bpmn-client 1.2.0 → 1.3.2

package/src/BPMNClient.ts

@@ -1,9 +1,5 @@
 import { IInstanceData, IItemData , IDefinitionData} from './interfaces/DataObjects';
 
-
-const dotenv = require('dotenv');
-const res = dotenv.config();
-
 console.log("BPMNClient 1.2");
 
 const https = require('https');
@@ -12,13 +8,14 @@ const http = require('http');
 class WebService {
     statusCode;
     result;
+    response;
     constructor() { }
     async invoke(params, options) {
 
         var driver = http;
         var body = JSON.stringify(params);
 
-        console.log(options, params);
+//        console.log(options, params);
         if (options.port == 443)
             driver = https;
 
@@ -28,7 +25,8 @@ class WebService {
             try {
 
                 driver.request(options, function (res) {
-                    console.log('STATUS: ' + res.statusCode);
+//                    console.log('STATUS: ' + res.statusCode);
+                    this.response = res;
                     //console.log(res);
                     self.statusCode = res.statusCode;
                     res.setEncoding('utf8');
@@ -61,6 +59,8 @@ class BPMNClient extends WebService {
     apiKey;
     engine: ClientEngine;
     datastore: ClientDatastore;
+    definitions: ClientDefinitions;
+
     constructor(host, port, apiKey) {
         super();
         this.host = host;
@@ -68,6 +68,7 @@ class BPMNClient extends WebService {
         this.apiKey = apiKey;
         this.engine = new ClientEngine(this);
         this.datastore = new ClientDatastore(this);
+        this.definitions = new ClientDefinitions(this);
     }
 
     async get(url, data = {}) {
@@ -131,8 +132,9 @@ class ClientEngine {
     constructor(client) {
         this.client = client;
     }
-    async start(name, data): Promise<IInstanceData> {
-        const ret = await this.client.post('engine/start', { name, data });
+    async start(name, data = {} , startNodeId = null, options = {}): Promise<IInstanceData> {
+        const ret = await this.client.post('engine/start',
+            { name, data, startNodeId, options });
         if (ret['errors']) {
             console.log(ret['errors']);
             throw new Error(ret['errors']);
@@ -150,6 +152,23 @@ class ClientEngine {
         return instance;
     }
 
+    async throwMessage(messageId, data) {
+        const ret = await this.client.put('engine/throwMessage', { "messageId": messageId , "data": data });
+        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 });
+        if (ret['errors']) {
+            console.log(ret['errors']);
+            throw new Error(ret['errors']);
+        }
+        return ret;
+    }
+
     async get(query): Promise<IInstanceData> {
         const ret = await this.client.get('engine/get', query);
         if (ret['errors']) {
@@ -159,6 +178,14 @@ class ClientEngine {
         const instance = ret['instance'] as IInstanceData;
         return instance;
     }
+    async status() {
+        const ret = await this.client.get('engine/status', {});
+        if (ret['errors']) {
+            console.log(ret['errors']);
+            throw new Error(ret['errors']);
+        }
+        return ret;
+    }
 }
 class ClientDatastore {
     private client: BPMNClient;
@@ -186,7 +213,7 @@ class ClientDatastore {
         return instances;
     }
     async deleteInstances(query) {
-        return await this.client.del('datastore/delete', query);
+        return await this.client.del('datastore/deleteInstances', query);
     }
 }
 class ClientDefinitions {

package/test/.mocharc.json

@@ -0,0 +1,12 @@
+{
+  "diff": true,
+  "extension": [ "js" ],
+  "package": "package.json",
+  "reporter": "spec",
+  "slow": 1500,
+  "timeout": 50000,
+  "recursive": true,
+  "file": [ "test/helpers/setup.js" ],
+  "ui": "mocha-cakes-2",
+  "watch-files": [ "test/feature/*.js" ]
+}

package/test/feature/.env

@@ -1,5 +1,3 @@
 API_KEY=1234
-MONGO_DB_URL=mongodb://localhost:27017?retryWrites=true&w=majority
-MONGO_DB_NAME=bpmn
-SENDGRID_API_KEY=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
+
 

package/test/feature/carServer.js

@@ -3,10 +3,10 @@ const {  BPMNClient } = require("../../src/");
 
 
 const API_KEY = '12345';
-//const HOST = 'localhost';
-//const PORT = '3000';
-const HOST = 'test.omniworkflow.com';
-const PORT = '443';
+const HOST = 'localhost';
+const PORT = '3000';
+//const HOST = 'test.omniworkflow.com';
+//const PORT = '443';
 
 const BASE_URL = 'api';
 
@@ -89,6 +89,11 @@ Feature('Buy Used Car- clean and repair', () => {
 
         });
 
+        and('find engine status', async () => {
+
+            var insts = await server.engine.status();
+ 
+        });
 
         // 
         and('find instances', async () => {

package/test.env

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

package/test.js

@@ -9,21 +9,72 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const BPMNClient_1 = require("./src/BPMNClient");
+const _1 = require("./");
 console.log("Testing BPMNClient");
+const dotenv = require('dotenv');
+const res = dotenv.config();
+console.log(res);
 test();
 function test() {
     return __awaiter(this, void 0, void 0, function* () {
-        const client = new BPMNClient_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' });
+        const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+        const caseId = 3040;
+        var delResp = yield server.datastore.deleteInstances({ name: 'Buy Used Car' });
+        //console.log(delResp);
+        //return;
+        var defs = yield server.definitions.list();
+        console.log(defs);
+        var def = yield server.definitions.load('Buy Used Car');
+        console.log(def['elements']);
+        //var instance = await server.engine.start("Buy Used Car", {});
+        var instance = yield server.engine.start("Buy Used Car", { caseId: caseId });
+        console.log("instance.id", instance.id, instance.name, instance.status, instance.data.caseId);
+        var response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_Buy' }, { needsCleaning: "Yes", needsRepairs: "Yes" });
+        console.log('after buy', response.id, response.data);
+        response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_clean' }, {});
+        console.log('after clean', response.id, response.data);
+        response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_repair' }, {});
+        console.log('after repair', response.id, response.data);
+        try {
+            response = yield server.engine.invoke({ id: instance.id, "items.elementId": 'task_Drive' }, {});
+            console.log('after drive', response.id, response.data);
+        }
+        catch (exc) {
+            console.log(exc);
+        }
+        var items = yield server.datastore.findItems({ "items.status": "end", "items.elementId": "task_Buy" });
+        items.forEach(item => {
+            console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
+        });
+        var insts = yield server.datastore.findInstances({ data: { caseId: caseId } });
+        insts.forEach(inst => {
+            console.log('Inst for CaseId id==>' + inst.id, inst.name, inst.data.caseId, 'status==>', inst.status);
+        });
+        var insts = yield server.datastore.findInstances({ id: instance.id });
         insts.forEach(inst => {
-            console.log('id==>' + inst.id, inst.name, 'status==>', inst.status);
+            for (var i = 0; i < inst.items.length; i++) {
+                var item = inst.items[i];
+                console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+            }
         });
-        var items = yield client.datastore.findItems({ query: { "items.elementId": "task_Buy" } });
+        var inst = yield server.engine.get({ id: instance.id });
+        for (var i = 0; i < inst.items.length; i++) {
+            var item = inst.items[i];
+            console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+        }
+        //    var items = await server.datastore.findItems({ query: { "items.elementId": "task_Buy" } });
+        var items = yield server.datastore.findItems({ id: instance.id });
         items.forEach(item => {
-            console.log('item: id==>' + item.id, item.name, 'status==>', item.status);
+            console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
+        });
+    });
+}
+function delay(time, result) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(function (resolve) {
+            setTimeout(function () {
+                resolve(result);
+            }, time);
         });
     });
 }

package/test.ts

@@ -1,27 +1,121 @@
-import { BPMNClient } from './src/BPMNClient';
+import { BPMNClient } from './';
 
 
 console.log("Testing BPMNClient");
+const dotenv = require('dotenv');
+const res = dotenv.config();
+
+console.log(res);
 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' });
+    const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+
+    const caseId = 3040;
+
+
+    var delResp = await server.datastore.deleteInstances({ name: 'Buy Used Car' });
+    //console.log(delResp);
+    //return;
+    var defs = await server.definitions.list();
+
+    console.log(defs);
+    var def = await server.definitions.load('Buy Used Car');
+
+    console.log(def['elements']);
+
+    //var instance = await server.engine.start("Buy Used Car", {});
+
+    var instance = await server.engine.start("Buy Used Car", { caseId: caseId });
+
+
+    console.log("instance.id", instance.id, instance.name, instance.status, instance.data.caseId);
+
+    var response = await server.engine.invoke(
+        { id: instance.id, "items.elementId": 'task_Buy' }
+        , { needsCleaning: "Yes", needsRepairs: "Yes" });
+
+    console.log('after buy', response.id, response.data);
+
+    response = await server.engine.invoke(
+        { id: instance.id, "items.elementId": 'task_clean' }
+        , {});
+
+    console.log('after clean', response.id, response.data);
+
+    response = await server.engine.invoke(
+        { id: instance.id, "items.elementId": 'task_repair' }
+        , {});
+
+    console.log('after repair', response.id, response.data);
+
+
+    try {
+        response = await server.engine.invoke(
+            { id: instance.id, "items.elementId": 'task_Drive' }
+            , {});
+
+        console.log('after drive', response.id, response.data);
+
+    }
+    catch (exc) {
+        console.log(exc);
+    }
+
+
+
+
+    var items = await server.datastore.findItems({ "items.status": "end", "items.elementId": "task_Buy" });
+
+
+    items.forEach(item => {
+        console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
+    });
+
+
+
+    var insts = await server.datastore.findInstances({ data: { caseId: caseId } });
+
+    insts.forEach(inst => {
+        console.log('Inst for CaseId id==>' + inst.id, inst.name, inst.data.caseId, 'status==>', inst.status);
+    });
+    var insts = await server.datastore.findInstances({ id: instance.id });
 
     insts.forEach(inst => {
-        console.log('id==>' + inst.id,inst.name, 'status==>',inst.status);
+        for (var i = 0; i < inst.items.length; i++) {
+            var item = inst.items[i];
+            console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+
+        }
     });
 
+    var inst = await server.engine.get({ id: instance.id });
+
+
+    for (var i = 0; i < inst.items.length; i++) {
+        var item = inst.items[i];
+        console.log('   item: elementId==>' + item.elementId, item.name, 'status==>', item.status);
+
+    }
+
+
+
+    //    var items = await server.datastore.findItems({ query: { "items.elementId": "task_Buy" } });
+    var items = await server.datastore.findItems({ id: instance.id });
 
-    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);
+        console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
     });
+}
 
+async function delay(time, result) {
+    return new Promise(function (resolve) {
+        setTimeout(function () {
+            resolve(result);
+        }, time);
+    });
 }
 
+