@open-e2ee/signal-protocol-sdk 4.0.0 → 5.0.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/CHANGELOG.md +74 -0
- package/README.md +2 -2
- package/SECURITY.md +2 -2
- package/client/README.md +3 -3
- package/dist/client/client.d.ts +9 -20
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +9 -22
- package/dist/client/client.js.map +1 -1
- package/dist/client/config.d.ts +25 -25
- package/dist/client/headless.d.ts +9 -20
- package/dist/client/headless.d.ts.map +1 -1
- package/dist/client/headless.js +22 -67
- package/dist/client/headless.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +15 -2
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
- package/dist/client/hosted-mailbox-subscription.js +32 -0
- package/dist/client/hosted-mailbox-subscription.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +14 -7
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +81 -60
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/key-rotation-core.d.ts +46 -69
- package/dist/client/key-rotation-core.d.ts.map +1 -1
- package/dist/client/key-rotation-core.js +161 -256
- package/dist/client/key-rotation-core.js.map +1 -1
- package/dist/client/key-rotation.d.ts +14 -29
- package/dist/client/key-rotation.d.ts.map +1 -1
- package/dist/client/key-rotation.js +37 -61
- package/dist/client/key-rotation.js.map +1 -1
- package/dist/client/one-time-prekey-refill.d.ts +52 -0
- package/dist/client/one-time-prekey-refill.d.ts.map +1 -0
- package/dist/client/one-time-prekey-refill.js +79 -0
- package/dist/client/one-time-prekey-refill.js.map +1 -0
- package/dist/client/prekeys.d.ts.map +1 -1
- package/dist/client/prekeys.js +38 -73
- package/dist/client/prekeys.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts +1 -1
- package/dist/client/signal-service-cipher.js +2 -2
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/types.d.ts +1 -1
- package/dist/device/lifecycle/manager.d.ts.map +1 -1
- package/dist/device/lifecycle/manager.js +0 -3
- package/dist/device/lifecycle/manager.js.map +1 -1
- package/dist/device/lifecycle/types.d.ts +1 -9
- package/dist/device/lifecycle/types.d.ts.map +1 -1
- package/dist/device/lifecycle/utils.d.ts +2 -4
- package/dist/device/lifecycle/utils.d.ts.map +1 -1
- package/dist/device/lifecycle/utils.js +2 -4
- package/dist/device/lifecycle/utils.js.map +1 -1
- package/dist/hooks/index.d.ts +1 -2
- package/dist/hooks/index.d.ts.map +1 -1
- package/dist/hooks/index.js +0 -1
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/use-key-rotation.d.ts +2 -5
- package/dist/hooks/use-key-rotation.d.ts.map +1 -1
- package/dist/hooks/use-key-rotation.js +8 -5
- package/dist/hooks/use-key-rotation.js.map +1 -1
- package/dist/hooks/use-single-flight.d.ts +4 -4
- package/dist/hooks/use-single-flight.js +4 -4
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/internal/manager/manager.d.ts +4 -4
- package/dist/internal/manager/manager.js +4 -4
- package/dist/local/store/expo/models/ec-one-time-prekey.d.ts.map +1 -1
- package/dist/local/store/expo/models/ec-one-time-prekey.js +4 -6
- package/dist/local/store/expo/models/ec-one-time-prekey.js.map +1 -1
- package/dist/local/store/expo/models/kyber-one-time-prekey.d.ts.map +1 -1
- package/dist/local/store/expo/models/kyber-one-time-prekey.js +4 -8
- package/dist/local/store/expo/models/kyber-one-time-prekey.js.map +1 -1
- package/dist/remote/relay/memory/adapter.d.ts +2 -14
- package/dist/remote/relay/memory/adapter.d.ts.map +1 -1
- package/dist/remote/relay/memory/adapter.js +5 -58
- package/dist/remote/relay/memory/adapter.js.map +1 -1
- package/dist/remote/relay/types.d.ts +20 -64
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/dist/safety/index.d.ts +2 -2
- package/dist/safety/index.js +2 -2
- package/dist/types/api.d.ts +25 -13
- package/dist/types/api.d.ts.map +1 -1
- package/docs/ASSURANCE.md +4 -4
- package/docs/ERROR_HANDLING.md +2 -2
- package/docs/PACKAGE_SURFACE.md +1 -2
- package/examples/browser/index.html +1 -1
- package/hooks/README.md +4 -14
- package/package.json +1 -5
- package/dist/hooks/use-connection-presence.d.ts +0 -66
- package/dist/hooks/use-connection-presence.d.ts.map +0 -1
- package/dist/hooks/use-connection-presence.js +0 -298
- package/dist/hooks/use-connection-presence.js.map +0 -1
package/hooks/README.md
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# React Hooks
|
|
2
2
|
|
|
3
3
|
The hooks module adapts client lifecycle operations to React components. It
|
|
4
|
-
includes
|
|
5
|
-
|
|
4
|
+
includes key rotation, group membership, session health, and single-flight
|
|
5
|
+
helpers.
|
|
6
6
|
|
|
7
7
|
## Why it exists
|
|
8
8
|
|
|
@@ -13,22 +13,12 @@ subscribe to SDK state without duplicating effect cleanup.
|
|
|
13
13
|
## Usage
|
|
14
14
|
|
|
15
15
|
```tsx
|
|
16
|
-
import {
|
|
17
|
-
useConnectionPresence,
|
|
18
|
-
useSessionHealth,
|
|
19
|
-
} from "@open-e2ee/signal-protocol-sdk/hooks";
|
|
16
|
+
import { useSessionHealth } from "@open-e2ee/signal-protocol-sdk/hooks";
|
|
20
17
|
|
|
21
18
|
function ConversationStatus({ client, address }) {
|
|
22
|
-
const connection = useConnectionPresence({ client });
|
|
23
19
|
const session = useSessionHealth({ client, address });
|
|
24
20
|
|
|
25
|
-
return
|
|
26
|
-
<p>
|
|
27
|
-
{connection.isConnected && session.isHealthy
|
|
28
|
-
? "Ready"
|
|
29
|
-
: "Reconnecting…"}
|
|
30
|
-
</p>
|
|
31
|
-
);
|
|
21
|
+
return <p>{session.isHealthy ? "Ready" : "Reconnecting…"}</p>;
|
|
32
22
|
}
|
|
33
23
|
```
|
|
34
24
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@open-e2ee/signal-protocol-sdk",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "5.0.0",
|
|
4
4
|
"description": "Pure TypeScript Signal Protocol SDK for encrypted chat in Expo, React Native, browsers, and Node. Post-quantum by default.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"open-e2ee",
|
|
@@ -147,10 +147,6 @@
|
|
|
147
147
|
"types": "./dist/hooks/index.d.ts",
|
|
148
148
|
"default": "./dist/hooks/index.js"
|
|
149
149
|
},
|
|
150
|
-
"./hooks/use-connection-presence": {
|
|
151
|
-
"types": "./dist/hooks/use-connection-presence.d.ts",
|
|
152
|
-
"default": "./dist/hooks/use-connection-presence.js"
|
|
153
|
-
},
|
|
154
150
|
"./keys": {
|
|
155
151
|
"types": "./dist/keys/index.d.ts",
|
|
156
152
|
"default": "./dist/keys/index.js"
|
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Unified Presence Tracking Hook
|
|
3
|
-
*
|
|
4
|
-
* Handles both WebSocket connection state and app lifecycle state
|
|
5
|
-
* to provide accurate, immediate presence updates with no duplicate calls.
|
|
6
|
-
*
|
|
7
|
-
* Routes presence operations through the Signal Protocol relay for architectural
|
|
8
|
-
* consistency with other device operations.
|
|
9
|
-
*
|
|
10
|
-
* Behavior:
|
|
11
|
-
* - WebSocket connects (app active) → mark online + start heartbeat
|
|
12
|
-
* - WebSocket disconnects → mark offline + stop heartbeat
|
|
13
|
-
* - App backgrounds → immediately mark offline + stop heartbeat
|
|
14
|
-
* - App foregrounds → wait for WebSocket reconnect (which marks online)
|
|
15
|
-
* - Heartbeat every 10 seconds keeps device "alive" on server
|
|
16
|
-
*
|
|
17
|
-
* Server-side:
|
|
18
|
-
* - Server schedules 30-second timeout on state transitions (offline → online)
|
|
19
|
-
* - Heartbeat writes to heartbeats table (triggers 0 query reruns)
|
|
20
|
-
* - If client crashes (no graceful disconnect), 30s timeout marks offline
|
|
21
|
-
*
|
|
22
|
-
* Benefits:
|
|
23
|
-
* - Immediate offline on app background
|
|
24
|
-
* - 30-second server timeout catches crashes
|
|
25
|
-
* - Periodic heartbeat keeps presence accurate
|
|
26
|
-
* - Single hook, no duplicate calls
|
|
27
|
-
*
|
|
28
|
-
* @example
|
|
29
|
-
* ```typescript
|
|
30
|
-
* // Any SignalProtocolRelayServer that reports presence.
|
|
31
|
-
* const relay = createAuthenticatedRelay({ userId, getAuthToken });
|
|
32
|
-
* useConnectionPresence({
|
|
33
|
-
* relay,
|
|
34
|
-
* deviceId,
|
|
35
|
-
* enabled: isSignedIn && !!deviceId,
|
|
36
|
-
* });
|
|
37
|
-
* ```
|
|
38
|
-
*/
|
|
39
|
-
import type { SignalProtocolRelayServer } from '../remote/relay/types.js';
|
|
40
|
-
import { type Logger } from '../logger.js';
|
|
41
|
-
/**
|
|
42
|
-
* Heartbeat interval for presence keep-alive.
|
|
43
|
-
* Server has 30-second timeout, so we send heartbeat every 10 seconds
|
|
44
|
-
* so we refresh `lastSeen` before the timeout fires.
|
|
45
|
-
*/
|
|
46
|
-
export {};
|
|
47
|
-
export interface UseConnectionPresenceOptions {
|
|
48
|
-
/** Signal Protocol relay server instance */
|
|
49
|
-
relay: SignalProtocolRelayServer;
|
|
50
|
-
/** Current device ID (1-5) */
|
|
51
|
-
deviceId: number | null;
|
|
52
|
-
/** Enable/disable presence tracking (default: true) */
|
|
53
|
-
enabled?: boolean;
|
|
54
|
-
/** Optional logger for presence operations */
|
|
55
|
-
logger?: Logger;
|
|
56
|
-
}
|
|
57
|
-
/**
|
|
58
|
-
* Hook that manages device presence via connection state and app lifecycle events.
|
|
59
|
-
*
|
|
60
|
-
* Combines WebSocket state tracking with AppState tracking for immediate,
|
|
61
|
-
* accurate presence updates without duplicate server calls.
|
|
62
|
-
*
|
|
63
|
-
* Uses single-flighting to prevent request spam during rapid state changes.
|
|
64
|
-
*/
|
|
65
|
-
export declare function useConnectionPresence({ relay, deviceId, enabled, logger: providedLogger, }: UseConnectionPresenceOptions): void;
|
|
66
|
-
//# sourceMappingURL=use-connection-presence.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"use-connection-presence.d.ts","sourceRoot":"","sources":["../../hooks/use-connection-presence.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAKH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAA+B,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAErE;;;;GAIG;AACH,OAAO,EAAE,CAAC;AAGV,MAAM,WAAW,4BAA4B;IAC3C,4CAA4C;IAC5C,KAAK,EAAE,yBAAyB,CAAC;IACjC,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,uDAAuD;IACvD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,KAAK,EACL,QAAQ,EACR,OAAc,EACd,MAAM,EAAE,cAAc,GACvB,EAAE,4BAA4B,GAAG,IAAI,CAqSrC"}
|
|
@@ -1,298 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Unified Presence Tracking Hook
|
|
3
|
-
*
|
|
4
|
-
* Handles both WebSocket connection state and app lifecycle state
|
|
5
|
-
* to provide accurate, immediate presence updates with no duplicate calls.
|
|
6
|
-
*
|
|
7
|
-
* Routes presence operations through the Signal Protocol relay for architectural
|
|
8
|
-
* consistency with other device operations.
|
|
9
|
-
*
|
|
10
|
-
* Behavior:
|
|
11
|
-
* - WebSocket connects (app active) → mark online + start heartbeat
|
|
12
|
-
* - WebSocket disconnects → mark offline + stop heartbeat
|
|
13
|
-
* - App backgrounds → immediately mark offline + stop heartbeat
|
|
14
|
-
* - App foregrounds → wait for WebSocket reconnect (which marks online)
|
|
15
|
-
* - Heartbeat every 10 seconds keeps device "alive" on server
|
|
16
|
-
*
|
|
17
|
-
* Server-side:
|
|
18
|
-
* - Server schedules 30-second timeout on state transitions (offline → online)
|
|
19
|
-
* - Heartbeat writes to heartbeats table (triggers 0 query reruns)
|
|
20
|
-
* - If client crashes (no graceful disconnect), 30s timeout marks offline
|
|
21
|
-
*
|
|
22
|
-
* Benefits:
|
|
23
|
-
* - Immediate offline on app background
|
|
24
|
-
* - 30-second server timeout catches crashes
|
|
25
|
-
* - Periodic heartbeat keeps presence accurate
|
|
26
|
-
* - Single hook, no duplicate calls
|
|
27
|
-
*
|
|
28
|
-
* @example
|
|
29
|
-
* ```typescript
|
|
30
|
-
* // Any SignalProtocolRelayServer that reports presence.
|
|
31
|
-
* const relay = createAuthenticatedRelay({ userId, getAuthToken });
|
|
32
|
-
* useConnectionPresence({
|
|
33
|
-
* relay,
|
|
34
|
-
* deviceId,
|
|
35
|
-
* enabled: isSignedIn && !!deviceId,
|
|
36
|
-
* });
|
|
37
|
-
* ```
|
|
38
|
-
*/
|
|
39
|
-
import { useEffect, useRef, useCallback } from 'react';
|
|
40
|
-
import { AppState } from 'react-native';
|
|
41
|
-
import { useConvex } from 'convex/react';
|
|
42
|
-
import { useSingleFlight } from './use-single-flight.js';
|
|
43
|
-
import { resolveSignalProtocolLogger } from '../logger.js';
|
|
44
|
-
const HEARTBEAT_INTERVAL_MS = 10 * 1000;
|
|
45
|
-
/**
|
|
46
|
-
* Hook that manages device presence via connection state and app lifecycle events.
|
|
47
|
-
*
|
|
48
|
-
* Combines WebSocket state tracking with AppState tracking for immediate,
|
|
49
|
-
* accurate presence updates without duplicate server calls.
|
|
50
|
-
*
|
|
51
|
-
* Uses single-flighting to prevent request spam during rapid state changes.
|
|
52
|
-
*/
|
|
53
|
-
export function useConnectionPresence({ relay, deviceId, enabled = true, logger: providedLogger, }) {
|
|
54
|
-
const convex = useConvex();
|
|
55
|
-
const relayRef = useRef(relay);
|
|
56
|
-
relayRef.current = relay;
|
|
57
|
-
const loggerRef = useRef(resolveSignalProtocolLogger(providedLogger));
|
|
58
|
-
loggerRef.current = resolveSignalProtocolLogger(providedLogger);
|
|
59
|
-
// Wrap relay methods with callbacks for single-flight
|
|
60
|
-
const markConnectedRaw = useCallback((currentDeviceId) => relayRef.current.markDeviceConnected(currentDeviceId), []);
|
|
61
|
-
const markDisconnectedRaw = useCallback((currentDeviceId) => relayRef.current.markDeviceDisconnected(currentDeviceId), []);
|
|
62
|
-
// Single-flight to handle rapid connect/disconnect cycles
|
|
63
|
-
const markConnected = useSingleFlight(markConnectedRaw);
|
|
64
|
-
const markDisconnected = useSingleFlight(markDisconnectedRaw);
|
|
65
|
-
// Track states
|
|
66
|
-
const wasConnectedRef = useRef(false);
|
|
67
|
-
const isInBackgroundRef = useRef(AppState.currentState !== 'active');
|
|
68
|
-
const deviceIdRef = useRef(deviceId);
|
|
69
|
-
deviceIdRef.current = deviceId;
|
|
70
|
-
// WebSocket state handler
|
|
71
|
-
const handleConnectionChange = useCallback((isConnected) => {
|
|
72
|
-
const logger = loggerRef.current;
|
|
73
|
-
const currentDeviceId = deviceIdRef.current;
|
|
74
|
-
if (!currentDeviceId)
|
|
75
|
-
return;
|
|
76
|
-
// Only act when state actually changes
|
|
77
|
-
if (isConnected && !wasConnectedRef.current) {
|
|
78
|
-
// WebSocket just connected
|
|
79
|
-
wasConnectedRef.current = true;
|
|
80
|
-
// Only mark online if app is in foreground
|
|
81
|
-
if (!isInBackgroundRef.current) {
|
|
82
|
-
logger.breadcrumb('WebSocket connected, marking device online', {
|
|
83
|
-
category: 'Device',
|
|
84
|
-
level: 'debug',
|
|
85
|
-
data: { deviceId: currentDeviceId },
|
|
86
|
-
});
|
|
87
|
-
markConnected(currentDeviceId).catch((err) => {
|
|
88
|
-
logger.warn('Failed to mark device connected', {
|
|
89
|
-
category: 'Device',
|
|
90
|
-
error: err,
|
|
91
|
-
});
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
else if (!isConnected && wasConnectedRef.current) {
|
|
96
|
-
// WebSocket just disconnected
|
|
97
|
-
wasConnectedRef.current = false;
|
|
98
|
-
logger.breadcrumb('WebSocket disconnected, marking device offline', {
|
|
99
|
-
category: 'Device',
|
|
100
|
-
level: 'debug',
|
|
101
|
-
data: { deviceId: currentDeviceId },
|
|
102
|
-
});
|
|
103
|
-
// May fail if network is down - that is OK, server timeout will catch it
|
|
104
|
-
markDisconnected(currentDeviceId).catch(() => {
|
|
105
|
-
logger.warn('Failed to mark disconnected', {
|
|
106
|
-
category: 'E2EE',
|
|
107
|
-
data: { deviceId: currentDeviceId },
|
|
108
|
-
});
|
|
109
|
-
});
|
|
110
|
-
}
|
|
111
|
-
}, [markConnected, markDisconnected]);
|
|
112
|
-
// App state handler
|
|
113
|
-
const handleAppStateChange = useCallback((nextAppState, forceConnectionCheck) => {
|
|
114
|
-
const logger = loggerRef.current;
|
|
115
|
-
const currentDeviceId = deviceIdRef.current;
|
|
116
|
-
if (!currentDeviceId)
|
|
117
|
-
return;
|
|
118
|
-
const wasInBackground = isInBackgroundRef.current;
|
|
119
|
-
isInBackgroundRef.current = nextAppState !== 'active';
|
|
120
|
-
// App going to background → immediately mark offline
|
|
121
|
-
if (!wasInBackground && nextAppState !== 'active') {
|
|
122
|
-
logger.debug(`[Presence] App → ${nextAppState}, marking offline (device ${currentDeviceId})`, {
|
|
123
|
-
category: 'Device',
|
|
124
|
-
});
|
|
125
|
-
logger.breadcrumb('App backgrounded, marking device offline', {
|
|
126
|
-
category: 'Device',
|
|
127
|
-
level: 'debug',
|
|
128
|
-
data: { deviceId: currentDeviceId },
|
|
129
|
-
});
|
|
130
|
-
markDisconnected(currentDeviceId).catch(() => {
|
|
131
|
-
logger.warn('Failed to mark disconnected', {
|
|
132
|
-
category: 'E2EE',
|
|
133
|
-
data: { deviceId: currentDeviceId },
|
|
134
|
-
});
|
|
135
|
-
});
|
|
136
|
-
}
|
|
137
|
-
// App returning to foreground
|
|
138
|
-
if (wasInBackground && nextAppState === 'active') {
|
|
139
|
-
// Query ACTUAL connection state, not the potentially stale ref
|
|
140
|
-
// After long background, WebSocket may have reconnected but ref was not updated
|
|
141
|
-
const actuallyConnected = forceConnectionCheck?.() ?? wasConnectedRef.current;
|
|
142
|
-
// Log to native logger (visible in Console.app)
|
|
143
|
-
logger.debug(`[Presence] App → active, ref=${wasConnectedRef.current}, actual=${actuallyConnected}, device=${currentDeviceId}`, {
|
|
144
|
-
category: 'Device',
|
|
145
|
-
});
|
|
146
|
-
logger.breadcrumb('App foregrounded, checking WebSocket state', {
|
|
147
|
-
category: 'Device',
|
|
148
|
-
level: 'debug',
|
|
149
|
-
data: {
|
|
150
|
-
deviceId: currentDeviceId,
|
|
151
|
-
wasConnected: wasConnectedRef.current,
|
|
152
|
-
actuallyConnected,
|
|
153
|
-
},
|
|
154
|
-
});
|
|
155
|
-
// Sync the ref with actual state
|
|
156
|
-
wasConnectedRef.current = actuallyConnected;
|
|
157
|
-
// If WebSocket is connected (either ref or actual), mark online now
|
|
158
|
-
if (actuallyConnected) {
|
|
159
|
-
logger.debug(`[Presence] Calling markConnected for device ${currentDeviceId}`, {
|
|
160
|
-
category: 'Device',
|
|
161
|
-
});
|
|
162
|
-
markConnected(currentDeviceId).catch((err) => {
|
|
163
|
-
logger.warn('Failed to mark device connected on foreground', {
|
|
164
|
-
category: 'Device',
|
|
165
|
-
error: err,
|
|
166
|
-
});
|
|
167
|
-
});
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
170
|
-
logger.debug(`[Presence] Skipping markConnected - not connected (device ${currentDeviceId})`, { category: 'Device' });
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
}, [markConnected, markDisconnected]);
|
|
174
|
-
useEffect(() => {
|
|
175
|
-
const logger = loggerRef.current;
|
|
176
|
-
if (!enabled || !deviceId) {
|
|
177
|
-
logger.debug('Presence effect skipped', {
|
|
178
|
-
category: 'Device',
|
|
179
|
-
data: { enabled, deviceId, reason: !enabled ? 'disabled' : 'no deviceId' },
|
|
180
|
-
});
|
|
181
|
-
return;
|
|
182
|
-
}
|
|
183
|
-
logger.debug('Presence effect starting', {
|
|
184
|
-
category: 'Device',
|
|
185
|
-
data: { enabled, deviceId },
|
|
186
|
-
});
|
|
187
|
-
// CRITICAL: Re-check current app state when effect enables
|
|
188
|
-
// AppState.currentState may have been stale during component mount
|
|
189
|
-
const currentAppState = AppState.currentState;
|
|
190
|
-
isInBackgroundRef.current = currentAppState !== 'active';
|
|
191
|
-
// Heartbeat interval reference
|
|
192
|
-
let heartbeatInterval = null;
|
|
193
|
-
// Start heartbeat when connected and in foreground
|
|
194
|
-
const startHeartbeat = () => {
|
|
195
|
-
if (heartbeatInterval)
|
|
196
|
-
return; // Already running
|
|
197
|
-
heartbeatInterval = setInterval(() => {
|
|
198
|
-
const currentDeviceId = deviceIdRef.current;
|
|
199
|
-
if (!currentDeviceId || isInBackgroundRef.current || !wasConnectedRef.current) {
|
|
200
|
-
return;
|
|
201
|
-
}
|
|
202
|
-
// Lightweight heartbeat. Writes only to heartbeats table, triggers 0 query reruns
|
|
203
|
-
relayRef.current.heartbeat(currentDeviceId).catch((err) => {
|
|
204
|
-
logger.warn('Failed to send presence heartbeat', {
|
|
205
|
-
category: 'Device',
|
|
206
|
-
error: err,
|
|
207
|
-
});
|
|
208
|
-
});
|
|
209
|
-
}, HEARTBEAT_INTERVAL_MS);
|
|
210
|
-
};
|
|
211
|
-
// Stop heartbeat when backgrounded or disconnected
|
|
212
|
-
const stopHeartbeat = () => {
|
|
213
|
-
if (heartbeatInterval) {
|
|
214
|
-
clearInterval(heartbeatInterval);
|
|
215
|
-
heartbeatInterval = null;
|
|
216
|
-
}
|
|
217
|
-
};
|
|
218
|
-
// Track last known connection state from Convex itself.
|
|
219
|
-
// We seed this synchronously because the subscription callback may not fire
|
|
220
|
-
// immediately when the hook enables while the socket is already connected.
|
|
221
|
-
const initialConnectionState = convex.connectionState().isWebSocketConnected;
|
|
222
|
-
let lastKnownConnectionState = initialConnectionState;
|
|
223
|
-
// Subscribe to WebSocket connection state changes
|
|
224
|
-
const unsubscribeConnection = convex.subscribeToConnectionState((state) => {
|
|
225
|
-
// Update tracking variable for AppState handler
|
|
226
|
-
const wasConnected = lastKnownConnectionState;
|
|
227
|
-
lastKnownConnectionState = state.isWebSocketConnected;
|
|
228
|
-
// Only log when state actually changes (reduces noise from repeated true → true)
|
|
229
|
-
if (wasConnected !== state.isWebSocketConnected) {
|
|
230
|
-
logger.debug(`[Presence] WebSocket: ${wasConnected} → ${state.isWebSocketConnected}, bg=${isInBackgroundRef.current}`, {
|
|
231
|
-
category: 'Device',
|
|
232
|
-
});
|
|
233
|
-
}
|
|
234
|
-
handleConnectionChange(state.isWebSocketConnected);
|
|
235
|
-
// Manage heartbeat based on connection state
|
|
236
|
-
if (state.isWebSocketConnected && !isInBackgroundRef.current) {
|
|
237
|
-
startHeartbeat();
|
|
238
|
-
}
|
|
239
|
-
else {
|
|
240
|
-
stopHeartbeat();
|
|
241
|
-
}
|
|
242
|
-
});
|
|
243
|
-
// Subscribe to app lifecycle state changes
|
|
244
|
-
const appStateSubscription = AppState.addEventListener('change', (nextState) => {
|
|
245
|
-
// Pass a function that returns the actual connection state.
|
|
246
|
-
// This is critical after a long background period. The ref may be stale,
|
|
247
|
-
// but lastKnownConnectionState is updated by the subscription callback.
|
|
248
|
-
handleAppStateChange(nextState, () => lastKnownConnectionState);
|
|
249
|
-
// Manage heartbeat based on app state
|
|
250
|
-
// Use lastKnownConnectionState instead of wasConnectedRef for reliability
|
|
251
|
-
if (nextState === 'active' && lastKnownConnectionState) {
|
|
252
|
-
startHeartbeat();
|
|
253
|
-
}
|
|
254
|
-
else if (nextState !== 'active') {
|
|
255
|
-
stopHeartbeat();
|
|
256
|
-
}
|
|
257
|
-
});
|
|
258
|
-
// When the effect enables (for example after the device unlocks), seed presence from the
|
|
259
|
-
// actual socket state instead of assuming "enabled" means "online".
|
|
260
|
-
const freshAppState = AppState.currentState;
|
|
261
|
-
const inBackground = freshAppState !== 'active';
|
|
262
|
-
isInBackgroundRef.current = inBackground;
|
|
263
|
-
wasConnectedRef.current = initialConnectionState;
|
|
264
|
-
if (!inBackground && initialConnectionState) {
|
|
265
|
-
markConnected(deviceId).catch((err) => {
|
|
266
|
-
logger.warn('Failed to mark device connected on effect enable', {
|
|
267
|
-
category: 'Device',
|
|
268
|
-
error: err,
|
|
269
|
-
});
|
|
270
|
-
});
|
|
271
|
-
startHeartbeat();
|
|
272
|
-
}
|
|
273
|
-
return () => {
|
|
274
|
-
stopHeartbeat();
|
|
275
|
-
unsubscribeConnection();
|
|
276
|
-
appStateSubscription.remove();
|
|
277
|
-
// Try to mark disconnected on unmount (component cleanup)
|
|
278
|
-
if (wasConnectedRef.current && deviceIdRef.current) {
|
|
279
|
-
markDisconnected(deviceIdRef.current).catch(() => {
|
|
280
|
-
logger.warn('Failed to mark disconnected', {
|
|
281
|
-
category: 'E2EE',
|
|
282
|
-
data: { deviceId: deviceIdRef.current },
|
|
283
|
-
});
|
|
284
|
-
});
|
|
285
|
-
wasConnectedRef.current = false;
|
|
286
|
-
}
|
|
287
|
-
};
|
|
288
|
-
}, [
|
|
289
|
-
convex,
|
|
290
|
-
deviceId,
|
|
291
|
-
enabled,
|
|
292
|
-
handleConnectionChange,
|
|
293
|
-
handleAppStateChange,
|
|
294
|
-
markConnected,
|
|
295
|
-
markDisconnected,
|
|
296
|
-
]);
|
|
297
|
-
}
|
|
298
|
-
//# sourceMappingURL=use-connection-presence.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"use-connection-presence.js","sourceRoot":"","sources":["../../hooks/use-connection-presence.ts"],"names":[],"mappings":"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"}
|