cloud189-sdk 1.0.6-alpha.3 → 1.0.6-alpha.5

package/README.md

@@ -1,5 +1,7 @@
 # cloud189-sdk
 
+[![NPM](https://nodei.co/npm/cloud189-sdk.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/cloud189-sdk/)
+
 > 基于node.js的天翼网盘sdk
 
 <div align="center">

package/dist/CloudClient.d.ts

@@ -1,11 +1,9 @@
 import { Got } from 'got';
-import { UserSignResponse, UserSizeInfoResponse, FamilyListResponse, FamilyUserSignResponse, ConfigurationOptions, ClientSession, RefreshTokenSession, TokenSession, AccessTokenStore } from './types';
-interface CacheQuery {
-    captchaToken: string;
-    reqId: string;
-    lt: string;
-    paramId: string;
-}
+import { UserSignResponse, UserSizeInfoResponse, FamilyListResponse, FamilyUserSignResponse, ConfigurationOptions, ClientSession, RefreshTokenSession, TokenSession, CacheQuery } from './types';
+import { Store } from './store';
+/**
+ * @public
+ */
 export declare class CloudAuthClient {
     #private;
     readonly request: Got;
@@ -33,6 +31,10 @@ export declare class CloudAuthClient {
      * token登录
      */
     loginByAccessToken(accessToken: string): Promise<TokenSession>;
+    /**
+     * sso登录
+     */
+    loginBySsoCooike(cookie: string): Promise<TokenSession>;
     /**
      * 刷新token
      */
@@ -46,7 +48,8 @@ export declare class CloudClient {
     #private;
     username: string;
     password: string;
-    token: AccessTokenStore;
+    ssonCookie: string;
+    tokenStore: Store;
     readonly request: Got;
     readonly authClient: CloudAuthClient;
     readonly session: ClientSession;
@@ -80,4 +83,3 @@ export declare class CloudClient {
      */
     familyUserSign(familyId: number): Promise<FamilyUserSignResponse>;
 }
-export {};

package/dist/CloudClient.js

@@ -15,11 +15,16 @@ const got_1 = __importDefault(require("got"));
 const log_1 = require("./log");
 const util_1 = require("./util");
 const const_1 = require("./const");
+const store_1 = require("./store");
+const error_1 = require("./error");
 const config = {
     clientId: '538135150693412',
     model: 'KB2000',
     version: '9.0.6'
 };
+/**
+ * @public
+ */
 class CloudAuthClient {
     constructor() {
         _CloudAuthClient_builLoginForm.set(this, (encrypt, appConf, username, password) => {
@@ -52,6 +57,7 @@ class CloudAuthClient {
                 afterResponse: [
                     async (response, retryWithMergedOptions) => {
                         log_1.log.debug(`url: ${response.requestUrl}, response: ${response.body})}`);
+                        (0, error_1.checkError)(response.body.toString());
                         return response;
                     }
                 ]
@@ -119,9 +125,6 @@ class CloudAuthClient {
                 form: data
             })
                 .json();
-            if (loginRes.result !== 0) {
-                throw new Error(loginRes.msg);
-            }
             return await this.getSessionForPC({ redirectURL: loginRes.toUrl });
         }
         catch (e) {
@@ -136,6 +139,26 @@ class CloudAuthClient {
         log_1.log.debug('loginByAccessToken...');
         return await this.getSessionForPC({ accessToken });
     }
+    /**
+     * sso登录
+     */
+    async loginBySsoCooike(cookie) {
+        log_1.log.debug('loginBySsoCooike...');
+        const res = await this.request.get(`${const_1.WEB_URL}/api/portal/unifyLoginForPC.action`, {
+            searchParams: {
+                appId: const_1.AppID,
+                clientType: const_1.ClientType,
+                returnURL: const_1.ReturnURL,
+                timeStamp: Date.now()
+            }
+        });
+        const redirect = await this.request(res.url, {
+            headers: {
+                Cookie: `SSON=${cookie}`
+            }
+        });
+        return await this.getSessionForPC({ redirectURL: redirect.url });
+    }
     /**
      * 刷新token
      */
@@ -170,7 +193,8 @@ class CloudClient {
         __classPrivateFieldGet(this, _CloudClient_valid, "f").call(this, _options);
         this.username = _options.username;
         this.password = _options.password;
-        this.token = _options.token;
+        this.ssonCookie = _options.ssonCookie;
+        this.tokenStore = _options.token || new store_1.MemoryStore();
         this.authClient = new CloudAuthClient();
         this.session = {
             accessToken: '',
@@ -182,7 +206,8 @@ class CloudClient {
             },
             headers: {
                 'User-Agent': const_1.UserAgent,
-                Referer: `${const_1.WEB_URL}/web/main/`
+                Referer: `${const_1.WEB_URL}/web/main/`,
+                Accept: 'application/json;charset=UTF-8'
             },
             hooks: {
                 beforeRequest: [
@@ -196,7 +221,6 @@ class CloudClient {
                             options.headers['Signature'] = signature;
                             options.headers['Timestamp'] = time;
                             options.headers['Accesstoken'] = accessToken;
-                            options.headers['Accept'] = 'application/json;charset=UTF-8';
                         }
                         else if (options.url.href.includes(const_1.WEB_URL)) {
                             const urlObj = new URL(options.url);
@@ -240,33 +264,50 @@ class CloudClient {
         });
     }
     async getSession() {
-        if (this.token) {
-            if (this.token.accessToken) {
-                try {
-                    return await this.authClient.loginByAccessToken(this.token.accessToken);
-                }
-                catch (e) {
-                    log_1.log.error(e);
-                }
+        const { accessToken, expiresIn, refreshToken } = await this.tokenStore.get();
+        if (accessToken && expiresIn && expiresIn > Date.now()) {
+            try {
+                return await this.authClient.loginByAccessToken(accessToken);
             }
-            if (this.token.refreshToken) {
-                try {
-                    const refreshTokenSession = await this.authClient.refreshToken(this.token.refreshToken);
-                    this.token.accessToken = refreshTokenSession.accessToken;
-                    return await this.authClient.loginByAccessToken(this.token.accessToken);
-                }
-                catch (e) {
-                    log_1.log.error(e);
-                }
+            catch (e) {
+                log_1.log.error(e);
+            }
+        }
+        if (refreshToken) {
+            try {
+                const refreshTokenSession = await this.authClient.refreshToken(refreshToken);
+                await this.tokenStore.update({
+                    accessToken: refreshTokenSession.accessToken,
+                    expiresIn: new Date(Date.now() + refreshTokenSession.expiresIn * 1000).getTime()
+                });
+                return await this.authClient.loginByAccessToken(refreshTokenSession.accessToken);
+            }
+            catch (e) {
+                log_1.log.error(e);
+            }
+        }
+        if (this.ssonCookie) {
+            try {
+                const loginToken = await this.authClient.loginBySsoCooike(this.ssonCookie);
+                await this.tokenStore.update({
+                    accessToken: loginToken.accessToken,
+                    refreshToken: loginToken.refreshToken,
+                    expiresIn: new Date(Date.now() + 8640 * 1000).getTime()
+                });
+                return loginToken;
+            }
+            catch (e) {
+                log_1.log.error(e);
             }
         }
         if (this.username && this.password) {
             try {
                 const loginToken = await this.authClient.loginByPassword(this.username, this.password);
-                this.token = {
+                await this.tokenStore.update({
                     accessToken: loginToken.accessToken,
-                    refreshToken: loginToken.refreshToken
-                };
+                    refreshToken: loginToken.refreshToken,
+                    expiresIn: new Date(Date.now() + 8640 * 1000).getTime()
+                });
                 return loginToken;
             }
             catch (e) {
@@ -296,11 +337,7 @@ class CloudClient {
      * @returns 账号容量结果
      */
     getUserSizeInfo() {
-        return this.request
-            .get(`${const_1.WEB_URL}/api/portal/getUserSizeInfo.action`, {
-            headers: { Accept: 'application/json;charset=UTF-8' }
-        })
-            .json();
+        return this.request.get(`${const_1.WEB_URL}/api/portal/getUserSizeInfo.action`).json();
     }
     /**
      * 个人签到任务

package/dist/error.d.ts

@@ -0,0 +1,5 @@
+export declare class InvalidRefreshTokenError extends Error {
+}
+export declare class AuthApiError extends Error {
+}
+export declare const checkError: (response: any) => void;

package/dist/error.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkError = exports.AuthApiError = exports.InvalidRefreshTokenError = void 0;
+class InvalidRefreshTokenError extends Error {
+}
+exports.InvalidRefreshTokenError = InvalidRefreshTokenError;
+class AuthApiError extends Error {
+}
+exports.AuthApiError = AuthApiError;
+const checkError = (response) => {
+    let res;
+    try {
+        res = JSON.parse(response);
+    }
+    catch (e) {
+        return;
+    }
+    // auth
+    if ('result' in res && 'msg' in res) {
+        switch (res.result) {
+            case 0:
+                return;
+            case -117:
+                throw new InvalidRefreshTokenError(res.msg);
+            default:
+                throw new AuthApiError(res.msg);
+        }
+    }
+};
+exports.checkError = checkError;

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './CloudClient';
 export * from './types';
+export { Store, MemoryStore, FileTokenStore } from './store';

package/dist/index.js

@@ -14,5 +14,10 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileTokenStore = exports.MemoryStore = exports.Store = void 0;
 __exportStar(require("./CloudClient"), exports);
 __exportStar(require("./types"), exports);
+var store_1 = require("./store");
+Object.defineProperty(exports, "Store", { enumerable: true, get: function () { return store_1.Store; } });
+Object.defineProperty(exports, "MemoryStore", { enumerable: true, get: function () { return store_1.MemoryStore; } });
+Object.defineProperty(exports, "FileTokenStore", { enumerable: true, get: function () { return store_1.FileTokenStore; } });

package/dist/log.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import WritableStream = NodeJS.WritableStream;
-export declare const debug: boolean;
+export declare const debug = true;
 export interface Fields {
     [index: string]: any;
 }

package/dist/log.js

@@ -6,7 +6,7 @@ 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.debug = true;
 exports.PADDING = 2;
 class Logger {
     constructor(stream) {

package/dist/store/file-token-store.d.ts

@@ -0,0 +1,14 @@
+import { MemoryStore } from './memstore';
+/**
+ * @public
+ */
+export declare class FileTokenStore extends MemoryStore {
+    #private;
+    filePath: string;
+    constructor(filePath: string);
+    update(token: {
+        accessToken: string;
+        refreshToken?: string;
+        expiresIn?: number;
+    }): Promise<void>;
+}

package/dist/store/file-token-store.js

@@ -0,0 +1,78 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 _FileTokenStore_instances, _FileTokenStore_loadFromFile, _FileTokenStore_saveToFile;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileTokenStore = void 0;
+const fs = __importStar(require("node:fs"));
+const promisesFs = __importStar(require("node:fs/promises"));
+const memstore_1 = require("./memstore");
+/**
+ * @public
+ */
+class FileTokenStore extends memstore_1.MemoryStore {
+    constructor(filePath) {
+        super();
+        _FileTokenStore_instances.add(this);
+        this.filePath = filePath;
+        if (!filePath) {
+            throw new Error('Unknown file for read/write token');
+        }
+        const dataJson = __classPrivateFieldGet(this, _FileTokenStore_instances, "m", _FileTokenStore_loadFromFile).call(this, filePath);
+        if (dataJson) {
+            super.update(dataJson);
+        }
+    }
+    update(token) {
+        super.update(token);
+        return __classPrivateFieldGet(this, _FileTokenStore_instances, "m", _FileTokenStore_saveToFile).call(this, this.filePath, this.store);
+    }
+}
+exports.FileTokenStore = FileTokenStore;
+_FileTokenStore_instances = new WeakSet(), _FileTokenStore_loadFromFile = function _FileTokenStore_loadFromFile(filePath) {
+    let data = null;
+    if (fs.existsSync(filePath)) {
+        data = fs.readFileSync(filePath, {
+            encoding: 'utf-8'
+        });
+    }
+    if (data) {
+        try {
+            return JSON.parse(data);
+        }
+        catch (e) {
+            throw new Error(`Could not parse token file ${filePath}. Please ensure it is not corrupted.`);
+        }
+    }
+    return null;
+}, _FileTokenStore_saveToFile = function _FileTokenStore_saveToFile(filePath, data) {
+    return promisesFs.writeFile(filePath, JSON.stringify(data), {
+        encoding: 'utf-8'
+    });
+};

package/dist/store/index.d.ts

@@ -0,0 +1,3 @@
+export * from './store';
+export * from './memstore';
+export * from './file-token-store';

package/dist/store/index.js

@@ -0,0 +1,19 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./store"), exports);
+__exportStar(require("./memstore"), exports);
+__exportStar(require("./file-token-store"), exports);

package/dist/store/memstore.d.ts

@@ -0,0 +1,22 @@
+import { Store } from './store';
+/**
+ * @public
+ */
+export declare class MemoryStore extends Store {
+    store: {
+        accessToken: string;
+        refreshToken: string;
+        expiresIn: number;
+    };
+    constructor();
+    get(): {
+        accessToken: string;
+        refreshToken: string;
+        expiresIn: number;
+    };
+    update(token: {
+        accessToken: string;
+        refreshToken?: string;
+        expiresIn?: number;
+    }): void;
+}

package/dist/store/memstore.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemoryStore = void 0;
+const store_1 = require("./store");
+/**
+ * @public
+ */
+class MemoryStore extends store_1.Store {
+    constructor() {
+        super();
+        this.store = {
+            accessToken: '',
+            refreshToken: '',
+            expiresIn: 0
+        };
+    }
+    get() {
+        return this.store;
+    }
+    update(token) {
+        var _a, _b;
+        this.store = {
+            accessToken: token.accessToken,
+            refreshToken: (_a = token.refreshToken) !== null && _a !== void 0 ? _a : this.store.refreshToken,
+            expiresIn: (_b = token.expiresIn) !== null && _b !== void 0 ? _b : this.store.expiresIn
+        };
+    }
+}
+exports.MemoryStore = MemoryStore;

package/dist/store/store.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @public
+ */
+export declare abstract class Store {
+    constructor();
+    abstract get(): {
+        accessToken: string;
+        refreshToken: string;
+        expiresIn: number;
+    } | Promise<{
+        accessToken: string;
+        refreshToken: string;
+        expiresIn: number;
+    }>;
+    abstract update(token: {
+        accessToken: string;
+        refreshToken?: string;
+        expiresIn?: number;
+    }): void | Promise<void>;
+}

package/dist/store/store.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Store = void 0;
+/**
+ * @public
+ */
+class Store {
+    constructor() { }
+}
+exports.Store = Store;

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import { Store } from './store';
 /**
  * 账户家庭信息
  * @public
@@ -124,6 +125,15 @@ export interface UserTaskResponse {
      */
     prizeName: string;
 }
+/**
+ * @public
+ */
+export interface CacheQuery {
+    captchaToken: string;
+    reqId: string;
+    lt: string;
+    paramId: string;
+}
 /**
  * 客户端初始化参数
  * @public
@@ -133,27 +143,35 @@ export interface ConfigurationOptions {
     username?: string;
     /** 密码 */
     password?: string;
-    token: AccessTokenStore;
+    token?: Store;
+    ssonCookie?: string;
 }
 /**
+ * @public
  * accessToken 有效期7天，可以通过refreshToken取新的accessToken
  */
-export interface TokenSession extends AccessTokenStore {
+export interface TokenSession {
     res_code: number;
     res_message: string;
+    accessToken: string;
     familySessionKey: string;
     familySessionSecret: string;
+    refreshToken: string;
     loginName: string;
     sessionKey: string;
 }
-export interface RefreshTokenSession extends AccessTokenStore {
+/**
+ * @public
+ */
+export interface RefreshTokenSession {
     expiresIn: number;
+    accessToken: string;
+    refreshToken: string;
 }
+/**
+ * @public
+ */
 export interface ClientSession {
     accessToken: string;
     sessionKey: string;
 }
-export interface AccessTokenStore {
-    accessToken: string;
-    refreshToken: string;
-}

package/dist/util.d.ts

@@ -1,2 +1,2 @@
 export declare const getSignature: (data: any) => string;
-export declare const rsaEncrypt: (publicKey: string, origData: string | Uint8Array) => string;
+export declare const rsaEncrypt: (publicKey: string, origData: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud189-sdk",
-  "version": "1.0.6-alpha.3",
+  "version": "1.0.6-alpha.5",
   "description": "基于node.js的第三方天翼云盘SDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,6 +13,8 @@
     "start": "node ./test/app.js",
     "debug": "CLOUD189_VERBOSE=1 npm run start",
     "build": "tsc",
+    "docs:build": "npm run build && cd docs && npm run build",
+    "docs:dev": "npm run build && cd docs && npm run dev",
     "test": "mocha",
     "coverage": "nyc npm run test"
   },