xcraft-core-busclient 5.7.0 → 5.7.2

package/eslint.config.js

@@ -0,0 +1,62 @@
+const js = require('@eslint/js');
+const globals = require('globals');
+const react = require('eslint-plugin-react');
+const jsdoc = require('eslint-plugin-jsdoc');
+const babel = require('@babel/eslint-plugin');
+const prettier = require('eslint-config-prettier');
+const babelParser = require('@babel/eslint-parser');
+
+module.exports = [
+  js.configs.recommended,
+  react.configs.flat.recommended,
+  jsdoc.configs['flat/recommended'],
+  prettier,
+  {
+    languageOptions: {
+      parser: babelParser,
+      parserOptions: {
+        requireConfigFile: false,
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.es2022,
+        ...globals.mocha,
+      },
+    },
+    plugins: {
+      'react': react,
+      'jsdoc': jsdoc,
+      '@babel': babel,
+    },
+    rules: {
+      'eqeqeq': 'error',
+      'no-console': 'off',
+      'react/display-name': 'off',
+      '@babel/no-unused-expressions': 'error',
+      'no-unused-vars': [
+        'error',
+        {
+          vars: 'all',
+          args: 'none',
+          ignoreRestSiblings: true,
+          destructuredArrayIgnorePattern: '^_',
+        },
+      ],
+      'jsdoc/require-jsdoc': 'off',
+      'jsdoc/require-param-description': 'off',
+      'jsdoc/require-returns-description': 'off',
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
+      jsdoc: {
+        mode: 'typescript',
+      },
+    },
+  },
+];

package/index.js

@@ -19,6 +19,12 @@ const Resp = require('./lib/resp.js');
 
 let globalBusClient = null;
 
+const autoconnect = {
+  no: 0,
+  yes: 1,
+  wait: 2,
+};
+
 class BusClient extends EventEmitter {
   #lastErrorReason = null;
 
@@ -39,7 +45,7 @@ class BusClient extends EventEmitter {
 
     this._token = 'invalid';
     this._orcName = null;
-    this._autoconnect = false;
+    this._autoconnect = autoconnect.no;
     this._connected = false;
     this._subClosed = true;
     this._pushClosed = true;
@@ -133,7 +139,7 @@ class BusClient extends EventEmitter {
         this.emit('reconnect');
       });
 
-      this._autoconnect = true;
+      this._autoconnect = autoconnect.yes;
     };
 
     this._subSocket
@@ -186,8 +192,18 @@ class BusClient extends EventEmitter {
 
       if (topic.startsWith('greathall::')) {
         if (topic === 'greathall::heartbeat') {
-          if (this._autoconnect) {
-            this._autoconnect = false;
+          if (
+            this._autoconnect === autoconnect.wait &&
+            Date.now() - this._autoconnectDelay > 5000
+          ) {
+            /* Try a new autoconnect after 5 seconds */
+            this._autoconnect = autoconnect.yes;
+          }
+
+          if (this._autoconnect === autoconnect.yes) {
+            this._autoconnect = autoconnect.wait;
+            this._autoconnectDelay = Date.now();
+
             autoConnectToken = xUtils.crypto.genToken();
             this._subSocket.subscribe(
               autoConnectToken + '::autoconnect.finished'
@@ -261,6 +277,7 @@ class BusClient extends EventEmitter {
         );
         this._eventsRegistry[escapeTopic].handler(msg); // FIXME: replace by a getter
         this.unregisterEvents('autoconnect.finished');
+        this._autoconnect = autoconnect.no;
         return;
       }
 
@@ -432,7 +449,7 @@ class BusClient extends EventEmitter {
       if (!busToken) {
         /* Autoconnect is sent when the server is ready (heartbeat). */
         this._registerAutoconnect(callback, err);
-        this._autoconnect = true;
+        this._autoconnect = autoconnect.yes;
         return;
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-busclient",
-  "version": "5.7.0",
+  "version": "5.7.2",
   "description": "Xcraft bus client",
   "main": "index.js",
   "engines": {
@@ -38,7 +38,7 @@
   "devDependencies": {
     "prettier": "2.0.4",
     "xcraft-dev-prettier": "^2.0.0",
-    "xcraft-dev-rules": "^4.1.0"
+    "xcraft-dev-rules": "^4.4.0"
   },
   "prettier": "xcraft-dev-prettier"
 }

package/.eslintrc.js

@@ -1,39 +0,0 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  parserOptions: {
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  env: {
-    browser: true,
-    es2022: true,
-    mocha: true,
-    node: true,
-  },
-  plugins: ['react', 'babel', 'jsdoc'],
-  extends: [
-    'prettier',
-    'eslint:recommended',
-    'plugin:react/recommended',
-    'plugin:jsdoc/recommended',
-  ],
-  rules: {
-    // Other rules
-    'no-console': 'off',
-    'eqeqeq': 'error',
-    'react/display-name': 'off',
-    'no-unused-vars': [
-      'error',
-      {
-        vars: 'all',
-        args: 'none',
-        ignoreRestSiblings: true,
-        destructuredArrayIgnorePattern: '^_',
-      },
-    ],
-  },
-};