refactor: use server-provided heartbeat interval in MeshV2Service

- Added heartbeatIntervalSeconds to CREATE_GROUP mutation
- Updated createGroup, renewHeartbeat, and joinGroup to capture interval from server
- Updated startHeartbeat to use server interval instead of environment variables
- Removed MESH_HOST_HEARTBEAT_INTERVAL_SECONDS and MESH_MEMBER_HEARTBEAT_INTERVAL_SECONDS

Author: takaokouji

.env.example

@@ -23,14 +23,6 @@ MESH_DATA_UPDATE_INTERVAL_MS=1000
 # Default: 1000
 MESH_EVENT_BATCH_INTERVAL_MS=1000
 
-# Host heartbeat interval in seconds
-# Default: 60 (60 seconds)
-MESH_HOST_HEARTBEAT_INTERVAL_SECONDS=60
-
-# Member heartbeat interval in seconds
-# Default: 120 (120 seconds)
-MESH_MEMBER_HEARTBEAT_INTERVAL_SECONDS=120
-
 # Debug logging (comma-separated categories, e.g., scratch-vm:*)
 DEBUG=
 

src/extensions/scratch3_mesh_v2/gql-operations.js

@@ -31,6 +31,7 @@ const CREATE_GROUP = gql`
       hostId
       createdAt
       expiresAt
+      heartbeatIntervalSeconds
     }
   }
 `;

src/extensions/scratch3_mesh_v2/mesh-service.js

@@ -67,6 +67,7 @@ class MeshV2Service {
         // Last data send promise to track completion of the most recent data transmission
         this.lastDataSendPromise = Promise.resolve();
 
+        this.hostHeartbeatInterval = 60; // Default 1 min
         this.memberHeartbeatInterval = 120; // Default 2 min
 
         // Data from other nodes: { nodeId: { key: { value: string, timestamp: number } } }
@@ -226,6 +227,9 @@ class MeshV2Service {
             this.domain = group.domain; // Update domain from server
             this.expiresAt = group.expiresAt;
             this.isHost = true;
+            if (group.heartbeatIntervalSeconds) {
+                this.hostHeartbeatInterval = group.heartbeatIntervalSeconds;
+            }
 
             this.costTracking.connectionStartTime = Date.now();
             this.startSubscriptions();
@@ -684,22 +688,7 @@ class MeshV2Service {
         if (!this.groupId) return;
 
         log.info(`Mesh V2: Starting heartbeat timer (Role: ${this.isHost ? 'Host' : 'Member'})`);
-        // Use 60s for host, memberHeartbeatInterval for member (default 120s)
-        const hostInterval = parseEnvInt(
-            process.env.MESH_HOST_HEARTBEAT_INTERVAL_SECONDS,
-            60, // default: 60 seconds
-            1, // min: 1 second
-            300 // max: 5 minutes
-        ) * 1000;
-
-        const memberDefaultInterval = parseEnvInt(
-            process.env.MESH_MEMBER_HEARTBEAT_INTERVAL_SECONDS,
-            120, // default: 120 seconds
-            1, // min: 1 second
-            600 // max: 10 minutes
-        ) * 1000;
-
-        const interval = this.isHost ? hostInterval : (this.memberHeartbeatInterval * 1000 || memberDefaultInterval);
+        const interval = (this.isHost ? this.hostHeartbeatInterval : this.memberHeartbeatInterval) * 1000;
 
         this.heartbeatTimer = setInterval(() => {
             if (this.isHost) {
@@ -734,6 +723,13 @@ class MeshV2Service {
             });
             this.expiresAt = result.data.renewHeartbeat.expiresAt;
             log.info(`Mesh V2: Heartbeat renewed. Expires at: ${this.expiresAt}`);
+            if (result.data.renewHeartbeat.heartbeatIntervalSeconds) {
+                const newInterval = result.data.renewHeartbeat.heartbeatIntervalSeconds;
+                if (newInterval !== this.hostHeartbeatInterval) {
+                    this.hostHeartbeatInterval = newInterval;
+                    this.startHeartbeat(); // Restart with new interval
+                }
+            }
             this.startConnectionTimer();
             return result.data.renewHeartbeat;
         } catch (error) {

webpack.config.js

@@ -78,11 +78,7 @@ const webBuilder = new ScratchWebpackConfigBuilder(common)
         'process.env.MESH_API_KEY': JSON.stringify(process.env.MESH_API_KEY),
         'process.env.MESH_AWS_REGION': JSON.stringify(process.env.MESH_AWS_REGION),
         'process.env.MESH_DATA_UPDATE_INTERVAL_MS': JSON.stringify(process.env.MESH_DATA_UPDATE_INTERVAL_MS),
-        'process.env.MESH_EVENT_BATCH_INTERVAL_MS': JSON.stringify(process.env.MESH_EVENT_BATCH_INTERVAL_MS),
-        'process.env.MESH_HOST_HEARTBEAT_INTERVAL_SECONDS':
-            JSON.stringify(process.env.MESH_HOST_HEARTBEAT_INTERVAL_SECONDS),
-        'process.env.MESH_MEMBER_HEARTBEAT_INTERVAL_SECONDS':
-            JSON.stringify(process.env.MESH_MEMBER_HEARTBEAT_INTERVAL_SECONDS)
+        'process.env.MESH_EVENT_BATCH_INTERVAL_MS': JSON.stringify(process.env.MESH_EVENT_BATCH_INTERVAL_MS)
     }));
 
 const playgroundBuilder = webBuilder.clone()