mstate-cli 0.2.5 → 0.2.6

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "mstate-cli",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "main": "index.js",
   "bin": {
     "mstate": "./dist/index.js"
   },
   "scripts": {
-    "build": "npx rollup -c",
+    "build": "rollup -c",
+    "dev": "rollup -c --watch",
+    "prod": "npm run build",
     "start": "npm run build && node dist/index.js"
   },
   "keywords": [
@@ -19,6 +21,7 @@
   "license": "ISC",
   "description": "A CLI tool for maintaining mstate workflows config",
   "devDependencies": {
+    "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.3.0",
@@ -28,6 +31,7 @@
     "@types/crypto-js": "^4.2.2",
     "@types/express": "^5.0.0",
     "@types/node": "^22.9.0",
+    "rollup": "^4.18.0",
     "tslib": "^2.8.1",
     "typescript": "^5.6.3"
   },

package/rollup.config.mjs

@@ -0,0 +1,34 @@
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from '@rollup/plugin-typescript';
+import json from '@rollup/plugin-json';
+import terser from '@rollup/plugin-terser';
+import alias from '@rollup/plugin-alias';
+import { fileURLToPath } from 'url';
+import path from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default {
+  input: 'src/index.ts', // Your entry file
+  output: {
+    dir: 'dist', // Output directory
+    format: 'cjs', // CommonJS format
+  },
+  plugins: [
+    alias({
+      entries: [
+        { find: '@shared', replacement: path.resolve(__dirname, '../shared') },
+      ],
+    }),
+    resolve(), // Resolves node_modules
+    commonjs(), // Converts CommonJS to ES Modules
+    terser(), // remove spaces and compress build
+    typescript({
+      tsconfig: './tsconfig.json', // Ensure Rollup uses your TypeScript config
+      declaration: false, // Make sure to disable declaration file generation in Rollup
+    }), // Transpile TypeScript
+    json(), // Add JSON plugin
+  ],
+};

package/src/common/constant.ts

@@ -1,5 +1,10 @@
 import path from 'path';
 import os from 'os';
+import {
+  MOBIOFFICE_API_URL,
+  MSTATE_API_URL,
+  MSTATE_FRONTEND_URL,
+} from '@shared/constants';
 
 export const CRED_FOLDER_PATH = path.join(os.homedir(), '.mstate');
 export const CRED_FILE_PATH = path.join(
@@ -9,13 +14,13 @@ export const CRED_FILE_PATH = path.join(
 
 export const ENCRYPT_KEY: string = 'THIS_IS_MOBIOFFICE';
 
-export const MSTATE_DOMAIN: string = `https://mstate.ai/`;
-// export const MSTATE_DOMAIN: string = `http://localhost:5173/`;
+// export const MSTATE_DOMAIN: string = `https://mstate.ai/`;
+export const MSTATE_DOMAIN: string = MSTATE_FRONTEND_URL;
 // export const MSTATE_DOMAIN: string = `https://dev.mstate.ai/`;
 
 // export const MSTATE_URL: string = 'https://dev.mstate.mobioffice.io/api';
-// export const MSTATE_URL = 'http://localhost:3000/api';
-export const MSTATE_URL = 'https://api.mstate.mobioffice.io/api';
+export const MSTATE_URL = MSTATE_API_URL;
+// export const MSTATE_URL = 'https://api.mstate.mobioffice.io/api';
 
-export const MOBIOFFICE_URL: string = 'https://server.mobioffice.io/api';
+export const MOBIOFFICE_URL: string = MOBIOFFICE_API_URL;
 // export const MOBIOFFICE_URL: string = 'https://dev-server.mobioffice.io/api';

package/src/common/enum.ts

@@ -7,6 +7,7 @@ export enum CmdAction {
   PERMISSION = 'permission',
   USER = 'user',
   ADD = 'add',
+  COPY = 'copy',
   CLONE = 'clone',
   PUSH = 'push',
   HELP = '--help',

package/src/handlers/action.handler.ts

@@ -7,6 +7,7 @@ import { customLog, getSecretKey } from '../common/utils';
 enum Key {
   WORKFLOW = 'workflow=',
   SECRET_KEY = 'secret=',
+  TYPE = 'type=',
 }
 
 class ActionHandler {
@@ -16,6 +17,7 @@ class ActionHandler {
     const args = process.argv;
     const workflowName = getValueFromArgs(args, Key.WORKFLOW);
     const secretKey = getSecretKey();
+    const type = getValueFromArgs(args, Key.TYPE);
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -27,7 +29,12 @@ class ActionHandler {
       return;
     }
 
-    const url = `${MSTATE_URL}/action/config/all/?workflow=${workflowName}`;
+    let query = `?workflow=${workflowName}`;
+    if (type) {
+      query += `&type=${type}`;
+    }
+
+    const url = `${MSTATE_URL}/action/config/all/${query}`;
 
     const responseJSON = await fetch(url, {
       headers: {
@@ -68,6 +75,7 @@ class ActionHandler {
   async saveToDB() {
     const args = process.argv;
     const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const type = getValueFromArgs(args, Key.TYPE);
     const secretKey = getSecretKey();
 
     if (!secretKey) {
@@ -82,6 +90,11 @@ class ActionHandler {
 
     const folderPath = path.resolve(workflowName, 'actions');
 
+    let query = `?workflow=${workflowName}`;
+    if (type) {
+      query += `&type=${type}`;
+    }
+
     // loop to every folder to publish workflow
     fs.readdir(folderPath, (err, files) => {
       if (!files) return;
@@ -90,7 +103,7 @@ class ActionHandler {
         const filePath = path.join(folderPath, fileName);
         const data = fs.readFileSync(filePath, 'utf8');
 
-        const url = `${MSTATE_URL}/action/config/?workflow=${workflowName}`;
+        const url = `${MSTATE_URL}/action/config/${query}`;
         const responseJSON = await fetch(url, {
           method: 'PUT',
           headers: {

package/src/handlers/environment.handler.ts

@@ -7,6 +7,7 @@ import { getValueFromArgs } from '../common/helpers';
 enum Key {
   WORKFLOW = 'workflow=',
   SECRET_KEY = 'secret=',
+  TYPE = 'type=',
 }
 
 class EnvironmentHandler {
@@ -16,6 +17,7 @@ class EnvironmentHandler {
     const args = process.argv;
     const workflowName = getValueFromArgs(args, Key.WORKFLOW);
     const secretKey = getSecretKey();
+    const type = getValueFromArgs(args, Key.TYPE);
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -27,7 +29,11 @@ class EnvironmentHandler {
       return;
     }
 
-    const url = `${MSTATE_URL}/env/?workflow=${workflowName}`;
+    let query = `?workflow=${workflowName}`;
+    if (type) {
+      query += `&type=${type}`;
+    }
+    const url = `${MSTATE_URL}/env/${query}`;
 
     const responseJSON = await fetch(url, {
       headers: {
@@ -55,6 +61,7 @@ class EnvironmentHandler {
 
     const workflowName = getValueFromArgs(args, Key.WORKFLOW);
     const secretKey = getSecretKey();
+    const type = getValueFromArgs(args, Key.TYPE);
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -82,6 +89,7 @@ class EnvironmentHandler {
         body: JSON.stringify({
           workflow: workflowName,
           env: environments,
+          type,
         }),
       });
 

package/src/handlers/help.handler.ts

@@ -11,6 +11,10 @@ class HelpHandler {
       CmdAction.CLONE,
       'Clone workflow with actions and environments',
     );
+    customLog.info(
+      CmdAction.COPY,
+      'crete a new workflow by copying the current',
+    );
     customLog.info(CmdAction.PUSH, 'Update the changes one in cloned workflow');
     customLog.info(
       CmdAction.LINK,

package/src/handlers/mobioffice.handler.ts

@@ -9,6 +9,7 @@ enum Key {
   SECRET_KEY = 'secret=',
   COMPANY_NAME = 'company=',
   USER_ID = 'user=',
+  TYPE = 'type=',
 }
 
 class MobiofficeHandler {
@@ -23,6 +24,7 @@ class MobiofficeHandler {
     const secretKey = getSecretKey();
     const companyName = getValueFromArgs(args, Key.COMPANY_NAME);
     const user = getValueFromArgs(args, Key.USER_ID);
+    const type = getValueFromArgs(args, Key.TYPE) || 'private';
 
     if (!workflowName) {
       customLog.changeAndThrow(`Parameter workflow is required`);
@@ -56,6 +58,7 @@ class MobiofficeHandler {
         workflow: workflowName,
         secret: secretKey,
         nickname: companyName,
+        type,
         user,
       }),
     });

package/src/handlers/workflow.handler.ts

@@ -9,17 +9,19 @@ enum Key {
   FILE = 'file=',
   SECRET_KEY = 'secret=',
   WORKFLOW = 'workflow=',
+  TYPE = 'type=',
 }
 
 class WorkflowHandler {
   constructor() {}
 
-  async saveToDB() {
+  async addNewWorkflow() {
     try {
       const args = process.argv;
 
       const workflowPath = getValueFromArgs(args, Key.PATH);
       const file = getValueFromArgs(args, Key.FILE);
+      const type = getValueFromArgs(args, Key.TYPE);
       const secretKey = getSecretKey();
 
       if (!file) {
@@ -44,6 +46,10 @@ class WorkflowHandler {
         query = '?' + query;
       }
 
+      if (type) {
+        query += query ? `&type=${type}` : `?type=${type}`;
+      }
+
       const url = `${MSTATE_URL}/workflow/config/new${query}`;
       const responseJSON = await fetch(url, {
         method: 'POST',
@@ -72,6 +78,7 @@ class WorkflowHandler {
     const args = process.argv;
 
     const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const type = getValueFromArgs(args, Key.TYPE);
     const secretKey = getSecretKey();
 
     if (!secretKey) {
@@ -91,6 +98,10 @@ class WorkflowHandler {
 
     let query = `?workflow=${workflowName}`;
 
+    if (type) {
+      query += `&type=${type}`;
+    }
+
     const url = `${MSTATE_URL}/workflow/config${query}`;
     const responseJSON = await fetch(url, {
       method: 'PUT',
@@ -118,6 +129,8 @@ class WorkflowHandler {
     const args = process.argv;
 
     const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const type = getValueFromArgs(args, Key.TYPE);
+
     const secretKey = getSecretKey();
 
     if (!secretKey) {
@@ -129,8 +142,9 @@ class WorkflowHandler {
       customLog.changeAndThrow(`Parameter workflow is required`);
       return;
     }
+    const typeQuery = type ? `&type=${type}` : '';
 
-    const url = `${MSTATE_URL}/workflow/config/?workflow=${workflowName}`;
+    const url = `${MSTATE_URL}/workflow/config/?workflow=${workflowName}${typeQuery}`;
     const responseJSON = await fetch(url, {
       method: 'GET',
       headers: {
@@ -158,6 +172,29 @@ class WorkflowHandler {
     }
   }
 
+  async copyWorkflow() {
+    try {
+      const args = process.argv;
+
+      const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+
+      if (!workflowName) {
+        customLog.changeAndThrow(`Parameter workflow is required`);
+        return;
+      }
+
+      const workflowPath = ('/' + workflowName).replace(/\/([^\/]*)$/, '');
+      if (workflowPath) {
+        process.argv.push(`path=${workflowPath.slice(1, workflowPath.length)}`);
+      }
+      process.argv.push(`file=${workflowName + '/workflow.json'}`);
+
+      await this.addNewWorkflow();
+    } catch (error: any) {
+      customLog.changeAndThrow(error.message);
+    }
+  }
+
   async resetCache() {
     const args = process.argv;
 

package/src/index.ts

@@ -55,8 +55,10 @@ const [action] = argv.slice(2);
       await environmentHandler.cloneEnvironments();
       break;
     case CmdAction.ADD:
-      await workflowHandler.saveToDB();
+      await workflowHandler.addNewWorkflow();
       break;
+    case CmdAction.COPY:
+      await workflowHandler.copyWorkflow();
     case CmdAction.PUSH:
       await workflowHandler.updateWorkflowToDB();
       await actionHandler.saveToDB();

package/tsconfig.json

@@ -1,16 +1,18 @@
 {
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",
     "moduleResolution": "Node",
     "strict": true,
-    "rootDir": "src",
+    "rootDir": "../",
+    "baseUrl": ".",
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "outDir": "./dist",
     "declaration": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "../shared/**/*"],
   "exclude": ["node_modules", "dist", ".vscode"]
 }

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "cSpell.words": ["MOBIOFFICE", "Mstate"]
-}

package/rollup.config.js

@@ -1,23 +0,0 @@
-const resolve = require('@rollup/plugin-node-resolve');
-const commonjs = require('@rollup/plugin-commonjs');
-const typescript = require('@rollup/plugin-typescript');
-const json = require('@rollup/plugin-json');
-const terser = require('@rollup/plugin-terser');
-
-module.exports = {
-  input: 'src/index.ts', // Your entry file
-  output: {
-    dir: 'dist', // Output directory
-    format: 'cjs', // CommonJS format
-  },
-  plugins: [
-    resolve(), // Resolves node_modules
-    commonjs(), // Converts CommonJS to ES Modules
-    terser(), // remove spaces and compress build
-    typescript({
-      tsconfig: './tsconfig.json', // Ensure Rollup uses your TypeScript config
-      declaration: false, // Make sure to disable declaration file generation in Rollup
-    }), // Transpile TypeScript
-    json(), // Add JSON plugin
-  ],
-};