bpmn-client 1.3.17 → 1.3.26

package/monitor.js

@@ -1,91 +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");
-}
+"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-client",
-  "version": "1.3.17",
+  "version": "1.3.26",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/mime": "^1.3.1",
-    "@types/node": "^8.10.62",
+    "@types/node": "^12.12.7",
     "@types/serve-static": "^1.7.32",
     "nodemon": "^2.0.19",
     "ts-node": "^8.10.2",

package/remote-import.js

@@ -1,105 +1,133 @@
-"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 });
-//FromPostMan();
-//request('test4', 'Trans.bpmn');
-const _1 = require("./");
-console.log('remote-import.ts');
-fromClientLib();
-console.log('-------------------');
-//FromPostMan();
-function fromClientLib() {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log('from client lib');
-        const server = new _1.BPMNClient('localhost', 3000, '12345');
-        var name = 'test-import';
-        var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
-        var res = yield server.definitions.import(name, file);
-        //console.log(res.length);
-        return res;
-    });
-}
-function FromPostMan() {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log("Testing Remote import");
-        var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
-        var http = require('follow-redirects').http;
-        //const http = require('http');
-        var fs = require('fs');
-        var options = {
-            'method': 'POST',
-            'hostname': 'localhost',
-            'port': 3000,
-            'path': '/api/definitions/import/testing4',
-            'headers': {
-                'x-api-key': '12345',
-                'Cookie': 'connect.sid=s%3AXMa01DuOlQ4WsrvBj0FVaIrTak49vLPB.hDIV9j7ONA437rZf%2F%2Biu%2Bc6B7T5%2FVuEIjj1BAaoCJW4'
-            },
-            'maxRedirects': 20
-        };
-        var req = http.request(options, function (res) {
-            var chunks = [];
-            res.on("data", function (chunk) {
-                chunks.push(chunk);
-            });
-            res.on("end", function (chunk) {
-                var body = Buffer.concat(chunks);
-                console.log(body.toString());
-            });
-            res.on("error", function (error) {
-                console.error(error);
-            });
-        });
-        var postData = "------WebKitFormBoundary7MA4YWxkTrZu0gW\r\nContent-Disposition: form-data; name=\"file\"; filename=\"Trans.bpmn\"\r\nContent-Type: \"text/plain\"\r\n\r\n" + fs.readFileSync(file) + "\r\n------WebKitFormBoundary7MA4YWxkTrZu0gW--";
-        req.setHeader('content-type', 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW');
-        req.write(postData);
-        req.end();
-        return req;
-    });
-}
-function request(name, path) {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log("Testing Request");
-        var http = require('http');
-        var fs = require('fs');
-        var options = {
-            'method': 'POST',
-            'hostname': 'localhost',
-            'port': 3000,
-            'path': '/api/definitions/import/' + name,
-            'headers': {
-                'x-api-key': '12345',
-                'Cookie': 'connect.sid=s%3AXMa01DuOlQ4WsrvBj0FVaIrTak49vLPB.hDIV9j7ONA437rZf%2F%2Biu%2Bc6B7T5%2FVuEIjj1BAaoCJW4'
-            },
-            'maxRedirects': 20
-        };
-        var req = http.request(options, function (res) {
-            var chunks = [];
-            res.on("data", function (chunk) {
-                chunks.push(chunk);
-            });
-            res.on("end", function (chunk) {
-                var body = Buffer.concat(chunks);
-                console.log(body.toString());
-            });
-            res.on("error", function (error) {
-                console.error(error);
-            });
-        });
-        var postData = "------WebKitFormBoundary7MA4YWxkTrZu0gW\r\nContent-Disposition: form-data; name=\"file\"; filename=\""
-            + path + "\"\r\nContent-Type: \"text/plain\"\r\n\r\n" +
-            fs.readFileSync(path) + "\r\n------WebKitFormBoundary7MA4YWxkTrZu0gW--";
-        req.setHeader('content-type', 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW');
-        req.write(postData);
-        req.end();
-        console.log('end');
-    });
-}
+"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 });
+//FromPostMan();
+//request('test4', 'Trans.bpmn');
+const _1 = require("./");
+console.log('remote-import.ts');
+//badImport();
+fromClientLib();
+console.log('-------------------');
+//FromPostMan();
+/*
+process.on('uncaughtException', function (err) {
+console.log('*******************Client ERROR***********');
+  console.error(err.stack);
+  throw err;
+});
+*/
+function badImport() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const path = require('path');
+        try {
+            const bpmnServer = new _1.BPMNClient('127.0.0.1', 3000, 12345);
+            const importResult = yield bpmnServer.definitions.import('dummyTest', path.resolve('test.js'));
+            console.log('badImport done');
+            return 'done';
+        }
+        catch (err) {
+            console.log('badImport Error', err);
+        }
+    });
+}
+function fromClientLib() {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('from client lib');
+        try {
+            const server = new _1.BPMNClient('localhost', 3000, '12345');
+            var name = 'test-import';
+            var file = '..\\WebApp\\processes\\Trans.bpmn';
+            var file2 = '..\\WebApp\\processes\\Trans.svg';
+            var res = yield server.definitions.import(name, file, file2);
+            return res;
+        }
+        catch (exc) {
+            console.log('*******ERROR********');
+            console.log(exc);
+        }
+    });
+}
+function FromPostMan() {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log("Testing Remote import");
+        var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
+        var http = require('follow-redirects').http;
+        //const http = require('http');
+        var fs = require('fs');
+        var options = {
+            'method': 'POST',
+            'hostname': 'localhost',
+            'port': 3000,
+            'path': '/api/definitions/import/testing4',
+            'headers': {
+                'x-api-key': '12345',
+                'Cookie': 'connect.sid=s%3AXMa01DuOlQ4WsrvBj0FVaIrTak49vLPB.hDIV9j7ONA437rZf%2F%2Biu%2Bc6B7T5%2FVuEIjj1BAaoCJW4'
+            },
+            'maxRedirects': 20
+        };
+        var req = http.request(options, function (res) {
+            var chunks = [];
+            res.on("data", function (chunk) {
+                chunks.push(chunk);
+            });
+            res.on("end", function (chunk) {
+                var body = Buffer.concat(chunks);
+                console.log(body.toString());
+            });
+            res.on("error", function (error) {
+                console.error(error);
+            });
+        });
+        var postData = "------WebKitFormBoundary7MA4YWxkTrZu0gW\r\nContent-Disposition: form-data; name=\"file\"; filename=\"Trans.bpmn\"\r\nContent-Type: \"text/plain\"\r\n\r\n" + fs.readFileSync(file) + "\r\n------WebKitFormBoundary7MA4YWxkTrZu0gW--";
+        req.setHeader('content-type', 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW');
+        req.write(postData);
+        req.end();
+        return req;
+    });
+}
+function request(name, path) {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log("Testing Request");
+        var http = require('http');
+        var fs = require('fs');
+        var options = {
+            'method': 'POST',
+            'hostname': 'localhost',
+            'port': 3000,
+            'path': '/api/definitions/import/' + name,
+            'headers': {
+                'x-api-key': '12345',
+                'Cookie': 'connect.sid=s%3AXMa01DuOlQ4WsrvBj0FVaIrTak49vLPB.hDIV9j7ONA437rZf%2F%2Biu%2Bc6B7T5%2FVuEIjj1BAaoCJW4'
+            },
+            'maxRedirects': 20
+        };
+        var req = http.request(options, function (res) {
+            var chunks = [];
+            res.on("data", function (chunk) {
+                chunks.push(chunk);
+            });
+            res.on("end", function (chunk) {
+                var body = Buffer.concat(chunks);
+                console.log(body.toString());
+            });
+            res.on("error", function (error) {
+                console.error(error);
+            });
+        });
+        var postData = "------WebKitFormBoundary7MA4YWxkTrZu0gW\r\nContent-Disposition: form-data; name=\"file\"; filename=\""
+            + path + "\"\r\nContent-Type: \"text/plain\"\r\n\r\n" +
+            fs.readFileSync(path) + "\r\n------WebKitFormBoundary7MA4YWxkTrZu0gW--";
+        req.setHeader('content-type', 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW');
+        req.write(postData);
+        req.end();
+        console.log('end');
+    });
+}

package/remote-import.ts

@@ -6,22 +6,57 @@ import { BPMNClient } from './';
 
 console.log('remote-import.ts');
 
+//badImport();
 fromClientLib();
 
 console.log('-------------------');
 //FromPostMan();
-
+/*
+process.on('uncaughtException', function (err) {
+console.log('*******************Client ERROR***********');
+  console.error(err.stack);
+  throw err;
+}); 
+*/
+async function badImport() 
+{
+    const path = require('path');
+
+        try{
+            const bpmnServer = new BPMNClient(
+                '127.0.0.1',
+                3000,
+               12345,
+            );
+
+            const importResult = await bpmnServer.definitions.import(
+                'dummyTest',
+                path.resolve('test.js'),
+            );
+            console.log('badImport done');
+            return 'done';
+        } catch(err){
+            console.log('badImport Error',err);
+        }
+}
 async function fromClientLib() {
 
     console.log('from client lib');
+	try {
     const server = new BPMNClient('localhost', 3000, '12345');
 
     var name = 'test-import';
-    var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
+    var file = '..\\WebApp\\processes\\Trans.bpmn';
+    var file2 = '..\\WebApp\\processes\\Trans.svg';
 
-    var res=await server.definitions.import(name, file);
-    //console.log(res.length);
+    var res=await server.definitions.import(name, file,file2);
     return res;
+	}
+	catch(exc)
+	{
+		console.log('*******ERROR********');
+		console.log(exc);
+	}
 }
 async function FromPostMan() {