@hapi/nes 12.0.3 → 13.0.0

package/LICENSE.md

@@ -1,4 +1,5 @@
-Copyright (c) 2016-2020, Sideway Inc, and project contributors  
+Copyright (c) 2016-2022, Project contributors
+Copyright (c) 2016-2020, Sideway Inc
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

package/lib/client.js

@@ -392,6 +392,10 @@
             return;
         }
 
+        if (this._reconnectionTimer) {
+            return;
+        }
+
         if (reconnection.retries < 1) {
             return this._disconnect(ignore, true);      // Clear _reconnection state
         }

package/lib/index.js

@@ -3,7 +3,7 @@
 const Cryptiles = require('@hapi/cryptiles');
 const Hoek = require('@hapi/hoek');
 const Iron = require('@hapi/iron');
-const Joi = require('@hapi/joi');
+const Validate = require('@hapi/validate');
 const Ws = require('ws');
 
 const Client = require('./client');
@@ -38,53 +38,53 @@ const internals = {
 };
 
 
-internals.schema = Joi.object({
-    onConnection: Joi.function(),                               // async function (socket) {}
-    onDisconnection: Joi.function(),                            // function (socket) {}
-    onMessage: Joi.function(),                                  // async function (socket, message) { return data; }    // Or throw errors
-    auth: Joi.object({
-        endpoint: Joi.string().required(),
-        id: Joi.string(),
-        type: Joi.valid('cookie', 'token', 'direct').required(),
+internals.schema = Validate.object({
+    onConnection: Validate.function(),                               // async function (socket) {}
+    onDisconnection: Validate.function(),                            // function (socket) {}
+    onMessage: Validate.function(),                                  // async function (socket, message) { return data; }    // Or throw errors
+    auth: Validate.object({
+        endpoint: Validate.string().required(),
+        id: Validate.string(),
+        type: Validate.valid('cookie', 'token', 'direct').required(),
         route: [
-            Joi.object(),
-            Joi.string()
+            Validate.object(),
+            Validate.string()
         ],
-        cookie: Joi.string().required(),
-        isSecure: Joi.boolean(),
-        isHttpOnly: Joi.boolean(),
-        isSameSite: Joi.valid('Strict', 'Lax').allow(false),
-        path: Joi.string().allow(null),
-        domain: Joi.string().allow(null),
-        ttl: Joi.number().allow(null),
-        iron: Joi.object(),
-        password: Joi.alternatives([
-            Joi.string(),
-            Joi.binary(),
-            Joi.object()
+        cookie: Validate.string().required(),
+        isSecure: Validate.boolean(),
+        isHttpOnly: Validate.boolean(),
+        isSameSite: Validate.valid('Strict', 'Lax').allow(false),
+        path: Validate.string().allow(null),
+        domain: Validate.string().allow(null),
+        ttl: Validate.number().allow(null),
+        iron: Validate.object(),
+        password: Validate.alternatives([
+            Validate.string(),
+            Validate.binary(),
+            Validate.object()
         ]),
-        index: Joi.boolean(),
-        timeout: Joi.number().integer().min(1).allow(false),
-        maxConnectionsPerUser: Joi.number().integer().min(1).allow(false).when('index', { is: true, otherwise: Joi.valid(false) }),
-        minAuthVerifyInterval: Joi.number().integer().allow(false).when('...heartbeat', {
+        index: Validate.boolean(),
+        timeout: Validate.number().integer().min(1).allow(false),
+        maxConnectionsPerUser: Validate.number().integer().min(1).allow(false).when('index', { is: true, otherwise: Validate.valid(false) }),
+        minAuthVerifyInterval: Validate.number().integer().allow(false).when('...heartbeat', {
             is: false,
-            then: Joi.number().min(1),
-            otherwise: Joi.number().min(Joi.ref('...heartbeat.interval'))
+            then: Validate.number().min(1),
+            otherwise: Validate.number().min(Validate.ref('...heartbeat.interval'))
         })
     })
         .allow(false)
         .required(),
-    headers: Joi.array().items(Joi.string().lowercase()).min(1).allow('*', null),
+    headers: Validate.array().items(Validate.string().lowercase()).min(1).allow('*', null),
     payload: {
-        maxChunkChars: Joi.number().integer().min(1).allow(false)
+        maxChunkChars: Validate.number().integer().min(1).allow(false)
     },
-    heartbeat: Joi.object({
-        interval: Joi.number().integer().min(1).required(),
-        timeout: Joi.number().integer().min(1).less(Joi.ref('interval')).required()
+    heartbeat: Validate.object({
+        interval: Validate.number().integer().min(1).required(),
+        timeout: Validate.number().integer().min(1).less(Validate.ref('interval')).required()
     })
         .allow(false),
-    maxConnections: Joi.number().integer().min(1).allow(false),
-    origin: Joi.array().items(Joi.string()).single().min(1)
+    maxConnections: Validate.number().integer().min(1).allow(false),
+    origin: Validate.array().items(Validate.string()).single().min(1)
 });
 
 
@@ -107,7 +107,7 @@ exports.plugin = {
             settings.auth.minAuthVerifyInterval = (settings.heartbeat ? settings.heartbeat.interval : internals.defaults.heartbeat.interval);
         }
 
-        Joi.assert(settings, internals.schema, 'Invalid nes configuration');
+        Validate.assert(settings, internals.schema, 'Invalid nes configuration');
 
         // Authentication endpoint
 
@@ -205,7 +205,7 @@ internals.auth = function (server, settings) {
                     return h.response(result).state(config.cookie, credentials);
                 }
 
-                const sealed = await Iron.seal(credentials, config.password, config.iron || Iron.defaults);
+                const sealed = await Iron.seal(credentials, config.password, config.iron ?? Iron.defaults);
                 result.token = sealed;
                 return result;
             }

package/lib/listener.js

@@ -4,7 +4,7 @@ const Boom = require('@hapi/boom');
 const Bounce = require('@hapi/bounce');
 const Call = require('@hapi/call');
 const Hoek = require('@hapi/hoek');
-const Joi = require('@hapi/joi');
+const Validate = require('@hapi/validate');
 const Ws = require('ws');
 
 const Socket = require('./socket');
@@ -165,7 +165,7 @@ internals.Listener.prototype._beat = function () {
 
 internals.Listener.broadcast = function (message, options) {
 
-    options = options || {};
+    options = options ?? {};
 
     const update = {
         type: 'update',
@@ -199,15 +199,15 @@ internals.Listener.prototype._broadcast = function (update, options) {
 };
 
 
-internals.subSchema = Joi.object({
-    filter: Joi.func(),                                             // async function (path, update, options), where options: { credentials, params }, returns true, false, { override }, or throws an error
-    onSubscribe: Joi.func(),                                        // async function (socket, path, params)
-    onUnsubscribe: Joi.func(),                                      // async function (socket, path, params)
-    auth: Joi.object({
-        mode: Joi.string().valid('required', 'optional'),
-        scope: Joi.array().items(Joi.string()).single().min(1),
-        entity: Joi.valid('user', 'app', 'any'),
-        index: Joi.boolean()
+internals.subSchema = Validate.object({
+    filter: Validate.func(),                                             // async function (path, update, options), where options: { credentials, params }, returns true, false, { override }, or throws an error
+    onSubscribe: Validate.func(),                                        // async function (socket, path, params)
+    onUnsubscribe: Validate.func(),                                      // async function (socket, path, params)
+    auth: Validate.object({
+        mode: Validate.string().valid('required', 'optional'),
+        scope: Validate.array().items(Validate.string()).single().min(1),
+        entity: Validate.valid('user', 'app', 'any'),
+        index: Validate.boolean()
     })
         .allow(false)
 });
@@ -216,9 +216,9 @@ internals.subSchema = Joi.object({
 internals.Listener.subscription = function (path, options) {
 
     Hoek.assert(path, 'Subscription missing path');
-    Joi.assert(options, internals.subSchema, 'Invalid subscription options: ' + path);
+    Validate.assert(options, internals.subSchema, 'Invalid subscription options: ' + path);
 
-    const settings = Hoek.clone(options || {});
+    const settings = Hoek.clone(options ?? {});
 
     // Auth configuration
 
@@ -261,7 +261,7 @@ internals.Listener.publish = function (path, update, options) {
 
     Hoek.assert(path && path[0] === '/', 'Missing or invalid subscription path:', path || 'empty');
 
-    options = options || {};
+    options = options ?? {};
 
     const message = {
         type: 'pub',
@@ -382,7 +382,7 @@ internals.Listener.prototype._subscribe = async function (path, socket) {
 
 internals.Listener.eachSocket = function (each, options) {
 
-    options = options || {};
+    options = options ?? {};
 
     return this.plugins.nes._listener._eachSocket(each, options);
 };
@@ -454,7 +454,7 @@ internals.Sockets.prototype.auth = function (socket) {
         throw Boom.serverUnavailable('Too many connections for the authenticated user');
     }
 
-    this._byUser[user] = this._byUser[user] || [];
+    this._byUser[user] = this._byUser[user] ?? [];
     this._byUser[user].push(socket);
 };
 
@@ -522,7 +522,7 @@ internals.Subscribers.prototype.add = async function (socket, path, match) {
             socket.auth.credentials.user) {
 
             const user = socket.auth.credentials.user;
-            this._byUser[user] = this._byUser[user] || [];
+            this._byUser[user] = this._byUser[user] ?? [];
             this._byUser[user].push(this._items[socket.id]);
         }
     }

package/lib/socket.js

@@ -118,7 +118,7 @@ internals.Socket.prototype.isOpen = function () {
 
 internals.Socket.prototype._send = function (message, options) {
 
-    options = options || {};
+    options = options ?? {};
 
     if (!this.isOpen()) {                                           // Open
         return Promise.reject(Boom.internal('Socket not open'));
@@ -544,7 +544,7 @@ internals.Socket.prototype._authenticate = async function (request) {
         const config = this._listener._settings.auth;
         if (config.type === 'direct') {
             const route = this.server.lookup(config.id);
-            request.auth.headers = request.auth.headers || {};
+            request.auth.headers = request.auth.headers ?? {};
             request.auth.headers['x-forwarded-for'] = this.info['x-forwarded-for'];
             const res = await this.server.inject({ url: route.path, method: 'auth', headers: request.auth.headers, remoteAddress: this.info.remoteAddress, allowInternals: true, validate: false });
             if (res.statusCode !== 200) {
@@ -560,7 +560,7 @@ internals.Socket.prototype._authenticate = async function (request) {
         }
 
         try {
-            const auth = await Iron.unseal(request.auth, config.password, config.iron || Iron.defaults);
+            const auth = await Iron.unseal(request.auth, config.password, config.iron ?? Iron.defaults);
             this._setCredentials(auth);
         }
         catch (err) {

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@hapi/nes",
   "description": "WebSocket adapter plugin for hapi routes",
-  "version": "12.0.3",
+  "version": "13.0.0",
   "repository": "git://github.com/hapijs/nes",
-  "engines": {
-    "node": ">=12.0.0"
-  },
   "main": "lib/index.js",
   "files": [
     "lib"
@@ -15,21 +12,27 @@
     "plugin",
     "websocket"
   ],
+  "eslintConfig": {
+    "extends": [
+      "plugin:@hapi/module"
+    ]
+  },
   "dependencies": {
-    "@hapi/boom": "9.x.x",
-    "@hapi/bounce": "2.x.x",
-    "@hapi/call": "8.x.x",
-    "@hapi/cryptiles": "5.x.x",
-    "@hapi/hoek": "9.x.x",
-    "@hapi/iron": "6.x.x",
-    "@hapi/joi": "17.x.x",
-    "@hapi/teamwork": "4.x.x",
-    "ws": "6.x.x"
+    "@hapi/boom": "^10.x.x",
+    "@hapi/bounce": "^3.0.0",
+    "@hapi/call": "^9.0.0",
+    "@hapi/cryptiles": "^6.0.0",
+    "@hapi/hoek": "^10.0.0",
+    "@hapi/iron": "^7.0.0",
+    "@hapi/teamwork": "^6.0.0",
+    "@hapi/validate": "^2.0.0",
+    "ws": "^7.3.1"
   },
   "devDependencies": {
-    "@hapi/code": "8.x.x",
-    "@hapi/hapi": "19.x.x",
-    "@hapi/lab": "22.x.x"
+    "@hapi/code": "^9.0.0",
+    "@hapi/eslint-plugin": "*",
+    "@hapi/hapi": "^21.0.0-beta.1",
+    "@hapi/lab": "^25.0.1"
   },
   "scripts": {
     "test": "lab -a @hapi/code -t 100 -L -m 10000",