Merge pull request #5 from HumeAI/twitchard/better-cross-compat

Ship javascript, not binaries

Author: zgreathouse

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@humeai/cli",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "module": "index.ts",
   "type": "module",
   "description": "CLI for Hume.ai's OCTAVE expressive TTS API",
@@ -18,22 +18,21 @@
     "typecheck": "tsc --noEmit",
     "format": "prettier --write \"**/*.{ts,js,json,md}\"",
     "format:check": "prettier --check \"**/*.{ts,js,json,md}\"",
-    "prebuild": "bun build src/index.ts --compile --outfile dist/hume",
+    "prebuild": "bun build src/index.ts --target node --outfile dist/index.js && chmod +x dist/index.js",
     "prepublishOnly": "npm run prebuild"
   },
   "dependencies": {
     "@clack/prompts": "^0.10.0",
-    "bun": "^1.2.2",
     "clipanion": "^4.0.0-rc.4",
     "debug": "^4.4.0",
     "hume": "^0.10.3",
     "open": "^10.1.0",
     "typanion": "^3.14.0"
   },
   "files": [
-    "dist/hume"
+    "dist/index.js"
   ],
   "bin": {
-    "hume": "dist/hume"
+    "hume": "dist/index.js"
   }
 }

src/index.ts

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import {
   Cli,
   Command as ClipanionBaseCommand,

src/play_audio.ts

@@ -1,4 +1,5 @@
 import { debug } from './common';
+import { spawnSync, spawn } from 'child_process';
 
 type Command = {
   cmd: string;
@@ -52,28 +53,38 @@ const findDefaultAudioPlayer_ = (): Command | null => {
   for (const player of commonPlayers) {
     const checkCmd = isWindows ? 'where' : 'which';
     try {
-      Bun.spawnSync([checkCmd, player.cmd]);
+      spawnSync(checkCmd, [player.cmd]);
       return player; // found!
     } catch {}
   }
 
   return null;
 };
 
-export const playAudioFile = async (
-  path: string,
-  customCommand: string | null
-): Promise<unknown> => {
+export const playAudioFile = async (path: string, customCommand: string | null) => {
   const command = ensureAudioPlayer(
     customCommand ? parseCustomCommand(customCommand) : findDefaultAudioPlayer()
   );
   const isWindows = process.platform === 'win32';
   const sanitizedPath = isWindows ? path.replace(/\\/g, '\\\\') : path;
 
-  return Bun.spawn([command.cmd, ...command.argsWithPath(sanitizedPath)], {
-    stdout: 'ignore',
-    stderr: 'ignore',
-  }).exited;
+  return new Promise<void>((resolve, reject) => {
+    const process = spawn(command.cmd, [...command.argsWithPath(sanitizedPath)], {
+      stdio: ['ignore', 'ignore', 'ignore'],
+    });
+
+    process.on('close', (code: number) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Process exited with code ${code}`));
+      }
+    });
+
+    process.on('error', (err: any) => {
+      reject(err);
+    });
+  });
 };
 
 export const parseCustomCommand = (command: string): Command => {
@@ -114,17 +125,30 @@ export const withStdinAudioPlayer = async (
   const command = ensureStdinSupport(
     ensureAudioPlayer(customCommand ? parseCustomCommand(customCommand) : findDefaultAudioPlayer())
   );
-
   debug([command.cmd, command.argsWithStdin]);
-  const proc = Bun.spawn([command.cmd, ...command.argsWithStdin], {
-    stdout: 'ignore',
-    stderr: 'ignore',
-    stdin: 'pipe',
+
+  const { spawn } = require('child_process');
+  const proc = spawn(command.cmd, [...command.argsWithStdin], {
+    stdio: ['pipe', 'ignore', 'ignore'],
   });
 
-  await f((audioBuffer: Buffer) => {
+  await f((audioBuffer) => {
     proc.stdin.write(audioBuffer);
   });
+
   proc.stdin.end();
-  await proc.exited;
+
+  return new Promise((resolve, reject) => {
+    proc.on('close', (code: number) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Process exited with code ${code}`));
+      }
+    });
+
+    proc.on('error', (err: any) => {
+      reject(err);
+    });
+  });
 };