@colijnit/ioneconnector 1.0.134 → 1.0.137

package/build/service/hd-session.service.js

@@ -1,13 +1,4 @@
 "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 });
 const hd_service_method_1 = require("../enum/hd-service-method");
 class HdSessionService {
@@ -17,46 +8,40 @@ class HdSessionService {
     set upId(value) {
         this._upId = +value;
     }
-    call(method, data, showLoader = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                if (!this._sessionCreated) {
-                    const response = yield this.createPublicSession()
-                        .catch(e => {
-                        return reject(e);
-                    });
-                    this._token = response.data;
-                    this._sessionCreated = true;
+    async call(method, data, showLoader = true) {
+        return new Promise(async (resolve, reject) => {
+            if (!this._sessionCreated) {
+                const response = await this.createPublicSession()
+                    .catch(e => {
+                    return reject(e);
+                });
+                this._token = response.data;
+                this._sessionCreated = true;
+            }
+            try {
+                const result = await this._ajaxService.call(method, data, this._token, showLoader);
+                resolve(result);
+            }
+            catch (e) {
+                const isTokenExpired = e.response && e.response.status && e.response.status === 401;
+                if (isTokenExpired) {
+                    this._sessionCreated = false;
+                    resolve(this.call(method, data));
                 }
-                try {
-                    const result = yield this._ajaxService.call(method, data, this._token, showLoader);
-                    resolve(result);
+                else {
+                    reject(e);
                 }
-                catch (e) {
-                    const isTokenExpired = e.response && e.response.status && e.response.status === 401;
-                    if (isTokenExpired) {
-                        this._sessionCreated = false;
-                        resolve(this.call(method, data));
-                    }
-                    else {
-                        reject(e);
-                    }
-                }
-            }));
+            }
         });
     }
-    createPublicSession() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                upId: this._upId
-            };
-            return yield this._ajaxService.call(hd_service_method_1.HdServiceMethod.CreatePublicSession, data, "");
-        });
+    async createPublicSession() {
+        const data = {
+            upId: this._upId
+        };
+        return await this._ajaxService.call(hd_service_method_1.HdServiceMethod.CreatePublicSession, data, "");
     }
-    closePublicSession() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._token ? this._ajaxService.call(hd_service_method_1.HdServiceMethod.ClosePublicSession, {}, this._token) : false;
-        });
+    async closePublicSession() {
+        return this._token ? this._ajaxService.call(hd_service_method_1.HdServiceMethod.ClosePublicSession, {}, this._token) : false;
     }
 }
 exports.HdSessionService = HdSessionService;

package/build/service/hd-session.service.unit.test.js

@@ -1,13 +1,4 @@
 "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 });
 const hd_ajax_service_1 = require("../provider/hd-ajax.service");
 const hd_session_service_1 = require("./hd-session.service");
@@ -20,26 +11,26 @@ describe("HdSessionService", () => {
     beforeEach(() => {
         ajaxService = new hd_ajax_service_1.HdAjaxService(options);
     });
-    it('should throw error if any error on create public session', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('should throw error if any error on create public session', async () => {
         ajaxService.call
             .mockResolvedValueOnce(new Error());
         const sessionService = new hd_session_service_1.HdSessionService(ajaxService);
         try {
-            yield sessionService.call("method", {});
+            await sessionService.call("method", {});
             expect(true).toBe(false);
         }
         catch (e) {
             expect(e).toBeTruthy();
         }
-    }));
-    it('method should be called with retrieved token', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('method should be called with retrieved token', async () => {
         ajaxService.call
             .mockResolvedValueOnce({ data: "token" });
         const sessionService = new hd_session_service_1.HdSessionService(ajaxService);
-        yield sessionService.call("method", {});
+        await sessionService.call("method", {});
         expect(ajaxService.call).toBeCalledWith("method", {}, "token");
-    }));
-    it('should get new token if current is expired', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('should get new token if current is expired', async () => {
         ajaxService.call
             .mockResolvedValueOnce({ data: "token" })
             .mockResolvedValueOnce({ data: "response1" })
@@ -47,24 +38,24 @@ describe("HdSessionService", () => {
             .mockResolvedValueOnce({ data: "new_token" })
             .mockResolvedValueOnce({ data: "response2" });
         const sessionService = new hd_session_service_1.HdSessionService(ajaxService);
-        yield sessionService.call("method", {});
-        yield sessionService.call("methodWhenTokenExpired", {});
+        await sessionService.call("method", {});
+        await sessionService.call("methodWhenTokenExpired", {});
         expect(ajaxService.call).toHaveBeenNthCalledWith(5, "methodWhenTokenExpired", {}, "new_token");
-    }));
-    it('should throw error if error 500', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('should throw error if error 500', async () => {
         ajaxService.call
             .mockResolvedValueOnce({ data: "token" })
             .mockRejectedValueOnce({ response: { status: 500 } });
         const sessionService = new hd_session_service_1.HdSessionService(ajaxService);
         try {
-            yield sessionService.call("method", {});
+            await sessionService.call("method", {});
             expect(true).toBe(false);
         }
         catch (e) {
             expect(e).toBeTruthy();
         }
-    }));
-    it('should throw error if any error on method call with new token', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('should throw error if any error on method call with new token', async () => {
         ajaxService.call
             .mockResolvedValueOnce({ data: "token" })
             .mockRejectedValueOnce({ response: { status: 401 } })
@@ -72,14 +63,14 @@ describe("HdSessionService", () => {
             .mockRejectedValueOnce({ response: { status: 401 } });
         const sessionService = new hd_session_service_1.HdSessionService(ajaxService);
         try {
-            yield sessionService.call("method", {});
+            await sessionService.call("method", {});
             expect(true).toBe(false);
         }
         catch (e) {
             expect(e).toBeTruthy();
         }
-    }));
-    it('createPublicSession should be called once on multiple calls', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('createPublicSession should be called once on multiple calls', async () => {
         ajaxService.call
             .mockResolvedValueOnce({ data: "token" })
             .mockResolvedValueOnce({ data: "response1" })
@@ -87,7 +78,7 @@ describe("HdSessionService", () => {
             .mockResolvedValueOnce({ data: "response3" });
         const sessionService = new hd_session_service_1.HdSessionService(ajaxService);
         sessionService.upId = "123";
-        yield Promise.all([
+        await Promise.all([
             sessionService.call("method1", {}),
             sessionService.call("method2", {}),
             sessionService.call("method3", {})
@@ -96,5 +87,5 @@ describe("HdSessionService", () => {
         expect(ajaxService.call).toHaveBeenNthCalledWith(2, "method1", {}, "token");
         expect(ajaxService.call).toHaveBeenNthCalledWith(3, "method2", {}, "token");
         expect(ajaxService.call).toHaveBeenNthCalledWith(4, "method3", {}, "token");
-    }));
+    });
 });

package/build/tests/int/connector-auth.int.test.js

@@ -1,13 +1,4 @@
 "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 });
 const connector_auth_1 = require("../../connector-auth");
 const paging_parameters_1 = require("../../model/paging-parameters");
@@ -27,24 +18,24 @@ describe("ConnectorAuth", () => {
             expect(response.data.validationResult.success).toBeTruthy();
         });
     });
-    it('copyInstance', () => __awaiter(void 0, void 0, void 0, function* () {
-        const response = yield connector.initNodeInstance(1);
+    it('copyInstance', async () => {
+        const response = await connector.initNodeInstance(1);
         const instanceId = response.data.resultObject;
-        const copyInstanceResponse = yield connector.copyInstance(instanceId, false);
+        const copyInstanceResponse = await connector.copyInstance(instanceId, false);
         const newInstanceId = copyInstanceResponse.data.resultObject;
         expect(newInstanceId).toBeTruthy();
-    }));
+    });
     it('getArticleQuickSel', () => {
         return connector.getArticleQuickSel(772).then((article) => {
             expect(article.id).toBe(772);
         });
     });
-    it('getFrozenArticle', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield connector.initNodeInstance(7497142);
+    it('getFrozenArticle', async () => {
+        await connector.initNodeInstance(7497142);
         return connector.getFrozenArticle().then((result) => {
             expect(result.validationResult.succsss).toBeTruthy();
         });
-    }));
+    });
     it('getSelections', () => {
         return connector.getSelections().then((data) => {
             expect(data).toBe([]);

package/build/tests/int/connector-public.int.test.js

@@ -1,13 +1,4 @@
 "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 });
 const connector_1 = require("../../connector");
 const paging_parameters_1 = require("../../model/paging-parameters");
@@ -30,13 +21,13 @@ describe("ConnectorPublic", () => {
             expect(response.data.validationResult.success).toBeTruthy();
         });
     });
-    it('copyInstance', () => __awaiter(void 0, void 0, void 0, function* () {
-        const response = yield connector.initNodeInstance(772);
+    it('copyInstance', async () => {
+        const response = await connector.initNodeInstance(772);
         const instanceId = response.data.resultObject;
-        const copyInstanceResponse = yield connector.copyInstance(instanceId, false);
+        const copyInstanceResponse = await connector.copyInstance(instanceId, false);
         const newInstanceId = copyInstanceResponse.data.resultObject;
         expect(newInstanceId).toBeTruthy();
-    }));
+    });
     it('getArticleQuickSel', () => {
         return connector.getArticleQuickSel(909090090).then((article) => {
             expect(article.id).toBe(772);
@@ -112,14 +103,14 @@ describe("ConnectorPublic", () => {
             expect(result).toBeTruthy();
         });
     });
-    it('getMatchTable', () => __awaiter(void 0, void 0, void 0, function* () {
-        const response = yield connector.initNodeInstance(7870333);
+    it('getMatchTable', async () => {
+        const response = await connector.initNodeInstance(7870333);
         const instanceId = response.data.resultObject;
-        yield connector.setInstanceToConfigure(instanceId, true);
-        yield connector.nextNode({ opvId: "6824758" });
-        const matchTable = yield connector.getMatchTable();
+        await connector.setInstanceToConfigure(instanceId, true);
+        await connector.nextNode({ opvId: "6824758" });
+        const matchTable = await connector.getMatchTable();
         expect(matchTable.length).toEqual(1);
-    }));
+    });
     it('getConcepts', () => {
         return connector.getConcepts().then((concepts) => {
             expect(concepts.length).toBeGreaterThan(0);

package/build/tests/int/connector.int.test.js

@@ -1,13 +1,4 @@
 "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 });
 const connector_1 = require("../../connector");
 const answer_1 = require("../../model/answer");
@@ -22,8 +13,8 @@ const options = {
 };
 const connector = new connector_1.Connector(options);
 describe("Connector", () => {
-    it('should get decos and selections on article load', (done) => __awaiter(void 0, void 0, void 0, function* () {
-        yield connector.getArticle("7497142");
+    it('should get decos and selections on article load', async (done) => {
+        await connector.getArticle("7497142");
         connector.getSelections();
         connector.handleDecoNodes = (decoNodes) => {
             expect(decoNodes.length).toBeGreaterThan(1);
@@ -37,18 +28,18 @@ describe("Connector", () => {
             expect(selections.length).toBeGreaterThan(1);
             done();
         };
-    }));
-    it('should retrieve article info', (done) => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('should retrieve article info', async (done) => {
         const answer = new answer_1.Answer();
         answer.nodeId = 7723656;
-        yield connector.getAnswerInfo(answer);
+        await connector.getAnswerInfo(answer);
         connector.handleAnswerInfo = (answer, infos) => {
             expect(infos.length).toBeGreaterThan(0);
             done();
         };
-    }));
-    it('should return internal parameter', (done) => __awaiter(void 0, void 0, void 0, function* () {
-        const value = yield connector.getInternalParameter(internal_param_enum_1.InternalParam.GeneralAssetUrl);
+    });
+    it('should return internal parameter', async (done) => {
+        const value = await connector.getInternalParameter(internal_param_enum_1.InternalParam.GeneralAssetUrl);
         expect(value).toBeDefined();
-    }));
+    });
 });

package/build/utils/promise-utils.js

@@ -1,13 +1,4 @@
 "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 });
 class PromiseUtils {
     static TryUntilSucceed(what, delay, params, tries) {
@@ -18,10 +9,10 @@ class PromiseUtils {
                 return Promise.reject('NO MORE TRIES');
             }
         }
-        return what(params).catch(() => __awaiter(this, void 0, void 0, function* () {
-            yield PromiseUtils.Wait(delay);
+        return what(params).catch(async () => {
+            await PromiseUtils.Wait(delay);
             return PromiseUtils.TryUntilSucceed(what, delay, params, tries);
-        }));
+        });
     }
     static Wait(delay = 0) {
         return new Promise(resolve => setTimeout(resolve, delay));

package/build/websocket/socket.js

@@ -1,13 +1,4 @@
 "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 });
 const rxjs_1 = require("rxjs");
 const promise_utils_1 = require("../utils/promise-utils");
@@ -95,10 +86,8 @@ class Socket {
     disconnect() {
         this._socket.close();
     }
-    tryReopeningConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield promise_utils_1.PromiseUtils.TryUntilSucceed(() => this.connect(), 500);
-        });
+    async tryReopeningConnection() {
+        await promise_utils_1.PromiseUtils.TryUntilSucceed(() => this.connect(), 500);
     }
     _getCallbackId() {
         let i = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/ioneconnector",
-  "version": "1.0.134",
+  "version": "1.0.137",
   "scripts": {
     "build": "grunt clean && tsc",
     "browserify": "browserify build/connector.js --s colijn -o dist/out-tsc/bundle.js",
@@ -20,8 +20,8 @@
   "private": false,
   "dependencies": {
     "@types/node": "^16.10.3",
-    "axios": "^0.21.4",
-    "jsencrypt": "^3.1.0",
+    "axios": "^0.27.2",
+    "jsencrypt": "3.2.1",
     "reflect-metadata": "^0.1.12",
     "rxjs": "6.6.3",
     "ts-node": "^10.2.1"
@@ -51,6 +51,9 @@
     ],
     "transform": {
       "^.+\\.tsx?$": "ts-jest"
-    }
+    },
+    "transformIgnorePatterns": [
+      "<rootDir>/node_modules/jsencrypt"
+    ]
   }
 }