@tuya-sat/micro-dev-proxy 3.0.9 → 3.0.11

package/dist/appProxy.d.ts

@@ -13,6 +13,7 @@ export interface AppProxyConfig {
     logSign?: boolean;
     isThirdLogin?: boolean;
 }
+export declare function GSdf(): any;
 export default class AppProxy {
     target: string;
     username: string;
@@ -34,6 +35,7 @@ export default class AppProxy {
     init(): Promise<void>;
     getCsrf(): Promise<void>;
     getLoginCookie(): Promise<void>;
+    getCookie(prevCookie: any): string;
     processReq(proxyReq: Parameters<Options['onProxyReq']>[0], req: any, res: any): void;
     combinedHeader(prevHeadar: any): any;
     processRes(responseBuffer: any, proxyRes: any, req: any, res: any): Promise<any>;

package/dist/appProxy.js

@@ -35,6 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GSdf = void 0;
 const globalAxios_1 = __importDefault(require("./globalAxios"));
 const js_sha256_1 = require("js-sha256");
 const csrf_1 = __importStar(require("./csrf"));
@@ -44,8 +45,19 @@ 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 mfPath = path.join(process.cwd(), 'manifest.json');
 const mf = fs.existsSync(mfPath) && JSON.parse(fs.readFileSync(mfPath, 'utf8'));
+let SDF;
+function parse_SDF(html) {
+    var _a;
+    const REGEX = /(?<=window._SDF=).*?}(?=;)/;
+    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
+}
+function GSdf() {
+    return SDF;
+}
+exports.GSdf = GSdf;
 class AppProxy {
     constructor({ target, username, password, additionHeaders, isMainApp, isThirdLogin, loginApi, csrf = true, logSign, }) {
         this.loginCookie = new token_1.default();
@@ -95,6 +107,14 @@ class AppProxy {
             })
                 .then((cookie) => {
                 this.loginCookie.setValue(cookie);
+                (0, undici_1.request)(new url_1.URL('/', this.target).href, {
+                    headers: this.combinedHeader({ cookie }),
+                }).then(({ body }) => {
+                    body.text().then((data) => {
+                        SDF = JSON.parse(parse_SDF(data));
+                        console.log(SDF);
+                    });
+                });
             })
                 .catch((err) => {
                 this.log('----inital login error----' + err);
@@ -102,12 +122,8 @@ class AppProxy {
             });
         });
     }
-    processReq(proxyReq, req, res) {
-        //整合需要添加的header头
-        const combineHeaders = this.combinedHeader(this.additionHeaders);
-        Object.entries(combineHeaders).forEach(([headerKey, value]) => proxyReq.setHeader(headerKey, value));
-        const prevCookie = proxyReq.getHeader('cookie') || '';
-        const cookie = [
+    getCookie(prevCookie) {
+        return [
             ...prevCookie
                 .split(';')
                 .map((item) => [item.split('=')[0].trim(), item])
@@ -127,7 +143,13 @@ class AppProxy {
         ]
             .filter(Boolean)
             .join(';');
-        proxyReq.setHeader('cookie', cookie);
+    }
+    processReq(proxyReq, req, res) {
+        //整合需要添加的header头
+        const combineHeaders = this.combinedHeader(this.additionHeaders);
+        Object.entries(combineHeaders).forEach(([headerKey, value]) => proxyReq.setHeader(headerKey, value));
+        const prevCookie = proxyReq.getHeader('cookie') || '';
+        proxyReq.setHeader('cookie', this.getCookie(prevCookie));
         this.log('----req-header----', proxyReq.getHeaders());
     }
     combinedHeader(prevHeadar) {
@@ -146,23 +168,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: `${method}:${urlPath} 未在manifest.json中注册`,
-                        code: '888888',
+            if (!this.isMainApp) {
+                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: `${method}:${urlPath} 未在manifest.json中注册`,
+                            code: '888888',
+                        });
+                    }
                 }
             }
             if (response.code === 1010 && !this.isMainApp) {

package/dist/csrf.js

@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HEADERS_CSRF = exports.COOKIE_CSRF = void 0;
 const globalAxios_1 = __importDefault(require("./globalAxios"));
 const util_1 = require("./util");
-exports.COOKIE_CSRF = "_csrf";
-exports.HEADERS_CSRF = "csrf-token";
+exports.COOKIE_CSRF = '_csrf';
+exports.HEADERS_CSRF = 'csrf-token';
 function parseHtml(html) {
     var _a;
     const CSRF_REGEX = /.*window.csrf=('|")?([^'"]+)/;
-    return ((_a = html.match(CSRF_REGEX)) === null || _a === void 0 ? void 0 : _a[2]) || "";
+    return ((_a = html.match(CSRF_REGEX)) === null || _a === void 0 ? void 0 : _a[2]) || '';
 }
 function getCsrf(url) {
     return globalAxios_1.default.get(url).then((res) => {
-        let csrfCookie = (0, util_1.parseSetCookie)(res.headers["set-cookie"], exports.COOKIE_CSRF);
+        let csrfCookie = (0, util_1.parseSetCookie)(res.headers['set-cookie'], exports.COOKIE_CSRF);
         let csrfToken = parseHtml(res.data);
         return [csrfCookie, csrfToken];
     });

package/dist/index.d.ts

@@ -4,5 +4,6 @@ export interface Config extends AppProxyConfig {
         [key: string]: any;
     };
 }
+export { GSdf } from './appProxy';
 export declare function awaiting(): any[];
 export default function createProxy({ additionHeaders, ...restPrevConfig }: Config): (app: any) => void;

package/dist/index.js

@@ -14,10 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.awaiting = void 0;
+exports.awaiting = exports.GSdf = void 0;
 const os_1 = __importDefault(require("os"));
 const http_proxy_middleware_1 = require("http-proxy-middleware");
 const appProxy_1 = __importDefault(require("./appProxy"));
+var appProxy_2 = require("./appProxy");
+Object.defineProperty(exports, "GSdf", { enumerable: true, get: function () { return appProxy_2.GSdf; } });
 function awaiting() {
     let $resolve, $reject;
     const waiting = new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-dev-proxy",
-  "version": "3.0.9",
+  "version": "3.0.11",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {
@@ -14,7 +14,8 @@
     "chalk": "5.0.1",
     "fs-extra": "10.0.1",
     "http-proxy-middleware": "2.0.4",
-    "js-sha256": "0.9.0"
+    "js-sha256": "0.9.0",
+    "undici": "^5.20.0"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.13",