@zhin.js/adapter-kook 1.1.3 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @zhin.js/adapter-kook
 
+## 1.1.4
+
+### Patch Changes
+
+- 43eda99: Unify Notice and Request payloads with their public types and runtime exports. Use camelCase fields, preserve native data under metadata, and bind canonical endpoint identity and request actions to the held generation. Remove legacy data aliases and from factories.
+
+  Keep login and lifecycle signals as independent SystemEvent payloads on system.receive, without chat conversation fields or user interaction. Update built-in adapter projections and authoring guidance.
+
+- Updated dependencies [43eda99]
+- Updated dependencies [0de4836]
+  - @zhin.js/core@1.1.39
+  - @zhin.js/permission@1.1.3
+  - @zhin.js/adapter@1.1.15
+
 ## 1.1.3
 
 ### Patch Changes

package/lib/protocol.d.ts

@@ -56,6 +56,19 @@ export interface KookWebhookEventData {
     readonly verify_token?: string;
     readonly challenge?: string;
     readonly extra?: {
+        readonly type?: string | number;
+        readonly body?: {
+            readonly user_id?: string;
+            readonly channel_id?: string;
+            readonly msg_id?: string;
+            readonly author_id?: string;
+            readonly target_id?: string;
+            readonly chat_code?: string;
+            readonly emoji?: {
+                readonly id?: string;
+                readonly name?: string;
+            };
+        };
         readonly guild_id?: string;
         readonly author?: {
             readonly id?: string;

package/lib/side-event-dispatch.js

@@ -1,4 +1,4 @@
-import { buildNotice, mapNoticeParts, senderFromId, KOOK_NOTICE_PARTS_MAP } from '@zhin.js/core';
+import { composeSideEventName, buildNotice, mapNoticeParts, senderFromId, KOOK_NOTICE_PARTS_MAP } from '@zhin.js/core';
 import { formatCompact } from '@zhin.js/logger';
 function extractKookNoticeType(raw) {
     if (!raw || typeof raw !== 'object')
@@ -20,23 +20,37 @@ export function receiveKookSideEvent(emit, configId, raw, logger) {
         return false;
     const event = raw;
     const parts = mapNoticeParts('kook', noticeType);
-    const guildId = event.extra?.guild_id;
-    const userId = event.author_id ?? event.extra?.author?.id;
-    const sceneId = guildId != null
-        ? String(guildId)
-        : userId != null
-            ? String(userId)
-            : configId;
+    const body = event.extra?.body;
+    const guildId = event.extra?.guild_id
+        ?? (event.channel_type === 'GROUP' && event.type === 255 ? event.target_id : undefined);
+    // author_id is the system sender (top-level) or original message author (body),
+    // not proof of who deleted a message. Keep an unknown deletion actor absent.
+    const userId = body?.user_id;
+    const memberEvent = noticeType === 'joined_guild' || noticeType === 'exited_guild';
+    // Guild ids and private chat_code values are not outbound channel/user ids.
+    const channelId = !memberEvent ? body?.channel_id : undefined;
+    const conversation = channelId ? {
+        kind: 'channel',
+        id: channelId,
+        ...(guildId ? { parent: { kind: 'channel', id: guildId } } : {}),
+    } : undefined;
+    const sceneType = conversation ? 'channel'
+        : noticeType.includes('private') ? 'friend' : parts.scene_type;
+    const sceneId = channelId ?? guildId ?? '';
+    const reactionEvent = noticeType.includes('reaction');
     void emit('notice.receive', buildNotice(event, {
-        $id: `kook:${noticeType}:${event.msg_timestamp ?? Date.now()}:${sceneId}:${String(userId ?? '')}`,
-        $adapter: 'kook',
-        $endpoint: configId,
-        $type: 'notice',
-        $scene_id: sceneId,
-        $scene_type: parts.scene_type,
-        $sub_type: parts.sub_type,
-        $actor: senderFromId(userId, event.extra?.author?.username),
-        $timestamp: event.msg_timestamp ?? Date.now(),
+        id: event.msg_id || `kook:${noticeType}:${event.msg_timestamp ?? Date.now()}:${sceneId}:${body?.msg_id ?? ''}:${String(userId ?? '')}`,
+        clientAdapter: 'kook',
+        endpointId: configId,
+        type: 'notice',
+        conversation,
+        name: composeSideEventName('notice', sceneType, parts.sub_type),
+        actor: memberEvent ? undefined : senderFromId(userId),
+        target: memberEvent ? senderFromId(userId) : undefined,
+        messageId: body?.msg_id,
+        reaction: reactionEvent ? body?.emoji?.id : undefined,
+        operation: reactionEvent ? (noticeType.includes('deleted') ? 'removed' : 'added') : undefined,
+        timestamp: event.msg_timestamp ?? Date.now(),
     })).catch((err) => {
         logger.warn(formatCompact({
             op: 'kook_side_event_failed',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-kook",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Zhin.js KOOK adapter for Plugin Runtime (WebSocket gateway or Webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -36,21 +36,21 @@
     "kook-client": "^1.0.4",
     "@zhin.js/adapter": "1.1.15",
     "@zhin.js/agent-feature": "1.1.2",
-    "@zhin.js/core": "1.1.38",
+    "@zhin.js/core": "1.1.39",
     "@zhin.js/feature-kit": "1.1.2",
     "@zhin.js/host-http": "1.1.2",
     "@zhin.js/im-contract": "1.1.2",
     "@zhin.js/logger": "1.1.1",
-    "@zhin.js/permission": "1.1.2",
+    "@zhin.js/permission": "1.1.3",
     "@zhin.js/skill": "1.1.2",
     "@zhin.js/tool": "1.1.2"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
     "@zhin.js/adapter": "^1.1.15",
-    "@zhin.js/command": "^1.1.2",
-    "@zhin.js/core": "^1.1.38",
-    "zhin.js": "^1.1.3"
+    "@zhin.js/command": "^1.1.3",
+    "@zhin.js/core": "^1.1.39",
+    "zhin.js": "^1.1.4"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {
@@ -69,7 +69,7 @@
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
     "@zhin.js/host-http": "1.1.2",
-    "zhin.js": "1.1.3"
+    "zhin.js": "1.1.4"
   },
   "files": [
     "adapters",

package/src/protocol.ts

@@ -76,6 +76,16 @@ export interface KookWebhookEventData {
   readonly verify_token?: string;
   readonly challenge?: string;
   readonly extra?: {
+    readonly type?: string | number;
+    readonly body?: {
+      readonly user_id?: string;
+      readonly channel_id?: string;
+      readonly msg_id?: string;
+      readonly author_id?: string;
+      readonly target_id?: string;
+      readonly chat_code?: string;
+      readonly emoji?: { readonly id?: string; readonly name?: string };
+    };
     readonly guild_id?: string;
     readonly author?: {
       readonly id?: string;

package/src/side-event-dispatch.ts

@@ -1,11 +1,11 @@
-import { buildNotice, mapNoticeParts, senderFromId, KOOK_NOTICE_PARTS_MAP } from '@zhin.js/core';
+import { composeSideEventName, buildNotice, mapNoticeParts, senderFromId, KOOK_NOTICE_PARTS_MAP } from '@zhin.js/core';
 import type { EndpointEventEmitter } from 'zhin.js/adapter';
 import { formatCompact, type getAdapterLogger } from '@zhin.js/logger';
 import type { KookWebhookEventData } from './protocol.js';
 
 function extractKookNoticeType(raw: unknown): string | null {
   if (!raw || typeof raw !== 'object') return null;
-  const event = raw as KookWebhookEventData & { extra?: { type?: string } };
+  const event = raw as KookWebhookEventData;
   const extraType = event.extra?.type;
   if (typeof extraType === 'string' && extraType) return extraType;
   if (event.channel_type === 'NOTICE' && event.type != null) {
@@ -25,23 +25,37 @@ export function receiveKookSideEvent(
   if (!Object.prototype.hasOwnProperty.call(KOOK_NOTICE_PARTS_MAP, noticeType)) return false;
   const event = raw as KookWebhookEventData;
   const parts = mapNoticeParts('kook', noticeType);
-  const guildId = event.extra?.guild_id;
-  const userId = event.author_id ?? event.extra?.author?.id;
-  const sceneId = guildId != null
-    ? String(guildId)
-    : userId != null
-      ? String(userId)
-      : configId;
+  const body = event.extra?.body;
+  const guildId = event.extra?.guild_id
+    ?? (event.channel_type === 'GROUP' && event.type === 255 ? event.target_id : undefined);
+  // author_id is the system sender (top-level) or original message author (body),
+  // not proof of who deleted a message. Keep an unknown deletion actor absent.
+  const userId = body?.user_id;
+  const memberEvent = noticeType === 'joined_guild' || noticeType === 'exited_guild';
+  // Guild ids and private chat_code values are not outbound channel/user ids.
+  const channelId = !memberEvent ? body?.channel_id : undefined;
+  const conversation = channelId ? {
+    kind: 'channel' as const,
+    id: channelId,
+    ...(guildId ? { parent: { kind: 'channel' as const, id: guildId } } : {}),
+  } : undefined;
+  const sceneType = conversation ? 'channel'
+    : noticeType.includes('private') ? 'friend' : parts.scene_type;
+  const sceneId = channelId ?? guildId ?? '';
+  const reactionEvent = noticeType.includes('reaction');
   void emit('notice.receive', buildNotice(event, {
-    $id: `kook:${noticeType}:${event.msg_timestamp ?? Date.now()}:${sceneId}:${String(userId ?? '')}`,
-    $adapter: 'kook' as never,
-    $endpoint: configId,
-    $type: 'notice',
-    $scene_id: sceneId,
-    $scene_type: parts.scene_type,
-    $sub_type: parts.sub_type,
-    $actor: senderFromId(userId, event.extra?.author?.username),
-    $timestamp: event.msg_timestamp ?? Date.now(),
+    id: event.msg_id || `kook:${noticeType}:${event.msg_timestamp ?? Date.now()}:${sceneId}:${body?.msg_id ?? ''}:${String(userId ?? '')}`,
+    clientAdapter: 'kook',
+    endpointId: configId,
+    type: 'notice',
+    conversation,
+    name: composeSideEventName('notice', sceneType, parts.sub_type),
+    actor: memberEvent ? undefined : senderFromId(userId),
+    target: memberEvent ? senderFromId(userId) : undefined,
+    messageId: body?.msg_id,
+    reaction: reactionEvent ? body?.emoji?.id : undefined,
+    operation: reactionEvent ? (noticeType.includes('deleted') ? 'removed' : 'added') : undefined,
+    timestamp: event.msg_timestamp ?? Date.now(),
   })).catch((err) => {
     logger.warn(formatCompact({
       op: 'kook_side_event_failed',