Skip to content

Add req.ws #163

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

Merged
merged 6 commits into from
Mar 2, 2022
Merged

Add req.ws #163

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e67f860
Add `req.ws`
a-a-GiTHuB-a-a Nov 29, 2021
630aadc
Update index.js
a-a-GiTHuB-a-a Nov 30, 2021
5f1c9b7
Fixed format
a-a-GiTHuB-a-a Dec 3, 2021
0bb25d9
minor repairs
a-a-GiTHuB-a-a Dec 3, 2021
5b1a95e
Update index.js
a-a-GiTHuB-a-a Feb 27, 2022
889b0c8
Remove trailing spaces
a-a-GiTHuB-a-a Mar 1, 2022
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
11 changes: 11 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ const kWs = Symbol('ws-socket')
const kWsHead = Symbol('ws-head')

function fastifyWebsocket (fastify, opts, next) {
fastify.decorateRequest('ws', null)

let errorHandler = defaultErrorHandler
if (opts.errorHandler) {
if (typeof opts.errorHandler !== 'function') {
Expand Down Expand Up @@ -68,6 +70,15 @@ function fastifyWebsocket (fastify, opts, next) {
})
}

fastify.addHook('onRequest', (request, reply, done) => { // this adds req.ws to the Request object
if (request.raw[kWs]) {
request.ws = true
} else {
request.ws = false
}
done()
})
Copy link
Member

@airhorns airhorns Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a test so future committers don't break this functionality!

Copy link
Contributor Author

@a-a-GiTHuB-a-a a-a-GiTHuB-a-a Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What test?

Copy link
Member

@airhorns airhorns Dec 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it'd make sense to add unit tests that check the value of this property is true for a websocket route and false for a non websocket route.

Copy link
Member

@airhorns airhorns Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/@a-a-GiTHuB-a-a are you able to copy one of the existing unit tests to get this in?


fastify.addHook('onError', (request, reply, error, done) => {
if (request.raw[kWs]) {
// Hijack reply to prevent fastify from sending the error after onError hooks are done running
Expand Down