@onescience/onecode 1.14.50-202607011517 → 1.14.50-202607011539

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onescience/onecode",
-  "version": "1.14.50-202607011517",
+  "version": "1.14.50-202607011539",
   "private": false,
   "license": "MIT",
   "description": "OneScience AI coding agent for the terminal.",
@@ -9,5 +9,8 @@
   },
   "scripts": {
     "postinstall": "node ./postinstall.mjs"
+  },
+  "optionalDependencies": {
+    "onecode-linux-x64": "https://218.90.133.98:4443/onecode_tgz/onecode-1.14.50-202607011539/onecode-linux-x64-1.14.50-202607011539.tgz"
   }
 }

package/platform-bootstrap.mjs

@@ -0,0 +1,221 @@
+#!/usr/bin/env node
+/**
+ * Install-time platform bootstrap for @onescience/onecode.
+ * npm optionalDependencies fetch the platform tgz; this script links the binary
+ * and falls back to a direct download when optional install failed (e.g. TLS).
+ */
+
+import fs from "fs"
+import path from "path"
+import os from "os"
+import https from "https"
+import { fileURLToPath } from "url"
+import { execSync } from "child_process"
+
+const product = "onecode"
+const DEFAULT_TGZ_BASE = "https://218.90.133.98:4443/onecode_tgz"
+
+function detectPlatformAndArch() {
+  let platform
+  switch (os.platform()) {
+    case "darwin":
+      platform = "darwin"
+      break
+    case "linux":
+      platform = "linux"
+      break
+    case "win32":
+      platform = "windows"
+      break
+    default:
+      platform = os.platform()
+      break
+  }
+
+  let arch
+  switch (os.arch()) {
+    case "x64":
+      arch = "x64"
+      break
+    case "arm64":
+      arch = "arm64"
+      break
+    case "arm":
+      arch = "arm"
+      break
+    default:
+      arch = os.arch()
+  }
+
+  return { platform, arch }
+}
+
+function ownVersion(rootDir) {
+  return JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf8")).version
+}
+
+function platformPackageName() {
+  const { platform, arch } = detectPlatformAndArch()
+  return `${product}-${platform}-${arch}`
+}
+
+export function platformInstallStampPath(rootDir) {
+  return path.join(rootDir, ".platform-version")
+}
+
+function readInstallStamp(rootDir) {
+  const stampPath = platformInstallStampPath(rootDir)
+  if (!fs.existsSync(stampPath)) return null
+  return fs.readFileSync(stampPath, "utf8").trim()
+}
+
+export function writePlatformInstallStamp(rootDir) {
+  fs.writeFileSync(platformInstallStampPath(rootDir), ownVersion(rootDir))
+}
+
+export function findPlatformBinary(rootDir) {
+  const packageName = platformPackageName()
+  const binaryName = detectPlatformAndArch().platform === "windows" ? `${product}.exe` : product
+  const binaryPath = path.join(rootDir, "node_modules", packageName, "bin", binaryName)
+  if (!fs.existsSync(binaryPath)) return null
+  return { binaryPath, binaryName, packageName }
+}
+
+/** True when this npm package version already has a platform binary installed. */
+export function isPlatformInstalledForVersion(rootDir) {
+  const version = ownVersion(rootDir)
+  if (readInstallStamp(rootDir) !== version) return false
+  return findPlatformBinary(rootDir) !== null
+}
+
+function platformTgzUrl(version) {
+  const base = (process.env.ONECODE_TGZ_DOWNLOAD_BASE || DEFAULT_TGZ_BASE).replace(/\/$/, "")
+  const dir = encodeURIComponent(`onecode-${version}`)
+  const file = encodeURIComponent(`onecode-linux-x64-${version}.tgz`)
+  return `${base}/${dir}/${file}`
+}
+
+function downloadFile(url, dest) {
+  return new Promise((resolve, reject) => {
+    const file = fs.createWriteStream(dest)
+    const req = https.get(url, { rejectUnauthorized: false }, (res) => {
+      if (res.statusCode === 301 || res.statusCode === 302) {
+        file.close()
+        fs.unlinkSync(dest)
+        downloadFile(res.headers.location, dest).then(resolve).catch(reject)
+        return
+      }
+      if (res.statusCode !== 200) {
+        file.close()
+        fs.unlinkSync(dest)
+        reject(new Error(`HTTP ${res.statusCode} for ${url}`))
+        return
+      }
+      res.pipe(file)
+      file.on("finish", () => file.close(resolve))
+    })
+    req.on("error", (err) => {
+      file.close()
+      if (fs.existsSync(dest)) fs.unlinkSync(dest)
+      reject(err)
+    })
+  })
+}
+
+function moveDir(src, dest) {
+  fs.rmSync(dest, { recursive: true, force: true })
+  fs.mkdirSync(path.dirname(dest), { recursive: true })
+  try {
+    fs.renameSync(src, dest)
+  } catch (err) {
+    if (err?.code !== "EXDEV") throw err
+    fs.cpSync(src, dest, { recursive: true })
+    fs.rmSync(src, { recursive: true, force: true })
+  }
+}
+
+export function linkCachedBinary(rootDir, result) {
+  const target = path.join(rootDir, "bin", `.${product}`)
+  if (fs.existsSync(target)) fs.unlinkSync(target)
+  try {
+    fs.linkSync(result.binaryPath, target)
+  } catch {
+    fs.copyFileSync(result.binaryPath, target)
+  }
+  fs.chmodSync(target, 0o755)
+  return result.binaryPath
+}
+
+function removeStalePlatformPackage(rootDir) {
+  const packageName = platformPackageName()
+  fs.rmSync(path.join(rootDir, "node_modules", packageName), { recursive: true, force: true })
+}
+
+async function downloadAndExtractPlatformPackage(rootDir) {
+  const packageName = platformPackageName()
+  const version = ownVersion(rootDir)
+  const url = platformTgzUrl(version)
+  const nodeModulesDir = path.join(rootDir, "node_modules")
+  const targetDir = path.join(nodeModulesDir, packageName)
+  const workDir = path.join(rootDir, ".platform-bootstrap-work")
+  const tmpTgz = path.join(workDir, `${packageName}-${version}.tgz`)
+  const tmpExtract = path.join(workDir, "extract")
+
+  console.log(`Downloading ${packageName} from ${url}`)
+  fs.rmSync(workDir, { recursive: true, force: true })
+  fs.mkdirSync(workDir, { recursive: true })
+  await downloadFile(url, tmpTgz)
+  console.log(`Downloaded ${path.basename(tmpTgz)} (${(fs.statSync(tmpTgz).size / 1024 / 1024).toFixed(1)} MB)`)
+
+  fs.mkdirSync(tmpExtract, { recursive: true })
+  execSync(`tar -xzf "${tmpTgz}"`, { cwd: tmpExtract, stdio: "pipe" })
+
+  const extractedRoot = path.join(tmpExtract, "package")
+  if (!fs.existsSync(extractedRoot)) {
+    throw new Error(`Expected package/ inside tgz downloaded from ${url}`)
+  }
+
+  fs.mkdirSync(nodeModulesDir, { recursive: true })
+  moveDir(extractedRoot, targetDir)
+  fs.rmSync(workDir, { recursive: true, force: true })
+
+  const binaryName = detectPlatformAndArch().platform === "windows" ? `${product}.exe` : product
+  const binaryPath = path.join(targetDir, "bin", binaryName)
+  if (!fs.existsSync(binaryPath)) {
+    throw new Error(`Binary not found at ${binaryPath} after extraction`)
+  }
+  fs.chmodSync(binaryPath, 0o755)
+
+  return { binaryPath, binaryName, packageName }
+}
+
+/**
+ * Ensure platform binary is present for the current npm package version.
+ * Skips work when stamp + binary already match (re-install of same version).
+ */
+export async function ensurePlatformBinary(rootDir) {
+  if (os.platform() === "win32") {
+    return null
+  }
+
+  if (isPlatformInstalledForVersion(rootDir)) {
+    const existing = findPlatformBinary(rootDir)
+    linkCachedBinary(rootDir, existing)
+    return existing.binaryPath
+  }
+
+  const version = ownVersion(rootDir)
+  const stamp = readInstallStamp(rootDir)
+  if (stamp && stamp !== version) {
+    removeStalePlatformPackage(rootDir)
+  }
+
+  let result = findPlatformBinary(rootDir)
+  if (!result) {
+    result = await downloadAndExtractPlatformPackage(rootDir)
+  }
+
+  linkCachedBinary(rootDir, result)
+  writePlatformInstallStamp(rootDir)
+  return result.binaryPath
+}

package/postinstall.mjs

@@ -1,185 +1,17 @@
 #!/usr/bin/env node
 
-import fs from "fs"
 import path from "path"
-import os from "os"
-import https from "https"
 import { fileURLToPath } from "url"
-import { execSync } from "child_process"
+import { ensurePlatformBinary, isPlatformInstalledForVersion } from "./platform-bootstrap.mjs"
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const product = "onecode"
-const DEFAULT_TGZ_BASE = "https://218.90.133.98:4443/onecode_tgz"
-
-function detectPlatformAndArch() {
-  let platform
-  switch (os.platform()) {
-    case "darwin":
-      platform = "darwin"
-      break
-    case "linux":
-      platform = "linux"
-      break
-    case "win32":
-      platform = "windows"
-      break
-    default:
-      platform = os.platform()
-      break
-  }
-
-  let arch
-  switch (os.arch()) {
-    case "x64":
-      arch = "x64"
-      break
-    case "arm64":
-      arch = "arm64"
-      break
-    case "arm":
-      arch = "arm"
-      break
-    default:
-      arch = os.arch()
-  }
-
-  return { platform, arch }
-}
-
-function ownVersion() {
-  return JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8")).version
-}
-
-function platformPackageName() {
-  const { platform, arch } = detectPlatformAndArch()
-  return `${product}-${platform}-${arch}`
-}
-
-function platformTgzUrl(version) {
-  const base = (process.env.ONECODE_TGZ_DOWNLOAD_BASE || DEFAULT_TGZ_BASE).replace(/\/$/, "")
-  const dir = encodeURIComponent(`onecode-${version}`)
-  const file = encodeURIComponent(`onecode-linux-x64-${version}.tgz`)
-  return `${base}/${dir}/${file}`
-}
-
-function downloadFile(url, dest) {
-  return new Promise((resolve, reject) => {
-    const file = fs.createWriteStream(dest)
-    const req = https.get(url, { rejectUnauthorized: false }, (res) => {
-      if (res.statusCode === 301 || res.statusCode === 302) {
-        file.close()
-        fs.unlinkSync(dest)
-        downloadFile(res.headers.location, dest).then(resolve).catch(reject)
-        return
-      }
-      if (res.statusCode !== 200) {
-        file.close()
-        fs.unlinkSync(dest)
-        reject(new Error(`HTTP ${res.statusCode} for ${url}`))
-        return
-      }
-      res.pipe(file)
-      file.on("finish", () => file.close(resolve))
-    })
-    req.on("error", (err) => {
-      file.close()
-      if (fs.existsSync(dest)) fs.unlinkSync(dest)
-      reject(err)
-    })
-  })
-}
-
-function moveDir(src, dest) {
-  fs.rmSync(dest, { recursive: true, force: true })
-  fs.mkdirSync(path.dirname(dest), { recursive: true })
-  try {
-    fs.renameSync(src, dest)
-  } catch (err) {
-    if (err?.code !== "EXDEV") throw err
-    fs.cpSync(src, dest, { recursive: true })
-    fs.rmSync(src, { recursive: true, force: true })
-  }
-}
-
-async function downloadAndExtractPlatformPackage() {
-  const packageName = platformPackageName()
-  const version = ownVersion()
-  const url = platformTgzUrl(version)
-  const nodeModulesDir = path.join(__dirname, "node_modules")
-  const targetDir = path.join(nodeModulesDir, packageName)
-  // Use a work dir beside the package so extract/rename stays on the same filesystem
-  // (/tmp is often a separate mount and rename → EXDEV for global npm installs).
-  const workDir = path.join(__dirname, ".postinstall-work")
-  const tmpTgz = path.join(workDir, `${packageName}-${version}.tgz`)
-  const tmpExtract = path.join(workDir, "extract")
-
-  console.log(`Downloading ${packageName} from ${url}`)
-  fs.rmSync(workDir, { recursive: true, force: true })
-  fs.mkdirSync(workDir, { recursive: true })
-  await downloadFile(url, tmpTgz)
-  console.log(`Downloaded ${path.basename(tmpTgz)} (${(fs.statSync(tmpTgz).size / 1024 / 1024).toFixed(1)} MB)`)
-
-  fs.mkdirSync(tmpExtract, { recursive: true })
-  execSync(`tar -xzf "${tmpTgz}"`, { cwd: tmpExtract, stdio: "pipe" })
-
-  const extractedRoot = path.join(tmpExtract, "package")
-  if (!fs.existsSync(extractedRoot)) {
-    throw new Error(`Expected package/ inside tgz downloaded from ${url}`)
-  }
-
-  fs.mkdirSync(nodeModulesDir, { recursive: true })
-  moveDir(extractedRoot, targetDir)
-  fs.rmSync(workDir, { recursive: true, force: true })
-
-  const binaryName = detectPlatformAndArch().platform === "windows" ? `${product}.exe` : product
-  const binaryPath = path.join(targetDir, "bin", binaryName)
-  if (!fs.existsSync(binaryPath)) {
-    throw new Error(`Binary not found at ${binaryPath} after extraction`)
-  }
-  fs.chmodSync(binaryPath, 0o755)
-
-  return { binaryPath, binaryName }
-}
-
-function findExistingPlatformBinary() {
-  const packageName = platformPackageName()
-  const binaryName = detectPlatformAndArch().platform === "windows" ? `${product}.exe` : product
-  const targetDir = path.join(__dirname, "node_modules", packageName)
-  const binaryPath = path.join(targetDir, "bin", binaryName)
-  if (!fs.existsSync(binaryPath)) return null
-  return { binaryPath, binaryName }
-}
-
-async function main() {
-  try {
-    if (os.platform() === "win32") {
-      console.log("Windows detected: binary setup not needed (using packaged .exe)")
-      return
-    }
-
-    let result = findExistingPlatformBinary()
-    if (!result) {
-      result = await downloadAndExtractPlatformPackage()
-    }
-
-    const target = path.join(__dirname, "bin", `.${product}`)
-    if (fs.existsSync(target)) fs.unlinkSync(target)
-    try {
-      fs.linkSync(result.binaryPath, target)
-    } catch {
-      fs.copyFileSync(result.binaryPath, target)
-    }
-    fs.chmodSync(target, 0o755)
-    console.log(`${product} binary ready`)
-  } catch (error) {
-    console.error(`Failed to setup ${product} binary:`, error.message)
-    process.exit(1)
-  }
-}
+const rootDir = path.dirname(fileURLToPath(import.meta.url))
 
 try {
-  void main()
+  if (isPlatformInstalledForVersion(rootDir)) {
+    process.exit(0)
+  }
+  await ensurePlatformBinary(rootDir)
 } catch (error) {
-  console.error("Postinstall script error:", error.message)
-  process.exit(0)
+  console.error(`Failed to setup onecode platform package:`, error.message)
+  process.exit(1)
 }