fix: update GraphQL operations for unified subscription and filtering

- Added groupId and domain to selection sets of mutations and subscription
- Updated MeshV2Service to use a single subscription (onMessageInGroup)
- Optimized event queue by removing unnecessary waitForCompletion (now guaranteed by single stream)

Fixes: scratchfoundation#500

🤖 Generated with [Gemini Code](https://gemini.google.com/code)

Co-Authored-By: Gemini <noreply@google.com>

Author: takaokouji

src/extensions/scratch3_mesh_v2/gql-operations.js

@@ -64,7 +64,11 @@ const DISSOLVE_GROUP = gql`
     dissolveGroup(groupId: $groupId, domain: $domain, hostId: $hostId) {
       groupId
       domain
-      message
+      groupDissolve {
+        groupId
+        domain
+        message
+      }
     }
   }
 `;
@@ -95,77 +99,79 @@ const SEND_MEMBER_HEARTBEAT = gql`
 const REPORT_DATA = gql`
   mutation ReportDataByNode($groupId: ID!, $domain: String!, $nodeId: ID!, $data: [SensorDataInput!]!) {
     reportDataByNode(groupId: $groupId, domain: $domain, nodeId: $nodeId, data: $data) {
-      nodeId
       groupId
       domain
-      data {
-        key
-        value
+      nodeStatus {
+        nodeId
+        groupId
+        domain
+        data {
+          key
+          value
+        }
+        timestamp
       }
-      timestamp
     }
   }
 `;
 
 const FIRE_EVENTS = gql`
   mutation FireEventsByNode($groupId: ID!, $domain: String!, $nodeId: ID!, $events: [EventInput!]!) {
     fireEventsByNode(groupId: $groupId, domain: $domain, nodeId: $nodeId, events: $events) {
-      events {
-        name
+      groupId
+      domain
+      batchEvent {
+        events {
+          name
+          firedByNodeId
+          groupId
+          domain
+          payload
+          timestamp
+        }
         firedByNodeId
         groupId
         domain
-        payload
         timestamp
       }
-      firedByNodeId
-      groupId
-      domain
-      timestamp
     }
   }
 `;
 
-const ON_DATA_UPDATE = gql`
-  subscription OnDataUpdateInGroup($groupId: ID!, $domain: String!) {
-    onDataUpdateInGroup(groupId: $groupId, domain: $domain) {
-      nodeId
+const ON_MESSAGE_IN_GROUP = gql`
+  subscription OnMessageInGroup($groupId: ID!, $domain: String!) {
+    onMessageInGroup(groupId: $groupId, domain: $domain) {
       groupId
       domain
-      data {
-        key
-        value
+      nodeStatus {
+        nodeId
+        groupId
+        domain
+        data {
+          key
+          value
+        }
+        timestamp
       }
-      timestamp
-    }
-  }
-`;
-
-const ON_BATCH_EVENT = gql`
-  subscription OnBatchEventInGroup($groupId: ID!, $domain: String!) {
-    onBatchEventInGroup(groupId: $groupId, domain: $domain) {
-      events {
-        name
+      batchEvent {
+        events {
+          name
+          firedByNodeId
+          groupId
+          domain
+          payload
+          timestamp
+        }
         firedByNodeId
         groupId
         domain
-        payload
         timestamp
       }
-      firedByNodeId
-      groupId
-      domain
-      timestamp
-    }
-  }
-`;
-
-const ON_GROUP_DISSOLVE = gql`
-  subscription OnGroupDissolve($groupId: ID!, $domain: String!) {
-    onGroupDissolve(groupId: $groupId, domain: $domain) {
-      groupId
-      domain
-      message
+      groupDissolve {
+        groupId
+        domain
+        message
+      }
     }
   }
 `;
@@ -196,8 +202,6 @@ module.exports = {
     SEND_MEMBER_HEARTBEAT,
     REPORT_DATA,
     FIRE_EVENTS,
-    ON_DATA_UPDATE,
-    ON_BATCH_EVENT,
-    ON_GROUP_DISSOLVE,
+    ON_MESSAGE_IN_GROUP,
     LIST_GROUP_STATUSES
 };

src/extensions/scratch3_mesh_v2/mesh-service.js

@@ -14,9 +14,7 @@ const {
     SEND_MEMBER_HEARTBEAT,
     REPORT_DATA,
     FIRE_EVENTS,
-    ON_DATA_UPDATE,
-    ON_BATCH_EVENT,
-    ON_GROUP_DISSOLVE,
+    ON_MESSAGE_IN_GROUP,
     LIST_GROUP_STATUSES
 } = require('./gql-operations');
 
@@ -399,35 +397,32 @@ class MeshV2Service {
             domain: this.domain
         };
 
-        const dataSub = this.client.subscribe({
-            query: ON_DATA_UPDATE,
+        const messageSub = this.client.subscribe({
+            query: ON_MESSAGE_IN_GROUP,
             variables
         }).subscribe({
-            next: result => this.handleDataUpdate(result.data.onDataUpdateInGroup),
-            error: err => log.error(`Mesh V2: Data subscription error: ${err}`)
-        });
-
-        const batchEventSub = this.client.subscribe({
-            query: ON_BATCH_EVENT,
-            variables
-        }).subscribe({
-            next: result => this.handleBatchEvent(result.data.onBatchEventInGroup),
-            error: err => log.error(`Mesh V2: Batch event subscription error: ${err}`)
-        });
-
-        const dissolveSub = this.client.subscribe({
-            query: ON_GROUP_DISSOLVE,
-            variables
-        }).subscribe({
-            next: () => {
-                this.costTracking.dissolveReceived++;
-                log.info('Mesh V2: Group dissolved by host');
-                this.cleanupAndDisconnect();
+            next: result => {
+                const message = result.data.onMessageInGroup;
+                if (!message) return;
+
+                // MeshMessage has three fields: nodeStatus, batchEvent, groupDissolve
+                // Only one field will be non-null per message
+                if (message.nodeStatus) {
+                    this.handleDataUpdate(message.nodeStatus);
+                } else if (message.batchEvent) {
+                    this.handleBatchEvent(message.batchEvent);
+                } else if (message.groupDissolve) {
+                    this.costTracking.dissolveReceived++;
+                    log.info('Mesh V2: Group dissolved by host');
+                    this.cleanupAndDisconnect();
+                } else {
+                    log.warn('Mesh V2: Received message with all fields null');
+                }
             },
-            error: err => log.error(`Mesh V2: Dissolve subscription error: ${err}`)
+            error: err => log.error(`Mesh V2: Subscription error: ${err}`)
         });
 
-        this.subscriptions.push(dataSub, batchEventSub, dissolveSub);
+        this.subscriptions.push(messageSub);
     }
 
     stopSubscriptions () {
@@ -622,8 +617,8 @@ class MeshV2Service {
         if (!this.groupId || !this.client || events.length === 0) return;
 
         try {
-            // データ送信完了を待つ
-            await this.dataRateLimiter.waitForCompletion();
+            // データ送信完了を待つ (Removed to prevent blocking, relying on unified subscription for order)
+            // await this.dataRateLimiter.waitForCompletion();
 
             this.costTracking.mutationCount++;
             this.costTracking.fireEventsCount++;