cloud189-sdk 1.0.6-alpha.5 → 1.0.7

package/README.md

@@ -14,6 +14,9 @@
   <a href="https://npmcharts.com/compare/cloud189-sdk?minimal=true">
     <img src="http://img.shields.io/npm/dm/cloud189-sdk.svg">
   </a>
+  <a href="https://coveralls.io/github/wes-lin/cloud189-sdk">
+    <img src="https://coveralls.io/repos/github/wes-lin/cloud189-sdk/badge.svg?branch=dev">
+  </a>
   <a href="LICENSE">
     <img src="https://img.shields.io/badge/License-MIT-yellow.svg">
   </a>

package/dist/CloudClient.d.ts

@@ -55,6 +55,10 @@ export declare class CloudClient {
     readonly session: ClientSession;
     constructor(_options: ConfigurationOptions);
     getSession(): Promise<TokenSession>;
+    /**
+     * 获取 sessionKey
+     * @returns sessionKey
+     */
     getSessionKey(): Promise<string>;
     /**
      * 获取 accessToken

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"));
@@ -56,7 +62,7 @@ class CloudAuthClient {
             hooks: {
                 afterResponse: [
                     async (response, retryWithMergedOptions) => {
-                        log_1.log.debug(`url: ${response.requestUrl}, response: ${response.body})}`);
+                        log_1.logger.debug(`url: ${response.requestUrl}, response: ${response.body})}`);
                         (0, error_1.checkError)(response.body.toString());
                         return response;
                     }
@@ -104,7 +110,7 @@ class CloudAuthClient {
      * 用户名密码登录
      * */
     async loginByPassword(username, password) {
-        log_1.log.debug('loginByPassword...');
+        log_1.logger.debug('loginByPassword...');
         try {
             const res = await Promise.all([
                 //1.获取公钥
@@ -128,7 +134,7 @@ class CloudAuthClient {
             return await this.getSessionForPC({ redirectURL: loginRes.toUrl });
         }
         catch (e) {
-            log_1.log.error(e);
+            log_1.logger.error(e);
             throw e;
         }
     }
@@ -136,14 +142,14 @@ class CloudAuthClient {
      * token登录
      */
     async loginByAccessToken(accessToken) {
-        log_1.log.debug('loginByAccessToken...');
+        log_1.logger.debug('loginByAccessToken...');
         return await this.getSessionForPC({ accessToken });
     }
     /**
      * sso登录
      */
     async loginBySsoCooike(cookie) {
-        log_1.log.debug('loginBySsoCooike...');
+        log_1.logger.debug('loginBySsoCooike...');
         const res = await this.request.get(`${const_1.WEB_URL}/api/portal/unifyLoginForPC.action`, {
             searchParams: {
                 appId: const_1.AppID,
@@ -184,9 +190,11 @@ _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');
+                log_1.logger.error('valid');
                 throw new Error('Please provide username and password or token !');
             }
         });
@@ -241,18 +249,18 @@ class CloudClient {
                 ],
                 afterResponse: [
                     async (response, retryWithMergedOptions) => {
-                        log_1.log.debug(`url: ${response.requestUrl}, response: ${response.body}`);
+                        log_1.logger.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');
+                                log_1.logger.debug('InvalidAccessToken retry...');
+                                log_1.logger.debug('Refresh AccessToken');
                                 this.session.accessToken = '';
                                 return retryWithMergedOptions({});
                             }
                             else if (errorCode === 'InvalidSessionKey') {
-                                log_1.log.debug('InvalidSessionKey retry...');
-                                log_1.log.debug('Refresh InvalidSessionKey');
+                                log_1.logger.debug('InvalidSessionKey retry...');
+                                log_1.logger.debug('Refresh InvalidSessionKey');
                                 this.session.sessionKey = '';
                                 return retryWithMergedOptions({});
                             }
@@ -270,7 +278,7 @@ class CloudClient {
                 return await this.authClient.loginByAccessToken(accessToken);
             }
             catch (e) {
-                log_1.log.error(e);
+                log_1.logger.error(e);
             }
         }
         if (refreshToken) {
@@ -278,12 +286,13 @@ class CloudClient {
                 const refreshTokenSession = await this.authClient.refreshToken(refreshToken);
                 await this.tokenStore.update({
                     accessToken: refreshTokenSession.accessToken,
+                    refreshToken: refreshTokenSession.refreshToken,
                     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.logger.error(e);
             }
         }
         if (this.ssonCookie) {
@@ -292,12 +301,12 @@ class CloudClient {
                 await this.tokenStore.update({
                     accessToken: loginToken.accessToken,
                     refreshToken: loginToken.refreshToken,
-                    expiresIn: new Date(Date.now() + 8640 * 1000).getTime()
+                    expiresIn: new Date(Date.now() + 6 * 24 * 60 * 60 * 1000).getTime()
                 });
                 return loginToken;
             }
             catch (e) {
-                log_1.log.error(e);
+                log_1.logger.error(e);
             }
         }
         if (this.username && this.password) {
@@ -306,31 +315,57 @@ class CloudClient {
                 await this.tokenStore.update({
                     accessToken: loginToken.accessToken,
                     refreshToken: loginToken.refreshToken,
-                    expiresIn: new Date(Date.now() + 8640 * 1000).getTime()
+                    expiresIn: new Date(Date.now() + 6 * 24 * 60 * 60 * 1000).getTime()
                 });
                 return loginToken;
             }
             catch (e) {
-                log_1.log.error(e);
+                log_1.logger.error(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;
+        }
+        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");
         }
-        return this.session.accessToken;
+        const result = await __classPrivateFieldGet(this, _CloudClient_accessTokenPromise, "f");
+        return result.accessToken;
     }
     /**
      * 获取用户网盘存储容量信息
@@ -367,6 +402,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/index.d.ts

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

package/dist/index.js

@@ -14,10 +14,7 @@ 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; } });
+__exportStar(require("./store"), exports);
+__exportStar(require("./log"), exports);

package/dist/log.d.ts

@@ -1,23 +1,7 @@
-/// <reference types="node" />
-import WritableStream = NodeJS.WritableStream;
-export declare const debug = true;
-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;
+import { Logger } from '@netdrive-sdk/log';
+/**
+ * 日志记录
+ * @public
+ */
+declare const logger: Logger;
+export { logger };

package/dist/log.js

@@ -1,102 +1,10 @@
 "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 = true;
-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);
+exports.logger = void 0;
+const log_1 = require("@netdrive-sdk/log");
+/**
+ * 日志记录
+ * @public
+ */
+const logger = new log_1.Logger();
+exports.logger = logger;

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

@@ -6,6 +6,7 @@ export declare class FileTokenStore extends MemoryStore {
     #private;
     filePath: string;
     constructor(filePath: string);
+    private ensureTokenDirectory;
     update(token: {
         accessToken: string;
         refreshToken?: string;

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

@@ -27,11 +27,15 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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 path_1 = __importDefault(require("path"));
 const memstore_1 = require("./memstore");
 /**
  * @public
@@ -44,11 +48,18 @@ class FileTokenStore extends memstore_1.MemoryStore {
         if (!filePath) {
             throw new Error('Unknown file for read/write token');
         }
+        this.ensureTokenDirectory(filePath);
         const dataJson = __classPrivateFieldGet(this, _FileTokenStore_instances, "m", _FileTokenStore_loadFromFile).call(this, filePath);
         if (dataJson) {
             super.update(dataJson);
         }
     }
+    ensureTokenDirectory(filePath) {
+        const dir = path_1.default.dirname(filePath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+    }
     update(token) {
         super.update(token);
         return __classPrivateFieldGet(this, _FileTokenStore_instances, "m", _FileTokenStore_saveToFile).call(this, this.filePath, this.store);

package/dist/types.d.ts

@@ -143,6 +143,7 @@ export interface ConfigurationOptions {
     username?: string;
     /** 密码 */
     password?: string;
+    /** token */
     token?: Store;
     ssonCookie?: string;
 }

package/dist/util.d.ts

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

package/dist/util.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud189-sdk",
-  "version": "1.0.6-alpha.5",
+  "version": "1.0.7",
   "description": "基于node.js的第三方天翼云盘SDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -10,25 +10,25 @@
     "!__tests__"
   ],
   "scripts": {
-    "start": "node ./test/app.js",
-    "debug": "CLOUD189_VERBOSE=1 npm run start",
+    "start": "node ./example/app.js",
     "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"
+    "test": "node --security-revert=CVE-2023-46809 ./node_modules/mocha/bin/mocha",
+    "coverage": "nyc npm run test",
+    "coveralls": "nyc report --reporter=text-lcov > coverage/lcov.info"
   },
   "author": "wes lin",
   "repository": {
     "type": "git",
-    "url": "https://github.com/wes-lin/cloud189-sdk.git"
+    "url": "git+https://github.com/wes-lin/cloud189-sdk.git"
   },
   "keywords": [
     "天翼网盘sdk"
   ],
   "license": "MIT",
   "dependencies": {
-    "chalk": "^4.1.2",
+    "@netdrive-sdk/log": "1.0.0",
     "got": "11.8.2"
   },
   "engines": {
@@ -38,12 +38,15 @@
     "@types/chai": "^4.3.16",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.12.13",
+    "@types/sinon": "^17.0.4",
     "@typescript-eslint/parser": "^6.17.0",
     "chai": "4.4.1",
+    "coveralls": "^3.1.1",
     "mocha": "^10.4.0",
     "nock": "14.0.0-beta.7",
     "nyc": "^15.1.0",
     "prettier": "^3.3.2",
+    "sinon": "^20.0.0",
     "ts-node": "^10.9.2",
     "typescript": "4.9.5"
   }