bpmn-client 1.3.2 → 1.3.8

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.8",
   "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/src/BPMNClient.js

@@ -36,8 +36,14 @@ 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) => {
                         console.log("Error: " + err.message);
@@ -141,9 +147,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 +157,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']);

package/src/BPMNClient.ts

@@ -34,9 +34,14 @@ 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);
+                        }
                     });
 
 
@@ -132,7 +137,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 +157,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']);

package/test.js

@@ -13,8 +13,35 @@ const _1 = require("./");
 console.log("Testing BPMNClient");
 const dotenv = require('dotenv');
 const res = dotenv.config();
-console.log(res);
-test();
+const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+testMessage();
+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

@@ -5,8 +5,40 @@ console.log("Testing BPMNClient");
 const dotenv = require('dotenv');
 const res = dotenv.config();
 
-console.log(res);
-test();
+const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+
+testMessage();
+
+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;
+}
+
 
 async function test() {