agent-notify 0.2.4 → 0.2.5

package/bin/agent-notify.js

@@ -6,58 +6,26 @@ const path = require('path');
 const os = require('os');
 const fs = require('fs');
 
-function getBinaryName() {
-  return os.platform() === 'win32' ? 'agent-notify.exe' : 'agent-notify';
-}
-
-function getBinaryPath() {
-  const binaryName = getBinaryName();
-  const searchPaths = [];
-
-  // 1. npm global bin directory
+function getBinaryDir() {
+  // Try to get npm global bin directory
+  // npm bin -g is deprecated, use npm prefix -g instead
   try {
     const prefix = execSync('npm prefix -g', { encoding: 'utf8' }).trim();
-    if (os.platform() === 'win32') {
-      searchPaths.push(prefix);
-    } else {
-      searchPaths.push(path.join(prefix, 'bin'));
-    }
+    return path.join(prefix, 'bin');
   } catch (e) {
-    // npm not available
-  }
-
-  // 2. GOPATH/bin
-  if (process.env.GOPATH) {
-    searchPaths.push(path.join(process.env.GOPATH, 'bin'));
+    // Fallback to ~/.local/bin
+    return path.join(os.homedir(), '.local', 'bin');
   }
+}
 
-  // 3. HOME/go/bin (default GOPATH)
-  searchPaths.push(path.join(os.homedir(), 'go', 'bin'));
-
-  // 4. ~/.local/bin
-  searchPaths.push(path.join(os.homedir(), '.local', 'bin'));
-
-  // 5. Search in PATH
-  try {
-    const whichCmd = os.platform() === 'win32' ? 'where' : 'which';
-    const result = execSync(`${whichCmd} ${binaryName}`, { encoding: 'utf8' }).trim();
-    if (result) {
-      return result.split('\n')[0].trim();
-    }
-  } catch (e) {
-    // Not found in PATH
-  }
+const BINARY_DIR = getBinaryDir();
 
-  // Return first existing path or first search path as default
-  for (const searchPath of searchPaths) {
-    const binaryPath = path.join(searchPath, binaryName);
-    if (fs.existsSync(binaryPath)) {
-      return binaryPath;
-    }
-  }
+function getBinaryName() {
+  return os.platform() === 'win32' ? 'agent-notify.exe' : 'agent-notify';
+}
 
-  // Fallback to npm global bin
-  return path.join(searchPaths[0] || path.join(os.homedir(), '.local', 'bin'), binaryName);
+function getBinaryPath() {
+  return path.join(BINARY_DIR, getBinaryName());
 }
 
 function run() {
@@ -65,11 +33,7 @@ function run() {
 
   if (!fs.existsSync(binaryPath)) {
     console.error(`Binary not found at ${binaryPath}`);
-    console.error('');
-    console.error('Please install agent-notify first:');
-    console.error('  npx agent-notify    # auto-download');
-    console.error('  or');
-    console.error('  go install github.com/hellolib/agent-notify/cmd/agent-notify@latest');
+    console.error('Please run: npm install or npx @hellolib/agent-notify');
     process.exit(1);
   }
 

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "agent-notify",
-  "version": "0.2.4",
+  "version": "0.2.5",
+  "agentnotifyversion": "0.2.4",
   "description": "Agent notification tool with Feishu integration",
   "bin": {
     "agent-notify": "./bin/agent-notify.js"

package/scripts/install.js

@@ -7,9 +7,43 @@ const path = require('path');
 const os = require('os');
 const { execSync } = require('child_process');
 
-const PACKAGE_VERSION = require('../package.json').version;
+const PACKAGE_VERSION = require('../package.json').agentnotifyversion;
 const GITHUB_REPO = 'hellolib/agent-notify';
 
+// Possible locations where agent-notify might be installed
+function getCommonBinaryDirs() {
+  const dirs = [];
+  const binaryName = os.platform() === 'win32' ? 'agent-notify.exe' : 'agent-notify';
+
+  // GOPATH/bin
+  if (process.env.GOPATH) {
+    dirs.push(path.join(process.env.GOPATH, 'bin'));
+  }
+  // GOBIN
+  if (process.env.GOBIN) {
+    dirs.push(process.env.GOBIN);
+  }
+  // Default Go bin directory
+  dirs.push(path.join(os.homedir(), 'go', 'bin'));
+  // ~/.local/bin
+  dirs.push(path.join(os.homedir(), '.local', 'bin'));
+  // /usr/local/bin
+  dirs.push('/usr/local/bin');
+
+  return dirs;
+}
+
+function findExistingBinary(binaryName) {
+  const dirs = getCommonBinaryDirs();
+  for (const dir of dirs) {
+    const binaryPath = path.join(dir, binaryName);
+    if (fs.existsSync(binaryPath)) {
+      return binaryPath;
+    }
+  }
+  return null;
+}
+
 function getBinaryDir() {
   // Try to get npm global bin directory
   // npm bin -g is deprecated, use npm prefix -g instead
@@ -108,7 +142,7 @@ async function install() {
   const localBinaryName = getLocalBinaryName();
   const binaryPath = path.join(BINARY_DIR, localBinaryName);
 
-  // Check if binary already exists with correct version
+  // Check if binary already exists in npm bin directory with correct version
   if (fs.existsSync(binaryPath)) {
     const installedVersion = getInstalledVersion(binaryPath);
     if (installedVersion === PACKAGE_VERSION) {
@@ -116,6 +150,34 @@ async function install() {
       return;
     }
     console.log(`Updating binary from v${installedVersion || 'unknown'} to v${PACKAGE_VERSION}...`);
+  } else {
+    // Check if binary exists in other common directories
+    const existingBinary = findExistingBinary(localBinaryName);
+    if (existingBinary) {
+      const existingVersion = getInstalledVersion(existingBinary);
+      if (existingVersion === PACKAGE_VERSION) {
+        // Same version, copy/link to npm bin directory
+        console.log(`Found existing binary at ${existingBinary} (v${PACKAGE_VERSION})`);
+        console.log(`Copying to npm bin directory: ${binaryPath}`);
+
+        if (!fs.existsSync(BINARY_DIR)) {
+          fs.mkdirSync(BINARY_DIR, { recursive: true });
+        }
+
+        fs.copyFileSync(existingBinary, binaryPath);
+        if (os.platform() !== 'win32') {
+          fs.chmodSync(binaryPath, 0o755);
+        }
+        console.log('Done!');
+        return;
+      } else if (existingVersion) {
+        console.log(`Found existing binary at ${existingBinary} (v${existingVersion}), but need v${PACKAGE_VERSION}`);
+        console.log('Installing new version to npm bin directory...');
+      } else {
+        console.log(`Found existing binary at ${existingBinary}, but version unknown`);
+        console.log('Installing to npm bin directory...');
+      }
+    }
   }
 
   // Create binary directory