@insta-dev01/intclaw 1.0.10 → 1.1.0

package/src/core/provider.ts

@@ -0,0 +1,106 @@
+/**
+ * IntClaw消息流 Provider 入口
+ *
+ * 职责：
+ * - 提供 monitorIntclawProvider 函数作为IntClaw消息流的统一入口
+ * - 协调单账号和多账号监控场景
+ * - 并行导入连接层和消息处理模块，避免循环依赖
+ *
+ * 主要功能：
+ * - 根据 accountId 参数决定启动单账号或所有账号
+ * - 验证账号配置状态
+ * - 并行启动多个账号的消息流连接
+ */
+import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
+import * as monitorState from "./state";
+
+// 只解构 monitorState 的导出
+const {
+  clearIntclawWebhookRateLimitStateForTest,
+  getIntclawWebhookRateLimitStateSizeForTest,
+  isWebhookRateLimitedForTest,
+  stopIntclawMonitorState,
+} = monitorState;
+
+export type MonitorIntclawOpts = {
+  config?: ClawdbotConfig;
+  runtime?: RuntimeEnv;
+  abortSignal?: AbortSignal;
+  accountId?: string;
+};
+
+export {
+  clearIntclawWebhookRateLimitStateForTest,
+  getIntclawWebhookRateLimitStateSizeForTest,
+  isWebhookRateLimitedForTest,
+} from "./state";
+
+// 只导出类型，不 re-export 函数（避免循环依赖）
+export type { IntclawReactionCreatedEvent } from "./connection";
+
+export async function monitorIntclawProvider(opts: MonitorIntclawOpts = {}): Promise<void> {
+  const cfg = opts.config;
+  if (!cfg) {
+    throw new Error("Config is required for IntClaw monitor");
+  }
+
+  const log = opts.runtime?.log;
+
+  // 并行导入所有模块（无循环依赖，可以并行）
+  const [accountsModule, monitorAccountModule, monitorSingleModule] = await Promise.all([
+    import("../config/accounts"),
+    import("./message-handler"),
+    import("./connection"),
+  ]);
+  
+  const { resolveIntclawAccount, listEnabledIntclawAccounts } = accountsModule;
+  const { handleIntClawMessage } = monitorAccountModule;
+  const { monitorSingleAccount, resolveReactionSyntheticEvent } = monitorSingleModule;
+
+  if (opts.accountId) {
+    const account = resolveIntclawAccount({ cfg, accountId: opts.accountId });
+    if (!account.enabled || !account.configured) {
+      throw new Error(`IntClaw account "${opts.accountId}" not configured or disabled`);
+    }
+    return monitorSingleAccount({
+      cfg,
+      account,
+      runtime: opts.runtime,
+      abortSignal: opts.abortSignal,
+      messageHandler: handleIntClawMessage,
+    });
+  }
+
+  const accounts = listEnabledIntclawAccounts(cfg);
+  if (accounts.length === 0) {
+    throw new Error("No enabled IntClaw accounts configured");
+  }
+
+  log?.info?.(
+    `intclaw-connector: starting ${accounts.length} account(s): ${accounts.map((a) => a.accountId).join(", ")}`,
+  );
+
+  const monitorPromises: Promise<void>[] = [];
+  for (const account of accounts) {
+    if (opts.abortSignal?.aborted) {
+      log?.info?.("intclaw-connector: abort signal received during startup preflight; stopping startup");
+      break;
+    }
+
+    monitorPromises.push(
+      monitorSingleAccount({
+        cfg,
+        account,
+        runtime: opts.runtime,
+        abortSignal: opts.abortSignal,
+        messageHandler: handleIntClawMessage,
+      }),
+    );
+  }
+
+  await Promise.all(monitorPromises);
+}
+
+export function stopIntclawMonitor(accountId?: string): void {
+  stopIntclawMonitorState(accountId);
+}

package/src/core/state.ts

@@ -0,0 +1,54 @@
+/**
+ * IntClaw消息流状态管理
+ * 
+ * 职责：
+ * - 管理每个IntClaw账号的运行状态
+ * - 存储 AbortController 用于优雅停止消息流
+ * - 提供测试工具函数
+ * 
+ * 核心功能：
+ * - setIntclawMonitorState: 设置账号运行状态
+ * - getIntclawMonitorState: 获取账号运行状态
+ * - stopIntclawMonitorState: 停止单个或多个账号的消息流
+ * - 测试工具：clearIntclawWebhookRateLimitStateForTest 等
+ */
+const monitorState = new Map<string, { running: boolean; abortController?: AbortController }>();
+
+export function setIntclawMonitorState(accountId: string, state: { running: boolean; abortController?: AbortController }): void {
+  monitorState.set(accountId, state);
+}
+
+export function getIntclawMonitorState(accountId: string): { running: boolean; abortController?: AbortController } | undefined {
+  return monitorState.get(accountId);
+}
+
+export function stopIntclawMonitorState(accountId?: string): void {
+  if (accountId) {
+    const state = monitorState.get(accountId);
+    if (state?.abortController) {
+      state.abortController.abort();
+    }
+    monitorState.delete(accountId);
+  } else {
+    // Stop all monitors
+    for (const [id, state] of monitorState.entries()) {
+      if (state.abortController) {
+        state.abortController.abort();
+      }
+    }
+    monitorState.clear();
+  }
+}
+
+// Test utilities
+export function clearIntclawWebhookRateLimitStateForTest(): void {
+  // IntClaw doesn't use webhook rate limiting
+}
+
+export function getIntclawWebhookRateLimitStateSizeForTest(): number {
+  return 0;
+}
+
+export function isWebhookRateLimitedForTest(): boolean {
+  return false;
+}

package/src/directory.ts

@@ -0,0 +1,95 @@
+import type { ClawdbotConfig } from "openclaw/plugin-sdk";
+import { resolveIntclawAccount } from "./config/accounts.ts";
+import { normalizeIntclawTarget } from "./targets.ts";
+
+export type IntclawDirectoryPeer = {
+  kind: "user";
+  id: string;
+  name?: string;
+};
+
+export type IntclawDirectoryGroup = {
+  kind: "group";
+  id: string;
+  name?: string;
+};
+
+export async function listIntclawDirectoryPeers(params: {
+  cfg: ClawdbotConfig;
+  query?: string;
+  limit?: number;
+  accountId?: string;
+}): Promise<IntclawDirectoryPeer[]> {
+  const account = resolveIntclawAccount({ cfg: params.cfg, accountId: params.accountId });
+  const intclawCfg = account.config;
+  const q = params.query?.trim().toLowerCase() || "";
+  const ids = new Set<string>();
+
+  for (const entry of intclawCfg?.allowFrom ?? []) {
+    const trimmed = String(entry).trim();
+    if (trimmed && trimmed !== "*") {
+      ids.add(trimmed);
+    }
+  }
+
+  return Array.from(ids)
+    .map((raw) => raw.trim())
+    .filter(Boolean)
+    .map((raw) => normalizeIntclawTarget(raw) ?? raw)
+    .filter((id) => (q ? id.toLowerCase().includes(q) : true))
+    .slice(0, params.limit && params.limit > 0 ? params.limit : undefined)
+    .map((id) => ({ kind: "user" as const, id }));
+}
+
+export async function listIntclawDirectoryGroups(params: {
+  cfg: ClawdbotConfig;
+  query?: string;
+  limit?: number;
+  accountId?: string;
+}): Promise<IntclawDirectoryGroup[]> {
+  const account = resolveIntclawAccount({ cfg: params.cfg, accountId: params.accountId });
+  const intclawCfg = account.config;
+  const q = params.query?.trim().toLowerCase() || "";
+  const ids = new Set<string>();
+
+  for (const groupId of Object.keys(intclawCfg?.groups ?? {})) {
+    const trimmed = groupId.trim();
+    if (trimmed && trimmed !== "*") {
+      ids.add(trimmed);
+    }
+  }
+
+  for (const entry of intclawCfg?.groupAllowFrom ?? []) {
+    const trimmed = String(entry).trim();
+    if (trimmed && trimmed !== "*") {
+      ids.add(trimmed);
+    }
+  }
+
+  return Array.from(ids)
+    .map((raw) => raw.trim())
+    .filter(Boolean)
+    .filter((id) => (q ? id.toLowerCase().includes(q) : true))
+    .slice(0, params.limit && params.limit > 0 ? params.limit : undefined)
+    .map((id) => ({ kind: "group" as const, id }));
+}
+
+export async function listIntclawDirectoryPeersLive(params: {
+  cfg: ClawdbotConfig;
+  query?: string;
+  limit?: number;
+  accountId?: string;
+}): Promise<IntclawDirectoryPeer[]> {
+  // IntClaw doesn't have a public API to list users, so we fall back to static list
+  return listIntclawDirectoryPeers(params);
+}
+
+export async function listIntclawDirectoryGroupsLive(params: {
+  cfg: ClawdbotConfig;
+  query?: string;
+  limit?: number;
+  accountId?: string;
+}): Promise<IntclawDirectoryGroup[]> {
+  // IntClaw doesn't have a public API to list groups, so we fall back to static list
+  return listIntclawDirectoryGroups(params);
+}

package/src/gateway-methods.ts

@@ -0,0 +1,237 @@
+/**
+ * Gateway Methods 注册
+ * 
+ * 提供IntClaw插件的 RPC 接口，允许外部系统、AI Agent 和其他插件调用IntClaw功能
+ */
+
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { resolveIntclawAccount } from "./config/accounts.ts";
+
+import { sendProactive } from "./services/messaging.ts";
+import { getUnionId } from "./utils/utils-legacy.ts";
+
+/**
+ * 注册所有 Gateway Methods
+ */
+export function registerGatewayMethods(api: OpenClawPluginApi) {
+  const log = api.logger;
+  
+  // ============ 消息发送类 ============
+
+  /**
+   * 主动发送单聊消息
+   * 
+   * @example
+   * ```typescript
+   * await gateway.call('intclaw-connector.sendToUser', {
+   *   userId: 'user123',
+   *   content: '任务已完成！',
+   *      * });
+   * ```
+   */
+  api.registerGatewayMethod('intclaw-connector.sendToUser', async ({ context, params, respond }) => {
+    const cfg = context.deps.getConfig();
+    try {
+      const { userId, userIds, content, msgType, title, accountId } = params || {};
+      const account = resolveIntclawAccount({ cfg, accountId });
+
+      if (!account.config?.clientId) {
+        return respond(false, { error: 'IntClaw not configured' });
+      }
+
+      const targetUserIds = userIds || (userId ? [userId] : []);
+      if (targetUserIds.length === 0) {
+        return respond(false, { error: 'userId or userIds is required' });
+      }
+
+      if (!content) {
+        return respond(false, { error: 'content is required' });
+      }
+
+      // 构建目标
+      const target = targetUserIds.length === 1
+        ? { userId: targetUserIds[0] }
+        : { userIds: targetUserIds };
+
+      const result = await sendProactive(account.config, target, content, {
+        msgType,
+        title,
+        log,
+      });
+
+      respond(result.ok, result);
+    } catch (err: any) {
+      log?.error?.(`[Gateway][sendToUser] 错误: ${err.message}`);
+      respond(false, { error: err.message });
+    }
+  });
+
+  /**
+   * 主动发送群聊消息
+   * 
+   * @example
+   * ```typescript
+   * await gateway.call('intclaw-connector.sendToGroup', {
+   *   openConversationId: 'cid123',
+   *   content: '构建失败，请检查日志',
+   *      * });
+   * ```
+   */
+  api.registerGatewayMethod('intclaw-connector.sendToGroup', async ({ context, params, respond }) => {
+    const cfg = context.deps.getConfig();
+    try {
+      const { openConversationId, content, msgType, title, accountId } = params || {};
+      const account = resolveIntclawAccount({ cfg, accountId });
+
+      if (!account.config?.clientId) {
+        return respond(false, { error: 'IntClaw not configured' });
+      }
+
+      if (!openConversationId) {
+        return respond(false, { error: 'openConversationId is required' });
+      }
+
+      if (!content) {
+        return respond(false, { error: 'content is required' });
+      }
+
+      const result = await sendProactive(account.config, { openConversationId }, content, {
+        msgType,
+        title,
+        log,
+      });
+
+      respond(result.ok, result);
+    } catch (err: any) {
+      log?.error?.(`[Gateway][sendToGroup] 错误: ${err.message}`);
+      respond(false, { error: err.message });
+    }
+  });
+
+  /**
+   * 智能发送消息（自动识别目标类型）
+   * 
+   * @example
+   * ```typescript
+   * // 发送给用户
+   * await gateway.call('intclaw-connector.send', {
+   *   target: 'user:user123',
+   *   content: '你好！'
+   * });
+   * 
+   * // 发送到群
+   * await gateway.call('intclaw-connector.send', {
+   *   target: 'group:cid123',
+   *   content: '大家好！'
+   * });
+   * ```
+   */
+  api.registerGatewayMethod('intclaw-connector.send', async ({ context, params, respond }) => {
+    const cfg = context.deps.getConfig();
+    try {
+      const { target, content, message, msgType, title, accountId } = params || {};
+      const actualContent = content || message;
+      const account = resolveIntclawAccount({ cfg, accountId });
+
+      log?.info?.(`[Gateway][send] 收到请求: target=${target}, contentLen=${actualContent?.length}`);
+
+      if (!account.config?.clientId) {
+        return respond(false, { error: 'IntClaw not configured' });
+      }
+
+      if (!target) {
+        return respond(false, { error: 'target is required (format: user:<userId> or group:<openConversationId>)' });
+      }
+
+      if (!actualContent) {
+        return respond(false, { error: 'content is required' });
+      }
+
+      const targetStr = String(target);
+      let sendTarget: { userId?: string; openConversationId?: string };
+
+      if (targetStr.startsWith('user:')) {
+        sendTarget = { userId: targetStr.slice(5) };
+      } else if (targetStr.startsWith('group:')) {
+        sendTarget = { openConversationId: targetStr.slice(6) };
+      } else {
+        // 默认当作 userId
+        sendTarget = { userId: targetStr };
+      }
+
+      const result = await sendProactive(account.config, sendTarget, actualContent, {
+        msgType,
+        title,
+        log,
+      });
+
+      respond(result.ok, result);
+    } catch (err: any) {
+      log?.error?.(`[Gateway][send] 错误: ${err.message}`);
+      respond(false, { error: err.message });
+    }
+  });
+
+
+
+  // ============ 状态检查类 ============
+
+  /**
+   * 检查插件状态
+   * 
+   * @example
+   * ```typescript
+   * const result = await gateway.call('intclaw-connector.status');
+   * console.log('配置状态:', result);
+   * ```
+   */
+  api.registerGatewayMethod('intclaw-connector.status', async ({ context, respond }) => {
+    const cfg = context.deps.getConfig();
+    try {
+      const account = resolveIntclawAccount({ cfg });
+      const configured = Boolean(account.config?.clientId && account.config?.clientSecret);
+
+      respond(true, {
+        configured,
+        enabled: account.enabled,
+        accountId: account.accountId,
+        clientId: account.config?.clientId,
+      });
+    } catch (err: any) {
+      log?.error?.(`[Gateway][status] 错误: ${err.message}`);
+      respond(false, { error: err.message });
+    }
+  });
+
+  /**
+   * 探测IntClaw连接
+   * 
+   * @example
+   * ```typescript
+   * const result = await gateway.call('intclaw-connector.probe');
+   * if (result.ok) {
+   *   console.log('连接正常');
+   * }
+   * ```
+   */
+  api.registerGatewayMethod('intclaw-connector.probe', async ({ context, respond }) => {
+    const cfg = context.deps.getConfig();
+    try {
+      const account = resolveIntclawAccount({ cfg });
+      
+      if (!account.config?.clientId || !account.config?.clientSecret) {
+        return respond(false, { error: 'Not configured' });
+      }
+
+      // 尝试获取 access token 来验证连接
+      const { getAccessToken } = await import('./utils/utils-legacy.ts');
+      await getAccessToken(account.config);
+
+      respond(true, { ok: true, details: { clientId: account.config.clientId } });
+    } catch (err: any) {
+      log?.error?.(`[Gateway][probe] 错误: ${err.message}`);
+      respond(false, { ok: false, error: err.message });
+    }
+  });
+
+}