@churchapps/apphelper 0.6.3 → 0.6.5
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/components/header/SupportDrawer.js +1 -1
- package/dist/components/header/SupportDrawer.js.map +1 -1
- package/dist/helpers/SocketHelper.d.ts.map +1 -1
- package/dist/helpers/SocketHelper.js +9 -63
- package/dist/helpers/SocketHelper.js.map +1 -1
- package/package.json +1 -1
- package/src/components/header/SupportDrawer.tsx +1 -1
- package/src/helpers/SocketHelper.ts +9 -73
|
@@ -41,6 +41,6 @@ export const SupportDrawer = (props) => {
|
|
|
41
41
|
const lastPart = parts[parts.length - 1];
|
|
42
42
|
const result = lastPart.replace("-", " ");
|
|
43
43
|
return (_jsx(ListItem, { disablePadding: true, children: _jsxs(ListItemButton, { href: supportHref + a, target: "_blank", rel: "noopener noreferrer", children: [_jsx(ListItemIcon, { sx: { minWidth: "35px" }, children: _jsx(Icon, { sx: { color: "#568bda" }, children: "play_circle" }) }), _jsx(ListItemText, { children: _jsx(Typography, { sx: { color: "#568bda", textTransform: "capitalize" }, fontSize: "15px", children: result }) })] }) }));
|
|
44
|
-
}) })] })) : null] }), _jsxs(Box, { sx: { marginRight: 4, marginLeft: 4, marginTop: "auto" }, children: [_jsx("hr", { style: { color: "#568bda", borderColor: "#568bda", marginLeft: -13, marginRight: -13 } }), _jsxs(Box, { sx: { display: "flex", alignItems: "center", justifyContent: "center", color: "#568bda", marginBottom: 1.5, marginTop: 1.5 }, children: [_jsx(Avatar, { src: "https://avatars.githubusercontent.com/u/74469593?s=200&v=4", variant: "rounded", sx: { width: 25, height: 25, marginRight: 1 }, children: "C" }), _jsx(Typography, { children: "ChurchApps" })] }), _jsxs(Box, { sx: { display: "flex", justifyContent: "space-between", alignItems: "center", gap: 4, marginBottom: 1 }, children: [_jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(Icon, { fontSize: "small", children: "mail" }), fullWidth: true, sx: { backgroundColor: "#568bda" }, href: "mailto:support@
|
|
44
|
+
}) })] })) : null] }), _jsxs(Box, { sx: { marginRight: 4, marginLeft: 4, marginTop: "auto" }, children: [_jsx("hr", { style: { color: "#568bda", borderColor: "#568bda", marginLeft: -13, marginRight: -13 } }), _jsxs(Box, { sx: { display: "flex", alignItems: "center", justifyContent: "center", color: "#568bda", marginBottom: 1.5, marginTop: 1.5 }, children: [_jsx(Avatar, { src: "https://avatars.githubusercontent.com/u/74469593?s=200&v=4", variant: "rounded", sx: { width: 25, height: 25, marginRight: 1 }, children: "C" }), _jsx(Typography, { children: "ChurchApps" })] }), _jsxs(Box, { sx: { display: "flex", justifyContent: "space-between", alignItems: "center", gap: 4, marginBottom: 1 }, children: [_jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(Icon, { fontSize: "small", children: "mail" }), fullWidth: true, sx: { backgroundColor: "#568bda" }, href: "mailto:support@churchapps.org", children: "Support" }), _jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(Icon, { fontSize: "small", children: "forum" }), fullWidth: true, sx: { backgroundColor: "#568bda" }, href: "https://github.com/orgs/ChurchApps/discussions", target: "_blank", rel: "noopener noreferrer", children: "Forum" })] })] })] }) })] }));
|
|
45
45
|
};
|
|
46
46
|
//# sourceMappingURL=SupportDrawer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SupportDrawer.js","sourceRoot":"","sources":["../../../src/components/header/SupportDrawer.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SupportDrawer.js","sourceRoot":"","sources":["../../../src/components/header/SupportDrawer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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;AAEjK,qBAAa,YAAY;IACxB,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,WAAW,CAAkB;IAE5C,MAAM,CAAC,eAAe,GAAI,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,UAOnE;IAED,MAAM,CAAC,qBAAqB,
|
|
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;AAEjK,qBAAa,YAAY;IACxB,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,WAAW,CAAkB;IAE5C,MAAM,CAAC,eAAe,GAAI,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,UAOnE;IAED,MAAM,CAAC,qBAAqB,aAY3B;IAED,MAAM,CAAC,IAAI,sBAyCV;IAED,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,UAOlF;IAED,MAAM,CAAC,aAAa,GAAI,IAAI,MAAM,UAEjC;IAED,MAAM,CAAC,sBAAsB,GAAI,QAAQ,MAAM,UAE9C;IAED,MAAM,CAAC,gBAAgB,aAEtB;IAED,MAAM,CAAC,aAAa,GAAI,SAAS,sBAAsB,UAqBtD;IAED,MAAM,CAAC,OAAO,aAcb;IAED,MAAM,CAAC,UAAU,aAEhB;IAED,MAAM,CAAC,WAAW,QAAO,OAAO,CAE/B;IAED,MAAM,CAAC,kBAAkB,QAAO,MAAM,CAerC;IAGD,MAAM,CAAC,kBAAkB,mBAmBxB;CAED"}
|
|
@@ -23,23 +23,7 @@ SocketHelper.createAlertConnection = () => {
|
|
|
23
23
|
socketId: _a.socketId,
|
|
24
24
|
personId: _a.personIdChurchId.personId
|
|
25
25
|
};
|
|
26
|
-
ApiHelper.postAnonymous("/connections", [connection], "MessagingApi")
|
|
27
|
-
}).catch((error) => {
|
|
28
|
-
console.error("❌ Failed to create alert connection:", error);
|
|
29
|
-
console.error("❌ Error details:", {
|
|
30
|
-
status: error.status,
|
|
31
|
-
message: error.message,
|
|
32
|
-
response: error.response
|
|
33
|
-
});
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
console.warn('⚠️ SocketHelper: Cannot create alert connection - missing data:', {
|
|
38
|
-
hasPersonId: !!_a.personIdChurchId.personId,
|
|
39
|
-
hasSocketId: !!_a.socketId,
|
|
40
|
-
personId: _a.personIdChurchId.personId,
|
|
41
|
-
socketId: _a.socketId
|
|
42
|
-
});
|
|
26
|
+
ApiHelper.postAnonymous("/connections", [connection], "MessagingApi");
|
|
43
27
|
}
|
|
44
28
|
};
|
|
45
29
|
SocketHelper.init = async () => {
|
|
@@ -49,67 +33,32 @@ SocketHelper.init = async () => {
|
|
|
49
33
|
try {
|
|
50
34
|
_a.socket.close();
|
|
51
35
|
}
|
|
52
|
-
catch
|
|
53
|
-
console.error("❌ Error closing existing socket:", e);
|
|
54
|
-
}
|
|
36
|
+
catch { /* ignore */ }
|
|
55
37
|
}
|
|
56
38
|
await new Promise((resolve, reject) => {
|
|
57
|
-
let hasReceivedSocketId = false;
|
|
58
|
-
let messageCount = 0;
|
|
59
39
|
try {
|
|
60
40
|
_a.socket = new WebSocket(CommonEnvironmentHelper.MessagingApiSocket);
|
|
61
41
|
_a.socket.onmessage = (event) => {
|
|
62
42
|
if (_a.isCleanedUp)
|
|
63
43
|
return;
|
|
64
|
-
messageCount++;
|
|
65
44
|
try {
|
|
66
45
|
const payload = JSON.parse(event.data);
|
|
67
|
-
if (payload.action === 'socketId') {
|
|
68
|
-
hasReceivedSocketId = true;
|
|
69
|
-
}
|
|
70
|
-
// Log all message types we receive
|
|
71
|
-
switch (payload.action) {
|
|
72
|
-
case 'socketId':
|
|
73
|
-
break;
|
|
74
|
-
case 'privateMessage':
|
|
75
|
-
break;
|
|
76
|
-
case 'notification':
|
|
77
|
-
break;
|
|
78
|
-
case 'message':
|
|
79
|
-
break;
|
|
80
|
-
case 'reconnect':
|
|
81
|
-
break;
|
|
82
|
-
default:
|
|
83
|
-
}
|
|
84
46
|
_a.handleMessage(payload);
|
|
85
47
|
}
|
|
86
|
-
catch
|
|
87
|
-
console.error("❌ Error parsing socket message:", error);
|
|
88
|
-
console.error("❌ Raw message was:", event.data);
|
|
89
|
-
}
|
|
48
|
+
catch { /* ignore parse errors */ }
|
|
90
49
|
};
|
|
91
|
-
_a.socket.onopen = async (
|
|
92
|
-
// Send the getId request
|
|
50
|
+
_a.socket.onopen = async () => {
|
|
93
51
|
_a.socket.send("getId");
|
|
94
|
-
// Wait longer to see if we get a response
|
|
95
52
|
setTimeout(() => {
|
|
96
|
-
if (!hasReceivedSocketId) {
|
|
97
|
-
console.warn('⚠️ SocketHelper: No socket ID received after 3 seconds');
|
|
98
|
-
}
|
|
99
53
|
resolve(null);
|
|
100
54
|
}, 3000);
|
|
101
55
|
};
|
|
102
|
-
_a.socket.onclose = async (
|
|
103
|
-
// Socket closed
|
|
104
|
-
};
|
|
56
|
+
_a.socket.onclose = async () => { };
|
|
105
57
|
_a.socket.onerror = (error) => {
|
|
106
|
-
console.error('❌ SocketHelper: WebSocket connection error:', error);
|
|
107
|
-
console.error('❌ SocketHelper: Messages received before error:', messageCount);
|
|
108
58
|
reject(error);
|
|
109
59
|
};
|
|
110
60
|
}
|
|
111
61
|
catch (error) {
|
|
112
|
-
console.error('❌ SocketHelper: Error initializing socket:', error);
|
|
113
62
|
reject(error);
|
|
114
63
|
}
|
|
115
64
|
});
|
|
@@ -147,13 +96,13 @@ SocketHelper.handleMessage = (payload) => {
|
|
|
147
96
|
handler.handleMessage(payload.data);
|
|
148
97
|
}
|
|
149
98
|
catch (error) {
|
|
150
|
-
console.error(
|
|
99
|
+
console.error(`Error in handler ${handler.id}:`, error);
|
|
151
100
|
}
|
|
152
101
|
});
|
|
153
102
|
}
|
|
154
103
|
}
|
|
155
104
|
catch (error) {
|
|
156
|
-
console.error("
|
|
105
|
+
console.error("Error handling socket message:", error);
|
|
157
106
|
}
|
|
158
107
|
};
|
|
159
108
|
SocketHelper.cleanup = () => {
|
|
@@ -163,14 +112,11 @@ SocketHelper.cleanup = () => {
|
|
|
163
112
|
try {
|
|
164
113
|
_a.socket.close();
|
|
165
114
|
}
|
|
166
|
-
catch
|
|
167
|
-
console.error("Error closing socket:", error);
|
|
168
|
-
}
|
|
115
|
+
catch { /* ignore */ }
|
|
169
116
|
}
|
|
170
|
-
// Clear references
|
|
117
|
+
// Clear references but preserve handlers - they should persist across reconnects
|
|
171
118
|
_a.socket = null;
|
|
172
119
|
_a.socketId = null;
|
|
173
|
-
_a.actionHandlers = [];
|
|
174
120
|
_a.personIdChurchId = { personId: "", churchId: "" };
|
|
175
121
|
};
|
|
176
122
|
SocketHelper.disconnect = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketHelper.js","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":";AAAA,OAAO,EAA6E,SAAS,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAEjK,MAAM,OAAO,YAAY;;;AAGjB,2BAAc,GAAmC,EAAE,AAArC,CAAsC;AAC5C,6BAAgB,GAA2C,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,AAAzE,CAA0E;AAC1F,wBAAW,GAAY,KAAK,AAAjB,CAAkB;AAErC,4BAAe,GAAG,CAAC,EAA0C,EAAE,EAAE;IAEvE,IAAI,EAAE,EAAE,QAAQ,IAAI,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,KAAK,EAAI,CAAC,gBAAgB,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ,KAAK,EAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;QACrI,EAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,EAAI,CAAC,qBAAqB,EAAE,CAAC;IAC9B,CAAC;SAAM,CAAC;IACR,CAAC;AACF,CAAC,AAPqB,CAOrB;AAEM,kCAAqB,GAAG,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"SocketHelper.js","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -101,7 +101,7 @@ export const SupportDrawer = (props: Props) => {
|
|
|
101
101
|
<Typography>ChurchApps</Typography>
|
|
102
102
|
</Box>
|
|
103
103
|
<Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center", gap: 4, marginBottom: 1 }}>
|
|
104
|
-
<Button variant="contained" size="small" startIcon={<Icon fontSize="small">mail</Icon>} fullWidth sx={{ backgroundColor: "#568bda" }} href="mailto:support@
|
|
104
|
+
<Button variant="contained" size="small" startIcon={<Icon fontSize="small">mail</Icon>} fullWidth sx={{ backgroundColor: "#568bda" }} href="mailto:support@churchapps.org">Support</Button>
|
|
105
105
|
<Button variant="contained" size="small" startIcon={<Icon fontSize="small">forum</Icon>} fullWidth sx={{ backgroundColor: "#568bda" }} href="https://github.com/orgs/ChurchApps/discussions" target="_blank" rel="noopener noreferrer">Forum</Button>
|
|
106
106
|
</Box>
|
|
107
107
|
</Box>
|
|
@@ -17,7 +17,6 @@ export class SocketHelper {
|
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
static createAlertConnection = () => {
|
|
20
|
-
|
|
21
20
|
if (SocketHelper.personIdChurchId.personId && SocketHelper.socketId) {
|
|
22
21
|
const connection: ConnectionInterface = {
|
|
23
22
|
conversationId: "alerts",
|
|
@@ -27,23 +26,7 @@ export class SocketHelper {
|
|
|
27
26
|
personId: SocketHelper.personIdChurchId.personId
|
|
28
27
|
}
|
|
29
28
|
|
|
30
|
-
|
|
31
|
-
ApiHelper.postAnonymous("/connections", [connection], "MessagingApi").then((response: any) => {
|
|
32
|
-
}).catch((error: any) => {
|
|
33
|
-
console.error("❌ Failed to create alert connection:", error);
|
|
34
|
-
console.error("❌ Error details:", {
|
|
35
|
-
status: error.status,
|
|
36
|
-
message: error.message,
|
|
37
|
-
response: error.response
|
|
38
|
-
});
|
|
39
|
-
});
|
|
40
|
-
} else {
|
|
41
|
-
console.warn('⚠️ SocketHelper: Cannot create alert connection - missing data:', {
|
|
42
|
-
hasPersonId: !!SocketHelper.personIdChurchId.personId,
|
|
43
|
-
hasSocketId: !!SocketHelper.socketId,
|
|
44
|
-
personId: SocketHelper.personIdChurchId.personId,
|
|
45
|
-
socketId: SocketHelper.socketId
|
|
46
|
-
});
|
|
29
|
+
ApiHelper.postAnonymous("/connections", [connection], "MessagingApi");
|
|
47
30
|
}
|
|
48
31
|
}
|
|
49
32
|
|
|
@@ -54,79 +37,37 @@ export class SocketHelper {
|
|
|
54
37
|
if (SocketHelper.socket && SocketHelper.socket.readyState !== SocketHelper.socket.CLOSED) {
|
|
55
38
|
try {
|
|
56
39
|
SocketHelper.socket.close();
|
|
57
|
-
} catch
|
|
58
|
-
console.error("❌ Error closing existing socket:", e);
|
|
59
|
-
}
|
|
40
|
+
} catch { /* ignore */ }
|
|
60
41
|
}
|
|
61
42
|
|
|
62
|
-
|
|
63
43
|
await new Promise((resolve, reject) => {
|
|
64
|
-
let hasReceivedSocketId = false;
|
|
65
|
-
let messageCount = 0;
|
|
66
|
-
|
|
67
44
|
try {
|
|
68
45
|
SocketHelper.socket = new WebSocket(CommonEnvironmentHelper.MessagingApiSocket);
|
|
69
46
|
|
|
70
47
|
SocketHelper.socket.onmessage = (event) => {
|
|
71
48
|
if (SocketHelper.isCleanedUp) return;
|
|
72
49
|
|
|
73
|
-
messageCount++;
|
|
74
|
-
|
|
75
50
|
try {
|
|
76
51
|
const payload = JSON.parse(event.data);
|
|
77
|
-
|
|
78
|
-
if (payload.action === 'socketId') {
|
|
79
|
-
hasReceivedSocketId = true;
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
// Log all message types we receive
|
|
83
|
-
switch (payload.action) {
|
|
84
|
-
case 'socketId':
|
|
85
|
-
break;
|
|
86
|
-
case 'privateMessage':
|
|
87
|
-
break;
|
|
88
|
-
case 'notification':
|
|
89
|
-
break;
|
|
90
|
-
case 'message':
|
|
91
|
-
break;
|
|
92
|
-
case 'reconnect':
|
|
93
|
-
break;
|
|
94
|
-
default:
|
|
95
|
-
}
|
|
96
|
-
|
|
97
52
|
SocketHelper.handleMessage(payload);
|
|
98
|
-
} catch
|
|
99
|
-
console.error("❌ Error parsing socket message:", error);
|
|
100
|
-
console.error("❌ Raw message was:", event.data);
|
|
101
|
-
}
|
|
53
|
+
} catch { /* ignore parse errors */ }
|
|
102
54
|
};
|
|
103
55
|
|
|
104
|
-
SocketHelper.socket.onopen = async (
|
|
105
|
-
|
|
106
|
-
// Send the getId request
|
|
56
|
+
SocketHelper.socket.onopen = async () => {
|
|
107
57
|
SocketHelper.socket.send("getId");
|
|
108
58
|
|
|
109
|
-
// Wait longer to see if we get a response
|
|
110
59
|
setTimeout(() => {
|
|
111
|
-
if (!hasReceivedSocketId) {
|
|
112
|
-
console.warn('⚠️ SocketHelper: No socket ID received after 3 seconds');
|
|
113
|
-
}
|
|
114
60
|
resolve(null);
|
|
115
61
|
}, 3000);
|
|
116
62
|
};
|
|
117
63
|
|
|
118
|
-
SocketHelper.socket.onclose = async (
|
|
119
|
-
// Socket closed
|
|
120
|
-
};
|
|
64
|
+
SocketHelper.socket.onclose = async () => { };
|
|
121
65
|
|
|
122
66
|
SocketHelper.socket.onerror = (error) => {
|
|
123
|
-
console.error('❌ SocketHelper: WebSocket connection error:', error);
|
|
124
|
-
console.error('❌ SocketHelper: Messages received before error:', messageCount);
|
|
125
67
|
reject(error);
|
|
126
68
|
};
|
|
127
69
|
|
|
128
70
|
} catch (error) {
|
|
129
|
-
console.error('❌ SocketHelper: Error initializing socket:', error);
|
|
130
71
|
reject(error);
|
|
131
72
|
}
|
|
132
73
|
});
|
|
@@ -157,24 +98,22 @@ export class SocketHelper {
|
|
|
157
98
|
if (SocketHelper.isCleanedUp) return;
|
|
158
99
|
|
|
159
100
|
try {
|
|
160
|
-
|
|
161
101
|
if (payload.action === "socketId") {
|
|
162
102
|
SocketHelper.socketId = payload.data;
|
|
163
103
|
SocketHelper.createAlertConnection();
|
|
164
104
|
}
|
|
165
105
|
else {
|
|
166
106
|
const matchingHandlers = ArrayHelper.getAll(SocketHelper.actionHandlers, "action", payload.action);
|
|
167
|
-
|
|
168
107
|
matchingHandlers.forEach((handler) => {
|
|
169
108
|
try {
|
|
170
109
|
handler.handleMessage(payload.data);
|
|
171
110
|
} catch (error) {
|
|
172
|
-
console.error(
|
|
111
|
+
console.error(`Error in handler ${handler.id}:`, error);
|
|
173
112
|
}
|
|
174
113
|
});
|
|
175
114
|
}
|
|
176
115
|
} catch (error) {
|
|
177
|
-
console.error("
|
|
116
|
+
console.error("Error handling socket message:", error);
|
|
178
117
|
}
|
|
179
118
|
}
|
|
180
119
|
|
|
@@ -185,15 +124,12 @@ export class SocketHelper {
|
|
|
185
124
|
if (SocketHelper.socket && SocketHelper.socket.readyState !== SocketHelper.socket.CLOSED) {
|
|
186
125
|
try {
|
|
187
126
|
SocketHelper.socket.close();
|
|
188
|
-
} catch
|
|
189
|
-
console.error("Error closing socket:", error);
|
|
190
|
-
}
|
|
127
|
+
} catch { /* ignore */ }
|
|
191
128
|
}
|
|
192
129
|
|
|
193
|
-
// Clear references
|
|
130
|
+
// Clear references but preserve handlers - they should persist across reconnects
|
|
194
131
|
SocketHelper.socket = null;
|
|
195
132
|
SocketHelper.socketId = null;
|
|
196
|
-
SocketHelper.actionHandlers = [];
|
|
197
133
|
SocketHelper.personIdChurchId = { personId: "", churchId: "" };
|
|
198
134
|
}
|
|
199
135
|
|