@fraqjs/fraq 0.9.1 → 0.10.0

package/dist/index.d.mts

@@ -5522,9 +5522,19 @@ interface RawPattern<P extends Pattern> {
   pattern: P;
   execute: Executor<P>;
 }
+interface SessionReplyOptions {
+  withQuote?: boolean;
+  withMention?: boolean;
+}
 interface Session {
   raw: IncomingMessage;
-  reply(segments: OutgoingSegment_ZodInput[]): Promise<void>;
+  reply(
+    textOrSegments: string | OutgoingSegment_ZodInput[],
+    options?: SessionReplyOptions,
+  ): Promise<{
+    messageSeq: number;
+  }>;
+  reaction(type: 'face' | 'emoji', reactionId: string): Promise<void>;
 }
 declare class CommandBuilder<P extends Pattern = {}, S = Command<P>> {
   readonly name: string;
@@ -5846,6 +5856,7 @@ export {
   ServiceClass,
   Session,
   SessionPredicate,
+  SessionReplyOptions,
   TypeInstruction,
   combineLogHandlers,
   createMilkyClient,

package/dist/index.mjs

@@ -64,6 +64,138 @@ function createMilkyClient(...params) {
 	} });
 }
 //#endregion
+//#region src/protocol/segment.ts
+function msg(strings, ...values) {
+	let buffer = "";
+	const segments = [];
+	for (let i = 0; i < strings.length; i++) {
+		buffer += strings[i];
+		if (i < values.length) {
+			const value = values[i];
+			if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") buffer += value.toString();
+			else {
+				if (buffer) {
+					segments.push({
+						type: "text",
+						data: { text: buffer }
+					});
+					buffer = "";
+				}
+				segments.push(value);
+			}
+		}
+	}
+	if (buffer) segments.push({
+		type: "text",
+		data: { text: buffer }
+	});
+	return trimBoundaryTextSegments(segments);
+}
+function isTextSegment(segment) {
+	return segment.type === "text";
+}
+function withText(segment, text) {
+	return {
+		...segment,
+		data: {
+			...segment.data,
+			text
+		}
+	};
+}
+function trimBoundaryTextSegments(segments) {
+	const result = [...segments];
+	const first = result[0];
+	if (first && isTextSegment(first)) {
+		const text = first.data.text.trimStart();
+		if (text) result[0] = withText(first, text);
+		else result.shift();
+	}
+	const lastIndex = result.length - 1;
+	const last = result[lastIndex];
+	if (last && isTextSegment(last)) {
+		const text = last.data.text.trimEnd();
+		if (text) result[lastIndex] = withText(last, text);
+		else result.pop();
+	}
+	return result;
+}
+let seg;
+(function(_seg) {
+	function mention(userId) {
+		return {
+			type: "mention",
+			data: { user_id: userId }
+		};
+	}
+	_seg.mention = mention;
+	function mentionAll() {
+		return {
+			type: "mention_all",
+			data: {}
+		};
+	}
+	_seg.mentionAll = mentionAll;
+	function face(faceId, options) {
+		return {
+			type: "face",
+			data: {
+				face_id: faceId.toString(),
+				is_large: options?.isLarge ?? false
+			}
+		};
+	}
+	_seg.face = face;
+	function reply(messageSeq) {
+		return {
+			type: "reply",
+			data: { message_seq: messageSeq }
+		};
+	}
+	_seg.reply = reply;
+	function image(uri, options) {
+		return {
+			type: "image",
+			data: {
+				uri,
+				sub_type: options?.subType,
+				summary: options?.summary
+			}
+		};
+	}
+	_seg.image = image;
+	function record(uri) {
+		return {
+			type: "record",
+			data: { uri }
+		};
+	}
+	_seg.record = record;
+	function video(uri, options) {
+		return {
+			type: "video",
+			data: {
+				uri,
+				thumb_uri: options?.thumbUri
+			}
+		};
+	}
+	_seg.video = video;
+	function forward(messages, options) {
+		return {
+			type: "forward",
+			data: {
+				messages,
+				title: options?.title,
+				preview: options?.preview,
+				summary: options?.summary,
+				prompt: options?.prompt
+			}
+		};
+	}
+	_seg.forward = forward;
+})(seg || (seg = {}));
+//#endregion
 //#region src/routing/command.ts
 var CommandBuilder = class {
 	name;
@@ -592,25 +724,40 @@ and implement the dispose method to clean up resources when the context stops.
 	createSession(message) {
 		return {
 			raw: message,
-			reply: async (segments) => {
-				try {
-					switch (message.message_scene) {
-						case "friend":
-							await this.client.send_private_message({
-								user_id: message.peer_id,
-								message: segments
-							});
-							break;
-						case "group":
-							await this.client.send_group_message({
-								group_id: message.peer_id,
-								message: segments
-							});
-							break;
+			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) {
+					case "friend": {
+						const { message_seq } = await this.client.send_private_message({
+							user_id: message.peer_id,
+							message: actualSegments
+						});
+						return { messageSeq: message_seq };
+					}
+					case "group": {
+						const { message_seq } = await this.client.send_group_message({
+							group_id: message.peer_id,
+							message: actualSegments
+						});
+						return { messageSeq: message_seq };
 					}
-				} catch (error) {
-					this.logger.error(`Error sending reply (source msg: scene=${message.message_scene} peer=${message.peer_id} sender=${message.sender_id} seq=${message.message_seq})`, error);
 				}
+				return { messageSeq: 0 };
+			},
+			reaction: async (type, reactionId) => {
+				if (message.message_scene === "group") await this.client.send_group_message_reaction({
+					group_id: message.peer_id,
+					message_seq: message.message_seq,
+					reaction_type: type,
+					reaction: reactionId
+				});
 			}
 		};
 	}
@@ -726,15 +873,15 @@ and implement the dispose method to clean up resources when the context stops.
 		for (const installedPlugin of sortedPlugins) {
 			const { plugin, args } = installedPlugin;
 			const providedBeforeApply = new Set(this.services.keys());
-			let debugMessage = `Applying plugin ${plugin.name}`;
+			let applyingMessage = `Applying plugin ${plugin.name}`;
 			const requiredServices = [];
 			const providedServices = [];
 			if (plugin.requires) for (const service of plugin.requires) requiredServices.push(service.name);
 			if (plugin.optionalRequires) for (const service of plugin.optionalRequires) requiredServices.push(`${service.name}?`);
 			if (plugin.provides) for (const service of plugin.provides) providedServices.push(service.name);
-			if (requiredServices.length > 0) debugMessage += `, requires: [${requiredServices.join(", ")}]`;
-			if (providedServices.length > 0) debugMessage += `, provides: [${providedServices.join(", ")}]`;
-			this.logger.debug(debugMessage);
+			if (requiredServices.length > 0) applyingMessage += `, requires: [${requiredServices.join(", ")}]`;
+			if (providedServices.length > 0) applyingMessage += `, provides: [${providedServices.join(", ")}]`;
+			this.logger.info(applyingMessage);
 			await plugin.apply(this.getPluginContext(installedPlugin), ...args);
 			for (const service of plugin.provides ?? []) if (!this.services.has(service) || providedBeforeApply.has(service)) throw new Error(`${plugin.name} declares service ${service.name} but did not provide it.`);
 		}
@@ -1063,138 +1210,6 @@ function definePlugin(plugin) {
 	return plugin;
 }
 //#endregion
-//#region src/protocol/segment.ts
-function msg(strings, ...values) {
-	let buffer = "";
-	const segments = [];
-	for (let i = 0; i < strings.length; i++) {
-		buffer += strings[i];
-		if (i < values.length) {
-			const value = values[i];
-			if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") buffer += value.toString();
-			else {
-				if (buffer) {
-					segments.push({
-						type: "text",
-						data: { text: buffer }
-					});
-					buffer = "";
-				}
-				segments.push(value);
-			}
-		}
-	}
-	if (buffer) segments.push({
-		type: "text",
-		data: { text: buffer }
-	});
-	return trimBoundaryTextSegments(segments);
-}
-function isTextSegment(segment) {
-	return segment.type === "text";
-}
-function withText(segment, text) {
-	return {
-		...segment,
-		data: {
-			...segment.data,
-			text
-		}
-	};
-}
-function trimBoundaryTextSegments(segments) {
-	const result = [...segments];
-	const first = result[0];
-	if (first && isTextSegment(first)) {
-		const text = first.data.text.trimStart();
-		if (text) result[0] = withText(first, text);
-		else result.shift();
-	}
-	const lastIndex = result.length - 1;
-	const last = result[lastIndex];
-	if (last && isTextSegment(last)) {
-		const text = last.data.text.trimEnd();
-		if (text) result[lastIndex] = withText(last, text);
-		else result.pop();
-	}
-	return result;
-}
-let seg;
-(function(_seg) {
-	function mention(userId) {
-		return {
-			type: "mention",
-			data: { user_id: userId }
-		};
-	}
-	_seg.mention = mention;
-	function mentionAll() {
-		return {
-			type: "mention_all",
-			data: {}
-		};
-	}
-	_seg.mentionAll = mentionAll;
-	function face(faceId, options) {
-		return {
-			type: "face",
-			data: {
-				face_id: faceId.toString(),
-				is_large: options?.isLarge ?? false
-			}
-		};
-	}
-	_seg.face = face;
-	function reply(messageSeq) {
-		return {
-			type: "reply",
-			data: { message_seq: messageSeq }
-		};
-	}
-	_seg.reply = reply;
-	function image(uri, options) {
-		return {
-			type: "image",
-			data: {
-				uri,
-				sub_type: options?.subType,
-				summary: options?.summary
-			}
-		};
-	}
-	_seg.image = image;
-	function record(uri) {
-		return {
-			type: "record",
-			data: { uri }
-		};
-	}
-	_seg.record = record;
-	function video(uri, options) {
-		return {
-			type: "video",
-			data: {
-				uri,
-				thumb_uri: options?.thumbUri
-			}
-		};
-	}
-	_seg.video = video;
-	function forward(messages, options) {
-		return {
-			type: "forward",
-			data: {
-				messages,
-				title: options?.title,
-				preview: options?.preview,
-				summary: options?.summary,
-				prompt: options?.prompt
-			}
-		};
-	}
-	_seg.forward = forward;
-})(seg || (seg = {}));
-//#endregion
 //#region src/protocol/types.ts
 const milkyVersion = "1.3";
 const milkyPackageVersion = "1.3.0-rc.1";

package/package.json

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