@zintrust/trace 0.5.4 → 0.5.5

package/dist/storage/TraceContentBudget.js

@@ -22,58 +22,6 @@ const describeValueType = (value) => {
         return 'null';
     return typeof value;
 };
-const chooseLargerCandidate = (left, right) => {
-    if (left === null)
-        return right;
-    if (right === null)
-        return left;
-    return right.size > left.size ? right : left;
-};
-const fallbackCandidate = (value, path) => {
-    return path.length === 0 ? null : { path, size: serializedSize(value) };
-};
-const findLargestDroppablePathInArray = (value, path) => {
-    let best = null;
-    for (const [index, item] of value.entries()) {
-        best = chooseLargerCandidate(best, findLargestDroppablePath(item, [...path, index]));
-    }
-    return best ?? fallbackCandidate(value, path);
-};
-const findLargestDroppablePathInObject = (value, path) => {
-    let best = null;
-    for (const [key, entryValue] of Object.entries(value)) {
-        if (key === '__traceNotice')
-            continue;
-        best = chooseLargerCandidate(best, findLargestDroppablePath(entryValue, [...path, key]));
-    }
-    return best ?? fallbackCandidate(value, path);
-};
-const findLargestDroppablePath = (value, path = []) => {
-    if (Array.isArray(value))
-        return findLargestDroppablePathInArray(value, path);
-    if (typeof value === 'object' && value !== null) {
-        return findLargestDroppablePathInObject(value, path);
-    }
-    return fallbackCandidate(value, path);
-};
-const replaceAtPath = (value, path, replacement) => {
-    if (path.length === 0)
-        return replacement;
-    const [segment, ...rest] = path;
-    if (Array.isArray(value) && typeof segment === 'number') {
-        const next = value.slice();
-        next[segment] = replaceAtPath(next[segment], rest, replacement);
-        return next;
-    }
-    if (typeof value === 'object' && value !== null && typeof segment === 'string') {
-        const current = value;
-        return {
-            ...current,
-            [segment]: replaceAtPath(current[segment], rest, replacement),
-        };
-    }
-    return value;
-};
 const compactValue = (value, depth) => {
     if (depth >= DEFAULT_MAX_DEPTH) {
         return DROPPED_FIELD_MESSAGE;
@@ -106,17 +54,28 @@ const compactValue = (value, depth) => {
     return Object.fromEntries(compactedEntries);
 };
 const compactStructuredValueToBudget = (value) => {
-    let compacted = typeof value === 'object' && value !== null && !Array.isArray(value)
-        ? {
-            ...value,
-            __traceNotice: COMPACTED_CONTENT_MESSAGE,
-        }
-        : value;
-    while (serializedSize(compacted) > DEFAULT_MAX_ENTRY_BYTES) {
-        const candidate = findLargestDroppablePath(compacted);
-        if (candidate === null)
+    if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+        return value;
+    }
+    const compacted = {
+        ...value,
+        __traceNotice: COMPACTED_CONTENT_MESSAGE,
+    };
+    const topLevelCandidates = Object.entries(compacted)
+        .filter(([key]) => key !== '__traceNotice')
+        .map(([key, entryValue]) => ({ key, size: serializedSize(entryValue) }))
+        .sort((left, right) => right.size - left.size);
+    let droppedCount = 0;
+    for (const candidate of topLevelCandidates) {
+        if (serializedSize(compacted) <= DEFAULT_MAX_ENTRY_BYTES) {
             break;
-        compacted = replaceAtPath(compacted, candidate.path, DROPPED_FIELD_MESSAGE);
+        }
+        compacted[candidate.key] = DROPPED_FIELD_MESSAGE;
+        droppedCount += 1;
+    }
+    if (droppedCount > 0) {
+        compacted['__traceNotice'] =
+            `${COMPACTED_CONTENT_MESSAGE} ${String(droppedCount)} top-level field(s) were dropped.`;
     }
     return compacted;
 };
@@ -158,23 +117,24 @@ const closePort = (port) => {
         port.close();
     }
 };
-const scheduleTask = (task) => {
-    if (typeof MessageChannel === 'function') {
-        const channel = new MessageChannel();
-        channel.port1.onmessage = () => {
-            channel.port1.onmessage = null;
-            closePort(channel.port1);
-            closePort(channel.port2);
-            void task().catch(() => undefined);
+const scheduleTask = async (task) => {
+    return await new Promise((resolve, reject) => {
+        const runTask = () => {
+            void task().then(resolve).catch(reject);
         };
-        channel.port2.postMessage(undefined);
-        return;
-    }
-    Promise.resolve()
-        .then(() => {
-        void task().catch(() => undefined);
-    })
-        .catch(() => undefined);
+        if (typeof MessageChannel === 'function') {
+            const channel = new MessageChannel();
+            channel.port1.onmessage = () => {
+                channel.port1.onmessage = null;
+                closePort(channel.port1);
+                closePort(channel.port2);
+                runTask();
+            };
+            channel.port2.postMessage(undefined);
+            return;
+        }
+        Promise.resolve().then(runTask).catch(reject);
+    });
 };
 const getReplacementContent = (content) => {
     return {
@@ -283,7 +243,7 @@ const startInternalDispatchWorker = (storage, config, runtime) => {
     if (startedWorkerKeys.has(key))
         return;
     startedWorkerKeys.add(key);
-    scheduleTask(async () => {
+    void scheduleTask(async () => {
         const workersApi = runtime?.queueWorkerApi ?? (await getQueueWorkerApi());
         if (workersApi === null) {
             startedWorkerKeys.delete(key);
@@ -323,10 +283,12 @@ const startInternalDispatchWorker = (storage, config, runtime) => {
         ensureWorkerTimer(key, setInterval(() => {
             void runWorker();
         }, intervalMs));
+    }).catch(() => {
+        startedWorkerKeys.delete(key);
     });
 };
-const dispatchWrite = (storage, config, entry, runtime) => {
-    scheduleTask(async () => {
+const dispatchWrite = async (storage, config, entry, runtime) => {
+    await scheduleTask(async () => {
         if (hasQueueDispatch(config)) {
             const enqueued = await enqueueTraceDispatch(config, { operation: 'write', entry }, runtime);
             if (enqueued)
@@ -335,8 +297,8 @@ const dispatchWrite = (storage, config, entry, runtime) => {
         await persistWriteFallback(storage, entry);
     });
 };
-const dispatchUpdate = (storage, config, uuid, patch, runtime) => {
-    scheduleTask(async () => {
+const dispatchUpdate = async (storage, config, uuid, patch, runtime) => {
+    await scheduleTask(async () => {
         if (hasQueueDispatch(config)) {
             const enqueued = await enqueueTraceDispatch(config, { operation: 'update', uuid, patch }, runtime);
             if (enqueued)
@@ -351,10 +313,10 @@ export const TraceContentBudget = Object.freeze({
         return Object.freeze({
             ...storage,
             writeEntry: async (entry) => {
-                dispatchWrite(storage, config, entry, runtime);
+                await dispatchWrite(storage, config, entry, runtime);
             },
             updateEntry: async (uuid, patch) => {
-                dispatchUpdate(storage, config, uuid, patch, runtime);
+                await dispatchUpdate(storage, config, uuid, patch, runtime);
             },
         });
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/trace",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Trace assistant for ZinTrust: logs requests, queries, exceptions, jobs, and more.",
   "private": false,
   "type": "module",

package/src/storage/TraceContentBudget.ts

@@ -28,87 +28,6 @@ const describeValueType = (value: unknown): string => {
   return typeof value;
 };
 
-type TracePathSegment = string | number;
-
-type TracePathCandidate = {
-  path: TracePathSegment[];
-  size: number;
-};
-
-const chooseLargerCandidate = (
-  left: TracePathCandidate | null,
-  right: TracePathCandidate | null
-): TracePathCandidate | null => {
-  if (left === null) return right;
-  if (right === null) return left;
-  return right.size > left.size ? right : left;
-};
-
-const fallbackCandidate = (value: unknown, path: TracePathSegment[]): TracePathCandidate | null => {
-  return path.length === 0 ? null : { path, size: serializedSize(value) };
-};
-
-const findLargestDroppablePathInArray = (
-  value: unknown[],
-  path: TracePathSegment[]
-): TracePathCandidate | null => {
-  let best: TracePathCandidate | null = null;
-
-  for (const [index, item] of value.entries()) {
-    best = chooseLargerCandidate(best, findLargestDroppablePath(item, [...path, index]));
-  }
-
-  return best ?? fallbackCandidate(value, path);
-};
-
-const findLargestDroppablePathInObject = (
-  value: Record<string, unknown>,
-  path: TracePathSegment[]
-): TracePathCandidate | null => {
-  let best: TracePathCandidate | null = null;
-
-  for (const [key, entryValue] of Object.entries(value)) {
-    if (key === '__traceNotice') continue;
-    best = chooseLargerCandidate(best, findLargestDroppablePath(entryValue, [...path, key]));
-  }
-
-  return best ?? fallbackCandidate(value, path);
-};
-
-const findLargestDroppablePath = (
-  value: unknown,
-  path: TracePathSegment[] = []
-): TracePathCandidate | null => {
-  if (Array.isArray(value)) return findLargestDroppablePathInArray(value, path);
-  if (typeof value === 'object' && value !== null) {
-    return findLargestDroppablePathInObject(value as Record<string, unknown>, path);
-  }
-
-  return fallbackCandidate(value, path);
-};
-
-const replaceAtPath = (value: unknown, path: TracePathSegment[], replacement: unknown): unknown => {
-  if (path.length === 0) return replacement;
-
-  const [segment, ...rest] = path;
-
-  if (Array.isArray(value) && typeof segment === 'number') {
-    const next = value.slice();
-    next[segment] = replaceAtPath(next[segment], rest, replacement);
-    return next;
-  }
-
-  if (typeof value === 'object' && value !== null && typeof segment === 'string') {
-    const current = value as Record<string, unknown>;
-    return {
-      ...current,
-      [segment]: replaceAtPath(current[segment], rest, replacement),
-    };
-  }
-
-  return value;
-};
-
 const compactValue = (value: unknown, depth: number): unknown => {
   if (depth >= DEFAULT_MAX_DEPTH) {
     return DROPPED_FIELD_MESSAGE;
@@ -152,18 +71,34 @@ const compactValue = (value: unknown, depth: number): unknown => {
 };
 
 const compactStructuredValueToBudget = (value: unknown): unknown => {
-  let compacted: unknown =
-    typeof value === 'object' && value !== null && !Array.isArray(value)
-      ? {
-          ...(value as Record<string, unknown>),
-          __traceNotice: COMPACTED_CONTENT_MESSAGE,
-        }
-      : value;
+  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+    return value;
+  }
+
+  const compacted: Record<string, unknown> = {
+    ...(value as Record<string, unknown>),
+    __traceNotice: COMPACTED_CONTENT_MESSAGE,
+  };
+
+  const topLevelCandidates = Object.entries(compacted)
+    .filter(([key]) => key !== '__traceNotice')
+    .map(([key, entryValue]) => ({ key, size: serializedSize(entryValue) }))
+    .sort((left, right) => right.size - left.size);
+
+  let droppedCount = 0;
+
+  for (const candidate of topLevelCandidates) {
+    if (serializedSize(compacted) <= DEFAULT_MAX_ENTRY_BYTES) {
+      break;
+    }
 
-  while (serializedSize(compacted) > DEFAULT_MAX_ENTRY_BYTES) {
-    const candidate = findLargestDroppablePath(compacted);
-    if (candidate === null) break;
-    compacted = replaceAtPath(compacted, candidate.path, DROPPED_FIELD_MESSAGE);
+    compacted[candidate.key] = DROPPED_FIELD_MESSAGE;
+    droppedCount += 1;
+  }
+
+  if (droppedCount > 0) {
+    compacted['__traceNotice'] =
+      `${COMPACTED_CONTENT_MESSAGE} ${String(droppedCount)} top-level field(s) were dropped.`;
   }
 
   return compacted;
@@ -270,26 +205,28 @@ const closePort = (port: MessagePort): void => {
   }
 };
 
-const scheduleTask = (task: () => Promise<void>): void => {
-  if (typeof MessageChannel === 'function') {
-    const channel = new MessageChannel();
-
-    channel.port1.onmessage = (): void => {
-      channel.port1.onmessage = null;
-      closePort(channel.port1);
-      closePort(channel.port2);
-      void task().catch(() => undefined);
+const scheduleTask = async (task: () => Promise<void>): Promise<void> => {
+  return await new Promise<void>((resolve, reject) => {
+    const runTask = (): void => {
+      void task().then(resolve).catch(reject);
     };
 
-    channel.port2.postMessage(undefined);
-    return;
-  }
+    if (typeof MessageChannel === 'function') {
+      const channel = new MessageChannel();
+
+      channel.port1.onmessage = (): void => {
+        channel.port1.onmessage = null;
+        closePort(channel.port1);
+        closePort(channel.port2);
+        runTask();
+      };
+
+      channel.port2.postMessage(undefined);
+      return;
+    }
 
-  Promise.resolve()
-    .then(() => {
-      void task().catch(() => undefined);
-    })
-    .catch(() => undefined);
+    Promise.resolve().then(runTask).catch(reject);
+  });
 };
 
 const getReplacementContent = (content: unknown): Record<string, unknown> => {
@@ -442,7 +379,7 @@ const startInternalDispatchWorker = (
   if (startedWorkerKeys.has(key)) return;
   startedWorkerKeys.add(key);
 
-  scheduleTask(async () => {
+  void scheduleTask(async () => {
     const workersApi = runtime?.queueWorkerApi ?? (await getQueueWorkerApi());
     if (workersApi === null) {
       startedWorkerKeys.delete(key);
@@ -487,16 +424,18 @@ const startInternalDispatchWorker = (
         void runWorker();
       }, intervalMs)
     );
+  }).catch(() => {
+    startedWorkerKeys.delete(key);
   });
 };
 
-const dispatchWrite = (
+const dispatchWrite = async (
   storage: ITraceStorage,
   config: ITraceConfig,
   entry: ITraceEntry,
   runtime?: TraceContentBudgetRuntime
-): void => {
-  scheduleTask(async () => {
+): Promise<void> => {
+  await scheduleTask(async () => {
     if (hasQueueDispatch(config)) {
       const enqueued = await enqueueTraceDispatch(config, { operation: 'write', entry }, runtime);
       if (enqueued) return;
@@ -506,14 +445,14 @@ const dispatchWrite = (
   });
 };
 
-const dispatchUpdate = (
+const dispatchUpdate = async (
   storage: ITraceStorage,
   config: ITraceConfig,
   uuid: string,
   patch: Partial<Pick<ITraceEntry, 'content' | 'isLatest'>>,
   runtime?: TraceContentBudgetRuntime
-): void => {
-  scheduleTask(async () => {
+): Promise<void> => {
+  await scheduleTask(async () => {
     if (hasQueueDispatch(config)) {
       const enqueued = await enqueueTraceDispatch(
         config,
@@ -538,13 +477,13 @@ export const TraceContentBudget = Object.freeze({
     return Object.freeze({
       ...storage,
       writeEntry: async (entry: ITraceEntry): Promise<void> => {
-        dispatchWrite(storage, config, entry, runtime);
+        await dispatchWrite(storage, config, entry, runtime);
       },
       updateEntry: async (
         uuid: string,
         patch: Partial<Pick<ITraceEntry, 'content' | 'isLatest'>>
       ): Promise<void> => {
-        dispatchUpdate(storage, config, uuid, patch, runtime);
+        await dispatchUpdate(storage, config, uuid, patch, runtime);
       },
     });
   },