mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
Merging performance branch into master (#4268)
* improve performance on sendNotifications * Fix SQL queries * Remove get direct profiles, not needed anymore * Add raw data to error details if AppError fails to decode * men * Fix decode (#4052) * Fixing json decode * Adding unit test * Initial work for client scaling (#4051) * Begin adding paging to profiles API * Added more paging functionality * Finish hooking up admin console user lists * Add API for searching users and add searching to all user lists * Add lazy loading of profiles * Revert config.json * Fix unit tests and some style issues * Add GetProfilesFromList to Go driver and fix web unit test * Update etag for GetProfiles * Updating ui for filters and pagination (#4044) * Updating UI for pagination * Adjusting margins for filter row * Adjusting margin for specific modals * Adding relative padding to system console * Adjusting responsive view * Update client user tests * Minor fixes for direct messages modal (#4056) * Remove some unneeded initial load calls (#4057) * UX updates to user lists, added smart counts and bug fixes (#4059) * Improved getExplicitMentions and unit tests (#4064) * Refactor getting posts to lazy load profiles correctly (#4062) * Comment out SetActiveChannel test (#4066) * Profiler cpu, block, and memory profiler. (#4081) * Fix TestSetActiveChannel unit test (#4071) * Fixing build failure caused by dependancies updating (#4076) * Adding profiler * Fix admin_team_member_dropdown eslint errors * Bumping session cache size (#4077) * Bumping session cache size * Bumping status cache * Refactor how the client handles channel members to be large team friendly (#4106) * Refactor how the client handles channel members to be large team friendly * Change Id to ChannelId in ChannelStats model * Updated getChannelMember and getProfilesByIds routes to match proposal * Performance improvements (#4100) * Performance improvements * Fixing re-connect issue * Fixing error message * Some other minor perf tweaks * Some other minor perf tweaks * Fixing config file * Fixing buffer size * Fixing web socket send message * adding some error logging * fix getMe to be user required * Fix websocket event for new user * Fixing shutting down * Reverting web socket changes * Fixing logging lvl * Adding caching to GetMember * Adding some logging * Fixing caching * Fixing caching invalidate * Fixing direct message caching * Fixing caching * Fixing caching * Remove GetDirectProfiles from initial load * Adding logging and fixing websocket client * Adding back caching from bad merge. * Explicitly close go driver requests (#4162) * Refactored how the client handles team members to be more large team friendly (#4159) * Refactor getProfilesForDirectMessageList API into getAllProfiles API * Refactored how the client handles team members to be more large team friendly * Fix js error when receiving a notification * Fix JS error caused by current user being overwritten with sanitized version (#4165) * Adding error message to status failure (#4167) * Fix a few bugs caused by client scaling refactoring (#4170) * When there is no read replica, don't open a second set of connections to the master database (#4173) * Adding connection tacking to stats (#4174) * Reduce DB writes for statuses and other status related changes (#4175) * Fix bug preventing opening of DM channels from more modal (#4181) * Fixing socket timing error (#4183) * Fixing ping/pong handler * Fixing socket timing error * Commenting out status broadcasting * Removing user status changes * Removing user status changes * Removing user status changes * Removing user status changes * Adding DoPreComputeJson() * Performance improvements (#4194) * * Fix System Console Analytics queries * Add db.SetConnMaxLifetime to 15 minutes * Add "net/http/pprof" for profiling * Add FreeOSMemory() to manually release memory on reload config * Add flag to enable http profiler * Fix memory leak (#4197) * Fix memory leak * removed unneeded nil assignment * Fixing go routine leak (#4208) * Merge fixes * Merge fix * Refactored statuses to be queried by the client rather than broadcast by the server (#4212) * Refactored server code to reduce status broadcasts and to allow getting statuses by IDs * Refactor client code to periodically fetch statuses * Add store unit test for getting statuses by ids * Fix status unit test * Add getStatusesByIds REST API and move the client over to use that instead of the WebSocket * Adding multiple threads to websocket hub (#4230) * Adding multiple threads to websocket hub * Fixing unit tests * Fixing so websocket connections from the same user end up in the same… (#4240) * Fixing so websocket connections from the same user end up in the same list * Removing old comment * Refactor user autocomplete to query the server (#4239) * Add API for autocompleting users * Converted at mention autocomplete to query server * Converted user search autocomplete to query server * Switch autocomplete API naming to use term instead of username * Split autocomplete API into two, one for channels and for teams * Fix copy/paste error * Some final client scaling fixes (#4246) * Add lazy loading of profiles to integration pages * Add lazy loading of profiles to emoji page * Fix JS error when receiving post in select team menu and also clean up channel store
This commit is contained in:
Joram Wilander
GitHub
@@ -73,11 +73,7 @@ export default class Client {
|
||||
return `${this.url}${this.urlVersion}/teams`;
|
||||
}
|
||||
|
||||
getTeamNeededRoute() {
|
||||
return `${this.url}${this.urlVersion}/teams/${this.getTeamId()}`;
|
||||
}
|
||||
|
||||
getTeamNeededManualRoute(teamId) {
|
||||
getTeamNeededRoute(teamId = this.getTeamId()) {
|
||||
return `${this.url}${this.urlVersion}/teams/${teamId}`;
|
||||
}
|
||||
|
||||
@@ -565,15 +561,43 @@ export default class Client {
|
||||
end(this.handleResponse.bind(this, 'getMyTeam', success, error));
|
||||
}
|
||||
|
||||
getTeamMembers(teamId, success, error) {
|
||||
getTeamMembers(teamId, offset, limit, success, error) {
|
||||
request.
|
||||
get(`${this.getTeamsRoute()}/members/${teamId}`).
|
||||
get(`${this.getTeamNeededRoute(teamId)}/members/${offset}/${limit}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getTeamMembers', success, error));
|
||||
}
|
||||
|
||||
getTeamMember(teamId, userId, success, error) {
|
||||
request.
|
||||
get(`${this.getTeamNeededRoute(teamId)}/members/${userId}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getTeamMember', success, error));
|
||||
}
|
||||
|
||||
getTeamMembersByIds(teamId, userIds, success, error) {
|
||||
request.
|
||||
post(`${this.getTeamNeededRoute(teamId)}/members/ids`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
send(userIds).
|
||||
end(this.handleResponse.bind(this, 'getTeamMembersByIds', success, error));
|
||||
}
|
||||
|
||||
getTeamStats(teamId, success, error) {
|
||||
request.
|
||||
get(`${this.getTeamNeededRoute(teamId)}/stats`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getTeamStats', success, error));
|
||||
}
|
||||
|
||||
inviteMembers(data, success, error) {
|
||||
request.
|
||||
post(`${this.getTeamNeededRoute()}/invite_members`).
|
||||
@@ -740,7 +764,7 @@ export default class Client {
|
||||
};
|
||||
|
||||
request.
|
||||
post(`${this.getTeamNeededManualRoute(teamId)}/update_member_roles`).
|
||||
post(`${this.getTeamNeededRoute(teamId)}/update_member_roles`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
@@ -1003,40 +1027,78 @@ export default class Client {
|
||||
end(this.handleResponse.bind(this, 'getRecentlyActiveUsers', success, error));
|
||||
}
|
||||
|
||||
getDirectProfiles(success, error) {
|
||||
getProfiles(offset, limit, success, error) {
|
||||
request.
|
||||
get(`${this.getUsersRoute()}/direct_profiles`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getDirectProfiles', success, error));
|
||||
}
|
||||
|
||||
getProfiles(success, error) {
|
||||
request.
|
||||
get(`${this.getUsersRoute()}/profiles/${this.getTeamId()}`).
|
||||
get(`${this.getUsersRoute()}/${offset}/${limit}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getProfiles', success, error));
|
||||
}
|
||||
|
||||
getProfilesForTeam(teamId, success, error) {
|
||||
getProfilesInTeam(teamId, offset, limit, success, error) {
|
||||
request.
|
||||
get(`${this.getUsersRoute()}/profiles/${teamId}`).
|
||||
get(`${this.getTeamNeededRoute(teamId)}/users/${offset}/${limit}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getProfilesForTeam', success, error));
|
||||
end(this.handleResponse.bind(this, 'getProfilesInTeam', success, error));
|
||||
}
|
||||
|
||||
getProfilesForDirectMessageList(success, error) {
|
||||
getProfilesInChannel(channelId, offset, limit, success, error) {
|
||||
request.
|
||||
get(`${this.getUsersRoute()}/profiles_for_dm_list/${this.getTeamId()}`).
|
||||
get(`${this.getChannelNeededRoute(channelId)}/users/${offset}/${limit}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getProfilesForDirectMessageList', success, error));
|
||||
end(this.handleResponse.bind(this, 'getProfilesInChannel', success, error));
|
||||
}
|
||||
|
||||
getProfilesNotInChannel(channelId, offset, limit, success, error) {
|
||||
request.
|
||||
get(`${this.getChannelNeededRoute(channelId)}/users/not_in_channel/${offset}/${limit}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getProfilesNotInChannel', success, error));
|
||||
}
|
||||
|
||||
getProfilesByIds(userIds, success, error) {
|
||||
request.
|
||||
post(`${this.getUsersRoute()}/ids`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
send(userIds).
|
||||
end(this.handleResponse.bind(this, 'getProfilesByIds', success, error));
|
||||
}
|
||||
|
||||
searchUsers(term, teamId, options, success, error) {
|
||||
request.
|
||||
post(`${this.getUsersRoute()}/search`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
send({term, team_id: teamId, ...options}).
|
||||
end(this.handleResponse.bind(this, 'searchUsers', success, error));
|
||||
}
|
||||
|
||||
autocompleteUsersInChannel(term, channelId, success, error) {
|
||||
request.
|
||||
get(`${this.getChannelNeededRoute(channelId)}/users/autocomplete?term=${encodeURIComponent(term)}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'autocompleteUsers', success, error));
|
||||
}
|
||||
|
||||
autocompleteUsersInTeam(term, success, error) {
|
||||
request.
|
||||
get(`${this.getTeamNeededRoute()}/users/autocomplete?term=${encodeURIComponent(term)}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'autocompleteUsers', success, error));
|
||||
}
|
||||
|
||||
getStatuses(success, error) {
|
||||
@@ -1048,6 +1110,16 @@ export default class Client {
|
||||
end(this.handleResponse.bind(this, 'getStatuses', success, error));
|
||||
}
|
||||
|
||||
getStatusesByIds(userIds, success, error) {
|
||||
request.
|
||||
post(`${this.getUsersRoute()}/status/ids`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
send(userIds).
|
||||
end(this.handleResponse.bind(this, 'getStatuses', success, error));
|
||||
}
|
||||
|
||||
setActiveChannel(id, success, error) {
|
||||
request.
|
||||
post(`${this.getUsersRoute()}/status/set_active_channel`).
|
||||
@@ -1285,18 +1357,22 @@ export default class Client {
|
||||
end(this.handleResponse.bind(this, 'getChannelCounts', success, error));
|
||||
}
|
||||
|
||||
getChannelExtraInfo(channelId, memberLimit, success, error) {
|
||||
var url = `${this.getChannelNeededRoute(channelId)}/extra_info`;
|
||||
if (memberLimit) {
|
||||
url += '/' + memberLimit;
|
||||
}
|
||||
|
||||
getChannelStats(channelId, success, error) {
|
||||
request.
|
||||
get(url).
|
||||
get(`${this.getChannelNeededRoute(channelId)}/stats`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getChannelExtraInfo', success, error));
|
||||
end(this.handleResponse.bind(this, 'getChannelStats', success, error));
|
||||
}
|
||||
|
||||
getChannelMember(channelId, userId, success, error) {
|
||||
request.
|
||||
get(`${this.getChannelNeededRoute(channelId)}/members/${userId}`).
|
||||
set(this.defaultHeaders).
|
||||
type('application/json').
|
||||
accept('application/json').
|
||||
end(this.handleResponse.bind(this, 'getChannelMember', success, error));
|
||||
}
|
||||
|
||||
addChannelMember(channelId, userId, success, error) {
|
||||
|
||||
@@ -12,6 +12,7 @@ export default class WebSocketClient {
|
||||
this.connectFailCount = 0;
|
||||
this.eventCallback = null;
|
||||
this.responseCallbacks = {};
|
||||
this.firstConnectCallback = null;
|
||||
this.reconnectCallback = null;
|
||||
this.errorCallback = null;
|
||||
this.closeCallback = null;
|
||||
@@ -29,12 +30,13 @@ export default class WebSocketClient {
|
||||
this.conn = new WebSocket(connectionUrl);
|
||||
|
||||
this.conn.onopen = () => {
|
||||
if (this.reconnectCallback) {
|
||||
this.reconnectCallback();
|
||||
}
|
||||
|
||||
if (this.connectFailCount > 0) {
|
||||
console.log('websocket re-established connection'); //eslint-disable-line no-console
|
||||
if (this.reconnectCallback) {
|
||||
this.reconnectCallback();
|
||||
}
|
||||
} else if (this.firstConnectCallback) {
|
||||
this.firstConnectCallback();
|
||||
}
|
||||
|
||||
this.connectFailCount = 0;
|
||||
@@ -104,6 +106,10 @@ export default class WebSocketClient {
|
||||
this.eventCallback = callback;
|
||||
}
|
||||
|
||||
setFirstConnectCallback(callback) {
|
||||
this.firstConnectCallback = callback;
|
||||
}
|
||||
|
||||
setReconnectCallback(callback) {
|
||||
this.reconnectCallback = callback;
|
||||
}
|
||||
@@ -157,4 +163,10 @@ export default class WebSocketClient {
|
||||
getStatuses(callback) {
|
||||
this.sendMessage('get_statuses', null, callback);
|
||||
}
|
||||
|
||||
getStatusesByIds(userIds, callback) {
|
||||
const data = {};
|
||||
data.user_ids = userIds;
|
||||
this.sendMessage('get_statuses_by_ids', data, callback);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user