@mml-io/mml-web-client 0.0.0-experimental-b3c5d2f-20250916 → 0.0.0-experimental-d5193f3-20250916

package/build/index.js

@@ -78,13 +78,44 @@
     }
     return node;
   }
-  function encodeConnectUsers(connectUsersMessage, writer) {
+  function getNetworkedDOMProtocolSubProtocol_v0_2Subversion(protocol) {
+    return protocolSubVersionMap[protocol] ?? null;
+  }
+  function getNetworkedDOMProtocolSubProtocol_v0_2SubversionOrThrow(protocol) {
+    const subversion = getNetworkedDOMProtocolSubProtocol_v0_2Subversion(protocol);
+    if (subversion === null) {
+      throw new Error(`Unrecognized networked-dom-v0.2 protocol subversion: ${protocol}`);
+    }
+    return subversion;
+  }
+  function isNetworkedDOMProtocolSubProtocol_v0_2(protocol) {
+    return networkedDOMProtocolSubProtocol_v0_2_SubVersionsList.includes(protocol);
+  }
+  function protocolSubversionHasConnectionTokens(protocolSubversion) {
+    return protocolSubversion >= 1;
+  }
+  function encodeConnectUsers(connectUsersMessage, writer, protocolSubversion) {
     const connectionIdsLength = connectUsersMessage.connectionIds.length;
     writer.writeUint8(ConnectUsersMessageType);
     writer.writeUVarint(connectionIdsLength);
     for (let i = 0; i < connectionIdsLength; i++) {
       writer.writeUVarint(connectUsersMessage.connectionIds[i]);
     }
+    if (protocolSubversionHasConnectionTokens(protocolSubversion)) {
+      if (connectUsersMessage.connectionTokens.length !== connectionIdsLength) {
+        throw new Error(
+          `connectionTokens length (${connectUsersMessage.connectionTokens.length}) does not match connectionIds length (${connectionIdsLength})`
+        );
+      }
+      for (let i = 0; i < connectionIdsLength; i++) {
+        const token = connectUsersMessage.connectionTokens[i];
+        if (token === null || token === void 0) {
+          writer.writeUVarint(0);
+        } else {
+          writer.writeLengthPrefixedString(token);
+        }
+      }
+    }
   }
   function encodeDisconnectUsers(disconnectUsersMessage, writer) {
     const connectionIdsLength = disconnectUsersMessage.connectionIds.length;
@@ -276,11 +307,11 @@
     }
     return messages;
   }
-  function encodeClientMessage(message, writer) {
+  function encodeClientMessage(message, writer, protocolSubversion) {
     const type2 = message.type;
     switch (type2) {
       case "connectUsers":
-        return encodeConnectUsers(message, writer);
+        return encodeConnectUsers(message, writer, protocolSubversion);
       case "disconnectUsers":
         return encodeDisconnectUsers(message, writer);
       case "event":
@@ -291,7 +322,7 @@
         throw new Error(`Unknown message type: ${type2}`);
     }
   }
-  var networkedDOMProtocolSubProtocol_v0_1, textDecoder, BufferReader, textEncoder, BufferWriter, networkedDOMProtocolSubProtocol_v0_2, SnapshotMessageType, BatchStartMessageType, DocumentTimeMessageType, ChildrenAddedMessageType, ChildrenRemovedMessageType, AttributesChangedMessageType, ChangeVisibleToMessageType, ChangeHiddenFromMessageType, TextChangedMessageType, BatchEndMessageType, PingMessageType, WarningMessageType, ErrorMessageType, ConnectUsersMessageType, DisconnectUsersMessageType, EventMessageType, PongMessageType, batchEndMessage, batchStartMessage;
+  var networkedDOMProtocolSubProtocol_v0_1, textDecoder, BufferReader, textEncoder, BufferWriter, networkedDOMProtocolSubProtocol_v0_2, networkedDOMProtocolSubProtocol_v0_2_1, networkedDOMProtocolSubProtocol_v0_2_SubVersionsList, protocolSubVersionMap, SnapshotMessageType, BatchStartMessageType, DocumentTimeMessageType, ChildrenAddedMessageType, ChildrenRemovedMessageType, AttributesChangedMessageType, ChangeVisibleToMessageType, ChangeHiddenFromMessageType, TextChangedMessageType, BatchEndMessageType, PingMessageType, WarningMessageType, ErrorMessageType, ConnectUsersMessageType, DisconnectUsersMessageType, EventMessageType, PongMessageType, batchEndMessage, batchStartMessage;
   var init_build = __esm({
     "../networked-dom-protocol/build/index.js"() {
       networkedDOMProtocolSubProtocol_v0_1 = "networked-dom-v0.1";
@@ -519,6 +550,15 @@
         }
       };
       networkedDOMProtocolSubProtocol_v0_2 = "networked-dom-v0.2";
+      networkedDOMProtocolSubProtocol_v0_2_1 = "networked-dom-v0.2.1";
+      networkedDOMProtocolSubProtocol_v0_2_SubVersionsList = [
+        networkedDOMProtocolSubProtocol_v0_2_1,
+        networkedDOMProtocolSubProtocol_v0_2
+      ];
+      protocolSubVersionMap = {
+        [networkedDOMProtocolSubProtocol_v0_2]: 0,
+        [networkedDOMProtocolSubProtocol_v0_2_1]: 1
+      };
       SnapshotMessageType = 1;
       BatchStartMessageType = 2;
       DocumentTimeMessageType = 3;
@@ -1120,7 +1160,14 @@
           this.batchMode = false;
           this.batchMessages = [];
           this.websocket.binaryType = "arraybuffer";
-          this.send({ type: "connectUsers", connectionIds: [connectionId] });
+          this.protocolSubversion = getNetworkedDOMProtocolSubProtocol_v0_2SubversionOrThrow(
+            websocket.protocol
+          );
+          this.send({
+            type: "connectUsers",
+            connectionIds: [connectionId],
+            connectionTokens: [this.options.connectionToken ?? null]
+          });
         }
         handleEvent(element, event) {
           const nodeId = this.elementToId.get(element);
@@ -1144,7 +1191,7 @@
         }
         send(message) {
           const writer = new BufferWriter(256);
-          encodeClientMessage(message, writer);
+          encodeClientMessage(message, writer, this.protocolSubversion);
           this.websocket.send(writer.getBuffer());
         }
         clearContents() {
@@ -1513,7 +1560,7 @@
         }
         static createWebSocket(url) {
           return new WebSocket(url, [
-            networkedDOMProtocolSubProtocol_v0_2,
+            ...networkedDOMProtocolSubProtocol_v0_2_SubVersionsList,
             networkedDOMProtocolSubProtocol_v0_1
           ]);
         }
@@ -1536,7 +1583,7 @@
             websocket.addEventListener("open", () => {
               clearTimeout(timeoutId);
               this.websocket = websocket;
-              const isV02 = websocket.protocol === networkedDOMProtocolSubProtocol_v0_2;
+              const isV02 = isNetworkedDOMProtocolSubProtocol_v0_2(websocket.protocol);
               let websocketAdapter;
               if (isV02) {
                 websocketAdapter = new NetworkedDOMWebsocketV02Adapter(
@@ -2121,6 +2168,12 @@
           scene22.removeChatProbe(chatProbe);
         }
       },
+      getOverlayElement() {
+        if (scene22.getOverlayElement) {
+          return scene22.getOverlayElement();
+        }
+        return null;
+      },
       hasGraphicsAdapter() {
         return scene22.hasGraphicsAdapter();
       },
@@ -8010,7 +8063,7 @@
           }
         }
       };
-      RemoteDocument = class extends MElement {
+      RemoteDocument = class extends TransformableElement {
         constructor() {
           super();
           this.scene = null;
@@ -9314,17 +9367,22 @@
             }
             overriddenHandler(element, event);
           };
+          const loadingProgressManager = new LoadingProgressManager();
+          const wrappedScene = createWrappedScene(this.options.mmlScene, loadingProgressManager);
           const src = this.options.url;
           this.remoteDocumentWrapper = new RemoteDocumentWrapper(
             src,
             this.options.windowTarget,
-            this.options.mmlScene,
+            wrappedScene,
             eventHandler
           );
           this.options.targetForWrappers.append(this.remoteDocumentWrapper.remoteDocument);
-          let loadingProgressManager;
+          let sceneLoadingProgressManager = null;
           if (this.options.mmlScene.getLoadingProgressManager) {
-            loadingProgressManager = this.options.mmlScene.getLoadingProgressManager();
+            sceneLoadingProgressManager = this.options.mmlScene.getLoadingProgressManager();
+            loadingProgressManager.addProgressCallback(() => {
+              sceneLoadingProgressManager == null ? void 0 : sceneLoadingProgressManager.updateDocumentProgress(this);
+            });
           }
           const isWebsocket = src.startsWith("ws://") || src.startsWith("wss://");
           if (isWebsocket) {
@@ -9336,15 +9394,22 @@
                 this.remoteDocumentWrapper.setDocumentTime(time2);
               },
               (status) => {
-                if (status === NetworkedDOMWebsocketStatus.Connected) {
-                  loadingProgressManager == null ? void 0 : loadingProgressManager.setInitialLoad(true);
+                if (status === NetworkedDOMWebsocketStatus.Reconnecting) {
+                  this.remoteDocumentWrapper.remoteDocument.showError(true);
+                  loadingProgressManager.setInitialLoad(new Error("Failed to connect"));
+                } else if (status === NetworkedDOMWebsocketStatus.Connected) {
+                  this.remoteDocumentWrapper.remoteDocument.showError(false);
+                  loadingProgressManager.setInitialLoad(true);
+                } else {
+                  this.remoteDocumentWrapper.remoteDocument.showError(false);
                 }
                 this.options.statusUpdated(status);
               },
               {
                 tagPrefix: "m-",
                 // If overlays are allowed, allow SVG elements to populate them
-                allowSVGElements: this.options.allowOverlay
+                allowSVGElements: this.options.allowOverlay,
+                connectionToken: this.options.connectionToken ?? null
               }
             );
             this.websocket = websocket;
@@ -9361,12 +9426,15 @@
             overriddenHandler = () => {
             };
           }
+          sceneLoadingProgressManager == null ? void 0 : sceneLoadingProgressManager.addLoadingDocument(this, this.options.url, loadingProgressManager);
         }
         dispose() {
+          var _a2, _b2, _c;
           if (this.websocket) {
             this.websocket.stop();
             this.websocket = null;
           }
+          (_c = (_b2 = (_a2 = this.options.mmlScene).getLoadingProgressManager) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c.removeLoadingDocument(this);
           this.remoteDocumentWrapper.remoteDocument.remove();
         }
       };
@@ -114235,6 +114303,7 @@ void main() {
     const urlSearchParams = new URLSearchParams(window.location.search);
     const useIframe = scriptUrl.searchParams.get("iframe") === "true" || urlSearchParams.get("iframe") === "true";
     const allowOverlay = scriptUrl.searchParams.get("allowOverlay") === "true" || urlSearchParams.get("allowOverlay") === "true";
+    const connectionToken = urlSearchParams.get("token") ?? null;
     const fullScreenMMLSceneOptions = {
       allowOverlay
     };
@@ -114262,6 +114331,7 @@ void main() {
       const statusUI = new StatusUI();
       const mmlNetworkSource = MMLNetworkSource.create({
         url,
+        connectionToken,
         mmlScene: fullScreenMMLScene,
         statusUpdated: (status) => {
           if (status === NetworkedDOMWebsocketStatus.Connected) {