vike 0.4.267-commit-7884d91 → 0.4.267-commit-5676e14

package/dist/server/runtime/renderPageServer.js

@@ -132,6 +132,7 @@ async function renderPageServerEntryOnce(pageContextBegin, globalContext, reques
     return await renderPageServerEntryRecursive(pageContextBegin, globalContext, requestId);
 }
 async function renderPageServerEntryRecursive(pageContextBegin, globalContext, requestId) {
+    assert(requestId);
     catchInfiniteLoop(`[${getRequestTag(requestId)}] renderPageServerEntryRecursive()`);
     const pageContextNominalPageBegin = fork(pageContextBegin);
     const pageContextAddendumAbort = getPageContextAddendumAbort(pageContextBegin.pageContextsAborted);

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: '0.4.267-commit-7884d91';
+export declare const PROJECT_VERSION: '0.4.267-commit-5676e14';

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.267-commit-7884d91';
+export const PROJECT_VERSION = '0.4.267-commit-5676e14';

package/dist/utils/catchInfiniteLoop.js

@@ -1,20 +1,40 @@
 export { catchInfiniteLoop };
-import { assertUsage, assertWarning } from './assert.js';
+import { assert, assertUsage, assertWarning } from './assert.js';
 import { humanizeTime } from './humanizeTime.js';
-const trackers = {};
+const trackers = new Map();
+let lastCleanup;
+// Given these parameters, a warning is shown upon 10 calls a second on average during 5 seconds
 const maxCalls = 99;
 const time = 5 * 1000;
 function catchInfiniteLoop(functionName) {
     // Init
     const now = new Date().getTime();
-    // Clean all outdated trackers
-    Object.keys(trackers).forEach((key) => {
-        const tracker = trackers[key];
-        const elapsedTime = now - tracker.startTime;
-        if (elapsedTime > time)
-            delete trackers[key];
-    });
-    const tracker = (trackers[functionName] ?? (trackers[functionName] = { count: 0, startTime: now }));
+    // Cleanup
+    if (globalThis.__VIKE__IS_CLIENT) {
+        // No cleanup on the client-side, in order to minimize client-side JavaScript (to save client-side KBs)
+        assert(trackers.size < 5);
+    }
+    else {
+        // Clean outdated trackers
+        // - On the server-side, there is an infinite amount of outdated trackers (a new tracker is created per HTTP request) => we should clean them
+        // - We don't clean upon every call: the server creates a new tracker per HTTP request, so that would cost O(n^2) — O(number of requests within `time`) per request
+        //   - https://github.com/vikejs/vike/pull/3576
+        const cleanInterval = 10 * 1000;
+        lastCleanup ?? (lastCleanup = now);
+        if (now - lastCleanup > cleanInterval) {
+            trackers.forEach((tracker, key) => {
+                if (isOutdated(tracker, now))
+                    trackers.delete(key);
+            });
+            lastCleanup = now;
+        }
+    }
+    // Get/reset tracker
+    let tracker = trackers.get(functionName);
+    if (!tracker || isOutdated(tracker, now)) {
+        tracker = { count: 0, startTime: now };
+        trackers.set(functionName, tracker);
+    }
     // Count
     tracker.count++;
     // Error
@@ -24,8 +44,10 @@ function catchInfiniteLoop(functionName) {
     }
     // Warning, at 50% threshold
     if (!tracker.warned && tracker.count > maxCalls * 0.5) {
-        // Warning is shown upon 10 calls a second, on average during 5 seconds, given the default parameters
         assertWarning(false, msg, { onlyOnce: false, showStackTrace: true });
         tracker.warned = true;
     }
 }
+function isOutdated(tracker, now) {
+    return now - tracker.startTime > time;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.267-commit-7884d91",
+  "version": "0.4.267-commit-5676e14",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -131,7 +131,7 @@
     "@universal-deploy/store": "^0.2.2",
     "@universal-deploy/vite": "^0.1.14",
     "@universal-middleware/core": "^0.4.18",
-    "@universal-middleware/node": "^0.2.2",
+    "@universal-middleware/node": "^0.2.3",
     "cac": "^6.0.0",
     "convert-route": "^1.1.1",
     "es-module-lexer": "^1.0.0",