@f2a/openclaw-f2a 0.3.1 → 0.3.4

package/dist/F2AWebhookManager.js

@@ -0,0 +1,241 @@
+"use strict";
+/**
+ * F2A Webhook 管理器
+ *
+ * 负责管理 Webhook 处理器的创建和配置。
+ * 从 connector.ts 拆分（Issue #106），遵循单一职责原则。
+ *
+ * @module F2AWebhookManager
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.F2AWebhookManager = void 0;
+const types_js_1 = require("./types.js");
+const task_guard_js_1 = require("./task-guard.js");
+const connector_helpers_js_1 = require("./connector-helpers.js");
+/**
+ * F2A Webhook 管理器
+ *
+ * 功能：
+ * 1. 创建和配置 Webhook 处理器
+ * 2. 处理 discover、delegate、message、status 等 webhook 事件
+ */
+class F2AWebhookManager {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    /**
+     * 创建 Webhook 处理器
+     */
+    createHandler() {
+        return {
+            onDiscover: async (payload) => {
+                return this.handleDiscover(payload);
+            },
+            onDelegate: async (payload) => {
+                return this.handleDelegate(payload);
+            },
+            onMessage: async (payload) => {
+                return this.handleMessage(payload);
+            },
+            onStatus: async () => {
+                return this.handleStatus();
+            },
+        };
+    }
+    /**
+     * 处理 discover webhook
+     */
+    async handleDiscover(payload) {
+        // 检查请求者信誉 - 使用分数检查替代 isAllowed
+        const requesterScore = this.deps.reputationSystem.getReputation(payload.requester).score;
+        if (requesterScore < types_js_1.INTERNAL_REPUTATION_CONFIG.minScoreForService) {
+            return {
+                capabilities: [],
+                reputation: requesterScore,
+            };
+        }
+        // 过滤能力
+        let caps = this.deps.capabilities;
+        if (payload.query.capability) {
+            caps = caps.filter(c => c.name === payload.query.capability || c.tools?.includes(payload.query.capability));
+        }
+        return {
+            capabilities: caps,
+            reputation: this.deps.reputationSystem.getReputation(payload.requester).score,
+        };
+    }
+    /**
+     * 处理 delegate webhook
+     */
+    async handleDelegate(payload) {
+        const { config, logger, reputationSystem, taskQueue, webhookPusher, api } = this.deps;
+        // 安全检查 - 使用分数检查替代 isAllowed
+        const requesterScore = reputationSystem.getReputation(payload.from).score;
+        if (requesterScore < types_js_1.INTERNAL_REPUTATION_CONFIG.minScoreForService) {
+            return {
+                accepted: false,
+                taskId: payload.taskId,
+                reason: 'Reputation too low',
+            };
+        }
+        // 检查白名单/黑名单
+        const whitelist = config.security?.whitelist || [];
+        const blacklist = config.security?.blacklist || [];
+        const isWhitelisted = whitelist.length > 0 && whitelist.includes(payload.from);
+        const isBlacklisted = blacklist.includes(payload.from);
+        if (whitelist.length > 0 && !isWhitelisted) {
+            return {
+                accepted: false,
+                taskId: payload.taskId,
+                reason: 'Not in whitelist',
+            };
+        }
+        if (isBlacklisted) {
+            return {
+                accepted: false,
+                taskId: payload.taskId,
+                reason: 'In blacklist',
+            };
+        }
+        // TaskGuard 安全检查
+        const requesterReputation = reputationSystem.getReputation(payload.from);
+        const taskGuardContext = {
+            requesterReputation,
+            isWhitelisted,
+            isBlacklisted,
+            recentTaskCount: 0,
+        };
+        const taskGuardReport = task_guard_js_1.taskGuard.check(payload, taskGuardContext);
+        if (!taskGuardReport.passed) {
+            const blockReasons = taskGuardReport.blocks.map(b => b.message).join('; ');
+            logger?.warn(`[F2A] TaskGuard 阻止任务 ${payload.taskId}: ${blockReasons}`);
+            return {
+                accepted: false,
+                taskId: payload.taskId,
+                reason: `TaskGuard blocked: ${blockReasons}`,
+            };
+        }
+        if (taskGuardReport.requiresConfirmation) {
+            const warnReasons = taskGuardReport.warnings.map(w => w.message).join('; ');
+            logger?.warn(`[F2A] TaskGuard 警告 ${payload.taskId}: ${warnReasons}`);
+        }
+        // 检查队列是否已满
+        const stats = taskQueue.getStats();
+        if (stats.pending >= (config.maxQueuedTasks || 100)) {
+            return {
+                accepted: false,
+                taskId: payload.taskId,
+                reason: 'Task queue is full',
+            };
+        }
+        // 添加任务到队列
+        try {
+            const task = taskQueue.add(payload);
+            // 优先使用 webhook 推送
+            if (webhookPusher && task) {
+                const queuedTask = task;
+                const result = await webhookPusher.pushTask(queuedTask);
+                if (result.success) {
+                    taskQueue.markWebhookPushed(queuedTask.taskId);
+                    logger?.info(`[F2A] 任务 ${queuedTask.taskId} 已通过 webhook 推送 (${result.latency}ms)`);
+                }
+                else {
+                    logger?.info(`[F2A] Webhook 推送失败: ${result.error}，任务将在轮询时处理`);
+                }
+            }
+            // 触发 OpenClaw 心跳
+            api?.runtime?.system?.requestHeartbeatNow?.();
+            return {
+                accepted: true,
+                taskId: payload.taskId,
+            };
+        }
+        catch (error) {
+            return {
+                accepted: false,
+                taskId: payload.taskId,
+                reason: error instanceof Error ? error.message : 'Failed to queue task',
+            };
+        }
+    }
+    /**
+     * 处理 message webhook
+     */
+    async handleMessage(payload) {
+        const { logger, invokeOpenClawAgent } = this.deps;
+        // 验证 PeerID 格式
+        if (!(0, connector_helpers_js_1.isValidPeerId)(payload.from)) {
+            logger?.warn(`[F2A] onMessage: 拒绝来自无效 PeerID 的消息: ${String(payload.from).slice(0, 20)}`);
+            return { response: 'Invalid sender' };
+        }
+        // 检查消息长度限制
+        if (payload.content && payload.content.length > connector_helpers_js_1.MAX_MESSAGE_LENGTH) {
+            logger?.warn(`[F2A] onMessage: 消息过长 (${payload.content.length} bytes)，拒绝处理`);
+            return { response: 'Message too long' };
+        }
+        logger?.info('[F2A] 收到 P2P 消息', {
+            from: payload.from.slice(0, 16),
+            content: payload.content.slice(0, 50),
+        });
+        try {
+            // 构造消息
+            const message = `[来自 ${payload.metadata?.from || payload.from.slice(0, 16)}] ${payload.content}`;
+            // 调用消息处理函数
+            const result = await invokeOpenClawAgent(payload.from, message);
+            return { response: result || '收到消息，但我暂时无法生成回复。' };
+        }
+        catch (error) {
+            logger?.error('[F2A] 处理消息失败', { error: (0, connector_helpers_js_1.extractErrorMessage)(error) });
+            return { response: '抱歉，我遇到了一些问题，无法处理你的消息。' };
+        }
+    }
+    /**
+     * 处理 status webhook
+     */
+    async handleStatus() {
+        const stats = this.deps.taskQueue.getStats();
+        return {
+            status: 'available',
+            load: stats.pending + stats.processing,
+            queued: stats.pending,
+            processing: stats.processing,
+        };
+    }
+    /**
+     * 更新依赖（用于运行时更新）
+     */
+    updateDeps(deps) {
+        if (deps.config)
+            this.deps.config = deps.config;
+        if (deps.capabilities)
+            this.deps.capabilities = deps.capabilities;
+        if (deps.logger)
+            this.deps.logger = deps.logger;
+        if (deps.reputationSystem)
+            this.deps.reputationSystem = deps.reputationSystem;
+        if (deps.taskQueue)
+            this.deps.taskQueue = deps.taskQueue;
+        if (deps.webhookPusher)
+            this.deps.webhookPusher = deps.webhookPusher;
+        if (deps.api)
+            this.deps.api = deps.api;
+        if (deps.invokeOpenClawAgent)
+            this.deps.invokeOpenClawAgent = deps.invokeOpenClawAgent;
+    }
+    /**
+     * 更新能力列表
+     */
+    updateCapabilities(capabilities) {
+        this.deps.capabilities = capabilities;
+    }
+    /**
+     * 更新配置
+     */
+    updateConfig(config) {
+        this.deps.config = config;
+    }
+}
+exports.F2AWebhookManager = F2AWebhookManager;
+exports.default = F2AWebhookManager;
+//# sourceMappingURL=F2AWebhookManager.js.map

package/dist/F2AWebhookManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"F2AWebhookManager.js","sourceRoot":"","sources":["../src/F2AWebhookManager.ts"],"names":[],"mappings":"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"}

package/dist/agent-manager.js

@@ -41,13 +41,13 @@ class AgentManager {
         const existing = this.loadIdentity();
         if (existing) {
             this.identity = existing;
-            logger_js_1.pluginLogger.info('[F2A:Agent] 已加载 Agent 身份: %s', existing.agentId);
+            logger_js_1.pluginLogger.info('[F2A:Agent] 已加载 Agent 身份', { agentId: existing.agentId });
             return;
         }
         // 创建新身份
         this.identity = this.createIdentity();
         this.saveIdentity(this.identity);
-        logger_js_1.pluginLogger.info('[F2A:Agent] 已创建新 Agent 身份: %s', this.identity.agentId);
+        logger_js_1.pluginLogger.info('[F2A:Agent] 已创建新 Agent 身份', { agentId: this.identity.agentId });
     }
     /**
      * 异步初始化（兼容旧 API）
@@ -125,7 +125,7 @@ class AgentManager {
             return identity;
         }
         catch (error) {
-            logger_js_1.pluginLogger.warn('[F2A:Agent] 加载身份文件失败: %s', error);
+            logger_js_1.pluginLogger.warn('[F2A:Agent] 加载身份文件失败', { error: String(error) });
             return null;
         }
     }
@@ -140,7 +140,7 @@ class AgentManager {
         const filePath = (0, path_1.join)(this.dataDir, AGENT_DATA_FILE);
         const data = JSON.stringify(identity, null, 2);
         (0, fs_1.writeFileSync)(filePath, data, { mode: 0o600 }); // 仅所有者可读写
-        logger_js_1.pluginLogger.debug('[F2A:Agent] 身份已保存到: %s', filePath);
+        logger_js_1.pluginLogger.debug?.('[F2A:Agent] 身份已保存', { filePath });
     }
     /**
      * 导出 Agent 身份（用于迁移）
@@ -189,7 +189,7 @@ class AgentManager {
         }
         this.identity = identity;
         this.saveIdentity(identity);
-        logger_js_1.pluginLogger.info('[F2A:Agent] 已导入 Agent 身份: %s', identity.agentId);
+        logger_js_1.pluginLogger.info('[F2A:Agent] 已导入 Agent 身份', { agentId: identity.agentId });
         return identity;
     }
     /**
@@ -198,7 +198,7 @@ class AgentManager {
     resetIdentity() {
         this.identity = this.createIdentity();
         this.saveIdentity(this.identity);
-        logger_js_1.pluginLogger.info('[F2A:Agent] 已重置 Agent 身份: %s', this.identity.agentId);
+        logger_js_1.pluginLogger.info('[F2A:Agent] 已重置 Agent 身份', { agentId: this.identity.agentId });
         return this.identity;
     }
 }

package/dist/agent-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-manager.js","sourceRoot":"","sources":["../src/agent-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-manager.js","sourceRoot":"","sources":["../src/agent-manager.ts"],"names":[],"mappings":"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"}

package/dist/announcement-queue.d.ts

@@ -8,13 +8,7 @@
  */
 import type { TaskAnnouncement, TaskClaim } from './types.js';
 import { EventEmitter } from 'eventemitter3';
-/** Logger 接口 */
-interface Logger {
-    info(message: string, ...args: unknown[]): void;
-    warn(message: string, ...args: unknown[]): void;
-    error(message: string, ...args: unknown[]): void;
-    debug?(message: string, ...args: unknown[]): void;
-}
+import type { Logger } from './logger.js';
 /**
  * 任务广播队列统计信息
  *
@@ -148,5 +142,4 @@ export declare function createAnnouncementQueue(options?: {
     maxAgeMs?: number;
 }): AnnouncementQueue;
 export declare const announcementQueue: AnnouncementQueue;
-export {};
 //# sourceMappingURL=announcement-queue.d.ts.map

package/dist/announcement-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"announcement-queue.d.ts","sourceRoot":"","sources":["../src/announcement-queue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"announcement-queue.d.ts","sourceRoot":"","sources":["../src/announcement-queue.ts"],"names":[],"mappings":"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"}

package/dist/announcement-queue.js

@@ -33,7 +33,7 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
         this.cleanup();
         // 检查容量
         if (this.announcements.size >= this.maxSize) {
-            this.logger.error('[F2A:Announce]  create: queue is full, size=%d, maxSize=%d', this.announcements.size, this.maxSize);
+            this.logger.error('[F2A:Announce]  create: queue is full', { size: this.announcements.size, maxSize: this.maxSize });
             throw new Error('Announcement queue is full');
         }
         // 使用 crypto.randomUUID() 生成唯一 ID，避免碰撞
@@ -46,7 +46,7 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
             claims: []
         };
         this.announcements.set(id, created);
-        this.logger.info('[F2A:Announce]  create: announcementId=%s, from=%s, taskType=%s', id, announcement.from, announcement.taskType);
+        this.logger.info('[F2A:Announce]  create: announcement created', { announcementId: id, from: announcement.from, taskType: announcement.taskType });
         // 发出创建事件
         this.emit('announcement:created', created);
         return created;
@@ -73,17 +73,17 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
     submitClaim(announcementId, claim) {
         const announcement = this.announcements.get(announcementId);
         if (!announcement) {
-            this.logger.warn('[F2A:Announce]  submitClaim: announcement not found, id=%s, claimant=%s', announcementId, claim.claimant);
+            this.logger.warn('[F2A:Announce]  submitClaim: announcement not found', { announcementId, claimant: claim.claimant });
             return null;
         }
         if (announcement.status !== 'open') {
-            this.logger.warn('[F2A:Announce]  submitClaim: announcement not open, id=%s, status=%s, claimant=%s', announcementId, announcement.status, claim.claimant);
+            this.logger.warn('[F2A:Announce]  submitClaim: announcement not open', { announcementId, status: announcement.status, claimant: claim.claimant });
             return null;
         }
         // 检查该 claimant 是否已经提交过认领（防止重复认领）
         const existingClaim = announcement.claims?.find(c => c.claimant === claim.claimant);
         if (existingClaim) {
-            this.logger.info('[F2A:Announce]  submitClaim: duplicate claim ignored, id=%s, claimant=%s, existingClaimId=%s', announcementId, claim.claimant, existingClaim.claimId);
+            this.logger.info('[F2A:Announce]  submitClaim: duplicate claim ignored', { announcementId, claimant: claim.claimant, existingClaimId: existingClaim.claimId });
             // 返回已存在的认领，而不是创建新的
             return existingClaim;
         }
@@ -100,7 +100,7 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
             announcement.claims = [];
         }
         announcement.claims.push(created);
-        this.logger.info('[F2A:Announce]  submitClaim: claimId=%s, announcementId=%s, claimant=%s', claimId, announcementId, claim.claimant);
+        this.logger.info('[F2A:Announce]  submitClaim: claim submitted', { claimId, announcementId, claimant: claim.claimant });
         return created;
     }
     /**
@@ -112,22 +112,22 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
     acceptClaim(announcementId, claimId) {
         const announcement = this.announcements.get(announcementId);
         if (!announcement) {
-            this.logger.warn('[F2A:Announce]  acceptClaim: announcement not found, id=%s, claimId=%s', announcementId, claimId);
+            this.logger.warn('[F2A:Announce]  acceptClaim: announcement not found', { announcementId, claimId });
             return null;
         }
         // 检查是否已被锁定（正在被其他操作处理）
         if (this.processingLocks.has(announcementId)) {
-            this.logger.warn('[F2A:Announce]  acceptClaim: announcement is being processed, id=%s, claimId=%s', announcementId, claimId);
+            this.logger.warn('[F2A:Announce]  acceptClaim: announcement is being processed', { announcementId, claimId });
             return null;
         }
         // 检查广播状态
         if (announcement.status !== 'open') {
-            this.logger.warn('[F2A:Announce]  acceptClaim: announcement not open, id=%s, status=%s, claimId=%s', announcementId, announcement.status, claimId);
+            this.logger.warn('[F2A:Announce]  acceptClaim: announcement not open', { announcementId, status: announcement.status, claimId });
             return null;
         }
         const claim = announcement.claims?.find(c => c.claimId === claimId);
         if (!claim) {
-            this.logger.warn('[F2A:Announce]  acceptClaim: claim not found, announcementId=%s, claimId=%s', announcementId, claimId);
+            this.logger.warn('[F2A:Announce]  acceptClaim: claim not found', { announcementId, claimId });
             return null;
         }
         // 获取锁
@@ -135,7 +135,7 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
         try {
             // 再次检查广播状态（双重检查）
             if (announcement.status !== 'open') {
-                this.logger.warn('[F2A:Announce]  acceptClaim: race condition detected, announcement status changed, id=%s, status=%s, claimId=%s', announcementId, announcement.status, claimId);
+                this.logger.warn('[F2A:Announce]  acceptClaim: race condition detected, announcement status changed', { announcementId, status: announcement.status, claimId });
                 return null;
             }
             // 标记该认领为接受
@@ -150,14 +150,14 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
             }).length || 0;
             // 标记广播为已认领
             announcement.status = 'claimed';
-            this.logger.info('[F2A:Announce]  acceptClaim: claimId=%s, announcementId=%s, claimant=%s, rejectedCount=%d', claimId, announcementId, claim.claimant, rejectedCount);
+            this.logger.info('[F2A:Announce]  acceptClaim: claim accepted', { claimId, announcementId, claimant: claim.claimant, rejectedCount });
             // 发出认领事件（在锁内发出，确保状态一致）
             this.emit('announcement:claimed', announcement, claim);
             return claim;
         }
         catch (error) {
             // P1 修复：记录异常并返回 null，但不改变状态
-            this.logger.error('[F2A:Announce]  acceptClaim: unexpected error, id=%s, claimId=%s, error=%s', announcementId, claimId, error);
+            this.logger.error('[F2A:Announce]  acceptClaim: unexpected error', { announcementId, claimId, error: String(error) });
             // 注意：不恢复状态，因为操作可能已部分完成
             // 但锁会在 finally 中释放
             return null;
@@ -173,16 +173,16 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
     rejectClaim(announcementId, claimId) {
         const announcement = this.announcements.get(announcementId);
         if (!announcement) {
-            this.logger.warn('[F2A:Announce]  rejectClaim: announcement not found, id=%s, claimId=%s', announcementId, claimId);
+            this.logger.warn('[F2A:Announce]  rejectClaim: announcement not found', { announcementId, claimId });
             return null;
         }
         const claim = announcement.claims?.find(c => c.claimId === claimId);
         if (!claim) {
-            this.logger.warn('[F2A:Announce]  rejectClaim: claim not found, announcementId=%s, claimId=%s', announcementId, claimId);
+            this.logger.warn('[F2A:Announce]  rejectClaim: claim not found', { announcementId, claimId });
             return null;
         }
         claim.status = 'rejected';
-        this.logger.info('[F2A:Announce]  rejectClaim: claimId=%s, announcementId=%s, claimant=%s', claimId, announcementId, claim.claimant);
+        this.logger.info('[F2A:Announce]  rejectClaim: claim rejected', { claimId, announcementId, claimant: claim.claimant });
         return claim;
     }
     /**
@@ -251,7 +251,7 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
                         reason: 'timeout'
                     };
                     this.emit('announcement:expired', expiredEvent);
-                    this.logger.info('[F2A:Announce] cleanup: announcement expired, id=%s, taskType=%s, from=%s', announcement.announcementId, announcement.taskType, announcement.from);
+                    this.logger.info('[F2A:Announce] cleanup: announcement expired', { announcementId: announcement.announcementId, taskType: announcement.taskType, from: announcement.from });
                 }
                 // 删除已过期一段时间的
                 if (age > this.maxAgeMs * 2) {
@@ -261,7 +261,7 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
             }
         }
         if (expiredCount > 0 || deletedCount > 0) {
-            this.logger.info('[F2A:Announce]  cleanup: expired=%d, deleted=%d, remaining=%d', expiredCount, deletedCount, this.announcements.size);
+            this.logger.info('[F2A:Announce]  cleanup: cleanup completed', { expired: expiredCount, deleted: deletedCount, remaining: this.announcements.size });
         }
     }
     /**
@@ -285,7 +285,7 @@ class AnnouncementQueue extends eventemitter3_1.EventEmitter {
         const count = this.processingLocks.size;
         this.processingLocks.clear();
         if (count > 0) {
-            this.logger.warn('[F2A:Announce]  forceClearOrphanLocks: cleared %d orphan locks', count);
+            this.logger.warn('[F2A:Announce]  forceClearOrphanLocks: cleared orphan locks', { count });
         }
         return count;
     }

package/dist/announcement-queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"announcement-queue.js","sourceRoot":"","sources":["../src/announcement-queue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"announcement-queue.js","sourceRoot":"","sources":["../src/announcement-queue.ts"],"names":[],"mappings":"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"}

package/dist/claim-handlers.d.ts

@@ -1,9 +1,10 @@
 /**
  * F2A OpenClaw Connector - Claim Handlers
  * 认领模式处理器模块 - 处理任务广播和认领相关工具
+ *
+ * Issue #106: 使用 F2APluginPublicInterface 解除循环依赖
  */
-import type { SessionContext, ToolResult } from './types.js';
-import type { F2AOpenClawAdapter } from './connector.js';
+import type { SessionContext, ToolResult, F2APluginPublicInterface } from './types.js';
 /**
  * 认领模式处理器参数类型
  */
@@ -37,10 +38,18 @@ export interface ClaimHandlerParams {
 /**
  * 认领模式处理器类
  * 包含所有认领相关工具的处理逻辑
+ *
+ * Issue #106: 使用 F2APluginPublicInterface 解除循环依赖
  */
 export declare class ClaimHandlers {
-    private adapter;
-    constructor(adapter: F2AOpenClawAdapter);
+    private plugin;
+    constructor(plugin: F2APluginPublicInterface);
+    /**
+     * 类型安全的内部访问 getter
+     */
+    private get announcementQueue();
+    private get api();
+    private get config();
     /**
      * 处理 f2a_announce 工具
      * 广播任务到 F2A 网络

package/dist/claim-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claim-handlers.d.ts","sourceRoot":"","sources":["../src/claim-handlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EAGX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAazD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;QACjC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,iBAAiB,EAAE;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE;QACL,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,YAAY,EAAE;QACZ,eAAe,EAAE,MAAM,CAAC;QACxB,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;QACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,QAAQ,EAAE;QACR,MAAM,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,KAAK,CAAC;KACtD,CAAC;CACH;AAED;;;GAGG;AACH,qBAAa,aAAa;IACZ,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,kBAAkB;IAE/C;;;OAGG;IACG,cAAc,CAClB,MAAM,EAAE,kBAAkB,CAAC,UAAU,CAAC,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAyFtB;;;OAGG;IACG,uBAAuB,CAC3B,MAAM,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,EAC/C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;OAGG;IACG,WAAW,CACf,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,EACnC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAkFtB;;;OAGG;IACG,kBAAkB,CACtB,MAAM,EAAE,kBAAkB,CAAC,cAAc,CAAC,EAC1C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAgGtB;;;OAGG;IACG,cAAc,CAClB,MAAM,EAAE,kBAAkB,CAAC,UAAU,CAAC,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IA0CtB;;;OAGG;IACG,uBAAuB,CAC3B,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;CAkBvB"}
+{"version":3,"file":"claim-handlers.d.ts","sourceRoot":"","sources":["../src/claim-handlers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EAGV,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAIpB;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;QACjC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,iBAAiB,EAAE;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE;QACL,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,YAAY,EAAE;QACZ,eAAe,EAAE,MAAM,CAAC;QACxB,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;QACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,QAAQ,EAAE;QACR,MAAM,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,KAAK,CAAC;KACtD,CAAC;CACH;AAED;;;;;GAKG;AACH,qBAAa,aAAa;IACZ,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,wBAAwB;IAEpD;;OAEG;IACH,OAAO,KAAK,iBAAiB,GAE5B;IAED,OAAO,KAAK,GAAG,GAEd;IAED,OAAO,KAAK,MAAM,GAEjB;IAED;;;OAGG;IACG,cAAc,CAClB,MAAM,EAAE,kBAAkB,CAAC,UAAU,CAAC,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAuGtB;;;OAGG;IACG,uBAAuB,CAC3B,MAAM,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,EAC/C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAkDtB;;;OAGG;IACG,WAAW,CACf,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,EACnC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAkFtB;;;OAGG;IACG,kBAAkB,CACtB,MAAM,EAAE,kBAAkB,CAAC,cAAc,CAAC,EAC1C,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IAgGtB;;;OAGG;IACG,cAAc,CAClB,MAAM,EAAE,kBAAkB,CAAC,UAAU,CAAC,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;IA0CtB;;;OAGG;IACG,uBAAuB,CAC3B,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;CAkBvB"}