@airiot/cli 1.0.10 → 1.0.12

package/config/envs.js

@@ -1,16 +1,43 @@
 import paths from './paths.js';
 import { URL } from 'url';
+import { resolve, dirname, basename } from 'path';
 
 let developConfig = {};
 
+// attempt to load the developConfig file, if not found try parent directories up to root
 try {
-  const module = await import(new URL(`file://${paths.developConfig}`));
-  developConfig = module.default;
+  let filePath = resolve(paths.developConfig);
+  const fileName = basename(filePath);
+  let dir = dirname(filePath);
+
+  while (true) {
+    const candidate = resolve(dir, fileName);
+    // build a file:// URL compatible with Windows and POSIX
+    const fileUrl = new URL(`file://${process.platform === 'win32' ? '/' : ''}${candidate.replace(/\\/g, '/')}`).href;
+
+    try {
+      const module = await import(fileUrl);
+      developConfig = module.default;
+      break;
+    } catch (err) {
+      if (err && err.code !== 'ERR_MODULE_NOT_FOUND') {
+        throw err;
+      }
+      const parent = dirname(dir);
+      if (parent === dir) {
+        // reached filesystem root, stop searching
+        break;
+      }
+      dir = parent;
+    }
+  }
 } catch (err) {
-  if (err.code !== 'ERR_MODULE_NOT_FOUND') {
+  // preserve original behavior: only rethrow unexpected errors
+  if (err && err.code !== 'ERR_MODULE_NOT_FOUND') {
     throw err;
   }
 }
+
 const getHost = () => {
   if (developConfig.host) {
     return developConfig.host;
@@ -65,6 +92,16 @@ const getBaseUrl = () => {
   return baseUrl;
 };
 
+const getOpsInfo = () => {
+  if (developConfig.ops) {
+    return {
+      ...developConfig.ops,
+      ophost: developConfig.ops.host
+    };
+  }
+  return null;
+}
+
 const getModule = () => {
   const envs = process.env;
   const args = process.argv;
@@ -102,4 +139,4 @@ const translateKeys = () => {
   return { appid, secret };
 }
 
-export { getHost, getBaseUrl, getModule, developConfig, translateKeys };
+export { getHost, getBaseUrl, getModule, getOpsInfo, developConfig, translateKeys };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airiot/cli",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "AIRIOT平台前端包管理工具",
   "type": "module",
   "scripts": {},

package/scripts/install.js

@@ -7,6 +7,7 @@ import fs from "fs";
 import fetch from "node-fetch";
 import FormData from "form-data";
 import paths from "../config/paths.js";
+import { getOpsInfo } from '../config/envs.js';
 
 const jsonData = fs.readFileSync(paths.appPackageJson, 'utf-8');
 const packageJson = JSON.parse(jsonData);
@@ -14,12 +15,15 @@ const packageJson = JSON.parse(jsonData);
 const envs = process.env;
 const args = process.argv;
 let packageName = packageJson.name;
+const developOpsConfig = getOpsInfo();
 
 const getOption = (name, envName) => {
   let value;
   const optionArgs = args.filter((arg) => arg.startsWith(`--${name}=`));
   if (optionArgs.length != 0) {
     value = optionArgs[0].replace(`--${name}=`, "");
+  } else if (developOpsConfig && developOpsConfig[name]) {
+    value = developOpsConfig[name];
   } else if (envs[envName]) {
     value = envs[envName];
   }
@@ -34,7 +38,7 @@ const getOption = (name, envName) => {
 const questions = [];
 const forceQuestion = args.filter((arg) => arg.startsWith("-f")).length != 0;
 const options = {
-  host: getOption("ophost", "IOT_OPURL"),
+  host: getOption("ophost", "IOT_OPHOST"),
   username: getOption("username", "IOT_OP_USER"),
   password: getOption("password", "IOT_OP_PASSWORD"),
   branch: getOption("branch", "IOT_BRANCH"),
@@ -61,6 +65,27 @@ inquirer
     let password = answers.password || options.password;
     let branch = answers.branch || options.branch;
 
+    console.log(chalk.yellow("[iot:install] 请确认以下参数:"));
+    console.log(chalk.yellow(`  host: ${host || "(未提供)"}`));
+    console.log(chalk.yellow(`  username: ${username || "(未提供)"}`));
+    console.log(chalk.yellow(`  password: ${password ? "********" : "(未提供)"}`));
+    console.log(chalk.yellow(`  branch: ${branch || "(未提供)"}`));
+    console.log(chalk.yellow(`  package: ${packageName}\n`));
+
+    const { confirmProceed } = await inquirer.prompt([
+      {
+        name: "confirmProceed",
+        type: "confirm",
+        message: "确认以上参数并继续安装吗？",
+        default: true,
+      },
+    ]);
+
+    if (!confirmProceed) {
+      console.log(chalk.red("[iot:install] 操作已取消"));
+      return;
+    }
+
     host = host.endsWith("/") ? host : host + "/";
 
     try {

package/scripts/preview.js

@@ -9,7 +9,7 @@ const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3030;
 const host = getHost();
 const baseUrl = getBaseUrl();
 
-console.log(chalk.green('[iot:envs] 请求 IOT_URL 为: ' + host));
+console.log(chalk.green('[iot:envs] 请求 IOT_URL 为: ' + host + ', 基础路径为: ' + baseUrl));
 
 (async () => {
   const proxy = {

package/scripts/start.js

@@ -9,7 +9,7 @@ const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
 const host = getHost();
 const baseUrl = getBaseUrl();
 
-console.log(chalk.green('[iot:envs] 请求 IOT_URL 为: ' + host));
+console.log(chalk.green('[iot:envs] 请求 IOT_URL 为: ' + host + ', 基础路径为: ' + baseUrl));
 
 (async () => {
   const proxy = {

package/vite-plugin/externals.js

@@ -12,7 +12,6 @@ export default {
   "antd": "antd",
   "xui": "xui",
   "@ant-design/icons": "icons",
-  "echarts": "echarts",
   "xls": "XLS",
   "xlsx": "XLSX",
   "async": "async",