clever-tools 3.0.2 → 3.2.0

package/src/models/app_configuration.js

@@ -38,6 +38,7 @@ async function addLinkedApplication (appData, alias, ignoreParentConfig) {
     app_id: appData.id,
     org_id: appData.ownerId,
     deploy_url: appData.deployment.httpUrl || appData.deployment.url,
+    git_ssh_url: appData.deployment.url,
     name: appData.name,
     alias: alias || slugify(appData.name),
   };
@@ -63,7 +64,6 @@ async function removeLinkedApplication (alias) {
 };
 
 function findApp (config, alias) {
-
   if (_.isEmpty(config.apps)) {
     throw new Error('There are no applications linked. You can add one with `clever link`');
   }
@@ -82,6 +82,18 @@ function findApp (config, alias) {
   return findDefaultApp(config);
 }
 
+function checkAlreadyLinked (apps, name, alias) {
+  const appAliasExists = apps.some((app) => app.alias != null && app.alias === alias);
+  if (appAliasExists) {
+    throw new Error(`An application is already linked with the alias '${alias}'`);
+  }
+
+  const appNameExists = apps.some((app) => app.name === name);
+  if (appNameExists) {
+    throw new Error(`An application is already linked with the name '${name}'`);
+  }
+}
+
 function findDefaultApp (config) {
   if (_.isEmpty(config.apps)) {
     throw new Error('There are no applications linked. You can add one with `clever link`');
@@ -163,6 +175,7 @@ module.exports = {
   loadApplicationConf,
   addLinkedApplication,
   removeLinkedApplication,
+  checkAlreadyLinked,
   findApp,
   getAppDetails,
   getMostNaturalName,

package/src/models/application.js

@@ -14,11 +14,13 @@ const User = require('./user.js');
 const { sendToApi } = require('../models/send-to-api.js');
 
 function listAvailableTypes () {
-  return autocomplete.words(['docker', 'elixir', 'go', 'gradle', 'haskell', 'jar', 'maven', 'node', 'php', 'play1', 'play2', 'python', 'ruby', 'rust', 'sbt', 'static-apache', 'war']);
+  return autocomplete.words(['docker', 'elixir', 'go', 'gradle', 'haskell', 'jar', 'maven', 'meteor', 'node', 'php', 'play1', 'play2', 'python', 'ruby', 'rust', 'sbt', 'static-apache', 'war']);
 };
 
+const AVAILABLE_ZONES = ['par', 'rbx', 'rbxhds', 'scw', 'jed', 'mtl', 'sgp', 'syd', 'wsw'];
+
 function listAvailableZones () {
-  return autocomplete.words(['par', 'mtl']);
+  return autocomplete.words(AVAILABLE_ZONES);
 };
 
 function listAvailableAliases () {
@@ -241,6 +243,7 @@ module.exports = {
   listAvailableAliases,
   listAvailableFlavors,
   listAvailableTypes,
+  AVAILABLE_ZONES,
   listAvailableZones,
   listDependencies,
   __mergeScalabilityParameters: mergeScalabilityParameters,

package/src/models/domain.js

@@ -11,7 +11,7 @@ async function getBest (appId, orgaId) {
   return getFavouriteDomain({ id: orgaId, appId }).then(sendToApi)
     .catch(async (e) => {
 
-      if (e.status !== 404) {
+      if (e.response.status !== 404) {
         throw e;
       }
 

package/src/models/git.js

@@ -5,7 +5,7 @@ const path = require('path');
 
 const _ = require('lodash');
 const git = require('isomorphic-git');
-const http = require('isomorphic-git/http/node');
+const http = require('./isomorphic-http-with-agent.js');
 const { autocomplete } = require('cliparse');
 
 const slugify = require('slugify');

package/src/models/isomorphic-http-with-agent.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const isomotphicHttp = require('isomorphic-git/http/node');
+const https = require('https');
+
+// We use our own HTTP plugin, so we can customize the agent used for requests and configure a long timeout (default is 5 seconds).
+
+const agent = new https.Agent({
+  keepAlive: true,
+  timeout: 10 * 60 * 1000,
+});
+
+function request (params) {
+  return isomotphicHttp.request({ ...params, agent });
+}
+
+module.exports = {
+  request,
+};

package/src/models/log-v4.js

@@ -1,4 +1,4 @@
-const { getHostAndTokens } = require('./send-to-api.js');
+const { getHostAndTokens, processError } = require('./send-to-api.js');
 const colors = require('colors/safe');
 const { Deferred } = require('./utils.js');
 const Logger = require('../logger.js');
@@ -9,6 +9,11 @@ const { ApplicationLogStream } = require('@clevercloud/client/cjs/streams/applic
 const THROTTLE_ELEMENTS = 2000;
 const THROTTLE_PER_IN_MILLISECONDS = 100;
 
+const retryConfiguration = {
+  enabled: true,
+  maxRetryCount: 6,
+};
+
 async function displayLogs (params) {
 
   const deferred = params.deferred || new Deferred();
@@ -20,6 +25,8 @@ async function displayLogs (params) {
     tokens,
     ownerId,
     appId,
+    connectionTimeout: 10_000,
+    retryConfiguration,
     since,
     until,
     deploymentId,
@@ -33,10 +40,10 @@ async function displayLogs (params) {
 
   logStream
     .on('open', (event) => {
-      Logger.debug(`stream opened! ${JSON.stringify({ appId, filter, deploymentId })}`);
+      Logger.debug(colors.blue(`Logs stream (open) ${JSON.stringify({ appId, filter, deploymentId })}`));
     })
     .on('error', (event) => {
-      Logger.error(`an error occured: ${event.detail}`);
+      Logger.debug(colors.red(`Logs stream (error) ${event.error.message}`));
     })
     .onLog((log) => {
       Logger.println(formatLogLine(log));
@@ -45,6 +52,7 @@ async function displayLogs (params) {
   // start() is blocking until end of stream
   logStream.start()
     .then((reason) => deferred.resolve())
+    .catch(processError)
     .catch((error) => deferred.reject(error));
 
   return logStream;

package/src/models/send-to-api.js

@@ -23,12 +23,22 @@ async function sendToApi (requestParams) {
     .then(prefixUrl(conf.API_HOST))
     .then(addOauthHeader(tokens))
     .then((requestParams) => {
-      if (process.env.CLEVER_VERBOSE) {
-        Logger.debug(`${requestParams.method.toUpperCase()} ${requestParams.url} ? ${JSON.stringify(requestParams.queryParams)}`);
-      }
+      Logger.debug(`${requestParams.method.toUpperCase()} ${requestParams.url} ? ${JSON.stringify(requestParams.queryParams)}`);
       return requestParams;
     })
-    .then((requestParams) => request(requestParams, { retry: 1 }));
+    .then(request)
+    .catch(processError);
+}
+
+function processError (error) {
+  const code = error.code ?? error?.cause?.code;
+  if (code === 'EAI_AGAIN') {
+    throw new Error('Cannot reach the Clever Cloud API, please check your internet connection.', { cause: error });
+  }
+  if (code === 'ECONNRESET') {
+    throw new Error('The connection to the Clever Cloud API was closed abruptly, please try again.', { cause: error });
+  }
+  throw error;
 }
 
 function sendToWarp10 (requestParams) {
@@ -45,4 +55,4 @@ async function getHostAndTokens () {
   };
 }
 
-module.exports = { sendToApi, sendToWarp10, getHostAndTokens };
+module.exports = { sendToApi, sendToWarp10, getHostAndTokens, processError };