lint, rename, imports

Author: toger5

spec/unit/matrixrtc/RoomAndToDeviceTransport.spec.ts

@@ -27,7 +27,7 @@ import {
 import { type Statistics } from "../../../src/matrixrtc";
 import { KeyTransportEvents } from "../../../src/matrixrtc/IKeyTransport.ts";
 import { type Logger } from "../../../src/logger.ts";
-import { RoomAndToDeviceEvents, RoomAndToDeviceTransport } from "../../../src/matrixrtc/ToDeviceAndRoomKeyTransport.ts";
+import { RoomAndToDeviceEvents, RoomAndToDeviceTransport } from "../../../src/matrixrtc/RoomAndToDeviceKeyTransport.ts";
 import type { RoomKeyTransport } from "../../../src/matrixrtc/RoomKeyTransport.ts";
 
 describe("RoomAndToDeviceTransport", () => {

src/matrixrtc/EncryptionManager.ts

@@ -6,7 +6,7 @@ import { safeGetRetryAfterMs } from "../http-api/errors.ts";
 import { type CallMembership } from "./CallMembership.ts";
 import { type KeyTransportEventListener, KeyTransportEvents, type IKeyTransport } from "./IKeyTransport.ts";
 import { isMyMembership, type Statistics } from "./types.ts";
-import { RoomAndToDeviceEvents, RoomAndToDeviceTransport } from "./ToDeviceAndRoomKeyTransport.ts";
+import { RoomAndToDeviceEvents, RoomAndToDeviceTransport } from "./RoomAndToDeviceKeyTransport.ts";
 
 /**
  * This interface is for testing and for making it possible to interchange the encryption manager.
@@ -106,9 +106,9 @@ export class EncryptionManager implements IEncryptionManager {
         this.manageMediaKeys = this.joinConfig?.manageMediaKeys ?? this.manageMediaKeys;
 
         this.transport.on(KeyTransportEvents.ReceivedKeys, this.onNewKeyReceived);
-        if (this.transport instanceof RoomAndToDeviceTransport)
+        if (this.transport instanceof RoomAndToDeviceTransport) {
             this.transport.on(RoomAndToDeviceEvents.EnabledTransportsChanged, this.onTransportChanged);
-
+        }
         this.transport.start();
         if (this.joinConfig?.manageMediaKeys) {
             this.makeNewSenderKey();
@@ -126,8 +126,9 @@ export class EncryptionManager implements IEncryptionManager {
         // as they may still be using the same ones.
         this.encryptionKeys.set(getParticipantId(this.userId, this.deviceId), []);
         this.transport.off(KeyTransportEvents.ReceivedKeys, this.onNewKeyReceived);
-        if (this.transport instanceof RoomAndToDeviceTransport)
+        if (this.transport instanceof RoomAndToDeviceTransport) {
             this.transport.off(RoomAndToDeviceEvents.EnabledTransportsChanged, this.onTransportChanged);
+        }
         this.transport.stop();
 
         if (this.makeNewKeyTimeout !== undefined) {

src/matrixrtc/MatrixRTCSession.ts

@@ -33,9 +33,9 @@ import { RoomKeyTransport } from "./RoomKeyTransport.ts";
 import type { IMembershipManager } from "./IMembershipManager.ts";
 import {
     RoomAndToDeviceEvents,
-    RoomAndToDeviceEventsHandlerMap,
+    type RoomAndToDeviceEventsHandlerMap,
     RoomAndToDeviceTransport,
-} from "./ToDeviceAndRoomKeyTransport.ts";
+} from "./RoomAndToDeviceKeyTransport.ts";
 import { TypedReEmitter } from "../ReEmitter.ts";
 
 export enum MatrixRTCSessionEvent {

src/matrixrtc/ToDeviceAndRoomKeyTransport.ts renamed to src/matrixrtc/RoomAndToDeviceKeyTransport.ts

@@ -18,10 +18,11 @@ 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 { type Room, TypedEventEmitter } from "../matrix.ts";
 import { RoomKeyTransport } from "./RoomKeyTransport.ts";
 import type { Statistics } from "./types.ts";
 import { ToDeviceKeyTransport } from "./ToDeviceKeyTransport.ts";
+import { TypedEventEmitter } from "../models/typed-event-emitter.ts";
+import { Room } from "../models/room.ts";
 
 export interface EnabledTransports {
     toDevice: boolean;