@mediaway/ffi 0.1.5 → 0.1.8

package/dist/index.d.ts

@@ -14,10 +14,8 @@
  *     `_free` — the public packages do this automatically.
  */
 import { type TypeObject } from "koffi";
-export declare function findLibrary(name: string): string;
-export declare const containerLib: import("koffi").LibraryHandle;
-export declare const pipelineLib: import("koffi").LibraryHandle;
-export declare const deviceLib: import("koffi").LibraryHandle;
+import { findLibrary, containerLib, pipelineLib, deviceLib } from "./loader.js";
+export { findLibrary, containerLib, pipelineLib, deviceLib };
 export declare const MwRational: TypeObject;
 export declare const MwVideoTrackInfo: TypeObject;
 export declare const MwAudioTrackInfo: TypeObject;
@@ -35,6 +33,9 @@ export declare const MwCameraConfig: TypeObject;
 export declare const MwCameraFrame: TypeObject;
 export declare const MwDesktopConfig: TypeObject;
 export declare const MwDesktopFrame: TypeObject;
+export declare const MwGpuAdapterInfo: TypeObject;
+export declare const MwGpuAdapterSelect: TypeObject;
+export declare const MwGpuDeviceOptions: TypeObject;
 export declare const MwAudioConfig: TypeObject;
 export declare const MwAudioFrame: TypeObject;
 export declare const MwAudioEncodeConfig: TypeObject;
@@ -166,6 +167,8 @@ export declare const pipeline: {
     audioDecodeSessionFlush: import("koffi").Callable;
     audioDecodeSessionClose: import("koffi").Callable;
     decodedAudioFrameFree: import("koffi").Callable;
+    sessionWriteFrameFromCameraCapture: import("koffi").Callable;
+    sessionWriteFrameFromDesktopCapture: import("koffi").Callable;
 };
 export declare const device: {
     abiVersion: import("koffi").Callable;
@@ -190,6 +193,11 @@ export declare const device: {
     audioPollFrame: import("koffi").Callable;
     audioClose: import("koffi").Callable;
     audioFrameFree: import("koffi").Callable;
+    gpuAdapterList: import("koffi").Callable;
+    gpuAdapterListFree: import("koffi").Callable;
+    gpuDeviceCreate: import("koffi").Callable;
+    gpuDeviceHandle: import("koffi").Callable;
+    gpuDeviceClose: import("koffi").Callable;
 };
 /** Copy `len` bytes out of a koffi pointer/opaque handle. */
 export declare function copyBytes(ptr: unknown, len: number): Buffer;
@@ -290,6 +298,20 @@ export interface RawCameraFrame {
     data: unknown;
     data_len: number;
 }
+/** `mediaway_desktop_frame_t` (Screen output) — unlike `RawCameraFrame`, GPU
+ * storage (`storage_kind == 1`) leaves `data`/`data_len` empty and carries the
+ * frame in `gpu_buffer` instead (borrowed — never freed by the caller). */
+export interface RawDesktopFrame {
+    pts: bigint | number;
+    duration: bigint | number;
+    width: number;
+    height: number;
+    pixel_format: number;
+    storage_kind: number;
+    data: unknown;
+    data_len: number;
+    gpu_buffer: RawGpuBufferHandle;
+}
 export interface RawAudioFrame {
     pts: bigint | number;
     duration: bigint | number;
@@ -311,6 +333,13 @@ export interface RawPipelineFrame {
     raw_bytes_len: number;
     gpu_buffer: RawGpuBufferHandle;
 }
+/** `mediaway_gpu_device_handle_t` (Screen capture / GPU-input encode input,
+ * mediaway_gpu_device_handle()'s output). */
+export interface RawGpuDeviceHandle {
+    kind: number;
+    native: number | bigint;
+    webgpu_device_id: number | bigint;
+}
 /** `mediaway_gpu_buffer_handle_t`. */
 export interface RawGpuBufferHandle {
     kind: number;
@@ -403,3 +432,23 @@ export interface RawDecodedAudioFrame {
     data: unknown;
     data_len: number;
 }
+/** `mediaway_gpu_adapter_info_t` (mediaway-device ADR-0007). */
+export interface RawGpuAdapterInfo {
+    index: number;
+    name: string;
+    vendor_id: number;
+    device_id: number;
+    dedicated_video_memory: bigint | number;
+    is_hardware: boolean;
+}
+/** `mediaway_gpu_adapter_select_t`. */
+export interface RawGpuAdapterSelect {
+    kind: number;
+    index: number;
+}
+/** `mediaway_gpu_device_options_t`. */
+export interface RawGpuDeviceOptions {
+    adapter: RawGpuAdapterSelect;
+    video_support: boolean;
+    debug_layer: boolean;
+}

package/dist/index.js

@@ -14,58 +14,8 @@
  *     `_free` — the public packages do this automatically.
  */
 import koffi, {} from "koffi";
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-// ── Library discovery ──────────────────────────────────────────────────────────
-// The cdylibs are Rust build artifacts, not installed system libraries. Search:
-//   1. $MEDIAWAY_FFI_DIR
-//   2. <this package>/native        (DLLs bundled at pack time — the npm distribution)
-//   3. <repo root>/target/x86_64-pc-windows-gnu/debug   (GNU toolchain, dev runs)
-//   4. <repo root>/target/debug                          (host/MSVC toolchain)
-//   5. cwd
-const here = path.dirname(fileURLToPath(import.meta.url));
-const repoRoot = path.resolve(here, "..", "..", "..", "..", "..");
-const searchDirs = [
-    process.env.MEDIAWAY_FFI_DIR ?? "",
-    path.resolve(here, "..", "native"),
-    path.join(repoRoot, "target", "x86_64-pc-windows-gnu", "debug"),
-    path.join(repoRoot, "target", "debug"),
-    process.cwd(),
-];
-export function findLibrary(name) {
-    for (const dir of searchDirs) {
-        if (!dir)
-            continue;
-        const candidate = path.join(dir, name);
-        if (fs.existsSync(candidate))
-            return candidate;
-    }
-    throw new Error(`cannot find ${name}; set $MEDIAWAY_FFI_DIR or build the -ffi crates`);
-}
-/**
- * cdylib filename Cargo produces for this platform. Windows and Linux only —
- * the workspace's own hardware/CI coverage is limited to those two (see
- * docs/ai/wiki/platform/order.md); macOS support is not claimed here since
- * it has never been built or run.
- */
-function libraryFilename() {
-    switch (process.platform) {
-        case "win32":
-            return "mediaway_ffi.dll";
-        case "linux":
-            return "libmediaway_ffi.so";
-        default:
-            throw new Error(`mediaway: unsupported platform ${process.platform} (Windows and Linux only)`);
-    }
-}
-function load(name) {
-    return koffi.load(findLibrary(name));
-}
-const libraryName = libraryFilename();
-export const containerLib = load(libraryName);
-export const pipelineLib = load(libraryName);
-export const deviceLib = load(libraryName);
+import { findLibrary, containerLib, pipelineLib, deviceLib } from "./loader.js";
+export { findLibrary, containerLib, pipelineLib, deviceLib };
 // ── Structs (layouts mirror the headers exactly) ───────────────────────────────
 export const MwRational = koffi.struct("MwRational", {
     num: "uint64",
@@ -199,6 +149,23 @@ export const MwDesktopFrame = koffi.struct("MwDesktopFrame", {
     data_len: "size_t",
     gpu_buffer: MwGpuBufferHandle,
 });
+export const MwGpuAdapterInfo = koffi.struct("MwGpuAdapterInfo", {
+    index: "uint32",
+    name: "str", // owned NUL-terminated UTF-8; freed via gpuAdapterListFree, not per-entry
+    vendor_id: "uint32",
+    device_id: "uint32",
+    dedicated_video_memory: "uint64",
+    is_hardware: "bool",
+});
+export const MwGpuAdapterSelect = koffi.struct("MwGpuAdapterSelect", {
+    kind: "int32", // 0 = Default, 1 = Index
+    index: "uint32", // meaningful only when kind == Index
+});
+export const MwGpuDeviceOptions = koffi.struct("MwGpuDeviceOptions", {
+    adapter: MwGpuAdapterSelect,
+    video_support: "bool",
+    debug_layer: "bool",
+});
 export const MwAudioConfig = koffi.struct("MwAudioConfig", {
     device_index: "uint32",
     time_base: MwRational,
@@ -422,6 +389,11 @@ export const pipeline = {
     audioDecodeSessionFlush: pipelineLib.func("int mediaway_audio_decode_session_flush(void *session)"),
     audioDecodeSessionClose: pipelineLib.func("void mediaway_audio_decode_session_close(void *session)"),
     decodedAudioFrameFree: pipelineLib.func("void mediaway_decoded_audio_frame_free(MwDecodedAudioFrame *frame)"),
+    // ── Capture-to-encode bridge (adr/pipeline/0005-capture-encode-bridge-c-abi.md) ──
+    // Pushes one polled frame from a device.h capture handle straight into a
+    // session — no intermediate MwCameraFrame/MwDesktopFrame, no extra copy.
+    sessionWriteFrameFromCameraCapture: pipelineLib.func("int mediaway_encode_session_write_frame_from_camera_capture(void *session, void *capture, _Out_ bool *out_wrote_frame)"),
+    sessionWriteFrameFromDesktopCapture: pipelineLib.func("int mediaway_encode_session_write_frame_from_desktop_capture(void *session, void *capture, _Out_ bool *out_wrote_frame)"),
 };
 // ── Device functions ───────────────────────────────────────────────────────────
 export const device = {
@@ -447,6 +419,12 @@ export const device = {
     audioPollFrame: deviceLib.func("int mediaway_audio_capture_poll_frame(void *capture, _Out_ MwAudioFrame *out_frame, _Out_ bool *out_has)"),
     audioClose: deviceLib.func("int mediaway_audio_capture_close(void *capture)"),
     audioFrameFree: deviceLib.func("void mediaway_audio_frame_free(MwAudioFrame *frame)"),
+    // ── GPU device factory (mediaway-device ADR-0007) ─────────────────────────
+    gpuAdapterList: deviceLib.func("int mediaway_gpu_adapter_list(_Out_ MwGpuAdapterInfo **out_adapters, _Out_ size_t *out_count)"),
+    gpuAdapterListFree: deviceLib.func("void mediaway_gpu_adapter_list_free(MwGpuAdapterInfo *adapters, size_t count)"),
+    gpuDeviceCreate: deviceLib.func("int mediaway_gpu_device_create(MwGpuDeviceOptions *options, _Out_ void **out_device)"),
+    gpuDeviceHandle: deviceLib.func("int mediaway_gpu_device_handle(void *device, _Out_ MwGpuDeviceHandle *out_handle)"),
+    gpuDeviceClose: deviceLib.func("void mediaway_gpu_device_close(void *device)"),
 };
 // ── Copy helpers ───────────────────────────────────────────────────────────────
 /** Copy `len` bytes out of a koffi pointer/opaque handle. */

package/dist/loader.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Native library discovery + koffi load for @mediaway/ffi.
+ *
+ * Split out of index.ts (ADR-0024, multi-platform binding distribution)
+ * once the added per-platform search-path logic pushed index.ts's struct/
+ * function-binding definitions past the workspace's 1000-line source cap.
+ */
+export declare function findLibrary(name: string): string;
+export declare const containerLib: import("koffi").LibraryHandle;
+export declare const pipelineLib: import("koffi").LibraryHandle;
+export declare const deviceLib: import("koffi").LibraryHandle;

package/dist/loader.js

@@ -0,0 +1,74 @@
+/**
+ * Native library discovery + koffi load for @mediaway/ffi.
+ *
+ * Split out of index.ts (ADR-0024, multi-platform binding distribution)
+ * once the added per-platform search-path logic pushed index.ts's struct/
+ * function-binding definitions past the workspace's 1000-line source cap.
+ */
+import koffi from "koffi";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+// ── Library discovery ──────────────────────────────────────────────────────────
+// The cdylib is a Rust build artifact, not an installed system library.
+// Search:
+//   1. $MEDIAWAY_FFI_DIR
+//   2. <this package>/native/<platform>-<arch>   (libs for every platform
+//      bundled at pack time — the npm distribution; see § platform tag)
+//   3. <repo root>/target/x86_64-pc-windows-gnu/debug   (GNU toolchain, dev runs)
+//   4. <repo root>/target/debug                          (host/MSVC toolchain)
+//   5. cwd
+const here = path.dirname(fileURLToPath(import.meta.url));
+const repoRoot = path.resolve(here, "..", "..", "..", "..", "..");
+/**
+ * `os-arch` tag matching one of `native/<tag>`'s subdirectories (this
+ * package bundles every platform's prebuilt lib directly — see
+ * tools/scripts/copy-native-dlls.ts). Returns `undefined` for an
+ * unsupported platform/arch pair rather than throwing, so callers can still
+ * fall through to the other search dirs (e.g. `$MEDIAWAY_FFI_DIR` during
+ * local development on an unlisted arch).
+ */
+function platformTag() {
+    const os = process.platform === "win32" ? "win32" : process.platform === "linux" ? "linux"
+        : process.platform === "darwin" ? "darwin" : undefined;
+    const arch = process.arch === "x64" ? "x64" : process.arch === "arm64" ? "arm64" : undefined;
+    return os && arch ? `${os}-${arch}` : undefined;
+}
+const tag = platformTag();
+const searchDirs = [
+    process.env.MEDIAWAY_FFI_DIR ?? "",
+    tag ? path.resolve(here, "..", "native", tag) : "",
+    path.join(repoRoot, "target", "x86_64-pc-windows-gnu", "debug"),
+    path.join(repoRoot, "target", "debug"),
+    process.cwd(),
+];
+export function findLibrary(name) {
+    for (const dir of searchDirs) {
+        if (!dir)
+            continue;
+        const candidate = path.join(dir, name);
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    throw new Error(`cannot find ${name}; set $MEDIAWAY_FFI_DIR or build the -ffi crates`);
+}
+/** cdylib filename Cargo produces for this platform. */
+function libraryFilename() {
+    switch (process.platform) {
+        case "win32":
+            return "mediaway_ffi.dll";
+        case "linux":
+            return "libmediaway_ffi.so";
+        case "darwin":
+            return "libmediaway_ffi.dylib";
+        default:
+            throw new Error(`mediaway: unsupported platform ${process.platform}`);
+    }
+}
+function load(name) {
+    return koffi.load(findLibrary(name));
+}
+const libraryName = libraryFilename();
+export const containerLib = load(libraryName);
+export const pipelineLib = load(libraryName);
+export const deviceLib = load(libraryName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediaway/ffi",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "description": "Rust-based, lightweight, fast — Mediaway native C ABI bindings for Node.js — the shared DLL behind the @mediaway packages",
   "type": "module",
   "main": "./dist/index.js",