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.

Sign up for GitHub

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

replace on-finished with node:stream's finished #6414

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

replace on-finished with node:stream's finished #6414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cbf430
refactor: replace on-finished with node:stream's finished in response…
bjohansebas Mar 25, 2025
6d3862c
remove on-finished dependency from package.json
bjohansebas Mar 25, 2025
6759cc8
chore: update History.md to reflect replacement of on-finished with n…
bjohansebas Mar 27, 2025
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
1 change: 1 addition & 0 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
unreleased
========================

* replace `on-finished` with `node:stream`'s `finished`
* Remove `utils-merge` dependency - use spread syntax instead
* Remove `Object.setPrototypeOf` polyfill
* cleanup: remove AsyncLocalStorage check from tests
Expand Down
6 changes: 3 additions & 3 deletions lib/response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ var createError = require('http-errors')
var encodeUrl = require('encodeurl');
var escapeHtml = require('escape-html');
var http = require('node:http');
var onFinished = require('on-finished');
var mime = require('mime-types')
var path = require('node:path');
var pathIsAbsolute = require('node:path').isAbsolute;
Expand All @@ -31,6 +30,7 @@ var send = require('send');
var extname = path.extname;
var resolve = path.resolve;
var vary = require('vary');
const { finished } = require('node:stream');

/**
* Response prototype.
Expand Down Expand Up @@ -955,7 +955,7 @@ function sendfile(res, file, options, callback) {

// finished
function onfinish(err) {
if (err && err.code === 'ECONNRESET') return onaborted();
if (err && err.code === 'ERR_STREAM_PREMATURE_CLOSE') return onaborted();
if (err) return onerror(err);
if (done) return;

Expand All @@ -981,7 +981,7 @@ function sendfile(res, file, options, callback) {
file.on('error', onerror);
file.on('file', onfile);
file.on('stream', onstream);
onFinished(res, onfinish);
finished(res, onfinish);

if (options.headers) {
// set headers on successful transfer
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"http-errors": "^2.0.0",
"merge-descriptors": "^2.0.0",
"mime-types": "^3.0.0",
"on-finished": "^2.4.1",
"once": "^1.4.0",
"parseurl": "^1.3.3",
"proxy-addr": "^2.0.7",
Expand Down
4 changes: 2 additions & 2 deletions test/res.sendFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage

var express = require('../')
, request = require('supertest')
var onFinished = require('on-finished');
var path = require('node:path');
var fixtures = path.join(__dirname, 'fixtures');
var utils = require('./support/utils');
const { finished } = require('node:stream');

describe('res', function(){
describe('.sendFile(path)', function () {
Expand Down Expand Up @@ -210,7 +210,7 @@ describe('res', function(){
var app = express();

app.use(function (req, res) {
onFinished(res, function () {
finished(res, function () {
res.sendFile(path.resolve(fixtures, 'name.txt'), function (err) {
assert.ok(err)
assert.strictEqual(err.code, 'ECONNABORTED')
Expand Down