@inditextech/weave-store-azure-web-pubsub 0.71.0 → 0.72.1

package/dist/server.cjs

@@ -20814,7 +20814,7 @@ function readRequestBody(req) {
 //#endregion
 //#region ../../node_modules/@typespec/ts-http-runtime/dist/esm/logger/log.js
 function log(message, ...args) {
-	node_process.stderr.write(`${node_util.default.format(message, ...args)}${node_os.EOL}`);
+	node_process.default.stderr.write(`${node_util.default.format(message, ...args)}${node_os.EOL}`);
 }
 
 //#endregion
@@ -20837,18 +20837,74 @@ function enable(namespaces) {
 	enabledString = namespaces;
 	enabledNamespaces = [];
 	skippedNamespaces = [];
-	const wildcard = /\*/g;
-	const namespaceList = namespaces.split(",").map((ns) => ns.trim().replace(wildcard, ".*?"));
-	for (const ns of namespaceList) if (ns.startsWith("-")) skippedNamespaces.push(new RegExp(`^${ns.substr(1)}$`));
-	else enabledNamespaces.push(new RegExp(`^${ns}$`));
+	const namespaceList = namespaces.split(",").map((ns) => ns.trim());
+	for (const ns of namespaceList) if (ns.startsWith("-")) skippedNamespaces.push(ns.substring(1));
+	else enabledNamespaces.push(ns);
 	for (const instance of debuggers) instance.enabled = enabled(instance.namespace);
 }
 function enabled(namespace) {
 	if (namespace.endsWith("*")) return true;
-	for (const skipped of skippedNamespaces) if (skipped.test(namespace)) return false;
-	for (const enabledNamespace of enabledNamespaces) if (enabledNamespace.test(namespace)) return true;
+	for (const skipped of skippedNamespaces) if (namespaceMatches(namespace, skipped)) return false;
+	for (const enabledNamespace of enabledNamespaces) if (namespaceMatches(namespace, enabledNamespace)) return true;
 	return false;
 }
+/**
+* Given a namespace, check if it matches a pattern.
+* Patterns only have a single wildcard character which is *.
+* The behavior of * is that it matches zero or more other characters.
+*/
+function namespaceMatches(namespace, patternToMatch) {
+	if (patternToMatch.indexOf("*") === -1) return namespace === patternToMatch;
+	let pattern = patternToMatch;
+	if (patternToMatch.indexOf("**") !== -1) {
+		const patternParts = [];
+		let lastCharacter = "";
+		for (const character of patternToMatch) if (character === "*" && lastCharacter === "*") continue;
+		else {
+			lastCharacter = character;
+			patternParts.push(character);
+		}
+		pattern = patternParts.join("");
+	}
+	let namespaceIndex = 0;
+	let patternIndex = 0;
+	const patternLength = pattern.length;
+	const namespaceLength = namespace.length;
+	let lastWildcard = -1;
+	let lastWildcardNamespace = -1;
+	while (namespaceIndex < namespaceLength && patternIndex < patternLength) if (pattern[patternIndex] === "*") {
+		lastWildcard = patternIndex;
+		patternIndex++;
+		if (patternIndex === patternLength) return true;
+		while (namespace[namespaceIndex] !== pattern[patternIndex]) {
+			namespaceIndex++;
+			if (namespaceIndex === namespaceLength) return false;
+		}
+		lastWildcardNamespace = namespaceIndex;
+		namespaceIndex++;
+		patternIndex++;
+		continue;
+	} else if (pattern[patternIndex] === namespace[namespaceIndex]) {
+		patternIndex++;
+		namespaceIndex++;
+	} else if (lastWildcard >= 0) {
+		patternIndex = lastWildcard + 1;
+		namespaceIndex = lastWildcardNamespace + 1;
+		if (namespaceIndex === namespaceLength) return false;
+		while (namespace[namespaceIndex] !== pattern[patternIndex]) {
+			namespaceIndex++;
+			if (namespaceIndex === namespaceLength) return false;
+		}
+		lastWildcardNamespace = namespaceIndex;
+		namespaceIndex++;
+		patternIndex++;
+		continue;
+	} else return false;
+	const namespaceDone = namespaceIndex === namespace.length;
+	const patternDone = patternIndex === pattern.length;
+	const trailingWildCard = patternIndex === pattern.length - 1 && pattern[patternIndex] === "*";
+	return namespaceDone && (patternDone || trailingWildCard);
+}
 function disable() {
 	const result = enabledString || "";
 	enable("");
@@ -21442,7 +21498,7 @@ var CloudEventsDispatcher = class {
 		switch (eventType) {
 			case EventType.Connect: {
 				const connectRequest = isMqtt ? await readSystemEventRequest(request$1, origin) : await readSystemEventRequest(request$1, origin);
-				connectRequest.queries = connectRequest.query;
+				connectRequest.queries = connectRequest.queries ?? {};
 				logger.verbose(connectRequest);
 				this.eventHandler.handleConnect(connectRequest, getConnectResponseHandler(connectRequest, response$1));
 				return true;

package/dist/server.js

@@ -8,7 +8,7 @@ import * as Y$1 from "yjs";
 import * as Y from "yjs";
 import { URL as URL$1 } from "node:url";
 import { EOL } from "node:os";
-import * as process$1 from "node:process";
+import process$1 from "node:process";
 
 //#region rolldown:runtime
 var __create = Object.create;
@@ -20841,18 +20841,74 @@ function enable(namespaces) {
 	enabledString = namespaces;
 	enabledNamespaces = [];
 	skippedNamespaces = [];
-	const wildcard = /\*/g;
-	const namespaceList = namespaces.split(",").map((ns) => ns.trim().replace(wildcard, ".*?"));
-	for (const ns of namespaceList) if (ns.startsWith("-")) skippedNamespaces.push(new RegExp(`^${ns.substr(1)}$`));
-	else enabledNamespaces.push(new RegExp(`^${ns}$`));
+	const namespaceList = namespaces.split(",").map((ns) => ns.trim());
+	for (const ns of namespaceList) if (ns.startsWith("-")) skippedNamespaces.push(ns.substring(1));
+	else enabledNamespaces.push(ns);
 	for (const instance of debuggers) instance.enabled = enabled(instance.namespace);
 }
 function enabled(namespace) {
 	if (namespace.endsWith("*")) return true;
-	for (const skipped of skippedNamespaces) if (skipped.test(namespace)) return false;
-	for (const enabledNamespace of enabledNamespaces) if (enabledNamespace.test(namespace)) return true;
+	for (const skipped of skippedNamespaces) if (namespaceMatches(namespace, skipped)) return false;
+	for (const enabledNamespace of enabledNamespaces) if (namespaceMatches(namespace, enabledNamespace)) return true;
 	return false;
 }
+/**
+* Given a namespace, check if it matches a pattern.
+* Patterns only have a single wildcard character which is *.
+* The behavior of * is that it matches zero or more other characters.
+*/
+function namespaceMatches(namespace, patternToMatch) {
+	if (patternToMatch.indexOf("*") === -1) return namespace === patternToMatch;
+	let pattern = patternToMatch;
+	if (patternToMatch.indexOf("**") !== -1) {
+		const patternParts = [];
+		let lastCharacter = "";
+		for (const character of patternToMatch) if (character === "*" && lastCharacter === "*") continue;
+		else {
+			lastCharacter = character;
+			patternParts.push(character);
+		}
+		pattern = patternParts.join("");
+	}
+	let namespaceIndex = 0;
+	let patternIndex = 0;
+	const patternLength = pattern.length;
+	const namespaceLength = namespace.length;
+	let lastWildcard = -1;
+	let lastWildcardNamespace = -1;
+	while (namespaceIndex < namespaceLength && patternIndex < patternLength) if (pattern[patternIndex] === "*") {
+		lastWildcard = patternIndex;
+		patternIndex++;
+		if (patternIndex === patternLength) return true;
+		while (namespace[namespaceIndex] !== pattern[patternIndex]) {
+			namespaceIndex++;
+			if (namespaceIndex === namespaceLength) return false;
+		}
+		lastWildcardNamespace = namespaceIndex;
+		namespaceIndex++;
+		patternIndex++;
+		continue;
+	} else if (pattern[patternIndex] === namespace[namespaceIndex]) {
+		patternIndex++;
+		namespaceIndex++;
+	} else if (lastWildcard >= 0) {
+		patternIndex = lastWildcard + 1;
+		namespaceIndex = lastWildcardNamespace + 1;
+		if (namespaceIndex === namespaceLength) return false;
+		while (namespace[namespaceIndex] !== pattern[patternIndex]) {
+			namespaceIndex++;
+			if (namespaceIndex === namespaceLength) return false;
+		}
+		lastWildcardNamespace = namespaceIndex;
+		namespaceIndex++;
+		patternIndex++;
+		continue;
+	} else return false;
+	const namespaceDone = namespaceIndex === namespace.length;
+	const patternDone = patternIndex === pattern.length;
+	const trailingWildCard = patternIndex === pattern.length - 1 && pattern[patternIndex] === "*";
+	return namespaceDone && (patternDone || trailingWildCard);
+}
 function disable() {
 	const result = enabledString || "";
 	enable("");
@@ -21446,7 +21502,7 @@ var CloudEventsDispatcher = class {
 		switch (eventType) {
 			case EventType.Connect: {
 				const connectRequest = isMqtt ? await readSystemEventRequest(request$1, origin) : await readSystemEventRequest(request$1, origin);
-				connectRequest.queries = connectRequest.query;
+				connectRequest.queries = connectRequest.queries ?? {};
 				logger.verbose(connectRequest);
 				this.eventHandler.handleConnect(connectRequest, getConnectResponseHandler(connectRequest, response$1));
 				return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inditextech/weave-store-azure-web-pubsub",
-  "version": "0.71.0",
+  "version": "0.72.1",
   "type": "module",
   "license": "Apache-2.0",
   "author": "Jesus Manuel Piñeiro Cid <jesusmpc@inditex.com>",
@@ -61,7 +61,7 @@
     "yjs": "13.6.27"
   },
   "devDependencies": {
-    "@inditextech/weave-sdk": "0.71.0",
+    "@inditextech/weave-sdk": "0.72.1",
     "@koa/cors": "^5.0.0",
     "@types/express": "^5.0.1",
     "@types/ioredis": "^4.28.10",
@@ -72,8 +72,8 @@
     "@types/ws": "^8.18.0",
     "@typescript-eslint/eslint-plugin": "8.26.0",
     "@typescript-eslint/parser": "8.26.0",
-    "@vitest/coverage-v8": "1.6.0",
-    "@vitest/ui": "1.6.0",
+    "@vitest/coverage-v8": "1.6.1",
+    "@vitest/ui": "1.6.1",
     "cors": "^2.8.5",
     "emittery": "^1.1.0",
     "eslint": "8.57.1",
@@ -86,11 +86,11 @@
     "tsdown": "^0.10.2",
     "tsx": "^4.19.3",
     "typescript-eslint": "8.22.0",
-    "vite": "5.2.9",
+    "vite": "5.4.20",
     "vite-bundle-visualizer": "1.1.0",
     "vite-plugin-compression2": "1.0.0",
     "vite-plugin-dts": "4.0.3",
-    "vitest": "1.6.0",
+    "vitest": "1.6.1",
     "vitest-sonar-reporter": "2.0.0"
   },
   "peerDependencies": {