mediasoup 3.9.0 → 3.9.1

package/node/lib/Worker.d.ts

@@ -167,5 +167,6 @@ export declare class Worker extends EnhancedEventEmitter {
      * Create a Router.
      */
     createRouter({ mediaCodecs, appData }?: RouterOptions): Promise<Router>;
+    private died;
 }
 //# sourceMappingURL=Worker.d.ts.map

package/node/lib/Worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../src/Worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../src/Worker.ts"],"names":[],"mappings":"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"}

package/node/lib/Worker.js

@@ -92,7 +92,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.9.0',
+                MEDIASOUP_VERSION: '3.9.1',
                 // Let the worker process inherit all environment variables, useful
                 // if a custom and not in the path GCC is used so the user can set
                 // LD_LIBRARY_PATH environment variable for runtime.
@@ -134,34 +134,35 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         });
         __classPrivateFieldGet(this, _child).on('exit', (code, signal) => {
             __classPrivateFieldSet(this, _child, undefined);
-            this.close();
             if (!spawnDone) {
                 spawnDone = true;
                 if (code === 42) {
                     logger.error('worker process failed due to wrong settings [pid:%s]', __classPrivateFieldGet(this, _pid));
+                    this.close();
                     this.emit('@failure', new TypeError('wrong settings'));
                 }
                 else {
                     logger.error('worker process failed unexpectedly [pid:%s, code:%s, signal:%s]', __classPrivateFieldGet(this, _pid), code, signal);
+                    this.close();
                     this.emit('@failure', new Error(`[pid:${__classPrivateFieldGet(this, _pid)}, code:${code}, signal:${signal}]`));
                 }
             }
             else {
                 logger.error('worker process died unexpectedly [pid:%s, code:%s, signal:%s]', __classPrivateFieldGet(this, _pid), code, signal);
-                this.safeEmit('died', new Error(`[pid:${__classPrivateFieldGet(this, _pid)}, code:${code}, signal:${signal}]`));
+                this.died(new Error(`[pid:${__classPrivateFieldGet(this, _pid)}, code:${code}, signal:${signal}]`));
             }
         });
         __classPrivateFieldGet(this, _child).on('error', (error) => {
             __classPrivateFieldSet(this, _child, undefined);
-            this.close();
             if (!spawnDone) {
                 spawnDone = true;
                 logger.error('worker process failed [pid:%s]: %s', __classPrivateFieldGet(this, _pid), error.message);
+                this.close();
                 this.emit('@failure', error);
             }
             else {
                 logger.error('worker process error [pid:%s]: %s', __classPrivateFieldGet(this, _pid), error.message);
-                this.safeEmit('died', error);
+                this.died(error);
             }
         });
         // Be ready for 3rd party worker libraries logging to stdout.
@@ -296,6 +297,24 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         __classPrivateFieldGet(this, _observer).safeEmit('newrouter', router);
         return router;
     }
+    died(error) {
+        if (__classPrivateFieldGet(this, _closed))
+            return;
+        logger.debug(`died() [error:${error}]`);
+        __classPrivateFieldSet(this, _closed, true);
+        // Close the Channel instance.
+        __classPrivateFieldGet(this, _channel).close();
+        // Close the PayloadChannel instance.
+        __classPrivateFieldGet(this, _payloadChannel).close();
+        // Close every Router.
+        for (const router of __classPrivateFieldGet(this, _routers)) {
+            router.workerClosed();
+        }
+        __classPrivateFieldGet(this, _routers).clear();
+        this.safeEmit('died', error);
+        // Emit observer event.
+        __classPrivateFieldGet(this, _observer).safeEmit('close');
+    }
 }
 exports.Worker = Worker;
 _child = new WeakMap(), _pid = new WeakMap(), _channel = new WeakMap(), _payloadChannel = new WeakMap(), _closed = new WeakMap(), _appData = new WeakMap(), _routers = new WeakMap(), _observer = new WeakMap();

package/node/lib/index.d.ts

@@ -9,7 +9,7 @@ export { types };
 /**
  * Expose mediasoup version.
  */
-export declare const version = "3.9.0";
+export declare const version = "3.9.1";
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/index.js

@@ -10,7 +10,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.9.0';
+exports.version = '3.9.1';
 /**
  * Expose parseScalabilityMode() function.
  */

package/npm-scripts.js

@@ -59,18 +59,14 @@ switch (task)
 
 	case 'worker:build':
 	{
-		if (!process.env.MEDIASOUP_WORKER_BIN)
-		{
-			execute(`${MAKE} -C worker`);
-		}
+		execute(`${MAKE} -C worker`);
 
 		break;
 	}
 
 	case 'lint:node':
 	{
-		execute('cross-env MEDIASOUP_NODE_LANGUAGE=typescript eslint -c node/.eslintrc.js --max-warnings 0 --ext=ts node/src/');
-		execute('cross-env MEDIASOUP_NODE_LANGUAGE=javascript eslint -c node/.eslintrc.js --max-warnings 0 --ext=js --ignore-pattern \'!node/.eslintrc.js\' node/.eslintrc.js npm-scripts.js node/tests/ worker/scripts/gulpfile.js');
+		execute('eslint -c node/.eslintrc.js --max-warnings 0 node/src/ node/.eslintrc.js npm-scripts.js node/tests/ worker/scripts/gulpfile.js');
 
 		break;
 	}
@@ -122,9 +118,12 @@ switch (task)
 
 	case 'postinstall':
 	{
-		execute('node npm-scripts.js worker:build');
-		execute(`${MAKE} clean-pip -C worker`);
-		execute(`${MAKE} clean-subprojects -C worker`);
+		if (!process.env.MEDIASOUP_WORKER_BIN)
+		{
+			execute('node npm-scripts.js worker:build');
+			execute(`${MAKE} clean-pip -C worker`);
+			execute(`${MAKE} clean-subprojects -C worker`);
+		}
 
 		break;
 	}
@@ -180,19 +179,7 @@ function execute(command)
 
 	try
 	{
-		// Set MSVC compiler as default on Windows
-		const env = isWindows ? {
-			CC  : process.env.CC || 'cl',
-			CXX : process.env.CXX || 'cl',
-			...process.env
-		} : process.env;
-
-		execSync(
-			command,
-			{
-				env   : env,
-				stdio : [ 'ignore', process.stdout, process.stderr ]
-			});
+		execSync(command, { stdio: [ 'ignore', process.stdout, process.stderr ] });
 	}
 	catch (error)
 	{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -69,7 +69,7 @@
     "testRegex": "node/tests/test.*\\.js"
   },
   "dependencies": {
-    "@types/node": "^16.10.3",
+    "@types/node": "^16.11.6",
     "awaitqueue": "^2.3.3",
     "debug": "^4.3.2",
     "h264-profile-level-id": "^1.0.1",
@@ -81,12 +81,11 @@
     "@types/debug": "^4.1.7",
     "@types/random-number": "^0.0.1",
     "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "cross-env": "^7.0.3",
-    "eslint": "^7.32.0",
-    "eslint-plugin-jest": "^25.0.5",
-    "jest": "^27.2.5",
+    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/parser": "^5.2.0",
+    "eslint": "^8.1.0",
+    "eslint-plugin-jest": "^25.2.2",
+    "jest": "^27.3.1",
     "jest-tobetype": "^1.2.3",
     "open-cli": "^7.0.1",
     "pick-port": "^1.0.0",

package/worker/Makefile

@@ -14,6 +14,9 @@ DOCKER ?= docker
 PIP_DIR = $(MEDIASOUP_OUT_DIR)/pip
 MESON ?= $(PIP_DIR)/bin/meson
 MESON_ARGS ?= ""
+# Workaround for NixOS and Guix that don't work with pre-built binaries, see:
+# https://github.com/NixOS/nixpkgs/issues/142383.
+PIP_BUILD_BINARIES = $(shell [ -f /etc/NIXOS -o -d /etc/guix ] && echo "--no-binary :all:")
 
 # Disable `*.pyc` files creation.
 export PYTHONDONTWRITEBYTECODE = 1
@@ -22,10 +25,17 @@ ifeq ($(OS),Windows_NT)
 	# Windows is, of course, special.
 	export NINJA = $(PIP_DIR)/bin/ninja.exe
 else
-    export NINJA = $(PIP_DIR)/bin/ninja
+	export NINJA = $(PIP_DIR)/bin/ninja
+endif
+
+# Instruct Python where to look for modules it needs, such that `meson` actually
+# runs from installed location.
+# For some reason on Windows adding `:${PYTHONPATH}` breaks things.
+ifeq ($(OS),Windows_NT)
+	export PYTHONPATH := $(PIP_DIR)
+else
+	export PYTHONPATH := $(PIP_DIR):${PYTHONPATH}
 endif
-# Instruct Python where to look for modules it needs, such that `meson` actually runs from installed location.
-export PYTHONPATH = $(PIP_DIR)
 
 .PHONY:	\
 	default meson-ninja setup clean clean-pip clean-subprojects clean-all mediasoup-worker xcode lint format test tidy \
@@ -36,17 +46,21 @@ default: mediasoup-worker
 meson-ninja:
 ifeq ($(wildcard $(PIP_DIR)),)
 	# Updated pip and setuptools are needed for meson
-	# `--system` is not present everywhere and is only needed as workaround for Debian-specific issue (copied from
-	# https://github.com/gluster/gstatus/pull/33), fallback to command without `--system` if the first one fails.
+	# `--system` is not present everywhere and is only needed as workaround for
+	# Debian-specific issue (copied from
+	# https://github.com/gluster/gstatus/pull/33), fallback to command without
+	# `--system` if the first one fails.
 	$(PYTHON) -m pip install --system --target=$(PIP_DIR) pip setuptools || \
 		$(PYTHON) -m pip install --target=$(PIP_DIR) pip setuptools || \
 		echo "Installation failed, likely because PIP is unavailable, if you are on Debian/Ubuntu or derivative please install the python3-pip package"
-	# Install `meson` and `ninja` using `pip` into custom location, so we don't depend on system-wide installation.
-	$(PYTHON) -m pip install --upgrade --target=$(PIP_DIR) meson ninja
+	# Install `meson` and `ninja` using `pip` into custom location, so we don't
+	# depend on system-wide installation.
+	$(PYTHON) -m pip install --upgrade --target=$(PIP_DIR) $(PIP_BUILD_BINARIES) meson ninja
 endif
 
 setup: meson-ninja
-# We try to call `--reconfigure` first as a workaround for https://github.com/ninja-build/ninja/issues/1997
+# We try to call `--reconfigure` first as a workaround for this issue:
+# https://github.com/ninja-build/ninja/issues/1997
 ifeq ($(MEDIASOUP_BUILDTYPE),Release)
 	$(MESON) setup \
 		--buildtype release \
@@ -126,7 +140,8 @@ format:
 test: setup
 ifeq ($(MEDIASOUP_WORKER_BIN),)
 	$(MESON) compile -j $(CORES) -C $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE) mediasoup-worker-test
-	# On Windows lcov doesn't work (at least not yet) and we need to add `.exe` to the binary path.
+	# On Windows lcov doesn't work (at least not yet) and we need to add `.exe` to
+	# the binary path.
 ifeq ($(OS),Windows_NT)
 	$(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/mediasoup-worker-test.exe --invisibles --use-colour=yes $(MEDIASOUP_TEST_TAGS)
 else

package/worker/src/RTC/Transport.cpp

@@ -1931,6 +1931,12 @@ namespace RTC
 							continue;
 						}
 
+						// Special case for (unused) RTCP-RR from the RTX stream.
+						if (GetConsumerByRtxSsrc(report->GetSsrc()) != nullptr)
+						{
+							continue;
+						}
+
 						MS_DEBUG_TAG(
 						  rtcp,
 						  "no Consumer found for received Receiver Report [ssrc:%" PRIu32 "]",

package/worker/subprojects/libuv.wrap

@@ -1,11 +1,11 @@
 [wrap-file]
-directory = libuv-v1.41.0
-source_url = https://dist.libuv.org/dist/v1.41.0/libuv-v1.41.0.tar.gz
-source_filename = libuv-v1.41.0.tar.gz
-source_hash = 1184533907e1ddad9c0dcd30a5abb0fe25288c287ff7fee303fff7b9b2d6eb6e
-patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.41.0-1/get_patch
-patch_filename = libuv-1.41.0-1-wrap.zip
-patch_hash = 66cab50ca1f002d823a2015611c08401b69d6f7c1ecd0059cb6afd34e1138b40
+directory = libuv-v1.42.0
+source_url = https://dist.libuv.org/dist/v1.42.0/libuv-v1.42.0.tar.gz
+source_filename = libuv-v1.42.0.tar.gz
+source_hash = 43129625155a8aed796ebe90b8d4c990a73985ec717de2b2d5d3a23cfe4deb72
+patch_filename = libuv_1.42.0-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.42.0-1/get_patch
+patch_hash = 891698d781bc68379b799e47bc7e100698f03985b6db5d1ddc4eaa9be42a8f35
 
 [provide]
 libuv = libuv_dep