@gooin/garmin-connect 1.6.12 → 1.7.2

package/dist/common/HttpClient copy.d.ts

@@ -0,0 +1,38 @@
+import { AxiosInstance, AxiosRequestConfig, AxiosResponse, RawAxiosRequestHeaders } from 'axios';
+import OAuth from 'oauth-1.0a';
+import { UrlClass } from '../garmin/UrlClass';
+import { GCConfig, IOauth1, IOauth1Consumer, IOauth1Token, IOauth2Token } from '../garmin/types';
+export declare class HttpClient {
+    client: AxiosInstance;
+    url: UrlClass;
+    config: GCConfig;
+    oauth1Token: IOauth1Token | undefined;
+    oauth2Token: IOauth2Token | undefined;
+    OAUTH_CONSUMER: IOauth1Consumer | undefined;
+    constructor(url: UrlClass, config: GCConfig);
+    fetchOauthConsumer(): Promise<void>;
+    checkTokenVaild(): Promise<void>;
+    get<T>(url: string, config?: AxiosRequestConfig<any>): Promise<T>;
+    post<T>(url: string, data: any, config?: AxiosRequestConfig<any>): Promise<T>;
+    put<T>(url: string, data: any, config?: AxiosRequestConfig<any>): Promise<T>;
+    delete<T>(url: string, config?: AxiosRequestConfig<any>): Promise<T>;
+    setCommonHeader(headers: RawAxiosRequestHeaders): void;
+    handleError(response: AxiosResponse): void;
+    handleHttpError(response: AxiosResponse): void;
+    /**
+     * Login to Garmin Connect
+     * @param username
+     * @param password
+     * @returns {Promise<HttpClient>}
+     */
+    login(username: string, password: string, mfaCallback?: () => Promise<string>): Promise<HttpClient>;
+    private getLoginTicket;
+    handleMFA(htmlStr: string): void;
+    handlePageTitle(htmlStr: string): void;
+    handleAccountLocked(htmlStr: string): void;
+    refreshOauth2Token(): Promise<void>;
+    getOauth1Token(ticket: string): Promise<IOauth1>;
+    getOauthClient(consumer: IOauth1Consumer): OAuth;
+    exchange(oauth1: IOauth1): Promise<void>;
+    setOauth2TokenExpiresAt(token: IOauth2Token): IOauth2Token;
+}

package/dist/common/HttpClient copy.js

@@ -0,0 +1,361 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpClient = void 0;
+const axios_1 = __importDefault(require("axios"));
+const form_data_1 = __importDefault(require("form-data"));
+const lodash_1 = __importDefault(require("lodash"));
+const luxon_1 = require("luxon");
+const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
+const qs_1 = __importDefault(require("qs"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const CSRF_RE = new RegExp('name="_csrf"\\s+value="(.+?)"');
+const TICKET_RE = new RegExp('ticket=([^"]+)"');
+const ACCOUNT_LOCKED_RE = new RegExp('var statuss*=s*"([^"]*)"');
+const PAGE_TITLE_RE = new RegExp('<title>([^<]*)</title>');
+const USER_AGENT_CONNECTMOBILE = 'com.garmin.android.apps.connectmobile';
+const USER_AGENT_BROWSER = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36';
+const USER_AGENT_BROWSER_MAC = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36';
+const OAUTH_CONSUMER_URL = 'https://thegarth.s3.amazonaws.com/oauth_consumer.json';
+const HTTP_STATUS = {
+    UNAUTHORIZED: 401
+};
+let tokenRefreshPromise = null;
+let refreshSubscribers = [];
+class HttpClient {
+    constructor(url, config) {
+        var _a, _b;
+        this.url = url;
+        this.client = axios_1.default.create({
+            timeout: (_a = config === null || config === void 0 ? void 0 : config.timeout) !== null && _a !== void 0 ? _a : 5000,
+            timeoutErrorMessage: `Request Timeout: > ${(_b = config === null || config === void 0 ? void 0 : config.timeout) !== null && _b !== void 0 ? _b : 5000} ms`
+            /**
+             * Charles debugger: uncomment `proxy` and `httpsAgent`, then run bellow command.
+             * NODE_TLS_REJECT_UNAUTHORIZED=0  node test/sync.js
+             */
+            // proxy: {
+            //     host: '127.0.0.1',
+            //     port: 8888,
+            //     protocol: 'http'
+            // },
+            // httpsAgent: new (require('https').Agent)({
+            //     rejectUnauthorized: false
+            // })
+        });
+        this.config = config;
+        this.client.interceptors.response.use((response) => response, async (error) => {
+            var _a;
+            if (axios_1.default.isAxiosError(error) &&
+                error.code === 'ECONNABORTED') {
+                throw new Error(error.message || 'Request Timeout');
+            }
+            const originalRequest = error.config;
+            if (((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === HTTP_STATUS.UNAUTHORIZED &&
+                !(originalRequest === null || originalRequest === void 0 ? void 0 : originalRequest._retry)) {
+                if (!this.oauth2Token) {
+                    throw new Error('No OAuth2 token available');
+                }
+                originalRequest._retry = true;
+                try {
+                    if (!tokenRefreshPromise) {
+                        tokenRefreshPromise =
+                            this.refreshOauth2Token().finally(() => {
+                                tokenRefreshPromise = null;
+                            });
+                    }
+                    await tokenRefreshPromise;
+                    originalRequest.headers.Authorization = `Bearer ${this.oauth2Token.access_token}`;
+                    return this.client(originalRequest);
+                }
+                catch (err) {
+                    console.error('Token refresh failed:', err);
+                    throw err;
+                }
+            }
+            if (axios_1.default.isAxiosError(error) && error.response) {
+                this.handleError(error.response);
+            }
+            else {
+                // 处理没有response的情况
+                throw new Error('Network error or unknown error occurred');
+            }
+            throw error;
+        });
+        this.client.interceptors.request.use(async (config) => {
+            if (this.oauth2Token) {
+                config.headers.Authorization =
+                    'Bearer ' + this.oauth2Token.access_token;
+            }
+            return config;
+        });
+    }
+    async fetchOauthConsumer() {
+        const response = await axios_1.default.get(OAUTH_CONSUMER_URL);
+        this.OAUTH_CONSUMER = {
+            key: response.data.consumer_key,
+            secret: response.data.consumer_secret
+        };
+    }
+    async checkTokenVaild() {
+        if (this.oauth2Token) {
+            if (this.oauth2Token.expires_at < luxon_1.DateTime.now().toSeconds()) {
+                console.error('Token expired!');
+                await this.refreshOauth2Token();
+            }
+        }
+    }
+    async get(url, config) {
+        const response = await this.client.get(url, config);
+        return response === null || response === void 0 ? void 0 : response.data;
+    }
+    async post(url, data, config) {
+        const response = await this.client.post(url, data, config);
+        return response === null || response === void 0 ? void 0 : response.data;
+    }
+    async put(url, data, config) {
+        const response = await this.client.put(url, data, config);
+        return response === null || response === void 0 ? void 0 : response.data;
+    }
+    async delete(url, config) {
+        const response = await this.client.post(url, null, {
+            ...config,
+            headers: {
+                ...config === null || config === void 0 ? void 0 : config.headers,
+                'X-Http-Method-Override': 'DELETE'
+            }
+        });
+        return response === null || response === void 0 ? void 0 : response.data;
+    }
+    setCommonHeader(headers) {
+        lodash_1.default.each(headers, (headerValue, key) => {
+            this.client.defaults.headers.common[key] = headerValue;
+        });
+    }
+    handleError(response) {
+        this.handleHttpError(response);
+    }
+    handleHttpError(response) {
+        const { status, statusText, data } = response;
+        const errorMessage = {
+            status,
+            statusText,
+            data: typeof data === 'object' ? JSON.stringify(data) : data
+        };
+        console.error('HTTP Error:', errorMessage);
+        throw new Error(`HTTP Error (${status}): ${statusText}`);
+    }
+    /**
+     * Login to Garmin Connect
+     * @param username
+     * @param password
+     * @returns {Promise<HttpClient>}
+     */
+    async login(username, password, mfaCallback) {
+        await this.fetchOauthConsumer();
+        // Step1-3: Get ticket from page.
+        const ticket = await this.getLoginTicket(username, password);
+        // Step4: Oauth1
+        const oauth1 = await this.getOauth1Token(ticket);
+        // TODO: Handle MFA
+        // Step 5: Oauth2
+        await this.exchange(oauth1);
+        return this;
+    }
+    async getLoginTicket(username, password) {
+        // Step1: Set cookie
+        const step1Params = {
+            clientId: 'GarminConnect',
+            locale: 'en',
+            service: this.url.GC_MODERN
+        };
+        const step1Url = `${this.url.GARMIN_SSO_EMBED}?${qs_1.default.stringify(step1Params)}`;
+        // console.log('login - step1Url:', step1Url);
+        await this.client.get(step1Url);
+        // Step2 Get _csrf
+        const step2Params = {
+            id: 'gauth-widget',
+            embedWidget: true,
+            locale: 'en',
+            gauthHost: this.url.GARMIN_SSO_EMBED
+        };
+        const step2Url = `${this.url.SIGNIN_URL}?${qs_1.default.stringify(step2Params)}`;
+        // console.log('login - step2Url:', step2Url);
+        const step2Result = await this.get(step2Url);
+        // console.log('login - step2Result:', step2Result)
+        const csrfRegResult = CSRF_RE.exec(step2Result);
+        if (!csrfRegResult) {
+            throw new Error('login - csrf not found');
+        }
+        const csrf_token = csrfRegResult[1];
+        // console.log('login - csrf:', csrf_token);
+        // Step3 Get ticket
+        const signinParams = {
+            id: 'gauth-widget',
+            embedWidget: true,
+            clientId: 'GarminConnect',
+            locale: 'en',
+            gauthHost: this.url.GARMIN_SSO_EMBED,
+            service: this.url.GARMIN_SSO_EMBED,
+            source: this.url.GARMIN_SSO_EMBED,
+            redirectAfterAccountLoginUrl: this.url.GARMIN_SSO_EMBED,
+            redirectAfterAccountCreationUrl: this.url.GARMIN_SSO_EMBED
+        };
+        const step3Url = `${this.url.SIGNIN_URL}?${qs_1.default.stringify(signinParams)}`;
+        // console.log('login - step3Url:', step3Url);
+        const step3Form = new form_data_1.default();
+        step3Form.append('username', username);
+        step3Form.append('password', password);
+        step3Form.append('embed', 'true');
+        step3Form.append('_csrf', csrf_token);
+        const step3Result = await this.post(step3Url, step3Form, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                Dnt: 1,
+                Origin: this.url.GARMIN_SSO_ORIGIN,
+                Referer: this.url.SIGNIN_URL,
+                'User-Agent': USER_AGENT_BROWSER
+            }
+        });
+        console.log('step3Result:', step3Result);
+        this.handleAccountLocked(step3Result);
+        this.handlePageTitle(step3Result);
+        this.handleMFA(step3Result);
+        const ticketRegResult = TICKET_RE.exec(step3Result);
+        if (!ticketRegResult) {
+            throw new Error('login failed (Ticket not found or MFA), please check username and password');
+        }
+        const ticket = ticketRegResult[1];
+        return ticket;
+    }
+    // TODO: Handle MFA
+    handleMFA(htmlStr) { }
+    // TODO: Handle Phone number
+    handlePageTitle(htmlStr) {
+        const pageTitileRegResult = PAGE_TITLE_RE.exec(htmlStr);
+        if (pageTitileRegResult) {
+            const title = pageTitileRegResult[1];
+            console.log('login page title:', title);
+            if (lodash_1.default.includes(title, 'Update Phone Number')) {
+                // current I don't know where to update it
+                // See:  https://github.com/matin/garth/issues/19
+                throw new Error('login failed (Update Phone number), please update your phone number, See:  https://github.com/matin/garth/issues/19');
+            }
+        }
+    }
+    handleAccountLocked(htmlStr) {
+        const accountLockedRegResult = ACCOUNT_LOCKED_RE.exec(htmlStr);
+        if (accountLockedRegResult) {
+            const msg = accountLockedRegResult[1];
+            console.error(msg);
+            throw new Error('login failed (AccountLocked), please open connect web page to unlock your account');
+        }
+    }
+    async refreshOauth2Token() {
+        try {
+            if (!this.OAUTH_CONSUMER) {
+                await this.fetchOauthConsumer();
+            }
+            if (!this.oauth2Token || !this.oauth1Token) {
+                throw new Error('Missing required tokens for refresh');
+            }
+            const oauth1 = {
+                oauth: this.getOauthClient(this.OAUTH_CONSUMER),
+                token: this.oauth1Token
+            };
+            await this.exchange(oauth1);
+            console.log(`「${this.config.username}」in「${this.url.domain}」 OAuth2 token refreshed successfully`);
+        }
+        catch (error) {
+            console.error('Failed to refresh OAuth2 token:', error);
+            throw error;
+        }
+    }
+    async getOauth1Token(ticket) {
+        if (!this.OAUTH_CONSUMER) {
+            throw new Error('No OAUTH_CONSUMER');
+        }
+        const params = {
+            ticket,
+            'login-url': this.url.GARMIN_SSO_EMBED,
+            'accepts-mfa-tokens': true
+        };
+        const url = `${this.url.OAUTH_URL}/preauthorized?${qs_1.default.stringify(params)}`;
+        const oauth = this.getOauthClient(this.OAUTH_CONSUMER);
+        const step4RequestData = {
+            url: url,
+            method: 'GET'
+        };
+        const headers = oauth.toHeader(oauth.authorize(step4RequestData));
+        // console.log('getOauth1Token - headers:', headers);
+        const response = await this.get(url, {
+            headers: {
+                ...headers,
+                'User-Agent': USER_AGENT_CONNECTMOBILE
+            }
+        });
+        // console.log('getOauth1Token - response:', response);
+        const token = qs_1.default.parse(response);
+        // console.log('getOauth1Token - token:', token);
+        this.oauth1Token = token;
+        return { token, oauth };
+    }
+    getOauthClient(consumer) {
+        const oauth = new oauth_1_0a_1.default({
+            consumer: consumer,
+            signature_method: 'HMAC-SHA1',
+            hash_function(base_string, key) {
+                return node_crypto_1.default
+                    .createHmac('sha1', key)
+                    .update(base_string)
+                    .digest('base64');
+            }
+        });
+        return oauth;
+    }
+    //
+    async exchange(oauth1) {
+        const token = {
+            key: oauth1.token.oauth_token,
+            secret: oauth1.token.oauth_token_secret
+        };
+        // console.log('exchange - token:', token);
+        const baseUrl = `${this.url.OAUTH_URL}/exchange/user/2.0`;
+        const requestData = {
+            url: baseUrl,
+            method: 'POST',
+            data: null
+        };
+        const step5AuthData = oauth1.oauth.authorize(requestData, token);
+        // console.log('login - step5AuthData:', step5AuthData);
+        const url = `${baseUrl}?${qs_1.default.stringify(step5AuthData)}`;
+        // console.log('exchange - url:', url);
+        this.oauth2Token = undefined;
+        const response = await this.post(url, null, {
+            headers: {
+                'User-Agent': USER_AGENT_CONNECTMOBILE,
+                'Content-Type': 'application/x-www-form-urlencoded'
+            }
+        });
+        // console.log('exchange - response:', response);
+        this.oauth2Token = this.setOauth2TokenExpiresAt(response);
+        // console.log('exchange - oauth2Token:', this.oauth2Token);
+    }
+    setOauth2TokenExpiresAt(token) {
+        const now = luxon_1.DateTime.now();
+        const expiresAt = now.plus({ seconds: token.expires_in });
+        const refreshTokenExpiresAt = now.plus({
+            seconds: token.refresh_token_expires_in
+        });
+        return {
+            ...token,
+            last_update_date: now.toLocal().toString(),
+            expires_date: expiresAt.toLocal().toString(),
+            expires_at: expiresAt.toSeconds(),
+            refresh_token_expires_at: refreshTokenExpiresAt.toSeconds()
+        };
+    }
+}
+exports.HttpClient = HttpClient;
+//# sourceMappingURL=HttpClient%20copy.js.map

package/dist/common/HttpClient copy.js.map

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

package/dist/common/HttpClient.d.ts

@@ -1,5 +1,6 @@
 import { AxiosInstance, AxiosRequestConfig, AxiosResponse, RawAxiosRequestHeaders } from 'axios';
 import OAuth from 'oauth-1.0a';
+import { MFAManager } from './MFAManager';
 import { UrlClass } from '../garmin/UrlClass';
 import { GCConfig, IOauth1, IOauth1Consumer, IOauth1Token, IOauth2Token } from '../garmin/types';
 export declare class HttpClient {
@@ -9,30 +10,164 @@ export declare class HttpClient {
     oauth1Token: IOauth1Token | undefined;
     oauth2Token: IOauth2Token | undefined;
     OAUTH_CONSUMER: IOauth1Consumer | undefined;
+    mfaManager: MFAManager;
     constructor(url: UrlClass, config: GCConfig);
+    /**
+     * 设置请求和响应拦截器
+     */
+    private setupInterceptors;
+    /**
+     * 记录响应跟踪信息
+     */
+    private logResponseTracking;
+    /**
+     * 处理响应错误
+     */
+    private handleResponseError;
+    /**
+     * 获取OAuth消费者信息
+     */
     fetchOauthConsumer(): Promise<void>;
+    /**
+     * 检查令牌有效性
+     */
     checkTokenVaild(): Promise<void>;
+    /**
+     * GET请求
+     */
     get<T>(url: string, config?: AxiosRequestConfig<any>): Promise<T>;
+    /**
+     * POST请求
+     */
     post<T>(url: string, data: any, config?: AxiosRequestConfig<any>): Promise<T>;
+    /**
+     * PUT请求
+     */
     put<T>(url: string, data: any, config?: AxiosRequestConfig<any>): Promise<T>;
+    /**
+     * DELETE请求
+     */
     delete<T>(url: string, config?: AxiosRequestConfig<any>): Promise<T>;
+    /**
+     * 设置通用请求头
+     */
     setCommonHeader(headers: RawAxiosRequestHeaders): void;
+    /**
+     * 处理错误
+     */
     handleError(response: AxiosResponse): void;
+    /**
+     * 处理HTTP错误
+     */
     handleHttpError(response: AxiosResponse): void;
     /**
-     * Login to Garmin Connect
-     * @param username
-     * @param password
-     * @returns {Promise<HttpClient>}
+     * 登录到Garmin Connect
+     * @param username 用户名
+     * @param password 密码
+     * @param mfaCallback MFA验证回调函数
+     * @param sessionId 会话ID，用于分步登录
+     * @returns Promise<HttpClient>
+     */
+    login(username: string, password: string, sessionId?: string): Promise<HttpClient>;
+    /**
+     * 获取登录票据
+     * @param username 用户名
+     * @param password 密码
+     * @param mfaCallback MFA验证回调函数
+     * @param sessionId 会话ID，用于分步登录
+     * @returns 登录票据
      */
-    login(username: string, password: string): Promise<HttpClient>;
     private getLoginTicket;
-    handleMFA(htmlStr: string): void;
-    handlePageTitle(htmlStr: string): void;
+    /**
+     * 准备登录参数
+     */
+    private prepareLoginParams;
+    /**
+     * 执行登录步骤1：设置cookie
+     */
+    private performLoginStep1;
+    /**
+     * 执行登录步骤2：获取CSRF令牌
+     */
+    private performLoginStep2;
+    /**
+     * 执行登录步骤3：提交凭据
+     */
+    private performLoginStep3;
+    /**
+     * 判断是否需要MFA验证
+     */
+    private isMFARequired;
+    /**
+     * 从响应中提取票据
+     */
+    private extractTicket;
+    /**
+     * 处理MFA验证（使用直接提供的验证码）
+     * @param htmlStr HTML响应字符串
+     * @param signinParams 登录参数
+     * @param mfaCode MFA验证码
+     * @returns MFA验证后的响应字符串
+     */
+    handleMFAWithCode(htmlStr: string, signinParams: Record<string, any>, mfaCode: string): Promise<string>;
+    /**
+     * 处理MFA验证
+     * @param htmlStr HTML响应字符串
+     * @param signinParams 登录参数
+     * @param mfaCallback MFA验证回调函数
+     * @returns MFA验证后的响应字符串
+     */
+    handleMFA(htmlStr: string, signinParams: Record<string, any>, mfaCallback?: () => Promise<string>): Promise<string>;
+    /**
+     * 提交MFA验证码
+     */
+    private submitMFACode;
+    /**
+     * 验证MFA结果
+     */
+    private validateMFAResult;
+    /**
+     * 从HTML中提取CSRF令牌
+     * @param html HTML字符串
+     * @returns CSRF令牌或null
+     */
+    extractCsrfToken(html: string): string | null;
+    /**
+     * 处理页面标题
+     * @param htmlStr HTML字符串
+     * @returns 页面标题
+     */
+    handlePageTitle(htmlStr: string): string;
+    /**
+     * 处理账户锁定状态
+     * @param htmlStr HTML字符串
+     */
     handleAccountLocked(htmlStr: string): void;
+    /**
+     * 刷新OAuth2令牌
+     */
     refreshOauth2Token(): Promise<void>;
+    /**
+     * 获取OAuth1令牌
+     * @param ticket 登录票据
+     * @returns OAuth1令牌和客户端
+     */
     getOauth1Token(ticket: string): Promise<IOauth1>;
+    /**
+     * 获取OAuth客户端
+     * @param consumer OAuth消费者信息
+     * @returns OAuth客户端
+     */
     getOauthClient(consumer: IOauth1Consumer): OAuth;
+    /**
+     * 交换OAuth2令牌
+     * @param oauth1 OAuth1令牌和客户端
+     */
     exchange(oauth1: IOauth1): Promise<void>;
+    /**
+     * 设置OAuth2令牌过期时间
+     * @param token OAuth2令牌
+     * @returns 设置了过期时间的OAuth2令牌
+     */
     setOauth2TokenExpiresAt(token: IOauth2Token): IOauth2Token;
 }