@lensjs/express 1.0.7 → 1.0.10

package/dist/adapter.cjs

@@ -26,6 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/adapter.ts
 var adapter_exports = {};
 __export(adapter_exports, {
   default: () => ExpressAdapter
@@ -33,8 +35,10 @@ __export(adapter_exports, {
 module.exports = __toCommonJS(adapter_exports);
 var import_core = require("@lensjs/core");
 var path = __toESM(require("path"), 1);
-var import_express2 = __toESM(require("express"), 1);
-class ExpressAdapter extends import_core.LensAdapter {
+var import_node_fs = __toESM(require("fs"), 1);
+var import_express = __toESM(require("express"), 1);
+var import_date = require("@lensjs/date");
+var ExpressAdapter = class extends import_core.LensAdapter {
   app;
   config;
   constructor({ app }) {
@@ -72,7 +76,7 @@ class ExpressAdapter extends import_core.LensAdapter {
     });
   }
   serveUI(uiPath, spaRoute, _dataToInject) {
-    this.app.use(this.normalizePath(spaRoute), import_express2.default.static(uiPath));
+    this.app.use(this.normalizePath(spaRoute), import_express.default.static(uiPath));
     this.app.get(
       this.normalizePath(`${spaRoute}/favicon.svg`),
       (_, res) => res.sendFile(path.join(uiPath, "favicon.svg"))
@@ -94,7 +98,7 @@ class ExpressAdapter extends import_core.LensAdapter {
         const queryPayload = {
           query: query.query,
           duration: query.duration || "0 ms",
-          createdAt: query.createdAt || import_core.lensUtils.sqlDateTime(),
+          createdAt: query.createdAt || (0, import_date.sqlDateTime)(),
           type: query.type
         };
         await watcher?.log({
@@ -124,8 +128,29 @@ class ExpressAdapter extends import_core.LensAdapter {
       return originalJson(body);
     };
     res.send = function(body) {
-      res._body = body;
-      return originalSend(body);
+      let safeBody;
+      try {
+        if (!body) {
+          safeBody = "Purged By Lens";
+        } else if (typeof body === "object" && !Buffer.isBuffer(body)) {
+          safeBody = body;
+        } else if (typeof body === "string") {
+          const filePath = path.resolve(body);
+          if (import_node_fs.default.existsSync(filePath)) {
+            safeBody = "Purged By Lens";
+          } else {
+            safeBody = body;
+          }
+        } else if (Buffer.isBuffer(body)) {
+          safeBody = "Purged By Lens";
+        } else {
+          safeBody = "Purged By Lens";
+        }
+      } catch {
+        safeBody = "Purged By Lens";
+      }
+      res._body = safeBody;
+      return originalSend(safeBody);
     };
   }
   async finalizeRequestLog(req, res, requestWatcher, start) {
@@ -141,7 +166,7 @@ class ExpressAdapter extends import_core.LensAdapter {
           body: req.body ?? {},
           status: res.statusCode,
           ip: req.socket?.remoteAddress ?? "",
-          createdAt: import_core.lensUtils.nowISO()
+          createdAt: (0, import_date.nowISO)()
         },
         response: {
           json: res._body ?? null,
@@ -157,4 +182,4 @@ class ExpressAdapter extends import_core.LensAdapter {
   normalizePath(pathStr) {
     return pathStr.startsWith("/") ? pathStr : `/${pathStr}`;
   }
-}
+};

package/dist/adapter.js

@@ -1,11 +1,14 @@
+// src/adapter.ts
 import {
   LensAdapter,
   lensUtils,
   WatcherTypeEnum
 } from "@lensjs/core";
 import * as path from "path";
+import fs from "fs";
 import express from "express";
-class ExpressAdapter extends LensAdapter {
+import { nowISO, sqlDateTime } from "@lensjs/date";
+var ExpressAdapter = class extends LensAdapter {
   app;
   config;
   constructor({ app }) {
@@ -65,7 +68,7 @@ class ExpressAdapter extends LensAdapter {
         const queryPayload = {
           query: query.query,
           duration: query.duration || "0 ms",
-          createdAt: query.createdAt || lensUtils.sqlDateTime(),
+          createdAt: query.createdAt || sqlDateTime(),
           type: query.type
         };
         await watcher?.log({
@@ -95,8 +98,29 @@ class ExpressAdapter extends LensAdapter {
       return originalJson(body);
     };
     res.send = function(body) {
-      res._body = body;
-      return originalSend(body);
+      let safeBody;
+      try {
+        if (!body) {
+          safeBody = "Purged By Lens";
+        } else if (typeof body === "object" && !Buffer.isBuffer(body)) {
+          safeBody = body;
+        } else if (typeof body === "string") {
+          const filePath = path.resolve(body);
+          if (fs.existsSync(filePath)) {
+            safeBody = "Purged By Lens";
+          } else {
+            safeBody = body;
+          }
+        } else if (Buffer.isBuffer(body)) {
+          safeBody = "Purged By Lens";
+        } else {
+          safeBody = "Purged By Lens";
+        }
+      } catch {
+        safeBody = "Purged By Lens";
+      }
+      res._body = safeBody;
+      return originalSend(safeBody);
     };
   }
   async finalizeRequestLog(req, res, requestWatcher, start) {
@@ -112,7 +136,7 @@ class ExpressAdapter extends LensAdapter {
           body: req.body ?? {},
           status: res.statusCode,
           ip: req.socket?.remoteAddress ?? "",
-          createdAt: lensUtils.nowISO()
+          createdAt: nowISO()
         },
         response: {
           json: res._body ?? null,
@@ -128,7 +152,7 @@ class ExpressAdapter extends LensAdapter {
   normalizePath(pathStr) {
     return pathStr.startsWith("/") ? pathStr : `/${pathStr}`;
   }
-}
+};
 export {
   ExpressAdapter as default
 };

package/dist/index.cjs

@@ -26,14 +26,169 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
 var index_exports = {};
 __export(index_exports, {
   lens: () => lens
 });
 module.exports = __toCommonJS(index_exports);
+var import_core2 = require("@lensjs/core");
+
+// src/adapter.ts
 var import_core = require("@lensjs/core");
-var import_adapter = __toESM(require("./adapter"), 1);
-const defaultConfig = {
+var path = __toESM(require("path"), 1);
+var import_node_fs = __toESM(require("fs"), 1);
+var import_express = __toESM(require("express"), 1);
+var import_date = require("@lensjs/date");
+var ExpressAdapter = class extends import_core.LensAdapter {
+  app;
+  config;
+  constructor({ app }) {
+    super();
+    this.app = app;
+  }
+  setConfig(config) {
+    this.config = config;
+    return this;
+  }
+  setup() {
+    for (const watcher of this.getWatchers()) {
+      switch (watcher.name) {
+        case import_core.WatcherTypeEnum.REQUEST:
+          this.watchRequests(watcher);
+          break;
+        case import_core.WatcherTypeEnum.QUERY:
+          void this.watchQueries(watcher);
+          break;
+      }
+    }
+  }
+  registerRoutes(routes) {
+    routes.forEach((route) => {
+      this.app[route.method.toLowerCase()](
+        this.normalizePath(route.path),
+        async (req, res) => {
+          const result = await route.handler({
+            params: req.params,
+            qs: req.query
+          });
+          return res.json(result);
+        }
+      );
+    });
+  }
+  serveUI(uiPath, spaRoute, _dataToInject) {
+    this.app.use(this.normalizePath(spaRoute), import_express.default.static(uiPath));
+    this.app.get(
+      this.normalizePath(`${spaRoute}/favicon.svg`),
+      (_, res) => res.sendFile(path.join(uiPath, "favicon.svg"))
+    );
+    this.app.get(new RegExp(`^/${spaRoute}(?!/api)(/.*)?$`), (req, res) => {
+      if (import_core.lensUtils.isStaticFile(req.path.split("/"))) {
+        return res.download(
+          path.join(uiPath, import_core.lensUtils.stripBeforeAssetsPath(req.path))
+        );
+      }
+      return res.sendFile(path.join(uiPath, "index.html"));
+    });
+  }
+  async watchQueries(watcher) {
+    if (!this.config.queryWatcher.enabled) return;
+    const handler = this.config.queryWatcher.handler;
+    await handler({
+      onQuery: async (query) => {
+        const queryPayload = {
+          query: query.query,
+          duration: query.duration || "0 ms",
+          createdAt: query.createdAt || (0, import_date.sqlDateTime)(),
+          type: query.type
+        };
+        await watcher?.log({
+          data: queryPayload
+        });
+      }
+    });
+  }
+  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);
+      });
+      next();
+    });
+  }
+  patchResponseMethods(res) {
+    const originalJson = res.json.bind(res);
+    const originalSend = res.send.bind(res);
+    res._body = void 0;
+    res.json = function(body) {
+      res._body = body;
+      return originalJson(body);
+    };
+    res.send = function(body) {
+      let safeBody;
+      try {
+        if (!body) {
+          safeBody = "Purged By Lens";
+        } else if (typeof body === "object" && !Buffer.isBuffer(body)) {
+          safeBody = body;
+        } else if (typeof body === "string") {
+          const filePath = path.resolve(body);
+          if (import_node_fs.default.existsSync(filePath)) {
+            safeBody = "Purged By Lens";
+          } else {
+            safeBody = body;
+          }
+        } else if (Buffer.isBuffer(body)) {
+          safeBody = "Purged By Lens";
+        } else {
+          safeBody = "Purged By Lens";
+        }
+      } catch {
+        safeBody = "Purged By Lens";
+      }
+      res._body = safeBody;
+      return originalSend(safeBody);
+    };
+  }
+  async finalizeRequestLog(req, res, requestWatcher, start) {
+    try {
+      const duration = import_core.lensUtils.prettyHrTime(process.hrtime(start));
+      const logPayload = {
+        request: {
+          id: import_core.lensUtils.generateRandomUuid(),
+          method: req.method,
+          duration,
+          path: req.originalUrl,
+          headers: req.headers,
+          body: req.body ?? {},
+          status: res.statusCode,
+          ip: req.socket?.remoteAddress ?? "",
+          createdAt: (0, import_date.nowISO)()
+        },
+        response: {
+          json: res._body ?? null,
+          headers: res.getHeaders?.()
+        },
+        user: await this.config.isAuthenticated?.(req) ? await this.config.getUser?.(req) : null
+      };
+      await requestWatcher.log(logPayload);
+    } catch (err) {
+      console.error("Error finalizing request log:", err);
+    }
+  }
+  normalizePath(pathStr) {
+    return pathStr.startsWith("/") ? pathStr : `/${pathStr}`;
+  }
+};
+
+// src/index.ts
+var defaultConfig = {
   appName: "Lens",
   enabled: true,
   path: "/lens",
@@ -41,25 +196,25 @@ const defaultConfig = {
   onlyPaths: [],
   requestWatcherEnabled: true
 };
-const lens = async (config) => {
-  const adapter = new import_adapter.default({ app: config.app });
+var lens = async (config) => {
+  const adapter = new ExpressAdapter({ app: config.app });
   const watchers = [];
   const mergedConfig = {
     ...config,
     ...defaultConfig
   };
   if (mergedConfig.requestWatcherEnabled) {
-    watchers.push(new import_core.RequestWatcher());
+    watchers.push(new import_core2.RequestWatcher());
   }
   if (mergedConfig.queryWatcher?.enabled) {
-    watchers.push(new import_core.QueryWatcher());
+    watchers.push(new import_core2.QueryWatcher());
   }
-  const { ignoredPaths, normalizedPath } = import_core.lensUtils.prepareIgnoredPaths(
+  const { ignoredPaths, normalizedPath } = import_core2.lensUtils.prepareIgnoredPaths(
     mergedConfig.path,
     mergedConfig.ignoredPaths
   );
   adapter.setConfig(mergedConfig).setIgnoredPaths(ignoredPaths).setOnlyPaths(mergedConfig.onlyPaths);
-  await import_core.Lens.setAdapter(adapter).setWatchers(watchers).start({
+  await import_core2.Lens.setAdapter(adapter).setWatchers(watchers).start({
     appName: mergedConfig.appName,
     enabled: mergedConfig.enabled,
     basePath: normalizedPath

package/dist/index.js

@@ -1,11 +1,169 @@
+// src/index.ts
 import {
   Lens,
+  lensUtils as lensUtils2,
+  QueryWatcher as QueryWatcher2,
+  RequestWatcher as RequestWatcher2
+} from "@lensjs/core";
+
+// src/adapter.ts
+import {
+  LensAdapter,
   lensUtils,
-  QueryWatcher,
-  RequestWatcher
+  WatcherTypeEnum
 } from "@lensjs/core";
-import ExpressAdapter from "./adapter";
-const defaultConfig = {
+import * as path from "path";
+import fs from "fs";
+import express from "express";
+import { nowISO, sqlDateTime } from "@lensjs/date";
+var ExpressAdapter = class extends LensAdapter {
+  app;
+  config;
+  constructor({ app }) {
+    super();
+    this.app = app;
+  }
+  setConfig(config) {
+    this.config = config;
+    return this;
+  }
+  setup() {
+    for (const watcher of this.getWatchers()) {
+      switch (watcher.name) {
+        case WatcherTypeEnum.REQUEST:
+          this.watchRequests(watcher);
+          break;
+        case WatcherTypeEnum.QUERY:
+          void this.watchQueries(watcher);
+          break;
+      }
+    }
+  }
+  registerRoutes(routes) {
+    routes.forEach((route) => {
+      this.app[route.method.toLowerCase()](
+        this.normalizePath(route.path),
+        async (req, res) => {
+          const result = await route.handler({
+            params: req.params,
+            qs: req.query
+          });
+          return res.json(result);
+        }
+      );
+    });
+  }
+  serveUI(uiPath, spaRoute, _dataToInject) {
+    this.app.use(this.normalizePath(spaRoute), express.static(uiPath));
+    this.app.get(
+      this.normalizePath(`${spaRoute}/favicon.svg`),
+      (_, res) => res.sendFile(path.join(uiPath, "favicon.svg"))
+    );
+    this.app.get(new RegExp(`^/${spaRoute}(?!/api)(/.*)?$`), (req, res) => {
+      if (lensUtils.isStaticFile(req.path.split("/"))) {
+        return res.download(
+          path.join(uiPath, lensUtils.stripBeforeAssetsPath(req.path))
+        );
+      }
+      return res.sendFile(path.join(uiPath, "index.html"));
+    });
+  }
+  async watchQueries(watcher) {
+    if (!this.config.queryWatcher.enabled) return;
+    const handler = this.config.queryWatcher.handler;
+    await handler({
+      onQuery: async (query) => {
+        const queryPayload = {
+          query: query.query,
+          duration: query.duration || "0 ms",
+          createdAt: query.createdAt || sqlDateTime(),
+          type: query.type
+        };
+        await watcher?.log({
+          data: queryPayload
+        });
+      }
+    });
+  }
+  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);
+      });
+      next();
+    });
+  }
+  patchResponseMethods(res) {
+    const originalJson = res.json.bind(res);
+    const originalSend = res.send.bind(res);
+    res._body = void 0;
+    res.json = function(body) {
+      res._body = body;
+      return originalJson(body);
+    };
+    res.send = function(body) {
+      let safeBody;
+      try {
+        if (!body) {
+          safeBody = "Purged By Lens";
+        } else if (typeof body === "object" && !Buffer.isBuffer(body)) {
+          safeBody = body;
+        } else if (typeof body === "string") {
+          const filePath = path.resolve(body);
+          if (fs.existsSync(filePath)) {
+            safeBody = "Purged By Lens";
+          } else {
+            safeBody = body;
+          }
+        } else if (Buffer.isBuffer(body)) {
+          safeBody = "Purged By Lens";
+        } else {
+          safeBody = "Purged By Lens";
+        }
+      } catch {
+        safeBody = "Purged By Lens";
+      }
+      res._body = safeBody;
+      return originalSend(safeBody);
+    };
+  }
+  async finalizeRequestLog(req, res, requestWatcher, start) {
+    try {
+      const duration = lensUtils.prettyHrTime(process.hrtime(start));
+      const logPayload = {
+        request: {
+          id: lensUtils.generateRandomUuid(),
+          method: req.method,
+          duration,
+          path: req.originalUrl,
+          headers: req.headers,
+          body: req.body ?? {},
+          status: res.statusCode,
+          ip: req.socket?.remoteAddress ?? "",
+          createdAt: nowISO()
+        },
+        response: {
+          json: res._body ?? null,
+          headers: res.getHeaders?.()
+        },
+        user: await this.config.isAuthenticated?.(req) ? await this.config.getUser?.(req) : null
+      };
+      await requestWatcher.log(logPayload);
+    } catch (err) {
+      console.error("Error finalizing request log:", err);
+    }
+  }
+  normalizePath(pathStr) {
+    return pathStr.startsWith("/") ? pathStr : `/${pathStr}`;
+  }
+};
+
+// src/index.ts
+var defaultConfig = {
   appName: "Lens",
   enabled: true,
   path: "/lens",
@@ -13,7 +171,7 @@ const defaultConfig = {
   onlyPaths: [],
   requestWatcherEnabled: true
 };
-const lens = async (config) => {
+var lens = async (config) => {
   const adapter = new ExpressAdapter({ app: config.app });
   const watchers = [];
   const mergedConfig = {
@@ -21,12 +179,12 @@ const lens = async (config) => {
     ...defaultConfig
   };
   if (mergedConfig.requestWatcherEnabled) {
-    watchers.push(new RequestWatcher());
+    watchers.push(new RequestWatcher2());
   }
   if (mergedConfig.queryWatcher?.enabled) {
-    watchers.push(new QueryWatcher());
+    watchers.push(new QueryWatcher2());
   }
-  const { ignoredPaths, normalizedPath } = lensUtils.prepareIgnoredPaths(
+  const { ignoredPaths, normalizedPath } = lensUtils2.prepareIgnoredPaths(
     mergedConfig.path,
     mergedConfig.ignoredPaths
   );

package/dist/types/index.cjs

@@ -12,5 +12,7 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types/index.ts
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lensjs/express",
-  "version": "1.0.7",
-  "description": "Express adapter for Lens",
+  "version": "1.0.10",
+  "description": "Express adapter for LensJs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -17,19 +17,17 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsup --clean"
-  },
   "dependencies": {
     "express": "^5.1.0",
-    "utf-8-validate": "^6.0.5"
+    "@lensjs/date": "1.0.10",
+    "@lensjs/watchers": "1.0.10",
+    "@lensjs/typescript-config": "1.0.10",
+    "@lensjs/core": "1.0.10"
   },
-  "trustedDependencies": [
-    "utf-8-validate"
-  ],
   "devDependencies": {
-    "@lensjs/core": "1.0.4",
     "@types/express": "^5.0.3"
   },
-  "gitHead": "a229fde5700970ec290ff31f1e3b7d84cc56d325"
-}
+  "scripts": {
+    "build": "tsup --clean"
+  }
+}