@zhin.js/adapter-satori 5.0.12 → 6.0.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @zhin.js/adapter-satori
 
+## 6.0.0
+
+### Patch Changes
+
+- f2c532f: Expose exact per-Endpoint message operations through one validated Adapter capability model, route Core control calls through declared active capabilities, and connect existing recall, edit, reaction, and typing implementations across platform adapters.
+- Updated dependencies [b10d058]
+- Updated dependencies [f2c532f]
+  - @zhin.js/host-http@1.0.12
+  - @zhin.js/adapter@1.2.0
+  - @zhin.js/core@1.5.13
+  - zhin.js@6.0.13
+
+## 5.0.13
+
+### Patch Changes
+
+- 5969c5b: Add SideEventGateway so adapters forward notice/request/system into HandlerIndex. HandlerContext now exposes only generation-safe capabilities and prompt ports; live Endpoint escape hatches are removed.
+- Updated dependencies [5969c5b]
+- Updated dependencies [d336a3f]
+- Updated dependencies [5969c5b]
+- Updated dependencies [5969c5b]
+- Updated dependencies [974772e]
+- Updated dependencies [5969c5b]
+- Updated dependencies [2f786bd]
+- Updated dependencies [1312ca0]
+- Updated dependencies [985fa22]
+  - @zhin.js/im-contract@1.0.4
+  - @zhin.js/core@1.5.12
+  - @zhin.js/adapter@1.1.11
+  - @zhin.js/host-http@1.0.11
+  - @zhin.js/command@1.0.15
+  - zhin.js@6.0.12
+
 ## 5.0.12
 
 ### Patch Changes

package/adapters/satori.js

@@ -3,7 +3,7 @@
  * Convention entry: discover `adapters/satori.ts` → defineAdapter.
  */
 import { defineAdapter } from 'zhin.js/adapter';
-import { messageGatewayToken } from '@zhin.js/core/runtime';
+import { messageGatewayToken, sideEventGatewayToken } from '@zhin.js/core/runtime';
 import { httpHostToken } from '@zhin.js/host-http';
 import { SatoriWebhookEndpoint, SatoriWsEndpoint } from "../lib/endpoint.js";
 import { resolveSatoriConfig, } from "../lib/protocol.js";
@@ -11,6 +11,7 @@ import { satoriRuntimeStateToken } from "../lib/satori-runtime-state.js";
 export { SatoriWebhookEndpoint, SatoriWsEndpoint } from "../lib/endpoint.js";
 export default defineAdapter({
     capabilities: ['inbound', 'outbound'],
+    operations: ['recall'],
     // Satori 协议 img/file 元素消费 url 与 base64 内联数据；无卡片交互面，交互段降级纯文本。
     segments: {
         outboundMedia: ['url', 'base64'],
@@ -19,6 +20,7 @@ export default defineAdapter({
     create(context) {
         const config = resolveSatoriConfig(context.config);
         const gateway = context.use(messageGatewayToken);
+        const sideEvents = context.use(sideEventGatewayToken);
         // 注册到插件运行时状态（satori.endpoint list 的"运行中"数据源）
         context.use(satoriRuntimeStateToken).endpoints.set(config.id, {
             id: config.id,
@@ -28,6 +30,7 @@ export default defineAdapter({
             return new SatoriWebhookEndpoint({
                 id: context.id,
                 gateway,
+                sideEvents,
                 http: context.use(httpHostToken),
                 config,
             });
@@ -35,6 +38,7 @@ export default defineAdapter({
         return new SatoriWsEndpoint({
             id: context.id,
             gateway,
+            sideEvents,
             config,
         });
     },

package/adapters/satori.ts

@@ -2,7 +2,7 @@
  * Convention entry: discover `adapters/satori.ts` → defineAdapter.
  */
 import { defineAdapter } from 'zhin.js/adapter';
-import { messageGatewayToken } from '@zhin.js/core/runtime';
+import { messageGatewayToken, sideEventGatewayToken } from '@zhin.js/core/runtime';
 import { httpHostToken } from '@zhin.js/host-http';
 import { SatoriWebhookEndpoint, SatoriWsEndpoint } from '../src/endpoint.js';
 import {
@@ -22,6 +22,7 @@ export type {
 
 export default defineAdapter<SatoriAdapterConfig>({
   capabilities: ['inbound', 'outbound'],
+  operations: ['recall'],
   // Satori 协议 img/file 元素消费 url 与 base64 内联数据；无卡片交互面，交互段降级纯文本。
   segments: {
     outboundMedia: ['url', 'base64'],
@@ -30,6 +31,7 @@ export default defineAdapter<SatoriAdapterConfig>({
   create(context) {
     const config = resolveSatoriConfig(context.config);
     const gateway = context.use(messageGatewayToken);
+    const sideEvents = context.use(sideEventGatewayToken);
     // 注册到插件运行时状态（satori.endpoint list 的"运行中"数据源）
     context.use(satoriRuntimeStateToken).endpoints.set(config.id, {
       id: config.id,
@@ -39,6 +41,7 @@ export default defineAdapter<SatoriAdapterConfig>({
       return new SatoriWebhookEndpoint({
         id: context.id,
         gateway,
+        sideEvents,
         http: context.use(httpHostToken),
         config,
       });
@@ -46,6 +49,7 @@ export default defineAdapter<SatoriAdapterConfig>({
     return new SatoriWsEndpoint({
       id: context.id,
       gateway,
+      sideEvents,
       config,
     });
   },

package/lib/endpoint.d.ts

@@ -1,8 +1,8 @@
 /**
  * SatoriEndpoint — WebSocket and webhook lifecycle, outbound, admit.
  */
-import { type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
-import type { MessageGateway } from '@zhin.js/core/runtime';
+import { type EndpointControl, type EndpointInstance, type EndpointManagement, type EndpointSendRequest } from 'zhin.js/adapter';
+import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
 import type { HttpHost } from '@zhin.js/host-http';
 import type { CapabilityId } from 'zhin.js';
 import { callSatoriApi, type ResolvedSatoriWebhookConfig, type ResolvedSatoriWsConfig, type SatoriEventBody, type SatoriLogin } from './protocol.js';
@@ -11,6 +11,7 @@ export type SatoriApiCaller = typeof callSatoriApi;
 export interface SatoriWsEndpointOptions {
     readonly id: CapabilityId;
     readonly gateway: MessageGateway;
+    readonly sideEvents?: SideEventGateway;
     readonly config: ResolvedSatoriWsConfig;
     readonly createWebSocket?: CreateSatoriWebSocket;
     readonly callApi?: SatoriApiCaller;
@@ -18,6 +19,7 @@ export interface SatoriWsEndpointOptions {
 export declare class SatoriWsEndpoint implements EndpointInstance {
     #private;
     readonly management: EndpointManagement;
+    readonly control: EndpointControl;
     constructor(options: SatoriWsEndpointOptions);
     start(): Promise<void>;
     open(): void;
@@ -26,13 +28,14 @@ export declare class SatoriWsEndpoint implements EndpointInstance {
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     /** Test / internal: admit a gateway event when the endpoint is open. */
     admit(body: SatoriEventBody): void;
-    recall(id: string): Promise<void>;
+    recall(id: string, fallbackChannelId?: string): Promise<void>;
     /** Test helper: inject a READY login without a live socket. */
     setLogin(login: SatoriLogin): void;
 }
 export interface SatoriWebhookEndpointOptions {
     readonly id: CapabilityId;
     readonly gateway: MessageGateway;
+    readonly sideEvents?: SideEventGateway;
     readonly http: HttpHost;
     readonly config: ResolvedSatoriWebhookConfig;
     readonly callApi?: SatoriApiCaller;
@@ -40,6 +43,7 @@ export interface SatoriWebhookEndpointOptions {
 export declare class SatoriWebhookEndpoint implements EndpointInstance {
     #private;
     readonly management: EndpointManagement;
+    readonly control: EndpointControl;
     constructor(options: SatoriWebhookEndpointOptions);
     /** Used by webhook handler. */
     get isOpen(): boolean;
@@ -50,7 +54,7 @@ export declare class SatoriWebhookEndpoint implements EndpointInstance {
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     admit(body: SatoriEventBody): void;
-    recall(id: string): Promise<void>;
+    recall(id: string, fallbackChannelId?: string): Promise<void>;
     /** Test helper: inject login without a live webhook push. */
     setLogin(login: SatoriLogin): void;
 }

package/lib/endpoint.js

@@ -15,6 +15,9 @@ export class SatoriWsEndpoint {
     #lastSn;
     #open = false;
     management = createSatoriEndpointManagement((resource, method, params) => this.#api(resource, method, params));
+    control = Object.freeze({
+        recall: (message) => this.recall(message.id, message.conversation.id),
+    });
     constructor(options) {
         this.#logger = getAdapterLogger('satori', options.config.id);
         this.#options = options;
@@ -114,10 +117,10 @@ export class SatoriWsEndpoint {
             }));
         });
     }
-    async recall(id) {
+    async recall(id, fallbackChannelId) {
         const { channelId, messageId } = parseMessageRef(id);
         await this.#api('message', 'delete', {
-            channel_id: channelId,
+            channel_id: channelId || fallbackChannelId || '',
             message_id: messageId,
         });
     }
@@ -248,6 +251,9 @@ export class SatoriWebhookEndpoint {
     #open = false;
     #started = false;
     management = createSatoriEndpointManagement((resource, method, params) => this.#api(resource, method, params));
+    control = Object.freeze({
+        recall: (message) => this.recall(message.id, message.conversation.id),
+    });
     constructor(options) {
         this.#logger = getAdapterLogger('satori', options.config.id);
         this.#options = options;
@@ -343,10 +349,10 @@ export class SatoriWebhookEndpoint {
             }));
         });
     }
-    async recall(id) {
+    async recall(id, fallbackChannelId) {
         const { channelId, messageId } = parseMessageRef(id);
         await this.#api('message', 'delete', {
-            channel_id: channelId,
+            channel_id: channelId || fallbackChannelId || '',
             message_id: messageId,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-satori",
-  "version": "5.0.12",
+  "version": "6.0.0",
   "description": "Zhin.js Satori adapter for Plugin Runtime (WebSocket client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -39,10 +39,10 @@
   },
   "dependencies": {
     "ws": "^8.21.1",
-    "@zhin.js/adapter": "1.1.10",
-    "@zhin.js/core": "1.5.11",
-    "@zhin.js/host-http": "1.0.10",
-    "@zhin.js/im-contract": "1.0.3",
+    "@zhin.js/adapter": "1.2.0",
+    "@zhin.js/core": "1.5.13",
+    "@zhin.js/host-http": "1.0.12",
+    "@zhin.js/im-contract": "1.0.4",
     "@zhin.js/logger": "1.0.76"
   },
   "devDependencies": {
@@ -50,14 +50,14 @@
     "@types/ws": "^8.18.1",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@zhin.js/host-http": "1.0.10",
-    "zhin.js": "6.0.11"
+    "@zhin.js/host-http": "1.0.12",
+    "zhin.js": "6.0.13"
   },
   "peerDependencies": {
-    "@zhin.js/adapter": "1.1.10",
-    "@zhin.js/command": "1.0.14",
-    "@zhin.js/core": "1.5.11",
-    "zhin.js": "6.0.11"
+    "@zhin.js/adapter": "1.2.0",
+    "@zhin.js/command": "1.0.15",
+    "@zhin.js/core": "1.5.13",
+    "zhin.js": "6.0.13"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/src/endpoint.ts

@@ -5,13 +5,14 @@ import {
   createEndpointLifecycle,
   type EndpointChannel,
   type EndpointConnectHandle,
+  type EndpointControl,
   type EndpointGroup,
   type EndpointInstance,
   type EndpointLifecycle,
   type EndpointManagement,
   type EndpointSendRequest,
 } from 'zhin.js/adapter';
-import type { MessageGateway } from '@zhin.js/core/runtime';
+import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from 'zhin.js';
@@ -48,6 +49,7 @@ export type SatoriApiCaller = typeof callSatoriApi;
 export interface SatoriWsEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
+  readonly sideEvents?: SideEventGateway;
   readonly config: ResolvedSatoriWsConfig;
   readonly createWebSocket?: CreateSatoriWebSocket;
   readonly callApi?: SatoriApiCaller;
@@ -65,6 +67,9 @@ export class SatoriWsEndpoint implements EndpointInstance {
   readonly management: EndpointManagement = createSatoriEndpointManagement(
     (resource, method, params) => this.#api(resource, method, params),
   );
+  readonly control: EndpointControl = Object.freeze<EndpointControl>({
+    recall: (message) => this.recall(message.id, message.conversation.id),
+  });
 
   constructor(options: SatoriWsEndpointOptions) {
     this.#logger = getAdapterLogger('satori', options.config.id);
@@ -167,10 +172,10 @@ export class SatoriWsEndpoint implements EndpointInstance {
     });
   }
 
-  async recall(id: string): Promise<void> {
+  async recall(id: string, fallbackChannelId?: string): Promise<void> {
     const { channelId, messageId } = parseMessageRef(id);
     await this.#api('message', 'delete', {
-      channel_id: channelId,
+      channel_id: channelId || fallbackChannelId || '',
       message_id: messageId,
     });
   }
@@ -307,6 +312,7 @@ export class SatoriWsEndpoint implements EndpointInstance {
 export interface SatoriWebhookEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
+  readonly sideEvents?: SideEventGateway;
   readonly http: HttpHost;
   readonly config: ResolvedSatoriWebhookConfig;
   readonly callApi?: SatoriApiCaller;
@@ -323,6 +329,9 @@ export class SatoriWebhookEndpoint implements EndpointInstance {
   readonly management: EndpointManagement = createSatoriEndpointManagement(
     (resource, method, params) => this.#api(resource, method, params),
   );
+  readonly control: EndpointControl = Object.freeze<EndpointControl>({
+    recall: (message) => this.recall(message.id, message.conversation.id),
+  });
 
   constructor(options: SatoriWebhookEndpointOptions) {
     this.#logger = getAdapterLogger('satori', options.config.id);
@@ -423,10 +432,10 @@ export class SatoriWebhookEndpoint implements EndpointInstance {
     });
   }
 
-  async recall(id: string): Promise<void> {
+  async recall(id: string, fallbackChannelId?: string): Promise<void> {
     const { channelId, messageId } = parseMessageRef(id);
     await this.#api('message', 'delete', {
-      channel_id: channelId,
+      channel_id: channelId || fallbackChannelId || '',
       message_id: messageId,
     });
   }