@deveco-test/deveco-code 1.10.28 → 1.10.30

package/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "1.10.28",
+  "version": "1.10.30",
   "license": "MIT",
   "files": [
     "bin/**/*",
@@ -16,10 +16,10 @@
     "CHANGELOG.md"
   ],
   "optionalDependencies": {
-    "@deveco-test/deveco-code-darwin-x64": "1.10.28",
-    "@deveco-test/deveco-code-darwin-arm64": "1.10.28",
-    "@deveco-test/deveco-code-windows-x64-baseline": "1.10.28",
-    "@deveco-test/deveco-code-windows-x64": "1.10.28"
+    "@deveco-test/deveco-code-darwin-x64": "1.10.30",
+    "@deveco-test/deveco-code-darwin-arm64": "1.10.30",
+    "@deveco-test/deveco-code-windows-x64-baseline": "1.10.30",
+    "@deveco-test/deveco-code-windows-x64": "1.10.30"
   },
   "dependencies": {
     "@deveco/deveco-cli": "1.3.2"

package/postinstall.mjs

@@ -30,6 +30,34 @@ const sourceBinary = platform === "windows" ? "deveco.exe" : "deveco"
 const targetBinary = path.join(__dirname, "bin", "deveco.exe")
 const devecoCliPackageName = "@deveco/deveco-cli"
 
+// Mirrors packages/tui isOhos(): OHOS PCs report linux/arm64 to npm but need
+// the cross-built hmos artifact instead of a generic linux platform package.
+function isOhos() {
+  if (os.platform() === "openharmony") return true
+  if (os.platform() !== "linux") return false
+  let filePara = false
+  let fileRelease = false
+  try {
+    filePara = fs.existsSync("/system/etc/ohos.para")
+    fileRelease = fs.existsSync("/etc/ohos-release")
+  } catch {
+    // Ignore filesystem probes that are blocked by the host.
+  }
+  const rel = os.release().toLowerCase()
+  return (
+    Boolean(process.env.HOS_VERSION) ||
+    Boolean(process.env.OHOS_API_VERSION) ||
+    rel.includes("ohos") ||
+    rel.includes("hongmeng") ||
+    filePara ||
+    fileRelease
+  )
+}
+
+function binaryName(name) {
+  return name.includes("-hmos-") ? "hmos" : sourceBinary
+}
+
 function resolveLocalDevecoCliEntry() {
   const packageJsonPath = require.resolve(`${devecoCliPackageName}/package.json`)
   const entry = path.join(path.dirname(packageJsonPath), "dist", "cli.js")
@@ -109,6 +137,7 @@ function isMusl() {
 }
 
 function packageNames() {
+  if (isOhos()) return [`${scope}/deveco-code-hmos-${arch}`]
   const baseline = arch === "x64" && !supportsAvx2()
 
   if (platform === "linux") {
@@ -137,7 +166,7 @@ function resolvePackageDir(name) {
 }
 
 function resolveBinary(name) {
-  const binaryPath = path.join(resolvePackageDir(name), "bin", sourceBinary)
+  const binaryPath = path.join(resolvePackageDir(name), "bin", binaryName(name))
   if (!fs.existsSync(binaryPath)) throw new Error(`Binary not found at ${binaryPath}`)
   return binaryPath
 }
@@ -202,8 +231,9 @@ function ensureVendorExecutables(vendorRoot) {
 }
 
 function installPackage(name) {
-  const version = packageJson.optionalDependencies?.[name]
-  if (!version) return
+  // hmos artifacts stay out of optionalDependencies (no os/cpu tuple), so fall
+  // back to the release version shared by every package in this train.
+  const version = packageJson.optionalDependencies?.[name] ?? packageJson.version
 
   const temp = fs.mkdtempSync(path.join(os.tmpdir(), "opencode-install-"))
   try {
@@ -214,7 +244,7 @@ function installPackage(name) {
     )
     if (result.status !== 0) return
     const packageDir = path.join(temp, "node_modules", name)
-    copyBinary(path.join(packageDir, "bin", sourceBinary), targetBinary)
+    copyBinary(path.join(packageDir, "bin", binaryName(name)), targetBinary)
     copyVendor(packageDir)
     return true
   } finally {
@@ -243,18 +273,36 @@ function verifyBinary() {
   return result.status === 0
 }
 
+function writeVendorEntryMarker(installRoot) {
+  const vendorRoot = path.join(installRoot, "vendor", "deveco-cli")
+  const names = ["@deveco-test/hmos-deveco-cli", "@deveco/deveco-cli", "@deveco-test/deveco-cli"]
+  for (const name of names) {
+    const entry = path.join(vendorRoot, "node_modules", ...name.split("/"), "dist", "cli.js")
+    if (!fs.existsSync(entry)) continue
+    fs.mkdirSync(path.join(installRoot, "vendor"), { recursive: true })
+    fs.writeFileSync(path.join(installRoot, "vendor", ".deveco-cli-entry"), `${entry}\n`, "utf8")
+    return
+  }
+}
+
 function main() {
-  writeDevecoCliEntryMarker(__dirname)
+  // On OHOS the npm dependency cli must not win over the vendored hmos cli, so
+  // the dependency marker is skipped and the vendor marker is written instead.
+  if (!isOhos()) writeDevecoCliEntryMarker(__dirname)
 
   for (const name of packageNames()) {
     try {
       const packageDir = resolvePackageDir(name)
       copyBinary(resolveBinary(name), targetBinary)
       copyVendor(packageDir)
-      writeDevecoCliEntryMarker(packageDir)
+      if (isOhos()) writeVendorEntryMarker(__dirname)
+      else writeDevecoCliEntryMarker(packageDir)
       if (verifyBinary()) return
     } catch {
-      if (installPackage(name) && verifyBinary()) return
+      if (installPackage(name)) {
+        if (isOhos()) writeVendorEntryMarker(__dirname)
+        if (verifyBinary()) return
+      }
     }
   }