kuzzle 2.43.2 → 2.44.0-beta.1

package/lib/core/auth/tokenManager.d.ts

@@ -14,6 +14,7 @@ export declare class TokenManager {
      */
     private tokensByConnection;
     private timer;
+    private readonly logger;
     constructor();
     init(): Promise<void>;
     runTimer(): void;

package/lib/core/auth/tokenManager.js

@@ -65,6 +65,7 @@ class TokenManager {
          */
         this.tokensByConnection = new Map();
         this.timer = null;
+        this.logger = global.kuzzle.log.child("auth:tokenManager");
         /*
          * Tokens are sorted by their expiration date
          *
@@ -95,7 +96,7 @@ class TokenManager {
         const anonymous = await global.kuzzle.ask("core:security:user:anonymous:get");
         this.anonymousUserId = anonymous._id;
         global.kuzzle.on("connection:remove", (connection) => {
-            this.removeConnection(connection.id).catch((err) => global.kuzzle.log.info(err));
+            this.removeConnection(connection.id).catch((err) => this.logger.info(err));
         });
     }
     runTimer() {
@@ -121,6 +122,7 @@ class TokenManager {
         const currentToken = this.tokensByConnection.get(connectionId);
         if (currentToken) {
             if (currentToken._id === token._id) {
+                this.logger.trace(`connection "${connectionId}" from user "${token.userId}" already linked to token`);
                 return; // Connection and Token already linked
             }
             this.removeConnectionLinkedToToken(connectionId, currentToken);
@@ -128,11 +130,13 @@ class TokenManager {
         const pos = this.tokens.search({ idx });
         if (pos === -1) {
             this.add(token, new Set([connectionId]));
+            this.logger.trace(`connection "${connectionId}" from user "${token.userId}" linked to a new token`);
         }
         else {
             const managedToken = this.tokens.array[pos];
             managedToken.connectionIds.add(connectionId);
             this.tokensByConnection.set(connectionId, managedToken);
+            this.logger.trace(`connection "${connectionId}" from user "${token.userId}" linked to existing token`);
         }
     }
     /**
@@ -142,12 +146,18 @@ class TokenManager {
      * @param connectionId
      */
     unlink(token, connectionId) {
-        if (!token || token.userId === this.anonymousUserId) {
+        if (!token) {
+            this.logger.warn(`tried to unlink connection "${connectionId}" with no token`);
+            return;
+        }
+        if (token.userId === this.anonymousUserId) {
+            this.logger.warn(`tried to unlink connection "${connectionId}" from anonymous user`);
             return;
         }
         const idx = ManagedToken.indexFor(token);
         const pos = this.tokens.search({ idx });
         if (pos === -1) {
+            this.logger.warn(`tried to unlink connection "${connectionId}" with no token associated`);
             return;
         }
         this.removeConnectionLinkedToToken(connectionId, this.tokens.array[pos]);
@@ -155,17 +165,19 @@ class TokenManager {
         if (currentToken && currentToken._id === token._id) {
             this.tokensByConnection.delete(connectionId);
         }
+        this.logger.trace(`connection "${connectionId}" from user "${token.userId}" unlinked from token`);
     }
     /**
      * Remove token associated with a connection.
      */
     async removeConnection(connectionId) {
         const managedToken = this.tokensByConnection.get(connectionId);
-        // Anonymous connection does not have associated token
         if (!managedToken) {
+            this.logger.warn(`tried to remove connection "${connectionId}" with no token associated`);
             return;
         }
-        await this.expire(managedToken);
+        this.unlink(managedToken, connectionId);
+        this.logger.trace(`connection "${connectionId}" from user "${managedToken.userId}" removed and unlinked from token`);
     }
     /**
      * Called when a token expires before its time (e.g. following a
@@ -177,6 +189,7 @@ class TokenManager {
      */
     async expire(token) {
         if (token.userId === this.anonymousUserId) {
+            this.logger.warn(`tried to expire an anonymous token`);
             return;
         }
         const idx = ManagedToken.indexFor(token);
@@ -188,6 +201,7 @@ class TokenManager {
                 await global.kuzzle.ask("core:realtime:connection:remove", connectionId);
             }
             this.deleteByIndex(searchResult);
+            this.logger.trace(`token from user "${token.userId}" expired and removed from list`);
         }
     }
     /**
@@ -211,6 +225,7 @@ class TokenManager {
             this.add(newToken, connectionIds);
             // Delete old token
             this.deleteByIndex(pos);
+            this.logger.trace(`token from user ${oldToken.userId} refreshed`);
         }
     }
     async checkTokensValidity() {
@@ -267,6 +282,7 @@ class TokenManager {
         if (this.tokens.array[0].idx === orderedToken.idx) {
             this.runTimer();
         }
+        this.logger.trace(`token from user ${token.userId} linked to connections ${Array.from(connectionIds)}`);
     }
     removeConnectionLinkedToToken(connectionId, managedToken) {
         managedToken.connectionIds.delete(connectionId);

package/lib/kuzzle/Logger.js

@@ -31,6 +31,7 @@ class Logger extends kuzzle_logger_1.KuzzleLogger {
         const deprecatedConfig = kuzzleConfig.plugins["kuzzle-plugin-logger"];
         const getMergingObject = () => {
             const mergingObject = {};
+            mergingObject.namespace = "kuzzle";
             mergingObject.failsafeMode = Boolean(kuzzleConfig.plugins.common.failsafeMode);
             if (global.kuzzle.id) {
                 mergingObject.nodeId = global.kuzzle.id;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
-  "version": "2.43.2",
+  "version": "2.44.0-beta.1",
   "description": "Kuzzle is an open-source solution that handles all the data management through a secured API, with a large choice of protocols.",
   "bin": "bin/start-kuzzle-server",
   "scripts": {
@@ -9,7 +9,7 @@
     "build": "tsc",
     "clean": "touch index.ts && npm run build | grep TSFILE | cut -d' ' -f 2 | xargs rm",
     "cucumber": "cucumber.js --fail-fast",
-    "dev": "tsx docker/scripts/start-kuzzle-dev.ts",
+    "dev": "tsx watch docker/scripts/start-kuzzle-dev.ts",
     "doc-error-codes": "node -r ts-node/register doc/build-error-codes",
     "prepublishOnly": "npm run build",
     "prettier": "prettier ./lib ./test ./features ./plugins/available/functional-test-plugin --write",
@@ -38,14 +38,14 @@
     "didyoumean": "1.2.2",
     "dumpme": "2.0.0",
     "eventemitter3": "5.0.1",
-    "inquirer": "12.6.3",
+    "inquirer": "12.8.2",
     "ioredis": "5.6.1",
     "js-yaml": "4.1.0",
     "json-stable-stringify": "1.3.0",
     "json2yaml": "1.1.0",
     "jsonwebtoken": "9.0.2",
     "koncorde": "4.6.0",
-    "kuzzle-logger": "1.2.0",
+    "kuzzle-logger": "1.3.0",
     "kuzzle-plugin-auth-passport-local": "6.4.1",
     "kuzzle-sdk": ">=7.15.0",
     "kuzzle-vault": "2.1.0",
@@ -75,7 +75,7 @@
     "winston-syslog": "2.7.1",
     "winston-transport": "4.9.0",
     "yargs": "18.0.0",
-    "zeromq": "6.4.2"
+    "zeromq": "6.5.0"
   },
   "repository": {
     "type": "git",
@@ -84,22 +84,22 @@
   "devDependencies": {
     "@commitlint/cli": "19.8.1",
     "@commitlint/config-conventional": "19.8.1",
-    "@jest/globals": "29.7.0",
+    "@jest/globals": "30.0.5",
     "@types/bluebird": "3.5.42",
     "@types/cookie": "1.0.0",
-    "@types/jest": "29.5.14",
+    "@types/jest": "30.0.0",
     "@types/js-yaml": "4.0.9",
-    "@types/lodash": "4.17.17",
+    "@types/lodash": "4.17.20",
     "@types/mocha": "10.0.10",
     "async": "3.2.6",
     "chokidar": "4.0.3",
     "cucumber": "6.0.7",
     "cz-conventional-changelog": "3.3.0",
-    "eslint-plugin-kuzzle": "0.0.13",
-    "jest": "29.7.0",
-    "mocha": "11.5.0",
+    "eslint-plugin-kuzzle": "0.0.14",
+    "jest": "30.0.5",
+    "mocha": "11.7.1",
     "mock-require": "3.0.3",
-    "mqtt": "5.13.1",
+    "mqtt": "5.13.3",
     "nyc": "17.1.0",
     "request": "2.88.2",
     "request-promise": "4.2.6",
@@ -107,18 +107,18 @@
     "semantic-release-config-kuzzle": "1.1.2",
     "should": "13.2.3",
     "should-sinon": "0.0.6",
-    "sinon": "20.0.0",
+    "sinon": "21.0.0",
     "strip-json-comments": "https://github.com/sindresorhus/strip-json-comments/archive/refs/tags/v3.1.1.tar.gz",
-    "ts-jest": "29.3.4",
+    "ts-jest": "29.4.0",
     "ts-node": "10.9.2",
-    "tsx": "^4.19.4",
+    "tsx": "4.20.3",
     "typescript": "5.3.2",
     "yaml": "2.8.0"
   },
   "engines": {
     "node": ">=18.0.0 <23.0.0"
   },
-  "packageManager": "npm@11.4.1",
+  "packageManager": "npm@11.4.2",
   "engineStrict": true,
   "license": "Apache-2.0",
   "files": [