@unito/integration-cli 1.0.0 → 1.0.2

package/dist/boilerplate/eslint.config.mjs

@@ -1,47 +1,42 @@
-import tseslint from '@typescript-eslint/eslint-plugin';
-import tsParser from '@typescript-eslint/parser';
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
 
-export default [
+export default tseslint.config(
   {
     ignores: ['node_modules/**', 'dist/**', 'eslint.config.mjs'],
   },
+  eslint.configs.recommended,
+  ...tseslint.configs.recommendedTypeChecked,
   {
-    files: ['**/*.{js,ts}'],
     languageOptions: {
-      parser: tsParser,
       parserOptions: {
         project: './**/tsconfig.json',
       },
-      ecmaVersion: 'latest',
-      sourceType: 'module',
       globals: {
-        // Equivalent to env: { browser: true, node: true, es6: true }
-        window: 'readonly',
-        document: 'readonly',
-        navigator: 'readonly',
         process: 'readonly',
         require: 'readonly',
         module: 'readonly',
         __dirname: 'readonly',
       },
     },
-    plugins: {
-      '@typescript-eslint': tseslint,
-    },
     rules: {
-      // TypeScript rules
-      '@typescript-eslint/no-loss-of-precision': 'off',
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/ban-ts-comment': 'off',
-      '@typescript-eslint/ban-ts-ignore': 'off',
-      '@typescript-eslint/explicit-module-boundary-types': 'off',
-      '@typescript-eslint/no-var-requires': 'off',
-      '@typescript-eslint/no-floating-promises': 'error',
-      '@typescript-eslint/no-unused-vars': 'off',
-      '@typescript-eslint/no-non-null-assertion': 'off',
-      '@typescript-eslint/prefer-namespace-keyword': 'off',
-      '@typescript-eslint/no-namespace': 'off',
-      '@typescript-eslint/no-inferrable-types': 'off',
+      'no-undef': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
+      '@typescript-eslint/no-misused-promises': [
+        'error',
+        {
+          checksVoidReturn: {
+            arguments: false,
+          },
+        },
+      ],
       '@typescript-eslint/naming-convention': [
         'warn',
         {
@@ -59,14 +54,8 @@ export default [
           modifiers: ['requiresQuotes'],
         },
       ],
-
-      // JavaScript rules
       'no-whitespace-before-property': 'error',
       'no-trailing-spaces': 'error',
-      'no-extra-boolean-cast': 'off',
-      'no-inner-declarations': 'off',
-      'no-useless-escape': 'off',
-      'no-case-declarations': 'off',
       'space-unary-ops': [
         'error',
         {
@@ -83,13 +72,26 @@ export default [
         },
       ],
       'object-curly-spacing': ['error', 'always'],
-      'no-console': ['error', { allow: ['info', 'error'] }],
+      'no-console': 'error',
+      curly: ['error', 'all'],
+      'padding-line-between-statements': ['error', { blankLine: 'always', prev: '*', next: 'return' }],
+      eqeqeq: ['error', 'always', { null: 'ignore' }],
+      'prefer-const': 'error',
+      'no-else-return': 'error',
     },
   },
   {
     files: ['test/**/*.test.ts'],
     rules: {
       '@typescript-eslint/no-floating-promises': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-argument': 'off',
+      '@typescript-eslint/no-unsafe-return': 'off',
+      '@typescript-eslint/unbound-method': 'off',
+      '@typescript-eslint/require-await': 'off',
     },
   },
-];
+);

package/dist/boilerplate/package-lock.json

@@ -1786,10 +1786,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/form-data": {
       "version": "4.0.4",

package/dist/src/commands/test.js

@@ -88,6 +88,10 @@ class Test extends baseCommand_1.BaseCommand {
             allowNo: true,
             default: false,
         }),
+        port: core_1.Flags.integer({
+            description: 'port to run the integration on',
+            default: 9200,
+        }),
     };
     async catch(error) {
         /* istanbul ignore if */
@@ -159,7 +163,7 @@ class Test extends baseCommand_1.BaseCommand {
         // Launch the tests.
         const commandArguments = [
             `${process.env.NODE_MODULES_FOLDER}/@unito/integration-debugger/dist/src/index.js`,
-            '--integration-url=http://localhost:9200',
+            `--integration-url=http://localhost:${flags.port}`,
             '--spawn-process=npm run dev',
             `--credential-payload=${credentialPayload}`,
             `--secrets-payload=${JSON.stringify(secrets)}`,
@@ -211,7 +215,7 @@ class Test extends baseCommand_1.BaseCommand {
         const child = child_process_1.default.spawn('node', commandArguments, {
             detached: true,
             stdio: 'inherit',
-            env: { ...process.env, ...environmentVariables, NODE_ENV: 'development', PORT: '9200' },
+            env: { ...process.env, ...environmentVariables, NODE_ENV: 'development', PORT: String(flags.port) },
         });
         // istanbul ignore next
         child.on('exit', (code) => {

package/dist/src/resources/oauth2.js

@@ -3,9 +3,66 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.performOAuth2Flow = performOAuth2Flow;
 exports.updateToken = updateToken;
 const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const oauth2_1 = tslib_1.__importDefault(require("../services/oauth2"));
 const errors_1 = require("../errors");
 const globalConfiguration_1 = require("./globalConfiguration");
+async function isServiceReachable(url) {
+    try {
+        await fetch(url, { signal: AbortSignal.timeout(3000) });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function waitForLegacyRedirectServices(legacyRedirectUrl) {
+    const { origin, port } = new URL(legacyRedirectUrl);
+    const services = [
+        {
+            name: 'maestro',
+            healthUrl: `${origin}/health`,
+            port: port || '3000',
+            startCmd: 'cd console/maestro && npm run dev',
+        },
+        {
+            name: 'platformServer',
+            healthUrl: 'http://127.0.0.1:9000/health',
+            port: '9000',
+            startCmd: 'cd connector-service/platformServer && npm run dev',
+        },
+    ];
+    console.log(chalk_1.default.yellow('\n  This integration uses legacyRedirectUrl — additional services are required.'));
+    console.log(chalk_1.default.yellow('  The OAuth callback will be routed through maestro → platformServer → CLI.\n'));
+    let allUp = false;
+    while (!allUp) {
+        const results = await Promise.all(services.map(s => isServiceReachable(s.healthUrl)));
+        allUp = results.every(Boolean);
+        for (const [i, service] of services.entries()) {
+            if (results[i]) {
+                console.log(chalk_1.default.green(`  ✓ ${service.name} is running`));
+            }
+            else {
+                console.log(chalk_1.default.red(`  ✗ ${service.name} not running on port ${service.port}`));
+                console.log(`    Start it: ${service.startCmd}`);
+            }
+        }
+        if (allUp) {
+            console.log('');
+            break;
+        }
+        const { retry } = await inquirer_1.default.prompt({
+            name: 'retry',
+            type: 'confirm',
+            message: 'Start the missing services and try again?',
+            default: true,
+        });
+        if (!retry) {
+            throw new Error('OAuth2 flow aborted: required services are not running.');
+        }
+    }
+}
 async function performOAuth2Flow(applicationCredentials, environment = globalConfiguration_1.Environment.Production, credentialPayload) {
     const oauthHelper = new oauth2_1.default(applicationCredentials, environment, credentialPayload);
     const serverUrl = await oauthHelper.startServer();
@@ -14,6 +71,9 @@ async function performOAuth2Flow(applicationCredentials, environment = globalCon
         const error = await healthCheck.text();
         throw new Error(`OAuthServer did not start correctly.\n  HealthCheck status: ${healthCheck.status}\n  Response: ${error}`);
     }
+    if (applicationCredentials.legacyRedirectUrl) {
+        await waitForLegacyRedirectServices(applicationCredentials.legacyRedirectUrl);
+    }
     await oauthHelper.authorize();
     const oauth2Response = await oauthHelper.callbackIsDone();
     await oauthHelper.stopServer();

package/dist/test/commands/test.test.js

@@ -72,6 +72,15 @@ describe('Test', () => {
         .command(['test'])
         .exit(-1)
         .it('handled exception');
+    test_1.test
+        .stdout()
+        .stub(ConfigurationResource, 'getConfiguration', stub => stub.resolves(cliConfiguration))
+        .stub(IntegrationResource, 'validateIsIntegrationDirectory', stub => stub.returns(true))
+        .command(['test', '--port=9300'])
+        .it('custom port', () => {
+        (0, test_1.expect)(spawnStub.getCall(0).args.at(1)).to.include('--integration-url=http://localhost:9300');
+        (0, test_1.expect)(spawnStub.getCall(0).args.at(2).env.PORT).to.equal('9300');
+    });
     test_1.test
         .stdout()
         .stub(ConfigurationResource, 'getConfiguration', stub => stub.resolves(cliConfiguration))

package/oclif.manifest.json

@@ -948,6 +948,14 @@
           "name": "skip-install",
           "allowNo": true,
           "type": "boolean"
+        },
+        "port": {
+          "description": "port to run the integration on",
+          "name": "port",
+          "default": 9200,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -999,5 +1007,5 @@
       ]
     }
   },
-  "version": "1.0.0"
+  "version": "1.0.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Integration CLI",
   "bin": {
     "integration-cli": "./bin/run"
@@ -36,10 +36,10 @@
     "!/bin/dev*"
   ],
   "dependencies": {
-    "@ngrok/ngrok": "^1.4.1",
+    "@ngrok/ngrok": "^1.7.0",
     "@oazapfts/runtime": "1.x",
     "@oclif/core": "3.x",
-    "@unito/integration-debugger": "0.29.0",
+    "@unito/integration-debugger": "^0.29.1",
     "ajv": "8.x",
     "ajv-formats": "3.x",
     "better-ajv-errors": "1.x",