arcway 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.1.4",
+  "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,15 +1,67 @@
+function trackDb(db) {
+  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) {
+      const value = Reflect.get(target, prop, receiver);
+      if (typeof value !== 'function') return value;
+      if (prop === 'raw' || prop === 'select' || prop === 'insert' || prop === 'update' ||
+          prop === 'delete' || prop === 'del' || prop === 'from' || prop === 'into' ||
+          prop === 'table' || prop === 'with' || prop === 'withRecursive') {
+        return (...args) => {
+          const builder = value.apply(target, args);
+          return wrapBuilder(builder, stats);
+        };
+      }
+      return value.bind ? value.bind(target) : value;
+    },
+    apply(target, thisArg, args) {
+      const builder = Reflect.apply(target, thisArg, args);
+      if (builder && typeof builder.then === 'function' && typeof builder.select === 'function') {
+        return wrapBuilder(builder, stats);
+      }
+      return builder;
+    },
+  };
+  const proxy = new Proxy(db, handler);
+  return { db: proxy, stats };
+}
+
+function wrapBuilder(builder, stats) {
+  const origThen = builder.then.bind(builder);
+  builder.then = (resolve, reject) => {
+    const start = performance.now();
+    return origThen(
+      (result) => {
+        stats.queries++;
+        stats.durationMs += performance.now() - start;
+        return resolve?.(result);
+      },
+      (err) => {
+        stats.queries++;
+        stats.durationMs += performance.now() - start;
+        if (reject) return reject(err);
+        throw err;
+      },
+    );
+  };
+  return builder;
+}
+
 function buildContext(appContext, extras) {
+  const tracked = trackDb(appContext.db);
   const ctx = {
-    db: appContext.db,
+    db: tracked.db,
     log: appContext.log,
     events: appContext.events,
     cache: appContext.cache,
     queue: appContext.queue,
     files: appContext.files,
     mail: appContext.mail,
+    _dbStats: tracked.stats,
     ...extras,
   };
   return ctx;
 }
 
-export { buildContext };
+export { buildContext, trackDb };

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

@@ -146,6 +146,28 @@ 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,
+      route,
+      status,
+      durationMs,
+      dbQueries: dbStats.queries,
+      dbDurationMs: Math.round(dbStats.durationMs),
+      middleware: middlewareNames,
+      ...extra,
+    };
+    if (session?.userId ?? session?.id) {
+      line.userId = session.userId ?? session.id;
+    }
+    if (error) line.error = error;
+    ctx.log.info('request', line);
+  }
+
   async init() {
     if (this._config.enabled === false) {
       this._log?.info('API: disabled');
@@ -214,14 +236,9 @@ class ApiRouter {
     } catch (err) {
       const errorMsg = toErrorMessage(err);
       ctx.log.error(`Handler error in ${route.method} ${route.pattern}`, { error: errorMsg });
-      ctx.log.info('request', {
-        method,
-        path: pathname,
-        route: route.pattern,
-        status: 500,
-        durationMs: Date.now() - startTime,
-        middleware: middlewareNames,
-        error: errorMsg,
+      this._emitCanonicalLog(ctx, {
+        method, path: pathname, route: route.pattern, status: 500,
+        startTime, middlewareNames, error: errorMsg, session: reqInfo.session,
       });
       sendJson(res, 500, {
         error: { code: ErrorCodes.HANDLER_ERROR, message: 'An internal error occurred' },
@@ -248,13 +265,9 @@ class ApiRouter {
     // ── Serialize + send ──
     const statusCode = response.status ?? (response.error ? 400 : 200);
     await serializeResponse(res, response, responseHeaders, statusCode);
-    ctx.log.info('request', {
-      method,
-      path: pathname,
-      route: route.pattern,
-      status: statusCode,
-      durationMs: Date.now() - startTime,
-      middleware: middlewareNames,
+    this._emitCanonicalLog(ctx, {
+      method, path: pathname, route: route.pattern, status: statusCode,
+      startTime, middlewareNames, session: response.session !== void 0 ? response.session : reqInfo.session,
     });
 
     return true;