owebjs 1.5.9-dev → 1.6.0-dev

package/dist/utils/assignRoutes.js

@@ -12,8 +12,8 @@ import { readdirSync } from "node:fs";
 import { WebSocketRoute } from '../structures/WebSocketRoute.js';
 import { FastifyWebSocketAdapter } from '../structures/FastifyWebSocketAdapter.js';
 import { formatSSE } from './utils.js';
-const websocketRoutes = {};
 const WS_REGISTRY_KEY = "ws:registered-routes";
+const runtimeStates = /* @__PURE__ */ new WeakMap();
 const createMethodMap = /* @__PURE__ */ __name(() => ({
   get: {},
   post: {},
@@ -22,11 +22,26 @@ const createMethodMap = /* @__PURE__ */ __name(() => ({
   patch: {},
   options: {}
 }), "createMethodMap");
-let matcherOverrides = {};
-let routeFunctions = createMethodMap();
-let temporaryRequests = createMethodMap();
-let routesCache = [];
-let compiledRoutes = {};
+function createRuntimeState() {
+  return {
+    matcherOverrides: {},
+    routeFunctions: createMethodMap(),
+    temporaryRequests: createMethodMap(),
+    routesCache: [],
+    compiledRoutes: {},
+    websocketRoutes: {}
+  };
+}
+__name(createRuntimeState, "createRuntimeState");
+function getRuntimeState(oweb) {
+  let state = runtimeStates.get(oweb);
+  if (!state) {
+    state = createRuntimeState();
+    runtimeStates.set(oweb, state);
+  }
+  return state;
+}
+__name(getRuntimeState, "getRuntimeState");
 function normalizeFsPath(filePath) {
   return path.resolve(filePath).replaceAll("\\", "/").toLowerCase();
 }
@@ -47,14 +62,13 @@ async function importFreshModule(filePath, source) {
 }
 __name(importFreshModule, "importFreshModule");
 function resetRuntimeCaches(oweb) {
-  matcherOverrides = {};
-  routeFunctions = createMethodMap();
-  temporaryRequests = createMethodMap();
-  routesCache = [];
-  compiledRoutes = {};
-  for (const key of Object.keys(websocketRoutes)) {
-    delete websocketRoutes[key];
-  }
+  const state = getRuntimeState(oweb);
+  state.matcherOverrides = {};
+  state.routeFunctions = createMethodMap();
+  state.temporaryRequests = createMethodMap();
+  state.routesCache = [];
+  state.compiledRoutes = {};
+  state.websocketRoutes = {};
   oweb._internalKV.delete(WS_REGISTRY_KEY);
 }
 __name(resetRuntimeCaches, "resetRuntimeCaches");
@@ -66,8 +80,8 @@ function removeExtension(filePath) {
   return filePath;
 }
 __name(removeExtension, "removeExtension");
-function createWebSocketProxy(url) {
-  const getHandler = /* @__PURE__ */ __name(() => websocketRoutes[url], "getHandler");
+function createWebSocketProxy(oweb, url) {
+  const getHandler = /* @__PURE__ */ __name(() => getRuntimeState(oweb).websocketRoutes[url], "getHandler");
   return {
     compression: getHandler()?._options.compression,
     maxPayloadLength: getHandler()?._options.maxPayloadLength,
@@ -101,10 +115,11 @@ function createWebSocketProxy(url) {
 }
 __name(createWebSocketProxy, "createWebSocketProxy");
 const applyMatcherHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallbackDir, filePath, content) => {
+  const state = getRuntimeState(oweb);
   let def;
   const fileName = path.basename(filePath);
   if (op === "delete-file") {
-    delete matcherOverrides[removeExtension(fileName)];
+    delete state.matcherOverrides[removeExtension(fileName)];
     success(`Matcher ${filePath} removed in 0ms`, "HMR");
     return;
   }
@@ -122,10 +137,11 @@ const applyMatcherHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fall
     success(`Matcher ${filePath} reloaded in ${end}ms`, "HMR");
   }
   if (def) {
-    matcherOverrides[removeExtension(fileName)] = def;
+    state.matcherOverrides[removeExtension(fileName)] = def;
   }
 }, "applyMatcherHMR");
 const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallbackDir, path2, content) => {
+  const state = getRuntimeState(oweb);
   const normalizedChangedPath = normalizeFsPath(path2);
   if (path2.endsWith("hooks.js") || path2.endsWith("hooks.ts")) {
     warn(`Hot Module Replacement is not supported for hooks. Restart the server for changes to take effect.`, "HMR");
@@ -133,15 +149,15 @@ const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallba
   }
   if (path2.endsWith(".ts")) {
     const start = Date.now();
-    compiledRoutes[path2] = content.length ? await generateFunctionFromTypescript(content, path2) : void 0;
+    state.compiledRoutes[path2] = content.length ? await generateFunctionFromTypescript(content, path2) : void 0;
     const end = Date.now() - start;
     success(`File ${path2} compiled in ${end}ms`, "HMR");
   }
   if (op === "new-file") {
     const start = Date.now();
     const files = await walk(workingDir, [], fallbackDir);
-    const routes = await generateRoutes(files, path2);
-    routesCache = routes;
+    const routes = await generateRoutes(files, path2, state.compiledRoutes);
+    state.routesCache = routes;
     const f = routes.find((x) => normalizeFsPath(x.fileInfo.filePath) === normalizedChangedPath);
     if (!f) {
       warn(`HMR could not resolve route metadata for file ${path2}`, "HMR");
@@ -161,18 +177,18 @@ const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallba
     }
     const method = f.method.toLowerCase();
     const nextHandler = inner(oweb, f);
-    if (routeFunctions[method][f.url]) {
-      routeFunctions[method][f.url] = nextHandler;
+    if (state.routeFunctions[method][f.url]) {
+      state.routeFunctions[method][f.url] = nextHandler;
     } else {
-      temporaryRequests[method][f.url] = nextHandler;
+      state.temporaryRequests[method][f.url] = nextHandler;
     }
     const end = Date.now() - start;
     success(`Route ${f.method.toUpperCase()}:${f.url} created in ${end}ms`, "HMR");
   } else if (op === "modify-file") {
     const start = Date.now();
     const files = await walk(workingDir, [], fallbackDir);
-    const routes = await generateRoutes(files, path2);
-    routesCache = routes;
+    const routes = await generateRoutes(files, path2, state.compiledRoutes);
+    state.routesCache = routes;
     const f = routes.find((x) => normalizeFsPath(x.fileInfo.filePath) === normalizedChangedPath);
     if (!f) {
       warn(`HMR could not resolve route metadata for file ${path2}`, "HMR");
@@ -185,19 +201,19 @@ const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallba
       }
     }
     if (f.fn?.prototype instanceof WebSocketRoute) {
-      websocketRoutes[f.url] = new f.fn();
+      state.websocketRoutes[f.url] = new f.fn();
       const end2 = Date.now() - start;
       success(`WebSocket Route ${f.url} reloaded in ${end2}ms`, "HMR");
       return;
     }
     const method = f.method.toLowerCase();
     const nextHandler = inner(oweb, f);
-    if (routeFunctions[method][f.url]) {
-      routeFunctions[method][f.url] = nextHandler;
-    } else if (f.url in temporaryRequests[method]) {
-      temporaryRequests[method][f.url] = nextHandler;
+    if (state.routeFunctions[method][f.url]) {
+      state.routeFunctions[method][f.url] = nextHandler;
+    } else if (f.url in state.temporaryRequests[method]) {
+      state.temporaryRequests[method][f.url] = nextHandler;
     } else {
-      routeFunctions[method][f.url] = nextHandler;
+      state.routeFunctions[method][f.url] = nextHandler;
     }
     const end = Date.now() - start;
     success(`Route ${f.method.toUpperCase()}:${f.url} reloaded in ${end}ms`, "HMR");
@@ -208,25 +224,25 @@ const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallba
     if (builded.url.endsWith("/index")) {
       builded.url = builded.url.slice(0, -"/index".length);
     }
-    if (websocketRoutes[builded.url]) {
-      delete websocketRoutes[builded.url];
+    if (state.websocketRoutes[builded.url]) {
+      delete state.websocketRoutes[builded.url];
       const end = Date.now() - start;
       success(`WebSocket Route ${builded.url} removed (shimmed) in ${end}ms`, "HMR");
       return;
     }
-    const f = routesCache.find((x) => x.method == builded.method && x.url == builded.url);
+    const f = state.routesCache.find((x) => x.method == builded.method && x.url == builded.url);
     if (f) {
-      if (f.url in temporaryRequests[f.method.toLowerCase()]) {
-        delete temporaryRequests[f.method.toLowerCase()][f.url];
+      if (f.url in state.temporaryRequests[f.method.toLowerCase()]) {
+        delete state.temporaryRequests[f.method.toLowerCase()][f.url];
       } else {
-        delete routeFunctions[f.method.toLowerCase()][f.url];
+        delete state.routeFunctions[f.method.toLowerCase()][f.url];
       }
       const end = Date.now() - start;
       success(`Route ${f.method.toUpperCase()}:${f.url} removed in ${end}ms`, "HMR");
     }
   }
 }, "applyRouteHMR");
-const generateRoutes = /* @__PURE__ */ __name(async (files, onlyGenerateFn) => {
+const generateRoutes = /* @__PURE__ */ __name(async (files, onlyGenerateFn, compiledRoutes = {}) => {
   const routes = [];
   for (const file of files) {
     const parsedFile = path.parse(file.rel);
@@ -272,11 +288,12 @@ function inner(oweb, route) {
   const handleIsAsync = routeFunc.handle.constructor.name === "AsyncFunction";
   const hasRouteErrorHandler = typeof routeFunc?.handleError === "function";
   const hmrEnabled = !!oweb._internalKV.get("hmr");
+  const state = getRuntimeState(oweb);
   const checkMatchers = /* @__PURE__ */ __name((req) => {
     if (!hasMatchers) return true;
     for (const matcher of matchers) {
       const param = req.params[matcher.paramName];
-      const fun = matcherOverrides[matcher.matcherName];
+      const fun = state.matcherOverrides[matcher.matcherName];
       if (fun) {
         return fun(param);
       }
@@ -432,7 +449,7 @@ function inner(oweb, route) {
     if (hmrEnabled && isParametric) {
       const currentPath = req.raw.url.split("?")[0];
       const method = req.method.toLowerCase();
-      const specificHandler = temporaryRequests[method]?.[currentPath];
+      const specificHandler = state.temporaryRequests[method]?.[currentPath];
       if (specificHandler) {
         return specificHandler(req, res);
       }
@@ -467,14 +484,15 @@ function getRegisteredWebSocketsForApp(oweb) {
 __name(getRegisteredWebSocketsForApp, "getRegisteredWebSocketsForApp");
 function assignSpecificRoute(oweb, route) {
   if (!route?.fn) return;
+  const state = getRuntimeState(oweb);
   if (route?.fn?.prototype instanceof WebSocketRoute) {
     const wsInstance = new route.fn();
-    websocketRoutes[route.url] = wsInstance;
+    state.websocketRoutes[route.url] = wsInstance;
     const registeredWebSockets = getRegisteredWebSocketsForApp(oweb);
     if (!registeredWebSockets.has(route.url)) {
       registeredWebSockets.add(route.url);
       if (oweb._options.uWebSocketsEnabled && oweb.uServer) {
-        const proxy = createWebSocketProxy(route.url);
+        const proxy = createWebSocketProxy(oweb, route.url);
         oweb.ws(route.url, proxy, route.fileInfo.hooks);
       } else {
         oweb.get(route.url, {
@@ -532,7 +550,7 @@ function assignSpecificRoute(oweb, route) {
               }
               return;
             }
-            const getHandler = /* @__PURE__ */ __name(() => websocketRoutes[route.url], "getHandler");
+            const getHandler = /* @__PURE__ */ __name(() => state.websocketRoutes[route.url], "getHandler");
             socket.on("message", (message, isBinary) => {
               const h = getHandler();
               if (h?.message) h.message(adapter, message, isBinary);
@@ -573,12 +591,12 @@ function assignSpecificRoute(oweb, route) {
   if (!routeHandler) return;
   const hmrEnabled = !!oweb._internalKV.get("hmr");
   if (hmrEnabled) {
-    routeFunctions[route.method][route.url] = routeHandler;
+    state.routeFunctions[route.method][route.url] = routeHandler;
     oweb[route.method](route.url, routeFunc._options || {}, function(req, res) {
-      if (routeFunctions[route.method][route.url]) {
-        return routeFunctions[route.method][route.url](req, res);
+      if (state.routeFunctions[route.method][route.url]) {
+        return state.routeFunctions[route.method][route.url](req, res);
       } else {
-        const vals = temporaryRequests[route.method];
+        const vals = state.temporaryRequests[route.method];
         const keys = Object.keys(vals);
         if (!vals || !keys.length) {
           return send404(req, res);
@@ -599,7 +617,7 @@ function assignSpecificRoute(oweb, route) {
   oweb[route.method](route.url, routeFunc._options || {}, routeHandler);
 }
 __name(assignSpecificRoute, "assignSpecificRoute");
-async function loadMatchers(directoryPath) {
+async function loadMatchers(directoryPath, state) {
   const files = readdirSync(directoryPath).filter((f) => [
     ".js",
     ".ts"
@@ -609,20 +627,21 @@ async function loadMatchers(directoryPath) {
     const fileName = path.basename(filePath);
     const packageURL = pathToFileURL(path.resolve(filePath)).href;
     const def = await import(packageURL);
-    matcherOverrides[removeExtension(fileName)] = def.default;
+    state.matcherOverrides[removeExtension(fileName)] = def.default;
   }
 }
 __name(loadMatchers, "loadMatchers");
 const assignRoutes = /* @__PURE__ */ __name(async (oweb, directory, matchersDirectory) => {
   resetRuntimeCaches(oweb);
+  const state = getRuntimeState(oweb);
   if (matchersDirectory) {
-    await loadMatchers(matchersDirectory);
+    await loadMatchers(matchersDirectory, state);
   }
   const files = await walk(directory);
-  const routes = await generateRoutes(files);
-  routesCache = routes;
+  const routes = await generateRoutes(files, void 0, state.compiledRoutes);
+  state.routesCache = routes;
   function fallbackHandle(req, res) {
-    const vals = temporaryRequests[req.method.toLowerCase()];
+    const vals = state.temporaryRequests[req.method.toLowerCase()];
     const keys = Object.keys(vals);
     if (!vals || !keys.length) {
       return send404(req, res);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "owebjs",
-    "version": "1.5.9-dev",
+    "version": "1.6.0-dev",
     "description": "A flexible and modern web framework built on top of Fastify",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",