@mytmpvpn/mytmpvpn-cli 1.7.0 → 1.8.1

package/README.md

@@ -1,6 +1,6 @@
 # mytmpvpn-cli
 
-Command Line Interface for the [`MyTmpVpn`](https://gitlab.com/mytmpvpn) project.
+Command Line Interface for the [`MyTmpVpn`](https://mytmpvpn.com) service.
 
 ## Getting started
 

package/dist/mytmpvpn.js

@@ -93,6 +93,19 @@ program.command('list-regions')
     }))
         .catch((err) => handleError(err));
 });
+program.command('list-regions-detailed')
+    .description('Returns the detailed list of all regions where vpn can be created')
+    .action((_, command) => {
+    const options = command.optsWithGlobals();
+    const appConfig = (0, appconfig_1.loadAppConfig)(options.appConfig);
+    // We don't need authenticated user to call this API
+    const client = new client_1.MyTmpVpnClient(appConfig.apiUrl);
+    client.listRegionsDetailed()
+        .then(((regions) => {
+        log.info(JSON.stringify(regions, null, 2));
+    }))
+        .catch((err) => handleError(err));
+});
 program.command('create')
     .description('Create a new vpn')
     .argument('<region>', 'region where the vpn should be created, as returned by list-regions')
@@ -172,20 +185,30 @@ program.command('get')
 program.command('download-config')
     .description('Download configuration of the given vpn to the given file')
     .argument('<vpnId>', 'vpnId to get config file from')
-    .option('--file <file>', 'file where the config should be downloaded to. Default is <vpnId>.tar.gz')
+    .option('--file <file>', 'file where the config should be downloaded to. Default is <vpnId>.conf')
     .option('--path <path>', 'path where the config file should be written to', (0, userconfig_1.getDefaultUserConfigDir)())
     .action((vpnId, _, command) => {
     const options = command.optsWithGlobals();
-    const file = options.file ? options.file : `${vpnId}.tar.gz`;
+    const file = options.file ? options.file : `${vpnId}.conf`;
     const fullpath = path.join(options.path, file);
     auth.getLoggedInClientFromFiles({ appConfigFile: options.appConfig, userConfigFile: options.userConfig, profileName: options.profile }, (err, client) => {
         if (err) {
             handleError(err);
             return;
         }
-        client.writeVpnConfigTo(vpnId, fs.createWriteStream(fullpath))
-            .then(() => log.info(fullpath))
-            .catch(err => handleError(err));
+        client.getVpnConfig(vpnId)
+            .then(b64 => {
+            const vpnConfig = Buffer.from(b64, 'base64');
+            log.debug(`Writing config file to ${fullpath}`);
+            // Write the config file to the given path
+            fs.writeFile(fullpath, vpnConfig, (err) => {
+                if (err) {
+                    handleError(err);
+                    return;
+                }
+                log.info(`Config file written to ${fullpath}`);
+            });
+        }).catch(err => handleError(err));
     });
 });
 program.command('list')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mytmpvpn/mytmpvpn-cli",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "MyTmpVpn CLI",
   "main": "./dist/mytmpvpn.js",
   "bin": {
@@ -27,8 +27,8 @@
   "dependencies": {
     "commander": "^9.4.1",
     "loglevel": "^1.8.1",
-    "@mytmpvpn/mytmpvpn-client": "^2.2.0",
-    "@mytmpvpn/mytmpvpn-common": "^2.1.0"
+    "@mytmpvpn/mytmpvpn-client": "^2.2.1",
+    "@mytmpvpn/mytmpvpn-common": "^2.1.1"
   },
   "devDependencies": {
     "@types/jest": "^29.2.2",

package/src/mytmpvpn.ts

@@ -47,6 +47,7 @@ program
   .option('--appConfig <file>', 'Path to the application config file', getDefaultAppConfigFile())
   .option('--userConfig <file>', 'Path to the user config file', getDefaultUserConfigFile())
   .option('--profile <name>', 'Name of the profile in the user config file to use', getDefaultUserProfile())
+
 program.on('option:verbose', function () {
   log.setDefaultLevel("trace")
 })
@@ -194,20 +195,30 @@ program.command('get')
 program.command('download-config')
   .description('Download configuration of the given vpn to the given file')
   .argument('<vpnId>', 'vpnId to get config file from')
-  .option('--file <file>', 'file where the config should be downloaded to. Default is <vpnId>.tar.gz')
+  .option('--file <file>', 'file where the config should be downloaded to. Default is <vpnId>.conf')
   .option('--path <path>', 'path where the config file should be written to', getDefaultUserConfigDir())
   .action((vpnId, _, command) => {
     const options = command.optsWithGlobals()
-    const file = options.file ? options.file : `${vpnId}.tar.gz`
+    const file = options.file ? options.file : `${vpnId}.conf`
     const fullpath = path.join(options.path, file)
     auth.getLoggedInClientFromFiles({ appConfigFile: options.appConfig, userConfigFile: options.userConfig, profileName: options.profile }, (err, client) => {
       if (err) {
         handleError(err)
         return
       }
-      client.writeVpnConfigTo(vpnId, fs.createWriteStream(fullpath))
-        .then(() => log.info(fullpath))
-        .catch(err => handleError(err))
+      client.getVpnConfig(vpnId)
+        .then(b64 => {
+          const vpnConfig = Buffer.from(b64, 'base64')
+          log.debug(`Writing config file to ${fullpath}`)
+          // Write the config file to the given path
+          fs.writeFile(fullpath, vpnConfig, (err) => {
+            if (err) {
+              handleError(err)
+              return
+            }
+            log.info(`Config file written to ${fullpath}`)
+          })
+        }).catch(err => handleError(err))
     })
   })
 

package/test/integration-test-one-region.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+if test $# -ne 1; then 
+    1>&2 echo "Usage: $(basename $0) <region ID>"
+    exit 1
+fi
+
+mytmpvpn="npx @mytmpvpn/mytmpvpn-cli@latest"
+
+region=$1
+
+# Create VPN and get VPN ID
+vpnId=$(${mytmpvpn} create ${region} --sync | grep vpnId | cut -d \' -f 2)
+
+err=$?
+if test $err -ne 0; then
+    exit 1
+fi
+
+# Get config file
+path_config_file=$(${mytmpvpn} download-config ${vpnId})
+
+err=$?
+if test $err -ne 0; then
+    exit 1
+fi
+
+# De-tar config file
+tar xvf ${path_config_file} --directory $(dirname ${path_config_file})
+
+err=$?
+if test $err -ne 0; then
+    exit 1
+fi
+
+# Get IP address
+old_ip_addr=$(curl ifconfig.me)
+
+# Connect to VPN
+sudo wg-quick up ~/.config/mytmpvpn/${vpnId}/mytmpvpn-wg.conf
+
+err=$?
+if test $err -ne 0; then
+    exit 1
+fi
+
+# Test connection
+ping 8.8.8.8 -c 4
+
+err=$?
+if test $err -ne 0; then
+    exit 1
+fi
+
+# Test different IP address
+new_ip_addr=$(curl ifconfig.me)
+
+if test "${old_ip_addr}" == "${new_ip_addr}"; then
+    1>&2 echo "external IP address has not changed: old IP ${old_ip_addr} new ${new_ip_addr}"
+    exit 1
+fi
+# Test region
+
+# disconnect from VPN 
+sudo wg-quick down mytmpvpn-wg
+sudo ip link delete mytmpvpn-wg
+
+err=$?
+if test $err -ne 0; then
+    exit 1
+fi
+
+# delete VPN 
+${mytmpvpn} delete ${vpnId}
+
+err=$?
+if test $err -ne 0; then
+    exit 1
+fi