Merge branch 'v3-CLT-build-fix' into v3

enimo · Jun 2, 2020 · 4b5cab3 · 4b5cab3
2 parents a24e907 + 743c72c
commit 4b5cab3
Show file tree

Hide file tree

Showing 52 changed files with 254 additions and 267 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -211,8 +211,9 @@ switch (process.env.MEDIASOUP_NODE_LANGUAGE)
 					ignoreRestSiblings : false
 				}
 			],
-			'@typescript-eslint/no-use-before-define' : 0,
-			'@typescript-eslint/no-empty-function'    : 0
+			'@typescript-eslint/no-use-before-define'  : 0,
+			'@typescript-eslint/no-empty-function'     : 0,
+			'@typescript-eslint/no-non-null-assertion' : 0
 		};
 
 		break;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+### 3.6.3
+
+* Modernize TypeScript.
+* `gyp`: Fix CLT version detection in OSX Catalina.
+
+
+### 3.6.2
+
+* Fix crash in `Transport.ts` when closing a `DataConsumer` created on a `DirectTransport`.
+
+
 ### 3.6.1
 
 * Export new `DirectTransport` in `types`.

diff --git a/lib/Channel.js b/lib/Channel.js
@@ -1,14 +1,7 @@
 "use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
-const netstring = __importStar(require("netstring"));
+const netstring = require("netstring");
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const errors_1 = require("./errors");
@@ -42,7 +35,7 @@ class Channel extends EnhancedEventEmitter_1.EnhancedEventEmitter {
             if (this._recvBuffer.length > NS_PAYLOAD_MAX_LEN) {
                 logger.error('receiving buffer is full, discarding all data into it');
                 // Reset the buffer and exit.
-                this._recvBuffer = null;
+                this._recvBuffer = undefined;
                 return;
             }
             while (true) // eslint-disable-line no-constant-condition

diff --git a/lib/Consumer.d.ts b/lib/Consumer.d.ts
@@ -117,8 +117,8 @@ export declare class Consumer extends EnhancedEventEmitter {
     private _producerPaused;
     private _priority;
     private _score;
-    private _preferredLayers;
-    private _currentLayers;
+    private _preferredLayers?;
+    private _currentLayers?;
     private readonly _observer;
     /**
      * @private
@@ -127,7 +127,7 @@ export declare class Consumer extends EnhancedEventEmitter {
      * @emits producerpause
      * @emits producerresume
      * @emits score - (score: ConsumerScore)
-     * @emits layerschange - (layers: ConsumerLayers | null)
+     * @emits layerschange - (layers: ConsumerLayers | undefined)
      * @emits trace - (trace: ConsumerTraceEventData)
      * @emits @close
      * @emits @producerclose
@@ -185,11 +185,11 @@ export declare class Consumer extends EnhancedEventEmitter {
     /**
      * Preferred video layers.
      */
-    get preferredLayers(): ConsumerLayers | null;
+    get preferredLayers(): ConsumerLayers | undefined;
     /**
      * Current video layers.
      */
-    get currentLayers(): ConsumerLayers | null;
+    get currentLayers(): ConsumerLayers | undefined;
     /**
      * App custom data.
      */
@@ -205,7 +205,7 @@ export declare class Consumer extends EnhancedEventEmitter {
      * @emits pause
      * @emits resume
      * @emits score - (score: ConsumerScore)
-     * @emits layerschange - (layers: ConsumerLayers | null)
+     * @emits layerschange - (layers: ConsumerLayers | undefined)
      * @emits trace - (trace: ConsumerTraceEventData)
      */
     get observer(): EnhancedEventEmitter;

diff --git a/lib/Consumer.d.ts.map b/lib/Consumer.d.ts.map
diff --git a/lib/Consumer.js b/lib/Consumer.js
@@ -11,7 +11,7 @@ class Consumer extends EnhancedEventEmitter_1.EnhancedEventEmitter {
      * @emits producerpause
      * @emits producerresume
      * @emits score - (score: ConsumerScore)
-     * @emits layerschange - (layers: ConsumerLayers | null)
+     * @emits layerschange - (layers: ConsumerLayers | undefined)
      * @emits trace - (trace: ConsumerTraceEventData)
      * @emits @close
      * @emits @producerclose
@@ -26,10 +26,6 @@ class Consumer extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         this._producerPaused = false;
         // Current priority.
         this._priority = 1;
-        // Preferred layers.
-        this._preferredLayers = null;
-        // Curent layers.
-        this._currentLayers = null;
         // Observer instance.
         this._observer = new EnhancedEventEmitter_1.EnhancedEventEmitter();
         logger.debug('constructor()');
@@ -134,7 +130,7 @@ class Consumer extends EnhancedEventEmitter_1.EnhancedEventEmitter {
      * @emits pause
      * @emits resume
      * @emits score - (score: ConsumerScore)
-     * @emits layerschange - (layers: ConsumerLayers | null)
+     * @emits layerschange - (layers: ConsumerLayers | undefined)
      * @emits trace - (trace: ConsumerTraceEventData)
      */
     get observer() {
@@ -217,7 +213,7 @@ class Consumer extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         logger.debug('setPreferredLayers()');
         const reqData = { spatialLayer, temporalLayer };
         const data = await this._channel.request('consumer.setPreferredLayers', this._internal, reqData);
-        this._preferredLayers = data || null;
+        this._preferredLayers = data || undefined;
     }
     /**
      * Set priority.

diff --git a/lib/Logger.d.ts b/lib/Logger.d.ts
@@ -1,4 +1,4 @@
-import debug from 'debug';
+/// <reference types="debug" />
 export declare class Logger {
     private readonly _debug;
     private readonly _warn;

diff --git a/lib/Logger.d.ts.map b/lib/Logger.d.ts.map
diff --git a/lib/Logger.js b/lib/Logger.js
@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const debug_1 = __importDefault(require("debug"));
+const debug_1 = require("debug");
 const APP_NAME = 'mediasoup';
 class Logger {
     constructor(prefix) {

diff --git a/lib/PayloadChannel.js b/lib/PayloadChannel.js
@@ -1,14 +1,7 @@
 "use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
-const netstring = __importStar(require("netstring"));
+const netstring = require("netstring");
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const errors_1 = require("./errors");
@@ -38,7 +31,7 @@ class PayloadChannel extends EnhancedEventEmitter_1.EnhancedEventEmitter {
             if (this._recvBuffer.length > NS_PAYLOAD_MAX_LEN) {
                 logger.error('receiving buffer is full, discarding all data into it');
                 // Reset the buffer and exit.
-                this._recvBuffer = null;
+                this._recvBuffer = undefined;
                 return;
             }
             while (true) // eslint-disable-line no-constant-condition

diff --git a/lib/PipeTransport.js b/lib/PipeTransport.js
@@ -1,15 +1,8 @@
 "use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const Logger_1 = require("./Logger");
-const ortc = __importStar(require("./ortc"));
+const ortc = require("./ortc");
 const Transport_1 = require("./Transport");
 const Consumer_1 = require("./Consumer");
 const logger = new Logger_1.Logger('PipeTransport');