@churchapps/apphelper 0.20.1 → 0.21.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/helpers/ConversationStore.d.ts +1 -0
- package/dist/helpers/ConversationStore.d.ts.map +1 -1
- package/dist/helpers/ConversationStore.js +14 -0
- package/dist/helpers/ConversationStore.js.map +1 -1
- package/dist/helpers/SocketHelper.d.ts +17 -1
- package/dist/helpers/SocketHelper.d.ts.map +1 -1
- package/dist/helpers/SocketHelper.js +191 -58
- package/dist/helpers/SocketHelper.js.map +1 -1
- package/dist/helpers/SubscriptionManager.d.ts +2 -1
- package/dist/helpers/SubscriptionManager.d.ts.map +1 -1
- package/dist/helpers/SubscriptionManager.js +27 -19
- package/dist/helpers/SubscriptionManager.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,6 +6,7 @@ export declare class ConversationStore {
|
|
|
6
6
|
private static listeners;
|
|
7
7
|
private static handlersRegistered;
|
|
8
8
|
private static peopleCache;
|
|
9
|
+
private static churchIds;
|
|
9
10
|
static ensureHandlers: () => void;
|
|
10
11
|
static reset: () => void;
|
|
11
12
|
static forget: (conversationId: string) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConversationStore.d.ts","sourceRoot":"","sources":["../../src/helpers/ConversationStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,qBAAqB,EAAE,gBAAgB,EAAmB,MAAM,qBAAqB,CAAC;AAGvH,KAAK,QAAQ,GAAG,CAAC,IAAI,EAAE,qBAAqB,KAAK,IAAI,CAAC;AAEtD,+FAA+F;AAC/F,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAiD;IAC7E,OAAO,CAAC,MAAM,CAAC,SAAS,CAAyC;IACjE,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAS;IAC1C,OAAO,CAAC,MAAM,CAAC,WAAW,CAA2C;
|
|
1
|
+
{"version":3,"file":"ConversationStore.d.ts","sourceRoot":"","sources":["../../src/helpers/ConversationStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,qBAAqB,EAAE,gBAAgB,EAAmB,MAAM,qBAAqB,CAAC;AAGvH,KAAK,QAAQ,GAAG,CAAC,IAAI,EAAE,qBAAqB,KAAK,IAAI,CAAC;AAEtD,+FAA+F;AAC/F,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAiD;IAC7E,OAAO,CAAC,MAAM,CAAC,SAAS,CAAyC;IACjE,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAS;IAC1C,OAAO,CAAC,MAAM,CAAC,WAAW,CAA2C;IACrE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAkC;IAE1D,MAAM,CAAC,cAAc,aA8BnB;IAEF,MAAM,CAAC,KAAK,aAKV;IAEF,MAAM,CAAC,MAAM,GAAI,gBAAgB,MAAM,KAAG,IAAI,CAI5C;IAEF,MAAM,CAAC,eAAe,GAAI,gBAAgB,MAAM,KAAG,qBAAqB,GAAG,IAAI,CAE7E;IAEF,MAAM,CAAC,eAAe,GAAI,MAAM,qBAAqB,UAKnD;IAEF,MAAM,CAAC,aAAa,GAAU,aAAa,MAAM,EAAE,WAAW,MAAM,KAAG,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAU1G;IAEF,MAAM,CAAC,oBAAoB,GAAU,gBAAgB,MAAM,EAAE,WAAW,MAAM,KAAG,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAcpH;IAEF,MAAM,CAAC,YAAY,GAAI,SAAS,gBAAgB,UAoB9C;IAEF,MAAM,CAAC,WAAW,GAAI,WAAW,MAAM,EAAE,iBAAiB,MAAM,UAe9D;IAEF,MAAM,CAAC,SAAS,GAAI,gBAAgB,MAAM,EAAE,UAAU,QAAQ,KAAG,CAAC,MAAM,IAAI,CAAC,CAgB3E;IAEF,OAAO,CAAC,MAAM,CAAC,MAAM,CAOnB;IAEF,OAAO,CAAC,MAAM,CAAC,aAAa,CAqB1B;IAEF,OAAO,CAAC,MAAM,CAAC,WAAW,CAoBxB;CACH"}
|
|
@@ -9,10 +9,20 @@ ConversationStore.conversations = new Map();
|
|
|
9
9
|
ConversationStore.listeners = new Map();
|
|
10
10
|
ConversationStore.handlersRegistered = false;
|
|
11
11
|
ConversationStore.peopleCache = new Map();
|
|
12
|
+
ConversationStore.churchIds = new Map();
|
|
12
13
|
ConversationStore.ensureHandlers = () => {
|
|
13
14
|
if (_a.handlersRegistered)
|
|
14
15
|
return;
|
|
15
16
|
_a.handlersRegistered = true;
|
|
17
|
+
SocketHelper.addHandler("reconnect", "ConversationStore-Reconnect", () => {
|
|
18
|
+
// Refetch open conversations to recover messages missed while disconnected.
|
|
19
|
+
_a.listeners.forEach((_set, conversationId) => {
|
|
20
|
+
const churchId = _a.churchIds.get(conversationId);
|
|
21
|
+
if (!ApiHelper.isAuthenticated && !churchId)
|
|
22
|
+
return; // anonymous catchup requires churchId
|
|
23
|
+
_a.loadByConversationId(conversationId, churchId).catch(() => { });
|
|
24
|
+
});
|
|
25
|
+
});
|
|
16
26
|
SocketHelper.addHandler("message", "ConversationStore-Message", (data) => {
|
|
17
27
|
const message = data?.message || data;
|
|
18
28
|
if (!message?.conversationId)
|
|
@@ -36,10 +46,12 @@ ConversationStore.reset = () => {
|
|
|
36
46
|
_a.conversations.clear();
|
|
37
47
|
_a.listeners.clear();
|
|
38
48
|
_a.peopleCache.clear();
|
|
49
|
+
_a.churchIds.clear();
|
|
39
50
|
};
|
|
40
51
|
ConversationStore.forget = (conversationId) => {
|
|
41
52
|
_a.conversations.delete(conversationId);
|
|
42
53
|
_a.listeners.delete(conversationId);
|
|
54
|
+
_a.churchIds.delete(conversationId);
|
|
43
55
|
};
|
|
44
56
|
ConversationStore.getConversation = (conversationId) => {
|
|
45
57
|
return _a.conversations.get(conversationId) ?? null;
|
|
@@ -68,6 +80,8 @@ ConversationStore.loadByConversationId = async (conversationId, churchId) => {
|
|
|
68
80
|
if (!conversationId)
|
|
69
81
|
return null;
|
|
70
82
|
_a.ensureHandlers();
|
|
83
|
+
if (churchId)
|
|
84
|
+
_a.churchIds.set(conversationId, churchId);
|
|
71
85
|
// Anonymous: unauthenticated /catchup (requires churchId); Authenticated: JWT /conversation/:id
|
|
72
86
|
const messages = ApiHelper.isAuthenticated
|
|
73
87
|
? await ApiHelper.get(`/messages/conversation/${conversationId}`, "MessagingApi")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConversationStore.js","sourceRoot":"","sources":["../../src/helpers/ConversationStore.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAA4D,MAAM,qBAAqB,CAAC;AACvH,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,+FAA+F;AAC/F,MAAM,OAAO,iBAAiB;;;AACb,+BAAa,GAAuC,IAAI,GAAG,EAAE,AAAhD,CAAiD;AAC9D,2BAAS,GAA+B,IAAI,GAAG,EAAE,AAAxC,CAAyC;AAClD,oCAAkB,GAAG,KAAK,AAAR,CAAS;AAC3B,6BAAW,GAAiC,IAAI,GAAG,EAAE,AAA1C,CAA2C;
|
|
1
|
+
{"version":3,"file":"ConversationStore.js","sourceRoot":"","sources":["../../src/helpers/ConversationStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,15 @@ export declare class SocketHelper {
|
|
|
4
4
|
static socketId: string;
|
|
5
5
|
static actionHandlers: SocketActionHandlerInterface[];
|
|
6
6
|
private static personIdChurchId;
|
|
7
|
-
private static
|
|
7
|
+
private static deliberateClose;
|
|
8
|
+
private static hadConnection;
|
|
9
|
+
private static reconnectAttempts;
|
|
10
|
+
private static reconnectTimer;
|
|
11
|
+
private static connectInFlight;
|
|
12
|
+
private static resumeListenersRegistered;
|
|
13
|
+
private static socketIdWaiters;
|
|
14
|
+
private static lastFrameAt;
|
|
15
|
+
private static probeInFlight;
|
|
8
16
|
static setPersonChurch: (pc: {
|
|
9
17
|
personId: string;
|
|
10
18
|
churchId: string;
|
|
@@ -28,11 +36,19 @@ export declare class SocketHelper {
|
|
|
28
36
|
static onSocketIdReady: (listener: (socketId: string) => void) => () => void;
|
|
29
37
|
static createAlertConnection: () => void;
|
|
30
38
|
static init: () => Promise<void>;
|
|
39
|
+
private static connect;
|
|
40
|
+
private static waitForSocketId;
|
|
41
|
+
private static scheduleReconnect;
|
|
42
|
+
private static registerResumeListeners;
|
|
43
|
+
static checkConnection: () => void;
|
|
44
|
+
private static probeConnection;
|
|
31
45
|
static addHandler: (action: string, id: string, handleMessage: (data: any) => void) => void;
|
|
32
46
|
static removeHandler: (id: string) => void;
|
|
33
47
|
static removeHandlersByAction: (action: string) => void;
|
|
34
48
|
static clearAllHandlers: () => void;
|
|
35
49
|
static handleMessage: (payload: SocketPayloadInterface) => void;
|
|
50
|
+
private static dispatchLocal;
|
|
51
|
+
private static closeSocket;
|
|
36
52
|
static cleanup: () => void;
|
|
37
53
|
static disconnect: () => void;
|
|
38
54
|
static isConnected: () => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,4BAA4B,EAAE,sBAAsB,EAAmD,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"SocketHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,4BAA4B,EAAE,sBAAsB,EAAmD,MAAM,qBAAqB,CAAC;AAMjK,qBAAa,YAAY;IACvB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;IACzB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,cAAc,EAAE,4BAA4B,EAAE,CAAM;IAC3D,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA0E;IACzG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAS;IACvC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAS;IACrC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAK;IACrC,OAAO,CAAC,MAAM,CAAC,cAAc,CAA8C;IAC3E,OAAO,CAAC,MAAM,CAAC,eAAe,CAA8B;IAC5D,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAS;IACjD,OAAO,CAAC,MAAM,CAAC,eAAe,CAAyB;IACvD,OAAO,CAAC,MAAM,CAAC,WAAW,CAAK;IAC/B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAS;IAErC,MAAM,CAAC,eAAe,GAAI,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,UAclE;IAEF,MAAM,CAAC,eAAe,QAAO;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAEjE;IAEF,MAAM,CAAC,oBAAoB,GAAI,UAAU,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,KAAK,IAAI,gBAKzJ;IAEF,OAAO,CAAC,MAAM,CAAC,eAAe,CAAiI;IAE/J,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAyC;IAEzE,MAAM,CAAC,eAAe,GAAI,UAAU,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,gBAK5D;IAEF,MAAM,CAAC,qBAAqB,aAa1B;IAEF,MAAM,CAAC,IAAI,sBAUT;IAGF,OAAO,CAAC,MAAM,CAAC,OAAO,CA+CpB;IAEF,OAAO,CAAC,MAAM,CAAC,eAAe,CAgB3B;IAEH,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAS9B;IAEF,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAWpC;IAEF,MAAM,CAAC,eAAe,aAYpB;IAGF,OAAO,CAAC,MAAM,CAAC,eAAe,CAgB5B;IAEF,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,UAOjF;IAEF,MAAM,CAAC,aAAa,GAAI,IAAI,MAAM,UAEhC;IAEF,MAAM,CAAC,sBAAsB,GAAI,QAAQ,MAAM,UAE7C;IAEF,MAAM,CAAC,gBAAgB,aAErB;IAEF,MAAM,CAAC,aAAa,GAAI,SAAS,sBAAsB,UA6BrD;IAEF,OAAO,CAAC,MAAM,CAAC,aAAa,CAS1B;IAEF,OAAO,CAAC,MAAM,CAAC,WAAW,CAQxB;IAEF,MAAM,CAAC,OAAO,aAcZ;IAEF,MAAM,CAAC,UAAU,aAEf;IAEF,MAAM,CAAC,WAAW,QAAO,OAAO,CAE9B;IAEF,MAAM,CAAC,kBAAkB,QAAO,MAAM,CAUpC;IAEF,MAAM,CAAC,kBAAkB,mBAWvB;CAEH"}
|
|
@@ -1,11 +1,22 @@
|
|
|
1
1
|
var _a;
|
|
2
2
|
import { ApiHelper, ArrayHelper, CommonEnvironmentHelper } from "@churchapps/helpers";
|
|
3
|
+
const HANDSHAKE_TIMEOUT_MS = 5000;
|
|
4
|
+
const PROBE_TIMEOUT_MS = 3000;
|
|
5
|
+
const MAX_BACKOFF_MS = 30000;
|
|
3
6
|
export class SocketHelper {
|
|
4
7
|
}
|
|
5
8
|
_a = SocketHelper;
|
|
6
9
|
SocketHelper.actionHandlers = [];
|
|
7
10
|
SocketHelper.personIdChurchId = { personId: "", churchId: "" };
|
|
8
|
-
SocketHelper.
|
|
11
|
+
SocketHelper.deliberateClose = false;
|
|
12
|
+
SocketHelper.hadConnection = false;
|
|
13
|
+
SocketHelper.reconnectAttempts = 0;
|
|
14
|
+
SocketHelper.reconnectTimer = null;
|
|
15
|
+
SocketHelper.connectInFlight = null;
|
|
16
|
+
SocketHelper.resumeListenersRegistered = false;
|
|
17
|
+
SocketHelper.socketIdWaiters = [];
|
|
18
|
+
SocketHelper.lastFrameAt = 0;
|
|
19
|
+
SocketHelper.probeInFlight = false;
|
|
9
20
|
SocketHelper.setPersonChurch = (pc) => {
|
|
10
21
|
if (!pc?.personId || !pc?.churchId)
|
|
11
22
|
return;
|
|
@@ -48,67 +59,163 @@ SocketHelper.createAlertConnection = () => {
|
|
|
48
59
|
const connection = {
|
|
49
60
|
conversationId: "alerts",
|
|
50
61
|
churchId: _a.personIdChurchId.churchId,
|
|
51
|
-
displayName: "
|
|
62
|
+
displayName: "",
|
|
52
63
|
socketId: _a.socketId,
|
|
53
64
|
personId: _a.personIdChurchId.personId
|
|
54
65
|
};
|
|
55
|
-
ApiHelper.postAnonymous("/connections", [connection], "MessagingApi")
|
|
66
|
+
ApiHelper.postAnonymous("/connections", [connection], "MessagingApi")
|
|
67
|
+
.catch((err) => console.warn("SocketHelper.createAlertConnection failed:", err));
|
|
56
68
|
}
|
|
57
69
|
};
|
|
58
70
|
SocketHelper.init = async () => {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
return resolve();
|
|
68
|
-
if (Date.now() - start > 3000)
|
|
69
|
-
return resolve();
|
|
70
|
-
setTimeout(tick, 50);
|
|
71
|
-
};
|
|
72
|
-
tick();
|
|
73
|
-
});
|
|
71
|
+
_a.deliberateClose = false;
|
|
72
|
+
_a.registerResumeListeners();
|
|
73
|
+
if (_a.isConnected() && _a.socketId)
|
|
74
|
+
return;
|
|
75
|
+
if (_a.connectInFlight)
|
|
76
|
+
return _a.connectInFlight;
|
|
77
|
+
if (_a.socket && _a.socket.readyState === _a.socket.CONNECTING) {
|
|
78
|
+
await _a.waitForSocketId(HANDSHAKE_TIMEOUT_MS);
|
|
74
79
|
if (_a.socketId)
|
|
75
80
|
return;
|
|
76
81
|
}
|
|
77
|
-
_a.
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
82
|
+
await _a.connect();
|
|
83
|
+
};
|
|
84
|
+
// Resolves once the handshake completes (or the retry loop has taken over); never rejects.
|
|
85
|
+
SocketHelper.connect = () => {
|
|
86
|
+
if (_a.connectInFlight)
|
|
87
|
+
return _a.connectInFlight;
|
|
88
|
+
const promise = new Promise((resolve) => {
|
|
89
|
+
let settled = false;
|
|
90
|
+
const finish = () => {
|
|
91
|
+
if (settled)
|
|
92
|
+
return;
|
|
93
|
+
settled = true;
|
|
94
|
+
resolve();
|
|
95
|
+
};
|
|
86
96
|
try {
|
|
87
|
-
_a.
|
|
88
|
-
|
|
89
|
-
|
|
97
|
+
_a.closeSocket();
|
|
98
|
+
const ws = new WebSocket(CommonEnvironmentHelper.MessagingApiSocket);
|
|
99
|
+
_a.socket = ws;
|
|
100
|
+
_a.socketId = null;
|
|
101
|
+
ws.onmessage = (event) => {
|
|
102
|
+
if (ws !== _a.socket)
|
|
90
103
|
return;
|
|
104
|
+
_a.lastFrameAt = Date.now();
|
|
91
105
|
try {
|
|
92
|
-
|
|
93
|
-
_a.handleMessage(payload);
|
|
106
|
+
_a.handleMessage(JSON.parse(event.data));
|
|
94
107
|
}
|
|
95
108
|
catch { /* ignore parse errors */ }
|
|
96
109
|
};
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
110
|
+
ws.onopen = () => {
|
|
111
|
+
ws.send("getId");
|
|
112
|
+
_a.waitForSocketId(HANDSHAKE_TIMEOUT_MS).then(() => {
|
|
113
|
+
if (!_a.socketId)
|
|
114
|
+
_a.scheduleReconnect();
|
|
115
|
+
finish();
|
|
116
|
+
});
|
|
102
117
|
};
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
118
|
+
ws.onclose = () => {
|
|
119
|
+
if (ws !== _a.socket)
|
|
120
|
+
return;
|
|
121
|
+
_a.socketId = null;
|
|
122
|
+
if (!_a.deliberateClose)
|
|
123
|
+
_a.scheduleReconnect();
|
|
124
|
+
finish();
|
|
106
125
|
};
|
|
126
|
+
ws.onerror = () => { };
|
|
107
127
|
}
|
|
108
128
|
catch (error) {
|
|
109
|
-
|
|
129
|
+
console.error("SocketHelper.connect failed:", error);
|
|
130
|
+
_a.scheduleReconnect();
|
|
131
|
+
finish();
|
|
110
132
|
}
|
|
111
133
|
});
|
|
134
|
+
_a.connectInFlight = promise.finally(() => { _a.connectInFlight = null; });
|
|
135
|
+
return _a.connectInFlight;
|
|
136
|
+
};
|
|
137
|
+
SocketHelper.waitForSocketId = (timeoutMs) => new Promise((resolve) => {
|
|
138
|
+
if (_a.socketId)
|
|
139
|
+
return resolve();
|
|
140
|
+
let done = false;
|
|
141
|
+
const waiter = () => {
|
|
142
|
+
if (done)
|
|
143
|
+
return;
|
|
144
|
+
done = true;
|
|
145
|
+
clearTimeout(timer);
|
|
146
|
+
resolve();
|
|
147
|
+
};
|
|
148
|
+
const timer = setTimeout(() => {
|
|
149
|
+
if (done)
|
|
150
|
+
return;
|
|
151
|
+
done = true;
|
|
152
|
+
_a.socketIdWaiters = _a.socketIdWaiters.filter(w => w !== waiter);
|
|
153
|
+
resolve();
|
|
154
|
+
}, timeoutMs);
|
|
155
|
+
_a.socketIdWaiters.push(waiter);
|
|
156
|
+
});
|
|
157
|
+
SocketHelper.scheduleReconnect = () => {
|
|
158
|
+
if (_a.deliberateClose || _a.reconnectTimer)
|
|
159
|
+
return;
|
|
160
|
+
const delay = Math.min(MAX_BACKOFF_MS, 1000 * Math.pow(2, _a.reconnectAttempts));
|
|
161
|
+
_a.reconnectAttempts++;
|
|
162
|
+
_a.reconnectTimer = setTimeout(() => {
|
|
163
|
+
_a.reconnectTimer = null;
|
|
164
|
+
if (_a.deliberateClose || _a.isConnected())
|
|
165
|
+
return;
|
|
166
|
+
_a.connect();
|
|
167
|
+
}, delay);
|
|
168
|
+
};
|
|
169
|
+
SocketHelper.registerResumeListeners = () => {
|
|
170
|
+
if (_a.resumeListenersRegistered || typeof window === "undefined")
|
|
171
|
+
return;
|
|
172
|
+
_a.resumeListenersRegistered = true;
|
|
173
|
+
const onResume = () => {
|
|
174
|
+
if (typeof document !== "undefined" && document.visibilityState !== "visible")
|
|
175
|
+
return;
|
|
176
|
+
_a.checkConnection();
|
|
177
|
+
};
|
|
178
|
+
window.addEventListener("online", onResume);
|
|
179
|
+
window.addEventListener("focus", onResume);
|
|
180
|
+
window.addEventListener("pageshow", onResume);
|
|
181
|
+
if (typeof document !== "undefined")
|
|
182
|
+
document.addEventListener("visibilitychange", onResume);
|
|
183
|
+
};
|
|
184
|
+
SocketHelper.checkConnection = () => {
|
|
185
|
+
if (_a.deliberateClose)
|
|
186
|
+
return;
|
|
187
|
+
if (!_a.isConnected()) {
|
|
188
|
+
if (_a.reconnectTimer) {
|
|
189
|
+
clearTimeout(_a.reconnectTimer);
|
|
190
|
+
_a.reconnectTimer = null;
|
|
191
|
+
}
|
|
192
|
+
_a.reconnectAttempts = 0;
|
|
193
|
+
_a.connect();
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
_a.probeConnection();
|
|
197
|
+
};
|
|
198
|
+
// OS suspend can leave readyState OPEN on a dead TCP link; verify with a getId echo.
|
|
199
|
+
SocketHelper.probeConnection = () => {
|
|
200
|
+
if (_a.probeInFlight)
|
|
201
|
+
return;
|
|
202
|
+
_a.probeInFlight = true;
|
|
203
|
+
const before = _a.lastFrameAt;
|
|
204
|
+
try {
|
|
205
|
+
_a.socket.send("getId");
|
|
206
|
+
}
|
|
207
|
+
catch {
|
|
208
|
+
_a.probeInFlight = false;
|
|
209
|
+
_a.connect();
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
212
|
+
setTimeout(() => {
|
|
213
|
+
_a.probeInFlight = false;
|
|
214
|
+
if (_a.deliberateClose)
|
|
215
|
+
return;
|
|
216
|
+
if (_a.lastFrameAt === before)
|
|
217
|
+
_a.connect();
|
|
218
|
+
}, PROBE_TIMEOUT_MS);
|
|
112
219
|
};
|
|
113
220
|
SocketHelper.addHandler = (action, id, handleMessage) => {
|
|
114
221
|
const existing = ArrayHelper.getOne(_a.actionHandlers, "id", id);
|
|
@@ -129,24 +236,28 @@ SocketHelper.clearAllHandlers = () => {
|
|
|
129
236
|
_a.actionHandlers = [];
|
|
130
237
|
};
|
|
131
238
|
SocketHelper.handleMessage = (payload) => {
|
|
132
|
-
if (_a.isCleanedUp)
|
|
133
|
-
return;
|
|
134
239
|
try {
|
|
135
240
|
if (payload.action === "socketId") {
|
|
136
241
|
const previousId = _a.socketId;
|
|
137
242
|
_a.socketId = payload.data;
|
|
243
|
+
const waiters = _a.socketIdWaiters;
|
|
244
|
+
_a.socketIdWaiters = [];
|
|
245
|
+
waiters.forEach(w => w());
|
|
246
|
+
if (payload.data === previousId)
|
|
247
|
+
return; // liveness probe echo
|
|
248
|
+
_a.reconnectAttempts = 0;
|
|
138
249
|
_a.createAlertConnection();
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
250
|
+
_a.socketIdListeners.forEach((cb) => {
|
|
251
|
+
try {
|
|
252
|
+
cb(payload.data);
|
|
253
|
+
}
|
|
254
|
+
catch (err) {
|
|
255
|
+
console.error("SocketHelper socketId listener error:", err);
|
|
256
|
+
}
|
|
257
|
+
});
|
|
258
|
+
if (_a.hadConnection)
|
|
259
|
+
_a.dispatchLocal("reconnect");
|
|
260
|
+
_a.hadConnection = true;
|
|
150
261
|
}
|
|
151
262
|
else {
|
|
152
263
|
const matchingHandlers = ArrayHelper.getAll(_a.actionHandlers, "action", payload.action);
|
|
@@ -164,14 +275,36 @@ SocketHelper.handleMessage = (payload) => {
|
|
|
164
275
|
console.error("Error handling socket message:", error);
|
|
165
276
|
}
|
|
166
277
|
};
|
|
167
|
-
SocketHelper.
|
|
168
|
-
_a.
|
|
169
|
-
|
|
278
|
+
SocketHelper.dispatchLocal = (action) => {
|
|
279
|
+
const handlers = ArrayHelper.getAll(_a.actionHandlers, "action", action);
|
|
280
|
+
handlers.forEach((handler) => {
|
|
170
281
|
try {
|
|
171
|
-
|
|
282
|
+
handler.handleMessage(null);
|
|
283
|
+
}
|
|
284
|
+
catch (error) {
|
|
285
|
+
console.error(`Error in handler ${handler.id}:`, error);
|
|
286
|
+
}
|
|
287
|
+
});
|
|
288
|
+
};
|
|
289
|
+
SocketHelper.closeSocket = () => {
|
|
290
|
+
const ws = _a.socket;
|
|
291
|
+
if (ws && ws.readyState !== ws.CLOSED) {
|
|
292
|
+
try {
|
|
293
|
+
ws.onclose = null;
|
|
294
|
+
ws.close();
|
|
172
295
|
}
|
|
173
296
|
catch { /* ignore */ }
|
|
174
297
|
}
|
|
298
|
+
};
|
|
299
|
+
SocketHelper.cleanup = () => {
|
|
300
|
+
_a.deliberateClose = true;
|
|
301
|
+
if (_a.reconnectTimer) {
|
|
302
|
+
clearTimeout(_a.reconnectTimer);
|
|
303
|
+
_a.reconnectTimer = null;
|
|
304
|
+
}
|
|
305
|
+
_a.reconnectAttempts = 0;
|
|
306
|
+
_a.hadConnection = false;
|
|
307
|
+
_a.closeSocket();
|
|
175
308
|
// Preserve handlers across reconnects.
|
|
176
309
|
_a.socket = null;
|
|
177
310
|
_a.socketId = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketHelper.js","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SocketHelper.js","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/** Tracks conversation room subscriptions via ref-counted WebSocket connections. */
|
|
2
2
|
export declare class SubscriptionManager {
|
|
3
|
-
private static
|
|
3
|
+
private static rooms;
|
|
4
4
|
private static rejoinHandlerRegistered;
|
|
5
|
+
private static lastRejoinSocketId;
|
|
5
6
|
static setupRejoin: () => void;
|
|
6
7
|
static joinRoom: (conversationId: string, churchId: string, personId?: string, displayName?: string) => Promise<void>;
|
|
7
8
|
private static pendingLeaves;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionManager.d.ts","sourceRoot":"","sources":["../../src/helpers/SubscriptionManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SubscriptionManager.d.ts","sourceRoot":"","sources":["../../src/helpers/SubscriptionManager.ts"],"names":[],"mappings":"AAKA,oFAAoF;AACpF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAqC;IACzD,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAS;IAC/C,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAuB;IAExD,MAAM,CAAC,WAAW,aAahB;IAEF,MAAM,CAAC,QAAQ,GAAU,gBAAgB,MAAM,EAAE,UAAU,MAAM,EAAE,WAAW,MAAM,EAAE,cAAc,MAAM,mBAUxG;IAGF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAyD;IACrF,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAO;IAEvC,MAAM,CAAC,SAAS,GAAU,gBAAgB,MAAM,EAAE,UAAU,MAAM,mBAoBhE;IAEF,MAAM,CAAC,SAAS,sBAQd;IAEF,MAAM,CAAC,KAAK,aAKV;IAEF,MAAM,CAAC,QAAQ,GAAI,UAAU,MAAM,EAAE,gBAAgB,MAAM,KAAG,OAAO,CAEnE;IAEF,OAAO,CAAC,MAAM,CAAC,cAAc,CAc3B;IAEF,OAAO,CAAC,MAAM,CAAC,GAAG,CAAiF;CACpG"}
|
|
@@ -5,8 +5,9 @@ import { SocketHelper } from "./SocketHelper";
|
|
|
5
5
|
export class SubscriptionManager {
|
|
6
6
|
}
|
|
7
7
|
_a = SubscriptionManager;
|
|
8
|
-
SubscriptionManager.
|
|
8
|
+
SubscriptionManager.rooms = new Map();
|
|
9
9
|
SubscriptionManager.rejoinHandlerRegistered = false;
|
|
10
|
+
SubscriptionManager.lastRejoinSocketId = null;
|
|
10
11
|
SubscriptionManager.setupRejoin = () => {
|
|
11
12
|
if (_a.rejoinHandlerRegistered)
|
|
12
13
|
return;
|
|
@@ -24,33 +25,36 @@ SubscriptionManager.setupRejoin = () => {
|
|
|
24
25
|
};
|
|
25
26
|
SubscriptionManager.joinRoom = async (conversationId, churchId, personId, displayName) => {
|
|
26
27
|
const key = _a.key(churchId, conversationId);
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
if (
|
|
28
|
+
const room = _a.rooms.get(key) ?? { count: 0 };
|
|
29
|
+
room.count++;
|
|
30
|
+
if (personId)
|
|
31
|
+
room.personId = personId;
|
|
32
|
+
if (displayName)
|
|
33
|
+
room.displayName = displayName;
|
|
34
|
+
_a.rooms.set(key, room);
|
|
35
|
+
if (room.count > 1)
|
|
30
36
|
return; // already joined
|
|
31
37
|
_a.setupRejoin();
|
|
32
|
-
await _a.postConnection(conversationId, churchId, personId, displayName);
|
|
38
|
+
await _a.postConnection(conversationId, churchId, room.personId, room.displayName);
|
|
33
39
|
};
|
|
34
40
|
// Debounce DELETE to avoid race where broadcast lands between DELETE and next POST (React StrictMode).
|
|
35
41
|
SubscriptionManager.pendingLeaves = new Map();
|
|
36
42
|
SubscriptionManager.LEAVE_DEBOUNCE_MS = 300;
|
|
37
43
|
SubscriptionManager.leaveRoom = async (conversationId, churchId) => {
|
|
38
44
|
const key = _a.key(churchId, conversationId);
|
|
39
|
-
const
|
|
40
|
-
if (
|
|
45
|
+
const room = _a.rooms.get(key);
|
|
46
|
+
if (!room || room.count <= 0)
|
|
41
47
|
return;
|
|
42
|
-
|
|
43
|
-
if (
|
|
44
|
-
_a.counts.set(key, next);
|
|
48
|
+
room.count--;
|
|
49
|
+
if (room.count > 0)
|
|
45
50
|
return;
|
|
46
|
-
|
|
47
|
-
_a.counts.delete(key);
|
|
51
|
+
_a.rooms.delete(key);
|
|
48
52
|
const existing = _a.pendingLeaves.get(key);
|
|
49
53
|
if (existing)
|
|
50
54
|
clearTimeout(existing);
|
|
51
55
|
const timer = setTimeout(async () => {
|
|
52
56
|
_a.pendingLeaves.delete(key);
|
|
53
|
-
if ((_a.
|
|
57
|
+
if ((_a.rooms.get(key)?.count ?? 0) > 0)
|
|
54
58
|
return;
|
|
55
59
|
if (!SocketHelper.socketId)
|
|
56
60
|
return;
|
|
@@ -64,19 +68,23 @@ SubscriptionManager.leaveRoom = async (conversationId, churchId) => {
|
|
|
64
68
|
_a.pendingLeaves.set(key, timer);
|
|
65
69
|
};
|
|
66
70
|
SubscriptionManager.rejoinAll = async () => {
|
|
67
|
-
if (!SocketHelper.socketId)
|
|
71
|
+
if (!SocketHelper.socketId || SocketHelper.socketId === _a.lastRejoinSocketId)
|
|
68
72
|
return;
|
|
69
|
-
|
|
70
|
-
|
|
73
|
+
_a.lastRejoinSocketId = SocketHelper.socketId;
|
|
74
|
+
const entries = Array.from(_a.rooms.entries());
|
|
75
|
+
await Promise.all(entries.map(([key, room]) => {
|
|
71
76
|
const [churchId, conversationId] = key.split("|");
|
|
72
|
-
return _a.postConnection(conversationId, churchId);
|
|
77
|
+
return _a.postConnection(conversationId, churchId, room.personId, room.displayName);
|
|
73
78
|
}));
|
|
74
79
|
};
|
|
75
80
|
SubscriptionManager.reset = () => {
|
|
76
|
-
_a.
|
|
81
|
+
_a.rooms.clear();
|
|
82
|
+
_a.pendingLeaves.forEach(timer => clearTimeout(timer));
|
|
83
|
+
_a.pendingLeaves.clear();
|
|
84
|
+
_a.lastRejoinSocketId = null;
|
|
77
85
|
};
|
|
78
86
|
SubscriptionManager.isJoined = (churchId, conversationId) => {
|
|
79
|
-
return (_a.
|
|
87
|
+
return (_a.rooms.get(_a.key(churchId, conversationId))?.count ?? 0) > 0;
|
|
80
88
|
};
|
|
81
89
|
SubscriptionManager.postConnection = async (conversationId, churchId, personId, displayName) => {
|
|
82
90
|
if (!SocketHelper.socketId)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionManager.js","sourceRoot":"","sources":["../../src/helpers/SubscriptionManager.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAuB,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"SubscriptionManager.js","sourceRoot":"","sources":["../../src/helpers/SubscriptionManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apphelper",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.0",
|
|
4
4
|
"description": "Library of helper functions, components, and feature modules (donations/forms/login/markdown/website) for React and NextJS ChurchApps",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|