cloud189-sdk 1.0.5 → 1.0.6-alpha.2

package/README.md

@@ -1,50 +1,51 @@
 # cloud189-sdk
 
-##  安装依赖
-``` console
-npm i cloud189-sdk
+> 基于node.js的天翼网盘sdk
+
+<div align="center">
+  <a href="https://github.com/wes-lin/cloud189-sdk/actions/workflows/publish.yml">
+    <img src="https://github.com/wes-lin/cloud189-sdk/actions/workflows/publish.yml/badge.svg">
+  </a>
+  <a href="https://www.npmjs.org/package/cloud189-sdk">
+    <img src="https://img.shields.io/npm/v/cloud189-sdk.svg">
+  </a>
+  <a href="https://packagephobia.com/result?p=cloud189-sdk">
+    <img src="https://packagephobia.com/badge?p=cloud189-sdk">
+  </a>
+  <a href="https://npmcharts.com/compare/cloud189-sdk?minimal=true">
+    <img src="http://img.shields.io/npm/dm/cloud189-sdk.svg">
+  </a>
+  <a href="LICENSE">
+    <img src="https://img.shields.io/badge/License-MIT-yellow.svg">
+  </a>
+</div>
+
+## 使用方法
+
+1. 安装依赖
+
+```sh
+npm install cloud189-sdk
 ```
-或者
-``` console
-yarn add cloud189-sdk
+
+2. 初始化
+
+```js
+const { CloudClient } = require('cloud189-sdk')
+// 使用账号密码初始化
+const client = new CloudClient({
+  username: 'username',
+  password: 'password'
+})
+
 ```
-## 测试代码
-``` javascript
-const { CloudClient } = require("cloud189-sdk");
-
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-(async () => {
-  const client = new CloudClient(
-    'your username',
-    'your password'
-  );
-  await client.login();
-  const t1 = await client.userSign();
-  console.log(t1);
-  await delay(5000);
-  const t2 = await client.taskSign();
-  console.log(t2);
-  await delay(5000);
-  const t3 = await client.taskPhoto();
-  console.log(t3);
-  await delay(5000);
-  const t4 = await client.taskKJ();
-  await delay(5000);
-  console.log(t4);
-  const { familyInfoResp } = await client.getFamilyList();
-  console.log(familyInfoResp);
-  if (familyInfoResp) {
-    for (let index = 0; index < familyInfoResp.length; index += 1) {
-      const { familyId } = familyInfoResp[index];
-      try {
-        const res = await client.familyUserSign(familyId);
-        console.log(res);
-      } catch (e) {
-        console.error(e);
-      }
-    }
-  }
-  const info = await client.getUserSizeInfo();
-  console.log(info);
-})();
+
+3. 使用
+
+```js
+const info = await client.getUserSizeInfo()
+console.log(info)
+
 ```
+
+## [API 文档](https://cloud.189.whaledev.cn/)

package/dist/CloudClient.d.ts

@@ -1,94 +1,87 @@
-import { CookieJar } from "tough-cookie";
-interface CacheQuery {
-    appId: string;
-    reqId: string;
-    lt: string;
-}
-interface FamilyListResponse {
-    familyInfoResp: [
-        {
-            familyId: number;
-            remarkName: string;
-            type: number;
-            userRole: number;
-        }
-    ];
-}
-interface UserBriefInfoResponse {
-    sessionKey: string;
-}
-interface AccessTokenResponse {
-    accessToken: string;
-}
-interface FamilyUserSignResponse {
-    bonusSpace: number;
-    signFamilyId: number;
-    signStatus: number;
-    signTime: string;
-    userId: string;
-}
-interface UserSizeInfoResponse {
-    cloudCapacityInfo: {
-        totalSize: number;
-    };
-    familyCapacityInfo: {
-        totalSize: number;
-    };
-}
-interface UserSignResponse {
-    isSign: boolean;
-    netdiskBonus: number;
-}
-interface TaskResponse {
-    errorCode: string;
-    prizeName: string;
-}
-interface UserSizeInfoResponse {
-    account: string;
-    cloudCapacityInfo: {
-        totalSize: number;
-    };
-    familyCapacityInfo: {
-        totalSize: number;
-    };
-}
-declare class CloudClient {
-    #private;
-    username: string;
-    password: string;
-    cacheQuery: CacheQuery;
-    cookieJar: CookieJar;
-    constructor(username: string, password: string);
-    getEncrypt: () => Promise<any>;
-    redirectURL: () => Promise<unknown>;
-    appConf: (query: CacheQuery) => Promise<any>;
-    /**
-     * 登录流程
-     * 1.获取公钥
-     * 2.获取登录参数
-     * 3.获取登录地址
-     * 4.跳转到登录页
-     * */
-    login: () => Promise<any>;
-    fetchAPI: (task: string) => Promise<any>;
-    getUserSizeInfo: () => Promise<UserSizeInfoResponse>;
-    userSign: () => Promise<UserSignResponse>;
-    /**
-     * @deprecated 任务无效， 1.0.4版本废弃
-     */
-    taskSign: () => Promise<TaskResponse>;
-    /**
-     * @deprecated 任务无效， 1.0.4版本废弃
-     */
-    taskPhoto: () => Promise<TaskResponse>;
-    /**
-     * @deprecated 任务无效， 1.0.3版本废弃
-     */
-    taskKJ: () => Promise<TaskResponse>;
-    getUserBriefInfo: () => Promise<UserBriefInfoResponse>;
-    getAccessTokenBySsKey: (sessionKey: string) => Promise<AccessTokenResponse>;
-    fetchFamilyAPI: (path: string) => Promise<any>;
-    getFamilyList: () => Promise<FamilyListResponse>;
-    familyUserSign: (familyId: number) => Promise<FamilyUserSignResponse>;
-}
-export default CloudClient;
+import { Got } from 'got';
+import { CookieJar } from 'tough-cookie';
+import { UserSignResponse, UserSizeInfoResponse, UserTaskResponse, FamilyListResponse, FamilyUserSignResponse, ConfigurationOptions } from './types';
+/**
+ * 天翼网盘客户端
+ * @public
+ */
+export default class CloudClient {
+    #private;
+    username: string;
+    password: string;
+    cookie: CookieJar;
+    readonly request: Got;
+    constructor(_options: ConfigurationOptions);
+    /**
+     * 获取加密参数
+     * @returns
+     */
+    getEncrypt(): Promise<{
+        data: {
+            pubKey: string;
+            pre: string;
+        };
+    }>;
+    /**
+     * 跳转到登录页面
+     * @returns 登录的参数
+     */
+    redirectURL(): Promise<any>;
+    /**
+     * 用户名密码登录
+     * */
+    login(): Promise<any>;
+    /**
+     * 是否存在登录信息
+     * @returns
+     */
+    isLoggedSession(): boolean;
+    /**
+     * 获取 sessionKey
+     * @param needRefresh - 是否重新获取
+     * @returns sessionKey
+     */
+    getSessionKey(needRefresh?: boolean): Promise<string>;
+    /**
+     * 获取 accessToken
+     * @param needRefresh - 是否重新获取
+     * @returns accessToken
+     */
+    getAccessToken(needRefresh?: boolean): Promise<string>;
+    /**
+     * 获取用户网盘存储容量信息
+     * @returns 账号容量结果
+     */
+    getUserSizeInfo(): Promise<UserSizeInfoResponse>;
+    /**
+     * 个人签到任务
+     * @returns 签到结果
+     */
+    userSign(): Promise<UserSignResponse>;
+    /**
+     * 任务无效， 1.0.4版本废弃
+     * @deprecated 任务过期
+     */
+    taskSign(): Promise<UserTaskResponse>;
+    /**
+     * 任务无效， 1.0.4版本废弃
+     * @deprecated 任务过期
+     */
+    taskPhoto(): Promise<UserTaskResponse>;
+    /**
+     * 任务无效， 1.0.3版本废弃
+     * @deprecated 任务过期
+     */
+    taskKJ(): Promise<UserTaskResponse>;
+    /**
+     * 获取家庭信息
+     * @returns 家庭列表信息
+     */
+    getFamilyList(): Promise<FamilyListResponse>;
+    /**
+     * 家庭签到任务
+     * @param familyId - 家庭id
+     * @returns 签到结果
+     */
+    familyUserSign(familyId: number): Promise<FamilyUserSignResponse>;
+}

package/dist/CloudClient.js

@@ -1,239 +1,353 @@
-"use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _CloudClient_accessToken, _CloudClient_builLoginForm, _CloudClient_sortParameter, _CloudClient_getSignature;
-Object.defineProperty(exports, "__esModule", { value: true });
-const url_1 = __importDefault(require("url"));
-const node_jsencrypt_1 = __importDefault(require("node-jsencrypt"));
-const crypto_1 = __importDefault(require("crypto"));
-const got_1 = __importDefault(require("got"));
-const tough_cookie_1 = require("tough-cookie");
-const config = {
-    clientId: "538135150693412",
-    model: "KB2000",
-    version: "9.0.6",
-};
-const headers = {
-    "User-Agent": `Mozilla/5.0 (Linux; U; Android 11; ${config.model} Build/RP1A.201005.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.136 Mobile Safari/537.36 Ecloud/${config.version} Android/30 clientId/${config.clientId} clientModel/${config.model} clientChannelId/qq proVersion/1.0.6`,
-    Referer: "https://m.cloud.189.cn/zhuanti/2016/sign/index.jsp?albumBackupOpened=1",
-    "Accept-Encoding": "gzip, deflate",
-    Host: "cloud.189.cn",
-};
-class CloudClient {
-    constructor(username, password) {
-        _CloudClient_accessToken.set(this, "");
-        this.getEncrypt = () => got_1.default.post("https://open.e.189.cn/api/logbox/config/encryptConf.do").json();
-        this.redirectURL = () => new Promise((resolve, reject) => {
-            got_1.default
-                .get("https://cloud.189.cn/api/portal/loginUrl.action?redirectURL=https://cloud.189.cn/web/redirect.html?returnURL=/main.action")
-                .then((res) => {
-                const { query } = url_1.default.parse(res.url, true);
-                resolve(query);
-            })
-                .catch((e) => reject(e));
-        });
-        this.appConf = (query) => got_1.default
-            .post("https://open.e.189.cn/api/logbox/oauth2/appConf.do", {
-            headers: {
-                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0",
-                Referer: "https://open.e.189.cn/",
-                lt: query.lt,
-                REQID: query.reqId,
-            },
-            form: { version: "2.0", appKey: query.appId },
-        })
-            .json();
-        _CloudClient_builLoginForm.set(this, (encrypt, appConf) => {
-            const jsencrypt = new node_jsencrypt_1.default();
-            const keyData = `-----BEGIN PUBLIC KEY-----\n${encrypt.pubKey}\n-----END PUBLIC KEY-----`;
-            jsencrypt.setPublicKey(keyData);
-            const usernameEncrypt = Buffer.from(jsencrypt.encrypt(this.username), "base64").toString("hex");
-            const passwordEncrypt = Buffer.from(jsencrypt.encrypt(this.password), "base64").toString("hex");
-            const data = {
-                appKey: "cloud",
-                version: "2.0",
-                accountType: "01",
-                mailSuffix: "@189.cn",
-                validateCode: "",
-                captchaToken: "",
-                dynamicCheck: "FALSE",
-                clientType: "1",
-                cb_SaveName: "0",
-                isOauth2: false,
-                returnUrl: appConf.returnUrl,
-                paramId: appConf.paramId,
-                userName: `${encrypt.pre}${usernameEncrypt}`,
-                password: `${encrypt.pre}${passwordEncrypt}`,
-            };
-            return data;
-        });
-        _CloudClient_sortParameter.set(this, (data) => {
-            if (!data) {
-                return "";
-            }
-            const e = Object.entries(data).map((t) => t.join("="));
-            e.sort((a, b) => (a > b ? 1 : a < b ? -1 : 0));
-            return e.join("&");
-        });
-        _CloudClient_getSignature.set(this, (data) => {
-            const parameter = __classPrivateFieldGet(this, _CloudClient_sortParameter, "f").call(this, data);
-            return crypto_1.default.createHash("md5").update(parameter).digest("hex");
-        });
-        /**
-         * 登录流程
-         * 1.获取公钥
-         * 2.获取登录参数
-         * 3.获取登录地址
-         * 4.跳转到登录页
-         * */
-        this.login = () => new Promise((resolve, reject) => {
-            Promise.all([
-                //1.获取公钥
-                this.getEncrypt(),
-                //2.获取登录参数
-                this.redirectURL().then((query) => {
-                    this.cacheQuery = query;
-                    return this.appConf(query);
-                }),
-            ])
-                .then((res) => {
-                const encrypt = res[0].data;
-                const appConf = res[1].data;
-                const data = __classPrivateFieldGet(this, _CloudClient_builLoginForm, "f").call(this, encrypt, appConf);
-                //3.获取登录地址
-                return got_1.default
-                    .post("https://open.e.189.cn/api/logbox/oauth2/loginSubmit.do", {
-                    headers: {
-                        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0",
-                        Referer: "https://open.e.189.cn/",
-                        REQID: this.cacheQuery.reqId,
-                        lt: this.cacheQuery.lt,
-                    },
-                    form: data,
-                })
-                    .json();
-            })
-                .then((res) => {
-                // 4.跳转到登录页
-                if (res.result !== 0) {
-                    reject(res.msg);
-                }
-                else {
-                    return got_1.default
-                        .get(res.toUrl, { headers, cookieJar: this.cookieJar })
-                        .then((r) => resolve(r.statusCode));
-                }
-            })
-                .catch((e) => reject(e));
-        });
-        this.fetchAPI = (task) => {
-            const q = url_1.default.parse(task, true);
-            return got_1.default
-                .get(task, {
-                headers: Object.assign(Object.assign({}, headers), { Host: q.host }),
-                cookieJar: this.cookieJar,
-            })
-                .json();
-        };
-        this.getUserSizeInfo = () => {
-            return got_1.default
-                .get("https://cloud.189.cn/api/portal/getUserSizeInfo.action", {
-                headers: {
-                    Accept: "application/json;charset=UTF-8",
-                },
-                cookieJar: this.cookieJar,
-            })
-                .json();
-        };
-        this.userSign = () => {
-            return this.fetchAPI(`https://cloud.189.cn/mkt/userSign.action?rand=${new Date().getTime()}&clientType=TELEANDROID&version=${config.version}&model=${config.model}`);
-        };
-        /**
-         * @deprecated 任务无效， 1.0.4版本废弃
-         */
-        this.taskSign = () => {
-            return this.fetchAPI("https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN&activityId=ACT_SIGNIN");
-        };
-        /**
-         * @deprecated 任务无效， 1.0.4版本废弃
-         */
-        this.taskPhoto = () => {
-            return this.fetchAPI("https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN_PHOTOS&activityId=ACT_SIGNIN");
-        };
-        /**
-         * @deprecated 任务无效， 1.0.3版本废弃
-         */
-        this.taskKJ = () => {
-            return this.fetchAPI("https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_2022_FLDFS_KJ&activityId=ACT_SIGNIN");
-        };
-        this.getUserBriefInfo = () => got_1.default
-            .get("https://cloud.189.cn/api/portal/v2/getUserBriefInfo.action", {
-            cookieJar: this.cookieJar,
-        })
-            .json();
-        this.getAccessTokenBySsKey = (sessionKey) => {
-            const appkey = "600100422";
-            const time = String(Date.now());
-            const signature = __classPrivateFieldGet(this, _CloudClient_getSignature, "f").call(this, {
-                sessionKey,
-                Timestamp: time,
-                AppKey: appkey,
-            });
-            return got_1.default
-                .get(`https://cloud.189.cn/api/open/oauth2/getAccessTokenBySsKey.action?sessionKey=${sessionKey}`, {
-                headers: {
-                    "Sign-Type": "1",
-                    Signature: signature,
-                    Timestamp: time,
-                    Appkey: appkey,
-                },
-                cookieJar: this.cookieJar,
-            })
-                .json();
-        };
-        this.fetchFamilyAPI = async (path) => {
-            const { query } = url_1.default.parse(path, true);
-            const time = String(Date.now());
-            if (!__classPrivateFieldGet(this, _CloudClient_accessToken, "f")) {
-                const { sessionKey } = await this.getUserBriefInfo();
-                const { accessToken } = await this.getAccessTokenBySsKey(sessionKey);
-                __classPrivateFieldSet(this, _CloudClient_accessToken, accessToken, "f");
-            }
-            const signature = __classPrivateFieldGet(this, _CloudClient_getSignature, "f").call(this, Object.assign(Object.assign({}, query), { Timestamp: time, AccessToken: __classPrivateFieldGet(this, _CloudClient_accessToken, "f") }));
-            return got_1.default
-                .get(path, {
-                headers: {
-                    "Sign-Type": "1",
-                    Signature: signature,
-                    Timestamp: time,
-                    Accesstoken: __classPrivateFieldGet(this, _CloudClient_accessToken, "f"),
-                    Accept: "application/json;charset=UTF-8",
-                },
-                cookieJar: this.cookieJar,
-            })
-                .json();
-        };
-        this.getFamilyList = () => this.fetchFamilyAPI("https://api.cloud.189.cn/open/family/manage/getFamilyList.action");
-        this.familyUserSign = (familyId) => {
-            const gturl = `https://api.cloud.189.cn/open/family/manage/exeFamilyUserSign.action?familyId=${familyId}`;
-            return this.fetchFamilyAPI(gturl);
-        };
-        this.username = username;
-        this.password = password;
-        this.cookieJar = new tough_cookie_1.CookieJar();
-    }
-}
-_CloudClient_accessToken = new WeakMap(), _CloudClient_builLoginForm = new WeakMap(), _CloudClient_sortParameter = new WeakMap(), _CloudClient_getSignature = new WeakMap();
-exports.default = CloudClient;
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _CloudClient_instances, _CloudClient_accessToken, _CloudClient_sessionKey, _CloudClient_cacheQuery, _CloudClient_valid, _CloudClient_appConf, _CloudClient_builLoginForm, _CloudClient_getUserBriefInfo, _CloudClient_getAccessTokenBySsKey;
+Object.defineProperty(exports, "__esModule", { value: true });
+const url_1 = __importDefault(require("url"));
+const node_jsencrypt_1 = __importDefault(require("node-jsencrypt"));
+const got_1 = __importDefault(require("got"));
+const tough_cookie_1 = require("tough-cookie");
+const log_1 = require("./log");
+const util_1 = require("./util");
+const const_1 = require("./const");
+const config = {
+    clientId: '538135150693412',
+    model: 'KB2000',
+    version: '9.0.6'
+};
+/**
+ * 天翼网盘客户端
+ * @public
+ */
+class CloudClient {
+    constructor(_options) {
+        _CloudClient_instances.add(this);
+        _CloudClient_accessToken.set(this, '');
+        _CloudClient_sessionKey.set(this, '');
+        _CloudClient_cacheQuery.set(this, void 0);
+        _CloudClient_valid.set(this, (options) => {
+            if (!options.cookie && (!options.username || !options.password)) {
+                log_1.log.error('valid');
+                throw new Error('Please provide username and password or Cookie!');
+            }
+        }
+        /**
+         * 获取加密参数
+         * @returns
+         */
+        );
+        _CloudClient_builLoginForm.set(this, (encrypt, appConf) => {
+            const jsencrypt = new node_jsencrypt_1.default();
+            const keyData = `-----BEGIN PUBLIC KEY-----\n${encrypt.pubKey}\n-----END PUBLIC KEY-----`;
+            jsencrypt.setPublicKey(keyData);
+            const usernameEncrypt = Buffer.from(jsencrypt.encrypt(this.username), 'base64').toString('hex');
+            const passwordEncrypt = Buffer.from(jsencrypt.encrypt(this.password), 'base64').toString('hex');
+            const data = {
+                appKey: 'cloud',
+                version: '2.0',
+                accountType: '01',
+                mailSuffix: '@189.cn',
+                validateCode: '',
+                captchaToken: '',
+                dynamicCheck: 'FALSE',
+                clientType: '1',
+                cb_SaveName: '3',
+                isOauth2: false,
+                returnUrl: appConf.returnUrl,
+                paramId: appConf.paramId,
+                userName: `${encrypt.pre}${usernameEncrypt}`,
+                password: `${encrypt.pre}${passwordEncrypt}`
+            };
+            return data;
+        }
+        /**
+         * 用户名密码登录
+         * */
+        );
+        __classPrivateFieldGet(this, _CloudClient_valid, "f").call(this, _options);
+        this.username = _options.username;
+        this.password = _options.password;
+        if (_options.cookie) {
+            this.cookie = _options.cookie;
+        }
+        else {
+            this.cookie = new tough_cookie_1.CookieJar();
+        }
+        this.request = got_1.default.extend({
+            cookieJar: this.cookie,
+            retry: {
+                limit: 5
+            },
+            headers: {
+                'User-Agent': const_1.UserAgent,
+                Referer: `${const_1.WEB_URL}/web/main/`
+            },
+            hooks: {
+                beforeRequest: [
+                    async (options) => {
+                        if (options.url.href.includes(const_1.API_URL) &&
+                            !options.url.href.includes('getSessionForPC.action')) {
+                            const accessToken = await this.getAccessToken();
+                            const { query } = url_1.default.parse(options.url.toString(), true);
+                            const time = String(Date.now());
+                            const signature = (0, util_1.getSignature)(Object.assign(Object.assign({}, (options.method === 'GET' ? query : options.json)), { Timestamp: time, AccessToken: accessToken }));
+                            options.headers['Sign-Type'] = '1';
+                            options.headers['Signature'] = signature;
+                            options.headers['Timestamp'] = time;
+                            options.headers['Accesstoken'] = accessToken;
+                            options.headers['Accept'] = 'application/json;charset=UTF-8';
+                        }
+                    }
+                ],
+                afterResponse: [
+                    async (response, retryWithMergedOptions) => {
+                        log_1.log.debug(`url: ${response.requestUrl}, response: ${response.body}`);
+                        if (response.statusCode === 400) {
+                            const { errorCode, errorMsg } = JSON.parse(response.body.toString());
+                            if (errorCode === 'InvalidAccessToken') {
+                                log_1.log.debug('InvalidAccessToken retry...');
+                                log_1.log.debug('Refresh AccessToken');
+                                await this.getAccessToken(true);
+                                return retryWithMergedOptions({});
+                            }
+                            else if (errorCode === 'InvalidSessionKey') {
+                                log_1.log.debug('InvalidSessionKey retry...');
+                                log_1.log.debug('Refresh InvalidSessionKey');
+                                const sessionKey = await this.getSessionKey(true);
+                                const urlObj = new URL(response.requestUrl);
+                                if (urlObj.searchParams.has('sessionKey')) {
+                                    urlObj.searchParams.set('sessionKey', sessionKey);
+                                }
+                                return retryWithMergedOptions({
+                                    url: urlObj.toString()
+                                });
+                            }
+                        }
+                        return response;
+                    }
+                ]
+            }
+        });
+    }
+    /**
+     * 获取加密参数
+     * @returns
+     */
+    getEncrypt() {
+        return this.request.post(`${const_1.AUTH_URL}/api/logbox/config/encryptConf.do`).json();
+    }
+    /**
+     * 跳转到登录页面
+     * @returns 登录的参数
+     */
+    redirectURL() {
+        return new Promise((resolve, reject) => {
+            this.request
+                .get(`${const_1.WEB_URL}/api/portal/loginUrl.action?redirectURL=${const_1.WEB_URL}/web/redirect.html?returnURL=/main.action`)
+                .then((res) => {
+                const { query } = url_1.default.parse(res.url, true);
+                resolve(query);
+            })
+                .catch((e) => reject(e));
+        });
+    }
+    /**
+     * 用户名密码登录
+     * */
+    login() {
+        /**
+         * 1.获取公钥
+         * 2.获取登录参数
+         * 3.获取登录地址
+         * 4.跳转到登录页
+         */
+        return new Promise((resolve, reject) => {
+            if (!this.username || !this.password) {
+                throw new Error('Please provide username and password!');
+            }
+            log_1.log.debug('login...');
+            this.cookie.removeAllCookiesSync();
+            Promise.all([
+                //1.获取公钥
+                this.getEncrypt(),
+                //2.获取登录参数
+                this.redirectURL().then((query) => {
+                    __classPrivateFieldSet(this, _CloudClient_cacheQuery, query, "f");
+                    return __classPrivateFieldGet(this, _CloudClient_instances, "m", _CloudClient_appConf).call(this);
+                })
+            ])
+                .then((res) => {
+                const encrypt = res[0].data;
+                const appConf = res[1].data;
+                const data = __classPrivateFieldGet(this, _CloudClient_builLoginForm, "f").call(this, encrypt, appConf);
+                //3.获取登录地址
+                return this.request
+                    .post(`${const_1.AUTH_URL}/api/logbox/oauth2/loginSubmit.do`, {
+                    headers: {
+                        Referer: const_1.AUTH_URL,
+                        lt: __classPrivateFieldGet(this, _CloudClient_cacheQuery, "f").lt,
+                        REQID: __classPrivateFieldGet(this, _CloudClient_cacheQuery, "f").reqId
+                    },
+                    form: data
+                })
+                    .json();
+            })
+                .then((res) => {
+                // 4.跳转到登录页
+                if (res.result !== 0) {
+                    reject(res.msg);
+                }
+                else {
+                    return this.request.get(res.toUrl).then((r) => resolve(r.statusCode));
+                }
+            })
+                .catch((e) => reject(e));
+        });
+    }
+    /**
+     * 是否存在登录信息
+     * @returns
+     */
+    isLoggedSession() {
+        var _a;
+        const loginUserCookie = (_a = this.cookie
+            .getCookiesSync(const_1.WEB_URL)) === null || _a === void 0 ? void 0 : _a.find((cookie) => cookie.key === 'COOKIE_LOGIN_USER' && cookie.value);
+        if (loginUserCookie) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * 获取 sessionKey
+     * @param needRefresh - 是否重新获取
+     * @returns sessionKey
+     */
+    async getSessionKey(needRefresh = false) {
+        if (!__classPrivateFieldGet(this, _CloudClient_sessionKey, "f") || needRefresh) {
+            if (!this.isLoggedSession()) {
+                await this.login();
+            }
+            const { sessionKey } = await __classPrivateFieldGet(this, _CloudClient_instances, "m", _CloudClient_getUserBriefInfo).call(this);
+            __classPrivateFieldSet(this, _CloudClient_sessionKey, sessionKey, "f");
+        }
+        return __classPrivateFieldGet(this, _CloudClient_sessionKey, "f");
+    }
+    /**
+     * 获取 accessToken
+     * @param needRefresh - 是否重新获取
+     * @returns accessToken
+     */
+    async getAccessToken(needRefresh = false) {
+        if (!__classPrivateFieldGet(this, _CloudClient_accessToken, "f") || needRefresh) {
+            const sessionKey = await this.getSessionKey();
+            const { accessToken } = await __classPrivateFieldGet(this, _CloudClient_instances, "m", _CloudClient_getAccessTokenBySsKey).call(this, sessionKey);
+            __classPrivateFieldSet(this, _CloudClient_accessToken, accessToken, "f");
+        }
+        return __classPrivateFieldGet(this, _CloudClient_accessToken, "f");
+    }
+    /**
+     * 获取用户网盘存储容量信息
+     * @returns 账号容量结果
+     */
+    getUserSizeInfo() {
+        return this.request
+            .get(`${const_1.WEB_URL}/api/portal/getUserSizeInfo.action`, {
+            headers: { Accept: 'application/json;charset=UTF-8' }
+        })
+            .json();
+    }
+    /**
+     * 个人签到任务
+     * @returns 签到结果
+     */
+    userSign() {
+        return this.request
+            .get(`${const_1.WEB_URL}/mkt/userSign.action?rand=${new Date().getTime()}&clientType=TELEANDROID&version=${config.version}&model=${config.model}`)
+            .json();
+    }
+    /**
+     * 任务无效， 1.0.4版本废弃
+     * @deprecated 任务过期
+     */
+    taskSign() {
+        return this.request('https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN&activityId=ACT_SIGNIN').json();
+    }
+    /**
+     * 任务无效， 1.0.4版本废弃
+     * @deprecated 任务过期
+     */
+    taskPhoto() {
+        return this.request('https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_SIGNIN_PHOTOS&activityId=ACT_SIGNIN').json();
+    }
+    /**
+     * 任务无效， 1.0.3版本废弃
+     * @deprecated 任务过期
+     */
+    taskKJ() {
+        return this.request
+            .get('https://m.cloud.189.cn/v2/drawPrizeMarketDetails.action?taskId=TASK_2022_FLDFS_KJ&activityId=ACT_SIGNIN')
+            .json();
+    }
+    /**
+     * 获取家庭信息
+     * @returns 家庭列表信息
+     */
+    getFamilyList() {
+        return this.request.get(`${const_1.API_URL}/open/family/manage/getFamilyList.action`).json();
+    }
+    /**
+     * 家庭签到任务
+     * @param familyId - 家庭id
+     * @returns 签到结果
+     */
+    familyUserSign(familyId) {
+        return this.request
+            .get(`${const_1.API_URL}/open/family/manage/exeFamilyUserSign.action?familyId=${familyId}`)
+            .json();
+    }
+}
+exports.default = CloudClient;
+_CloudClient_accessToken = new WeakMap(), _CloudClient_sessionKey = new WeakMap(), _CloudClient_cacheQuery = new WeakMap(), _CloudClient_valid = new WeakMap(), _CloudClient_builLoginForm = new WeakMap(), _CloudClient_instances = new WeakSet(), _CloudClient_appConf = function _CloudClient_appConf() {
+    return this.request
+        .post(`${const_1.AUTH_URL}/api/logbox/oauth2/appConf.do`, {
+        headers: {
+            Referer: const_1.AUTH_URL,
+            lt: __classPrivateFieldGet(this, _CloudClient_cacheQuery, "f").lt,
+            REQID: __classPrivateFieldGet(this, _CloudClient_cacheQuery, "f").reqId
+        },
+        form: { version: '2.0', appKey: __classPrivateFieldGet(this, _CloudClient_cacheQuery, "f").appId }
+    })
+        .json();
+}, _CloudClient_getUserBriefInfo = function _CloudClient_getUserBriefInfo() {
+    return this.request.get(`${const_1.WEB_URL}/api/portal/v2/getUserBriefInfo.action`).json();
+}, _CloudClient_getAccessTokenBySsKey = function _CloudClient_getAccessTokenBySsKey(sessionKey) {
+    const appkey = '600100422';
+    const time = String(Date.now());
+    const signature = (0, util_1.getSignature)({
+        sessionKey,
+        Timestamp: time,
+        AppKey: appkey
+    });
+    return this.request
+        .get(`${const_1.WEB_URL}/api/open/oauth2/getAccessTokenBySsKey.action?sessionKey=${sessionKey}`, {
+        headers: {
+            'Sign-Type': '1',
+            Signature: signature,
+            Timestamp: time,
+            Appkey: appkey
+        }
+    })
+        .json();
+};

package/dist/const.d.ts

@@ -0,0 +1,11 @@
+export declare const WEB_URL = "https://cloud.189.cn";
+export declare const AUTH_URL = "https://open.e.189.cn";
+export declare const API_URL = "https://api.cloud.189.cn";
+export declare const ClientType = "10020";
+export declare const UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36";
+export declare const clientSuffix: () => {
+    clientType: string;
+    version: string;
+    channelId: string;
+    rand: number;
+};

package/dist/const.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clientSuffix = exports.UserAgent = exports.ClientType = exports.API_URL = exports.AUTH_URL = exports.WEB_URL = void 0;
+exports.WEB_URL = 'https://cloud.189.cn';
+exports.AUTH_URL = 'https://open.e.189.cn';
+exports.API_URL = 'https://api.cloud.189.cn';
+exports.ClientType = '10020';
+exports.UserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36';
+const Version = '6.2', PC = 'TELEPC', ChannelID = 'web_cloud.189.cn';
+const clientSuffix = () => ({
+    clientType: PC,
+    version: Version,
+    channelId: ChannelID,
+    rand: Date.now()
+});
+exports.clientSuffix = clientSuffix;

package/dist/index.d.ts

@@ -1,2 +1,3 @@
-import CloudClient from "./CloudClient";
-export { CloudClient };
+import CloudClient from './CloudClient';
+export { CloudClient };
+export * from './types';

package/dist/index.js

@@ -1,8 +1,23 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CloudClient = void 0;
-const CloudClient_1 = __importDefault(require("./CloudClient"));
-exports.CloudClient = CloudClient_1.default;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudClient = void 0;
+const CloudClient_1 = __importDefault(require("./CloudClient"));
+exports.CloudClient = CloudClient_1.default;
+__exportStar(require("./types"), exports);

package/dist/log.d.ts

@@ -0,0 +1,23 @@
+/// <reference types="node" />
+import WritableStream = NodeJS.WritableStream;
+export declare const debug: boolean;
+export interface Fields {
+    [index: string]: any;
+}
+export type LogLevel = 'info' | 'warn' | 'debug' | 'notice' | 'error';
+export declare const PADDING = 2;
+export declare class Logger {
+    protected readonly stream: WritableStream;
+    constructor(stream: WritableStream);
+    messageTransformer: (message: string, level: LogLevel) => string;
+    get isDebugEnabled(): boolean;
+    info(messageOrFields: Fields | null | string, message?: string): void;
+    error(messageOrFields: Fields | null | string, message?: string): void;
+    warn(messageOrFields: Fields | null | string, message?: string): void;
+    debug(messageOrFields: Fields | null | string, message?: string): void;
+    private doLog;
+    private _doLog;
+    static createMessage(message: string, fields: Fields | null, level: LogLevel, color: (it: string) => string, messagePadding?: number): string;
+    log(message: string): void;
+}
+export declare const log: Logger;

package/dist/log.js

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.log = exports.Logger = exports.PADDING = exports.debug = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+let printer = null;
+exports.debug = process.env.CLOUD189_VERBOSE === '1';
+exports.PADDING = 2;
+class Logger {
+    constructor(stream) {
+        this.stream = stream;
+        this.messageTransformer = (it) => it;
+    }
+    get isDebugEnabled() {
+        return exports.debug;
+    }
+    info(messageOrFields, message) {
+        this.doLog(message, messageOrFields, 'info');
+    }
+    error(messageOrFields, message) {
+        this.doLog(message, messageOrFields, 'error');
+    }
+    warn(messageOrFields, message) {
+        this.doLog(message, messageOrFields, 'warn');
+    }
+    debug(messageOrFields, message) {
+        if (this.isDebugEnabled) {
+            this.doLog(message, messageOrFields, 'debug');
+        }
+    }
+    doLog(message, messageOrFields, level) {
+        if (message === undefined) {
+            this._doLog(messageOrFields, null, level);
+        }
+        else {
+            this._doLog(message, messageOrFields, level);
+        }
+    }
+    _doLog(message, fields, level) {
+        // noinspection SuspiciousInstanceOfGuard
+        if (message instanceof Error) {
+            message = message.stack || message.toString();
+        }
+        else {
+            message = message.toString();
+        }
+        const levelIndicator = level === 'error' ? '⨯' : '•';
+        const color = LEVEL_TO_COLOR[level];
+        this.stream.write(`${' '.repeat(exports.PADDING)}${color(levelIndicator)} `);
+        this.stream.write(Logger.createMessage(this.messageTransformer(message, level), fields, level, color, exports.PADDING + 2 /* level indicator and space */));
+        this.stream.write('\n');
+    }
+    static createMessage(message, fields, level, color, messagePadding = 0) {
+        if (fields == null) {
+            return message;
+        }
+        const fieldPadding = ' '.repeat(Math.max(2, 16 - message.length));
+        let text = (level === 'error' ? color(message) : message) + fieldPadding;
+        const fieldNames = Object.keys(fields);
+        let counter = 0;
+        for (const name of fieldNames) {
+            let fieldValue = fields[name];
+            let valuePadding = null;
+            // Remove unnecessary line breaks
+            if (fieldValue != null && typeof fieldValue === 'string' && fieldValue.includes('\n')) {
+                valuePadding = ' '.repeat(messagePadding + message.length + fieldPadding.length + 2);
+                fieldValue = fieldValue.replace(/\n\s*\n/g, `\n${valuePadding}`);
+            }
+            else if (Array.isArray(fieldValue)) {
+                fieldValue = JSON.stringify(fieldValue);
+            }
+            text += `${color(name)}=${fieldValue}`;
+            if (++counter !== fieldNames.length) {
+                if (valuePadding == null) {
+                    text += ' ';
+                }
+                else {
+                    text += '\n' + valuePadding;
+                }
+            }
+        }
+        return text;
+    }
+    log(message) {
+        if (printer == null) {
+            this.stream.write(`${message}\n`);
+        }
+        else {
+            printer(message);
+        }
+    }
+}
+exports.Logger = Logger;
+const LEVEL_TO_COLOR = {
+    info: chalk_1.default.blue,
+    warn: chalk_1.default.yellow,
+    error: chalk_1.default.red,
+    debug: chalk_1.default.white
+};
+exports.log = new Logger(process.stdout);

package/dist/types.d.ts

@@ -0,0 +1,146 @@
+import { CookieJar } from 'tough-cookie';
+/**
+ * 账户家庭信息
+ * @public
+ */
+export interface FamilyListResponse {
+    familyInfoResp: [
+        {
+            /**
+             * 家庭id
+             */
+            familyId: number;
+            /**
+             * 家庭名称
+             */
+            remarkName: string;
+            /**
+             * 类型
+             */
+            type: number;
+            /**
+             * 用户角色 如果是1 表明当前账户是该账户的主家庭 否则当前账户是其他家庭的成员账户
+             */
+            userRole: number;
+        }
+    ];
+}
+/**
+ * sessionKey结果
+ * @public
+ */
+export interface UserBriefInfoResponse {
+    sessionKey: string;
+}
+/**
+ * accessToken 结果
+ * @public
+ */
+export interface AccessTokenResponse {
+    /**
+     * accessToken
+     */
+    accessToken: string;
+    /**
+     * accessToken 的有效期 单位秒
+     */
+    expiresIn: number;
+}
+/**
+ * 家庭签到任务结果
+ * @public
+ */
+export interface FamilyUserSignResponse {
+    /**
+     * 签到的奖励容量 单位MB
+     */
+    bonusSpace: number;
+    /**
+     * 签到的家庭id
+     */
+    signFamilyId: number;
+    /**
+     * 签到的状态
+     */
+    signStatus: number;
+    /**
+     * 签到的时间
+     */
+    signTime: string;
+    /**
+     * 签到的用户
+     */
+    userId: string;
+}
+/**
+ * 容量信息
+ * @public
+ */
+export interface CapacityInfo {
+    /**
+     * 总空间 单位KB
+     */
+    totalSize: number;
+    /**
+     * 已使用空间 单位KB
+     */
+    usedSize: number;
+    /**
+     * 剩余空间 单位KB
+     */
+    freeSize: number;
+}
+/**
+ * 账户容量信息
+ * @public
+ */
+export interface UserSizeInfoResponse {
+    /**
+     * 个人容量信息
+     */
+    cloudCapacityInfo: CapacityInfo;
+    /**
+     * 家庭容量信息
+     */
+    familyCapacityInfo: CapacityInfo;
+}
+/**
+ * 个人签到结果
+ * @public
+ */
+export interface UserSignResponse {
+    /**
+     * 是否已经签到过
+     */
+    isSign: boolean;
+    /**
+     * 签到获取的容量奖励 单位MB
+     */
+    netdiskBonus: number;
+}
+/**
+ * 个人任务执行结果
+ * @public
+ */
+export interface UserTaskResponse {
+    /**
+     * 错误码
+     */
+    errorCode: string;
+    /**
+     * 奖励容量 单位MB
+     */
+    prizeName: string;
+}
+/**
+ * 客户端初始化参数
+ * @public
+ */
+export interface ConfigurationOptions {
+    /** 登录名 */
+    username?: string;
+    /** 密码 */
+    password?: string;
+    /** 登录的cookie,如不传用户名和密码时需要传入 */
+    cookie?: CookieJar;
+}

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/util.d.ts

@@ -0,0 +1,2 @@
+declare const getSignature: (data: any) => string;
+export { getSignature };

package/dist/util.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSignature = void 0;
+const crypto_1 = __importDefault(require("crypto"));
+const sortParameter = (data) => {
+    if (!data) {
+        return '';
+    }
+    const e = Object.entries(data).map((t) => t.join('='));
+    e.sort((a, b) => (a > b ? 1 : a < b ? -1 : 0));
+    return e.join('&');
+};
+const getSignature = (data) => {
+    const parameter = sortParameter(data);
+    return crypto_1.default.createHash('md5').update(parameter).digest('hex');
+};
+exports.getSignature = getSignature;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud189-sdk",
-  "version": "1.0.5",
-  "description": "cloud189-sdk",
+  "version": "1.0.6-alpha.2",
+  "description": "基于node.js的第三方天翼云盘SDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -11,6 +11,7 @@
   ],
   "scripts": {
     "start": "node ./test/app.js",
+    "debug": "CLOUD189_VERBOSE=1 npm run start",
     "build": "tsc",
     "test": "mocha",
     "coverage": "nyc npm run test"
@@ -25,9 +26,11 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "chalk": "^4.1.2",
     "got": "11.8.2",
     "node-jsencrypt": "^1.0.0",
-    "tough-cookie": "^4.1.4"
+    "tough-cookie": "^4.1.4",
+    "tough-cookie-file-store": "^2.0.3"
   },
   "engines": {
     "node": ">=16"
@@ -36,10 +39,14 @@
     "@types/chai": "^4.3.16",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.12.13",
+    "@types/tough-cookie": "^4.0.5",
+    "@types/tough-cookie-file-store": "^2.0.4",
+    "@typescript-eslint/parser": "^6.17.0",
     "chai": "4.4.1",
     "mocha": "^10.4.0",
     "nock": "14.0.0-beta.7",
     "nyc": "^15.1.0",
+    "prettier": "^3.3.2",
     "ts-node": "^10.9.2",
     "typescript": "4.9.5"
   }