bpmn-client 1.3.15 → 1.3.17

package/.env

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

package/cli.js

@@ -14,6 +14,7 @@ const _1 = require("./");
 const readline = require("readline");
 const dotenv = require('dotenv');
 const res = dotenv.config();
+console.log(res);
 const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
 const cl = readline.createInterface(process.stdin, process.stdout);
 const question = function (q) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-client",
-  "version": "1.3.15",
+  "version": "1.3.17",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",
@@ -26,6 +26,7 @@
     "url": "git+https:github.com/ralphhanna/bpmn-client.git"
   },
   "dependencies": {
+    "axios": "^1.3.4",
     "connect-busboy": "0.0.2",
     "core-js": "^3.6.5",
     "dotenv": "^16.0.1"
@@ -40,6 +41,5 @@
   },
   "engines": {
     "node": ">=12.0.0"
-
   }
 }

package/remote-import.js

@@ -12,14 +12,19 @@ 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* () {
-        const server = new _1.BPMNClient('localhost', 3000, '1234');
+        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';
-        server.definitions.import(name, file);
+        var res = yield server.definitions.import(name, file);
+        //console.log(res.length);
+        return res;
     });
 }
 function FromPostMan() {
@@ -27,12 +32,13 @@ function FromPostMan() {
         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/testing3',
+            'path': '/api/definitions/import/testing4',
             'headers': {
                 'x-api-key': '12345',
                 'Cookie': 'connect.sid=s%3AXMa01DuOlQ4WsrvBj0FVaIrTak49vLPB.hDIV9j7ONA437rZf%2F%2Biu%2Bc6B7T5%2FVuEIjj1BAaoCJW4'
@@ -56,6 +62,7 @@ function FromPostMan() {
         req.setHeader('content-type', 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW');
         req.write(postData);
         req.end();
+        return req;
     });
 }
 function request(name, path) {
@@ -93,5 +100,6 @@ function request(name, path) {
         req.setHeader('content-type', 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW');
         req.write(postData);
         req.end();
+        console.log('end');
     });
 }

package/remote-import.ts

@@ -4,18 +4,24 @@
 import { BPMNClient } from './';
 
 
+console.log('remote-import.ts');
 
 fromClientLib();
+
+console.log('-------------------');
 //FromPostMan();
 
 async function fromClientLib() {
-    const server = new BPMNClient('localhost', 3000, '1234');
+
+    console.log('from client lib');
+    const server = new BPMNClient('localhost', 3000, '12345');
 
     var name = 'test-import';
     var file = 'E:\\x4\\dev\\webApp\\processes\\Trans.bpmn';
 
-    server.definitions.import(name, file);
-
+    var res=await server.definitions.import(name, file);
+    //console.log(res.length);
+    return res;
 }
 async function FromPostMan() {
 
@@ -24,13 +30,15 @@ async function FromPostMan() {
 
 
     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/testing3',
+        'path': '/api/definitions/import/testing4',
         'headers': {
             'x-api-key': '12345',
             'Cookie': 'connect.sid=s%3AXMa01DuOlQ4WsrvBj0FVaIrTak49vLPB.hDIV9j7ONA437rZf%2F%2Biu%2Bc6B7T5%2FVuEIjj1BAaoCJW4'
@@ -63,6 +71,8 @@ async function FromPostMan() {
 
     req.end();
 
+    return req;
+
 }
 
 
@@ -112,5 +122,5 @@ async function request(name,path) {
     req.write(postData);
 
     req.end();
-
+    console.log('end');
 }

package/src/BPMNClient.js

@@ -17,10 +17,30 @@ const fs = require("fs");
 class WebService {
     constructor() { }
     invoke(params, options, postData = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = require('axios');
+            var data = JSON.stringify(params);
+            var url = 'http://' + options.host + ':' + options.port + options.path;
+            if (options.port == 443)
+                url = 'https://' + options.host + options.path;
+            var config = {
+                method: options.method,
+                url: url,
+                headers: options.headers,
+                data: data
+            };
+            let self = this;
+            let response = yield axios(config);
+            self.result = response.data;
+            return response.data;
+        });
+    }
+    invokeOld(params, options, postData = null) {
         return __awaiter(this, void 0, void 0, function* () {
             var driver = http;
             var body = JSON.stringify(params);
-            //        console.log(options, params);
+            console.log('invoke:');
+            console.log('options:', options, params);
             if (options.port == 443)
                 driver = https;
             let data = '';
@@ -28,16 +48,21 @@ class WebService {
             return new Promise(function (resolve, reject) {
                 try {
                     var req = 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');
                         res.on('data', function (chunk) {
+                            console.log('>>chunk', chunk);
                             data += chunk;
                         });
                         res.on('end', () => {
+                            console.log('response end');
                             try {
+                                if (data == null)
+                                    console.log("empty response");
+                                console.log('data:', data);
                                 self.result = JSON.parse(data);
                                 resolve(self.result);
                             }
@@ -53,7 +78,11 @@ class WebService {
                     });
                     if (postData !== null)
                         req.write(postData);
+                    else
+                        req.write('');
+                    console.log('request ending', body);
                     req.end(body);
+                    console.log('request ended');
                 }
                 catch (exc) {
                     console.log(exc);
@@ -65,6 +94,7 @@ class WebService {
 class BPMNClient extends WebService {
     constructor(host, port, apiKey) {
         super();
+        ;
         this.host = host;
         this.port = port;
         this.apiKey = apiKey;
@@ -99,7 +129,7 @@ class BPMNClient extends WebService {
                 'method': 'POST',
                 'hostname': this.host,
                 'port': this.port,
-                'path': url + '/' + fileName,
+                'path': '/api/' + url + '/' + fileName,
                 'headers': {
                     'x-api-key': this.apiKey
                 },
@@ -124,6 +154,7 @@ class BPMNClient extends WebService {
             req.setHeader('content-type', 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW');
             req.write(postData);
             req.end();
+            return req;
         });
     }
     request(url, method, params) {

package/src/BPMNClient.ts

@@ -12,13 +12,37 @@ class WebService {
     response;
     constructor() { }
 
-    async invoke(params, options,postData=null) {
+    async invoke(params, options, postData = null) {
+
+        var axios = require('axios');
+
+        var data = JSON.stringify(params);
+        var url = 'http://'+options.host+':'+options.port+options.path;
+
+        if (options.port == 443)
+            url = 'https://'+options.host+options.path;
+
+        var config = {
+            method: options.method,
+            url: url,
+            headers: options.headers,
+            data: data
+        };
+
+        let self = this;
+
+        let response = await axios(config);
+        self.result = response.data;
+
+        return response.data;
+    }
+    async invokeOld(params, options,postData=null) {
 
         var driver = http;
 
         var body = JSON.stringify(params);
-
-//        console.log(options, params);
+        console.log('invoke:');
+        console.log('options:',options, params);
         if (options.port == 443)
             driver = https;
 
@@ -28,16 +52,22 @@ class WebService {
             try {
 
                 var req = 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');
                     res.on('data', function (chunk) {
+                        console.log('>>chunk', chunk);
                         data += chunk;
                     });
                     res.on('end', () => {
+                        console.log('response end');
                         try {
+                            if (data == null)
+                                console.log("empty response");
+                            console.log('data:', data);
+                            
                             self.result = JSON.parse(data);
                             resolve(self.result);
                         }
@@ -53,10 +83,13 @@ class WebService {
                     console.log("Error: " + err.message);
                     reject(err);
                 });
-                if (postData !==null)
+                if (postData !== null)
                     req.write(postData);
-
+                else
+                    req.write('');
+                console.log('request ending',body);
                 req.end(body);
+                console.log('request ended');
             }
             catch (exc) {
                 console.log(exc);
@@ -76,6 +109,7 @@ class BPMNClient extends WebService {
 
     constructor(host, port, apiKey) {
         super();
+;
         this.host = host;
         this.port = port;
         this.apiKey = apiKey;
@@ -107,7 +141,7 @@ class BPMNClient extends WebService {
             'method': 'POST',
             'hostname': this.host,
             'port': this.port,
-            'path': url + '/' + fileName,
+            'path': '/api/'+ url + '/' + fileName,
             'headers': {
                 'x-api-key': this.apiKey
             },
@@ -139,6 +173,8 @@ class BPMNClient extends WebService {
         req.write(postData);
 
         req.end();
+
+        return req;
     }
 
 
@@ -185,7 +221,6 @@ class BPMNClient extends WebService {
             };
         }
 
-
         return await this.invoke(params, options);
 
     }

package/test-raw.js

@@ -0,0 +1,74 @@
+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());
+    });
+};
+console.log("Testing BPMNClient raw");
+raw1();
+function raw1() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var axios = require('axios');
+        var data = JSON.stringify({ "items.status": "end", "items.elementId": "script_task" });
+        var config = {
+            method: 'get',
+            url: 'http://localhost:3000/api/datastore/findItems',
+            headers: {
+                'x-api-key': '12345',
+                'Content-Type': 'application/json',
+                //            'Cookie': 'connect.sid=s%3AFJpzbs-nlVsxrhROzC_e0joMyopi6ke0.uoCjT87OZa3SOJosZxXCrC7zriAIVdMmtwcKsrY2C4I'
+            },
+            data: data
+        };
+        var response = yield axios(config);
+        console.log(response.data);
+        /*
+        axios(config)
+            .then(function (response) {
+                console.log('then',JSON.stringify(response.data));
+            })
+            .catch(function (error) {
+                console.log('error',error);
+            });
+            */
+    });
+}
+function raw() {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('raw');
+        var https = require('follow-redirects').http;
+        var fs = require('fs');
+        var options = {
+            'method': 'GET',
+            'hostname': 'localhost',
+            'port': 3000,
+            'path': '/api/datastore/findItems',
+            'headers': {
+                'x-api-key': '12345',
+                'Content-Type': 'application/json',
+                'Cookie': 'connect.sid=s%3AFJpzbs-nlVsxrhROzC_e0joMyopi6ke0.uoCjT87OZa3SOJosZxXCrC7zriAIVdMmtwcKsrY2C4I'
+            },
+            'maxRedirects': 20
+        };
+        var req = https.request(options, function (res) {
+            var chunks = [];
+            res.on("data", function (chunk) {
+                console.log('data', chunk);
+                chunks.push(chunk);
+            });
+            res.on("end", function (chunk) {
+                var body = Buffer.concat(chunks);
+                console.log('end', body.toString());
+            });
+            res.on("error", function (error) {
+                console.error(error);
+            });
+        });
+        var postData = JSON.stringify({ "items.status": "end", "items.elementId": "script_task" });
+        req.write(postData);
+        req.end();
+    });
+}

package/test-raw.ts

@@ -0,0 +1,73 @@
+console.log("Testing BPMNClient raw");
+
+
+raw1();
+
+async function raw1() {
+    var axios = require('axios');
+    var data = JSON.stringify({ "items.status": "end", "items.elementId": "script_task" });
+
+    var config = {
+        method: 'get',
+        url: 'http://localhost:3000/api/datastore/findItems',
+        headers: {
+            'x-api-key': '12345',
+            'Content-Type': 'application/json',
+//            'Cookie': 'connect.sid=s%3AFJpzbs-nlVsxrhROzC_e0joMyopi6ke0.uoCjT87OZa3SOJosZxXCrC7zriAIVdMmtwcKsrY2C4I'
+        },
+        data: data
+    };
+    var response = await axios(config);
+    console.log(response.data);
+    /*
+    axios(config)
+        .then(function (response) {
+            console.log('then',JSON.stringify(response.data));
+        })
+        .catch(function (error) {
+            console.log('error',error);
+        });
+        */
+}
+async function raw() {
+    console.log('raw');
+    var https = require('follow-redirects').http;
+    var fs = require('fs');
+
+    var options = {
+        'method': 'GET',
+        'hostname': 'localhost',
+        'port': 3000,
+        'path': '/api/datastore/findItems',
+        'headers': {
+            'x-api-key': '12345',
+            'Content-Type': 'application/json',
+            'Cookie': 'connect.sid=s%3AFJpzbs-nlVsxrhROzC_e0joMyopi6ke0.uoCjT87OZa3SOJosZxXCrC7zriAIVdMmtwcKsrY2C4I'
+        },
+        'maxRedirects': 20
+    };
+
+    var req = https.request(options, function (res) {
+        var chunks = [];
+
+        res.on("data", function (chunk) {
+            console.log('data', chunk);
+            chunks.push(chunk);
+        });
+
+        res.on("end", function (chunk) {
+            var body = Buffer.concat(chunks);
+            console.log('end',body.toString());
+        });
+
+        res.on("error", function (error) {
+            console.error(error);
+        });
+    });
+
+    var postData = JSON.stringify({ "items.status": "end", "items.elementId": "script_task" });
+
+    req.write(postData);
+
+    req.end();
+}

package/test.js

@@ -10,13 +10,74 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require("./");
+const readline = require("readline");
+const cl = readline.createInterface(process.stdin, process.stdout);
+const question = function (q) {
+    return new Promise((res, rej) => {
+        cl.question(q, answer => {
+            res(answer);
+        });
+    });
+};
 console.log("Testing BPMNClient");
 const dotenv = require('dotenv');
 const res = dotenv.config();
+console.log(res.parsed.PORT);
 const fs = require('fs');
-const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+//raw();
+const server = new _1.BPMNClient(process.env.HOST, res.parsed.PORT, process.env.API_KEY);
+console.log(server);
 //testMessage();
-testImport();
+// testImport();
+test1();
+end();
+function raw() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var https = require('follow-redirects').https;
+        var fs = require('fs');
+        var options = {
+            'method': 'GET',
+            'hostname': 'localhost',
+            'port': 3000,
+            'path': '/api/datastore/findItems',
+            'headers': {
+                'x-api-key': '12345',
+                'Content-Type': 'application/json',
+                'Cookie': 'connect.sid=s%3AFJpzbs-nlVsxrhROzC_e0joMyopi6ke0.uoCjT87OZa3SOJosZxXCrC7zriAIVdMmtwcKsrY2C4I'
+            },
+            'maxRedirects': 20
+        };
+        var req = https.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 = JSON.stringify({ "items.status": "end", "items.elementId": "script_task" });
+        req.write(postData);
+        req.end();
+    });
+}
+function end() {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield question("continue");
+    });
+}
+function test1() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var items = yield server.definitions.list();
+        items.forEach(item => {
+            //        console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
+        });
+    });
+}
 function testImport() {
     return __awaiter(this, void 0, void 0, function* () {
         var file = 'test-import';
@@ -67,7 +128,7 @@ function testMessage() {
 }
 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);
+        const server = new _1.BPMNClient(process.env.HOST, res.parsed.PORT, process.env.API_KEY);
         const caseId = 3040;
         var delResp = yield server.datastore.deleteInstances({ name: 'Buy Used Car' });
         //console.log(delResp);

package/test.ts

@@ -1,16 +1,85 @@
 import { BPMNClient } from './';
 
+import * as readline from 'readline';
+const cl = readline.createInterface(process.stdin, process.stdout);
+const question = function (q) {
+    return new Promise((res, rej) => {
+        cl.question(q, answer => {
+            res(answer);
+        })
+    });
+};
+
 
 console.log("Testing BPMNClient");
 const dotenv = require('dotenv');
 const res = dotenv.config();
+console.log(res.parsed.PORT);
 const fs = require('fs');
+//raw();
 
-const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
 
+const server = new BPMNClient(process.env.HOST, res.parsed.PORT, process.env.API_KEY);
+console.log(server);
 //testMessage();
-testImport();
+// testImport();
+test1();
+end(); 
+
+async function raw() {
+    var https = require('follow-redirects').https;
+    var fs = require('fs');
+
+    var options = {
+        'method': 'GET',
+        'hostname': 'localhost',
+        'port': 3000,
+        'path': '/api/datastore/findItems',
+        'headers': {
+            'x-api-key': '12345',
+            'Content-Type': 'application/json',
+            'Cookie': 'connect.sid=s%3AFJpzbs-nlVsxrhROzC_e0joMyopi6ke0.uoCjT87OZa3SOJosZxXCrC7zriAIVdMmtwcKsrY2C4I'
+        },
+        'maxRedirects': 20
+    };
+
+    var req = https.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 = JSON.stringify({ "items.status": "end", "items.elementId": "script_task" });
 
+    req.write(postData);
+
+    req.end();
+}
+
+async function end() {
+    await question("continue")
+}
+async function test1() {
+    var items = await server.definitions.list();
+
+
+    items.forEach(item => {
+//        console.log('item: id==>' + item.elementId, item.type, item.name, 'status==>', item.status);
+    });
+
+
+}
 async function testImport() {
 
 
@@ -70,7 +139,7 @@ async function testMessage() {
 
 async function test() {
 
-    const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
+    const server = new BPMNClient(process.env.HOST, res.parsed.PORT, process.env.API_KEY);
 
     const caseId = 3040;