@tuya-sat/micro-script 3.2.4 → 3.2.6

package/dist/module/main/fakeSaas.js

@@ -36,8 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFakeUser = void 0;
-const axios_1 = __importDefault(require("axios"));
 const chalk_1 = __importDefault(require("chalk"));
+const micro_dev_proxy_1 = require("@tuya-sat/micro-dev-proxy");
 const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 function parse_SDF_CONFIG(html) {
@@ -57,10 +57,10 @@ function parse__MAIN_APP_PUBLIC_PATH(html) {
 }
 const grabSaasPage = (target) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        return yield axios_1.default.get(target);
+        return yield micro_dev_proxy_1.globalAxios.get(target);
     }
     catch (e) {
-        return axios_1.default.get(new URL('/login?disable_third_login=true', target).href);
+        return micro_dev_proxy_1.globalAxios.get(new URL('/login?disable_third_login=true', target).href);
     }
 });
 function getFakeSaas(config) {

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

@@ -1,5 +1,5 @@
 import { Express } from 'express';
-import AppProxy from "@tuya-sat/micro-dev-proxy/dist/appProxy";
+import { AppProxy } from '@tuya-sat/micro-dev-proxy';
 interface IApp extends Express {
     __appProxy__?: AppProxy;
 }

package/dist/module/main/fakeSaasInfo.js

@@ -36,13 +36,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const micro_utils_1 = require("@tuya-sat/micro-utils");
+const micro_dev_proxy_1 = require("@tuya-sat/micro-dev-proxy");
 const uuid_1 = require("uuid");
 const paths_1 = __importDefault(require("../../config/paths"));
 const uid_1 = require("uid");
 const path = __importStar(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("../../utils");
-const axios_1 = __importDefault(require("axios"));
 function mockSaasInfo(app, microPort) {
     let { multiApps, microApps, debuggerConfig: { isMainApp, target }, } = require(paths_1.default.microConfig);
     const idsMap = new Map();
@@ -208,7 +208,7 @@ function refactorConstructApp(config, localApps) {
     return __awaiter(this, void 0, void 0, function* () {
         const saasAppsMap = {};
         try {
-            const res = yield axios_1.default.get(new URL('/api/saas-info', config.url).href, {
+            const res = yield micro_dev_proxy_1.globalAxios.get(new URL('/api/saas-info', config.url).href, {
                 headers: config.headers,
             });
             (_a = res.data.result.apps) === null || _a === void 0 ? void 0 : _a.forEach((app) => {

package/dist/module/main/staticMain.js

@@ -36,11 +36,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const cheerio_1 = __importDefault(require("cheerio"));
-const axios_1 = __importDefault(require("axios"));
+const micro_dev_proxy_1 = require("@tuya-sat/micro-dev-proxy");
 const fakeSaas_1 = __importStar(require("./fakeSaas"));
 const paths_1 = __importDefault(require("../../config/paths"));
 const webpack_common_1 = require("../../config/webpack.common");
-const undici_1 = require("undici");
 const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 function parse_SDF(html) {
@@ -52,9 +51,8 @@ function staticMain(app, debuggerConfig, microPort) {
     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));
+        const { data: pageHtml } = yield micro_dev_proxy_1.globalAxios.get(new URL('/login?disable_third_login=true', debuggerConfig.target).href);
+        SDF = JSON.parse(parse_SDF(pageHtml));
         app.get([
             '/',
             '/apps/:appId',
@@ -73,7 +71,7 @@ function staticMain(app, debuggerConfig, microPort) {
             if (!/^https?:\/\//.test(base)) {
                 base = new URL(base, debuggerConfig.target).href;
             }
-            const { data } = yield axios_1.default.get(new URL('index.html', base).href);
+            const { data } = yield micro_dev_proxy_1.globalAxios.get(new URL('index.html', base).href);
             const $ = cheerio_1.default.load(data);
             modifySrcAttr($, base);
             yield insertScript($, debuggerConfig);

package/dist/module/proxy.js

@@ -12,6 +12,7 @@ function useProxy(app) {
     if (customApiUrl) {
         app.use('/custom-api', (0, http_proxy_middleware_1.createProxyMiddleware)({
             target: customApiUrl,
+            secure: false,
             pathRewrite: { '^/custom-api': '' },
             changeOrigin: true,
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "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.2.4",
-    "@tuya-sat/micro-dev-proxy": "3.2.4",
-    "@tuya-sat/micro-utils": "3.2.4",
+    "@tuya-sat/micro-dev-loader": "3.2.6",
+    "@tuya-sat/micro-dev-proxy": "3.2.6",
+    "@tuya-sat/micro-utils": "3.2.6",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",
@@ -63,7 +63,6 @@
     "svg-url-loader": "7.1.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "uid": "^2.0.1",
-    "undici": "^5.20.0",
     "update-notifier": "5.1.0",
     "url-loader": "4.1.1",
     "uuid": "8.3.2",