@doenet/doenetml 0.7.24-dev.495 → 0.7.24-dev.497

package/{doenetml-BuSy6I1w.js → doenetml-BNj8hUPJ.js}

@@ -31813,7 +31813,7 @@ async function cidFromArrayBuffer(data) {
       await crypto.subtle.digest("SHA-256", new Uint8Array());
       digest = (data2) => crypto.subtle.digest("SHA-256", data2);
     } catch (e2) {
-      const sha256 = (await import("./sha256-DT5xJ2Hv-zsQ-uelX.js").then((n2) => n2.s)).default;
+      const sha256 = (await import("./sha256-DT5xJ2Hv-XHK0B5et.js").then((n2) => n2.s)).default;
       digest = (data2) => sha256(data2, {
         asBytes: true
       });
@@ -47637,8 +47637,11 @@ function lockManager() {
 }
 const HANDSHAKE_CENSUS_LOCK = "doenet-handshake-census";
 const CENSUS_JOIN_TIMEOUT_MS = 1e3;
-const NO_CENSUS_SEAT = { release: () => {
-} };
+const NO_CENSUS_SEAT = {
+  release: () => {
+  },
+  count: Promise.resolve(1)
+};
 function reportedCores() {
   try {
     return typeof navigator !== "undefined" && navigator.hardwareConcurrency ? navigator.hardwareConcurrency : 0;
@@ -47671,8 +47674,15 @@ function joinHandshakeCensus() {
         if (released) {
           return Promise.resolve();
         }
+        const count = countConcurrentHandshakes().then(
+          (inFlight2) => {
+            lastKnownConcurrentHandshakes = inFlight2;
+            return inFlight2;
+          }
+        );
         return new Promise((release) => {
           settle({
+            count,
             release: () => {
               released = true;
               release();
@@ -47755,17 +47765,32 @@ function retryDelayMs(attempt) {
 }
 const CORE_START_FAILED_MESSAGE = "This document could not be started. Please reload the page.";
 const CORE_START_FAILED_BUSY_MESSAGE = "This document could not be started. Several documents were starting at once, which can take longer on a slower device. Reloading the page may help once the other documents have finished.";
-function withTimeout(task, ms, label) {
+function withTimeout(task, ms, label, widenedMs) {
   return new Promise((resolve, reject2) => {
     let settled = false;
-    const timer = setTimeout(() => {
+    const startedAt = Date.now();
+    let budgetMs = ms;
+    function expire() {
       if (!settled) {
         settled = true;
-        const err = new Error(`${label} timed out after ${ms}ms`);
+        const err = new Error(`${label} timed out after ${budgetMs}ms`);
         err[TIMEOUT_ERROR_FLAG] = true;
         reject2(err);
       }
-    }, ms);
+    }
+    let timer = setTimeout(expire, ms);
+    widenedMs?.then((wider) => {
+      if (settled || !(wider > budgetMs)) {
+        return;
+      }
+      budgetMs = wider;
+      clearTimeout(timer);
+      timer = setTimeout(
+        expire,
+        Math.max(0, startedAt + wider - Date.now())
+      );
+    }).catch(() => {
+    });
     task().then(
       (value) => {
         if (!settled) {
@@ -48148,8 +48173,11 @@ function DocViewer({
         return;
       }
       if (e2.data.subject === "SPLICE.getState.response") {
-        if (messageIdFromGetState.current === e2.data.message_id) {
-          if (e2.data.state && e2.data.state.cid === cid.current) {
+        const openRequestId = messageIdFromGetState.current;
+        const quotesOpenRequest = openRequestId !== null && e2.data.message_id === openRequestId;
+        const isUnaddressedError = openRequestId !== null && (e2.data.message_id === void 0 || e2.data.message_id === null) && Boolean(e2.data.error);
+        if (quotesOpenRequest || isUnaddressedError) {
+          if (quotesOpenRequest && e2.data.state && e2.data.state.cid === cid.current) {
             messageIdFromGetState.current = null;
             setErrMsg(null);
             setIsInErrorState?.(false);
@@ -48177,17 +48205,17 @@ function DocViewer({
             } else {
               setStage("readyToCreateCore");
             }
-          }
-        } else if (messageIdFromGetState.current !== null && e2.data.error) {
-          const error = e2.data.error;
-          setIsInErrorState?.(true);
-          if (typeof error === "object" && "code" in error && "message" in error) {
-            console.log(
-              `error ${error.code} getting state: ${error.message}`
-            );
-            setErrMsg(error.message);
-          } else {
-            setErrMsg("Invalid response to getState");
+          } else if (e2.data.error) {
+            const error = e2.data.error;
+            setIsInErrorState?.(true);
+            if (typeof error === "object" && "code" in error && "message" in error) {
+              console.log(
+                `error ${error.code} getting state: ${error.message}`
+              );
+              setErrMsg(error.message);
+            } else {
+              setErrMsg("Invalid response to getState");
+            }
           }
         }
       } else if (e2.data.subject === "SPLICE.requestSolutionView.response") {
@@ -48558,7 +48586,7 @@ function DocViewer({
     for (const rendererClassName of coreInfo.current.rendererTypesInDocument) {
       rendererClassNames.push(rendererClassName);
       rendererLoaders.push(
-        () => __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./renderers/GraphFrame.tsx": () => import("./GraphFrame-zEBOQLV2.js"), "./renderers/JSXGraphRenderer.tsx": () => import("./JSXGraphRenderer-CyYe0d3K.js").then((n2) => n2.m), "./renderers/_error.tsx": () => import("./_error-hqesHzVC.js"), "./renderers/alert.tsx": () => import("./alert-axYiV_tJ.js"), "./renderers/angle.tsx": () => import("./angle-BKq_hmKc.js"), "./renderers/answer.tsx": () => import("./answer-BMMoGAJn.js"), "./renderers/asList.tsx": () => import("./asList-CC2BVoI_.js"), "./renderers/blockQuote.tsx": () => import("./blockQuote-kj3Ck-pZ.js"), "./renderers/boolean.tsx": () => import("./boolean-BuBdYx-N.js"), "./renderers/booleanInput.tsx": () => import("./booleanInput-BcvmUpXs.js"), "./renderers/br.tsx": () => import("./br-BRIBO7bD.js"), "./renderers/button.tsx": () => import("./button-CMX4IneM.js"), "./renderers/c.tsx": () => import("./c-sY8VwhFg.js"), "./renderers/cell.tsx": () => import("./cell-L0R7RpcY.js"), "./renderers/choiceInput.tsx": () => import("./choiceInput-BrWYbJql.js"), "./renderers/circle.tsx": () => import("./circle-C7ZgorN7.js"), "./renderers/cobwebPolyline.tsx": () => import("./cobwebPolyline-DH3cUzkl.js"), "./renderers/codeEditor.tsx": () => import("./codeEditor-D12aWsev.js"), "./renderers/containerBlock.tsx": () => import("./containerBlock-Cc3gEQrI.js"), "./renderers/containerInline.tsx": () => import("./containerInline-CPpPik-D.js"), "./renderers/curve.tsx": () => import("./curve-C4GzvlkI.js"), "./renderers/ellipsis.tsx": () => import("./ellipsis-DnFVuA9d.js"), "./renderers/em.tsx": () => import("./em-DdD05o3x.js"), "./renderers/embed.tsx": () => import("./embed-B62WIgaH.js"), "./renderers/feedback.tsx": () => import("./feedback-BcxDOMuZ.js"), "./renderers/figure.tsx": () => import("./figure-CcLohmH5.js"), "./renderers/footnote.tsx": () => import("./footnote-CPEytkdo.js"), "./renderers/fractionInput.tsx": () => import("./fractionInput-CiL7mOX5.js"), "./renderers/graph.tsx": () => import("./graph-9LOjGTCa.js"), "./renderers/hint.tsx": () => import("./hint-C41Ch5XB.js"), "./renderers/hr.tsx": () => import("./hr-C84KrkaF.js"), "./renderers/image.tsx": () => import("./image-DsR4O6yd.js"), "./renderers/label.tsx": () => import("./label-CodBWl3q.js"), "./renderers/legend.tsx": () => import("./legend-D5qk1cn9.js"), "./renderers/line.tsx": () => import("./line-LKhHK3ao.js"), "./renderers/lineSegment.tsx": () => import("./lineSegment-CMe7p4B8.js"), "./renderers/list.tsx": () => import("./list-aDqq9E8_.js"), "./renderers/lq.tsx": () => import("./lq-sk_kpM4g.js"), "./renderers/lsq.tsx": () => import("./lsq-udYhMiy-.js"), "./renderers/math.tsx": () => import("./math-D5bR8goy.js"), "./renderers/mathInput.tsx": () => import("./mathInput-CqA8QGlC.js"), "./renderers/matrixInput.tsx": () => import("./matrixInput-DZ5rWbAH.js"), "./renderers/mdash.tsx": () => import("./mdash-ByqoX5jk.js"), "./renderers/nbsp.tsx": () => import("./nbsp-DJyyMGnV.js"), "./renderers/ndash.tsx": () => import("./ndash-Cm01kWl7.js"), "./renderers/number.tsx": () => import("./number-C22PBQNy.js"), "./renderers/orbitalDiagram.tsx": () => import("./orbitalDiagram-CTmuEgi-.js"), "./renderers/orbitalDiagramInput.tsx": () => import("./orbitalDiagramInput-ByYETH5z.js"), "./renderers/p.tsx": () => import("./p-TtFLz_x5.js"), "./renderers/paginatorControls.tsx": () => import("./paginatorControls-D0_5xOvO.js"), "./renderers/pegboard.tsx": () => import("./pegboard-pPTxf8sE.js"), "./renderers/point.tsx": () => import("./point-D4b8U4lC.js"), "./renderers/polygon.tsx": () => import("./polygon-iydeAeAK.js"), "./renderers/polyline.tsx": () => import("./polyline-D1Wqv7hE.js"), "./renderers/pre.tsx": () => import("./pre-CQ9y4D0C.js"), "./renderers/prefigure.tsx": () => import("./prefigure-CJkNxksY.js"), "./renderers/pretzel.tsx": () => import("./pretzel-CPkDoQpu.js"), "./renderers/q.tsx": () => import("./q-CZXq0YKe.js"), "./renderers/ray.tsx": () => import("./ray-BXcVKK2Z.js"), "./renderers/ref.tsx": () => import("./ref-DU5u7LFH.js"), "./renderers/regionBetweenCurveXAxis.tsx": () => import("./regionBetweenCurveXAxis-D8UXPU8g.js"), "./renderers/regionBetweenCurves.tsx": () => import("./regionBetweenCurves-DvRmJcwN.js"), "./renderers/row.tsx": () => import("./row-DvC8EdBh.js"), "./renderers/rq.tsx": () => import("./rq-JzDMJ0ZL.js"), "./renderers/rsq.tsx": () => import("./rsq-GgFYOjN0.js"), "./renderers/section.tsx": () => import("./section-BrgbvDNu.js"), "./renderers/sideBySide.tsx": () => import("./sideBySide-DE2uxJzi.js"), "./renderers/slider.tsx": () => import("./slider-CkjyPDPg.js"), "./renderers/slopeField.tsx": () => import("./slopeField-DzoDI_VI.js"), "./renderers/solution.tsx": () => import("./solution-D61ajFGy.js"), "./renderers/spreadsheet.tsx": () => import("./spreadsheet-DG_DFrQv.js"), "./renderers/sq.tsx": () => import("./sq-Crt8B5Q9.js"), "./renderers/subsetOfRealsInput.tsx": () => import("./subsetOfRealsInput-Cpy9vBVy.js"), "./renderers/summaryStatistics.tsx": () => import("./summaryStatistics-DW_aR-Nj.js"), "./renderers/table.tsx": () => import("./table-CbJlvUVx.js"), "./renderers/tabular.tsx": () => import("./tabular-CrEPPxUm.js"), "./renderers/tag.tsx": () => import("./tag-sTOkSoGF.js"), "./renderers/text.tsx": () => import("./text-BOFBX0YD.js"), "./renderers/textInput.tsx": () => import("./textInput-TRboDv3U.js"), "./renderers/vector.tsx": () => import("./vector-QaINZf3K.js"), "./renderers/vectorField.tsx": () => import("./vectorField-PPj_aZIR.js"), "./renderers/video.tsx": () => import("./video-CYCSnFH1.js") }), `./renderers/${rendererClassName}.tsx`, 3)
+        () => __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./renderers/GraphFrame.tsx": () => import("./GraphFrame-J9aRYw-_.js"), "./renderers/JSXGraphRenderer.tsx": () => import("./JSXGraphRenderer-B1fPgBQL.js").then((n2) => n2.m), "./renderers/_error.tsx": () => import("./_error-CM2xv1L1.js"), "./renderers/alert.tsx": () => import("./alert-fJ7fPOja.js"), "./renderers/angle.tsx": () => import("./angle-BMp-FdH-.js"), "./renderers/answer.tsx": () => import("./answer-Beh1L7Ct.js"), "./renderers/asList.tsx": () => import("./asList-BVYcSN95.js"), "./renderers/blockQuote.tsx": () => import("./blockQuote-DDdYo8yZ.js"), "./renderers/boolean.tsx": () => import("./boolean-BaaeCDPe.js"), "./renderers/booleanInput.tsx": () => import("./booleanInput-CfZlovJh.js"), "./renderers/br.tsx": () => import("./br-BBXsTvz_.js"), "./renderers/button.tsx": () => import("./button-Bd1RCL0F.js"), "./renderers/c.tsx": () => import("./c-BqPn5zlt.js"), "./renderers/cell.tsx": () => import("./cell-ggDoyaMY.js"), "./renderers/choiceInput.tsx": () => import("./choiceInput-BWaliQ4N.js"), "./renderers/circle.tsx": () => import("./circle-rTsM60Ni.js"), "./renderers/cobwebPolyline.tsx": () => import("./cobwebPolyline-D5E3KzUQ.js"), "./renderers/codeEditor.tsx": () => import("./codeEditor-DyIRx_j2.js"), "./renderers/containerBlock.tsx": () => import("./containerBlock-NuZs9v9y.js"), "./renderers/containerInline.tsx": () => import("./containerInline-D8EMJvCH.js"), "./renderers/curve.tsx": () => import("./curve-Bcul46BA.js"), "./renderers/ellipsis.tsx": () => import("./ellipsis-7GygteHr.js"), "./renderers/em.tsx": () => import("./em-BztesGjV.js"), "./renderers/embed.tsx": () => import("./embed-I5GEhyft.js"), "./renderers/feedback.tsx": () => import("./feedback---TEGwVg.js"), "./renderers/figure.tsx": () => import("./figure-9tM-jQ8A.js"), "./renderers/footnote.tsx": () => import("./footnote-CYCVlIwr.js"), "./renderers/fractionInput.tsx": () => import("./fractionInput-BZD7yTQ0.js"), "./renderers/graph.tsx": () => import("./graph-C3I-T75j.js"), "./renderers/hint.tsx": () => import("./hint-DYs5Ha0O.js"), "./renderers/hr.tsx": () => import("./hr-COBqtTMA.js"), "./renderers/image.tsx": () => import("./image-QRhbXjAg.js"), "./renderers/label.tsx": () => import("./label-fHZrrjbM.js"), "./renderers/legend.tsx": () => import("./legend-BNEFF-AX.js"), "./renderers/line.tsx": () => import("./line-GmB_gf87.js"), "./renderers/lineSegment.tsx": () => import("./lineSegment-BQiisB3c.js"), "./renderers/list.tsx": () => import("./list-DbWCTpHS.js"), "./renderers/lq.tsx": () => import("./lq-D9o0nwGb.js"), "./renderers/lsq.tsx": () => import("./lsq-CVJGiNNV.js"), "./renderers/math.tsx": () => import("./math-CzWtQFdq.js"), "./renderers/mathInput.tsx": () => import("./mathInput-CXeU9U0X.js"), "./renderers/matrixInput.tsx": () => import("./matrixInput-CBwk6GLN.js"), "./renderers/mdash.tsx": () => import("./mdash-D-BsPzqD.js"), "./renderers/nbsp.tsx": () => import("./nbsp-QfRXvBbj.js"), "./renderers/ndash.tsx": () => import("./ndash-FnmkrE6h.js"), "./renderers/number.tsx": () => import("./number-IucfLRl6.js"), "./renderers/orbitalDiagram.tsx": () => import("./orbitalDiagram-CepnW8EZ.js"), "./renderers/orbitalDiagramInput.tsx": () => import("./orbitalDiagramInput-Da-mS49s.js"), "./renderers/p.tsx": () => import("./p-DIFbp4Q-.js"), "./renderers/paginatorControls.tsx": () => import("./paginatorControls-DbrpzYCs.js"), "./renderers/pegboard.tsx": () => import("./pegboard-CZfMy39_.js"), "./renderers/point.tsx": () => import("./point-cDV7OtNc.js"), "./renderers/polygon.tsx": () => import("./polygon-AQ0WNJy_.js"), "./renderers/polyline.tsx": () => import("./polyline-MhjLSEz0.js"), "./renderers/pre.tsx": () => import("./pre-xnI7rJMx.js"), "./renderers/prefigure.tsx": () => import("./prefigure-eNk02kQJ.js"), "./renderers/pretzel.tsx": () => import("./pretzel-CiOUs7vd.js"), "./renderers/q.tsx": () => import("./q-k8k15LVt.js"), "./renderers/ray.tsx": () => import("./ray-Ch2ui56v.js"), "./renderers/ref.tsx": () => import("./ref-DNZxSqSj.js"), "./renderers/regionBetweenCurveXAxis.tsx": () => import("./regionBetweenCurveXAxis-BpYtfJsb.js"), "./renderers/regionBetweenCurves.tsx": () => import("./regionBetweenCurves-BRVme9F1.js"), "./renderers/row.tsx": () => import("./row-BbBPepAA.js"), "./renderers/rq.tsx": () => import("./rq-DA-W1nVB.js"), "./renderers/rsq.tsx": () => import("./rsq-DbQU81S7.js"), "./renderers/section.tsx": () => import("./section-Cwk2YVpg.js"), "./renderers/sideBySide.tsx": () => import("./sideBySide-CTu3a-AV.js"), "./renderers/slider.tsx": () => import("./slider-BUJra_ib.js"), "./renderers/slopeField.tsx": () => import("./slopeField-bgKdbJoE.js"), "./renderers/solution.tsx": () => import("./solution-DR1m0hOM.js"), "./renderers/spreadsheet.tsx": () => import("./spreadsheet-BJjzrRv1.js"), "./renderers/sq.tsx": () => import("./sq-BI6oF5xT.js"), "./renderers/subsetOfRealsInput.tsx": () => import("./subsetOfRealsInput-Ck9-Pmna.js"), "./renderers/summaryStatistics.tsx": () => import("./summaryStatistics-cR50eUyw.js"), "./renderers/table.tsx": () => import("./table-CZpSGdPm.js"), "./renderers/tabular.tsx": () => import("./tabular-D2XRUIwk.js"), "./renderers/tag.tsx": () => import("./tag-B2UbPKyg.js"), "./renderers/text.tsx": () => import("./text-QdF5glJv.js"), "./renderers/textInput.tsx": () => import("./textInput-BCACwzF3.js"), "./renderers/vector.tsx": () => import("./vector-F-uuaHSD.js"), "./renderers/vectorField.tsx": () => import("./vectorField-CIcOQbof.js"), "./renderers/video.tsx": () => import("./video-0Z7YLjVE.js") }), `./renderers/${rendererClassName}.tsx`, 3)
       );
     }
     const documentComponentInstructions = coreInfo.current.documentToRender;
@@ -48877,6 +48905,12 @@ function DocViewer({
     );
     const handshakeWatchdogOverride = doenetGlobalConfig.coreHandshakeWatchdogMs;
     const cores = reportedCores() || 1;
+    function budgetMsFor(concurrentHandshakes) {
+      return handshakeWatchdogOverride ?? handshakeWatchdogMsFor({
+        concurrentHandshakes,
+        hardwareConcurrency: cores
+      });
+    }
     let thisCoreWorker = null;
     let handshakeSucceeded = false;
     let lastFailureWasContended = false;
@@ -48889,16 +48923,21 @@ function DocViewer({
           return;
         }
         refreshHandshakeCensusCount();
-        const concurrentHandshakes = concurrentHandshakesSnapshot();
-        const handshakeWatchdogMs = handshakeWatchdogOverride ?? handshakeWatchdogMsFor({
-          concurrentHandshakes,
-          hardwareConcurrency: cores
-        });
+        let concurrentHandshakes = concurrentHandshakesSnapshot();
+        const openingWatchdogMs = budgetMsFor(concurrentHandshakes);
+        const seatWidenedWatchdogMs = attempt === 0 ? censusHandle.then(async (seat) => {
+          concurrentHandshakes = Math.max(
+            concurrentHandshakes,
+            await seat.count
+          );
+          return budgetMsFor(concurrentHandshakes);
+        }) : null;
         try {
           thisCoreWorker = await withTimeout(
             () => handshakeCore(attempt, coreIdWhenCalled),
-            handshakeWatchdogMs,
-            `core worker handshake (attempt ${attempt + 1}/${maxAttempts})`
+            openingWatchdogMs,
+            `core worker handshake (attempt ${attempt + 1}/${maxAttempts})`,
+            seatWidenedWatchdogMs
           );
           handshakeSucceeded = true;
           break;
@@ -48917,7 +48956,7 @@ function DocViewer({
           });
           lastFailureWasContended = contended;
           console.warn(
-            `DocViewer: core worker handshake attempt ${attempt + 1} of ${maxAttempts} failed (watchdog ${handshakeWatchdogMs}ms; ${concurrentHandshakes} handshake(s) in flight on ${cores} core(s))` + (attempt + 1 < maxAttempts ? "; retrying with a fresh worker." : "; giving up."),
+            `DocViewer: core worker handshake attempt ${attempt + 1} of ${maxAttempts} failed (watchdog ${budgetMsFor(concurrentHandshakes)}ms; ${concurrentHandshakes} handshake(s) in flight on ${cores} core(s))` + (attempt + 1 < maxAttempts ? "; retrying with a fresh worker." : "; giving up."),
             err
           );
           await teardownCurrentCoreWorker({
@@ -49223,6 +49262,7 @@ function DocViewer({
       setIsInErrorState?.(false);
     }
     coreId.current = nanoid$1();
+    messageIdFromGetState.current = null;
     initialCoreData.current = null;
     coreInfo.current = null;
     setDocumentRenderer(null);
@@ -112151,7 +112191,7 @@ function ExternalAwareVirtualKeyboard({
 }
 const LazyInner = React__default.lazy(async () => {
   const module = await importRendererWithRetry(
-    () => import("./EditorViewer-CgeqFSvi.js"),
+    () => import("./EditorViewer-YRLY16JM.js"),
     "EditorViewer"
   );
   return { default: module.EditorViewer };

package/doenetml-external-worker.js

@@ -1,5 +1,5 @@
-import { n as hostProvidedWorkerUrl, o as doenetGlobalConfig } from "./doenetml-BuSy6I1w.js";
-import { D, a, c, b, d, f, g, e, h, i, m, j, r, s, k, l } from "./doenetml-BuSy6I1w.js";
+import { n as hostProvidedWorkerUrl, o as doenetGlobalConfig } from "./doenetml-BNj8hUPJ.js";
+import { D, a, c, b, d, f, g, e, h, i, m, j, r, s, k, l } from "./doenetml-BNj8hUPJ.js";
 const workerPath = "./doenetml-worker/index.js";
 function resolveWorkerUrl() {
   try {