@vielzeug/pulse 2.3.0 → 2.4.0
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/_utils.cjs +1 -1
- package/dist/_utils.cjs.map +1 -1
- package/dist/_utils.js +4 -15
- package/dist/_utils.js.map +1 -1
- package/dist/_wait.cjs +1 -1
- package/dist/_wait.cjs.map +1 -1
- package/dist/_wait.js +15 -16
- package/dist/_wait.js.map +1 -1
- package/dist/pulse.cjs +1 -1
- package/dist/pulse.cjs.map +1 -1
- package/dist/pulse.iife.js +1 -1
- package/dist/pulse.iife.js.map +1 -1
- package/dist/pulse.js +1 -1
- package/dist/pulse.js.map +1 -1
- package/dist/room.cjs +1 -1
- package/dist/room.cjs.map +1 -1
- package/dist/room.js +83 -83
- package/dist/room.js.map +1 -1
- package/package.json +2 -2
package/dist/room.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { PulseAbortError as e, PulseConnectionError as t, PulseDisposedError as n, PulseError as r, PulseRoomTimeoutError as i } from "./errors.js";
|
|
2
|
-
import {
|
|
3
|
-
import { encode as
|
|
4
|
-
import { signal as
|
|
2
|
+
import { deriveAbortController as a } from "./_utils.js";
|
|
3
|
+
import { encode as o } from "./protocol.js";
|
|
4
|
+
import { signal as s } from "@vielzeug/ripple";
|
|
5
5
|
//#region src/room.ts
|
|
6
|
-
function
|
|
7
|
-
let
|
|
8
|
-
function
|
|
9
|
-
let t =
|
|
6
|
+
function c(c) {
|
|
7
|
+
let d = s(/* @__PURE__ */ new Set()), f = /* @__PURE__ */ new Map();
|
|
8
|
+
function p(e) {
|
|
9
|
+
let t = f.get(e);
|
|
10
10
|
return t || (t = {
|
|
11
11
|
confirmed: !1,
|
|
12
12
|
joinSent: !1,
|
|
@@ -14,138 +14,138 @@ function l(l) {
|
|
|
14
14
|
localPresence: void 0,
|
|
15
15
|
refs: 0,
|
|
16
16
|
scopes: /* @__PURE__ */ new Set()
|
|
17
|
-
},
|
|
17
|
+
}, f.set(e, t)), t;
|
|
18
18
|
}
|
|
19
|
-
function
|
|
20
|
-
let n = new Set(
|
|
21
|
-
t ? n.add(e) : n.delete(e),
|
|
19
|
+
function m(e, t) {
|
|
20
|
+
let n = new Set(d.value);
|
|
21
|
+
t ? n.add(e) : n.delete(e), d.value = n;
|
|
22
22
|
}
|
|
23
|
-
function
|
|
24
|
-
|
|
23
|
+
function h(e) {
|
|
24
|
+
c.send(o({
|
|
25
25
|
room: e,
|
|
26
26
|
type: "join"
|
|
27
27
|
}));
|
|
28
28
|
}
|
|
29
|
-
function
|
|
30
|
-
|
|
29
|
+
function g(e) {
|
|
30
|
+
c.send(o({
|
|
31
31
|
room: e,
|
|
32
32
|
type: "leave"
|
|
33
33
|
}));
|
|
34
34
|
}
|
|
35
|
-
function
|
|
36
|
-
let i =
|
|
35
|
+
function _(e, r) {
|
|
36
|
+
let i = f.get(e);
|
|
37
37
|
if (!i) throw new n(`Room "${e}"`);
|
|
38
|
-
if (!
|
|
39
|
-
|
|
38
|
+
if (!c.isOpen()) throw new t("Connection is not open", e);
|
|
39
|
+
c.send(o({
|
|
40
40
|
room: e,
|
|
41
41
|
state: r,
|
|
42
42
|
type: "presence"
|
|
43
43
|
})), i.localPresence = r;
|
|
44
44
|
}
|
|
45
|
-
function
|
|
46
|
-
let n =
|
|
47
|
-
!n || !n.scopes.has(t) || (n.scopes.delete(t), n.refs--, n.refs === 0 && (n.confirmed ? (n.confirmed = !1, n.localPresence = void 0,
|
|
45
|
+
function v(e, t) {
|
|
46
|
+
let n = f.get(e);
|
|
47
|
+
!n || !n.scopes.has(t) || (n.scopes.delete(t), n.refs--, n.refs === 0 && (n.confirmed ? (n.confirmed = !1, n.localPresence = void 0, m(e, !1), c.isOpen() && g(e), f.delete(e)) : n.joinSent ? n.leaveAfterJoin = !0 : f.delete(e)));
|
|
48
48
|
}
|
|
49
49
|
return {
|
|
50
|
-
createScope(
|
|
51
|
-
if (
|
|
52
|
-
let
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
},
|
|
56
|
-
|
|
50
|
+
createScope(o, d, f) {
|
|
51
|
+
if (c.disposalSignal.aborted) return u(o, d);
|
|
52
|
+
let m = p(o), g = a(c.disposalSignal), y, b, x = !1, S = new Promise((e, t) => {
|
|
53
|
+
y = () => {
|
|
54
|
+
x || (x = !0, clearTimeout(C), T.removeEventListener("abort", j), e());
|
|
55
|
+
}, b = (e) => {
|
|
56
|
+
x || (x = !0, clearTimeout(C), T.removeEventListener("abort", j), t(e));
|
|
57
57
|
};
|
|
58
58
|
});
|
|
59
|
-
|
|
60
|
-
let
|
|
61
|
-
if (
|
|
59
|
+
S.catch(() => {});
|
|
60
|
+
let C, w = [g.signal];
|
|
61
|
+
if (f?.signal && w.push(f.signal), f?.timeout !== void 0) {
|
|
62
62
|
let e = new AbortController();
|
|
63
|
-
|
|
63
|
+
C = setTimeout(() => e.abort(new i(o)), f.timeout), w.push(e.signal);
|
|
64
64
|
}
|
|
65
|
-
let
|
|
66
|
-
|
|
65
|
+
let T = AbortSignal.any(w), E, D, O = /* @__PURE__ */ new Set(), k = /* @__PURE__ */ new Set();
|
|
66
|
+
d && (E = s(/* @__PURE__ */ new Map()), D = {
|
|
67
67
|
onJoin(e, t) {
|
|
68
|
-
let n = new Map(
|
|
69
|
-
n.set(e, t),
|
|
70
|
-
for (let n of
|
|
68
|
+
let n = new Map(E.value);
|
|
69
|
+
n.set(e, t), E.value = n;
|
|
70
|
+
for (let n of O) n(e, t);
|
|
71
71
|
},
|
|
72
72
|
onLeave(e) {
|
|
73
|
-
let t = new Map(
|
|
74
|
-
t.delete(e),
|
|
75
|
-
for (let t of
|
|
73
|
+
let t = new Map(E.value);
|
|
74
|
+
t.delete(e), E.value = t;
|
|
75
|
+
for (let t of k) t(e);
|
|
76
76
|
},
|
|
77
77
|
onState(e) {
|
|
78
78
|
let t = /* @__PURE__ */ new Map();
|
|
79
79
|
for (let [n, r] of Object.entries(e)) t.set(n, r);
|
|
80
|
-
|
|
80
|
+
E.value = t;
|
|
81
81
|
},
|
|
82
82
|
reset() {
|
|
83
|
-
|
|
83
|
+
E.value = /* @__PURE__ */ new Map();
|
|
84
84
|
}
|
|
85
85
|
});
|
|
86
|
-
let
|
|
87
|
-
isSettled: () =>
|
|
88
|
-
joined:
|
|
89
|
-
name:
|
|
90
|
-
presenceHandlers:
|
|
91
|
-
rejectJoined:
|
|
92
|
-
resolveJoined:
|
|
93
|
-
},
|
|
94
|
-
clearTimeout(
|
|
95
|
-
let t =
|
|
96
|
-
|
|
86
|
+
let A = {
|
|
87
|
+
isSettled: () => x,
|
|
88
|
+
joined: S,
|
|
89
|
+
name: o,
|
|
90
|
+
presenceHandlers: D,
|
|
91
|
+
rejectJoined: b,
|
|
92
|
+
resolveJoined: y
|
|
93
|
+
}, j = () => {
|
|
94
|
+
clearTimeout(C), g.abort();
|
|
95
|
+
let t = T.reason, n = t instanceof r ? t : new e();
|
|
96
|
+
A.rejectJoined(n), v(o, A);
|
|
97
97
|
};
|
|
98
|
-
if (
|
|
99
|
-
if (
|
|
100
|
-
else if (!
|
|
101
|
-
|
|
98
|
+
if (m.refs++, m.scopes.add(A), T.aborted) return j(), l(A, g.signal, E, O, k, o, _);
|
|
99
|
+
if (T.addEventListener("abort", j, { once: !0 }), m.confirmed) A.resolveJoined();
|
|
100
|
+
else if (!m.joinSent && c.isOpen()) {
|
|
101
|
+
m.joinSent = !0;
|
|
102
102
|
try {
|
|
103
|
-
|
|
103
|
+
h(o);
|
|
104
104
|
} catch (e) {
|
|
105
|
-
|
|
105
|
+
m.joinSent = !1, A.rejectJoined(e instanceof r ? e : new t("Failed to send join", o));
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
|
-
return
|
|
109
|
-
|
|
108
|
+
return l(A, g.signal, E, O, k, o, _, () => {
|
|
109
|
+
g.signal.aborted || (clearTimeout(C), T.removeEventListener("abort", j), g.abort(), x || A.rejectJoined(new n(`Room "${o}"`)), v(o, A));
|
|
110
110
|
});
|
|
111
111
|
},
|
|
112
112
|
dispose() {
|
|
113
|
-
|
|
113
|
+
d.value = /* @__PURE__ */ new Set(), f.clear();
|
|
114
114
|
},
|
|
115
115
|
handleJoined(e) {
|
|
116
|
-
let t =
|
|
116
|
+
let t = f.get(e);
|
|
117
117
|
if (t) {
|
|
118
|
-
if (t.confirmed = !0, t.joinSent = !1,
|
|
119
|
-
t.leaveAfterJoin = !1, t.confirmed = !1,
|
|
118
|
+
if (t.confirmed = !0, t.joinSent = !1, m(e, !0), t.leaveAfterJoin) {
|
|
119
|
+
t.leaveAfterJoin = !1, t.confirmed = !1, m(e, !1), c.isOpen() && g(e), f.delete(e);
|
|
120
120
|
return;
|
|
121
121
|
}
|
|
122
122
|
for (let e of t.scopes) e.isSettled() || e.resolveJoined();
|
|
123
123
|
}
|
|
124
124
|
},
|
|
125
125
|
handleLeft(e) {
|
|
126
|
-
let t =
|
|
127
|
-
t && (t.confirmed = !1, t.joinSent = !1,
|
|
126
|
+
let t = f.get(e);
|
|
127
|
+
t && (t.confirmed = !1, t.joinSent = !1, m(e, !1));
|
|
128
128
|
},
|
|
129
129
|
handlePresenceJoin(e, t, n) {
|
|
130
|
-
let r =
|
|
130
|
+
let r = f.get(e);
|
|
131
131
|
if (r) for (let e of r.scopes) e.presenceHandlers?.onJoin(t, n);
|
|
132
132
|
},
|
|
133
133
|
handlePresenceLeave(e, t) {
|
|
134
|
-
let n =
|
|
134
|
+
let n = f.get(e);
|
|
135
135
|
if (n) for (let e of n.scopes) e.presenceHandlers?.onLeave(t);
|
|
136
136
|
},
|
|
137
137
|
handlePresenceState(e, t) {
|
|
138
|
-
let n =
|
|
138
|
+
let n = f.get(e);
|
|
139
139
|
if (n) for (let e of n.scopes) e.presenceHandlers?.onState(t);
|
|
140
140
|
},
|
|
141
141
|
rejectAll(e) {
|
|
142
|
-
for (let t of
|
|
142
|
+
for (let t of f.values()) for (let n of t.scopes) n.isSettled() || n.rejectJoined(e);
|
|
143
143
|
},
|
|
144
144
|
reset() {
|
|
145
|
-
|
|
146
|
-
for (let [e, t] of
|
|
145
|
+
d.value = /* @__PURE__ */ new Set();
|
|
146
|
+
for (let [e, t] of f) {
|
|
147
147
|
if (t.refs === 0) {
|
|
148
|
-
|
|
148
|
+
f.delete(e);
|
|
149
149
|
continue;
|
|
150
150
|
}
|
|
151
151
|
t.confirmed = !1, t.joinSent = !1;
|
|
@@ -153,15 +153,15 @@ function l(l) {
|
|
|
153
153
|
}
|
|
154
154
|
},
|
|
155
155
|
restore() {
|
|
156
|
-
for (let [e, t] of
|
|
156
|
+
for (let [e, t] of f) if (t.refs !== 0) {
|
|
157
157
|
t.confirmed = !1, t.joinSent = !0;
|
|
158
158
|
try {
|
|
159
|
-
|
|
159
|
+
h(e);
|
|
160
160
|
} catch {
|
|
161
161
|
t.joinSent = !1;
|
|
162
162
|
}
|
|
163
163
|
if (t.localPresence !== void 0) try {
|
|
164
|
-
|
|
164
|
+
c.send(o({
|
|
165
165
|
room: e,
|
|
166
166
|
state: t.localPresence,
|
|
167
167
|
type: "presence"
|
|
@@ -169,10 +169,10 @@ function l(l) {
|
|
|
169
169
|
} catch {}
|
|
170
170
|
}
|
|
171
171
|
},
|
|
172
|
-
rooms:
|
|
172
|
+
rooms: d
|
|
173
173
|
};
|
|
174
174
|
}
|
|
175
|
-
function
|
|
175
|
+
function l(e, t, r, i, a, o, s, c) {
|
|
176
176
|
let l = c ?? (() => {});
|
|
177
177
|
return r ? {
|
|
178
178
|
get disposalSignal() {
|
|
@@ -220,7 +220,7 @@ function u(e, t, r, i, a, o, s, c) {
|
|
|
220
220
|
[Symbol.dispose]: l
|
|
221
221
|
};
|
|
222
222
|
}
|
|
223
|
-
function
|
|
223
|
+
function u(e, t) {
|
|
224
224
|
let r = new AbortController();
|
|
225
225
|
r.abort(new n());
|
|
226
226
|
let i = Promise.reject(new n(`Room "${e}"`));
|
|
@@ -236,7 +236,7 @@ function d(e, t) {
|
|
|
236
236
|
onLeave() {
|
|
237
237
|
throw new n(`Room "${e}"`);
|
|
238
238
|
},
|
|
239
|
-
presence:
|
|
239
|
+
presence: s(/* @__PURE__ */ new Map()),
|
|
240
240
|
updatePresence() {
|
|
241
241
|
throw new n(`Room "${e}"`);
|
|
242
242
|
},
|
|
@@ -251,6 +251,6 @@ function d(e, t) {
|
|
|
251
251
|
};
|
|
252
252
|
}
|
|
253
253
|
//#endregion
|
|
254
|
-
export {
|
|
254
|
+
export { c as createRoomRegistry };
|
|
255
255
|
|
|
256
256
|
//# sourceMappingURL=room.js.map
|
package/dist/room.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room.js","names":[],"sources":["../src/room.ts"],"sourcesContent":["import { type Signal, signal } from '@vielzeug/ripple';\nimport { combineSignals, deriveAbortController } from './_utils';\nimport { PulseAbortError, PulseConnectionError, PulseDisposedError, PulseError, PulseRoomTimeoutError } from './errors';\nimport { encode } from './protocol';\nimport type { PresenceRoomScope, RoomOptions, RoomScopeBase, Unsubscribe } from './types';\n\ntype PresenceHandlers = {\n onState(members: Record<string, unknown>): void;\n onJoin(id: string, state: unknown): void;\n onLeave(id: string): void;\n reset(): void;\n};\n\ntype RoomState = {\n refs: number;\n confirmed: boolean;\n joinSent: boolean;\n leaveAfterJoin: boolean;\n localPresence: unknown | undefined;\n scopes: Set<ScopeInternal>;\n};\n\ntype ScopeInternal = {\n readonly name: string;\n readonly joined: Promise<void>;\n resolveJoined(): void;\n rejectJoined(error: PulseError): void;\n isSettled(): boolean;\n presenceHandlers?: PresenceHandlers;\n};\n\ntype RegistryOptions = {\n isOpen: () => boolean;\n send: (frame: string) => void;\n disposalSignal: AbortSignal;\n};\n\nexport type RoomRegistry = {\n readonly rooms: Signal<ReadonlySet<string>>;\n createScope(name: string, hasPresence: boolean, opts: RoomOptions | undefined): RoomScopeBase | PresenceRoomScope;\n handleJoined(room: string): void;\n handleLeft(room: string): void;\n handlePresenceState(room: string, members: Record<string, unknown>): void;\n handlePresenceJoin(room: string, id: string, state: unknown): void;\n handlePresenceLeave(room: string, id: string): void;\n restore(): void;\n reset(): void;\n rejectAll(error: PulseError): void;\n dispose(): void;\n};\n\n/**\n * Manages ref-counted room memberships, pending join tracking, and presence state.\n * @internal\n */\nexport function createRoomRegistry(opts: RegistryOptions): RoomRegistry {\n const rooms = signal<ReadonlySet<string>>(new Set());\n const states = new Map<string, RoomState>();\n\n function getOrCreate(name: string): RoomState {\n let state = states.get(name);\n\n if (!state) {\n state = {\n confirmed: false,\n joinSent: false,\n leaveAfterJoin: false,\n localPresence: undefined,\n refs: 0,\n scopes: new Set(),\n };\n states.set(name, state);\n }\n\n return state;\n }\n\n function setRoom(name: string, joined: boolean): void {\n const next = new Set(rooms.value);\n if (joined) next.add(name);\n else next.delete(name);\n rooms.value = next;\n }\n\n function sendJoin(name: string): void {\n opts.send(encode({ room: name, type: 'join' }));\n }\n\n function sendLeave(name: string): void {\n opts.send(encode({ room: name, type: 'leave' }));\n }\n\n function updatePresence(name: string, state: unknown): void {\n const roomState = states.get(name);\n if (!roomState) throw new PulseDisposedError(`Room \"${name}\"`);\n if (!opts.isOpen()) throw new PulseConnectionError('Connection is not open', name);\n opts.send(encode({ room: name, state, type: 'presence' }));\n roomState.localPresence = state;\n }\n\n function releaseScope(name: string, scope: ScopeInternal): void {\n const state = states.get(name);\n if (!state || !state.scopes.has(scope)) return;\n\n state.scopes.delete(scope);\n state.refs--;\n\n if (state.refs === 0) {\n if (state.confirmed) {\n state.confirmed = false;\n state.localPresence = undefined;\n setRoom(name, false);\n if (opts.isOpen()) sendLeave(name);\n states.delete(name);\n } else if (state.joinSent) {\n state.leaveAfterJoin = true;\n // Keep state alive until handleJoined processes the compensating leave\n } else {\n states.delete(name);\n }\n }\n }\n\n return {\n createScope(name, hasPresence, joinOpts) {\n if (opts.disposalSignal.aborted) {\n return createDeadScope(name, hasPresence);\n }\n\n const state = getOrCreate(name);\n const ctrl = deriveAbortController(opts.disposalSignal);\n\n let resolveJoined!: () => void;\n let rejectJoined!: (error: PulseError) => void;\n let settled = false;\n\n const joined = new Promise<void>((resolve, reject) => {\n resolveJoined = () => {\n if (settled) return;\n settled = true;\n clearTimeout(timeoutId);\n combined.removeEventListener('abort', onAbort);\n resolve();\n };\n rejectJoined = (error) => {\n if (settled) return;\n settled = true;\n clearTimeout(timeoutId);\n combined.removeEventListener('abort', onAbort);\n reject(error);\n };\n });\n // Suppress unhandled rejection when joined is never awaited\n joined.catch(() => {});\n\n // Timeout + abort handling\n let timeoutId: ReturnType<typeof setTimeout> | undefined;\n const signals: AbortSignal[] = [ctrl.signal];\n\n if (joinOpts?.signal) signals.push(joinOpts.signal);\n\n if (joinOpts?.timeout !== undefined) {\n const timeoutCtrl = new AbortController();\n timeoutId = setTimeout(() => timeoutCtrl.abort(new PulseRoomTimeoutError(name)), joinOpts.timeout);\n signals.push(timeoutCtrl.signal);\n }\n\n const combined = signals.length === 1 ? signals[0]! : combineSignals(signals[0]!, ...signals.slice(1));\n\n // Presence state\n let presenceSignal: Signal<Map<string, unknown>> | undefined;\n let presenceHandlers: PresenceHandlers | undefined;\n const joinHandlers = new Set<(memberId: string, state: unknown) => void>();\n const leaveHandlers = new Set<(memberId: string) => void>();\n\n if (hasPresence) {\n presenceSignal = signal(new Map<string, unknown>());\n presenceHandlers = {\n onJoin(id, memberState) {\n const next = new Map(presenceSignal!.value);\n next.set(id, memberState);\n presenceSignal!.value = next;\n for (const handler of joinHandlers) handler(id, memberState);\n },\n onLeave(id) {\n const next = new Map(presenceSignal!.value);\n next.delete(id);\n presenceSignal!.value = next;\n for (const handler of leaveHandlers) handler(id);\n },\n onState(members) {\n const next = new Map<string, unknown>();\n for (const [id, memberState] of Object.entries(members)) next.set(id, memberState);\n presenceSignal!.value = next;\n },\n reset() {\n presenceSignal!.value = new Map();\n },\n };\n }\n\n const scope: ScopeInternal = {\n isSettled: () => settled,\n joined,\n name,\n presenceHandlers,\n rejectJoined,\n resolveJoined,\n };\n\n // Abort handler — rejects joined and auto-disposes\n const onAbort = (): void => {\n clearTimeout(timeoutId);\n ctrl.abort();\n const reason = combined.reason;\n const error = reason instanceof PulseError ? reason : new PulseAbortError();\n scope.rejectJoined(error);\n releaseScope(name, scope);\n };\n\n // Register scope BEFORE setting up abort, so releaseScope is safe\n state.refs++;\n state.scopes.add(scope);\n\n if (combined.aborted) {\n onAbort();\n return buildPublicScope(scope, ctrl.signal, presenceSignal, joinHandlers, leaveHandlers, name, updatePresence);\n }\n\n combined.addEventListener('abort', onAbort, { once: true });\n\n // Start join\n if (state.confirmed) {\n scope.resolveJoined();\n } else if (!state.joinSent && opts.isOpen()) {\n state.joinSent = true;\n try {\n sendJoin(name);\n } catch (error) {\n state.joinSent = false;\n scope.rejectJoined(\n error instanceof PulseError ? error : new PulseConnectionError('Failed to send join', name),\n );\n }\n }\n\n // Build dispose function\n const disposeScope = (): void => {\n if (ctrl.signal.aborted) return;\n clearTimeout(timeoutId);\n combined.removeEventListener('abort', onAbort);\n ctrl.abort();\n if (!settled) scope.rejectJoined(new PulseDisposedError(`Room \"${name}\"`));\n releaseScope(name, scope);\n };\n\n return buildPublicScope(\n scope,\n ctrl.signal,\n presenceSignal,\n joinHandlers,\n leaveHandlers,\n name,\n updatePresence,\n disposeScope,\n );\n },\n\n dispose() {\n rooms.value = new Set();\n states.clear();\n },\n\n handleJoined(room) {\n const state = states.get(room);\n if (!state) return;\n\n state.confirmed = true;\n state.joinSent = false;\n setRoom(room, true);\n\n if (state.leaveAfterJoin) {\n state.leaveAfterJoin = false;\n state.confirmed = false;\n setRoom(room, false);\n if (opts.isOpen()) sendLeave(room);\n states.delete(room);\n return;\n }\n\n for (const scope of state.scopes) {\n if (!scope.isSettled()) scope.resolveJoined();\n }\n },\n\n handleLeft(room) {\n const state = states.get(room);\n if (!state) return;\n\n state.confirmed = false;\n state.joinSent = false;\n setRoom(room, false);\n },\n\n handlePresenceJoin(room, id, memberState) {\n const state = states.get(room);\n if (!state) return;\n for (const scope of state.scopes) scope.presenceHandlers?.onJoin(id, memberState);\n },\n\n handlePresenceLeave(room, id) {\n const state = states.get(room);\n if (!state) return;\n for (const scope of state.scopes) scope.presenceHandlers?.onLeave(id);\n },\n\n handlePresenceState(room, members) {\n const state = states.get(room);\n if (!state) return;\n for (const scope of state.scopes) scope.presenceHandlers?.onState(members);\n },\n\n rejectAll(error) {\n for (const state of states.values()) {\n for (const scope of state.scopes) {\n if (!scope.isSettled()) scope.rejectJoined(error);\n }\n }\n },\n\n reset() {\n rooms.value = new Set();\n for (const [name, state] of states) {\n if (state.refs === 0) {\n states.delete(name);\n continue;\n }\n state.confirmed = false;\n state.joinSent = false;\n for (const scope of state.scopes) scope.presenceHandlers?.reset();\n }\n },\n\n restore() {\n for (const [name, state] of states) {\n if (state.refs === 0) continue;\n\n state.confirmed = false;\n state.joinSent = true;\n\n try {\n sendJoin(name);\n } catch {\n state.joinSent = false;\n }\n\n if (state.localPresence !== undefined) {\n try {\n opts.send(encode({ room: name, state: state.localPresence, type: 'presence' }));\n } catch {\n // non-fatal; next updatePresence retries\n }\n }\n }\n },\n rooms,\n };\n}\n\nfunction buildPublicScope(\n scope: ScopeInternal,\n disposalSignal: AbortSignal,\n presenceSignal: Signal<Map<string, unknown>> | undefined,\n joinHandlers: Set<(memberId: string, state: unknown) => void>,\n leaveHandlers: Set<(memberId: string) => void>,\n name: string,\n updatePresence: (name: string, state: unknown) => void,\n disposeFn?: () => void,\n): RoomScopeBase | PresenceRoomScope {\n const dispose = disposeFn ?? (() => {});\n\n if (presenceSignal) {\n const publicScope: PresenceRoomScope = {\n get disposalSignal() {\n return disposalSignal;\n },\n dispose,\n get disposed() {\n return disposalSignal.aborted;\n },\n get joined() {\n return scope.joined;\n },\n get name() {\n return scope.name;\n },\n onJoin(handler: (memberId: string, state: unknown) => void): Unsubscribe {\n if (disposalSignal.aborted) throw new PulseDisposedError(`Room \"${name}\"`);\n joinHandlers.add(handler);\n return () => joinHandlers.delete(handler);\n },\n onLeave(handler: (memberId: string) => void): Unsubscribe {\n if (disposalSignal.aborted) throw new PulseDisposedError(`Room \"${name}\"`);\n leaveHandlers.add(handler);\n return () => leaveHandlers.delete(handler);\n },\n get presence() {\n return presenceSignal;\n },\n updatePresence(state: unknown) {\n updatePresence(name, state);\n },\n [Symbol.dispose]: dispose,\n };\n return publicScope;\n }\n\n const publicScope: RoomScopeBase = {\n get disposalSignal() {\n return disposalSignal;\n },\n dispose,\n get disposed() {\n return disposalSignal.aborted;\n },\n get joined() {\n return scope.joined;\n },\n get name() {\n return scope.name;\n },\n [Symbol.dispose]: dispose,\n };\n return publicScope;\n}\n\nfunction createDeadScope(name: string, hasPresence: boolean): RoomScopeBase | PresenceRoomScope {\n const disposalCtrl = new AbortController();\n disposalCtrl.abort(new PulseDisposedError());\n\n const joined = Promise.reject(new PulseDisposedError(`Room \"${name}\"`));\n joined.catch(() => {});\n\n if (hasPresence) {\n return {\n disposalSignal: disposalCtrl.signal,\n dispose() {},\n disposed: true,\n joined,\n name,\n onJoin() {\n throw new PulseDisposedError(`Room \"${name}\"`);\n },\n onLeave() {\n throw new PulseDisposedError(`Room \"${name}\"`);\n },\n presence: signal(new Map()),\n updatePresence() {\n throw new PulseDisposedError(`Room \"${name}\"`);\n },\n [Symbol.dispose]() {},\n };\n }\n\n return {\n disposalSignal: disposalCtrl.signal,\n dispose() {},\n disposed: true,\n joined,\n name,\n [Symbol.dispose]() {},\n };\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"room.js","names":[],"sources":["../src/room.ts"],"sourcesContent":["import { type Signal, signal } from '@vielzeug/ripple';\nimport { deriveAbortController } from './_utils';\nimport { PulseAbortError, PulseConnectionError, PulseDisposedError, PulseError, PulseRoomTimeoutError } from './errors';\nimport { encode } from './protocol';\nimport type { PresenceRoomScope, RoomOptions, RoomScopeBase, Unsubscribe } from './types';\n\ntype PresenceHandlers = {\n onState(members: Record<string, unknown>): void;\n onJoin(id: string, state: unknown): void;\n onLeave(id: string): void;\n reset(): void;\n};\n\ntype RoomState = {\n refs: number;\n confirmed: boolean;\n joinSent: boolean;\n leaveAfterJoin: boolean;\n localPresence: unknown | undefined;\n scopes: Set<ScopeInternal>;\n};\n\ntype ScopeInternal = {\n readonly name: string;\n readonly joined: Promise<void>;\n resolveJoined(): void;\n rejectJoined(error: PulseError): void;\n isSettled(): boolean;\n presenceHandlers?: PresenceHandlers;\n};\n\ntype RegistryOptions = {\n isOpen: () => boolean;\n send: (frame: string) => void;\n disposalSignal: AbortSignal;\n};\n\nexport type RoomRegistry = {\n readonly rooms: Signal<ReadonlySet<string>>;\n createScope(name: string, hasPresence: boolean, opts: RoomOptions | undefined): RoomScopeBase | PresenceRoomScope;\n handleJoined(room: string): void;\n handleLeft(room: string): void;\n handlePresenceState(room: string, members: Record<string, unknown>): void;\n handlePresenceJoin(room: string, id: string, state: unknown): void;\n handlePresenceLeave(room: string, id: string): void;\n restore(): void;\n reset(): void;\n rejectAll(error: PulseError): void;\n dispose(): void;\n};\n\n/**\n * Manages ref-counted room memberships, pending join tracking, and presence state.\n * @internal\n */\nexport function createRoomRegistry(opts: RegistryOptions): RoomRegistry {\n const rooms = signal<ReadonlySet<string>>(new Set());\n const states = new Map<string, RoomState>();\n\n function getOrCreate(name: string): RoomState {\n let state = states.get(name);\n\n if (!state) {\n state = {\n confirmed: false,\n joinSent: false,\n leaveAfterJoin: false,\n localPresence: undefined,\n refs: 0,\n scopes: new Set(),\n };\n states.set(name, state);\n }\n\n return state;\n }\n\n function setRoom(name: string, joined: boolean): void {\n const next = new Set(rooms.value);\n if (joined) next.add(name);\n else next.delete(name);\n rooms.value = next;\n }\n\n function sendJoin(name: string): void {\n opts.send(encode({ room: name, type: 'join' }));\n }\n\n function sendLeave(name: string): void {\n opts.send(encode({ room: name, type: 'leave' }));\n }\n\n function updatePresence(name: string, state: unknown): void {\n const roomState = states.get(name);\n if (!roomState) throw new PulseDisposedError(`Room \"${name}\"`);\n if (!opts.isOpen()) throw new PulseConnectionError('Connection is not open', name);\n opts.send(encode({ room: name, state, type: 'presence' }));\n roomState.localPresence = state;\n }\n\n function releaseScope(name: string, scope: ScopeInternal): void {\n const state = states.get(name);\n if (!state || !state.scopes.has(scope)) return;\n\n state.scopes.delete(scope);\n state.refs--;\n\n if (state.refs === 0) {\n if (state.confirmed) {\n state.confirmed = false;\n state.localPresence = undefined;\n setRoom(name, false);\n if (opts.isOpen()) sendLeave(name);\n states.delete(name);\n } else if (state.joinSent) {\n state.leaveAfterJoin = true;\n // Keep state alive until handleJoined processes the compensating leave\n } else {\n states.delete(name);\n }\n }\n }\n\n return {\n createScope(name, hasPresence, joinOpts) {\n if (opts.disposalSignal.aborted) {\n return createDeadScope(name, hasPresence);\n }\n\n const state = getOrCreate(name);\n const ctrl = deriveAbortController(opts.disposalSignal);\n\n let resolveJoined!: () => void;\n let rejectJoined!: (error: PulseError) => void;\n let settled = false;\n\n const joined = new Promise<void>((resolve, reject) => {\n resolveJoined = () => {\n if (settled) return;\n settled = true;\n clearTimeout(timeoutId);\n combined.removeEventListener('abort', onAbort);\n resolve();\n };\n rejectJoined = (error) => {\n if (settled) return;\n settled = true;\n clearTimeout(timeoutId);\n combined.removeEventListener('abort', onAbort);\n reject(error);\n };\n });\n // Suppress unhandled rejection when joined is never awaited\n joined.catch(() => {});\n\n // Timeout + abort handling\n let timeoutId: ReturnType<typeof setTimeout> | undefined;\n const signals: AbortSignal[] = [ctrl.signal];\n\n if (joinOpts?.signal) signals.push(joinOpts.signal);\n\n if (joinOpts?.timeout !== undefined) {\n const timeoutCtrl = new AbortController();\n timeoutId = setTimeout(() => timeoutCtrl.abort(new PulseRoomTimeoutError(name)), joinOpts.timeout);\n signals.push(timeoutCtrl.signal);\n }\n\n const combined = AbortSignal.any(signals);\n\n // Presence state\n let presenceSignal: Signal<Map<string, unknown>> | undefined;\n let presenceHandlers: PresenceHandlers | undefined;\n const joinHandlers = new Set<(memberId: string, state: unknown) => void>();\n const leaveHandlers = new Set<(memberId: string) => void>();\n\n if (hasPresence) {\n presenceSignal = signal(new Map<string, unknown>());\n presenceHandlers = {\n onJoin(id, memberState) {\n const next = new Map(presenceSignal!.value);\n next.set(id, memberState);\n presenceSignal!.value = next;\n for (const handler of joinHandlers) handler(id, memberState);\n },\n onLeave(id) {\n const next = new Map(presenceSignal!.value);\n next.delete(id);\n presenceSignal!.value = next;\n for (const handler of leaveHandlers) handler(id);\n },\n onState(members) {\n const next = new Map<string, unknown>();\n for (const [id, memberState] of Object.entries(members)) next.set(id, memberState);\n presenceSignal!.value = next;\n },\n reset() {\n presenceSignal!.value = new Map();\n },\n };\n }\n\n const scope: ScopeInternal = {\n isSettled: () => settled,\n joined,\n name,\n presenceHandlers,\n rejectJoined,\n resolveJoined,\n };\n\n // Abort handler — rejects joined and auto-disposes\n const onAbort = (): void => {\n clearTimeout(timeoutId);\n ctrl.abort();\n const reason = combined.reason;\n const error = reason instanceof PulseError ? reason : new PulseAbortError();\n scope.rejectJoined(error);\n releaseScope(name, scope);\n };\n\n // Register scope BEFORE setting up abort, so releaseScope is safe\n state.refs++;\n state.scopes.add(scope);\n\n if (combined.aborted) {\n onAbort();\n return buildPublicScope(scope, ctrl.signal, presenceSignal, joinHandlers, leaveHandlers, name, updatePresence);\n }\n\n combined.addEventListener('abort', onAbort, { once: true });\n\n // Start join\n if (state.confirmed) {\n scope.resolveJoined();\n } else if (!state.joinSent && opts.isOpen()) {\n state.joinSent = true;\n try {\n sendJoin(name);\n } catch (error) {\n state.joinSent = false;\n scope.rejectJoined(\n error instanceof PulseError ? error : new PulseConnectionError('Failed to send join', name),\n );\n }\n }\n\n // Build dispose function\n const disposeScope = (): void => {\n if (ctrl.signal.aborted) return;\n clearTimeout(timeoutId);\n combined.removeEventListener('abort', onAbort);\n ctrl.abort();\n if (!settled) scope.rejectJoined(new PulseDisposedError(`Room \"${name}\"`));\n releaseScope(name, scope);\n };\n\n return buildPublicScope(\n scope,\n ctrl.signal,\n presenceSignal,\n joinHandlers,\n leaveHandlers,\n name,\n updatePresence,\n disposeScope,\n );\n },\n\n dispose() {\n rooms.value = new Set();\n states.clear();\n },\n\n handleJoined(room) {\n const state = states.get(room);\n if (!state) return;\n\n state.confirmed = true;\n state.joinSent = false;\n setRoom(room, true);\n\n if (state.leaveAfterJoin) {\n state.leaveAfterJoin = false;\n state.confirmed = false;\n setRoom(room, false);\n if (opts.isOpen()) sendLeave(room);\n states.delete(room);\n return;\n }\n\n for (const scope of state.scopes) {\n if (!scope.isSettled()) scope.resolveJoined();\n }\n },\n\n handleLeft(room) {\n const state = states.get(room);\n if (!state) return;\n\n state.confirmed = false;\n state.joinSent = false;\n setRoom(room, false);\n },\n\n handlePresenceJoin(room, id, memberState) {\n const state = states.get(room);\n if (!state) return;\n for (const scope of state.scopes) scope.presenceHandlers?.onJoin(id, memberState);\n },\n\n handlePresenceLeave(room, id) {\n const state = states.get(room);\n if (!state) return;\n for (const scope of state.scopes) scope.presenceHandlers?.onLeave(id);\n },\n\n handlePresenceState(room, members) {\n const state = states.get(room);\n if (!state) return;\n for (const scope of state.scopes) scope.presenceHandlers?.onState(members);\n },\n\n rejectAll(error) {\n for (const state of states.values()) {\n for (const scope of state.scopes) {\n if (!scope.isSettled()) scope.rejectJoined(error);\n }\n }\n },\n\n reset() {\n rooms.value = new Set();\n for (const [name, state] of states) {\n if (state.refs === 0) {\n states.delete(name);\n continue;\n }\n state.confirmed = false;\n state.joinSent = false;\n for (const scope of state.scopes) scope.presenceHandlers?.reset();\n }\n },\n\n restore() {\n for (const [name, state] of states) {\n if (state.refs === 0) continue;\n\n state.confirmed = false;\n state.joinSent = true;\n\n try {\n sendJoin(name);\n } catch {\n state.joinSent = false;\n }\n\n if (state.localPresence !== undefined) {\n try {\n opts.send(encode({ room: name, state: state.localPresence, type: 'presence' }));\n } catch {\n // non-fatal; next updatePresence retries\n }\n }\n }\n },\n rooms,\n };\n}\n\nfunction buildPublicScope(\n scope: ScopeInternal,\n disposalSignal: AbortSignal,\n presenceSignal: Signal<Map<string, unknown>> | undefined,\n joinHandlers: Set<(memberId: string, state: unknown) => void>,\n leaveHandlers: Set<(memberId: string) => void>,\n name: string,\n updatePresence: (name: string, state: unknown) => void,\n disposeFn?: () => void,\n): RoomScopeBase | PresenceRoomScope {\n const dispose = disposeFn ?? (() => {});\n\n if (presenceSignal) {\n const publicScope: PresenceRoomScope = {\n get disposalSignal() {\n return disposalSignal;\n },\n dispose,\n get disposed() {\n return disposalSignal.aborted;\n },\n get joined() {\n return scope.joined;\n },\n get name() {\n return scope.name;\n },\n onJoin(handler: (memberId: string, state: unknown) => void): Unsubscribe {\n if (disposalSignal.aborted) throw new PulseDisposedError(`Room \"${name}\"`);\n joinHandlers.add(handler);\n return () => joinHandlers.delete(handler);\n },\n onLeave(handler: (memberId: string) => void): Unsubscribe {\n if (disposalSignal.aborted) throw new PulseDisposedError(`Room \"${name}\"`);\n leaveHandlers.add(handler);\n return () => leaveHandlers.delete(handler);\n },\n get presence() {\n return presenceSignal;\n },\n updatePresence(state: unknown) {\n updatePresence(name, state);\n },\n [Symbol.dispose]: dispose,\n };\n return publicScope;\n }\n\n const publicScope: RoomScopeBase = {\n get disposalSignal() {\n return disposalSignal;\n },\n dispose,\n get disposed() {\n return disposalSignal.aborted;\n },\n get joined() {\n return scope.joined;\n },\n get name() {\n return scope.name;\n },\n [Symbol.dispose]: dispose,\n };\n return publicScope;\n}\n\nfunction createDeadScope(name: string, hasPresence: boolean): RoomScopeBase | PresenceRoomScope {\n const disposalCtrl = new AbortController();\n disposalCtrl.abort(new PulseDisposedError());\n\n const joined = Promise.reject(new PulseDisposedError(`Room \"${name}\"`));\n joined.catch(() => {});\n\n if (hasPresence) {\n return {\n disposalSignal: disposalCtrl.signal,\n dispose() {},\n disposed: true,\n joined,\n name,\n onJoin() {\n throw new PulseDisposedError(`Room \"${name}\"`);\n },\n onLeave() {\n throw new PulseDisposedError(`Room \"${name}\"`);\n },\n presence: signal(new Map()),\n updatePresence() {\n throw new PulseDisposedError(`Room \"${name}\"`);\n },\n [Symbol.dispose]() {},\n };\n }\n\n return {\n disposalSignal: disposalCtrl.signal,\n dispose() {},\n disposed: true,\n joined,\n name,\n [Symbol.dispose]() {},\n };\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vielzeug/pulse",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"description": "Typed WebSocket client with channel multiplexing, presence tracking, auto-reconnect, and heartbeat",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"test": "vitest"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@vielzeug/ripple": "2.
|
|
43
|
+
"@vielzeug/ripple": "2.3.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@types/node": "^26.2.0",
|