@mytmpvpn/mytmpvpn-cli 4.0.0 → 4.1.0

package/dist/mytmpvpn.js

@@ -9,10 +9,10 @@ const commander_1 = require("commander");
 const log = require("loglevel");
 log.setDefaultLevel("info");
 const vpnlib = require("@mytmpvpn/mytmpvpn-common/models/vpn");
-const appconfig_1 = require("@mytmpvpn/mytmpvpn-client/appconfig");
-const userconfig_1 = require("@mytmpvpn/mytmpvpn-client/userconfig");
-const auth = require("@mytmpvpn/mytmpvpn-client/index");
-const client_1 = require("@mytmpvpn/mytmpvpn-client/client");
+const mytmpvpn_client_1 = require("@mytmpvpn/mytmpvpn-client");
+const appconfig = require("@mytmpvpn/mytmpvpn-client/appconfig");
+const userconfig = require("@mytmpvpn/mytmpvpn-client/userconfig");
+const client = require("@mytmpvpn/mytmpvpn-client/client");
 const program = new commander_1.Command();
 function handleError(error, verbose = false) {
     if (error.response) {
@@ -43,9 +43,9 @@ program
     .description('MyTmpVpn CLI')
     .version('0.0.1')
     .option('--verbose', 'Produce more logs')
-    .option('--appConfig <file>', 'Path to the application config file', (0, appconfig_1.getDefaultAppConfigFile)())
-    .option('--userConfig <file>', 'Path to the user config file', (0, userconfig_1.getDefaultUserConfigFile)())
-    .option('--profile <name>', 'Name of the profile in the user config file to use', (0, userconfig_1.getDefaultUserProfile)());
+    .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());
 program.on('option:verbose', function () {
     log.setDefaultLevel("trace");
 });
@@ -53,10 +53,10 @@ program.command('list-peanuts-packs')
     .description(`Returns the list of peanuts packs you can purchase. A peanuts pack contains a given number of peanuts.`)
     .action((_, command) => {
     const options = command.optsWithGlobals();
-    const appConfig = (0, appconfig_1.loadAppConfig)(options.appConfig);
+    const appConfig = appconfig.loadAppConfig(options.appConfig);
     // We don't need authenticated user to call this API
-    const client = new client_1.MyTmpVpnClientImpl(appConfig.apiUrl);
-    client.listPeanutsPacks()
+    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl);
+    clientImpl.listPeanutsPacks()
         .then(((packs) => {
         log.info(JSON.stringify(packs, null, 2));
     }))
@@ -67,7 +67,7 @@ program.command('get-peanuts-balance')
     .action((_, command) => {
     const options = command.optsWithGlobals();
     log.debug(`Get peanuts balance`);
-    auth.getLoggedInClientFromFiles({
+    (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
@@ -85,10 +85,10 @@ program.command('list-regions')
     .description('Returns the list of all regions where vpn can be created')
     .action((_, command) => {
     const options = command.optsWithGlobals();
-    const appConfig = (0, appconfig_1.loadAppConfig)(options.appConfig);
+    const appConfig = appconfig.loadAppConfig(options.appConfig);
     // We don't need authenticated user to call this API
-    const client = new client_1.MyTmpVpnClientImpl(appConfig.apiUrl);
-    client.listRegions()
+    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl);
+    clientImpl.listRegions()
         .then(((regions) => {
         log.info(JSON.stringify(regions, null, 2));
     }))
@@ -98,10 +98,10 @@ 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);
+    const appConfig = appconfig.loadAppConfig(options.appConfig);
     // We don't need authenticated user to call this API
-    const client = new client_1.MyTmpVpnClientImpl(appConfig.apiUrl);
-    client.listRegionsDetailed()
+    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl);
+    clientImpl.listRegionsDetailed()
         .then(((regions) => {
         log.info(JSON.stringify(regions, null, 2));
     }))
@@ -121,7 +121,7 @@ program.command('create')
     const syncStr = options.sync ? "synchronously" : "asynchronously";
     const deleteAfter = options.deleteAfter ? options.deleteAfter : undefined;
     log.debug(`Creating new ${options.type} vpn into ${region} ${syncStr}`);
-    auth.getLoggedInClientFromFiles({
+    (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
@@ -154,7 +154,7 @@ program.command('delete')
     const options = command.optsWithGlobals();
     const syncStr = options.sync ? "synchronously" : "asynchronously";
     log.debug(`Deleting vpn ${vpnId} ${syncStr}`);
-    auth.getLoggedInClientFromFiles({
+    (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
@@ -181,7 +181,7 @@ program.command('get')
     .argument('<vpnId>', 'vpnId to get information from')
     .action((vpnId, _, command) => {
     const options = command.optsWithGlobals();
-    auth.getLoggedInClientFromFiles({
+    (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
@@ -197,12 +197,12 @@ 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', (0, userconfig_1.getDefaultUserConfigDir)())
+    .option('--path <path>', 'path where the config file should be written to', userconfig.getDefaultUserConfigDir())
     .action((vpnId, _, command) => {
     const options = command.optsWithGlobals();
     const file = options.file ? options.file : `${vpnId}.conf`;
     const fullpath = path.join(options.path, file);
-    auth.getLoggedInClientFromFiles({
+    (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
@@ -231,7 +231,7 @@ program.command('list')
     .option('--exclude-state [<state>, ...]', 'Comma separated list of states to exclude from', [vpnlib.VpnState.Deleted])
     .action((_, command) => {
     const options = command.optsWithGlobals();
-    auth.getLoggedInClientFromFiles({
+    (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
@@ -266,7 +266,7 @@ program.command('wait')
         return;
     }
     log.debug(`Waiting for ${vpnId} state to be (at least) ${state}`);
-    auth.getLoggedInClientFromFiles({
+    (0, mytmpvpn_client_1.getLoggedInClientFromFiles)({
         appConfigFile: options.appConfig,
         userConfigFile: options.userConfig,
         profileName: options.profile
@@ -286,20 +286,20 @@ program.command('register')
     .argument('<password>', 'a password')
     .action((username, password, _, command) => {
     const options = command.optsWithGlobals();
-    var userConfig;
+    var userConfigData;
     if (fs.existsSync(options.userConfig)) {
-        userConfig = (0, userconfig_1.loadUserConfig)(options.userConfig);
-        if (userConfig.profiles[options.profile]) {
+        userConfigData = userconfig.loadUserConfig(options.userConfig);
+        if (userConfigData.profiles[options.profile]) {
             handleError(`Profile ${options.profile}  already exists in ${options.userConfig}, specify another profile name using --profile`);
             return;
         }
-        userConfig.profiles[options.profile] = {
+        userConfigData.profiles[options.profile] = {
             username: username,
             password: password
         };
     }
     else {
-        userConfig = {
+        userConfigData = {
             version: 1,
             profiles: {
                 default: {
@@ -309,7 +309,7 @@ program.command('register')
             }
         };
     }
-    auth.registerUser(options.appConfig, { username, password })
+    (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) => {
@@ -318,7 +318,7 @@ program.command('register')
                 return;
             }
             log.debug(`Directory: ${path} created`);
-            fs.writeFile(options.userConfig, JSON.stringify(userConfig, null, 2), (err) => {
+            fs.writeFile(options.userConfig, JSON.stringify(userConfigData, null, 2), (err) => {
                 if (err) {
                     handleError(err);
                     return;
@@ -336,8 +336,7 @@ program.command('confirm-registration')
     .argument('<code>', 'the code received')
     .action((username, code, _, command) => {
     const options = command.optsWithGlobals();
-    auth
-        .confirmUser(options.appConfig, username, code)
+    (0, mytmpvpn_client_1.confirmUser)(options.appConfig, username, code)
         .then(result => {
         log.debug(result);
         log.info(`User ${username} confirmed!`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mytmpvpn/mytmpvpn-cli",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "MyTmpVpn CLI",
   "main": "./dist/mytmpvpn.js",
   "bin": {
@@ -30,7 +30,7 @@
   },
   "license": "GNU GPL",
   "dependencies": {
-    "@mytmpvpn/mytmpvpn-client": "^5.0.0",
+    "@mytmpvpn/mytmpvpn-client": "^5.1.2",
     "@mytmpvpn/mytmpvpn-common": "^7.0.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "commander": "^9.5.0",

package/src/mytmpvpn.ts

@@ -9,10 +9,10 @@ log.setDefaultLevel("info")
 
 import * as vpnlib from '@mytmpvpn/mytmpvpn-common/models/vpn'
 import * as peanuts from '@mytmpvpn/mytmpvpn-common/models/peanuts'
-import { getDefaultAppConfigFile, loadAppConfig } from '@mytmpvpn/mytmpvpn-client/appconfig'
-import { getDefaultUserConfigFile, getDefaultUserProfile, getDefaultUserConfigDir, loadUserConfig, UserConfig } from '@mytmpvpn/mytmpvpn-client/userconfig'
-import * as auth from '@mytmpvpn/mytmpvpn-client/index'
-import { MyTmpVpnClientImpl } from '@mytmpvpn/mytmpvpn-client/client'
+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 client from '@mytmpvpn/mytmpvpn-client/client'
 
 const program = new Command()
 
@@ -44,9 +44,9 @@ program
   .description('MyTmpVpn CLI')
   .version('0.0.1')
   .option('--verbose', 'Produce more logs')
-  .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())
+  .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())
 
 program.on('option:verbose', function () {
   log.setDefaultLevel("trace")
@@ -56,10 +56,10 @@ program.command('list-peanuts-packs')
   .description(`Returns the list of peanuts packs you can purchase. A peanuts pack contains a given number of peanuts.`)
   .action((_, command) => {
     const options = command.optsWithGlobals()
-    const appConfig = loadAppConfig(options.appConfig)
+    const appConfig = appconfig.loadAppConfig(options.appConfig)
     // We don't need authenticated user to call this API
-    const client = new MyTmpVpnClientImpl(appConfig.apiUrl)
-    client.listPeanutsPacks()
+    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl)
+    clientImpl.listPeanutsPacks()
       .then(((packs: peanuts.PeanutsPack[]) => {
         log.info(JSON.stringify(packs, null, 2))
       }))
@@ -71,7 +71,7 @@ program.command('get-peanuts-balance')
   .action((_, command) => {
     const options = command.optsWithGlobals()
     log.debug(`Get peanuts balance`)
-    auth.getLoggedInClientFromFiles({
+    getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
@@ -90,10 +90,10 @@ program.command('list-regions')
   .description('Returns the list of all regions where vpn can be created')
   .action((_, command) => {
     const options = command.optsWithGlobals()
-    const appConfig = loadAppConfig(options.appConfig)
+    const appConfig = appconfig.loadAppConfig(options.appConfig)
     // We don't need authenticated user to call this API
-    const client = new MyTmpVpnClientImpl(appConfig.apiUrl)
-    client.listRegions()
+    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl)
+    clientImpl.listRegions()
       .then(((regions: any) => {
         log.info(JSON.stringify(regions, null, 2))
       }))
@@ -104,10 +104,10 @@ 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 = loadAppConfig(options.appConfig)
+    const appConfig = appconfig.loadAppConfig(options.appConfig)
     // We don't need authenticated user to call this API
-    const client = new MyTmpVpnClientImpl(appConfig.apiUrl)
-    client.listRegionsDetailed()
+    const clientImpl = new client.MyTmpVpnClientImpl(appConfig.apiUrl)
+    clientImpl.listRegionsDetailed()
       .then(((regions: any) => {
         log.info(JSON.stringify(regions, null, 2))
       }))
@@ -128,7 +128,7 @@ program.command('create')
     const syncStr = options.sync ? "synchronously" : "asynchronously"
     const deleteAfter = options.deleteAfter ? options.deleteAfter : undefined
     log.debug(`Creating new ${options.type} vpn into ${region} ${syncStr}`)
-    auth.getLoggedInClientFromFiles({
+    getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
@@ -162,7 +162,7 @@ program.command('delete')
     const options = command.optsWithGlobals()
     const syncStr = options.sync ? "synchronously" : "asynchronously"
     log.debug(`Deleting vpn ${vpnId} ${syncStr}`)
-    auth.getLoggedInClientFromFiles({
+    getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
@@ -190,7 +190,7 @@ program.command('get')
   .argument('<vpnId>', 'vpnId to get information from')
   .action((vpnId, _, command) => {
     const options = command.optsWithGlobals()
-    auth.getLoggedInClientFromFiles({
+    getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
@@ -207,12 +207,12 @@ 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', getDefaultUserConfigDir())
+  .option('--path <path>', 'path where the config file should be written to', userconfig.getDefaultUserConfigDir())
   .action((vpnId, _, command) => {
     const options = command.optsWithGlobals()
     const file = options.file ? options.file : `${vpnId}.conf`
     const fullpath = path.join(options.path, file)
-    auth.getLoggedInClientFromFiles({
+    getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
@@ -242,7 +242,7 @@ program.command('list')
   .option('--exclude-state [<state>, ...]', 'Comma separated list of states to exclude from', [vpnlib.VpnState.Deleted])
   .action((_, command) => {
     const options = command.optsWithGlobals()
-    auth.getLoggedInClientFromFiles({
+    getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
@@ -278,7 +278,7 @@ program.command('wait')
       return
     }
     log.debug(`Waiting for ${vpnId} state to be (at least) ${state}`)
-    auth.getLoggedInClientFromFiles({
+    getLoggedInClientFromFiles({
       appConfigFile: options.appConfig,
       userConfigFile: options.userConfig,
       profileName: options.profile
@@ -299,19 +299,19 @@ program.command('register')
   .argument('<password>', 'a password')
   .action((username, password, _, command) => {
     const options = command.optsWithGlobals()
-    var userConfig: UserConfig
+    var userConfigData: userconfig.UserConfig
     if (fs.existsSync(options.userConfig)) {
-      userConfig = loadUserConfig(options.userConfig)
-      if (userConfig.profiles[options.profile]) {
+      userConfigData = userconfig.loadUserConfig(options.userConfig)
+      if (userConfigData.profiles[options.profile]) {
         handleError(`Profile ${options.profile}  already exists in ${options.userConfig}, specify another profile name using --profile`)
         return
       }
-      userConfig.profiles[options.profile] = {
+      userConfigData.profiles[options.profile] = {
         username: username,
         password: password
       }
     } else {
-      userConfig = {
+      userConfigData = {
         version: 1,
         profiles: {
           default: {
@@ -321,7 +321,7 @@ program.command('register')
         }
       }
     }
-    auth.registerUser(options.appConfig,
+    registerUser(options.appConfig,
       { username, password })
       .then(user => {
         log.info(`Please confirm your identity with the code sent to ${username}`)
@@ -331,7 +331,7 @@ program.command('register')
             return
           }
           log.debug(`Directory: ${path} created`)
-          fs.writeFile(options.userConfig, JSON.stringify(userConfig, null, 2), (err) => {
+          fs.writeFile(options.userConfig, JSON.stringify(userConfigData, null, 2), (err) => {
             if (err) {
               handleError(err)
               return
@@ -351,8 +351,7 @@ program.command('confirm-registration')
   .argument('<code>', 'the code received')
   .action((username, code, _, command) => {
     const options = command.optsWithGlobals()
-    auth
-      .confirmUser(options.appConfig, username, code)
+    confirmUser(options.appConfig, username, code)
       .then(result => {
         log.debug(result)
         log.info(`User ${username} confirmed!`)