bpmn-client 1.3.23 → 1.3.27

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

@@ -118,10 +118,10 @@ function start() {
 function findItems(query) {
     return __awaiter(this, void 0, void 0, function* () {
         var items = yield server.datastore.findItems(query);
-        console.log(items);
+        console.log(`processName	item.name	item.elementId	instanceId	item.id`);
         for (var i = 0; i < items.length; i++) {
             let item = items[i];
-            console.log(`${item.name} - ${item.elementId}	instanceId:	${item['instanceId']}`);
+            console.log(`${item['processName']}	${item.name}	${item.elementId}	${item['instanceId']}	${item.id}`);
         }
     });
 }

package/cli.ts

@@ -127,10 +127,10 @@ async function start()
 async function findItems(query) {
 	var items = await server.datastore.findItems(query);
 
-	console.log(items);
+	console.log(`processName	item.name	item.elementId	instanceId	item.id`);
 	for (var i = 0; i < items.length; i++) {
 		let item = items[i];
-		console.log(`${item.name} - ${item.elementId}	instanceId:	${item['instanceId']}`);
+		console.log(`${item['processName']}	${item.name}	${item.elementId}	${item['instanceId']}	${item.id}`);
 	}
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-client",
-  "version": "1.3.23",
+  "version": "1.3.27",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",

package/remote-import.js

@@ -42,10 +42,15 @@ function fromClientLib() {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('from client lib');
         try {
-            const server = new _1.BPMNClient('localhost', 3000, '12345');
+            //    const server = new BPMNClient('localhost', 3000, '12345');
+            const dotenv = require('dotenv');
+            dotenv.config();
+            console.log('env:', process.env.HOST, process.env.PORT, process.env.API_KEY);
+            const server = new _1.BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
             var name = 'test-import';
             var file = '..\\WebApp\\processes\\Trans.bpmn';
-            var res = yield server.definitions.import(name, file);
+            var file2 = '..\\WebApp\\processes\\Trans.svg';
+            var res = yield server.definitions.import(name, file, file2);
             return res;
         }
         catch (exc) {

package/remote-import.ts

@@ -43,12 +43,19 @@ async function fromClientLib() {
 
     console.log('from client lib');
 	try {
-    const server = new BPMNClient('localhost', 3000, '12345');
+//    const server = new BPMNClient('localhost', 3000, '12345');
+
+const dotenv = require('dotenv');
+dotenv.config();
+console.log('env:',process.env.HOST, process.env.PORT, process.env.API_KEY);
+
+const server = new BPMNClient(process.env.HOST, process.env.PORT, process.env.API_KEY);
 
     var name = 'test-import';
     var file = '..\\WebApp\\processes\\Trans.bpmn';
+    var file2 = '..\\WebApp\\processes\\Trans.svg';
 
-    var res=await server.definitions.import(name, file);
+    var res=await server.definitions.import(name, file,file2);
     return res;
 	}
 	catch(exc)

package/src/BPMNClient.js

@@ -190,11 +190,11 @@ class ClientDefinitions {
     constructor(client) {
         this.client = client;
     }
-    import(name, path) {
+    import(name, pathToBPMN, pathToSVG = null) {
         return __awaiter(this, void 0, void 0, function* () {
             var options = {
                 'method': 'POST',
-                'hostname': this.client.host,
+                'host': this.client.host,
                 'port': this.client.port,
                 'path': '/api/definitions/import/' + name,
                 'headers': {
@@ -202,8 +202,8 @@ class ClientDefinitions {
                 },
                 'maxRedirects': 20
             };
-            console.log('import ', name, path);
-            var res = yield this.client.upload(name, path, options);
+            console.log('import ', name, pathToBPMN, pathToSVG);
+            var res = yield this.client.upload(name, pathToBPMN, pathToSVG, options);
             console.log('import done ', res);
             this.checkErrors(res);
             return res;

package/src/BPMNClient.ts

@@ -186,11 +186,11 @@ class ClientDefinitions {
         this.client = client;
     }
     
-    async import(name, path) {
+    async import(name, pathToBPMN,pathToSVG=null) {
 
         var options = {
             'method': 'POST',
-            'hostname': this.client.host,
+            'host': this.client.host,
             'port': this.client.port,
             'path': '/api/definitions/import/' + name,
             'headers': {
@@ -199,8 +199,8 @@ class ClientDefinitions {
             'maxRedirects': 20
         };
 
-        console.log('import ',name,path);
-        var res = await this.client.upload(name,path,options);
+        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;

package/src/WebService.js

@@ -40,16 +40,20 @@ class WebService {
             }
         });
     }
-    upload(fileName, path, options) {
+    upload(fileName, path, path2, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const fileContents = fs.createReadStream(path);
             const title = fileName;
-            var url = 'http://' + options.hostname + ':' + options.port + options.path;
+            var url = 'http://' + options.host + ':' + options.port + options.path;
             if (options.port == 443)
                 url = 'https://' + options.host + options.path;
             const form = new FormData();
-            form.append('title', 'title');
+            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
@@ -58,7 +62,7 @@ class WebService {
                 return response.data;
             }
             catch (error) {
-                console.log('upload failed:', error.message);
+                console.log('upload failed:', error);
                 throw new Error(error.message);
                 /*
                             if (error.response) { // get response with a status code not in range 2xx

package/src/WebService.ts

@@ -40,20 +40,25 @@ class WebService {
 		}
     }
 
-    async upload(fileName, path, options) {
+    async upload(fileName, path,path2, options) {
 
-        const fileContents = fs.createReadStream(path);
         const title = fileName;
 
-        var url = 'http://'+options.hostname+':'+options.port+options.path;
+        var url = 'http://'+options.host+':'+options.port+options.path;
 
         if (options.port == 443)
             url = 'https://'+options.host+options.path;
-
   
         const form = new FormData();
-        form.append('title', 'title');
+        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 {
 
@@ -65,7 +70,7 @@ class WebService {
 
         } 
         catch (error) {
-            console.log('upload failed:',error.message);
+            console.log('upload failed:',error);
             throw new Error(error.message);
 /*
             if (error.response) { // get response with a status code not in range 2xx