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" : "[email protected]:passepartoutvpn/passepartoutkit-source",
       "state" : {
-        "revision" : "61c0a13efecbd46993a8c8dfed17c599f66c7986"
+        "revision" : "7426954e8ec84e6ddf6c8cd415bfa2c5c7064534"
       }
     },
     {

Passepartout/Library/Package.swift

@@ -36,7 +36,7 @@ let package = Package(
     ],
     dependencies: [
 //        .package(url: "[email protected]:passepartoutvpn/passepartoutkit-source", from: "0.9.0"),
-        .package(url: "[email protected]:passepartoutvpn/passepartoutkit-source", revision: "61c0a13efecbd46993a8c8dfed17c599f66c7986"),
+        .package(url: "[email protected]:passepartoutvpn/passepartoutkit-source", revision: "7426954e8ec84e6ddf6c8cd415bfa2c5c7064534"),
 //        .package(path: "../../../passepartoutkit-source"),
         .package(url: "[email protected]:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
 //        .package(url: "[email protected]: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/API/v5/providers/ivpn/ovpn.json

@@ -0,0 +1 @@
+{"presets":[{"id":"default","name":"Default","comment":"256-bit encryption","ovpn":{"cfg":{"ca":"-----BEGIN CERTIFICATE-----\n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\nsWGIGABGAHwXEAoDiZ/jjFrEZT0=\n-----END CERTIFICATE-----\n","tlsWrap":{"strategy":"auth","key":{"dir":1,"data":"rEcMk/+fVgKoqrN97oSlKBTRDyBJCtI8R9XYISDBv4Wek9Bpa0VdShuNVdQMJoXEHKHQrvKaPv0nJ0xO8JAgo5eP5FeEszXabfLRLbl7u4OEFlFfKpbwRxX9KJScb+KWqSXPraP4uJKO1/yWPBVjJy9c9G5eHZyEXXcDyogUl7fmVkqdHeqTWK3/1DUpVHn0fVKY+r9TWWE/9ZkstX/wgaBN+4GiZROmtEqbVJCtJl+KAjhIMqWcw+B1rVRUYQYLe8q0m6yBUWPLgJg91R1bH9dhcP/ZBNgpEHHpbvw/t3eFbHF7FI0IpRD1aHuKgoXc/+c3uYkW3RXvYjXe5CZtOw=="}},"cipher":"AES-256-CBC","digest":"SHA1","compressionFraming":0},"endpoints":["UDP:53","UDP:80","UDP:123","UDP:2049","UDP:2050","UDP:443","UDP:1194","TCP:80","TCP:443","TCP:1194","TCP:2049","TCP:2050","TCP:30587","TCP:41893","TCP:48574","TCP:58237"]}}],"defaults":{"username":"ivpnXXXXXXXX","country":"US"},"categories":[{"name":"","locations":[{"country":"AT","servers":[{"id":"at","country":"AT","area":"Vienna","hostname":"at.gw.ivpn.net","addrs":[3119830082]}]},{"country":"AU","servers":[{"id":"au-nsw","country":"AU","area":"Sydney","hostname":"au-nsw.gw.ivpn.net","addrs":[778476018,2454081098]}]},{"country":"BE","servers":[{"id":"be","country":"BE","area":"Brussels","hostname":"be.gw.ivpn.net","addrs":[3267099402]}]},{"country":"BG","servers":[{"id":"bg","country":"BG","area":"Sofia","hostname":"bg.gw.ivpn.net","addrs":[1382422290]}]},{"country":"BR","servers":[{"id":"br","country":"BR","area":"Franca","hostname":"br.gw.ivpn.net","addrs":[765650482]}]},{"country":"CA","servers":[{"id":"ca-bc","country":"CA","area":"Vancouver","hostname":"ca-bc.gw.ivpn.net","addrs":[1757513700]},{"id":"ca-on","country":"CA","area":"Toronto","hostname":"ca-on.gw.ivpn.net","addrs":[3091977986,2732306450]},{"id":"ca-qc","country":"CA","area":"Montreal","hostname":"ca-qc.gw.ivpn.net","addrs":[1466260506]}]},{"country":"CH","servers":[{"id":"ch","country":"CH","area":"Zurich","hostname":"ch.gw.ivpn.net","addrs":[3117722250,1360074914,2382341826]}]},{"country":"CZ","servers":[{"id":"cz","country":"CZ","area":"Prague","hostname":"cz.gw.ivpn.net","addrs":[3283460263]}]},{"country":"DE","servers":[{"id":"de","country":"DE","area":"Frankfurt","hostname":"de.gw.ivpn.net","addrs":[2997015410,2454102178,3110525736]}]},{"country":"DK","servers":[{"id":"dk","country":"DK","area":"Copenhagen","hostname":"dk.gw.ivpn.net","addrs":[3119863010]}]},{"country":"ES","servers":[{"id":"es","country":"ES","area":"Madrid","hostname":"es.gw.ivpn.net","addrs":[3109880769]}]},{"country":"FI","servers":[{"id":"fi","country":"FI","area":"Helsinki","hostname":"fi.gw.ivpn.net","addrs":[3111145996]}]},{"country":"FR","servers":[{"id":"fr","country":"FR","area":"Paris","hostname":"fr.gw.ivpn.net","addrs":[3119961011]}]},{"country":"GB","servers":[{"id":"gb-man","country":"GB","area":"Manchester","hostname":"gb-man.gw.ivpn.net","addrs":[1508806116]},{"id":"gb","country":"GB","area":"London","hostname":"gb.gw.ivpn.net","addrs":[3107708293,3107708248]}]},{"country":"GR","servers":[{"id":"gr","country":"GR","area":"Athens","hostname":"gr.gw.ivpn.net","addrs":[2845244526]}]},{"country":"HK","servers":[{"id":"hk","country":"HK","area":"Hong Kong","hostname":"hk.gw.ivpn.net","addrs":[3510287373,1986786488]}]},{"country":"HR","servers":[{"id":"hr","country":"HR","area":"Zagreb","hostname":"hr.gw.ivpn.net","addrs":[2845241857]}]},{"country":"HU","servers":[{"id":"hu","country":"HU","area":"Budapest","hostname":"hu.gw.ivpn.net","addrs":[3116200634]}]},{"country":"IE","servers":[{"id":"ie","country":"IE","area":"Dublin","hostname":"ie.gw.ivpn.net","addrs":[1475971464]}]},{"country":"IL","servers":[{"id":"il","country":"IL","area":"Holon, Tel Aviv","hostname":"il.gw.ivpn.net","addrs":[3116354690]}]},{"country":"IS","servers":[{"id":"is","country":"IS","area":"Reykjavik","hostname":"is.gw.ivpn.net","addrs":[1390242738]}]},{"country":"IT","servers":[{"id":"it","country":"IT","area":"Milan","hostname":"it.gw.ivpn.net","addrs":[1410415497]}]},{"country":"JP","servers":[{"id":"jp","country":"JP","area":"Tokyo","hostname":"jp.gw.ivpn.net","addrs":[3112652067]}]},{"country":"LU","servers":[{"id":"lu","country":"LU","area":"Luxembourg","hostname":"lu.gw.ivpn.net","addrs":[1558141237]}]},{"country":"MX","servers":[{"id":"mx","country":"MX","area":"Querétaro","hostname":"mx.gw.ivpn.net","addrs":[2038377409]}]},{"country":"MY","servers":[{"id":"my","country":"MY","area":"Kuala Lumpur","hostname":"my.gw.ivpn.net","addrs":[1023697300]}]},{"country":"NL","servers":[{"id":"nl","country":"NL","area":"Amsterdam","hostname":"nl.gw.ivpn.net","addrs":[3110525552,1607707716,1607707743,1607711710,1607711716,1607687958,1607707666]}]},{"country":"NO","servers":[{"id":"no","country":"NO","area":"Oslo","hostname":"no.gw.ivpn.net","addrs":[3270642326]}]},{"country":"PE","servers":[{"id":"pe","country":"PE","area":"Lima","hostname":"pe.gw.ivpn.net","addrs":[1333787713]}]},{"country":"PL","servers":[{"id":"pl","country":"PL","area":"Warsaw","hostname":"pl.gw.ivpn.net","addrs":[3119960150]}]},{"country":"PT","servers":[{"id":"pt","country":"PT","area":"Lisbon","hostname":"pt.gw.ivpn.net","addrs":[1580117872]}]},{"country":"RO","servers":[{"id":"ro","country":"RO","area":"Bucharest","hostname":"ro.gw.ivpn.net","addrs":[628674098]}]},{"country":"RS","servers":[{"id":"rs","country":"RS","area":"Belgrade","hostname":"rs.gw.ivpn.net","addrs":[2372036602]}]},{"country":"SE","servers":[{"id":"se","country":"SE","area":"Stockholm","hostname":"se.gw.ivpn.net","addrs":[1346570890]}]},{"country":"SG","servers":[{"id":"sg","country":"SG","area":"Singapore","hostname":"sg.gw.ivpn.net","addrs":[3112179898,628660092]}]},{"country":"SK","servers":[{"id":"sk","country":"SK","area":"Bratislava","hostname":"sk.gw.ivpn.net","addrs":[2626824394]}]},{"country":"TW","servers":[{"id":"tw","country":"TW","area":"Taipei","hostname":"tw.gw.ivpn.net","addrs":[3116212230]}]},{"country":"UA","servers":[{"id":"ua","country":"UA","area":"Kyiv","hostname":"ua.gw.ivpn.net","addrs":[1541938302]}]},{"country":"US","servers":[{"id":"us-az","country":"US","area":"Phoenix, AZ","hostname":"us-az.gw.ivpn.net","addrs":[3240492674]},{"id":"us-ca","country":"US","area":"Los Angeles, CA","hostname":"us-ca.gw.ivpn.net","addrs":[2919154746,1158434962,3325460835,2919156938,3115584825]},{"id":"us-co","country":"US","area":"Denver, CO","hostname":"us-co.gw.ivpn.net","addrs":[2038377498]},{"id":"us-fl","country":"US","area":"Miami, FL","hostname":"us-fl.gw.ivpn.net","addrs":[2905354586]},{"id":"us-ga","country":"US","area":"Atlanta, GA","hostname":"us-ga.gw.ivpn.net","addrs":[1753290898,1804998218,3109880023]},{"id":"us-il","country":"US","area":"Chicago, IL","hostname":"us-il.gw.ivpn.net","addrs":[1804999762,1208715666,1505473910]},{"id":"us-ma","country":"US","area":"Boston, MA","hostname":"us-ma.gw.ivpn.net","addrs":[1832736303]},{"id":"us-nj","country":"US","area":"Secaucus, NJ","hostname":"us-nj.gw.ivpn.net","addrs":[400719890,3257167666]},{"id":"us-nv","country":"US","area":"Las Vegas, NV","hostname":"us-nv.gw.ivpn.net","addrs":[3119645986]},{"id":"us-ny","country":"US","area":"New York, NY","hostname":"us-ny.gw.ivpn.net","addrs":[3563532482,1505473168]},{"id":"us-tx","country":"US","area":"Dallas, TX","hostname":"us-tx.gw.ivpn.net","addrs":[1613544898,1613532746,3325523012]},{"id":"us-ut","country":"US","area":"Salt Lake City, UT","hostname":"us-ut.gw.ivpn.net","addrs":[3328825372]},{"id":"us-va","country":"US","area":"Ashburn, VA","hostname":"us-va.gw.ivpn.net","addrs":[622055017]},{"id":"us-wa","country":"US","area":"Seattle, WA","hostname":"us-wa.gw.ivpn.net","addrs":[3324805891]}]},{"country":"ZA","servers":[{"id":"za","country":"ZA","area":"Johannesburg","hostname":"za.gw.ivpn.net","addrs":[2845240935]}]}]}],"build":3000,"name":"ivpn","fullName":"IVPN"}