@gooin/garmin-connect 1.7.3 → 1.7.4

package/dist/common/FileMFASessionStorage.d.ts

@@ -0,0 +1,59 @@
+import { MFASessionStorage } from './MFASessionStorage';
+/**
+ * 文件系统实现的MFA会话存储
+ */
+export declare class FileMFASessionStorage implements MFASessionStorage {
+    private readonly storageDir;
+    private readonly DEFAULT_TIMEOUT;
+    constructor(storageDir: string);
+    /**
+     * 确保存储目录存在
+     */
+    private ensureStorageDir;
+    /**
+     * 获取会话文件路径
+     */
+    private getSessionFilePath;
+    /**
+     * 创建一个等待MFA验证码的Promise
+     * @param sessionId 会话ID
+     * @param timeout 超时时间（毫秒）
+     * @returns Promise<string> 返回验证码
+     */
+    waitForMFACode(sessionId: string, timeout?: number): Promise<string>;
+    /**
+     * 提交MFA验证码
+     * @param sessionId 会话ID
+     * @param code 验证码
+     * @returns 是否成功提交
+     */
+    submitMFACode(sessionId: string, code: string): Promise<boolean>;
+    /**
+     * 取消MFA验证
+     * @param sessionId 会话ID
+     * @param reason 取消原因
+     * @returns 是否成功取消
+     */
+    cancelMFARequest(sessionId: string, reason?: string): Promise<boolean>;
+    /**
+     * 检查会话是否存在
+     * @param sessionId 会话ID
+     * @returns 是否存在
+     */
+    hasSession(sessionId: string): Promise<boolean>;
+    /**
+     * 获取所有活跃的会话ID
+     * @returns 会话ID列表
+     */
+    getActiveSessions(): Promise<string[]>;
+    /**
+     * 清理过期的请求
+     * @param maxAge 最大存活时间（毫秒）
+     */
+    cleanupExpiredRequests(maxAge?: number): Promise<void>;
+    /**
+     * 清理指定会话的资源
+     * @param sessionId 会话ID
+     */
+    private cleanupRequest;
+}

package/dist/common/FileMFASessionStorage.js

@@ -0,0 +1,247 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileMFASessionStorage = void 0;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+/**
+ * 文件系统实现的MFA会话存储
+ */
+class FileMFASessionStorage {
+    constructor(storageDir) {
+        this.DEFAULT_TIMEOUT = 5 * 60 * 1000; // 5分钟
+        this.storageDir = storageDir;
+        this.ensureStorageDir();
+    }
+    /**
+     * 确保存储目录存在
+     */
+    async ensureStorageDir() {
+        try {
+            await fs_1.promises.mkdir(this.storageDir, { recursive: true });
+        }
+        catch (error) {
+            console.error('创建MFA存储目录失败:', error);
+        }
+    }
+    /**
+     * 获取会话文件路径
+     */
+    getSessionFilePath(sessionId) {
+        return path_1.default.join(this.storageDir, `${sessionId}.json`);
+    }
+    /**
+     * 创建一个等待MFA验证码的Promise
+     * @param sessionId 会话ID
+     * @param timeout 超时时间（毫秒）
+     * @returns Promise<string> 返回验证码
+     */
+    async waitForMFACode(sessionId, timeout = this.DEFAULT_TIMEOUT) {
+        // 确保存储目录存在
+        await this.ensureStorageDir();
+        // 清理可能存在的旧会话
+        await this.cleanupRequest(sessionId);
+        // 创建会话文件
+        const sessionData = {
+            sessionId,
+            status: 'waiting',
+            createdAt: new Date().toISOString(),
+            timeout: timeout
+        };
+        const sessionFilePath = this.getSessionFilePath(sessionId);
+        await fs_1.promises.writeFile(sessionFilePath, JSON.stringify(sessionData), 'utf8');
+        console.log(`MFA验证会话已创建: ${sessionId}`);
+        // 轮询检查验证码是否已提交
+        return new Promise((resolve, reject) => {
+            const startTime = Date.now();
+            const checkInterval = setInterval(async () => {
+                try {
+                    // 检查是否超时
+                    if (Date.now() - startTime > timeout) {
+                        clearInterval(checkInterval);
+                        await this.cleanupRequest(sessionId);
+                        reject(new Error('MFA验证超时，请重新登录'));
+                        return;
+                    }
+                    // 检查会话文件是否存在
+                    try {
+                        const data = await fs_1.promises.readFile(sessionFilePath, 'utf8');
+                        const session = JSON.parse(data);
+                        // 如果状态已更新为resolved，则返回验证码
+                        if (session.status === 'resolved' && session.code) {
+                            clearInterval(checkInterval);
+                            await this.cleanupRequest(sessionId);
+                            resolve(session.code);
+                            return;
+                        }
+                        // 如果状态已更新为rejected，则抛出错误
+                        if (session.status === 'rejected' && session.error) {
+                            clearInterval(checkInterval);
+                            await this.cleanupRequest(sessionId);
+                            reject(new Error(session.error));
+                            return;
+                        }
+                    }
+                    catch (error) {
+                        // 文件不存在或其他错误，继续等待
+                    }
+                }
+                catch (error) {
+                    clearInterval(checkInterval);
+                    await this.cleanupRequest(sessionId);
+                    reject(error instanceof Error
+                        ? error
+                        : new Error(String(error)));
+                }
+            }, 1000); // 每秒检查一次
+        });
+    }
+    /**
+     * 提交MFA验证码
+     * @param sessionId 会话ID
+     * @param code 验证码
+     * @returns 是否成功提交
+     */
+    async submitMFACode(sessionId, code) {
+        const sessionFilePath = this.getSessionFilePath(sessionId);
+        try {
+            // 检查会话文件是否存在
+            const data = await fs_1.promises.readFile(sessionFilePath, 'utf8');
+            const session = JSON.parse(data);
+            if (session.status !== 'waiting') {
+                console.log(`MFA验证会话状态不正确: ${sessionId}, 状态: ${session.status}`);
+                return false;
+            }
+            // 更新会话状态为已解决
+            session.status = 'resolved';
+            session.code = code;
+            session.resolvedAt = new Date().toISOString();
+            await fs_1.promises.writeFile(sessionFilePath, JSON.stringify(session), 'utf8');
+            console.log(`MFA验证码已提交: code ${code}, sessionId ${sessionId}`);
+            return true;
+        }
+        catch (error) {
+            console.log(`未找到MFA验证会话: ${sessionId}, 错误: ${error instanceof Error ? error.message : String(error)}`);
+            return false;
+        }
+    }
+    /**
+     * 取消MFA验证
+     * @param sessionId 会话ID
+     * @param reason 取消原因
+     * @returns 是否成功取消
+     */
+    async cancelMFARequest(sessionId, reason = 'MFA验证已取消') {
+        const sessionFilePath = this.getSessionFilePath(sessionId);
+        try {
+            // 检查会话文件是否存在
+            const data = await fs_1.promises.readFile(sessionFilePath, 'utf8');
+            const session = JSON.parse(data);
+            // 更新会话状态为已拒绝
+            session.status = 'rejected';
+            session.error = reason;
+            session.rejectedAt = new Date().toISOString();
+            await fs_1.promises.writeFile(sessionFilePath, JSON.stringify(session), 'utf8');
+            console.log(`MFA验证已取消: ${sessionId}, 原因: ${reason}`);
+            return true;
+        }
+        catch (error) {
+            console.log(`未找到MFA验证会话: ${sessionId}, 错误: ${error instanceof Error ? error.message : String(error)}`);
+            return false;
+        }
+    }
+    /**
+     * 检查会话是否存在
+     * @param sessionId 会话ID
+     * @returns 是否存在
+     */
+    async hasSession(sessionId) {
+        const sessionFilePath = this.getSessionFilePath(sessionId);
+        try {
+            await fs_1.promises.access(sessionFilePath);
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    /**
+     * 获取所有活跃的会话ID
+     * @returns 会话ID列表
+     */
+    async getActiveSessions() {
+        try {
+            await this.ensureStorageDir();
+            const files = await fs_1.promises.readdir(this.storageDir);
+            return files
+                .filter((file) => file.endsWith('.json'))
+                .map((file) => file.replace('.json', ''));
+        }
+        catch (error) {
+            console.error('获取活跃会话失败:', error instanceof Error ? error : String(error));
+            return [];
+        }
+    }
+    /**
+     * 清理过期的请求
+     * @param maxAge 最大存活时间（毫秒）
+     */
+    async cleanupExpiredRequests(maxAge = this.DEFAULT_TIMEOUT) {
+        try {
+            await this.ensureStorageDir();
+            const files = await fs_1.promises.readdir(this.storageDir);
+            const now = new Date();
+            let cleanedCount = 0;
+            for (const file of files) {
+                if (!file.endsWith('.json'))
+                    continue;
+                try {
+                    const filePath = path_1.default.join(this.storageDir, file);
+                    const data = await fs_1.promises.readFile(filePath, 'utf8');
+                    const session = JSON.parse(data);
+                    const createdAt = new Date(session.createdAt);
+                    // 检查是否过期
+                    if (now.getTime() - createdAt.getTime() > maxAge) {
+                        await fs_1.promises.unlink(filePath);
+                        cleanedCount++;
+                    }
+                }
+                catch (error) {
+                    // 如果文件读取失败，直接删除
+                    try {
+                        await fs_1.promises.unlink(path_1.default.join(this.storageDir, file));
+                        cleanedCount++;
+                    }
+                    catch (unlinkError) {
+                        console.error(`删除过期会话文件失败: ${file}`, unlinkError instanceof Error
+                            ? unlinkError
+                            : String(unlinkError));
+                    }
+                }
+            }
+            if (cleanedCount > 0) {
+                console.log(`清理了 ${cleanedCount} 个过期的MFA验证会话`);
+            }
+        }
+        catch (error) {
+            console.error('清理过期请求失败:', error instanceof Error ? error : String(error));
+        }
+    }
+    /**
+     * 清理指定会话的资源
+     * @param sessionId 会话ID
+     */
+    async cleanupRequest(sessionId) {
+        const sessionFilePath = this.getSessionFilePath(sessionId);
+        try {
+            await fs_1.promises.unlink(sessionFilePath);
+        }
+        catch (error) {
+            // 文件不存在，忽略错误
+        }
+    }
+}
+exports.FileMFASessionStorage = FileMFASessionStorage;
+//# sourceMappingURL=FileMFASessionStorage.js.map

package/dist/common/FileMFASessionStorage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FileMFASessionStorage.js","sourceRoot":"","sources":["../../src/common/FileMFASessionStorage.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAoC;AACpC,gDAAwB;AAGxB;;GAEG;AACH,MAAa,qBAAqB;IAI9B,YAAY,UAAkB;QAFb,oBAAe,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,MAAM;QAGpD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,gBAAgB;QAC1B,IAAI;YACA,MAAM,aAAE,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SACxD;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;SACxC;IACL,CAAC;IAED;;OAEG;IACK,kBAAkB,CAAC,SAAiB;QACxC,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,SAAS,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,cAAc,CACvB,SAAiB,EACjB,UAAkB,IAAI,CAAC,eAAe;QAEtC,WAAW;QACX,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9B,aAAa;QACb,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAErC,SAAS;QACT,MAAM,WAAW,GAAG;YAChB,SAAS;YACT,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,OAAO,EAAE,OAAO;SACnB,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC3D,MAAM,aAAE,CAAC,SAAS,CACd,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAC3B,MAAM,CACT,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,eAAe,SAAS,EAAE,CAAC,CAAC;QAExC,eAAe;QACf,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;gBACzC,IAAI;oBACA,SAAS;oBACT,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE;wBAClC,aAAa,CAAC,aAAa,CAAC,CAAC;wBAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;wBACrC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;wBACnC,OAAO;qBACV;oBAED,aAAa;oBACb,IAAI;wBACA,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;wBACxD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAEjC,0BAA0B;wBAC1B,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE;4BAC/C,aAAa,CAAC,aAAa,CAAC,CAAC;4BAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;4BACrC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;4BACtB,OAAO;yBACV;wBAED,yBAAyB;wBACzB,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE;4BAChD,aAAa,CAAC,aAAa,CAAC,CAAC;4BAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;4BACrC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;4BACjC,OAAO;yBACV;qBACJ;oBAAC,OAAO,KAAK,EAAE;wBACZ,kBAAkB;qBACrB;iBACJ;gBAAC,OAAO,KAAK,EAAE;oBACZ,aAAa,CAAC,aAAa,CAAC,CAAC;oBAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBACrC,MAAM,CACF,KAAK,YAAY,KAAK;wBAClB,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CACjC,CAAC;iBACL;YACL,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS;QACvB,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,aAAa,CACtB,SAAiB,EACjB,IAAY;QAEZ,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAE3D,IAAI;YACA,aAAa;YACb,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEjC,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC9B,OAAO,CAAC,GAAG,CACP,iBAAiB,SAAS,SAAS,OAAO,CAAC,MAAM,EAAE,CACtD,CAAC;gBACF,OAAO,KAAK,CAAC;aAChB;YAED,aAAa;YACb,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC;YAC5B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;YACpB,OAAO,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,aAAE,CAAC,SAAS,CACd,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EACvB,MAAM,CACT,CAAC;YACF,OAAO,CAAC,GAAG,CACP,mBAAmB,IAAI,eAAe,SAAS,EAAE,CACpD,CAAC;YACF,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,GAAG,CACP,eAAe,SAAS,SACpB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACzD,EAAE,CACL,CAAC;YACF,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,gBAAgB,CACzB,SAAiB,EACjB,SAAiB,UAAU;QAE3B,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAE3D,IAAI;YACA,aAAa;YACb,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEjC,aAAa;YACb,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC;YAC5B,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;YACvB,OAAO,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAE9C,MAAM,aAAE,CAAC,SAAS,CACd,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EACvB,MAAM,CACT,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,aAAa,SAAS,SAAS,MAAM,EAAE,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,GAAG,CACP,eAAe,SAAS,SACpB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACzD,EAAE,CACL,CAAC;YACF,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,UAAU,CAAC,SAAiB;QACrC,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI;YACA,MAAM,aAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACf;QAAC,WAAM;YACJ,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,iBAAiB;QAC1B,IAAI;YACA,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,MAAM,aAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChD,OAAO,KAAK;iBACP,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBACxC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;SACjD;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CACT,WAAW,EACX,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACjD,CAAC;YACF,OAAO,EAAE,CAAC;SACb;IACL,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,sBAAsB,CAC/B,SAAiB,IAAI,CAAC,eAAe;QAErC,IAAI;YACA,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,MAAM,aAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,YAAY,GAAG,CAAC,CAAC;YAErB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAAE,SAAS;gBAEtC,IAAI;oBACA,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;oBAClD,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjC,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBAE9C,SAAS;oBACT,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,GAAG,MAAM,EAAE;wBAC9C,MAAM,aAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;wBAC1B,YAAY,EAAE,CAAC;qBAClB;iBACJ;gBAAC,OAAO,KAAK,EAAE;oBACZ,gBAAgB;oBAChB,IAAI;wBACA,MAAM,aAAE,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;wBAClD,YAAY,EAAE,CAAC;qBAClB;oBAAC,OAAO,WAAW,EAAE;wBAClB,OAAO,CAAC,KAAK,CACT,eAAe,IAAI,EAAE,EACrB,WAAW,YAAY,KAAK;4BACxB,CAAC,CAAC,WAAW;4BACb,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAC5B,CAAC;qBACL;iBACJ;aACJ;YAED,IAAI,YAAY,GAAG,CAAC,EAAE;gBAClB,OAAO,CAAC,GAAG,CAAC,OAAO,YAAY,cAAc,CAAC,CAAC;aAClD;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CACT,WAAW,EACX,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACjD,CAAC;SACL;IACL,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,cAAc,CAAC,SAAiB;QAC1C,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI;YACA,MAAM,aAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;SACpC;QAAC,OAAO,KAAK,EAAE;YACZ,aAAa;SAChB;IACL,CAAC;CACJ;AAzSD,sDAySC"}

package/dist/common/HttpClient.js

@@ -48,8 +48,12 @@ class HttpClient {
             jar: jar
         }));
         this.config = config;
-        const mfaStorageDir = config.mfaStorageDir || '/tmp';
-        this.mfaManager = MFAManager_1.MFAManager.getInstance(mfaStorageDir);
+        // 使用新的MFA配置初始化MFAManager
+        const mfaConfig = config.mfa || {
+            type: 'file',
+            dir: config.mfaStorageDir || '/tmp'
+        };
+        this.mfaManager = MFAManager_1.MFAManager.getInstance(mfaConfig);
         this.setupInterceptors();
     }
     /**
@@ -262,7 +266,7 @@ class HttpClient {
             // 如果提供了sessionId，则使用分步登录模式
             if (sessionId) {
                 // 等待外部提供验证码
-                const mfaCode = await MFAManager_1.MFAManager.getInstance().waitForMFACode(sessionId);
+                const mfaCode = await this.mfaManager.waitForMFACode(sessionId);
                 // 使用获取到的验证码完成MFA验证
                 signinResult = await this.handleMFAWithCode(signinResult, loginParams.step3Params, mfaCode);
             }

package/dist/common/HttpClient.js.map

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

package/dist/common/MFAManager.d.ts

@@ -1,24 +1,21 @@
+import { MFAConfig } from '../garmin/types';
 /**
  * MFA管理器，用于处理需要等待外部验证码的登录流程
- * 使用文件系统持久化存储，支持跨进程共享状态
+ * 支持文件系统和Redis两种存储方式
  */
 export declare class MFAManager {
     private static instance;
-    readonly storageDir: string;
+    private storage;
     private readonly DEFAULT_TIMEOUT;
     private constructor();
     /**
      * 获取MFA管理器单例
      */
-    static getInstance(storageDir?: string): MFAManager;
+    static getInstance(config?: MFAConfig): MFAManager;
     /**
-     * 确保存储目录存在
+     * 重置单例实例，用于测试或重新配置
      */
-    private ensureStorageDir;
-    /**
-     * 获取会话文件路径
-     */
-    private getSessionFilePath;
+    static resetInstance(): void;
     /**
      * 创建一个等待MFA验证码的Promise
      * @param sessionId 会话ID
@@ -56,13 +53,12 @@ export declare class MFAManager {
      * @param maxAge 最大存活时间（毫秒）
      */
     cleanupExpiredRequests(maxAge?: number): Promise<void>;
-    /**
-     * 清理指定会话的资源
-     * @param sessionId 会话ID
-     */
-    private cleanupRequest;
     /**
      * 定期清理过期请求
      */
     startCleanupTask(interval?: number): void;
+    /**
+     * 关闭资源连接（主要用于Redis）
+     */
+    disconnect(): Promise<void>;
 }

package/dist/common/MFAManager.js

@@ -4,47 +4,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MFAManager = void 0;
-const fs_1 = require("fs");
+const FileMFASessionStorage_1 = require("./FileMFASessionStorage");
+const RedisMFASessionStorage_1 = require("./RedisMFASessionStorage");
 const path_1 = __importDefault(require("path"));
 /**
  * MFA管理器，用于处理需要等待外部验证码的登录流程
- * 使用文件系统持久化存储，支持跨进程共享状态
+ * 支持文件系统和Redis两种存储方式
  */
 class MFAManager {
-    constructor(storageDir) {
+    constructor(config) {
         this.DEFAULT_TIMEOUT = 5 * 60 * 1000; // 5分钟
-        // 使用提供的目录或默认临时目录
-        this.storageDir =
-            storageDir || path_1.default.join(process.cwd(), '.mfa-sessions');
-        this.ensureStorageDir();
+        // 根据配置创建不同的存储实现
+        if (config.type === 'redis') {
+            if (config.redis) {
+                this.storage = new RedisMFASessionStorage_1.RedisMFASessionStorage(undefined, undefined, config.redis);
+            }
+            else if (config.redisUrl && config.redisToken) {
+                this.storage = new RedisMFASessionStorage_1.RedisMFASessionStorage(config.redisUrl, config.redisToken);
+            }
+            else if (config.redisUrl) {
+                this.storage = new RedisMFASessionStorage_1.RedisMFASessionStorage(config.redisUrl);
+            }
+            else {
+                throw new Error('Redis配置不完整，需要提供redisUrl或redis实例');
+            }
+        }
+        else if (config.type === 'file') {
+            const storageDir = config.dir || path_1.default.join(process.cwd(), '.mfa-sessions');
+            this.storage = new FileMFASessionStorage_1.FileMFASessionStorage(storageDir);
+        }
+        else {
+            throw new Error(`不支持的MFA存储类型: ${config.type}`);
+        }
     }
     /**
      * 获取MFA管理器单例
      */
-    static getInstance(storageDir) {
+    static getInstance(config) {
         if (!MFAManager.instance) {
-            console.log('创建MFA管理器实例', storageDir);
-            MFAManager.instance = new MFAManager(storageDir);
+            if (!config) {
+                throw new Error('首次创建MFAManager实例必须提供配置');
+            }
+            console.log('创建MFA管理器实例', config);
+            MFAManager.instance = new MFAManager(config);
         }
-        console.log('返回MFA管理器实例', MFAManager.instance.storageDir);
         return MFAManager.instance;
     }
     /**
-     * 确保存储目录存在
-     */
-    async ensureStorageDir() {
-        try {
-            await fs_1.promises.mkdir(this.storageDir, { recursive: true });
-        }
-        catch (error) {
-            console.error('创建MFA存储目录失败:', error);
-        }
-    }
-    /**
-     * 获取会话文件路径
+     * 重置单例实例，用于测试或重新配置
      */
-    getSessionFilePath(sessionId) {
-        return path_1.default.join(this.storageDir, `${sessionId}.json`);
+    static resetInstance() {
+        MFAManager.instance = undefined;
     }
     /**
      * 创建一个等待MFA验证码的Promise
@@ -53,64 +63,7 @@ class MFAManager {
      * @returns Promise<string> 返回验证码
      */
     async waitForMFACode(sessionId, timeout = this.DEFAULT_TIMEOUT) {
-        // 确保存储目录存在
-        await this.ensureStorageDir();
-        // 清理可能存在的旧会话
-        await this.cleanupRequest(sessionId);
-        // 创建会话文件
-        const sessionData = {
-            sessionId,
-            status: 'waiting',
-            createdAt: new Date().toISOString(),
-            timeout: timeout
-        };
-        const sessionFilePath = this.getSessionFilePath(sessionId);
-        await fs_1.promises.writeFile(sessionFilePath, JSON.stringify(sessionData), 'utf8');
-        console.log(`MFA验证会话已创建: ${sessionId}`);
-        // 轮询检查验证码是否已提交
-        return new Promise((resolve, reject) => {
-            const startTime = Date.now();
-            const checkInterval = setInterval(async () => {
-                try {
-                    // 检查是否超时
-                    if (Date.now() - startTime > timeout) {
-                        clearInterval(checkInterval);
-                        await this.cleanupRequest(sessionId);
-                        reject(new Error('MFA验证超时，请重新登录'));
-                        return;
-                    }
-                    // 检查会话文件是否存在
-                    try {
-                        const data = await fs_1.promises.readFile(sessionFilePath, 'utf8');
-                        const session = JSON.parse(data);
-                        // 如果状态已更新为resolved，则返回验证码
-                        if (session.status === 'resolved' && session.code) {
-                            clearInterval(checkInterval);
-                            await this.cleanupRequest(sessionId);
-                            resolve(session.code);
-                            return;
-                        }
-                        // 如果状态已更新为rejected，则抛出错误
-                        if (session.status === 'rejected' && session.error) {
-                            clearInterval(checkInterval);
-                            await this.cleanupRequest(sessionId);
-                            reject(new Error(session.error));
-                            return;
-                        }
-                    }
-                    catch (error) {
-                        // 文件不存在或其他错误，继续等待
-                    }
-                }
-                catch (error) {
-                    clearInterval(checkInterval);
-                    await this.cleanupRequest(sessionId);
-                    reject(error instanceof Error
-                        ? error
-                        : new Error(String(error)));
-                }
-            }, 1000); // 每秒检查一次
-        });
+        return this.storage.waitForMFACode(sessionId, timeout);
     }
     /**
      * 提交MFA验证码
@@ -119,27 +72,7 @@ class MFAManager {
      * @returns 是否成功提交
      */
     async submitMFACode(sessionId, code) {
-        const sessionFilePath = this.getSessionFilePath(sessionId);
-        try {
-            // 检查会话文件是否存在
-            const data = await fs_1.promises.readFile(sessionFilePath, 'utf8');
-            const session = JSON.parse(data);
-            if (session.status !== 'waiting') {
-                console.log(`MFA验证会话状态不正确: ${sessionId}, 状态: ${session.status}`);
-                return false;
-            }
-            // 更新会话状态为已解决
-            session.status = 'resolved';
-            session.code = code;
-            session.resolvedAt = new Date().toISOString();
-            await fs_1.promises.writeFile(sessionFilePath, JSON.stringify(session), 'utf8');
-            console.log(`MFA验证码已提交: code ${code}, sessionId ${sessionId}`);
-            return true;
-        }
-        catch (error) {
-            console.log(`未找到MFA验证会话: ${sessionId}, 错误: ${error instanceof Error ? error.message : String(error)}`);
-            return false;
-        }
+        return this.storage.submitMFACode(sessionId, code);
     }
     /**
      * 取消MFA验证
@@ -148,23 +81,7 @@ class MFAManager {
      * @returns 是否成功取消
      */
     async cancelMFARequest(sessionId, reason = 'MFA验证已取消') {
-        const sessionFilePath = this.getSessionFilePath(sessionId);
-        try {
-            // 检查会话文件是否存在
-            const data = await fs_1.promises.readFile(sessionFilePath, 'utf8');
-            const session = JSON.parse(data);
-            // 更新会话状态为已拒绝
-            session.status = 'rejected';
-            session.error = reason;
-            session.rejectedAt = new Date().toISOString();
-            await fs_1.promises.writeFile(sessionFilePath, JSON.stringify(session), 'utf8');
-            console.log(`MFA验证已取消: ${sessionId}, 原因: ${reason}`);
-            return true;
-        }
-        catch (error) {
-            console.log(`未找到MFA验证会话: ${sessionId}, 错误: ${error instanceof Error ? error.message : String(error)}`);
-            return false;
-        }
+        return this.storage.cancelMFARequest(sessionId, reason);
     }
     /**
      * 检查会话是否存在
@@ -172,89 +89,21 @@ class MFAManager {
      * @returns 是否存在
      */
     async hasSession(sessionId) {
-        const sessionFilePath = this.getSessionFilePath(sessionId);
-        try {
-            await fs_1.promises.access(sessionFilePath);
-            return true;
-        }
-        catch (_a) {
-            return false;
-        }
+        return this.storage.hasSession(sessionId);
     }
     /**
      * 获取所有活跃的会话ID
      * @returns 会话ID列表
      */
     async getActiveSessions() {
-        try {
-            await this.ensureStorageDir();
-            const files = await fs_1.promises.readdir(this.storageDir);
-            return files
-                .filter((file) => file.endsWith('.json'))
-                .map((file) => file.replace('.json', ''));
-        }
-        catch (error) {
-            console.error('获取活跃会话失败:', error instanceof Error ? error : String(error));
-            return [];
-        }
+        return this.storage.getActiveSessions();
     }
     /**
      * 清理过期的请求
      * @param maxAge 最大存活时间（毫秒）
      */
     async cleanupExpiredRequests(maxAge = this.DEFAULT_TIMEOUT) {
-        try {
-            await this.ensureStorageDir();
-            const files = await fs_1.promises.readdir(this.storageDir);
-            const now = new Date();
-            let cleanedCount = 0;
-            for (const file of files) {
-                if (!file.endsWith('.json'))
-                    continue;
-                try {
-                    const filePath = path_1.default.join(this.storageDir, file);
-                    const data = await fs_1.promises.readFile(filePath, 'utf8');
-                    const session = JSON.parse(data);
-                    const createdAt = new Date(session.createdAt);
-                    // 检查是否过期
-                    if (now.getTime() - createdAt.getTime() > maxAge) {
-                        await fs_1.promises.unlink(filePath);
-                        cleanedCount++;
-                    }
-                }
-                catch (error) {
-                    // 如果文件读取失败，直接删除
-                    try {
-                        await fs_1.promises.unlink(path_1.default.join(this.storageDir, file));
-                        cleanedCount++;
-                    }
-                    catch (unlinkError) {
-                        console.error(`删除过期会话文件失败: ${file}`, unlinkError instanceof Error
-                            ? unlinkError
-                            : String(unlinkError));
-                    }
-                }
-            }
-            if (cleanedCount > 0) {
-                console.log(`清理了 ${cleanedCount} 个过期的MFA验证会话`);
-            }
-        }
-        catch (error) {
-            console.error('清理过期请求失败:', error instanceof Error ? error : String(error));
-        }
-    }
-    /**
-     * 清理指定会话的资源
-     * @param sessionId 会话ID
-     */
-    async cleanupRequest(sessionId) {
-        const sessionFilePath = this.getSessionFilePath(sessionId);
-        try {
-            await fs_1.promises.unlink(sessionFilePath);
-        }
-        catch (error) {
-            // 文件不存在，忽略错误
-        }
+        return this.storage.cleanupExpiredRequests(maxAge);
     }
     /**
      * 定期清理过期请求
@@ -264,6 +113,14 @@ class MFAManager {
             this.cleanupExpiredRequests();
         }, interval);
     }
+    /**
+     * 关闭资源连接（主要用于Redis）
+     */
+    async disconnect() {
+        if (this.storage instanceof RedisMFASessionStorage_1.RedisMFASessionStorage) {
+            await this.storage.disconnect();
+        }
+    }
 }
 exports.MFAManager = MFAManager;
 //# sourceMappingURL=MFAManager.js.map

package/dist/common/MFAManager.js.map

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

package/dist/common/MFASessionStorage.d.ts

@@ -0,0 +1,42 @@
+/**
+ * MFA存储接口，定义了MFA会话存储的基本操作
+ */
+export interface MFASessionStorage {
+    /**
+     * 创建一个等待MFA验证码的会话
+     * @param sessionId 会话ID
+     * @param timeout 超时时间（毫秒）
+     * @returns Promise<string> 返回验证码
+     */
+    waitForMFACode(sessionId: string, timeout?: number): Promise<string>;
+    /**
+     * 提交MFA验证码
+     * @param sessionId 会话ID
+     * @param code 验证码
+     * @returns 是否成功提交
+     */
+    submitMFACode(sessionId: string, code: string): Promise<boolean>;
+    /**
+     * 取消MFA验证
+     * @param sessionId 会话ID
+     * @param reason 取消原因
+     * @returns 是否成功取消
+     */
+    cancelMFARequest(sessionId: string, reason?: string): Promise<boolean>;
+    /**
+     * 检查会话是否存在
+     * @param sessionId 会话ID
+     * @returns 是否存在
+     */
+    hasSession(sessionId: string): Promise<boolean>;
+    /**
+     * 获取所有活跃的会话ID
+     * @returns 会话ID列表
+     */
+    getActiveSessions(): Promise<string[]>;
+    /**
+     * 清理过期的请求
+     * @param maxAge 最大存活时间（毫秒）
+     */
+    cleanupExpiredRequests(maxAge?: number): Promise<void>;
+}

package/dist/common/MFASessionStorage.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=MFASessionStorage.js.map

package/dist/common/MFASessionStorage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MFASessionStorage.js","sourceRoot":"","sources":["../../src/common/MFASessionStorage.ts"],"names":[],"mappings":""}

package/dist/common/RedisMFASessionStorage.d.ts

@@ -0,0 +1,60 @@
+import { MFASessionStorage } from './MFASessionStorage';
+/**
+ * Redis实现的MFA会话存储
+ */
+export declare class RedisMFASessionStorage implements MFASessionStorage {
+    private redis;
+    private readonly DEFAULT_TIMEOUT;
+    private readonly KEY_PREFIX;
+    constructor(redisUrl?: string, redisToken?: string, redisClient?: any);
+    /**
+     * 获取会话键名
+     */
+    private getSessionKey;
+    /**
+     * 创建一个等待MFA验证码的Promise
+     * @param sessionId 会话ID
+     * @param timeout 超时时间（毫秒）
+     * @returns Promise<string> 返回验证码
+     */
+    waitForMFACode(sessionId: string, timeout?: number): Promise<string>;
+    /**
+     * 提交MFA验证码
+     * @param sessionId 会话ID
+     * @param code 验证码
+     * @returns 是否成功提交
+     */
+    submitMFACode(sessionId: string, code: string): Promise<boolean>;
+    /**
+     * 取消MFA验证
+     * @param sessionId 会话ID
+     * @param reason 取消原因
+     * @returns 是否成功取消
+     */
+    cancelMFARequest(sessionId: string, reason?: string): Promise<boolean>;
+    /**
+     * 检查会话是否存在
+     * @param sessionId 会话ID
+     * @returns 是否存在
+     */
+    hasSession(sessionId: string): Promise<boolean>;
+    /**
+     * 获取所有活跃的会话ID
+     * @returns 会话ID列表
+     */
+    getActiveSessions(): Promise<string[]>;
+    /**
+     * 清理过期的请求
+     * @param maxAge 最大存活时间（毫秒）
+     */
+    cleanupExpiredRequests(maxAge?: number): Promise<void>;
+    /**
+     * 清理指定会话的资源
+     * @param sessionId 会话ID
+     */
+    private cleanupRequest;
+    /**
+     * 关闭Redis连接
+     */
+    disconnect(): Promise<void>;
+}

package/dist/common/RedisMFASessionStorage.js

@@ -0,0 +1,281 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisMFASessionStorage = void 0;
+/**
+ * Redis实现的MFA会话存储
+ */
+class RedisMFASessionStorage {
+    constructor(redisUrl, redisToken, redisClient) {
+        this.DEFAULT_TIMEOUT = 5 * 60 * 1000; // 5分钟
+        this.KEY_PREFIX = 'mfa:session:';
+        if (redisClient) {
+            this.redis = redisClient;
+        }
+        else if (redisUrl && redisToken) {
+            // 使用Upstash Redis
+            try {
+                const { Redis } = require('@upstash/redis');
+                this.redis = new Redis({
+                    url: redisUrl,
+                    token: redisToken
+                });
+            }
+            catch (error) {
+                throw new Error('Upstash Redis module not found. Please install @upstash/redis: npm install @upstash/redis');
+            }
+        }
+        else if (redisUrl) {
+            // 动态导入redis模块
+            try {
+                const Redis = require('ioredis');
+                this.redis = new Redis(redisUrl);
+            }
+            catch (error) {
+                throw new Error('Redis module not found. Please install ioredis: npm install ioredis');
+            }
+        }
+        else {
+            throw new Error('Either redisUrl with redisToken (for Upstash) or redisClient must be provided');
+        }
+    }
+    /**
+     * 获取会话键名
+     */
+    getSessionKey(sessionId) {
+        return `${this.KEY_PREFIX}${sessionId}`;
+    }
+    /**
+     * 创建一个等待MFA验证码的Promise
+     * @param sessionId 会话ID
+     * @param timeout 超时时间（毫秒）
+     * @returns Promise<string> 返回验证码
+     */
+    async waitForMFACode(sessionId, timeout = this.DEFAULT_TIMEOUT) {
+        // 清理可能存在的旧会话
+        await this.cleanupRequest(sessionId);
+        // 创建会话数据
+        const sessionData = {
+            sessionId,
+            status: 'waiting',
+            createdAt: new Date().toISOString(),
+            timeout: timeout
+        };
+        const sessionKey = this.getSessionKey(sessionId);
+        // 使用Redis的SET命令存储会话数据，并设置过期时间
+        await this.redis.setex(sessionKey, Math.ceil(timeout / 1000), // Redis的TTL是秒
+        JSON.stringify(sessionData));
+        console.log(`MFA验证会话已创建: ${sessionId}`);
+        // 轮询检查验证码是否已提交
+        return new Promise((resolve, reject) => {
+            const startTime = Date.now();
+            const checkInterval = setInterval(async () => {
+                try {
+                    // 检查是否超时
+                    if (Date.now() - startTime > timeout) {
+                        clearInterval(checkInterval);
+                        await this.cleanupRequest(sessionId);
+                        reject(new Error('MFA验证超时，请重新登录'));
+                        return;
+                    }
+                    // 检查会话状态
+                    const data = await this.redis.get(sessionKey);
+                    if (!data) {
+                        clearInterval(checkInterval);
+                        reject(new Error('MFA验证会话已过期'));
+                        return;
+                    }
+                    // 确保data是字符串，如果是对象则先转换为字符串
+                    const dataStr = typeof data === 'string' ? data : JSON.stringify(data);
+                    const session = JSON.parse(dataStr);
+                    // 如果状态已更新为resolved，则返回验证码
+                    if (session.status === 'resolved' && session.code) {
+                        clearInterval(checkInterval);
+                        await this.cleanupRequest(sessionId);
+                        resolve(session.code);
+                        return;
+                    }
+                    // 如果状态已更新为rejected，则抛出错误
+                    if (session.status === 'rejected' && session.error) {
+                        clearInterval(checkInterval);
+                        await this.cleanupRequest(sessionId);
+                        reject(new Error(session.error));
+                        return;
+                    }
+                }
+                catch (error) {
+                    clearInterval(checkInterval);
+                    await this.cleanupRequest(sessionId);
+                    reject(error instanceof Error
+                        ? error
+                        : new Error(String(error)));
+                }
+            }, 1000); // 每秒检查一次
+        });
+    }
+    /**
+     * 提交MFA验证码
+     * @param sessionId 会话ID
+     * @param code 验证码
+     * @returns 是否成功提交
+     */
+    async submitMFACode(sessionId, code) {
+        const sessionKey = this.getSessionKey(sessionId);
+        try {
+            // 获取会话数据
+            const data = await this.redis.get(sessionKey);
+            if (!data) {
+                console.log(`未找到MFA验证会话: ${sessionId}`);
+                return false;
+            }
+            // 确保data是字符串，如果是对象则先转换为字符串
+            const dataStr = typeof data === 'string' ? data : JSON.stringify(data);
+            const session = JSON.parse(dataStr);
+            if (session.status !== 'waiting') {
+                console.log(`MFA验证会话状态不正确: ${sessionId}, 状态: ${session.status}`);
+                return false;
+            }
+            // 更新会话状态为已解决
+            session.status = 'resolved';
+            session.code = code;
+            session.resolvedAt = new Date().toISOString();
+            await this.redis.set(sessionKey, JSON.stringify(session));
+            console.log(`MFA验证码已提交: code ${code}, sessionId ${sessionId}`);
+            return true;
+        }
+        catch (error) {
+            console.log(`提交MFA验证码失败: ${sessionId}, 错误: ${error instanceof Error ? error.message : String(error)}`);
+            return false;
+        }
+    }
+    /**
+     * 取消MFA验证
+     * @param sessionId 会话ID
+     * @param reason 取消原因
+     * @returns 是否成功取消
+     */
+    async cancelMFARequest(sessionId, reason = 'MFA验证已取消') {
+        const sessionKey = this.getSessionKey(sessionId);
+        try {
+            // 获取会话数据
+            const data = await this.redis.get(sessionKey);
+            if (!data) {
+                console.log(`未找到MFA验证会话: ${sessionId}`);
+                return false;
+            }
+            // 确保data是字符串，如果是对象则先转换为字符串
+            const dataStr = typeof data === 'string' ? data : JSON.stringify(data);
+            const session = JSON.parse(dataStr);
+            // 更新会话状态为已拒绝
+            session.status = 'rejected';
+            session.error = reason;
+            session.rejectedAt = new Date().toISOString();
+            await this.redis.set(sessionKey, JSON.stringify(session));
+            console.log(`MFA验证已取消: ${sessionId}, 原因: ${reason}`);
+            return true;
+        }
+        catch (error) {
+            console.log(`取消MFA验证失败: ${sessionId}, 错误: ${error instanceof Error ? error.message : String(error)}`);
+            return false;
+        }
+    }
+    /**
+     * 检查会话是否存在
+     * @param sessionId 会话ID
+     * @returns 是否存在
+     */
+    async hasSession(sessionId) {
+        const sessionKey = this.getSessionKey(sessionId);
+        try {
+            const exists = await this.redis.exists(sessionKey);
+            return exists === 1;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    /**
+     * 获取所有活跃的会话ID
+     * @returns 会话ID列表
+     */
+    async getActiveSessions() {
+        try {
+            const keys = await this.redis.keys(`${this.KEY_PREFIX}*`);
+            return keys.map((key) => key.replace(this.KEY_PREFIX, ''));
+        }
+        catch (error) {
+            console.error('获取活跃会话失败:', error instanceof Error ? error : String(error));
+            return [];
+        }
+    }
+    /**
+     * 清理过期的请求
+     * @param maxAge 最大存活时间（毫秒）
+     */
+    async cleanupExpiredRequests(maxAge = this.DEFAULT_TIMEOUT) {
+        try {
+            const keys = await this.redis.keys(`${this.KEY_PREFIX}*`);
+            const now = new Date();
+            let cleanedCount = 0;
+            for (const key of keys) {
+                try {
+                    const data = await this.redis.get(key);
+                    if (!data)
+                        continue;
+                    // 确保data是字符串，如果是对象则先转换为字符串
+                    const dataStr = typeof data === 'string' ? data : JSON.stringify(data);
+                    const session = JSON.parse(dataStr);
+                    const createdAt = new Date(session.createdAt);
+                    // 检查是否过期
+                    if (now.getTime() - createdAt.getTime() > maxAge) {
+                        await this.redis.del(key);
+                        cleanedCount++;
+                    }
+                }
+                catch (error) {
+                    // 如果处理失败，直接删除
+                    try {
+                        await this.redis.del(key);
+                        cleanedCount++;
+                    }
+                    catch (unlinkError) {
+                        console.error(`删除过期会话失败: ${key}`, unlinkError instanceof Error
+                            ? unlinkError
+                            : String(unlinkError));
+                    }
+                }
+            }
+            if (cleanedCount > 0) {
+                console.log(`清理了 ${cleanedCount} 个过期的MFA验证会话`);
+            }
+        }
+        catch (error) {
+            console.error('清理过期请求失败:', error instanceof Error ? error : String(error));
+        }
+    }
+    /**
+     * 清理指定会话的资源
+     * @param sessionId 会话ID
+     */
+    async cleanupRequest(sessionId) {
+        const sessionKey = this.getSessionKey(sessionId);
+        try {
+            await this.redis.del(sessionKey);
+        }
+        catch (error) {
+            // 忽略错误
+        }
+    }
+    /**
+     * 关闭Redis连接
+     */
+    async disconnect() {
+        if (this.redis && typeof this.redis.disconnect === 'function') {
+            await this.redis.disconnect();
+        }
+        else if (this.redis && typeof this.redis.quit === 'function') {
+            await this.redis.quit();
+        }
+    }
+}
+exports.RedisMFASessionStorage = RedisMFASessionStorage;
+//# sourceMappingURL=RedisMFASessionStorage.js.map

package/dist/common/RedisMFASessionStorage.js.map

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

package/dist/garmin/types/index.d.ts

@@ -14,6 +14,14 @@ export type GCHttpClientConfig = {
     timeout?: number;
     domain?: GarminDomain;
     mfaStorageDir?: string;
+    mfa?: MFAConfig;
+};
+export type MFAConfig = {
+    type: 'file' | 'redis';
+    dir?: string;
+    redisUrl?: string;
+    redisToken?: string;
+    redis?: any;
 };
 export type EventCallback<T> = (data: T) => void;
 export interface Listeners {

package/dist/garmin/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/garmin/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAMA,6CAA2B;AAqB3B,IAAY,KAEX;AAFD,WAAY,KAAK;IACb,wCAA+B,CAAA;AACnC,CAAC,EAFW,KAAK,GAAL,aAAK,KAAL,aAAK,QAEhB;AAED,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,6BAAW,CAAA;AACf,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AAED,IAAY,cAIX;AAJD,WAAY,cAAc;IACtB,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,6BAAW,CAAA;AACf,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/garmin/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAMA,6CAA2B;AA8B3B,IAAY,KAEX;AAFD,WAAY,KAAK;IACb,wCAA+B,CAAA;AACnC,CAAC,EAFW,KAAK,GAAL,aAAK,KAAL,aAAK,QAEhB;AAED,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,6BAAW,CAAA;AACf,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AAED,IAAY,cAIX;AAJD,WAAY,cAAc;IACtB,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,6BAAW,CAAA;AACf,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gooin/garmin-connect",
-    "version": "1.7.3",
+    "version": "1.7.4",
     "description": "Makes it simple to interface with Garmin Connect to get or set any data point",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -41,6 +41,7 @@
         "@types/luxon": "^3.3.2",
         "@types/node": "^18.11.15",
         "@types/qs": "^6.9.7",
+        "@types/redis": "^4.0.11",
         "@types/request-promise": "^4.1.48",
         "pre-commit": "^1.2.2",
         "prettier": "^2.8.1",
@@ -53,15 +54,18 @@
     },
     "runkitExampleFilename": "./examples/example.js",
     "dependencies": {
+        "@upstash/redis": "^1.35.6",
         "app-root-path": "^3.1.0",
         "axios": "^1.5.1",
         "axios-cookiejar-support": "^6.0.4",
         "crypto": "^1.0.1",
         "form-data": "^4.0.0",
+        "ioredis": "^5.8.1",
         "lodash": "^4.17.21",
         "luxon": "^3.4.3",
         "oauth-1.0a": "^2.2.6",
         "qs": "^6.11.2",
+        "redis": "^4.6.10",
         "tough-cookie": "^6.0.0"
     },
     "pre-commit": "pretty"