@zhin.js/adapter-satori 1.1.18 → 1.1.19

package/src/protocol.ts

@@ -1,6 +1,6 @@
 /** Satori protocol helpers. Spec: https://satori.chat/zh-CN/protocol/overview.html */
 
-import { isMediaRef, type ConversationKind, type ConversationRef } from '@zhin.js/im-contract';
+import { EndpointDeliveryError, isMediaRef, type ConversationKind, type ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('satori');
@@ -69,6 +69,7 @@ export interface SatoriApiOptions {
   readonly platform: string;
   readonly userId: string;
   readonly token?: string;
+  readonly signal?: AbortSignal;
 }
 
 export interface SatoriWireSegment {
@@ -79,6 +80,9 @@ export interface SatoriWireSegment {
 /** One endpoint config after AdapterIndex expands `plugins.<instanceKey>.endpoints`. */
 export interface SatoriEndpointConfig {
   readonly id: string;
+  /** Exact remote login selected by this configured Endpoint. */
+  readonly platform: string;
+  readonly userId: string;
   readonly connection?: 'ws' | 'webhook';
   readonly baseUrl: string;
   readonly token?: string;
@@ -91,6 +95,8 @@ export interface ResolvedSatoriWsConfig {
   readonly context: 'satori';
   readonly connection: 'ws';
   readonly id: string;
+  readonly platform: string;
+  readonly userId: string;
   readonly baseUrl: string;
   readonly token?: string;
   readonly heartbeat_interval: number;
@@ -100,6 +106,8 @@ export interface ResolvedSatoriWebhookConfig {
   readonly context: 'satori';
   readonly connection: 'webhook';
   readonly id: string;
+  readonly platform: string;
+  readonly userId: string;
   readonly baseUrl: string;
   readonly token?: string;
   readonly path: string;
@@ -110,6 +118,8 @@ export type ResolvedSatoriConfig = ResolvedSatoriWsConfig | ResolvedSatoriWebhoo
 export function resolveSatoriConfig(config: SatoriEndpointConfig): ResolvedSatoriConfig {
   const connection = config.connection ?? 'ws';
   const id = requiredEndpointField(config.id, 'id');
+  const platform = requiredEndpointField(config.platform, 'platform');
+  const userId = requiredEndpointField(config.userId, 'userId');
   const baseUrl = requiredEndpointField(config.baseUrl, 'baseUrl');
   const token = typeof config.token === 'string' && config.token.trim()
     ? config.token.trim()
@@ -121,6 +131,8 @@ export function resolveSatoriConfig(config: SatoriEndpointConfig): ResolvedSator
       context: 'satori',
       connection: 'webhook',
       id,
+      platform,
+      userId,
       baseUrl,
       token,
       path,
@@ -132,6 +144,8 @@ export function resolveSatoriConfig(config: SatoriEndpointConfig): ResolvedSator
     context: 'satori',
     connection: 'ws',
     id,
+    platform,
+    userId,
     baseUrl,
     token,
     heartbeat_interval: heartbeat,
@@ -140,7 +154,7 @@ export function resolveSatoriConfig(config: SatoriEndpointConfig): ResolvedSator
 
 function requiredEndpointField(
   value: unknown,
-  field: 'id' | 'baseUrl' | 'path',
+  field: 'id' | 'baseUrl' | 'path' | 'platform' | 'userId',
 ): string {
   if (typeof value !== 'string' || !value.trim()) {
     throw new TypeError(`Satori endpoint requires a non-empty ${field}`);
@@ -170,11 +184,14 @@ export function buildWsUrl(baseUrl: string, token?: string): string {
  * Call Satori HTTP API: POST {baseUrl}/v1/{resource}.{method}
  * @see https://satori.chat/en-US/protocol/api.html
  */
+export interface SatoriApiRequest extends SatoriApiOptions {
+  readonly resource: string;
+  readonly method: string;
+  readonly params?: Record<string, unknown>;
+}
+
 export async function callSatoriApi<T = unknown>(
-  options: SatoriApiOptions,
-  resource: string,
-  method: string,
-  params: Record<string, unknown> = {},
+  { resource, method, params = {}, ...options }: SatoriApiRequest,
 ): Promise<T> {
   const { baseUrl, platform, userId, token } = options;
   const url = `${baseUrl.replace(/\/$/, '')}/v1/${resource}.${method}`;
@@ -185,11 +202,14 @@ export async function callSatoriApi<T = unknown>(
   };
   if (token) headers.Authorization = `Bearer ${token}`;
 
-  const res = await fetch(url, {
-    method: 'POST',
-    headers,
-    body: JSON.stringify(params),
-  });
+  if (options.signal?.aborted) throw new EndpointDeliveryError('endpoint_inactive', 'Satori request ended before submission', 'not_sent', { cause: options.signal.reason });
+  const body = JSON.stringify(params);
+  let res: Response;
+  try {
+    res = await fetch(url, { method: 'POST', headers, body, signal: options.signal });
+  } catch (cause) {
+    throw new EndpointDeliveryError('delivery_unconfirmed', 'Satori HTTP request outcome is unknown', 'unknown', { cause });
+  }
 
   const text = await res.text();
   if (res.status === 401) throw new Error(`Satori API 认证失败: ${text}`);

package/lib/satori-runtime-state.d.ts

@@ -1 +0,0 @@
-export declare const satoriRuntimeStateToken: import("zhin.js").Token<import("@zhin.js/adapter").EndpointRuntimeState>;

package/lib/satori-runtime-state.js

@@ -1,6 +0,0 @@
-/**
- * Satori 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `satori endpoint` 命令共享（同一 owner generation）。
- */
-import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
-export const satoriRuntimeStateToken = defineEndpointRuntimeStateToken('satori');

package/src/satori-runtime-state.ts

@@ -1,7 +0,0 @@
-/**
- * Satori 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `satori endpoint` 命令共享（同一 owner generation）。
- */
-import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
-
-export const satoriRuntimeStateToken = defineEndpointRuntimeStateToken('satori');