@paroicms/server 1.98.1 → 1.99.0

package/dist/site-context/site-context.js

@@ -1,5 +1,7 @@
 import { ApiError } from "@paroicms/public-server-lib";
 import { registeredSites } from "../context.js";
+import { isShuttingDown } from "../maintenance/shutdown.js";
+import { initializeRequestTracker, setRequestTrackerState, waitForPendingRequests, } from "../request-tracking/request-state.js";
 import { loadSiteContext } from "./load-site-context.js";
 const MAX_IDLE_TIME = 1000 * 60 * 20;
 const promises = new Map();
@@ -18,6 +20,8 @@ export function getActiveSiteContext(fqdn, options = {}) {
     throw new Error(`should have the site-context for '${fqdn}'`);
 }
 export function getSiteContext(fqdn, options = {}) {
+    if (isShuttingDown())
+        throw new ApiError("Server shutting down", 503);
     let promise = promises.get(fqdn);
     if (promise) {
         updateLastUseTime(fqdn);
@@ -36,18 +40,19 @@ export function getSiteContext(fqdn, options = {}) {
 }
 export async function unloadSiteContext(siteContext) {
     const { logger } = siteContext;
+    setRequestTrackerState(siteContext, "gracefulShutdown");
+    await waitForPendingRequests(siteContext, 30_000);
+    await siteContext.cn.destroy();
+    await siteContext.textCache.close();
+    await siteContext.imageCache.close();
+    await siteContext.mediaStorage.close();
     promises.delete(siteContext.fqdn);
     activeContextAndTimes.delete(siteContext.fqdn);
-    await Promise.all([
-        siteContext.imageCache.close(),
-        siteContext.textCache.close(),
-        siteContext.mediaStorage.close(),
-        siteContext.cn.destroy(),
-    ]);
     logger.info("Site unloaded ↘");
 }
 async function wrapCreateSiteContext(regSite) {
     const siteContext = await loadSiteContext(regSite);
+    initializeRequestTracker(siteContext);
     activeContextAndTimes.set(regSite.fqdn, {
         siteContext,
         lastUseTimeMs: Date.now(),

package/dist/site-context/site-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-context.js","sourceRoot":"","sources":["../../src/site-context/site-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"site-context.js","sourceRoot":"","sources":["../../src/site-context/site-context.ts"],"names":[],"mappings":"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"}

package/dist/site-context/site-context.types.d.ts

@@ -27,6 +27,16 @@ export interface SiteContext extends PublicSiteContext {
     hooks: Map<string, PluginHookHandler[]>;
     trusted: boolean;
     access: SiteAccessValue;
+    requestTracker: RequestTracker;
+}
+export interface RequestTracker {
+    pendingRequests: Set<string>;
+    requestQueue: Array<{
+        resolve: () => void;
+        reject: (error: Error) => void;
+        timeout: NodeJS.Timeout;
+    }>;
+    state: "normal" | "gracefulShutdown" | "backupMode";
 }
 export interface PluginFieldPreprocessor {
     preprocessor: FieldPreprocessor;