@tuya-sat/micro-script 3.0.17-beta.3 → 3.0.17

package/dist/module/main/fakeSaasInfo.js

@@ -107,7 +107,9 @@ function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir
         menu.oem_micro_app_id = oem_micro_app_id;
         menu.entry_id = entry_id;
         //@ts-ignore
-        menu.entry_name = pickText(menu.entry_name, lang);
+        menu.entry_name_zh = pickText(menu.entry_name, 'zh');
+        //@ts-ignore
+        menu.entry_name_en = pickText(menu.entry_name, 'en');
         //@ts-ignore
         menu.micro_app_name = pickText(menu.micro_app_name, lang);
         menu.path = `${baseUrl}${menu.path}`;

package/dist/module/main/staticMain.d.ts

@@ -20,4 +20,4 @@ export declare type CustomConfig = {
 };
 export default function staticMain(app: Express & {
     _isLogin?: Promise<void>;
-}, debuggerConfig: DebuggerConfig, microPort: number): void;
+}, debuggerConfig: DebuggerConfig, microPort: number): Promise<void>;

package/dist/module/main/staticMain.js

@@ -40,29 +40,41 @@ const axios_1 = __importDefault(require("axios"));
 const fakeSaas_1 = __importStar(require("./fakeSaas"));
 const paths_1 = __importDefault(require("../../config/paths"));
 const webpack_common_1 = require("../../config/webpack.common");
-const defaultBase = 'https://static1.tuyacn.com/static/sdf-gw/v1.0.1.516/';
+const undici_1 = require("undici");
+function parse_SDF(html) {
+    var _a;
+    const REGEX = /(?<=window._SDF=).*?}(?=;)/;
+    return ((_a = REGEX.exec(html)) === null || _a === void 0 ? void 0 : _a[0]) || '';
+}
 function staticMain(app, debuggerConfig, microPort) {
-    app.get([
-        '/',
-        '/apps/:appId',
-        '/login',
-        '/apps/:appId/*',
-        '/application',
-        '/application/*',
-    ], (req, res) => __awaiter(this, void 0, void 0, function* () {
-        if (!debuggerConfig.isMainApp && app._isLogin) {
-            yield app._isLogin;
-        }
-        let base = debuggerConfig.base || defaultBase;
-        if (debuggerConfig.isMainApp) {
-            base = `http://localhost:${microPort}`;
-        }
-        const { data } = yield axios_1.default.get(new URL('index.html', base).href);
-        const $ = cheerio_1.default.load(data);
-        modifySrcAttr($, base);
-        yield insertScript($, debuggerConfig);
-        res.send($.html());
-    }));
+    return __awaiter(this, void 0, void 0, function* () {
+        //获取当前SaaS版本
+        let SDF;
+        let { body } = yield (0, undici_1.request)(new URL('/login?disable_third_login=true', debuggerConfig.target).href);
+        const data = yield body.text();
+        SDF = JSON.parse(parse_SDF(data));
+        app.get([
+            '/',
+            '/apps/:appId',
+            '/login',
+            '/apps/:appId/*',
+            '/application',
+            '/application/*',
+        ], (req, res) => __awaiter(this, void 0, void 0, function* () {
+            if (!debuggerConfig.isMainApp && app._isLogin) {
+                yield app._isLogin;
+            }
+            let base = SDF.base;
+            if (debuggerConfig.isMainApp) {
+                base = `http://localhost:${microPort}`;
+            }
+            const { data } = yield axios_1.default.get(new URL('index.html', base).href);
+            const $ = cheerio_1.default.load(data);
+            modifySrcAttr($, base);
+            yield insertScript($, debuggerConfig);
+            res.send($.html());
+        }));
+    });
 }
 exports.default = staticMain;
 function initalCustom_configs(saas) {

package/dist/module/mainServer.js

@@ -92,7 +92,7 @@ function runMain({ port, microPort, }) {
         });
         (0, socket_1.bootStrap)(io);
         mainServer && mainServer.before && mainServer.before(app);
-        (0, staticMain_1.default)(app, debuggerConfig, microPort);
+        yield (0, staticMain_1.default)(app, debuggerConfig, microPort);
         (0, fakeSaasInfo_1.default)(app, microPort);
         (0, mock_1.default)(app);
         (0, proxy_1.default)(app);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.0.17-beta.3",
+  "version": "3.0.17",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -23,9 +23,9 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/traverse": "^7.20.13",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
-    "@tuya-sat/micro-dev-loader": "3.0.17-beta.3",
-    "@tuya-sat/micro-dev-proxy": "3.0.17-beta.3",
-    "@tuya-sat/micro-utils": "3.0.17-beta.3",
+    "@tuya-sat/micro-dev-loader": "3.0.17",
+    "@tuya-sat/micro-dev-proxy": "3.0.17",
+    "@tuya-sat/micro-utils": "3.0.17",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
@@ -61,6 +61,7 @@
     "svg-url-loader": "7.1.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "uid": "^2.0.1",
+    "undici": "^5.20.0",
     "url-loader": "4.1.1",
     "uuid": "8.3.2",
     "vue-loader": "17.0.0",