@zhin.js/adapter-icqq 1.1.18 → 1.1.20

package/lib/group-moderation.d.ts

@@ -1,5 +1,8 @@
 import type { Client } from '@icqqjs/icqq';
-import type { GroupModerationAction, GroupModerationMember } from 'zhin.js/adapter';
+import { type EndpointMemberInspectionRequest, type EndpointModerationRequest, type GroupModerationMember } from 'zhin.js/adapter';
 /** Native role/join facts stay in the adapter; the moderation plugin owns policy. */
-export declare function inspectGroupMember(client: Client, groupId: string, userId: string, signal: AbortSignal): Promise<GroupModerationMember>;
-export declare function moderateGroupMember(client: Client, groupId: string, userId: string, action: GroupModerationAction, signal: AbortSignal, isActive: () => boolean): Promise<void>;
+export declare function inspectGroupMember(client: Client, { groupId, userId, signal }: EndpointMemberInspectionRequest): Promise<GroupModerationMember>;
+export declare function moderateGroupMember({ client, isActive }: {
+    readonly client: Client;
+    readonly isActive: () => boolean;
+}, { groupId, userId, action, signal }: EndpointModerationRequest): Promise<void>;

package/lib/group-moderation.js

@@ -1,12 +1,13 @@
+import { createEndpointOperation } from 'zhin.js/adapter';
 /** Native role/join facts stay in the adapter; the moderation plugin owns policy. */
-export async function inspectGroupMember(client, groupId, userId, signal) {
-    signal.throwIfAborted();
+export async function inspectGroupMember(client, { groupId, userId, signal }) {
+    const operation = createEndpointOperation({ signal });
     const group = numericId(groupId);
     const user = numericId(userId);
-    const selfLookup = client.getGroupMemberInfo(group, client.uin, true);
+    const selfLookup = operation.run(() => client.getGroupMemberInfo(group, client.uin, true));
     const [self, member] = await Promise.all([
         selfLookup,
-        user === client.uin ? selfLookup : client.getGroupMemberInfo(group, user, true),
+        user === client.uin ? selfLookup : operation.run(() => client.getGroupMemberInfo(group, user, true)),
     ]);
     signal.throwIfAborted();
     const joinedAt = member.join_time * 1000;
@@ -22,8 +23,8 @@ export async function inspectGroupMember(client, groupId, userId, signal) {
         ...(Number.isSafeInteger(joinedAt) && joinedAt > 0 && joinedAt <= Date.now() ? { joinedAt } : {}),
     };
 }
-export async function moderateGroupMember(client, groupId, userId, action, signal, isActive) {
-    const member = await inspectGroupMember(client, groupId, userId, signal);
+export async function moderateGroupMember({ client, isActive }, { groupId, userId, action, signal }) {
+    const member = await inspectGroupMember(client, { groupId: groupId, userId: userId, signal: signal });
     signal.throwIfAborted();
     if (!isActive() || !member.canModerate)
         throw new Error('Group moderation permission is unavailable');
@@ -38,8 +39,8 @@ export async function moderateGroupMember(client, groupId, userId, action, signa
         throw new Error('Invalid group mute duration');
     }
     const ok = action.type === 'kick'
-        ? await client.setGroupKick(numericId(groupId), numericId(userId))
-        : await client.setGroupBan(numericId(groupId), numericId(userId), action.durationSeconds);
+        ? await createEndpointOperation({ signal }).run(() => client.setGroupKick(numericId(groupId), numericId(userId)))
+        : await createEndpointOperation({ signal }).run(() => client.setGroupBan(numericId(groupId), numericId(userId), action.durationSeconds));
     if (!ok)
         throw new Error('Platform did not confirm the moderation action');
 }

package/lib/group-scene.d.ts

@@ -1,11 +1,11 @@
 import type { Client } from '@icqqjs/icqq';
-import type { GroupMemberProfile, GroupSceneFacts } from 'zhin.js/adapter';
+import { type EndpointGroupInspectionRequest, type EndpointMemberInspectionRequest, type GroupMemberProfile, type GroupSceneFacts } from 'zhin.js/adapter';
 /** Listing a very large roster only to find admins is not worth the packet; adminIds stay unknown. */
 export declare const ADMIN_SCAN_MAX_MEMBERS = 1000;
 /**
  * ADR 0041 scene facts: one uncached group-info read, plus (small groups only) one roster read for
  * admins. A roster failure leaves adminIds unknown instead of failing the other facts.
  */
-export declare function inspectGroupScene(client: Client, groupId: string, signal: AbortSignal): Promise<GroupSceneFacts>;
+export declare function inspectGroupScene(client: Client, { groupId, signal }: EndpointGroupInspectionRequest): Promise<GroupSceneFacts>;
 /** ADR 0041 member facts from one uncached lookup (same rationale as the agent `freshMember` helper). */
-export declare function inspectGroupMemberProfile(client: Client, groupId: string, userId: string, signal: AbortSignal): Promise<GroupMemberProfile>;
+export declare function inspectGroupMemberProfile(client: Client, { groupId, userId, signal }: EndpointMemberInspectionRequest): Promise<GroupMemberProfile>;

package/lib/group-scene.js

@@ -1,3 +1,4 @@
+import { createEndpointOperation } from 'zhin.js/adapter';
 /** Listing a very large roster only to find admins is not worth the packet; adminIds stay unknown. */
 export const ADMIN_SCAN_MAX_MEMBERS = 1000;
 const MAX_ADMIN_IDS = 20;
@@ -14,10 +15,10 @@ function numericId(value) {
  * ADR 0041 scene facts: one uncached group-info read, plus (small groups only) one roster read for
  * admins. A roster failure leaves adminIds unknown instead of failing the other facts.
  */
-export async function inspectGroupScene(client, groupId, signal) {
-    signal.throwIfAborted();
+export async function inspectGroupScene(client, { groupId, signal }) {
+    const operation = createEndpointOperation({ signal });
     const group = numericId(groupId);
-    const info = await client.getGroupInfo(group, true);
+    const info = await operation.run(() => client.getGroupInfo(group, true));
     signal.throwIfAborted();
     if (info.group_id !== group)
         return {};
@@ -26,7 +27,7 @@ export async function inspectGroupScene(client, groupId, signal) {
     let adminIds;
     if (memberCount === undefined || memberCount <= ADMIN_SCAN_MAX_MEMBERS) {
         try {
-            const roster = await client.getGroupMemberList(group);
+            const roster = await operation.run(() => client.getGroupMemberList(group));
             signal.throwIfAborted();
             adminIds = [...roster.values()]
                 .filter(member => member.role === 'admin' && member.group_id === group)
@@ -50,11 +51,11 @@ export async function inspectGroupScene(client, groupId, signal) {
     };
 }
 /** ADR 0041 member facts from one uncached lookup (same rationale as the agent `freshMember` helper). */
-export async function inspectGroupMemberProfile(client, groupId, userId, signal) {
-    signal.throwIfAborted();
+export async function inspectGroupMemberProfile(client, { groupId, userId, signal }) {
+    const operation = createEndpointOperation({ signal });
     const group = numericId(groupId);
     const user = numericId(userId);
-    const member = await client.getGroupMemberInfo(group, user, true);
+    const member = await operation.run(() => client.getGroupMemberInfo(group, user, true));
     signal.throwIfAborted();
     if (member.user_id !== user || member.group_id !== group)
         return {};

package/lib/icqq-login-assist.d.ts

@@ -1,5 +1,5 @@
 import type { Locale } from 'zhin.js/i18n';
-import type { LoginAssist, LoginAssistType } from '@zhin.js/core';
+import type { LoginAssist, LoginAssistEndpointIdentity, LoginAssistType } from '@zhin.js/core';
 type IcqqLoginClient = {
     login(password?: string): Promise<unknown>;
     submitSlider(ticket: string): Promise<unknown>;
@@ -21,6 +21,8 @@ export declare function runIcqqLoginAssistStep(input: {
     adapter: string;
     endpointKey: string;
     owner: object;
+    signal?: AbortSignal;
+    endpointIdentity?: LoginAssistEndpointIdentity;
     logger: Logger;
     step: LoginAssistType;
     event: unknown;

package/lib/icqq-login-assist.js

@@ -17,6 +17,7 @@ export async function runIcqqLoginAssistStep(input) {
         ...(typeof payload.url === 'string' ? { url: payload.url } : {}),
     }));
     try {
+        input.signal?.throwIfAborted();
         if (step === 'device') {
             try {
                 await client.sendSmsCode();
@@ -29,7 +30,8 @@ export async function runIcqqLoginAssistStep(input) {
                 }));
             }
         }
-        const value = await assist.waitForInput(adapter, endpointKey, step, payload, { owner });
+        const value = await assist.waitForInput(adapter, endpointKey, step, payload, { owner, signal: input.signal, endpointIdentity: input.endpointIdentity });
+        input.signal?.throwIfAborted();
         const text = normalizeSubmitValue(value);
         switch (step) {
             case 'qrcode':

package/lib/icqq-login-control.d.ts

@@ -1,3 +1,4 @@
+import type { FeatureId, PluginId } from 'zhin.js';
 import type { PendingLoginTask } from '@zhin.js/core';
 export interface IcqqLoginControlState {
     readonly endpointId: string;
@@ -14,5 +15,10 @@ export interface IcqqLoginControl {
     submit(taskId: string, value: string | Record<string, unknown>): boolean;
     cancel(taskId: string, reason?: string): boolean;
 }
-/** `endpoint id (QQ uin)` → control for the current generation. */
-export declare const icqqLoginControlToken: import("zhin.js").Token<Map<string, IcqqLoginControl>>;
+/** Read the owning Adapter's actual incarnations; this projection retains no independent directory. */
+export declare function icqqLoginControls(context: Readonly<{
+    owner: PluginId | Readonly<{
+        id: PluginId;
+    }>;
+    project<T>(id: FeatureId): T;
+}>): ReadonlyMap<string, IcqqLoginControl>;

package/lib/icqq-login-control.js

@@ -1,8 +1,25 @@
 /**
  * ICQQ login control surface exposed to the Plugin Runtime, Console and the
- * recovery command. One control per endpoint instance (UIN), provided by the
- * ICQQ plugin setup and filled by `adapters/icqq/create()`.
+ * recovery command. Controls are projected from actual current incarnations in
+ * the owning IcqqAdapter; no plugin resource keeps a second Endpoint directory.
  */
-import { createToken } from 'zhin.js';
-/** `endpoint id (QQ uin)` → control for the current generation. */
-export const icqqLoginControlToken = createToken('zhin.icqq.login-control', 'ICQQ login control surface for recovery commands');
+import { adapterFeatureId, isAdapterIndex } from 'zhin.js/adapter';
+import { IcqqAdapter } from './adapter.js';
+/** Read the owning Adapter's actual incarnations; this projection retains no independent directory. */
+export function icqqLoginControls(context) {
+    const index = context.project(adapterFeatureId);
+    if (!isAdapterIndex(index))
+        throw new Error('ICQQ Adapter projection is unavailable');
+    const owner = typeof context.owner === 'string' ? context.owner : context.owner.id;
+    const controls = new Map();
+    for (const adapter of index.forOwner(owner).adapters()) {
+        if (!(adapter instanceof IcqqAdapter))
+            continue;
+        for (const row of adapter.list()) {
+            const endpoint = adapter.getEndpoint(row.instanceId);
+            if (endpoint)
+                controls.set(row.endpointId, endpoint.loginControl);
+        }
+    }
+    return controls;
+}

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export { Actions, formatInboundContent, formatOutboundBody, formatOutboundMessages, formatOutboundMessageParts, icqqInboundConversation, icqqOutboundTarget, type ActionResult, type IcqqEndpointConfig, type IcqqInboundMessage, type IcqqWireSegment, type IcqqOutboundMessagePart, type ParsedIcqqSendTarget, type ResolvedIcqqConfig, } from './protocol.js';
 export { IcqqEndpoint, type IcqqEndpointOptions, } from './endpoint.js';
 export * from './types.js';
-export { icqqClient, type IcqqClient, type IcqqClientEventMap, } from './client.js';
+export { type IcqqClient, type IcqqClientEventMap, } from './client.js';
 export { resolveIcqqInboundMessageId, } from './icqq-inbound.js';
+export { IcqqAdapter } from './adapter.js';

package/lib/index.js

@@ -1,5 +1,5 @@
 export { Actions, formatInboundContent, formatOutboundBody, formatOutboundMessages, formatOutboundMessageParts, icqqInboundConversation, icqqOutboundTarget, } from './protocol.js';
 export { IcqqEndpoint, } from './endpoint.js';
 export * from './types.js';
-export { icqqClient, } from './client.js';
 export { resolveIcqqInboundMessageId, } from './icqq-inbound.js';
+export { IcqqAdapter } from './adapter.js';

package/lib/protocol.d.ts

@@ -205,6 +205,9 @@ export interface IcqqWireSegment {
     readonly platform?: Readonly<Record<string, unknown>>;
 }
 export interface IcqqInboundMessage {
+    /** Exact SDK callback object, operation-local and never a persisted projection. */
+    readonly event?: unknown;
+    readonly platformSentAt?: number;
     readonly id: string;
     readonly conversation: ConversationRef;
     readonly content: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Zhin.js ICQQ adapter — direct connection to @icqqjs/icqq",
   "type": "module",
   "main": "./lib/index.js",
@@ -33,27 +33,27 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.25",
-    "@zhin.js/agent-feature": "1.1.10",
-    "@zhin.js/client": "1.1.21",
+    "@zhin.js/adapter": "1.1.26",
+    "@zhin.js/agent-feature": "1.1.11",
+    "@zhin.js/client": "1.1.22",
     "@zhin.js/console-contract": "1.1.3",
-    "@zhin.js/core": "1.1.53",
-    "@zhin.js/feature-kit": "1.1.9",
+    "@zhin.js/core": "1.1.54",
+    "@zhin.js/feature-kit": "1.1.10",
     "@zhin.js/im-contract": "1.1.9",
     "@zhin.js/logger": "1.1.2",
-    "@zhin.js/page": "1.1.10",
-    "@zhin.js/permission": "1.1.9",
-    "@zhin.js/skill": "1.1.10",
-    "@zhin.js/tool": "1.1.12"
+    "@zhin.js/page": "1.1.12",
+    "@zhin.js/permission": "1.1.10",
+    "@zhin.js/skill": "1.1.11",
+    "@zhin.js/tool": "1.1.13"
   },
   "peerDependencies": {
     "@icqqjs/icqq": "^1.12.2",
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.25",
-    "@zhin.js/command": "^1.1.11",
-    "@zhin.js/core": "^1.1.53",
-    "@zhin.js/prompt-section": "^1.1.9",
-    "zhin.js": "^1.1.18"
+    "@zhin.js/adapter": "^1.1.26",
+    "@zhin.js/command": "^1.1.12",
+    "@zhin.js/core": "^1.1.54",
+    "@zhin.js/prompt-section": "^1.1.10",
+    "zhin.js": "^1.1.19"
   },
   "peerDependenciesMeta": {
     "@icqqjs/icqq": {
@@ -78,8 +78,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/prompt-section": "1.1.9",
-    "zhin.js": "1.1.18"
+    "@zhin.js/prompt-section": "1.1.10",
+    "zhin.js": "1.1.19"
   },
   "files": [
     "adapters",
@@ -111,7 +111,7 @@
     "features": [
       {
         "package": "@zhin.js/adapter",
-        "api": "^1.0.0"
+        "api": "^2.0.0"
       },
       {
         "package": "@zhin.js/command",

package/plugin.js

@@ -1,9 +1,6 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { createEndpointRuntimeState } from 'zhin.js/adapter';
 import { definePlugin, pluginConsoleRpcToken } from 'zhin.js';
 import { permissionHostToken, createSceneRolePlatformChecker } from '@zhin.js/permission';
-import { icqqRuntimeStateToken } from "./lib/icqq-runtime-state.js";
-import { icqqLoginControlToken } from "./lib/icqq-login-control.js";
 import { createIcqqConsoleRpc } from "./lib/console.js";
 export default definePlugin({
     name: 'icqq',
@@ -11,11 +8,7 @@ export default definePlugin({
         displayName: 'ICQQ Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（icqq endpoint list 的"运行中"数据源）
-        context.resources.provide(icqqRuntimeStateToken, createEndpointRuntimeState());
-        // 掉线恢复命令用：当前 generation 每个 UIN 的登录控制面
-        context.resources.provide(icqqLoginControlToken, new Map());
-        context.resources.provide(pluginConsoleRpcToken, createIcqqConsoleRpc(context.resources, () => context.config.get()));
+        context.resources.provide(pluginConsoleRpcToken, createIcqqConsoleRpc(() => context.config.get()));
         const disposePlatform = context.resources.has(permissionHostToken)
             ? context.resources.use(permissionHostToken).registerPlatform('icqq', createSceneRolePlatformChecker())
             : undefined;

package/src/adapter.ts

@@ -0,0 +1,29 @@
+import { Adapter, createAdapterOutageNotifier, type AdapterContext, type EndpointCreationContext } from 'zhin.js/adapter';
+import { projectLocaleToken } from 'zhin.js/i18n';
+import { loginAssistToken } from '@zhin.js/core/runtime';
+import { outboundHostToken } from 'zhin.js';
+import { IcqqEndpoint } from './endpoint.js';
+import { resolveIcqqConfig, type IcqqEndpointConfig } from './protocol.js';
+import type { IcqqClientEventMap } from './client.js';
+
+/** ICQQ account construction and actual SDK ownership belong to this Adapter. */
+export class IcqqAdapter extends Adapter<IcqqEndpoint, IcqqEndpointConfig, IcqqClientEventMap> {
+  override get configurationIdentityFields(): readonly string[] { return ['id']; }
+  override get configurationUpdateFields(): readonly string[] {
+    return ['password', 'platform', 'ver', 'dataDir', 'signApiAddr', 'autoReconnect', 'autoServer', 'qqnt', 'ntLogin'];
+  }
+  readonly #context: AdapterContext<IcqqEndpointConfig>;
+  constructor(context: AdapterContext<IcqqEndpointConfig>) { super(); this.#context = context; }
+  protected override validateConfiguration(config: IcqqEndpointConfig): void { resolveIcqqConfig(config); }
+  protected createEndpoint(input: IcqqEndpointConfig, execution: EndpointCreationContext): IcqqEndpoint {
+    const context = this.#context;
+    const config = resolveIcqqConfig(input);
+    const outbound = context.has?.(outboundHostToken) ? context.use(outboundHostToken) : undefined;
+    const endpoint = new IcqqEndpoint({ id: execution.canonicalId, config,
+      signal: execution.signal, endpointIdentity: { canonicalId: execution.canonicalId, instanceId: execution.instanceId, epoch: execution.epoch, incarnationId: execution.incarnationId },
+      loginAssist: context.use(loginAssistToken), locale: context.use(projectLocaleToken),
+      notifier: createAdapterOutageNotifier(outbound, config.notify),
+    });
+    return endpoint;
+  }
+}

package/src/client.ts

@@ -1,5 +1,6 @@
-import type { Client, EventMap } from '@icqqjs/icqq';
-import { defineEndpointClient } from 'zhin.js/adapter';
+import type { IcqqAdapter } from './adapter.js';
+import type { IcqqEndpoint } from './endpoint.js';
+import type { EventMap } from '@icqqjs/icqq';
 
 type EventPayload<TListener> = TListener extends (
   event: infer TEvent,
@@ -9,7 +10,7 @@ type EventPayload<TListener> = TListener extends (
   : never;
 
 /** The actual ICQQ SDK instance exposed by every ICQQ Endpoint event. */
-export type IcqqClient = Client;
+export type IcqqClient = IcqqEndpoint;
 
 /** Native ICQQ event-name → first public event payload, derived from the SDK SSOT. */
 export type IcqqClientEventMap = {
@@ -17,13 +18,7 @@ export type IcqqClientEventMap = {
 };
 
 declare module '@zhin.js/feature-kit' {
-  interface AdapterClientRegistry {
-    readonly icqq: {
-      readonly client: IcqqClient;
-      readonly events: IcqqClientEventMap;
-    };
+  interface AdapterRegistry {
+    readonly icqq: IcqqAdapter;
   }
 }
-
-/** Typed, generation-checked identity used by handlers, commands, tools and schedules. */
-export const icqqClient = defineEndpointClient<IcqqClient, IcqqClientEventMap>('icqq');

package/src/console-spec.ts

@@ -7,6 +7,15 @@ export const icqqConsoleSpec = {
   adapterKey: 'icqq',
   adapterDisplayName: 'ICQQ',
   fields: [
+    { key: 'password', env: true, description: 'QQ password; leave blank to retain the saved credential' },
+    { key: 'platform', type: 'number', description: 'ICQQ platform number' },
+    { key: 'ver', description: 'ICQQ protocol version' },
+    { key: 'dataDir', description: 'ICQQ device and session directory' },
+    { key: 'signApiAddr', description: 'ICQQ signing service URL' },
+    { key: 'autoReconnect', type: 'boolean', description: 'ICQQ reconnect setting' },
+    { key: 'autoServer', type: 'boolean', description: 'ICQQ automatic server selection' },
+    { key: 'qqnt', type: 'boolean', description: 'QQNT protocol' },
+    { key: 'ntLogin', type: 'boolean', description: 'QQNT login' },
   ] as readonly AdapterConsoleField[],
   docsUrl: 'https://zhin.js.org/adapters/icqq',
   readPermission: 'icqq:read',

package/src/console.ts

@@ -3,19 +3,15 @@
  *
  * 页面绑定 `pages/index`，读取 / 写入分别要求 `<adapter>:read` / `<adapter>:write`。
  */
-import { createAdapterConsoleRpc, type AdapterConsoleResources } from 'zhin.js/adapter';
+import { createAdapterConsoleRpc } from 'zhin.js/adapter';
 import type { PluginConsoleRpc } from 'zhin.js';
-import { icqqRuntimeStateToken } from './icqq-runtime-state.js';
 import { icqqConsoleSpec } from './console-spec.js';
 
 export function createIcqqConsoleRpc(
-  resources: AdapterConsoleResources,
   getConfig: () => unknown,
 ): PluginConsoleRpc {
-  const state = resources.use(icqqRuntimeStateToken);
   return createAdapterConsoleRpc({
     ...icqqConsoleSpec,
-    running: () => state.endpoints.values(),
     getConfig,
-  }, resources);
+  });
 }