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

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,5 +1,6 @@
 import { Got } from 'got';
-import { UserSignResponse, UserSizeInfoResponse, FamilyListResponse, FamilyUserSignResponse, ConfigurationOptions, ClientSession, RefreshTokenSession, TokenSession, AccessTokenStore } from './types';
+import { UserSignResponse, UserSizeInfoResponse, FamilyListResponse, FamilyUserSignResponse, ConfigurationOptions, ClientSession, RefreshTokenSession, TokenSession } from './types';
+import { Store } from './store';
 interface CacheQuery {
     captchaToken: string;
     reqId: string;
@@ -46,7 +47,7 @@ export declare class CloudClient {
     #private;
     username: string;
     password: string;
-    token: AccessTokenStore;
+    tokenStore: Store;
     readonly request: Got;
     readonly authClient: CloudAuthClient;
     readonly session: ClientSession;

package/dist/CloudClient.js

@@ -15,6 +15,7 @@ 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 config = {
     clientId: '538135150693412',
     model: 'KB2000',
@@ -170,7 +171,7 @@ class CloudClient {
         __classPrivateFieldGet(this, _CloudClient_valid, "f").call(this, _options);
         this.username = _options.username;
         this.password = _options.password;
-        this.token = _options.token;
+        this.tokenStore = _options.token || new store_1.MemoryStore();
         this.authClient = new CloudAuthClient();
         this.session = {
             accessToken: '',
@@ -240,33 +241,33 @@ 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 = await this.tokenStore.getAccessToken();
+        if (accessToken) {
+            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);
+            }
+        }
+        const refreshToken = await this.tokenStore.getRefreshToken();
+        if (refreshToken) {
+            try {
+                const refreshTokenSession = await this.authClient.refreshToken(refreshToken);
+                await this.tokenStore.updateAccessToken(refreshTokenSession.accessToken);
+                return await this.authClient.loginByAccessToken(refreshTokenSession.accessToken);
+            }
+            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
-                };
+                });
                 return loginToken;
             }
             catch (e) {

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/store/file-token-store.d.ts

@@ -0,0 +1,12 @@
+import { MemoryStore } from './memstore';
+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;
+    }): Promise<void>;
+}

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

@@ -0,0 +1,83 @@
+"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");
+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);
+        }
+    }
+    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);
+    }
+}
+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,16 @@
+import { Store } from './store';
+export declare class MemoryStore extends Store {
+    store: {
+        accessToken: string;
+        refreshToken: string;
+    };
+    constructor();
+    getAccessToken(): Promise<string>;
+    updateAccessToken(accessToken: string): Promise<void>;
+    updateRefreshToken(refreshToken: string): Promise<void>;
+    getRefreshToken(): Promise<string>;
+    update(token: {
+        accessToken: string;
+        refreshToken: string;
+    }): void;
+}

package/dist/store/memstore.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemoryStore = void 0;
+const store_1 = require("./store");
+class MemoryStore extends store_1.Store {
+    constructor() {
+        super();
+        this.store = {
+            accessToken: '',
+            refreshToken: ''
+        };
+    }
+    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);
+    }
+    update(token) {
+        this.store = {
+            accessToken: token.accessToken,
+            refreshToken: token.refreshToken
+        };
+    }
+}
+exports.MemoryStore = MemoryStore;

package/dist/store/store.d.ts

@@ -0,0 +1,11 @@
+export declare class Store {
+    constructor();
+    getAccessToken(): Promise<string | undefined>;
+    getRefreshToken(): Promise<string | undefined>;
+    updateRefreshToken(refreshToken: string): Promise<void>;
+    updateAccessToken(accessToken: string): Promise<void>;
+    update(token: {
+        accessToken: string;
+        refreshToken: string;
+    }): any;
+}

package/dist/store/store.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Store = void 0;
+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

@@ -1,3 +1,4 @@
+import { Store } from './store';
 /**
  * 账户家庭信息
  * @public
@@ -133,27 +134,27 @@ export interface ConfigurationOptions {
     username?: string;
     /** 密码 */
     password?: string;
-    token: AccessTokenStore;
+    token?: Store;
 }
 /**
  * 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 {
+export interface RefreshTokenSession {
     expiresIn: number;
+    accessToken: string;
+    refreshToken: string;
 }
 export interface ClientSession {
     accessToken: string;
     sessionKey: string;
 }
-export interface AccessTokenStore {
-    accessToken: string;
-    refreshToken: string;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud189-sdk",
-  "version": "1.0.6-alpha.3",
+  "version": "1.0.6-alpha.4",
   "description": "基于node.js的第三方天翼云盘SDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",