@tuya-sat/micro-dev-proxy 3.2.23 → 3.3.0

package/dist/appProxy.d.ts

@@ -17,6 +17,7 @@ export interface AppProxyConfig {
 export declare function GSdf(): any;
 export default class AppProxy {
     target: string;
+    targetOrigin: string;
     username: string;
     password: string;
     csrf: boolean;
@@ -37,6 +38,7 @@ export default class AppProxy {
     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

@@ -68,9 +68,12 @@ class AppProxy {
         this.csrfCookie = new token_1.default();
         this.csrfValue = new token_1.default();
         this.target = target;
+        this.targetOrigin = new url_1.URL(this.target).origin;
         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;
@@ -107,7 +110,17 @@ class AppProxy {
             this.loginApi,
             '/api/login',
             '/api/login/qrcode'
-        ].includes(url.replace(/^\/+/, ''));
+        ].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() {
@@ -189,6 +202,7 @@ class AppProxy {
         Object.entries(combineHeaders).forEach(([headerKey, value]) => proxyReq.setHeader(headerKey, value));
         const prevCookie = proxyReq.getHeader('cookie') || '';
         proxyReq.setHeader('cookie', this.getCookie(prevCookie));
+        proxyReq.setHeader('origin', this.targetOrigin);
     }
     combinedHeader(prevHeadar) {
         let proccessedHeader = Object.assign({}, prevHeadar);
@@ -212,9 +226,8 @@ 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'];
             const isMicroAppPage = (_b = req.referer) === null || _b === void 0 ? void 0 : _b.includes('/apps');
-            if (!this.isMainApp && isMicroAppPage && !isApiBelongMainApp.includes(req.url)) {
+            if (!this.isMainApp && isMicroAppPage && !this.isApiBelongMainApp(req.url)) {
                 const apiPathMatchReg = /\/(:[^/]+|\$?{[^/]+})/g;
                 const apis = mf.apis || [];
                 const microAppId = req.headers['micro-app-id'];

package/dist/index.js

@@ -35,7 +35,7 @@ function awaiting() {
 exports.awaiting = awaiting;
 function createProxy(_a) {
     var { additionHeaders = {} } = _a, restPrevConfig = __rest(_a, ["additionHeaders"]);
-    const config = Object.assign({ additionHeaders: Object.assign({ terminalId: os_1.default.hostname() + Date.now() }, additionHeaders), isMainApp: restPrevConfig.isMainApp, loginApi: '/api/login', needProxyApi: ['/api', '/open-api', '/custom-api'], logSign: false, csrf: true }, restPrevConfig);
+    const config = Object.assign({ additionHeaders: Object.assign({ terminalId: os_1.default.hostname() + Date.now() }, additionHeaders), isMainApp: restPrevConfig.isMainApp, loginApi: '/api/login', needProxyApi: ['/api', '/open-api', '/custom-api', '/ws'], logSign: false, csrf: true }, restPrevConfig);
     const { needProxyApi } = config, appProxyConfig = __rest(config, ["needProxyApi"]);
     const appProxy = new appProxy_1.default(appProxyConfig);
     return function middleware(app) {
@@ -47,9 +47,11 @@ function createProxy(_a) {
         });
         app.use(needProxyApi, (0, http_proxy_middleware_1.createProxyMiddleware)({
             target: appProxyConfig.target,
+            ws: true,
             secure: false,
             changeOrigin: true,
             selfHandleResponse: true,
+            onProxyReqWs: appProxy.processReq.bind(appProxy),
             onProxyReq: appProxy.processReq.bind(appProxy),
             onProxyRes: (0, http_proxy_middleware_1.responseInterceptor)(appProxy.processRes.bind(appProxy)),
         }));

package/package.json

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