@zhin.js/adapter-milky 6.0.2 → 6.0.5

package/src/wss-endpoint.ts

@@ -2,10 +2,14 @@
  * Milky reverse WSS endpoint — httpHostToken WS upgrade inbound + baseUrl HTTP API outbound.
  */
 import { clearInterval } from 'node:timers';
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type {
+  EndpointInstance,
+  EndpointManagement,
+  EndpointSendRequest,
+} from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, WsConnection } from '@zhin.js/host-http';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { verifyMilkyAccessToken } from './milky-auth.js';
 import { createMilkyEndpointManagement } from './endpoint-management.js';
@@ -17,10 +21,10 @@ import {
   formatInboundContent,
   formatInboundMessageId,
   formatInboundSegments,
-  formatInboundTarget,
   formatOutboundMessageId,
   formatOutboundSegments,
   isMentioned,
+  milkyInboundConversation,
   parseMessageReceiveData,
   parseMilkyMessageId,
   senderNickname,
@@ -30,7 +34,6 @@ import {
 } from './protocol.js';
 import type { MilkyWsSocket } from './ws-types.js';
 
-const logger = getLogger('milky');
 const WS_OPEN = 1;
 
 export interface MilkyWssEndpointOptions {
@@ -42,6 +45,8 @@ export interface MilkyWssEndpointOptions {
 }
 
 export class MilkyWssEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: MilkyWssEndpointOptions;
   readonly #callApi: typeof callApi;
   readonly management: EndpointManagement = createMilkyEndpointManagement(this);
@@ -53,6 +58,7 @@ export class MilkyWssEndpoint implements EndpointInstance {
   #unregisterAgent?: () => void;
 
   constructor(options: MilkyWssEndpointOptions) {
+    this.#logger = getAdapterLogger('milky', options.config.id);
     this.#options = options;
     this.#callApi = options.callApi ?? callApi;
   }
@@ -60,14 +66,14 @@ export class MilkyWssEndpoint implements EndpointInstance {
   async start(): Promise<void> {
     if (this.#started) return;
     this.#started = true;
-    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.name, this);
+    this.#unregisterAgent = registerMilkyAgentEndpoint(this.#options.config.id, this);
     const handle = this.#options.http.ws(this.#options.config.path);
     this.#wsRelease = handle.onConnection((connection) => {
       this.#acceptConnection(connection);
     });
-    logger.info(formatCompact({
+    this.#logger.info(formatCompact({
       op: 'listen',
-      endpoint: this.#options.config.name,
+      endpoint: this.#options.config.id,
       mode: 'wss',
       path: this.#options.config.path,
     }));
@@ -102,15 +108,15 @@ export class MilkyWssEndpoint implements EndpointInstance {
     this.#started = false;
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const message = formatOutboundSegments(payload);
-    const { action, params } = buildSendAction(target, message);
+    const { action, params } = buildSendAction(conversation, message);
     const data = await this.callApi(action, params) as { message_seq?: number } | undefined;
-    const messageId = formatOutboundMessageId(target, data?.message_seq);
-    logger.debug(formatCompact({
+    const messageId = formatOutboundMessageId(conversation, data?.message_seq);
+    this.#logger.debug(formatCompact({
       op: 'milky_send',
-      endpoint: this.#options.config.name,
-      target,
+      endpoint: this.#options.config.id,
+      target: `${conversation.kind}:${conversation.id}`,
       messageId,
     }));
     return messageId;
@@ -213,33 +219,32 @@ export class MilkyWssEndpoint implements EndpointInstance {
   }
 
   #admitMessage(data: MilkyIncomingMessage, event: MilkyEvent): void {
-    const target = formatInboundTarget(data);
+    const conversation = milkyInboundConversation(String(this.#options.id), data);
+    const target = `${conversation.kind}:${conversation.id}`;
     const content = formatInboundContent(data);
     const segments = formatInboundSegments(data);
     const audioUrl = extractInboundAudioUrl(data);
     const nickname = senderNickname(data);
     const mentioned = isMentioned(data, event.self_id);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: formatInboundMessageId(data) },
       content,
       segments,
-      sender: String(data.sender_id),
-      id: formatInboundMessageId(data),
+      sender: { id: String(data.sender_id) },
+      endpointId: this.#options.config.id,
+      ...(mentioned ? { mentioned: true } : {}),
       metadata: Object.freeze({
         message_scene: data.message_scene,
         peer_id: String(data.peer_id),
         sender_id: String(data.sender_id),
         message_seq: data.message_seq,
-        endpoint: this.#options.config.name,
         time: data.time ?? event.time,
         self_id: event.self_id != null ? String(event.self_id) : undefined,
         ...(nickname ? { nickname } : {}),
-        ...(mentioned ? { mentioned: true } : {}),
-        ...(audioUrl ? { audio_url: audioUrl } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'milky_gateway_receive_failed',
         target,
         error: err instanceof Error ? err.message : String(err),
@@ -268,8 +273,8 @@ export class MilkyWssEndpoint implements EndpointInstance {
     socket.on('close', () => {
       if (this.#ws === socket) this.#ws = undefined;
     });
-    logger.debug(formatCompact({
-      endpoint: this.#options.config.name,
+    this.#logger.debug(formatCompact({
+      endpoint: this.#options.config.id,
       mode: 'wss',
       peer: connection.request.socket.remoteAddress,
     }));
@@ -287,9 +292,9 @@ export class MilkyWssEndpoint implements EndpointInstance {
       const event = JSON.parse(raw) as MilkyEvent;
       this.admit(event);
     } catch (error) {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'milky_parse_failed',
-        endpoint: this.#options.config.name,
+        endpoint: this.#options.config.id,
         error: error instanceof Error ? error.message : String(error),
       }));
     }