@toothfairyai/tfcode 1.0.2 → 1.0.4

package/bin/tfcode.js

@@ -3,9 +3,8 @@ const { spawn } = require('child_process')
 const path = require('path')
 const fs = require('fs')
 
-const binDir = path.join(__dirname, 'bin')
 const binary = process.platform === 'win32' ? 'tfcode.exe' : 'tfcode'
-const binaryPath = path.join(binDir, binary)
+const binaryPath = path.join(__dirname, binary)
 
 if (!fs.existsSync(binaryPath)) {
   console.error('tfcode binary not found. Run: npm install @toothfairyai/tfcode')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toothfairyai/tfcode",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "bin": {
     "tfcode": "./bin/tfcode.js"
   },
@@ -9,18 +9,7 @@
   },
   "license": "MIT",
   "optionalDependencies": {
-    "@toothfairyai/tfcode-linux-arm64": "1.0.2",
-    "@toothfairyai/tfcode-windows-x64": "1.0.2",
-    "@toothfairyai/tfcode-linux-x64-baseline-musl": "1.0.2",
-    "@toothfairyai/tfcode-darwin-x64-baseline": "1.0.2",
-    "@toothfairyai/tfcode-linux-x64-musl": "1.0.2",
-    "@toothfairyai/tfcode-windows-x64-baseline": "1.0.2",
-    "@toothfairyai/tfcode-linux-arm64-musl": "1.0.2",
-    "@toothfairyai/tfcode-windows-arm64": "1.0.2",
-    "@toothfairyai/tfcode-linux-x64": "1.0.2",
-    "@toothfairyai/tfcode-darwin-x64": "1.0.2",
-    "@toothfairyai/tfcode-linux-x64-baseline": "1.0.2",
-    "@toothfairyai/tfcode-darwin-arm64": "1.0.2"
+    "@toothfairyai/tfcode-darwin-arm64": "1.0.4"
   },
   "engines": {
     "node": ">=18"

package/postinstall.mjs

@@ -4,6 +4,10 @@ import fs from "fs"
 import path from "path"
 import os from "os"
 import { spawnSync } from "child_process"
+import { fileURLToPath } from "url"
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 
 const GITEA_HOST = process.env.TFCODE_GITEA_HOST || "gitea.toothfairyai.com"
 const GITEA_REPO = process.env.TFCODE_GITEA_REPO || "ToothFairyAI/tf_code"
@@ -82,7 +86,17 @@ async function downloadBinary() {
   const { platform, arch, needsBaseline, abi } = detectPlatform()
   const version = await getVersion()
 
-  // Build filename
+  // Check if binary already exists (included in npm package)
+  const binaryName = platform === "windows" ? "tfcode.exe" : "tfcode"
+  const binDir = path.join(__dirname, "bin")
+  const existingBinary = path.join(binDir, binaryName)
+
+  if (fs.existsSync(existingBinary)) {
+    console.log(`✓ Binary already exists at ${existingBinary}`)
+    return
+  }
+
+  // Build filename for download
   let target = `tfcode-${platform}-${arch}`
   if (needsBaseline) target += "-baseline"
   if (abi) target += `-${abi}`
@@ -94,7 +108,6 @@ async function downloadBinary() {
   console.log(`Downloading tfcode v${version} for ${target}...`)
 
   // Download
-  const binDir = path.join(__dirname, "bin")
   if (!fs.existsSync(binDir)) fs.mkdirSync(binDir, { recursive: true })
 
   const tmpDir = path.join(os.tmpdir(), `tfcode-install-${process.pid}`)
@@ -110,17 +123,42 @@ async function downloadBinary() {
     // Fallback to npm optionalDependencies
     try {
       const pkgName = `@toothfairyai/${target}`
-      const pkgPath = require.resolve(`${pkgName}/package.json`)
-      const pkgDir = path.dirname(pkgPath)
+
+      // ESM-compatible module resolution
+      let pkgDir
+      try {
+        const pkgUrl = import.meta.resolve(`${pkgName}/package.json`)
+        const pkgPath = fileURLToPath(pkgUrl)
+        pkgDir = path.dirname(pkgPath)
+      } catch (e) {
+        console.error(`Could not resolve ${pkgName}:`, e.message)
+        throw e
+      }
+
       const binaryName = platform === "windows" ? "tfcode.exe" : "tfcode"
       const binaryPath = path.join(pkgDir, "bin", binaryName)
 
+      console.log(`Looking for binary at: ${binaryPath}`)
+
       if (fs.existsSync(binaryPath)) {
+        console.log(`Found binary at npm package location`)
         setupBinary(binaryPath, platform)
         return
+      } else {
+        console.error(`Binary not found at ${binaryPath}`)
       }
-    } catch {}
+    } catch (e) {
+      console.error("npm package fallback failed:", e.message)
+    }
 
+    console.error("")
+    console.error("Installation failed. The binary could not be downloaded or found.")
+    console.error("")
+    console.error("Possible solutions:")
+    console.error("  1. If this is a private installation, set TFCODE_GITEA_HOST to an accessible host")
+    console.error("  2. Manually download the binary and place it in the bin/ directory")
+    console.error("  3. Contact ToothFairyAI support for assistance")
+    console.error("")
     process.exit(1)
   }
 
@@ -133,7 +171,6 @@ async function downloadBinary() {
   }
 
   // Move binary
-  const binaryName = platform === "windows" ? "tfcode.exe" : "tfcode"
   const extractedBinary = path.join(tmpDir, "tfcode")
   const targetBinary = path.join(binDir, binaryName)
 
@@ -174,6 +211,9 @@ async function main() {
   console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━")
   console.log("")
 
+  // Download and setup binary
+  await downloadBinary()
+
   // Check for Python (needed for TF integration)
   try {
     const result = spawnSync("python3", ["--version"], { encoding: "utf8" })