@supabase/realtime-js 1.3.5 → 1.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main/RealtimeClient.d.ts +1 -2
- package/dist/main/RealtimeClient.d.ts.map +1 -1
- package/dist/main/RealtimeClient.js +7 -16
- package/dist/main/RealtimeClient.js.map +1 -1
- package/dist/main/RealtimePresence.d.ts +92 -0
- package/dist/main/RealtimePresence.d.ts.map +1 -0
- package/dist/main/RealtimePresence.js +198 -0
- package/dist/main/RealtimePresence.js.map +1 -0
- package/dist/main/index.d.ts +2 -1
- package/dist/main/index.d.ts.map +1 -1
- package/dist/main/index.js +3 -1
- package/dist/main/index.js.map +1 -1
- package/dist/main/lib/push.js.map +1 -1
- package/dist/main/lib/transformers.js +16 -24
- package/dist/main/lib/transformers.js.map +1 -1
- package/dist/main/lib/version.d.ts +1 -1
- package/dist/main/lib/version.js +1 -1
- package/dist/module/RealtimeClient.d.ts +1 -2
- package/dist/module/RealtimeClient.d.ts.map +1 -1
- package/dist/module/RealtimeClient.js +7 -16
- package/dist/module/RealtimeClient.js.map +1 -1
- package/dist/module/RealtimePresence.d.ts +92 -0
- package/dist/module/RealtimePresence.d.ts.map +1 -0
- package/dist/module/RealtimePresence.js +192 -0
- package/dist/module/RealtimePresence.js.map +1 -0
- package/dist/module/index.d.ts +2 -1
- package/dist/module/index.d.ts.map +1 -1
- package/dist/module/index.js +2 -1
- package/dist/module/index.js.map +1 -1
- package/dist/module/lib/push.js.map +1 -1
- package/dist/module/lib/transformers.js.map +1 -1
- package/dist/module/lib/version.d.ts +1 -1
- package/dist/module/lib/version.js +1 -1
- package/package.json +5 -2
- package/src/RealtimeClient.ts +10 -13
- package/src/RealtimePresence.ts +319 -0
- package/src/index.ts +2 -0
- package/src/lib/version.ts +1 -1
|
@@ -0,0 +1,319 @@
|
|
|
1
|
+
/*
|
|
2
|
+
This file draws heavily from https://github.com/phoenixframework/phoenix/blob/d344ec0a732ab4ee204215b31de69cf4be72e3bf/assets/js/phoenix/presence.js
|
|
3
|
+
License: https://github.com/phoenixframework/phoenix/blob/d344ec0a732ab4ee204215b31de69cf4be72e3bf/LICENSE.md
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import cloneDeep from 'lodash.clonedeep'
|
|
7
|
+
import {
|
|
8
|
+
PresenceOpts,
|
|
9
|
+
PresenceOnJoinCallback,
|
|
10
|
+
PresenceOnLeaveCallback,
|
|
11
|
+
} from 'phoenix'
|
|
12
|
+
import RealtimeSubscription from './RealtimeSubscription'
|
|
13
|
+
|
|
14
|
+
type Presence = {
|
|
15
|
+
presence_id: string
|
|
16
|
+
[key: string]: any
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
type PresenceState = { [key: string]: Presence[] }
|
|
20
|
+
|
|
21
|
+
type PresenceDiff = {
|
|
22
|
+
joins: PresenceState
|
|
23
|
+
leaves: PresenceState
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
type RawPresenceState = {
|
|
27
|
+
[key: string]: Record<
|
|
28
|
+
'metas',
|
|
29
|
+
{
|
|
30
|
+
phx_ref?: string
|
|
31
|
+
phx_ref_prev?: string
|
|
32
|
+
[key: string]: any
|
|
33
|
+
}[]
|
|
34
|
+
>
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
type RawPresenceDiff = {
|
|
38
|
+
joins: RawPresenceState
|
|
39
|
+
leaves: RawPresenceState
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
type PresenceChooser<T> = (key: string, presences: any) => T
|
|
43
|
+
|
|
44
|
+
export default class RealtimePresence {
|
|
45
|
+
state: PresenceState = {}
|
|
46
|
+
pendingDiffs: RawPresenceDiff[] = []
|
|
47
|
+
joinRef: string | null = null
|
|
48
|
+
caller: {
|
|
49
|
+
onJoin: PresenceOnJoinCallback
|
|
50
|
+
onLeave: PresenceOnLeaveCallback
|
|
51
|
+
onSync: () => void
|
|
52
|
+
} = {
|
|
53
|
+
onJoin: () => {},
|
|
54
|
+
onLeave: () => {},
|
|
55
|
+
onSync: () => {},
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/**
|
|
59
|
+
* Initializes the Presence
|
|
60
|
+
* @param channel - The RealtimeSubscription
|
|
61
|
+
* @param opts - The options,
|
|
62
|
+
* for example `{events: {state: 'state', diff: 'diff'}}`
|
|
63
|
+
*/
|
|
64
|
+
constructor(public channel: RealtimeSubscription, opts?: PresenceOpts) {
|
|
65
|
+
const events = opts?.events || {
|
|
66
|
+
state: 'presence_state',
|
|
67
|
+
diff: 'presence_diff',
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
this.channel.on(events.state, (newState: RawPresenceState) => {
|
|
71
|
+
const { onJoin, onLeave, onSync } = this.caller
|
|
72
|
+
|
|
73
|
+
this.joinRef = this.channel.joinRef()
|
|
74
|
+
|
|
75
|
+
this.state = RealtimePresence.syncState(
|
|
76
|
+
this.state,
|
|
77
|
+
newState,
|
|
78
|
+
onJoin,
|
|
79
|
+
onLeave
|
|
80
|
+
)
|
|
81
|
+
|
|
82
|
+
this.pendingDiffs.forEach((diff) => {
|
|
83
|
+
this.state = RealtimePresence.syncDiff(
|
|
84
|
+
this.state,
|
|
85
|
+
diff,
|
|
86
|
+
onJoin,
|
|
87
|
+
onLeave
|
|
88
|
+
)
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
this.pendingDiffs = []
|
|
92
|
+
|
|
93
|
+
onSync()
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
this.channel.on(events.diff, (diff: RawPresenceDiff) => {
|
|
97
|
+
const { onJoin, onLeave, onSync } = this.caller
|
|
98
|
+
|
|
99
|
+
if (this.inPendingSyncState()) {
|
|
100
|
+
this.pendingDiffs.push(diff)
|
|
101
|
+
} else {
|
|
102
|
+
this.state = RealtimePresence.syncDiff(
|
|
103
|
+
this.state,
|
|
104
|
+
diff,
|
|
105
|
+
onJoin,
|
|
106
|
+
onLeave
|
|
107
|
+
)
|
|
108
|
+
|
|
109
|
+
onSync()
|
|
110
|
+
}
|
|
111
|
+
})
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/**
|
|
115
|
+
* Used to sync the list of presences on the server
|
|
116
|
+
* with the client's state. An optional `onJoin` and `onLeave` callback can
|
|
117
|
+
* be provided to react to changes in the client's local presences across
|
|
118
|
+
* disconnects and reconnects with the server.
|
|
119
|
+
*/
|
|
120
|
+
static syncState(
|
|
121
|
+
currentState: PresenceState,
|
|
122
|
+
newState: RawPresenceState | PresenceState,
|
|
123
|
+
onJoin: PresenceOnJoinCallback,
|
|
124
|
+
onLeave: PresenceOnLeaveCallback
|
|
125
|
+
): PresenceState {
|
|
126
|
+
const state = cloneDeep(currentState)
|
|
127
|
+
const transformedState = this.transformState(newState)
|
|
128
|
+
const joins: PresenceState = {}
|
|
129
|
+
const leaves: PresenceState = {}
|
|
130
|
+
|
|
131
|
+
this.map(state, (key: string, presences: Presence[]) => {
|
|
132
|
+
if (!transformedState[key]) {
|
|
133
|
+
leaves[key] = presences
|
|
134
|
+
}
|
|
135
|
+
})
|
|
136
|
+
|
|
137
|
+
this.map(transformedState, (key, newPresences: Presence[]) => {
|
|
138
|
+
const currentPresences: Presence[] = state[key]
|
|
139
|
+
|
|
140
|
+
if (currentPresences) {
|
|
141
|
+
const newPresenceIds = newPresences.map((m: Presence) => m.presence_id)
|
|
142
|
+
const curPresenceIds = currentPresences.map(
|
|
143
|
+
(m: Presence) => m.presence_id
|
|
144
|
+
)
|
|
145
|
+
const joinedPresences: Presence[] = newPresences.filter(
|
|
146
|
+
(m: Presence) => curPresenceIds.indexOf(m.presence_id) < 0
|
|
147
|
+
)
|
|
148
|
+
const leftPresences: Presence[] = currentPresences.filter(
|
|
149
|
+
(m: Presence) => newPresenceIds.indexOf(m.presence_id) < 0
|
|
150
|
+
)
|
|
151
|
+
|
|
152
|
+
if (joinedPresences.length > 0) {
|
|
153
|
+
joins[key] = joinedPresences
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
if (leftPresences.length > 0) {
|
|
157
|
+
leaves[key] = leftPresences
|
|
158
|
+
}
|
|
159
|
+
} else {
|
|
160
|
+
joins[key] = newPresences
|
|
161
|
+
}
|
|
162
|
+
})
|
|
163
|
+
|
|
164
|
+
return this.syncDiff(state, { joins, leaves }, onJoin, onLeave)
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
*
|
|
169
|
+
* Used to sync a diff of presence join and leave
|
|
170
|
+
* events from the server, as they happen. Like `syncState`, `syncDiff`
|
|
171
|
+
* accepts optional `onJoin` and `onLeave` callbacks to react to a user
|
|
172
|
+
* joining or leaving from a device.
|
|
173
|
+
*/
|
|
174
|
+
static syncDiff(
|
|
175
|
+
state: PresenceState,
|
|
176
|
+
diff: RawPresenceDiff | PresenceDiff,
|
|
177
|
+
onJoin: PresenceOnJoinCallback,
|
|
178
|
+
onLeave: PresenceOnLeaveCallback
|
|
179
|
+
): PresenceState {
|
|
180
|
+
const { joins, leaves } = {
|
|
181
|
+
joins: this.transformState(diff.joins),
|
|
182
|
+
leaves: this.transformState(diff.leaves),
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
if (!onJoin) {
|
|
186
|
+
onJoin = () => {}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
if (!onLeave) {
|
|
190
|
+
onLeave = () => {}
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
this.map(joins, (key, newPresences: Presence[]) => {
|
|
194
|
+
const currentPresences: Presence[] = state[key]
|
|
195
|
+
state[key] = cloneDeep(newPresences)
|
|
196
|
+
|
|
197
|
+
if (currentPresences) {
|
|
198
|
+
const joinedPresenceIds = state[key].map((m: Presence) => m.presence_id)
|
|
199
|
+
const curPresences: Presence[] = currentPresences.filter(
|
|
200
|
+
(m: Presence) => joinedPresenceIds.indexOf(m.presence_id) < 0
|
|
201
|
+
)
|
|
202
|
+
|
|
203
|
+
state[key].unshift(...curPresences)
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
onJoin(key, currentPresences, newPresences)
|
|
207
|
+
})
|
|
208
|
+
|
|
209
|
+
this.map(leaves, (key, leftPresences: Presence[]) => {
|
|
210
|
+
let currentPresences: Presence[] = state[key]
|
|
211
|
+
|
|
212
|
+
if (!currentPresences) return
|
|
213
|
+
|
|
214
|
+
const presenceIdsToRemove = leftPresences.map(
|
|
215
|
+
(m: Presence) => m.presence_id
|
|
216
|
+
)
|
|
217
|
+
currentPresences = currentPresences.filter(
|
|
218
|
+
(m: Presence) => presenceIdsToRemove.indexOf(m.presence_id) < 0
|
|
219
|
+
)
|
|
220
|
+
|
|
221
|
+
state[key] = currentPresences
|
|
222
|
+
|
|
223
|
+
onLeave(key, currentPresences, leftPresences)
|
|
224
|
+
|
|
225
|
+
if (currentPresences.length === 0) delete state[key]
|
|
226
|
+
})
|
|
227
|
+
|
|
228
|
+
return state
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
/**
|
|
232
|
+
* Returns the array of presences, with selected metadata.
|
|
233
|
+
*/
|
|
234
|
+
static list<T = any>(
|
|
235
|
+
presences: PresenceState,
|
|
236
|
+
chooser: PresenceChooser<T> | undefined
|
|
237
|
+
): T[] {
|
|
238
|
+
if (!chooser) {
|
|
239
|
+
chooser = (_key, pres) => pres
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
return this.map(presences, (key, presences: Presence[]) =>
|
|
243
|
+
chooser!(key, presences)
|
|
244
|
+
)
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
private static map<T = any>(
|
|
248
|
+
obj: PresenceState,
|
|
249
|
+
func: PresenceChooser<T>
|
|
250
|
+
): T[] {
|
|
251
|
+
return Object.getOwnPropertyNames(obj).map((key) => func(key, obj[key]))
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
/**
|
|
255
|
+
* Remove 'metas' key
|
|
256
|
+
* Change 'phx_ref' to 'presence_id'
|
|
257
|
+
* Remove 'phx_ref' and 'phx_ref_prev'
|
|
258
|
+
*
|
|
259
|
+
* @example
|
|
260
|
+
* // returns {
|
|
261
|
+
* abc123: [
|
|
262
|
+
* { presence_id: '2', user_id: 1 },
|
|
263
|
+
* { presence_id: '3', user_id: 2 }
|
|
264
|
+
* ]
|
|
265
|
+
* }
|
|
266
|
+
* RealtimePresence.transformState({
|
|
267
|
+
* abc123: {
|
|
268
|
+
* metas: [
|
|
269
|
+
* { phx_ref: '2', phx_ref_prev: '1' user_id: 1 },
|
|
270
|
+
* { phx_ref: '3', user_id: 2 }
|
|
271
|
+
* ]
|
|
272
|
+
* }
|
|
273
|
+
* })
|
|
274
|
+
*/
|
|
275
|
+
private static transformState(
|
|
276
|
+
state: RawPresenceState | PresenceState
|
|
277
|
+
): PresenceState {
|
|
278
|
+
state = cloneDeep(state)
|
|
279
|
+
|
|
280
|
+
return Object.getOwnPropertyNames(state).reduce((newState, key) => {
|
|
281
|
+
const presences = state[key]
|
|
282
|
+
|
|
283
|
+
if ('metas' in presences) {
|
|
284
|
+
newState[key] = presences.metas.map((presence) => {
|
|
285
|
+
presence['presence_id'] = presence['phx_ref']
|
|
286
|
+
|
|
287
|
+
delete presence['phx_ref']
|
|
288
|
+
delete presence['phx_ref_prev']
|
|
289
|
+
|
|
290
|
+
return presence
|
|
291
|
+
}) as Presence[]
|
|
292
|
+
} else {
|
|
293
|
+
newState[key] = presences
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
return newState
|
|
297
|
+
}, {} as PresenceState)
|
|
298
|
+
}
|
|
299
|
+
|
|
300
|
+
onJoin(callback: PresenceOnJoinCallback): void {
|
|
301
|
+
this.caller.onJoin = callback
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
onLeave(callback: PresenceOnLeaveCallback): void {
|
|
305
|
+
this.caller.onLeave = callback
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
onSync(callback: () => void): void {
|
|
309
|
+
this.caller.onSync = callback
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
list<T = any>(by?: PresenceChooser<T>): T[] {
|
|
313
|
+
return RealtimePresence.list<T>(this.state, by)
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
private inPendingSyncState(): boolean {
|
|
317
|
+
return !this.joinRef || this.joinRef !== this.channel.joinRef()
|
|
318
|
+
}
|
|
319
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -3,10 +3,12 @@ import RealtimeClient, {
|
|
|
3
3
|
Options as RealtimeClientOptions,
|
|
4
4
|
} from './RealtimeClient'
|
|
5
5
|
import RealtimeSubscription from './RealtimeSubscription'
|
|
6
|
+
import RealtimePresence from './RealtimePresence'
|
|
6
7
|
|
|
7
8
|
export {
|
|
8
9
|
RealtimeClient,
|
|
9
10
|
RealtimeClientOptions,
|
|
10
11
|
RealtimeSubscription,
|
|
12
|
+
RealtimePresence,
|
|
11
13
|
Transformers,
|
|
12
14
|
}
|
package/src/lib/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// generated by genversion
|
|
2
|
-
export const version = '1.
|
|
2
|
+
export const version = '1.4.2'
|