mstate-cli 0.1.8 → 0.1.9

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "mstate-cli",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "main": "index.js",
   "bin": {
     "mstate": "./dist/index.js"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "npx rollup -c",
     "start": "npm run build && node dist/index.js"
   },
   "keywords": [
@@ -19,10 +19,23 @@
   "license": "ISC",
   "description": "A CLI tool for maintaining mstate workflows config",
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^28.0.1",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^12.1.1",
+    "@types/cors": "^2.8.17",
+    "@types/crypto-js": "^4.2.2",
+    "@types/express": "^5.0.0",
     "@types/node": "^22.9.0",
+    "tslib": "^2.8.1",
     "typescript": "^5.6.3"
   },
   "dependencies": {
-    "mstate-cli": "^0.0.9"
+    "cors": "^2.8.5",
+    "crypto-js": "^4.2.0",
+    "express": "^4.21.1",
+    "mstate-cli": "^0.0.9",
+    "open": "^10.1.0"
   }
 }

package/rollup.config.js

@@ -0,0 +1,23 @@
+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
+  ],
+};

package/src/common/constant.ts

@@ -1,2 +1,15 @@
+import path from 'path';
+import os from 'os';
+
+export const CRED_FOLDER_PATH = path.join(os.homedir(), '.mstate');
+export const CRED_FILE_PATH = path.join(
+  CRED_FOLDER_PATH,
+  '.mstate_credentials',
+);
+
+export const MSTATE_DOMAIN: string = `https"//mstate.ai/`;
+// export const MSTATE_DOMAIN: string = `http://localhost:5173/`;
+
+// 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 MOBIOFFICE_URL = 'https://server.mobioffice.io/api';

package/src/common/enum.ts

@@ -1,4 +1,5 @@
 export enum CmdAction {
+  LOGIN = 'login',
   LINK = 'link',
   UNLINK = 'unlink',
   USER = 'user',

package/src/common/helpers.ts

@@ -0,0 +1,25 @@
+import CryptoJS from 'crypto-js';
+
+export function getValueFromArgs(args: string[], key: string) {
+  return args.find((str) => str.includes(key))?.replace(key, '') ?? '';
+}
+
+export function hasFlag(args: string[], flag: string) {
+  return args.includes(flag.toUpperCase()) || args.includes(flag.toLowerCase());
+}
+
+const ENCRYPT_KEY: string = 'THIS_IS_MOBIOFFICE';
+
+// Encrypting data
+export function encryptData(data: any) {
+  const jsonData = JSON.stringify(data);
+  const encryptedData = CryptoJS.AES.encrypt(jsonData, ENCRYPT_KEY).toString();
+  return encryptedData;
+}
+
+// Decrypting data
+export function decryptData<T = any>(encryptedData: string) {
+  const bytes = CryptoJS.AES.decrypt(encryptedData, ENCRYPT_KEY);
+  const decryptedData = bytes.toString(CryptoJS.enc.Utf8);
+  return JSON.parse(decryptedData) as T;
+}

package/src/common/utils.ts

@@ -1,6 +1,6 @@
-export function getValueFromArgs(args: string[], key: string) {
-  return args.find((str) => str.includes(key))?.replace(key, '') ?? '';
-}
+import fs from 'fs';
+import { CRED_FILE_PATH, CRED_FOLDER_PATH } from './constant';
+import { decryptData, encryptData, getValueFromArgs } from './helpers';
 
 export const customLog = {
   changeAndThrow(...message: string[]) {
@@ -28,6 +28,39 @@ export const customLog = {
   },
 };
 
-export function hasFlag(args: string[], flag: string) {
-  return args.includes(flag.toUpperCase()) || args.includes(flag.toLowerCase());
+//#region Credentials
+export function handleUpdateSecretKey(secret: string) {
+  try {
+    fs.mkdirSync(CRED_FOLDER_PATH, { recursive: true });
+
+    const data = encryptData({ secret });
+    fs.writeFileSync(CRED_FILE_PATH, data, {
+      flag: 'w',
+      mode: 0o600,
+    });
+  } catch (error) {}
+}
+
+export function getSecretKey() {
+  try {
+    const fileData = fs.readFileSync(CRED_FILE_PATH, 'utf8');
+    const secret =
+      decryptData(fileData)?.secret ||
+      getValueFromArgs(process.argv, 'secret=');
+
+    if (!secret) {
+      customLog.changeAndThrow(`Please login or Parameter secret is required`);
+    }
+
+    return secret;
+  } catch (error) {
+    const secretKey = getValueFromArgs(process.argv, 'secret=');
+    if (secretKey) {
+      return secretKey;
+    }
+
+    customLog.changeAndThrow(`Please login or Parameter secret is required`);
+  }
 }
+
+//#endregion

package/src/handlers/action.handler.ts

@@ -1,7 +1,8 @@
 import * as fs from 'fs';
 import path from 'path';
 import { MSTATE_URL } from '../common/constant';
-import { customLog, getValueFromArgs } from '../common/utils';
+import { getValueFromArgs } from '../common/helpers';
+import { customLog, getSecretKey } from '../common/utils';
 
 enum Key {
   WORKFLOW = 'workflow=',
@@ -13,9 +14,8 @@ class ActionHandler {
 
   async cloneActions() {
     const args = process.argv;
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -45,7 +45,7 @@ class ActionHandler {
     } else {
       const actionConfigs = response?.data;
 
-      const folderPath = path.resolve(dirPath, 'actions');
+      const folderPath = path.resolve(workflowName, 'actions');
       fs.mkdirSync(folderPath, { recursive: true });
 
       actionConfigs.forEach((config: ActionConfig) => {
@@ -67,9 +67,8 @@ class ActionHandler {
 
   async saveToDB() {
     const args = process.argv;
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -81,7 +80,7 @@ class ActionHandler {
       return;
     }
 
-    const folderPath = path.resolve(dirPath, 'actions');
+    const folderPath = path.resolve(workflowName, 'actions');
 
     // loop to every folder to publish workflow
     fs.readdir(folderPath, (err, files) => {

package/src/handlers/company.handler.ts

@@ -1,5 +1,14 @@
-import { MSTATE_URL } from '../common/constant';
-import { customLog, getValueFromArgs } from '../common/utils';
+import { MSTATE_DOMAIN, MSTATE_URL } from '../common/constant';
+import {
+  customLog,
+  getSecretKey,
+  handleUpdateSecretKey,
+} from '../common/utils';
+import { getValueFromArgs } from '../common/helpers';
+
+import open from 'open';
+import express from 'express';
+import cors from 'cors';
 
 enum Key {
   PERMISSIONS = 'permissions=',
@@ -15,7 +24,7 @@ class CompanyHandler {
 
     const pString = getValueFromArgs(args, Key.PERMISSIONS).trim();
     const permissions = pString.split(',');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const secretKey = getSecretKey();
     const user = getValueFromArgs(args, Key.USER_ID);
 
     if (!pString.length) {
@@ -62,7 +71,7 @@ class CompanyHandler {
 
     const pString = getValueFromArgs(args, Key.PERMISSIONS);
     const permissions = pString.split(',');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const secretKey = getSecretKey();
     const user = getValueFromArgs(args, Key.USER_ID);
 
     if (!permissions.length) {
@@ -103,6 +112,78 @@ class CompanyHandler {
       customLog.success('Company updated successfully \n', response?.data);
     }
   }
+
+  async handleLogin() {
+    // Start the login process
+    let port = 49152;
+    const app = express();
+    app.use(cors({ origin: '*' }));
+
+    async function login() {
+      console.log('Opening browser for authentication...');
+
+      // Start a local server to capture the token
+
+      const startServer = (port: number) => {
+        return app.listen(port, () => {
+          console.log(`Server is running on port ${port}`);
+        });
+      };
+
+      const server = startServer(port);
+
+      server.on('error', (err: any) => {
+        if (err.code === 'EADDRINUSE') {
+          console.log(`Port ${port} is in use. Trying another port...`);
+
+          startServer(++port);
+        } else {
+          console.error('Server error:', err);
+        }
+      });
+
+      // Capture the OAuth callback
+      app.get('/cli/mstate/login', (req, res) => {
+        try {
+          const { token } = req.query;
+
+          if (token) {
+            console.log('Authentication successful! Token received.');
+
+            // Save the token locally
+            handleUpdateSecretKey(token as string);
+
+            res.send('<h1>Login successful! You can close this window.</h1>');
+          } else {
+            console.error('Authentication failed. No token received.');
+            res.send('<h1>Authentication failed. Please try again.</h1>');
+          }
+        } catch (error) {
+        } finally {
+          server.close(); // Stop the server after handling the response
+        }
+      });
+    }
+
+    // Command handling
+    login()
+      .then(async () => {
+        await open(
+          MSTATE_DOMAIN +
+            `oauth?redirect=${encodeURIComponent(
+              'cli/mstate/login',
+            )}&open=${port}&scope=profile`,
+        );
+      })
+      .catch((err) => {
+        console.error('Error during login:', err.message);
+        process.exit(1);
+      });
+  }
+
+  logToken() {
+    customLog.info('Token', getSecretKey());
+  }
 }
 
 export const companyHandler = new CompanyHandler();

package/src/handlers/environment.handler.ts

@@ -1,7 +1,8 @@
 import * as fs from 'fs';
 import path from 'path';
 import { MSTATE_URL } from '../common/constant';
-import { customLog, getValueFromArgs } from '../common/utils';
+import { customLog, getSecretKey } from '../common/utils';
+import { getValueFromArgs } from '../common/helpers';
 
 enum Key {
   WORKFLOW = 'workflow=',
@@ -13,9 +14,8 @@ class EnvironmentHandler {
 
   async cloneEnvironments() {
     const args = process.argv;
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -45,7 +45,7 @@ class EnvironmentHandler {
     } else {
       const config = response?.data;
 
-      const filePath = path.resolve(dirPath, 'environment.json');
+      const filePath = path.resolve(workflowName, 'environment.json');
       fs.writeFileSync(filePath, JSON.stringify(config, null, 2));
     }
   }
@@ -53,9 +53,8 @@ class EnvironmentHandler {
   async saveToDB() {
     const args = process.argv;
 
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -67,7 +66,7 @@ class EnvironmentHandler {
       return;
     }
 
-    const filePath = path.resolve(dirPath, 'environment.json');
+    const filePath = path.resolve(workflowName, 'environment.json');
 
     const data = fs.readFileSync(filePath, 'utf8');
     const environments = JSON.parse(data);

package/src/handlers/mobioffice.handler.ts

@@ -1,6 +1,6 @@
-import { MOBIOFFICE_URL, MSTATE_URL } from '../common/constant';
 import { CmdAction } from '../common/enum';
-import { customLog, getValueFromArgs } from '../common/utils';
+import { getValueFromArgs } from '../common/helpers';
+import { customLog, getSecretKey } from '../common/utils';
 
 enum Key {
   WORKFLOW = 'workflow=',
@@ -11,14 +11,15 @@ enum Key {
 }
 
 class MobiofficeHandler {
+  private MOBIOFFICE_URL: string = 'https://server.mobioffice.io/api';
+
   constructor() {}
 
   async linkToMobioffice(action: CmdAction.LINK | CmdAction.UNLINK) {
     const args = process.argv;
 
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
     const companyID = getValueFromArgs(args, Key.COMPANY_ID);
     const user = getValueFromArgs(args, Key.USER_ID);
 
@@ -42,7 +43,7 @@ class MobiofficeHandler {
       return;
     }
 
-    const url = `${MOBIOFFICE_URL}/Mstate/workFlow/user`;
+    const url = `${this.MOBIOFFICE_URL}/Mstate/workFlow/user`;
     const responseJSON = await fetch(url, {
       method: 'POST',
       headers: {

package/src/handlers/workflow.handler.ts

@@ -1,7 +1,8 @@
 import * as fs from 'fs';
 import path from 'path';
 import { MSTATE_URL } from '../common/constant';
-import { customLog, getValueFromArgs } from '../common/utils';
+import { customLog, getSecretKey } from '../common/utils';
+import { getValueFromArgs } from '../common/helpers';
 
 enum Key {
   PATH = 'path=',
@@ -17,10 +18,9 @@ class WorkflowHandler {
     try {
       const args = process.argv;
 
-      const dirPath = getValueFromArgs(args, Key.PATH);
-      const workflowPath = dirPath.replace(/\//g, '__');
+      const workflowPath = getValueFromArgs(args, Key.PATH);
       const file = getValueFromArgs(args, Key.FILE);
-      const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+      const secretKey = getSecretKey();
 
       if (!file) {
         customLog.changeAndThrow(`Parameter file is required`);
@@ -71,9 +71,8 @@ class WorkflowHandler {
   async updateWorkflowToDB() {
     const args = process.argv;
 
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -85,7 +84,7 @@ class WorkflowHandler {
       return;
     }
 
-    const folderPath = path.resolve(dirPath);
+    const folderPath = path.resolve(workflowName);
     const filePath = path.join(folderPath, 'workflow.json');
 
     const workflowJSON = fs.readFileSync(filePath, 'utf8');
@@ -118,9 +117,8 @@ class WorkflowHandler {
   async cloneWorkflow() {
     const args = process.argv;
 
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -132,7 +130,7 @@ class WorkflowHandler {
       return;
     }
 
-    const url = `${MSTATE_URL}/workflow/config/${workflowName}`;
+    const url = `${MSTATE_URL}/workflow/config/?workflow=${workflowName}`;
     const responseJSON = await fetch(url, {
       method: 'GET',
       headers: {
@@ -150,7 +148,7 @@ class WorkflowHandler {
     } else {
       const workflowConfig = response?.data;
 
-      const folderPath = path.resolve(dirPath);
+      const folderPath = path.resolve(workflowName);
       fs.mkdirSync(folderPath, { recursive: true });
 
       const filePath = path.join(folderPath, 'workflow.json');
@@ -163,9 +161,8 @@ class WorkflowHandler {
   async resetCache() {
     const args = process.argv;
 
-    const dirPath = getValueFromArgs(args, Key.WORKFLOW);
-    const workflowName = dirPath.replace(/\//g, '__');
-    const secretKey = getValueFromArgs(args, Key.SECRET_KEY);
+    const workflowName = getValueFromArgs(args, Key.WORKFLOW);
+    const secretKey = getSecretKey();
 
     if (!secretKey) {
       customLog.changeAndThrow(`Parameter secret is required`);
@@ -177,7 +174,7 @@ class WorkflowHandler {
       return;
     }
 
-    const url = `${MSTATE_URL}/cache/reset/${workflowName}`;
+    const url = `${MSTATE_URL}/cache/reset/?workflow=${workflowName}`;
     const responseJSON = await fetch(url, {
       method: 'DELETE',
       headers: {

package/src/index.ts

@@ -6,7 +6,8 @@ import { actionHandler } from './handlers/action.handler';
 import { workflowHandler } from './handlers/workflow.handler';
 import { CmdAction } from './common/enum';
 import { mobiofficeHandler } from './handlers/mobioffice.handler';
-import { customLog, hasFlag } from './common/utils';
+import { customLog } from './common/utils';
+import { hasFlag } from './common/helpers';
 import { environmentHandler } from './handlers/environment.handler';
 import { companyHandler } from './handlers/company.handler';
 import { argv } from 'process';
@@ -28,8 +29,12 @@ const [action] = argv.slice(2);
       break;
 
     case CmdAction.USER:
-      if (hasFlag(argv, '-d')) companyHandler.revokePermission();
-      else companyHandler.addToken();
+      companyHandler.logToken();
+      // if (hasFlag(argv, '-d')) companyHandler.revokePermission();
+      // else companyHandler.addToken();
+      break;
+    case CmdAction.LOGIN:
+      await companyHandler.handleLogin();
       break;
 
     case CmdAction.CLONE:

package/tsconfig.json

@@ -1,14 +1,16 @@
 {
   "compilerOptions": {
-    "outDir": "./dist",
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "strict": true,
     "rootDir": "src",
-    "target": "es2016",
-    "module": "commonjs",
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
+    "resolveJsonModule": true,
     "skipLibCheck": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true
-  }
+    "outDir": "./dist",
+    "declaration": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "dist", ".vscode"]
 }

package/dist/common/constant.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MOBIOFFICE_URL = exports.MSTATE_URL = void 0;
-exports.MSTATE_URL = 'https://api.mstate.mobioffice.io/api';
-exports.MOBIOFFICE_URL = 'https://server.mobioffice.io/api';

package/dist/common/enum.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CmdAction = void 0;
-var CmdAction;
-(function (CmdAction) {
-    CmdAction["LINK"] = "link";
-    CmdAction["UNLINK"] = "unlink";
-    CmdAction["USER"] = "user";
-    CmdAction["ADD"] = "add";
-    CmdAction["CLONE"] = "clone";
-    CmdAction["PUSH"] = "push";
-    CmdAction["HELP"] = "--help";
-    CmdAction["HELP_FLAG"] = "-h";
-    CmdAction["VERSION"] = "--version";
-    CmdAction["VERSION_FLAG"] = "-v";
-})(CmdAction || (exports.CmdAction = CmdAction = {}));

package/dist/common/utils.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.customLog = void 0;
-exports.getValueFromArgs = getValueFromArgs;
-exports.hasFlag = hasFlag;
-function getValueFromArgs(args, key) {
-    var _a, _b;
-    return (_b = (_a = args.find((str) => str.includes(key))) === null || _a === void 0 ? void 0 : _a.replace(key, '')) !== null && _b !== void 0 ? _b : '';
-}
-exports.customLog = {
-    changeAndThrow(...message) {
-        throw new Error(message.join('\n'));
-    },
-    error(...message) {
-        const RED_COLOR = '\x1b[31m'; // ANSI code for red
-        const RESET_COLOR = '\x1b[0m'; // ANSI code to reset to default color
-        console.error(`${RED_COLOR}[MSTATE][ERROR] ${RESET_COLOR}`, ...message);
-    },
-    success(...message) {
-        const GREEN_COLOR = '\x1b[32m'; // ANSI code for green
-        const RESET_COLOR = '\x1b[0m'; // ANSI code to reset to default color
-        console.log(`${GREEN_COLOR}[MSTATE] ${RESET_COLOR}`, ...message);
-    },
-    info(key, desc) {
-        const optionPadding = 30; // Define spacing width for the option column
-        const descriptionPadding = 60; // Define spacing width for the description column
-        console.log(' ', key.padEnd(optionPadding) + desc.padEnd(descriptionPadding));
-    },
-};
-function hasFlag(args, flag) {
-    return args.includes(flag.toUpperCase()) || args.includes(flag.toLowerCase());
-}