@stormstreaming/stormstreamer 0.9.0-beta.5 → 0.9.0-beta.7

package/dist/amd/index.js

@@ -4,8 +4,8 @@
  * contact@stormstreaming.com
  * https://stormstreaming.com
  *
- * Version: 0.9.0-beta.5
- * Version: 12/10/2024, 10:26:03 AM
+ * Version: 0.9.0-beta.7
+ * Version: 1/2/2025, 1:53:46 AM
  *
  * LEGAL NOTICE:
  * This software is subject to the terms and conditions defined in
@@ -578,7 +578,7 @@
         this.startOnDOMReady = false;
         this.iOSOnDomReadyFix = true;
         this._restartOnFocus = true;
-        this._forceDeviceSelection = false;
+        this._preselectDevices = true;
         this.parse(config);
       }
       parse(config) {
@@ -589,7 +589,7 @@
         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._forceDeviceSelection = (_f = this._settingsConfig.forceDeviceSelection) !== null && _f !== void 0 ? _f : this._forceDeviceSelection;
+        this._preselectDevices = (_f = this._settingsConfig.preselectDevices) !== null && _f !== void 0 ? _f : this._preselectDevices;
         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);
@@ -626,7 +626,7 @@
         return this._debugData;
       }
       getIfForceSelection() {
-        return this._forceDeviceSelection;
+        return !this._preselectDevices;
       }
       getIfStartOnDOMReadyEnabled() {
         return this.startOnDOMReady;
@@ -2576,15 +2576,15 @@
       }
     }
 
-    var InputDeviceState;
-    (function (InputDeviceState) {
-      InputDeviceState["NOT_INITIALIZED"] = "NOT_INITIALIZED";
-      InputDeviceState["INITIALIZED"] = "INITIALIZED";
-      InputDeviceState["READY"] = "READY";
-      InputDeviceState["UPDATING"] = "UPDATING";
-      InputDeviceState["INVALID"] = "INVALID";
-      InputDeviceState["UNKNOWN"] = "UNKNOWN";
-    })(InputDeviceState || (InputDeviceState = {}));
+    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) {
@@ -2615,41 +2615,75 @@
           },
           audio: true
         };
+        this._restartTimerCount = 0;
+        this._restartTimerMaxCount = 5;
         this._publishState = exports.PublishState.NOT_INITIALIZED;
-        this._inputDeviceState = InputDeviceState.NOT_INITIALIZED;
+        this._inputDeviceState = exports.DevicesState.NOT_INITIALIZED;
         this.onServerDisconnect = () => {};
+        this.onStreamKeyTaken = () => {
+          if (this._restartTimer != null) {
+            clearInterval(this._restartTimer);
+            this._restartTimerCount = 0;
+          }
+          this._logger.info(this, "WebRTCStreamer :: Starting StreamKeyTaken Interval");
+          this._restartTimer = setInterval(() => {
+            var _a, _b;
+            if (this._restartTimer != null) {
+              if (this._restartTimerCount < this._restartTimerMaxCount) {
+                this._logger.info(this, "WebRTCStreamer :: StreamKeyTaken Interval: " + this._restartTimerCount + "/" + this._restartTimerMaxCount);
+                this._restartTimerCount++;
+              } else {
+                clearInterval(this._restartTimer);
+                this._restartTimer = null;
+                this._restartTimerCount = 0;
+                const streamData = (_a = this._main.getConfigManager()) === null || _a === void 0 ? void 0 : _a.getStreamData();
+                const streamKey = streamData === null || streamData === void 0 ? void 0 : streamData.streamKey;
+                if (streamKey != null) {
+                  const prevStreamKey = streamKey;
+                  this.publish(prevStreamKey);
+                }
+              }
+              const usedStreamKey = (_b = this._main.getConfigManager().getStreamData().streamKey) !== null && _b !== void 0 ? _b : "unknown";
+              this._main.dispatchEvent("streamKeyInUseInterval", {
+                ref: this._main,
+                streamKey: usedStreamKey,
+                count: this._restartTimerCount,
+                maxCount: this._restartTimerMaxCount
+              });
+            }
+          }, 1000);
+        };
         this.onServerConnect = () => {
           if (this._peerConnection) {
             this.closeWebRTCConnection();
           }
           this._peerConnection = new RTCPeerConnection(this._peerConnectionConfig);
+          if (this._stream) {
+            let localTracks = this._stream.getTracks();
+            for (let localTrack in localTracks) {
+              this._peerConnection.addTrack(localTracks[localTrack], this._stream);
+            }
+          }
           this._peerConnection.onicecandidate = event => {
             this.onIceCandidate(event);
           };
           this._peerConnection.onconnectionstatechange = event => {
             this.onConnectionStateChange(event);
           };
-          this._peerConnection.onnegotiationneeded = event => {
+          this._peerConnection.onnegotiationneeded = event => __awaiter(this, void 0, void 0, function* () {
             if (this._peerConnection) {
-              this._peerConnection.createOffer(description => {
-                this.onDescriptionSuccess(description);
-              }, error => {
+              try {
+                const description = yield this._peerConnection.createOffer();
+                yield this.onDescriptionSuccess(description);
+              } catch (error) {
                 this.onDescriptionError(error);
-              }).catch(reason => {
-                console.log(reason);
-              });
-            }
-          };
-          if (this._stream) {
-            let localTracks = this._stream.getTracks();
-            for (let localTrack in localTracks) {
-              this._peerConnection.addTrack(localTracks[localTrack], this._stream);
+                console.error('Error creating offer:', error);
+              }
             }
-          }
+          });
         };
         this.onDescriptionSuccess = description => {
           var _a, _b, _c;
-          console.log('%c⏵ 🎥 onDescriptionSuccess ', 'background: green; color: white;');
           const streamInfo = {
             applicationName: (_b = (_a = this._main.getNetworkController()) === null || _a === void 0 ? void 0 : _a.getConnection().getCurrentServer()) === null || _b === void 0 ? void 0 : _b.getApplication(),
             streamName: (_c = this._main.getConfigManager()) === null || _c === void 0 ? void 0 : _c.getStreamData().streamKey,
@@ -2700,6 +2734,7 @@
         var _a, _b;
         this._main.addEventListener("serverConnect", this.onServerConnect, false);
         this._main.addEventListener("serverDisconnect", this.onServerDisconnect, false);
+        this._main.addEventListener("streamKeyInUse", this.onStreamKeyTaken, false);
         document.addEventListener("visibilitychange", this.visibilityChange);
         window.addEventListener("blur", this.onWindowBlur);
         window.addEventListener("focus", this.onWindowFocus);
@@ -2754,7 +2789,7 @@
       handlePermissionChange(device, state) {
         return __awaiter(this, void 0, void 0, function* () {
           if (state === 'denied') {
-            this.setInputDeviceState(InputDeviceState.INVALID);
+            this.setInputDeviceState(exports.DevicesState.INVALID);
             if (this._publishState == exports.PublishState.PUBLISHED) {
               this.closeStream();
             }
@@ -2808,6 +2843,7 @@
           this._logger.warning(this, "Cannot publish - stream not ready (missing video or audio track)");
           return false;
         }
+        this._logger.info(this, "Publish: " + streamKey);
         this.closeWebRTCConnection();
         this._main.getConfigManager().getStreamData().streamKey = streamKey;
         this._main.dispatchEvent("publish", {
@@ -2855,7 +2891,6 @@
             console.error("Error checking device availability:", error);
           }
           if (isFirefox) {
-            console.log("Firefox detected, using direct getUserMedia check...");
             if (results.camera.available) {
               try {
                 const stream = yield navigator.mediaDevices.getUserMedia({
@@ -2864,7 +2899,7 @@
                 results.camera.allowed = true;
                 stream.getTracks().forEach(track => track.stop());
               } catch (e) {
-                console.log("Camera permission check failed:", e);
+                this._logger.error(this, "Camera permission check failed: " + JSON.stringify(e));
                 results.camera.allowed = false;
               }
             }
@@ -2876,7 +2911,7 @@
                 results.microphone.allowed = true;
                 stream.getTracks().forEach(track => track.stop());
               } catch (e) {
-                console.log("Microphone permission check failed:", e);
+                this._logger.error(this, "Microphone permission check failed: " + JSON.stringify(e));
                 results.microphone.allowed = false;
               }
             }
@@ -2903,22 +2938,23 @@
                   }
                   stream.getTracks().forEach(track => track.stop());
                 } catch (error) {
-                  console.log("Additional permission check failed:", error);
+                  this._logger.error(this, "Additional permission check failed " + JSON.stringify(error));
                 }
               }
             } catch (error) {
-              console.error("Error checking permissions:", error);
+              this._logger.error(this, "Error checking permissions " + JSON.stringify(error));
             }
           }
           return results;
         });
       }
       onSocketMessage(data) {
+        var _a;
         let msgJSON = JSON.parse(data);
         let msgStatus = Number(msgJSON["status"]);
         switch (msgStatus) {
           case 200:
-            console.log('%c⏵ 🎥 onSocketMessage: 200', 'background: green; color: white;');
+            this._logger.info(this, "SDP Exchange Successful");
             let sdpData = msgJSON['sdp'];
             if (sdpData !== undefined) {
               this._peerConnection.setRemoteDescription(new RTCSessionDescription(sdpData), () => {}, () => {});
@@ -2931,17 +2967,18 @@
             }
             break;
           case 503:
-            console.log('%c⏵ 🎥 onSocketMessage: 503', 'background: green; color: white;');
+            this._logger.error(this, "StreamKey already use");
+            const usedStreamKey = (_a = this._main.getConfigManager().getStreamData().streamKey) !== null && _a !== void 0 ? _a : "unknown";
             this._main.dispatchEvent("streamKeyInUse", {
               ref: this._main,
-              streamKey: this._main.getConfigManager().getStreamData().streamKey
+              streamKey: usedStreamKey
             });
             this.setPublishState(exports.PublishState.ERROR);
             break;
         }
       }
       onConnectionStateChange(event) {
-        console.log('%c⏵ 🎥 onConnectionStateChange: ' + event.currentTarget.connectionState, 'background: green; color: white;');
+        this._logger.info(this, "Connection State Change: " + JSON.stringify(event));
         if (event !== null) {
           switch (event.currentTarget.connectionState) {
             case "connecting":
@@ -3013,12 +3050,12 @@
                 this._selectedMicrophone = this.pickMicrophone();
               }
               if (this._selectedCamera != null && this._selectedMicrophone != null) {
-                this.setInputDeviceState(InputDeviceState.READY);
+                this.setInputDeviceState(exports.DevicesState.READY);
               } else {
-                this.setInputDeviceState(InputDeviceState.INVALID);
+                this.setInputDeviceState(exports.DevicesState.INVALID);
               }
             } catch (error) {
-              this.setInputDeviceState(InputDeviceState.INVALID);
+              this.setInputDeviceState(exports.DevicesState.INVALID);
               this._logger.error(this, "Errror on grab devices: " + JSON.stringify(error));
             }
             this._main.dispatchEvent("deviceListUpdate", {
@@ -3045,13 +3082,12 @@
       selectCamera(cameraID) {
         var _a, _b;
         this._selectedCamera = null;
-        this.setInputDeviceState(InputDeviceState.UPDATING);
+        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++) {
           if (this._cameraList.get(i).getID() == cameraID) {
             this._selectedCamera = this._cameraList.get(i);
-            console.log("kamera znaleziona i zapisana " + this._cameraList.get(i).getLabel() + " " + this._cameraList.get(i).getID());
             (_b = this._main.getStorageManager()) === null || _b === void 0 ? void 0 : _b.saveField("cameraID", this._selectedCamera.getID());
             break;
           }
@@ -3060,9 +3096,9 @@
         if (this._selectedCamera != null) {
           this._constraints.video.deviceId = this._selectedCamera.getID();
           if (this._selectedCamera != null && this._selectedMicrophone != null) {
-            this.setInputDeviceState(InputDeviceState.READY);
+            this.setInputDeviceState(exports.DevicesState.READY);
           } else {
-            this.setInputDeviceState(InputDeviceState.INVALID);
+            this.setInputDeviceState(exports.DevicesState.INVALID);
           }
           this.startCamera().then(() => {
             if (wasPublished && streamKey) {
@@ -3070,15 +3106,15 @@
             }
           });
         } else {
-          this.setInputDeviceState(InputDeviceState.INVALID);
+          this.setInputDeviceState(exports.DevicesState.INVALID);
         }
       }
       selectMicrophone(micID) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
           this._selectedMicrophone = null;
-          this.setInputDeviceState(InputDeviceState.UPDATING);
-          console.log("🎤 Selecting microphone:", micID);
+          this.setInputDeviceState(exports.DevicesState.UPDATING);
+          this._logger.info(this, "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;
           for (let i = 0; i < this._microphoneList.getSize(); i++) {
@@ -3111,16 +3147,16 @@
               }
             }
             if (this._selectedCamera != null && this._selectedMicrophone != null) {
-              this.setInputDeviceState(InputDeviceState.READY);
+              this.setInputDeviceState(exports.DevicesState.READY);
             } else {
-              this.setInputDeviceState(InputDeviceState.INVALID);
+              this.setInputDeviceState(exports.DevicesState.INVALID);
             }
             if (wasPublished && streamKey) {
               this.publish(streamKey);
             }
           } catch (error) {
             console.error("Error changing microphone:", error);
-            this.setInputDeviceState(InputDeviceState.INVALID);
+            this.setInputDeviceState(exports.DevicesState.INVALID);
             this._main.dispatchEvent("inputDeviceError", {
               ref: this._main
             });
@@ -3130,7 +3166,6 @@
       startCamera() {
         return __awaiter(this, void 0, void 0, function* () {
           if (this._stream) {
-            console.log("Stopping existing stream before starting new one");
             this._stream.getTracks().forEach(track => {
               track.stop();
             });
@@ -3196,7 +3231,7 @@
         this.setPublishState(exports.PublishState.UNPUBLISHED);
       }
       pickCamera() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         for (let i = 0; i < this._cameraList.getSize(); i++) {
           this._cameraList.get(i).setSelected(false);
         }
@@ -3229,6 +3264,7 @@
             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;
@@ -3243,7 +3279,7 @@
         return this._selectedCamera;
       }
       pickMicrophone() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         for (let i = 0; i < this._microphoneList.getSize(); i++) {
           this._microphoneList.get(i).setSelected(false);
         }
@@ -3273,6 +3309,7 @@
             });
             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;
             }
@@ -3355,6 +3392,7 @@
         return this._selectedMicrophone;
       }
       setPublishState(newState) {
+        this._logger.info(this, "Publish State: " + newState);
         this._publishState = newState;
         this._main.dispatchEvent("publishStateChange", {
           ref: this._main,
@@ -3399,7 +3437,6 @@
       }
       forceStopAllStreams() {
         var _a, _b;
-        console.log("Force stopping all streams...");
         if (this._peerConnection) {
           try {
             const senders = this._peerConnection.getSenders();
@@ -3443,13 +3480,10 @@
         if (this._stream) {
           try {
             const tracks = this._stream.getTracks();
-            console.log(`Stopping ${tracks.length} tracks from main stream`);
             tracks.forEach(track => {
               try {
-                console.log(`Stopping ${track.kind} track, enabled: ${track.enabled}, state: ${track.readyState}`);
                 track.enabled = false;
                 track.stop();
-                console.log(`Track after stop - state: ${track.readyState}`);
               } catch (e) {
                 console.error(`Error stopping ${track.kind} track:`, e);
               }
@@ -3459,10 +3493,8 @@
             console.error('Error stopping main stream:', e);
           }
         }
-        console.log("All streams should be stopped now");
       }
       destroy() {
-        console.log("Starting destroy process...");
         this.forceStopAllStreams();
         if (this._soundMeter) {
           this._soundMeter.detach();
@@ -3483,7 +3515,7 @@
           console.error('Error removing event listeners:', e);
         }
         this._publishState = exports.PublishState.NOT_INITIALIZED;
-        console.log("Destroy process completed");
+        if (this._restartTimer != null) clearInterval(this._restartTimer);
       }
     }
 
@@ -3785,8 +3817,8 @@
       constructor(streamConfig, autoInitialize = false) {
         super();
         this.DEV_MODE = true;
-        this.STREAMER_VERSION = "0.9.0-beta.5";
-        this.COMPILE_DATE = "12/10/2024, 10:26:02 AM";
+        this.STREAMER_VERSION = "0.9.0-beta.7";
+        this.COMPILE_DATE = "1/2/2025, 1:53:45 AM";
         this.STREAMER_BRANCH = "Experimental";
         this.STREAMER_PROTOCOL_VERSION = 1;
         this._initialized = false;
@@ -3940,11 +3972,12 @@
       }
       publish(streamKey) {
         var _a, _b;
+        console.log("gonzo daje publish");
         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 : InputDeviceState.NOT_INITIALIZED;
+        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;