Skip to content

Initialise pusher before rendering children #54188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aldo-expensify merged 6 commits into from
Dec 17, 2024
Merged

Initialise pusher before rendering children #54188

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb179e5
Initialise pusher before rendering children
jnowakow Dec 16, 2024
fe5c385
Always chain pusher subscriptions on the same promise
jnowakow Dec 16, 2024
e50ab7e
Clear pusher initPromise on disconnect
jnowakow Dec 16, 2024
ceebb96
Promise types
jnowakow Dec 17, 2024
ee98fe0
Chain on init Promise to resolve
jnowakow Dec 17, 2024
5393b37
adjust to new eslint rules
jnowakow Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/libs/Pusher/pusher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,14 @@ Onyx.connect({
});

let socket: PusherWithAuthParams | null;
let pusherSocketID = '';
let pusherSocketID: string | undefined;
const socketEventCallbacks: SocketEventCallback[] = [];
let customAuthorizer: ChannelAuthorizerGenerator;

let initPromise: Promise<void>;
let resolveInitPromise: () => void;
let initPromise = new Promise<void>((resolve) => {
resolveInitPromise = resolve;
});

const eventsBoundToChannels = new Map<Channel, Set<PusherEventName>>();

Expand All @@ -90,7 +93,7 @@ function callSocketEventCallbacks(eventName: SocketEventName, data?: EventCallba
* @returns resolves when Pusher has connected
*/
function init(args: Args, params?: unknown): Promise<void> {
initPromise = new Promise((resolve) => {
return new Promise<void>((resolve) => {
if (socket) {
resolve();
return;
Expand Down Expand Up @@ -129,7 +132,7 @@ function init(args: Args, params?: unknown): Promise<void> {
});

socket?.connection.bind('connected', () => {
pusherSocketID = socket?.connection.socket_id ?? '';
pusherSocketID = socket?.connection.socket_id;
callSocketEventCallbacks('connected');
resolve();
});
Expand All @@ -141,9 +144,7 @@ function init(args: Args, params?: unknown): Promise<void> {
socket?.connection.bind('state_change', (states: States) => {
callSocketEventCallbacks('state_change', states);
});
});

return initPromise;
}).then(resolveInitPromise);
}

/**
Expand Down Expand Up @@ -394,6 +395,9 @@ function disconnect() {
socket.disconnect();
socket = null;
pusherSocketID = '';
initPromise = new Promise((resolve) => {
resolveInitPromise = resolve;
});
}

/**
Expand All @@ -410,7 +414,7 @@ function reconnect() {
socket.connect();
}

function getPusherSocketID(): string {
function getPusherSocketID(): string | undefined {
return pusherSocketID;
}

Expand Down