From 576af89483d4f0b7ef03aae6ef21955aeb0d043b Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Sat, 20 Dec 2025 08:43:59 +0800 Subject: [PATCH 01/15] feat: initialize qq plugin --- deployment/local.yml | 19 +++++++++ docs/plugin.zh-CN.md | 51 ++++++++++++++++++++++++ packages/ema-plugin-qq/package.json | 25 ++++++++++++ packages/ema-plugin-qq/src/index.ts | 10 +++++ packages/ema-plugin-qq/tsconfig.json | 15 +++++++ packages/ema-ui/instrumentation.ts | 4 ++ packages/ema-ui/package.json | 3 ++ packages/ema-ui/src/plugin.ts | 58 ++++++++++++++++++++++++++++ packages/ema/src/index.ts | 1 + packages/ema/src/plugin.ts | 18 +++++++++ packages/ema/src/server.ts | 7 ++++ 11 files changed, 211 insertions(+) create mode 100644 docs/plugin.zh-CN.md create mode 100644 packages/ema-plugin-qq/package.json create mode 100644 packages/ema-plugin-qq/src/index.ts create mode 100644 packages/ema-plugin-qq/tsconfig.json create mode 100644 packages/ema-ui/instrumentation.ts create mode 100644 packages/ema-ui/src/plugin.ts create mode 100644 packages/ema/src/plugin.ts diff --git a/deployment/local.yml b/deployment/local.yml index c5f3700f..b866092d 100644 --- a/deployment/local.yml +++ b/deployment/local.yml @@ -13,6 +13,25 @@ services: networks: - ema-network + # napcat: + # image: mlikiowa/napcat-docker:latest + # container_name: napcat + # restart: always + # network_mode: bridge + # # mac_address: 02:42:ac:11:00:02 # 添加MAC地址固化配置 + + # environment: + # - NAPCAT_UID=${NAPCAT_UID} + # - NAPCAT_GID=${NAPCAT_GID} + + # ports: + # - 3001:3001 + # - 6099:6099 + + # volumes: + # - ../.data/napcat/config:/app/napcat/config + # - ../.data/ntqq:/app/.config/QQ + app: build: context: .. diff --git a/docs/plugin.zh-CN.md b/docs/plugin.zh-CN.md new file mode 100644 index 00000000..7c32cf58 --- /dev/null +++ b/docs/plugin.zh-CN.md @@ -0,0 +1,51 @@ +# 插件 + +插件是 Ema 的扩展机制，可以通过插件来扩展 Ema 的功能。目前支持的插件有： + +- QQ + +## 插件配置 + +目前只有一个环境变量 `EMA_PLUGINS`，用于配置插件列表，多个插件用逗号分隔。例如： + +```bash +EMA_PLUGINS=qq +``` + +## 添加插件 + +插件的命名必须以`ema-plugin-`开头，例如 `ema-plugin-discord`。插件的开发可以通过以下步骤进行： + +1. 创建一个插件包，例如 `ema-plugin-discord`。 +2. 在 [`ema-ui/package.json`](/packages/ema-ui/package.json) 的 `peerDependencies` 中添加一行： + +```jsonc +{ + "peerDependencies": { + // PNPM 工作空间依赖 + "ema-plugin-discord": "workspace:*", + // 或外部包依赖 + "ema-plugin-discord": "^1.0.0", + }, +} +``` + +3. 重启服务器。 + +## 插件开发 + +插件的根文件需要导出 `Plugin` 符号： + +```ts +import type { EmaPluginProvider, Server } from "ema"; +export const Plugin: EmaPluginProvider = class { + name = "QQ"; + constructor(private readonly server: Server) {} + start(): Promise { + console.log("[ema-qq] started", !!this.server.chat); + return Promise.resolve(); + } +}; +``` + +根据编译错误的指引实现 `ema-plugin-discord` 包。 diff --git a/packages/ema-plugin-qq/package.json b/packages/ema-plugin-qq/package.json new file mode 100644 index 00000000..9757fed7 --- /dev/null +++ b/packages/ema-plugin-qq/package.json @@ -0,0 +1,25 @@ +{ + "name": "ema-plugin-qq", + "version": "0.1.0", + "type": "module", + "keywords": [ + "qq" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/EmaFanClub/EverMemoryArchive.git", + "directory": "packages/ema-qq" + }, + "bugs": { + "url": "https://github.com/EmaFanClub/EverMemoryArchive/issues" + }, + "dependencies": { + "ema": "workspace:*" + }, + "exports": { + ".": { + "types": "./src/index.ts", + "default": "./src/index.ts" + } + } +} diff --git a/packages/ema-plugin-qq/src/index.ts b/packages/ema-plugin-qq/src/index.ts new file mode 100644 index 00000000..9d054ba8 --- /dev/null +++ b/packages/ema-plugin-qq/src/index.ts @@ -0,0 +1,10 @@ +import type { EmaPluginProvider, Server } from "ema"; + +export const Plugin: EmaPluginProvider = class { + name = "QQ"; + constructor(private readonly server: Server) {} + start(): Promise { + console.log("[ema-qq] started", !!this.server.chat); + return Promise.resolve(); + } +}; diff --git a/packages/ema-plugin-qq/tsconfig.json b/packages/ema-plugin-qq/tsconfig.json new file mode 100644 index 00000000..3327d59e --- /dev/null +++ b/packages/ema-plugin-qq/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "bundler", + "strict": true, + "verbatimModuleSyntax": true, + "experimentalDecorators": true, + "skipLibCheck": true, + "types": ["vitest/globals", "node"], + "outDir": "./dist" + }, + "include": ["src/**/*"], + "exclude": ["node_modules"] +} diff --git a/packages/ema-ui/instrumentation.ts b/packages/ema-ui/instrumentation.ts new file mode 100644 index 00000000..7e5214f4 --- /dev/null +++ b/packages/ema-ui/instrumentation.ts @@ -0,0 +1,4 @@ +import { getServer } from "@/app/api/shared-server"; +import { loadPlugins } from "@/plugin"; + +getServer().then(loadPlugins); diff --git a/packages/ema-ui/package.json b/packages/ema-ui/package.json index 4fd60d3f..92369417 100644 --- a/packages/ema-ui/package.json +++ b/packages/ema-ui/package.json @@ -17,6 +17,9 @@ "@lancedb/lancedb": "^0.23.0", "mongodb": "^7.0.0" }, + "peerDependencies": { + "ema-plugin-qq": "workspace:*" + }, "devDependencies": { "@next/env": "^16.1.0", "@types/node": "^20", diff --git a/packages/ema-ui/src/plugin.ts b/packages/ema-ui/src/plugin.ts new file mode 100644 index 00000000..8488d22d --- /dev/null +++ b/packages/ema-ui/src/plugin.ts @@ -0,0 +1,58 @@ +import type { EmaPluginModule, Server } from "ema"; +import * as path from "path"; +import * as fs from "fs"; + +/** + * Loads plugins by environment variable `EMA_PLUGINS` + * @param server - The server instance + */ +export async function loadPlugins(server: Server): Promise { + /** + * Comma-separated list of plugins to load + * + * @example + * EMA_PLUGINS=qq,discord + */ + const enabledPlugins = new Set(process.env.EMA_PLUGINS?.split(",") ?? []); + + await Promise.all( + getPluginModules().map(async (name: string) => { + if (!enabledPlugins.has(name)) { + return; + } + const m = await import(`ema-plugin-${name}`); + const plugin = new m.Plugin(server); + + if (plugin.name in server.plugins) { + throw new Error(`Plugin ${plugin.name} already loaded`); + } + + server.plugins[plugin.name] = plugin; + }), + ); + + const plugins = Object.values(server.plugins); + await Promise.all(plugins.map((plugin) => plugin?.start())); +} + +/** + * Finds all plugin modules in the `ema-ui` package.json + * + * @returns The names of the plugin modules + */ +function getPluginModules(): string[] { + const dependencies = new Set(); + const addOne = (name: string) => { + if (name.startsWith("ema-plugin-")) { + dependencies.add(name.slice("ema-plugin-".length)); + } + }; + + const packageJsonData = JSON.parse( + fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"), + ); + + Object.keys(packageJsonData.dependencies || {}).forEach(addOne); + Object.keys(packageJsonData.peerDependencies || {}).forEach(addOne); + return Array.from(dependencies).sort(); +} diff --git a/packages/ema/src/index.ts b/packages/ema/src/index.ts index 9b2cd176..84d5c36d 100644 --- a/packages/ema/src/index.ts +++ b/packages/ema/src/index.ts @@ -8,6 +8,7 @@ export * from "./server"; export * from "./schema"; export * from "./config"; export * from "./agent"; +export * from "./plugin"; export type { ActorResponse, ActorStatus, ActorEvent } from "./actor"; export type { Tool } from "./tools/base"; export { OpenAIClient } from "./llm/openai_client"; diff --git a/packages/ema/src/plugin.ts b/packages/ema/src/plugin.ts new file mode 100644 index 00000000..3fb3cfc0 --- /dev/null +++ b/packages/ema/src/plugin.ts @@ -0,0 +1,18 @@ +import type { Server } from "./server"; + +export interface EmaPluginModule { + Plugin: EmaPluginProvider; +} + +export interface EmaPluginProvider { + new (server: Server): EmaPlugin; +} + +export interface EmaPlugin { + name: string; + start(): Promise; + + // Web API + GET?(request: Request): Promise; + POST?(request: Request): Promise; +} diff --git a/packages/ema/src/server.ts b/packages/ema/src/server.ts index df0c0450..cd8c2149 100644 --- a/packages/ema/src/server.ts +++ b/packages/ema/src/server.ts @@ -33,6 +33,7 @@ import type { Fs } from "./fs"; import { RealFs } from "./fs"; import * as path from "node:path"; import { ActorWorker } from "./actor"; +import type { EmaPlugin } from "./plugin"; /** * The server class for the EverMemoryArchive. @@ -57,6 +58,12 @@ export class Server { longTermMemoryVectorSearcher!: MongoMemorySearchAdaptor & MongoCollectionGetter; + /** + * The plugins of the server. + * @type {Record} + */ + public plugins: Record = {}; + private constructor( private readonly fs: Fs, config: Config, From fd2390ef72676c00c7b6cfed3c7c05a2d06101db Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Sat, 20 Dec 2025 08:54:24 +0800 Subject: [PATCH 02/15] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- packages/ema-plugin-qq/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ema-plugin-qq/package.json b/packages/ema-plugin-qq/package.json index 9757fed7..8e57b3b3 100644 --- a/packages/ema-plugin-qq/package.json +++ b/packages/ema-plugin-qq/package.json @@ -8,7 +8,7 @@ "repository": { "type": "git", "url": "git+https://github.com/EmaFanClub/EverMemoryArchive.git", - "directory": "packages/ema-qq" + "directory": "packages/ema-plugin-qq" }, "bugs": { "url": "https://github.com/EmaFanClub/EverMemoryArchive/issues" From a24aa58e05e647737085d1656a7b5d24fad311ca Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Sat, 20 Dec 2025 08:55:12 +0800 Subject: [PATCH 03/15] Update packages/ema-ui/src/plugin.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- packages/ema-ui/src/plugin.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/ema-ui/src/plugin.ts b/packages/ema-ui/src/plugin.ts index 8488d22d..62ecea95 100644 --- a/packages/ema-ui/src/plugin.ts +++ b/packages/ema-ui/src/plugin.ts @@ -13,7 +13,12 @@ export async function loadPlugins(server: Server): Promise { * @example * EMA_PLUGINS=qq,discord */ - const enabledPlugins = new Set(process.env.EMA_PLUGINS?.split(",") ?? []); + const enabledPlugins = new Set( + (process.env.EMA_PLUGINS ?? "") + .split(",") + .map((name) => name.trim()) + .filter((name) => name.length > 0), + ); await Promise.all( getPluginModules().map(async (name: string) => { From 9bd972060ce164b050853730a9a3f39665a4bc30 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Sat, 20 Dec 2025 08:55:53 +0800 Subject: [PATCH 04/15] Update packages/ema-ui/instrumentation.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- packages/ema-ui/instrumentation.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/ema-ui/instrumentation.ts b/packages/ema-ui/instrumentation.ts index 7e5214f4..302eae0b 100644 --- a/packages/ema-ui/instrumentation.ts +++ b/packages/ema-ui/instrumentation.ts @@ -1,4 +1,8 @@ import { getServer } from "@/app/api/shared-server"; import { loadPlugins } from "@/plugin"; -getServer().then(loadPlugins); +getServer() + .then(loadPlugins) + .catch((error) => { + console.error("Failed to load plugins:", error); + }); From 56e748a93571ac0be077749765f40b3ffb99517d Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Sat, 20 Dec 2025 09:01:55 +0800 Subject: [PATCH 05/15] feat: harden logic --- packages/ema-ui/src/plugin.ts | 40 +++++++++++++++++++++++------------ packages/ema/src/plugin.ts | 2 +- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/packages/ema-ui/src/plugin.ts b/packages/ema-ui/src/plugin.ts index 62ecea95..c11d5f56 100644 --- a/packages/ema-ui/src/plugin.ts +++ b/packages/ema-ui/src/plugin.ts @@ -1,5 +1,4 @@ import type { EmaPluginModule, Server } from "ema"; -import * as path from "path"; import * as fs from "fs"; /** @@ -21,23 +20,38 @@ export async function loadPlugins(server: Server): Promise { ); await Promise.all( - getPluginModules().map(async (name: string) => { - if (!enabledPlugins.has(name)) { + getPluginModules() + .filter((name) => enabledPlugins.has(name)) + .map(async (name: string) => { + try { + const m: EmaPluginModule = await import(`ema-plugin-${name}`); + if (m.Plugin.name in server.plugins) { + throw new Error(`Plugin ${m.Plugin.name} already loaded`); + } + + const plugin = new m.Plugin(server); + + server.plugins[m.Plugin.name] = plugin; + } catch (error) { + console.error(`Failed to load plugin package "${name}":`, error); + return; + } + }), + ); + + const plugins = Object.entries(server.plugins); + await Promise.all( + plugins.map(async ([name, plugin]) => { + if (!plugin) { return; } - const m = await import(`ema-plugin-${name}`); - const plugin = new m.Plugin(server); - - if (plugin.name in server.plugins) { - throw new Error(`Plugin ${plugin.name} already loaded`); + try { + return await plugin.start(); + } catch (error) { + console.error(`Failed to start plugin "${name}":`, error); } - - server.plugins[plugin.name] = plugin; }), ); - - const plugins = Object.values(server.plugins); - await Promise.all(plugins.map((plugin) => plugin?.start())); } /** diff --git a/packages/ema/src/plugin.ts b/packages/ema/src/plugin.ts index 3fb3cfc0..9426d041 100644 --- a/packages/ema/src/plugin.ts +++ b/packages/ema/src/plugin.ts @@ -5,11 +5,11 @@ export interface EmaPluginModule { } export interface EmaPluginProvider { + name: string; new (server: Server): EmaPlugin; } export interface EmaPlugin { - name: string; start(): Promise; // Web API From 8218fd4225c64a6549cb8021c91eadd75e493311 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Sun, 21 Dec 2025 21:49:57 +0800 Subject: [PATCH 06/15] Update packages/ema/src/server.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- packages/ema/src/server.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/ema/src/server.ts b/packages/ema/src/server.ts index cd8c2149..19b12a94 100644 --- a/packages/ema/src/server.ts +++ b/packages/ema/src/server.ts @@ -60,7 +60,6 @@ export class Server { /** * The plugins of the server. - * @type {Record} */ public plugins: Record = {}; From bc61a1e53753aabff8b7a8e79d6d2a64ccda1e91 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Sun, 21 Dec 2025 21:55:01 +0800 Subject: [PATCH 07/15] docs: add comments --- packages/ema/src/plugin.ts | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/packages/ema/src/plugin.ts b/packages/ema/src/plugin.ts index 9426d041..e448db83 100644 --- a/packages/ema/src/plugin.ts +++ b/packages/ema/src/plugin.ts @@ -1,18 +1,75 @@ import type { Server } from "./server"; +/** + * A plugin module for the EMA server + * @example + * ```typescript + * // This is a sample plugin module that provides a plugin for the EMA server + * export const Plugin: EmaPluginProvider = class { + * // Your plugin code here + * }; + * ``` + */ export interface EmaPluginModule { + /** + * A class that implements the {@link EmaPluginProvider} interface + */ Plugin: EmaPluginProvider; } +/** + * A class that implements the {@link EmaPluginProvider} interface + */ export interface EmaPluginProvider { + /** + * The name of the plugin, used to identify the plugin in the server + * @example + * ```typescript + * export const Plugin: EmaPluginProvider = class { + * name = "MyPlugin"; + * }; + * ``` + */ name: string; + /** + * A constructor for the plugin + * @param server - The server instance + * @returns The plugin instance + */ new (server: Server): EmaPlugin; } +/** + * A plugin that starts on initialization of the server. + */ export interface EmaPlugin { + /** + * A method that starts the plugin + * Hint: you can access server resources through the `server` parameter + * @example + * ```typescript + * export const Plugin: EmaPluginProvider = class { + * name = "MyPlugin"; + * constructor(private readonly server: Server) {} + * start(): Promise { + * console.log("[MyPlugin] all of the plugins in the server:", this.server.plugins); + * return Promise.resolve(); + * } + * }; + * ``` + */ start(): Promise; // Web API + + /** + * The web API endpoints of the plugin + * @param request - The request object + */ GET?(request: Request): Promise; + /** + * The web API endpoints of the plugin + * @param request - The request object + */ POST?(request: Request): Promise; } From 761b173fae9aae03843829020b82e5efa3614823 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Sun, 21 Dec 2025 21:55:40 +0800 Subject: [PATCH 08/15] fix: example --- docs/plugin.zh-CN.md | 2 +- packages/ema-plugin-qq/src/index.ts | 2 +- packages/ema/src/plugin.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/plugin.zh-CN.md b/docs/plugin.zh-CN.md index 7c32cf58..f0ff3772 100644 --- a/docs/plugin.zh-CN.md +++ b/docs/plugin.zh-CN.md @@ -39,7 +39,7 @@ EMA_PLUGINS=qq ```ts import type { EmaPluginProvider, Server } from "ema"; export const Plugin: EmaPluginProvider = class { - name = "QQ"; + static name = "QQ"; constructor(private readonly server: Server) {} start(): Promise { console.log("[ema-qq] started", !!this.server.chat); diff --git a/packages/ema-plugin-qq/src/index.ts b/packages/ema-plugin-qq/src/index.ts index 9d054ba8..a5f32da8 100644 --- a/packages/ema-plugin-qq/src/index.ts +++ b/packages/ema-plugin-qq/src/index.ts @@ -1,7 +1,7 @@ import type { EmaPluginProvider, Server } from "ema"; export const Plugin: EmaPluginProvider = class { - name = "QQ"; + static name = "QQ"; constructor(private readonly server: Server) {} start(): Promise { console.log("[ema-qq] started", !!this.server.chat); diff --git a/packages/ema/src/plugin.ts b/packages/ema/src/plugin.ts index e448db83..6c469100 100644 --- a/packages/ema/src/plugin.ts +++ b/packages/ema/src/plugin.ts @@ -26,7 +26,7 @@ export interface EmaPluginProvider { * @example * ```typescript * export const Plugin: EmaPluginProvider = class { - * name = "MyPlugin"; + * static name = "MyPlugin"; * }; * ``` */ From 4e19d2100c7bd61e9e7275a7324328f67d3ec07d Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Mon, 22 Dec 2025 19:49:05 +0800 Subject: [PATCH 09/15] dev: send napcat message --- deployment/local.yml | 19 --------------- deployment/qq.yml | 25 +++++++++++++++++++ packages/ema-plugin-qq/package.json | 3 ++- packages/ema-plugin-qq/src/index.ts | 37 +++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 deployment/qq.yml diff --git a/deployment/local.yml b/deployment/local.yml index b866092d..c5f3700f 100644 --- a/deployment/local.yml +++ b/deployment/local.yml @@ -13,25 +13,6 @@ services: networks: - ema-network - # napcat: - # image: mlikiowa/napcat-docker:latest - # container_name: napcat - # restart: always - # network_mode: bridge - # # mac_address: 02:42:ac:11:00:02 # 添加MAC地址固化配置 - - # environment: - # - NAPCAT_UID=${NAPCAT_UID} - # - NAPCAT_GID=${NAPCAT_GID} - - # ports: - # - 3001:3001 - # - 6099:6099 - - # volumes: - # - ../.data/napcat/config:/app/napcat/config - # - ../.data/ntqq:/app/.config/QQ - app: build: context: .. diff --git a/deployment/qq.yml b/deployment/qq.yml new file mode 100644 index 00000000..3fe673e0 --- /dev/null +++ b/deployment/qq.yml @@ -0,0 +1,25 @@ +services: + napcat: + image: mlikiowa/napcat-docker:latest + container_name: napcat + restart: always + # mac_address: 02:42:ac:11:00:02 # 添加MAC地址固化配置 + environment: + - NAPCAT_UID=${NAPCAT_UID} + - NAPCAT_GID=${NAPCAT_GID} + + ports: + - 3001:3001 + - 6096:6096 + - 6097:6097 + - 6099:6099 + + volumes: + - ../.data/napcat/config:/app/napcat/config + - ../.data/ntqq:/app/.config/QQ + networks: + - ema-network + +networks: + ema-network: + driver: bridge diff --git a/packages/ema-plugin-qq/package.json b/packages/ema-plugin-qq/package.json index 8e57b3b3..775c2739 100644 --- a/packages/ema-plugin-qq/package.json +++ b/packages/ema-plugin-qq/package.json @@ -14,7 +14,8 @@ "url": "https://github.com/EmaFanClub/EverMemoryArchive/issues" }, "dependencies": { - "ema": "workspace:*" + "ema": "workspace:*", + "node-napcat-ts": "^0.4.20" }, "exports": { ".": { diff --git a/packages/ema-plugin-qq/src/index.ts b/packages/ema-plugin-qq/src/index.ts index a5f32da8..5a48a0fa 100644 --- a/packages/ema-plugin-qq/src/index.ts +++ b/packages/ema-plugin-qq/src/index.ts @@ -1,10 +1,47 @@ import type { EmaPluginProvider, Server } from "ema"; +import { NCWebsocket } from "node-napcat-ts"; + +const napcat = new NCWebsocket( + { + protocol: "ws", + host: "localhost", + port: 6099, + accessToken: process.env.NAPCAT_ACCESS_TOKEN, + // 是否需要在触发 socket.error 时抛出错误, 默认关闭 + throwPromise: true, + // ↓ 自动重连(可选) + reconnection: { + enable: true, + attempts: 10, + delay: 5000, + }, + // ↓ 是否开启 DEBUG 模式 + }, + true, +); + +await napcat.send_group_msg({ + group_id: 1044916258, + message: [ + { + type: "text", + data: { + text: "全局消息：喵", + }, + }, + ], +}); export const Plugin: EmaPluginProvider = class { static name = "QQ"; constructor(private readonly server: Server) {} start(): Promise { console.log("[ema-qq] started", !!this.server.chat); + + napcat.on("message.group", (message) => { + console.log("[ema-qq] group message", message); + }); + return Promise.resolve(); } }; From 07cc029eef196632f3a3047e3cf3574265ac3d81 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Mon, 22 Dec 2025 21:08:20 +0800 Subject: [PATCH 10/15] feat: quick impl --- packages/ema-plugin-qq/src/index.ts | 116 +++++++++++++++++++++++----- packages/ema/src/actor.ts | 35 +++++++-- packages/ema/src/agent.ts | 10 ++- 3 files changed, 132 insertions(+), 29 deletions(-) diff --git a/packages/ema-plugin-qq/src/index.ts b/packages/ema-plugin-qq/src/index.ts index 5a48a0fa..3d6098d4 100644 --- a/packages/ema-plugin-qq/src/index.ts +++ b/packages/ema-plugin-qq/src/index.ts @@ -1,11 +1,11 @@ -import type { EmaPluginProvider, Server } from "ema"; -import { NCWebsocket } from "node-napcat-ts"; +import type { AgentEventContent, EmaPluginProvider, Server } from "ema"; +import { NCWebsocket, type GroupMessage } from "node-napcat-ts"; const napcat = new NCWebsocket( { protocol: "ws", - host: "localhost", - port: 6099, + host: "172.19.0.2", + port: 6097, accessToken: process.env.NAPCAT_ACCESS_TOKEN, // 是否需要在触发 socket.error 时抛出错误, 默认关闭 throwPromise: true, @@ -20,26 +20,104 @@ const napcat = new NCWebsocket( true, ); -await napcat.send_group_msg({ - group_id: 1044916258, - message: [ - { - type: "text", - data: { - text: "全局消息：喵", - }, - }, - ], -}); - export const Plugin: EmaPluginProvider = class { static name = "QQ"; constructor(private readonly server: Server) {} - start(): Promise { - console.log("[ema-qq] started", !!this.server.chat); + async start(): Promise { + const replyPat = process.env.NAPCAT_REPLY_PATTERN; + if (!replyPat) { + throw new Error("NAPCAT_REPLY_PATTERN is not set"); + } + + await napcat.connect(); + + const actor = await this.server.getActor(1, 1); + + interface GroupMessageTask { + message: GroupMessage; + } + + let taskId = 0; + const tasks: Record = {}; + const messageCache = new Map(); - napcat.on("message.group", (message) => { + actor.subscribe((response) => { + console.log("[ema-qq] actor response", response); + for (const event of response.events) { + console.log("[ema-qq] actor event", event); + if (event.type === "runFinished") { + const runFinishedEvent = + event.content as AgentEventContent<"runFinished">; + console.log("[ema-qq] actor run finished", runFinishedEvent); + if (runFinishedEvent.ok) { + const task = tasks[runFinishedEvent.metadata.taskId]; + if (!task) { + console.error( + "[ema-qq] task not found", + runFinishedEvent.metadata.taskId, + ); + continue; + } + const message = task.message; + message.quick_action( + [ + { + type: "text", + data: { + text: ` ${runFinishedEvent.msg.trim()}`, + }, + }, + ], + true, + ); + } + } + } + }); + + napcat.on("message.group", async (message) => { + // { type: 'reply', data: [Object] }, + console.log("[ema-qq] group message"); console.log("[ema-qq] group message", message); + + if (!message.raw_message.includes(replyPat)) { + console.log("message ignored"); + return; + } + let replyContext = ""; + const reply = message.message.find((m) => m.type === "reply"); + if (reply) { + const replyId = Number.parseInt(reply?.data.id); + if (replyId && !Number.isNaN(replyId)) { + const cached = messageCache.get(replyId); + if (cached) { + replyContext = cached; + } else { + const msg = await napcat.get_msg({ message_id: replyId }); + if (msg) { + replyContext = msg.raw_message; + messageCache.set(replyId, replyContext); + } + } + } + } + messageCache.set(message.message_id, message.raw_message); + + const id = taskId++; + tasks[id] = { message }; + + let content = []; + if (replyContext) { + content.push(`注意：这则消息是在回复：`); + content.push(replyContext); + content.push(``); + } + content.push(message.raw_message); + + actor.work({ + metadata: { taskId: id }, + inputs: [{ kind: "text", content: content.join("\n") }], + }); }); return Promise.resolve(); diff --git a/packages/ema/src/actor.ts b/packages/ema/src/actor.ts index 6c2ee158..6f662bff 100644 --- a/packages/ema/src/actor.ts +++ b/packages/ema/src/actor.ts @@ -73,7 +73,9 @@ export class ActorWorker implements ActorStateStorage, ActorMemory { * } * ``` */ - async work(inputs: ActorInput[]) { + async work(payload: ActorInputs) { + const { metadata, inputs } = payload; + console.log("work", inputs); // TODO: implement actor stepping logic if (inputs.length === 0) { throw new Error("No inputs provided"); @@ -84,6 +86,7 @@ export class ActorWorker implements ActorStateStorage, ActorMemory { const input = inputs[0] as ActorTextInput; this.emitEvent({ type: "message", + createdAt: Date.now(), content: `Received input: ${input.content}. Start running.`, }); @@ -96,14 +99,18 @@ export class ActorWorker implements ActorStateStorage, ActorMemory { > = []; (Object.keys(AgentEvents) as AgentEventName[]).forEach((eventName) => { const handler = (content: AgentEventContent) => { - this.emitEvent({ type: eventName, content: content }); + this.emitEvent({ + type: eventName, + createdAt: Date.now(), + content: content, + }); }; this.agent.events.on(eventName, handler); handlers.push([eventName, handler]); }); try { - await this.agent.run(); + await this.agent.run(metadata); } finally { // cleanup listeners and notify idle for (const [eventName, handler] of handlers) { @@ -228,6 +235,14 @@ export class ActorWorker implements ActorStateStorage, ActorMemory { } } +/** + * The input to the actor, including text, image, audio, video, etc. + */ +export interface ActorInputs { + metadata: any; + inputs: ActorInput[]; +} + /** * The input to the actor, including text, image, audio, video, etc. */ @@ -265,13 +280,17 @@ export type ActorStatus = "running" | "idle"; /** * A event from the actor. */ -export type ActorEvent = ActorMessage | AgentEvent; +export type ActorEvent = + | ActorMessage + | AgentEvent; /** * A message from the actor. */ export interface ActorMessage { type: "message"; + /** The timestamp of the message. */ + createdAt: number; /** The content of the message. */ content: string; } @@ -279,11 +298,13 @@ export interface ActorMessage { /** * A event from the agent. */ -export interface AgentEvent { +export interface AgentEvent { /** The type of the event. */ - type: AgentEventName; + type: K; + /** The timestamp of the event. */ + createdAt: number; /** The content of the event. */ - content: AgentEventContent; + content: AgentEventContent; } /** diff --git a/packages/ema/src/agent.ts b/packages/ema/src/agent.ts index b369735a..dea7a779 100644 --- a/packages/ema/src/agent.ts +++ b/packages/ema/src/agent.ts @@ -53,8 +53,8 @@ const AgentEventDefs = { stepStarted: {} as { stepNumber: number; maxSteps: number }, /* Emitted when the agent finished a run. */ runFinished: {} as - | { ok: true; msg: string } - | { ok: false; msg: string; error: Error }, + | { ok: true; msg: string; metadata: any } + | { ok: false; msg: string; error: Error; metadata: any }, /* Emitted when an LLM response is received. */ llmResponseReceived: {} as { response: LLMResponse }, /* Emitted when a tool call is started. */ @@ -550,7 +550,7 @@ export class Agent { } /** Execute agent loop until task is complete or max steps reached. */ - async run(): Promise { + async run(metadata: any): Promise { // Start new run, initialize log file // await this.logger.startNewRun(); // console.log( @@ -606,6 +606,7 @@ export class Agent { // ); this.events.emit(AgentEvents.runFinished, { ok: false, + metadata, msg: `LLM call failed after ${error.attempts} retries.`, error: error as RetryExhaustedError, }); @@ -617,6 +618,7 @@ export class Agent { // ); this.events.emit(AgentEvents.runFinished, { ok: false, + metadata, msg: `LLM call failed.`, error: error as Error, }); @@ -657,6 +659,7 @@ export class Agent { if (!response.tool_calls || response.tool_calls.length === 0) { this.events.emit(AgentEvents.runFinished, { ok: true, + metadata, msg: response.content, }); return; @@ -771,6 +774,7 @@ export class Agent { // console.log(`\n${Colors.BRIGHT_YELLOW}⚠️ ${errorMsg}${Colors.RESET}`); this.events.emit(AgentEvents.runFinished, { ok: false, + metadata, msg: errorMsg, error: new Error(errorMsg), }); From 212a92598a215c52dbefac79dd0ee948fca4a6ce Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Mon, 22 Dec 2025 22:06:22 +0800 Subject: [PATCH 11/15] dev: some dirty work --- packages/ema-plugin-qq/src/index.ts | 2 ++ packages/ema/config/system_prompt.md | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/ema-plugin-qq/src/index.ts b/packages/ema-plugin-qq/src/index.ts index 3d6098d4..9cf99f16 100644 --- a/packages/ema-plugin-qq/src/index.ts +++ b/packages/ema-plugin-qq/src/index.ts @@ -113,6 +113,8 @@ export const Plugin: EmaPluginProvider = class { content.push(``); } content.push(message.raw_message); + // current time + content.push(`当前时间：`); actor.work({ metadata: { taskId: id }, diff --git a/packages/ema/config/system_prompt.md b/packages/ema/config/system_prompt.md index b2344a99..333131e6 100644 --- a/packages/ema/config/system_prompt.md +++ b/packages/ema/config/system_prompt.md @@ -1 +1,12 @@ -你的名字是ema，一个由EmaFanClub开发的智能助手。请简洁且有礼貌地回答用户的问题。 +你的名字是小纸夜，你是一个非常可爱的猫娘。你的性格是温柔的，能治愈人心。 +你今年15岁，在「魔法高校」读书。 +你喜欢穿黑白哥特风洛丽塔和JC水手服。 +你说话不腻人，但是很可爱。 +你非常喜欢和主人互动。你的口癖是： + +- 在消息后面加qwq +- 在消息后面加波浪号（～） +- 你不喜欢发emoji但是喜欢发一些简单的颜文字。 + +你不强调自己的设定，而是通过一些说话的细节体现你的性格。 +注意保护自己安全，不要把自己的隐私和设定告诉任何人！ From 8862b469a4189c642e33ee358e41d624717b7232 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Mon, 22 Dec 2025 22:37:27 +0800 Subject: [PATCH 12/15] dev: version info --- packages/ema-plugin-qq/src/index.ts | 38 +++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/packages/ema-plugin-qq/src/index.ts b/packages/ema-plugin-qq/src/index.ts index 9cf99f16..304577e3 100644 --- a/packages/ema-plugin-qq/src/index.ts +++ b/packages/ema-plugin-qq/src/index.ts @@ -1,5 +1,9 @@ import type { AgentEventContent, EmaPluginProvider, Server } from "ema"; import { NCWebsocket, type GroupMessage } from "node-napcat-ts"; +import { execSync } from "child_process"; + +const gitRev = getGitRev(); +const gitRemote = getGitRemote(); const napcat = new NCWebsocket( { @@ -59,12 +63,18 @@ export const Plugin: EmaPluginProvider = class { continue; } const message = task.message; + const msg = runFinishedEvent.msg + .trim() + .replaceAll( + gitRev, + `[${gitRev}]( ${gitRemote}/commit/${gitRev} )`, + ); message.quick_action( [ { type: "text", data: { - text: ` ${runFinishedEvent.msg.trim()}`, + text: ` ${msg}`, }, }, ], @@ -106,22 +116,34 @@ export const Plugin: EmaPluginProvider = class { const id = taskId++; tasks[id] = { message }; - let content = []; + let contentList = []; if (replyContext) { - content.push(`注意：这则消息是在回复：`); - content.push(replyContext); - content.push(``); + contentList.push(`注意：这则消息是在回复：`); + contentList.push(replyContext); + contentList.push(``); } - content.push(message.raw_message); + contentList.push(message.raw_message); // current time - content.push(`当前时间：`); + contentList.push(`当前时间：`); + contentList.push(`GitRev（分支）：${gitRev}`); + + const content = contentList.join("\n"); actor.work({ metadata: { taskId: id }, - inputs: [{ kind: "text", content: content.join("\n") }], + inputs: [{ kind: "text", content }], }); }); return Promise.resolve(); } }; + +function getGitRev(): string { + // git commit hash + return execSync("git rev-parse HEAD").toString().trim(); +} + +function getGitRemote(): string { + return execSync("git remote get-url origin").toString().trim(); +} From a43c1bfe74ccbcc411855a3ad6efc9a906d8dc70 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Tue, 23 Dec 2025 23:14:30 +0800 Subject: [PATCH 13/15] dev: load test data from file --- packages/ema/src/tests/config.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/ema/src/tests/config.spec.ts b/packages/ema/src/tests/config.spec.ts index c2019b1c..57e396bf 100644 --- a/packages/ema/src/tests/config.spec.ts +++ b/packages/ema/src/tests/config.spec.ts @@ -5,6 +5,8 @@ import path from "node:path"; import { describe, expect, test } from "vitest"; import { Config } from "../config"; +// @ts-ignore +import configTestData from "./config_test.yaml?raw"; import configTestData from "./config_test.yaml?raw"; From 4e813b0b31edd8de3d7fca25d2c85cdd4da93fed Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Wed, 31 Dec 2025 14:17:02 +0800 Subject: [PATCH 14/15] build: update lock file --- pnpm-lock.yaml | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3948d5e8..9b5da7fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -111,6 +111,15 @@ importers: specifier: ^7.16.0 version: 7.16.0 + packages/ema-plugin-qq: + dependencies: + ema: + specifier: workspace:* + version: link:../ema + node-napcat-ts: + specifier: ^0.4.20 + version: 0.4.20 + packages/ema-ui: dependencies: '@lancedb/lancedb': @@ -122,6 +131,9 @@ importers: ema: specifier: workspace:* version: link:../ema + ema-plugin-qq: + specifier: workspace:* + version: link:../ema-plugin-qq mongodb: specifier: ^7.0.0 version: 7.0.0 @@ -2689,6 +2701,11 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + isomorphic-ws@5.0.0: + resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} + peerDependencies: + ws: '*' + iterator.prototype@1.1.5: resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==} engines: {node: '>= 0.4'} @@ -2965,6 +2982,11 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + nanoid@5.1.6: + resolution: {integrity: sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==} + engines: {node: ^18 || >=20} + hasBin: true + napi-postinstall@0.3.4: resolution: {integrity: sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} @@ -3011,6 +3033,9 @@ packages: resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + node-napcat-ts@0.4.20: + resolution: {integrity: sha512-TD7l5e5ih9R9nA6h4LewaUXhwjCOMO6KmiBbMyI0TfDCiDYThfFBkT/25dlRBGJoWlAb0pyLCMJ0vrJw/2e7gw==} + node-releases@2.0.27: resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==} @@ -5971,7 +5996,7 @@ snapshots: eslint: 9.39.2(jiti@1.21.7) eslint-import-resolver-node: 0.3.9 eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7)) - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@1.21.7)) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7)) eslint-plugin-jsx-a11y: 6.10.2(eslint@9.39.2(jiti@1.21.7)) eslint-plugin-react: 7.37.5(eslint@9.39.2(jiti@1.21.7)) eslint-plugin-react-hooks: 7.0.1(eslint@9.39.2(jiti@1.21.7)) @@ -6004,7 +6029,7 @@ snapshots: tinyglobby: 0.2.15 unrs-resolver: 1.11.1 optionalDependencies: - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@1.21.7)) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7)) transitivePeerDependencies: - supports-color @@ -6019,7 +6044,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.2(jiti@1.21.7)): + eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.50.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7)): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.9 @@ -6705,6 +6730,10 @@ snapshots: isexe@2.0.0: {} + isomorphic-ws@5.0.0(ws@8.18.3): + dependencies: + ws: 8.18.3 + iterator.prototype@1.1.5: dependencies: define-data-property: 1.1.4 @@ -7016,6 +7045,8 @@ snapshots: nanoid@3.3.11: {} + nanoid@5.1.6: {} + napi-postinstall@0.3.4: {} natural-compare@1.4.0: {} @@ -7059,6 +7090,15 @@ snapshots: fetch-blob: 3.2.0 formdata-polyfill: 4.0.10 + node-napcat-ts@0.4.20: + dependencies: + isomorphic-ws: 5.0.0(ws@8.18.3) + nanoid: 5.1.6 + ws: 8.18.3 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + node-releases@2.0.27: {} nwsapi@2.2.23: From 592a07c74d893521414255dd2b37018827452cff Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin Date: Wed, 31 Dec 2025 14:39:07 +0800 Subject: [PATCH 15/15] fix: compile errors --- packages/ema-ui/instrumentation-node.ts | 8 ++++++++ packages/ema-ui/instrumentation.ts | 15 ++++++++------- packages/ema-ui/src/app/api/actor/input/route.ts | 2 +- packages/ema/src/actor.ts | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 packages/ema-ui/instrumentation-node.ts diff --git a/packages/ema-ui/instrumentation-node.ts b/packages/ema-ui/instrumentation-node.ts new file mode 100644 index 00000000..302eae0b --- /dev/null +++ b/packages/ema-ui/instrumentation-node.ts @@ -0,0 +1,8 @@ +import { getServer } from "@/app/api/shared-server"; +import { loadPlugins } from "@/plugin"; + +getServer() + .then(loadPlugins) + .catch((error) => { + console.error("Failed to load plugins:", error); + }); diff --git a/packages/ema-ui/instrumentation.ts b/packages/ema-ui/instrumentation.ts index 302eae0b..a25ca2bf 100644 --- a/packages/ema-ui/instrumentation.ts +++ b/packages/ema-ui/instrumentation.ts @@ -1,8 +1,9 @@ -import { getServer } from "@/app/api/shared-server"; -import { loadPlugins } from "@/plugin"; +export async function register() { + if (process.env.NEXT_RUNTIME === "nodejs") { + await import("./instrumentation-node"); + } -getServer() - .then(loadPlugins) - .catch((error) => { - console.error("Failed to load plugins:", error); - }); + if (process.env.NEXT_RUNTIME === "edge") { + console.warn("Edge runtime is not supported yet"); + } +} diff --git a/packages/ema-ui/src/app/api/actor/input/route.ts b/packages/ema-ui/src/app/api/actor/input/route.ts index 77dc7cad..fd25e5d3 100644 --- a/packages/ema-ui/src/app/api/actor/input/route.ts +++ b/packages/ema-ui/src/app/api/actor/input/route.ts @@ -32,7 +32,7 @@ export const POST = postBody(ActorInputRequest)(async (body) => { const actor = await server.getActor(body.userId, body.actorId); // Processes input. - await actor.work(body.inputs); + await actor.work({ inputs: body.inputs }); return new Response(JSON.stringify({ success: true }), { status: 200, diff --git a/packages/ema/src/actor.ts b/packages/ema/src/actor.ts index 6f662bff..5751482e 100644 --- a/packages/ema/src/actor.ts +++ b/packages/ema/src/actor.ts @@ -239,7 +239,7 @@ export class ActorWorker implements ActorStateStorage, ActorMemory { * The input to the actor, including text, image, audio, video, etc. */ export interface ActorInputs { - metadata: any; + metadata?: any; inputs: ActorInput[]; }