bpmn-client 1.3.17 → 1.3.26

package/src/BPMNClient.ts

@@ -1,104 +1,8 @@
 import { IInstanceData, IItemData , IDefinitionData} from './interfaces/DataObjects';
-
+import {WebService} from './WebService';
 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, 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('invoke:');
-        console.log('options:',options, params);
-        if (options.port == 443)
-            driver = https;
-
-        let data = '';
-        let self = this;
-        return new Promise(function (resolve, reject) {
-            try {
-
-                var req = driver.request(options, function (res) {
-                     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);
-                        }
-                        catch (exc) {
-                            console.log(data);
-                            console.log(exc);
-                        }
-                    });
-
-
-                });
-                req.on("error", (err) => {
-                    console.log("Error: " + err.message);
-                    reject(err);
-                });
-                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);
-            }
-
-        });
 
-    }
-}
 class BPMNClient extends WebService {
     host;
     port;
@@ -109,7 +13,7 @@ class BPMNClient extends WebService {
 
     constructor(host, port, apiKey) {
         super();
-;
+
         this.host = host;
         this.port = port;
         this.apiKey = apiKey;
@@ -135,49 +39,6 @@ class BPMNClient extends WebService {
 
     }
 
-    async upload(url, fileName, path) {
-        console.log('upload');
-        var options = {
-            'method': 'POST',
-            'hostname': this.host,
-            'port': this.port,
-            'path': '/api/'+ 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();
-
-        return req;
-    }
-
-
     async request(url, method, params) {
 
         var body = JSON.stringify(params);
@@ -324,12 +185,24 @@ class ClientDefinitions {
     constructor(client) {
         this.client = client;
     }
-
     
-    async import(name, path) {
+    async import(name, pathToBPMN,pathToSVG=null) {
 
-        var res = await this.client.upload('definitions/import',name,path);
+        var options = {
+            'method': 'POST',
+            'hostname': this.client.host,
+            'port': this.client.port,
+            'path': '/api/definitions/import/' + name,
+            'headers': {
+                'x-api-key': this.client.apiKey
+            },
+            'maxRedirects': 20
+        };
 
+        console.log('import ',name,pathToBPMN,pathToSVG);
+        var res = await this.client.upload(name,pathToBPMN,pathToSVG,options);
+        console.log('import done ',res);
+        this.checkErrors(res);
         return res;
 
     }
@@ -371,6 +244,12 @@ class ClientDefinitions {
         console.log(res);
         return res as IDefinitionData;
     }
+    checkErrors(res) {
+        if (res['errors']) {
+            console.log(res['errors']);
+            throw new Error(res['errors']);
+        }
+    }
 }
 
 

package/src/WebService.js

@@ -0,0 +1,82 @@
+"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 });
+exports.WebService = void 0;
+const https = require('https');
+const http = require('http');
+const fs = require("fs");
+const axios = require('axios');
+const FormData = require('form-data');
+class WebService {
+    constructor() { }
+    invoke(params, options, postData = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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;
+            try {
+                let response = yield axios(config);
+                self.result = response.data;
+                return response.data;
+            }
+            catch (err) {
+                console.log('** Connection failed ***', err);
+            }
+        });
+    }
+    upload(fileName, path, path2, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const title = fileName;
+            var url = 'http://' + options.hostname + ':' + options.port + options.path;
+            if (options.port == 443)
+                url = 'https://' + options.host + options.path;
+            const form = new FormData();
+            form.append('title', title);
+            const fileContents = fs.createReadStream(path);
+            form.append('file', fileContents);
+            if (path2 !== null) {
+                const fileContents2 = fs.createReadStream(path2);
+                form.append('file', fileContents2);
+            }
+            try {
+                const response = yield axios.post(url, form, {
+                    headers: options.headers
+                });
+                console.log('Response Status:', response.status, response.data);
+                return response.data;
+            }
+            catch (error) {
+                console.log('upload failed:', error.message);
+                throw new Error(error.message);
+                /*
+                            if (error.response) { // get response with a status code not in range 2xx
+                              console.log(error.response.data);
+                              console.log(error.response.status);
+                              console.log(error.response.headers);
+                            } else if (error.request) { // no response
+                              console.log(error.request);
+                            } else { // Something wrong in setting up the request
+                              console.log('Error', error.message);
+                            }
+                            console.log(error.config); */
+            }
+        });
+    }
+}
+exports.WebService = WebService;

package/src/WebService.ts

@@ -0,0 +1,91 @@
+
+const https = require('https');
+const http = require('http');
+const fs = require("fs");
+const axios = require('axios');
+const FormData = require('form-data');
+
+class WebService {
+    statusCode;
+    result;
+    response;
+    constructor() { }
+
+    async invoke(params, options, postData = null) {
+
+
+        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;
+		try {
+			let response = await axios(config);
+			self.result = response.data;
+
+			return response.data;
+		}
+		catch(err)
+		{
+			console.log('** Connection failed ***',err);
+		}
+    }
+
+    async upload(fileName, path,path2, options) {
+
+        const title = fileName;
+
+        var url = 'http://'+options.hostname+':'+options.port+options.path;
+
+        if (options.port == 443)
+            url = 'https://'+options.host+options.path;
+
+  
+        const form = new FormData();
+        form.append('title', title);
+        const fileContents = fs.createReadStream(path);
+        form.append('file', fileContents);
+        if (path2!==null)
+            {
+            const fileContents2 = fs.createReadStream(path2);
+            form.append('file', fileContents2);
+            }
+
+
+        try {
+
+            const response = await axios.post(url, form, {
+              headers: options.headers    });
+
+            console.log('Response Status:',response.status,response.data);
+            return response.data;
+
+        } 
+        catch (error) {
+            console.log('upload failed:',error.message);
+            throw new Error(error.message);
+/*
+            if (error.response) { // get response with a status code not in range 2xx
+              console.log(error.response.data);
+              console.log(error.response.status);
+              console.log(error.response.headers);
+            } else if (error.request) { // no response
+              console.log(error.request);
+            } else { // Something wrong in setting up the request
+              console.log('Error', error.message);
+            }
+            console.log(error.config); */
+      }
+    }
+
+}
+export {WebService }

package/src/index.js

@@ -1,15 +1,19 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./interfaces/Enums"), exports);
-__exportStar(require("./interfaces/DataObjects"), exports);
-__exportStar(require("./BPMNClient"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./interfaces/Enums"), exports);
+__exportStar(require("./interfaces/DataObjects"), exports);
+__exportStar(require("./BPMNClient"), exports);

package/src/interfaces/DataObjects.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/interfaces/DataObjects.ts

@@ -6,6 +6,7 @@ interface IItemData {
     elementId: string;   // bpmn element
     name: string;       // name of bpmn element
     type: string;       // bpmn element type
+    instanceId: string;   // Instance Id of the item
     tokenId: any;         // execution Token
     userId: any;
     startedAt: any;
@@ -19,6 +20,7 @@ interface IItemData {
     assignments;
     authorizations;
     notifications;
+    vars;
 }
 interface IInstanceData {
     id;