@fraqjs/fraq 0.9.2 → 0.10.1

package/dist/index.d.mts

@@ -5529,7 +5529,7 @@ interface SessionReplyOptions {
 interface Session {
   raw: IncomingMessage;
   reply(
-    segments: OutgoingSegment_ZodInput[],
+    textOrSegments: string | OutgoingSegment_ZodInput[],
     options?: SessionReplyOptions,
   ): Promise<{
     messageSeq: number;

package/dist/index.mjs

@@ -617,7 +617,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 +636,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 +700,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) {
@@ -724,8 +728,13 @@ and implement the dispose method to clean up resources when the context stops.
 	createSession(message) {
 		return {
 			raw: message,
-			reply: async (segments, options) => {
-				const actualSegments = [...segments];
+			reply: async (textOrSegments, options) => {
+				const actualSegments = [];
+				if (typeof textOrSegments === "string") actualSegments.push({
+					type: "text",
+					data: { text: textOrSegments }
+				});
+				else actualSegments.push(...textOrSegments);
 				if (options?.withMention && message.message_scene === "group") actualSegments.unshift(seg.mention(message.sender_id));
 				if (options?.withQuote) actualSegments.unshift(seg.reply(message.message_seq));
 				switch (message.message_scene) {
@@ -809,7 +818,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);
@@ -897,7 +906,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) {
@@ -974,7 +983,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.9.2",
+  "version": "0.10.1",
   "description": "Milky Bot framework",
   "files": [
     "dist"