arcway 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/context.js

@@ -1,5 +1,5 @@
 function trackDb(db) {
-  if (!db) return { db, stats: { queries: 0, durationMs: 0 } };
+  if (!db || typeof db !== 'function' && typeof db !== 'object') return { db, stats: { queries: 0, durationMs: 0 } };
   const stats = { queries: 0, durationMs: 0 };
   const handler = {
     get(target, prop, receiver) {

package/server/logger/index.js

@@ -112,6 +112,15 @@ class Logger {
     return this.query({ level: 'error', limit, since });
   }
 
+  addContext(fields) {
+    if (!this._canonicalContext) this._canonicalContext = {};
+    Object.assign(this._canonicalContext, fields);
+  }
+
+  getCanonicalContext() {
+    return this._canonicalContext ?? null;
+  }
+
   extend(fields) {
     const child = Object.create(Logger.prototype);
     const hasFields = Object.keys(fields).length > 0;
@@ -123,6 +132,7 @@ class Logger {
     child._root = this._root ?? this;
     child._base = null;
     child._ring = null;
+    child._canonicalContext = null;
     return child;
   }
 }

package/server/router/api-router.js

@@ -149,6 +149,7 @@ class ApiRouter {
   _emitCanonicalLog(ctx, { method, path, route, status, startTime, middlewareNames, error, session }) {
     const durationMs = Date.now() - startTime;
     const dbStats = ctx._dbStats ?? { queries: 0, durationMs: 0 };
+    const extra = ctx.log.getCanonicalContext?.() ?? {};
     const line = {
       method,
       path,
@@ -158,6 +159,7 @@ class ApiRouter {
       dbQueries: dbStats.queries,
       dbDurationMs: Math.round(dbStats.durationMs),
       middleware: middlewareNames,
+      ...extra,
     };
     if (session?.userId ?? session?.id) {
       line.userId = session.userId ?? session.id;