@newgameplusinc/odyssey-audio-video-sdk-dev 1.0.34 → 1.0.36

package/dist/index.js

@@ -157,6 +157,86 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
         this.spatialAudioManager.setListenerFromLSD(listenerPos, cameraPos, lookAtPos);
     }
     listenForEvents() {
+        // CRITICAL: Register all-participants-update listener at initialization
+        // This ensures channel data is available when consumers are created
+        this.socket.on("all-participants-update", (payload) => {
+            if (!this.room) {
+                this.room = {
+                    id: payload.roomId,
+                    participants: new Map(),
+                };
+            }
+            const activeParticipantIds = new Set();
+            for (const snapshot of payload.participants) {
+                activeParticipantIds.add(snapshot.participantId);
+                let participant = this.room?.participants.get(snapshot.participantId);
+                const normalizedPosition = {
+                    x: snapshot.position?.x ?? 0,
+                    y: snapshot.position?.y ?? 0,
+                    z: snapshot.position?.z ?? 0,
+                };
+                const normalizedDirection = {
+                    x: snapshot.direction?.x ?? 0,
+                    y: snapshot.direction?.y ?? 0,
+                    z: snapshot.direction?.z ?? 1,
+                };
+                const normalizedMediaState = {
+                    audio: snapshot.mediaState?.audio ?? false,
+                    video: snapshot.mediaState?.video ?? false,
+                    sharescreen: snapshot.mediaState?.sharescreen ?? false,
+                };
+                if (!participant) {
+                    participant = {
+                        participantId: snapshot.participantId,
+                        userId: snapshot.userId,
+                        deviceId: snapshot.deviceId,
+                        isLocal: this.localParticipant?.participantId ===
+                            snapshot.participantId,
+                        audioTrack: undefined,
+                        videoTrack: undefined,
+                        producers: new Map(),
+                        consumers: new Map(),
+                        position: normalizedPosition,
+                        direction: normalizedDirection,
+                        mediaState: normalizedMediaState,
+                    };
+                }
+                else {
+                    participant.userId = snapshot.userId;
+                    participant.deviceId = snapshot.deviceId;
+                    participant.position = normalizedPosition;
+                    participant.direction = normalizedDirection;
+                    participant.mediaState = normalizedMediaState;
+                }
+                participant.bodyHeight = snapshot.bodyHeight;
+                participant.bodyShape = snapshot.bodyShape;
+                participant.userName = snapshot.userName;
+                participant.userEmail = snapshot.userEmail;
+                participant.isLocal =
+                    this.localParticipant?.participantId === snapshot.participantId;
+                // CRITICAL: Store channel data for huddle detection
+                participant.currentChannel = snapshot.currentChannel || "spatial";
+                this.room?.participants.set(snapshot.participantId, participant);
+                if (participant.isLocal) {
+                    this.localParticipant = participant;
+                }
+            }
+            if (this.room) {
+                for (const existingId of Array.from(this.room.participants.keys())) {
+                    if (!activeParticipantIds.has(existingId)) {
+                        this.room.participants.delete(existingId);
+                    }
+                }
+            }
+            const normalizedParticipants = this.room
+                ? Array.from(this.room.participants.values())
+                : [];
+            this.emit("all-participants-update", normalizedParticipants);
+            // CRITICAL: After receiving channel data, update ALL mute states
+            // This ensures existing audio consumers get the correct mute state
+            console.log(`📊 [all-participants-update] Received ${normalizedParticipants.length} participants, updating mute states...`);
+            this.updateAllParticipantsMuteState();
+        });
         this.socket.on("new-participant", (participantData) => {
             if (this.room) {
                 const newParticipant = {
@@ -187,83 +267,7 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
         });
         this.socket.on("consumer-created", async (data) => {
             const { consumer, track } = await this.mediasoupManager.consume(data);
-            this.socket.on("all-participants-update", (payload) => {
-                if (!this.room) {
-                    this.room = {
-                        id: payload.roomId,
-                        participants: new Map(),
-                    };
-                }
-                const activeParticipantIds = new Set();
-                for (const snapshot of payload.participants) {
-                    activeParticipantIds.add(snapshot.participantId);
-                    let participant = this.room?.participants.get(snapshot.participantId);
-                    const normalizedPosition = {
-                        x: snapshot.position?.x ?? 0,
-                        y: snapshot.position?.y ?? 0,
-                        z: snapshot.position?.z ?? 0,
-                    };
-                    const normalizedDirection = {
-                        x: snapshot.direction?.x ?? 0,
-                        y: snapshot.direction?.y ?? 0,
-                        z: snapshot.direction?.z ?? 1,
-                    };
-                    const normalizedMediaState = {
-                        audio: snapshot.mediaState?.audio ?? false,
-                        video: snapshot.mediaState?.video ?? false,
-                        sharescreen: snapshot.mediaState?.sharescreen ?? false,
-                    };
-                    if (!participant) {
-                        participant = {
-                            participantId: snapshot.participantId,
-                            userId: snapshot.userId,
-                            deviceId: snapshot.deviceId,
-                            isLocal: this.localParticipant?.participantId ===
-                                snapshot.participantId,
-                            audioTrack: undefined,
-                            videoTrack: undefined,
-                            producers: new Map(),
-                            consumers: new Map(),
-                            position: normalizedPosition,
-                            direction: normalizedDirection,
-                            mediaState: normalizedMediaState,
-                        };
-                    }
-                    else {
-                        participant.userId = snapshot.userId;
-                        participant.deviceId = snapshot.deviceId;
-                        participant.position = normalizedPosition;
-                        participant.direction = normalizedDirection;
-                        participant.mediaState = normalizedMediaState;
-                    }
-                    participant.bodyHeight = snapshot.bodyHeight;
-                    participant.bodyShape = snapshot.bodyShape;
-                    participant.userName = snapshot.userName;
-                    participant.userEmail = snapshot.userEmail;
-                    participant.isLocal =
-                        this.localParticipant?.participantId === snapshot.participantId;
-                    this.room?.participants.set(snapshot.participantId, participant);
-                    if (participant.isLocal) {
-                        this.localParticipant = participant;
-                    }
-                }
-                if (this.room) {
-                    for (const existingId of Array.from(this.room.participants.keys())) {
-                        if (!activeParticipantIds.has(existingId)) {
-                            this.room.participants.delete(existingId);
-                        }
-                    }
-                }
-                const normalizedParticipants = this.room
-                    ? Array.from(this.room.participants.values())
-                    : [];
-                this.emit("all-participants-update", normalizedParticipants);
-            });
-            // Resume the consumer to start receiving media (non-blocking)
-            this.mediasoupManager
-                .resumeConsumer(consumer.id)
-                .then(() => { })
-                .catch((err) => { });
+            // DON'T resume yet! Resume AFTER setting up the audio pipeline
             let participant = this.room?.participants.get(data.participantId);
             // If participant doesn't exist yet, create it with the data from the event
             if (!participant && this.room) {
@@ -283,6 +287,8 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
                     userName: data.userName,
                     userEmail: data.userEmail,
                 };
+                // Default to spatial channel if not specified
+                participant.currentChannel = "spatial";
                 this.room.participants.set(data.participantId, participant);
             }
             if (participant) {
@@ -311,27 +317,46 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
                     const isLocalParticipant = participant.participantId === this.localParticipant?.participantId;
                     if (isLocalParticipant) {
                         // Do NOT connect this audio to Web Audio API
+                        console.log(`🚫 Skipping local participant audio setup (prevent loopback)`);
                         return; // Exit early to prevent any audio processing
                     }
                     else {
                         // Check if participant is in huddle - if so, skip spatial audio
                         const participantChannel = participant.currentChannel || "spatial";
-                        const isInHuddle = participantChannel === "odyssey-huddle";
+                        const myChannel = this.localParticipant?.currentChannel || "spatial";
+                        const isInHuddle = participantChannel !== "spatial";
+                        console.log(`🎧 Setting up audio for ${participant.participantId?.substring(0, 8)}`);
+                        console.log(`   My channel: ${myChannel}`);
+                        console.log(`   Their channel: ${participantChannel}`);
                         // Setup spatial audio with full 3D positioning (disabled for huddle users)
                         await this.spatialAudioManager.setupSpatialAudioForParticipant(participant.participantId, track, isInHuddle // Disable spatial audio for huddle users
                         );
                         // CRITICAL: Mute if not in same channel
-                        const myChannel = this.localParticipant?.currentChannel || "spatial";
                         const shouldMute = myChannel !== participantChannel;
+                        console.log(`   Should mute: ${shouldMute} (channels ${myChannel === participantChannel ? 'MATCH' : 'DIFFER'})`);
                         this.spatialAudioManager.setParticipantMuted(participant.participantId, shouldMute);
                         // Only update spatial audio position if NOT in huddle
                         if (!isInHuddle) {
                             this.spatialAudioManager.updateSpatialAudio(participant.participantId, data.position);
                         }
                     }
+                    // NOW resume the consumer after audio pipeline is ready
+                    this.mediasoupManager
+                        .resumeConsumer(consumer.id)
+                        .then(() => {
+                        console.log(`✅ Consumer ${consumer.id.substring(0, 8)} resumed for ${participant?.participantId?.substring(0, 8)}`);
+                    })
+                        .catch((err) => {
+                        console.error(`❌ Failed to resume consumer ${consumer.id}:`, err);
+                    });
                 }
                 else if (track.kind === "video") {
                     participant.videoTrack = track;
+                    // Resume video consumer immediately (no audio pipeline needed)
+                    this.mediasoupManager
+                        .resumeConsumer(consumer.id)
+                        .then(() => { })
+                        .catch((err) => { });
                 }
                 this.emit("consumer-created", {
                     participant,
@@ -406,11 +431,12 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
             this.emit("huddle-ended", data);
         });
         this.socket.on("participant-channel-changed", (data) => {
+            console.log(`📡 participant-channel-changed: ${data.participantId?.substring(0, 8)} → ${data.channelId}`);
             const participant = this.room?.participants.get(data.participantId);
             if (participant) {
                 participant.currentChannel = data.channelId;
                 // Toggle spatial audio based on channel
-                const isInHuddle = data.channelId === "odyssey-huddle";
+                const isInHuddle = data.channelId !== "spatial";
                 // Update spatial audio bypass state for this participant
                 if (participant.audioTrack) {
                     this.spatialAudioManager.setupSpatialAudioForParticipant(participant.participantId, participant.audioTrack, isInHuddle // Disable spatial for huddle, enable for spatial
@@ -419,18 +445,19 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
                     });
                 }
                 // CRITICAL: Mute/unmute based on channel matching
-                // If I'm in huddle and they're in spatial -> MUTE them
-                // If I'm in spatial and they're in huddle -> MUTE them
-                // If we're in the same channel -> UNMUTE them
                 const myChannel = this.localParticipant?.currentChannel || "spatial";
                 const theirChannel = data.channelId || "spatial";
                 const shouldMute = myChannel !== theirChannel;
+                console.log(`   My channel: ${myChannel}, Their channel: ${theirChannel}`);
+                console.log(`   ${shouldMute ? '🔇 MUTING' : '🔊 UNMUTING'} ${participant.participantId?.substring(0, 8)}`);
                 this.spatialAudioManager.setParticipantMuted(participant.participantId, shouldMute);
             }
             // Update local participant if it's them
             if (this.localParticipant?.participantId === data.participantId && this.localParticipant !== null) {
+                console.log(`   This is ME changing channel!`);
                 this.localParticipant.currentChannel = data.channelId;
                 // When LOCAL user changes channel, update ALL other participants' mute state
+                console.log(`   🔄 Updating ALL participants mute state`);
                 this.updateAllParticipantsMuteState();
             }
             this.emit("participant-channel-changed", data);
@@ -494,6 +521,7 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
      * Join huddle (anyone can join directly without invite)
      */
     async joinHuddle() {
+        console.log(`🎧 [joinHuddle] Joining group huddle...`);
         if (!this.localParticipant || !this.room) {
             return { success: false, error: "Not in a room" };
         }
@@ -503,10 +531,14 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
                 roomId: this.room.id,
             }, (response) => {
                 if (response.success && this.localParticipant) {
+                    console.log(`✅ [joinHuddle] Success! New channel: ${response.channelId}`);
                     this.localParticipant.currentChannel = response.channelId;
                     // CRITICAL: Update mute state for all participants when joining huddle
                     this.updateAllParticipantsMuteState();
                 }
+                else {
+                    console.error(`❌ [joinHuddle] Failed:`, response.error);
+                }
                 resolve(response);
             });
         });
@@ -515,6 +547,7 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
      * Leave current huddle and return to spatial audio
      */
     async leaveHuddle() {
+        console.log(`🚪 [leaveHuddle] Leaving huddle...`);
         if (!this.localParticipant || !this.room) {
             return { success: false, error: "Not in a room" };
         }
@@ -524,10 +557,14 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
                 roomId: this.room.id,
             }, (response) => {
                 if (response.success && this.localParticipant) {
+                    console.log(`✅ [leaveHuddle] Success! New channel: ${response.channelId}`);
                     this.localParticipant.currentChannel = response.channelId;
                     // CRITICAL: Update mute state for all participants when leaving huddle
                     this.updateAllParticipantsMuteState();
                 }
+                else {
+                    console.error(`❌ [leaveHuddle] Failed:`, response.error);
+                }
                 resolve(response);
             });
         });
@@ -553,6 +590,7 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
         if (!this.localParticipant || !this.room)
             return;
         const myChannel = this.localParticipant.currentChannel || "spatial";
+        console.log(`🔄 [updateAllParticipantsMuteState] My channel: ${myChannel}`);
         this.room.participants.forEach((participant) => {
             // Skip local participant (never hear yourself)
             if (participant.participantId === this.localParticipant?.participantId) {
@@ -560,8 +598,10 @@ class OdysseySpatialComms extends EventManager_1.EventManager {
             }
             const theirChannel = participant.currentChannel || "spatial";
             const shouldMute = myChannel !== theirChannel;
+            console.log(`   ${participant.participantId?.substring(0, 8)}: channel=${theirChannel}, ${shouldMute ? '🔇 MUTE' : '🔊 UNMUTE'}`);
             this.spatialAudioManager.setParticipantMuted(participant.participantId, shouldMute);
         });
+        console.log(`✅ [updateAllParticipantsMuteState] Complete`);
     }
     async muteParticipant(participantId) {
         if (!this.localParticipant || !this.room) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newgameplusinc/odyssey-audio-video-sdk-dev",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "Odyssey Spatial Audio & Video SDK using MediaSoup for real-time communication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",