@mytmpvpn/mytmpvpn-cli 4.2.0 → 5.0.0

package/dist/mytmpvpn.js

@@ -114,52 +114,36 @@ program.command('get-peanuts-balance')
         handleError(err, options.verbose);
     });
 });
-program.command('list-regions')
-    .description('Returns the list of all regions where vpn can be created')
+program.command('list-locations')
+    .description('Returns the list of all locations where vpn can be created')
     .action((_, command) => {
     const options = command.optsWithGlobals();
     const appConfig = appconfig.loadAppConfig(options.appConfig);
     // We don't need authenticated user to call this API
     const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl);
-    clientImpl.listRegions()
-        .then(((regions) => {
-        log.info(JSON.stringify(regions, null, 2));
-    }))
-        .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 = appconfig.loadAppConfig(options.appConfig);
-    // We don't need authenticated user to call this API
-    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl);
-    clientImpl.listRegionsDetailed()
-        .then(((regions) => {
-        log.info(JSON.stringify(regions, null, 2));
+    clientImpl.listLocations()
+        .then(((locations) => {
+        log.info(JSON.stringify(locations, 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')
+    .argument('<geonameId>', 'geonameId where the vpn should be created, as returned by list-locations')
     .option('--sync', 'wait for vpn creation completion')
-    .addOption(new commander_1.Option('--type <type>', 'Type of VPN')
-    .choices(vpnlib.getVpnConfigTypes())
-    .default(vpnlib.VpnType.WireGuard))
     .option('--peanuts <nb>', 'Max number of peanuts to use (specify -1 for maximum)', '-1')
     .option('--deleteAfter seconds', 'Number of seconds after which the vpn will be terminated')
-    .action((region, _, command) => {
+    .action((geonameId, _, command) => {
     const options = command.optsWithGlobals();
     const syncStr = options.sync ? "synchronously" : "asynchronously";
     const deleteAfter = options.deleteAfter ? options.deleteAfter : undefined;
-    log.debug(`Creating new ${options.type} vpn into ${region} ${syncStr}`);
+    log.debug(`Creating new ${options.type} vpn into ${geonameId} ${syncStr}`);
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
     }).then(client => {
-        client.createVpn(region, {
+        client.createVpn(Number.parseInt(geonameId), {
             type: options.type,
             maxPeanuts: options.peanuts, deleteAfter
         }).then(vpn => {
@@ -259,7 +243,7 @@ program.command('download-config')
 });
 program.command('list')
     .description('List all vpns')
-    .option('--region <region>', 'region to list vpns from')
+    .option('--geonameId <geonameId>', 'geonameId to list vpns from')
     .option('--include-state [<state>, ...]', 'Comma separated list of states to include', Object.values(vpnlib.VpnState))
     .option('--exclude-state [<state>, ...]', 'Comma separated list of states to exclude from', [vpnlib.VpnState.Deleted])
     .action((_, command) => {
@@ -271,8 +255,8 @@ program.command('list')
     }).then(client => {
         client.listVpns(options.state)
             .then(vpns => {
-            if (options.region) {
-                vpns = vpns.filter((vpn) => vpn.region === options.region);
+            if (options.location) {
+                vpns = vpns.filter((vpn) => vpn.geonamesId === options.geonameId);
             }
             if (options.includeState) {
                 vpns = vpns.filter((vpn) => options.includeState.includes(vpn.state));
@@ -399,11 +383,11 @@ Examples:
 
   # Then you can use the following command at will:
   
-  # List available regions:
-  $ mytmpvpn list-regions                 
+  # List available locations:
+  $ mytmpvpn list-locations
 
   # Create a new vpn in Paris:
-  $ mytmpvpn create 'paris' --sync         # This takes several minutes, please be patient or remove --sync
+  $ mytmpvpn create '2988507' --sync         # This takes several minutes, please be patient or remove --sync
 
   # List all my vpns:
   $ mytmpvpn list

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mytmpvpn/mytmpvpn-cli",
-  "version": "4.2.0",
+  "version": "5.0.0",
   "description": "MyTmpVpn CLI",
   "main": "./dist/mytmpvpn.js",
   "bin": {
@@ -30,8 +30,8 @@
   },
   "license": "GNU GPL",
   "dependencies": {
-    "@mytmpvpn/mytmpvpn-client": "^6.0.0",
-    "@mytmpvpn/mytmpvpn-common": "^8.0.0",
+    "@mytmpvpn/mytmpvpn-client": "^9.0.0",
+    "@mytmpvpn/mytmpvpn-common": "^10.0.2",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "commander": "^14.0.1",
     "eslint": "^8.57.1",

package/src/mytmpvpn.ts

@@ -13,6 +13,7 @@ import { confirmUser, getLoggedInClientFromFiles, registerUser } from '@mytmpvpn
 import * as appconfig from '@mytmpvpn/mytmpvpn-client/appconfig'
 import * as userconfig from '@mytmpvpn/mytmpvpn-client/userconfig'
 import * as client from '@mytmpvpn/mytmpvpn-client/client'
+import { ListLocationsResponse } from '@mytmpvpn/mytmpvpn-common/models/location'
 
 const program = new Command()
 
@@ -86,54 +87,37 @@ program.command('get-peanuts-balance')
     })
   })
 
-program.command('list-regions')
-  .description('Returns the list of all regions where vpn can be created')
+program.command('list-locations')
+  .description('Returns the list of all locations where vpn can be created')
   .action((_, command) => {
     const options = command.optsWithGlobals()
     const appConfig = appconfig.loadAppConfig(options.appConfig)
     // We don't need authenticated user to call this API
     const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl)
-    clientImpl.listRegions()
-      .then(((regions: any) => {
-        log.info(JSON.stringify(regions, null, 2))
-      }))
-      .catch((err: any) => 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 = appconfig.loadAppConfig(options.appConfig)
-    // We don't need authenticated user to call this API
-    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl)
-    clientImpl.listRegionsDetailed()
-      .then(((regions: any) => {
-        log.info(JSON.stringify(regions, null, 2))
+    clientImpl.listLocations()
+      .then(((locations: ListLocationsResponse) => {
+        log.info(JSON.stringify(locations, null, 2))
       }))
       .catch((err: any) => handleError(err))
   })
 
 program.command('create')
   .description('Create a new vpn')
-  .argument('<region>', 'region where the vpn should be created, as returned by list-regions')
+  .argument('<geonameId>', 'geonameId where the vpn should be created, as returned by list-locations')
   .option('--sync', 'wait for vpn creation completion')
-  .addOption(new Option('--type <type>', 'Type of VPN')
-    .choices(vpnlib.getVpnConfigTypes())
-    .default(vpnlib.VpnType.WireGuard))
   .option('--peanuts <nb>', 'Max number of peanuts to use (specify -1 for maximum)', '-1')
   .option('--deleteAfter seconds', 'Number of seconds after which the vpn will be terminated')
-  .action((region: string, _, command) => {
+  .action((geonameId: string, _, command) => {
     const options = command.optsWithGlobals()
     const syncStr = options.sync ? "synchronously" : "asynchronously"
     const deleteAfter = options.deleteAfter ? options.deleteAfter : undefined
-    log.debug(`Creating new ${options.type} vpn into ${region} ${syncStr}`)
+    log.debug(`Creating new ${options.type} vpn into ${geonameId} ${syncStr}`)
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
     }).then(client => {
-      client.createVpn(region, {
+      client.createVpn(Number.parseInt(geonameId), {
         type: options.type,
         maxPeanuts: options.peanuts, deleteAfter
       }).then(vpn => {
@@ -237,7 +221,7 @@ program.command('download-config')
 
 program.command('list')
   .description('List all vpns')
-  .option('--region <region>', 'region to list vpns from')
+  .option('--geonameId <geonameId>', 'geonameId to list vpns from')
   .option('--include-state [<state>, ...]', 'Comma separated list of states to include', Object.values(vpnlib.VpnState))
   .option('--exclude-state [<state>, ...]', 'Comma separated list of states to exclude from', [vpnlib.VpnState.Deleted])
   .action((_, command) => {
@@ -249,8 +233,8 @@ program.command('list')
     }).then(client => {
       client.listVpns(options.state)
         .then(vpns => {
-          if (options.region) {
-            vpns = vpns.filter((vpn: vpnlib.Vpn) => vpn.region === options.region)
+          if (options.location) {
+            vpns = vpns.filter((vpn: vpnlib.Vpn) => vpn.geonamesId === options.geonameId)
           }
           if (options.includeState) {
             vpns = vpns.filter((vpn: vpnlib.Vpn) => options.includeState.includes(vpn.state))
@@ -382,11 +366,11 @@ Examples:
 
   # Then you can use the following command at will:
   
-  # List available regions:
-  $ mytmpvpn list-regions                 
+  # List available locations:
+  $ mytmpvpn list-locations
 
   # Create a new vpn in Paris:
-  $ mytmpvpn create 'paris' --sync         # This takes several minutes, please be patient or remove --sync
+  $ mytmpvpn create '2988507' --sync         # This takes several minutes, please be patient or remove --sync
 
   # List all my vpns:
   $ mytmpvpn list