@4players/odin-plugin-web 1.0.0-alpha.13 → 1.0.0-alpha.14

package/lib/plugin/audioController.d.ts

@@ -87,7 +87,8 @@ export declare class AudioCapture implements Backend.AudioCapture {
     private _Vad;
     private _Apm;
     private _Volume;
-    private _deviceParameters?;
+    private _DeviceParameters?;
+    private _DeviceCb;
     get vad(): Backend.VadConfig;
     get apm(): Backend.ApmConfig;
     get volume(): Backend.Volume;

package/lib/plugin/audioController.js

@@ -339,7 +339,7 @@ export class AudioCapture {
     }
     get deviceId() {
         var _a, _b;
-        return (_b = (_a = this._deviceParameters) === null || _a === void 0 ? void 0 : _a.device) === null || _b === void 0 ? void 0 : _b.device.deviceId;
+        return (_b = (_a = this._DeviceParameters) === null || _a === void 0 ? void 0 : _a.device) === null || _b === void 0 ? void 0 : _b.device.deviceId;
     }
     constructor(controller, parameters) {
         this.controller = controller;
@@ -347,6 +347,19 @@ export class AudioCapture {
         this._Vad = defaultVad;
         this._Apm = defaultApm;
         this._Volume = 1;
+        this._DeviceCb = () => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const devices = yield this.controller.enumerateDevices();
+            const isListed = devices.some((device) => {
+                var _a, _b;
+                return (device.device.deviceId ===
+                    ((_b = (_a = this._DeviceParameters) === null || _a === void 0 ? void 0 : _a.device) === null || _b === void 0 ? void 0 : _b.device.deviceId));
+            });
+            if (!isListed) {
+                (_b = (_a = this._DeviceParameters) === null || _a === void 0 ? void 0 : _a.onStatusChanged) === null || _b === void 0 ? void 0 : _b.call(_a, 'stopped');
+                navigator.mediaDevices.removeEventListener('devicechange', this._DeviceCb);
+            }
+        });
         if (parameters.apm) {
             this.setApm(parameters.apm);
         }
@@ -397,25 +410,28 @@ export class AudioCapture {
     setApm(config) {
         return __awaiter(this, void 0, void 0, function* () {
             this._Apm = config;
-            if (this._deviceParameters) {
-                yield this.setDevice(this._deviceParameters);
+            if (this._DeviceParameters) {
+                yield this.setDevice(this._DeviceParameters);
             }
         });
     }
     setDevice(parameters) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const rollbackParams = this._deviceParameters;
-            this._deviceParameters = parameters;
+            const rollbackParams = this._DeviceParameters;
+            this._DeviceParameters = parameters;
             if (this._Volume === 'muted') {
                 return;
             }
             const device = yield openCaptureDevice(this.controller, parameters, this._Apm);
             if (device.type !== 'Success') {
                 console.error(`unable to open capture device; ${device.reason}`);
-                this._deviceParameters = rollbackParams;
+                this._DeviceParameters = rollbackParams;
                 return;
             }
+            if (this._DeviceParameters.onStatusChanged) {
+                navigator.mediaDevices.addEventListener('devicechange', this._DeviceCb);
+            }
             if (this._Capture !== undefined) {
                 stopMediaStream(this._Capture.source.mediaStream);
                 this._Capture.source.disconnect(this._Capture.worker.worklet);
@@ -445,8 +461,8 @@ export class AudioCapture {
             this.close();
         }
         else {
-            if (!this._Capture && this._deviceParameters) {
-                this.setDevice(this._deviceParameters);
+            if (!this._Capture && this._DeviceParameters) {
+                this.setDevice(this._DeviceParameters);
             }
             (_a = this._Capture) === null || _a === void 0 ? void 0 : _a.worker.setVolume(value);
         }
@@ -458,6 +474,7 @@ export class AudioCapture {
             this._Capture.source.disconnect(this._Capture.worker.worklet);
             this.controller.audioContexts.release(this._Capture.source.context);
         }
+        navigator.mediaDevices.removeEventListener('devicechange', this._DeviceCb);
         this._Capture = undefined;
     }
     _UpdateMedias() {

package/lib/plugin/mainConnection.js

@@ -46,29 +46,31 @@ export class MainConnection {
         return this.connection.closed;
     }
     webRtcReady() {
-        const isReady = () => {
-            switch (this.webRtc.connectionState) {
-                case 'connected':
-                    return true;
-                case 'failed':
-                case 'closed':
-                    return false;
-                default:
-                    return undefined;
-            }
-        };
-        const result = isReady();
-        if (result !== undefined)
-            return Promise.resolve(result);
-        return new Promise((accept) => {
-            const onConnectionStateChanged = () => {
-                const result = isReady();
-                if (result !== undefined) {
-                    this.webRtc.removeEventListener('connectionstatechange', onConnectionStateChanged);
-                    accept(result);
+        return __awaiter(this, void 0, void 0, function* () {
+            const isReady = () => {
+                switch (this.webRtc.connectionState) {
+                    case 'connected':
+                        return true;
+                    case 'failed':
+                    case 'closed':
+                        return false;
+                    default:
+                        return undefined;
                 }
             };
-            this.webRtc.addEventListener('connectionstatechange', onConnectionStateChanged);
+            const result = isReady();
+            if (result !== undefined)
+                return result;
+            return new Promise((accept) => {
+                const onConnectionStateChanged = () => {
+                    const result = isReady();
+                    if (result !== undefined) {
+                        this.webRtc.removeEventListener('connectionstatechange', onConnectionStateChanged);
+                        accept(result);
+                    }
+                };
+                this.webRtc.addEventListener('connectionstatechange', onConnectionStateChanged);
+            });
         });
     }
     constructor(id, url, onDatagram, connection, webRtc) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4players/odin-plugin-web",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "A backend plugin providing the custom WebAssembly audio processing module for ODIN web clients",
   "homepage": "https://www.4players.io",
   "repository": {