@tuya-sat/micro-dev-proxy 3.0.29 → 3.1.0

package/dist/appProxy.d.ts

@@ -1,5 +1,6 @@
 import Token from './token';
 import { Options } from 'http-proxy-middleware';
+import Spinnies from 'spinnies';
 export interface AppProxyConfig {
     target: string;
     username: string;
@@ -31,6 +32,7 @@ export default class AppProxy {
     csrfCookie: Token;
     csrfValue: Token;
     isThirdLogin?: boolean;
+    spinnies: Spinnies;
     constructor({ target, username, password, additionHeaders, isMainApp, isThirdLogin, loginApi, csrf, logSign, }: AppProxyConfig);
     init(): Promise<void>;
     getCsrf(): Promise<void>;

package/dist/appProxy.js

@@ -39,13 +39,14 @@ exports.GSdf = void 0;
 const globalAxios_1 = __importDefault(require("./globalAxios"));
 const js_sha256_1 = require("js-sha256");
 const csrf_1 = __importStar(require("./csrf"));
-const initLogin_1 = __importDefault(require("./initLogin"));
+const initLogin_1 = __importStar(require("./initLogin"));
 const token_1 = __importDefault(require("./token"));
 const util_1 = require("./util");
 const url_1 = require("url");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const undici_1 = require("undici");
+const spinnies_1 = __importDefault(require("spinnies"));
 const mfPath = path.join(process.cwd(), 'manifest.json');
 const mf = fs.existsSync(mfPath) && JSON.parse(fs.readFileSync(mfPath, 'utf8'));
 let SDF;
@@ -58,6 +59,10 @@ function GSdf() {
     return SDF;
 }
 exports.GSdf = GSdf;
+const SPIN_LABEL_NAME = {
+    csrf: '获取 csrf  ',
+    login: '登录 SaaS  '
+};
 class AppProxy {
     constructor({ target, username, password, additionHeaders, isMainApp, isThirdLogin, loginApi, csrf = true, logSign, }) {
         this.loginCookie = new token_1.default();
@@ -74,14 +79,26 @@ class AppProxy {
         this.log = (0, util_1.logFactory)(logSign);
         this.csrf = csrf;
         this.isThirdLogin = isThirdLogin;
+        this.spinnies = new spinnies_1.default();
         Object.assign(globalAxios_1.default.defaults.headers.common, this.additionHeaders);
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.spinnies.add('\n');
+            this.spinnies.add('csrf', { text: SPIN_LABEL_NAME.csrf });
+            this.spinnies.add('login', { text: SPIN_LABEL_NAME.login });
             this.csrf && (yield this.getCsrf());
-            if (this.isMainApp)
-                return;
-            yield this.getLoginCookie();
+            if (!this.isMainApp) {
+                try {
+                    yield this.getLoginCookie();
+                }
+                catch (e) {
+                    throw e;
+                }
+                finally {
+                    this.spinnies.stopAll();
+                }
+            }
         });
     }
     //获取csrf
@@ -91,9 +108,12 @@ class AppProxy {
                 .then(([cookie, value]) => {
                 this.csrfCookie.setValue(cookie);
                 this.csrfValue.setValue(value);
+                this.spinnies.succeed('csrf');
             })
                 .catch((err) => {
-                this.log('----get csrf error----' + err);
+                this.spinnies.fail('csrf', {
+                    text: `${SPIN_LABEL_NAME.csrf}\n\r ${err.message}`
+                });
                 return Promise.reject(err);
             });
         });
@@ -101,6 +121,9 @@ class AppProxy {
     //模拟登录
     getLoginCookie() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.spinnies.pick('login')) {
+                this.spinnies.add('login', { text: SPIN_LABEL_NAME.login });
+            }
             const { href: loginUrl } = new url_1.URL(this.loginApi, this.target);
             yield (0, initLogin_1.default)(loginUrl, { username: this.username, password: this.password }, {
                 headers: this.combinedHeader({ cookie: this.csrfCookie.value }),
@@ -114,10 +137,15 @@ class AppProxy {
                         SDF = JSON.parse(parse_SDF(data));
                     });
                 });
+                this.spinnies.succeed('login');
             })
                 .catch((err) => {
-                this.log('----inital login error----' + err);
-                return Promise.reject(err);
+                var _a, _b;
+                const errMsg = ((_a = err.response) === null || _a === void 0 ? void 0 : _a.data) ? JSON.stringify((_b = err.response) === null || _b === void 0 ? void 0 : _b.data) : err.message;
+                this.spinnies.fail('login', {
+                    text: `${SPIN_LABEL_NAME.login}\n\r ${errMsg}`
+                });
+                return Promise.reject(errMsg);
             });
         });
     }
@@ -131,7 +159,7 @@ class AppProxy {
                 if (csrf_1.COOKIE_CSRF === key) {
                     return false;
                 }
-                if (('connect.sid' === key || 'sid' === key) && !this.isMainApp) {
+                if (initLogin_1.LOGIN_COOKIE_KEYS.includes(key) && !this.isMainApp) {
                     return false;
                 }
                 return true;
@@ -156,14 +184,14 @@ class AppProxy {
         return proccessedHeader;
     }
     processRes(responseBuffer, proxyRes, req, res) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let response;
             try {
                 response = JSON.parse(responseBuffer.toString('utf8'));
             }
             catch (err) {
-                this.log('----json parse responseBuffer string error-----', err);
+                this.log('----json parse responseBuffer string error-----', ((_a = err.response) === null || _a === void 0 ? void 0 : _a.data) || err.message);
                 return responseBuffer;
             }
             if (!this.isMainApp) {
@@ -171,7 +199,7 @@ class AppProxy {
                 const apis = mf.apis || [];
                 if (!(req === null || req === void 0 ? void 0 : req.headers['micro-app-id'].includes('main-app'))) {
                     const method = (req === null || req === void 0 ? void 0 : req.method) || 'GET';
-                    const urlPath = ((_a = req === null || req === void 0 ? void 0 : req.path) === null || _a === void 0 ? void 0 : _a.replace(/^\s*\/(custom-api|open-api)/, '')) || '';
+                    const urlPath = ((_b = req === null || req === void 0 ? void 0 : req.path) === null || _b === void 0 ? void 0 : _b.replace(/^\s*\/(custom-api|open-api)/, '')) || '';
                     let isExists = false;
                     apis.forEach((api) => {
                         const isLegal = new RegExp(`^${api.path.replace(apiPathMatchReg, '/[^/]+')}/?$`).test(urlPath);

package/dist/initLogin.d.ts

@@ -1,2 +1,2 @@
-export declare const LOGIN_COOKIE_KEY = "connect.sid";
+export declare const LOGIN_COOKIE_KEYS: string[];
 export default function getLoginCookie(url: any, loginData: any, options: any): Promise<string>;

package/dist/initLogin.js

@@ -3,10 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOGIN_COOKIE_KEY = void 0;
+exports.LOGIN_COOKIE_KEYS = void 0;
 const globalAxios_1 = __importDefault(require("./globalAxios"));
 const util_1 = require("./util");
-exports.LOGIN_COOKIE_KEY = "connect.sid";
+exports.LOGIN_COOKIE_KEYS = [
+    'sid',
+    'connect.sid'
+];
 function getLoginCookie(url, loginData, options) {
     return globalAxios_1.default
         .post(url, loginData, options)
@@ -14,7 +17,7 @@ function getLoginCookie(url, loginData, options) {
         if (!res.data.success) {
             return Promise.reject(res);
         }
-        return (0, util_1.parseSetCookie)(res.headers["set-cookie"], exports.LOGIN_COOKIE_KEY);
+        return (0, util_1.parseSetCookie)(res.headers["set-cookie"]);
     });
 }
 exports.default = getLoginCookie;

package/dist/util.d.ts

@@ -4,4 +4,4 @@ export declare function getLoginData(username: string, password: string): {
     password: string;
 };
 export declare function logFactory(isLog: boolean): (message?: any, ...optionalParams: any[]) => void;
-export declare function parseSetCookie(setCookie: string[], key: string): string;
+export declare function parseSetCookie(setCookie: string[]): string;

package/dist/util.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSetCookie = exports.logFactory = exports.getLoginData = exports.exit = void 0;
 const js_sha256_1 = require("js-sha256");
+const initLogin_1 = require("./initLogin");
 function exit(info) {
     console.log(info);
     process.exit(1);
@@ -18,10 +19,10 @@ function logFactory(isLog) {
     return isLog ? console.log : (...info) => { };
 }
 exports.logFactory = logFactory;
-function parseSetCookie(setCookie, key) {
+function parseSetCookie(setCookie) {
     const targetCookie = setCookie
         .map((cookieInfo) => cookieInfo.split(';')[0])
-        .find((cookie) => cookie.split('=')[0] === 'connect.sid' || cookie.split('=')[0] === 'sid');
+        .find((cookie) => initLogin_1.LOGIN_COOKIE_KEYS.includes(cookie.split('=')[0]));
     return targetCookie || '';
 }
 exports.parseSetCookie = parseSetCookie;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-dev-proxy",
-  "version": "3.0.29",
+  "version": "3.1.0",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {
@@ -15,6 +15,7 @@
     "fs-extra": "10.0.1",
     "http-proxy-middleware": "2.0.4",
     "js-sha256": "0.9.0",
+    "spinnies": "^0.5.1",
     "undici": "^5.20.0"
   },
   "devDependencies": {