@ethora/chat-component-rn 26.10.6 → 26.10.7

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.
Files changed (73) hide show
  1. package/CHANGELOG.md +3 -1
  2. package/README.md +6 -3
  3. package/lib/commonjs/helpers/secureStoreRuntime.js +10 -1
  4. package/lib/commonjs/helpers/secureStoreRuntime.js.map +1 -1
  5. package/lib/commonjs/main.js +81 -0
  6. package/lib/commonjs/main.js.map +1 -1
  7. package/lib/commonjs/networking/api-requests/push.api.js +22 -7
  8. package/lib/commonjs/networking/api-requests/push.api.js.map +1 -1
  9. package/lib/commonjs/push/pushKeyStore.js +169 -0
  10. package/lib/commonjs/push/pushKeyStore.js.map +1 -0
  11. package/lib/commonjs/push/sealedBox.js +106 -0
  12. package/lib/commonjs/push/sealedBox.js.map +1 -0
  13. package/lib/commonjs/push/sealedPush.js +124 -0
  14. package/lib/commonjs/push/sealedPush.js.map +1 -0
  15. package/lib/commonjs/push/sealedPushTask.js +195 -0
  16. package/lib/commonjs/push/sealedPushTask.js.map +1 -0
  17. package/lib/commonjs/services/pushRegistration.js +12 -7
  18. package/lib/commonjs/services/pushRegistration.js.map +1 -1
  19. package/lib/commonjs/version.js +1 -1
  20. package/lib/module/helpers/secureStoreRuntime.js +10 -1
  21. package/lib/module/helpers/secureStoreRuntime.js.map +1 -1
  22. package/lib/module/main.js +6 -0
  23. package/lib/module/main.js.map +1 -1
  24. package/lib/module/networking/api-requests/push.api.js +21 -6
  25. package/lib/module/networking/api-requests/push.api.js.map +1 -1
  26. package/lib/module/push/pushKeyStore.js +159 -0
  27. package/lib/module/push/pushKeyStore.js.map +1 -0
  28. package/lib/module/push/sealedBox.js +97 -0
  29. package/lib/module/push/sealedBox.js.map +1 -0
  30. package/lib/module/push/sealedPush.js +117 -0
  31. package/lib/module/push/sealedPush.js.map +1 -0
  32. package/lib/module/push/sealedPushTask.js +187 -0
  33. package/lib/module/push/sealedPushTask.js.map +1 -0
  34. package/lib/module/services/pushRegistration.js +12 -7
  35. package/lib/module/services/pushRegistration.js.map +1 -1
  36. package/lib/module/version.js +1 -1
  37. package/lib/typescript/helpers/secureStoreRuntime.d.ts +17 -3
  38. package/lib/typescript/helpers/secureStoreRuntime.d.ts.map +1 -1
  39. package/lib/typescript/main.d.ts +6 -0
  40. package/lib/typescript/main.d.ts.map +1 -1
  41. package/lib/typescript/networking/api-requests/push.api.d.ts +14 -2
  42. package/lib/typescript/networking/api-requests/push.api.d.ts.map +1 -1
  43. package/lib/typescript/push/pushKeyStore.d.ts +35 -0
  44. package/lib/typescript/push/pushKeyStore.d.ts.map +1 -0
  45. package/lib/typescript/push/sealedBox.d.ts +24 -0
  46. package/lib/typescript/push/sealedBox.d.ts.map +1 -0
  47. package/lib/typescript/push/sealedPush.d.ts +61 -0
  48. package/lib/typescript/push/sealedPush.d.ts.map +1 -0
  49. package/lib/typescript/push/sealedPushTask.d.ts +33 -0
  50. package/lib/typescript/push/sealedPushTask.d.ts.map +1 -0
  51. package/lib/typescript/services/pushRegistration.d.ts +8 -0
  52. package/lib/typescript/services/pushRegistration.d.ts.map +1 -1
  53. package/lib/typescript/types/types.d.ts +6 -0
  54. package/lib/typescript/types/types.d.ts.map +1 -1
  55. package/lib/typescript/version.d.ts +1 -1
  56. package/package.json +11 -1
  57. package/plugins/notification-service/NotificationService.swift +113 -0
  58. package/plugins/notification-service/SealedBox.swift +355 -0
  59. package/plugins/notification-service/check/gen-vectors.mjs +24 -0
  60. package/plugins/notification-service/check/main.swift +37 -0
  61. package/plugins/notification-service/check/run.sh +12 -0
  62. package/plugins/notification-service/check/vectors.json +1 -0
  63. package/plugins/withNotificationServiceExtension.js +70 -18
  64. package/src/helpers/secureStoreRuntime.ts +21 -3
  65. package/src/main.ts +30 -0
  66. package/src/networking/api-requests/push.api.ts +29 -4
  67. package/src/push/pushKeyStore.ts +163 -0
  68. package/src/push/sealedBox.ts +104 -0
  69. package/src/push/sealedPush.ts +127 -0
  70. package/src/push/sealedPushTask.ts +175 -0
  71. package/src/services/pushRegistration.ts +25 -5
  72. package/src/types/types.ts +6 -0
  73. package/src/version.ts +1 -1
@@ -0,0 +1,124 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.isSealedPush = exports.SEALED_PUSH_VERSION = exports.SEALED_PUSH_ALG = void 0;
7
+ exports.openSealedPush = openSealedPush;
8
+ exports.sealedPushEnvelopeOf = void 0;
9
+ var _crypto = require("../e2ee/crypto");
10
+ var _sealedBox = require("./sealedBox");
11
+ // The envelope of an encrypted chat push (ethora-backend,
12
+ // services/push/README.md, "Encrypted pushes"): the FCM `data` map on
13
+ // Android, the custom keys next to `aps` on iOS. Only ids travel in the
14
+ // clear; everything shown to the user is inside `enc`, a sealed box for
15
+ // the key the device registered with its token.
16
+
17
+ const SEALED_PUSH_ALG = exports.SEALED_PUSH_ALG = 'sealed-box-x25519';
18
+ const SEALED_PUSH_VERSION = exports.SEALED_PUSH_VERSION = '1';
19
+
20
+ /** What the box holds: the notification the service would have sent in the clear. */
21
+
22
+ const str = value => typeof value === 'string' ? value : '';
23
+
24
+ /** The envelope of `data` when it is a sealed chat push, else null. */
25
+ const sealedPushEnvelopeOf = data => {
26
+ if (!data || data.alg !== SEALED_PUSH_ALG) {
27
+ return null;
28
+ }
29
+ const enc = str(data.enc);
30
+ return {
31
+ v: str(data.v) || SEALED_PUSH_VERSION,
32
+ alg: SEALED_PUSH_ALG,
33
+ kid: str(data.kid),
34
+ jid: str(data.jid),
35
+ msgID: str(data.msgID),
36
+ userJid: str(data.userJid),
37
+ ...(enc ? {
38
+ enc
39
+ } : {})
40
+ };
41
+ };
42
+ exports.sealedPushEnvelopeOf = sealedPushEnvelopeOf;
43
+ const isSealedPush = data => sealedPushEnvelopeOf(data) !== null;
44
+ exports.isSealedPush = isSealedPush;
45
+ const parseContent = plaintext => {
46
+ try {
47
+ const parsed = JSON.parse(new TextDecoder().decode(plaintext));
48
+ if (!parsed || typeof parsed !== 'object') {
49
+ return null;
50
+ }
51
+ return {
52
+ title: str(parsed.title),
53
+ body: str(parsed.body),
54
+ sender: str(parsed.sender),
55
+ senderJid: str(parsed.senderJid),
56
+ chat: str(parsed.chat),
57
+ chatJid: str(parsed.chatJid),
58
+ msgID: str(parsed.msgID),
59
+ image: str(parsed.image)
60
+ };
61
+ } catch {
62
+ return null;
63
+ }
64
+ };
65
+ /**
66
+ * Open a sealed push with the device key. `key` null means there is no key
67
+ * on this device. Never throws: every failure names why, so the caller can
68
+ * show the placeholder and log the reason.
69
+ */
70
+ function openSealedPush(envelope, key) {
71
+ if (!key) {
72
+ return {
73
+ ok: false,
74
+ reason: 'no-key',
75
+ envelope
76
+ };
77
+ }
78
+ if (envelope.kid && envelope.kid !== (0, _sealedBox.sealedBoxKeyId)(key.publicKey)) {
79
+ return {
80
+ ok: false,
81
+ reason: 'key-mismatch',
82
+ envelope
83
+ };
84
+ }
85
+ if (!envelope.enc) {
86
+ return {
87
+ ok: false,
88
+ reason: 'no-ciphertext',
89
+ envelope
90
+ };
91
+ }
92
+ let sealed;
93
+ try {
94
+ sealed = (0, _crypto.fromBase64)(envelope.enc);
95
+ } catch {
96
+ return {
97
+ ok: false,
98
+ reason: 'bad-ciphertext',
99
+ envelope
100
+ };
101
+ }
102
+ const plaintext = (0, _sealedBox.sealedBoxOpen)(sealed, key.publicKey, key.secretKey);
103
+ if (!plaintext) {
104
+ return {
105
+ ok: false,
106
+ reason: 'bad-ciphertext',
107
+ envelope
108
+ };
109
+ }
110
+ const content = parseContent(plaintext);
111
+ if (!content) {
112
+ return {
113
+ ok: false,
114
+ reason: 'bad-content',
115
+ envelope
116
+ };
117
+ }
118
+ return {
119
+ ok: true,
120
+ content,
121
+ envelope
122
+ };
123
+ }
124
+ //# sourceMappingURL=sealedPush.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["_crypto","require","_sealedBox","SEALED_PUSH_ALG","exports","SEALED_PUSH_VERSION","str","value","sealedPushEnvelopeOf","data","alg","enc","v","kid","jid","msgID","userJid","isSealedPush","parseContent","plaintext","parsed","JSON","parse","TextDecoder","decode","title","body","sender","senderJid","chat","chatJid","image","openSealedPush","envelope","key","ok","reason","sealedBoxKeyId","publicKey","sealed","fromBase64","sealedBoxOpen","secretKey","content"],"sourceRoot":"../../../src","sources":["push/sealedPush.ts"],"mappings":"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","ignoreList":[]}
@@ -0,0 +1,195 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.__resetSealedPushTaskForTests = exports.SEALED_PUSH_TASK = void 0;
7
+ exports.presentSealedPush = presentSealedPush;
8
+ exports.registerSealedPushTask = registerSealedPushTask;
9
+ exports.sealedPushDataOf = void 0;
10
+ var _reactNative = require("react-native");
11
+ var _devLogger = require("../utils/devLogger");
12
+ var _pushKeyStore = require("./pushKeyStore");
13
+ var _sealedPush = require("./sealedPush");
14
+ // Android half of encrypted pushes. A sealed push is data-only, so the OS
15
+ // shows nothing by itself: expo-notifications hands it to a background
16
+ // task (expo-task-manager, foreground, background and killed app alike)
17
+ // and this task opens the box and posts the notification. iOS does the
18
+ // same in the notification service extension; here `registerSealedPushTask`
19
+ // is a no-op.
20
+ //
21
+ // Both packages are optional peers, required lazily: a host that does not
22
+ // want encrypted pushes never pays for them.
23
+
24
+ const SEALED_PUSH_TASK = exports.SEALED_PUSH_TASK = 'ETHORA_SEALED_PUSH';
25
+ const PLACEHOLDER_TITLE = 'New message';
26
+ let registered = false;
27
+ const loadTaskManager = () => {
28
+ try {
29
+ return require('expo-task-manager');
30
+ } catch {
31
+ return null;
32
+ }
33
+ };
34
+ const loadNotifications = () => {
35
+ try {
36
+ return require('expo-notifications');
37
+ } catch {
38
+ return null;
39
+ }
40
+ };
41
+
42
+ /**
43
+ * The FCM data map out of the task payload. expo-notifications passes the
44
+ * message as `{ notification, data }`; the data keys are on `data`
45
+ * itself, `data.dataString` carries the same as a JSON string on some
46
+ * versions, and a Firebase `RemoteMessage` keeps them under `data.data`.
47
+ */
48
+ const sealedPushDataOf = payload => {
49
+ const root = payload && typeof payload === 'object' ? payload : null;
50
+ if (!root) {
51
+ return null;
52
+ }
53
+ const candidates = [root.data, root];
54
+ const data = root.data && typeof root.data === 'object' ? root.data : null;
55
+ if (data) {
56
+ if (typeof data.dataString === 'string') {
57
+ try {
58
+ candidates.unshift(JSON.parse(data.dataString));
59
+ } catch {
60
+ // not JSON — fall through to the map itself
61
+ }
62
+ }
63
+ candidates.push(data.data);
64
+ }
65
+ for (const candidate of candidates) {
66
+ if ((0, _sealedPush.sealedPushEnvelopeOf)(candidate)) {
67
+ return candidate;
68
+ }
69
+ }
70
+ return null;
71
+ };
72
+ exports.sealedPushDataOf = sealedPushDataOf;
73
+ const notificationContent = (result, options) => {
74
+ const {
75
+ envelope
76
+ } = result;
77
+ // What the tap handler (`handlePushPayload` through the host's response
78
+ // listener) needs: the same ids a plain push carries on `data`.
79
+ const data = {
80
+ jid: envelope.jid,
81
+ msgID: envelope.msgID,
82
+ userJid: envelope.userJid,
83
+ sealed: true
84
+ };
85
+ if (!result.ok) {
86
+ return {
87
+ title: options.placeholderTitle || PLACEHOLDER_TITLE,
88
+ ...(options.placeholderBody ? {
89
+ body: options.placeholderBody
90
+ } : {}),
91
+ data,
92
+ sound: 'default'
93
+ };
94
+ }
95
+ const {
96
+ content
97
+ } = result;
98
+ return {
99
+ title: content.title || content.sender || content.chat || PLACEHOLDER_TITLE,
100
+ body: content.body,
101
+ data: {
102
+ ...data,
103
+ chatJid: content.chatJid,
104
+ senderJid: content.senderJid
105
+ },
106
+ sound: 'default'
107
+ };
108
+ };
109
+
110
+ /**
111
+ * Open a sealed push and show it. One notification per chat: the room JID
112
+ * is the identifier, so a newer message replaces the older one the way the
113
+ * service's collapse key does for plain pushes.
114
+ */
115
+ async function presentSealedPush(data, options = {}) {
116
+ const envelope = (0, _sealedPush.sealedPushEnvelopeOf)(data);
117
+ if (!envelope) {
118
+ return null;
119
+ }
120
+ const notifications = loadNotifications();
121
+ if (!notifications?.scheduleNotificationAsync) {
122
+ return null;
123
+ }
124
+ const result = (0, _sealedPush.openSealedPush)(envelope, await (0, _pushKeyStore.loadPushSecretKey)());
125
+ // console, not only pushLog: with the app killed this runs headless and
126
+ // `adb logcat -s ReactNativeJS` is the only place to see it.
127
+ if (result.ok) {
128
+ console.log(`[push] sealed push kid=${envelope.kid} opened for ${envelope.jid}`);
129
+ } else {
130
+ console.warn(`[push] sealed push kid=${envelope.kid} not opened (${result.reason}), showing the placeholder`);
131
+ (0, _devLogger.pushLog)('warn', `push: sealed push not opened (${result.reason}), showing the placeholder`);
132
+ }
133
+ await notifications.scheduleNotificationAsync({
134
+ identifier: envelope.jid || envelope.msgID || undefined,
135
+ content: notificationContent(result, options),
136
+ trigger: options.channelId ? {
137
+ channelId: options.channelId
138
+ } : null
139
+ });
140
+ return result;
141
+ }
142
+
143
+ /**
144
+ * Define and register the background task that renders sealed pushes on
145
+ * Android. Call it at module scope of a file the app loads first (the
146
+ * entry file, or the root layout with expo-router): a killed app is
147
+ * started headless to run it, and the task must exist by then. No-op on
148
+ * iOS and when expo-task-manager / expo-notifications are not installed.
149
+ */
150
+ function registerSealedPushTask(options = {}) {
151
+ if (_reactNative.Platform.OS !== 'android' || registered) {
152
+ return registered;
153
+ }
154
+ const taskManager = loadTaskManager();
155
+ const notifications = loadNotifications();
156
+ if (!taskManager?.defineTask || !notifications?.registerTaskAsync) {
157
+ (0, _devLogger.pushLog)('warn', 'push: expo-task-manager and expo-notifications are needed to show encrypted pushes on Android');
158
+ return false;
159
+ }
160
+ taskManager.defineTask(SEALED_PUSH_TASK, async ({
161
+ data,
162
+ error
163
+ }) => {
164
+ if (error) {
165
+ return;
166
+ }
167
+ const map = sealedPushDataOf(data);
168
+ if (!map) {
169
+ return;
170
+ }
171
+ // In the foreground the room is live over XMPP; the host's
172
+ // notification handler decides about plain pushes there too.
173
+ if (_reactNative.AppState.currentState === 'active') {
174
+ return;
175
+ }
176
+ try {
177
+ await presentSealedPush(map, options);
178
+ } catch (e) {
179
+ (0, _devLogger.pushLog)('warn', 'push: showing a sealed push failed', e);
180
+ }
181
+ });
182
+ registered = true;
183
+ notifications.registerTaskAsync(SEALED_PUSH_TASK).catch(e => {
184
+ registered = false;
185
+ (0, _devLogger.pushLog)('warn', 'push: registering the sealed push task failed', e);
186
+ });
187
+ return true;
188
+ }
189
+
190
+ /** Test seam only. */
191
+ const __resetSealedPushTaskForTests = () => {
192
+ registered = false;
193
+ };
194
+ exports.__resetSealedPushTaskForTests = __resetSealedPushTaskForTests;
195
+ //# sourceMappingURL=sealedPushTask.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["_reactNative","require","_devLogger","_pushKeyStore","_sealedPush","SEALED_PUSH_TASK","exports","PLACEHOLDER_TITLE","registered","loadTaskManager","loadNotifications","sealedPushDataOf","payload","root","candidates","data","dataString","unshift","JSON","parse","push","candidate","sealedPushEnvelopeOf","notificationContent","result","options","envelope","jid","msgID","userJid","sealed","ok","title","placeholderTitle","placeholderBody","body","sound","content","sender","chat","chatJid","senderJid","presentSealedPush","notifications","scheduleNotificationAsync","openSealedPush","loadPushSecretKey","console","log","kid","warn","reason","pushLog","identifier","undefined","trigger","channelId","registerSealedPushTask","Platform","OS","taskManager","defineTask","registerTaskAsync","error","map","AppState","currentState","e","catch","__resetSealedPushTaskForTests"],"sourceRoot":"../../../src","sources":["push/sealedPushTask.ts"],"mappings":"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","ignoreList":[]}
@@ -35,7 +35,7 @@ const readSession = () => {
35
35
  };
36
36
  const isGateway = session => !!session.gatewayUrl;
37
37
  const isReady = session => !!session.authToken && (isGateway(session) ? !!session.xmppUsername && !!session.projectName : !!session.appId);
38
- const sameRegistration = (token, current, session) => !!current && current.token === token.token && current.tokenType === token.tokenType && current.gateway === isGateway(session) && current.appId === session.appId && current.xmppUsername === session.xmppUsername;
38
+ const sameRegistration = (token, current, session) => !!current && current.token === token.token && current.tokenType === token.tokenType && (current.pushKey || '') === (token.pushKey || '') && current.gateway === isGateway(session) && current.appId === session.appId && current.xmppUsername === session.xmppUsername;
39
39
  const slotsNeedingRegistration = session => SLOTS.filter(slot => {
40
40
  const token = held.get(slot);
41
41
  return !!token && !sameRegistration(token, registered.get(slot), session);
@@ -70,7 +70,8 @@ const registerOne = async (token, session) => {
70
70
  appId: session.appId,
71
71
  token: token.token,
72
72
  tokenType: token.tokenType,
73
- authToken: session.authToken
73
+ authToken: session.authToken,
74
+ pushKey: token.pushKey
74
75
  });
75
76
  }
76
77
  registered.set(slotOf(token.tokenType), {
@@ -79,7 +80,7 @@ const registerOne = async (token, session) => {
79
80
  xmppUsername: session.xmppUsername,
80
81
  gateway: isGateway(session)
81
82
  });
82
- (0, _devLogger.pushLog)('rn', `push: ${token.tokenType} token registered` + (isGateway(session) ? ' (gateway)' : ` for app ${session.appId}`));
83
+ (0, _devLogger.pushLog)('rn', `push: ${token.tokenType} token registered` + (isGateway(session) ? ' (gateway)' : ` for app ${session.appId}`) + (token.pushKey && !isGateway(session) ? ' with a device key (encrypted pushes)' : ''));
83
84
  };
84
85
  const registerNow = () => {
85
86
  if (inflight) {
@@ -124,7 +125,7 @@ const runTokenHook = session => {
124
125
  if (typeof entry?.token !== 'string' || !entry.token.trim()) {
125
126
  continue;
126
127
  }
127
- hold(entry.token.trim(), entry.tokenType);
128
+ hold(entry.token.trim(), entry.tokenType, entry.pushKey);
128
129
  }
129
130
  await registerNow();
130
131
  })().catch(error => {
@@ -133,11 +134,15 @@ const runTokenHook = session => {
133
134
  (0, _devLogger.pushLog)('warn', 'push: getPushTokens failed; will retry', error);
134
135
  });
135
136
  };
136
- const hold = (token, tokenType) => {
137
+ const hold = (token, tokenType, pushKey) => {
137
138
  const resolved = tokenType ?? (0, _push.detectPushTokenType)(token);
139
+ const key = typeof pushKey === 'string' ? pushKey.trim() : '';
138
140
  const entry = {
139
141
  token,
140
- tokenType: resolved
142
+ tokenType: resolved,
143
+ ...(key ? {
144
+ pushKey: key
145
+ } : {})
141
146
  };
142
147
  held.set(slotOf(resolved), entry);
143
148
  return entry;
@@ -186,7 +191,7 @@ async function registerPushToken(token, options) {
186
191
  if (typeof token !== 'string' || !token.trim()) {
187
192
  throw new TypeError('registerPushToken: token must be a non-empty string');
188
193
  }
189
- hold(token.trim(), options?.tokenType);
194
+ hold(token.trim(), options?.tokenType, options?.pushKey);
190
195
  ensureWatching();
191
196
  const session = readSession();
192
197
  if (session.pushDisabled) {
@@ -1 +1 @@
1
- {"version":3,"names":["_roomStore","require","_push","_devLogger","slotOf","tokenType","SLOTS","HOOK_RETRY_MS","held","Map","registered","inflight","unwatch","hookIdentity","hookFailedAt","readSession","slice","store","getState","chatSettingStore","user","config","authToken","String","token","appId","trim","xmppUsername","projectName","gatewayUrl","pushNotifications","apiUrl","pushDisabled","enabled","pushEnabled","isGateway","session","isReady","sameRegistration","current","gateway","slotsNeedingRegistration","filter","slot","get","releaseOnServer","unregisterPushSubscription","registerOne","PushRegistrationError","subscribeToPushGateway","userJid","registerPushSubscription","set","pushLog","registerNow","previous","delete","catch","error","finally","runTokenHook","hook","getPushTokens","identity","Date","now","result","list","Array","isArray","entry","hold","resolved","detectPushTokenType","ensureWatching","subscribe","size","releasePushRegistration","undefined","length","installPushTokenHook","exports","registerPushToken","options","TypeError","from","values","clear","Promise","all","map","then","unregisterPushToken","slots","toRelease","push","removable","results","allSettled","failure","find","r","status","reason","getRegisteredPushToken","chat","getRegisteredPushTokens","t","__resetPushRegistrationForTests"],"sourceRoot":"../../../src","sources":["services/pushRegistration.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_roomStore","require","_push","_devLogger","slotOf","tokenType","SLOTS","HOOK_RETRY_MS","held","Map","registered","inflight","unwatch","hookIdentity","hookFailedAt","readSession","slice","store","getState","chatSettingStore","user","config","authToken","String","token","appId","trim","xmppUsername","projectName","gatewayUrl","pushNotifications","apiUrl","pushDisabled","enabled","pushEnabled","isGateway","session","isReady","sameRegistration","current","pushKey","gateway","slotsNeedingRegistration","filter","slot","get","releaseOnServer","unregisterPushSubscription","registerOne","PushRegistrationError","subscribeToPushGateway","userJid","registerPushSubscription","set","pushLog","registerNow","previous","delete","catch","error","finally","runTokenHook","hook","getPushTokens","identity","Date","now","result","list","Array","isArray","entry","hold","resolved","detectPushTokenType","key","ensureWatching","subscribe","size","releasePushRegistration","undefined","length","installPushTokenHook","exports","registerPushToken","options","TypeError","from","values","clear","Promise","all","map","then","unregisterPushToken","slots","toRelease","push","removable","results","allSettled","failure","find","r","status","reason","getRegisteredPushToken","chat","getRegisteredPushTokens","t","__resetPushRegistrationForTests"],"sourceRoot":"../../../src","sources":["services/pushRegistration.ts"],"mappings":"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","ignoreList":[]}
@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.ETHORA_CHAT_COMPONENT_VERSION = void 0;
7
7
  // Generated by scripts/sync-version.mjs on `npm version`.
8
8
  // Edit package.json's version instead of this file.
9
- const ETHORA_CHAT_COMPONENT_VERSION = exports.ETHORA_CHAT_COMPONENT_VERSION = '26.10.6';
9
+ const ETHORA_CHAT_COMPONENT_VERSION = exports.ETHORA_CHAT_COMPONENT_VERSION = '26.10.7';
10
10
  //# sourceMappingURL=version.js.map
@@ -14,6 +14,12 @@
14
14
  * AsyncStorage rather than crash (see `secureKeyValue.ts`).
15
15
  */
16
16
 
17
+ /**
18
+ * The subset of expo-secure-store's options the SDK uses. `keychainService`
19
+ * must be repeated on every read of an item written with it; the
20
+ * accessibility constants come from `SecureStoreRuntime.accessible`.
21
+ */
22
+
17
23
  let cached;
18
24
 
19
25
  /**
@@ -35,7 +41,10 @@ export const loadSecureStore = () => {
35
41
  cached = {
36
42
  getItemAsync: mod.getItemAsync,
37
43
  setItemAsync: mod.setItemAsync,
38
- deleteItemAsync: mod.deleteItemAsync
44
+ deleteItemAsync: mod.deleteItemAsync,
45
+ accessible: {
46
+ afterFirstUnlockThisDeviceOnly: mod.AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY
47
+ }
39
48
  };
40
49
  }
41
50
  } catch {
@@ -1 +1 @@
1
- {"version":3,"names":["cached","loadSecureStore","undefined","mod","require","getItemAsync","setItemAsync","deleteItemAsync","isSecureStoreAvailable","__resetSecureStoreRuntimeForTests"],"sourceRoot":"../../../src","sources":["helpers/secureStoreRuntime.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA,IAAIA,MAA6C;;AAEjD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAAA,KAAiC;EAC9D,IAAID,MAAM,KAAKE,SAAS,EAAE;IACxB,OAAOF,MAAM;EACf;EAEA,IAAI;IACF;IACA,MAAMG,GAAG,GAAGC,OAAO,CAAC,mBAAmB,CAAC;IACxC,IACE,OAAOD,GAAG,EAAEE,YAAY,KAAK,UAAU,IACvC,OAAOF,GAAG,EAAEG,YAAY,KAAK,UAAU,IACvC,OAAOH,GAAG,EAAEI,eAAe,KAAK,UAAU,EAC1C;MACAP,MAAM,GAAG,IAAI;IACf,CAAC,MAAM;MACLA,MAAM,GAAG;QACPK,YAAY,EAAEF,GAAG,CAACE,YAAY;QAC9BC,YAAY,EAAEH,GAAG,CAACG,YAAY;QAC9BC,eAAe,EAAEJ,GAAG,CAACI;MACvB,CAAC;IACH;EACF,CAAC,CAAC,MAAM;IACNP,MAAM,GAAG,IAAI;EACf;EAEA,OAAOA,MAAM;AACf,CAAC;AAED,OAAO,MAAMQ,sBAAsB,GAAGA,CAAA,KAAeP,eAAe,CAAC,CAAC,KAAK,IAAI;;AAE/E;AACA,OAAO,MAAMQ,iCAAiC,GAAGA,CAAA,KAAY;EAC3DT,MAAM,GAAGE,SAAS;AACpB,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["cached","loadSecureStore","undefined","mod","require","getItemAsync","setItemAsync","deleteItemAsync","accessible","afterFirstUnlockThisDeviceOnly","AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY","isSecureStoreAvailable","__resetSecureStoreRuntimeForTests"],"sourceRoot":"../../../src","sources":["helpers/secureStoreRuntime.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAiBA,IAAIA,MAA6C;;AAEjD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAAA,KAAiC;EAC9D,IAAID,MAAM,KAAKE,SAAS,EAAE;IACxB,OAAOF,MAAM;EACf;EAEA,IAAI;IACF;IACA,MAAMG,GAAG,GAAGC,OAAO,CAAC,mBAAmB,CAAC;IACxC,IACE,OAAOD,GAAG,EAAEE,YAAY,KAAK,UAAU,IACvC,OAAOF,GAAG,EAAEG,YAAY,KAAK,UAAU,IACvC,OAAOH,GAAG,EAAEI,eAAe,KAAK,UAAU,EAC1C;MACAP,MAAM,GAAG,IAAI;IACf,CAAC,MAAM;MACLA,MAAM,GAAG;QACPK,YAAY,EAAEF,GAAG,CAACE,YAAY;QAC9BC,YAAY,EAAEH,GAAG,CAACG,YAAY;QAC9BC,eAAe,EAAEJ,GAAG,CAACI,eAAe;QACpCC,UAAU,EAAE;UACVC,8BAA8B,EAAEN,GAAG,CAACO;QACtC;MACF,CAAC;IACH;EACF,CAAC,CAAC,MAAM;IACNV,MAAM,GAAG,IAAI;EACf;EAEA,OAAOA,MAAM;AACf,CAAC;AAED,OAAO,MAAMW,sBAAsB,GAAGA,CAAA,KAAeV,eAAe,CAAC,CAAC,KAAK,IAAI;;AAE/E;AACA,OAAO,MAAMW,iCAAiC,GAAGA,CAAA,KAAY;EAC3DZ,MAAM,GAAGE,SAAS;AACpB,CAAC","ignoreList":[]}
@@ -36,6 +36,12 @@ export { useUnread } from './hooks/useUnreadMessagesCounter';
36
36
  export { handlePushPayload, openRoomFromPush } from './helpers/pushPayload';
37
37
  export { registerPushToken, unregisterPushToken, getRegisteredPushToken, getRegisteredPushTokens } from './services/pushRegistration';
38
38
  export { detectPushTokenType, PushRegistrationError, isPushRegistrationError } from './networking/api-requests/push.api';
39
+ // Encrypted (sealed) pushes: the device key and the Android renderer.
40
+ // iOS renders them in the notification service extension the config
41
+ // plugin adds. See README, "Encrypted pushes".
42
+ export { ensurePushKeyPair, getPushKeyPair, resetPushKeyPair, clearPushKeyPair, PUSH_KEY_KEYCHAIN_SERVICE, PUSH_SECRET_KEY_ITEM } from './push/pushKeyStore';
43
+ export { registerSealedPushTask, presentSealedPush, SEALED_PUSH_TASK } from './push/sealedPushTask';
44
+ export { openSealedPush, isSealedPush, sealedPushEnvelopeOf, SEALED_PUSH_ALG } from './push/sealedPush';
39
45
  export { useChatRoomFocus } from './hooks/useChatRoomFocus';
40
46
  export { logoutService, useLogout } from './hooks/useLogout';
41
47
  export { useQRCodeChat, handleQRChatId } from './hooks/useQRCodeChatHandler';
@@ -1 +1 @@
1
- {"version":3,"names":["ReduxWrapper","Chat","XmppProvider","useUnread","handlePushPayload","openRoomFromPush","registerPushToken","unregisterPushToken","getRegisteredPushToken","getRegisteredPushTokens","detectPushTokenType","PushRegistrationError","isPushRegistrationError","useChatRoomFocus","logoutService","useLogout","useQRCodeChat","handleQRChatId","resendMessage","useChatFonts","useT","useUiLocale","BUILTIN_STRINGS","DEFAULT_UI_LANGUAGE","resolveStringTable","toBaseLanguage","translateKey","refreshAuthTokens","refreshAuthTokensQuietly","RefreshFatalError","isRefreshFatalError","LIGHT_THEME","DARK_THEME","resolveTheme","isDarkTheme","useTheme","setThemePreference","setPushEnabled","omemo","isE2eeEnabled"],"sourceRoot":"../../src","sources":["main.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,OAAO,gCAAgC;;AAEvC;AACA,SAASA,YAAY,IAAIC,IAAI,QAAQ,0CAA0C;AAC/E,SAASC,YAAY,QAAQ,wBAAwB;;AAErD;AACA,SAASC,SAAS,QAAQ,kCAAkC;AAE5D,SAASC,iBAAiB,EAAEC,gBAAgB,QAAQ,uBAAuB;AAE3E,SACEC,iBAAiB,EACjBC,mBAAmB,EACnBC,sBAAsB,EACtBC,uBAAuB,QAClB,6BAA6B;AAOpC,SACEC,mBAAmB,EACnBC,qBAAqB,EACrBC,uBAAuB,QAClB,oCAAoC;AAM3C,SAASC,gBAAgB,QAAQ,0BAA0B;AAC3D,SAASC,aAAa,EAAEC,SAAS,QAAQ,mBAAmB;AAC5D,SAASC,aAAa,EAAEC,cAAc,QAAQ,8BAA8B;AAC5E,SAASC,aAAa,QAAQ,uBAAuB;AACrD;AACA,SAASC,YAAY,QAAQ,sBAAsB;;AAEnD;AACA;AACA;AACA,SAASC,IAAI,EAAEC,WAAW,QAAQ,aAAa;AAC/C,SACEC,eAAe,EACfC,mBAAmB,EACnBC,kBAAkB,EAClBC,cAAc,EACdC,YAAY,QACP,gBAAgB;;AAGvB;AACA;;AAqBA;AACA;AACA;AACA;AACA;AACA;AACA,SACEC,iBAAiB,EACjBC,wBAAwB,EACxBC,iBAAiB,EACjBC,mBAAmB,QACd,0BAA0B;AAOjC,SACEC,WAAW,EACXC,UAAU,EACVC,YAAY,EACZC,WAAW,EACXC,QAAQ,QACH,SAAS;AAGhB,SAASC,kBAAkB,EAAEC,cAAc,QAAQ,+BAA+B;AAClF,SAASC,KAAK,EAAEC,aAAa,QAAQ,QAAQ","ignoreList":[]}
1
+ {"version":3,"names":["ReduxWrapper","Chat","XmppProvider","useUnread","handlePushPayload","openRoomFromPush","registerPushToken","unregisterPushToken","getRegisteredPushToken","getRegisteredPushTokens","detectPushTokenType","PushRegistrationError","isPushRegistrationError","ensurePushKeyPair","getPushKeyPair","resetPushKeyPair","clearPushKeyPair","PUSH_KEY_KEYCHAIN_SERVICE","PUSH_SECRET_KEY_ITEM","registerSealedPushTask","presentSealedPush","SEALED_PUSH_TASK","openSealedPush","isSealedPush","sealedPushEnvelopeOf","SEALED_PUSH_ALG","useChatRoomFocus","logoutService","useLogout","useQRCodeChat","handleQRChatId","resendMessage","useChatFonts","useT","useUiLocale","BUILTIN_STRINGS","DEFAULT_UI_LANGUAGE","resolveStringTable","toBaseLanguage","translateKey","refreshAuthTokens","refreshAuthTokensQuietly","RefreshFatalError","isRefreshFatalError","LIGHT_THEME","DARK_THEME","resolveTheme","isDarkTheme","useTheme","setThemePreference","setPushEnabled","omemo","isE2eeEnabled"],"sourceRoot":"../../src","sources":["main.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,OAAO,gCAAgC;;AAEvC;AACA,SAASA,YAAY,IAAIC,IAAI,QAAQ,0CAA0C;AAC/E,SAASC,YAAY,QAAQ,wBAAwB;;AAErD;AACA,SAASC,SAAS,QAAQ,kCAAkC;AAE5D,SAASC,iBAAiB,EAAEC,gBAAgB,QAAQ,uBAAuB;AAE3E,SACEC,iBAAiB,EACjBC,mBAAmB,EACnBC,sBAAsB,EACtBC,uBAAuB,QAClB,6BAA6B;AAOpC,SACEC,mBAAmB,EACnBC,qBAAqB,EACrBC,uBAAuB,QAClB,oCAAoC;AAM3C;AACA;AACA;AACA,SACEC,iBAAiB,EACjBC,cAAc,EACdC,gBAAgB,EAChBC,gBAAgB,EAChBC,yBAAyB,EACzBC,oBAAoB,QACf,qBAAqB;AAE5B,SACEC,sBAAsB,EACtBC,iBAAiB,EACjBC,gBAAgB,QACX,uBAAuB;AAE9B,SACEC,cAAc,EACdC,YAAY,EACZC,oBAAoB,EACpBC,eAAe,QACV,mBAAmB;AAO1B,SAASC,gBAAgB,QAAQ,0BAA0B;AAC3D,SAASC,aAAa,EAAEC,SAAS,QAAQ,mBAAmB;AAC5D,SAASC,aAAa,EAAEC,cAAc,QAAQ,8BAA8B;AAC5E,SAASC,aAAa,QAAQ,uBAAuB;AACrD;AACA,SAASC,YAAY,QAAQ,sBAAsB;;AAEnD;AACA;AACA;AACA,SAASC,IAAI,EAAEC,WAAW,QAAQ,aAAa;AAC/C,SACEC,eAAe,EACfC,mBAAmB,EACnBC,kBAAkB,EAClBC,cAAc,EACdC,YAAY,QACP,gBAAgB;;AAGvB;AACA;;AAqBA;AACA;AACA;AACA;AACA;AACA;AACA,SACEC,iBAAiB,EACjBC,wBAAwB,EACxBC,iBAAiB,EACjBC,mBAAmB,QACd,0BAA0B;AAOjC,SACEC,WAAW,EACXC,UAAU,EACVC,YAAY,EACZC,WAAW,EACXC,QAAQ,QACH,SAAS;AAGhB,SAASC,kBAAkB,EAAEC,cAAc,QAAQ,+BAA+B;AAClF,SAASC,KAAK,EAAEC,aAAa,QAAQ,QAAQ","ignoreList":[]}
@@ -38,31 +38,46 @@ const toRegistrationError = (error, what) => {
38
38
  return new PushRegistrationError(status ? `${what} refused (HTTP ${status}): ${detail}` : `${what} failed: ${detail}`, status, body);
39
39
  };
40
40
  const isUnknownFieldError = error => error?.response?.status === 422 && /not allowed/i.test(String(error?.response?.data?.error ?? ''));
41
- export const buildPushSubscriptionPayload = (token, tokenType) => ({
41
+
42
+ /** The only sealing scheme the push service knows (README, "Encrypted pushes"). */
43
+ export const PUSH_KEY_ALG = 'sealed-box-x25519';
44
+ export const buildPushSubscriptionPayload = (token, tokenType, pushKey, pushKeyId) => ({
42
45
  registrationToken: token,
43
46
  deviceType: resolvePushDeviceType(),
44
- tokenType
47
+ tokenType,
48
+ ...(pushKey ? {
49
+ pushKey,
50
+ pushKeyAlg: PUSH_KEY_ALG,
51
+ ...(pushKeyId ? {
52
+ pushKeyId
53
+ } : {})
54
+ } : {})
45
55
  });
46
56
  export async function registerPushSubscription({
47
57
  appId,
48
58
  token,
49
59
  tokenType,
50
- authToken
60
+ authToken,
61
+ pushKey,
62
+ pushKeyId
51
63
  }) {
52
64
  const path = `/v1/push/subscription/${encodeURIComponent(appId)}`;
53
65
  const headers = {
54
66
  Authorization: authToken
55
67
  };
56
- const payload = buildPushSubscriptionPayload(token, tokenType);
68
+ const payload = buildPushSubscriptionPayload(token, tokenType, pushKey, pushKeyId);
57
69
  try {
58
70
  await http.post(path, payload, {
59
71
  headers
60
72
  });
61
73
  return;
62
74
  } catch (error) {
63
- const canDowngrade = tokenType === 'apns' || tokenType === 'fcm';
75
+ // A backend that predates `tokenType` still delivers to apns / fcm
76
+ // tokens. One that predates `pushKey` would deliver in the clear: the
77
+ // host asked for encryption, so that is an error, never a quiet fallback.
78
+ const canDowngrade = (tokenType === 'apns' || tokenType === 'fcm') && !pushKey;
64
79
  if (!(canDowngrade && isUnknownFieldError(error))) {
65
- throw toRegistrationError(error, tokenType === 'expo' ? 'Push registration (the backend does not accept Expo push tokens yet)' : 'Push registration');
80
+ throw toRegistrationError(error, tokenType === 'expo' ? 'Push registration (the backend does not accept Expo push tokens yet)' : pushKey && isUnknownFieldError(error) ? 'Push registration (the backend does not support encrypted pushes)' : 'Push registration');
66
81
  }
67
82
  }
68
83
  try {
@@ -1 +1 @@
1
- {"version":3,"names":["axios","Platform","store","http","PushRegistrationError","Error","constructor","message","status","body","name","isPushRegistrationError","error","EXPO_PUSH_TOKEN","APNS_TOKEN","detectPushTokenType","token","t","trim","test","resolvePushDeviceType","OS","toRegistrationError","what","response","data","detail","isUnknownFieldError","String","buildPushSubscriptionPayload","tokenType","registrationToken","deviceType","registerPushSubscription","appId","authToken","path","encodeURIComponent","headers","Authorization","payload","post","canDowngrade","unregisterPushSubscription","delete","endpoint","DEFAULT_XMPP_HOST","resolveXmppHost","config","getState","chatSettingStore","xmppSettings","host","gatewayAxios","create","buildPushGatewayPayload","userJid","projectName","jid","includes","subscribeToPushGateway","args","baseURL","apiUrl"],"sourceRoot":"../../../../src","sources":["networking/api-requests/push.api.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["axios","Platform","store","http","PushRegistrationError","Error","constructor","message","status","body","name","isPushRegistrationError","error","EXPO_PUSH_TOKEN","APNS_TOKEN","detectPushTokenType","token","t","trim","test","resolvePushDeviceType","OS","toRegistrationError","what","response","data","detail","isUnknownFieldError","String","PUSH_KEY_ALG","buildPushSubscriptionPayload","tokenType","pushKey","pushKeyId","registrationToken","deviceType","pushKeyAlg","registerPushSubscription","appId","authToken","path","encodeURIComponent","headers","Authorization","payload","post","canDowngrade","unregisterPushSubscription","delete","endpoint","DEFAULT_XMPP_HOST","resolveXmppHost","config","getState","chatSettingStore","xmppSettings","host","gatewayAxios","create","buildPushGatewayPayload","userJid","projectName","jid","includes","subscribeToPushGateway","args","baseURL","apiUrl"],"sourceRoot":"../../../../src","sources":["networking/api-requests/push.api.ts"],"mappings":"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","ignoreList":[]}