Skip to content

fix: Only handle recent awareness messagess from sessions #4053

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
max-nextcloud merged 2 commits into from
Apr 17, 2023
Merged

fix: Only handle recent awareness messagess from sessions #4053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807b47f
fix: Only handle recent awareness messagess from sessions
juliusknorr Apr 14, 2023
f6c1e71
Compile assets
nextcloud-command Apr 17, 2023
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
Next Next commit
fix: Only handle recent awareness messagess from sessions 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @max-nextcloud
juliusknorr authored and max-nextcloud committed Apr 17, 2023
commit 807b47fba2adee09d082e4d20b17c29db536f2c6
4 changes: 1 addition & 3 deletions src/components/Editor/SessionList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ import { NcPopover, Tooltip } from '@nextcloud/vue'
import AvatarWrapper from './AvatarWrapper.vue'
import { mapActions, mapState } from 'vuex'
import store from '../../mixins/store.js'

const COLLABORATOR_IDLE_TIME = 60
const COLLABORATOR_DISCONNECT_TIME = 90
import { COLLABORATOR_IDLE_TIME, COLLABORATOR_DISCONNECT_TIME } from '../../services/SyncService.js'

export default {
name: 'SessionList',
Expand Down
7 changes: 6 additions & 1 deletion src/services/SyncService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ const IDLE_TIMEOUT = 1440
*/
const AUTOSAVE_INTERVAL = 30000

const COLLABORATOR_IDLE_TIME = 60

const COLLABORATOR_DISCONNECT_TIME = 90

const ERROR_TYPE = {
/**
* Failed to save collaborative document due to external change
Expand Down Expand Up @@ -173,6 +177,7 @@ class SyncService {

_receiveSteps({ steps, document, sessions }) {
const awareness = sessions
.filter(s => s.lastContact > (Math.floor(Date.now() / 1000) - COLLABORATOR_DISCONNECT_TIME))
.filter(s => s.lastAwarenessMessage)
.map(s => {
return { step: s.lastAwarenessMessage, clientId: s.clientId }
Expand Down Expand Up @@ -288,4 +293,4 @@ class SyncService {
}

export default SyncService
export { SyncService, ERROR_TYPE, IDLE_TIMEOUT }
export { SyncService, ERROR_TYPE, IDLE_TIMEOUT, COLLABORATOR_IDLE_TIME, COLLABORATOR_DISCONNECT_TIME }