@oneteme/inspect-ng-collector 1.3.0-beta.7 → 1.3.0-beta.8

package/fesm2022/oneteme-inspect-ng-collector.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { Injectable, APP_INITIALIZER, ErrorHandler, NgModule } from '@angular/core';
-import { HttpResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpErrorResponse, HttpResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { finalize, interval, startWith, tap as tap$1 } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { NavigationStart, NavigationEnd, NavigationCancel, Router } from '@angular/router';
@@ -19,7 +19,7 @@ const PRE_DISPATCH = 'pre-dispatch';
 const BEFOREUNLOAD = 'beforeunload';
 function createLogEntry(level, message, sessionId) {
     return {
-        "@type": "log",
+        "@type": "00",
         level: level,
         message: message,
         instant: dateNow(),
@@ -28,7 +28,7 @@ function createLogEntry(level, message, sessionId) {
 }
 function createReport(message) {
     return {
-        "@type": "log",
+        "@type": "00",
         level: "ERROR",
         message: message,
         instant: dateNow(),
@@ -147,7 +147,7 @@ function adaptedConfig(conf) {
             ...conf.tracing,
             remote: {
                 ...conf.tracing?.remote,
-                '@type': "rest-rmt",
+                '@type': "02",
                 retentionMaxAge: (conf.tracing?.remote?.retentionMaxAge ?? 10) * 60 * 60 * 24
             }
         }
@@ -202,7 +202,7 @@ class ContextManager {
             id: instanceId,
             name: require(getStringOrCall(conf?.monitoring?.name), 'name'),
             version: getStringOrCall(conf?.monitoring?.version),
-            address: undefined, //server side
+            address: getSessionAddress(), //server side
             env: require(getStringOrCall(conf?.monitoring?.env), 'env'),
             os: detectOs(),
             re: detectBrowser(),
@@ -216,6 +216,14 @@ class ContextManager {
         };
     }
 }
+function getSessionAddress() {
+    let inspectId = localStorage.getItem("inspect-id");
+    if (!inspectId) {
+        inspectId = crypto.randomUUID();
+        localStorage.setItem("inspect-id", inspectId);
+    }
+    return inspectId;
+}
 function instanceApiURL(host, path) {
     return toURL(host, path);
 }
@@ -237,24 +245,27 @@ class SessionManager {
     navigate(url) {
         this.getCurrentSession(s => {
             if (s) {
-                s.end = dateNow();
-                window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { force: !url } }));
+                this.getCurrentSessionCallBack(cb => cb.end = dateNow());
+                window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { force: !url, traces: this.currentSessionCallBack } }));
             }
             this.currentSession = null;
         });
         if (url) {
+            let id = crypto.randomUUID();
             this.currentSession = {
-                '@type': "main-ses",
-                id: crypto.randomUUID(),
+                '@type': "10",
+                id: id,
                 user: ContextManager.instance.techConfig.user,
                 start: dateNow(),
                 type: "VIEW",
                 location: url,
                 loading: true,
-                exceptions: [],
-                requestsMask: 0,
-                end: null,
-                address: this.getSessionAddress()
+                requestMask: 0,
+            };
+            this.currentSessionCallBack = {
+                '@type': "11",
+                id: id,
+                requestMask: 0,
             };
         }
     }
@@ -267,14 +278,6 @@ class SessionManager {
             }
         });
     }
-    getSessionAddress() {
-        let inspectId = localStorage.getItem("inspect-id");
-        if (!inspectId) {
-            inspectId = crypto.randomUUID();
-            localStorage.setItem("inspect-id", inspectId);
-        }
-        return inspectId;
-    }
     getCurrentSession(fn) {
         if (this.currentSession) {
             return fn(this.currentSession);
@@ -282,14 +285,21 @@ class SessionManager {
         window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { traces: createReport("no active session found ") } }));
         return undefined;
     }
+    getCurrentSessionCallBack(fn) {
+        if (this.currentSessionCallBack) {
+            return fn(this.currentSessionCallBack);
+        }
+        window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { traces: createReport("no active session found ") } }));
+        return undefined;
+    }
     currentSessionID() {
         return this.getCurrentSession(s => s.id);
     }
     updateMask(requestMask) {
-        this.getCurrentSession(s => s.requestsMask |= requestMask);
+        this.getCurrentSessionCallBack(s => s.requestMask |= requestMask);
     }
     addException(exception) {
-        this.getCurrentSession(s => s.exceptions.push(exception));
+        this.getCurrentSessionCallBack(s => s.exception = exception);
     }
 }
 
@@ -299,7 +309,7 @@ class RestRequestMonitor {
         const url = toHref(restRequest.urlWithParams);
         const auth_user = extractAuthSchemeAnduser(restRequest.headers);
         this.restRequest = {
-            "@type": "http-req",
+            "@type": "120",
             id: crypto.randomUUID(),
             method: restRequest.method,
             protocol: url.protocol.slice(0, -1),
@@ -310,40 +320,48 @@ class RestRequestMonitor {
             contentType: restRequest.responseType,
             authScheme: auth_user.authScheme,
             user: auth_user.user,
-            ouDataSize: sizeOf(restRequest.body),
+            dataSize: sizeOf(restRequest.body),
             start: start,
-            linked: false,
-            end: undefined,
             sessionId: SessionManager.instance.currentSessionID()
         };
         SessionManager.instance.updateMask(RequestMask.REST);
+        this.restRequestCallBack = {
+            "@type": "121",
+            id: this.restRequest.id,
+            dataSize: -1,
+            linked: false
+        };
     }
     postProcess(event, error) {
         let status = 0, exception = null;
         if (event) {
             status = +event.status;
-            this.restRequest.inDataSize = sizeOf(event.body);
-            this.restRequest.linked = this.assertSessionID(this.restRequest.id, event.headers);
+            this.restRequestCallBack.dataSize = sizeOf(event.body);
+            this.restRequestCallBack.linked = this.assertSessionID(this.restRequest.id, event.headers);
         }
         if (error) {
-            this.restRequest.linked = error?.headers && this.assertSessionID(this.restRequest.id, error.headers);
+            this.restRequestCallBack.linked = error?.headers && this.assertSessionID(this.restRequest.id, error.headers);
             status = +error.status;
             exception = {
                 type: error.name,
                 message: error.error && error.status ? JSON.stringify(error.error) : error.message
             };
+            this.restRequestCallBack.bodyContent = error instanceof HttpErrorResponse ? JSON.stringify(error.error) : undefined;
+            this.restRequestCallBack.dataSize = sizeOf(error.error);
         }
-        this.restRequest.end = dateNow();
-        this.restRequest.status = +status;
+        this.restRequestCallBack.contentType = extractContentType(event?.headers);
+        this.restRequestCallBack.end = dateNow();
+        this.restRequestCallBack.status = +status;
         let stage = {
-            "@type": "http-stg",
+            "@type": "220",
             name: "PROCESS",
-            start: this.restRequest.start,
+            start: this.restRequest.start, //  use request
             end: dateNow(),
             order: 0,
             exception: exception,
-            requestId: this.restRequest.id
+            requestId: this.restRequestCallBack.id
         };
+        window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { traces: this.restRequestCallBack } }));
         window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { traces: stage } }));
     }
     assertSessionID(id, headers) {
@@ -391,6 +409,17 @@ function extractAuthSchemeAnduser(headers) {
     }
     return auth_user;
 }
+function extractContentType(headers) {
+    try {
+        if (headers?.has('Content-Type')) {
+            return headers.get('Content-Type');
+        }
+    }
+    catch (err) {
+        createReport(JSON.stringify(err));
+    }
+    return undefined;
+}
 function sizeOf(body) {
     return body ? JSON.stringify(body).length : 0;
 }
@@ -428,10 +457,10 @@ class HttpInterceptorService {
             });
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: HttpInterceptorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: HttpInterceptorService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: HttpInterceptorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: HttpInterceptorService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: HttpInterceptorService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: HttpInterceptorService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [] });
@@ -449,10 +478,10 @@ class GlobalErrorHandlerService {
         }
         throw error;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: GlobalErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: GlobalErrorHandlerService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: GlobalErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: GlobalErrorHandlerService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: GlobalErrorHandlerService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: GlobalErrorHandlerService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -472,7 +501,9 @@ class EventTraceScheduledDispatcherService {
             if (this.sendSessionfinished) {
                 this.sendSessionfinished = false;
                 window.dispatchEvent(new CustomEvent(PRE_DISPATCH));
-                setTimeout(() => this.Dispatch().finally(() => { this.sendSessionfinished = true; }), 5);
+                setTimeout(() => this.Dispatch()
+                    .catch(err => { })
+                    .finally(() => { this.sendSessionfinished = true; }), 5);
             }
         }))
             .subscribe();
@@ -502,7 +533,8 @@ class EventTraceScheduledDispatcherService {
             if (instanceComplete) {
                 uri += "&end=" + new Date().toISOString();
             }
-            let sessions = this.extractEventTrace();
+            let sessions = this.traceQueue;
+            this.traceQueue = new Set();
             return fetch(uri, this.getRequestInit(sessions))
                 .then(res => {
                 if (res.ok) {
@@ -515,27 +547,6 @@ class EventTraceScheduledDispatcherService {
         }
         return Promise.resolve(0);
     }
-    extractEventTrace() {
-        let trc = this.traceQueue;
-        this.traceQueue = new Set();
-        let ses = new Set();
-        trc.forEach(((e) => {
-            if (e.hasOwnProperty("end")) {
-                const copy = { ...e };
-                if (!copy.end) {
-                    ses.add(copy);
-                    this.traceQueue.add(e);
-                }
-                else {
-                    ses.add(e);
-                }
-            }
-            else {
-                ses.add(e);
-            }
-        }));
-        return ses;
-    }
     handleEventTraceSavingError(sessions) {
         this.sessionSendAttempts % 5 == 0 && console.warn(`Error while attempting to send sessions, attempts: ${this.sessionSendAttempts}`);
         this.revertQueueSize(sessions);
@@ -593,7 +604,7 @@ function routeHandler(event) {
         SessionManager.instance.navigate(event.url);
     }
     if (event instanceof NavigationEnd || event instanceof NavigationCancel) {
-        SessionManager.instance.updateSession();
+        setTimeout(() => SessionManager.instance.updateSession(), 0);
     }
 }
 function windowUnloadHandler(event) {
@@ -603,7 +614,7 @@ function bfCacheHandler(event) {
     if (event.persisted) { // if the page was restored from bfcache
         ContextManager.init(NgCollectorModule.configuration);
         SessionManager.instance.navigate(document.URL);
-        SessionManager.instance.updateSession();
+        setTimeout(() => SessionManager.instance.updateSession(), 0);
     }
 }
 
@@ -614,7 +625,7 @@ function getMemoryInfo() {
     try {
         const memory = performance.memory;
         return {
-            '@type': 'rsrc-usg',
+            '@type': '01',
             instant: dateNow(),
             usedHeap: memory.usedJSHeapSize / (1024 * 1024),
             commitedHeap: memory.totalJSHeapSize / (1024 * 1024),
@@ -732,14 +743,14 @@ function lookUpChild(t, depth) {
 }
 function addActionUser(eventType, target) {
     const ua = {
-        '@type': "user-act",
+        '@type': "300",
         type: eventType,
         start: dateNow(),
         name: extractName(target),
         nodeName: target.tagName?.toLowerCase(),
         sessionId: SessionManager.instance?.currentSessionID()
     };
-    //  window.dispatchEvent(new CustomEvent( DISPATCH ,{ detail :  { traces:ua }}));
+    // window.dispatchEvent(new CustomEvent( DISPATCH ,{ detail :  { traces:ua }}));
 }
 
 function eventTraceDebugger() {
@@ -811,7 +822,7 @@ class EventTraceDebugger {
         if (session.location) {
             s += `(${session.location}) `;
         }
-        s += this.prettyDurationFormat(session.start, session.end) + '\n';
+        //s+= this.prettyDurationFormat(session.start, session.end)+'\n';
         s += this.getChildPrint(this.restRequests, this.prettyRestRequestFormat.bind(this));
         s += this.getChildPrint(this.localRequests, this.prettyLocalRequestFormat.bind(this));
         s += this.getChildPrint(this.userActions, this.prettyActionUserFormat.bind(this));
@@ -839,8 +850,9 @@ class EventTraceDebugger {
         if (rest.query) {
             s += rest.query;
         }
-        s += ` >> ${rest.status} `;
-        s += this.prettyDurationFormat(rest.start, rest.end) + '\n';
+        // s+= ` >> ${rest.status} `
+        // s+= this.prettyDurationFormat(rest.start,rest.end);
+        s += '\n';
         this.httpRequestStages.filter((s) => s.requestId == rest.id).forEach((stage) => {
             s += this.prettyHttpRequestStageFormat(stage);
         });
@@ -863,14 +875,14 @@ class EventTraceDebugger {
         if (local.location) {
             s += `(${local.location})`;
         }
-        s += " >> ";
-        if (local.exception?.type) {
-            s += ` ${local.exception?.type}:`;
-        }
-        if (local.exception?.message) {
-            s += ` ${local.exception.message}`;
-        }
-        s += ` ${this.prettyDurationFormat(local.start, local.end)}`;
+        /*s+= " >> ";
+       if(local.exception?.type){
+         s+= ` ${local.exception?.type}:`;
+       }
+       if(local.exception?.message){
+         s+= ` ${local.exception.message}`
+       }
+       s+= ` ${this.prettyDurationFormat(local.start, local.end)}`;*/
         return s;
     }
     prettyLogEntryFormat(log) {
@@ -953,11 +965,11 @@ class NgCollectorModule {
             ngModule: NgCollectorModule
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: NgCollectorModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.11", ngImport: i0, type: NgCollectorModule }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: NgCollectorModule }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: NgCollectorModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.16", ngImport: i0, type: NgCollectorModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: NgCollectorModule }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.11", ngImport: i0, type: NgCollectorModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.16", ngImport: i0, type: NgCollectorModule, decorators: [{
             type: NgModule
         }] });
 function initializeEvents(router) {
@@ -1007,19 +1019,26 @@ function TraceableStage() {
             }
             finally {
                 end = Date.now();
+                let id = crypto.randomUUID();
                 window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { traces: {
-                            "@type": "locl-req",
-                            id: crypto.randomUUID(),
+                            "@type": "110",
+                            id: id,
                             name: propertyKey,
                             location: target.constructor.name,
                             user: WIN["inspect-session-manager"]?.currentSession?.user,
                             start: start,
-                            end: end,
-                            exception: exception,
                             sessionId: WIN["inspect-session-manager"]?.currentSession?.id
                         }
                     }
                 }));
+                window.dispatchEvent(new CustomEvent(DISPATCH, { detail: { traces: {
+                            "@type": "111",
+                            id: id,
+                            exception: exception,
+                            end: end
+                        }
+                    }
+                }));
             }
         };
         return descriptor;