Skip to content
Merged
Show file tree
Hide file tree
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
46 changes: 46 additions & 0 deletions application.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,52 @@ Deno.test({
},
});

Deno.test({
name: "application .fetch() websocket upgrade",
ignore: isNode(),
sanitizeOps: false,
sanitizeResources: false,
async fn() {
const app = new Application();
let wsReceived = "";
app.use((ctx) => {
const ws = ctx.upgrade();
ws.onmessage = (event) => {
wsReceived = event.data;
ws.send("pong");
ws.close();
};
});

const controller = new AbortController();
let port = 0;
const { promise: listeningPromise, resolve: listeningResolve } =
createPromiseWithResolvers<void>();
const server = Deno.serve({
signal: controller.signal,
port: 0,
handler: app.fetch as (req: Request) => Promise<Response>,
onListen({ port: p }) {
port = p;
listeningResolve();
},
});
await listeningPromise;

const { promise, resolve, reject } = createPromiseWithResolvers<string>();
const ws = new WebSocket(`ws://localhost:${port}/`);
ws.onopen = () => ws.send("ping");
ws.onmessage = (event) => resolve(event.data);
ws.onerror = () => reject(new Error("WebSocket error"));
const reply = await promise;
assertEquals(reply, "pong");
assertEquals(wsReceived, "ping");
controller.abort();
await server.finished;
teardown();
},
});

function isBigInitValue(value: unknown): value is { __bigint: string } {
return value != null && typeof value === "object" && "__bigint" in value &&
typeof (value as any).__bigint === "string";
Expand Down
4 changes: 4 additions & 0 deletions application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,10 @@ export class Application<AS extends State = Record<string, any>>
);
try {
await this.#getComposed()(context);
if (context.respond === false) {
context.response.destroy();
return contextRequest.response;
}
const response = await context.response.toDomResponse();
context.response.destroy(false);
return response;
Expand Down
Loading