Skip to content
Open
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
17 changes: 4 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"debug": "^4.3.4",
"lodash.throttle": "^4.1.1",
"set-cookie-parser": "^2.7.1",
"srvx": "~0.8.9"
"srvx": "~0.11.13"
},
"devDependencies": {
"@types/debug": "^4.1.12",
Expand Down
6 changes: 4 additions & 2 deletions packages/server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import http from 'node:http'
import {EventEmitter} from 'node:events'

import type {ServerRequest} from 'srvx'
import {toNodeHandler} from 'srvx/node'
import {NodeRequest, sendNodeResponse} from 'srvx/node'
import debug from 'debug'
import {EVENTS, ERRORS, REQUEST_METHODS, TUS_RESUMABLE, HEADERS} from '@tus/utils'
import type {DataStore, Upload, CancellationContext} from '@tus/utils'
Expand Down Expand Up @@ -123,7 +123,9 @@ export class Server extends EventEmitter {
}

async handle(req: http.IncomingMessage, res: http.ServerResponse) {
return toNodeHandler(this.handler.bind(this))(req, res)
const request = new NodeRequest({req, res})
const response = await this.handler(request)
return sendNodeResponse(res, response)
}

async handleWeb(req: Request) {
Expand Down
16 changes: 12 additions & 4 deletions packages/server/src/test/Server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@ describe('Server', () => {

it('should preserve custom request', (done) => {
const userData = {username: 'admin'}
const requestHeaders = {
'Tus-Resumable': TUS_RESUMABLE,
'Upload-Length': '12345678',
}
const server = new Server({
path: '/test/output',
datastore: new FileStore({directory}),
Expand All @@ -455,16 +459,20 @@ describe('Server', () => {
const req = httpMocks.createRequest({
method: 'POST',
url: server.options.path,
headers: {
'tus-resumable': TUS_RESUMABLE,
'upload-length': '12345678',
},
headers: requestHeaders,
})

// Add custom property like Express middleware would
req.user = userData
const mockReq = req as typeof req & {rawHeaders: string[]}
mockReq.rawHeaders = Object.entries(requestHeaders).flat()

const res = httpMocks.createResponse({req})
const mockRes = res as typeof res & {
off: (...args: unknown[]) => unknown
removeListener: (...args: unknown[]) => unknown
}
mockRes.off = res.removeListener.bind(res)
server.handle(req, res)
})

Expand Down