cloud189-sdk 1.0.3 → 1.0.5

package/README.md

@@ -1,11 +1,11 @@
 # cloud189-sdk
 
 ##  安装依赖
-``` bash
+``` console
 npm i cloud189-sdk
 ```
 或者
-``` bash
+``` console
 yarn add cloud189-sdk
 ```
 ## 测试代码
@@ -47,5 +47,4 @@ const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
   const info = await client.getUserSizeInfo();
   console.log(info);
 })();
-``
 ```

package/dist/CloudClient.d.ts

@@ -1,31 +1,40 @@
+import { CookieJar } from "tough-cookie";
 interface CacheQuery {
-    REQID: any;
-    lt: any;
+    appId: string;
+    reqId: string;
+    lt: string;
 }
 interface FamilyListResponse {
     familyInfoResp: [
         {
-            familyId: any;
+            familyId: number;
+            remarkName: string;
+            type: number;
+            userRole: number;
         }
     ];
 }
-interface APIResponse {
-    result: number;
-    msg: string;
-}
-interface UserBriefInfoResponse extends APIResponse {
+interface UserBriefInfoResponse {
     sessionKey: string;
 }
-interface AccessTokenResponse extends APIResponse {
+interface AccessTokenResponse {
     accessToken: string;
 }
-interface FamilyUserSignResponse extends APIResponse {
+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;
@@ -34,15 +43,25 @@ 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;
-    constructor(username: any, password: any);
+    cookieJar: CookieJar;
+    constructor(username: string, password: string);
     getEncrypt: () => Promise<any>;
     redirectURL: () => Promise<unknown>;
-    appConf: (query: any) => Promise<any>;
+    appConf: (query: CacheQuery) => Promise<any>;
     /**
      * 登录流程
      * 1.获取公钥
@@ -51,16 +70,25 @@ declare class CloudClient {
      * 4.跳转到登录页
      * */
     login: () => Promise<any>;
-    fetchAPI: (task: any) => Promise<any>;
-    getUserSizeInfo: () => 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: any) => Promise<AccessTokenResponse>;
-    fetchFamilyAPI: (path: any) => Promise<any>;
+    getAccessTokenBySsKey: (sessionKey: string) => Promise<AccessTokenResponse>;
+    fetchFamilyAPI: (path: string) => Promise<any>;
     getFamilyList: () => Promise<FamilyListResponse>;
-    familyUserSign: (familyId: string) => Promise<FamilyUserSignResponse>;
+    familyUserSign: (familyId: number) => Promise<FamilyUserSignResponse>;
 }
 export default CloudClient;

package/dist/CloudClient.js

@@ -20,7 +20,6 @@ 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 cookieJar = new tough_cookie_1.CookieJar();
 const config = {
     clientId: "538135150693412",
     model: "KB2000",
@@ -119,7 +118,7 @@ class CloudClient {
                     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,
+                        REQID: this.cacheQuery.reqId,
                         lt: this.cacheQuery.lt,
                     },
                     form: data,
@@ -133,7 +132,7 @@ class CloudClient {
                 }
                 else {
                     return got_1.default
-                        .get(res.toUrl, { headers, cookieJar })
+                        .get(res.toUrl, { headers, cookieJar: this.cookieJar })
                         .then((r) => resolve(r.statusCode));
                 }
             })
@@ -144,7 +143,7 @@ class CloudClient {
             return got_1.default
                 .get(task, {
                 headers: Object.assign(Object.assign({}, headers), { Host: q.host }),
-                cookieJar,
+                cookieJar: this.cookieJar,
             })
                 .json();
         };
@@ -154,25 +153,34 @@ class CloudClient {
                 headers: {
                     Accept: "application/json;charset=UTF-8",
                 },
-                cookieJar,
+                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,
+            cookieJar: this.cookieJar,
         })
             .json();
         this.getAccessTokenBySsKey = (sessionKey) => {
@@ -191,7 +199,7 @@ class CloudClient {
                     Timestamp: time,
                     Appkey: appkey,
                 },
-                cookieJar,
+                cookieJar: this.cookieJar,
             })
                 .json();
         };
@@ -213,7 +221,7 @@ class CloudClient {
                     Accesstoken: __classPrivateFieldGet(this, _CloudClient_accessToken, "f"),
                     Accept: "application/json;charset=UTF-8",
                 },
-                cookieJar,
+                cookieJar: this.cookieJar,
             })
                 .json();
         };
@@ -224,6 +232,7 @@ class CloudClient {
         };
         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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud189-sdk",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "cloud189-sdk",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",