@swell/apps-sdk 1.0.183 → 1.0.184

package/dist/index.js

@@ -17460,14 +17460,14 @@ ${injects.join("\n")}<\/script>`;
       default_groups: [
         {
           user_agent: RobotsRule.from("User-agent", "*"),
-          // sitemap: RobotsRule.from('Sitemap', sitemapUrl),
+          sitemap: RobotsRule.from("Sitemap", sitemapUrl),
           rules: defaultRules.map(
             (rule) => RobotsRule.from(rule.directive, rule.value)
           )
         },
         {
           user_agent: RobotsRule.from("User-agent", "AhrefsBot"),
-          // sitemap: RobotsRule.from('Sitemap', sitemapUrl),
+          sitemap: RobotsRule.from("Sitemap", sitemapUrl),
           rules: [
             RobotsRule.from("Crawl-delay", "10"),
             ...defaultRules.map(
@@ -17477,7 +17477,7 @@ ${injects.join("\n")}<\/script>`;
         },
         {
           user_agent: RobotsRule.from("User-agent", "AhrefsSiteAudit"),
-          // sitemap: RobotsRule.from('Sitemap', sitemapUrl),
+          sitemap: RobotsRule.from("Sitemap", sitemapUrl),
           rules: [
             RobotsRule.from("Crawl-delay", "10"),
             ...defaultRules.map(
@@ -19437,6 +19437,35 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     },
     pathRules: [{ path: "/checkout/*", skip: true }]
   };
+  var SANITIZE_CLIENT_HEADERS = Object.freeze([
+    "connection",
+    "proxy-connection",
+    "keep-alive",
+    "transfer-encoding",
+    "upgrade",
+    "proxy-authenticate",
+    "proxy-authorization",
+    "te",
+    "trailers",
+    "via",
+    "alt-svc",
+    "content-length",
+    "content-encoding",
+    // Also strip any legacy internal metadata keys
+    "x-original-ttl",
+    "x-original-swr",
+    "x-cache-time"
+  ]);
+  var CACHE_KEY_HEADERS = Object.freeze([
+    "cookie",
+    "swell-storefront-id",
+    "swell-app-id",
+    "swell-access-token",
+    "swell-theme-version-hash",
+    "swell-cache-modified",
+    "x-locale",
+    "swell-storefront-context"
+  ]);
   var HtmlCache = class {
     epoch;
     backend;
@@ -19444,7 +19473,23 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     constructor(epoch, backend, cacheRules = DEFAULT_CACHE_RULES) {
       this.epoch = epoch;
       this.backend = backend;
-      this.cacheRules = cacheRules;
+      this.cacheRules = {
+        ...cacheRules,
+        pathRules: cacheRules.pathRules?.map((rule) => ({
+          ...rule,
+          regex: this.convertPathToRegex(rule.path)
+        }))
+      };
+    }
+    /**
+     * Converts wildcard pattern to regex and tests against path.
+     *
+     * - `*` matches any characters except `/`
+     * - `**` matches any characters including `/`
+     */
+    convertPathToRegex(pattern) {
+      const regex = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "___DOUBLE_STAR___").replace(/\*/g, "[^/]*").replace(/___DOUBLE_STAR___/g, ".*");
+      return new RegExp(`^${regex}$`);
     }
     async get(request) {
       const trace = createTraceId();
@@ -19535,18 +19580,18 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
           );
           return;
         }
-        const cacheTimeISO = (/* @__PURE__ */ new Date()).toISOString();
+        const date = /* @__PURE__ */ new Date();
         const headers = this.normalizeHeaders(response.headers);
         const entry = {
           status: response.status,
           statusText: response.statusText,
           headers,
           body,
-          cacheTimeISO,
+          cacheTimeISO: date.toISOString(),
           ttl,
           swr,
           etag: this.quoteETag(headers["etag"] || md5(body)),
-          lastModifiedUTC: headers["last-modified"] || new Date(cacheTimeISO).toUTCString()
+          lastModifiedUTC: headers["last-modified"] || date.toUTCString()
         };
         const hardExpireSeconds = ttl + swr;
         await this.backend.write(cacheKey, entry, hardExpireSeconds);
@@ -19571,8 +19616,13 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       }
     }
     canReadFromCache(request) {
-      const method = request.method.toUpperCase();
-      if (!(method === "GET" || method === "HEAD")) return false;
+      switch (request.method.toUpperCase()) {
+        case "GET":
+        case "HEAD":
+          break;
+        default:
+          return false;
+      }
       const res = this.resolvePathRule(request);
       if (res.skip) return false;
       return this.isRequestCacheable(request);
@@ -19638,7 +19688,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
         try {
           const ifModDate = new Date(ifModifiedSince);
           const lastModDate = new Date(lastModified);
-          if (isNaN(ifModDate.getTime()) || isNaN(lastModDate.getTime())) {
+          if (Number.isNaN(ifModDate.getTime()) || Number.isNaN(lastModDate.getTime())) {
             return false;
           }
           return ifModDate >= lastModDate;
@@ -19668,31 +19718,25 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       return `"${value}"`;
     }
     sanitizeClientHeaders(headers) {
-      const HOP_BY_HOP = [
-        "connection",
-        "proxy-connection",
-        "keep-alive",
-        "transfer-encoding",
-        "upgrade",
-        "proxy-authenticate",
-        "proxy-authorization",
-        "te",
-        "trailers",
-        "via",
-        "alt-svc",
-        "content-length"
-      ];
-      for (const h of HOP_BY_HOP) headers.delete(h);
-      headers.delete("content-encoding");
-      headers.delete("x-original-ttl");
-      headers.delete("x-original-swr");
-      headers.delete("x-cache-time");
+      for (const name of SANITIZE_CLIENT_HEADERS) {
+        headers.delete(name);
+      }
+    }
+    getCacheKeyHeaders(headers) {
+      const acc = new Headers();
+      for (const name of CACHE_KEY_HEADERS) {
+        const value = headers.get(name);
+        if (value) {
+          acc.set(name, value);
+        }
+      }
+      return acc;
     }
     generateVersionHash(headers) {
-      const swellData = this.extractSwellData(headers);
+      const swellData = this.extractSwellData(headers.get("cookie"));
       const versionFactors = {
         store: headers.get("swell-storefront-id") || "",
-        app: (headers.get("swell-app-id") || "") + "@" + (headers.get("host") || ""),
+        app: headers.get("swell-app-id") || "",
         auth: headers.get("swell-access-token") || "",
         theme: headers.get("swell-theme-version-hash") || "",
         modified: headers.get("swell-cache-modified") || "",
@@ -19703,8 +19747,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       };
       return md5(JSON.stringify(versionFactors));
     }
-    extractSwellData(headers) {
-      const cookie = headers.get("cookie");
+    extractSwellData(cookie) {
       if (!cookie) return {};
       const swellDataMatch = cookie.match(/swell-data=([^;]+)/);
       if (!swellDataMatch) return {};
@@ -19756,15 +19799,6 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       const age = (Date.now() - t) / 1e3;
       return age < 0 ? 0 : age;
     }
-    /**
-     * Converts wildcard pattern to regex and tests against path.
-     * - * matches any characters except /
-     * - ** matches any characters including /
-     */
-    pathMatches(pattern, path) {
-      const regex = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "___DOUBLE_STAR___").replace(/\*/g, "[^/]*").replace(/___DOUBLE_STAR___/g, ".*");
-      return new RegExp(`^${regex}$`).test(path);
-    }
     normalizeHeaders(headers) {
       const normalized = {};
       headers.forEach((value, key) => {
@@ -19775,16 +19809,10 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     resolvePathRule(request) {
       const url = new URL(request.url);
       const mode = this.getDeploymentMode(request.headers);
-      const defaults = this.cacheRules.defaults?.[mode] ?? DEFAULT_CACHE_RULES.defaults[mode];
-      let rule;
-      if (this.cacheRules.pathRules) {
-        for (const r of this.cacheRules.pathRules) {
-          if (this.pathMatches(r.path, url.pathname)) {
-            rule = r;
-            break;
-          }
-        }
-      }
+      const defaults = this.cacheRules.defaults?.[mode] ?? DEFAULT_CACHE_RULES.defaults?.[mode];
+      const rule = this.cacheRules.pathRules?.find(
+        (r) => r.regex.test(url.pathname)
+      );
       const effectiveTTL = (rule?.ttl !== void 0 ? rule.ttl : defaults?.ttl) ?? defaults.ttl;
       const effectiveSWR = (rule?.swr !== void 0 ? rule.swr : defaults?.swr) ?? defaults.swr;
       return {
@@ -19796,27 +19824,29 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       };
     }
     normalizeSearchParams(searchParams) {
-      const ignoredParams = [
-        "utm_source",
-        "utm_medium",
-        "utm_campaign",
-        "utm_content",
-        "utm_term",
-        "fbclid",
-        "gclid",
-        "gbraid",
-        "wbraid",
-        "ref",
-        "source",
-        "mc_cid",
-        "mc_eid"
-      ];
       const relevantParams = [];
       searchParams.forEach((value, key) => {
-        if (!ignoredParams.includes(key)) {
-          relevantParams.push(
-            `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
-          );
+        switch (key) {
+          case "utm_source":
+          case "utm_medium":
+          case "utm_campaign":
+          case "utm_content":
+          case "utm_term":
+          case "fbclid":
+          case "gclid":
+          case "gbraid":
+          case "wbraid":
+          case "ref":
+          case "source":
+          case "mc_cid":
+          case "mc_eid":
+            break;
+          default: {
+            relevantParams.push(
+              `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
+            );
+            break;
+          }
         }
       });
       return relevantParams.sort().join("&");