@4players/odin-plugin-web 1.0.0-alpha.17 → 1.0.0-alpha.19

package/lib/plugin/connectionPool.js

@@ -99,7 +99,9 @@ export class ConnectionPool {
         });
     }
     releaseConnection(connection) {
+        logger.log(['Connection'], 'ConnectionPool.releaseConnection()');
         const entry = this._ConnectionsById.get(connection.id);
+        logger.log(['Connection'], 'ConnectionPool.releaseConnection() entry refs', entry === null || entry === void 0 ? void 0 : entry.references);
         if (entry === undefined)
             return;
         if (entry.status === 'init') {

package/lib/plugin/index.d.ts

@@ -23,7 +23,7 @@ export interface WebPluginOptions {
 }
 export declare class WebPlugin implements Plugin {
     readonly options: WebPluginOptions;
-    readonly version = "1";
+    readonly version = "2";
     private _NextRoomId;
     private _PlaybackVolume;
     private readonly _ConnectionPool;

package/lib/plugin/index.js

@@ -42,7 +42,7 @@ export class WebPlugin {
     }
     constructor(connectionPool, audioController, options = { transport: Transport.H3 }) {
         this.options = options;
-        this.version = '1';
+        this.version = '2';
         this._NextRoomId = 0;
         this._PlaybackVolume = 1;
         this._ConnectionPool = connectionPool;
@@ -117,6 +117,7 @@ export class Room {
     link(media) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
+            logger.debug(['Audio'], 'Room.link() media', media);
             if (media instanceof AudioPlayback) {
                 const entry = (_a = this._Playbacks.get(media.uid)) !== null && _a !== void 0 ? _a : {
                     media: undefined,
@@ -199,6 +200,7 @@ export class Room {
     }
     unlink(media) {
         var _a, _b;
+        logger.debug(['Audio'], 'Room.unlink() media', media);
         if (media instanceof AudioPlayback || media instanceof VideoPlayback) {
             const entry = this._Playbacks.get(media.uid);
             if ((entry === null || entry === void 0 ? void 0 : entry.playback) !== media)

package/lib/plugin/medias/audio-capture.d.ts

@@ -10,6 +10,7 @@ export declare class AudioCapture implements Backend.AudioCapture {
     private _Apm;
     private _Volume;
     private _DeviceParameters?;
+    private _ProcessingSetDevice;
     private _DeviceCb;
     get vad(): Backend.VadConfig;
     get apm(): Backend.ApmConfig;
@@ -22,8 +23,8 @@ export declare class AudioCapture implements Backend.AudioCapture {
     stop(room: RoomConnection, media: GlobalMediaId): void;
     setVad(value: Backend.VadConfig): void;
     setApm(config: Backend.ApmConfig): Promise<void>;
-    setDevice(parameters: DeviceParameters): Promise<import("@4players/odin-common").Success<void> | undefined>;
-    setVolume(value: Backend.Volume): void;
-    close(): void;
+    setDevice(parameters: DeviceParameters): Promise<void>;
+    setVolume(value: Backend.Volume): Promise<void>;
+    close(): Promise<void>;
     _UpdateMedias(): Promise<void>;
 }

package/lib/plugin/medias/audio-capture.js

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { success } from '@4players/odin-common';
 import { Silence } from '../../worker/common';
 import { logger } from '../index';
 import { createCaptureWorker } from '../../worker';
@@ -59,8 +58,10 @@ export class AudioCapture {
         this._Vad = defaultVad;
         this._Apm = defaultApm;
         this._Volume = 1;
+        this._ProcessingSetDevice = false;
         this._DeviceCb = () => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            logger.debug(['Audio'], 'AudioCapture._DeviceCb()');
             const devices = yield enumerateDevices();
             const isListed = devices.some((device) => {
                 var _a, _b;
@@ -84,6 +85,7 @@ export class AudioCapture {
     }
     start(room, media, uid) {
         var _a;
+        logger.debug(['Audio'], 'AudioCapture.start()', media);
         let entry = this._Medias.get(media.connectionId);
         if (entry === undefined) {
             this._Medias.set(media.connectionId, (entry = new Set()));
@@ -103,6 +105,7 @@ export class AudioCapture {
     }
     stop(room, media) {
         var _a;
+        logger.debug(['Audio'], 'AudioCapture.stop()', media);
         const entry = this._Medias.get(media.connectionId);
         if (!(entry === null || entry === void 0 ? void 0 : entry.delete(media.mediaId)))
             return;
@@ -114,6 +117,7 @@ export class AudioCapture {
         this._UpdateMedias();
     }
     setVad(value) {
+        logger.debug(['Audio'], 'AudioCapture.setVad() config', value);
         this._Vad = value;
         if (this._Capture) {
             this._Capture.worker.setVad(value);
@@ -121,6 +125,7 @@ export class AudioCapture {
     }
     setApm(config) {
         return __awaiter(this, void 0, void 0, function* () {
+            logger.debug(['Audio'], 'AudioCapture.setApm() config', config);
             this._Apm = config;
             if (this._DeviceParameters) {
                 yield this.setDevice(this._DeviceParameters);
@@ -160,41 +165,54 @@ export class AudioCapture {
                     source: device.value,
                 };
                 yield this._UpdateMedias();
-                this.setVolume(this.volume);
+                yield this.setVolume(this._Volume);
                 this.setVad(this.vad);
             }
             else {
                 this._Capture.source = device.value;
             }
             this._Capture.source.connect(this._Capture.worker.worklet);
-            return success();
         });
     }
     setVolume(value) {
-        var _a;
-        this._Volume = value;
-        if (value === 'muted') {
-            this.close();
-        }
-        else {
-            if (!this._Capture && this._DeviceParameters) {
-                this.setDevice(this._DeviceParameters);
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            logger.debug(['Audio'], 'AudioCapture.setVolume()', value);
+            this._Volume = value;
+            if (this._ProcessingSetDevice)
+                return;
+            this._ProcessingSetDevice = true;
+            if (value === 'muted') {
+                yield this.close();
             }
-            (_a = this._Capture) === null || _a === void 0 ? void 0 : _a.worker.setVolume(value);
-        }
+            else {
+                if (!this._Capture && this._DeviceParameters) {
+                    yield this.setDevice(this._DeviceParameters);
+                }
+                (_a = this._Capture) === null || _a === void 0 ? void 0 : _a.worker.setVolume(value);
+            }
+            this._ProcessingSetDevice = false;
+            if (value !== this._Volume) {
+                yield this.setVolume(this._Volume);
+            }
+        });
     }
     close() {
-        if (this._Capture !== undefined) {
-            this._Capture.worker.close();
-            stopMediaStream(this._Capture.source.mediaStream);
-            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;
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.debug(['Audio'], 'AudioCapture.close()');
+            if (this._Capture !== undefined) {
+                this._Capture.worker.close();
+                stopMediaStream(this._Capture.source.mediaStream);
+                this._Capture.source.disconnect(this._Capture.worker.worklet);
+                yield this.controller.audioContexts.release(this._Capture.source.context);
+            }
+            navigator.mediaDevices.removeEventListener('devicechange', this._DeviceCb);
+            this._Capture = undefined;
+        });
     }
     _UpdateMedias() {
         return __awaiter(this, void 0, void 0, function* () {
+            logger.debug(['Audio'], 'AudioCapture._UpdateMedias()');
             if (this._Capture !== undefined) {
                 const connections = Array.from(this._Medias).map(([key, value]) => {
                     return { id: key, mediaIds: Array.from(value) };

package/lib/plugin/medias/audio-playback.d.ts

@@ -8,6 +8,6 @@ export declare class AudioPlayback implements Backend.AudioPlayback {
     constructor(controller: MediaController, uid: Backend.UID);
     start(id: GlobalMediaId): void;
     stop(id: GlobalMediaId): void;
-    setVolume(value: Backend.Volume): void;
+    setVolume(value: Backend.Volume): Promise<void>;
     close(): void;
 }

package/lib/plugin/medias/audio-playback.js

@@ -1,3 +1,13 @@
+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());
+    });
+};
+import { logger } from '../config';
 export class AudioPlayback {
     get volume() {
         return this.controller.playbackGetVolume(this.uid);
@@ -10,15 +20,21 @@ export class AudioPlayback {
         this.uid = uid;
     }
     start(id) {
+        logger.debug(['Audio'], 'AudioPlayback.start()', id);
         this.controller.playbackStart(this.uid, id);
     }
     stop(id) {
+        logger.debug(['Audio'], 'AudioPlayback.stop()', id);
         this.controller.playbackStop(this.uid, id);
     }
     setVolume(value) {
-        this.controller.playbackSetVolume(this.uid, value);
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.debug(['Audio'], 'AudioPlayback.setVolume()', value);
+            this.controller.playbackSetVolume(this.uid, value);
+        });
     }
     close() {
+        logger.debug(['Audio'], 'AudioPlayback.close()');
         this.controller.closePlayback(this.uid);
     }
 }

package/lib/plugin/roomConnection.js

@@ -215,6 +215,7 @@ export class RoomConnection {
                     case 'closed':
                         logger.debug(['Connection'], 'RoomConnection._HandleConnection: closed');
                         (_a = this._RoomConnection) === null || _a === void 0 ? void 0 : _a.close();
+                        this.connectionPool.releaseConnection(main);
                         return;
                     case 'renewToken':
                         this._RenewToken();

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.0-alpha.17";
+export declare const version = "1.0.0-alpha.19";

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '1.0.0-alpha.17';
+export const version = '1.0.0-alpha.19';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4players/odin-plugin-web",
-  "version": "1.0.0-alpha.17",
+  "version": "1.0.0-alpha.19",
   "description": "A backend plugin providing the custom WebAssembly audio processing module for ODIN web clients",
   "homepage": "https://www.4players.io",
   "repository": {
@@ -28,7 +28,7 @@
     "bundle": "npm run build && esbuild lib/plugin/index.js --bundle --outfile=dist/plugin.js"
   },
   "dependencies": {
-    "@4players/odin-common": "~2.4.13"
+  "@4players/odin-common": "~2.5.0"
   },
   "devDependencies": {
     "@types/node": "~20.12.0",