cloud189-sdk 1.0.6-alpha.4 → 1.0.6-alpha.6

package/dist/CloudClient.d.ts

@@ -1,12 +1,9 @@
 import { Got } from 'got';
-import { UserSignResponse, UserSizeInfoResponse, FamilyListResponse, FamilyUserSignResponse, ConfigurationOptions, ClientSession, RefreshTokenSession, TokenSession } from './types';
+import { UserSignResponse, UserSizeInfoResponse, FamilyListResponse, FamilyUserSignResponse, ConfigurationOptions, ClientSession, RefreshTokenSession, TokenSession, CacheQuery } from './types';
 import { Store } from './store';
-interface CacheQuery {
-    captchaToken: string;
-    reqId: string;
-    lt: string;
-    paramId: string;
-}
+/**
+ * @public
+ */
 export declare class CloudAuthClient {
     #private;
     readonly request: Got;
@@ -34,6 +31,10 @@ export declare class CloudAuthClient {
      * token登录
      */
     loginByAccessToken(accessToken: string): Promise<TokenSession>;
+    /**
+     * sso登录
+     */
+    loginBySsoCooike(cookie: string): Promise<TokenSession>;
     /**
      * 刷新token
      */
@@ -47,12 +48,17 @@ export declare class CloudClient {
     #private;
     username: string;
     password: string;
+    ssonCookie: string;
     tokenStore: Store;
     readonly request: Got;
     readonly authClient: CloudAuthClient;
     readonly session: ClientSession;
     constructor(_options: ConfigurationOptions);
     getSession(): Promise<TokenSession>;
+    /**
+     * 获取 sessionKey
+     * @returns sessionKey
+     */
     getSessionKey(): Promise<string>;
     /**
      * 获取 accessToken
@@ -81,4 +87,3 @@ export declare class CloudClient {
      */
     familyUserSign(familyId: number): Promise<FamilyUserSignResponse>;
 }
-export {};

package/dist/CloudClient.js

@@ -4,10 +4,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _CloudAuthClient_builLoginForm, _CloudClient_instances, _CloudClient_valid, _CloudClient_getAccessTokenBySsKey;
+var _CloudAuthClient_builLoginForm, _CloudClient_instances, _CloudClient_sessionKeyPromise, _CloudClient_accessTokenPromise, _CloudClient_valid, _CloudClient_getAccessTokenBySsKey;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudClient = exports.CloudAuthClient = void 0;
 const url_1 = __importDefault(require("url"));
@@ -16,11 +22,15 @@ 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) => {
@@ -53,6 +63,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;
                     }
                 ]
@@ -120,9 +131,6 @@ class CloudAuthClient {
                 form: data
             })
                 .json();
-            if (loginRes.result !== 0) {
-                throw new Error(loginRes.msg);
-            }
             return await this.getSessionForPC({ redirectURL: loginRes.toUrl });
         }
         catch (e) {
@@ -137,6 +145,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
      */
@@ -162,6 +190,8 @@ _CloudAuthClient_builLoginForm = new WeakMap();
 class CloudClient {
     constructor(_options) {
         _CloudClient_instances.add(this);
+        _CloudClient_sessionKeyPromise.set(this, void 0);
+        _CloudClient_accessTokenPromise.set(this, void 0);
         _CloudClient_valid.set(this, (options) => {
             if (!options.token && (!options.username || !options.password)) {
                 log_1.log.error('valid');
@@ -171,6 +201,7 @@ class CloudClient {
         __classPrivateFieldGet(this, _CloudClient_valid, "f").call(this, _options);
         this.username = _options.username;
         this.password = _options.password;
+        this.ssonCookie = _options.ssonCookie;
         this.tokenStore = _options.token || new store_1.MemoryStore();
         this.authClient = new CloudAuthClient();
         this.session = {
@@ -183,7 +214,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: [
@@ -197,7 +229,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);
@@ -241,24 +272,40 @@ class CloudClient {
         });
     }
     async getSession() {
-        const accessToken = await this.tokenStore.getAccessToken();
-        if (accessToken) {
+        const { accessToken, expiresIn, refreshToken } = await this.tokenStore.get();
+        if (accessToken && expiresIn && expiresIn > Date.now()) {
             try {
                 return await this.authClient.loginByAccessToken(accessToken);
             }
             catch (e) {
-                log_1.log.error(e);
+                log_1.log.debug(e);
             }
         }
-        const refreshToken = await this.tokenStore.getRefreshToken();
         if (refreshToken) {
             try {
                 const refreshTokenSession = await this.authClient.refreshToken(refreshToken);
-                await this.tokenStore.updateAccessToken(refreshTokenSession.accessToken);
+                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);
+                log_1.log.debug(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.debug(e);
             }
         }
         if (this.username && this.password) {
@@ -266,42 +313,65 @@ class CloudClient {
                 const loginToken = await this.authClient.loginByPassword(this.username, this.password);
                 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) {
-                log_1.log.error(e);
+                log_1.log.debug(e);
             }
         }
         throw new Error('Can not get session.');
     }
+    /**
+     * 获取 sessionKey
+     * @returns sessionKey
+     */
     async getSessionKey() {
-        if (!this.session.sessionKey) {
-            this.session.sessionKey = (await this.getSession()).sessionKey;
+        if (this.session.sessionKey) {
+            return this.session.sessionKey;
         }
-        return this.session.sessionKey;
+        if (!__classPrivateFieldGet(this, _CloudClient_sessionKeyPromise, "f")) {
+            __classPrivateFieldSet(this, _CloudClient_sessionKeyPromise, this.getSession()
+                .then((result) => {
+                this.session.sessionKey = result.sessionKey;
+                return result;
+            })
+                .finally(() => {
+                __classPrivateFieldSet(this, _CloudClient_sessionKeyPromise, null, "f");
+            }), "f");
+        }
+        const result = await __classPrivateFieldGet(this, _CloudClient_sessionKeyPromise, "f");
+        return result.sessionKey;
     }
     /**
      * 获取 accessToken
      * @returns accessToken
      */
     async getAccessToken() {
-        if (!this.session.accessToken) {
-            this.session.accessToken = (await __classPrivateFieldGet(this, _CloudClient_instances, "m", _CloudClient_getAccessTokenBySsKey).call(this)).accessToken;
+        if (this.session.accessToken) {
+            return this.session.accessToken;
         }
-        return this.session.accessToken;
+        if (!__classPrivateFieldGet(this, _CloudClient_accessTokenPromise, "f")) {
+            __classPrivateFieldSet(this, _CloudClient_accessTokenPromise, __classPrivateFieldGet(this, _CloudClient_instances, "m", _CloudClient_getAccessTokenBySsKey).call(this)
+                .then((result) => {
+                this.session.accessToken = result.accessToken;
+                return result;
+            })
+                .finally(() => {
+                __classPrivateFieldSet(this, _CloudClient_accessTokenPromise, null, "f");
+            }), "f");
+        }
+        const result = await __classPrivateFieldGet(this, _CloudClient_accessTokenPromise, "f");
+        return result.accessToken;
     }
     /**
      * 获取用户网盘存储容量信息
      * @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();
     }
     /**
      * 个人签到任务
@@ -331,6 +401,6 @@ class CloudClient {
     }
 }
 exports.CloudClient = CloudClient;
-_CloudClient_valid = new WeakMap(), _CloudClient_instances = new WeakSet(), _CloudClient_getAccessTokenBySsKey = function _CloudClient_getAccessTokenBySsKey() {
+_CloudClient_sessionKeyPromise = new WeakMap(), _CloudClient_accessTokenPromise = new WeakMap(), _CloudClient_valid = new WeakMap(), _CloudClient_instances = new WeakSet(), _CloudClient_getAccessTokenBySsKey = function _CloudClient_getAccessTokenBySsKey() {
     return this.request.get(`${const_1.WEB_URL}/api/open/oauth2/getAccessTokenBySsKey.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/log.d.ts

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

package/dist/log.js

@@ -3,10 +3,9 @@ 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;
+exports.log = exports.Logger = exports.PADDING = 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) {
@@ -14,7 +13,7 @@ class Logger {
         this.messageTransformer = (it) => it;
     }
     get isDebugEnabled() {
-        return exports.debug;
+        return process.env.CLOUD189_VERBOSE == '1';
     }
     info(messageOrFields, message) {
         this.doLog(message, messageOrFields, 'info');

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

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

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

@@ -33,6 +33,9 @@ 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();
@@ -46,14 +49,6 @@ class FileTokenStore extends memstore_1.MemoryStore {
             super.update(dataJson);
         }
     }
-    updateAccessToken(accessToken) {
-        super.updateAccessToken(accessToken);
-        return __classPrivateFieldGet(this, _FileTokenStore_instances, "m", _FileTokenStore_saveToFile).call(this, this.filePath, this.store);
-    }
-    updateRefreshToken(refreshToken) {
-        super.updateRefreshToken(refreshToken);
-        return __classPrivateFieldGet(this, _FileTokenStore_instances, "m", _FileTokenStore_saveToFile).call(this, this.filePath, this.store);
-    }
     update(token) {
         super.update(token);
         return __classPrivateFieldGet(this, _FileTokenStore_instances, "m", _FileTokenStore_saveToFile).call(this, this.filePath, this.store);

package/dist/store/memstore.d.ts

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

package/dist/store/memstore.js

@@ -2,32 +2,27 @@
 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: ''
+            refreshToken: '',
+            expiresIn: 0
         };
     }
-    getAccessToken() {
-        return Promise.resolve(this.store.accessToken);
-    }
-    updateAccessToken(accessToken) {
-        this.store.accessToken = accessToken;
-        return Promise.resolve();
-    }
-    updateRefreshToken(refreshToken) {
-        this.store.refreshToken = refreshToken;
-        return Promise.resolve();
-    }
-    getRefreshToken() {
-        return Promise.resolve(this.store.refreshToken);
+    get() {
+        return this.store;
     }
     update(token) {
+        var _a, _b;
         this.store = {
             accessToken: token.accessToken,
-            refreshToken: token.refreshToken
+            refreshToken: (_a = token.refreshToken) !== null && _a !== void 0 ? _a : this.store.refreshToken,
+            expiresIn: (_b = token.expiresIn) !== null && _b !== void 0 ? _b : this.store.expiresIn
         };
     }
 }

package/dist/store/store.d.ts

@@ -1,11 +1,20 @@
-export declare class Store {
+/**
+ * @public
+ */
+export declare abstract class Store {
     constructor();
-    getAccessToken(): Promise<string | undefined>;
-    getRefreshToken(): Promise<string | undefined>;
-    updateRefreshToken(refreshToken: string): Promise<void>;
-    updateAccessToken(accessToken: string): Promise<void>;
-    update(token: {
+    abstract get(): {
         accessToken: string;
         refreshToken: string;
-    }): any;
+        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

@@ -1,22 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Store = void 0;
+/**
+ * @public
+ */
 class Store {
     constructor() { }
-    getAccessToken() {
-        throw new Error('getAccessToken is not implemented');
-    }
-    getRefreshToken() {
-        throw new Error('getRefreshToken is not implemented');
-    }
-    updateRefreshToken(refreshToken) {
-        throw new Error('updateRefreshToken is not implemented');
-    }
-    updateAccessToken(accessToken) {
-        throw new Error('updateAccessToken is not implemented');
-    }
-    update(token) {
-        throw new Error('update is not implemented');
-    }
 }
 exports.Store = Store;

package/dist/types.d.ts

@@ -125,6 +125,15 @@ export interface UserTaskResponse {
      */
     prizeName: string;
 }
+/**
+ * @public
+ */
+export interface CacheQuery {
+    captchaToken: string;
+    reqId: string;
+    lt: string;
+    paramId: string;
+}
 /**
  * 客户端初始化参数
  * @public
@@ -134,9 +143,12 @@ export interface ConfigurationOptions {
     username?: string;
     /** 密码 */
     password?: string;
+    /** token */
     token?: Store;
+    ssonCookie?: string;
 }
 /**
+ * @public
  * accessToken 有效期7天，可以通过refreshToken取新的accessToken
  */
 export interface TokenSession {
@@ -149,11 +161,17 @@ export interface TokenSession {
     loginName: string;
     sessionKey: string;
 }
+/**
+ * @public
+ */
 export interface RefreshTokenSession {
     expiresIn: number;
     accessToken: string;
     refreshToken: string;
 }
+/**
+ * @public
+ */
 export interface ClientSession {
     accessToken: string;
     sessionKey: 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.4",
+  "version": "1.0.6-alpha.6",
   "description": "基于node.js的第三方天翼云盘SDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -11,8 +11,9 @@
   ],
   "scripts": {
     "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"
   },