@harmonyos-arkts/droid2hmos 0.0.8 → 0.0.9

package/config/preflight-checklist.json

@@ -1,65 +1,65 @@
-{
-  "version": 1,
-  "checks": {
-    "android-ui-stack": {
-      "name": "Android UI 技术栈",
-      "required": true,
-      "enabled": true
-    },
-    "git": {
-      "name": "Git 仓库和工作区",
-      "required": true,
-      "enabled": true
-    },
-    "toolchain": {
-      "name": "主机综合工具链",
-      "required": true,
-      "enabled": true
-    },
-    "devecocli-auth": {
-      "name": "DevEco CLI 登录状态",
-      "required": true,
-      "enabled": true
-    },
-    "appgraph": {
-      "name": "AppGraph 兼容性和健康状态",
-      "required": true,
-      "enabled": true
-    },
-    "config": {
-      "name": ".migration/config.json",
-      "required": true,
-      "enabled": true
-    },
-    "android-build": {
-      "name": "Android 基线构建",
-      "required": false,
-      "enabled": false
-    },
-    "android-emulator": {
-      "name": "Android 模拟器",
-      "required": false,
-      "enabled": true
-    },
-    "harmony-project": {
-      "name": "HarmonyOS 工程存在或初始化",
-      "required": true,
-      "enabled": true
-    },
-    "harmony-sdk": {
-      "name": "HarmonyOS SDK 声明根目录",
-      "required": false,
-      "enabled": true
-    },
-    "harmony-build": {
-      "name": "HarmonyOS 应用 HAP 构建",
-      "required": true,
-      "enabled": true
-    },
-    "harmony-device": {
-      "name": "HarmonyOS 设备和 Shell",
-      "required": true,
-      "enabled": true
-    }
-  }
-}
+{
+  "version": 1,
+  "checks": {
+    "android-ui-stack": {
+      "name": "Android UI 技术栈",
+      "required": true,
+      "enabled": true
+    },
+    "git": {
+      "name": "Git 仓库和工作区",
+      "required": true,
+      "enabled": true
+    },
+    "toolchain": {
+      "name": "主机综合工具链",
+      "required": true,
+      "enabled": true
+    },
+    "devecocli-auth": {
+      "name": "DevEco CLI 登录状态",
+      "required": true,
+      "enabled": true
+    },
+    "appgraph": {
+      "name": "AppGraph 兼容性和健康状态",
+      "required": true,
+      "enabled": true
+    },
+    "config": {
+      "name": ".migration/config.json",
+      "required": true,
+      "enabled": true
+    },
+    "android-build": {
+      "name": "Android 基线构建",
+      "required": false,
+      "enabled": false
+    },
+    "android-emulator": {
+      "name": "Android 模拟器",
+      "required": false,
+      "enabled": true
+    },
+    "harmony-project": {
+      "name": "HarmonyOS 工程存在或初始化",
+      "required": true,
+      "enabled": true
+    },
+    "harmony-sdk": {
+      "name": "HarmonyOS SDK 声明根目录",
+      "required": false,
+      "enabled": true
+    },
+    "harmony-build": {
+      "name": "HarmonyOS 应用 HAP 构建",
+      "required": true,
+      "enabled": true
+    },
+    "harmony-device": {
+      "name": "HarmonyOS 设备和 Shell",
+      "required": true,
+      "enabled": true
+    }
+  }
+}

package/dist/cli.js

@@ -2395,6 +2395,14 @@ import { existsSync as existsSync3, readdirSync, statSync } from "fs";
 import path13 from "path";
 var DEVECO_CLI_PACKAGE = "@deveco/deveco-cli@latest";
 var DEVECO_CLI_INSTALL_COMMAND = `npm install -g ${DEVECO_CLI_PACKAGE}`;
+var NODE_INSPECTOR_OPTION = /(?:^|\s)--inspect(?:-brk|-port|-wait)?(?:=(?:"[^"]*"|'[^']*'|\S+))?(?=\s|$)/gu;
+function devEcoCliEnvironment(environment = process.env) {
+  const result = { ...environment, DEVECO_CLI_SKIP_VERSION_CHECK: "1" };
+  const nodeOptions = String(environment.NODE_OPTIONS ?? "").replace(NODE_INSPECTOR_OPTION, "").trim();
+  if (nodeOptions) result.NODE_OPTIONS = nodeOptions;
+  else delete result.NODE_OPTIONS;
+  return result;
+}
 function executableName() {
   return process.env.DEVECO_CLI_BINARY || "devecocli";
 }
@@ -2402,14 +2410,14 @@ function devEcoCliSpawn(executable, args) {
   const scriptWrapper = /\.m?js$/i.test(executable);
   return scriptWrapper ? [process.execPath, executable, ...args] : [executable, ...args];
 }
-function runDevEcoCli(args, { executable = executableName(), runner = spawnCommandSync, timeoutMs = 15e3 } = {}, cwd) {
+function runDevEcoCli(args, { executable = executableName(), runner = spawnCommandSync, timeoutMs = 15e3, environment = process.env } = {}, cwd) {
   const [command2, ...commandArgs] = devEcoCliSpawn(executable, args);
   const result = runner(command2, commandArgs, {
     cwd,
     encoding: "utf8",
     timeout: timeoutMs,
     windowsHide: true,
-    env: { ...process.env, DEVECO_CLI_SKIP_VERSION_CHECK: "1" }
+    env: devEcoCliEnvironment(environment)
   });
   return {
     executable,
@@ -2421,13 +2429,13 @@ function runDevEcoCli(args, { executable = executableName(), runner = spawnComma
     errorCode: result.error && "code" in result.error ? result.error.code : null
   };
 }
-async function runDevEcoCliAsync(args, { executable = executableName(), timeoutMs = 15e3 } = {}, cwd) {
+async function runDevEcoCliAsync(args, { executable = executableName(), timeoutMs = 15e3, environment = process.env } = {}, cwd) {
   const [command2, ...commandArgs] = devEcoCliSpawn(executable, args);
   const child = spawnCommand(command2, commandArgs, {
     cwd,
     windowsHide: true,
     detached: process.platform !== "win32",
-    env: { ...process.env, DEVECO_CLI_SKIP_VERSION_CHECK: "1" },
+    env: devEcoCliEnvironment(environment),
     stdio: ["ignore", "pipe", "pipe"]
   });
   let stdout = "";
@@ -2508,7 +2516,7 @@ function checkDevEcoCliAuth(cli = {}) {
   const result = runDevEcoCli(["auth", "status"], cli);
   const output = [result.stdout, result.stderr].map((value) => value.trim()).filter(Boolean).join("\n");
   const loggedOut = /(?:^|\n)Not logged in(?:\n|$)/i.test(output);
-  const currentUser = output.match(/(?:^|\n)Current user:\s*(.+?)(?:\n|$)/i)?.[1]?.trim();
+  const currentUser = output.match(/Current user:\s*([^\r\n]+)/i)?.[1]?.trim();
   if (result.status !== "passed" || loggedOut || !currentUser) {
     return {
       status: "failed",
@@ -4074,7 +4082,7 @@ async function runPreflight(options) {
 }
 
 // src/commands/deveco-auth-login.ts
-import { spawn as spawn3, spawnSync as spawnSync6 } from "child_process";
+import { spawnSync as spawnSync6 } from "child_process";
 import { closeSync as closeSync3, existsSync as existsSync6, mkdirSync as mkdirSync3, openSync as openSync3, readFileSync as readFileSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "fs";
 import path24 from "path";
 import { setTimeout as delay2 } from "timers/promises";
@@ -4212,7 +4220,7 @@ function runDetachedDevEcoAuthHost(requestPath) {
   const stdout = openSync3(request.stdout, "a");
   const stderr = openSync3(request.stderr, "a");
   try {
-    const child = spawn3(request.command[0], request.command.slice(1), {
+    const child = spawnCommand(request.command[0], request.command.slice(1), {
       cwd: request.cwd,
       detached: true,
       env: { ...process.env, ...request.env ?? {} },
@@ -4220,6 +4228,13 @@ function runDetachedDevEcoAuthHost(requestPath) {
       windowsHide: true
     });
     const stdin = child.stdin;
+    if (!stdin) {
+      try {
+        child.kill();
+      } catch {
+      }
+      throw new Error("DevEco CLI \u767B\u5F55\u8FDB\u7A0B\u7684 stdin \u4E0D\u53EF\u7528");
+    }
     stdin.on("error", () => {
     });
     stdin.write("\n");
@@ -4310,7 +4325,7 @@ async function managedDevEcoCliLogin(options) {
     stdout: state.stdoutLog,
     stderr: state.stderrLog,
     command: devEcoCliSpawn(executable, ["auth", "login"]),
-    env: { DEVECO_CLI_SKIP_VERSION_CHECK: "1" }
+    env: devEcoCliEnvironment()
   }, null, 2), "utf8");
   launchHostOutsideRunner(requestPath, options.hostCommand);
   progress(`\u5DF2\u6301\u4E45\u62C9\u8D77\u767B\u5F55\u8FDB\u7A0B\uFF08\u56DE\u8C03\u670D\u52A1\u5668\u968F\u8FDB\u7A0B\u5B58\u6D3B\uFF09\uFF0C\u65E5\u5FD7: ${state.stdoutLog}`);