contensis-cli 1.1.2-beta.0 → 1.1.2-beta.1

package/src/services/ContensisAuthService.ts

@@ -3,6 +3,17 @@ import { ClientGrants, ClientGrantType } from 'contensis-core-api';
 
 class ContensisAuthService {
   private client: NodejsClient;
+  private credentials: {
+    clientType: ClientGrantType;
+    clientDetails: ClientGrants;
+  };
+
+  get clientType() {
+    return this.credentials.clientType;
+  }
+  get clientDetails() {
+    return this.credentials.clientDetails;
+  }
 
   constructor({
     clientId = '',
@@ -21,39 +32,37 @@ class ContensisAuthService {
     projectId: string;
     rootUrl: string;
   }) {
-    let credentials: {
-      clientType: ClientGrantType;
-      clientDetails: ClientGrants;
-    };
-    if (clientId && clientSecret) {
-      credentials = {
+    if (clientId && clientSecret)
+      this.credentials = {
         clientType: 'client_credentials',
         clientDetails: {
           clientId,
           clientSecret,
         },
       };
-    } else if (username && password) {
-      credentials = {
+    else if (username && password)
+      this.credentials = {
         clientType: 'contensis_classic',
         clientDetails: {
           username,
           password,
         },
       };
-    } else if (refreshToken) {
-      credentials = {
+    else if (refreshToken)
+      this.credentials = {
         clientType: 'contensis_classic_refresh_token',
         clientDetails: {
           refreshToken,
         },
       };
-    } else {
-      credentials = { clientType: 'none', clientDetails: { refreshToken: '' } };
-    }
+    else
+      this.credentials = {
+        clientType: 'none',
+        clientDetails: { refreshToken: '' },
+      };
 
     this.client = NodejsClient.create({
-      ...credentials,
+      ...this.credentials,
       projectId,
       rootUrl,
     });

package/src/services/ContensisCliService.ts

@@ -45,12 +45,13 @@ import {
   printNodesMigrateResult,
 } from '~/util/console.printer';
 import { csvFormatter } from '~/util/csv.formatter';
-import { xmlFormatter } from '~/util/xml.formatter';
 import { jsonFormatter, limitFields } from '~/util/json.formatter';
+import { xmlFormatter } from '~/util/xml.formatter';
+import { isDebug } from '~/util/debug';
 import { diffLogStrings } from '~/util/diff';
+import { findByIdOrName } from '~/util/find';
 import { logError, Logger } from '~/util/logger';
 import { promiseDelay } from '~/util/timers';
-import { findByIdOrName } from '~/util/find';
 
 let insecurePasswordWarningShown = false;
 
@@ -72,6 +73,7 @@ class ContensisCli {
   contensis?: ContensisMigrationService;
   contensisOpts: Partial<MigrateRequest>;
   currentProject: string;
+  debug = isDebug();
 
   sourceAlias?: string;
   targetEnv?: string;
@@ -2048,7 +2050,7 @@ class ContensisCli {
       // Retrieve blocks list for env
       const [err, blocks] = await contensis.blocks.GetBlocks();
 
-      if (Array.isArray(blocks)) {
+      if (Array.isArray(blocks) && blocks.length) {
         await this.HandleFormattingAndOutput(blocks, () => {
           // print the blocks to console
           log.success(messages.blocks.list(currentEnv, env.currentProject));
@@ -2082,8 +2084,8 @@ class ContensisCli {
       }
 
       if (err) {
-        log.error(messages.blocks.noList(currentEnv));
-        log.error(jsonFormatter(err));
+        log.error(messages.blocks.noList(currentEnv, env.currentProject));
+        // log.error(jsonFormatter(err));
       }
     }
   };
@@ -2103,11 +2105,29 @@ class ContensisCli {
         version
       );
 
-      if (blocks) {
+      if (err || blocks?.length === 0) {
+        log.warning(
+          messages.blocks.noGet(
+            blockId,
+            branch,
+            version,
+            currentEnv,
+            env.currentProject
+          )
+        );
+        log.help(messages.blocks.noGetTip());
+        // if (err) log.error(jsonFormatter(err));
+      } else if (blocks) {
         await this.HandleFormattingAndOutput(blocks, () => {
           // print the version detail to console
           log.success(
-            messages.blocks.get(blockId, currentEnv, env.currentProject)
+            messages.blocks.get(
+              blockId,
+              branch,
+              version,
+              currentEnv,
+              env.currentProject
+            )
           );
           for (const block of blocks)
             printBlockVersion(
@@ -2126,11 +2146,6 @@ class ContensisCli {
 
         return blocks;
       }
-
-      if (err) {
-        log.error(messages.blocks.noList(currentEnv, env.currentProject));
-        log.error(jsonFormatter(err));
-      }
     }
   };
 
@@ -2454,9 +2469,7 @@ class ContensisCli {
     const contensis = await this.ConnectContensis();
     if (contensis) {
       // Retrieve renderers list for env
-      const [err, renderers] = await (contensis.renderers.GetRenderers as any)(
-        rendererId
-      ); // TODO: resolve any cast
+      const [err, renderers] = await contensis.renderers.GetRenderers();
 
       if (Array.isArray(renderers)) {
         await this.HandleFormattingAndOutput(renderers, () => {
@@ -2487,6 +2500,7 @@ class ContensisCli {
                 );
           }
         });
+        return renderers;
       }
 
       if (err) {
@@ -2495,6 +2509,7 @@ class ContensisCli {
       }
     }
   };
+
   HandleFormattingAndOutput = async <T>(obj: T, logFn: (obj: T) => void) => {
     const { format, log, messages, output } = this;
     const fields = this.contensis?.payload.query?.fields;

package/src/services/ContensisDevService.ts

@@ -1,27 +1,25 @@
 import ansiEscapes from 'ansi-escapes';
 import to from 'await-to-js';
-import { spawn } from 'child_process';
 import inquirer from 'inquirer';
 import { createSpinner } from 'nanospinner';
-import path from 'path';
 
 import { Role } from 'contensis-management-api/lib/models';
 import { MigrateRequest } from 'migratortron';
 
 import ContensisRole from './ContensisRoleService';
+import { createRequestHandler } from '~/factories/RequestHandlerFactory';
 import { OutputOptionsConstructorArg } from '~/models/CliService';
 import { EnvContentsToAdd } from '~/models/DevService';
-import { mapSiteConfigYaml } from '~/mappers/DevRequests-to-RequestHanderSiteConfigYaml';
 import { mapCIWorkflowContent } from '~/mappers/DevInit-to-CIWorkflow';
+import { requestHandlerCliArgs } from '~/mappers/DevRequests-to-RequestHanderCliArgs';
 import { deployKeyRole } from '~/mappers/DevInit-to-RolePermissions';
-import { appRootDir, readFile, writeFile } from '~/providers/file-provider';
+import { readFile, writeFile } from '~/providers/file-provider';
 import { diffFileContent } from '~/util/diff';
 import { mergeDotEnvFileContents } from '~/util/dotenv';
 import { findByIdOrName } from '~/util/find';
 import { GitHelper } from '~/util/git';
 import { jsonFormatter } from '~/util/json.formatter';
 import { winSlash } from '~/util/os';
-import { stringifyYaml } from '~/util/yaml';
 import { mergeContentsToAddWithGitignore } from '~/util/gitignore';
 
 class ContensisDev extends ContensisRole {
@@ -413,90 +411,26 @@ class ContensisDev extends ContensisRole {
     }
   };
 
-  ExecRequestHandler = async (blockIds: string[], overrideArgs?: string[]) => {
-    // if no request handler exe
-    // download it.
-
-    // if update arg, redownload it
-
-    const { log } = this;
-    // const getPrefixOld = log.getPrefix;
-    const exeHome = path.join(appRootDir, 'reqhan');
-    const exe = 'Zengenti.Contensis.RequestHandler.LocalDevelopment';
-    const exePath = path.join(exeHome, exe);
-    const siteConfigPath = path.join(appRootDir, 'site_config.yaml');
-
-    const siteConfig = await mapSiteConfigYaml(this);
-    writeFile('site_config.yaml', stringifyYaml(siteConfig));
-
-    const args = overrideArgs
-      ? typeof overrideArgs?.[0] === 'string' &&
-        overrideArgs[0].includes(' ', 2)
-        ? overrideArgs[0].split(' ')
-        : overrideArgs
-      : []; // args could be [ '-c .\\site_config.yaml' ] or [ '-c', '.\\site_config.yaml' ]
-
-    // Add required args
-    if (!args.find(a => a === '-c')) args.push('-c', siteConfigPath);
-
-    // const child = execFile(exePath, args);
-
-    const child = spawn(exePath, args, { stdio: 'inherit' });
-
-    // log.raw('');
-    log.info(`Launching request handler...`);
-    if (overrideArgs?.length)
-      this.log.warning(
-        `Spawning process with supplied args: ${JSON.stringify(
-          child.spawnargs,
-          null,
-          2
-        )}`
-      );
-
-    let isRunning = false;
-
-    // Log child output through event listeners
-    child?.stdout?.on('data', data => {
-      isRunning = true;
-      log.raw(data);
-    });
+  ExecRequestHandler = async (
+    blockIds: string[],
+    overrideArgs: string[] = []
+  ) => {
+    const { debug, log, messages } = this;
 
-    child?.stderr?.on('data', data => {
-      log.error(data);
-    });
+    const spinner = !debug
+      ? createSpinner(messages.devrequests.launch())
+      : log.info(messages.devrequests.launch());
 
-    child.on('spawn', () => {
-      isRunning = true;
-      log.help(
-        `You may see a firewall popup requesting network access, it is safe to approve`
-      );
-      // log.getPrefix = () => Logger.infoText(`[rqh]`);
-    });
-
-    child.on('exit', code => {
-      isRunning = false;
+    // Ensure request handler is available to use
+    const requestHandler = await createRequestHandler();
 
-      log[code === 0 ? 'success' : 'warning'](
-        `Request handler exited with code ${code}\n`
-      );
-    });
+    // Generate args for request handler using CLI methods
+    spinner?.start();
+    const args = await requestHandlerCliArgs(this, overrideArgs);
+    spinner?.success();
 
-    child.on('error', error => {
-      isRunning = false;
-      log.error(`Could not launch request handler due to error \n${error}`);
-    });
-
-    await new Promise(resolve => setTimeout(resolve, 2000));
-
-    // keep the method running until we can return
-    while (true === true) {
-      if (!isRunning) {
-        // log.getPrefix = getPrefixOld; // restore logger state
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 1000));
-    }
+    // Launch request handler
+    await requestHandler(args);
   };
 }
 export const devCommand = (

package/src/util/debug.ts

@@ -0,0 +1 @@
+export const isDebug = () => ['true', '1'].includes(process.env.debug || '');

package/src/util/fetch.ts

@@ -0,0 +1,74 @@
+import { DoRetry, FetchInit, fetchWithDefaults } from 'enterprise-fetch';
+import { Logger } from './logger';
+
+const retryPolicy = {
+  retries: 2,
+  minTimeout: 400,
+  factor: 2,
+};
+
+const applyTimeout = (s: number) =>
+  process.env.NODE_ENV === 'test' ? 2 * 1000 : s * 1000;
+
+export const doRetry = ({ silent = false } = {}) => {
+  const fn: DoRetry = async (
+    attempt: number,
+    res: Response | AppError,
+    { url, options } = { url: '', options: {} }
+  ) => {
+    // Get the retry policy from options or fetchDefaults
+    const { retry = retryPolicy } = options || ({} as any);
+    let shouldRetry = false;
+
+    // Retry request on any network error, or 4xx or 5xx status codes
+    if (
+      !res.status ||
+      (res.status >= 400 && ![400, 404, 409, 422, 500].includes(res.status))
+    )
+      if (
+        !('message' in res) ||
+        ('message' in res &&
+          !(res.message as string).includes('Nock: No match'))
+      )
+        shouldRetry = true;
+
+    if (attempt <= retry.retries) {
+      // If a res has a status it is a HTTP error
+      // With no status it could be a fetch error or app error
+      const errorMessage = !res.status
+        ? `${('name' in res && res.name) || ('type' in res && res.type)}: ${
+            'message' in res && res.message
+          }`
+        : `${res.status}: ${res.statusText}`;
+
+      if (!silent)
+        Logger.warning(
+          `[fetch] ${
+            shouldRetry
+              ? `attempt ${attempt}/${retry.retries}`
+              : 'non-retriable'
+          } ${errorMessage} ${url || ''}`
+        );
+    } else {
+      shouldRetry = false;
+    }
+    return await Promise.resolve(shouldRetry);
+  };
+  return fn;
+};
+
+const fetchDefaults = {
+  // The timeout to apply to requests that do not supply a timeout option
+  timeout: applyTimeout(60),
+  // Retry policy for all fetch requests
+  retry: retryPolicy,
+  // Do retry function to examine failures and apply custom retry logic
+  // return true to retry the fetch call
+  doRetry: doRetry(),
+} as FetchInit;
+
+export const enhancedFetch = fetchWithDefaults(fetchDefaults);
+// export const assetFetch = fetchWithDefaults({
+//   ...fetchDefaults,
+//   timeout: applyTimeout(1200),
+// });

package/src/util/index.ts

@@ -16,7 +16,7 @@ export const tryParse = (str: any) => {
   }
 };
 
-export const isJson = (str: string) =>
+export const isJson = (str?: string) =>
   typeof str === 'object' || !!tryParse(str);
 
 export const tryStringify = (obj: any) => {

package/src/util/logger.ts

@@ -57,7 +57,6 @@ export class Logger {
     else console.log(message);
   };
   static warning: LogMethod = content => {
-    // if (process.env.DEBUG === 'true') {
     const message = `${Logger.getPrefix()} ${Logger.warningText(
       `${Logger.isUserTerminal ? '⚠️ ' : '[WARN]'} ${content}`
     )}\n`;

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.1.2-beta.0";
+export const LIB_VERSION = "1.1.2-beta.1";

package/dist/mappers/DevRequests-to-RequestHanderSiteConfigYaml.js

@@ -1,56 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var DevRequests_to_RequestHanderSiteConfigYaml_exports = {};
-__export(DevRequests_to_RequestHanderSiteConfigYaml_exports, {
-  mapSiteConfigYaml: () => mapSiteConfigYaml
-});
-module.exports = __toCommonJS(DevRequests_to_RequestHanderSiteConfigYaml_exports);
-const mapSiteConfigYaml = async (cli) => {
-  var _a, _b;
-  const credentials = await cli.GetCredentials(cli.env.lastUserId);
-  const blocks = [];
-  const blocksRaw = await cli.PrintBlocks();
-  for (const block of blocksRaw || []) {
-    const versions = await cli.PrintBlockVersions(
-      block.id,
-      "default",
-      "latest"
-    );
-    if (versions == null ? void 0 : versions[0]) {
-      blocks.push({
-        id: versions[0].id,
-        baseUri: versions[0].previewUrl
-      });
-    }
-  }
-  const siteConfig = {
-    alias: cli.currentEnv,
-    projectId: cli.currentProject,
-    accessToken: "",
-    clientId: ((_a = credentials == null ? void 0 : credentials.current) == null ? void 0 : _a.account) || "",
-    sharedSecret: ((_b = credentials == null ? void 0 : credentials.current) == null ? void 0 : _b.password) || "",
-    blocks
-  };
-  return siteConfig;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  mapSiteConfigYaml
-});
-//# sourceMappingURL=DevRequests-to-RequestHanderSiteConfigYaml.js.map

package/dist/mappers/DevRequests-to-RequestHanderSiteConfigYaml.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/mappers/DevRequests-to-RequestHanderSiteConfigYaml.ts"],
-  "sourcesContent": ["import ContensisCli from '~/services/ContensisCliService';\n\ninterface ISiteConfigYaml {\n  alias: string;\n  projectId: string;\n  accessToken: string;\n  clientId: string;\n  sharedSecret: string;\n  blocks: {\n    id: string;\n    baseUri: string;\n  }[];\n}\n\nexport const mapSiteConfigYaml = async (cli: ContensisCli) => {\n  const credentials = await cli.GetCredentials(cli.env.lastUserId);\n\n  const blocks = [];\n  const blocksRaw = await cli.PrintBlocks();\n\n  for (const block of blocksRaw || []) {\n    const versions = await cli.PrintBlockVersions(\n      block.id,\n      'default',\n      'latest'\n    );\n    if (versions?.[0]) {\n      blocks.push({\n        id: versions[0].id,\n        baseUri: versions[0].previewUrl,\n      });\n    }\n  }\n\n  const siteConfig: ISiteConfigYaml = {\n    alias: cli.currentEnv,\n    projectId: cli.currentProject,\n    accessToken: '',\n    clientId: credentials?.current?.account || '',\n    sharedSecret: credentials?.current?.password || '',\n    blocks,\n  };\n  return siteConfig;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAcO,MAAM,oBAAoB,OAAO,QAAsB;AAd9D;AAeE,QAAM,cAAc,MAAM,IAAI,eAAe,IAAI,IAAI,UAAU;AAE/D,QAAM,SAAS,CAAC;AAChB,QAAM,YAAY,MAAM,IAAI,YAAY;AAExC,aAAW,SAAS,aAAa,CAAC,GAAG;AACnC,UAAM,WAAW,MAAM,IAAI;AAAA,MACzB,MAAM;AAAA,MACN;AAAA,MACA;AAAA,IACF;AACA,QAAI,qCAAW,IAAI;AACjB,aAAO,KAAK;AAAA,QACV,IAAI,SAAS,GAAG;AAAA,QAChB,SAAS,SAAS,GAAG;AAAA,MACvB,CAAC;AAAA,IACH;AAAA,EACF;AAEA,QAAM,aAA8B;AAAA,IAClC,OAAO,IAAI;AAAA,IACX,WAAW,IAAI;AAAA,IACf,aAAa;AAAA,IACb,YAAU,gDAAa,YAAb,mBAAsB,YAAW;AAAA,IAC3C,gBAAc,gDAAa,YAAb,mBAAsB,aAAY;AAAA,IAChD;AAAA,EACF;AACA,SAAO;AACT;",
-  "names": []
-}

package/src/mappers/DevRequests-to-RequestHanderSiteConfigYaml.ts

@@ -1,44 +0,0 @@
-import ContensisCli from '~/services/ContensisCliService';
-
-interface ISiteConfigYaml {
-  alias: string;
-  projectId: string;
-  accessToken: string;
-  clientId: string;
-  sharedSecret: string;
-  blocks: {
-    id: string;
-    baseUri: string;
-  }[];
-}
-
-export const mapSiteConfigYaml = async (cli: ContensisCli) => {
-  const credentials = await cli.GetCredentials(cli.env.lastUserId);
-
-  const blocks = [];
-  const blocksRaw = await cli.PrintBlocks();
-
-  for (const block of blocksRaw || []) {
-    const versions = await cli.PrintBlockVersions(
-      block.id,
-      'default',
-      'latest'
-    );
-    if (versions?.[0]) {
-      blocks.push({
-        id: versions[0].id,
-        baseUri: versions[0].previewUrl,
-      });
-    }
-  }
-
-  const siteConfig: ISiteConfigYaml = {
-    alias: cli.currentEnv,
-    projectId: cli.currentProject,
-    accessToken: '',
-    clientId: credentials?.current?.account || '',
-    sharedSecret: credentials?.current?.password || '',
-    blocks,
-  };
-  return siteConfig;
-};