@daugasauron/dolly-host-audio 0.1.4 → 0.1.5

package/abi.mjs

@@ -15,4 +15,4 @@ export const DOLLY_AUDIO_WRITE = 2;
 export const DOLLY_AUDIO_STATUS = 3;
 export const DOLLY_AUDIO_CLOSE = 4;
 export const DOLLY_ERRNO = Object.freeze({ E2BIG: 1, EACCES: 2, EADDRINUSE: 3, EADDRNOTAVAIL: 4, EAFNOSUPPORT: 5, EAGAIN: 6, EALREADY: 7, EBADF: 8, EBADMSG: 9, EBUSY: 10, ECANCELED: 11, ECHILD: 12, ECONNABORTED: 13, ECONNREFUSED: 14, ECONNRESET: 15, EDEADLK: 16, EDESTADDRREQ: 17, EDOM: 18, EDQUOT: 19, EEXIST: 20, EFAULT: 21, EFBIG: 22, EHOSTUNREACH: 23, EIDRM: 24, EILSEQ: 25, EINPROGRESS: 26, EINTR: 27, EINVAL: 28, EIO: 29, EISCONN: 30, EISDIR: 31, ELOOP: 32, EMFILE: 33, EMLINK: 34, EMSGSIZE: 35, EMULTIHOP: 36, ENAMETOOLONG: 37, ENETDOWN: 38, ENETRESET: 39, ENETUNREACH: 40, ENFILE: 41, ENOBUFS: 42, ENODEV: 43, ENOENT: 44, ENOEXEC: 45, ENOLCK: 46, ENOLINK: 47, ENOMEM: 48, ENOMSG: 49, ENOPROTOOPT: 50, ENOSPC: 51, ENOSYS: 52, ENOTCONN: 53, ENOTDIR: 54, ENOTEMPTY: 55, ENOTRECOVERABLE: 56, ENOTSOCK: 57, ENOTTY: 59, ENXIO: 60, EOVERFLOW: 61, EOWNERDEAD: 62, EPERM: 63, EPIPE: 64, EPROTO: 65, EPROTONOSUPPORT: 66, EPROTOTYPE: 67, ERANGE: 68, EROFS: 69, ESPIPE: 70, ESRCH: 71, ESTALE: 72, ETIMEDOUT: 73, ETXTBSY: 74, EXDEV: 75, ENODATA: 116, ENOTSUP: 138 });
-export const DOLLY_AUDIO_ABI_DIGEST = "bf9f97c6945174f9788f03091ca6e1c982f5b8c80488c1b5526804ceb84a1046";
+export const DOLLY_AUDIO_ABI_DIGEST = "fb2dac188156936432d9e25bb6350b3cf5a3226bd1ee26aa799b323b41e53592";

package/audio.mjs

@@ -4,24 +4,19 @@ import { DOLLY_ERRNO as E } from "./abi.mjs";
 export { DOLLY_AUDIO_ABI_DIGEST as digest } from "./abi.mjs";
 
 // The device as the lease bridge sees it.
-export const lease = { type: "audio", slots: A.DOLLY_AUDIO_SLOTS, packetBytes: A.DOLLY_AUDIO_PACKET_BYTES,
+export const lease = { type: "audio", version: A.DOLLY_AUDIO_VERSION, slots: A.DOLLY_AUDIO_SLOTS, packetBytes: A.DOLLY_AUDIO_PACKET_BYTES,
   replyBytes: A.DOLLY_AUDIO_REPLY_BYTES, open: A.DOLLY_AUDIO_OPEN, close: A.DOLLY_AUDIO_CLOSE };
 
-export function check() {
-  return typeof globalThis.AudioContext === "function" ? null : "Web Audio playback is unavailable in this browser";
-}
-
 export function browser({ send }) {
   const provider = createAudioProvider();
   const resume = event => { if (event.isTrusted) provider.resume(); };
   window.addEventListener("keydown", resume, { capture: true });
   window.addEventListener("pointerdown", resume, { capture: true });
   return {
-    get status() { return provider.status(); },
     page: { get audio() { return provider.status(); } },
     messages: {
       "audio-request"(message) {
-        const result = provider.dispatch(message.packet);
+        const result = provider.dispatch(message);
         send({ type: "audio-complete", scope: message.scope, sequence: message.sequence, ...result },
           [result.bytes.buffer]);
       },

package/package.json

@@ -1,10 +1,10 @@
 {
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "name": "@daugasauron/dolly-host-audio",
   "license": "MIT",
   "dependencies": {
-    "@daugasauron/dolly": "0.1.4"
+    "@daugasauron/dolly": "0.1.5"
   },
   "description": "Dolly's audio@0 host module: stereo PCM playback.",
   "repository": {

package/provider.mjs

@@ -42,22 +42,19 @@ export function createAudioProvider() {
     for (const node of stream.nodes) { node.source.onended = null; node.source.stop(); node.source.disconnect(); }
     stream.nodes.clear();
   }
-  function dispatch(packet) {
+  // A request the lease bridge checked: the packet's operation, scope and
+  // sequence (dolly_device_header) and its body.
+  function dispatch({ operation: op, scope, sequence, body }) {
     try {
-      if (!(packet instanceof Uint8Array) || packet.byteLength < 32 || packet.byteLength > A.DOLLY_AUDIO_PACKET_BYTES) fail(E.EINVAL);
-      packet = packet.slice();
-      const view = new DataView(packet.buffer, packet.byteOffset, packet.byteLength);
-      const op = view.getUint32(4, true), scope = view.getUint32(8, true), sequence = view.getUint32(16, true);
-      if (view.getUint32(0, true) !== A.DOLLY_AUDIO_VERSION || view.getUint32(12, true) || view.getUint32(20, true) ||
-          !scope || !sequence || view.getUint32(24, true) !== packet.length - 32 || view.getUint32(28, true)) fail(E.EINVAL);
+      const view = new DataView(body.buffer, body.byteOffset, body.byteLength);
       const slot = (scope - 1) % A.DOLLY_AUDIO_SLOTS;
       let stream = streams.get(scope), result;
       if (op === A.DOLLY_AUDIO_OPEN) {
-        if (packet.length !== 32) fail(E.EINVAL);
+        if (body.length) fail(E.EINVAL);
         if (scope <= generations[slot]) fail(E.ESTALE);
         if ([...streams.keys()].some(key => (key - 1) % A.DOLLY_AUDIO_SLOTS === slot)) fail(E.EBUSY);
         if (!context) {
-          if (typeof AudioContext !== "function") fail(E.ENOSYS);
+          if (typeof AudioContext !== "function") fail(E.ENODEV);
           context = new AudioContext({sampleRate: A.DOLLY_AUDIO_RATE, latencyHint: "interactive"});
         }
         if (context.state === "closed") fail(E.EIO);
@@ -73,17 +70,17 @@ export function createAudioProvider() {
         if (sequence <= stream.sequence) fail(E.ESTALE);
         stream.sequence = sequence;
         if (op === A.DOLLY_AUDIO_WRITE) {
-          if (packet.length < 40) fail(E.EINVAL);
-          const frames = view.getUint32(32, true);
+          if (body.length < 8) fail(E.EINVAL);
+          const frames = view.getUint32(0, true);
           if (frames < A.DOLLY_AUDIO_MIN_FRAMES || frames > A.DOLLY_AUDIO_MAX_FRAMES ||
-              view.getUint32(36, true) || packet.length !== 40 + frames * 8) fail(E.EINVAL);
-          for (let at = 40; at < packet.length; at += 4) if (!Number.isFinite(view.getFloat32(at, true))) fail(E.EINVAL);
+              view.getUint32(4, true) || body.length !== 8 + frames * 8) fail(E.EINVAL);
+          for (let at = 8; at < body.length; at += 4) if (!Number.isFinite(view.getFloat32(at, true))) fail(E.EINVAL);
           const pending = queued(stream);
           if (pending + frames > A.DOLLY_AUDIO_QUEUE_FRAMES || stream.nodes.size >= A.DOLLY_AUDIO_MAX_BUFFERS) fail(E.EAGAIN);
           const buffer = context.createBuffer(A.DOLLY_AUDIO_CHANNELS, frames, A.DOLLY_AUDIO_RATE);
           for (let channel = 0; channel < A.DOLLY_AUDIO_CHANNELS; ++channel) {
             const data = buffer.getChannelData(channel);
-            for (let i = 0; i < frames; ++i) data[i] = Math.max(-1, Math.min(1, view.getFloat32(40 + (i * 2 + channel) * 4, true)));
+            for (let i = 0; i < frames; ++i) data[i] = Math.max(-1, Math.min(1, view.getFloat32(8 + (i * 2 + channel) * 4, true)));
           }
           const source = context.createBufferSource(); source.buffer = buffer;
           source.connect(context.destination);
@@ -93,7 +90,7 @@ export function createAudioProvider() {
           source.start(start); stream.end = node.end; stream.nodes.add(node);
           result = response(4); new DataView(result.buffer).setUint32(0, frames, true);
         } else if (op === A.DOLLY_AUDIO_STATUS) {
-          if (packet.length !== 32) fail(E.EINVAL);
+          if (body.length) fail(E.EINVAL);
           const pending = queued(stream);
           let played = stream.played;
           for (const node of stream.nodes) played += Math.min(node.frames, Math.max(0, Math.floor((context.currentTime - node.start) * A.DOLLY_AUDIO_RATE)));
@@ -102,7 +99,7 @@ export function createAudioProvider() {
           output.setUint32(0, pending, true); output.setUint32(4, context.state === "running" ? 1 : 2, true);
           output.setBigUint64(8, BigInt(played), true);
         } else if (op === A.DOLLY_AUDIO_CLOSE) {
-          if (packet.length !== 32) fail(E.EINVAL);
+          if (body.length) fail(E.EINVAL);
           release(scope); result = response(0);
         } else fail(E.ENOSYS);
       }