eddev 2.0.0-beta.73 → 2.0.0-beta.75

package/dist/app/server/server-context.js

@@ -2,7 +2,7 @@ import { parseURL, stringifyParsedURL, withQuery, withTrailingSlash } from "ufo"
 import { fetchWP } from "../../node/utils/fetch-wp.js";
 import { filterHeader } from "./utils/headers.js";
 import { createUrlReplacer } from "./utils/replace-host.js";
-import { swr } from "./utils/swr-cache.js";
+import { pageCache, queryCache, swr } from "./utils/swr-cache.js";
 const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", /woocommerce/];
 const PROXY_REQUEST_HEADERS = [
     "content-type",
@@ -93,6 +93,7 @@ export class ServerContext {
         let cacheKey = "fetchRouteData:" + req.pathname;
         const result = await swr({
             key: cacheKey,
+            cache: pageCache,
             getFreshValue: async (ctx) => {
                 ctx.metadata.createdTime;
                 const fetchUrl = withQuery(withTrailingSlash(req.pathname), {
@@ -148,6 +149,7 @@ export class ServerContext {
     async fetchAppData() {
         const data = await swr({
             key: "fetchAppData",
+            cache: pageCache,
             getFreshValue: async (ctx) => {
                 const response = await this.fetchOrigin("/_appdata", {
                     cache: "no-cache",
@@ -181,37 +183,45 @@ export class ServerContext {
     }
     async fetchNamedQuery(req) {
         const url = `/wp-json/ed/v1/query/${req.name}?params=${encodeURIComponent(JSON.stringify(req.params))}`;
-        const hasVariedHeaders = VARIES_HEADERS.some((key) => !!req.headers[key]);
         const key = `fetchNamedQuery:${req.name}:${JSON.stringify(req.params)}`;
-        const result = await swr({
-            key,
-            getFreshValue: async (ctx) => {
-                const result = await this.fetchOrigin(url, {
-                    cache: "no-cache",
-                    replaceUrls: true,
-                    headers: {
-                        ...this.extractRequestHeaders(req.headers),
-                        "Content-Type": "application/json",
-                        Accept: "application/json",
-                    },
-                });
-                const preferredCacheDuration = parseInt(result.headers.get("x-ed-cache-duration") ?? "");
-                if (isFinite(preferredCacheDuration)) {
-                    ctx.metadata.ttl = preferredCacheDuration * 1000;
-                }
-                let resultStatus = result.status;
-                let resultHeaders = result.headers;
-                let resultData = await result.json();
-                if (resultData && typeof resultData === "object") {
-                    resultData.__generated = new Date().toISOString();
-                }
-                return {
-                    status: resultStatus,
-                    headers: resultHeaders,
-                    data: JSON.stringify(resultData),
-                };
-            },
-        });
+        const fetch = async () => {
+            const result = await this.fetchOrigin(url, {
+                cache: "no-cache",
+                replaceUrls: true,
+                headers: {
+                    ...this.extractRequestHeaders(req.headers),
+                    "Content-Type": "application/json",
+                    Accept: "application/json",
+                },
+            });
+            const preferredCacheDuration = parseInt(result.headers.get("x-ed-cache-duration") ?? "");
+            let resultStatus = result.status;
+            let resultHeaders = result.headers;
+            let resultData = await result.json();
+            if (resultData && typeof resultData === "object") {
+                resultData.__generated = new Date().toISOString();
+            }
+            return {
+                status: resultStatus,
+                headers: resultHeaders,
+                data: JSON.stringify(resultData),
+                cacheTime: isFinite(preferredCacheDuration) ? preferredCacheDuration * 1000 : undefined,
+            };
+        };
+        // If headers like 'Authorization' are set, then we shouldn't cache.
+        const hasVariedHeaders = VARIES_HEADERS.some((key) => !!req.headers[key]);
+        // Get the result, either from cache or by fetching.
+        const result = hasVariedHeaders
+            ? await fetch()
+            : await swr({
+                key,
+                cache: queryCache,
+                getFreshValue: async (ctx) => {
+                    const result = await fetch();
+                    ctx.metadata.ttl = result.cacheTime;
+                    return result;
+                },
+            });
         return new Response(result.data, {
             status: result.status,
             headers: result.headers,

package/dist/app/server/utils/swr-cache.d.ts

@@ -1,4 +1,4 @@
 import { Cache, CachifiedOptions } from "@epic-web/cachified";
-export declare function swr<T>(args: Omit<CachifiedOptions<T>, "cache"> & {
-    cache?: Cache;
-}): Promise<T>;
+export declare const pageCache: Cache<any>;
+export declare const queryCache: Cache<any>;
+export declare function swr<T>(args: CachifiedOptions<T>): Promise<T>;

package/dist/app/server/utils/swr-cache.js

@@ -1,27 +1,31 @@
 import { LRUCache } from "lru-cache";
-import { cachified, totalTtl, verboseReporter } from "@epic-web/cachified";
-const lruInstance = new LRUCache({ max: 1000 });
-const lru = {
-    set(key, value) {
-        const ttl = totalTtl(value?.metadata);
-        return lruInstance.set(key, value, {
-            ttl: ttl === Infinity ? undefined : ttl,
-            start: value?.metadata?.createdTime,
-        });
-    },
-    get(key) {
-        return lruInstance.get(key);
-    },
-    delete(key) {
-        return lruInstance.delete(key);
-    },
-};
+import { cachified, totalTtl } from "@epic-web/cachified";
+function createCache() {
+    const lruInstance = new LRUCache({ max: 1000 });
+    const lru = {
+        set(key, value) {
+            const ttl = totalTtl(value?.metadata);
+            return lruInstance.set(key, value, {
+                ttl: ttl === Infinity ? undefined : ttl,
+                start: value?.metadata?.createdTime,
+            });
+        },
+        get(key) {
+            return lruInstance.get(key);
+        },
+        delete(key) {
+            return lruInstance.delete(key);
+        },
+    };
+    return lru;
+}
+export const pageCache = createCache();
+export const queryCache = createCache();
 export function swr(args) {
     return cachified({
         ttl: args.ttl ?? 10_000,
-        swr: 3600_000 * 12,
+        swr: 3600_000,
         fallbackToCache: 15_000,
-        cache: args.cache ?? lru,
         ...args,
-    }, verboseReporter());
+    });
 }

package/dist/node/cli/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.73";
+export declare const VERSION = "2.0.0-beta.75";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.73";
+export const VERSION = "2.0.0-beta.75";

package/dist/node/project/project.js

@@ -12,7 +12,6 @@ import { loadRouteManifest } from "./manifest/routes-manifest.js";
 import { loadViewManifest } from "./manifest/view-manifest.js";
 import { loadWidgetManifest } from "./manifest/widget-manifest.js";
 import { WPInfo } from "./wp-info.js";
-import { fetchWP } from "../utils/fetch-wp.js";
 const console = createConsole("Project", "project");
 export const projectLog = console;
 /**
@@ -47,7 +46,7 @@ export class Project {
     }
     async verifyOriginAccess() {
         try {
-            const response = await fetchWP(this.wp.infoUrl);
+            const response = await this.wp.ping();
             if (!response.ok) {
                 return {
                     success: false,
@@ -68,7 +67,7 @@ export class Project {
                 message: [
                     `Failed to access WordPress origin at ${this.origin}`,
                     `Using API Key?: ${ProjectEnvUtils.getSafe("SITE_API_KEY") ? "Yes" : "No"}`,
-                    `The following error occurred:\n${err}`,
+                    `The following error occurred:${err}`,
                 ].join("\n"),
             };
         }

package/dist/node/project/wp-info.d.ts

@@ -26,7 +26,7 @@ export declare class WPInfo {
     siteUrl: string;
     private cached?;
     constructor(siteUrl: string);
-    get infoUrl(): string;
+    ping(): Promise<Response>;
     getInfo(force?: boolean): Promise<WPInfoData>;
     getPluginIssues(): Promise<string[]>;
 }

package/dist/node/project/wp-info.js

@@ -6,8 +6,13 @@ export class WPInfo {
     constructor(siteUrl) {
         this.siteUrl = siteUrl;
     }
-    get infoUrl() {
-        return resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
+    async ping() {
+        if (!this.siteUrl) {
+            throw new Error("Attempted to ping WordPress, but SITE_URL was not present in the environment.");
+        }
+        const url = resolveURL(this.siteUrl, "/wp-json/ed/v1/handshake");
+        const response = await fetchWP(url);
+        return response;
     }
     async getInfo(force = false) {
         if (!this.siteUrl) {
@@ -15,7 +20,7 @@ export class WPInfo {
         }
         if (this.cached && !force)
             return this.cached;
-        const url = this.infoUrl;
+        const url = resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
         const response = await fetchWP(url);
         const result = (await response.json());
         this.cached = result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.73",
+  "version": "2.0.0-beta.75",
   "description": "",
   "main": "index.js",
   "type": "module",