verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: Fix websocket connection to sdk (#4182)

This commit is contained in:
Gleidson Daniel Silva 2022-05-19 13:43:49 -03:00 committed by GitHub
parent 4a84e47cfa
commit 9d514690f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/lib/services/connect.ts
View File

@ -1,5 +1,5 @@
import RNFetchBlob from 'rn-fetch-blob'; import RNFetchBlob from 'rn-fetch-blob';
import { settings as RocketChatSettings } from '@rocket.chat/sdk'; import { settings as RocketChatSettings, Rocketchat as RocketchatClient } from '@rocket.chat/sdk';
import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord'; import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
import { InteractionManager } from 'react-native'; import { InteractionManager } from 'react-native';
import { Q } from '@nozbe/watermelondb'; import { Q } from '@nozbe/watermelondb';
@ -23,6 +23,7 @@ import { updateSettings } from '../../actions/settings';
import { defaultSettings, MIN_ROCKETCHAT_VERSION } from '../constants'; import { defaultSettings, MIN_ROCKETCHAT_VERSION } from '../constants';
import { compareServerVersion } from '../methods/helpers/compareServerVersion'; import { compareServerVersion } from '../methods/helpers/compareServerVersion';
import { onRolesChanged } from '../methods/getRoles'; import { onRolesChanged } from '../methods/getRoles';
import { isSsl } from '../../utils/url';
import { getSettings, IActiveUsers, unsubscribeRooms, _activeUsers, _setUser, _setUserTimer } from '../methods'; import { getSettings, IActiveUsers, unsubscribeRooms, _activeUsers, _setUser, _setUserTimer } from '../methods';
interface IServices { interface IServices {
@ -425,10 +426,10 @@ async function getServerInfo(server: string) {
} }
async function getWebsocketInfo({ server }: { server: string }) { async function getWebsocketInfo({ server }: { server: string }) {
sdk.initialize(server); const websocketSdk = new RocketchatClient({ host: server, protocol: 'ddp', useSsl: isSsl(server) });
try { try {
await sdk.current.connect(); await websocketSdk.connect();
} catch (err: any) { } catch (err: any) {
if (err.message && err.message.includes('400')) { if (err.message && err.message.includes('400')) {
return { return {
@ -438,7 +439,7 @@ async function getWebsocketInfo({ server }: { server: string }) {
} }
} }
sdk.disconnect(); websocketSdk.disconnect();
return { return {
success: true success: true