@squadbase/vite-server 0.1.3-dev.8 → 0.1.3-dev.9

package/dist/index.js

@@ -39679,7 +39679,7 @@ __export(lib_exports, {
   FetchError: () => FetchError,
   Headers: () => Headers2,
   Request: () => Request2,
-  Response: () => Response,
+  Response: () => Response2,
   default: () => lib_default
 });
 import Stream from "stream";
@@ -40205,7 +40205,7 @@ function fetch2(url, opts) {
       };
       const codings = headers.get("Content-Encoding");
       if (!request2.compress || request2.method === "HEAD" || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-        response = new Response(body, response_options);
+        response = new Response2(body, response_options);
         resolve(response);
         return;
       }
@@ -40215,7 +40215,7 @@ function fetch2(url, opts) {
       };
       if (codings == "gzip" || codings == "x-gzip") {
         body = body.pipe(zlib.createGunzip(zlibOptions));
-        response = new Response(body, response_options);
+        response = new Response2(body, response_options);
         resolve(response);
         return;
       }
@@ -40227,12 +40227,12 @@ function fetch2(url, opts) {
           } else {
             body = body.pipe(zlib.createInflateRaw());
           }
-          response = new Response(body, response_options);
+          response = new Response2(body, response_options);
           resolve(response);
         });
         raw.on("end", function() {
           if (!response) {
-            response = new Response(body, response_options);
+            response = new Response2(body, response_options);
             resolve(response);
           }
         });
@@ -40240,11 +40240,11 @@ function fetch2(url, opts) {
       }
       if (codings == "br" && typeof zlib.createBrotliDecompress === "function") {
         body = body.pipe(zlib.createBrotliDecompress());
-        response = new Response(body, response_options);
+        response = new Response2(body, response_options);
         resolve(response);
         return;
       }
-      response = new Response(body, response_options);
+      response = new Response2(body, response_options);
       resolve(response);
     });
     writeToStream(req, request2);
@@ -40277,7 +40277,7 @@ function destroyStream(stream, err) {
     stream.end();
   }
 }
-var import_whatwg_url, Readable6, BUFFER, TYPE, Blob2, convert, INTERNALS, PassThrough, invalidTokenRegex, invalidHeaderCharRegex, MAP, Headers2, INTERNAL, HeadersIteratorPrototype, INTERNALS$1, STATUS_CODES, Response, INTERNALS$2, URL2, parse_url, format_url, streamDestructionSupported, Request2, URL$1, PassThrough$1, isDomainOrSubdomain, isSameProtocol, lib_default;
+var import_whatwg_url, Readable6, BUFFER, TYPE, Blob2, convert, INTERNALS, PassThrough, invalidTokenRegex, invalidHeaderCharRegex, MAP, Headers2, INTERNAL, HeadersIteratorPrototype, INTERNALS$1, STATUS_CODES, Response2, INTERNALS$2, URL2, parse_url, format_url, streamDestructionSupported, Request2, URL$1, PassThrough$1, isDomainOrSubdomain, isSameProtocol, lib_default;
 var init_lib2 = __esm({
   "../../node_modules/node-fetch/lib/index.mjs"() {
     "use strict";
@@ -40720,7 +40720,7 @@ var init_lib2 = __esm({
     });
     INTERNALS$1 = /* @__PURE__ */ Symbol("Response internals");
     STATUS_CODES = http.STATUS_CODES;
-    Response = class _Response {
+    Response2 = class _Response {
       constructor() {
         let body = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null;
         let opts = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
@@ -40778,8 +40778,8 @@ var init_lib2 = __esm({
         });
       }
     };
-    Body.mixIn(Response.prototype);
-    Object.defineProperties(Response.prototype, {
+    Body.mixIn(Response2.prototype);
+    Object.defineProperties(Response2.prototype, {
       url: { enumerable: true },
       status: { enumerable: true },
       ok: { enumerable: true },
@@ -40788,7 +40788,7 @@ var init_lib2 = __esm({
       headers: { enumerable: true },
       clone: { enumerable: true }
     });
-    Object.defineProperty(Response.prototype, Symbol.toStringTag, {
+    Object.defineProperty(Response2.prototype, Symbol.toStringTag, {
       value: "Response",
       writable: false,
       enumerable: false,
@@ -86428,11 +86428,42 @@ function buildCacheKey(slug, params) {
 
 // src/routes/server-logic.ts
 var app = new Hono();
-function buildSqlResponse(c6, result) {
-  return c6.json({ data: result });
+function buildSqlResponseFromRows(c6, rows) {
+  return c6.json({ data: rows });
 }
-function buildTypescriptResponse(result) {
-  return result;
+function buildTypescriptResponseFromJsonBody(jsonBody) {
+  return Response.json(jsonBody);
+}
+function buildResponseFromCache(c6, data) {
+  if (data.type === "sql") {
+    return buildSqlResponseFromRows(c6, data.rows);
+  }
+  return buildTypescriptResponseFromJsonBody(data.jsonBody);
+}
+function isJsonContentType(response) {
+  const header = response.headers.get("content-type") ?? "";
+  const lower = header.toLowerCase();
+  return lower.startsWith("application/json") || lower.includes("+json");
+}
+async function cacheTypescriptResponse(response) {
+  if (response.status !== 200 || !isJsonContentType(response)) {
+    return { cacheable: false, response };
+  }
+  const jsonBody = await response.json();
+  return {
+    cacheable: true,
+    data: { type: "typescript", jsonBody },
+    response: buildTypescriptResponseFromJsonBody(jsonBody)
+  };
+}
+function withCacheHeaders(c6, status, ageSeconds, ttl) {
+  c6.header("X-Cache", status);
+  c6.header("X-Cache-Age", String(ageSeconds));
+  if (status === "STALE") {
+    c6.header("Cache-Control", `max-age=0, stale-while-revalidate=${ttl}`);
+  } else {
+    c6.header("Cache-Control", `max-age=${Math.max(0, ttl - ageSeconds)}`);
+  }
 }
 app.get("/:slug", async (c6) => {
   const slug = c6.req.param("slug");
@@ -86444,10 +86475,10 @@ app.get("/:slug", async (c6) => {
     if (ds._isTypescript && ds._tsHandlerPath) {
       const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
       const result = await handler(c6);
-      return buildTypescriptResponse(result);
+      return result;
     } else {
-      const result = await ds.handler({});
-      return buildSqlResponse(c6, result);
+      const rows = await ds.handler({});
+      return buildSqlResponseFromRows(c6, rows);
     }
   } catch (e6) {
     console.error(`[server-logic] ${slug} error:`, e6);
@@ -86471,61 +86502,67 @@ app.post("/:slug", async (c6) => {
     if (ttl <= 0) {
       if (ds._isTypescript && ds._tsHandlerPath) {
         const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
-        const result2 = await handler(c6);
-        return buildTypescriptResponse(result2);
+        const result = await handler(c6);
+        return result;
       } else {
-        const result2 = await ds.handler(params);
-        return buildSqlResponse(c6, result2);
+        const rows2 = await ds.handler(params);
+        return buildSqlResponseFromRows(c6, rows2);
       }
     }
     const cacheKey = buildCacheKey(slug, params);
     const cached = cacheGet(cacheKey);
-    const buildResponse = ds._isTypescript ? (r6) => buildTypescriptResponse(r6) : (r6) => buildSqlResponse(c6, r6);
     if (cached) {
       if (isFresh(cached)) {
         recordHit(cacheKey);
         const ageSeconds = Math.floor((Date.now() - cached.cachedAt) / 1e3);
-        c6.header("X-Cache", "HIT");
-        c6.header("X-Cache-Age", String(ageSeconds));
-        c6.header("Cache-Control", `max-age=${ttl - ageSeconds}`);
-        return buildResponse(cached.data);
+        withCacheHeaders(c6, "HIT", ageSeconds, ttl);
+        return buildResponseFromCache(c6, cached.data);
       }
       if (cacheConfig?.staleWhileRevalidate) {
         recordHit(cacheKey);
         const ageSeconds = Math.floor((Date.now() - cached.cachedAt) / 1e3);
-        c6.header("X-Cache", "STALE");
-        c6.header("X-Cache-Age", String(ageSeconds));
-        c6.header("Cache-Control", `max-age=0, stale-while-revalidate=${ttl}`);
+        withCacheHeaders(c6, "STALE", ageSeconds, ttl);
         void (async () => {
           try {
-            let freshData;
             if (ds._isTypescript && ds._tsHandlerPath) {
               const tsHandler = await loadTypeScriptHandler(ds._tsHandlerPath);
-              freshData = await tsHandler(c6);
+              const freshResponse = await tsHandler(c6);
+              const outcome = await cacheTypescriptResponse(freshResponse);
+              if (outcome.cacheable) {
+                cacheSet(cacheKey, outcome.data, ttl);
+                console.log(`[cache] background revalidated: ${cacheKey}`);
+              } else {
+                console.log(
+                  `[cache] background revalidation skipped (non-cacheable response) for ${cacheKey}`
+                );
+              }
             } else {
-              freshData = await ds.handler(params);
+              const rows2 = await ds.handler(params);
+              cacheSet(cacheKey, { type: "sql", rows: rows2 }, ttl);
+              console.log(`[cache] background revalidated: ${cacheKey}`);
             }
-            cacheSet(cacheKey, freshData, ttl);
-            console.log(`[cache] background revalidated: ${cacheKey}`);
           } catch (e6) {
             console.error(`[cache] background revalidation failed for ${slug}:`, e6);
           }
         })();
-        return buildResponse(cached.data);
+        return buildResponseFromCache(c6, cached.data);
       }
     }
-    let result;
     if (ds._isTypescript && ds._tsHandlerPath) {
       const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
-      result = await handler(c6);
-    } else {
-      result = await ds.handler(params);
-    }
-    cacheSet(cacheKey, result, ttl);
-    c6.header("X-Cache", "MISS");
-    c6.header("X-Cache-Age", "0");
-    c6.header("Cache-Control", `max-age=${ttl}`);
-    return buildResponse(result);
+      const response = await handler(c6);
+      const outcome = await cacheTypescriptResponse(response);
+      if (outcome.cacheable) {
+        cacheSet(cacheKey, outcome.data, ttl);
+        withCacheHeaders(c6, "MISS", 0, ttl);
+        return outcome.response;
+      }
+      return outcome.response;
+    }
+    const rows = await ds.handler(params);
+    cacheSet(cacheKey, { type: "sql", rows }, ttl);
+    withCacheHeaders(c6, "MISS", 0, ttl);
+    return buildSqlResponseFromRows(c6, rows);
   } catch (e6) {
     console.error(`[server-logic] ${slug} error:`, e6);
     return c6.json(

package/dist/main.js

@@ -39679,7 +39679,7 @@ __export(lib_exports, {
   FetchError: () => FetchError,
   Headers: () => Headers2,
   Request: () => Request2,
-  Response: () => Response,
+  Response: () => Response2,
   default: () => lib_default
 });
 import Stream from "stream";
@@ -40205,7 +40205,7 @@ function fetch2(url, opts) {
       };
       const codings = headers.get("Content-Encoding");
       if (!request2.compress || request2.method === "HEAD" || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-        response = new Response(body, response_options);
+        response = new Response2(body, response_options);
         resolve(response);
         return;
       }
@@ -40215,7 +40215,7 @@ function fetch2(url, opts) {
       };
       if (codings == "gzip" || codings == "x-gzip") {
         body = body.pipe(zlib.createGunzip(zlibOptions));
-        response = new Response(body, response_options);
+        response = new Response2(body, response_options);
         resolve(response);
         return;
       }
@@ -40227,12 +40227,12 @@ function fetch2(url, opts) {
           } else {
             body = body.pipe(zlib.createInflateRaw());
           }
-          response = new Response(body, response_options);
+          response = new Response2(body, response_options);
           resolve(response);
         });
         raw.on("end", function() {
           if (!response) {
-            response = new Response(body, response_options);
+            response = new Response2(body, response_options);
             resolve(response);
           }
         });
@@ -40240,11 +40240,11 @@ function fetch2(url, opts) {
       }
       if (codings == "br" && typeof zlib.createBrotliDecompress === "function") {
         body = body.pipe(zlib.createBrotliDecompress());
-        response = new Response(body, response_options);
+        response = new Response2(body, response_options);
         resolve(response);
         return;
       }
-      response = new Response(body, response_options);
+      response = new Response2(body, response_options);
       resolve(response);
     });
     writeToStream(req, request2);
@@ -40277,7 +40277,7 @@ function destroyStream(stream, err) {
     stream.end();
   }
 }
-var import_whatwg_url, Readable6, BUFFER, TYPE, Blob2, convert, INTERNALS, PassThrough, invalidTokenRegex, invalidHeaderCharRegex, MAP, Headers2, INTERNAL, HeadersIteratorPrototype, INTERNALS$1, STATUS_CODES, Response, INTERNALS$2, URL2, parse_url, format_url, streamDestructionSupported, Request2, URL$1, PassThrough$1, isDomainOrSubdomain, isSameProtocol, lib_default;
+var import_whatwg_url, Readable6, BUFFER, TYPE, Blob2, convert, INTERNALS, PassThrough, invalidTokenRegex, invalidHeaderCharRegex, MAP, Headers2, INTERNAL, HeadersIteratorPrototype, INTERNALS$1, STATUS_CODES, Response2, INTERNALS$2, URL2, parse_url, format_url, streamDestructionSupported, Request2, URL$1, PassThrough$1, isDomainOrSubdomain, isSameProtocol, lib_default;
 var init_lib2 = __esm({
   "../../node_modules/node-fetch/lib/index.mjs"() {
     "use strict";
@@ -40720,7 +40720,7 @@ var init_lib2 = __esm({
     });
     INTERNALS$1 = /* @__PURE__ */ Symbol("Response internals");
     STATUS_CODES = http.STATUS_CODES;
-    Response = class _Response {
+    Response2 = class _Response {
       constructor() {
         let body = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : null;
         let opts = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
@@ -40778,8 +40778,8 @@ var init_lib2 = __esm({
         });
       }
     };
-    Body.mixIn(Response.prototype);
-    Object.defineProperties(Response.prototype, {
+    Body.mixIn(Response2.prototype);
+    Object.defineProperties(Response2.prototype, {
       url: { enumerable: true },
       status: { enumerable: true },
       ok: { enumerable: true },
@@ -40788,7 +40788,7 @@ var init_lib2 = __esm({
       headers: { enumerable: true },
       clone: { enumerable: true }
     });
-    Object.defineProperty(Response.prototype, Symbol.toStringTag, {
+    Object.defineProperty(Response2.prototype, Symbol.toStringTag, {
       value: "Response",
       writable: false,
       enumerable: false,
@@ -86167,11 +86167,42 @@ function buildCacheKey(slug, params) {
 
 // src/routes/server-logic.ts
 var app = new Hono();
-function buildSqlResponse(c6, result) {
-  return c6.json({ data: result });
+function buildSqlResponseFromRows(c6, rows) {
+  return c6.json({ data: rows });
 }
-function buildTypescriptResponse(result) {
-  return result;
+function buildTypescriptResponseFromJsonBody(jsonBody) {
+  return Response.json(jsonBody);
+}
+function buildResponseFromCache(c6, data) {
+  if (data.type === "sql") {
+    return buildSqlResponseFromRows(c6, data.rows);
+  }
+  return buildTypescriptResponseFromJsonBody(data.jsonBody);
+}
+function isJsonContentType(response) {
+  const header = response.headers.get("content-type") ?? "";
+  const lower = header.toLowerCase();
+  return lower.startsWith("application/json") || lower.includes("+json");
+}
+async function cacheTypescriptResponse(response) {
+  if (response.status !== 200 || !isJsonContentType(response)) {
+    return { cacheable: false, response };
+  }
+  const jsonBody = await response.json();
+  return {
+    cacheable: true,
+    data: { type: "typescript", jsonBody },
+    response: buildTypescriptResponseFromJsonBody(jsonBody)
+  };
+}
+function withCacheHeaders(c6, status, ageSeconds, ttl) {
+  c6.header("X-Cache", status);
+  c6.header("X-Cache-Age", String(ageSeconds));
+  if (status === "STALE") {
+    c6.header("Cache-Control", `max-age=0, stale-while-revalidate=${ttl}`);
+  } else {
+    c6.header("Cache-Control", `max-age=${Math.max(0, ttl - ageSeconds)}`);
+  }
 }
 app.get("/:slug", async (c6) => {
   const slug = c6.req.param("slug");
@@ -86183,10 +86214,10 @@ app.get("/:slug", async (c6) => {
     if (ds._isTypescript && ds._tsHandlerPath) {
       const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
       const result = await handler(c6);
-      return buildTypescriptResponse(result);
+      return result;
     } else {
-      const result = await ds.handler({});
-      return buildSqlResponse(c6, result);
+      const rows = await ds.handler({});
+      return buildSqlResponseFromRows(c6, rows);
     }
   } catch (e6) {
     console.error(`[server-logic] ${slug} error:`, e6);
@@ -86210,61 +86241,67 @@ app.post("/:slug", async (c6) => {
     if (ttl <= 0) {
       if (ds._isTypescript && ds._tsHandlerPath) {
         const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
-        const result2 = await handler(c6);
-        return buildTypescriptResponse(result2);
+        const result = await handler(c6);
+        return result;
       } else {
-        const result2 = await ds.handler(params);
-        return buildSqlResponse(c6, result2);
+        const rows2 = await ds.handler(params);
+        return buildSqlResponseFromRows(c6, rows2);
       }
     }
     const cacheKey = buildCacheKey(slug, params);
     const cached = cacheGet(cacheKey);
-    const buildResponse = ds._isTypescript ? (r6) => buildTypescriptResponse(r6) : (r6) => buildSqlResponse(c6, r6);
     if (cached) {
       if (isFresh(cached)) {
         recordHit(cacheKey);
         const ageSeconds = Math.floor((Date.now() - cached.cachedAt) / 1e3);
-        c6.header("X-Cache", "HIT");
-        c6.header("X-Cache-Age", String(ageSeconds));
-        c6.header("Cache-Control", `max-age=${ttl - ageSeconds}`);
-        return buildResponse(cached.data);
+        withCacheHeaders(c6, "HIT", ageSeconds, ttl);
+        return buildResponseFromCache(c6, cached.data);
       }
       if (cacheConfig?.staleWhileRevalidate) {
         recordHit(cacheKey);
         const ageSeconds = Math.floor((Date.now() - cached.cachedAt) / 1e3);
-        c6.header("X-Cache", "STALE");
-        c6.header("X-Cache-Age", String(ageSeconds));
-        c6.header("Cache-Control", `max-age=0, stale-while-revalidate=${ttl}`);
+        withCacheHeaders(c6, "STALE", ageSeconds, ttl);
         void (async () => {
           try {
-            let freshData;
             if (ds._isTypescript && ds._tsHandlerPath) {
               const tsHandler = await loadTypeScriptHandler(ds._tsHandlerPath);
-              freshData = await tsHandler(c6);
+              const freshResponse = await tsHandler(c6);
+              const outcome = await cacheTypescriptResponse(freshResponse);
+              if (outcome.cacheable) {
+                cacheSet(cacheKey, outcome.data, ttl);
+                console.log(`[cache] background revalidated: ${cacheKey}`);
+              } else {
+                console.log(
+                  `[cache] background revalidation skipped (non-cacheable response) for ${cacheKey}`
+                );
+              }
             } else {
-              freshData = await ds.handler(params);
+              const rows2 = await ds.handler(params);
+              cacheSet(cacheKey, { type: "sql", rows: rows2 }, ttl);
+              console.log(`[cache] background revalidated: ${cacheKey}`);
             }
-            cacheSet(cacheKey, freshData, ttl);
-            console.log(`[cache] background revalidated: ${cacheKey}`);
           } catch (e6) {
             console.error(`[cache] background revalidation failed for ${slug}:`, e6);
           }
         })();
-        return buildResponse(cached.data);
+        return buildResponseFromCache(c6, cached.data);
       }
     }
-    let result;
     if (ds._isTypescript && ds._tsHandlerPath) {
       const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
-      result = await handler(c6);
-    } else {
-      result = await ds.handler(params);
-    }
-    cacheSet(cacheKey, result, ttl);
-    c6.header("X-Cache", "MISS");
-    c6.header("X-Cache-Age", "0");
-    c6.header("Cache-Control", `max-age=${ttl}`);
-    return buildResponse(result);
+      const response = await handler(c6);
+      const outcome = await cacheTypescriptResponse(response);
+      if (outcome.cacheable) {
+        cacheSet(cacheKey, outcome.data, ttl);
+        withCacheHeaders(c6, "MISS", 0, ttl);
+        return outcome.response;
+      }
+      return outcome.response;
+    }
+    const rows = await ds.handler(params);
+    cacheSet(cacheKey, { type: "sql", rows }, ttl);
+    withCacheHeaders(c6, "MISS", 0, ttl);
+    return buildSqlResponseFromRows(c6, rows);
   } catch (e6) {
     console.error(`[server-logic] ${slug} error:`, e6);
     return c6.json(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squadbase/vite-server",
-  "version": "0.1.3-dev.8",
+  "version": "0.1.3-dev.9",
   "type": "module",
   "exports": {
     ".": {