@daugasauron/dolly-host-microphone 0.1.4 → 0.1.5-rc.0

package/abi.mjs

@@ -17,4 +17,4 @@ export const DOLLY_MICROPHONE_CAPTURING = 2;
 export const DOLLY_MICROPHONE_DENIED = 3;
 export const DOLLY_MICROPHONE_UNAVAILABLE = 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_MICROPHONE_ABI_DIGEST = "1e1a29020c1d2f288048903eb53d1807819f52264e6366a8f9a326483054e5b4";
+export const DOLLY_MICROPHONE_ABI_DIGEST = "0efad528c1809a3a87a0889c2e68145ace79da86af746de2800f2bc215dc2f86";

package/microphone.mjs

@@ -4,24 +4,19 @@ import { DOLLY_ERRNO as E } from "./abi.mjs";
 export { DOLLY_MICROPHONE_ABI_DIGEST as digest } from "./abi.mjs";
 
 // The device as the lease bridge sees it.
-export const lease = { type: "microphone", slots: M.DOLLY_MICROPHONE_SLOTS, packetBytes: M.DOLLY_MICROPHONE_PACKET_BYTES,
+export const lease = { type: "microphone", version: M.DOLLY_MICROPHONE_VERSION, slots: M.DOLLY_MICROPHONE_SLOTS, packetBytes: M.DOLLY_MICROPHONE_PACKET_BYTES,
   replyBytes: M.DOLLY_MICROPHONE_REPLY_BYTES, open: M.DOLLY_MICROPHONE_OPEN, close: M.DOLLY_MICROPHONE_CLOSE };
 
-export function check() {
-  return typeof navigator.mediaDevices?.getUserMedia === "function" && typeof globalThis.AudioWorkletNode === "function"
-    ? null : "Microphone capture is unavailable in this browser";
-}
-
 // Trusted page DOM over the display, beside the browser's own recording mark:
 // shown for as long as a program has asked for or holds the microphone.
-function indicate(indicators, state) {
+function indicate({ mount, indicators }, state) {
   let element = document.querySelector("#microphone-status");
   if (!element) {
-    element = document.body.appendChild(document.createElement("div"));
+    element = mount.appendChild(document.createElement("div"));
     element.id = "microphone-status";
     element.className = "page-indicator";
     element.setAttribute("role", "status");
-    element.style.cssText = "position:fixed;left:0.5rem;bottom:2rem;z-index:8;max-width:calc(100vw - 1rem);" +
+    element.style.cssText = "position:absolute;left:0.5rem;bottom:2rem;z-index:8;max-width:calc(100% - 1rem);" +
       "padding:0.15rem 0.45rem;background:#262626;border:1px solid #e98773;color:#e98773;font-size:13px;pointer-events:none";
   }
   const text = { waiting: "Microphone: waiting for permission", capturing: "Microphone on" }[state];
@@ -30,13 +25,13 @@ function indicate(indicators, state) {
   indicators.hold(element, Boolean(text));
 }
 
-export function browser({ send, indicators }) {
-  const provider = createMicrophoneProvider(() => indicate(indicators, provider.status().state));
+export function browser({ mount, send, indicators }) {
+  const provider = createMicrophoneProvider(() => indicate({ mount, indicators }, provider.status().state));
   return {
     page: { get microphone() { return provider.status(); } },
     messages: {
       "microphone-request"(message) {
-        const result = provider.dispatch(message.packet);
+        const result = provider.dispatch(message);
         send({ type: "microphone-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-rc.0",
   "type": "module",
   "name": "@daugasauron/dolly-host-microphone",
   "license": "MIT",
   "dependencies": {
-    "@daugasauron/dolly": "0.1.4"
+    "@daugasauron/dolly": "0.1.5-rc.0"
   },
   "description": "Dolly's microphone@0 host module: the default microphone, behind the browser's permission prompt.",
   "repository": {

package/provider.mjs

@@ -72,20 +72,17 @@ export function createMicrophoneProvider(changed = () => {}) {
       queuedFrames: capture?.length ?? 0, capturedFrames: capture?.captured ?? 0, droppedFrames: capture?.dropped ?? 0,
       liveTracks: capture?.stream?.getTracks().filter(track => track.readyState === "live").length ?? 0 };
   }
-  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 > M.DOLLY_MICROPHONE_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) !== M.DOLLY_MICROPHONE_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);
       let result;
       if (op === M.DOLLY_MICROPHONE_OPEN) {
-        if (packet.length !== 32) fail(E.EINVAL);
+        if (body.length) fail(E.EINVAL);
         if (scope <= generation) fail(E.ESTALE);
         if (capture) fail(E.EBUSY);
-        if (typeof navigator.mediaDevices?.getUserMedia !== "function" || typeof AudioWorkletNode !== "function") fail(E.ENOSYS);
+        if (typeof navigator.mediaDevices?.getUserMedia !== "function" || typeof AudioWorkletNode !== "function") fail(E.ENODEV);
         capture = { scope, sequence, state: M.DOLLY_MICROPHONE_WAITING, released: false,
           samples: new Float32Array(M.DOLLY_MICROPHONE_QUEUE_FRAMES), start: 0, length: 0, captured: 0, dropped: 0 };
         generation = scope;
@@ -100,9 +97,9 @@ export function createMicrophoneProvider(changed = () => {}) {
         if (sequence <= capture.sequence) fail(E.ESTALE);
         capture.sequence = sequence;
         if (op === M.DOLLY_MICROPHONE_READ) {
-          if (packet.length !== 40) fail(E.EINVAL);
-          const frames = view.getUint32(32, true);
-          if (!frames || frames > M.DOLLY_MICROPHONE_MAX_FRAMES || view.getUint32(36, true)) fail(E.EINVAL);
+          if (body.length !== 8) fail(E.EINVAL);
+          const frames = view.getUint32(0, true);
+          if (!frames || frames > M.DOLLY_MICROPHONE_MAX_FRAMES || view.getUint32(4, true)) fail(E.EINVAL);
           const count = Math.min(frames, capture.length), size = capture.samples.length;
           if (!count && capture.state === M.DOLLY_MICROPHONE_DENIED) fail(E.EACCES);
           if (!count && capture.state === M.DOLLY_MICROPHONE_UNAVAILABLE) fail(E.ENODEV);
@@ -112,13 +109,13 @@ export function createMicrophoneProvider(changed = () => {}) {
           for (let i = 0; i < count; ++i) output.setFloat32(8 + i * 4, capture.samples[(capture.start + i) % size], true);
           capture.start = (capture.start + count) % size; capture.length -= count;
         } else if (op === M.DOLLY_MICROPHONE_STATUS) {
-          if (packet.length !== 32) fail(E.EINVAL);
+          if (body.length) fail(E.EINVAL);
           result = response(24);
           const output = new DataView(result.buffer);
           output.setUint32(0, capture.length, true); output.setUint32(4, capture.state, true);
           output.setBigUint64(8, BigInt(capture.captured), true); output.setBigUint64(16, BigInt(capture.dropped), true);
         } else if (op === M.DOLLY_MICROPHONE_CLOSE) {
-          if (packet.length !== 32) fail(E.EINVAL);
+          if (body.length) fail(E.EINVAL);
           release(scope); result = response(0);
         } else fail(E.ENOSYS);
       }