Skip to content

Commit 4ce419d

Browse files
committed
fixups
- circular deps - singleAsyncExecution - 0 falsy fix
1 parent 82ce2d7 commit 4ce419d

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

src/client.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ import {
207207
import { M_BEACON_INFO, type MBeaconInfoEventContent } from "./@types/beacon.ts";
208208
import { NamespacedValue, UnstableValue } from "./NamespacedValue.ts";
209209
import { ToDeviceMessageQueue } from "./ToDeviceMessageQueue.ts";
210-
import {type ToDeviceBatch, ToDevicePayload} from "./models/ToDeviceMessage.ts";
210+
import { type ToDeviceBatch, type ToDevicePayload } from "./models/ToDeviceMessage.ts";
211211
import { IgnoredInvites } from "./models/invites-ignorer.ts";
212212
import { type UIARequest } from "./@types/uia.ts";
213213
import { type LocalNotificationSettings } from "./@types/local_notifications.ts";
@@ -7957,8 +7957,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
79577957
await this.queueToDevice(batch);
79587958
}
79597959

7960-
7961-
/**
7960+
/**
79627961
* Sends events directly to specific devices using Matrix's to-device
79637962
* messaging system. The batch will be split up into appropriately sized
79647963
* batches for sending and stored in the store so they can be retried

src/http-api/fetch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export class FetchHttpApi<O extends IHttpOpts> {
218218
* On success, sets new access and refresh tokens in opts.
219219
* @returns Promise that resolves to a boolean - true when token was refreshed successfully
220220
*/
221-
// @singleAsyncExecution
221+
@singleAsyncExecution
222222
private async tryRefreshToken(): Promise<TokenRefreshOutcome> {
223223
if (!this.opts.refreshToken || !this.opts.tokenRefreshFunction) {
224224
return TokenRefreshOutcome.Logout;

src/matrixrtc/MatrixRTCSession.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { logDurationSync } from "../utils.ts";
3131
import { ToDeviceKeyTransport } from "./ToDeviceKeyTransport.ts";
3232
import { type Statistics } from "./types.ts";
3333
import { RoomKeyTransport } from "./RoomKeyTransport.ts";
34-
import { IMembershipManager } from "./IMembershipManager.ts";
34+
import type { IMembershipManager } from "./IMembershipManager.ts";
3535

3636
const logger = rootLogger.getChild("MatrixRTCSession");
3737

src/matrixrtc/ToDeviceKeyTransport.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
import { ClientEvent, EventType, type MatrixClient, MatrixEvent } from "../matrix.ts";
1817
import { TypedEventEmitter } from "../models/typed-event-emitter.ts";
19-
import { IKeyTransport, KeyTransportEvents, KeyTransportEventsHandlerMap } from "./IKeyTransport.ts";
18+
import { type IKeyTransport, KeyTransportEvents, type KeyTransportEventsHandlerMap } from "./IKeyTransport.ts";
2019
import { type Logger, logger } from "../logger.ts";
21-
import { CallMembership } from "./CallMembership.ts";
22-
import { EncryptionKeysToDeviceEventContent, Statistics } from "./types.ts";
20+
import type { CallMembership } from "./CallMembership.ts";
21+
import type { EncryptionKeysToDeviceEventContent, Statistics } from "./types.ts";
22+
import { ClientEvent, MatrixClient } from "../client.ts";
23+
import { MatrixEvent } from "../models/event.ts";
24+
import { EventType } from "../@types/event.ts";
2325

2426
export class ToDeviceKeyTransport
2527
extends TypedEventEmitter<KeyTransportEvents, KeyTransportEventsHandlerMap>
@@ -145,7 +147,7 @@ export class ToDeviceKeyTransport
145147
return;
146148
}
147149

148-
if (!content.keys || !content.keys.key || !content.keys.index) {
150+
if (!content.keys || !content.keys.key || typeof content.keys.index !== "number") {
149151
this.prefixedLogger.warn("Malformed Event: Missing keys field");
150152
return;
151153
}

0 commit comments

Comments
 (0)