Bundle API in app rather than library (#782)

Add script to speed up API update.

.gitignore

@@ -18,3 +18,4 @@ default.profraw
 .build
 .bundle
 .env.secret*
+tmp

Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
       "state" : {
-        "revision" : "61c0a13efecbd46993a8c8dfed17c599f66c7986"
+        "revision" : "7426954e8ec84e6ddf6c8cd415bfa2c5c7064534"
       }
     },
     {

Passepartout/Library/Package.swift

@@ -36,7 +36,7 @@ let package = Package(
     ],
     dependencies: [
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.9.0"),
-        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "61c0a13efecbd46993a8c8dfed17c599f66c7986"),
+        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "7426954e8ec84e6ddf6c8cd415bfa2c5c7064534"),
 //        .package(path: "../../../passepartoutkit-source"),
         .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),
@@ -109,12 +109,12 @@ let package = Package(
         .target(
             name: "CommonLibrary",
             dependencies: [
-                .product(name: "PassepartoutAPIBundle", package: "passepartoutkit-source"),
                 .product(name: "PassepartoutKit", package: "passepartoutkit-source"),
                 .product(name: "PassepartoutOpenVPNOpenSSL", package: "passepartoutkit-source-openvpn-openssl"),
                 .product(name: "PassepartoutWireGuardGo", package: "passepartoutkit-source-wireguard-go")
             ],
             resources: [
+                .copy("API"),
                 .process("Resources")
             ]
         ),

Passepartout/Library/Sources/CommonLibrary/API/v5/providers/index.json

@@ -0,0 +1,51 @@
+{
+    "metadata": [{
+        "name": "hideme",
+        "fullName": "Hide.me",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "ivpn",
+        "fullName": "IVPN",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "mullvad",
+        "fullName": "Mullvad",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "nordvpn",
+        "fullName": "NordVPN",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "oeck",
+        "fullName": "Oeck",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "pia",
+        "fullName": "PIA",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "protonvpn",
+        "fullName": "ProtonVPN",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "surfshark",
+        "fullName": "SurfShark",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "torguard",
+        "fullName": "TorGuard",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "tunnelbear",
+        "fullName": "TunnelBear",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "vyprvpn",
+        "fullName": "VyprVPN",
+        "vpn": ["ovpn"]
+    }, {
+        "name": "windscribe",
+        "fullName": "Windscribe",
+        "vpn": ["ovpn"]
+    }]
+}

Passepartout/Library/Sources/CommonLibrary/Shared.swift

@@ -24,7 +24,6 @@
 //
 
 import Foundation
-import PassepartoutAPIBundle
 import PassepartoutKit
 import PassepartoutWireGuardGo
 
@@ -73,7 +72,7 @@ extension API {
     ]
 
     public static let bundled: APIMapper = {
-        guard let url = API.bundledURL else {
+        guard let url = Bundle.module.url(forResource: "API", withExtension: nil) else {
             fatalError("Unable to find bundled API")
         }
         let ws = API.V5.DefaultWebServices(

ci/update-bundled-api.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+DESTINATION="Passepartout/Library/Sources/CommonLibrary/Resources/API"
+API_VERSION="v5"
+
+mkdir tmp
+cd tmp
+if [[ ! `git clone https://github.com/passepartoutvpn/api --depth 1` ]]; then
+    cd api
+    git pull
+fi
+cd ../..
+
+rm -rf $DESTINATION
+mkdir -p $DESTINATION
+cp -rp tmp/api/$API_VERSION $DESTINATION