fix: make sdk.current nullable and guard its call sites

app/definitions/rest/v1/push.ts

@@ -14,6 +14,7 @@ export type PushEndpoints = {
 				userId: string;
 			};
 		};
+		DELETE: (params: { token: string }) => void;
 	};
 	'push.info': {
 		GET: () => TPushInfo;

app/lib/methods/actions.ts

@@ -108,12 +108,16 @@ export async function triggerAction({
 	const payload = rest.payload ?? rest.value;
 
 	try {
-		const { currentLogin } = sdk.current;
+		const client = sdk.current;
+		if (!client) {
+			return;
+		}
+		const { currentLogin } = client;
 		if (!currentLogin) {
 			throw new Error('triggerAction requires an authenticated session');
 		}
 		const { userId, authToken } = currentLogin;
-		const { host } = sdk.current.client;
+		const { host } = client.client;
 		const interaction = toUserInteraction({
 			type,
 			actionId,

app/lib/methods/getSettings.ts

@@ -157,10 +157,14 @@ export async function getSettings(): Promise<void> {
 		let offset = 0;
 		let remaining;
 		let settings: IData[] = [];
+		const client = sdk.current;
+		if (!client) {
+			return;
+		}
 		const serverVersion = reduxStore.getState().server.version;
 		const url = compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '7.0.0')
-			? `${sdk.current.client.host}/api/v1/settings.public?_id=${settingsParams.join(',')}`
-			: `${sdk.current.client.host}/api/v1/settings.public?query={"_id":{"$in":${JSON.stringify(settingsParams)}}}`;
+			? `${client.client.host}/api/v1/settings.public?_id=${settingsParams.join(',')}`
+			: `${client.client.host}/api/v1/settings.public?query={"_id":{"$in":${JSON.stringify(settingsParams)}}}`;
 		// Iterate over paginated results to retrieve all settings
 		do {
 			// TODO: why is no-await-in-loop enforced in the first place?

app/lib/methods/logout.ts

@@ -108,7 +108,7 @@ export async function logout({ server }: { server: string }): Promise<void> {
 
 	try {
 		// RC 0.60.0
-		await sdk.current.logout();
+		await sdk.logout();
 	} catch (e) {
 		log(e);
 	}

app/lib/methods/subscriptions/rooms.ts

@@ -302,7 +302,7 @@ export default function subscribeRooms() {
 		const db = database.active;
 
 		// check if the server from variable is the same as the js sdk client
-		if (sdk && sdk.current.client && sdk.current.client.host !== subServer) {
+		if (sdk.current?.client && sdk.current.client.host !== subServer) {
 			return;
 		}
 		if (ddpMessage.msg === 'added') {
@@ -435,12 +435,17 @@ export default function subscribeRooms() {
 		roomsSubscription = null;
 	};
 
+	const client = sdk.current;
+	if (!client) {
+		return null;
+	}
+
 	streamListener = sdk.onStreamData('stream-notify-user', handleStreamMessageReceived);
 
 	try {
 		// set the server that started this task
-		subServer = sdk.current.client.host;
-		sdk.current.subscribeNotifyUser().catch((e: unknown) => console.log(e));
+		subServer = client.client.host;
+		client.subscribeNotifyUser().catch((e: unknown) => console.log(e));
 		roomsSubscription = { stop: () => stop() };
 		return null;
 	} catch (e) {

app/lib/services/connect.test.ts

@@ -23,7 +23,6 @@ const mockOnStreamData = jest.fn<Promise<{ stop: jest.Mock }>, [string, (...args
 const mockSdkConnect = jest.fn<Promise<void>, []>(() => Promise.resolve());
 const mockSdkAbort = jest.fn<void, []>();
 const mockSdkDisconnect = jest.fn<void, []>();
-const mockSdkInitialize = jest.fn<void, [string]>();
 const mockSdkLogin = jest.fn<Promise<void>, [unknown]>(() => Promise.resolve());
 const mockSdkCurrent: Record<string, unknown> = {
 	onStreamData: (event: string, cb: (...args: any[]) => void) => mockOnStreamData(event, cb),
@@ -32,6 +31,7 @@ const mockSdkCurrent: Record<string, unknown> = {
 	login: (credentials: unknown) => mockSdkLogin(credentials),
 	currentLogin: undefined
 };
+const mockSdkInitialize = jest.fn<typeof mockSdkCurrent, [string]>(() => mockSdkCurrent);
 jest.mock('./sdk', () => ({
 	__esModule: true,
 	default: {

app/lib/services/connect.ts

@@ -85,10 +85,10 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 
 		EventEmitter.emit('INQUIRY_UNSUBSCRIBE');
 
-		sdk.initialize(server);
+		const client = sdk.initialize(server);
 		getSettings();
 
-		sdk.current
+		client
 			.connect()
 			.then(() => {
 				console.log('connected');
@@ -97,11 +97,11 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 				console.log('connect error', err);
 			});
 
-		connectingListener = sdk.current.onStreamData('connecting', () => {
+		connectingListener = client.onStreamData('connecting', () => {
 			store.dispatch(connectRequest());
 		});
 
-		connectedListener = sdk.current.onStreamData('connected', () => {
+		connectedListener = client.onStreamData('connected', () => {
 			const { connected } = store.getState().meteor;
 			if (connected) {
 				return;
@@ -117,12 +117,12 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 		// the WebSocket was unhealthy. Local to the closure so it resets per `connect()` call.
 		let pendingHangupsDrainArmed = false;
 
-		closeListener = sdk.current.onStreamData('close', () => {
+		closeListener = client.onStreamData('close', () => {
 			pendingHangupsDrainArmed = true;
 			store.dispatch(disconnectAction());
 		});
 
-		pendingHangupsConnectedListener = sdk.current.onStreamData('connected', async () => {
+		pendingHangupsConnectedListener = client.onStreamData('connected', async () => {
 			if (!pendingHangupsDrainArmed) return;
 			pendingHangupsDrainArmed = false;
 			if (pendingHangups.size === 0) return;
@@ -134,12 +134,12 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 			}
 		});
 
-		usersListener = sdk.current.onStreamData(
+		usersListener = client.onStreamData(
 			'users',
 			protectedFunction((ddpMessage: any) => _setUser(ddpMessage))
 		);
 
-		notifyAllListener = sdk.current.onStreamData(
+		notifyAllListener = client.onStreamData(
 			'stream-notify-all',
 			protectedFunction(async (ddpMessage: { fields: { args?: any; eventName: string } }) => {
 				const { eventName } = ddpMessage.fields;
@@ -177,7 +177,7 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 			})
 		);
 
-		rolesListener = sdk.current.onStreamData(
+		rolesListener = client.onStreamData(
 			'stream-roles',
 			protectedFunction((ddpMessage: any) => onRolesChanged(ddpMessage))
 		);
@@ -199,7 +199,7 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 			}
 		});
 
-		notifyLoggedListener = sdk.current.onStreamData(
+		notifyLoggedListener = client.onStreamData(
 			'stream-notify-logged',
 			protectedFunction(async (ddpMessage: { fields: { args?: any; eventName?: any } }) => {
 				const { eventName } = ddpMessage.fields;
@@ -290,7 +290,7 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 			})
 		);
 
-		logoutListener = sdk.current.onStreamData('stream-force_logout', () => store.dispatch(logout(true)));
+		logoutListener = client.onStreamData('stream-force_logout', () => store.dispatch(logout(true)));
 
 		resolve();
 	});
@@ -301,10 +301,14 @@ function stopListener(listener: any): void {
 }
 
 async function login(credentials: ILoginCredentials): Promise<ILoggedUser> {
+	const client = sdk.current;
+	if (!client) {
+		throw new Error('Cannot login without an active connection');
+	}
 	// RC 0.64.0
-	await sdk.current.login(credentials);
+	await client.login(credentials);
 	const serverVersion = store.getState().server.version;
-	const result = sdk.current.currentLogin?.result;
+	const result = client.currentLogin?.result;
 	if (!result) {
 		throw new Error('Login failed: missing login result');
 	}

app/lib/services/restApi.ts

@@ -22,15 +22,15 @@
 import { TEAM_TYPE } from '../../definitions/ITeam';
 import { type OperationParams, type ResultFor } from '../../definitions/rest/helpers';
 import { type SubscriptionsEndpoints } from '../../definitions/rest/v1/subscriptions';
 import { Encryption } from '../encryption';
 import { type RoomTypes, roomTypeToApiType } from '../methods/roomTypeToApiType';
 import { uploadUserAvatarMultipart } from '../methods/uploadAvatar/uploadAvatar';
 import { unsubscribeRooms } from '../methods/subscribeRooms';
 import { compareServerVersion, getBundleId, isIOS } from '../methods/helpers';
 import { getDeviceToken } from '../notifications';
 import NativeVoipModule from '../native/NativeVoip';
 import { store as reduxStore } from '../store/auxStore';
 import sdk from './sdk';
 import fetch from '../methods/helpers/fetch';
 import log from '../methods/helpers/log';
 
@@ -1175,15 +1175,14 @@
 };
 
 // TODO: add voip token removal
-export const removePushToken = (): Promise<boolean | void> => {
+export const removePushToken = async (): Promise<void> => {
 	const token = getDeviceToken();
 	if (token) {
 		lastToken = '';
 		lastVoipToken = '';
 		// RC 0.60.0
-		return sdk.current.del('push.token', { token });
+		await sdk.del('push.token', { token });
 	}
-	return Promise.resolve();
 };
 
 // RC 6.6.0

app/lib/services/sdk.ts

@@ -24,33 +24,34 @@ export interface IStreamDataListener {
 }
 
 class Sdk {
-	private sdk!: Rocketchat;
+	private sdk: Rocketchat | null = null;
 	private code: any;
 
+	private get activeSdk(): Rocketchat {
+		if (!this.sdk) {
+			throw new Error('Sdk is not initialized');
+		}
+		return this.sdk;
+	}
+
 	private initializeSdk(server: string): Rocketchat {
 		// The app can't reconnect if reopen interval is 5s while in development
 		return new Rocketchat({ host: server, protocol: 'ddp', useSsl: isSsl(server), reopen: __DEV__ ? 20000 : 5000 });
 	}
 
-	// TODO: We need to stop returning the SDK after all methods are dehydrated
 	initialize(server: string) {
 		this.code = null;
 		this.sdk = this.initializeSdk(server);
 		return this.sdk;
 	}
 
-	get current(): Rocketchat {
+	get current(): Rocketchat | null {
 		return this.sdk;
 	}
 
-	/**
-	 * TODO: evaluate the need for assigning "null" to this.sdk
-	 * I'm returning "null" because we need to remove both instances of this.sdk here and on rocketchat.js
-	 */
 	disconnect() {
 		if (this.sdk) {
 			this.sdk.disconnect();
-			// @ts-expect-error
 			this.sdk = null;
 		}
 		return null;
@@ -67,7 +68,7 @@ class Sdk {
 			? void
 			: Serialized<OperationParams<'GET', MatchPathPattern<TPath>>>
 	): Promise<Serialized<ResultFor<'GET', MatchPathPattern<TPath>>>> {
-		return this.current.get(endpoint, params);
+		return this.activeSdk.get(endpoint, params);
 	}
 
 	post<TPath extends PathFor<'POST'>>(
@@ -84,7 +85,7 @@ class Sdk {
 		return new Promise(async (resolve, reject) => {
 			const isMethodCall = endpoint?.startsWith('method.call/');
 			try {
-				const result = await this.current.post(endpoint, params);
+				const result = await this.activeSdk.post(endpoint, params);
 
 				/**
 				 * if API_Use_REST_For_DDP_Calls is enabled and it's a method call,
@@ -117,13 +118,31 @@ class Sdk {
 		});
 	}
 
+	del<TPath extends PathFor<'DELETE'>>(
+		endpoint: TPath,
+		params: void extends OperationParams<'DELETE', MatchPathPattern<TPath>>
+			? void
+			: Serialized<OperationParams<'DELETE', MatchPathPattern<TPath>>> = undefined as void extends OperationParams<
+			'DELETE',
+			MatchPathPattern<TPath>
+		>
+			? void
+			: Serialized<OperationParams<'DELETE', MatchPathPattern<TPath>>>
+	): Promise<Serialized<ResultFor<'DELETE', MatchPathPattern<TPath>>>> {
+		return this.activeSdk.del(endpoint, params);
+	}
+
+	logout() {
+		return this.activeSdk.logout();
+	}
+
 	methodCall(method: string, ...args: any[]): Promise<any> {
 		return new Promise(async (resolve, reject) => {
 			try {
 				// Clear the 2FA code after use — a stale trailing arg breaks typed method signatures
 				const { code } = this;
 				this.code = null;
-				const result = await this.current.methodCall(method, ...args, ...(code ? [code] : []));
+				const result = await this.activeSdk.methodCall(method, ...args, ...(code ? [code] : []));
 				return resolve(result);
 			} catch (e: any) {
 				if (e.error && (e.error === 'totp-required' || e.error === 'totp-invalid')) {
@@ -161,11 +180,11 @@ class Sdk {
 	}
 
 	subscribe(topic: string, eventName?: string, ...args: any[]): Promise<ISubscription | undefined> {
-		return this.current.subscribe(topic, eventName as string, ...args);
+		return this.activeSdk.subscribe(topic, eventName as string, ...args);
 	}
 
 	subscribeRaw(name: string, params: any[]): Promise<ISubscription | undefined> {
-		return this.current.subscribeRaw(name, params);
+		return this.activeSdk.subscribeRaw(name, params);
 	}
 
 	subscribeRoom(...args: any[]) {
@@ -190,11 +209,11 @@ class Sdk {
 	}
 
 	unsubscribe(subscription: ISubscription) {
-		return this.current.unsubscribe(subscription);
+		return this.activeSdk.unsubscribe(subscription);
 	}
 
 	onStreamData(event: string, callback: TStreamDataCallback): Promise<IStreamDataListener> {
-		return this.current.onStreamData(event, callback as ICallback);
+		return this.activeSdk.onStreamData(event, callback as ICallback);
 	}
 }