Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking β€œSign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cache): cache event handler stream response #2933

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/runtime/internal/cache.ts
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import {
fetchWithEvent,
handleCacheHeaders,
isEvent,
isStream,
splitCookiesString,
} from "h3";
import type { EventHandlerRequest, EventHandlerResponse, H3Event } from "h3";
@@ -406,11 +407,26 @@ export function defineCachedEventHandler<
headers["cache-control"] = cacheControl.join(", ");
}

let cachedBody = body as any;
// When handler response is a stream, we cache the result of this stream
if (body instanceof ReadableStream) {
const td = new TextDecoder();
let buffer = "";
await body.pipeTo(
new WritableStream({
write(chunk) {
buffer += td.decode(chunk);
},
})
);
cachedBody = buffer;
}

// Create cache entry for response
const cacheEntry: ResponseCacheEntry<Response> = {
code: event.node.res.statusCode,
headers,
body,
body: cachedBody,
};

return cacheEntry;
1 change: 1 addition & 0 deletions test/fixture/nitro.config.ts
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@ export default defineNitroConfig({
"/rules/_/cached/noncached": { cache: false, swr: false, isr: false },
"/rules/_/cached/**": { swr: true },
"/api/proxy/**": { proxy: "/api/echo" },
"/stream-cached": { swr: true },
},
prerender: {
crawlLinks: true,
13 changes: 13 additions & 0 deletions test/fixture/routes/stream-cached.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export default eventHandler(() => {
const encoder = new TextEncoder();
const stream = new ReadableStream({
start(controller) {
controller.enqueue(encoder.encode("nitro"));
controller.enqueue(encoder.encode("is"));
controller.enqueue(encoder.encode("awesome,"));
controller.enqueue(encoder.encode(Date.now().toString()));
controller.close();
},
});
return stream;
});
1 change: 1 addition & 0 deletions test/presets/netlify-legacy.test.ts
Original file line number Diff line number Diff line change
@@ -71,6 +71,7 @@ describe("nitro:preset:netlify-legacy", async () => {
/rules/isr-ttl/* /.netlify/builders/server 200
/rules/isr/* /.netlify/builders/server 200
/rules/dynamic /.netlify/functions/server 200
/stream-cached /.netlify/builders/server 200
/build/* /build/:splat 200
/* /.netlify/functions/server 200"
`);
4 changes: 4 additions & 0 deletions test/presets/vercel.test.ts
Original file line number Diff line number Diff line change
@@ -142,6 +142,10 @@ describe("nitro:preset:vercel", async () => {
"dest": "/__nitro--rules-swr-ttl?url=$url",
"src": "(?<url>/rules/swr-ttl/.*)",
},
{
"dest": "/stream-cached?url=$url",
"src": "/stream-cached",
},
{
"dest": "/__nitro",
"src": "/(.*)",
28 changes: 28 additions & 0 deletions test/tests.ts
Original file line number Diff line number Diff line change
@@ -729,6 +729,34 @@ export function testNitro(
}
}
);

it.skipIf(
ctx.isIsolated ||
(isWindows && ctx.preset === "nitro-dev") ||
ctx.isLambda
)("should cache stream result", async () => {
const { data } = await callHandler({
url: "/stream-cached",
});

const [str, timestamp] = data.split(",") as string[];

expect(str).toBe(
ctx.isLambda ? btoa("nitroisawesome") : "nitroisawesome"
);

const calls = await Promise.all([
callHandler({ url: "/stream-cached" }),
callHandler({ url: "/stream-cached" }),
callHandler({ url: "/stream-cached" }),
]);

for (const call of calls) {
expect(call.data).toBe(
ctx.isLambda ? btoa(`${str},${timestamp}`) : `${str},${timestamp}`
);
}
});
});

describe("scanned files", () => {