bpmn-client 1.3.15 → 1.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-client",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "license": "MIT",
   "scripts": {
     "build": "tsc --build",
@@ -28,7 +28,8 @@
   "dependencies": {
     "connect-busboy": "0.0.2",
     "core-js": "^3.6.5",
-    "dotenv": "^16.0.1"
+    "dotenv": "^16.0.1",
+    "follow-redirects": "^1.15.2"
   },
   "devDependencies": {
     "@types/mime": "^1.3.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

@@ -99,7 +99,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 +124,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

@@ -107,7 +107,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 +139,8 @@ class BPMNClient extends WebService {
         req.write(postData);
 
         req.end();
+
+        return req;
     }