bpmn-client 1.2.5 → 1.3.2

package/.env

@@ -1,4 +1,4 @@
 API_KEY=12345
-HOST=test.omniworkflow.com
-PORT=443
+HOST=localhost
+PORT=3000
 BASE_URL=api

package/Sample/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "bpmn-client-sample",
-  "version": "1.2.0",
-  "license": "MIT",
-  "scripts": {
-    "build": "tsc --build",
-    "clean": "tsc --build --clean",
-    "start": "node app.ts",
-    "test": "mocha -R dot",
-    "posttest": "eslint . --cache && npm run toc",
-    "wintest": "node_modules/.bin/mocha",
-    "start:watch": "tsc-watch --project . --onSuccess \"nodemon ./test.ts\"",
-    "toc": "node scripts/generate-api-toc ./docs/API.md,./docs/Examples.md",
-    "test-md": "node scripts/test-markdown.js ./docs/API.md && node scripts/test-markdown.js ./docs/Examples.md"
-  },
-  "description": "Client API for BPMN-Server webservices",
-  "keywords": [
-    "BPMN",
-    "BPMN 2.0",
-    "Workflow",
-    "Node.js",
-    "TypeScript"
-  ],
-  "author": {
-    "name": "ralphhanna"
-  },
-  "dependencies": {
-    "bpmn-client": "*",
-    "connect-busboy": "0.0.2",
-    "core-js": "^3.6.5",
-    "dotenv": "^16.0.1"
-  },
-  "devDependencies": {
-    "@types/mime": "^1.3.1",
-    "@types/node": "^8.10.66",
-    "@types/serve-static": "^1.7.32",
-    "nodemon": "^2.0.19",
-    "ts-node": "^8.10.2",
-    "typescript": "^3.9.7"
-  },
-  "engines": {
-    "node": "^14.0.0"
-  }
-}
+{
+  "name": "bpmn-client-sample",
+  "version": "1.2.0",
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc --build",
+    "clean": "tsc --build --clean",
+    "start": "node app.ts",
+    "test": "mocha -R dot",
+    "posttest": "eslint . --cache && npm run toc",
+    "wintest": "node_modules/.bin/mocha",
+    "start:watch": "tsc-watch --project . --onSuccess \"nodemon ./test.ts\"",
+    "toc": "node scripts/generate-api-toc ./docs/API.md,./docs/Examples.md",
+    "test-md": "node scripts/test-markdown.js ./docs/API.md && node scripts/test-markdown.js ./docs/Examples.md"
+  },
+  "description": "Client API for BPMN-Server webservices",
+  "keywords": [
+    "BPMN",
+    "BPMN 2.0",
+    "Workflow",
+    "Node.js",
+    "TypeScript"
+  ],
+  "author": {
+    "name": "ralphhanna"
+  },
+  "dependencies": {
+    "bpmn-client": "*",
+    "connect-busboy": "0.0.2",
+    "core-js": "^3.6.5",
+    "dotenv": "^16.0.1"
+  },
+  "devDependencies": {
+    "@types/mime": "^1.3.1",
+    "@types/node": "^8.10.66",
+    "@types/serve-static": "^1.7.32",
+    "nodemon": "^2.0.19",
+    "ts-node": "^8.10.2",
+    "typescript": "^3.9.7"
+  },
+  "engines": {
+    "node": "^14.0.0"
+  }
+}

package/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/monitor.js

@@ -0,0 +1,91 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require("./");
+console.log("Testing BPMNClient");
+const dotenv = require('dotenv');
+const res = dotenv.config();
+console.log(res);
+monitor();
+function monitor() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+        console.log('running monitor');
+        for (var i = 0; i < 1000; i++) {
+            yield checkStatus(server);
+            yield delay(15000, 'test');
+        }
+    });
+}
+function checkStatus(server, reason = '') {
+    return __awaiter(this, void 0, void 0, function* () {
+        var list = yield server.engine.status();
+        var insT = 0, insR = 0, itmT = 0, itmR = 0, tokT = 0, tokR = 0;
+        for (var i = 0; i < list.length; i++) {
+            var exec = list[i];
+            var dInstance = null;
+            insT++;
+            tokT += exec.instance.tokens.length;
+            if (exec.instance.status == 'running')
+                insR++;
+            var started = dateDiff(exec.instance.startedAt);
+            var ended = dateDiff(exec.instance.endedAt);
+            var msg = ` Instance for '${exec.instance.name}'  Status: ${exec.status} Started At ${started} Ended ${ended} items: ${exec.instance.items.length}`;
+            try {
+                dInstance = yield server.datastore.findInstances({ id: exec.instance.id }, {});
+                //console.log(reason+' logs:',exec.instance.logs.length, dInstance.logs.length,dInstance.data.caseId);
+                if (dInstance.length > 0)
+                    msg += ' items:' + dInstance[0].items.length;
+            }
+            catch (exc) {
+                msg += ' no instance' + exc.toString();
+            }
+            console.log(msg);
+        }
+        console.log(`${reason} ->Instances: Total: ${insT} Running: ${insR}`); // Tokens: ${tokT} `);
+    });
+}
+function delay(time, result) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(function (resolve) {
+            setTimeout(function () {
+                resolve(result);
+            }, time);
+        });
+    });
+}
+function dateDiff(dateStr) {
+    var endDate = new Date();
+    var startTime = new Date(dateStr);
+    var time1 = endDate.getTime();
+    var time2 = startTime;
+    var seconds = Math.abs(time1 - time2) / 1000;
+    // get total seconds between the times
+    var delta = seconds; //Math.abs(date_future - date_now) / 1000;
+    // calculate (and subtract) whole days
+    var days = Math.floor(delta / 86400);
+    delta -= days * 86400;
+    // calculate (and subtract) whole hours
+    var hours = Math.floor(delta / 3600) % 24;
+    delta -= hours * 3600;
+    // calculate (and subtract) whole minutes
+    var minutes = Math.floor(delta / 60) % 60;
+    delta -= minutes * 60;
+    // what's left is seconds
+    var seconds = Math.floor(delta % 60); // in theory the modulus is not required
+    if (days > 0)
+        return (days + " days");
+    if (hours > 0)
+        return (hours + " hours");
+    if (minutes > 0)
+        return (minutes + " minutes");
+    return (seconds + " seconds");
+}

package/monitor.ts

@@ -0,0 +1,100 @@
+import { BPMNClient } from './';
+
+
+console.log("Testing BPMNClient");
+const dotenv = require('dotenv');
+const res = dotenv.config();
+
+console.log(res);
+monitor();
+
+async function monitor() {
+
+    const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+
+    console.log('running monitor');
+    for (var i = 0; i < 1000; i++) {
+        await checkStatus(server);
+        await delay(15000, 'test');
+    }
+
+
+}
+async function checkStatus(server, reason = '') {
+
+
+    var list = await server.engine.status();
+
+    var insT = 0, insR = 0, itmT = 0, itmR = 0, tokT = 0, tokR = 0;
+    for (var i = 0; i < list.length; i++) {
+        var exec = list[i];
+        var dInstance = null;
+        insT++;
+        tokT += exec.instance.tokens.length;
+        if (exec.instance.status == 'running') insR++;
+        var started = dateDiff(exec.instance.startedAt);
+        var ended = dateDiff(exec.instance.endedAt);
+
+
+        var msg = ` Instance for '${exec.instance.name}'  Status: ${exec.status} Started At ${started} Ended ${ended} items: ${exec.instance.items.length}`;
+        try {
+            dInstance = await server.datastore.findInstances({ id: exec.instance.id }, {});
+            //console.log(reason+' logs:',exec.instance.logs.length, dInstance.logs.length,dInstance.data.caseId);
+            if (dInstance.length > 0)
+                msg += ' items:' + dInstance[0].items.length;
+        }
+        catch (exc) {
+            msg += ' no instance' + exc.toString();
+        }
+        console.log(msg);
+
+    }
+    console.log(`${reason} ->Instances: Total: ${insT} Running: ${insR}`);// Tokens: ${tokT} `);
+}
+
+async function delay(time, result) {
+    return new Promise(function (resolve) {
+        setTimeout(function () {
+            resolve(result);
+        }, time);
+    });
+}
+
+
+
+
+function dateDiff(dateStr) {
+
+    var endDate = new Date();
+    var startTime = new Date(dateStr);
+    var time1 = endDate.getTime();
+    var time2 = startTime as unknown as number;
+
+    var seconds = Math.abs(time1 - time2) / 1000;
+
+
+    // get total seconds between the times
+    var delta = seconds; //Math.abs(date_future - date_now) / 1000;
+
+    // calculate (and subtract) whole days
+    var days = Math.floor(delta / 86400);
+    delta -= days * 86400;
+
+    // calculate (and subtract) whole hours
+    var hours = Math.floor(delta / 3600) % 24;
+    delta -= hours * 3600;
+
+    // calculate (and subtract) whole minutes
+    var minutes = Math.floor(delta / 60) % 60;
+    delta -= minutes * 60;
+
+    // what's left is seconds
+    var seconds = Math.floor(delta % 60);  // in theory the modulus is not required
+    if (days > 0)
+        return (days + " days");
+    if (hours > 0)
+        return (hours + " hours");
+    if (minutes > 0)
+        return (minutes + " minutes");
+    return (seconds + " seconds");
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "bpmn-client",
-  "version": "1.2.5",
+  "version": "1.3.2",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",
-    "compileRun": "tsc --build && node app.js",
+    "compileRun": "tsc --build && node test.js",
     "dev": "nodemon -e ts  --exec \"npm run compileRun\"",
     "clean": "tsc --build --clean",
     "start": "node test.ts",

package/src/BPMNClient.js

@@ -19,7 +19,7 @@ class WebService {
         return __awaiter(this, void 0, void 0, function* () {
             var driver = http;
             var body = JSON.stringify(params);
-            console.log(options, params);
+            //        console.log(options, params);
             if (options.port == 443)
                 driver = https;
             let data = '';
@@ -27,7 +27,7 @@ class WebService {
             return new Promise(function (resolve, reject) {
                 try {
                     driver.request(options, function (res) {
-                        console.log('STATUS: ' + res.statusCode);
+                        //                    console.log('STATUS: ' + res.statusCode);
                         this.response = res;
                         //console.log(res);
                         self.statusCode = res.statusCode;
@@ -212,7 +212,7 @@ class ClientDatastore {
     }
     deleteInstances(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client.del('datastore/delete', query);
+            return yield this.client.del('datastore/deleteInstances', query);
         });
     }
 }

package/src/BPMNClient.ts

@@ -15,7 +15,7 @@ class WebService {
         var driver = http;
         var body = JSON.stringify(params);
 
-        console.log(options, params);
+//        console.log(options, params);
         if (options.port == 443)
             driver = https;
 
@@ -25,7 +25,7 @@ class WebService {
             try {
 
                 driver.request(options, function (res) {
-                    console.log('STATUS: ' + res.statusCode);
+//                    console.log('STATUS: ' + res.statusCode);
                     this.response = res;
                     //console.log(res);
                     self.statusCode = res.statusCode;
@@ -213,7 +213,7 @@ class ClientDatastore {
         return instances;
     }
     async deleteInstances(query) {
-        return await this.client.del('datastore/delete', query);
+        return await this.client.del('datastore/deleteInstances', query);
     }
 }
 class ClientDefinitions {

package/src/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/test/feature/.env

@@ -1,5 +1,3 @@
 API_KEY=1234
-MONGO_DB_URL=mongodb://localhost:27017?retryWrites=true&w=majority
-MONGO_DB_NAME=bpmn
-SENDGRID_API_KEY=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
+
 

package/test.js

@@ -19,6 +19,9 @@ function test() {
     return __awaiter(this, void 0, void 0, function* () {
         const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
         const caseId = 3040;
+        var delResp = yield server.datastore.deleteInstances({ name: 'Buy Used Car' });
+        //console.log(delResp);
+        //return;
         var defs = yield server.definitions.list();
         console.log(defs);
         var def = yield server.definitions.load('Buy Used Car');
@@ -66,3 +69,12 @@ function test() {
         });
     });
 }
+function delay(time, result) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(function (resolve) {
+            setTimeout(function () {
+                resolve(result);
+            }, time);
+        });
+    });
+}

package/test.ts

@@ -10,10 +10,14 @@ test();
 
 async function test() {
 
-    const server= new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+    const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
 
     const caseId = 3040;
 
+
+    var delResp = await server.datastore.deleteInstances({ name: 'Buy Used Car' });
+    //console.log(delResp);
+    //return;
     var defs = await server.definitions.list();
 
     console.log(defs);
@@ -60,7 +64,7 @@ async function test() {
     }
 
 
-    
+
 
     var items = await server.datastore.findItems({ "items.status": "end", "items.elementId": "task_Buy" });
 
@@ -70,7 +74,7 @@ async function test() {
     });
 
 
-  
+
     var insts = await server.datastore.findInstances({ data: { caseId: caseId } });
 
     insts.forEach(inst => {
@@ -104,7 +108,14 @@ async function test() {
     items.forEach(item => {
         console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
     });
+}
 
+async function delay(time, result) {
+    return new Promise(function (resolve) {
+        setTimeout(function () {
+            resolve(result);
+        }, time);
+    });
 }