bpmn-client 1.3.2 → 1.3.15

package/{testCLI.js → cli.js}

@@ -24,16 +24,23 @@ const question = function (q) {
     });
 };
 completeUserTask();
+function menu() {
+    console.log('Commands:');
+    console.log('	q	to quit');
+    console.log('	s	start process ');
+    console.log('	lo	list outstanding items');
+    console.log('	li	list items');
+    console.log('	l	list instances for a process');
+    console.log('	di	display Instance information');
+    console.log('	i	Invoke Task');
+    console.log('	sgl	Signal Task');
+    console.log('	msg	Message Task');
+    console.log('	d	delete instnaces');
+    console.log('	?	repeat this list');
+}
 function completeUserTask() {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('Commands:');
-        console.log('	q	to quit');
-        console.log('	s	start process ');
-        console.log('	lo	list outstanding items');
-        console.log('	l	list instances for a process');
-        console.log('	di	display Instance information');
-        console.log('	i	invoke item');
-        console.log('	d	delete instnaces');
+        menu();
         let option = '';
         var command;
         while (option !== 'q') {
@@ -41,16 +48,23 @@ function completeUserTask() {
             let opts = command.split(' ');
             option = opts[0];
             switch (option) {
+                case '?':
+                    menu();
+                    break;
                 case 'lo':
-                    console.log("list outstanding items");
+                    console.log("Listing Outstanding Items");
                     yield findItems({ "items.status": "wait" });
                     break;
                 case 'l':
-                    console.log("list instances");
+                    console.log("Listing Instances for a Process");
                     yield listInstances();
                     break;
+                case 'li':
+                    console.log("list items");
+                    yield listItems();
+                    break;
                 case 'di':
-                    console.log("displaying ");
+                    console.log("Displaying Instance Details");
                     yield displayInstance();
                     break;
                 case 'i':
@@ -58,9 +72,17 @@ function completeUserTask() {
                     yield invoke();
                     break;
                 case 's':
-                    console.log("starting");
+                    console.log("Starting Process");
                     yield start();
                     break;
+                case 'sgl':
+                    console.log("Signalling Process");
+                    yield signal();
+                    break;
+                case 'msg':
+                    console.log("Message Process");
+                    yield message();
+                    break;
                 case 'd':
                     console.log("deleting");
                     yield delInstances();
@@ -75,14 +97,22 @@ function start() {
     return __awaiter(this, void 0, void 0, function* () {
         const name = yield question('Please provide your process name: ');
         let taskData = yield question('Please provide your Task Data (json obj) if any: ');
-        if (taskData === "") {
-            taskData = {};
+        console.log(taskData);
+        try {
+            if (taskData === "") {
+                taskData = {};
+            }
+            else {
+                taskData = JSON.parse(taskData.toString());
+            }
         }
-        else {
-            taskData = JSON.parse(taskData.toString());
+        catch (exc) {
+            console.log(exc);
+            return;
         }
         let response = yield server.engine.start(name, taskData);
-        console.log("Process " + name + " started:", response.items, 'InstanceId', response.id);
+        console.log("Process " + name + " started:", 'InstanceId', response.id);
+        return yield displayInstance(response.id);
     });
 }
 function findItems(query) {
@@ -95,6 +125,26 @@ function findItems(query) {
         }
     });
 }
+function listItems() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const answer = yield question('Please items criteria name value pair; example: items.status wait ');
+        let str = '' + answer;
+        const list = str.split(' ');
+        let criteria = {};
+        console.log(list);
+        for (var i = 0; i < list.length; i += 2) {
+            console.log(list[i], list[i + 1]);
+            criteria[list[i]] = list[i + 1];
+        }
+        console.log(criteria);
+        var items = yield server.datastore.findItems(criteria);
+        console.log(items.length);
+        for (var j = 0; j < items.length; j++) {
+            let item = items[j];
+            console.log(`element: ${item.elementId} status: ${item.status}  processName: ${item['processName']} InstanceId: ${item['instanceId']}	id:	${item.id}`);
+        }
+    });
+}
 function listInstances() {
     return __awaiter(this, void 0, void 0, function* () {
         const name = yield question('Please provide your process name: ');
@@ -106,9 +156,10 @@ function listInstances() {
         }
     });
 }
-function displayInstance() {
+function displayInstance(instanceId = null) {
     return __awaiter(this, void 0, void 0, function* () {
-        const instanceId = yield question('Please provide your Instance ID: ');
+        if (instanceId == null)
+            instanceId = yield question('Please provide your Instance ID: ');
         let insts = yield server.datastore.findInstances({ id: instanceId });
         for (var i = 0; i < insts.length; i++) {
             let inst = insts[i];
@@ -135,7 +186,8 @@ function invoke() {
         }
         try {
             let response = yield server.engine.invoke({ id: instanceId, "items.elementId": taskId }, taskData);
-            console.log("Completed UserTask:", taskId, response.items);
+            console.log("Completed UserTask:", taskId);
+            return yield displayInstance(response.id);
         }
         catch (exc) {
             console.log("Invoking task failed for:", taskId, instanceId);
@@ -143,9 +195,49 @@ function invoke() {
         }
     });
 }
+function signal() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const signalId = yield question('Please provide signal ID: ');
+        let signalData = yield question('Please provide your Data (json obj) if any: ');
+        //if (typeof signalData === 'string' && signalData.trim() === '') {
+        if (signalData === "") {
+            signalData = {};
+        }
+        else {
+            try {
+                signalData = JSON.parse(signalData.toString());
+            }
+            catch (exc) {
+                console.log(exc);
+                return;
+            }
+        }
+        let response = yield server.engine.throwSignal(signalId, signalData);
+        console.log("Signal Response:", response);
+    });
+}
+function message() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const messageId = yield question('Please provide message ID: ');
+        let messageData = yield question('Please provide your Data (json obj) if any: ');
+        if (typeof messageData === 'string' && messageData.trim() === '') {
+            messageData = {};
+        }
+        else {
+            messageData = JSON.parse(messageData.toString());
+        }
+        let response = yield server.engine.throwMessage(messageId, messageData);
+        if (response['id'])
+            return yield displayInstance(response['id']);
+        else {
+            console.log(' no results.');
+            return null;
+        }
+    });
+}
 function delInstances() {
     return __awaiter(this, void 0, void 0, function* () {
-        const name = yield question('Please provide process name to delete instnaces: ');
+        const name = yield question('Please provide process name to delete instances for process: ');
         let response = yield server.datastore.deleteInstances({ name: name });
         console.log("Instances Deleted:", response['result']['deletedCount']);
     });

package/{testCLI.ts → cli.ts}

@@ -19,15 +19,24 @@ const question = function(q) {
 
 completeUserTask();
 
-async function completeUserTask() {
+function menu() {
 	console.log('Commands:');
 	console.log('	q	to quit');
 	console.log('	s	start process ');
 	console.log('	lo	list outstanding items');
+	console.log('	li	list items');
 	console.log('	l	list instances for a process');
 	console.log('	di	display Instance information');
-	console.log('	i	invoke item');
+	console.log('	i	Invoke Task');
+	console.log('	sgl	Signal Task');
+	console.log('	msg	Message Task');
 	console.log('	d	delete instnaces');
+	console.log('	?	repeat this list');
+
+}
+async function completeUserTask() {
+
+	menu();
 	
   let option='';
   var command;
@@ -38,16 +47,23 @@ async function completeUserTask() {
 	option=opts[0];
 	switch(option)
 	{
+		case '?':
+			menu();
+			break;
 		case 'lo':
-			console.log("list outstanding items");
+			console.log("Listing Outstanding Items");
 			await findItems({ "items.status": "wait"});
 			break;
 		case 'l':
-			console.log("list instances");
+			console.log("Listing Instances for a Process");
 			await listInstances();
 			break;
+		case 'li':
+			console.log("list items");
+			await listItems();
+			break;
 		case 'di':
-			console.log("displaying ");
+			console.log("Displaying Instance Details");
 			await displayInstance();
 			break;
 		case 'i':
@@ -56,9 +72,18 @@ async function completeUserTask() {
 			break;
 			
 		case 's':
-			console.log("starting");
+			console.log("Starting Process");
 			await start();
 			break;
+		case 'sgl':
+			console.log("Signalling Process");
+			await signal();
+			break;
+		case 'msg':
+			console.log("Message Process");
+			await message();
+			break;
+
 		case 'd':
 			console.log("deleting");
 			await delInstances();
@@ -79,15 +104,25 @@ async function start()
   const name = await question('Please provide your process name: ');
   let taskData = await question('Please provide your Task Data (json obj) if any: ');
 
-  if (taskData === ""){
-      taskData = {};
-  }else{
-      taskData = JSON.parse(taskData.toString());
-  }
+	console.log(taskData);
+
+	try {
+		if (taskData === "") {
+			taskData = {};
+		} else {
+			taskData = JSON.parse(taskData.toString());
+		}
+
+	}
+	catch (exc) {
+		console.log(exc);
+		return;
+    }
   
   let response=await server.engine.start(name, taskData);
 
-  console.log("Process "+name+" started:", response.items,'InstanceId',response.id);
+	console.log("Process " + name + " started:", 'InstanceId', response.id);
+	return await displayInstance(response.id);
 }
 async function findItems(query) {
 	var items = await server.datastore.findItems(query);
@@ -99,6 +134,28 @@ async function findItems(query) {
 	}
 
 }
+async function listItems() {
+	const answer = await question('Please items criteria name value pair; example: items.status wait ');
+	let str=''+ answer;
+
+	const list = str.split(' ');
+	let criteria = {};
+	console.log(list);
+	for (var i = 0; i < list.length; i += 2) {
+		console.log(list[i], list[i + 1]);
+		criteria[list[i]] = list[i + 1];
+    }
+	console.log(criteria);	
+
+	var items = await server.datastore.findItems(criteria)
+	console.log(items.length);
+
+	for (var j = 0; j < items.length; j++) {
+		let item = items[j];
+		console.log(`element: ${item.elementId} status: ${item.status}  processName: ${item['processName']} InstanceId: ${item['instanceId']}	id:	${item.id}`);
+	}
+}
+
 async function listInstances() {
 	const name = await question('Please provide your process name: ');
 
@@ -111,8 +168,10 @@ async function listInstances() {
 	}
 }
 
-async function displayInstance() {
-	const instanceId = await question('Please provide your Instance ID: ');
+async function displayInstance(instanceId=null) {
+
+	if (instanceId==null)
+		instanceId = await question('Please provide your Instance ID: ');
 
 	let insts = await server.datastore.findInstances({id: instanceId})
 
@@ -144,8 +203,9 @@ async function invoke()
 			{ id: instanceId, "items.elementId": taskId }
 			, taskData);
 
-		console.log("Completed UserTask:", taskId, response.items);
+		console.log("Completed UserTask:", taskId);
 
+		return await displayInstance(response.id);
 	}
 	catch (exc) {
 		console.log("Invoking task failed for:", taskId, instanceId);
@@ -154,8 +214,53 @@ async function invoke()
 
     }
 }
+
+async function signal() {
+	const signalId = await question('Please provide signal ID: ');
+
+	let signalData = await question('Please provide your Data (json obj) if any: ');
+
+	//if (typeof signalData === 'string' && signalData.trim() === '') {
+	if (signalData === "") {
+		signalData = {};
+	} else {
+		try {
+			signalData = JSON.parse(signalData.toString());
+		}
+		catch (exc) {
+			console.log(exc);
+			return;
+        }
+	}
+
+	let response = await server.engine.throwSignal(signalId, signalData);
+
+	console.log("Signal Response:", response);
+}
+
+async function message() {
+	const messageId = await question('Please provide message ID: ');
+
+	let messageData = await question('Please provide your Data (json obj) if any: ');
+
+	if (typeof messageData === 'string' && messageData.trim() === '') {
+		messageData = {};
+	} else {
+		messageData = JSON.parse(messageData.toString());
+	}
+
+	let response = await server.engine.throwMessage(messageId, messageData);
+
+	if (response['id'])
+		return await displayInstance(response['id']);
+	else {
+		console.log(' no results.');
+		return null;
+    }
+}
+
 async function delInstances() {
-	const name = await question('Please provide process name to delete instnaces: ');
+	const name = await question('Please provide process name to delete instances for process: ');
 
 	let response = await server.datastore.deleteInstances({ name: name });
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "bpmn-client",
-  "version": "1.3.2",
+  "version": "1.3.15",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",
-    "compileRun": "tsc --build && node test.js",
+    "compileRun": "tsc --build && node cli.js",
     "dev": "nodemon -e ts  --exec \"npm run compileRun\"",
     "clean": "tsc --build --clean",
-    "start": "node test.ts",
+    "start": "node cli.ts",
     "test": "mocha -exit --config=test\\.mocharc.json"
   },
   "description": "Client API for BPMN-Server webservices",

package/remote-import.js

@@ -0,0 +1,97 @@
+"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("./");
+fromClientLib();
+//FromPostMan();
+function fromClientLib() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const server = new _1.BPMNClient('localhost', 3000, '1234');
+        var name = 'test-import';
+        var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
+        server.definitions.import(name, file);
+    });
+}
+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;
+        var fs = require('fs');
+        var options = {
+            'method': 'POST',
+            'hostname': 'localhost',
+            'port': 3000,
+            'path': '/api/definitions/import/testing3',
+            '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();
+    });
+}
+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();
+    });
+}

package/remote-import.ts

@@ -0,0 +1,116 @@
+
+//FromPostMan();
+//request('test4', 'Trans.bpmn');
+import { BPMNClient } from './';
+
+
+
+fromClientLib();
+//FromPostMan();
+
+async function fromClientLib() {
+    const server = new BPMNClient('localhost', 3000, '1234');
+
+    var name = 'test-import';
+    var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
+
+    server.definitions.import(name, file);
+
+}
+async function FromPostMan() {
+
+    console.log("Testing Remote import");
+    var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
+
+
+    var http = require('follow-redirects').http;
+    var fs = require('fs');
+
+    var options = {
+        'method': 'POST',
+        'hostname': 'localhost',
+        'port': 3000,
+        'path': '/api/definitions/import/testing3',
+        '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();
+
+}
+
+
+async function request(name,path) {
+
+    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();
+
+}

package/src/BPMNClient.js

@@ -13,9 +13,10 @@ exports.ClientDefinitions = exports.ClientDatastore = exports.ClientEngine = exp
 console.log("BPMNClient 1.2");
 const https = require('https');
 const http = require('http');
+const fs = require("fs");
 class WebService {
     constructor() { }
-    invoke(params, options) {
+    invoke(params, options, postData = null) {
         return __awaiter(this, void 0, void 0, function* () {
             var driver = http;
             var body = JSON.stringify(params);
@@ -26,7 +27,7 @@ class WebService {
             let self = this;
             return new Promise(function (resolve, reject) {
                 try {
-                    driver.request(options, function (res) {
+                    var req = driver.request(options, function (res) {
                         //                    console.log('STATUS: ' + res.statusCode);
                         this.response = res;
                         //console.log(res);
@@ -36,13 +37,23 @@ class WebService {
                             data += chunk;
                         });
                         res.on('end', () => {
-                            self.result = JSON.parse(data);
-                            resolve(self.result);
+                            try {
+                                self.result = JSON.parse(data);
+                                resolve(self.result);
+                            }
+                            catch (exc) {
+                                console.log(data);
+                                console.log(exc);
+                            }
                         });
-                    }).on("error", (err) => {
+                    });
+                    req.on("error", (err) => {
                         console.log("Error: " + err.message);
                         reject(err);
-                    }).end(body);
+                    });
+                    if (postData !== null)
+                        req.write(postData);
+                    req.end(body);
                 }
                 catch (exc) {
                     console.log(exc);
@@ -81,9 +92,59 @@ class BPMNClient extends WebService {
             return yield this.request(url, 'DELETE', data);
         });
     }
+    upload(url, fileName, path) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('upload');
+            var options = {
+                'method': 'POST',
+                'hostname': this.host,
+                'port': this.port,
+                'path': url + '/' + fileName,
+                'headers': {
+                    'x-api-key': this.apiKey
+                },
+                '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=\""
+                + fileName + "\"\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();
+        });
+    }
     request(url, method, params) {
         return __awaiter(this, void 0, void 0, function* () {
             var body = JSON.stringify(params);
+            var size = Buffer.byteLength(body);
+            var contentType = "application/json";
+            if (method == 'UPLOAD') {
+                contentType = 'multipart/form-data; boundary = ----WebKitFormBoundary7MA4YWxkTrZu0gW';
+                method = 'POST';
+            }
+            var headers = {
+                "Content-Type": contentType,
+                "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)
+            };
             var options;
             if (params) {
                 options = {
@@ -91,15 +152,7 @@ class BPMNClient extends WebService {
                     port: this.port,
                     path: '/api/' + url,
                     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)
-                    }
+                    headers: headers
                 };
             }
             else {
@@ -141,9 +194,9 @@ class ClientEngine {
             return instance;
         });
     }
-    throwMessage(messageId, data) {
+    throwMessage(messageId, data = {}, messageMatchingKey = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield this.client.put('engine/throwMessage', { "messageId": messageId, "data": data });
+            const ret = yield this.client.post('engine/throwMessage', { "messageId": messageId, "data": data, messageMatchingKey });
             if (ret['errors']) {
                 console.log(ret['errors']);
                 throw new Error(ret['errors']);
@@ -151,9 +204,9 @@ class ClientEngine {
             return ret;
         });
     }
-    throwSignal(signalId, data) {
+    throwSignal(signalId, data = {}, messageMatchingKey = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield this.client.put('engine/throwSignal', { "signalId": signalId, "data": data });
+            const ret = yield this.client.post('engine/throwSignal', { "signalId": signalId, "data": data, messageMatchingKey });
             if (ret['errors']) {
                 console.log(ret['errors']);
                 throw new Error(ret['errors']);
@@ -221,6 +274,12 @@ class ClientDefinitions {
     constructor(client) {
         this.client = client;
     }
+    import(name, path) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var res = yield this.client.upload('definitions/import', name, path);
+            return res;
+        });
+    }
     list() {
         return __awaiter(this, void 0, void 0, function* () {
             var res = yield this.client.get('definitions/list', []);
@@ -231,9 +290,31 @@ class ClientDefinitions {
             return res;
         });
     }
+    delete(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this.client.post('definitions/delete/', { name });
+            if (res['errors']) {
+                console.log(res['errors']);
+                throw new Error(res['errors']);
+            }
+            console.log(res);
+            return res;
+        });
+    }
+    rename(name, newName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this.client.post('definitions/rename/', { name, newName });
+            if (res['errors']) {
+                console.log(res['errors']);
+                throw new Error(res['errors']);
+            }
+            console.log(res);
+            return res;
+        });
+    }
     load(name) {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.client.get(encodeURI('definitions/load/' + name), { name: name });
+            const res = yield this.client.get(encodeURI('definitions/load/' + name), { name });
             if (res['errors']) {
                 console.log(res['errors']);
                 throw new Error(res['errors']);

package/src/BPMNClient.ts

@@ -4,15 +4,18 @@ console.log("BPMNClient 1.2");
 
 const https = require('https');
 const http = require('http');
+const fs = require("fs");
 
 class WebService {
     statusCode;
     result;
     response;
     constructor() { }
-    async invoke(params, options) {
+
+    async invoke(params, options,postData=null) {
 
         var driver = http;
+
         var body = JSON.stringify(params);
 
 //        console.log(options, params);
@@ -24,8 +27,8 @@ class WebService {
         return new Promise(function (resolve, reject) {
             try {
 
-                driver.request(options, function (res) {
-//                    console.log('STATUS: ' + res.statusCode);
+                var req = driver.request(options, function (res) {
+                    //                    console.log('STATUS: ' + res.statusCode);
                     this.response = res;
                     //console.log(res);
                     self.statusCode = res.statusCode;
@@ -34,16 +37,26 @@ class WebService {
                         data += chunk;
                     });
                     res.on('end', () => {
-                        self.result = JSON.parse(data);
-
-                        resolve(self.result);
+                        try {
+                            self.result = JSON.parse(data);
+                            resolve(self.result);
+                        }
+                        catch (exc) {
+                            console.log(data);
+                            console.log(exc);
+                        }
                     });
 
 
-                }).on("error", (err) => {
+                });
+                req.on("error", (err) => {
                     console.log("Error: " + err.message);
                     reject(err);
-                }).end(body);
+                });
+                if (postData !==null)
+                    req.write(postData);
+
+                req.end(body);
             }
             catch (exc) {
                 console.log(exc);
@@ -87,9 +100,70 @@ class BPMNClient extends WebService {
         return await this.request(url, 'DELETE', data);
 
     }
+
+    async upload(url, fileName, path) {
+        console.log('upload');
+        var options = {
+            'method': 'POST',
+            'hostname': this.host,
+            'port': this.port,
+            'path': url + '/' + fileName,
+            'headers': {
+                'x-api-key': this.apiKey
+            },
+            '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=\""
+            + fileName + "\"\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();
+    }
+
+
     async request(url, method, params) {
 
         var body = JSON.stringify(params);
+        var size = Buffer.byteLength(body);
+        var contentType = "application/json";
+
+        if (method == 'UPLOAD') {
+            contentType = 'multipart/form-data; boundary = ----WebKitFormBoundary7MA4YWxkTrZu0gW';
+            method = 'POST';
+        }
+
+        var headers = {
+            "Content-Type": contentType ,
+            "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)
+        };
+
 
         var options;
 
@@ -99,15 +173,7 @@ class BPMNClient extends WebService {
                 port: this.port,
                 path: '/api/' + url,
                 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)
-                }
+                headers: headers
             };
         }
         else {
@@ -132,7 +198,7 @@ class ClientEngine {
     constructor(client) {
         this.client = client;
     }
-    async start(name, data = {} , startNodeId = null, options = {}): Promise<IInstanceData> {
+    async start(name, data = {}, startNodeId = null, options = {}): Promise<IInstanceData> {
         const ret = await this.client.post('engine/start',
             { name, data, startNodeId, options });
         if (ret['errors']) {
@@ -152,16 +218,16 @@ class ClientEngine {
         return instance;
     }
 
-    async throwMessage(messageId, data) {
-        const ret = await this.client.put('engine/throwMessage', { "messageId": messageId , "data": data });
+    async throwMessage(messageId, data = {} , messageMatchingKey = {}) {
+        const ret = await this.client.post('engine/throwMessage', { "messageId": messageId, "data": data, messageMatchingKey });
         if (ret['errors']) {
             console.log(ret['errors']);
             throw new Error(ret['errors']);
         }
         return ret;
     }
-    async throwSignal(signalId, data) {
-        const ret = await this.client.put('engine/throwSignal', { "signalId": signalId, "data": data });
+    async throwSignal(signalId, data = {} , messageMatchingKey = {}) {
+        const ret = await this.client.post('engine/throwSignal', { "signalId": signalId, "data": data, messageMatchingKey });
         if (ret['errors']) {
             console.log(ret['errors']);
             throw new Error(ret['errors']);
@@ -205,6 +271,7 @@ class ClientDatastore {
     }
     async findInstances(query): Promise<IInstanceData[]> {
         const res = await this.client.get('datastore/findInstances', query);
+
         if (res['errors']) {
             console.log(res['errors']);
             throw new Error(res['errors']);
@@ -222,6 +289,15 @@ class ClientDefinitions {
     constructor(client) {
         this.client = client;
     }
+
+    
+    async import(name, path) {
+
+        var res = await this.client.upload('definitions/import',name,path);
+
+        return res;
+
+    }
     async list(): Promise<string[]> {
         var res = await this.client.get('definitions/list', []);
         if (res['errors']) {
@@ -230,9 +306,29 @@ class ClientDefinitions {
         }
         return res as string[];
 
+    }
+    async delete(name) {
+        const res = await this.client.post('definitions/delete/', { name });
+        if (res['errors']) {
+            console.log(res['errors']);
+            throw new Error(res['errors']);
+        }
+        console.log(res);
+        return res as IDefinitionData;
+
+    }
+    async rename(name,newName) {
+        const res = await this.client.post('definitions/rename/', { name , newName });
+        if (res['errors']) {
+            console.log(res['errors']);
+            throw new Error(res['errors']);
+        }
+        console.log(res);
+        return res as IDefinitionData;
+
     }
     async load(name): Promise<IDefinitionData> {
-        const res = await this.client.get(encodeURI('definitions/load/' + name), { name: name });
+        const res = await this.client.get(encodeURI('definitions/load/' + name), { name });
         if (res['errors']) {
             console.log(res['errors']);
             throw new Error(res['errors']);

package/src/interfaces/Enums.js

@@ -9,7 +9,7 @@ var BPMN_TYPE;
     BPMN_TYPE["SendTask"] = "bpmn:SendTask";
     BPMN_TYPE["ReceiveTask"] = "bpmn:ReceiveTask";
     BPMN_TYPE["BusinessRuleTask"] = "bpmn:BusinessRuleTask";
-    BPMN_TYPE["SubProcess"] = "bpmn:SubProces";
+    BPMN_TYPE["SubProcess"] = "bpmn:SubProcess";
     BPMN_TYPE["ParallelGateway"] = "bpmn:ParallelGateway";
     BPMN_TYPE["EventBasedGateway"] = "bpmn:EventBasedGateway";
     BPMN_TYPE["InclusiveGateway"] = "bpmn:InclusiveGateway";
@@ -31,6 +31,8 @@ var NODE_SUBTYPE;
     NODE_SUBTYPE["signal"] = "signal";
     NODE_SUBTYPE["error"] = "error";
     NODE_SUBTYPE["escalation"] = "escalation";
+    NODE_SUBTYPE["cancel"] = "cancel";
+    NODE_SUBTYPE["compensate"] = "compensate";
 })(NODE_SUBTYPE || (NODE_SUBTYPE = {}));
 exports.NODE_SUBTYPE = NODE_SUBTYPE;
 /*
@@ -56,7 +58,7 @@ var EXECUTION_EVENT;
     EXECUTION_EVENT["process_resumed"] = "process_resumed";
     EXECUTION_EVENT["process_wait"] = "process.wait";
     EXECUTION_EVENT["process_end"] = "process.end";
-    EXECUTION_EVENT["process_terminated"] = "executeion.terminate";
+    EXECUTION_EVENT["process_terminated"] = "process.terminated";
     EXECUTION_EVENT["token_start"] = "token.start";
     EXECUTION_EVENT["token_wait"] = "token.wait";
     EXECUTION_EVENT["token_end"] = "token.end";
@@ -85,6 +87,7 @@ var ITEM_STATUS;
     ITEM_STATUS["wait"] = "wait";
     ITEM_STATUS["end"] = "end";
     ITEM_STATUS["terminated"] = "terminated";
+    ITEM_STATUS["cancelled"] = "cancelled";
     ITEM_STATUS["discard"] = "discard";
 })(ITEM_STATUS || (ITEM_STATUS = {}));
 exports.ITEM_STATUS = ITEM_STATUS;

package/src/interfaces/Enums.ts

@@ -6,7 +6,7 @@ enum BPMN_TYPE {
     SendTask = 'bpmn:SendTask',
     ReceiveTask = 'bpmn:ReceiveTask',
     BusinessRuleTask = 'bpmn:BusinessRuleTask',
-    SubProcess = 'bpmn:SubProces',
+    SubProcess = 'bpmn:SubProcess',
     ParallelGateway = 'bpmn:ParallelGateway',
     EventBasedGateway = 'bpmn:EventBasedGateway',
     InclusiveGateway = 'bpmn:InclusiveGateway',
@@ -26,7 +26,10 @@ enum NODE_SUBTYPE {
     message = 'message',
     signal = 'signal',
     error = 'error',
-    escalation = 'escalation'
+    escalation = 'escalation',
+    cancel = 'cancel',
+
+    compensate = 'compensate'
 }
 /*
  * ALL events 
@@ -40,7 +43,7 @@ enum EXECUTION_EVENT {
     process_invoke = 'process.invoke',     process_invoked = 'process.invoked',
     process_restored = 'process.restored', process_resumed = 'process_resumed',
     process_wait = 'process.wait',
-    process_end = 'process.end', process_terminated = 'executeion.terminate' ,
+    process_end = 'process.end', process_terminated = 'process.terminated' ,
     token_start = 'token.start', token_wait = 'token.wait', token_end = 'token.end', token_terminated = 'token.terminated' 
 }
 /*
@@ -49,7 +52,16 @@ enum EXECUTION_EVENT {
 //   must be same as above
 enum NODE_ACTION { continue = 1, wait,  end , stop , error , abort  };
 
-enum ITEM_STATUS {  enter = 'enter', start = 'start', wait = 'wait', end = 'end', terminated = 'terminated' , discard= 'discard'}
+enum ITEM_STATUS {
+    enter = 'enter',
+    start = 'start',
+    wait = 'wait',
+    end = 'end',
+    terminated = 'terminated',
+    cancelled = 'cancelled',
+    discard = 'discard'
+
+}
 
 //type ITEMSTATUS = 'enter' | 'start' | 'wait' | 'end' | 'terminated' | 'discard';
 
@@ -63,7 +75,6 @@ enum TOKEN_STATUS { running = 'running', wait = 'wait', end = 'end', terminated
 
 enum FLOW_ACTION { take = 'take', discard = 'discard' }
 
-
 export {
     BPMN_TYPE ,
     EXECUTION_EVENT, NODE_ACTION, FLOW_ACTION,

package/test.js

@@ -13,8 +13,58 @@ const _1 = require("./");
 console.log("Testing BPMNClient");
 const dotenv = require('dotenv');
 const res = dotenv.config();
-console.log(res);
-test();
+const fs = require('fs');
+const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+//testMessage();
+testImport();
+function testImport() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var file = 'test-import';
+        var path = '../webApp/processes/Trans.bpmn';
+        var postData = "------WebKitFormBoundary7MA4YWxkTrZu0gW\r\nContent-Disposition: form-data;filename=\"" + path + "\"\r\nContent-Type: \"text/plain\"\r\n\r\n" + fs.readFileSync(file) + "\r\n------WebKitFormBoundary7MA4YWxkTrZu0gW--";
+        console.log(postData);
+        //        var res = await upload('definitions/import/' + name, postData);
+        if (res['errors']) {
+            console.log(res['errors']);
+            throw new Error(res['errors']);
+        }
+    });
+}
+function testImport2() {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('calling');
+        var file = '../webApp/processes/Trans.bpmn';
+        let response = yield server.definitions.import('testing_123', file);
+        console.log(response);
+    });
+}
+function displayInstance(instanceId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let insts = yield server.datastore.findInstances({ id: instanceId });
+        for (var i = 0; i < insts.length; i++) {
+            let inst = insts[i];
+            var items = inst.items;
+            console.log(`name: ${inst.name} status: ${inst.status}	instanceId:	${inst.id}
+	startedAt: ${inst.startedAt} endedAt ${inst.endedAt}`, 'data:', inst.data);
+            for (var j = 0; j < items.length; j++) {
+                let item = items[j];
+                console.log(`element: ${item.elementId} status: ${item.status}	id:	${item.id}`);
+            }
+        }
+    });
+}
+function testMessage() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const messageId = 'Message-104';
+        let messageData = {};
+        console.log('calling');
+        let response = yield server.engine.throwMessage(messageId, messageData);
+        if (response['id'])
+            return yield displayInstance(response['id']);
+        else
+            return null;
+    });
+}
 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);

package/test.ts

@@ -4,9 +4,69 @@ import { BPMNClient } from './';
 console.log("Testing BPMNClient");
 const dotenv = require('dotenv');
 const res = dotenv.config();
+const fs = require('fs');
+
+const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+
+//testMessage();
+testImport();
+
+async function testImport() {
+
+
+    var file = 'test-import';
+    var path = '../webApp/processes/Trans.bpmn';
+
+        var postData = "------WebKitFormBoundary7MA4YWxkTrZu0gW\r\nContent-Disposition: form-data;filename=\"" + path + "\"\r\nContent-Type: \"text/plain\"\r\n\r\n" + fs.readFileSync(file) + "\r\n------WebKitFormBoundary7MA4YWxkTrZu0gW--";
+
+        console.log(postData);
+//        var res = await upload('definitions/import/' + name, postData);
+
+    if(res['errors']) {
+        console.log(res['errors']);
+        throw new Error(res['errors']);
+    }
+
+}
+async function testImport2() {
+
+
+    console.log('calling');
+    var file = '../webApp/processes/Trans.bpmn';
+    let response = await server.definitions.import('testing_123', file);
+    console.log(response);
+}
+
+async function displayInstance(instanceId) {
+
+    let insts = await server.datastore.findInstances({ id: instanceId })
+
+    for (var i = 0; i < insts.length; i++) {
+        let inst = insts[i];
+        var items = inst.items;
+        console.log(`name: ${inst.name} status: ${inst.status}	instanceId:	${inst.id}
+	startedAt: ${inst.startedAt} endedAt ${inst.endedAt}`, 'data:', inst.data);
+        for (var j = 0; j < items.length; j++) {
+            let item = items[j];
+            console.log(`element: ${item.elementId} status: ${item.status}	id:	${item.id}`);
+        }
+    }
+}
+
+
+async function testMessage() {
+    const messageId = 'Message-104';
+
+    let messageData = {};
+
+    console.log('calling');
+    let response = await server.engine.throwMessage(messageId, messageData);
+    if (response['id'])
+        return await displayInstance(response['id']);
+    else
+        return null;
+}
 
-console.log(res);
-test();
 
 async function test() {