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

fix: compatible with http-compression #5735

Merged
merged 2 commits into from
May 13, 2024
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
6 changes: 6 additions & 0 deletions .changeset/tall-balloons-explain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@modern-js/server-core': patch
---

fix: Compatible with http-compression, make sure res.end is called before executing the subsequent code
fix: 兼容 http-compression,确保执行后续代码前,res.end 先被调用
35 changes: 22 additions & 13 deletions packages/server/core/src/base/adapters/node/polyfills/stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,29 @@ export async function writeReadableStreamToWritable(
const flushable = writable as { flush?: Function };

try {
while (true) {
const { done, value } = await reader.read();

if (done) {
writable.end();
break;
}
await new Promise<void>((resolve, reject) => {
writable.on('finish', resolve);
writable.on('error', reject);

const writeAndFlush = async () => {
while (true) {
const { done, value } = await reader.read();

if (done) {
writable.end();
break;
}

writable.write(value);
if (typeof flushable.flush === 'function') {
flushable.flush();
}
}
};

writable.write(value);
if (typeof flushable.flush === 'function') {
flushable.flush();
}
}
} catch (error: unknown) {
writeAndFlush().catch(reject);
});
} catch (error) {
writable.destroy(error as Error);
throw error;
}
Expand Down
Loading