@hahnpro/flow-cli 2.14.1 → 2.14.3

package/lib/auth.mjs

@@ -1,9 +1,10 @@
 // @ts-check
 import express from 'express';
 import getPort from 'get-port';
+import HttpsProxyAgent from 'https-proxy-agent';
 import nconf from 'nconf';
 import open from 'open';
-import openidClient from 'openid-client';
+import openidClient, { custom } from 'openid-client';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -21,6 +22,12 @@ const viewsPath = join(__dirname, 'views');
 let server = null;
 nconf.file({ file: join(__dirname, 'config') });
 
+if (process.env.https_proxy || process.env.http_proxy) {
+  custom.setHttpOptionsDefaults({
+    agent: HttpsProxyAgent(process.env.https_proxy || process.env.http_proxy),
+  });
+}
+
 export async function getAccessToken(baseUrl = BASE_URL, realm = REALM) {
   checkEnvironment([
     ['BASE_URL', baseUrl],
@@ -38,8 +45,8 @@ export async function getAccessToken(baseUrl = BASE_URL, realm = REALM) {
             const kcIssuer = await openidClient.Issuer.discover(`${baseUrl}/auth/realms/${realm}/`);
             const client = new kcIssuer.Client({ client_id: CLIENT_ID, client_secret: CLIENT_SECRET });
             const tokenSet = await client.grant({ grant_type: 'client_credentials' });
+
             nconf.set(baseUrl.replace(/:/g, ''), tokenSet);
-            server.close();
             nconf.save((error) => {
               if (error) {
                 logger.error(error);
@@ -135,6 +142,6 @@ function checkEnvironment(values) {
     }
   }
   if (missing) {
-    throw new Error('Missing environment varialbes');
+    throw new Error('Missing environment variables');
   }
 }

package/lib/cli.mjs

@@ -15,25 +15,29 @@ import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import ora from 'ora';
+import { fileURLToPath } from 'node:url';
 
 import { getAccessToken, login, logout } from './auth.mjs';
-import { handleConvertedOutput, logger, prepareTsFile } from './utils.mjs';
+import { handleApiError, handleConvertedOutput, logger, prepareTsFile } from './utils.mjs';
 
 const require = createRequire(import.meta.url);
 const BASE_URL = process.env.BASE_URL || process.env.PLATFORM_URL;
 const BUILD_DIR = process.env.BUILD_DIR || 'dist';
 
-let axios;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+let axios = Axios;
 if (process.env.https_proxy || process.env.http_proxy) {
   const httpsAgent = HttpsProxyAgent(process.env.https_proxy || process.env.http_proxy);
   axios = Axios.create({ httpsAgent, proxy: false });
-} else {
-  axios = Axios;
 }
 
 let apiToken;
 let projectsRoot = 'modules';
 
+const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json')));
+
 const CMD = {
   AUDIT: 'audit',
   BUILD: 'build',
@@ -48,7 +52,7 @@ const CMD = {
 const program = new Command();
 
 program
-  .version('2.13.0', '-v, --version')
+  .version(packageJson.version, '-v, --version')
   .usage('[command] [options]')
   .description('Flow Module Management Tool')
   .on('--help', () => {});
@@ -114,11 +118,7 @@ program
   .description('Lint project files')
   .action(async (projectName) => {
     try {
-      let project;
-      if (projectName === 'all') {
-        project = { location: '.' };
-      }
-      project = await findProject(projectName);
+      const project = await findProject(projectName);
       await exec(CMD.LINT, project);
     } catch (error) {
       if (error) logger.log(error);
@@ -126,10 +126,11 @@ program
     }
   });
 
+// if BASE_URL is not given and --url is not specified this correctly throws an error
 program
   .command('login')
-  .option('--url <url>', 'URL of target platform')
-  .option('-r, --realm <realm>', 'Auth realm of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
+  .requiredOption('-r, --realm <realm>', 'Auth realm of target platform', process.env.REALM)
   .description('Authenticate against platform')
   .action(async (options) => {
     try {
@@ -143,7 +144,7 @@ program
 
 program
   .command('logout')
-  .option('--url <url>', 'URL of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
   .description('Remove authentication data')
   .action(async (options) => {
     try {
@@ -188,8 +189,8 @@ program
 
 program
   .command('publish-module [projectName]')
-  .option('--url <url>', 'URL of target platform')
-  .option('-r, --realm <realm>', 'Auth realm of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
+  .requiredOption('-r, --realm <realm>', 'Auth realm of target platform', process.env.REALM)
   .option('-f, --functions', 'publish flow functions')
   .option('-u, --update', 'update existing flow functions')
   .option('-s, --skip', 'skip modules that already exists with the current version')
@@ -242,8 +243,8 @@ program
 
 program
   .command('publish-functions [projectName]')
-  .option('--url <url>', 'URL of target platform')
-  .option('-r, --realm <realm>', 'Auth realm of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
+  .requiredOption('-r, --realm <realm>', 'Auth realm of target platform', process.env.REALM)
   .option('-u, --update', 'update existing flow functions')
   .description('Publishes all Flow Functions inside specified Module to Cloud Platform')
   .action(async (projectName, options) => {
@@ -532,6 +533,8 @@ async function publishModule(project, baseUrl = BASE_URL) {
           ...form.getHeaders(),
           Authorization: `Bearer ${apiToken}`,
         },
+        maxBodyLength: Number.POSITIVE_INFINITY,
+        maxContentLength: Number.POSITIVE_INFINITY,
       });
 
       logger.ok(`Module "${project.name}" published!`);
@@ -610,17 +613,6 @@ async function publishFunctions(project, update, baseUrl = BASE_URL) {
   });
 }
 
-function handleApiError(error) {
-  if (error.isAxiosError && error.response) {
-    logger.error(`${error.response.status} ${error.response.statusText}`);
-    if (error.response.data) {
-      logger.error(JSON.stringify(error.response.data));
-    }
-  } else {
-    logger.error(error);
-  }
-}
-
 function zipDirectory(source, out) {
   const archive = archiver('zip', { zlib: { level: 8 } });
   const stream = fs.createWriteStream(out);

package/lib/utils.mjs

@@ -192,6 +192,17 @@ export const logger = {
   /* eslint-enable no-console */
 };
 
+export function handleApiError(error) {
+  if (error.isAxiosError && error.response) {
+    logger.error(`${error.response.status} ${error.response.statusText}`);
+    if (error.response.data) {
+      logger.error(JSON.stringify(error.response.data));
+    }
+  } else {
+    logger.error(error);
+  }
+}
+
 function blockDefinitionIncludes(block, value) {
   return block.trim().split('\n', 1)[0].includes(value);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/flow-cli",
-  "version": "2.14.1",
+  "version": "2.14.3",
   "description": "CLI for managing Flow Modules",
   "license": "MIT",
   "type": "module",
@@ -27,38 +27,38 @@
   },
   "dependencies": {
     "archiver": "^5.3.1",
-    "axios": "^0.26.1",
+    "axios": "~0.27.2",
     "chalk": "^5.0.1",
     "class-transformer": "0.5.1",
     "class-validator": "~0.13.2",
     "class-validator-jsonschema": "^3.1.0",
     "commander": "^9.2.0",
     "copyfiles": "^2.4.1",
-    "dotenv": "^16.0.0",
-    "ejs": "^3.1.7",
+    "dotenv": "^16.0.1",
+    "ejs": "^3.1.8",
     "execa": "^6.1.0",
-    "express": "^4.17.3",
+    "express": "^4.18.1",
     "form-data": "^4.0.0",
     "get-port": "^6.1.2",
-    "glob": "^8.0.1",
+    "glob": "^8.0.3",
     "https-proxy-agent": "^5.0.1",
     "nconf": "^0.12.0",
     "open": "^8.4.0",
-    "openid-client": "^5.1.5",
+    "openid-client": "^5.1.6",
     "ora": "^6.1.0",
     "reflect-metadata": "^0.1.13",
-    "ts-node": "^10.7.0"
+    "ts-node": "^10.8.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^27.5.1",
     "@types/nconf": "^0.10.2",
-    "@types/node": "^16.11.27",
-    "eslint": "^8.13.0",
+    "@types/node": "^16.11.36",
+    "eslint": "^8.16.0",
     "eslint-plugin-unicorn": "^42.0.0",
-    "jest": "^27.5.1",
+    "jest": "^28.1.0",
     "prettier": "^2.6.2",
-    "typescript": "^4.6.3"
+    "typescript": "^4.7.2"
   },
   "engines": {
     "node": "^14.13.1 || >=16.0.0"
@@ -83,6 +83,5 @@
     "format": "prettier --write .",
     "lint": "eslint '**/*.{js,mjs}'",
     "test": "jest"
-  },
-  "readme": "# `@hahnpro/flow-cli`\n\nhttps://github.com/hahnprojects/flow\n\n```shell\nflow-cli --help\nflow-cli [command] --help\n```\n\n# Commands\n\n## `build [projectName]`\n\nBuilds specified Project.\n\n## `install [projectName]`\n\nInstalls the dependencies of the specified Project.\n\n## `format`\n\nFormats all typescript files according to prettier configuration.\n\n## `name [projectName]`\n\nInstalls Dependencies and Builds the specified Project.\n\n## `package [projectName]`\n\nBuilds specified Module and packages it as .zip File for manual upload to the platform.\n\n## `publish-module [projectName]`\n\nPublishes specified Module to Cloud Platform.\n\n- `-f`, `--functions` Publish flow functions.\n- `-u`, `--update` Update existing flow functions.\n\n## `publish-functions [projectName]`\n\nPublishes all Flow Functions inside specified Module to Cloud Platform.\n\n- `-u`, `--update` Update existing flow functions.\n\n## `serve [projectName]`\n\nBuilds and serves your Project. Rebuilding on file changes.\n\n## `start [projectName]`\n\nRuns your project.\n\n## `test [projectName]`\n\nRuns tests for your Project.\n\n## `generate-schemas [projectName]`\n\nGenerates Input, Output and Properties-Schemas for the specified project.\n\n- `--verbose` Output more information about what is being done.\n- `-h`, `--hide` Hide warnings if Input/OutputProperties classes can´t be found.\n  This command generates the schemas and puts them in the `inputStreams` and `outputStreams`\n  fields in the json-files of each Flow-Function. It always assumes the properties defined\n  in the `Input/OutPutProperties` classes are meant for the default input/output streams.\n  If your Function uses different streams you may have to change stream name manually.\n"
+  }
 }