@4players/odin-common 2.17.4 → 2.19.0

package/lib/cjs/utility/codec.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VideoCodec = void 0;
-const sdp_transform_1 = require("sdp-transform");
 const result_1 = require("./result");
 const validCodecs = ['VP8', 'VP9', 'AV1', 'H264'];
 class VideoCodec {
@@ -14,22 +13,19 @@ class VideoCodec {
         return validCodecs.includes(this.codec);
     }
     isSupported() {
-        var _a, _b, _c;
         if (typeof RTCRtpReceiver === 'undefined' ||
             typeof RTCRtpReceiver.getCapabilities === 'undefined') {
-            return false;
+            return null;
         }
         const expectedMimeType = (0, result_1.unwrapOr)(this.getMimeType(), '').toLowerCase();
         const expectedFmtpLine = new Set((0, result_1.unwrapOr)(this.getSdpFmtpLine(), '')
             .split(';')
             .map((arg) => arg.trim().toLowerCase()));
-        return ((_c = (_b = (_a = RTCRtpReceiver.getCapabilities('video')) === null || _a === void 0 ? void 0 : _a.codecs) === null || _b === void 0 ? void 0 : _b.some((c) => {
-            var _a;
+        return (RTCRtpReceiver.getCapabilities('video')?.codecs?.find((c) => {
             const actualMimeType = c.mimeType.toLowerCase();
-            const actualFmtpLine = new Set(((_a = c.sdpFmtpLine) !== null && _a !== void 0 ? _a : '')
+            const actualFmtpLine = new Set((c.sdpFmtpLine ?? '')
                 .split(';')
                 .map((arg) => arg.trim().toLowerCase()));
-            console.log(actualMimeType, actualFmtpLine);
             if (expectedMimeType !== actualMimeType)
                 return false;
             if (expectedFmtpLine.size !== actualFmtpLine.size)
@@ -39,36 +35,7 @@ class VideoCodec {
                     return false;
             }
             return true;
-        })) !== null && _c !== void 0 ? _c : false);
-    }
-    filterSdp(description) {
-        if (!this.isValid()) {
-            return description;
-        }
-        const sdp = (0, sdp_transform_1.parse)(description);
-        const payload = (0, result_1.unwrap)(this.getPayloadType());
-        const config = (0, result_1.unwrap)(this.getSdpFmtpLine());
-        sdp.media = sdp.media.map((media) => {
-            if (media.type !== 'video') {
-                return media;
-            }
-            media.payloads = '';
-            media.rtp = [];
-            media.fmtp = [];
-            media.rtcpFb = [];
-            media.payloads = String(payload);
-            media.rtp.push({ payload, codec: this.codec, rate: this.clockRate });
-            if (config.length) {
-                media.fmtp.push({ payload, config });
-            }
-            media.rtcpFb.push({ payload, type: 'goog-remb' });
-            media.rtcpFb.push({ payload, type: 'transport-cc' });
-            media.rtcpFb.push({ payload, type: 'ccm', subtype: 'fir' });
-            media.rtcpFb.push({ payload, type: 'nack' });
-            media.rtcpFb.push({ payload, type: 'nack', subtype: 'pli' });
-            return media;
-        });
-        return (0, sdp_transform_1.write)(sdp);
+        }) ?? null);
     }
     getPayloadType() {
         switch (this.codec) {

package/lib/cjs/utility/log.js

@@ -83,14 +83,14 @@ function debug(msg, ...args) {
 }
 class Logger {
     constructor(level, name, options) {
-        this.name = name !== null && name !== void 0 ? name : LOG_DEFAULT_ID;
+        this.name = name ?? LOG_DEFAULT_ID;
         if ((0, validation_1.isNumber)(level)) {
             this._Level = (0, result_1.unwrap)(getLevelByName((0, result_1.unwrap)(getLevelName(level))));
         }
         else {
             this._Level = (0, result_1.unwrap)(getLevelByName(level));
         }
-        this._Handlers = (options === null || options === void 0 ? void 0 : options.handlers) || [new LogHandler(level)];
+        this._Handlers = options?.handlers || [new LogHandler(level)];
         LOG_COLLECTION.set(this.name, this);
     }
     get level() {

package/lib/cjs/utility/selector.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Selector = void 0;
 class Selector {
@@ -15,17 +6,13 @@ class Selector {
         this._Generators = _Generators;
         this._Futures = _Generators.map(Selector.addIndex);
     }
-    next() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [result, index] = yield Promise.race(this._Futures);
-            this._Futures[index] = Selector.addIndex(this._Generators[index], index);
-            return result;
-        });
+    async next() {
+        const [result, index] = await Promise.race(this._Futures);
+        this._Futures[index] = Selector.addIndex(this._Generators[index], index);
+        return result;
     }
-    static addIndex(generator, index) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [yield generator(), index];
-        });
+    static async addIndex(generator, index) {
+        return [await generator(), index];
     }
 }
 exports.Selector = Selector;

package/lib/cjs/utility/strand.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Strand = void 0;
 class Strand {
@@ -18,32 +9,30 @@ class Strand {
     }
     enqueue(task) {
         return new Promise((resolve, reject) => {
-            const wrapped = () => __awaiter(this, void 0, void 0, function* () {
+            const wrapped = async () => {
                 try {
-                    const result = yield task(...this._Values);
+                    const result = await task(...this._Values);
                     resolve(result);
                 }
                 catch (error) {
                     reject(error);
                 }
-            });
+            };
             this._Tasks.push(wrapped);
             if (!this._Running) {
                 this.execute();
             }
         });
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._Running = true;
-            while (true) {
-                const task = this._Tasks.shift();
-                if (task === undefined)
-                    break;
-                yield task();
-            }
-            this._Running = false;
-        });
+    async execute() {
+        this._Running = true;
+        while (true) {
+            const task = this._Tasks.shift();
+            if (task === undefined)
+                break;
+            await task();
+        }
+        this._Running = false;
     }
 }
 exports.Strand = Strand;

package/lib/esm/index.js

@@ -1,5 +1,4 @@
-import * as zod_1 from 'zod';
-export { zod_1 as zod };
+export * as zod from 'zod';
 export * from './schema/serialization';
 export * from './schema/token';
 export * from './schema/room';

package/lib/esm/utility/codec.js

@@ -1,5 +1,4 @@
-import { parse, write } from 'sdp-transform';
-import { failure, success, unwrap, unwrapOr } from './result';
+import { failure, success, unwrapOr } from './result';
 const validCodecs = ['VP8', 'VP9', 'AV1', 'H264'];
 export class VideoCodec {
     constructor(codec) {
@@ -11,22 +10,19 @@ export class VideoCodec {
         return validCodecs.includes(this.codec);
     }
     isSupported() {
-        var _a, _b, _c;
         if (typeof RTCRtpReceiver === 'undefined' ||
             typeof RTCRtpReceiver.getCapabilities === 'undefined') {
-            return false;
+            return null;
         }
         const expectedMimeType = unwrapOr(this.getMimeType(), '').toLowerCase();
         const expectedFmtpLine = new Set(unwrapOr(this.getSdpFmtpLine(), '')
             .split(';')
             .map((arg) => arg.trim().toLowerCase()));
-        return ((_c = (_b = (_a = RTCRtpReceiver.getCapabilities('video')) === null || _a === void 0 ? void 0 : _a.codecs) === null || _b === void 0 ? void 0 : _b.some((c) => {
-            var _a;
+        return (RTCRtpReceiver.getCapabilities('video')?.codecs?.find((c) => {
             const actualMimeType = c.mimeType.toLowerCase();
-            const actualFmtpLine = new Set(((_a = c.sdpFmtpLine) !== null && _a !== void 0 ? _a : '')
+            const actualFmtpLine = new Set((c.sdpFmtpLine ?? '')
                 .split(';')
                 .map((arg) => arg.trim().toLowerCase()));
-            console.log(actualMimeType, actualFmtpLine);
             if (expectedMimeType !== actualMimeType)
                 return false;
             if (expectedFmtpLine.size !== actualFmtpLine.size)
@@ -36,36 +32,7 @@ export class VideoCodec {
                     return false;
             }
             return true;
-        })) !== null && _c !== void 0 ? _c : false);
-    }
-    filterSdp(description) {
-        if (!this.isValid()) {
-            return description;
-        }
-        const sdp = parse(description);
-        const payload = unwrap(this.getPayloadType());
-        const config = unwrap(this.getSdpFmtpLine());
-        sdp.media = sdp.media.map((media) => {
-            if (media.type !== 'video') {
-                return media;
-            }
-            media.payloads = '';
-            media.rtp = [];
-            media.fmtp = [];
-            media.rtcpFb = [];
-            media.payloads = String(payload);
-            media.rtp.push({ payload, codec: this.codec, rate: this.clockRate });
-            if (config.length) {
-                media.fmtp.push({ payload, config });
-            }
-            media.rtcpFb.push({ payload, type: 'goog-remb' });
-            media.rtcpFb.push({ payload, type: 'transport-cc' });
-            media.rtcpFb.push({ payload, type: 'ccm', subtype: 'fir' });
-            media.rtcpFb.push({ payload, type: 'nack' });
-            media.rtcpFb.push({ payload, type: 'nack', subtype: 'pli' });
-            return media;
-        });
-        return write(sdp);
+        }) ?? null);
     }
     getPayloadType() {
         switch (this.codec) {

package/lib/esm/utility/log.js

@@ -73,14 +73,14 @@ export function debug(msg, ...args) {
 }
 export class Logger {
     constructor(level, name, options) {
-        this.name = name !== null && name !== void 0 ? name : LOG_DEFAULT_ID;
+        this.name = name ?? LOG_DEFAULT_ID;
         if (isNumber(level)) {
             this._Level = unwrap(getLevelByName(unwrap(getLevelName(level))));
         }
         else {
             this._Level = unwrap(getLevelByName(level));
         }
-        this._Handlers = (options === null || options === void 0 ? void 0 : options.handlers) || [new LogHandler(level)];
+        this._Handlers = options?.handlers || [new LogHandler(level)];
         LOG_COLLECTION.set(this.name, this);
     }
     get level() {

package/lib/esm/utility/selector.js

@@ -1,27 +1,14 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 export class Selector {
     constructor(_Generators) {
         this._Generators = _Generators;
         this._Futures = _Generators.map(Selector.addIndex);
     }
-    next() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [result, index] = yield Promise.race(this._Futures);
-            this._Futures[index] = Selector.addIndex(this._Generators[index], index);
-            return result;
-        });
+    async next() {
+        const [result, index] = await Promise.race(this._Futures);
+        this._Futures[index] = Selector.addIndex(this._Generators[index], index);
+        return result;
     }
-    static addIndex(generator, index) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [yield generator(), index];
-        });
+    static async addIndex(generator, index) {
+        return [await generator(), index];
     }
 }

package/lib/esm/utility/strand.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 export class Strand {
     constructor(...values) {
         this._Tasks = [];
@@ -15,31 +6,29 @@ export class Strand {
     }
     enqueue(task) {
         return new Promise((resolve, reject) => {
-            const wrapped = () => __awaiter(this, void 0, void 0, function* () {
+            const wrapped = async () => {
                 try {
-                    const result = yield task(...this._Values);
+                    const result = await task(...this._Values);
                     resolve(result);
                 }
                 catch (error) {
                     reject(error);
                 }
-            });
+            };
             this._Tasks.push(wrapped);
             if (!this._Running) {
                 this.execute();
             }
         });
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._Running = true;
-            while (true) {
-                const task = this._Tasks.shift();
-                if (task === undefined)
-                    break;
-                yield task();
-            }
-            this._Running = false;
-        });
+    async execute() {
+        this._Running = true;
+        while (true) {
+            const task = this._Tasks.shift();
+            if (task === undefined)
+                break;
+            await task();
+        }
+        this._Running = false;
     }
 }

package/lib/plugin/api.d.ts

@@ -15,7 +15,7 @@ export declare namespace Backend {
         joinRoom(parameters: JoinRoomParameters): Room;
         createAudioPlayback(parameters: CreateAudioPlaybackParameters): Promise<AudioPlayback>;
         createAudioCapture(parameters: CreateAudioCaptureParameters): Promise<AudioCapture>;
-        createVideoCapture(ms: MediaStream, customType?: string): Promise<VideoCapture>;
+        createVideoCapture(ms: MediaStream, options?: DeviceOptions): Promise<VideoCapture>;
         createVideoPlayback(parameters: CreateVideoPlaybackParameters): Promise<VideoPlayback>;
         enumerateDevices(): Promise<Array<Device>>;
         setOutputVolume(volume: Volume): void;
@@ -148,4 +148,8 @@ export declare namespace Backend {
         configure(settings: CipherSettings): void;
         getPeerStatus(peerId: number): PeerCipherStatus;
     }
+    type DeviceOptions = {
+        codec?: 'H264' | 'VP8' | 'VP9';
+        customType?: string;
+    };
 }

package/lib/utility/codec.d.ts

@@ -7,8 +7,7 @@ export declare class VideoCodec {
     readonly clockRate = 90000;
     constructor(codec: Codec);
     isValid(): boolean;
-    isSupported(): boolean;
-    filterSdp(description: string): string;
+    isSupported(): RTCRtpCodec | null;
     getPayloadType(): Result<number>;
     getMimeType(): Result<string>;
     getSdpFmtpLine(): Result<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4players/odin-common",
-  "version": "2.17.4",
+  "version": "2.19.0",
   "description": "A collection of commonly used type definitions and utility functions across ODIN web projects",
   "author": "Josho Bleicker <josho.bleicker@4players.io> (https://www.4players.io)",
   "homepage": "https://www.4players.io",