@tuya-sat/micro-dev-proxy 3.0.27-beta.9 → 3.0.28

package/dist/appProxy.js

@@ -39,7 +39,7 @@ 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 = __importStar(require("./initLogin"));
+const initLogin_1 = __importDefault(require("./initLogin"));
 const token_1 = __importDefault(require("./token"));
 const util_1 = require("./util");
 const url_1 = require("url");
@@ -51,7 +51,7 @@ const mf = fs.existsSync(mfPath) && JSON.parse(fs.readFileSync(mfPath, 'utf8'));
 let SDF;
 function parse_SDF(html) {
     var _a;
-    const REGEX = /(?<=window._SDF=).*?}(?=;)/;
+    const REGEX = /(?<=window._SDF=).*?}(?=(;|<\/script>))/;
     return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
 }
 function GSdf() {
@@ -112,7 +112,6 @@ class AppProxy {
                 }).then(({ body }) => {
                     body.text().then((data) => {
                         SDF = JSON.parse(parse_SDF(data));
-                        console.log(SDF);
                     });
                 });
             })
@@ -132,7 +131,7 @@ class AppProxy {
                 if (csrf_1.COOKIE_CSRF === key) {
                     return false;
                 }
-                if (initLogin_1.LOGIN_COOKIE_KEY === key && !this.isMainApp) {
+                if (('connect.sid' === key || 'sid' === key) && !this.isMainApp) {
                     return false;
                 }
                 return true;
@@ -150,7 +149,6 @@ class AppProxy {
         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) {
         let proccessedHeader = Object.assign({}, prevHeadar);

package/dist/csrf.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 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';
 function parseHtml(html) {
@@ -15,7 +14,9 @@ function parseHtml(html) {
 }
 function getCsrf(url) {
     return globalAxios_1.default.get(url).then((res) => {
-        let csrfCookie = (0, util_1.parseSetCookie)(res.headers['set-cookie'], exports.COOKIE_CSRF);
+        const csrfCookie = res.headers['set-cookie']
+            .map((cookieInfo) => cookieInfo.split(';')[0])
+            .find((cookie) => cookie.split('=')[0] === exports.COOKIE_CSRF) || '';
         let csrfToken = parseHtml(res.data);
         return [csrfCookie, csrfToken];
     });

package/dist/index.js

@@ -31,7 +31,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() }, 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'], logSign: false, csrf: true }, restPrevConfig);
     const { needProxyApi } = config, appProxyConfig = __rest(config, ["needProxyApi"]);
     const appProxy = new appProxy_1.default(appProxyConfig);
     return function middleware(app) {

package/dist/util.js

@@ -20,8 +20,8 @@ function logFactory(isLog) {
 exports.logFactory = logFactory;
 function parseSetCookie(setCookie, key) {
     const targetCookie = setCookie
-        .map((cookieInfo) => cookieInfo.split(";")[0])
-        .find((cookie) => cookie.split("=")[0] === key);
-    return targetCookie || "";
+        .map((cookieInfo) => cookieInfo.split(';')[0])
+        .find((cookie) => cookie.split('=')[0] === 'connect.sid' || cookie.split('=')[0] === 'sid');
+    return targetCookie || '';
 }
 exports.parseSetCookie = parseSetCookie;

package/package.json

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