biz-a-cli 2.3.3 → 2.3.4

package/bin/hub.js

@@ -22,21 +22,28 @@ const argv = yargs(process.argv.slice(2))
     .options('h', {
         alias: 'hostname',
         default: '127.0.0.1',
-        describe: 'Address of local server for forwarding over socket-tunnel',
+        describe: '(Required) Address of local server for forwarding over socket-tunnel',
         type: 'string',
         demandOption: true
     })
+    .options('d', {
+        alias: 'dbindex',
+        default: 2,
+        describe: '(Required) Biz-A Database Index (Callback Feature)',
+        type: 'number',
+        demandOption: false
+    })
     .options('p', {
         alias: 'port',
         default: 212,
-        describe: '(Required) Port of local server for forwarding over socket-tunnel',
+        describe: 'Port of local server for forwarding over socket-tunnel',
         type: 'number',
-        demandOption: true
+        demandOption: false
     })
     .options('sp', {
         alias: 'serverport',
         default: 3002,
-        describe: 'Server Port',
+        describe: 'Express Port (Callback Feature)',
         type: 'number',
         demandOption: false
     })
@@ -67,6 +74,8 @@ import { runCliScript } from '../callbackController.js'
 app.use(cors());
 app.use(express.json());
 
+app.set('args', argv);
+
 app.use('/cb', runCliScript);
 const port = 3002;
 

package/callbackController.js

@@ -1,19 +1,34 @@
 import { loadCliScript, extractFunctionScript } from "./scheduler/datalib.js";
-import { getCompanyObjectId, getSelectedConfig } from "./scheduler/configController.js";
+
+
+export function getInputScript(req) {//
+    const args = req.app.settings.args;
+    return {
+        data: {
+            arguments: args,
+            body: req.body.body
+        },
+        selectedConfig: {
+            API_URL: `http://${args.hostname}:${args.port}`,
+            dbindex: args.dbindex,
+            subdomain: args.subdomain
+        }
+    }
+}
 
 export async function runCliScript(req, res) {
-    const data = req.body;
-    const company = await getCompanyObjectId(data.query.companyId);
-    const config = await getSelectedConfig(company._id);
-    const selectedConfig = config[0];
+    const { data, selectedConfig } = getInputScript(req);
 
-    loadCliScript(selectedConfig, data.query).subscribe({
-        next: data => {
-            let functions = extractFunctionScript(data);
-            res.send(functions.onInit(selectedConfig, data.body));
+    loadCliScript(selectedConfig, req.body.query).subscribe({
+        next: script => {
+            let functions = extractFunctionScript(script);
+            res.send(functions.onInit(data));
 
             console.log(`Run Callback Successfully!`);
         },
-        error: error => console.log(error.response.data || error)
+        error: error => {
+            console.error(error);
+            throw new Error(error);
+        }
     })
 }

package/envs/env.dev.js

@@ -1,10 +1,10 @@
 export const envDev = {
   production: false,
-  cdmUrl: 'https://imm-cdm-dev.herokuapp.com',
   BIZA_MONGO_LINK: 'mongodb+srv://imm_biza:' +
     encodeURIComponent('imm@2023') + '@cluster0.z2yr8kp.mongodb.net/?retryWrites=true&w=majority',
   CDM_MONGO_LINK: 'mongodb+srv://imm_cdm:' +
     encodeURIComponent('imm@2019') + '@imm-cdm-dev.rf6wr.mongodb.net/?retryWrites=true&w=majority',
   COMPANY_REGISTER: 'companyregister-dev',
   BIZA_SERVER_LINK: 'https://biz-a-dev-41e7c93a25e5.herokuapp.com'
+  // BIZA_SERVER_LINK: 'http://localhost:3000'
 };

package/envs/env.js

@@ -1,6 +1,5 @@
 export const env = {
   production: true,
-  cdmUrl: 'https://imm-cdm.herokuapp.com',
   BIZA_MONGO_LINK: 'mongodb+srv://imm_biza:' +
     encodeURIComponent('imm@2023') + '@cluster0.lezywmk.mongodb.net/?retryWrites=true&w=majority',
   CDM_MONGO_LINK: 'mongodb+srv://imm_cdm:' +

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.3",
-  "versionDev": "0.0.20",
+  "version": "2.3.4",
+  "versionDev": "0.0.22",
   "description": "",
   "main": "bin/index.js",
   "type": "module",

package/scheduler/configController.js

@@ -7,17 +7,17 @@ let CDM_MONGO_LINK;
 let COMPANY_REGISTER;
 
 // if ((process.env.NODE_ENV == undefined) || (process.env.NODE_ENV == 'development')) {
-    // BIZA_MONGO_LINK = envDev.BIZA_MONGO_LINK;
-    // CDM_MONGO_LINK = envDev.CDM_MONGO_LINK;
-    // COMPANY_REGISTER = envDev.COMPANY_REGISTER;
+// BIZA_MONGO_LINK = envDev.BIZA_MONGO_LINK;
+// CDM_MONGO_LINK = envDev.CDM_MONGO_LINK;
+// COMPANY_REGISTER = envDev.COMPANY_REGISTER;
 
-    // console.log('BIZA_MONGO_LINK =>', BIZA_MONGO_LINK);
-    // console.log('CDM_MONGO_LINK =>', CDM_MONGO_LINK);
-    // console.log('COMPANY_REGISTER =>', COMPANY_REGISTER);
+// console.log('BIZA_MONGO_LINK =>', BIZA_MONGO_LINK);
+// console.log('CDM_MONGO_LINK =>', CDM_MONGO_LINK);
+// console.log('COMPANY_REGISTER =>', COMPANY_REGISTER);
 // } else {
-    BIZA_MONGO_LINK = env.BIZA_MONGO_LINK;
-    CDM_MONGO_LINK = env.CDM_MONGO_LINK;
-    COMPANY_REGISTER = env.COMPANY_REGISTER;
+BIZA_MONGO_LINK = env.BIZA_MONGO_LINK;
+CDM_MONGO_LINK = env.CDM_MONGO_LINK;
+COMPANY_REGISTER = env.COMPANY_REGISTER;
 // }
 
 async function fetchSelectedConfig(aggregateField) {

package/scheduler/datalib.js

@@ -134,6 +134,7 @@ export function extractFunctionScript(data) {
         return
     }
     if (data.length == 0) return
+
     let hex = JSON.parse(hex2a(data[0].template))
     //sementara ke template dahulu
     // let hex = JSON.parse(hex2a(data[0].script))
@@ -145,8 +146,8 @@ export function extractFunctionScript(data) {
 export function getQueryDataObsParameters(trigger) {
     return {
         length: 1,
-        // filter: [{ junction: '', column: 'FILENAME', operator: '=', value1: `'${trigger.filename}'` }],
-        filter: [{ junction: '', column: 'FILENAME', operator: '=', value1: `'cekUser.js'` }],
+
+        filter: [{ junction: '', column: 'FILENAME', operator: '=', value1: `'${trigger.filename}'` }],
         columns: [{ data: "TEMPLATE.TEMPLATE", key: 'template' }]
 
         //sementara ke template dahulu
@@ -173,11 +174,24 @@ export function loadCliScript(selectedConfig, trigger) {
     )
 }
 
+export function getInputData(config, trigger) {
+    const urlAndPort = config.API_URL.split(':');
+    return {
+        arguments: {
+            hostname: urlAndPort[1].split('//')[1],
+            port: +urlAndPort[2],
+            dbindex: config.dbindex,
+            subdomain: config.subdomain
+        },
+        body: trigger.data
+    }
+}
+
 export function scheduleSubscription(config, data, trigger, needSetHistory, isTest = false) {
     try {
         let functions = extractFunctionScript(data);
         if (!isTest) {  // next, change isTest to test better
-            functions.onInit(config, trigger.data);
+            functions.onInit(getInputData(config, trigger));
         }
 
         if (needSetHistory) {
@@ -195,6 +209,9 @@ export function scheduleSubscription(config, data, trigger, needSetHistory, isTe
 export function checkSchedule(selectedConfig, trigger, needSetHistory) {
     loadCliScript(selectedConfig, trigger).subscribe({
         next: data => scheduleSubscription(selectedConfig, data, trigger, needSetHistory),
-        error: error => console.log(error.response.data || error)
+        error: error => {
+            console.error(error);
+            throw new Error(error);
+        }
     })
 }

package/scheduler/timer.js

@@ -50,14 +50,13 @@ export async function runHistory(histories, config, watchers, now) {
 
 
 export const runScheduler = async (companyName) => {
-    await delay(30000);
+    // await delay(30000);
 
     const company = await getCompanyObjectId(companyName);
     const config = await getSelectedConfig(company._id);
 
     forkJoin([getHistories(config[0]), getWatchers(config[0])]).subscribe({
         next: ([historyResult, watcherResult]) => {
-            
             const histories = historyRecordToJson(historyResult);
             const watchers = watcherRecordToJson(watcherResult);
             runHistory(histories, config[0], watchers, new Date());

package/tests/callback.test.js

@@ -0,0 +1,40 @@
+// import { jest } from '@jest/globals'
+
+// const mockInsertHistory = jest.fn();
+// jest.unstable_mockModule("../scheduler/watcherController.js", () => ({
+//     insertHistory: mockInsertHistory.mockResolvedValue('OK')
+// }))
+
+const {
+    getInputScript
+} = await import('../callbackController.js');
+
+describe('callback test', () => {
+    test('get input script', () => {
+        const args = {
+            hostname: 'localhost',
+            port: 212,
+            dbindex: 2,
+            subdomain: 'abc'
+        };
+
+        const request = {
+            app: { settings: { args: args } },
+            body: { body: { body1: 'value1' } }
+        }
+
+        expect(getInputScript(request)).toStrictEqual({
+            data: {
+                arguments: args,
+                body: { body1: 'value1' }
+            },
+            selectedConfig: {
+                API_URL: 'http://localhost:212',
+                dbindex: 2,
+                subdomain: 'abc'
+            }
+        });
+    });
+
+})
+

package/tests/data.test.js

@@ -15,6 +15,7 @@ jest.unstable_mockModule("../scheduler/watcherController.js", () => ({
 const {
     scheduleSubscription,
     getConfig,
+    getInputData,
     getQueryDataObsParameters,
 } = await import('../scheduler/datalib.js');
 
@@ -22,9 +23,10 @@ describe('data test', () => {
     test('check schedule subscription no history', () => {
         const config = {
             _id: 'ffffffff2ae49fab9ea654e1',
-            API_URL: 'localhost'
+            API_URL: 'http://localhost:212',
+            dbindex: 2,
+            subdomain: 'abc'
         }
-
         const data = [{ template: '7b2266756e6374696f6e73223a7b226f6e496e6974223a5b2277696e646f772e46756e6374696f6e222c5b22636f6e666967222c222064617461225d2c5b2220202020202020202020202020202020636f6e737420646f6974203d206173796e63202829203d3e207b222c222020202020202020202020202020202020202020636f6e7374207b20746170207d203d20617761697420696d706f7274282772786a732729222c222020202020202020202020202020202020202020636f6e7374207b20717565727944617461207d203d20617761697420696d706f727428272e2f646174616c69622e6a732729222c222020202020202020202020202020202020202020636f6e737420706172616d203d207b222c222020202020202020202020202020202020202020202020206c656e6774683a2031302c222c22202020202020202020202020202020202020202020202020636f6c756d6e733a205b222c22202020202020202020202020202020202020202020202020202020207b20646174613a202755534552532e555345524944272c206b65793a202775736572696427207d222c222020202020202020202020202020202020202020202020205d2c222c222020202020202020202020202020202020202020202020206462496e6465783a2031222c2220202020202020202020202020202020202020207d222c22202020202020202020202020202020202020202071756572794461746128706172616d2c20636f6e6669672c2074727565292e7069706528222c2220202020202020202020202020202020202020202020202074617028726573203d3e20636f6e736f6c652e6c6f672872657329292c222c222020202020202020202020202020202020202020292e73756273637269626528726573203d3e207b222c22202020202020202020202020202020202020202020202020636f6e736f6c652e6c6f67287265732c20277375627363726962652729222c2220202020202020202020202020202020202020207d29222c22202020202020202020202020202020207d222c2220202020202020202020202020202020646f69742829222c222020202020202020202020202020202072657475726e20276f6b20646172692063656b55736572273b225d5d7d7d' }]
         const trigger = {
             _id: 1,
@@ -38,19 +40,49 @@ describe('data test', () => {
     test('check schedule subscription with history', () => {
         const config = {
             _id: 'ffffffff2ae49fab9ea654e1',
-            API_URL: 'localhost'
+            API_URL: 'http://localhost:212',
+            dbindex: 2,
+            subdomain: 'abc'
         }
 
         const data = [{ template: '7b2266756e6374696f6e73223a7b226f6e496e6974223a5b2277696e646f772e46756e6374696f6e222c5b22636f6e666967222c222064617461225d2c5b2220202020202020202020202020202020636f6e737420646f6974203d206173796e63202829203d3e207b222c222020202020202020202020202020202020202020636f6e7374207b20746170207d203d20617761697420696d706f7274282772786a732729222c222020202020202020202020202020202020202020636f6e7374207b20717565727944617461207d203d20617761697420696d706f727428272e2f646174616c69622e6a732729222c222020202020202020202020202020202020202020636f6e737420706172616d203d207b222c222020202020202020202020202020202020202020202020206c656e6774683a2031302c222c22202020202020202020202020202020202020202020202020636f6c756d6e733a205b222c22202020202020202020202020202020202020202020202020202020207b20646174613a202755534552532e555345524944272c206b65793a202775736572696427207d222c222020202020202020202020202020202020202020202020205d2c222c222020202020202020202020202020202020202020202020206462496e6465783a2031222c2220202020202020202020202020202020202020207d222c22202020202020202020202020202020202020202071756572794461746128706172616d2c20636f6e6669672c2074727565292e7069706528222c2220202020202020202020202020202020202020202020202074617028726573203d3e20636f6e736f6c652e6c6f672872657329292c222c222020202020202020202020202020202020202020292e73756273637269626528726573203d3e207b222c22202020202020202020202020202020202020202020202020636f6e736f6c652e6c6f67287265732c20277375627363726962652729222c2220202020202020202020202020202020202020207d29222c22202020202020202020202020202020207d222c2220202020202020202020202020202020646f69742829222c222020202020202020202020202020202072657475726e20276f6b20646172692063656b55736572273b225d5d7d7d' }]
         const trigger = {
             _id: 1,
-            name: 'New Watcher 1',
+            name: 'New Watcher 1'
         }
 
         scheduleSubscription(config, data, trigger, true, true);
         expect(mockInsertHistory).toBeCalledTimes(1);
     });
 
+    test('get input data', () => {
+        const config = {
+            _id: 'ffffffff2ae49fab9ea654e1',
+            API_URL: 'http://localhost:212',
+            dbindex: 2,
+            subdomain: 'abc'
+        }
+        const trigger = {
+            data: {
+                _id: 1,
+                name: 'New Watcher 1'
+            }
+        }
+
+        expect(getInputData(config, trigger)).toStrictEqual({
+            arguments: {
+                hostname: 'localhost',
+                port: 212,
+                dbindex: 2,
+                subdomain: 'abc'
+            },
+            body: {
+                _id: 1,
+                name: 'New Watcher 1'
+            }
+        });
+    });
+
     test('get config', () => {
         const config = {
             _id: 'ffffffff2ae49fab9ea654e1',

package/tests/hub.test.js

@@ -75,7 +75,7 @@ describe('cli req test', () => {
       });
 
       const result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
-        'cli-req', { d: 1, }, cb => resolve(cb)
+        'cli-req', { d: 1 }, cb => resolve(cb)
       ))
 
       expect(result).toStrictEqual('OK');