You've already forked matrix-js-sdk
mirror of
https://github.com/matrix-org/matrix-js-sdk.git
synced 2025-08-05 00:42:10 +03:00
Make sliding sync linearize processing of sync requests (#3442)
* Make sliding sync linearize processing of sync requests * Iterate * Iterate * Iterate * Iterate
This commit is contained in:
committed by
GitHub
parent
0329824cab
commit
04a6c4e6c4
@@ -20,7 +20,7 @@ import { fail } from "assert";
|
|||||||
|
|
||||||
import { SlidingSync, SlidingSyncEvent, MSC3575RoomData, SlidingSyncState, Extension } from "../../src/sliding-sync";
|
import { SlidingSync, SlidingSyncEvent, MSC3575RoomData, SlidingSyncState, Extension } from "../../src/sliding-sync";
|
||||||
import { TestClient } from "../TestClient";
|
import { TestClient } from "../TestClient";
|
||||||
import { IRoomEvent, IStateEvent } from "../../src/sync-accumulator";
|
import { IRoomEvent, IStateEvent } from "../../src";
|
||||||
import {
|
import {
|
||||||
MatrixClient,
|
MatrixClient,
|
||||||
MatrixEvent,
|
MatrixEvent,
|
||||||
@@ -39,7 +39,7 @@ import {
|
|||||||
} from "../../src";
|
} from "../../src";
|
||||||
import { SlidingSyncSdk } from "../../src/sliding-sync-sdk";
|
import { SlidingSyncSdk } from "../../src/sliding-sync-sdk";
|
||||||
import { SyncApiOptions, SyncState } from "../../src/sync";
|
import { SyncApiOptions, SyncState } from "../../src/sync";
|
||||||
import { IStoredClientOpts } from "../../src/client";
|
import { IStoredClientOpts } from "../../src";
|
||||||
import { logger } from "../../src/logger";
|
import { logger } from "../../src/logger";
|
||||||
import { emitPromise } from "../test-utils/test-utils";
|
import { emitPromise } from "../test-utils/test-utils";
|
||||||
import { defer } from "../../src/utils";
|
import { defer } from "../../src/utils";
|
||||||
|
@@ -89,6 +89,24 @@ export class TypedEventEmitter<
|
|||||||
return super.emit(event, ...args);
|
return super.emit(event, ...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Similar to `emit` but calls all listeners within a `Promise.all` and returns the promise chain
|
||||||
|
* @param event - The name of the event to emit
|
||||||
|
* @param args - Arguments to pass to the listener
|
||||||
|
* @returns `true` if the event had listeners, `false` otherwise.
|
||||||
|
*/
|
||||||
|
public async emitPromised<T extends Events>(
|
||||||
|
event: T,
|
||||||
|
...args: Parameters<SuperclassArguments[T]>
|
||||||
|
): Promise<boolean>;
|
||||||
|
public async emitPromised<T extends Events>(event: T, ...args: Parameters<Arguments[T]>): Promise<boolean>;
|
||||||
|
public async emitPromised<T extends Events>(event: T, ...args: any[]): Promise<boolean> {
|
||||||
|
const listeners = this.listeners(event);
|
||||||
|
return Promise.allSettled(listeners.map((l) => l(...args))).then(() => {
|
||||||
|
return listeners.length > 0;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the number of listeners listening to the event named `event`.
|
* Returns the number of listeners listening to the event named `event`.
|
||||||
*
|
*
|
||||||
|
@@ -376,7 +376,7 @@ export class SlidingSyncSdk {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private onRoomData(roomId: string, roomData: MSC3575RoomData): void {
|
private async onRoomData(roomId: string, roomData: MSC3575RoomData): Promise<void> {
|
||||||
let room = this.client.store.getRoom(roomId);
|
let room = this.client.store.getRoom(roomId);
|
||||||
if (!room) {
|
if (!room) {
|
||||||
if (!roomData.initial) {
|
if (!roomData.initial) {
|
||||||
@@ -385,7 +385,7 @@ export class SlidingSyncSdk {
|
|||||||
}
|
}
|
||||||
room = _createAndReEmitRoom(this.client, roomId, this.opts);
|
room = _createAndReEmitRoom(this.client, roomId, this.opts);
|
||||||
}
|
}
|
||||||
this.processRoomData(this.client, room, roomData);
|
await this.processRoomData(this.client, room!, roomData);
|
||||||
}
|
}
|
||||||
|
|
||||||
private onLifecycle(state: SlidingSyncState, resp: MSC3575SlidingSyncResponse | null, err?: Error): void {
|
private onLifecycle(state: SlidingSyncState, resp: MSC3575SlidingSyncResponse | null, err?: Error): void {
|
||||||
|
@@ -326,7 +326,7 @@ export enum SlidingSyncEvent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export type SlidingSyncEventHandlerMap = {
|
export type SlidingSyncEventHandlerMap = {
|
||||||
[SlidingSyncEvent.RoomData]: (roomId: string, roomData: MSC3575RoomData) => void;
|
[SlidingSyncEvent.RoomData]: (roomId: string, roomData: MSC3575RoomData) => Promise<void> | void;
|
||||||
[SlidingSyncEvent.Lifecycle]: (
|
[SlidingSyncEvent.Lifecycle]: (
|
||||||
state: SlidingSyncState,
|
state: SlidingSyncState,
|
||||||
resp: MSC3575SlidingSyncResponse | null,
|
resp: MSC3575SlidingSyncResponse | null,
|
||||||
@@ -567,14 +567,14 @@ export class SlidingSync extends TypedEventEmitter<SlidingSyncEvent, SlidingSync
|
|||||||
* @param roomId - The room which received some data.
|
* @param roomId - The room which received some data.
|
||||||
* @param roomData - The raw sliding sync response JSON.
|
* @param roomData - The raw sliding sync response JSON.
|
||||||
*/
|
*/
|
||||||
private invokeRoomDataListeners(roomId: string, roomData: MSC3575RoomData): void {
|
private async invokeRoomDataListeners(roomId: string, roomData: MSC3575RoomData): Promise<void> {
|
||||||
if (!roomData.required_state) {
|
if (!roomData.required_state) {
|
||||||
roomData.required_state = [];
|
roomData.required_state = [];
|
||||||
}
|
}
|
||||||
if (!roomData.timeline) {
|
if (!roomData.timeline) {
|
||||||
roomData.timeline = [];
|
roomData.timeline = [];
|
||||||
}
|
}
|
||||||
this.emit(SlidingSyncEvent.RoomData, roomId, roomData);
|
await this.emitPromised(SlidingSyncEvent.RoomData, roomId, roomData);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -923,9 +923,9 @@ export class SlidingSync extends TypedEventEmitter<SlidingSyncEvent, SlidingSync
|
|||||||
}
|
}
|
||||||
this.onPreExtensionsResponse(resp.extensions);
|
this.onPreExtensionsResponse(resp.extensions);
|
||||||
|
|
||||||
Object.keys(resp.rooms).forEach((roomId) => {
|
for (const roomId in resp.rooms) {
|
||||||
this.invokeRoomDataListeners(roomId, resp!.rooms[roomId]);
|
await this.invokeRoomDataListeners(roomId, resp!.rooms[roomId]);
|
||||||
});
|
}
|
||||||
|
|
||||||
const listKeysWithUpdates: Set<string> = new Set();
|
const listKeysWithUpdates: Set<string> = new Set();
|
||||||
if (!doNotUpdateList) {
|
if (!doNotUpdateList) {
|
||||||
|
Reference in New Issue
Block a user