@tuya-sat/micro-script 2.0.0-rc.3 → 2.0.0-rc.6

package/dist/module/main/staticMain.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cheerio_1 = __importDefault(require("cheerio"));
 const axios_1 = __importDefault(require("axios"));
 const fakeSaas_1 = __importDefault(require("./fakeSaas"));
-const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.0.555/";
+const defaultBase = "https://static1.tuyacn.com/static/sdf-gw/v1.0.1.22";
 function staticMain(app, debuggerConfig) {
     app.get([
         "/",
@@ -26,7 +26,7 @@ function staticMain(app, debuggerConfig) {
         "/application/*",
     ], (req, res) => __awaiter(this, void 0, void 0, function* () {
         const base = debuggerConfig.base || defaultBase;
-        const { data } = yield axios_1.default.get(new URL("index.html", debuggerConfig.base).href);
+        const { data } = yield axios_1.default.get(new URL("index.html", base).href);
         const $ = cheerio_1.default.load(data);
         modifySrcAttr($, base);
         insertLocalStorage($);

package/dist/module/mainServer.js

@@ -20,9 +20,11 @@ const paths_1 = __importDefault(require("../config/paths"));
 const fakeSaasInfo_1 = __importDefault(require("./main/fakeSaasInfo"));
 const staticMain_1 = __importDefault(require("./main/staticMain"));
 const proxy_1 = __importDefault(require("../module/proxy"));
+const validate_1 = require("../utils/validate");
 function runMain({ port, microPort, }) {
     return __awaiter(this, void 0, void 0, function* () {
         const { debuggerConfig } = require(paths_1.default.microConfig);
+        (0, validate_1.validateDebuggerConfig)(debuggerConfig);
         const app = (0, express_1.default)();
         (0, staticMain_1.default)(app, debuggerConfig);
         (0, fakeSaasInfo_1.default)(app, microPort);

package/dist/utils/validate.d.ts

@@ -1,5 +1,7 @@
+import { DebuggerConfig } from "../module/main/staticMain";
 interface anyObject {
     [key: string]: any;
 }
 export declare const validate: (manifest: anyObject, microConfig: anyObject) => void;
+export declare const validateDebuggerConfig: (value: DebuggerConfig) => Promise<void>;
 export {};

package/dist/utils/validate.js

@@ -1,5 +1,33 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = void 0;
+exports.validateDebuggerConfig = exports.validate = void 0;
+const joi_1 = __importDefault(require("joi"));
 const validate = (manifest, microConfig) => { };
 exports.validate = validate;
+const validateDebuggerConfig = (value) => __awaiter(void 0, void 0, void 0, function* () {
+    const schema = joi_1.default.object({
+        target: joi_1.default.string()
+            .regex(/^(http|https):\/\//)
+            .message("请配置正确的saas地址，在micro.config.js->debuggerConfig->target"),
+    }).unknown();
+    try {
+        yield schema.validateAsync(value);
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+});
+exports.validateDebuggerConfig = validateDebuggerConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.6",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -20,9 +20,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": "2.0.0-rc.3",
-    "@tuya-sat/micro-dev-proxy": "2.0.0-rc.3",
-    "@tuya-sat/micro-utils": "2.0.0-rc.3",
+    "@tuya-sat/micro-dev-loader": "2.0.0-rc.6",
+    "@tuya-sat/micro-dev-proxy": "2.0.0-rc.6",
+    "@tuya-sat/micro-utils": "2.0.0-rc.6",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
     "chalk": "4.1.2",
@@ -34,6 +34,7 @@
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "html-webpack-plugin": "^5.3.2",
     "http-proxy-middleware": "^2.0.1",
+    "joi": "^17.6.0",
     "less": "^4.1.2",
     "less-loader": "^10.1.0",
     "mini-css-extract-plugin": "^2.4.2",
@@ -60,12 +61,15 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
+    "@types/jest": "^27.4.1",
     "@types/uuid": "^8.3.4",
     "@types/webpack-dev-server": "^4.5.0",
+    "jest": "^27.5.1",
+    "ts-jest": "^27.1.3",
     "typescript": "^4.4.4"
   },
   "peerDependencies": {
-    "@tuya-sat/micro-dev-component": "^2.0.0-rc.3"
+    "@tuya-sat/micro-dev-component": "^2.0.0-rc.6"
   },
   "keywords": [
     "saturn-project",