ng2-rest 13.0.12 → 13.0.16

package/browser/fesm2020/ng2-rest.mjs

@@ -1,4 +1,4 @@
-import { Subject, firstValueFrom, Observable } from 'rxjs';
+import { Subject, Observable, firstValueFrom } from 'rxjs';
 import { Log, Level } from 'ng2-logger/browser';
 import { diffChars } from 'diff';
 import { Helpers as Helpers$1, _, CoreHelpers } from 'tnp-core/browser';
@@ -988,6 +988,13 @@ var Models;
         get booleanValue() {
             return ['ok', 'true'].includes(this.body.trim());
         }
+        get rawJson() {
+            let res = this.toJSON(this.body, this.isArray);
+            if (this.circular && Array.isArray(this.circular)) {
+                res = JSON10.parse(JSON.stringify(res), this.circular);
+            }
+            return res;
+        }
         get json() {
             if (this.entity && typeof this.entity === 'object') {
                 const json = this.toJSON(this.body, this.isArray);
@@ -1083,6 +1090,9 @@ var Models;
 
 const log$1 = Log.create('[ng2-rest] rest-request', Level.__NOTHING);
 const jobIDkey = 'jobID';
+const customObs = 'customObs';
+const cancelFn = 'cancelFn';
+const isCanceled = 'isCanceled';
 //#region mock request
 //#endregion
 class RestRequest {
@@ -1098,11 +1108,6 @@ class RestRequest {
         }
         // log.d(`HANDLE RESULT (jobid:${options.jobid}) ${sourceRequest.url}`);
         const { res, jobid, isArray, method } = options;
-        // if (this.endedJobs[jobid]) {
-        //   debugger
-        // }
-        // this.endedJobs[jobid] = true;
-        // log.i(`handle jobid ${jobid}`)
         if (typeof res !== 'object') {
             throw new Error('No resposnse for request. ');
         }
@@ -1116,15 +1121,21 @@ class RestRequest {
         }
         const entity = this.meta[jobid].entity;
         const circular = this.meta[jobid].circular;
-        this.subjectInuUse[jobid].next(new Models.HttpResponse(sourceRequest, res.data, res.headers, res.code, entity, circular, jobid, isArray));
+        const success = Resource['_listenSuccess'];
+        const reqResp = new 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;
-        return;
+        this.subjectInuUse[jobid].complete();
     }
     checkCache(sourceRequest, jobid) {
         const existedInCache = RequestCache.findBy(sourceRequest);
         if (existedInCache) {
             log$1.i('cache exists', existedInCache);
+            const success = Resource['_listenSuccess'];
+            success.next(existedInCache.response);
             this.subjectInuUse[jobid].next(existedInCache);
+            this.subjectInuUse[jobid].complete();
             return true;
         }
         // log.i(`cache not exists for jobid ${jobid}`)
@@ -1139,6 +1150,9 @@ class RestRequest {
         }, jobid)) {
             return;
         }
+        const CancelToken = axios.CancelToken;
+        const source = CancelToken.source();
+        this.subjectInuUse[jobid][cancelFn] = source.cancel;
         var response;
         if (mockHttp) {
             if (typeof mockHttp === 'object') {
@@ -1169,10 +1183,14 @@ class RestRequest {
                     method,
                     data: body,
                     responseType: 'text',
-                    headers: headers.toJSON()
+                    headers: headers.toJSON(),
+                    cancelToken: source.token,
                 });
                 // log.d(`after response of jobid: ${jobid}`);
             }
+            if (this.subjectInuUse[jobid][isCanceled]) {
+                return;
+            }
             this.handlerResult({
                 res: {
                     code: response.status,
@@ -1192,13 +1210,17 @@ class RestRequest {
             });
         }
         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 || '';
                 let stack = (err.stack || '').split('\n');
-                Resource['_listenErrors'].next({
+                const errObs = Resource['_listenErrors'];
+                errObs.next({
                     msg,
                     stack,
                     data: catchedError.response.data
@@ -1255,12 +1277,39 @@ class RestRequest {
         }
         replay = this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast];
         if (!_.isNumber(replay.id)) {
+            if (RestRequest.jobId === Number.MAX_SAFE_INTEGER) {
+                RestRequest.jobId = 0;
+            }
             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 Observable((observer) => {
+                // observer.remove(() => {
+                // });
+                observer.add(() => {
+                    // console.log(`cancel observable job${jobid}`)
+                    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}`)
+                    }
+                });
+                const sub = subject.subscribe({
+                    next: a => observer.next(a),
+                    error: a => observer.error(a),
+                    complete: () => {
+                        sub.unsubscribe();
+                        observer.complete();
+                    },
+                });
+            });
             //#region DISPOSE  @UNCOMMENT AFTER TESTS
             // if (objectIDToCreateOrLast > 2) {
             //   const oldReq: Models.ReplayData = this.replaySubjects[meta.endpoint][meta.path][method][(objectIDToCreateOrLast - 2)];
@@ -1283,8 +1332,8 @@ class RestRequest {
             // log.d(`for ${purl} jobid ${pid}`);
             setTimeout(() => pthis.req(purl, pmethod, pheaders, pbody, pid, pisArray, pmockHttp));
         })(this, url, method, headers, body, replay.id, isArray, mockHttp);
-        const resp = firstValueFrom(replay.subject.asObservable());
-        resp.observable = replay.subject.asObservable();
+        const resp = firstValueFrom(replay.subject[customObs]);
+        resp.observable = replay.subject[customObs];
         resp.cache = RequestCache.findBy({
             body,
             isArray,
@@ -1348,9 +1397,9 @@ class RestRequest {
             document.body.appendChild(sc);
             document.body.removeChild(sc);
         });
-        // return replay.subject.asObservable();
-        const resp = firstValueFrom(replay.subject.asObservable());
-        resp.observable = replay.subject.asObservable();
+        const resp = firstValueFrom(replay.subject[customObs]);
+        resp.observable = replay.subject[customObs];
+        console.log('assiging custom observable');
         resp.cache = RequestCache.findBy({
             body,
             isArray,
@@ -1396,6 +1445,9 @@ class Resource {
     static get listenErrors() {
         return this._listenErrors.asObservable();
     }
+    static get listenSuccessOperations() {
+        return this._listenSuccess.asObservable();
+    }
     //#region private mthods and fields
     getZone() {
         const isNode = (typeof window === 'undefined');
@@ -1508,7 +1560,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             url = url.slice(0, url.length - 1);
         log.i('url after', url);
         if (Resource.endpoints[e] !== void 0) {
-            !global.hideLog && console.warn('Cannot use map function at the same API endpoint again ('
+            Helpers$1.log('Cannot use map function at the same API endpoint again ('
                 + Resource.endpoints[e].url + ')');
             return false;
         }
@@ -1613,6 +1665,7 @@ Resource.DEFAULT_HEADERS = RestHeaders.from({
     'Accept': 'application/json'
 });
 Resource._listenErrors = new Subject();
+Resource._listenSuccess = new Subject();
 Resource.enableWarnings = true;
 Resource.instance = new Resource();
 Resource.endpoints = {};