@zhin.js/adapter-weixin-ilink 1.1.0 → 1.1.2

package/src/credentials.ts

@@ -1,5 +1,5 @@
-import fs from "node:fs";
-import path from "node:path";
+import fs from 'node:fs';
+import path from 'node:path';
 
 export interface WeixinIlinkCredentials {
   botToken: string;
@@ -9,56 +9,79 @@ export interface WeixinIlinkCredentials {
   updatedAt?: string;
 }
 
-const DEFAULT_DATA_DIR = "./data/weixin-ilink";
+/** Endpoint-owned persistence for credentials, cursors, context tokens, and media. */
+export class WeixinIlinkStateStore {
+  readonly endpointId: string;
+  readonly rootDir: string;
 
-export function resolveStateDir(): string {
-  return process.env.ZHIN_DATA_DIR
-    ? path.join(process.env.ZHIN_DATA_DIR, "weixin-ilink")
-    : DEFAULT_DATA_DIR;
-}
+  constructor(
+    endpointId: string,
+    rootDir: string,
+  ) {
+    if (!/^[A-Za-z0-9_.-]+$/u.test(endpointId)) {
+      throw new TypeError('Weixin iLink state endpoint id is invalid');
+    }
+    if (!rootDir.trim()) throw new TypeError('Weixin iLink state root is required');
+    this.endpointId = endpointId;
+    this.rootDir = rootDir;
+  }
 
-export function credentialsPath(endpointId: string): string {
-  return path.join(resolveStateDir(), `${endpointId}.json`);
-}
+  endpointDirectory(): string {
+    return path.join(this.rootDir, this.endpointId);
+  }
 
-export function loadCredentials(endpointId: string): WeixinIlinkCredentials | null {
-  const file = credentialsPath(endpointId);
-  try {
-    if (!fs.existsSync(file)) return null;
-    const raw = fs.readFileSync(file, "utf-8");
-    const data = JSON.parse(raw) as WeixinIlinkCredentials;
-    if (!data.botToken?.trim()) return null;
-    return data;
-  } catch {
-    return null;
+  credentialsPath(): string {
+    return path.join(this.endpointDirectory(), 'credentials.json');
   }
-}
 
-export function saveCredentials(endpointId: string, creds: WeixinIlinkCredentials): void {
-  const file = credentialsPath(endpointId);
-  fs.mkdirSync(path.dirname(file), { recursive: true });
-  fs.writeFileSync(
-    file,
-    JSON.stringify({ ...creds, updatedAt: new Date().toISOString() }, null, 2),
-    "utf-8",
-  );
-}
+  loadCredentials(): WeixinIlinkCredentials | null {
+    const file = this.credentialsPath();
+    try {
+      if (!fs.existsSync(file)) return null;
+      const data = JSON.parse(fs.readFileSync(file, 'utf-8')) as WeixinIlinkCredentials;
+      return data.botToken?.trim() ? data : null;
+    } catch {
+      return null;
+    }
+  }
 
-export function syncBufPath(endpointId: string): string {
-  return path.join(resolveStateDir(), `${endpointId}.sync-buf`);
-}
+  saveCredentials(credentials: WeixinIlinkCredentials): void {
+    const file = this.credentialsPath();
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(
+      file,
+      JSON.stringify({ ...credentials, updatedAt: new Date().toISOString() }, null, 2),
+      'utf-8',
+    );
+  }
 
-export function loadSyncBuf(endpointId: string): string {
-  const file = syncBufPath(endpointId);
-  try {
-    return fs.existsSync(file) ? fs.readFileSync(file, "utf-8") : "";
-  } catch {
-    return "";
+  syncBufPath(): string {
+    return path.join(this.endpointDirectory(), 'sync-buf');
+  }
+
+  loadSyncBuf(): string {
+    const file = this.syncBufPath();
+    try {
+      return fs.existsSync(file) ? fs.readFileSync(file, 'utf-8') : '';
+    } catch {
+      return '';
+    }
+  }
+
+  saveSyncBuf(value: string): void {
+    const file = this.syncBufPath();
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, value, 'utf-8');
+  }
+
+  contextTokensPath(): string {
+    return path.join(this.endpointDirectory(), 'context-tokens.json');
   }
-}
 
-export function saveSyncBuf(endpointId: string, buf: string): void {
-  const file = syncBufPath(endpointId);
-  fs.mkdirSync(path.dirname(file), { recursive: true });
-  fs.writeFileSync(file, buf, "utf-8");
+  mediaDirectory(subdir: string): string {
+    if (subdir !== 'inbound' && subdir !== 'outbound') {
+      throw new TypeError(`Unsupported Weixin iLink media directory: ${subdir}`);
+    }
+    return path.join(this.endpointDirectory(), 'media', subdir);
+  }
 }

package/src/endpoint.ts

@@ -1,38 +1,31 @@
-import { Endpoint } from 'zhin.js/adapter';
 /**
  * WeixinIlinkEndpoint — lifecycle, long-poll inbound, outbound send.
  */
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
-import type {
-  EndpointFriend,
-  EndpointControl,
-  EndpointManagement,
-  EndpointSendRequest,
+import {
+  Endpoint,
+  type EndpointFriend,
+  type EndpointControl,
+  type EndpointManagement,
+  type EndpointSendRequest,
 } from 'zhin.js/adapter';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from 'zhin.js';
 import { getUpdates, notifyStart, notifyStop } from './ilink-api.js';
-import { configureIlinkMeta } from './ilink-meta.js';
+import { IlinkClientMetadata } from './ilink-meta.js';
 import {
-  loadSyncBuf,
-  resolveStateDir,
-  saveSyncBuf,
   type WeixinIlinkCredentials,
+  WeixinIlinkStateStore,
 } from './credentials.js';
 import { resolveCredentials } from './login.js';
 import {
-  listContextTokenUserIds,
-  restoreContextTokens,
-  setContextToken,
-  flushContextTokenPersist,
+  WeixinContextTokenStore,
 } from './context-store.js';
 import { WeixinConfigManager } from './ilink-config-cache.js';
 import {
-  getRemainingPauseMs,
-  isSessionPaused,
-  pauseSession,
+  IlinkSessionGuard,
   SESSION_EXPIRED_ERRCODE,
 } from './ilink-session-guard.js';
 import { downloadMediaFromItem } from './media-download.js';
@@ -74,6 +67,8 @@ export interface WeixinIlinkEndpointOptions {
   readonly config: ResolvedWeixinIlinkConfig;
   readonly resolveCredentials?: (
     config: ResolvedWeixinIlinkConfig,
+    metadata: IlinkClientMetadata,
+    state: WeixinIlinkStateStore,
     signal?: AbortSignal,
   ) => Promise<WeixinIlinkCredentials>;
   /** Test / internal: override network side effects. */
@@ -81,6 +76,9 @@ export interface WeixinIlinkEndpointOptions {
   readonly notifyStop?: WeixinIlinkNotifyStop;
   readonly getUpdates?: WeixinIlinkGetUpdates;
   readonly sendText?: WeixinIlinkSendText;
+  readonly state?: WeixinIlinkStateStore;
+  readonly contextTokens?: WeixinContextTokenStore;
+  readonly sessionGuard?: IlinkSessionGuard;
 }
 
 export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
@@ -90,12 +88,18 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
   readonly #options: WeixinIlinkEndpointOptions;
   readonly #resolveCredentials: (
     config: ResolvedWeixinIlinkConfig,
+    metadata: IlinkClientMetadata,
+    state: WeixinIlinkStateStore,
     signal?: AbortSignal,
   ) => Promise<WeixinIlinkCredentials>;
   readonly #notifyStart: WeixinIlinkNotifyStart;
   readonly #notifyStop: WeixinIlinkNotifyStop;
   readonly #getUpdates: WeixinIlinkGetUpdates;
   readonly #sendText: WeixinIlinkSendText;
+  readonly #state: WeixinIlinkStateStore;
+  readonly #contextTokens: WeixinContextTokenStore;
+  readonly #sessionGuard: IlinkSessionGuard;
+  readonly #metadata: IlinkClientMetadata;
   #creds: WeixinIlinkCredentials | null = null;
   #pollAbort?: AbortController;
   #pollPromise?: Promise<void>;
@@ -123,11 +127,18 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
     this.#notifyStop = options.notifyStop ?? notifyStop;
     this.#getUpdates = options.getUpdates ?? getUpdates;
     this.#sendText = options.sendText ?? sendMessageWeixin;
+    this.#state = options.state
+      ?? new WeixinIlinkStateStore(options.config.id, options.config.dataDir);
+    this.#contextTokens = options.contextTokens ?? new WeixinContextTokenStore(this.#state);
+    this.#sessionGuard = options.sessionGuard ?? new IlinkSessionGuard(options.config.id);
+    this.#metadata = new IlinkClientMetadata({ botAgent: options.config.botAgent });
     this.client = new WeixinIlinkClient(
       options.config,
+      this.#metadata,
       () => this.#creds,
       () => this.#configManager,
       this.#sendText,
+      this.#contextTokens,
     );
   }
 
@@ -139,19 +150,28 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
     if (this.#started) return;
     this.#started = true;
     try {
-      configureIlinkMeta({ botAgent: this.#options.config.botAgent });
       // QR 登录最长 8 分钟：stop() 必须能打断
       this.#loginAbort = new AbortController();
-      this.#creds = await this.#resolveCredentials(this.#options.config, this.#loginAbort.signal);
-      restoreContextTokens(this.#options.config.id);
+      this.#creds = await this.#resolveCredentials(
+        this.#options.config,
+        this.#metadata,
+        this.#state,
+        this.#loginAbort.signal,
+      );
+      this.#contextTokens.restore();
 
       await this.#notifyStart({
         baseUrl: this.client.apiBaseUrl,
+        metadata: this.#metadata,
         token: this.#creds.botToken,
       });
 
       this.#configManager = new WeixinConfigManager(
-        { baseUrl: this.client.apiBaseUrl, token: this.#creds.botToken },
+        {
+          baseUrl: this.client.apiBaseUrl,
+          metadata: this.#metadata,
+          token: this.#creds.botToken,
+        },
         (msg) => this.#logger.debug(msg),
       );
 
@@ -191,10 +211,14 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
     }
     this.#stopMediaSweep();
     // 防抖中的 context token 落盘，避免 stop 丢尾部写入
-    flushContextTokenPersist(this.#options.config.id);
+    this.#contextTokens.flush();
     if (this.#creds?.botToken) {
       try {
-        await this.#notifyStop({ baseUrl: this.client.apiBaseUrl, token: this.#creds.botToken });
+        await this.#notifyStop({
+          baseUrl: this.client.apiBaseUrl,
+          metadata: this.#metadata,
+          token: this.#creds.botToken,
+        });
       } catch (err) {
         this.#logger.warn(formatCompact({
           op: 'notify_stop',
@@ -229,7 +253,7 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
       throw new Error(`missing context_token for peer ${target}`);
     }
 
-    const outboundDir = path.join(resolveStateDir(), 'media', 'outbound');
+    const outboundDir = this.#state.mediaDirectory('outbound');
     const wire = formatOutboundSegments(payload);
     const materialized = await materializeOutboundMedia(wire, outboundDir);
     const segments = Array.isArray(materialized) ? materialized : [materialized];
@@ -283,7 +307,7 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
     if (!this.#open) return;
     const userId = msg.from_user_id ?? '';
     if (msg.context_token && userId) {
-      setContextToken(this.#options.config.id, userId, msg.context_token);
+      this.#contextTokens.set(userId, msg.context_token);
     }
     const conversation = weixinIlinkInboundConversation(String(this.#options.id), userId);
     const replyTo = weixinReplyTo(msg);
@@ -311,20 +335,20 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
   async #pollLoop(abortSignal: AbortSignal): Promise<void> {
     if (!this.#creds?.botToken) return;
 
-    const endpointId = this.#options.config.id;
-    let getUpdatesBuf = loadSyncBuf(endpointId);
+    let getUpdatesBuf = this.#state.loadSyncBuf();
     let nextTimeoutMs = this.#options.config.longPollTimeoutMs;
     let consecutiveFailures = 0;
 
     while (!abortSignal.aborted) {
-      if (isSessionPaused(endpointId)) {
-        await sleep(getRemainingPauseMs(endpointId), abortSignal);
+      if (this.#sessionGuard.paused) {
+        await sleep(this.#sessionGuard.remainingMs, abortSignal);
         continue;
       }
 
       try {
         const resp = await this.#getUpdates({
           baseUrl: this.client.apiBaseUrl,
+          metadata: this.#metadata,
           token: this.#creds.botToken,
           get_updates_buf: getUpdatesBuf,
           timeoutMs: nextTimeoutMs,
@@ -343,9 +367,9 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
           const sessionExpired =
             resp.errcode === SESSION_EXPIRED_ERRCODE || resp.ret === SESSION_EXPIRED_ERRCODE;
           if (sessionExpired) {
-            pauseSession(endpointId);
+            this.#sessionGuard.pause();
             consecutiveFailures = 0;
-            await sleep(getRemainingPauseMs(endpointId), abortSignal);
+            await sleep(this.#sessionGuard.remainingMs, abortSignal);
             continue;
           }
           consecutiveFailures += 1;
@@ -366,7 +390,7 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
         }
         if (nextBuf) {
           getUpdatesBuf = nextBuf;
-          saveSyncBuf(endpointId, getUpdatesBuf);
+          this.#state.saveSyncBuf(getUpdatesBuf);
         }
       } catch (err) {
         if (abortSignal.aborted) return;
@@ -388,9 +412,6 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
   async #handleInboundMessage(full: WeixinMessage): Promise<void> {
     void this.#emitPlatformEvent(`message.${full.message_type ?? 'unknown'}`, full);
     const fromUserId = full.from_user_id ?? '';
-    if (full.context_token && fromUserId) {
-      setContextToken(this.#options.config.id, fromUserId, full.context_token);
-    }
 
     const mediaOpts = await this.#downloadInboundMedia(full);
     this.admit({ ...full, _media: mediaOpts });
@@ -452,7 +473,7 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
     if (buffer.length > maxBytes) {
       throw new Error(`media exceeds max size ${maxBytes}`);
     }
-    const dir = path.join(resolveStateDir(), 'media', subdir);
+    const dir = this.#state.mediaDirectory(subdir);
     fs.mkdirSync(dir, { recursive: true });
     const resolvedMime = contentType ?? sniffMimeFromBuffer(buffer);
     const ext = originalFilename
@@ -486,7 +507,7 @@ export class WeixinIlinkEndpoint extends Endpoint<WeixinIlinkClient> {
   }
 
   #sweepInboundMedia(): void {
-    const dir = path.join(resolveStateDir(), 'media', 'inbound');
+    const dir = this.#state.mediaDirectory('inbound');
     let entries: fs.Dirent[];
     try {
       entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -521,7 +542,7 @@ function createWeixinIlinkEndpointManagement(
     // "好友"只能从会话推导：凡持有 context_token 的对端（来过消息，含重启后从磁盘恢复的）
     // 即为可达私聊对端；昵称不可得，用 user_id 占位并在 remark 注明来源。
     async listFriends(): Promise<readonly EndpointFriend[]> {
-      return listContextTokenUserIds(requireClient().config.id).map((userId) => ({
+      return requireClient().reachableUserIds().map((userId) => ({
         user_id: userId,
         nickname: userId,
         remark: 'ilink: 从会话 context_token 推导，非通讯录',

package/src/ilink-api.ts

@@ -2,8 +2,7 @@ import crypto from "node:crypto";
 
 import { logger } from "./ilink-logger.js";
 import {
-  buildBaseInfo,
-  ILINK_APP_CLIENT_VERSION,
+  type IlinkClientMetadata,
   ILINK_APP_ID,
 } from "./ilink-meta.js";
 import { redactBody, redactUrl } from "./ilink-redact.js";
@@ -20,10 +19,11 @@ import type {
   GetConfigResp,
 } from "./ilink-types.js";
 
-export { buildBaseInfo, sanitizeBotAgent } from "./ilink-meta.js";
+export { IlinkClientMetadata, sanitizeBotAgent } from "./ilink-meta.js";
 
 export type WeixinApiOptions = {
   baseUrl: string;
+  metadata: IlinkClientMetadata;
   token?: string;
   timeoutMs?: number;
   /** Long-poll timeout for getUpdates (server may hold the request up to this). */
@@ -48,20 +48,20 @@ function randomWechatUin(): string {
 }
 
 /** Build headers shared by both GET and POST requests. */
-function buildCommonHeaders(): Record<string, string> {
+function buildCommonHeaders(metadata: IlinkClientMetadata): Record<string, string> {
   const headers: Record<string, string> = {
     "iLink-App-Id": ILINK_APP_ID,
-    "iLink-App-ClientVersion": String(ILINK_APP_CLIENT_VERSION),
+    "iLink-App-ClientVersion": String(metadata.appClientVersion),
   };
   return headers;
 }
 
-function buildHeaders(opts: { token?: string }): Record<string, string> {
+function buildHeaders(opts: { metadata: IlinkClientMetadata; token?: string }): Record<string, string> {
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
     AuthorizationType: "ilink_bot_token",
     "X-WECHAT-UIN": randomWechatUin(),
-    ...buildCommonHeaders(),
+    ...buildCommonHeaders(opts.metadata),
   };
   if (opts.token?.trim()) {
     headers.Authorization = `Bearer ${opts.token.trim()}`;
@@ -80,6 +80,7 @@ function buildHeaders(opts: { token?: string }): Record<string, string> {
  */
 export async function apiGetFetch(params: {
   baseUrl: string;
+  metadata: IlinkClientMetadata;
   endpoint: string;
   timeoutMs?: number;
   label: string;
@@ -87,7 +88,7 @@ export async function apiGetFetch(params: {
 }): Promise<string> {
   const base = ensureTrailingSlash(params.baseUrl);
   const url = new URL(params.endpoint, base);
-  const hdrs = buildCommonHeaders();
+  const hdrs = buildCommonHeaders(params.metadata);
   logger.debug(`GET ${redactUrl(url.toString())}`);
 
   const timeoutMs = params.timeoutMs;
@@ -149,6 +150,7 @@ function combineAbortSignals(
  */
 export async function apiPostFetch(params: {
   baseUrl: string;
+  metadata: IlinkClientMetadata;
   endpoint: string;
   body: string;
   token?: string;
@@ -158,7 +160,7 @@ export async function apiPostFetch(params: {
 }): Promise<string> {
   const base = ensureTrailingSlash(params.baseUrl);
   const url = new URL(params.endpoint, base);
-  const hdrs = buildHeaders({ token: params.token });
+  const hdrs = buildHeaders({ metadata: params.metadata, token: params.token });
   logger.debug(`POST ${redactUrl(url.toString())} body=${redactBody(params.body)}`);
 
   const controller =
@@ -196,10 +198,7 @@ export async function apiPostFetch(params: {
  * with ret=0 so the caller can simply retry. This is normal for long-poll.
  */
 export async function getUpdates(
-  params: GetUpdatesReq & {
-    baseUrl: string;
-    token?: string;
-    timeoutMs?: number;
+  params: GetUpdatesReq & WeixinApiOptions & {
     /**
      * Optional external abort signal (e.g. from the gateway when stopping the
      * channel). When this aborts, the in-flight long-poll is terminated
@@ -213,10 +212,11 @@ export async function getUpdates(
   try {
     const rawText = await apiPostFetch({
       baseUrl: params.baseUrl,
+      metadata: params.metadata,
       endpoint: "ilink/bot/getupdates",
       body: JSON.stringify({
         get_updates_buf: params.get_updates_buf ?? "",
-        base_info: buildBaseInfo(),
+        base_info: params.metadata.buildBaseInfo(),
       }),
       token: params.token,
       timeoutMs: timeout,
@@ -249,6 +249,7 @@ export async function getUploadUrl(
 ): Promise<GetUploadUrlResp> {
   const rawText = await apiPostFetch({
     baseUrl: params.baseUrl,
+    metadata: params.metadata,
     endpoint: "ilink/bot/getuploadurl",
     body: JSON.stringify({
       filekey: params.filekey,
@@ -262,7 +263,7 @@ export async function getUploadUrl(
       thumb_filesize: params.thumb_filesize,
       no_need_thumb: params.no_need_thumb,
       aeskey: params.aeskey,
-      base_info: buildBaseInfo(),
+      base_info: params.metadata.buildBaseInfo(),
     }),
     token: params.token,
     timeoutMs: params.timeoutMs ?? DEFAULT_API_TIMEOUT_MS,
@@ -278,8 +279,9 @@ export async function sendMessage(
 ): Promise<void> {
   await apiPostFetch({
     baseUrl: params.baseUrl,
+    metadata: params.metadata,
     endpoint: "ilink/bot/sendmessage",
-    body: JSON.stringify({ ...params.body, base_info: buildBaseInfo() }),
+    body: JSON.stringify({ ...params.body, base_info: params.metadata.buildBaseInfo() }),
     token: params.token,
     timeoutMs: params.timeoutMs ?? DEFAULT_API_TIMEOUT_MS,
     label: "sendMessage",
@@ -292,11 +294,12 @@ export async function getConfig(
 ): Promise<GetConfigResp> {
   const rawText = await apiPostFetch({
     baseUrl: params.baseUrl,
+    metadata: params.metadata,
     endpoint: "ilink/bot/getconfig",
     body: JSON.stringify({
       ilink_user_id: params.ilinkUserId,
       context_token: params.contextToken,
-      base_info: buildBaseInfo(),
+      base_info: params.metadata.buildBaseInfo(),
     }),
     token: params.token,
     timeoutMs: params.timeoutMs ?? DEFAULT_CONFIG_TIMEOUT_MS,
@@ -312,8 +315,9 @@ export async function sendTyping(
 ): Promise<void> {
   await apiPostFetch({
     baseUrl: params.baseUrl,
+    metadata: params.metadata,
     endpoint: "ilink/bot/sendtyping",
-    body: JSON.stringify({ ...params.body, base_info: buildBaseInfo() }),
+    body: JSON.stringify({ ...params.body, base_info: params.metadata.buildBaseInfo() }),
     token: params.token,
     timeoutMs: params.timeoutMs ?? DEFAULT_CONFIG_TIMEOUT_MS,
     label: "sendTyping",
@@ -328,8 +332,9 @@ export async function sendTyping(
 export async function notifyStop(params: WeixinApiOptions): Promise<NotifyStopResp> {
   const rawText = await apiPostFetch({
     baseUrl: params.baseUrl,
+    metadata: params.metadata,
     endpoint: "ilink/bot/msg/notifystop",
-    body: JSON.stringify({ base_info: buildBaseInfo() }),
+    body: JSON.stringify({ base_info: params.metadata.buildBaseInfo() }),
     token: params.token,
     timeoutMs: params.timeoutMs ?? DEFAULT_CONFIG_TIMEOUT_MS,
     label: "notifyStop",
@@ -343,8 +348,9 @@ export async function notifyStop(params: WeixinApiOptions): Promise<NotifyStopRe
 export async function notifyStart(params: WeixinApiOptions): Promise<NotifyStartResp> {
   const rawText = await apiPostFetch({
     baseUrl: params.baseUrl,
+    metadata: params.metadata,
     endpoint: "ilink/bot/msg/notifystart",
-    body: JSON.stringify({ base_info: buildBaseInfo() }),
+    body: JSON.stringify({ base_info: params.metadata.buildBaseInfo() }),
     token: params.token,
     timeoutMs: params.timeoutMs ?? DEFAULT_CONFIG_TIMEOUT_MS,
     label: "notifyStart",

package/src/ilink-config-cache.ts

@@ -1,4 +1,4 @@
-import { getConfig } from "./ilink-api.js";
+import { getConfig, type WeixinApiOptions } from "./ilink-api.js";
 
 /** Subset of getConfig fields that we actually need; add new fields here as needed. */
 export interface CachedConfig {
@@ -21,41 +21,45 @@ interface ConfigCacheEntry {
  * exponential-backoff retry (up to 1h) on failure.
  */
 export class WeixinConfigManager {
-  private cache = new Map<string, ConfigCacheEntry>();
+  readonly #cache = new Map<string, ConfigCacheEntry>();
+  readonly #apiOptions: WeixinApiOptions;
+  readonly #log: (msg: string) => void;
 
   constructor(
-    private apiOpts: { baseUrl: string; token?: string },
-    private log: (msg: string) => void,
-  ) {}
+    apiOptions: WeixinApiOptions,
+    log: (msg: string) => void,
+  ) {
+    this.#apiOptions = apiOptions;
+    this.#log = log;
+  }
 
   async getForUser(userId: string, contextToken?: string): Promise<CachedConfig> {
     const now = Date.now();
-    const entry = this.cache.get(userId);
+    const entry = this.#cache.get(userId);
     const shouldFetch = !entry || now >= entry.nextFetchAt;
 
     if (shouldFetch) {
       let fetchOk = false;
       try {
         const resp = await getConfig({
-          baseUrl: this.apiOpts.baseUrl,
-          token: this.apiOpts.token,
+          ...this.#apiOptions,
           ilinkUserId: userId,
           contextToken,
         });
         if (resp.ret === 0) {
-          this.cache.set(userId, {
+          this.#cache.set(userId, {
             config: { typingTicket: resp.typing_ticket ?? "" },
             everSucceeded: true,
             nextFetchAt: now + Math.random() * CONFIG_CACHE_TTL_MS,
             retryDelayMs: CONFIG_CACHE_INITIAL_RETRY_MS,
           });
-          this.log(
+          this.#log(
             `[weixin] config ${entry?.everSucceeded ? "refreshed" : "cached"} for ${userId}`,
           );
           fetchOk = true;
         }
       } catch (err) {
-        this.log(`[weixin] getConfig failed for ${userId} (ignored): ${String(err)}`);
+        this.#log(`[weixin] getConfig failed for ${userId} (ignored): ${String(err)}`);
       }
       if (!fetchOk) {
         const prevDelay = entry?.retryDelayMs ?? CONFIG_CACHE_INITIAL_RETRY_MS;
@@ -64,7 +68,7 @@ export class WeixinConfigManager {
           entry.nextFetchAt = now + nextDelay;
           entry.retryDelayMs = nextDelay;
         } else {
-          this.cache.set(userId, {
+          this.#cache.set(userId, {
             config: { typingTicket: "" },
             everSucceeded: false,
             nextFetchAt: now + CONFIG_CACHE_INITIAL_RETRY_MS,
@@ -74,6 +78,6 @@ export class WeixinConfigManager {
       }
     }
 
-    return this.cache.get(userId)?.config ?? { typingTicket: "" };
+    return this.#cache.get(userId)?.config ?? { typingTicket: "" };
   }
 }