@mediaway/ffi 0.1.6 → 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;

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",

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.6",
+  "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",