bpmn-client 1.0.1 → 1.2.0

package/.env

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

package/Sample/package.json

@@ -0,0 +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"
+  }
+}

package/Sample/test.js

@@ -0,0 +1,30 @@
+"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 src_1 = require("bpmn-client/src/");
+console.log("Testing BPMNClient");
+test();
+function test() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const client = new src_1.BPMNClient('localhost', 3000, 12345);
+        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' });
+        insts.forEach(inst => {
+            console.log('id==>' + inst.id, inst.name, 'status==>', inst.status);
+        });
+        var items = yield client.datastore.findItems({ query: { "items.elementId": "task_Buy" } });
+        items.forEach(item => {
+            console.log('item: id==>' + item.id, item.name, 'status==>', item.status);
+        });
+    });
+}
+//# sourceMappingURL=test.js.map

package/Sample/test.ts

@@ -0,0 +1,27 @@
+import { BPMNClient } from "bpmn-client/src/";
+
+
+console.log("Testing BPMNClient");
+test();
+
+async function test() {
+    const client = new BPMNClient('localhost', 3000,12345);
+    var instance = await client.engine.start("Buy Used Car",  {} );
+    console.log("instance.id", instance.id, instance.name,instance.status);
+
+    var insts= await client.datastore.findInstances({ 'status': 'running' });
+
+    insts.forEach(inst => {
+        console.log('id==>' + inst.id,inst.name, 'status==>',inst.status);
+    });
+
+
+    var items = await client.datastore.findItems({ query: { "items.elementId": "task_Buy" } });
+
+    
+    items.forEach(item => {
+        console.log('item: id==>' + item.id, item.name, 'status==>', item.status);
+    });
+
+}
+

package/Sample/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "lib": [ "es6" ],
+    "sourceMap": false,
+    "declaration": false,
+    "listFiles" :  false 
+
+  },
+  "include": [
+    "**/*.ts"
+  ],
+  "exclude": [
+    "node_modules" 
+  ]
+}

package/index.js

@@ -1,21 +1,13 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    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];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const BPMNClient_1 = require("./BPMNClient");
-test();
-function test() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = new BPMNClient_1.BPMNClient('bpmn.omniworkflow.com', 80);
-        const ret = yield client.engine.start({ name: "Buy Used Car", data: {} });
-        console.log(ret);
-    });
-}
-//# sourceMappingURL=index.js.map
+__exportStar(require("./src/"), exports);

package/index.ts

@@ -1,10 +1 @@
-import { BPMNClient } from './BPMNClient';
-
-
-async function test() {
-    const client = new BPMNClient('bpmn.omniworkflow.com', 80);
-    const ret= await client.engine.start({ name: "Buy Used Car", data: {} });
-    console.log(ret);
-
-}
-
+export * from './src/';

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "bpmn-client",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",
     "clean": "tsc --build --clean",
-    "start:watch": "nodemon app",
     "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": "bpmn-server.webApp",
+  "description": "Client API for BPMN-Server webservices",
   "keywords": [
     "BPMN",
     "BPMN 2.0",
@@ -26,39 +26,22 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https:github.com/ralphhanna/bpmn-server.git"
+    "url": "git+https:github.com/ralphhanna/bpmn-client.git"
   },
   "dependencies": {
-    "bpmn-server": "^1.0.0",
-    "camunda-bpmn-moddle": "^4.4.0",
-    "chai": "^4.2.0",
     "connect-busboy": "0.0.2",
     "core-js": "^3.6.5",
-    "debug": "^2.2.0",
-    "express": "^4.14.0",
-    "iso8601-duration": "^1.2.0",
-    "mocha": "^7.1.2",
-    "mocha-cakes-2": "^3.3.0",
-    "mongodb": "^3.5.7",
-    "mongoose": "^5.9.13",
-    "nock": "^12.0.3",
-    "nodemon": "^2.0.4",
-    "pug": "^2.0.0-rc.3",
-    "ts-node": "^8.10.1",
-    "uuid": "^8.0.0"
+    "dotenv": "^16.0.1"
   },
   "devDependencies": {
-    "@types/debug": "0.0.30",
-    "@types/express": "^4.17.7",
-    "@types/express-serve-static-core": "^4.17.9",
     "@types/mime": "^1.3.1",
     "@types/node": "^8.10.62",
     "@types/serve-static": "^1.7.32",
-    "typedoc": "^0.17.8",
-    "typedoc-plugin-markdown": "^2.3.1",
+    "nodemon": "^2.0.19",
+    "ts-node": "^8.10.2",
     "typescript": "^3.9.7"
   },
   "engines": {
-    "node": "^8.0.0"
+    "node": "^14.0.0"
   }
 }

package/{BPMNClient.js → src/BPMNClient.js}

@@ -9,14 +9,57 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Engine = exports.BPMNClient = void 0;
+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');
-class BPMNClient {
-    constructor(host, port) {
+class WebService {
+    constructor() { }
+    invoke(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var driver = http;
+            var body = JSON.stringify(params);
+            console.log(options, params);
+            if (options.port == 443)
+                driver = https;
+            let data = '';
+            let self = this;
+            return new Promise(function (resolve, reject) {
+                try {
+                    driver.request(options, function (res) {
+                        console.log('STATUS: ' + res.statusCode);
+                        //console.log(res);
+                        self.statusCode = res.statusCode;
+                        res.setEncoding('utf8');
+                        res.on('data', function (chunk) {
+                            data += chunk;
+                        });
+                        res.on('end', () => {
+                            self.result = JSON.parse(data);
+                            resolve(self.result);
+                        });
+                    }).on("error", (err) => {
+                        console.log("Error: " + err.message);
+                        reject(err);
+                    }).end(body);
+                }
+                catch (exc) {
+                    console.log(exc);
+                }
+            });
+        });
+    }
+}
+class BPMNClient extends WebService {
+    constructor(host, port, apiKey) {
+        super();
         this.host = host;
         this.port = port;
-        this.engine = new Engine(this);
-        this.datastore = new Datastore(this);
+        this.apiKey = apiKey;
+        this.engine = new ClientEngine(this);
+        this.datastore = new ClientDatastore(this);
     }
     get(url, data = {}) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -40,8 +83,8 @@ class BPMNClient {
     }
     request(url, method, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var options;
             var body = JSON.stringify(params);
+            var options;
             if (params) {
                 options = {
                     host: this.host,
@@ -50,6 +93,11 @@ class BPMNClient {
                     method: method,
                     headers: {
                         "Content-Type": "application/json",
+                        "x-api-key": this.apiKey,
+                        "Accept": "*/*",
+                        //                        "User-Agent": "PostmanRuntime/ 7.26.8",
+                        //                        "Accept-Encoding": "gzip, deflate, br",
+                        "Connection": "keep-alive",
                         "Content-Length": Buffer.byteLength(body)
                     }
                 };
@@ -62,77 +110,74 @@ class BPMNClient {
                     method: method
                 };
             }
-            console.log(options);
-            let data = '';
-            let self = this;
-            return new Promise(function (resolve, reject) {
-                try {
-                    http.request(options, function (res) {
-                        console.log('STATUS: ' + res.statusCode);
-                        //          console.log('HEADERS: ' + JSON.stringify(res.headers));
-                        self.statusCode = res.statusCode;
-                        res.setEncoding('utf8');
-                        res.on('data', function (chunk) {
-                            data += chunk;
-                        });
-                        res.on('end', () => {
-                            //                console.log(JSON.parse(data));
-                            self.result = JSON.parse(data);
-                            resolve(self.result);
-                        });
-                    }).on("error", (err) => {
-                        console.log("Error: " + err.message);
-                        reject(err);
-                    }).end(body);
-                }
-                catch (exc) {
-                    console.log(exc);
-                }
-            });
+            return yield this.invoke(params, options);
         });
     }
-    getItem(id) {
-        if (!this.result.instance) {
-            console.log(this.result);
-            return;
-        }
-        return this.result.instance.items.filter(item => { return item.elementId == id; })[0];
-    }
 }
 exports.BPMNClient = BPMNClient;
-class Engine {
+class ClientEngine {
     constructor(client) {
         this.client = client;
     }
-    start({ name, data }) {
+    start(name, data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client.post('engine/start', { name, data });
+            const ret = yield this.client.post('engine/start', { name, data });
+            if (ret['errors']) {
+                console.log(ret['errors']);
+                throw new Error(ret['errors']);
+            }
+            const instance = ret;
+            return instance;
         });
     }
-    invoke({ query, data }) {
+    invoke(query, data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client.put('engine/invoke', { query, data });
+            const ret = yield this.client.put('engine/invoke', { query, data });
+            if (ret['errors']) {
+                console.log(ret['errors']);
+                throw new Error(ret['errors']);
+            }
+            const instance = ret['instance'];
+            return instance;
         });
     }
     get(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client.get('engine/get', query);
+            const ret = yield this.client.get('engine/get', query);
+            if (ret['errors']) {
+                console.log(ret['errors']);
+                throw new Error(ret['errors']);
+            }
+            const instance = ret['instance'];
+            return instance;
         });
     }
 }
-exports.Engine = Engine;
-class Datastore {
+exports.ClientEngine = ClientEngine;
+class ClientDatastore {
     constructor(client) {
         this.client = client;
     }
     findItems(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client.get('datastore/findItems', query);
+            var res = yield this.client.get('datastore/findItems', query);
+            if (res['errors']) {
+                console.log(res['errors']);
+                throw new Error(res['errors']);
+            }
+            const items = res['items'];
+            return items;
         });
     }
-    findInsances(query) {
+    findInstances(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client.get('datastore/findInstances', query);
+            const res = yield this.client.get('datastore/findInstances', query);
+            if (res['errors']) {
+                console.log(res['errors']);
+                throw new Error(res['errors']);
+            }
+            const instances = res['instances'];
+            return instances;
         });
     }
     deleteInstances(query) {
@@ -141,4 +186,31 @@ class Datastore {
         });
     }
 }
-//# sourceMappingURL=BPMNClient.js.map
+exports.ClientDatastore = ClientDatastore;
+class ClientDefinitions {
+    constructor(client) {
+        this.client = client;
+    }
+    list() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var res = yield this.client.get('definitions/list', []);
+            if (res['errors']) {
+                console.log(res['errors']);
+                throw new Error(res['errors']);
+            }
+            return res;
+        });
+    }
+    load(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this.client.get(encodeURI('definitions/load/' + name), { name: name });
+            if (res['errors']) {
+                console.log(res['errors']);
+                throw new Error(res['errors']);
+            }
+            console.log(res);
+            return res;
+        });
+    }
+}
+exports.ClientDefinitions = ClientDefinitions;