refactor: log trace

Author: nomagick

package.json

@@ -1,6 +1,6 @@
 {
     "name": "civkit",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "description": "Sets of tools, in typescript",
     "main": "index.js",
     "types": "index.d.ts",

src/civ-rpc/errors.ts

@@ -110,12 +110,12 @@ export function StatusCode(status: APPLICATION_ERROR | number) {
 })
 @StatusCode(50000)
 export class ApplicationError extends Error implements AutoCastable {
-    static from(input: string | object, status: number, detail?: any) {
+    static from(input: string | object) {
         let _input = input;
         if (typeof input === 'string') {
             _input = { message: input };
         }
-        const instance = autoConstructor.call(this, _input, status, detail) as ApplicationError;
+        const instance = autoConstructor.call(this, _input) as ApplicationError;
 
         Error.captureStackTrace(instance, this.from);
         instance._fixStack();

src/lib/logger.ts

@@ -13,19 +13,20 @@ const logLevels = {
     TRACE: 'trace'
 } as const;
 
-export const TRACE_ID = Symbol('TraceID');
-export const TRACE_T0 = Symbol('TraceT0');
+export const TRACE_CTX = Symbol('TraceCtx');
+export interface TraceCtx {
+    id?: string;
+    t0?: Date;
+}
 export interface TraceableInterface {
-    [TRACE_ID]?: string;
-    [TRACE_T0]?: Date;
+    [TRACE_CTX]?: TraceCtx;
 }
 
 export const tracerHook = createHook({
     init(_asyncId, _type, _triggerAsyncId, resource: TraceableInterface) {
         const currentResource: TraceableInterface = executionAsyncResource();
-        if (currentResource?.[TRACE_ID]) {
-            resource[TRACE_ID] = currentResource[TRACE_ID];
-            resource[TRACE_T0] = currentResource[TRACE_T0];
+        if (currentResource?.[TRACE_CTX]) {
+            resource[TRACE_CTX] = currentResource[TRACE_CTX];
         }
     }
 });
@@ -34,10 +35,19 @@ export function setupTraceId(traceId?: string, t0?: Date) {
     tracerHook.enable();
     const currentResource: TraceableInterface = executionAsyncResource();
     if (currentResource) {
-        currentResource[TRACE_ID] = traceId || randomUUID();
-        currentResource[TRACE_T0] = t0 || new Date();
-
-        return currentResource[TRACE_ID];
+        
+        if (!currentResource[TRACE_CTX]) {
+            currentResource[TRACE_CTX] = {
+                id: traceId || randomUUID(),
+                t0: t0 || new Date()
+            };
+        } else {
+            const ctx = currentResource[TRACE_CTX]!;
+            ctx.id = traceId || randomUUID();
+            ctx.t0 = t0 || new Date();
+        } 
+
+        return currentResource[TRACE_CTX];
     }
 
     return undefined;
@@ -46,7 +56,7 @@ export function setupTraceId(traceId?: string, t0?: Date) {
 export function getTraceId() {
     const currentResource: TraceableInterface = executionAsyncResource();
 
-    return currentResource?.[TRACE_ID];
+    return currentResource?.[TRACE_CTX]?.id;
 }
 
 export abstract class AbstractLogger extends AsyncService {
@@ -86,10 +96,10 @@ export abstract class AbstractLogger extends AsyncService {
         }
 
         const resource: TraceableInterface = executionAsyncResource();
-        if (resource?.[TRACE_ID]) {
+        if (resource?.[TRACE_CTX]) {
             objects.push({
-                traceId: resource[TRACE_ID],
-                traceDt: Date.now() - resource[TRACE_T0]!.getTime()
+                traceId: resource[TRACE_CTX].id,
+                traceDt: Date.now() - resource[TRACE_CTX].t0!.getTime()
             });
         }