Merge branch 'master' into docs-and-comments

Author: rse

README.md

@@ -281,7 +281,7 @@ server.route({
             websocket: {
                 only: true,
                 autoping: 10 * 1000,
-                subprotocol: "v1.foo.example.com",
+                subprotocol: "quux.example.com",
                 initially: true,
                 connect: ({ ctx, wss, ws, req, peers }) => {
                     ...
@@ -358,7 +358,7 @@ should be your choice, of course.
 License
 -------
 
-Copyright (c) 2016-2021 Dr. Ralf S. Engelschall (http://engelschall.com/)
+Copyright (c) 2016-2022 Dr. Ralf S. Engelschall (http://engelschall.com/)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

eslint.yaml

@@ -1,6 +1,6 @@
 ##
 ##  hapi-plugin-websocket -- HAPI plugin for seamless WebSocket integration
-##  Copyright (c) 2016-2021 Dr. Ralf S. Engelschall <[email protected]>
+##  Copyright (c) 2016-2022 Dr. Ralf S. Engelschall <[email protected]>
 ##
 ##  Permission is hereby granted, free of charge, to any person obtaining
 ##  a copy of this software and associated documentation files (the
@@ -29,13 +29,11 @@ extends:
     - eslint-config-standard
 
 parserOptions:
-    ecmaVersion: 8
+    ecmaVersion: 12
     sourceType:  module
     ecmaFeatures:
         jsx:     false
 
-parser: babel-eslint
-
 env:
     browser:       true
     node:          false
@@ -63,4 +61,5 @@ rules:
     curly:                               off
     space-in-parens:                     off
     object-curly-newline:                off
+    object-shorthand:                    off
 

hapi-plugin-websocket.js

@@ -1,6 +1,6 @@
 /*
 **  hapi-plugin-websocket -- HAPI plugin for seamless WebSocket integration
-**  Copyright (c) 2016-2021 Dr. Ralf S. Engelschall <[email protected]>
+**  Copyright (c) 2016-2022 Dr. Ralf S. Engelschall <[email protected]>
 **
 **  Permission is hereby granted, free of charge, to any person obtaining
 **  a copy of this software and associated documentation files (the
@@ -371,8 +371,16 @@ const register = async (server, pluginOptions) => {
     /*  make available to HAPI request the remote WebSocket information  */
     server.ext({ type: "onRequest", method: (request, h) => {
         if (isRequestWebSocketDriven(request)) {
-            request.info.remoteAddress = request.plugins.websocket.req.socket.remoteAddress
-            request.info.remotePort    = request.plugins.websocket.req.socket.remotePort
+            /*  RequestInfo's remoteAddress and remotePort use getters and are not
+                settable, so we have to replace them.  */
+            Object.defineProperties(request.info, {
+                remoteAddress: {
+                    value: request.plugins.websocket.req.socket.remoteAddress
+                },
+                remotePort: {
+                    value: request.plugins.websocket.req.socket.remotePort
+                }
+            });
         }
         return h.continue
     } })

package.json

@@ -1,6 +1,6 @@
 {
     "name":        "hapi-plugin-websocket",
-    "version":     "2.3.7",
+    "version":     "2.3.8",
     "description": "HAPI plugin for seamless WebSocket integration",
     "keywords":    [ "hapi", "plugin", "websocket" ],
     "main":        "./hapi-plugin-websocket.js",
@@ -20,19 +20,18 @@
         "@hapi/hapi":              ">=18.0.0"
     },
     "dependencies": {
-        "urijs":                   "1.19.7",
+        "urijs":                   "1.19.11",
         "@hapi/hoek":              "9.2.1",
         "@hapi/boom":              "9.1.4",
-        "ws":                      "8.2.3",
+        "ws":                      "8.5.0",
         "websocket-framed":        "1.2.8"
     },
     "devDependencies": {
-        "@hapi/hapi":              "20.2.1",
+        "@hapi/hapi":              "20.2.2",
         "@hapi/basic":             "6.0.0",
-        "babel-eslint":            "10.1.0",
-        "eslint":                  "7.32.0",
-        "eslint-config-standard":  "16.0.3",
-        "eslint-plugin-import":    "2.25.2",
+        "eslint":                  "8.13.0",
+        "eslint-config-standard":  "17.0.0",
+        "eslint-plugin-import":    "2.26.0",
         "eslint-plugin-node":      "11.1.0"
     },
     "engines": {