@flintttan/hapi 0.5.43 → 0.5.44

package/bin/hapi.cjs

@@ -1,48 +1,165 @@
 #!/usr/bin/env node
 
-const { execFileSync } = require('child_process');
-const path = require('path');
+const { execFileSync } = require('child_process')
+const path = require('path')
 
-const platform = process.platform;
-const arch = process.arch;
-const pkgName = `@flintttan/hapi-${platform}-${arch}`;
+const platform = process.platform
+const arch = process.arch
+const PACKAGE_NAME = '@flintttan/hapi'
+const RELEASE_URL = 'https://github.com/flintttan/hapi/releases'
+const OFFICIAL_NPM_REGISTRY = 'https://registry.npmjs.org'
+const SUPPORTED_PLATFORMS = [
+    {
+        key: 'darwin-arm64',
+        label: 'darwin-arm64 (macOS Apple Silicon)'
+    },
+    {
+        key: 'darwin-x64',
+        label: 'darwin-x64 (macOS Intel)'
+    },
+    {
+        key: 'linux-arm64',
+        label: 'linux-arm64'
+    },
+    {
+        key: 'linux-x64',
+        label: 'linux-x64'
+    },
+    {
+        key: 'win32-x64',
+        label: 'win32-x64'
+    }
+]
+
+function getPlatformKey(platformName = platform, archName = arch) {
+    return `${platformName}-${archName}`
+}
+
+function getPlatformPackageName(platformName = platform, archName = arch) {
+    return `${PACKAGE_NAME}-${platformName}-${archName}`
+}
+
+function isSupportedPlatform(platformName = platform, archName = arch) {
+    return SUPPORTED_PLATFORMS.some((item) => item.key === getPlatformKey(platformName, archName))
+}
+
+function getBinaryPath(platformName = platform, archName = arch) {
+    const pkgName = getPlatformPackageName(platformName, archName)
 
-function getBinaryPath() {
     try {
-        // Try to find the platform-specific package
-        const pkgPath = require.resolve(`${pkgName}/package.json`);
-        const binName = platform === 'win32' ? 'hapi.exe' : 'hapi';
-        return path.join(path.dirname(pkgPath), 'bin', binName);
-    } catch (e) {
-        return null;
-    }
-}
-
-const binPath = getBinaryPath();
-
-if (!binPath) {
-    console.error(`Unsupported platform: ${platform}-${arch}`);
-    console.error('');
-    console.error('Supported platforms:');
-    console.error('  - darwin-arm64 (macOS Apple Silicon)');
-    console.error('  - darwin-x64 (macOS Intel)');
-    console.error('  - linux-arm64');
-    console.error('  - linux-x64');
-    console.error('  - win32-x64');
-    console.error('');
-    console.error('You can download the binary manually from:');
-console.error('  https://github.com/flintttan/hapi/releases');
-    process.exit(1);
-}
-
-try {
-    execFileSync(binPath, process.argv.slice(2), { stdio: 'inherit' });
-} catch (e) {
-    // If the binary execution fails, exit with the same code
-    if (e.status !== undefined) {
-        process.exit(e.status);
-    }
-    // For other errors (e.g., binary not found), print and exit
-    console.error(`Failed to execute ${binPath}:`, e.message);
-    process.exit(1);
+        const pkgPath = require.resolve(`${pkgName}/package.json`)
+        const binName = platformName === 'win32' ? 'hapi.exe' : 'hapi'
+        return path.join(path.dirname(pkgPath), 'bin', binName)
+    } catch {
+        return null
+    }
+}
+
+function formatCommand(binPath, args) {
+    return [binPath, ...args].map((arg) => JSON.stringify(String(arg))).join(' ')
+}
+
+function normalizeExecError(error) {
+    return {
+        status: typeof error?.status === 'number' ? error.status : null,
+        signal: typeof error?.signal === 'string' ? error.signal : null,
+        message: error?.message ? String(error.message) : null
+    }
+}
+
+function reportExecutionFailure(error, binPath, args, log = console.error) {
+    const { status, signal, message } = normalizeExecError(error)
+
+    log(`Failed to execute: ${formatCommand(binPath, args)}`)
+
+    if (signal) {
+        log(`Binary terminated by signal ${signal}.`)
+    }
+
+    if (status !== null) {
+        log(`Binary exited with status ${status}.`)
+    }
+
+    if (message) {
+        log(message)
+    }
+
+    return { status, signal }
+}
+
+function reportUnsupportedPlatform(platformName = platform, archName = arch, log = console.error) {
+    log(`Unsupported platform: ${platformName}-${archName}`)
+    log('')
+    log('Supported platforms:')
+    for (const item of SUPPORTED_PLATFORMS) {
+        log(`  - ${item.label}`)
+    }
+    log('')
+    log('You can download the binary manually from:')
+    log(`  ${RELEASE_URL}`)
+}
+
+function reportMissingPlatformPackage(platformName = platform, archName = arch, log = console.error) {
+    const platformPackage = getPlatformPackageName(platformName, archName)
+    log(`Missing platform package: ${platformPackage}`)
+    log('')
+    log(`Detected platform ${platformName}-${archName} is supported, but the platform binary package was not installed.`)
+    log('This may happen when using a registry mirror that has not synced all optionalDependencies.')
+    log('')
+    log('Try reinstalling with the official npm registry:')
+    log(`  npm install -g ${PACKAGE_NAME} --registry=${OFFICIAL_NPM_REGISTRY}`)
+    log('')
+    log('Or download the binary manually from:')
+    log(`  ${RELEASE_URL}`)
+}
+
+function main() {
+    if (!isSupportedPlatform()) {
+        reportUnsupportedPlatform()
+        process.exit(1)
+    }
+
+    const binPath = getBinaryPath()
+    if (!binPath) {
+        reportMissingPlatformPackage()
+        process.exit(1)
+    }
+
+    const args = process.argv.slice(2)
+
+    try {
+        execFileSync(binPath, args, { stdio: 'inherit' })
+    } catch (error) {
+        const { status, signal } = reportExecutionFailure(error, binPath, args)
+
+        if (status !== null) {
+            process.exit(status)
+        }
+
+        if (signal) {
+            try {
+                process.kill(process.pid, signal)
+            } catch {
+                // ignore unsupported/invalid signal names on this platform
+            }
+        }
+
+        process.exit(1)
+    }
+}
+
+if (require.main === module) {
+    main()
+}
+
+module.exports = {
+    formatCommand,
+    getBinaryPath,
+    getPlatformKey,
+    getPlatformPackageName,
+    isSupportedPlatform,
+    normalizeExecError,
+    reportExecutionFailure,
+    reportMissingPlatformPackage,
+    reportUnsupportedPlatform
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flintttan/hapi",
-    "version": "0.5.43",
+    "version": "0.5.44",
     "description": "App for agentic coding - access coding agent anywhere",
     "author": "Kirill Dubovitskiy & weishu",
     "license": "AGPL-3.0-only",
@@ -20,10 +20,10 @@
         "NOTICE"
     ],
     "optionalDependencies": {
-        "@flintttan/hapi-darwin-arm64": "0.5.43",
-        "@flintttan/hapi-darwin-x64": "0.5.43",
-        "@flintttan/hapi-linux-arm64": "0.5.43",
-        "@flintttan/hapi-linux-x64": "0.5.43",
-        "@flintttan/hapi-win32-x64": "0.5.43"
+        "@flintttan/hapi-darwin-arm64": "0.5.44",
+        "@flintttan/hapi-darwin-x64": "0.5.44",
+        "@flintttan/hapi-linux-arm64": "0.5.44",
+        "@flintttan/hapi-linux-x64": "0.5.44",
+        "@flintttan/hapi-win32-x64": "0.5.44"
     }
 }