refactor to construct the transports outside the RoomAndToDeviceKeyTransport

Author: toger5

src/matrixrtc/MatrixRTCSession.ts

@@ -37,6 +37,7 @@ import {
     RoomAndToDeviceTransport,
 } from "./RoomAndToDeviceKeyTransport.ts";
 import { TypedReEmitter } from "../ReEmitter.ts";
+import { ToDeviceKeyTransport } from "./ToDeviceKeyTransport.ts";
 
 export enum MatrixRTCSessionEvent {
     // A member joined, left, or updated a property of their membership.
@@ -398,14 +399,12 @@ export class MatrixRTCSession extends TypedEventEmitter<
             let transport;
             if (joinConfig?.useExperimentalToDeviceTransport) {
                 this.logger.info("Using to-device with room fallback transport for encryption keys");
-                transport = new RoomAndToDeviceTransport(
-                    this.client.getUserId()!,
-                    this.client.getDeviceId()!,
-                    this.roomSubset,
-                    this.client,
-                    this.statistics,
-                    this.logger,
-                );
+                const [uId, dId] = [this.client.getUserId()!, this.client.getDeviceId()!];
+                const [room, client, statistics] = [this.roomSubset, this.client, this.statistics];
+                const roomKeyTransport = new RoomKeyTransport(room, client, statistics);
+                const toDeviceTransport = new ToDeviceKeyTransport(uId, dId, room.roomId, client, statistics);
+                transport = new RoomAndToDeviceTransport(toDeviceTransport, roomKeyTransport, this.logger);
+
                 // Expose the changes so the ui can display the currently used transport.
                 this.reEmitter.reEmit(transport, [RoomAndToDeviceEvents.EnabledTransportsChanged]);
             } else {

src/matrixrtc/RoomAndToDeviceKeyTransport.ts

@@ -14,15 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import type { MatrixClient } from "../client.ts";
 import { logger as rootLogger, type Logger } from "../logger.ts";
 import { KeyTransportEvents, type KeyTransportEventsHandlerMap, type IKeyTransport } from "./IKeyTransport.ts";
 import { type CallMembership } from "./CallMembership.ts";
-import { RoomKeyTransport } from "./RoomKeyTransport.ts";
-import type { Statistics } from "./types.ts";
-import { ToDeviceKeyTransport } from "./ToDeviceKeyTransport.ts";
+import type { RoomKeyTransport } from "./RoomKeyTransport.ts";
+import type { ToDeviceKeyTransport } from "./ToDeviceKeyTransport.ts";
 import { TypedEventEmitter } from "../models/typed-event-emitter.ts";
-import { type Room } from "../models/room.ts";
 
 export interface EnabledTransports {
     toDevice: boolean;
@@ -52,39 +49,18 @@ export class RoomAndToDeviceTransport
     implements IKeyTransport
 {
     private readonly logger: Logger;
-    private roomKeyTransport: RoomKeyTransport;
-    private toDeviceTransport: IKeyTransport;
     private _enabled: EnabledTransports = { toDevice: true, room: false };
     public constructor(
-        userId: string,
-        deviceId: string,
-        room: Pick<Room, "on" | "off" | "roomId">,
-        client: Pick<
-            MatrixClient,
-            | "sendEvent"
-            | "getDeviceId"
-            | "getUserId"
-            | "cancelPendingEvent"
-            | "decryptEventIfNeeded"
-            | "encryptAndSendToDevice"
-            | "on"
-            | "off"
-        >,
-        statistics: Statistics,
+        private toDeviceTransport: ToDeviceKeyTransport,
+        private roomKeyTransport: RoomKeyTransport,
         parentLogger?: Logger,
     ) {
         super();
         this.logger = (parentLogger ?? rootLogger).getChild(`[RoomAndToDeviceTransport]`);
+        // update parent loggers for the sub transports so filtering for `RoomAndToDeviceTransport` contains their logs too
+        this.toDeviceTransport.setParentLogger(this.logger);
+        this.roomKeyTransport.setParentLogger(this.logger);
 
-        this.roomKeyTransport = new RoomKeyTransport(room, client, statistics, this.logger);
-        this.toDeviceTransport = new ToDeviceKeyTransport(
-            userId,
-            deviceId,
-            room.roomId,
-            client,
-            statistics,
-            this.logger,
-        );
         this.roomKeyTransport.on(KeyTransportEvents.ReceivedKeys, (...props) => {
             // Turn on the room transport if we receive a roomKey from another participant
             // and disable the toDevice transport.

src/matrixrtc/RoomKeyTransport.ts

@@ -29,8 +29,10 @@ export class RoomKeyTransport
     extends TypedEventEmitter<KeyTransportEvents, KeyTransportEventsHandlerMap>
     implements IKeyTransport
 {
-    private readonly logger: Logger;
-
+    private logger: Logger = rootLogger;
+    public setParentLogger(parentLogger: Logger): void {
+        this.logger = parentLogger.getChild(`[RoomKeyTransport]`);
+    }
     public constructor(
         private room: Pick<Room, "on" | "off" | "roomId">,
         private client: Pick<
@@ -41,7 +43,7 @@ export class RoomKeyTransport
         parentLogger?: Logger,
     ) {
         super();
-        this.logger = (parentLogger ?? rootLogger).getChild(`[RoomKeyTransport]`);
+        this.setParentLogger(parentLogger ?? rootLogger);
     }
     public start(): void {
         this.room.on(RoomEvent.Timeline, (ev) => void this.consumeCallEncryptionEvent(ev));

src/matrixrtc/ToDeviceKeyTransport.ts

@@ -31,7 +31,10 @@ export class ToDeviceKeyTransport
     extends TypedEventEmitter<KeyTransportEvents, KeyTransportEventsHandlerMap>
     implements IKeyTransport
 {
-    private readonly logger: Logger;
+    private logger: Logger = rootLogger;
+    public setParentLogger(parentLogger: Logger): void {
+        this.logger = parentLogger.getChild(`[ToDeviceKeyTransport]`);
+    }
 
     public constructor(
         private userId: string,
@@ -42,7 +45,7 @@ export class ToDeviceKeyTransport
         parentLogger?: Logger,
     ) {
         super();
-        this.logger = (parentLogger ?? rootLogger).getChild(`[ToDeviceKeyTransport]`);
+        this.setParentLogger(parentLogger ?? rootLogger);
     }
 
     public start(): void {