@tuya-sat/micro-script 1.0.7 → 1.1.2

package/dist/module/bundleServer.js

@@ -27,9 +27,11 @@ exports.runBundleServer = exports.createServerCompiler = void 0;
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const ora_1 = __importDefault(require("ora"));
+const chalk_1 = __importDefault(require("chalk"));
 const paths_1 = __importDefault(require("../config/paths"));
 const webpack_config_1 = __importDefault(require("../config/webpack.config"));
 const options_1 = __importDefault(require("./options"));
+const onceFactory_1 = require("../utils/onceFactory");
 function createServerCompiler() {
     const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
         //下面所有配置都是为了精简terminal输出
@@ -64,6 +66,10 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
             spinner.isSpinning && spinner.succeed();
             console.log(`compiled time ~${endTime - startTime}ms`);
         });
+        //临时提示
+        compiler.hooks.done.tap("once-tip", (0, onceFactory_1.onceFactory)(() => {
+            console.log(chalk_1.default.yellow(`Tip: 如果HMR失效且保存文件时造成多次compile，请考虑调高aggregateTimeout参数(可以尝试100)`));
+        }));
         server.start();
     });
 }

package/dist/module/mainServer.js

@@ -23,9 +23,19 @@ const mock_1 = __importDefault(require("../module/mock"));
 const paths_1 = __importDefault(require("../config/paths"));
 const oem_micro_app_id = (0, uuid_1.v4)();
 const entry_id = (0, uuid_1.v4)();
+function parseCookie(cookie, key) {
+    const cookies = (cookie || "").split(";");
+    for (let cookieItem of cookies) {
+        const [cookieKey, value] = cookieItem.split("=");
+        if (cookieKey.trim() === key) {
+            return value;
+        }
+    }
+    return "";
+}
 function runMain({ port, microPort, }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { debuggerConfig: { target }, } = require(paths_1.default.microConfig);
+        const { debuggerConfig: { target, additionHeaders = {} }, } = require(paths_1.default.microConfig);
         const app = (0, express_1.default)();
         //use mock
         (0, mock_1.default)(app);
@@ -46,6 +56,9 @@ function runMain({ port, microPort, }) {
             changeOrigin: true,
             selfHandleResponse: true,
             onProxyReq(proxyReq, req) {
+                //强制覆盖host字段，优先级高于changeOrigin
+                const { host } = additionHeaders;
+                host && proxyReq.setHeader("host", host);
                 if (req.url === "/api/saas-info") {
                     //该死的，会有缓存
                     proxyReq.setHeader("if-none-match", "");
@@ -57,7 +70,7 @@ function runMain({ port, microPort, }) {
                 }
                 let response = responseBuffer;
                 try {
-                    const lang = req.headers["accept-language"];
+                    const lang = parseCookie(req.headers["cookie"], "main-i18next");
                     const data = JSON.parse(response.toString("utf8"));
                     response = JSON.stringify(processSaasInfo(data, lang, microPort));
                 }
@@ -66,6 +79,7 @@ function runMain({ port, microPort, }) {
                 }
                 return response;
             })),
+            headers: additionHeaders,
         }));
         const { pp, resolve } = (0, promiser_1.promiser)();
         app.listen(port, () => {
@@ -134,5 +148,5 @@ function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port) {
     };
 }
 function pickText(texts, lang) {
-    return lang === "en-US" ? texts[1] : texts[0];
+    return lang === "en" ? texts[1] : texts[0];
 }

package/dist/scripts/startInMain.js

@@ -20,17 +20,8 @@ const chalk_1 = __importDefault(require("chalk"));
 const mainServer_1 = __importDefault(require("../module/mainServer"));
 const micro_utils_1 = require("@tuya-sat/micro-utils");
 const bundleServer_1 = require("../module/bundleServer");
-function onceFactory(fn, count = 1) {
-    let executeCount = 0;
-    return () => {
-        if (executeCount >= count) {
-            return;
-        }
-        executeCount++;
-        return fn();
-    };
-}
 (() => __awaiter(void 0, void 0, void 0, function* () {
+    console.log(chalk_1.default.yellow(`Tip: 目前--main命令是个体验命令，请知悉`));
     let defaultPort = 9000;
     //检测端口占用情况
     const bundledServerPort = yield portfinder_1.default.getPortPromise({
@@ -54,10 +45,6 @@ function onceFactory(fn, count = 1) {
         port: bundledServerPort,
         compiler,
     });
-    //临时提示
-    compiler.hooks.done.tap("once-tip", onceFactory(() => {
-        console.log(chalk_1.default.yellow(`Tip: 如果HMR失效且保存文件时造成多次compile，请考虑调高aggregateTimeout参数(可以尝试100)`));
-    }));
 }))().catch((err) => {
     console.log(err);
 });

package/dist/utils/onceFactory.d.ts

@@ -0,0 +1 @@
+export declare function onceFactory(fn: Function, count?: number): () => any;

package/dist/utils/onceFactory.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onceFactory = void 0;
+function onceFactory(fn, count = 1) {
+    let executeCount = 0;
+    return () => {
+        if (executeCount >= count) {
+            return;
+        }
+        executeCount++;
+        return fn();
+    };
+}
+exports.onceFactory = onceFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "1.0.7",
+  "version": "1.1.2",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -15,9 +15,9 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.15.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
-    "@tuya-sat/micro-dev-loader": "1.0.7",
-    "@tuya-sat/micro-dev-proxy": "1.0.7",
-    "@tuya-sat/micro-utils": "1.0.7",
+    "@tuya-sat/micro-dev-loader": "1.1.2",
+    "@tuya-sat/micro-dev-proxy": "1.1.2",
+    "@tuya-sat/micro-utils": "1.1.2",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
     "chalk": "4.1.2",