aiot-toolkit 2.0.6-beta.9 → 2.1.0-prender.1

package/README.md

@@ -74,26 +74,50 @@ aiot-toolkit2.0目前支持的打包格式如下：
 
 ## resign
 
-build目录重新生成rpk
-
-步骤
-
-1. 创建任意名称的空目录, 例如 `folder`
-2. 将 `build` 复制到 `folder`
-3. (可跳过)如需自定义证书，将证书复制到 `folder/sign`
-4. 进入 `folder` 目录，执行 `aiot resign`，会在`foler/dist`中生成rpk
-5. 目录结构如下
-
-```sh
-folder
-  build // 用户复制
-  sign  // 用户复制，可选
-     certificate.pem
-     private.pem
-  dist  // 生成
-     ***.rpk
+**rpk解压的代码目录**重新生成rpk
+
+### 示例
+
+#### 无参数
+
+1. 创建目录结构如下
+
+   ```js
+   folder
+     build // 用户复制：代码目录
+       *.js
+     sign  // 用户复制：证书 (可选)
+       certificate.pem
+       private.pem
+   ```
+
+1. 执行命令：`npx aiot-toolkit resign`
+1. 产物
+
+   ```js
+     folder
+        dist  // 生成
+          ***.rpk
+   ```
+
+#### 自定义参数
+
+1. 执行命令：`npx aiot-toolkit resign --source="com.your.app" --output="."`
+2. 产物：
+
+```js
+com.your.app // 代码目录
+com.your.app.rpk // 产物
 ```
 
+### 参数说明
+
+| 名称   | 说明     | 默认值  |
+| ------ | -------- | ------- |
+| source | 代码目录 | `build` |
+| output | 产物目录 | `dist`  |
+| sign   | 证书目录 | `sign`  |
+
 ## jsc
 
 指定目录的js文件转换为jsc文件

package/lib/bin.js

@@ -10,7 +10,6 @@ var _VelaUxBuilder = _interopRequireDefault(require("./builder/VelaUxBuilder"));
 var _AndroidUxStart = _interopRequireDefault(require("./starter/AndroidUxStart"));
 var _VelaUxStarter = _interopRequireDefault(require("./starter/VelaUxStarter"));
 var _DeviceUtil = _interopRequireDefault(require("./utils/DeviceUtil"));
-var _VelaAvdUtils = _interopRequireDefault(require("./utils/VelaAvdUtils"));
 var _ZipUtil = _interopRequireDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/utils/ZipUtil"));
 var _BuildNameFormatType = _interopRequireDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/enum/BuildNameFormatType"));
 var _Jsc = _interopRequireDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/utils/Jsc"));
@@ -20,6 +19,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 // 支持的最低node版本
 const NODE_MINIMUM_VERSION = '18.0.0';
 checkVersion();
+
+// VelaAvdUtil is lazy-imported in emulator commands to avoid loading emulator code for build/release
+
 // 校验当前环境中的node
 function checkVersion() {
   const currentVersion = process.versions.node;
@@ -142,52 +144,98 @@ async function main() {
       name: 'createVVD',
       description: 'create a vela virtual device',
       action: async () => {
-        _VelaAvdUtils.default.createVelaVvdByInquire();
+        const VelaAvdUtil = (await import('./utils/VelaAvdUtils')).default;
+        await VelaAvdUtil.createVelaVvdByInquire();
       }
     }, {
       name: 'deleteVVD',
       description: 'delete vela virtual device(s)',
-      paramList: [{
-        name: 'avdNames',
-        description: 'avd names to delete',
-        enableInquirer: true,
-        type: 'checkbox',
-        choices: _VelaAvdUtils.default.vvdManager.getVvdList().map(item => {
-          return {
-            name: item.name,
-            value: item.name
-          };
-        })
-      }],
-      action: async option => {
+      action: async () => {
         const {
-          avdNames
-        } = option;
+          checkbox
+        } = await import('@inquirer/prompts');
+        const VelaAvdUtil = (await import('./utils/VelaAvdUtils')).default;
+        const vvdList = VelaAvdUtil.vvdManager.getVvdList();
+        const avdNames = await checkbox({
+          message: 'avd names to delete',
+          choices: vvdList.map(item => {
+            return {
+              name: item.name,
+              value: item.name
+            };
+          })
+        });
         avdNames.forEach(avdName => {
-          _VelaAvdUtils.default.vvdManager.deleteVvd(avdName);
+          VelaAvdUtil.vvdManager.deleteVvd(avdName);
         });
       }
+    }, {
+      name: 'status',
+      description: 'show active running sessions',
+      action: async () => {
+        const os = await import('os');
+        const sessionDir = _path.default.join(os.homedir(), '.aiot-toolkit', 'running-sessions');
+        if (!_fsExtra.default.existsSync(sessionDir)) {
+          console.log(JSON.stringify([]));
+          return;
+        }
+        const files = _fsExtra.default.readdirSync(sessionDir).filter(f => f.endsWith('.json'));
+        const active = [];
+        for (const file of files) {
+          try {
+            const session = _fsExtra.default.readJsonSync(_path.default.join(sessionDir, file));
+            process.kill(session.pid, 0);
+            active.push(session);
+          } catch {
+            // pid not alive, clean up stale session file
+            _fsExtra.default.removeSync(_path.default.join(sessionDir, file));
+          }
+        }
+        console.log(JSON.stringify(active, null, 2));
+      }
     }, {
       name: 'initEmulatorEnv',
       description: 'init/reset emulator environment',
       action: async () => {
-        _VelaAvdUtils.default.initEmulatorEnv();
+        const VelaAvdUtil = (await import('./utils/VelaAvdUtils')).default;
+        await VelaAvdUtil.initEmulatorEnv();
       }
     }, {
       name: 'resign',
       description: 'resign build folder to dist/rpk',
-      action: () => {
+      paramList: [{
+        name: 'source',
+        description: 'build folder to resign',
+        defaultValue: 'build',
+        type: 'string'
+      }, {
+        name: 'output',
+        description: 'output folder for the resigned build',
+        defaultValue: 'dist',
+        type: 'string'
+      }, {
+        name: 'sign',
+        description: 'sign folder for the resigned build',
+        defaultValue: 'sign',
+        type: 'string'
+      }],
+      action: option => {
+        const {
+          source,
+          output,
+          sign
+        } = option;
         const projectPath = process.cwd();
         const param = {
-          signRoot: 'sign',
+          signRoot: sign,
           mode: _aiotpack.CompileMode.DEVELOPMENT,
-          outputPath: 'build',
-          releasePath: 'dist',
+          outputPath: source,
+          releasePath: output,
           projectPath,
           buildNameFormat: _BuildNameFormatType.default.DEFAULT,
-          sourceRoot: 'build'
+          sourceRoot: source
         };
-        return _ZipUtil.default.createRpk(projectPath + '/build', param);
+        return _ZipUtil.default.createRpk(_path.default.join(projectPath, source), param);
       }
     }, {
       name: 'jsc',

package/lib/builder/VelaUxBuilder.d.ts

@@ -2,11 +2,13 @@ import { IParam } from '@aiot-toolkit/commander';
 import IBuilder from './IBuilder';
 import UxBuilderBase from './UxBuilderBase';
 import IVelaUxBuilderOption from '../interface/IVelaUxBuilderOption';
+import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
 /**
  * VelaUxBuilder
  */
 declare class VelaUxBuilder extends UxBuilderBase<IVelaUxBuilderOption> implements IBuilder<IVelaUxBuilderOption> {
     params: IParam[];
     match(projectPath: string): boolean;
+    getCompilerOption(projectPath: string, options: IVelaUxBuilderOption): Partial<IJavascriptCompileOption>;
 }
 export default VelaUxBuilder;

package/lib/builder/VelaUxBuilder.js

@@ -16,5 +16,19 @@ class VelaUxBuilder extends _UxBuilderBase.default {
   match(projectPath) {
     return _sharedUtils.ProjectType.getProjectType(projectPath) === _sharedUtils.ProjectType.VELA_UX;
   }
+  getCompilerOption(projectPath, options) {
+    const compilerOption = super.getCompilerOption(projectPath, options);
+
+    // --no-prerender → enablePrerender: false
+    if (options.noPrerender) {
+      compilerOption.enablePrerender = false;
+    }
+
+    // --prerender-exclude "a,b" → prerenderExclude: ['a', 'b']
+    if (typeof options.prerenderExclude === 'string' && options.prerenderExclude) {
+      compilerOption.prerenderExclude = options.prerenderExclude.split(',').map(s => s.trim()).filter(Boolean);
+    }
+    return compilerOption;
+  }
 }
 var _default = exports.default = VelaUxBuilder;

package/lib/interface/IVelaUxBuilderOption.d.ts

@@ -17,6 +17,10 @@ interface IVelaUxBuilderOption extends IUxBuildOption {
      * 是否启用 jsc bundle
      */
     enableJsc?: boolean;
+    /**
+     * 是否使用 VRU 包装格式（release 模式生成 manifest+CERT+inner-vru 的双层 RPK）
+     */
+    enableVru?: boolean;
     /**
      * 是否启用 `protobuf`
      */
@@ -62,6 +66,14 @@ interface IVelaUxBuilderOption extends IUxBuildOption {
      * 删除 console.   <br/>+ `true`: 全部删除  <br/>+ `false`: 不删除. <br/>+ string: 自定义. <br/>示例：`--drop-console=warn,error` ,`--drop-console=true`
      */
     dropConsole?: string;
+    /**
+     * 禁用预渲染
+     */
+    noPrerender?: boolean;
+    /**
+     * 排除不预渲染的页面路径，逗号分隔
+     */
+    prerenderExclude?: string;
 }
 declare const velaUxBuilderParams: IParam[];
 export { velaUxBuilderParams };

package/lib/interface/IVelaUxBuilderOption.js

@@ -21,6 +21,11 @@ const velaUxBuilderParams = exports.velaUxBuilderParams = [{
   "name": "enable-jsc",
   "description": "enable jsc bundle",
   "defaultValue": false
+}, {
+  "type": "confirm",
+  "name": "enable-vru",
+  "description": "enable VRU release format",
+  "defaultValue": false
 }, {
   "type": "confirm",
   "name": "enable-protobuf",
@@ -75,4 +80,13 @@ const velaUxBuilderParams = exports.velaUxBuilderParams = [{
   "name": "drop-console",
   "description": "drop console. true: drop all, false: do nothing, string: custom.  example: --drop-console warn,error",
   "defaultValue": false
+}, {
+  "type": "confirm",
+  "name": "no-prerender",
+  "description": "disable prerender",
+  "defaultValue": false
+}, {
+  "type": "string",
+  "name": "prerender-exclude",
+  "description": "exclude pages from prerender, comma-separated. example: --prerender-exclude pages/Dynamic,pages/Live"
 }];

package/lib/starter/VelaUxStarter.d.ts

@@ -1,5 +1,5 @@
 import { IParam } from '@aiot-toolkit/commander';
-import { IStartOptions, CommonInstance } from '@aiot-toolkit/emulator';
+import { IStartOptions, CommonInstance, BrokerInstance } from '@aiot-toolkit/emulator';
 import VelaUxBuilder from '../builder/VelaUxBuilder';
 import IStarter from './IStarter';
 import Event from 'events';
@@ -11,6 +11,7 @@ declare class VelaUxStarter extends IStarter<IStartOptions> {
     protected name: string;
     protected description: string;
     emulatorInstance?: CommonInstance;
+    brokerInstance?: BrokerInstance;
     builder: VelaUxBuilder;
     event: Event;
     lastRpk?: string;

package/lib/starter/VelaUxStarter.js

@@ -14,6 +14,7 @@ var _VelaUxBuilder = _interopRequireDefault(require("../builder/VelaUxBuilder"))
 var _VelaAvdUtils = _interopRequireDefault(require("../utils/VelaAvdUtils"));
 var _IStarter = _interopRequireDefault(require("./IStarter"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _os = _interopRequireDefault(require("os"));
 var _aiotpack = require("@aiot-toolkit/aiotpack");
 var _events = _interopRequireDefault(require("events"));
 var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
@@ -60,6 +61,14 @@ class VelaUxStarter extends _IStarter.default {
     description: 'deprecated',
     deprecated: 'please remove it now',
     deprecatedVersion: '2.1.0'
+  }, {
+    name: 'device',
+    description: 'device ID for MQTT topic (e.g. vela_emulator_S4)',
+    type: 'string'
+  }, {
+    name: 'mqttPort',
+    description: 'MQTT broker port',
+    type: 'string'
   }, ..._IVelaUxBuilderOption.velaUxBuilderParams])();
   async start(projectPath, options) {
     const check = await _VelaAvdUtils.default.checkEmulatorEnv();
@@ -96,16 +105,24 @@ class VelaUxStarter extends _IStarter.default {
         })
       });
     }
-    // 检查选择的模拟器是否符合要求
-    if (vvdName && !this.isAvailableEmulator(vvdName)) {
-      _sharedUtils.ColorConsole.throw(`this emulator is unavailable, please create a new emulator.`);
-      return;
-    }
 
-    // build
-    const compilerOption = this.builder.getCompilerOption(projectPath, options);
-    // start build
-    await this.builder.build(projectPath, options);
+    // Step 1: Start MQTT broker first
+    this.brokerInstance = await (0, _emulator.startBroker)(options.mqttPort ? {
+      preferredMqttPort: Number(options.mqttPort)
+    } : undefined);
+    _sharedUtils.ColorConsole.success({
+      word: 'MQTT broker started: '
+    }, `${this.brokerInstance.mqttHost}:${this.brokerInstance.mqttPort}`);
+
+    // Step 2: Generate debug config (contains MQTT address and port)
+    const deviceId = options.device || `vela_emulator_${vvdName}`;
+    const debugCfg = {
+      mqttHost: this.brokerInstance.mqttHost,
+      mqttPort: this.brokerInstance.mqttPort,
+      device: deviceId
+    };
+    const cfgPath = _path.default.join(_os.default.tmpdir(), `quickapp_debug_cfg_${vvdName}.json`);
+    await _fsExtra.default.writeFile(cfgPath, JSON.stringify(debugCfg, undefined, 2));
 
     // 设置 debugPort
     let debugPort;
@@ -115,16 +132,95 @@ class VelaUxStarter extends _IStarter.default {
       });
     }
 
-    // start emulator
+    // Step 3: Start emulator with stdoutCallback to push debug config on boot
+    // quickapp_debug_cfg.json is in /tmp which gets wiped on reboot,
+    // so we push it when emulator outputs "Start Debug Server" (same as core plugin)
+    const pushDebugConfig = async () => {
+      if (!this.emulatorInstance) return;
+      await this.emulatorInstance.push(cfgPath, '/tmp/quickapp_debug_cfg.json');
+      _sharedUtils.ColorConsole.success({
+        word: 'Debug config pushed to emulator'
+      });
+    };
     const startRes = await _VelaAvdUtils.default.vvdManager.startVvd({
       vvdName,
       origin: _emulator.IStartOrigin.Terminal,
-      debugPort
+      debugPort,
+      stdoutCallback: msg => {
+        // 模拟器启动/重启时推送 debug config（参考 core 插件做法）
+        if (msg.includes('Start Debug Server')) {
+          pushDebugConfig();
+        }
+      }
     });
     this.emulatorInstance = startRes.emulatorInstance;
     if (!this.emulatorInstance) {
       throw new Error('emulatorInstance is undefined');
     }
+
+    // 如果是冷启动，stdoutCallback 会在启动过程中触发推送
+    // 如果模拟器已经在运行（非冷启动），需要手动推送一次
+    if (!startRes.coldBoot) {
+      await pushDebugConfig();
+    }
+
+    // Step 4: Wait for VelaJS runtime to connect to MQTT broker
+    await new Promise(resolve => {
+      if (this.brokerInstance.aedes.connectedClients > 0) {
+        resolve();
+        return;
+      }
+      const onClient = () => {
+        this.brokerInstance.aedes.removeListener('client', onClient);
+        resolve();
+      };
+      this.brokerInstance.aedes.on('client', onClient);
+    });
+    _sharedUtils.ColorConsole.success({
+      word: 'VelaJS runtime connected to MQTT broker'
+    });
+
+    // Output MCP config for AI agent
+    _sharedUtils.ColorConsole.success({
+      word: 'MCP config: '
+    }, `--device ${deviceId} --mqttPort ${this.brokerInstance.mqttPort}`);
+
+    // Write session file for status tracking
+    const sessionDir = _path.default.join(_os.default.homedir(), '.vela', 'sessions');
+    const sessionFile = _path.default.join(sessionDir, `${deviceId}.json`);
+    await _fsExtra.default.ensureDir(sessionDir);
+    await _fsExtra.default.writeJson(sessionFile, {
+      pid: process.pid,
+      device: deviceId,
+      mqttHost: this.brokerInstance.mqttHost,
+      mqttPort: this.brokerInstance.mqttPort,
+      grpcPort: Number(startRes.grpcConfig['grpc.port']),
+      vvdName,
+      source: 'cli',
+      startedAt: new Date().toISOString()
+    }, {
+      spaces: 2
+    });
+
+    // Clean up session file on exit
+    const cleanup = () => {
+      try {
+        _fsExtra.default.removeSync(sessionFile);
+      } catch {}
+    };
+    process.on('exit', cleanup);
+    process.on('SIGINT', () => {
+      cleanup();
+      process.exit();
+    });
+    process.on('SIGTERM', () => {
+      cleanup();
+      process.exit();
+    });
+
+    // Step 7: Build + push rpk + start app
+    const compilerOption = this.builder.getCompilerOption(projectPath, options);
+    await this.builder.build(projectPath, options);
     const projectInfo = _aiotpack.UxFileUtils.getManifestInfo(projectPath, compilerOption.sourceRoot);
     if (this.lastRpk && _fsExtra.default.existsSync(this.lastRpk)) {
       const targetPath = await this.emulatorInstance?.pushRpk(this.lastRpk, projectInfo.package);
@@ -157,14 +253,17 @@ class VelaUxStarter extends _IStarter.default {
    */
   isAvailableEmulator(avdName) {
     const {
-      imageDir
+      imageDir,
+      customImagePath
     } = _VelaAvdUtils.default.vvdManager.getVvdInfo(avdName);
-    // 没有avdImagePath，即对应的configIni里没有 image.sysdir.1 字段
-    // 有avdImagePath，但是这个目录下没有nuttx
-    if (!imageDir || !_fsExtra.default.existsSync(_path.default.resolve(imageDir, 'nuttx'))) {
-      return false;
+    const images = [imageDir, customImagePath];
+    let res = false;
+    for (const image of images) {
+      if (image && _fsExtra.default.existsSync(_path.default.resolve(image, 'nuttx'))) {
+        res = true;
+      }
     }
-    return true;
+    return res;
   }
 }
 var _default = exports.default = VelaUxStarter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.6-beta.9",
+  "version": "2.1.0-prender.1",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -22,14 +22,14 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.6-beta.9",
-    "@aiot-toolkit/commander": "2.0.6-beta.9",
-    "@aiot-toolkit/emulator": "2.0.6-beta.9",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.9",
+    "@aiot-toolkit/aiotpack": "2.1.0-prender.1",
+    "@aiot-toolkit/commander": "2.1.0-prender.1",
+    "@aiot-toolkit/emulator": "2.1.0-prender.1",
+    "@aiot-toolkit/shared-utils": "2.1.0-prender.1",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "axios": "^1.7.4",
-    "file-lane": "2.0.6-beta.9",
+    "file-lane": "2.1.0-prender.1",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -43,5 +43,5 @@
     "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8"
   },
-  "gitHead": "18718f09f1ee7f1d7361022c5fb7858c87cee2bd"
+  "gitHead": "8bb39a59fbe7a7c22c1167e69d44c78024330cec"
 }