@fraqjs/fraq 0.10.0 → 0.10.2

package/dist/index.mjs

@@ -241,6 +241,16 @@ var CommandBuilder = class {
 };
 //#endregion
 //#region src/routing/tokenizer.ts
+const WHITESPACE_CHARS = new Set([
+	" ",
+	"	",
+	"\n",
+	"\r",
+	"\v",
+	"\f",
+	"\xA0",
+	"　"
+]);
 var Tokenizer = class {
 	segments;
 	offset = 0;
@@ -353,12 +363,12 @@ var Tokenizer = class {
 	}
 	findTextTokenStart(text, from) {
 		let offset = from;
-		while (offset < text.length && text[offset] === " ") offset += 1;
+		while (offset < text.length && WHITESPACE_CHARS.has(text[offset])) offset += 1;
 		return offset;
 	}
 	readTextToken(text, from) {
 		let offset = from;
-		while (offset < text.length && text[offset] !== " ") offset += 1;
+		while (offset < text.length && !WHITESPACE_CHARS.has(text[offset])) offset += 1;
 		return text.slice(from, offset);
 	}
 };
@@ -617,7 +627,7 @@ var Context = class Context {
 	eventBus = mitt();
 	plugins = [];
 	services = /* @__PURE__ */ new Map();
-	subContexts = [];
+	subContexts = /* @__PURE__ */ new Map();
 	parentEventForwarder;
 	timers = /* @__PURE__ */ new Set();
 	initialReconnectDelayMs;
@@ -636,7 +646,7 @@ var Context = class Context {
 		this.maxReconnectDelayMs = options?.reconnect?.maxDelayMs ?? DEFAULT_MAX_RECONNECT_DELAY_MS;
 		this.logHandler = options?.logHandler ?? parent?.logHandler;
 		this.name = name ?? "root";
-		this.logger = new Logger((message) => this.logHandler?.(message), this.name);
+		this.logger = new Logger((message) => this.logHandler?.(message), `context:${this.name}`);
 		this.parent = parent;
 		this.filter = filter;
 		if (parent) {
@@ -700,8 +710,12 @@ and implement the dispose method to clean up resources when the context stops.
 		return this.tryResolve(service) !== void 0;
 	}
 	fork(name, filter) {
+		if (this.subContexts.has(name)) {
+			if (filter) throw new Error(`Sub context "${name}" already exists, so the provided filter cannot be applied. Please use fork('${name}') without a filter to get the existing subcontext.`);
+			return this.subContexts.get(name);
+		}
 		const subContext = new Context(this.client, void 0, name, this, filter);
-		this.subContexts.push(subContext);
+		this.subContexts.set(name, subContext);
 		return subContext;
 	}
 	timeout(delayMs, callback) {
@@ -814,7 +828,7 @@ and implement the dispose method to clean up resources when the context stops.
 	async stopInternal() {
 		const errors = [];
 		this.clearTimers();
-		for (const subContext of [...this.subContexts].reverse()) try {
+		for (const subContext of [...this.subContexts.values()].reverse()) try {
 			await subContext.stop();
 		} catch (error) {
 			errors.push(error);
@@ -902,7 +916,7 @@ and implement the dispose method to clean up resources when the context stops.
 			context: this,
 			sortedPlugins
 		});
-		for (const subContext of this.subContexts) await subContext.recursiveApplyPlugins(appliedContextPlugins, startingContexts);
+		for (const subContext of this.subContexts.values()) await subContext.recursiveApplyPlugins(appliedContextPlugins, startingContexts);
 	}
 	async startPlugins(sortedPlugins) {
 		for (const installedPlugin of sortedPlugins) {
@@ -979,7 +993,7 @@ and implement the dispose method to clean up resources when the context stops.
 		return installedPlugin.proxy;
 	}
 	createProxyContextForPlugin(plugin) {
-		const proxyLogger = new Logger((message) => this.logHandler?.(message), plugin.name);
+		const proxyLogger = new Logger((message) => this.logHandler?.(message), `plugin:${this.name ? `${this.name}/` : ""}${plugin.name}`);
 		let proxyInjections;
 		if (plugin.inject) {
 			proxyInjections = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fraqjs/fraq",
   "type": "module",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Milky Bot framework",
   "files": [
     "dist"