@lensjs/express 1.0.11 → 1.1.0

package/dist/adapter.cjs

@@ -58,6 +58,9 @@ var ExpressAdapter = class extends import_core.LensAdapter {
         case import_core.WatcherTypeEnum.QUERY:
           void this.watchQueries(watcher);
           break;
+        case import_core.WatcherTypeEnum.CACHE:
+          void this.watchCache(watcher);
+          break;
       }
     }
   }
@@ -90,6 +93,12 @@ var ExpressAdapter = class extends import_core.LensAdapter {
       return res.sendFile(path.join(uiPath, "index.html"));
     });
   }
+  async watchCache(watcher) {
+    if (!this.config.cacheWatcherEnabled) return;
+    import_core.lensEmitter.on("cache", async (data) => {
+      await watcher?.log(data);
+    });
+  }
   async watchQueries(watcher) {
     if (!this.config.queryWatcher.enabled) return;
     const handler = this.config.queryWatcher.handler;
@@ -98,7 +107,7 @@ var ExpressAdapter = class extends import_core.LensAdapter {
         const queryPayload = {
           query: query.query,
           duration: query.duration || "0 ms",
-          createdAt: query.createdAt || (0, import_date.sqlDateTime)(),
+          createdAt: query.createdAt || (0, import_date.nowISO)(),
           type: query.type
         };
         await watcher?.log({
@@ -110,13 +119,18 @@ var ExpressAdapter = class extends import_core.LensAdapter {
   watchRequests(requestWatcher) {
     if (!this.config.requestWatcherEnabled) return;
     this.app.use((req, res, next) => {
-      if (this.shouldIgnorePath(req.path)) return next();
-      const start = process.hrtime();
-      this.patchResponseMethods(res);
-      res.on("finish", async () => {
-        await this.finalizeRequestLog(req, res, requestWatcher, start);
+      const context = {
+        requestId: import_core.lensUtils.generateRandomUuid()
+      };
+      import_core.lensContext.run(context, () => {
+        if (this.shouldIgnorePath(req.path)) return next();
+        const start = process.hrtime();
+        this.patchResponseMethods(res);
+        res.on("finish", async () => {
+          await this.finalizeRequestLog(req, res, requestWatcher, start);
+        });
+        next();
       });
-      next();
     });
   }
   patchResponseMethods(res) {
@@ -158,7 +172,7 @@ var ExpressAdapter = class extends import_core.LensAdapter {
       const duration = import_core.lensUtils.prettyHrTime(process.hrtime(start));
       const logPayload = {
         request: {
-          id: import_core.lensUtils.generateRandomUuid(),
+          id: import_core.lensContext.getStore()?.requestId || import_core.lensUtils.generateRandomUuid(),
           method: req.method,
           duration,
           path: req.originalUrl,
@@ -186,6 +200,10 @@ var ExpressAdapter = class extends import_core.LensAdapter {
     if (!body) {
       return null;
     }
-    return JSON.parse(body);
+    try {
+      return JSON.parse(body);
+    } catch (_e) {
+      return body;
+    }
   }
 };

package/dist/adapter.d.cts

@@ -13,6 +13,7 @@ declare class ExpressAdapter extends LensAdapter {
     setup(): void;
     registerRoutes(routes: RouteDefinition[]): void;
     serveUI(uiPath: string, spaRoute: string, _dataToInject: Record<string, any>): void;
+    private watchCache;
     private watchQueries;
     private watchRequests;
     private patchResponseMethods;

package/dist/adapter.d.ts

@@ -13,6 +13,7 @@ declare class ExpressAdapter extends LensAdapter {
     setup(): void;
     registerRoutes(routes: RouteDefinition[]): void;
     serveUI(uiPath: string, spaRoute: string, _dataToInject: Record<string, any>): void;
+    private watchCache;
     private watchQueries;
     private watchRequests;
     private patchResponseMethods;

package/dist/adapter.js

@@ -2,12 +2,14 @@
 import {
   LensAdapter,
   lensUtils,
-  WatcherTypeEnum
+  WatcherTypeEnum,
+  lensContext,
+  lensEmitter
 } from "@lensjs/core";
 import * as path from "path";
 import fs from "fs";
 import express from "express";
-import { nowISO, sqlDateTime } from "@lensjs/date";
+import { nowISO } from "@lensjs/date";
 var ExpressAdapter = class extends LensAdapter {
   app;
   config;
@@ -28,6 +30,9 @@ var ExpressAdapter = class extends LensAdapter {
         case WatcherTypeEnum.QUERY:
           void this.watchQueries(watcher);
           break;
+        case WatcherTypeEnum.CACHE:
+          void this.watchCache(watcher);
+          break;
       }
     }
   }
@@ -60,6 +65,12 @@ var ExpressAdapter = class extends LensAdapter {
       return res.sendFile(path.join(uiPath, "index.html"));
     });
   }
+  async watchCache(watcher) {
+    if (!this.config.cacheWatcherEnabled) return;
+    lensEmitter.on("cache", async (data) => {
+      await watcher?.log(data);
+    });
+  }
   async watchQueries(watcher) {
     if (!this.config.queryWatcher.enabled) return;
     const handler = this.config.queryWatcher.handler;
@@ -68,7 +79,7 @@ var ExpressAdapter = class extends LensAdapter {
         const queryPayload = {
           query: query.query,
           duration: query.duration || "0 ms",
-          createdAt: query.createdAt || sqlDateTime(),
+          createdAt: query.createdAt || nowISO(),
           type: query.type
         };
         await watcher?.log({
@@ -80,13 +91,18 @@ var ExpressAdapter = class extends LensAdapter {
   watchRequests(requestWatcher) {
     if (!this.config.requestWatcherEnabled) return;
     this.app.use((req, res, next) => {
-      if (this.shouldIgnorePath(req.path)) return next();
-      const start = process.hrtime();
-      this.patchResponseMethods(res);
-      res.on("finish", async () => {
-        await this.finalizeRequestLog(req, res, requestWatcher, start);
+      const context = {
+        requestId: lensUtils.generateRandomUuid()
+      };
+      lensContext.run(context, () => {
+        if (this.shouldIgnorePath(req.path)) return next();
+        const start = process.hrtime();
+        this.patchResponseMethods(res);
+        res.on("finish", async () => {
+          await this.finalizeRequestLog(req, res, requestWatcher, start);
+        });
+        next();
       });
-      next();
     });
   }
   patchResponseMethods(res) {
@@ -128,7 +144,7 @@ var ExpressAdapter = class extends LensAdapter {
       const duration = lensUtils.prettyHrTime(process.hrtime(start));
       const logPayload = {
         request: {
-          id: lensUtils.generateRandomUuid(),
+          id: lensContext.getStore()?.requestId || lensUtils.generateRandomUuid(),
           method: req.method,
           duration,
           path: req.originalUrl,
@@ -156,7 +172,11 @@ var ExpressAdapter = class extends LensAdapter {
     if (!body) {
       return null;
     }
-    return JSON.parse(body);
+    try {
+      return JSON.parse(body);
+    } catch (_e) {
+      return body;
+    }
   }
 };
 export {

package/dist/index.cjs

@@ -61,6 +61,9 @@ var ExpressAdapter = class extends import_core.LensAdapter {
         case import_core.WatcherTypeEnum.QUERY:
           void this.watchQueries(watcher);
           break;
+        case import_core.WatcherTypeEnum.CACHE:
+          void this.watchCache(watcher);
+          break;
       }
     }
   }
@@ -93,6 +96,12 @@ var ExpressAdapter = class extends import_core.LensAdapter {
       return res.sendFile(path.join(uiPath, "index.html"));
     });
   }
+  async watchCache(watcher) {
+    if (!this.config.cacheWatcherEnabled) return;
+    import_core.lensEmitter.on("cache", async (data) => {
+      await watcher?.log(data);
+    });
+  }
   async watchQueries(watcher) {
     if (!this.config.queryWatcher.enabled) return;
     const handler = this.config.queryWatcher.handler;
@@ -101,7 +110,7 @@ var ExpressAdapter = class extends import_core.LensAdapter {
         const queryPayload = {
           query: query.query,
           duration: query.duration || "0 ms",
-          createdAt: query.createdAt || (0, import_date.sqlDateTime)(),
+          createdAt: query.createdAt || (0, import_date.nowISO)(),
           type: query.type
         };
         await watcher?.log({
@@ -113,13 +122,18 @@ var ExpressAdapter = class extends import_core.LensAdapter {
   watchRequests(requestWatcher) {
     if (!this.config.requestWatcherEnabled) return;
     this.app.use((req, res, next) => {
-      if (this.shouldIgnorePath(req.path)) return next();
-      const start = process.hrtime();
-      this.patchResponseMethods(res);
-      res.on("finish", async () => {
-        await this.finalizeRequestLog(req, res, requestWatcher, start);
+      const context = {
+        requestId: import_core.lensUtils.generateRandomUuid()
+      };
+      import_core.lensContext.run(context, () => {
+        if (this.shouldIgnorePath(req.path)) return next();
+        const start = process.hrtime();
+        this.patchResponseMethods(res);
+        res.on("finish", async () => {
+          await this.finalizeRequestLog(req, res, requestWatcher, start);
+        });
+        next();
       });
-      next();
     });
   }
   patchResponseMethods(res) {
@@ -161,7 +175,7 @@ var ExpressAdapter = class extends import_core.LensAdapter {
       const duration = import_core.lensUtils.prettyHrTime(process.hrtime(start));
       const logPayload = {
         request: {
-          id: import_core.lensUtils.generateRandomUuid(),
+          id: import_core.lensContext.getStore()?.requestId || import_core.lensUtils.generateRandomUuid(),
           method: req.method,
           duration,
           path: req.originalUrl,
@@ -189,7 +203,11 @@ var ExpressAdapter = class extends import_core.LensAdapter {
     if (!body) {
       return null;
     }
-    return JSON.parse(body);
+    try {
+      return JSON.parse(body);
+    } catch (_e) {
+      return body;
+    }
   }
 };
 
@@ -200,21 +218,36 @@ var defaultConfig = {
   path: "/lens",
   ignoredPaths: [],
   onlyPaths: [],
-  requestWatcherEnabled: true
+  requestWatcherEnabled: true,
+  cacheWatcherEnabled: false
 };
 var lens = async (config) => {
   const adapter = new ExpressAdapter({ app: config.app });
   const watchers = [];
   const mergedConfig = {
-    ...config,
-    ...defaultConfig
+    ...defaultConfig,
+    ...config
   };
-  if (mergedConfig.requestWatcherEnabled) {
-    watchers.push(new import_core2.RequestWatcher());
-  }
-  if (mergedConfig.queryWatcher?.enabled) {
-    watchers.push(new import_core2.QueryWatcher());
-  }
+  const defaultWatchers = [
+    {
+      enabled: mergedConfig.requestWatcherEnabled,
+      watcher: new import_core2.RequestWatcher()
+    },
+    {
+      enabled: mergedConfig.cacheWatcherEnabled,
+      watcher: new import_core2.CacheWatcher()
+    },
+    {
+      enabled: mergedConfig.queryWatcher?.enabled,
+      watcher: new import_core2.QueryWatcher()
+    }
+  ];
+  defaultWatchers.forEach((watcher) => {
+    if (watcher.enabled) {
+      watchers.push(watcher.watcher);
+    }
+  });
+  console.log("currentWatchers", watchers);
   const { ignoredPaths, normalizedPath } = import_core2.lensUtils.prepareIgnoredPaths(
     mergedConfig.path,
     mergedConfig.ignoredPaths

package/dist/index.js

@@ -1,5 +1,6 @@
 // src/index.ts
 import {
+  CacheWatcher as CacheWatcher2,
   Lens,
   lensUtils as lensUtils2,
   QueryWatcher as QueryWatcher2,
@@ -10,12 +11,14 @@ import {
 import {
   LensAdapter,
   lensUtils,
-  WatcherTypeEnum
+  WatcherTypeEnum,
+  lensContext,
+  lensEmitter
 } from "@lensjs/core";
 import * as path from "path";
 import fs from "fs";
 import express from "express";
-import { nowISO, sqlDateTime } from "@lensjs/date";
+import { nowISO } from "@lensjs/date";
 var ExpressAdapter = class extends LensAdapter {
   app;
   config;
@@ -36,6 +39,9 @@ var ExpressAdapter = class extends LensAdapter {
         case WatcherTypeEnum.QUERY:
           void this.watchQueries(watcher);
           break;
+        case WatcherTypeEnum.CACHE:
+          void this.watchCache(watcher);
+          break;
       }
     }
   }
@@ -68,6 +74,12 @@ var ExpressAdapter = class extends LensAdapter {
       return res.sendFile(path.join(uiPath, "index.html"));
     });
   }
+  async watchCache(watcher) {
+    if (!this.config.cacheWatcherEnabled) return;
+    lensEmitter.on("cache", async (data) => {
+      await watcher?.log(data);
+    });
+  }
   async watchQueries(watcher) {
     if (!this.config.queryWatcher.enabled) return;
     const handler = this.config.queryWatcher.handler;
@@ -76,7 +88,7 @@ var ExpressAdapter = class extends LensAdapter {
         const queryPayload = {
           query: query.query,
           duration: query.duration || "0 ms",
-          createdAt: query.createdAt || sqlDateTime(),
+          createdAt: query.createdAt || nowISO(),
           type: query.type
         };
         await watcher?.log({
@@ -88,13 +100,18 @@ var ExpressAdapter = class extends LensAdapter {
   watchRequests(requestWatcher) {
     if (!this.config.requestWatcherEnabled) return;
     this.app.use((req, res, next) => {
-      if (this.shouldIgnorePath(req.path)) return next();
-      const start = process.hrtime();
-      this.patchResponseMethods(res);
-      res.on("finish", async () => {
-        await this.finalizeRequestLog(req, res, requestWatcher, start);
+      const context = {
+        requestId: lensUtils.generateRandomUuid()
+      };
+      lensContext.run(context, () => {
+        if (this.shouldIgnorePath(req.path)) return next();
+        const start = process.hrtime();
+        this.patchResponseMethods(res);
+        res.on("finish", async () => {
+          await this.finalizeRequestLog(req, res, requestWatcher, start);
+        });
+        next();
       });
-      next();
     });
   }
   patchResponseMethods(res) {
@@ -136,7 +153,7 @@ var ExpressAdapter = class extends LensAdapter {
       const duration = lensUtils.prettyHrTime(process.hrtime(start));
       const logPayload = {
         request: {
-          id: lensUtils.generateRandomUuid(),
+          id: lensContext.getStore()?.requestId || lensUtils.generateRandomUuid(),
           method: req.method,
           duration,
           path: req.originalUrl,
@@ -164,7 +181,11 @@ var ExpressAdapter = class extends LensAdapter {
     if (!body) {
       return null;
     }
-    return JSON.parse(body);
+    try {
+      return JSON.parse(body);
+    } catch (_e) {
+      return body;
+    }
   }
 };
 
@@ -175,21 +196,36 @@ var defaultConfig = {
   path: "/lens",
   ignoredPaths: [],
   onlyPaths: [],
-  requestWatcherEnabled: true
+  requestWatcherEnabled: true,
+  cacheWatcherEnabled: false
 };
 var lens = async (config) => {
   const adapter = new ExpressAdapter({ app: config.app });
   const watchers = [];
   const mergedConfig = {
-    ...config,
-    ...defaultConfig
+    ...defaultConfig,
+    ...config
   };
-  if (mergedConfig.requestWatcherEnabled) {
-    watchers.push(new RequestWatcher2());
-  }
-  if (mergedConfig.queryWatcher?.enabled) {
-    watchers.push(new QueryWatcher2());
-  }
+  const defaultWatchers = [
+    {
+      enabled: mergedConfig.requestWatcherEnabled,
+      watcher: new RequestWatcher2()
+    },
+    {
+      enabled: mergedConfig.cacheWatcherEnabled,
+      watcher: new CacheWatcher2()
+    },
+    {
+      enabled: mergedConfig.queryWatcher?.enabled,
+      watcher: new QueryWatcher2()
+    }
+  ];
+  defaultWatchers.forEach((watcher) => {
+    if (watcher.enabled) {
+      watchers.push(watcher.watcher);
+    }
+  });
+  console.log("currentWatchers", watchers);
   const { ignoredPaths, normalizedPath } = lensUtils2.prepareIgnoredPaths(
     mergedConfig.path,
     mergedConfig.ignoredPaths

package/dist/types/index.d.cts

@@ -10,6 +10,7 @@ type ExpressAdapterConfig = {
     ignoredPaths?: RegExp[];
     onlyPaths?: RegExp[];
     requestWatcherEnabled?: boolean;
+    cacheWatcherEnabled?: boolean;
     queryWatcher?: {
         enabled: boolean;
         handler: QueryWatcherHandler;

package/dist/types/index.d.ts

@@ -10,6 +10,7 @@ type ExpressAdapterConfig = {
     ignoredPaths?: RegExp[];
     onlyPaths?: RegExp[];
     requestWatcherEnabled?: boolean;
+    cacheWatcherEnabled?: boolean;
     queryWatcher?: {
         enabled: boolean;
         handler: QueryWatcherHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lensjs/express",
-  "version": "1.0.11",
+  "version": "1.1.0",
   "description": "Express adapter for LensJs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,10 +19,10 @@
   ],
   "dependencies": {
     "express": "^5.1.0",
-    "@lensjs/watchers": "1.0.11",
-    "@lensjs/core": "1.0.11",
-    "@lensjs/typescript-config": "1.0.11",
-    "@lensjs/date": "1.0.11"
+    "@lensjs/date": "1.0.12",
+    "@lensjs/watchers": "1.0.13",
+    "@lensjs/core": "2.0.0",
+    "@lensjs/typescript-config": "1.0.12"
   },
   "devDependencies": {
     "@types/express": "^5.0.3"