@convis/audio-native 0.0.2 → 0.0.3

package/README.md

@@ -12,7 +12,7 @@ napi-rs compiles Rust and generates 3 files in `dist/`: `audio.<local target>.no
 ## Releases
 
 * Trigger the GitHub workflow here: <https://github.com/k2d222/convis-audio/actions/workflows/build.yml>
-* When completed: `pnpm download-artifacts <workflow run ID>`
+* When completed: `pnpm script:download-artifacts <workflow run ID>`
 * Check that the `.node` files were copied to `platforms/<target>/audio-<target>.node`
-* Bump package versions and commit
+* Bump package versions and commit: `pnpm script:version patch` (for a patch version bump)
 * `pnpm publish -r --access public`

package/dist/index.js

@@ -0,0 +1,104 @@
+/** Load the native module for the current OS / architecture combo.
+ * Modified from the auto-generated file by napi-rs.
+ */
+
+let nativeBinding = null;
+const loadErrors = [];
+
+function requireNative() {
+	try {
+		// the locally-build module overrides all others. (generated in dev mode)
+		return require("./audio.node");
+	} catch (e) {
+		loadErrors.push(e);
+	}
+	if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
+		try {
+			return require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+		} catch (err) {
+			loadErrors.push(err);
+		}
+	} else if (process.platform === "win32") {
+		if (process.arch === "x64") {
+			try {
+				return require("@convis/audio-x86_64-pc-windows-msvc");
+			} catch (e) {
+				loadErrors.push(e);
+			}
+		} else if (process.arch === "arm64") {
+			try {
+				return require("@convis/audio-aarch64-pc-windows-msvc");
+			} catch (e) {
+				loadErrors.push(e);
+			}
+		} else {
+			loadErrors.push(
+				new Error(`Unsupported architecture on Windows: ${process.arch}`),
+			);
+		}
+	} else if (process.platform === "darwin") {
+		if (process.arch === "x64") {
+			try {
+				return require("@convis/audio-x86_64-apple-darwin");
+			} catch (e) {
+				loadErrors.push(e);
+			}
+		} else if (process.arch === "arm64") {
+			try {
+				return require("@convis/audio-aarch64-apple-darwin");
+			} catch (e) {
+				loadErrors.push(e);
+			}
+		} else {
+			loadErrors.push(
+				new Error(`Unsupported architecture on macOS: ${process.arch}`),
+			);
+		}
+	} else if (process.platform === "linux") {
+		if (process.arch === "x64") {
+			try {
+				return require("@convis/audio-x86_64-unknown-linux-gnu");
+			} catch (e) {
+				loadErrors.push(e);
+			}
+		} else if (process.arch === "arm64") {
+			try {
+				return require("@convis/audio-aarch64-unknown-linux-gnu");
+			} catch (e) {
+				loadErrors.push(e);
+			}
+		} else {
+			loadErrors.push(
+				new Error(`Unsupported architecture on Linux: ${process.arch}`),
+			);
+		}
+	} else {
+		loadErrors.push(
+			new Error(
+				`Unsupported OS: ${process.platform}, architecture: ${process.arch}`,
+			),
+		);
+	}
+}
+
+nativeBinding = requireNative();
+
+if (!nativeBinding) {
+	if (loadErrors.length > 0) {
+		throw new Error(
+			`Cannot find native binding. ` +
+				`npm has a bug related to optional dependencies (https://github.com/npm/cli/issues/4828). ` +
+				"Please try `npm i` again after removing both package-lock.json and node_modules directory.",
+			{
+				cause: loadErrors.reduce((err, cur) => {
+					cur.cause = err;
+					return cur;
+				}),
+			},
+		);
+	}
+	throw new Error(`Failed to load native binding`);
+}
+
+module.exports = nativeBinding;
+module.exports.AudioHardware = nativeBinding.AudioHardware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@convis/audio-native",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Native Node (N-API) module for @convis/audio",
   "homepage": "https://github.com/k2d222/convis-audio",
   "bugs": "https://github.com/k2d222/convis-audio/issues",
@@ -8,7 +8,8 @@
   "author": "Mathis Brossier <mathis.brossier@gmail.com>",
   "repository": "github:k2d222/convis-audio",
   "files": [
-    "./dist/*",
+    "./dist/index.d.ts",
+    "./dist/index.js",
     "./src/*"
   ],
   "type": "module",
@@ -21,12 +22,12 @@
     "@types/node": "^25.6.2"
   },
   "optionalDependencies": {
-    "@convis/audio-aarch64-apple-darwin": "0.0.2",
-    "@convis/audio-aarch64-pc-windows-msvc": "0.0.2",
-    "@convis/audio-x86_64-pc-windows-msvc": "0.0.2",
-    "@convis/audio-x86_64-unknown-linux-gnu": "0.0.2",
-    "@convis/audio-aarch64-unknown-linux-gnu": "0.0.2",
-    "@convis/audio-x86_64-apple-darwin": "0.0.2"
+    "@convis/audio-aarch64-apple-darwin": "0.0.3",
+    "@convis/audio-x86_64-apple-darwin": "0.0.3",
+    "@convis/audio-x86_64-pc-windows-msvc": "0.0.3",
+    "@convis/audio-aarch64-unknown-linux-gnu": "0.0.3",
+    "@convis/audio-aarch64-pc-windows-msvc": "0.0.3",
+    "@convis/audio-x86_64-unknown-linux-gnu": "0.0.3"
   },
   "napi": {
     "npmClient": "pnpm",
@@ -41,10 +42,11 @@
     ]
   },
   "scripts": {
-    "build": "rm -rf dist/ && pnpm run napi:build:release",
+    "build": "pnpm run napi:build:release",
     "dev": "pnpm napi:build:debug --watch",
     "napi:build:debug": "napi build -o dist/",
-    "napi:build:release": "napi build --release --strip -o dist/",
-    "download-artifacts": "sh scripts/download-artifacts.sh"
+    "napi:build:release": "napi build -o dist/ --release --strip",
+    "script:download-artifacts": "sh scripts/download-artifacts.sh",
+    "script:version": "sh scripts/version.sh"
   }
 }

package/src/audio-decode.d.ts

@@ -1,8 +0,0 @@
-declare module "@audio/decode-wav" {
-  export interface AudioData {
-    channelData: Float32Array[];
-    sampleRate: number;
-  }
-
-  export default function decode(buf: ArrayBuffer | Uint8Array): Promise<AudioData>;
-}