aiot-toolkit 2.0.6-beta.25 → 2.0.6-beta.28

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,36 +144,61 @@ 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',

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: 'name of the emulator (VVD) to start, skips interactive selection',
+    type: 'string'
+  }, {
+    name: 'mqttPort',
+    description: 'MQTT broker port',
+    type: 'string'
   }, ..._IVelaUxBuilderOption.velaUxBuilderParams])();
   async start(projectPath, options) {
     const check = await _VelaAvdUtils.default.checkEmulatorEnv();
@@ -71,7 +80,18 @@ class VelaUxStarter extends _IStarter.default {
     // 获取已经创建的模拟器列表
     const vvdList = _VelaAvdUtils.default.vvdManager.getVvdList();
     let vvdName;
-    if (vvdList.length === 0) {
+    if (options.device) {
+      // --device specified: use it directly, skip interactive selection
+      const match = vvdList.find(v => v.name === options.device);
+      if (!match) {
+        const available = vvdList.map(v => v.name).join(', ');
+        const errorMsg = `Emulator "${options.device}" not found. Available: ${available || 'none'}`;
+        _sharedUtils.ColorConsole.throw(errorMsg);
+        throw new Error(errorMsg);
+      }
+      vvdName = options.device;
+      _sharedUtils.ColorConsole.warn(`Start run by: ${vvdName}`);
+    } else if (vvdList.length === 0) {
       _sharedUtils.ColorConsole.error('no vela emulator available, please create it first.');
       _VelaAvdUtils.default.createVelaVvdByInquire();
       return;
@@ -96,11 +116,27 @@ class VelaUxStarter extends _IStarter.default {
         })
       });
     }
+    if (!vvdName) {
+      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 = `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;
@@ -110,16 +146,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.6-beta.25",
+  "version": "2.0.6-beta.28",
   "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.25",
-    "@aiot-toolkit/commander": "2.0.6-beta.25",
-    "@aiot-toolkit/emulator": "2.0.6-beta.25",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.25",
+    "@aiot-toolkit/aiotpack": "2.0.6-beta.28",
+    "@aiot-toolkit/commander": "2.0.6-beta.28",
+    "@aiot-toolkit/emulator": "2.0.6-beta.28",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.28",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "axios": "^1.7.4",
-    "file-lane": "2.0.6-beta.25",
+    "file-lane": "2.0.6-beta.28",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -42,6 +42,5 @@
     "@types/koa-router": "^7.4.8",
     "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8"
-  },
-  "gitHead": "25b954200dd056d25c2c9fa2c2ccd04f261d57af"
+  }
 }