@tuya-sat/micro-dev-proxy 3.2.22 → 3.2.24

package/dist/appProxy.d.ts

@@ -35,6 +35,9 @@ export default class AppProxy {
     spinnies: Spinnies;
     constructor({ target, username, password, additionHeaders, isMainApp, isThirdLogin, loginApi, csrf, logSign, }: AppProxyConfig);
     init(): Promise<void>;
+    needManualLogin(): boolean;
+    isLoginApi(url: string): boolean;
+    isApiBelongMainApp(url: string): boolean;
     getCsrf(): Promise<void>;
     getLoginCookie(): Promise<void>;
     getCookie(prevCookie?: string): string;

package/dist/appProxy.js

@@ -70,7 +70,9 @@ class AppProxy {
         this.target = target;
         if (!isMainApp) {
             this.username = username;
-            this.password = (0, js_sha256_1.sha256)(password);
+            if (password) {
+                this.password = (0, js_sha256_1.sha256)(password);
+            }
         }
         this.isMainApp = isMainApp;
         this.loginApi = loginApi;
@@ -99,6 +101,26 @@ class AppProxy {
             }
         });
     }
+    needManualLogin() {
+        return !this.username || !this.password;
+    }
+    isLoginApi(url) {
+        return [
+            this.loginApi,
+            '/api/login',
+            '/api/login/qrcode'
+        ].includes(url.replace(/\/+$/, ''));
+    }
+    isApiBelongMainApp(url) {
+        return [
+            this.loginApi,
+            '/api/login',
+            '/api/login/qrcode',
+            '/open-api/v1.0/current/user',
+            '/open-api/v1.0/m/life/web/user/info',
+            '/open-api/v1.0/m/life/web/mqtt/connection/config',
+        ].includes(url.replace(/\/+$/, ''));
+    }
     //获取csrf
     getCsrf() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -122,6 +144,12 @@ class AppProxy {
             if (!this.spinnies.pick('login')) {
                 this.spinnies.add('login', { text: SPIN_LABEL_NAME.login });
             }
+            if (this.needManualLogin()) {
+                this.spinnies.fail('login', {
+                    text: '账密未配置，需要手动登录'
+                });
+                return;
+            }
             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 }),
@@ -180,12 +208,12 @@ class AppProxy {
         return proccessedHeader;
     }
     processRes(responseBuffer, proxyRes, req, res) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             let response;
             try {
                 response = JSON.parse(responseBuffer.toString('utf8'));
-                if (req.url === this.loginApi) {
+                if (this.isLoginApi(req.url)) {
                     const token = (0, util_1.parseSetCookie)(proxyRes.headers['set-cookie']);
                     if (token) {
                         this.loginCookie.setValue(token);
@@ -196,14 +224,14 @@ class AppProxy {
                 this.log('----json parse responseBuffer string error-----', ((_a = err.response) === null || _a === void 0 ? void 0 : _a.data) || err.message);
                 return responseBuffer;
             }
-            const isApiBelongMainApp = [this.loginApi, '/open-api/v1.0/current/user'];
-            if (!this.isMainApp && !isApiBelongMainApp.includes(req.url)) {
+            const isMicroAppPage = (_b = req.referer) === null || _b === void 0 ? void 0 : _b.includes('/apps');
+            if (!this.isMainApp && isMicroAppPage && !this.isApiBelongMainApp(req.url)) {
                 const apiPathMatchReg = /\/(:[^/]+|\$?{[^/]+})/g;
                 const apis = mf.apis || [];
                 const microAppId = req.headers['micro-app-id'];
                 if (microAppId && !microAppId.includes('main-app')) {
                     const method = (req === null || req === void 0 ? void 0 : req.method) || 'GET';
-                    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)/, '')) || '';
+                    const urlPath = ((_c = req === null || req === void 0 ? void 0 : req.path) === null || _c === void 0 ? void 0 : _c.replace(/^\s*\/(custom-api|open-api)/, '')) || '';
                     let isExists = false;
                     apis.forEach((api) => {
                         const isLegal = new RegExp(`^${api.path.replace(apiPathMatchReg, '/[^/]+')}/?$`).test(urlPath);
@@ -215,6 +243,7 @@ class AppProxy {
                         return JSON.stringify({
                             msg: `${method}:${urlPath} 未在manifest.json中注册`,
                             code: '888888',
+                            success: false,
                         });
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-dev-proxy",
-  "version": "3.2.22",
+  "version": "3.2.24",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {