ng2-rest 18.0.19 → 18.0.21

package/lib/rest-request.js

@@ -1,41 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestRequest = void 0;
-var tslib_1 = require("tslib");
-var rxjs_1 = require("rxjs");
-var rxjs_2 = require("rxjs");
-var tnp_core_1 = require("tnp-core");
-var models_1 = require("./models");
-var rest_headers_1 = require("./rest-headers");
-var tnp_core_2 = require("tnp-core");
-var ng2_logger_1 = require("ng2-logger");
-var axios_1 = require("axios");
-var resource_service_1 = require("./resource-service");
-var ng2_logger_2 = require("ng2-logger");
-var request_cache_1 = require("./request-cache");
-var log = ng2_logger_2.Log.create('[ng2-rest] rest-request', ng2_logger_1.Level.__NOTHING);
+const rxjs_1 = require("rxjs");
+const rxjs_2 = require("rxjs");
+const tnp_core_1 = require("tnp-core");
+const models_1 = require("./models");
+const rest_headers_1 = require("./rest-headers");
+const tnp_core_2 = require("tnp-core");
+const ng2_logger_1 = require("ng2-logger");
+const axios_1 = require("axios");
+const resource_service_1 = require("./resource-service");
+const ng2_logger_2 = require("ng2-logger");
+const request_cache_1 = require("./request-cache");
+const log = ng2_logger_2.Log.create('[ng2-rest] rest-request', ng2_logger_1.Level.__NOTHING);
 /**
  * TODO refactor this (remove jobid)
  */
-var jobIDkey = 'jobID';
-var customObs = 'customObs';
-var cancelFn = 'cancelFn';
-var isCanceled = 'isCanceled';
+const jobIDkey = 'jobID';
+const customObs = 'customObs';
+const cancelFn = 'cancelFn';
+const isCanceled = 'isCanceled';
 //#region mock request
 //#endregion
-var RestRequest = /** @class */ (function () {
-    function RestRequest() {
-        this.subjectInuUse = {};
-        this.meta = {};
-        //#endregion
-        this.replaySubjects = {};
-    }
-    RestRequest.prototype.handlerResult = function (options, sourceRequest) {
+class RestRequest {
+    static zone;
+    static jobId = 0;
+    subjectInuUse = {};
+    meta = {};
+    handlerResult(options, sourceRequest) {
         if (tnp_core_1._.isUndefined(options)) {
             options = {};
         }
         // log.d(`HANDLE RESULT (jobid:${options.jobid}) ${sourceRequest.url}`);
-        var res = options.res, jobid = options.jobid, isArray = options.isArray, method = options.method;
+        const { res, jobid, isArray, method } = options;
         if (typeof res !== 'object') {
             throw new Error('No resposnse for request. ');
         }
@@ -47,20 +44,20 @@ var RestRequest = /** @class */ (function () {
             this.subjectInuUse[jobid].error(new models_1.Models.HttpResponseError(res.error, res.data, res.headers, res.code, jobid));
             return;
         }
-        var entity = this.meta[jobid].entity;
-        var circular = this.meta[jobid].circular;
-        var success = resource_service_1.Resource['_listenSuccess'];
-        var reqResp = new models_1.Models.HttpResponse(sourceRequest, res.data, res.headers, res.code, entity, circular, jobid, isArray);
+        const entity = this.meta[jobid].entity;
+        const circular = this.meta[jobid].circular;
+        const success = resource_service_1.Resource['_listenSuccess'];
+        const reqResp = new models_1.Models.HttpResponse(sourceRequest, res.data, res.headers, res.code, entity, circular, jobid, isArray);
         success.next(reqResp);
         this.subjectInuUse[jobid].next(reqResp);
         this.meta[jobid] = void 0;
         this.subjectInuUse[jobid].complete();
-    };
-    RestRequest.prototype.checkCache = function (sourceRequest, jobid) {
-        var existedInCache = request_cache_1.RequestCache.findBy(sourceRequest);
+    }
+    checkCache(sourceRequest, jobid) {
+        const existedInCache = request_cache_1.RequestCache.findBy(sourceRequest);
         if (existedInCache) {
             // log.i('cache exists', existedInCache)
-            var success = resource_service_1.Resource['_listenSuccess'];
+            const success = resource_service_1.Resource['_listenSuccess'];
             success.next(existedInCache.response);
             this.subjectInuUse[jobid].next(existedInCache);
             this.subjectInuUse[jobid].complete();
@@ -68,136 +65,124 @@ var RestRequest = /** @class */ (function () {
         }
         // log.i(`cache not exists for jobid ${jobid}`)
         return false;
-    };
-    RestRequest.prototype.req = function (url_1, method_1, headers_1, body_1, jobid_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function (url, method, headers, body, jobid, isArray, mockHttp) {
-            var CancelToken, source, response, r, headersJson, responseType, catchedError_1, err, msg, stack, errObs, error;
-            if (isArray === void 0) { isArray = false; }
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (this.checkCache({
-                            url: url,
-                            body: body,
-                            isArray: isArray,
-                            method: method
-                        }, jobid)) {
-                            return [2 /*return*/];
-                        }
-                        CancelToken = axios_1.default.CancelToken;
-                        source = CancelToken.source();
-                        this.subjectInuUse[jobid][cancelFn] = source.cancel;
-                        if (mockHttp) {
-                            if (typeof mockHttp === 'object') {
-                                response = {
-                                    data: mockHttp.data,
-                                    status: mockHttp.code,
-                                    headers: mockHttp.headers,
-                                    statusText: mockHttp.error,
-                                    config: {}
-                                };
-                            }
-                            else if (typeof mockHttp === 'function') {
-                                r = mockHttp(url, method, headers, body);
-                                response = {
-                                    data: r.data,
-                                    status: r.code,
-                                    headers: r.headers,
-                                    statusText: r.error,
-                                    config: {}
-                                };
-                            }
-                        }
-                        headersJson = headers.toJSON();
-                        responseType = headersJson.responsetypeaxios ? headersJson.responsetypeaxios : 'text';
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 4, , 5]);
-                        if (!!response) return [3 /*break*/, 3];
-                        return [4 /*yield*/, (0, axios_1.default)({
-                                url: url,
-                                method: method,
-                                data: body,
-                                responseType: responseType,
-                                headers: headersJson,
-                                cancelToken: source.token,
-                                // withCredentials: true, // this can be done manually
-                            })];
-                    case 2:
-                        // console.log(`[${method}] (jobid=${jobid}) request to:  ${url}`);
-                        // console.log('headers axios:', headers.toJSON())
-                        // console.log({ responseType, headersJson, body, method, url })
-                        response = _a.sent();
-                        _a.label = 3;
-                    case 3:
-                        // console.log('AXIOS RESPONES', response)
-                        if (this.subjectInuUse[jobid][isCanceled]) {
-                            return [2 /*return*/];
-                        }
-                        this.handlerResult({
-                            res: {
-                                code: response.status,
-                                data: response.data,
-                                isArray: isArray,
-                                jobid: jobid,
-                                headers: rest_headers_1.RestHeaders.from(response.headers)
-                            },
-                            method: method,
-                            jobid: jobid,
-                            isArray: isArray
-                        }, {
-                            url: url,
-                            body: body,
-                            method: method,
-                            isArray: isArray,
-                        });
-                        return [3 /*break*/, 5];
-                    case 4:
-                        catchedError_1 = _a.sent();
-                        if (this.subjectInuUse[jobid][isCanceled]) {
-                            return [2 /*return*/];
-                        }
-                        // console.log('ERROR RESPONESE catchedError typeof ', typeof catchedError)
-                        // console.log('ERROR RESPONESE catchedError', catchedError)
-                        if (typeof catchedError_1 === 'object' && catchedError_1.response && catchedError_1.response.data) {
-                            err = catchedError_1.response.data;
-                            msg = catchedError_1.response.data.message || '';
-                            stack = (err.stack || '').split('\n');
-                            errObs = resource_service_1.Resource['_listenErrors'];
-                            errObs.next({
-                                msg: msg,
-                                stack: stack,
-                                data: catchedError_1.response.data
-                            });
-                        }
-                        error = (catchedError_1 && catchedError_1.response) ? "[".concat(catchedError_1.response.statusText, "]: ") : '';
-                        this.handlerResult({
-                            res: {
-                                code: (catchedError_1 && catchedError_1.response) ? catchedError_1.response.status : void 0,
-                                error: "".concat(error).concat(catchedError_1.message),
-                                data: (catchedError_1 && catchedError_1.response) ? JSON.stringify(catchedError_1.response.data) : void 0,
-                                isArray: isArray,
-                                jobid: jobid,
-                                headers: rest_headers_1.RestHeaders.from(catchedError_1 && catchedError_1.response && catchedError_1.response.headers)
-                            },
-                            method: method,
-                            jobid: jobid,
-                            isArray: isArray
-                        }, {
-                            url: url,
-                            body: body,
-                            isArray: isArray,
-                            method: method
-                        });
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
-                }
+    }
+    async req(url, method, headers, body, jobid, isArray = false, mockHttp) {
+        if (this.checkCache({
+            url,
+            body,
+            isArray,
+            method
+        }, jobid)) {
+            return;
+        }
+        const CancelToken = axios_1.default.CancelToken;
+        const source = CancelToken.source();
+        this.subjectInuUse[jobid][cancelFn] = source.cancel;
+        var response;
+        if (mockHttp) {
+            if (typeof mockHttp === 'object') {
+                response = {
+                    data: mockHttp.data,
+                    status: mockHttp.code,
+                    headers: mockHttp.headers,
+                    statusText: mockHttp.error,
+                    config: {}
+                };
+            }
+            else if (typeof mockHttp === 'function') {
+                const r = mockHttp(url, method, headers, body);
+                response = {
+                    data: r.data,
+                    status: r.code,
+                    headers: r.headers,
+                    statusText: r.error,
+                    config: {}
+                };
+            }
+        }
+        const headersJson = headers.toJSON();
+        const responseType = headersJson.responsetypeaxios ? headersJson.responsetypeaxios : 'text';
+        try {
+            if (!response) {
+                // console.log(`[${method}] (jobid=${jobid}) request to:  ${url}`);
+                // console.log('headers axios:', headers.toJSON())
+                // console.log({ responseType, headersJson, body, method, url })
+                response = await (0, axios_1.default)({
+                    url,
+                    method,
+                    data: body,
+                    responseType,
+                    headers: headersJson,
+                    cancelToken: source.token,
+                    // withCredentials: true, // this can be done manually
+                });
+                // log.d(`after response of jobid: ${jobid}`);
+            }
+            // console.log('AXIOS RESPONES', response)
+            if (this.subjectInuUse[jobid][isCanceled]) {
+                return;
+            }
+            this.handlerResult({
+                res: {
+                    code: response.status,
+                    data: response.data,
+                    isArray,
+                    jobid,
+                    headers: rest_headers_1.RestHeaders.from(response.headers)
+                },
+                method,
+                jobid,
+                isArray
+            }, {
+                url,
+                body,
+                method,
+                isArray,
             });
-        });
-    };
-    RestRequest.prototype.getReplay = function (method, meta, onlyGetLastReplayForMethod) {
-        var _this = this;
-        var replay;
+        }
+        catch (catchedError) {
+            if (this.subjectInuUse[jobid][isCanceled]) {
+                return;
+            }
+            // console.log('ERROR RESPONESE catchedError typeof ', typeof catchedError)
+            // console.log('ERROR RESPONESE catchedError', catchedError)
+            if (typeof catchedError === 'object' && catchedError.response && catchedError.response.data) {
+                const err = catchedError.response.data;
+                const msg = catchedError.response.data.message || '';
+                // console.log({
+                //   'err.stack': err?.stack
+                // })
+                let stack = (err.stack || '').split('\n');
+                const errObs = resource_service_1.Resource['_listenErrors'];
+                errObs.next({
+                    msg,
+                    stack,
+                    data: catchedError.response.data
+                });
+            }
+            const error = (catchedError && catchedError.response) ? `[${catchedError.response.statusText}]: ` : '';
+            this.handlerResult({
+                res: {
+                    code: (catchedError && catchedError.response) ? catchedError.response.status : void 0,
+                    error: `${error}${catchedError.message}`,
+                    data: (catchedError && catchedError.response) ? JSON.stringify(catchedError.response.data) : void 0,
+                    isArray,
+                    jobid,
+                    headers: rest_headers_1.RestHeaders.from(catchedError && catchedError.response && catchedError.response.headers)
+                },
+                method,
+                jobid,
+                isArray
+            }, {
+                url,
+                body,
+                isArray,
+                method
+            });
+        }
+    }
+    getReplay(method, meta, onlyGetLastReplayForMethod) {
+        let replay;
         //#region prevent empty tree
         if (tnp_core_1._.isUndefined(this.replaySubjects[meta.endpoint])) {
             // log.i(`(${meta.endpoint}) `);
@@ -212,7 +197,7 @@ var RestRequest = /** @class */ (function () {
             this.replaySubjects[meta.endpoint][meta.path][method] = {};
         }
         //#endregion
-        var objectIDToCreateOrLast = (Object.keys(this.replaySubjects[meta.endpoint][meta.path][method]).length) +
+        const objectIDToCreateOrLast = (Object.keys(this.replaySubjects[meta.endpoint][meta.path][method]).length) +
             (onlyGetLastReplayForMethod ? 0 : 1);
         if (onlyGetLastReplayForMethod && (objectIDToCreateOrLast === 0)) {
             return replay;
@@ -229,31 +214,31 @@ var RestRequest = /** @class */ (function () {
             if (RestRequest.jobId === Number.MAX_SAFE_INTEGER) {
                 RestRequest.jobId = 0;
             }
-            var jobid_1 = RestRequest.jobId++;
-            replay.id = jobid_1;
-            var subject_1 = replay.subject;
-            subject_1[jobIDkey] = jobid_1; // modify internal rxjs subject obj
-            this.meta[jobid_1] = meta;
-            this.subjectInuUse[jobid_1] = subject_1;
-            this.subjectInuUse[jobid_1][customObs] = new rxjs_1.Observable(function (observer) {
+            const jobid = RestRequest.jobId++;
+            replay.id = jobid;
+            const subject = replay.subject;
+            subject[jobIDkey] = jobid; // modify internal rxjs subject obj
+            this.meta[jobid] = meta;
+            this.subjectInuUse[jobid] = subject;
+            this.subjectInuUse[jobid][customObs] = new rxjs_1.Observable((observer) => {
                 // observer.remove(() => {
                 // });
-                observer.add(function () {
+                observer.add(() => {
                     // console.log(`cancel observable job${jobid}`)
-                    if (!_this.subjectInuUse[jobid_1][isCanceled]) {
-                        _this.subjectInuUse[jobid_1][isCanceled] = true;
-                        if (typeof _this.subjectInuUse[jobid_1][cancelFn] === 'function') {
-                            _this.subjectInuUse[jobid_1][cancelFn]('[ng2-rest] on purpose canceled http request');
+                    if (!this.subjectInuUse[jobid][isCanceled]) {
+                        this.subjectInuUse[jobid][isCanceled] = true;
+                        if (typeof this.subjectInuUse[jobid][cancelFn] === 'function') {
+                            this.subjectInuUse[jobid][cancelFn]('[ng2-rest] on purpose canceled http request');
                         }
                     }
                     else {
                         // console.log(`somehow second time cancel ${jobid}`)
                     }
                 });
-                var sub = subject_1.subscribe({
-                    next: function (a) { return observer.next(a); },
-                    error: function (a) { return observer.error(a); },
-                    complete: function () {
+                const sub = subject.subscribe({
+                    next: a => observer.next(a),
+                    error: a => observer.error(a),
+                    complete: () => {
                         sub.unsubscribe();
                         observer.complete();
                     },
@@ -272,114 +257,111 @@ var RestRequest = /** @class */ (function () {
             //#endregion
         }
         return replay;
-    };
+    }
     //#region http methods
-    RestRequest.prototype.generalReq = function (method, url, body, headers, meta, isArray, mockHttp) {
-        var replay = this.getReplay(method, meta, false);
-        replay.data = { url: url, body: body, headers: headers, isArray: isArray };
-        (function (pthis, purl, pmethod, pheaders, pbody, pid, pisArray, pmockHttp) {
+    generalReq(method, url, body, headers, meta, isArray, mockHttp) {
+        const replay = this.getReplay(method, meta, false);
+        replay.data = { url, body, headers, isArray };
+        ((pthis, purl, pmethod, pheaders, pbody, pid, pisArray, pmockHttp) => {
             // log.d(`for ${purl} jobid ${pid}`);
-            setTimeout(function () { return pthis.req(purl, pmethod, pheaders, pbody, pid, pisArray, pmockHttp); });
+            setTimeout(() => pthis.req(purl, pmethod, pheaders, pbody, pid, pisArray, pmockHttp));
         })(this, url, method, headers, body, replay.id, isArray, mockHttp);
-        var resp = (0, rxjs_1.firstValueFrom)(replay.subject[customObs]);
+        const resp = (0, rxjs_1.firstValueFrom)(replay.subject[customObs]);
         resp.observable = replay.subject[customObs];
         resp.cache = request_cache_1.RequestCache.findBy({
-            body: body,
-            isArray: isArray,
-            method: method,
-            url: url
+            body,
+            isArray,
+            method,
+            url
         });
         return resp;
-    };
-    RestRequest.prototype.get = function (url, body, headers, meta, isArray, mockHttp) {
+    }
+    get(url, body, headers, meta, isArray, mockHttp) {
         return this.generalReq('get', url, body, headers, meta, isArray, mockHttp);
-    };
-    RestRequest.prototype.head = function (url, body, headers, meta, isArray, mockHttp) {
+    }
+    head(url, body, headers, meta, isArray, mockHttp) {
         return this.generalReq('head', url, body, headers, meta, isArray, mockHttp);
-    };
-    RestRequest.prototype.delete = function (url, body, headers, meta, isArray, mockHttp) {
+    }
+    delete(url, body, headers, meta, isArray, mockHttp) {
         return this.generalReq('delete', url, body, headers, meta, isArray, mockHttp);
-    };
-    RestRequest.prototype.post = function (url, body, headers, meta, isArray, mockHttp) {
+    }
+    post(url, body, headers, meta, isArray, mockHttp) {
         return this.generalReq('post', url, body, headers, meta, isArray, mockHttp);
-    };
-    RestRequest.prototype.put = function (url, body, headers, meta, isArray, mockHttp) {
+    }
+    put(url, body, headers, meta, isArray, mockHttp) {
         return this.generalReq('put', url, body, headers, meta, isArray, mockHttp);
-    };
-    RestRequest.prototype.patch = function (url, body, headers, meta, isArray, mockHttp) {
+    }
+    patch(url, body, headers, meta, isArray, mockHttp) {
         return this.generalReq('patch', url, body, headers, meta, isArray, mockHttp);
-    };
-    RestRequest.prototype.jsonp = function (url, body, headers, meta, isArray, mockHttp) {
-        var _this = this;
-        var replay = this.getReplay('jsonp', meta, false);
-        var jobid = replay.id;
-        var method = 'jsonp';
-        setTimeout(function () {
+    }
+    jsonp(url, body, headers, meta, isArray, mockHttp) {
+        const replay = this.getReplay('jsonp', meta, false);
+        const jobid = replay.id;
+        const method = 'jsonp';
+        setTimeout(() => {
             if (url.endsWith('/'))
                 url = url.slice(0, url.length - 1);
-            var num = Math.round(10000 * Math.random());
-            var callbackMethodName = "cb_" + num;
-            window[callbackMethodName] = function (data) {
-                if (_this.checkCache({
-                    url: url,
-                    body: body,
-                    isArray: isArray,
-                    method: method
+            let num = Math.round(10000 * Math.random());
+            let callbackMethodName = "cb_" + num;
+            window[callbackMethodName] = (data) => {
+                if (this.checkCache({
+                    url,
+                    body,
+                    isArray,
+                    method
                 }, jobid)) {
                     return;
                 }
-                _this.handlerResult({
+                this.handlerResult({
                     res: {
-                        data: data,
-                        isArray: isArray
+                        data, isArray
                     },
-                    method: method,
-                    jobid: jobid,
-                    isArray: isArray
+                    method,
+                    jobid,
+                    isArray
                 }, {
-                    url: url,
-                    body: body,
-                    isArray: isArray,
-                    method: method,
+                    url,
+                    body,
+                    isArray,
+                    method,
                 });
             };
-            var sc = document.createElement('script');
-            sc.src = "".concat(url, "?callback=").concat(callbackMethodName);
+            let sc = document.createElement('script');
+            sc.src = `${url}?callback=${callbackMethodName}`;
             document.body.appendChild(sc);
             document.body.removeChild(sc);
         });
-        var resp = (0, rxjs_1.firstValueFrom)(replay.subject[customObs]);
+        const resp = (0, rxjs_1.firstValueFrom)(replay.subject[customObs]);
         resp.observable = replay.subject[customObs];
         console.log('assiging custom observable');
         resp.cache = request_cache_1.RequestCache.findBy({
-            body: body,
-            isArray: isArray,
-            method: method,
-            url: url
+            body,
+            isArray,
+            method,
+            url
         });
         return resp;
-    };
-    RestRequest.prototype.replay = function (method, meta) {
-        var _this = this;
-        var replay = this.getReplay(method, meta, true);
+    }
+    //#endregion
+    replaySubjects = {};
+    replay(method, meta) {
+        const replay = this.getReplay(method, meta, true);
         if (!replay || !replay.data) {
-            console.warn("Canno replay first ".concat(method, " request from ").concat(meta.endpoint, "/").concat(meta.path));
+            console.warn(`Canno replay first ${method} request from ${meta.endpoint}/${meta.path}`);
             return;
         }
         ;
         if (replay && replay.subject && Array.isArray(replay.subject.observers) &&
             replay.subject.observers.length === 0) {
-            console.warn("No observators for ".concat(method, " request from ").concat(meta.endpoint, "/").concat(meta.path));
+            console.warn(`No observators for ${method} request from ${meta.endpoint}/${meta.path}`);
             return;
         }
-        var url = replay.data.url;
-        var headers = replay.data.headers;
-        var body = replay.data.body;
-        var isArray = replay.data.isArray;
-        setTimeout(function () { return _this.req(url, method, headers, body, replay.id, isArray); });
-    };
-    RestRequest.jobId = 0;
-    return RestRequest;
-}());
+        const url = replay.data.url;
+        const headers = replay.data.headers;
+        const body = replay.data.body;
+        const isArray = replay.data.isArray;
+        setTimeout(() => this.req(url, method, headers, body, replay.id, isArray));
+    }
+}
 exports.RestRequest = RestRequest;
 //# sourceMappingURL=rest-request.js.map