@stormstreaming/stormstreamer 0.9.0-beta.4 → 0.9.0-beta.6

package/dist/amd/index.js

@@ -4,8 +4,8 @@
  * contact@stormstreaming.com
  * https://stormstreaming.com
  *
- * Version: 0.9.0-beta.4
- * Version: 12/7/2024, 6:37:55 PM
+ * Version: 0.9.0-beta.6
+ * Version: 12/10/2024, 1:21:58 PM
  *
  * LEGAL NOTICE:
  * This software is subject to the terms and conditions defined in
@@ -578,20 +578,22 @@
         this.startOnDOMReady = false;
         this.iOSOnDomReadyFix = true;
         this._restartOnFocus = true;
+        this._forceDeviceSelection = false;
         this.parse(config);
       }
       parse(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         this._settingsConfig = config;
         this._autoConnect = (_a = this._settingsConfig.autoConnect) !== null && _a !== void 0 ? _a : this._autoConnect;
         this._autoStart = (_b = this._settingsConfig.autoStart) !== null && _b !== void 0 ? _b : this._autoStart;
         this._restartOnFocus = (_c = this._settingsConfig.restartOnFocus) !== null && _c !== void 0 ? _c : this._restartOnFocus;
         this._restartOnError = (_d = this._settingsConfig.restartOnError) !== null && _d !== void 0 ? _d : this._restartOnError;
         this._reconnectTime = (_e = this._settingsConfig.reconnectTime) !== null && _e !== void 0 ? _e : this._reconnectTime;
-        this._videoData = new VideoData((_f = this._settingsConfig.video) !== null && _f !== void 0 ? _f : null);
-        this._audioData = new AudioData((_g = this._settingsConfig.audio) !== null && _g !== void 0 ? _g : null);
-        this._storageData = new StorageData((_h = this._settingsConfig.storage) !== null && _h !== void 0 ? _h : null);
-        this._debugData = new DebugData((_j = this._settingsConfig.debug) !== null && _j !== void 0 ? _j : null);
+        this._forceDeviceSelection = (_f = !this._settingsConfig.preselectDevices) !== null && _f !== void 0 ? _f : this._forceDeviceSelection;
+        this._videoData = new VideoData((_g = this._settingsConfig.video) !== null && _g !== void 0 ? _g : null);
+        this._audioData = new AudioData((_h = this._settingsConfig.audio) !== null && _h !== void 0 ? _h : null);
+        this._storageData = new StorageData((_j = this._settingsConfig.storage) !== null && _j !== void 0 ? _j : null);
+        this._debugData = new DebugData((_k = this._settingsConfig.debug) !== null && _k !== void 0 ? _k : null);
       }
       getAudioData() {
         return this._audioData;
@@ -623,6 +625,9 @@
       getDebugData() {
         return this._debugData;
       }
+      getIfForceSelection() {
+        return this._forceDeviceSelection;
+      }
       getIfStartOnDOMReadyEnabled() {
         return this.startOnDOMReady;
       }
@@ -2467,74 +2472,103 @@
 
     class SoundMeter {
       constructor(main) {
-        this._stream = null;
         this._audioContext = null;
         this._analyser = null;
         this._microphone = null;
         this._lastEventTime = 0;
         this.THROTTLE_INTERVAL = 100;
+        this._isMonitoring = false;
         this._instant = 0.0;
         this._slow = 0.0;
-        this._clip = 0.0;
         this._main = main;
       }
       attach(stream) {
-        this._stream = stream;
-        this._audioContext = new AudioContext();
-        this._microphone = this._audioContext.createMediaStreamSource(stream);
-        this._analyser = this._audioContext.createAnalyser();
-        this._analyser.fftSize = 2048;
-        this._analyser.smoothingTimeConstant = 0.3;
-        this._microphone.connect(this._analyser);
-        this.startMonitoring();
+        if (!stream.getAudioTracks().length) {
+          console.warn('SoundMeter: Attempted to attach stream without audio tracks');
+          return;
+        }
+        this.detach();
+        try {
+          this._audioContext = new AudioContext();
+          this._microphone = this._audioContext.createMediaStreamSource(stream);
+          this._analyser = this._audioContext.createAnalyser();
+          this._analyser.fftSize = 2048;
+          this._analyser.smoothingTimeConstant = 0.3;
+          this._microphone.connect(this._analyser);
+          this.startMonitoring();
+          console.log('SoundMeter: Successfully attached to new audio stream');
+        } catch (error) {
+          console.error('SoundMeter: Error during attach:', error);
+          this.detach();
+        }
       }
       detach() {
+        var _a, _b;
+        this._isMonitoring = false;
         if (this._microphone) {
-          this._microphone.disconnect();
+          try {
+            this._microphone.disconnect();
+          } catch (e) {
+            console.warn('SoundMeter: Error disconnecting microphone:', e);
+          }
           this._microphone = null;
         }
         if (this._analyser) {
-          this._analyser.disconnect();
+          try {
+            this._analyser.disconnect();
+          } catch (e) {
+            console.warn('SoundMeter: Error disconnecting analyser:', e);
+          }
           this._analyser = null;
         }
-        if (this._audioContext) {
-          this._audioContext.close();
-          this._audioContext = null;
+        if (((_a = this._audioContext) === null || _a === void 0 ? void 0 : _a.state) !== 'closed') {
+          try {
+            (_b = this._audioContext) === null || _b === void 0 ? void 0 : _b.close();
+          } catch (e) {
+            console.warn('SoundMeter: Error closing audio context:', e);
+          }
         }
-        this._stream = null;
+        this._audioContext = null;
         this.clear();
+        console.log('SoundMeter: Successfully detached');
       }
       clear() {
         this._instant = 0;
         this._slow = 0;
-        this._clip = 0;
+        this._lastEventTime = 0;
       }
       startMonitoring() {
-        if (!this._analyser) return;
+        if (!this._analyser || this._isMonitoring) return;
+        this._isMonitoring = true;
         const dataArray = new Float32Array(this._analyser.frequencyBinCount);
         const analyze = () => {
-          if (!this._analyser) return;
+          if (!this._analyser || !this._isMonitoring) return;
           const now = Date.now();
-          this._analyser.getFloatTimeDomainData(dataArray);
-          let sum = 0.0;
-          let clipcount = 0;
-          for (let i = 0; i < dataArray.length; ++i) {
-            const amplitude = dataArray[i] * 3.16;
-            sum += amplitude * amplitude;
-            if (Math.abs(amplitude) > 0.99) {
-              clipcount += 1;
+          try {
+            this._analyser.getFloatTimeDomainData(dataArray);
+            let sum = 0.0;
+            let clipcount = 0;
+            for (let i = 0; i < dataArray.length; ++i) {
+              const amplitude = dataArray[i];
+              sum += amplitude * amplitude;
+              if (Math.abs(amplitude) > 0.99) {
+                clipcount += 1;
+              }
             }
-          }
-          this._instant = Math.min(1, Math.sqrt(sum / dataArray.length));
-          this._slow = Math.min(1, 0.05 * this._instant + 0.95 * this._slow);
-          this._clip = clipcount / dataArray.length;
-          if (now - this._lastEventTime >= this.THROTTLE_INTERVAL) {
-            this._lastEventTime = now;
-            this._main.dispatchEvent("soundMeter", {
-              ref: this._main,
-              high: Number(this._instant.toFixed(4)),
-              low: Number(this._slow.toFixed(4))
-            });
+            this._instant = Math.sqrt(sum / dataArray.length);
+            this._slow = 0.05 * this._instant + 0.95 * this._slow;
+            if (now - this._lastEventTime >= this.THROTTLE_INTERVAL) {
+              this._lastEventTime = now;
+              this._main.dispatchEvent("soundMeter", {
+                ref: this._main,
+                high: this._instant,
+                low: this._slow
+              });
+            }
+          } catch (error) {
+            console.error('SoundMeter: Error during analysis:', error);
+            this._isMonitoring = false;
+            return;
           }
           requestAnimationFrame(analyze);
         };
@@ -2542,6 +2576,16 @@
       }
     }
 
+    exports.DevicesState = void 0;
+    (function (DevicesState) {
+      DevicesState["NOT_INITIALIZED"] = "NOT_INITIALIZED";
+      DevicesState["INITIALIZED"] = "INITIALIZED";
+      DevicesState["READY"] = "READY";
+      DevicesState["UPDATING"] = "UPDATING";
+      DevicesState["INVALID"] = "INVALID";
+      DevicesState["UNKNOWN"] = "UNKNOWN";
+    })(exports.DevicesState || (exports.DevicesState = {}));
+
     class PlaybackController {
       constructor(main) {
         this._isWindowActive = true;
@@ -2572,6 +2616,7 @@
           audio: true
         };
         this._publishState = exports.PublishState.NOT_INITIALIZED;
+        this._inputDeviceState = exports.DevicesState.NOT_INITIALIZED;
         this.onServerDisconnect = () => {};
         this.onServerConnect = () => {
           if (this._peerConnection) {
@@ -2709,6 +2754,7 @@
       handlePermissionChange(device, state) {
         return __awaiter(this, void 0, void 0, function* () {
           if (state === 'denied') {
+            this.setInputDeviceState(exports.DevicesState.INVALID);
             if (this._publishState == exports.PublishState.PUBLISHED) {
               this.closeStream();
             }
@@ -2966,7 +3012,13 @@
               if (deviceAccess.microphone.allowed) {
                 this._selectedMicrophone = this.pickMicrophone();
               }
+              if (this._selectedCamera != null && this._selectedMicrophone != null) {
+                this.setInputDeviceState(exports.DevicesState.READY);
+              } else {
+                this.setInputDeviceState(exports.DevicesState.INVALID);
+              }
             } catch (error) {
+              this.setInputDeviceState(exports.DevicesState.INVALID);
               this._logger.error(this, "Errror on grab devices: " + JSON.stringify(error));
             }
             this._main.dispatchEvent("deviceListUpdate", {
@@ -2992,6 +3044,8 @@
       }
       selectCamera(cameraID) {
         var _a, _b;
+        this._selectedCamera = null;
+        this.setInputDeviceState(exports.DevicesState.UPDATING);
         const streamKey = (_a = this._main.getConfigManager()) === null || _a === void 0 ? void 0 : _a.getStreamData().streamKey;
         const wasPublished = this._publishState === exports.PublishState.PUBLISHED;
         for (let i = 0; i < this._cameraList.getSize(); i++) {
@@ -3003,16 +3057,27 @@
           }
         }
         this.stopCameraStream();
-        this._constraints.video.deviceId = this._selectedCamera.getID();
-        this.startCamera().then(() => {
-          if (wasPublished && streamKey) {
-            this.publish(streamKey);
+        if (this._selectedCamera != null) {
+          this._constraints.video.deviceId = this._selectedCamera.getID();
+          if (this._selectedCamera != null && this._selectedMicrophone != null) {
+            this.setInputDeviceState(exports.DevicesState.READY);
+          } else {
+            this.setInputDeviceState(exports.DevicesState.INVALID);
           }
-        });
+          this.startCamera().then(() => {
+            if (wasPublished && streamKey) {
+              this.publish(streamKey);
+            }
+          });
+        } else {
+          this.setInputDeviceState(exports.DevicesState.INVALID);
+        }
       }
       selectMicrophone(micID) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
+          this._selectedMicrophone = null;
+          this.setInputDeviceState(exports.DevicesState.UPDATING);
           console.log("🎤 Selecting microphone:", micID);
           const streamKey = (_a = this._main.getConfigManager()) === null || _a === void 0 ? void 0 : _a.getStreamData().streamKey;
           const wasPublished = this._publishState === exports.PublishState.PUBLISHED;
@@ -3024,33 +3089,41 @@
             }
           }
           this._soundMeter.detach();
-          (_c = this._stream) === null || _c === void 0 ? void 0 : _c.getAudioTracks().forEach(track => track.stop());
           try {
             const audioStream = yield navigator.mediaDevices.getUserMedia({
               audio: {
                 deviceId: {
-                  exact: (_d = this._selectedMicrophone) === null || _d === void 0 ? void 0 : _d.getID()
+                  exact: (_c = this._selectedMicrophone) === null || _c === void 0 ? void 0 : _c.getID()
                 }
               }
             });
-            const oldAudioTracks = ((_e = this._stream) === null || _e === void 0 ? void 0 : _e.getAudioTracks()) || [];
+            const oldAudioTracks = ((_d = this._stream) === null || _d === void 0 ? void 0 : _d.getAudioTracks()) || [];
             oldAudioTracks.forEach(track => {
               var _a;
               (_a = this._stream) === null || _a === void 0 ? void 0 : _a.removeTrack(track);
               track.stop();
             });
             const newAudioTrack = audioStream.getAudioTracks()[0];
-            (_f = this._stream) === null || _f === void 0 ? void 0 : _f.addTrack(newAudioTrack);
-            this._soundMeter.detach();
-            yield new Promise(resolve => setTimeout(resolve, 100));
             if (this._stream) {
-              this._soundMeter.attach(this._stream);
+              this._stream.addTrack(newAudioTrack);
+              if (newAudioTrack.readyState === 'live') {
+                this._soundMeter.attach(this._stream);
+              }
+            }
+            if (this._selectedCamera != null && this._selectedMicrophone != null) {
+              this.setInputDeviceState(exports.DevicesState.READY);
+            } else {
+              this.setInputDeviceState(exports.DevicesState.INVALID);
             }
             if (wasPublished && streamKey) {
               this.publish(streamKey);
             }
           } catch (error) {
             console.error("Error changing microphone:", error);
+            this.setInputDeviceState(exports.DevicesState.INVALID);
+            this._main.dispatchEvent("inputDeviceError", {
+              ref: this._main
+            });
           }
         });
       }
@@ -3123,7 +3196,7 @@
         this.setPublishState(exports.PublishState.UNPUBLISHED);
       }
       pickCamera() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         for (let i = 0; i < this._cameraList.getSize(); i++) {
           this._cameraList.get(i).setSelected(false);
         }
@@ -3142,18 +3215,25 @@
             }
             if (!found) {
               this._main.dispatchEvent("savedCameraNotFound", {
-                ref: this._main
+                ref: this._main,
+                savedDeviceID: savedCameraID
               });
-              throw new Error("Specific camera was not found!");
+              return null;
             }
           }
           if (!this._selectedCamera) {
             this._main.dispatchEvent("savedCameraNotFound", {
-              ref: this._main
+              ref: this._main,
+              savedDeviceID: null
             });
-            this._selectedCamera = this._cameraList.get(0);
-            this._selectedCamera.setSelected(true);
-            this._constraints.video.deviceId = this._selectedCamera.getID();
+            if (!((_c = this._main.getConfigManager()) === null || _c === void 0 ? void 0 : _c.getSettingsData().getIfForceSelection())) {
+              this._selectedCamera = this._cameraList.get(0);
+              this._selectedCamera.setSelected(true);
+              (_d = this._main.getStorageManager()) === null || _d === void 0 ? void 0 : _d.saveField("cameraID", this._selectedCamera.getID());
+              this._constraints.video.deviceId = this._selectedCamera.getID();
+            } else {
+              return null;
+            }
           }
         }
         this._main.dispatchEvent("deviceListUpdate", {
@@ -3164,7 +3244,7 @@
         return this._selectedCamera;
       }
       pickMicrophone() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         for (let i = 0; i < this._microphoneList.getSize(); i++) {
           this._microphoneList.get(i).setSelected(false);
         }
@@ -3181,13 +3261,23 @@
             }
             if (!found) {
               this._main.dispatchEvent("savedMicrophoneNotFound", {
-                ref: this._main
+                ref: this._main,
+                savedDeviceID: savedMicID
               });
-              throw new Error("Specific microphone was not found!");
+              return null;
             }
           }
           if (!this._selectedMicrophone) {
-            this._selectedMicrophone = this._microphoneList.get(0);
+            this._main.dispatchEvent("savedMicrophoneNotFound", {
+              ref: this._main,
+              savedDeviceID: null
+            });
+            if (!((_c = this._main.getConfigManager()) === null || _c === void 0 ? void 0 : _c.getSettingsData().getIfForceSelection())) {
+              this._selectedMicrophone = this._microphoneList.get(0);
+              (_d = this._main.getStorageManager()) === null || _d === void 0 ? void 0 : _d.saveField("microphoneID", this._selectedMicrophone.getID());
+            } else {
+              return null;
+            }
           }
           this._selectedMicrophone.setSelected(true);
           this._constraints.audio = {
@@ -3267,12 +3357,23 @@
         return this._selectedMicrophone;
       }
       setPublishState(newState) {
+        console.log('%c⏵ 🎥 setPublishState: ' + newState, 'background: green; color: white;');
         this._publishState = newState;
         this._main.dispatchEvent("publishStateChange", {
           ref: this._main,
           state: this._publishState
         });
       }
+      setInputDeviceState(newState) {
+        console.log('%c⏵ 🎥 setInputDeviceState: ' + newState, 'background: green; color: white;');
+        this._inputDeviceState = newState;
+        this._main.dispatchEvent("deviceStateChange", {
+          ref: this._main,
+          state: this._inputDeviceState,
+          selectedCamera: this._selectedCamera,
+          selectedMicrophone: this._selectedMicrophone
+        });
+      }
       getCameraList() {
         return this._cameraList != null ? this._cameraList.getArray() : [];
       }
@@ -3282,6 +3383,9 @@
       getPublishState() {
         return this._publishState;
       }
+      getInputDeviceState() {
+        return this._inputDeviceState;
+      }
       getPlayer() {
         return this._selectedPlayer;
       }
@@ -3685,8 +3789,8 @@
       constructor(streamConfig, autoInitialize = false) {
         super();
         this.DEV_MODE = true;
-        this.STREAMER_VERSION = "0.9.0-beta.4";
-        this.COMPILE_DATE = "12/7/2024, 6:37:54 PM";
+        this.STREAMER_VERSION = "0.9.0-beta.6";
+        this.COMPILE_DATE = "12/10/2024, 1:21:57 PM";
         this.STREAMER_BRANCH = "Experimental";
         this.STREAMER_PROTOCOL_VERSION = 1;
         this._initialized = false;
@@ -3842,6 +3946,10 @@
         var _a, _b;
         return (_b = (_a = this._playbackController) === null || _a === void 0 ? void 0 : _a.publish(streamKey)) !== null && _b !== void 0 ? _b : false;
       }
+      getDeviceState() {
+        var _a, _b;
+        return (_b = (_a = this._playbackController) === null || _a === void 0 ? void 0 : _a.getInputDeviceState()) !== null && _b !== void 0 ? _b : exports.DevicesState.NOT_INITIALIZED;
+      }
       clearSavedDevices() {
         var _a;
         return (_a = this._playbackController) === null || _a === void 0 ? void 0 : _a.clearSavedDevices();