@tuya-sat/micro-dev-proxy 3.0.7-beta.1 → 3.0.7-beta.2

package/dist/appProxy.d.ts

@@ -36,5 +36,5 @@ export default class AppProxy {
     getLoginCookie(): Promise<void>;
     processReq(proxyReq: Parameters<Options['onProxyReq']>[0], req: any, res: any): void;
     combinedHeader(prevHeadar: any): any;
-    processRes(responseBuffer: any): Promise<any>;
+    processRes(responseBuffer: any, proxyRes: any, req: any, res: any): Promise<any>;
 }

package/dist/appProxy.js

@@ -45,7 +45,7 @@ const url_1 = require("url");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const mfPath = path.join(process.cwd(), 'manifest.json');
-const mf = fs.existsSync(mfPath) && JSON.stringify(fs.readFileSync(mfPath, 'utf8'));
+const mf = fs.existsSync(mfPath) && JSON.parse(fs.readFileSync(mfPath, 'utf8'));
 class AppProxy {
     constructor({ target, username, password, additionHeaders, isMainApp, isThirdLogin, loginApi, csrf = true, logSign, }) {
         this.loginCookie = new token_1.default();
@@ -104,7 +104,6 @@ class AppProxy {
     }
     processReq(proxyReq, req, res) {
         //整合需要添加的header头
-        var _a;
         const combineHeaders = this.combinedHeader(this.additionHeaders);
         Object.entries(combineHeaders).forEach(([headerKey, value]) => proxyReq.setHeader(headerKey, value));
         const prevCookie = proxyReq.getHeader('cookie') || '';
@@ -130,34 +129,14 @@ class AppProxy {
             .join(';');
         proxyReq.setHeader('cookie', cookie);
         this.log('----req-header----', proxyReq.getHeaders());
-        //todo: 拦截请求,判断是否在微应用manifest中存在
-        const apiPathMatchReg = /\/(:[^/]+|\$?{[^/]+})/g;
-        const apis = mf.apis || [];
-        if (!(proxyReq === null || proxyReq === void 0 ? void 0 : proxyReq._headers['micro-app-id'].includes('main-app'))) {
-            const method = (proxyReq === null || proxyReq === void 0 ? void 0 : proxyReq.method) || 'GET';
-            const urlPath = ((_a = proxyReq === null || proxyReq === void 0 ? void 0 : proxyReq.path) === null || _a === void 0 ? void 0 : _a.replace(/^\s*\/(custom-api|open-api)/, '')) ||
-                '';
-            let isExists = false;
-            apis.array.forEach((api) => {
-                const isLegal = new RegExp(`^${api.path.replace(apiPathMatchReg, '/[^/]+')}/?$`).test(urlPath);
-                if (isLegal && method.toLowerCase() === api.method.toLowerCase()) {
-                    isExists = true;
-                }
-            });
-            if (!isExists) {
-                res.send(JSON.stringify({
-                    msg: `api:${urlPath} 未在manifest.json中注册`,
-                    code: '888888',
-                }));
-            }
-        }
     }
     combinedHeader(prevHeadar) {
         let proccessedHeader = Object.assign({}, prevHeadar);
         this.csrf && (proccessedHeader[csrf_1.HEADERS_CSRF] = this.csrfValue.value);
         return proccessedHeader;
     }
-    processRes(responseBuffer) {
+    processRes(responseBuffer, proxyRes, req, res) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let response;
             try {
@@ -167,6 +146,25 @@ class AppProxy {
                 this.log('----json parse responseBuffer string error-----', err);
                 return responseBuffer;
             }
+            const apiPathMatchReg = /\/(:[^/]+|\$?{[^/]+})/g;
+            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)/, '')) || '';
+                let isExists = false;
+                apis.forEach((api) => {
+                    const isLegal = new RegExp(`^${api.path.replace(apiPathMatchReg, '/[^/]+')}/?$`).test(urlPath);
+                    if (isLegal && method.toLowerCase() === api.method.toLowerCase()) {
+                        isExists = true;
+                    }
+                });
+                if (!isExists) {
+                    return JSON.stringify({
+                        msg: `api:${urlPath} 未在manifest.json中注册`,
+                        code: '888888',
+                    });
+                }
+            }
             if (response.code === 1010 && !this.isMainApp) {
                 let modifyText = '';
                 yield this.getLoginCookie()

package/package.json

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