clever-tools 3.8.2 → 3.9.0

package/src/commands/login.js

@@ -1,18 +1,18 @@
-'use strict';
+import crypto from 'node:crypto';
+import util from 'node:util';
 
-const crypto = require('crypto');
-const util = require('util');
+import colors from 'colors/safe.js';
+import open from 'open';
+import superagent from 'superagent';
 
-const delay = util.promisify(setTimeout);
+import { Logger } from '../logger.js';
+import * as User from '../models/user.js';
+import { conf, writeOAuthConf } from '../models/configuration.js';
 
-const colors = require('colors/safe');
-const open = require('open');
-const superagent = require('superagent');
+import { getPackageJson } from '../load-package-json.cjs';
 
-const Logger = require('../logger.js');
-const User = require('../models/user.js');
-const { conf, writeOAuthConf } = require('../models/configuration.js');
-const { version } = require('../../package');
+const delay = util.promisify(setTimeout);
+const pkg = getPackageJson();
 
 // 20 random bytes as Base64URL
 function randomToken () {
@@ -49,7 +49,7 @@ async function loginViaConsole () {
   const cliToken = randomToken();
 
   const consoleUrl = new URL(conf.CONSOLE_TOKEN_URL);
-  consoleUrl.searchParams.set('cli_version', version);
+  consoleUrl.searchParams.set('cli_version', pkg.version);
   consoleUrl.searchParams.set('cli_token', cliToken);
 
   const cliPollUrl = new URL(conf.API_HOST);
@@ -63,7 +63,7 @@ async function loginViaConsole () {
   return pollOauthData(cliPollUrl.toString());
 }
 
-async function login (params) {
+export async function login (params) {
   const { token, secret } = params.options;
   const isLoginWithArgs = (token != null && secret != null);
   const isInteractiveLogin = (token == null && secret == null);
@@ -82,5 +82,3 @@ async function login (params) {
 
   throw new Error('Both `--token` and `--secret` have to be defined');
 }
-
-module.exports = { login };

package/src/commands/logout.js

@@ -1,12 +1,8 @@
-'use strict';
+import { Logger } from '../logger.js';
+import { conf, writeOAuthConf } from '../models/configuration.js';
 
-const Logger = require('../logger.js');
-const { conf, writeOAuthConf } = require('../models/configuration.js');
-
-async function logout () {
+export async function logout () {
   // write empty object
   await writeOAuthConf({});
   Logger.println(`${conf.CONFIGURATION_FILE} has been updated.`);
 }
-
-module.exports = { logout };

package/src/commands/logs.js

@@ -1,14 +1,12 @@
-'use strict';
-
-const Application = require('../models/application.js');
-const LogV2 = require('../models/log.js');
-const Log = require('../models/log-v4.js');
-const Logger = require('../logger.js');
-const { Deferred } = require('../models/utils.js');
-const colors = require('colors/safe');
-const { resolveAddonId } = require('../models/ids-resolver.js');
-
-async function appLogs (params) {
+import * as Application from '../models/application.js';
+import * as LogV2 from '../models/log.js';
+import * as Log from '../models/log-v4.js';
+import { Logger } from '../logger.js';
+import { Deferred } from '../models/utils.js';
+import colors from 'colors/safe.js';
+import { resolveAddonId } from '../models/ids-resolver.js';
+
+export async function appLogs (params) {
   const { alias, app: appIdOrName, addon: addonIdOrRealId, after: since, before: until, search, 'deployment-id': deploymentId, format } = params.options;
 
   // ignore --search ""
@@ -37,5 +35,3 @@ async function appLogs (params) {
   await Log.displayLogs({ ownerId, appId, since, until, filter, deploymentId, format, deferred });
   return deferred.promise;
 }
-
-module.exports = { appLogs };

package/src/commands/makeDefault.js

@@ -1,14 +1,10 @@
-'use strict';
+import * as AppConfig from '../models/app_configuration.js';
+import { Logger } from '../logger.js';
 
-const AppConfig = require('../models/app_configuration.js');
-const Logger = require('../logger.js');
-
-async function makeDefault (params) {
+export async function makeDefault (params) {
   const [alias] = params.args;
 
   await AppConfig.setDefault(alias);
 
   Logger.println(`The application ${alias} has been set as default`);
 };
-
-module.exports = { makeDefault };

package/src/commands/notify-email.js

@@ -1,14 +1,12 @@
-'use strict';
+import colors from 'colors/safe.js';
 
-const colors = require('colors/safe');
+import { Logger } from '../logger.js';
+import { getOwnerAndApp, getOrgaIdOrUserId } from '../models/notification.js';
 
-const Logger = require('../logger.js');
-const { getOwnerAndApp, getOrgaIdOrUserId } = require('../models/notification.js');
+import { getEmailhooks, createEmailhook, deleteEmailhook } from '@clevercloud/client/esm/api/v2/notification.js';
+import { sendToApi } from '../models/send-to-api.js';
 
-const { getEmailhooks, createEmailhook, deleteEmailhook } = require('@clevercloud/client/cjs/api/v2/notification.js');
-const { sendToApi } = require('../models/send-to-api.js');
-
-async function list (params) {
+export async function list (params) {
   const { org, 'list-all': listAll, format } = params.options;
 
   // TODO: fix alias option
@@ -53,7 +51,7 @@ async function list (params) {
   }
 }
 
-function getEmailNotificationTargets (notifTargets) {
+export function getEmailNotificationTargets (notifTargets) {
 
   if (notifTargets == null) {
     return [];
@@ -75,7 +73,7 @@ function getEmailNotificationTargets (notifTargets) {
     .filter((e) => e != null);
 }
 
-async function add (params) {
+export async function add (params) {
   const { org, event: events, service, notify: notifTargets } = params.options;
   const [name] = params.args;
 
@@ -94,7 +92,7 @@ async function add (params) {
   Logger.println('The webhook has been added');
 }
 
-async function remove (params) {
+export async function remove (params) {
   const { org } = params.options;
   const [notificationId] = params.args;
 
@@ -103,11 +101,3 @@ async function remove (params) {
 
   Logger.println('The notification has been successfully removed');
 }
-
-module.exports = {
-  list,
-  add,
-  remove,
-  // For tests,
-  getEmailNotificationTargets,
-};

package/src/commands/open.js

@@ -1,12 +1,10 @@
-'use strict';
+import openPage from 'open';
 
-const openPage = require('open');
+import * as Application from '../models/application.js';
+import * as Domain from '../models/domain.js';
+import { Logger } from '../logger.js';
 
-const Application = require('../models/application.js');
-const Domain = require('../models/domain.js');
-const Logger = require('../logger.js');
-
-async function open (params) {
+export async function open (params) {
   const { alias, app: appIdOrName } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
@@ -16,5 +14,3 @@ async function open (params) {
   Logger.println('Opening the application in your browser');
   await openPage(url, { wait: false });
 }
-
-module.exports = { open };

package/src/commands/profile.js

@@ -1,14 +1,23 @@
-'use strict';
+import colors from 'colors/safe.js';
 
-const colors = require('colors/safe');
+import { Logger } from '../logger.js';
+import * as User from '../models/user.js';
 
-const Logger = require('../logger.js');
-const User = require('../models/user.js');
-
-async function profile (params) {
+export async function profile (params) {
   const { format } = params.options;
 
   const user = await User.getCurrent();
+  const currentToken = await User.getCurrentToken();
+  const tokenExpiration = new Date(currentToken.expirationDate).toLocaleString('en-US', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+    hour12: false,
+    timeZone: 'UTC',
+    timeZoneName: 'short',
+  });
 
   const formattedUser = {
     id: user.id,
@@ -16,6 +25,7 @@ async function profile (params) {
     name: user.name,
     avatar: user.avatar,
     creationDate: new Date(user.creationDate),
+    tokenExpiration: new Date(currentToken.expirationDate).toISOString(),
     lang: user.lang,
     has2FA: (user.preferredMFA != null && user.preferredMFA !== 'NONE'),
   };
@@ -28,12 +38,11 @@ async function profile (params) {
     case 'human':
     default: {
       Logger.println('You\'re currently logged in as:');
-      Logger.println(`User id          ${formattedUser.id}`);
-      Logger.println(`Name             ${formattedUser.name ?? colors.red.bold('[not specified]')}`);
-      Logger.println(`Email            ${formattedUser.email}`);
-      Logger.println(`Two factor auth  ${formattedUser.has2FA ? 'yes' : 'no'}`);
+      Logger.println(`User id           ${formattedUser.id}`);
+      Logger.println(`Name              ${formattedUser.name ?? colors.red.bold('[not specified]')}`);
+      Logger.println(`Email             ${formattedUser.email}`);
+      Logger.println(`Token expiration  ${tokenExpiration}`);
+      Logger.println(`Two factor auth   ${formattedUser.has2FA ? 'yes' : 'no'}`);
     }
   }
 };
-
-module.exports = { profile };

package/src/commands/published-config.js

@@ -1,13 +1,11 @@
-'use strict';
-
-const Application = require('../models/application.js');
-const Logger = require('../logger.js');
-const variables = require('../models/variables.js');
-const { sendToApi } = require('../models/send-to-api.js');
-const { toNameEqualsValueString, validateName } = require('@clevercloud/client/cjs/utils/env-vars.js');
-const application = require('@clevercloud/client/cjs/api/v2/application.js');
-
-async function list (params) {
+import * as Application from '../models/application.js';
+import { Logger } from '../logger.js';
+import * as variables from '../models/variables.js';
+import { sendToApi } from '../models/send-to-api.js';
+import { toNameEqualsValueString, validateName } from '@clevercloud/client/esm/utils/env-vars.js';
+import * as application from '@clevercloud/client/esm/api/v2/application.js';
+
+export async function list (params) {
   const { alias, app: appIdOrName, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
@@ -30,7 +28,7 @@ async function list (params) {
   }
 }
 
-async function set (params) {
+export async function set (params) {
   const [varName, varValue] = params.args;
   const { alias, app: appIdOrName } = params.options;
 
@@ -48,7 +46,7 @@ async function set (params) {
   Logger.println('Your published config item has been successfully saved');
 };
 
-async function rm (params) {
+export async function rm (params) {
   const [varName] = params.args;
   const { alias, app: appIdOrName } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -60,7 +58,7 @@ async function rm (params) {
   Logger.println('Your published config item has been successfully removed');
 };
 
-async function importEnv (params) {
+export async function importEnv (params) {
   const { alias, app: appIdOrName, json } = params.options;
   const format = json ? 'json' : 'name-equals-value';
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -70,5 +68,3 @@ async function importEnv (params) {
 
   Logger.println('Your published configs have been set');
 };
-
-module.exports = { list, set, rm, importEnv };

package/src/commands/restart.js

@@ -1,16 +1,14 @@
-'use strict';
+import colors from 'colors/safe.js';
 
-const colors = require('colors/safe');
-
-const Application = require('../models/application.js');
-const git = require('../models/git.js');
-const Log = require('../models/log-v4.js');
-const Logger = require('../logger.js');
-const ExitStrategy = require('../models/exit-strategy-option.js');
+import * as Application from '../models/application.js';
+import * as git from '../models/git.js';
+import * as Log from '../models/log-v4.js';
+import { Logger } from '../logger.js';
+import * as ExitStrategy from '../models/exit-strategy-option.js';
 
 // Once the API call to redeploy() has been triggerred successfully,
 // the rest (waiting for deployment state to evolve and displaying logs) is done with auto retry (resilient to network pb)
-async function restart (params) {
+export async function restart (params) {
   const { alias, app: appIdOrName, quiet, commit, 'without-cache': withoutCache, follow, 'exit-on': exitOnDeploy } = params.options;
 
   const exitStrategy = ExitStrategy.get(follow, exitOnDeploy);
@@ -45,5 +43,3 @@ async function restart (params) {
     exitStrategy,
   });
 }
-
-module.exports = { restart };

package/src/commands/scale.js

@@ -1,7 +1,5 @@
-'use strict';
-
-const Application = require('../models/application.js');
-const Logger = require('../logger.js');
+import * as Application from '../models/application.js';
+import { Logger } from '../logger.js';
 
 function validateOptions (options) {
 
@@ -43,7 +41,7 @@ function validateOptions (options) {
   return { minFlavor, maxFlavor, minInstances, maxInstances, buildFlavor };
 }
 
-async function scale (params) {
+export async function scale (params) {
   const { alias, app: appIdOrName } = params.options;
   const { minFlavor, maxFlavor, minInstances, maxInstances, buildFlavor } = validateOptions(params.options);
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -57,5 +55,3 @@ async function scale (params) {
 
   Logger.println('App rescaled successfully');
 };
-
-module.exports = { scale };

package/src/commands/service.js

@@ -1,10 +1,8 @@
-'use strict';
+import * as Addon from '../models/addon.js';
+import * as Application from '../models/application.js';
+import { Logger } from '../logger.js';
 
-const Addon = require('../models/addon.js');
-const Application = require('../models/application.js');
-const Logger = require('../logger.js');
-
-async function list (params) {
+export async function list (params) {
   const { alias, app: appIdOrName, 'show-all': showAll, 'only-apps': onlyApps, 'only-addons': onlyAddons, format } = params.options;
   if (onlyApps && onlyAddons) {
     throw new Error('--only-apps and --only-addons are mutually exclusive');
@@ -53,7 +51,7 @@ async function list (params) {
   }
 }
 
-async function linkApp (params) {
+export async function linkApp (params) {
   const { alias, app: appIdOrName } = params.options;
   const [dependency] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -62,7 +60,7 @@ async function linkApp (params) {
   Logger.println(`App ${dependency.app_id || dependency.app_name} successfully linked`);
 }
 
-async function unlinkApp (params) {
+export async function unlinkApp (params) {
   const { alias, app: appIdOrName } = params.options;
   const [dependency] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -71,7 +69,7 @@ async function unlinkApp (params) {
   Logger.println(`App ${dependency.app_id || dependency.app_name} successfully unlinked`);
 }
 
-async function linkAddon (params) {
+export async function linkAddon (params) {
   const { alias, app: appIdOrName } = params.options;
   const [addon] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -80,7 +78,7 @@ async function linkAddon (params) {
   Logger.println(`Addon ${addon.addon_id || addon.addon_name} successfully linked`);
 }
 
-async function unlinkAddon (params) {
+export async function unlinkAddon (params) {
   const { alias, app: appIdOrName } = params.options;
   const [addon] = params.args;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -88,11 +86,3 @@ async function unlinkAddon (params) {
   await Addon.unlink(ownerId, appId, addon);
   Logger.println(`Addon ${addon.addon_id || addon.addon_name} successfully unlinked`);
 }
-
-module.exports = {
-  list,
-  linkApp,
-  unlinkApp,
-  linkAddon,
-  unlinkAddon,
-};

package/src/commands/ssh.js

@@ -1,11 +1,9 @@
-'use strict';
+import { spawn } from 'node:child_process';
 
-const { spawn } = require('child_process');
+import * as Application from '../models/application.js';
+import { conf } from '../models/configuration.js';
 
-const Application = require('../models/application.js');
-const { conf } = require('../models/configuration.js');
-
-async function ssh (params) {
+export async function ssh (params) {
   const { alias, app: appIdOrName, 'identity-file': identityFile } = params.options;
 
   const { appId } = await Application.resolveId(appIdOrName, alias);
@@ -21,5 +19,3 @@ async function ssh (params) {
     sshProcess.on('error', reject);
   });
 }
-
-module.exports = { ssh };

package/src/commands/status.js

@@ -1,15 +1,13 @@
-'use strict';
+import _ from 'lodash';
+import colors from 'colors/safe.js';
 
-const _ = require('lodash');
-const colors = require('colors/safe');
+import * as Application from '../models/application.js';
+import { Logger } from '../logger.js';
 
-const Application = require('../models/application.js');
-const Logger = require('../logger.js');
+import { get as getApplication, getAllInstances } from '@clevercloud/client/esm/api/v2/application.js';
+import { sendToApi } from '../models/send-to-api.js';
 
-const { get: getApplication, getAllInstances } = require('@clevercloud/client/cjs/api/v2/application.js');
-const { sendToApi } = require('../models/send-to-api.js');
-
-async function status (params) {
+export async function status (params) {
   const { alias, app: appIdOrName, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
@@ -101,5 +99,3 @@ function groupInstances (instances) {
     }))
     .value();
 }
-
-module.exports = { status };

package/src/commands/stop.js

@@ -1,16 +1,12 @@
-'use strict';
+import * as Application from '../models/application.js';
+import * as application from '@clevercloud/client/esm/api/v2/application.js';
+import { Logger } from '../logger.js';
+import { sendToApi } from '../models/send-to-api.js';
 
-const Application = require('../models/application.js');
-const application = require('@clevercloud/client/cjs/api/v2/application.js');
-const Logger = require('../logger.js');
-const { sendToApi } = require('../models/send-to-api.js');
-
-async function stop (params) {
+export async function stop (params) {
   const { alias, app: appIdOrName } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
   await application.undeploy({ id: ownerId, appId }).then(sendToApi);
   Logger.println('App successfully stopped!');
 }
-
-module.exports = { stop };

package/src/commands/tcp-redirs.js

@@ -1,15 +1,13 @@
-'use strict';
+import colors from 'colors/safe.js';
 
-const colors = require('colors/safe');
+import * as Namespaces from '../models/namespaces.js';
+import { sendToApi } from '../models/send-to-api.js';
+import * as Interact from '../models/interact.js';
+import { Logger } from '../logger.js';
+import * as application from '@clevercloud/client/esm/api/v2/application.js';
+import * as Application from '../models/application.js';
 
-const Namespaces = require('../models/namespaces.js');
-const { sendToApi } = require('../models/send-to-api.js');
-const Interact = require('../models/interact.js');
-const Logger = require('../logger.js');
-const application = require('@clevercloud/client/cjs/api/v2/application.js');
-const Application = require('../models/application.js');
-
-async function listNamespaces (params) {
+export async function listNamespaces (params) {
   const { alias, app: appIdOrName, format } = params.options;
   const { ownerId } = await Application.resolveId(appIdOrName, alias);
 
@@ -42,7 +40,7 @@ async function listNamespaces (params) {
   }
 }
 
-async function list (params) {
+export async function list (params) {
   const { alias, app: appIdOrName, format } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
@@ -81,7 +79,7 @@ async function acceptPayment (result, skipConfirmation) {
   }
 }
 
-async function add (params) {
+export async function add (params) {
   const { alias, app: appIdOrName, namespace, yes: skipConfirmation } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
 
@@ -99,7 +97,7 @@ async function add (params) {
   Logger.println('Successfully added tcp redirection on port: ' + port);
 };
 
-async function remove (params) {
+export async function remove (params) {
   const [port] = params.args;
   const { alias, app: appIdOrName, namespace } = params.options;
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);
@@ -108,5 +106,3 @@ async function remove (params) {
 
   Logger.println('Successfully removed tcp redirection.');
 };
-
-module.exports = { listNamespaces, list, add, remove };

package/src/commands/unlink.js

@@ -1,15 +1,11 @@
-'use strict';
+import * as AppConfig from '../models/app_configuration.js';
+import * as Application from '../models/application.js';
+import { Logger } from '../logger.js';
 
-const AppConfig = require('../models/app_configuration.js');
-const Application = require('../models/application.js');
-const Logger = require('../logger.js');
-
-async function unlink (params) {
+export async function unlink (params) {
   const [alias] = params.args;
   const app = await AppConfig.getAppDetails({ alias });
 
   await Application.unlinkRepo(app.alias);
   Logger.println('Your application has been successfully unlinked!');
 };
-
-module.exports = { unlink };

package/src/commands/version.js

@@ -1,10 +1,8 @@
-'use strict';
+import { Logger } from '../logger.js';
+import { getPackageJson } from '../load-package-json.cjs';
 
-const Logger = require('../logger.js');
-const pkg = require('../../package.json');
+const pkg = getPackageJson();
 
-async function version () {
+export async function version () {
   Logger.println(pkg.version);
 }
-
-module.exports = { version };

package/src/commands/webhooks.js

@@ -1,14 +1,12 @@
-'use strict';
+import colors from 'colors/safe.js';
 
-const colors = require('colors/safe');
+import { Logger } from '../logger.js';
+import { getOwnerAndApp, getOrgaIdOrUserId } from '../models/notification.js';
 
-const Logger = require('../logger.js');
-const { getOwnerAndApp, getOrgaIdOrUserId } = require('../models/notification.js');
+import { getWebhooks, createWebhook, deleteWebhook } from '@clevercloud/client/esm/api/v2/notification.js';
+import { sendToApi } from '../models/send-to-api.js';
 
-const { getWebhooks, createWebhook, deleteWebhook } = require('@clevercloud/client/cjs/api/v2/notification.js');
-const { sendToApi } = require('../models/send-to-api.js');
-
-async function list (params) {
+export async function list (params) {
   const { org, 'list-all': listAll, format } = params.options;
 
   // TODO: fix alias option
@@ -48,7 +46,7 @@ async function list (params) {
   }
 }
 
-async function add (params) {
+export async function add (params) {
   const { org, format, event: events, service } = params.options;
   const [name, hookUrl] = params.args;
 
@@ -67,7 +65,7 @@ async function add (params) {
   Logger.println('The webhook has been added');
 }
 
-async function remove (params) {
+export async function remove (params) {
   const { org } = params.options;
   const [notificationId] = params.args;
 
@@ -76,9 +74,3 @@ async function remove (params) {
 
   Logger.println('The notification has been successfully removed');
 }
-
-module.exports = {
-  list,
-  add,
-  remove,
-};