@bendyline/squisq-editor-react 2.11.17 → 2.11.19

package/dist/{chunk-C6QVA6TO.js → chunk-UFK47ZAI.js}

@@ -1,25 +1,35 @@
+import {
+  DEFAULT_RECORDER_DEVICE_SETTINGS,
+  buildRecorderAudioConstraints,
+  buildRecorderCameraConstraints,
+  buildRecorderScreenAudioConstraints,
+  buildRecorderScreenConstraints,
+  recorderBitsPerSecond
+} from "./chunk-LRZJD5YD.js";
 import {
   Icon
 } from "./chunk-GS7QWYFT.js";
 import {
   NarrationStage,
-  buildFilename,
   buildTimingJson,
   encodeNarrationTimingJson,
   encodeTimingJson,
   formatRecordingBytes,
   requestCameraStream,
+  resolveMaxRecordingBytes,
+  timingPathFor,
+  useNarrationStage,
+  useStreamPreview
+} from "./chunk-ZS6G2P57.js";
+import {
+  buildFilename,
   requestMicStream,
   resolveFormat,
-  resolveMaxRecordingBytes,
   supportsDisplayMedia,
   supportsMediaRecorder,
   supportsSystemAudioCapture,
-  supportsUserMedia,
-  timingPathFor,
-  useNarrationStage,
-  useStreamPreview
-} from "./chunk-XZVMKR5Q.js";
+  supportsUserMedia
+} from "./chunk-DNJ6HOES.js";
 
 // src/recorder/sources/screenRegion.ts
 function validateScreenCaptureRegion(region, width, height) {
@@ -1707,105 +1717,6 @@ function RecorderDeviceQuickPicks({
   ] });
 }
 
-// src/recorder/deviceSettings.ts
-var DEFAULT_RECORDER_DEVICE_SETTINGS = {
-  constraintMode: "ideal",
-  audio: { deviceId: "" },
-  camera: { deviceId: "" },
-  screen: {},
-  screenAudio: {},
-  encoding: {
-    audioMimeType: "",
-    videoMimeType: ""
-  }
-};
-function preferredNumber(value, mode) {
-  if (value === void 0 || !Number.isFinite(value) || value <= 0) return void 0;
-  return { [mode]: value };
-}
-function preferredInteger(value, mode) {
-  if (value === void 0 || !Number.isFinite(value) || value <= 0) return void 0;
-  return { [mode]: Math.round(value) };
-}
-function preferredString(value, mode) {
-  const trimmed = value?.trim();
-  return trimmed ? { [mode]: trimmed } : void 0;
-}
-function buildRecorderAudioConstraints(settings) {
-  const { audio, constraintMode } = settings;
-  const result = {};
-  if (audio.deviceId) result.deviceId = { exact: audio.deviceId };
-  const groupId = preferredString(audio.groupId, constraintMode);
-  if (groupId) result.groupId = groupId;
-  if (audio.autoGainControl !== void 0) result.autoGainControl = audio.autoGainControl;
-  if (audio.echoCancellation !== void 0) result.echoCancellation = audio.echoCancellation;
-  if (audio.noiseSuppression !== void 0) result.noiseSuppression = audio.noiseSuppression;
-  const channelCount = preferredInteger(audio.channelCount, constraintMode);
-  const latency = preferredNumber(audio.latency, constraintMode);
-  const sampleRate = preferredInteger(audio.sampleRate, constraintMode);
-  const sampleSize = preferredInteger(audio.sampleSize, constraintMode);
-  if (channelCount) result.channelCount = channelCount;
-  if (latency) result.latency = latency;
-  if (sampleRate) result.sampleRate = sampleRate;
-  if (sampleSize) result.sampleSize = sampleSize;
-  return result;
-}
-function buildRecorderCameraConstraints(settings) {
-  const { camera, constraintMode } = settings;
-  const result = {};
-  if (camera.deviceId) result.deviceId = { exact: camera.deviceId };
-  const groupId = preferredString(camera.groupId, constraintMode);
-  if (groupId) result.groupId = groupId;
-  if (camera.backgroundBlur !== void 0) result.backgroundBlur = camera.backgroundBlur;
-  const aspectRatio = preferredNumber(camera.aspectRatio, constraintMode);
-  const facingMode = preferredString(camera.facingMode, constraintMode);
-  const frameRate = preferredNumber(camera.frameRate, constraintMode);
-  const height = preferredInteger(camera.height, constraintMode);
-  const resizeMode = preferredString(camera.resizeMode, constraintMode);
-  const width = preferredInteger(camera.width, constraintMode);
-  if (aspectRatio) result.aspectRatio = aspectRatio;
-  if (facingMode) result.facingMode = facingMode;
-  if (frameRate) result.frameRate = frameRate;
-  if (height) result.height = height;
-  if (resizeMode) result.resizeMode = resizeMode;
-  if (width) result.width = width;
-  return result;
-}
-function buildRecorderScreenConstraints(settings) {
-  const { screen } = settings;
-  const result = {};
-  const aspectRatio = preferredNumber(screen.aspectRatio, "ideal");
-  const cursor = preferredString(screen.cursor, "ideal");
-  const displaySurface = preferredString(screen.displaySurface, "ideal");
-  const frameRate = preferredNumber(screen.frameRate, "ideal");
-  const height = preferredInteger(screen.height, "ideal");
-  const resizeMode = preferredString(screen.resizeMode, "ideal");
-  const width = preferredInteger(screen.width, "ideal");
-  if (screen.logicalSurface !== void 0) result.logicalSurface = screen.logicalSurface;
-  if (aspectRatio) result.aspectRatio = aspectRatio;
-  if (cursor) result.cursor = cursor;
-  if (displaySurface) result.displaySurface = displaySurface;
-  if (frameRate) result.frameRate = frameRate;
-  if (height) result.height = height;
-  if (resizeMode) result.resizeMode = resizeMode;
-  if (width) result.width = width;
-  return result;
-}
-function buildRecorderScreenAudioConstraints(settings) {
-  const result = {};
-  if (settings.screenAudio.restrictOwnAudio !== void 0) {
-    result.restrictOwnAudio = settings.screenAudio.restrictOwnAudio;
-  }
-  if (settings.screenAudio.suppressLocalAudioPlayback !== void 0) {
-    result.suppressLocalAudioPlayback = settings.screenAudio.suppressLocalAudioPlayback;
-  }
-  return result;
-}
-function recorderBitsPerSecond(value) {
-  if (value === void 0 || !Number.isFinite(value) || value <= 0) return void 0;
-  return Math.round(value * 1e3);
-}
-
 // src/recorder/recordedMediaKind.ts
 function recordedMediaKind(source, stream, mimeType) {
   if (stream) return stream.getVideoTracks().length > 0 ? "video" : "audio";
@@ -2701,6 +2612,7 @@ function RecorderModal({
   const narrationRecording = narrationOn && Boolean(narration?.recording);
   const expanded = isExpandedPanel(panelMode);
   const [narrationRequesting, setNarrationRequesting] = useState3(false);
+  const [countingIn, setCountingIn] = useState3(false);
   const [narrationPreview, setNarrationPreview] = useState3(null);
   const [deviceSettings, setDeviceSettings] = useState3(() => ({
     ...DEFAULT_RECORDER_DEVICE_SETTINGS,
@@ -3016,17 +2928,27 @@ function RecorderModal({
     } catch {
     }
   }, [recorder]);
-  const handleStart = useCallback4(() => {
+  const handleStart = useCallback4(async () => {
     setSaveError(null);
     dualSaveProgressRef.current = {};
+    if (narrationOn) {
+      setCountingIn(true);
+      const rolled = await stageRef.current.controller.countIn();
+      setCountingIn(false);
+      if (!rolled) return;
+    }
     recorder.start();
     const blockId = slideDeckRef.current[slideIndexRef.current]?.blockId;
     setAdvanceLog(blockId ? recordSlideShown(EMPTY_ADVANCE_LOG, blockId, 0) : EMPTY_ADVANCE_LOG);
-  }, [recorder]);
+  }, [narrationOn, recorder]);
   const handleStop = useCallback4(async () => {
     setSaveError(null);
+    if (countingIn) {
+      stageRef.current.controller.pause();
+      return;
+    }
     await recorder.stop();
-  }, [recorder]);
+  }, [countingIn, recorder]);
   const writeSlideTimingSidecar = useCallback4(
     async (mediaRelativePath, durationSec) => {
       const doc = slides?.doc;
@@ -3219,8 +3141,8 @@ function RecorderModal({
   );
   const isAudioOnly = recordedMediaKind(source, recorder.stream, recorder.mimeType) === "audio";
   const showPreview = recorder.state !== "idle" && recorder.state !== "error";
-  const canRecord = recorder.state === "ready";
-  const canStop = recorder.state === "recording";
+  const canRecord = recorder.state === "ready" && !countingIn;
+  const canStop = recorder.state === "recording" || countingIn;
   const canSave = recorder.state === "stopped" && recorder.blob !== null;
   const isBusy = recorder.state === "requesting" || recorder.state === "stopping" || isSaving;
   const slidesTimingCapture = slidesOn && slidesCaptureTimings;
@@ -3274,7 +3196,7 @@ function RecorderModal({
     sourceText
   ]);
   const slideCoverageWarning = slideCoverage ? unshownSlidesWarning(slideCoverage.total, slideCoverage.unshown) : null;
-  const togglesLocked = recorder.state === "recording" || recorder.state === "requesting" || recorder.state === "stopping" || canSave;
+  const togglesLocked = countingIn || recorder.state === "recording" || recorder.state === "requesting" || recorder.state === "stopping" || canSave;
   const toggleLockReason = canSave ? "Save or discard this recording before changing sources" : void 0;
   const systemAudioHasCompanion = micOn || cameraOn || screenOn;
   const simpleToggleProps = (key) => {
@@ -3769,24 +3691,33 @@ function RecorderModal({
                             children: recorder.state === "requesting" ? "Requesting\u2026" : "Start preview"
                           }
                         ),
-                        canRecord && /* @__PURE__ */ jsxs5("button", { type: "button", style: btnRecord, onClick: handleStart, disabled: isBusy, children: [
-                          /* @__PURE__ */ jsx6(
-                            "span",
-                            {
-                              className: "squisq-recorder-record-dot",
-                              style: recordDotFrameStyle,
-                              "aria-hidden": "true",
-                              children: /* @__PURE__ */ jsx6(
+                        canRecord && /* @__PURE__ */ jsxs5(
+                          "button",
+                          {
+                            type: "button",
+                            style: btnRecord,
+                            onClick: () => void handleStart(),
+                            disabled: isBusy,
+                            children: [
+                              /* @__PURE__ */ jsx6(
                                 "span",
                                 {
-                                  className: "squisq-recorder-record-dot-center",
-                                  style: recordDotStyle
+                                  className: "squisq-recorder-record-dot",
+                                  style: recordDotFrameStyle,
+                                  "aria-hidden": "true",
+                                  children: /* @__PURE__ */ jsx6(
+                                    "span",
+                                    {
+                                      className: "squisq-recorder-record-dot-center",
+                                      style: recordDotStyle
+                                    }
+                                  )
                                 }
-                              )
-                            }
-                          ),
-                          "Record"
-                        ] }),
+                              ),
+                              "Record"
+                            ]
+                          }
+                        ),
                         canStop && /* @__PURE__ */ jsx6("button", { type: "button", style: btnDanger, onClick: handleStop, disabled: isBusy, children: "Stop" }),
                         canSave && /* @__PURE__ */ jsxs5(Fragment3, { children: [
                           /* @__PURE__ */ jsx6(
@@ -3922,12 +3853,6 @@ export {
   useMediaDevices,
   RecorderDeviceSettingsPanel,
   RecorderDeviceQuickPicks,
-  DEFAULT_RECORDER_DEVICE_SETTINGS,
-  buildRecorderAudioConstraints,
-  buildRecorderCameraConstraints,
-  buildRecorderScreenConstraints,
-  buildRecorderScreenAudioConstraints,
-  recorderBitsPerSecond,
   recordedMediaKind,
   isExpandedPanel,
   panelModeAfterToggle,

package/dist/{chunk-UBFNLWCN.js → chunk-V2OLZOYJ.js}

@@ -1,10 +1,10 @@
 import {
   MarkdownEscape
-} from "./chunk-2XXBDECJ.js";
+} from "./chunk-OCQEWWHI.js";
 import {
   markdownToTiptap,
   tiptapToMarkdown
-} from "./chunk-DPAMJV6A.js";
+} from "./chunk-HSWWEWT4.js";
 
 // src/jsonEditor/JsonEditorContext.tsx
 import { createContext, useContext, useEffect, useMemo } from "react";

package/dist/{chunk-XZVMKR5Q.js → chunk-ZS6G2P57.js}

@@ -1,86 +1,9 @@
-// src/recorder/formats.ts
-var AUDIO_CANDIDATES = [
-  "audio/webm;codecs=opus",
-  "audio/webm",
-  "audio/mp4;codecs=mp4a.40.2",
-  "audio/mp4",
-  "audio/ogg;codecs=opus"
-];
-var VIDEO_CANDIDATES = [
-  "video/webm;codecs=vp9,opus",
-  "video/webm;codecs=vp8,opus",
-  "video/webm",
-  "video/mp4;codecs=avc1.42E01E,mp4a.40.2",
-  "video/mp4"
-];
-function extensionForMime(mimeType) {
-  const m = mimeType.toLowerCase();
-  if (m.startsWith("audio/webm")) return ".webm";
-  if (m.startsWith("audio/ogg")) return ".ogg";
-  if (m.startsWith("audio/mp4")) return ".m4a";
-  if (m.startsWith("audio/mpeg")) return ".mp3";
-  if (m.startsWith("audio/wav")) return ".wav";
-  if (m.startsWith("video/webm")) return ".webm";
-  if (m.startsWith("video/mp4")) return ".mp4";
-  return ".bin";
-}
-function probeMimeType(candidates) {
-  if (typeof MediaRecorder === "undefined") return null;
-  for (const candidate of candidates) {
-    try {
-      if (MediaRecorder.isTypeSupported(candidate)) return candidate;
-    } catch {
-    }
-  }
-  return null;
-}
-function resolveFormat(kind, preferred) {
-  const candidates = kind === "audio" ? AUDIO_CANDIDATES : VIDEO_CANDIDATES;
-  const probed = (preferred && probeMimeType([preferred])) ?? probeMimeType(candidates) ?? "";
-  const directory = kind === "audio" ? "audio" : "video";
-  const extension = probed ? extensionForMime(probed) : ".webm";
-  return { mimeType: probed, extension, directory };
-}
-function supportsMediaRecorder() {
-  return typeof MediaRecorder !== "undefined";
-}
-function supportsUserMedia() {
-  return typeof navigator !== "undefined" && typeof navigator.mediaDevices !== "undefined" && typeof navigator.mediaDevices.getUserMedia === "function";
-}
-function supportsDisplayMedia() {
-  return typeof navigator !== "undefined" && typeof navigator.mediaDevices !== "undefined" && typeof navigator.mediaDevices.getDisplayMedia === "function";
-}
-function supportsSystemAudioCapture() {
-  if (!supportsDisplayMedia()) return false;
-  const nav = navigator;
-  const uaData = nav.userAgentData;
-  if (uaData?.mobile === true) return false;
-  if (uaData?.brands?.length) {
-    return uaData.brands.some(({ brand }) => /chromium/i.test(brand));
-  }
-  const userAgent = nav.userAgent ?? "";
-  if (/Android|Mobile|iPhone|iPad|iPod/i.test(userAgent)) return false;
-  return /(?:Chrome|Chromium|Edg|OPR)\//.test(userAgent);
-}
-function buildFilename(kind, extension, basename, seed) {
-  const safe = basename ? basename.trim().replace(/[\\/:*?"<>|]+/g, "-").replace(/\s+/g, "-") : "";
-  if (safe) return `${safe}${extension}`;
-  const now = /* @__PURE__ */ new Date();
-  const stamp = now.getFullYear().toString().padStart(4, "0") + (now.getMonth() + 1).toString().padStart(2, "0") + now.getDate().toString().padStart(2, "0") + "-" + now.getHours().toString().padStart(2, "0") + now.getMinutes().toString().padStart(2, "0") + now.getSeconds().toString().padStart(2, "0");
-  const prefix = seed ?? (kind === "audio" ? "narration" : "recording");
-  return `${prefix}-${stamp}${extension}`;
-}
-
-// src/recorder/sources/micStream.ts
-async function requestMicStream(constraints) {
-  if (!supportsUserMedia()) {
-    throw new Error("navigator.mediaDevices.getUserMedia is not available in this environment.");
-  }
-  return navigator.mediaDevices.getUserMedia({
-    audio: constraints ?? true,
-    video: false
-  });
-}
+import {
+  buildFilename,
+  requestMicStream,
+  resolveFormat,
+  supportsUserMedia
+} from "./chunk-DNJ6HOES.js";
 
 // src/recorder/sources/cameraStream.ts
 async function requestCameraStream(options) {
@@ -506,6 +429,7 @@ function useTeleprompter(opts) {
   const levelRef = useRef2(0);
   const voiceRef = useRef2(false);
   const countdownTimerRef = useRef2(null);
+  const countInWaitersRef = useRef2([]);
   scriptRef.current = script;
   prefsRef.current = prefs;
   transportRef.current = transport;
@@ -530,13 +454,19 @@ function useTeleprompter(opts) {
   const notifyTick = useCallback2(() => {
     for (const cb of tickSubsRef.current) cb(wordPosRef.current);
   }, []);
+  const settleCountIn = useCallback2((rolled) => {
+    const waiters = countInWaitersRef.current;
+    countInWaitersRef.current = [];
+    for (const resolve of waiters) resolve(rolled);
+  }, []);
   const clearCountdown = useCallback2(() => {
     if (countdownTimerRef.current !== null) {
       clearInterval(countdownTimerRef.current);
       countdownTimerRef.current = null;
     }
     setCountdownRemaining(null);
-  }, []);
+    settleCountIn(false);
+  }, [settleCountIn]);
   const finish = useCallback2(() => {
     setTransport("finished");
     transportRef.current = "finished";
@@ -610,13 +540,14 @@ function useTeleprompter(opts) {
     return () => cancelAnimationFrame(raf);
   }, [transport, mic.status, finish, notifyTick, publish]);
   const beginRolling = useCallback2(() => {
+    settleCountIn(true);
     clearCountdown();
     if (sessionRef.current) {
       sessionRef.current = reanchorSession(sessionRef.current, wordPosRef.current);
     }
     setTransport("rolling");
     transportRef.current = "rolling";
-  }, [clearCountdown]);
+  }, [clearCountdown, settleCountIn]);
   const play = useCallback2(() => {
     if (transportRef.current === "rolling" || transportRef.current === "countdown") return;
     if (transportRef.current === "finished") {
@@ -641,6 +572,14 @@ function useTeleprompter(opts) {
       beginRolling();
     }
   }, [beginRolling, mic, publish]);
+  const countIn = useCallback2(() => {
+    if (transportRef.current === "rolling") return Promise.resolve(true);
+    const rolled = new Promise((resolve) => {
+      countInWaitersRef.current.push(resolve);
+    });
+    play();
+    return rolled;
+  }, [play]);
   const pause = useCallback2(() => {
     if (transportRef.current === "countdown") {
       clearCountdown();
@@ -776,6 +715,7 @@ function useTeleprompter(opts) {
     prefs,
     setPrefs,
     play,
+    countIn,
     pause,
     restart,
     nudge,
@@ -1527,6 +1467,11 @@ function useNarrationRecorder(options) {
         cameraMime = videoFormat.mimeType;
         cameraExt = videoFormat.extension;
       }
+      if (opts.countIn) {
+        setCameraStream(camera);
+        if (!await opts.countIn()) throw new StartAborted();
+        if (superseded()) throw new StartAborted();
+      }
       const capture = {
         audioRecorder,
         audioChunks: [],
@@ -1604,6 +1549,7 @@ function useNarrationRecorder(options) {
     if (!capture) {
       if (startingRef.current) {
         cancelPendingStart();
+        optionsRef.current.onRecordingStop?.();
         setState("idle");
       }
       return;
@@ -1793,11 +1739,16 @@ function insertNarrationPreamble(source, audioPath, cameraPath) {
 
 // src/teleprompter/recording/narrationSave.ts
 import {
-  buildNarrationTimingJson
+  buildNarrationTimingJson,
+  resolveNarrationTimingGenerator
 } from "@bendyline/squisq/narration";
 function buildNarrationSavePlan(args) {
+  const timingOptions = {
+    ...args.baseWpm !== void 0 ? { baseWpm: args.baseWpm } : {},
+    ...args.generator ? { generator: args.generator } : {}
+  };
   const sidecarPayload = args.alignment ? buildNarrationTimingJson(args.script, args.alignment, args.durationSec, {
-    baseWpm: args.baseWpm,
+    ...timingOptions,
     ...args.cameraOffsetSec !== void 0 ? { cameraOffsetSec: args.cameraOffsetSec } : {}
   }) : {
     version: 3,
@@ -1805,7 +1756,7 @@ function buildNarrationSavePlan(args) {
     duration: args.durationSec,
     bookmarks: [],
     blocks: [],
-    generator: { name: "squisq-teleprompter", method: "dsp-align", baseWpm: args.baseWpm }
+    generator: resolveNarrationTimingGenerator(timingOptions)
   };
   return {
     audioRelativeName: `audio/${buildFilename("audio", args.audioExt, args.audioBasename)}`,
@@ -1898,7 +1849,8 @@ function useNarrationStage(opts) {
     maxRecordingBytes: opts.maxRecordingBytes,
     audioRecorderOptions: opts.audioRecorderOptions,
     cameraRecorderOptions: opts.cameraRecorderOptions,
-    onRecordingStart: () => controllerRef.current.play(),
+    // The take starts when the countdown ends, with the prompter already rolling.
+    countIn: () => controllerRef.current.countIn(),
     onRecordingStop: () => controllerRef.current.pause()
   });
   const recorderRef = useRef5(recorder);
@@ -2874,13 +2826,6 @@ function NarrationStage(props) {
 export {
   resolveMaxRecordingBytes,
   formatRecordingBytes,
-  resolveFormat,
-  supportsMediaRecorder,
-  supportsUserMedia,
-  supportsDisplayMedia,
-  supportsSystemAudioCapture,
-  buildFilename,
-  requestMicStream,
   requestCameraStream,
   useStreamPreview,
   buildTimingJson,