ink-framework-audio 0.1.0-alpha.12 → 0.1.0-alpha.13

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "ink-framework-audio",
-  "version": "0.1.0-alpha.12",
+  "version": "0.1.0-alpha.13",
   "exports": {
     ".": "./src/index.ts",
     "./microphone": "./src/microphone.ts",
     "./recording": "./src/recording.ts"
   },
   "peerDependencies": {
-    "@ink/files": "npm:ink-framework-files@0.1.0-alpha.12",
-    "ink": "npm:ink-framework@0.1.0-alpha.12",
+    "@ink/files": "npm:ink-framework-files@0.1.0-alpha.13",
+    "ink": "npm:ink-framework@0.1.0-alpha.13",
     "react": "19.2.8"
   },
   "license": "MIT",
@@ -20,6 +20,7 @@
   "files": [
     "src",
     "*.json",
-    "*.ts"
+    "*.ts",
+    "*.md"
   ]
 }

package/src/capture-internal.ts

@@ -1,7 +1,7 @@
-import { createElement, useEffect, useMemo, useRef, useState } from "react";
+import { createElement, useEffect, useMemo, useState } from "ink/internal/react";
 import type { Snapshot, SnapshotSource } from "ink";
 import { NativeError } from "ink/native";
-import { attachNativeController } from "ink/native/controller";
+import { useNativeController } from "ink/internal/controller";
 
 const displayController = Symbol("captureController");
 export type CaptureDisplay = { readonly [displayController]: number | null };
@@ -48,7 +48,7 @@ export function useCapture<State extends { status: string; error: Error | null }
 ) {
   const [state, setState] = useState(() => selectStatus(initial));
   const [id, setId] = useState<number | null>(null);
-  const controller = useRef<ReturnType<typeof attachNativeController> | null>(null);
+  const controller = useNativeController("audio", "audio capture");
   const channel = useMemo(() => {
     let snapshot: Snapshot<State> = { status: "loading" };
     const listeners = new Set<() => void>();
@@ -75,7 +75,7 @@ export function useCapture<State extends { status: string; error: Error | null }
       },
     };
     return { source, publish, observe };
-  }, []);
+  }, [controller]);
   useEffect(() => {
     setState(selectStatus(initial));
     setId(null);
@@ -92,27 +92,18 @@ export function useCapture<State extends { status: string; error: Error | null }
       setState({ ...selectStatus(initial), status: "error", error: failure });
       channel.publish({ status: "error", error: failure });
     };
-    const attachment = attachNativeController("audio", { kind, config: referenceHz === undefined ? {} : { referenceHz } }, value => {
-      if (controller.current !== attachment) return;
+    return controller.attach({ kind, config: referenceHz === undefined ? {} : { referenceHz } }, value => {
       try { publish(decode(value)); }
       catch (error) { fail(error); }
+    }, fail, id => {
+      setId(id);
+      channel.observe();
     });
-    controller.current = attachment;
-    void attachment.ready.then(() => {
-      if (controller.current === attachment) {
-        setId(attachment.id);
-        channel.observe();
-      }
-    }, error => { if (controller.current === attachment) fail(error); });
-    return () => {
-      controller.current = null;
-      void attachment.dispose().catch(error => console.error("Could not release audio capture", error));
-    };
-  }, [kind, initial, decode, selectStatus, referenceHz, channel]);
+  }, [kind, initial, decode, selectStatus, referenceHz, channel, controller]);
   const call = useMemo(() => async (operation: string) => {
     if (!controller.current) throw new NativeError("unavailable", "Audio capture is not attached");
     return controller.current.call(operation);
-  }, []);
+  }, [controller]);
   const display = useMemo(() => ({ [displayController]: id }), [id]);
   return { state, ready: id !== null, call, display, measurements: channel.source };
 }

package/src/index.ts

@@ -1,5 +1,5 @@
-import { useEffect, useMemo, useRef, useState } from "react";
-import { attachNativeController } from "ink/native/controller";
+import { useEffect, useMemo, useRef, useState } from "ink/internal/react";
+import { useNativeController } from "ink/internal/controller";
 import { NativeError } from "ink/native";
 import { playbackController } from "ink/internal/playback";
 
@@ -137,24 +137,21 @@ export function usePlayer(options: PlayerOptions = {}) {
   if (!Number.isSafeInteger(startupBuffer) || startupBuffer < 0 || startupBuffer > 30_000) throw new RangeError("Startup buffering must be between 0 and 30000 milliseconds");
   const [state, setState] = useState(initial);
   const current = useRef(initial);
-  const controller = useRef<ReturnType<typeof attachNativeController> | null>(null);
+  const controller = useNativeController("audio", "audio player");
   useEffect(() => {
     const publish = (next: PlayerState) => { current.current = next; setState(next); };
     publish(initial);
-    const attachment = attachNativeController("audio", { kind: "player", config: { session, playback: mode, usage, cache, preloadNext, startupBuffer } }, value => {
+    const detach = controller.attach({ kind: "player", config: { session, playback: mode, usage, cache, preloadNext, startupBuffer } }, value => {
       try { publish(decode(value)); }
       catch (error) { publish({ ...initial, error: error instanceof Error ? error : new Error(String(error)) }); }
-    });
-    controller.current = attachment;
-    void attachment.ready.catch(error => {
-      if (controller.current === attachment) publish({ ...initial, error: error instanceof Error ? error : new Error(String(error)) });
+    }, error => {
+      publish({ ...initial, error: error instanceof Error ? error : new Error(String(error)) });
     });
     return () => {
-      controller.current = null;
+      detach();
       current.current = initial;
-      void attachment.dispose().catch(error => console.error("Could not release audio player", error));
     };
-  }, [session, mode, usage, cache, preloadNext, startupBuffer]);
+  }, [session, mode, usage, cache, preloadNext, startupBuffer, controller]);
   const commands = useMemo(() => {
     const call = async (operation: string, payload: unknown = {}) => {
       if (!controller.current || !current.current.ready) throw new NativeError("unavailable", "Audio player is not ready");
@@ -224,6 +221,6 @@ export function usePlayer(options: PlayerOptions = {}) {
         return call("seekTo", { value: position });
       },
     };
-  }, []);
+  }, [controller]);
   return { state, [playbackController]: controller.current?.id, ...commands };
 }

package/src/microphone.ts

@@ -1,4 +1,4 @@
-import { createElement, useMemo } from "react";
+import { createElement, useMemo } from "ink/internal/react";
 import { NativeError } from "ink/native";
 import { captureReadout, fields, useCapture, type CaptureDisplay } from "./capture-internal";
 

package/src/recording.ts

@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useMemo } from "ink/internal/react";
 import { NativeError } from "ink/native";
 import type { FileRef } from "@ink/files";
 import { captureReadout, fields, useCapture, type CaptureDisplay } from "./capture-internal";