bpmn-client 1.2.0 → 1.3.2

package/Sample/.env

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

package/Sample/CarExample.js

@@ -0,0 +1,62 @@
+"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 bpmn_client_1 = require("bpmn-client");
+const dotenv = require('dotenv');
+const res = dotenv.config();
+console.log("Testing BPMNClient 3");
+const http = require('http');
+test();
+function test() {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('-------- car.js -----------');
+        const server = new bpmn_client_1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+        var caseId = Math.floor(Math.random() * 10000);
+        let name = 'Buy Used Car';
+        let instanceId;
+        var instance = yield server.engine.start("Buy Used Car", { caseId: caseId });
+        console.log("instance.id", instance.id, instance.name, instance.status, instance.data.caseId);
+        var response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_Buy' }, { needsCleaning: "Yes", needsRepairs: "Yes" });
+        console.log('after buy', response.id, response.data);
+        response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_clean' }, {});
+        console.log('after clean', response.id, response.data);
+        response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_repair' }, {});
+        console.log('after repair', response.id, response.data);
+        try {
+            response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_Drive' }, {});
+            console.log('after drive', response.id, response.data);
+        }
+        catch (exc) {
+            console.log(exc);
+        }
+        var insts = yield server.datastore.findInstances({ data: { caseId: caseId } });
+        insts.forEach(inst => {
+            console.log('Inst for CaseId id==>' + inst.id, inst.name, inst.data.caseId, 'status==>', inst.status);
+        });
+        var insts = yield server.datastore.findInstances({ id: instance.id });
+        insts.forEach(inst => {
+            for (var i = 0; i < inst.items.length; i++) {
+                var item = inst.items[i];
+                console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+            }
+        });
+        var inst = yield server.engine.get({ id: instance.id });
+        for (var i = 0; i < inst.items.length; i++) {
+            var item = inst.items[i];
+            console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+        }
+        //    var items = await server.datastore.findItems({ query: { "items.elementId": "task_Buy" } });
+        var items = yield server.datastore.findItems({ id: instance.id });
+        items.forEach(item => {
+            console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
+        });
+    });
+}

package/Sample/CarExample.ts

@@ -0,0 +1,97 @@
+import { BPMNClient } from "bpmn-client";
+
+const dotenv = require('dotenv');
+const res = dotenv.config();
+
+console.log("Testing BPMNClient 3");
+
+const http = require('http');
+
+    
+test();
+
+async function test() {
+
+
+    console.log('-------- car.js -----------');
+
+    
+    const server= new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+    var caseId = Math.floor(Math.random() * 10000);
+
+    let name = 'Buy Used Car';
+    let instanceId;
+
+    var instance = await server.engine.start("Buy Used Car", { caseId: caseId });
+
+
+    console.log("instance.id", instance.id, instance.name, instance.status, instance.data.caseId);
+
+    var response = await server.engine.invoke(
+        { id: instance.id, "items.elementId": 'task_Buy' }
+        , { needsCleaning: "Yes", needsRepairs: "Yes" });
+
+    console.log('after buy', response.id, response.data);
+
+    response = await server.engine.invoke(
+        { id: instance.id, "items.elementId": 'task_clean' }
+        , {});
+
+    console.log('after clean', response.id, response.data);
+
+    response = await server.engine.invoke(
+        { id: instance.id, "items.elementId": 'task_repair' }
+        , {});
+
+    console.log('after repair', response.id, response.data);
+
+
+    try {
+        response = await server.engine.invoke(
+            { id: instance.id, "items.elementId": 'task_Drive' }
+            , {});
+
+        console.log('after drive', response.id, response.data);
+
+    }
+    catch (exc) {
+        console.log(exc);
+    }
+
+
+
+    var insts = await server.datastore.findInstances({ data: { caseId: caseId } });
+
+    insts.forEach(inst => {
+        console.log('Inst for CaseId id==>' + inst.id, inst.name, inst.data.caseId, 'status==>', inst.status);
+    });
+    var insts = await server.datastore.findInstances({ id: instance.id });
+
+    insts.forEach(inst => {
+        for (var i = 0; i < inst.items.length; i++) {
+            var item = inst.items[i];
+            console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+
+        }
+    });
+
+    var inst = await server.engine.get({ id: instance.id });
+
+
+    for (var i = 0; i < inst.items.length; i++) {
+        var item = inst.items[i];
+        console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+
+    }
+
+
+
+    //    var items = await server.datastore.findItems({ query: { "items.elementId": "task_Buy" } });
+    var items = await server.datastore.findItems({ id: instance.id });
+
+
+    items.forEach(item => {
+        console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
+    });
+
+}

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.62",
-    "@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/Sample/test.js

@@ -9,12 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const src_1 = require("bpmn-client/src/");
+const bpmn_client_1 = require("bpmn-client");
+console.log("Testing BPMNClient");
+const dotenv = require('dotenv');
+const res = dotenv.config();
 console.log("Testing BPMNClient");
 test();
 function test() {
     return __awaiter(this, void 0, void 0, function* () {
-        const client = new src_1.BPMNClient('localhost', 3000, 12345);
+        //const client = new BPMNClient('localhost', 3000,12345);
+        const client = new bpmn_client_1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
         var instance = yield client.engine.start("Buy Used Car", {});
         console.log("instance.id", instance.id, instance.name, instance.status);
         var insts = yield client.datastore.findInstances({ 'status': 'running' });
@@ -27,4 +31,3 @@ function test() {
         });
     });
 }
-//# sourceMappingURL=test.js.map

package/Sample/test.ts

@@ -1,11 +1,16 @@
-import { BPMNClient } from "bpmn-client/src/";
+import { BPMNClient } from "bpmn-client";
+
+console.log("Testing BPMNClient");
+const dotenv = require('dotenv');
+const res = dotenv.config();
 
 
 console.log("Testing BPMNClient");
 test();
 
 async function test() {
-    const client = new BPMNClient('localhost', 3000,12345);
+    //const client = new BPMNClient('localhost', 3000,12345);
+    const client= new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
     var instance = await client.engine.start("Buy Used Car",  {} );
     console.log("instance.id", instance.id, instance.name,instance.status);
 

package/demo.env

@@ -0,0 +1,4 @@
+API_KEY=12345
+HOST=bpmn.omniworkflow.com
+PORT=443
+BASE_URL=api

package/local.env

@@ -0,0 +1,4 @@
+API_KEY=12345
+HOST=localhost
+PORT=3000
+BASE_URL=api

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,17 +1,14 @@
 {
   "name": "bpmn-client",
-  "version": "1.2.0",
+  "version": "1.3.2",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",
+    "compileRun": "tsc --build && node test.js",
+    "dev": "nodemon -e ts  --exec \"npm run compileRun\"",
     "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"
+    "start": "node test.ts",
+    "test": "mocha -exit --config=test\\.mocharc.json"
   },
   "description": "Client API for BPMN-Server webservices",
   "keywords": [
@@ -42,6 +39,7 @@
     "typescript": "^3.9.7"
   },
   "engines": {
-    "node": "^14.0.0"
+    "node": ">=12.0.0"
+
   }
 }

package/src/BPMNClient.js

@@ -10,8 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientDefinitions = exports.ClientDatastore = exports.ClientEngine = exports.BPMNClient = void 0;
-const dotenv = require('dotenv');
-const res = dotenv.config();
 console.log("BPMNClient 1.2");
 const https = require('https');
 const http = require('http');
@@ -21,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 = '';
@@ -29,7 +27,8 @@ 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;
                         res.setEncoding('utf8');
@@ -60,6 +59,7 @@ class BPMNClient extends WebService {
         this.apiKey = apiKey;
         this.engine = new ClientEngine(this);
         this.datastore = new ClientDatastore(this);
+        this.definitions = new ClientDefinitions(this);
     }
     get(url, data = {}) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -119,9 +119,9 @@ class ClientEngine {
     constructor(client) {
         this.client = client;
     }
-    start(name, data) {
+    start(name, data = {}, startNodeId = null, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield this.client.post('engine/start', { name, data });
+            const ret = yield this.client.post('engine/start', { name, data, startNodeId, options });
             if (ret['errors']) {
                 console.log(ret['errors']);
                 throw new Error(ret['errors']);
@@ -141,6 +141,26 @@ class ClientEngine {
             return instance;
         });
     }
+    throwMessage(messageId, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ret = yield this.client.put('engine/throwMessage', { "messageId": messageId, "data": data });
+            if (ret['errors']) {
+                console.log(ret['errors']);
+                throw new Error(ret['errors']);
+            }
+            return ret;
+        });
+    }
+    throwSignal(signalId, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ret = yield this.client.put('engine/throwSignal', { "signalId": signalId, "data": data });
+            if (ret['errors']) {
+                console.log(ret['errors']);
+                throw new Error(ret['errors']);
+            }
+            return ret;
+        });
+    }
     get(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield this.client.get('engine/get', query);
@@ -152,6 +172,16 @@ class ClientEngine {
             return instance;
         });
     }
+    status() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ret = yield this.client.get('engine/status', {});
+            if (ret['errors']) {
+                console.log(ret['errors']);
+                throw new Error(ret['errors']);
+            }
+            return ret;
+        });
+    }
 }
 exports.ClientEngine = ClientEngine;
 class ClientDatastore {
@@ -182,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);
         });
     }
 }