@nemoobc/opencode-termux 1.18.22 → 1.18.24

package/bin/opencode.js

@@ -26,14 +26,16 @@ if (!ready()) {
 
 if (!ready()) process.exit(1)
 
-// Diagnosa awal: Android sering tidak punya /etc/resolv.conf yang dibaca musl.
+// DNS fix: musl hasil build kita membaca config dari prefix Termux —
+// pastikan filenya ada (bisa ditulis tanpa root).
 try {
-  if (!fs.existsSync("/etc/resolv.conf")) {
-    console.error("[opencode-termux] ⚠️  /etc/resolv.conf tidak ada di device ini;")
-    console.error("    kalau perintah jaringan (models/login) gagal/gantung, itu sebabnya.")
-    console.error("    Solusi sementara (butuh akses root):")
-    console.error('      su -c \'mkdir -p /etc && echo "nameserver 8.8.8.8" > /etc/resolv.conf\'')
-  }
+  const PREFIX = process.env.TERMUX_PREFIX || "/data/data/com.termux/files/usr"
+  const etc = path.join(PREFIX, "etc")
+  fs.mkdirSync(etc, { recursive: true })
+  const rc = path.join(etc, "resolv.conf")
+  if (!fs.existsSync(rc)) fs.writeFileSync(rc, "nameserver 1.1.1.1\nnameserver 8.8.8.8\n")
+  const hh = path.join(etc, "hosts")
+  if (!fs.existsSync(hh)) fs.writeFileSync(hh, "127.0.0.1 localhost\n")
 } catch {}
 
 // LD_PRELOAD bawaan Termux (libtermux-exec) dibuat untuk Bionic dan akan

package/install.mjs

@@ -54,32 +54,53 @@ const untar = (tgz, dest, members = []) => {
 const work = path.join(__dirname, ".build")
 fs.rmSync(work, { recursive: true, force: true })
 fs.mkdirSync(work, { recursive: true })
+const AV = "v3.21", AL = "3.21.3"
 
 // 1) binary opencode (musl) dari npm resmi
 await dl(`https://registry.npmjs.org/opencode-linux-${ARCH}-musl/-/opencode-linux-${ARCH}-musl-${V}.tgz`, `${work}/oc.tgz`)
 untar(`${work}/oc.tgz`, `${work}/oc`)
 
-// 2) loader+libc musl dari Alpine minirootfs
-const AV = "v3.21", AL = "3.21.3"
-await dl(`https://dl-cdn.alpinelinux.org/alpine/${AV}/releases/${A}/alpine-minirootfs-${AL}-${A}.tar.gz`, `${work}/ap.tgz`)
-untar(`${work}/ap.tgz`, `${work}/ap`, ["lib"])
-
-// 3) libgcc + libstdc++
+// 2) libgcc + libstdc++
 const apkDir = `${work}/apk`; fs.mkdirSync(apkDir, { recursive: true })
 for (const f of [`libgcc-14.2.0-r4.apk`, `libstdc%2B%2B-14.2.0-r4.apk`]) {
   await dl(`https://dl-cdn.alpinelinux.org/alpine/${AV}/main/${A}/${f}`, `${apkDir}/${f}`)
   untar(`${apkDir}/${f}`, apkDir)
 }
 
-// 4) rakit vendor/
+// 3) rakit vendor/
 const vendor = path.join(__dirname, "vendor")
 fs.rmSync(vendor, { recursive: true, force: true }); fs.mkdirSync(vendor)
-const cp = (from, name) => fs.copyFileSync(path.join(from, name), path.join(vendor, name))
-cp(`${work}/ap/lib`, `ld-musl-${A}.so.1`); fs.renameSync(path.join(vendor, `ld-musl-${A}.so.1`), path.join(vendor, "ld-musl.so"))
+const cp = (dir, name) => fs.copyFileSync(path.join(dir, name), path.join(vendor, name))
+if (A === "aarch64") {
+  // loader hasil build khusus: resolv.conf & hosts menunjuk ke prefix Termux
+  cp(path.join(__dirname, "prebuilt"), "ld-musl-aarch64-termux.so")
+  fs.renameSync(path.join(vendor, "ld-musl-aarch64-termux.so"), path.join(vendor, "ld-musl.so"))
+} else {
+  const mini = `${work}/ap`; await dl(
+    `https://dl-cdn.alpinelinux.org/alpine/${AV}/releases/${A}/alpine-minirootfs-${AL}-${A}.tar.gz`, `${work}/ap.tgz`)
+  untar(`${work}/ap.tgz`, mini, ["lib"])
+  cp(`${mini}/lib`, `ld-musl-${A}.so.1`); fs.renameSync(path.join(vendor, `ld-musl-${A}.so.1`), path.join(vendor, "ld-musl.so"))
+}
 cp(`${work}/oc/package/bin`, "opencode")
 cp(`${apkDir}/usr/lib`, "libstdc++.so.6"); cp(`${apkDir}/usr/lib`, "libstdc++.so.6.0.33"); cp(`${apkDir}/usr/lib`, "libgcc_s.so.1")
 for (const f of fs.readdirSync(vendor)) fs.chmodSync(path.join(vendor, f), 0o755)
 
+// 4) siapkan DNS config di prefix Termux (bisa ditulis TANPA root)
+function ensureEtc() {
+  try {
+    const PREFIX = process.env.TERMUX_PREFIX || "/data/data/com.termux/files/usr"
+    const etc = path.join(PREFIX, "etc")
+    fs.mkdirSync(etc, { recursive: true })
+    const rc = path.join(etc, "resolv.conf")
+    if (!fs.existsSync(rc)) fs.writeFileSync(rc, "nameserver 1.1.1.1\nnameserver 8.8.8.8\n")
+    const hh = path.join(etc, "hosts")
+    if (!fs.existsSync(hh)) fs.writeFileSync(hh, "127.0.0.1 localhost\n")
+  } catch (e) {
+    if (!FORCE && IS_ANDROID) throw e
+  }
+}
+ensureEtc()
+
 // 5) smoke test (LD_PRELOAD termux-exec dibuang: tidak kompatibel dengan musl)
 console.log("[opencode-termux] smoke test…")
 const { LD_PRELOAD, LD_PRELOAD_32BIT, ...cleanEnv } = process.env

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nemoobc/opencode-termux",
-  "version": "1.18.22",
+  "version": "1.18.24",
   "description": "opencode CLI native untuk Termux/Android tanpa proot — membundel loader musl + binary opencode resmi (upstream opencode-ai)",
   "bin": {
     "opencode-termux": "./bin/opencode.js"
@@ -22,6 +22,8 @@
   "files": [
     "bin",
     "install.mjs",
+    "prebuilt",
     "README.md"
-  ]
+  ],
+  "opencodeUpstream": "1.18.21"
 }