[FIX] Investigate app losing connection issues

__mocks__/@rocket.chat/sdk.js

@@ -0,0 +1,2 @@
+export class Rocketchat {}
+export const settings = {};

app/lib/methods/getUsersPresence.js

@@ -3,12 +3,13 @@ import semver from 'semver';
 
 import reduxStore from '../createStore';
 import { setActiveUsers } from '../../actions/activeUsers';
+import { setUser } from '../../actions/login';
 
 export function subscribeUsersPresence() {
 	const serverVersion = reduxStore.getState().server.version;
 
 	// if server is lower than 1.1.0
-	if (serverVersion && semver.lt(semver.coerce(serverVersion), '1.1.0')) {
+	if (serverVersion && semver.lt(serverVersion, '1.1.0')) {
 		if (this.activeUsersSubTimeout) {
 			clearTimeout(this.activeUsersSubTimeout);
 			this.activeUsersSubTimeout = false;
@@ -25,35 +26,43 @@ let ids = [];
 
 export default async function getUsersPresence() {
 	const serverVersion = reduxStore.getState().server.version;
+	const { user: loggedUser } = reduxStore.getState().login;
 
 	// if server is greather than or equal 1.1.0
-	if (serverVersion && !semver.lt(semver.coerce(serverVersion), '1.1.0')) {
+	if (serverVersion && semver.gte(serverVersion, '1.1.0')) {
 		let params = {};
 
 		// if server is greather than or equal 3.0.0
-		if (serverVersion && !semver.lt(semver.coerce(serverVersion), '3.0.0')) {
+		if (serverVersion && semver.gte(serverVersion, '3.0.0')) {
 			// if not have any id
 			if (!ids.length) {
 				return;
 			}
 			// Request userPresence on demand
 			params = { ids: ids.join(',') };
-			ids = [];
 		}
 
-		// RC 1.1.0
-		const result = await this.sdk.get('users.presence', params);
-		if (result.success) {
-			const activeUsers = result.users.reduce((ret, item) => {
-				ret[item._id] = {
-					status: item.status,
-					statusText: item.statusText
-				};
-				return ret;
-			}, {});
-			InteractionManager.runAfterInteractions(() => {
-				reduxStore.dispatch(setActiveUsers(activeUsers));
-			});
+		try {
+			// RC 1.1.0
+			const result = await this.sdk.get('users.presence', params);
+			if (result.success) {
+				const activeUsers = result.users.reduce((ret, item) => {
+					const { _id, status, statusText } = item;
+
+					if (loggedUser && loggedUser.id === _id) {
+						reduxStore.dispatch(setUser({ status, statusText }));
+					}
+
+					ret[_id] = { status, statusText };
+					return ret;
+				}, {});
+				InteractionManager.runAfterInteractions(() => {
+					reduxStore.dispatch(setActiveUsers(activeUsers));
+				});
+				ids = [];
+			}
+		} catch {
+			// do nothing
 		}
 	}
 }

app/lib/methods/subscriptions/room.js

@@ -51,11 +51,11 @@ export default class RoomSubscription {
 				// do nothing
 			}
 		}
+		reduxStore.dispatch(clearUserTyping());
 		this.removeListener(this.connectedListener);
 		this.removeListener(this.disconnectedListener);
 		this.removeListener(this.notifyRoomListener);
 		this.removeListener(this.messageReceivedListener);
-		reduxStore.dispatch(clearUserTyping());
 		if (this.timer) {
 			clearTimeout(this.timer);
 		}
@@ -73,6 +73,7 @@ export default class RoomSubscription {
 	};
 
 	handleConnection = () => {
+		reduxStore.dispatch(clearUserTyping());
 		RocketChat.loadMissedMessages({ rid: this.rid }).catch(e => console.log(e));
 	};
 

app/lib/rocketchat.js

@@ -63,13 +63,12 @@ const RocketChat = {
 	TOKEN_KEY,
 	callJitsi,
 	async subscribeRooms() {
-		if (this.roomsSub) {
-			this.roomsSub.stop();
-		}
-		try {
-			this.roomsSub = await subscribeRooms.call(this);
-		} catch (e) {
-			log(e);
+		if (!this.roomsSub) {
+			try {
+				this.roomsSub = await subscribeRooms.call(this);
+			} catch (e) {
+				log(e);
+			}
 		}
 	},
 	canOpenRoom,
@@ -189,6 +188,7 @@ const RocketChat = {
 
 			if (this.roomsSub) {
 				this.roomsSub.stop();
+				this.roomsSub = null;
 			}
 
 			if (this.sdk) {
@@ -206,7 +206,7 @@ const RocketChat = {
 			this.sdk = new RocketchatClient({ host: server, protocol: 'ddp', useSsl });
 			this.getSettings();
 
-			this.sdk.connect()
+			const sdkConnect = () => this.sdk.connect()
 				.then(() => {
 					if (user && user.token) {
 						reduxStore.dispatch(loginRequest({ resume: user.token }, logoutOnError));
@@ -217,10 +217,12 @@ const RocketChat = {
 
 					// when `connect` raises an error, we try again in 10 seconds
 					this.connectTimeout = setTimeout(() => {
-						this.connect({ server, user });
+						sdkConnect();
 					}, 10000);
 				});
 
+			sdkConnect();
+
 			this.connectedListener = this.sdk.onStreamData('connected', () => {
 				reduxStore.dispatch(connectSuccess());
 			});
@@ -410,6 +412,7 @@ const RocketChat = {
 	async logout({ server }) {
 		if (this.roomsSub) {
 			this.roomsSub.stop();
+			this.roomsSub = null;
 		}
 
 		if (this.activeUsersSubTimeout) {

app/presentation/RoomItem/index.js

@@ -27,6 +27,7 @@ const attrs = [
 	'isRead',
 	'favorite',
 	'status',
+	'connected',
 	'theme'
 ];
 
@@ -40,13 +41,13 @@ const arePropsEqual = (oldProps, newProps) => {
 };
 
 const RoomItem = React.memo(({
-	onPress, width, favorite, toggleFav, isRead, rid, toggleRead, hideChannel, testID, unread, userMentions, name, _updatedAt, alert, type, avatarSize, baseUrl, userId, username, token, id, prid, showLastMessage, hideUnreadStatus, lastMessage, status, avatar, useRealName, getUserPresence, isGroupChat, theme
+	onPress, width, favorite, toggleFav, isRead, rid, toggleRead, hideChannel, testID, unread, userMentions, name, _updatedAt, alert, type, avatarSize, baseUrl, userId, username, token, id, prid, showLastMessage, hideUnreadStatus, lastMessage, status, avatar, useRealName, getUserPresence, isGroupChat, connected, theme
 }) => {
 	useEffect(() => {
-		if (type === 'd') {
+		if (connected && type === 'd' && id) {
 			getUserPresence(id);
 		}
-	}, []);
+	}, [connected]);
 
 	const date = formatDate(_updatedAt);
 
@@ -197,6 +198,7 @@ RoomItem.propTypes = {
 	hideUnreadStatus: PropTypes.bool,
 	useRealName: PropTypes.bool,
 	getUserPresence: PropTypes.func,
+	connected: PropTypes.bool,
 	isGroupChat: PropTypes.bool,
 	theme: PropTypes.string
 };
@@ -208,6 +210,7 @@ RoomItem.defaultProps = {
 };
 
 const mapStateToProps = (state, ownProps) => ({
+	connected: state.meteor.connected,
 	status:
 		state.meteor.connected && ownProps.type === 'd'
 			? state.activeUsers[ownProps.id] && state.activeUsers[ownProps.id].status

app/sagas/login.js

@@ -73,14 +73,16 @@ const registerPushToken = function* registerPushToken() {
 
 const fetchUsersPresence = function* fetchUserPresence() {
 	yield RocketChat.getUsersPresence();
-	yield RocketChat.subscribeUsersPresence();
+	RocketChat.subscribeUsersPresence();
 };
 
 const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 	try {
 		const adding = yield select(state => state.server.adding);
 		yield RNUserDefaults.set(RocketChat.TOKEN_KEY, user.token);
 
+		RocketChat.getUserPresence(user.id);
+
 		const server = yield select(getServer);
 		yield put(roomsRequest());
 		yield fork(fetchPermissions);

app/sagas/selectServer.js

@@ -38,20 +38,23 @@ const getServerInfo = function* getServerInfo({ server, raiseError = true }) {
 			return;
 		}
 
-		const validVersion = semver.coerce(serverInfo.version);
+		let serverVersion = semver.valid(serverInfo.version);
+		if (!serverVersion) {
+			({ version: serverVersion } = semver.coerce(serverInfo.version));
+		}
 
 		const serversDB = database.servers;
 		const serversCollection = serversDB.collections.get('servers');
 		yield serversDB.action(async() => {
 			try {
 				const serverRecord = await serversCollection.find(server);
 				await serverRecord.update((record) => {
-					record.version = validVersion;
+					record.version = serverVersion;
 				});
 			} catch (e) {
 				await serversCollection.create((record) => {
 					record._raw = sanitizedRaw({ id: server }, serversCollection.schema);
-					record.version = validVersion;
+					record.version = serverVersion;
 				});
 			}
 		});

app/views/RoomView/Header/index.js

@@ -101,8 +101,10 @@ const mapStateToProps = (state, ownProps) => {
 	if (type === 'd') {
 		const user = getUserSelector(state);
 		if (user.id) {
-			if (state.activeUsers[roomUserId]) {
+			if (state.activeUsers[roomUserId] && state.meteor.connected) {
 				({ status, statusText } = state.activeUsers[roomUserId]);
+			} else {
+				status = 'offline';
 			}
 		}
 	}

app/views/RoomView/index.js

@@ -222,10 +222,13 @@ class RoomView extends React.Component {
 			if (this.tmid) {
 				navigation.setParams({ toggleFollowThread: this.toggleFollowThread, goRoomActionsView: this.goRoomActionsView });
 			}
-			if (isAuthenticated && this.rid) {
-				this.init();
-			} else if (this.rid) {
-				EventEmitter.addEventListener('connected', this.handleConnected);
+			if (this.rid) {
+				this.sub.subscribe();
+				if (isAuthenticated) {
+					this.init();
+				} else {
+					EventEmitter.addEventListener('connected', this.handleConnected);
+				}
 			}
 			if (isIOS && this.rid) {
 				this.updateUnreadCount();
@@ -361,7 +364,6 @@ class RoomView extends React.Component {
 						this.setLastOpen(null);
 					}
 					RocketChat.readMessages(room.rid, newLastOpen, true).catch(e => console.log(e));
-					this.sub.subscribe();
 				}
 			}
 

app/views/RoomsListView/index.js

@@ -174,6 +174,7 @@ class RoomsListView extends React.Component {
 		roomsRequest: PropTypes.func,
 		closeServerDropdown: PropTypes.func,
 		useRealName: PropTypes.bool,
+		connected: PropTypes.bool,
 		split: PropTypes.bool
 	};
 
@@ -302,6 +303,7 @@ class RoomsListView extends React.Component {
 			showFavorites,
 			showUnread,
 			appState,
+			connected,
 			roomsRequest
 		} = this.props;
 
@@ -317,6 +319,7 @@ class RoomsListView extends React.Component {
 		} else if (
 			appState === 'foreground'
 			&& appState !== prevProps.appState
+			&& connected
 		) {
 			roomsRequest();
 		}
@@ -894,6 +897,7 @@ class RoomsListView extends React.Component {
 const mapStateToProps = state => ({
 	user: getUserSelector(state),
 	server: state.server.server,
+	connected: state.server.connected,
 	searchText: state.rooms.searchText,
 	loadingServer: state.server.loading,
 	showServerDropdown: state.rooms.showServerDropdown,

package.json

@@ -28,7 +28,7 @@
     "@react-native-community/cameraroll": "^1.3.0",
     "@react-native-community/datetimepicker": "^2.1.0",
     "@react-native-community/slider": "2.0.5",
-    "@rocket.chat/sdk": "1.0.0-alpha.41",
+    "@rocket.chat/sdk": "djorkaeffalexandre/Rocket.Chat.js.SDK#test.fix-ddp",
     "@rocket.chat/ui-kit": "^0.2.0-alpha.25",
     "base-64": "^0.1.0",
     "bugsnag-react-native": "2.23.2",
@@ -70,7 +70,7 @@
     "react-native-keyboard-tracking-view": "^5.6.1",
     "react-native-keycommands": "2.0.3",
     "react-native-localize": "1.3.1",
-    "react-native-mime-types": "^2.2.1",
+    "react-native-mime-types": "2.2.1",
     "react-native-modal": "11.5.3",
     "react-native-modalize": "^1.3.6",
     "react-native-navigation-bar-color": "^1.0.0",