Skip to content

Commit a15e8a5

Browse files
rserse
committed
use const to make ESLint happy again
1 parent 971c9a2 commit a15e8a5

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

‎eslint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ rules:
6262
object-property-newline: off
6363
curly: off
6464
space-in-parens: off
65+
object-curly-newline: off
6566

‎hapi-plugin-websocket.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,18 @@ const register = async (server, pluginOptions) => {
8888
let route = null
8989

9090
/* determine request parameters */
91-
let url = URI.parse(req.url)
92-
let host = typeof req.headers.host === "string" ? req.headers.host : undefined
93-
let path = url.path
94-
let protos = (req.headers["sec-websocket-protocol"] || "").split(/, */)
91+
const url = URI.parse(req.url)
92+
const host = typeof req.headers.host === "string" ? req.headers.host : undefined
93+
const path = url.path
94+
const protos = (req.headers["sec-websocket-protocol"] || "").split(/, */)
9595

9696
/* find a matching route */
97-
let matched = server.match("POST", path, host)
97+
const matched = server.match("POST", path, host)
9898
if (matched) {
9999
/* we accept only WebSocket-enabled ones */
100100
if (isRouteWebSocketEnabled(matched)) {
101101
/* optionally, we accept only the correct WebSocket subprotocol */
102-
let routeOptions = fetchRouteOptions(matched)
102+
const routeOptions = fetchRouteOptions(matched)
103103
if (!( routeOptions.subprotocol !== null
104104
&& protos.indexOf(routeOptions.subprotocol) === -1)) {
105105
/* take this route */
@@ -137,7 +137,7 @@ const register = async (server, pluginOptions) => {
137137

138138
/* ensure that incoming WebSocket requests have a corresponding HAPI route */
139139
verifyClient: ({ req }, result) => {
140-
let route = findRoute(req)
140+
const route = findRoute(req)
141141
if (route)
142142
result(true)
143143
else
@@ -147,18 +147,18 @@ const register = async (server, pluginOptions) => {
147147
pluginOptions.create(wss)
148148

149149
/* per-route peer (aka client) tracking */
150-
let routePeers = {}
150+
const routePeers = {}
151151

152152
/* per-route timers */
153-
let routeTimers = {}
153+
const routeTimers = {}
154154

155155
/* on WebSocket connection (actually HTTP upgrade events)... */
156156
wss.on("connection", async (ws, req) => {
157157
/* find the (previously already successfully matched) HAPI route */
158-
let route = findRoute(req)
158+
const route = findRoute(req)
159159

160160
/* fetch the per-route options */
161-
let routeOptions = fetchRouteOptions(route)
161+
const routeOptions = fetchRouteOptions(route)
162162

163163
/* determine a route-specific identifier */
164164
let routeId = `${route.method}:${route.path}`
@@ -170,7 +170,7 @@ const register = async (server, pluginOptions) => {
170170
/* track the peer per-route */
171171
if (routePeers[routeId] === undefined)
172172
routePeers[routeId] = []
173-
let peers = routePeers[routeId]
173+
const peers = routePeers[routeId]
174174
peers.push(ws)
175175

176176
/* optionally enable automatic WebSocket PING messages */
@@ -203,21 +203,21 @@ const register = async (server, pluginOptions) => {
203203
wsf = new WSF(ws, routeOptions.frameEncoding)
204204

205205
/* provide a local context */
206-
let ctx = {}
206+
const ctx = {}
207207

208208
/* allow application to hook into WebSocket connection */
209209
routeOptions.connect.call(ctx, { ctx, wss, ws, wsf, req, peers })
210210

211211
/* determine HTTP headers for simulated HTTP request:
212212
take headers of initial HTTP upgrade request, but explicitly remove Accept-Encoding,
213213
because it could lead HAPI to compress the payload (which we cannot post-process) */
214-
let headers = Object.assign({}, req.headers)
214+
const headers = Object.assign({}, req.headers)
215215
delete headers["accept-encoding"]
216216

217217
/* optionally inject an empty initial message */
218218
if (routeOptions.initially) {
219219
/* inject incoming WebSocket message as a simulated HTTP request */
220-
let response = await server.inject({
220+
const response = await server.inject({
221221
/* simulate the hard-coded POST request */
222222
method: "POST",
223223

@@ -238,7 +238,7 @@ const register = async (server, pluginOptions) => {
238238
/* any HTTP redirection, client error or server error response
239239
leads to an immediate WebSocket connection drop */
240240
if (response.statusCode >= 300) {
241-
let annotation = `(HAPI handler reponded with HTTP status ${response.statusCode})`
241+
const annotation = `(HAPI handler reponded with HTTP status ${response.statusCode})`
242242
if (response.statusCode < 400)
243243
ws.close(1002, `Protocol Error ${annotation}`)
244244
else if (response.statusCode < 500)
@@ -258,10 +258,10 @@ const register = async (server, pluginOptions) => {
258258
/* process frame of expected type only */
259259
if (ev.frame.type === routeOptions.frameRequest) {
260260
/* re-encode data as JSON as HAPI want to decode it */
261-
let message = JSON.stringify(ev.frame.data)
261+
const message = JSON.stringify(ev.frame.data)
262262

263263
/* inject incoming WebSocket message as a simulated HTTP request */
264-
let response = await server.inject({
264+
const response = await server.inject({
265265
/* simulate the hard-coded POST request */
266266
method: "POST",
267267

@@ -282,8 +282,8 @@ const register = async (server, pluginOptions) => {
282282
/* transform simulated HTTP response into an outgoing WebSocket message */
283283
if (response.statusCode !== 204 && ws.readyState === WS.OPEN) {
284284
/* decode data from JSON as HAPI has already encoded it */
285-
let type = routeOptions.frameResponse
286-
let data = JSON.parse(response.payload)
285+
const type = routeOptions.frameResponse
286+
const data = JSON.parse(response.payload)
287287

288288
/* send as framed data */
289289
wsf.send({ type, data }, ev.frame)
@@ -295,7 +295,7 @@ const register = async (server, pluginOptions) => {
295295
/* plain WebSocket communication (uncorrelated request/reponse) */
296296
ws.on("message", async (message) => {
297297
/* inject incoming WebSocket message as a simulated HTTP request */
298-
let response = await server.inject({
298+
const response = await server.inject({
299299
/* simulate the hard-coded POST request */
300300
method: "POST",
301301

@@ -325,7 +325,7 @@ const register = async (server, pluginOptions) => {
325325
routeOptions.disconnect.call(ctx, { ctx, wss, ws, wsf, req, peers })
326326

327327
/* stop tracking the peer */
328-
let idx = routePeers[routeId].indexOf(ws)
328+
const idx = routePeers[routeId].indexOf(ws)
329329
routePeers[routeId].splice(idx, 1)
330330
})
331331

@@ -395,15 +395,15 @@ const register = async (server, pluginOptions) => {
395395
/* handle request/response hooks */
396396
server.ext({ type: "onPostAuth", method: (request, h) => {
397397
if (isRouteWebSocketEnabled(request.route) && isRequestWebSocketDriven(request)) {
398-
let routeOptions = fetchRouteOptions(request.route)
398+
const routeOptions = fetchRouteOptions(request.route)
399399
return routeOptions.request.call(request.plugins.websocket.ctx,
400400
request.plugins.websocket, request, h)
401401
}
402402
return h.continue
403403
} })
404404
server.ext({ type: "onPostHandler", method: (request, h) => {
405405
if (isRouteWebSocketEnabled(request.route) && isRequestWebSocketDriven(request)) {
406-
let routeOptions = fetchRouteOptions(request.route)
406+
const routeOptions = fetchRouteOptions(request.route)
407407
return routeOptions.response.call(request.plugins.websocket.ctx,
408408
request.plugins.websocket, request, h)
409409
}

‎sample-server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const WebSocket = require("ws")
4545
plugins: { websocket: true }
4646
},
4747
handler: (request, h) => {
48-
let { mode } = request.websocket()
48+
const { mode } = request.websocket()
4949
return { at: "bar", mode: mode, seen: request.payload }
5050
}
5151
})
@@ -89,7 +89,7 @@ const WebSocket = require("ws")
8989
}
9090
},
9191
handler: (request, h) => {
92-
let { initially, ws } = request.websocket()
92+
const { initially, ws } = request.websocket()
9393
if (initially) {
9494
ws.send(JSON.stringify({ cmd: "HELLO", arg: request.auth.credentials.username }))
9595
return ""

0 commit comments

Comments
 (0)