@dxos/log 0.8.4-main.fcfe5033a5 → 0.8.4-main.fdfb99ef29

package/dist/lib/browser/index.mjs

@@ -1,4 +1,5 @@
 import {
+  LogEntry,
   LogLevel,
   LogProcessorType,
   gatherLogInfoFromScope,
@@ -8,7 +9,7 @@ import {
   logInfo,
   shortLevelName,
   shouldLog
-} from "./chunk-M2YHSBML.mjs";
+} from "./chunk-V7FYKT4H.mjs";
 import {
   __export,
   __reExport
@@ -20,7 +21,9 @@ __export(index_exports, {
   BROWSER_PROCESSOR: () => BROWSER_PROCESSOR,
   DEBUG_PROCESSOR: () => DEBUG_PROCESSOR,
   FILE_PROCESSOR: () => FILE_PROCESSOR,
+  LOG_META_MARKER: () => LOG_META_MARKER,
   LogBuffer: () => LogBuffer,
+  LogEntry: () => LogEntry,
   LogLevel: () => LogLevel,
   LogProcessorType: () => LogProcessorType,
   createFileProcessor: () => createFileProcessor,
@@ -31,17 +34,123 @@ __export(index_exports, {
   getContextFromEntry: () => getContextFromEntry,
   getCurrentOwnershipScope: () => getCurrentOwnershipScope,
   getRelativeFilename: () => getRelativeFilename,
+  inferEnvironmentName: () => inferEnvironmentName,
+  isLogMeta: () => isLogMeta,
   levels: () => levels,
   log: () => log,
   logInfo: () => logInfo,
   omit: () => omit,
   parseFilter: () => parseFilter,
   pick: () => pick,
+  serializeToJsonl: () => serializeToJsonl,
   shortLevelName: () => shortLevelName,
   shouldLog: () => shouldLog
 });
 import { omit, pick } from "@dxos/util";
 
+// src/environment.ts
+var TAB_SUFFIX_STORAGE_KEY = "@dxos/log:env-suffix";
+var SUFFIX_LENGTH = 6;
+var randomSuffix = () => {
+  const cryptoRef = globalThis.crypto;
+  if (cryptoRef?.getRandomValues) {
+    const bytes = new Uint8Array(SUFFIX_LENGTH);
+    cryptoRef.getRandomValues(bytes);
+    let suffix = "";
+    for (const byte of bytes) {
+      suffix += (byte % 36).toString(36);
+    }
+    return suffix;
+  }
+  return Math.random().toString(36).slice(2, 2 + SUFFIX_LENGTH).padEnd(SUFFIX_LENGTH, "0");
+};
+var getOrCreateTabSuffix = (session) => {
+  if (!session) {
+    return randomSuffix();
+  }
+  try {
+    const existing = session.getItem(TAB_SUFFIX_STORAGE_KEY);
+    if (existing && existing.length > 0) {
+      return existing;
+    }
+    const suffix = randomSuffix();
+    session.setItem(TAB_SUFFIX_STORAGE_KEY, suffix);
+    return suffix;
+  } catch {
+    return randomSuffix();
+  }
+};
+var isInstanceOf = (scope, ctorName) => {
+  const ctor = scope?.[ctorName];
+  return typeof ctor === "function" && scope instanceof ctor;
+};
+var CF_WORKER_USER_AGENT = "Cloudflare-Workers";
+var inferEnvironmentName = (options = {}) => {
+  const scope = options.scope ?? globalThis;
+  if (scope.navigator?.userAgent === CF_WORKER_USER_AGENT) {
+    return `cf-worker::${randomSuffix()}`;
+  }
+  if (isInstanceOf(scope, "SharedWorkerGlobalScope")) {
+    return `shared-worker:${scope.name ?? ""}:${randomSuffix()}`;
+  }
+  if (isInstanceOf(scope, "ServiceWorkerGlobalScope")) {
+    return `service-worker::${randomSuffix()}`;
+  }
+  if (isInstanceOf(scope, "DedicatedWorkerGlobalScope")) {
+    return `dedicated-worker:${scope.name ?? ""}:${randomSuffix()}`;
+  }
+  if (scope.window !== void 0 && scope.window === scope) {
+    const origin = scope.location?.origin ?? "";
+    return `tab:${origin}:${getOrCreateTabSuffix(scope.sessionStorage)}`;
+  }
+  const proc = scope.process;
+  if (proc && typeof proc === "object" && proc.versions?.node) {
+    const pid = typeof proc.pid === "number" ? String(proc.pid) : "";
+    return `node:${pid}:${randomSuffix()}`;
+  }
+  return `unknown::${randomSuffix()}`;
+};
+
+// src/jsonl.ts
+var serializeToJsonl = (entry, opts = {}) => {
+  if (entry.level <= LogLevel.TRACE) {
+    return void 0;
+  }
+  const { filename, line, context: scopeName } = entry.computedMeta;
+  const record = {
+    t: new Date(entry.timestamp).toISOString(),
+    l: shortLevelName[entry.level] ?? "?",
+    m: entry.message ?? ""
+  };
+  if (filename !== void 0) {
+    record.f = filename;
+  }
+  if (line !== void 0) {
+    record.n = line;
+  }
+  if (scopeName !== void 0) {
+    record.o = scopeName;
+  }
+  if (entry.computedError !== void 0) {
+    record.e = entry.computedError;
+  }
+  if (opts.env !== void 0) {
+    record.i = opts.env;
+  }
+  const computedContext = entry.computedContext;
+  if (Object.keys(computedContext).length > 0) {
+    try {
+      record.c = JSON.stringify(computedContext);
+    } catch {
+    }
+  }
+  try {
+    return JSON.stringify(record);
+  } catch {
+    return void 0;
+  }
+};
+
 // src/decorators.ts
 import chalk from "chalk";
 import { inspect } from "@dxos/node-std/util";
@@ -170,15 +279,7 @@ __export(processors_exports, {
 });
 
 // src/processors/browser-processor.ts
-import { getDebugName, safariCheck } from "@dxos/util";
-var getRelativeFilename2 = (filename) => {
-  const match = filename.match(/.+\/(packages\/.+\/.+)/);
-  if (match) {
-    const [, filePath] = match;
-    return filePath;
-  }
-  return filename;
-};
+import { safariCheck } from "@dxos/util";
 var CONFIG = {
   useTestProcessor: false,
   printFileLinks: false
@@ -189,18 +290,20 @@ var APP_BROWSER_PROCESSOR = (config, entry) => {
   }
   const LOG_BROWSER_PREFIX = config.prefix ?? "https://vscode.dev/github.com/dxos/dxos/blob/main/";
   const LOG_BROWSER_CSS = [];
+  const { filename, line: lineNumber, context: scopeDebugName } = entry.computedMeta;
   let link = "";
-  if (entry.meta) {
-    const filename = getRelativeFilename2(entry.meta.F);
+  if (filename !== void 0 && lineNumber !== void 0) {
     const filepath = `${LOG_BROWSER_PREFIX.replace(/\/$/, "")}/${filename}`;
-    link = `${filepath}#L${entry.meta.L}`;
+    link = `${filepath}#L${lineNumber}`;
   }
   let args = [];
-  if (entry.meta?.S) {
-    const scope = entry.meta?.S;
-    const scopeName = scope.name || getDebugName(scope);
-    const processPrefix = entry.meta.S?.hostSessionId ? "[worker] " : "";
-    args.push(`%c${processPrefix}${scopeName}`, "color:#C026D3;font-weight:bold");
+  const scope = entry.meta?.S;
+  if (scope) {
+    const scopeName = scope.name || scopeDebugName;
+    if (scopeName) {
+      const processPrefix = scope.hostSessionId ? "[worker] " : "";
+      args.push(`%c${processPrefix}${scopeName}`, "color:#C026D3;font-weight:bold");
+    }
   }
   if (entry.message) {
     args.push(entry.message);
@@ -208,9 +311,9 @@ var APP_BROWSER_PROCESSOR = (config, entry) => {
   const context = getContextFromEntry(entry);
   if (context) {
     if (Object.keys(context).length === 1 && "error" in context) {
-      args.push(context.error);
+      args.push(unwrapEffectError(context.error));
     } else if (Object.keys(context).length === 1 && "err" in context) {
-      args.push(context.err);
+      args.push(unwrapEffectError(context.err));
     } else {
       args.push(context);
     }
@@ -245,10 +348,8 @@ var TEST_BROWSER_PROCESSOR = (config, entry) => {
   if (!shouldLog(entry, config.filters)) {
     return;
   }
-  let path = "";
-  if (entry.meta) {
-    path = `${getRelativeFilename2(entry.meta.F)}:${entry.meta.L}`;
-  }
+  const { filename, line: lineNumber } = entry.computedMeta;
+  const path = filename !== void 0 && lineNumber !== void 0 ? `${filename}:${lineNumber}` : "";
   let args = [];
   const processPrefix = entry.meta?.S?.hostSessionId ? "[worker] " : "";
   args.push(`${processPrefix}${entry.message}`);
@@ -275,6 +376,13 @@ var TEST_BROWSER_PROCESSOR = (config, entry) => {
   }
 };
 var BROWSER_PROCESSOR = CONFIG.useTestProcessor ? TEST_BROWSER_PROCESSOR : APP_BROWSER_PROCESSOR;
+var originalSymbol = /* @__PURE__ */ Symbol.for("effect/OriginalAnnotation");
+var unwrapEffectError = (error) => {
+  if (typeof error === "object" && error !== null && originalSymbol in error) {
+    return error[originalSymbol];
+  }
+  return error;
+};
 
 // src/processors/index.ts
 __reExport(processors_exports, console_processor_star);
@@ -289,7 +397,6 @@ var DEBUG_PROCESSOR = (config, entry) => {
 // src/processors/file-processor.ts
 import { appendFileSync, mkdirSync, openSync } from "@dxos/node-std/fs";
 import { dirname } from "@dxos/node-std/path";
-import { jsonlogify } from "@dxos/util";
 var EAGAIN_MAX_DURATION = 1e3;
 var createFileProcessor = ({ pathOrFd, levels: levels2, filters }) => {
   let fd;
@@ -310,15 +417,12 @@ var createFileProcessor = ({ pathOrFd, levels: levels2, filters }) => {
       fd = openSync(pathOrFd, "a");
     }
     const record = {
-      ...entry,
-      timestamp: Date.now(),
-      ...entry.meta ? {
-        meta: {
-          file: getRelativeFilename(entry.meta.F),
-          line: entry.meta.L
-        }
-      } : {},
-      context: jsonlogify(getContextFromEntry(entry))
+      level: entry.level,
+      message: entry.message,
+      timestamp: entry.timestamp,
+      meta: entry.computedMeta,
+      context: entry.computedContext,
+      error: entry.computedError
     };
     let retryTS = 0;
     while (true) {
@@ -417,13 +521,14 @@ var createLog = () => {
     get: () => log2._config
   });
   const processLog = (level, message, context = {}, meta, error) => {
-    log2._config.processors.forEach((processor) => processor(log2._config, {
+    const entry = new LogEntry({
       level,
       message,
       context,
       meta,
       error
-    }));
+    });
+    log2._config.processors.forEach((processor) => processor(log2._config, entry));
   };
   Object.assign(log2, {
     /**
@@ -488,6 +593,12 @@ var getFormattedStackTrace = () => new Error().stack.split("\n").slice(3).join("
 // src/index.ts
 __reExport(index_exports, processors_exports);
 
+// src/meta.ts
+var LOG_META_MARKER = "~LogMeta";
+var isLogMeta = (value) => {
+  return value != null && typeof value === "object" && value[LOG_META_MARKER] === LOG_META_MARKER;
+};
+
 // src/dbg.ts
 var dbg = (arg, meta) => {
   if (meta?.A) {
@@ -499,7 +610,7 @@ var dbg = (arg, meta) => {
 };
 
 // src/log-buffer.ts
-import { CircularBuffer, getDebugName as getDebugName2 } from "@dxos/util";
+import { CircularBuffer } from "@dxos/util";
 var DEFAULT_BUFFER_SIZE = 2e3;
 var MAX_CONTEXT_LENGTH = 500;
 var LogBuffer = class {
@@ -515,35 +626,35 @@ var LogBuffer = class {
     if (entry.level <= LogLevel.TRACE) {
       return;
     }
+    const { filename, line, context: scopeName } = entry.computedMeta;
     const record = {
-      t: (/* @__PURE__ */ new Date()).toISOString(),
+      t: new Date(entry.timestamp).toISOString(),
       l: shortLevelName[entry.level] ?? "?",
       m: entry.message ?? ""
     };
-    if (entry.meta) {
-      record.f = getRelativeFilename3(entry.meta.F);
-      record.n = entry.meta.L;
+    if (filename !== void 0) {
+      record.f = filename;
+    }
+    if (line !== void 0) {
+      record.n = line;
     }
-    if (entry.error) {
-      record.e = entry.error.stack ?? entry.error.message;
+    if (scopeName !== void 0) {
+      record.o = scopeName;
     }
-    if (entry.context != null) {
+    if (entry.computedError !== void 0) {
+      record.e = entry.computedError;
+    }
+    const computedContext = entry.computedContext;
+    if (Object.keys(computedContext).length > 0) {
       try {
-        const ctx = typeof entry.context === "function" ? entry.context() : entry.context;
-        if (ctx != null && !(ctx instanceof Error)) {
-          let json = JSON.stringify(ctx);
-          if (json.length > MAX_CONTEXT_LENGTH) {
-            json = json.slice(0, MAX_CONTEXT_LENGTH);
-          }
-          record.c = json;
+        let json = JSON.stringify(computedContext);
+        if (json.length > MAX_CONTEXT_LENGTH) {
+          json = json.slice(0, MAX_CONTEXT_LENGTH);
         }
+        record.c = json;
       } catch {
       }
     }
-    const scope = entry.meta?.S;
-    if (typeof scope === "object" && scope !== null && Object.getPrototypeOf(scope) !== Object.prototype) {
-      record.o = getDebugName2(scope);
-    }
     this._buffer.push(record);
   };
   /** Number of entries currently in the buffer. */
@@ -563,13 +674,6 @@ var LogBuffer = class {
     return lines.join("\n");
   }
 };
-var getRelativeFilename3 = (filename) => {
-  const match = filename.match(/.+\/(packages\/.+\/.+)/);
-  if (match) {
-    return match[1];
-  }
-  return filename;
-};
 
 // src/experimental/ownership.ts
 import { inspect as inspect3 } from "@dxos/node-std/util";
@@ -606,7 +710,9 @@ export {
   BROWSER_PROCESSOR,
   DEBUG_PROCESSOR,
   FILE_PROCESSOR,
+  LOG_META_MARKER,
   LogBuffer,
+  LogEntry,
   LogLevel,
   LogProcessorType,
   createFileProcessor,
@@ -617,12 +723,15 @@ export {
   getContextFromEntry,
   getCurrentOwnershipScope,
   getRelativeFilename,
+  inferEnvironmentName,
+  isLogMeta,
   levels,
   log,
   logInfo,
   omit,
   parseFilter,
   pick,
+  serializeToJsonl,
   shortLevelName,
   shouldLog
 };