@mytmpvpn/mytmpvpn-cli 5.0.0 → 6.0.0

package/dist/mytmpvpn.js

@@ -33,18 +33,21 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 // Use NODE_NO_WARNINGS=1 to get rid of the fetch node deprecated API
 //  https://github.com/netlify/cli/issues/4608 -- but it hangs the process: https://github.com/nodejs/node/issues/21960
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const commander_1 = require("commander");
-const log = __importStar(require("loglevel"));
-log.setDefaultLevel("info");
+const loglevel_1 = __importDefault(require("loglevel"));
+loglevel_1.default.setDefaultLevel("info");
 const vpnlib = __importStar(require("@mytmpvpn/mytmpvpn-common/models/vpn"));
 const mytmpvpn_client_1 = require("@mytmpvpn/mytmpvpn-client");
 const appconfig = __importStar(require("@mytmpvpn/mytmpvpn-client/appconfig"));
-const userconfig = __importStar(require("@mytmpvpn/mytmpvpn-client/userconfig"));
+const userprofiles = __importStar(require("@mytmpvpn/mytmpvpn-client/userprofiles"));
 const client = __importStar(require("@mytmpvpn/mytmpvpn-client/client"));
 const program = new commander_1.Command();
 function handleError(error, verbose = false) {
@@ -52,24 +55,24 @@ function handleError(error, verbose = false) {
         // The request was made and the server responded with a status code
         // that falls out of the range of 2xx
         try {
-            log.error(`[${error.response.status}] - ${JSON.stringify(error.response.data)}`);
+            loglevel_1.default.error(`[${error.response.status}] - ${JSON.stringify(error.response.data)}`);
         }
         catch (Error) {
-            log.error(`[${error.response.status}] - ${JSON.stringify(error.message)}`);
+            loglevel_1.default.error(`[${error.response.status}] - ${JSON.stringify(error.message)}`);
         }
-        log.debug(error.response.headers);
+        loglevel_1.default.debug(error.response.headers);
     }
     else if (error.request) {
         // The request was made but no response was received
         // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
         // http.ClientRequest in node.js
-        log.error(`No reponse received. Check your profile and your appConfig`);
+        loglevel_1.default.error(`No reponse received. Check your profile and your appConfig`);
     }
     else {
         // Something happened in setting up the request that triggered an Error
-        log.error(`Error while setting up the request ${JSON.stringify(error)}`);
+        loglevel_1.default.error(`Error while setting up the request ${JSON.stringify(error)}`);
     }
-    log.trace(`Stack trace: ${error}`);
+    loglevel_1.default.trace(`Stack trace: ${error}`);
 }
 program
     .name('mytmpvpn-cli')
@@ -77,10 +80,10 @@ program
     .version('0.0.1')
     .option('--verbose', 'Produce more logs')
     .option('--appConfig <file>', 'Path to the application config file', appconfig.getDefaultAppConfigFile())
-    .option('--userConfig <file>', 'Path to the user config file', userconfig.getDefaultUserConfigFile())
-    .option('--profile <name>', 'Name of the profile in the user config file to use', userconfig.getDefaultUserProfile());
+    .option('--userProfiles <file>', 'Path to the user profiles file', userprofiles.getDefaultUserProfilesFile())
+    .option('--profile <name>', 'Name of the profile in the user profiles file to use', userprofiles.getDefaultUsername());
 program.on('option:verbose', function () {
-    log.setDefaultLevel("trace");
+    loglevel_1.default.setDefaultLevel("trace");
 });
 program.command('list-peanuts-packs')
     .description(`Returns the list of peanuts packs you can purchase. A peanuts pack contains a given number of peanuts.`)
@@ -91,7 +94,7 @@ program.command('list-peanuts-packs')
     const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl);
     clientImpl.listPeanutsPacks()
         .then(((packs) => {
-        log.info(JSON.stringify(packs, null, 2));
+        loglevel_1.default.info(JSON.stringify(packs, null, 2));
     }))
         .catch((err) => handleError(err));
 });
@@ -99,14 +102,14 @@ program.command('get-peanuts-balance')
     .description('Get the current peanuts balance')
     .action((_, command) => {
     const options = command.optsWithGlobals();
-    log.debug(`Get peanuts balance`);
+    loglevel_1.default.debug(`Get peanuts balance`);
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
-        userConfigFile: options.userConfig,
+        userConfigFile: options.userProfiles,
         profileName: options.profile
     }).then(client => {
         client.getPeanutsBalance().then(balance => {
-            log.info(balance);
+            loglevel_1.default.info(balance);
         }).catch((err) => {
             handleError(err);
         });
@@ -123,7 +126,7 @@ program.command('list-locations')
     const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl);
     clientImpl.listLocations()
         .then(((locations) => {
-        log.info(JSON.stringify(locations, null, 2));
+        loglevel_1.default.info(JSON.stringify(locations, null, 2));
     }))
         .catch((err) => handleError(err));
 });
@@ -137,10 +140,10 @@ program.command('create')
     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 ${geonameId} ${syncStr}`);
+    loglevel_1.default.debug(`Creating new ${options.type} vpn into ${geonameId} ${syncStr}`);
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
-        userConfigFile: options.userConfig,
+        userConfigFile: options.userProfiles,
         profileName: options.profile
     }).then(client => {
         client.createVpn(Number.parseInt(geonameId), {
@@ -148,11 +151,11 @@ program.command('create')
             maxPeanuts: options.peanuts, deleteAfter
         }).then(vpn => {
             if (!options.sync) {
-                log.info(vpn);
+                loglevel_1.default.info(vpn);
                 return;
             }
             client.waitUntilVpnStateIs(vpn.vpnId, vpnlib.VpnState.Running).then(updatedVpn => {
-                log.info(updatedVpn);
+                loglevel_1.default.info(updatedVpn);
             }).catch(err => {
                 handleError(err);
             });
@@ -170,20 +173,20 @@ program.command('delete')
     .action((vpnId, _, command) => {
     const options = command.optsWithGlobals();
     const syncStr = options.sync ? "synchronously" : "asynchronously";
-    log.debug(`Deleting vpn ${vpnId} ${syncStr}`);
+    loglevel_1.default.debug(`Deleting vpn ${vpnId} ${syncStr}`);
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
-        userConfigFile: options.userConfig,
+        userConfigFile: options.userProfiles,
         profileName: options.profile
     }).then(client => {
         client.deleteVpn(vpnId).then(vpn => {
             if (!options.sync) {
-                log.info(JSON.stringify(vpn));
+                loglevel_1.default.info(JSON.stringify(vpn));
                 return;
             }
             client.waitUntilVpnStateIs(vpnId, vpnlib.VpnState.Deleted)
                 .then(updatedVpn => {
-                log.info(updatedVpn);
+                loglevel_1.default.info(updatedVpn);
                 return;
             }).catch(err => {
                 handleError(err.response?.data || JSON.stringify(err));
@@ -200,11 +203,11 @@ program.command('get')
     const options = command.optsWithGlobals();
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
-        userConfigFile: options.userConfig,
+        userConfigFile: options.userProfiles,
         profileName: options.profile
     }).then(client => {
         client.getVpn(vpnId)
-            .then(result => log.info(result))
+            .then(result => loglevel_1.default.info(result))
             .catch(err => handleError(err));
     }).catch(err => {
         handleError(err);
@@ -214,27 +217,27 @@ 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>.conf')
-    .option('--path <path>', 'path where the config file should be written to', userconfig.getDefaultUserConfigDir())
+    .option('--path <path>', 'path where the config file should be written to', userprofiles.getDefaultUserProfilesDir())
     .action((vpnId, _, command) => {
     const options = command.optsWithGlobals();
     const file = options.file ? options.file : `${vpnId}.conf`;
     const fullpath = path.join(options.path, file);
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
-        userConfigFile: options.userConfig,
+        userConfigFile: options.userProfiles,
         profileName: options.profile
     }).then(client => {
         client.getVpnConfig(vpnId)
             .then(b64 => {
             const vpnConfig = Buffer.from(b64, 'base64');
-            log.debug(`Writing config file to ${fullpath}`);
+            loglevel_1.default.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}`);
+                loglevel_1.default.info(`Config file written to ${fullpath}`);
             });
         }).catch(err => handleError(err));
     }).catch(err => {
@@ -250,7 +253,7 @@ program.command('list')
     const options = command.optsWithGlobals();
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
-        userConfigFile: options.userConfig,
+        userConfigFile: options.userProfiles,
         profileName: options.profile
     }).then(client => {
         client.listVpns(options.state)
@@ -264,7 +267,7 @@ program.command('list')
             if (options.excludeState) {
                 vpns = vpns.filter((vpn) => !options.excludeState.includes(vpn.state));
             }
-            log.info(JSON.stringify(vpns, null, 2));
+            loglevel_1.default.info(JSON.stringify(vpns, null, 2));
         })
             .catch(err => handleError(err));
     }).catch(err => {
@@ -282,15 +285,15 @@ program.command('wait')
         handleError(`Unknown state: ${state}. Valid states: ${Object.values(vpnlib.VpnState)}`);
         return;
     }
-    log.debug(`Waiting for ${vpnId} state to be (at least) ${state}`);
+    loglevel_1.default.debug(`Waiting for ${vpnId} state to be (at least) ${state}`);
     (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
-        userConfigFile: options.userConfig,
+        userConfigFile: options.userProfiles,
         profileName: options.profile
     }).then(client => {
         client.waitUntilVpnStateIs(vpnId, actualState)
             .then(vpn => {
-            log.info(vpn);
+            loglevel_1.default.info(vpn);
         })
             .catch(err => handleError(err));
     }).catch(err => {
@@ -304,10 +307,10 @@ program.command('register')
     .action((username, password, _, command) => {
     const options = command.optsWithGlobals();
     var userConfigData;
-    if (fs.existsSync(options.userConfig)) {
-        userConfigData = userconfig.loadUserConfig(options.userConfig);
+    if (fs.existsSync(options.userProfiles)) {
+        userConfigData = userprofiles.loadUserProfiles(options.userProfiles);
         if (userConfigData.profiles[options.profile]) {
-            handleError(`Profile ${options.profile}  already exists in ${options.userConfig}, specify another profile name using --profile`);
+            handleError(`Profile ${options.profile}  already exists in ${options.userProfiles}, specify another profile name using --profile`);
             return;
         }
         userConfigData.profiles[options.profile] = {
@@ -328,20 +331,20 @@ program.command('register')
     }
     (0, mytmpvpn_client_1.registerUser)(options.appConfig, { username, password })
         .then(user => {
-        log.info(`Please confirm your identity with the code sent to ${username}`);
-        fs.mkdir(path.dirname(options.userConfig), { recursive: true }, (err, path) => {
+        loglevel_1.default.info(`Please confirm your identity with the code sent to ${username}`);
+        fs.mkdir(path.dirname(options.userProfiles), { recursive: true }, (err, path) => {
             if (err) {
                 handleError(err);
                 return;
             }
-            log.debug(`Directory: ${path} created`);
-            fs.writeFile(options.userConfig, JSON.stringify(userConfigData, null, 2), (err) => {
+            loglevel_1.default.debug(`Directory: ${path} created`);
+            fs.writeFile(options.userProfiles, JSON.stringify(userConfigData, null, 2), (err) => {
                 if (err) {
                     handleError(err);
                     return;
                 }
             });
-            log.info(`A new profile has been created for ${options.profile} in ${options.userConfig}`);
+            loglevel_1.default.info(`A new profile has been created for ${options.profile} in ${options.userProfiles}`);
         });
     }).catch(err => {
         handleError(err);
@@ -355,8 +358,8 @@ program.command('confirm-registration')
     const options = command.optsWithGlobals();
     (0, mytmpvpn_client_1.confirmUser)(options.appConfig, username, code)
         .then(result => {
-        log.debug(result);
-        log.info(`User ${username} confirmed!`);
+        loglevel_1.default.debug(result);
+        loglevel_1.default.info(`User ${username} confirmed!`);
     })
         .catch(err => {
         handleError(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mytmpvpn/mytmpvpn-cli",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "MyTmpVpn CLI",
   "main": "./dist/mytmpvpn.js",
   "bin": {
@@ -30,10 +30,10 @@
   },
   "license": "GNU GPL",
   "dependencies": {
-    "@mytmpvpn/mytmpvpn-client": "^9.0.0",
-    "@mytmpvpn/mytmpvpn-common": "^10.0.2",
+    "@mytmpvpn/mytmpvpn-client": "^10.0.2",
+    "@mytmpvpn/mytmpvpn-common": "^13.0.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "commander": "^14.0.1",
+    "commander": "^14.0.3",
     "eslint": "^8.57.1",
     "eslint-config-standard-with-typescript": "^39.1.1",
     "eslint-plugin-import": "^2.32.0",
@@ -43,9 +43,9 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^24.8.1",
+    "@types/node": "^24.10.13",
     "jest": "^29.7.0",
-    "ts-jest": "^29.4.5",
+    "ts-jest": "^29.4.6",
     "typescript": "^5.9.3"
   }
 }

package/src/mytmpvpn.ts

@@ -4,14 +4,14 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import { Command, Option } from 'commander'
-import * as log from 'loglevel'
+import log from 'loglevel'
 log.setDefaultLevel("info")
 
 import * as vpnlib from '@mytmpvpn/mytmpvpn-common/models/vpn'
 import * as peanuts from '@mytmpvpn/mytmpvpn-common/models/peanuts'
 import { confirmUser, getLoggedInClientFromFiles, registerUser } from '@mytmpvpn/mytmpvpn-client'
 import * as appconfig from '@mytmpvpn/mytmpvpn-client/appconfig'
-import * as userconfig from '@mytmpvpn/mytmpvpn-client/userconfig'
+import * as userprofiles from '@mytmpvpn/mytmpvpn-client/userprofiles'
 import * as client from '@mytmpvpn/mytmpvpn-client/client'
 import { ListLocationsResponse } from '@mytmpvpn/mytmpvpn-common/models/location'
 
@@ -46,8 +46,8 @@ program
   .version('0.0.1')
   .option('--verbose', 'Produce more logs')
   .option('--appConfig <file>', 'Path to the application config file', appconfig.getDefaultAppConfigFile())
-  .option('--userConfig <file>', 'Path to the user config file', userconfig.getDefaultUserConfigFile())
-  .option('--profile <name>', 'Name of the profile in the user config file to use', userconfig.getDefaultUserProfile())
+  .option('--userProfiles <file>', 'Path to the user profiles file', userprofiles.getDefaultUserProfilesFile())
+  .option('--profile <name>', 'Name of the profile in the user profiles file to use', userprofiles.getDefaultUsername())
 
 program.on('option:verbose', function () {
   log.setDefaultLevel("trace")
@@ -74,7 +74,7 @@ program.command('get-peanuts-balance')
     log.debug(`Get peanuts balance`)
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
-      userConfigFile: options.userConfig,
+      userConfigFile: options.userProfiles,
       profileName: options.profile
     }).then(client => {
       client.getPeanutsBalance().then(balance => {
@@ -114,7 +114,7 @@ program.command('create')
     log.debug(`Creating new ${options.type} vpn into ${geonameId} ${syncStr}`)
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
-      userConfigFile: options.userConfig,
+      userConfigFile: options.userProfiles,
       profileName: options.profile
     }).then(client => {
       client.createVpn(Number.parseInt(geonameId), {
@@ -148,7 +148,7 @@ program.command('delete')
     log.debug(`Deleting vpn ${vpnId} ${syncStr}`)
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
-      userConfigFile: options.userConfig,
+      userConfigFile: options.userProfiles,
       profileName: options.profile
     }).then(client => {
       client.deleteVpn(vpnId).then(vpn => {
@@ -176,7 +176,7 @@ program.command('get')
     const options = command.optsWithGlobals()
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
-      userConfigFile: options.userConfig,
+      userConfigFile: options.userProfiles,
       profileName: options.profile
     }).then(client => {
       client.getVpn(vpnId)
@@ -191,14 +191,14 @@ 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>.conf')
-  .option('--path <path>', 'path where the config file should be written to', userconfig.getDefaultUserConfigDir())
+  .option('--path <path>', 'path where the config file should be written to', userprofiles.getDefaultUserProfilesDir())
   .action((vpnId, _, command) => {
     const options = command.optsWithGlobals()
     const file = options.file ? options.file : `${vpnId}.conf`
     const fullpath = path.join(options.path, file)
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
-      userConfigFile: options.userConfig,
+      userConfigFile: options.userProfiles,
       profileName: options.profile
     }).then(client => {
       client.getVpnConfig(vpnId)
@@ -228,7 +228,7 @@ program.command('list')
     const options = command.optsWithGlobals()
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
-      userConfigFile: options.userConfig,
+      userConfigFile: options.userProfiles,
       profileName: options.profile
     }).then(client => {
       client.listVpns(options.state)
@@ -264,7 +264,7 @@ program.command('wait')
     log.debug(`Waiting for ${vpnId} state to be (at least) ${state}`)
     getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
-      userConfigFile: options.userConfig,
+      userConfigFile: options.userProfiles,
       profileName: options.profile
     }).then(client => {
       client.waitUntilVpnStateIs(vpnId, actualState)
@@ -283,11 +283,11 @@ program.command('register')
   .argument('<password>', 'a password')
   .action((username, password, _, command) => {
     const options = command.optsWithGlobals()
-    var userConfigData: userconfig.UserConfig
-    if (fs.existsSync(options.userConfig)) {
-      userConfigData = userconfig.loadUserConfig(options.userConfig)
+    var userConfigData: userprofiles.UserProfiles
+    if (fs.existsSync(options.userProfiles)) {
+      userConfigData = userprofiles.loadUserProfiles(options.userProfiles)
       if (userConfigData.profiles[options.profile]) {
-        handleError(`Profile ${options.profile}  already exists in ${options.userConfig}, specify another profile name using --profile`)
+        handleError(`Profile ${options.profile}  already exists in ${options.userProfiles}, specify another profile name using --profile`)
         return
       }
       userConfigData.profiles[options.profile] = {
@@ -309,19 +309,19 @@ program.command('register')
       { username, password })
       .then(user => {
         log.info(`Please confirm your identity with the code sent to ${username}`)
-        fs.mkdir(path.dirname(options.userConfig), { recursive: true }, (err, path?) => {
+        fs.mkdir(path.dirname(options.userProfiles), { recursive: true }, (err, path?) => {
           if (err) {
             handleError(err)
             return
           }
           log.debug(`Directory: ${path} created`)
-          fs.writeFile(options.userConfig, JSON.stringify(userConfigData, null, 2), (err) => {
+          fs.writeFile(options.userProfiles, JSON.stringify(userConfigData, null, 2), (err) => {
             if (err) {
               handleError(err)
               return
             }
           })
-          log.info(`A new profile has been created for ${options.profile} in ${options.userConfig}`)
+          log.info(`A new profile has been created for ${options.profile} in ${options.userProfiles}`)
         })
       }).catch(err => {
         handleError(err)