theokit 0.71.0 → 0.72.1

package/dist/{chunk-5XXXJ6DT.js → chunk-E2RC367T.js}

@@ -21,7 +21,7 @@ import {
   newSpanId,
   newTraceId,
   requestTrace
-} from "./chunk-MS4A7N77.js";
+} from "./chunk-PEL3MJLM.js";
 import {
   RequestBodyConsumedError,
   createLogger,
@@ -542,6 +542,24 @@ async function runWebShapedMiddleware(mw, req, res, context) {
 function isWebShaped(mw) {
   return WEB_SHAPED_MIDDLEWARE in mw;
 }
+var warnedUninvocable = /* @__PURE__ */ new Set();
+function describeUninvocable(value) {
+  if (value === void 0) return "no default export";
+  if (value === null) return "a default export of `null`";
+  if (typeof value !== "object") return `a default export of type \`${typeof value}\``;
+  const keys = Object.keys(value);
+  if (keys.includes("build") && keys.includes("handle")) {
+    return "a middleware BUILDER that was never built \u2014 call `.handle(fn).build()` on it";
+  }
+  return `an object with keys [${keys.join(", ")}]`;
+}
+function reportUninvocableMiddleware(path, value) {
+  if (warnedUninvocable.has(path)) return;
+  warnedUninvocable.add(path);
+  console.warn(
+    `[theokit] middleware not run: ${path} exports ${describeUninvocable(value)}. The file-scan runner invokes a function; this export is not one, so it was skipped and the request was answered without it.`
+  );
+}
 async function runScannedMiddleware(mw, req, res, context) {
   if (isWebShaped(mw)) {
     const { shortCircuited } = await runWebShapedMiddleware(mw, req, res, context);
@@ -600,7 +618,10 @@ async function runMiddlewareAndContext(req, res, loadModule, serverDir) {
     for (const mwPath of dirMiddlewares) {
       const mod = await loadModule(mwPath);
       const mw = mod.default;
-      if (typeof mw !== "function") continue;
+      if (typeof mw !== "function") {
+        reportUninvocableMiddleware(mwPath, mod.default);
+        continue;
+      }
       const { aborted } = await runScannedMiddleware(mw, req, res, middlewareCtx);
       if (aborted) return { ctx: middlewareCtx, aborted: true };
     }
@@ -611,6 +632,8 @@ async function runMiddlewareAndContext(req, res, loadModule, serverDir) {
     if (typeof mw === "function") {
       const { aborted } = await runScannedMiddleware(mw, req, res, middlewareCtx);
       if (aborted) return { ctx: middlewareCtx, aborted: true };
+    } else {
+      reportUninvocableMiddleware(singleFilePath, mod.default);
     }
   }
   const factoryCtx = await createServerContext(req, res, loadModule, serverDir);
@@ -1803,6 +1826,13 @@ async function createPluginRunnerFromConfig(plugins) {
 }
 
 // src/server/rate-limit/rate-limit-store.ts
+function slidingCount(state, windowMs) {
+  const { previousCount } = state;
+  if (previousCount === void 0 || previousCount === 0) return state.count;
+  const windowStart = state.resetAt - windowMs;
+  const throughCurrent = Math.min(1, Math.max(0, (Date.now() - windowStart) / windowMs));
+  return state.count + previousCount * (1 - throughCurrent);
+}
 var InMemoryStore = class _InMemoryStore {
   store = /* @__PURE__ */ new Map();
   /** Bound the map to prevent unbounded growth from pathological inputs. */
@@ -1838,12 +1868,18 @@ var InMemoryStore = class _InMemoryStore {
     }
     const entry = this.store.get(key);
     if (!entry || now >= entry.resetAt) {
-      const fresh = { count: 1, resetAt: now + windowMs };
+      let previousCount = 0;
+      let resetAt = now + windowMs;
+      if (entry !== void 0 && now - entry.resetAt < windowMs) {
+        previousCount = entry.count;
+        resetAt = entry.resetAt + windowMs;
+      }
+      const fresh = { count: 1, resetAt, previousCount };
       this.store.set(key, fresh);
       return { ...fresh };
     }
     entry.count++;
-    return { count: entry.count, resetAt: entry.resetAt };
+    return { count: entry.count, resetAt: entry.resetAt, previousCount: entry.previousCount };
   }
   /** Sweep expired entries. Called by the GC timer; safe to call manually. */
   sweepExpired() {
@@ -1899,13 +1935,15 @@ function createRateLimiter(config, opts = {}) {
   };
 }
 function resultFromState(state, config) {
-  if (state.count > config.max) {
-    const retryAfter = Math.ceil((state.resetAt - Date.now()) / 1e3);
+  const reset = String(Math.ceil(state.resetAt / 1e3));
+  if (slidingCount(state, config.windowMs) > config.max) {
+    const retryAfter = Math.max(0, Math.ceil((state.resetAt - Date.now()) / 1e3));
     return {
       limited: true,
       headers: {
         "X-RateLimit-Limit": String(config.max),
         "X-RateLimit-Remaining": "0",
+        "X-RateLimit-Reset": reset,
         "Retry-After": String(retryAfter)
       }
     };
@@ -1914,7 +1952,8 @@ function resultFromState(state, config) {
     limited: false,
     headers: {
       "X-RateLimit-Limit": String(config.max),
-      "X-RateLimit-Remaining": String(Math.max(0, config.max - state.count))
+      "X-RateLimit-Remaining": String(Math.max(0, config.max - state.count)),
+      "X-RateLimit-Reset": reset
     }
   };
 }
@@ -2696,4 +2735,4 @@ export {
   CsrfReadinessStore,
   applySecurityHeaders
 };
-//# sourceMappingURL=chunk-5XXXJ6DT.js.map
+//# sourceMappingURL=chunk-E2RC367T.js.map