fix collaboration extension issue

Author: Titanium2099

src/addons/addons/collaboration/helpers/helper.js

@@ -659,6 +659,39 @@ export function hydrateTargetFromYjs(targetId) {
     if (ySounds) applyYjsSoundsToTarget(target, ySounds);
 }
 
+export function reconcileExtensionsToYjs() {
+    const vm = constants.mutableRefs.vm;
+    const sharedExtensions = constants.mutableRefs.sharedExtensions;
+    if (!vm || !sharedExtensions || !constants.mutableRefs.ydoc) return;
+
+    const extensionManager = vm.extensionManager;
+    if (!extensionManager || !extensionManager._loadedExtensions) return;
+    const extensionURLs = (typeof extensionManager.getExtensionURLs === 'function') ?
+        extensionManager.getExtensionURLs() : {};
+
+    const knownNames = new Set();
+    sharedExtensions.toArray().forEach(ext => {
+        const extObj = (typeof ext.toJSON === 'function') ? ext.toJSON() : ext;
+        if (typeof extObj === 'string') {
+            knownNames.add(extObj);
+        } else if (extObj && extObj.name) {
+            knownNames.add(extObj.name);
+        }
+    });
+
+    const missing = [];
+    for (const id of extensionManager._loadedExtensions.keys()) {
+        if (!knownNames.has(id)) {
+            missing.push({ URL: extensionURLs[id] || id, name: id });
+        }
+    }
+    if (missing.length === 0) return;
+
+    constants.mutableRefs.ydoc.transact(() => {
+        constants.mutableRefs.sharedExtensions.push(missing);
+    }, constants.LOCAL_EVENT_SYNC_ORIGIN);
+}
+
 export function performInitialSync() {
     const vm = constants.mutableRefs.vm;
     const Blockly = constants.mutableRefs.BlocklyInstance;

src/addons/addons/collaboration/userscript.js

@@ -584,6 +584,8 @@ function attachYjsProvider() {
                     const ySpriteArray = targets.map(target => helper.serializeSpriteForYjs(target));
                     sharedSprites.insert(0, ySpriteArray);
                 }, constants.LOCAL_EVENT_SYNC_ORIGIN);
+
+                helper.reconcileExtensionsToYjs();
             }, 100);
         };
 
@@ -637,8 +639,6 @@ function attachYjsProvider() {
         };
 
         const handleExtensionAdded = (extension) => {
-            if (constants.mutableRefs.BlocklyInstance?.Events.getGroup() === 'yjs-remote-sync') return;
-
             constants.mutableRefs.ydoc.transact(() => {
                 const currentExts = constants.mutableRefs.sharedExtensions.toArray();
                 const alreadyExists = currentExts.some(ext => {
@@ -650,6 +650,8 @@ function attachYjsProvider() {
                     constants.mutableRefs.sharedExtensions.push([extension]);
                 }
             }, constants.LOCAL_EVENT_SYNC_ORIGIN);
+
+            setTimeout(() => helper.reconcileExtensionsToYjs(), 0);
         };
 
         constants.mutableRefs.vm.on('TARGET_BLOCKS_CHANGED', handleTargetBlocksChanged);
@@ -676,6 +678,7 @@ function attachYjsProvider() {
                         collabUI.hideSyncingPopup();
                         timeout.resetInactivityTimers();
                         constants.mutableRefs.isInitialRoomSync = false;
+                        helper.reconcileExtensionsToYjs();
                         setTimeout(() => {
                             constants.mutableRefs.vm?.emitTargetsUpdate(false);
                         }, 500);
@@ -901,7 +904,7 @@ function attachYjsProvider() {
             constants.mutableRefs.vm.removeListener('TARGETS_INDEX_CHANGED', handleTargetsIndexChanged);
             constants.mutableRefs.vm.removeListener('ADD_SPRITE', handleAddSprite);
             constants.mutableRefs.vm.removeListener('DELETE_SPRITE', handleDeleteSprite);
-            constants.mutableRefs.vm.removeListener('EXTENSION_ADDED', handleExtensionAdded);
+            constants.mutableRefs.vm.removeListener('COLLABORATION_EXTENSION_ADDED', handleExtensionAdded);
 
             collabUI.clearLocalChatMessage();
             timeout.clearInactivityTimers();