@ethora/chat-component-rn 26.10.5 → 26.10.7

package/lib/commonjs/main.js

@@ -33,6 +33,18 @@ Object.defineProperty(exports, "LIGHT_THEME", {
     return _theme.LIGHT_THEME;
   }
 });
+Object.defineProperty(exports, "PUSH_KEY_KEYCHAIN_SERVICE", {
+  enumerable: true,
+  get: function () {
+    return _pushKeyStore.PUSH_KEY_KEYCHAIN_SERVICE;
+  }
+});
+Object.defineProperty(exports, "PUSH_SECRET_KEY_ITEM", {
+  enumerable: true,
+  get: function () {
+    return _pushKeyStore.PUSH_SECRET_KEY_ITEM;
+  }
+});
 Object.defineProperty(exports, "PushRegistrationError", {
   enumerable: true,
   get: function () {
@@ -45,18 +57,48 @@ Object.defineProperty(exports, "RefreshFatalError", {
     return _authRefresh.RefreshFatalError;
   }
 });
+Object.defineProperty(exports, "SEALED_PUSH_ALG", {
+  enumerable: true,
+  get: function () {
+    return _sealedPush.SEALED_PUSH_ALG;
+  }
+});
+Object.defineProperty(exports, "SEALED_PUSH_TASK", {
+  enumerable: true,
+  get: function () {
+    return _sealedPushTask.SEALED_PUSH_TASK;
+  }
+});
 Object.defineProperty(exports, "XmppProvider", {
   enumerable: true,
   get: function () {
     return _xmppProvider.XmppProvider;
   }
 });
+Object.defineProperty(exports, "clearPushKeyPair", {
+  enumerable: true,
+  get: function () {
+    return _pushKeyStore.clearPushKeyPair;
+  }
+});
 Object.defineProperty(exports, "detectPushTokenType", {
   enumerable: true,
   get: function () {
     return _push.detectPushTokenType;
   }
 });
+Object.defineProperty(exports, "ensurePushKeyPair", {
+  enumerable: true,
+  get: function () {
+    return _pushKeyStore.ensurePushKeyPair;
+  }
+});
+Object.defineProperty(exports, "getPushKeyPair", {
+  enumerable: true,
+  get: function () {
+    return _pushKeyStore.getPushKeyPair;
+  }
+});
 Object.defineProperty(exports, "getRegisteredPushToken", {
   enumerable: true,
   get: function () {
@@ -105,6 +147,12 @@ Object.defineProperty(exports, "isRefreshFatalError", {
     return _authRefresh.isRefreshFatalError;
   }
 });
+Object.defineProperty(exports, "isSealedPush", {
+  enumerable: true,
+  get: function () {
+    return _sealedPush.isSealedPush;
+  }
+});
 Object.defineProperty(exports, "logoutService", {
   enumerable: true,
   get: function () {
@@ -123,6 +171,18 @@ Object.defineProperty(exports, "openRoomFromPush", {
     return _pushPayload.openRoomFromPush;
   }
 });
+Object.defineProperty(exports, "openSealedPush", {
+  enumerable: true,
+  get: function () {
+    return _sealedPush.openSealedPush;
+  }
+});
+Object.defineProperty(exports, "presentSealedPush", {
+  enumerable: true,
+  get: function () {
+    return _sealedPushTask.presentSealedPush;
+  }
+});
 Object.defineProperty(exports, "refreshAuthTokens", {
   enumerable: true,
   get: function () {
@@ -141,12 +201,24 @@ Object.defineProperty(exports, "registerPushToken", {
     return _pushRegistration.registerPushToken;
   }
 });
+Object.defineProperty(exports, "registerSealedPushTask", {
+  enumerable: true,
+  get: function () {
+    return _sealedPushTask.registerSealedPushTask;
+  }
+});
 Object.defineProperty(exports, "resendMessage", {
   enumerable: true,
   get: function () {
     return _resendMessage.resendMessage;
   }
 });
+Object.defineProperty(exports, "resetPushKeyPair", {
+  enumerable: true,
+  get: function () {
+    return _pushKeyStore.resetPushKeyPair;
+  }
+});
 Object.defineProperty(exports, "resolveStringTable", {
   enumerable: true,
   get: function () {
@@ -159,6 +231,12 @@ Object.defineProperty(exports, "resolveTheme", {
     return _theme.resolveTheme;
   }
 });
+Object.defineProperty(exports, "sealedPushEnvelopeOf", {
+  enumerable: true,
+  get: function () {
+    return _sealedPush.sealedPushEnvelopeOf;
+  }
+});
 Object.defineProperty(exports, "setPushEnabled", {
   enumerable: true,
   get: function () {
@@ -244,6 +322,9 @@ var _useUnreadMessagesCounter = require("./hooks/useUnreadMessagesCounter");
 var _pushPayload = require("./helpers/pushPayload");
 var _pushRegistration = require("./services/pushRegistration");
 var _push = require("./networking/api-requests/push.api");
+var _pushKeyStore = require("./push/pushKeyStore");
+var _sealedPushTask = require("./push/sealedPushTask");
+var _sealedPush = require("./push/sealedPush");
 var _useChatRoomFocus = require("./hooks/useChatRoomFocus");
 var _useLogout = require("./hooks/useLogout");
 var _useQRCodeChatHandler = require("./hooks/useQRCodeChatHandler");

package/lib/commonjs/main.js.map

@@ -1 +1 @@
-{"version":3,"names":["require","_ReduxWrapper","_xmppProvider","_useUnreadMessagesCounter","_pushPayload","_pushRegistration","_push","_useChatRoomFocus","_useLogout","_useQRCodeChatHandler","_resendMessage","_useChatFonts","_useT","_strings","_authRefresh","_theme","_chatSettingsSlice","_e2ee"],"sourceRoot":"../../src","sources":["main.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyBAA,OAAA;AAGA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AAGA,IAAAG,yBAAA,GAAAH,OAAA;AAEA,IAAAI,YAAA,GAAAJ,OAAA;AAEA,IAAAK,iBAAA,GAAAL,OAAA;AAYA,IAAAM,KAAA,GAAAN,OAAA;AAUA,IAAAO,iBAAA,GAAAP,OAAA;AACA,IAAAQ,UAAA,GAAAR,OAAA;AACA,IAAAS,qBAAA,GAAAT,OAAA;AACA,IAAAU,cAAA,GAAAV,OAAA;AAEA,IAAAW,aAAA,GAAAX,OAAA;AAKA,IAAAY,KAAA,GAAAZ,OAAA;AACA,IAAAa,QAAA,GAAAb,OAAA;AAqCA,IAAAc,YAAA,GAAAd,OAAA;AAYA,IAAAe,MAAA,GAAAf,OAAA;AASA,IAAAgB,kBAAA,GAAAhB,OAAA;AACA,IAAAiB,KAAA,GAAAjB,OAAA","ignoreList":[]}
+{"version":3,"names":["require","_ReduxWrapper","_xmppProvider","_useUnreadMessagesCounter","_pushPayload","_pushRegistration","_push","_pushKeyStore","_sealedPushTask","_sealedPush","_useChatRoomFocus","_useLogout","_useQRCodeChatHandler","_resendMessage","_useChatFonts","_useT","_strings","_authRefresh","_theme","_chatSettingsSlice","_e2ee"],"sourceRoot":"../../src","sources":["main.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyBAA,OAAA;AAGA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AAGA,IAAAG,yBAAA,GAAAH,OAAA;AAEA,IAAAI,YAAA,GAAAJ,OAAA;AAEA,IAAAK,iBAAA,GAAAL,OAAA;AAYA,IAAAM,KAAA,GAAAN,OAAA;AAaA,IAAAO,aAAA,GAAAP,OAAA;AASA,IAAAQ,eAAA,GAAAR,OAAA;AAMA,IAAAS,WAAA,GAAAT,OAAA;AAYA,IAAAU,iBAAA,GAAAV,OAAA;AACA,IAAAW,UAAA,GAAAX,OAAA;AACA,IAAAY,qBAAA,GAAAZ,OAAA;AACA,IAAAa,cAAA,GAAAb,OAAA;AAEA,IAAAc,aAAA,GAAAd,OAAA;AAKA,IAAAe,KAAA,GAAAf,OAAA;AACA,IAAAgB,QAAA,GAAAhB,OAAA;AAqCA,IAAAiB,YAAA,GAAAjB,OAAA;AAYA,IAAAkB,MAAA,GAAAlB,OAAA;AASA,IAAAmB,kBAAA,GAAAnB,OAAA;AACA,IAAAoB,KAAA,GAAApB,OAAA","ignoreList":[]}

package/lib/commonjs/networking/api-requests/auth.api.js

@@ -174,7 +174,10 @@ const cloneFormData = formData => {
   }
   return copy;
 };
-function postMultipart(url, body, path) {
+
+// How long an upload may sit without progress before it is aborted.
+const UPLOAD_STALL_MS = 90_000;
+function postMultipart(url, body, path, onProgress) {
   const token = _roomStore.store.getState().chatSettingStore?.user?.token ?? '';
   (0, _devLogger.pushLog)('http', `→ POST ${url} (xhr)`, {
     path,
@@ -233,10 +236,66 @@ function postMultipart(url, body, path) {
     xhr.onerror = () => failNetwork('Network request failed');
     xhr.ontimeout = () => failNetwork('Upload timed out');
     xhr.onabort = () => failNetwork('Upload aborted');
+
+    // A stalled connection must not hold an upload (and the message waiting on
+    // it) forever: abort when the body makes no progress for UPLOAD_STALL_MS,
+    // and again while the server takes that long to answer once it is up.
+    let stallTimer = null;
+    const armStall = () => {
+      if (stallTimer) {
+        clearTimeout(stallTimer);
+      }
+      stallTimer = setTimeout(() => {
+        try {
+          xhr.abort();
+        } catch {
+          // already finished
+        }
+      }, UPLOAD_STALL_MS);
+    };
+    const disarmStall = () => {
+      if (stallTimer) {
+        clearTimeout(stallTimer);
+      }
+      stallTimer = null;
+    };
+    const settledOnload = xhr.onload;
+    xhr.onload = (...args) => {
+      disarmStall();
+      settledOnload?.apply(xhr, args);
+    };
+    const settledOnerror = xhr.onerror;
+    xhr.onerror = (...args) => {
+      disarmStall();
+      settledOnerror?.apply(xhr, args);
+    };
+    const settledOnabort = xhr.onabort;
+    xhr.onabort = (...args) => {
+      disarmStall();
+      settledOnabort?.apply(xhr, args);
+    };
+    if (xhr.upload) {
+      xhr.upload.onprogress = event => {
+        armStall();
+        if (!onProgress) {
+          return;
+        }
+        if (!event.lengthComputable || !(event.total > 0)) {
+          return;
+        }
+        const percent = Math.min(100, Math.max(0, Math.round(event.loaded / event.total * 100)));
+        try {
+          onProgress(percent);
+        } catch {
+          // A progress listener must never fail the upload itself.
+        }
+      };
+    }
     xhr.open('POST', url);
     xhr.setRequestHeader('Authorization', token);
     xhr.setRequestHeader('Accept', '*/*');
     // Deliberately no Content-Type — see the note above.
+    armStall();
     xhr.send(body);
   });
 }
@@ -258,7 +317,7 @@ async function uploadFileV2(formData, activeRoomJID, options = {}) {
     const body = cloneFormData(formData);
     body.append('chatName', chatName);
     try {
-      return await postMultipart(`${apiRoot}${SECURE_UPLOAD_PATH}`, body, SECURE_UPLOAD_PATH);
+      return await postMultipart(`${apiRoot}${SECURE_UPLOAD_PATH}`, body, SECURE_UPLOAD_PATH, options.onProgress);
     } catch (error) {
       if (!canFallBackToLegacyUpload(error)) {
         throw error;
@@ -267,7 +326,7 @@ async function uploadFileV2(formData, activeRoomJID, options = {}) {
       console.warn(`[chat] ${SECURE_UPLOAD_PATH} unreachable, falling back to ${LEGACY_UPLOAD_PATH} for this session`, error);
     }
   }
-  return postMultipart(`${apiRoot}${LEGACY_UPLOAD_PATH}`, formData, LEGACY_UPLOAD_PATH);
+  return postMultipart(`${apiRoot}${LEGACY_UPLOAD_PATH}`, formData, LEGACY_UPLOAD_PATH, options.onProgress);
 }
 const __resetSecureUploadLatchForTests = () => {
   secureUploadUnavailable = false;

package/lib/commonjs/networking/api-requests/auth.api.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiClient","_interopRequireWildcard","require","_roomStore","_devLogger","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","loginEmail","email","password","res","http","post","headers","Authorization","getCurrentAppToken","console","log","data","user","fileToken","loginSocial","idToken","accessToken","loginType","authToken","registerSocial","signUpPlan","signupPlan","checkEmailExist","loginViaJwt","clientToken","response","hasUser","hasToken","token","hasRefreshToken","refreshToken","userData","_id","firstName","lastName","xmppUsername","uploadFile","formData","store","getState","chatSettingStore","Accept","transformRequest","delete","SECURE_UPLOAD_PATH","LEGACY_UPLOAD_PATH","cloneFormData","copy","FormData","source","Array","isArray","_parts","key","value","append","forEach","getParts","part","fieldName","string","_headers","file","undefined","postMultipart","url","body","path","pushLog","baseUrl","getCurrentBaseURL","slice","Promise","resolve","reject","xhr","XMLHttpRequest","failNetwork","reason","err","Error","code","config","onload","status","responseBody","JSON","parse","responseText","statusText","resultsCount","results","length","onerror","ontimeout","onabort","open","setRequestHeader","send","canFallBackToLegacyUpload","error","secureUploadUnavailable","uploadFileV2","activeRoomJID","options","clientEncrypted","chatName","split","apiRoot","replace","warn","__resetSecureUploadLatchForTests","exports"],"sourceRoot":"../../../../src","sources":["networking/api-requests/auth.api.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_apiClient","_interopRequireWildcard","require","_roomStore","_devLogger","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","loginEmail","email","password","res","http","post","headers","Authorization","getCurrentAppToken","console","log","data","user","fileToken","loginSocial","idToken","accessToken","loginType","authToken","registerSocial","signUpPlan","signupPlan","checkEmailExist","loginViaJwt","clientToken","response","hasUser","hasToken","token","hasRefreshToken","refreshToken","userData","_id","firstName","lastName","xmppUsername","uploadFile","formData","store","getState","chatSettingStore","Accept","transformRequest","delete","SECURE_UPLOAD_PATH","LEGACY_UPLOAD_PATH","cloneFormData","copy","FormData","source","Array","isArray","_parts","key","value","append","forEach","getParts","part","fieldName","string","_headers","file","undefined","UPLOAD_STALL_MS","postMultipart","url","body","path","onProgress","pushLog","baseUrl","getCurrentBaseURL","slice","Promise","resolve","reject","xhr","XMLHttpRequest","failNetwork","reason","err","Error","code","config","onload","status","responseBody","JSON","parse","responseText","statusText","resultsCount","results","length","onerror","ontimeout","onabort","stallTimer","armStall","clearTimeout","setTimeout","abort","disarmStall","settledOnload","args","apply","settledOnerror","settledOnabort","upload","onprogress","event","lengthComputable","total","percent","Math","min","max","round","loaded","open","setRequestHeader","send","canFallBackToLegacyUpload","error","secureUploadUnavailable","uploadFileV2","activeRoomJID","options","clientEncrypted","chatName","split","apiRoot","replace","warn","__resetSecureUploadLatchForTests","exports"],"sourceRoot":"../../../../src","sources":["networking/api-requests/auth.api.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/networking/api-requests/push.api.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPushRegistrationError = exports.detectPushTokenType = exports.buildPushSubscriptionPayload = exports.buildPushGatewayPayload = exports.PushRegistrationError = void 0;
+exports.isPushRegistrationError = exports.detectPushTokenType = exports.buildPushSubscriptionPayload = exports.buildPushGatewayPayload = exports.PushRegistrationError = exports.PUSH_KEY_ALG = void 0;
 exports.registerPushSubscription = registerPushSubscription;
 exports.resolvePushDeviceType = void 0;
 exports.subscribeToPushGateway = subscribeToPushGateway;
@@ -51,32 +51,47 @@ const toRegistrationError = (error, what) => {
   return new PushRegistrationError(status ? `${what} refused (HTTP ${status}): ${detail}` : `${what} failed: ${detail}`, status, body);
 };
 const isUnknownFieldError = error => error?.response?.status === 422 && /not allowed/i.test(String(error?.response?.data?.error ?? ''));
-const buildPushSubscriptionPayload = (token, tokenType) => ({
+
+/** The only sealing scheme the push service knows (README, "Encrypted pushes"). */
+const PUSH_KEY_ALG = exports.PUSH_KEY_ALG = 'sealed-box-x25519';
+const buildPushSubscriptionPayload = (token, tokenType, pushKey, pushKeyId) => ({
   registrationToken: token,
   deviceType: resolvePushDeviceType(),
-  tokenType
+  tokenType,
+  ...(pushKey ? {
+    pushKey,
+    pushKeyAlg: PUSH_KEY_ALG,
+    ...(pushKeyId ? {
+      pushKeyId
+    } : {})
+  } : {})
 });
 exports.buildPushSubscriptionPayload = buildPushSubscriptionPayload;
 async function registerPushSubscription({
   appId,
   token,
   tokenType,
-  authToken
+  authToken,
+  pushKey,
+  pushKeyId
 }) {
   const path = `/v1/push/subscription/${encodeURIComponent(appId)}`;
   const headers = {
     Authorization: authToken
   };
-  const payload = buildPushSubscriptionPayload(token, tokenType);
+  const payload = buildPushSubscriptionPayload(token, tokenType, pushKey, pushKeyId);
   try {
     await _apiClient.default.post(path, payload, {
       headers
     });
     return;
   } catch (error) {
-    const canDowngrade = tokenType === 'apns' || tokenType === 'fcm';
+    // A backend that predates `tokenType` still delivers to apns / fcm
+    // tokens. One that predates `pushKey` would deliver in the clear: the
+    // host asked for encryption, so that is an error, never a quiet fallback.
+    const canDowngrade = (tokenType === 'apns' || tokenType === 'fcm') && !pushKey;
     if (!(canDowngrade && isUnknownFieldError(error))) {
-      throw toRegistrationError(error, tokenType === 'expo' ? 'Push registration (the backend does not accept Expo push tokens yet)' : 'Push registration');
+      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');
     }
   }
   try {

package/lib/commonjs/networking/api-requests/push.api.js.map

@@ -1 +1 @@
-{"version":3,"names":["_axios","_interopRequireDefault","require","_reactNative","_roomStore","_apiClient","e","__esModule","default","PushRegistrationError","Error","constructor","message","status","body","name","exports","isPushRegistrationError","error","EXPO_PUSH_TOKEN","APNS_TOKEN","detectPushTokenType","token","t","trim","test","resolvePushDeviceType","Platform","OS","toRegistrationError","what","response","data","detail","isUnknownFieldError","String","buildPushSubscriptionPayload","tokenType","registrationToken","deviceType","registerPushSubscription","appId","authToken","path","encodeURIComponent","headers","Authorization","payload","http","post","canDowngrade","unregisterPushSubscription","delete","endpoint","DEFAULT_XMPP_HOST","resolveXmppHost","config","store","getState","chatSettingStore","xmppSettings","host","gatewayAxios","axios","create","buildPushGatewayPayload","userJid","projectName","jid","includes","subscribeToPushGateway","args","baseURL","apiUrl"],"sourceRoot":"../../../../src","sources":["networking/api-requests/push.api.ts"],"mappings":";;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAAgC,SAAAD,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAOhC;AACA;AACA;AACA;AACA;AACO,MAAMG,qBAAqB,SAASC,KAAK,CAAC;EAI/CC,WAAWA,CAACC,OAAe,EAAEC,MAAe,EAAEC,IAAc,EAAE;IAC5D,KAAK,CAACF,OAAO,CAAC;IACd,IAAI,CAACG,IAAI,GAAG,uBAAuB;IACnC,IAAI,CAACF,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACC,IAAI,GAAGA,IAAI;EAClB;AACF;AAACE,OAAA,CAAAP,qBAAA,GAAAA,qBAAA;AAEM,MAAMQ,uBAAuB,GAClCC,KAAc,IAEbA,KAAK,EAA4BH,IAAI,KAAK,uBAAuB;AAACC,OAAA,CAAAC,uBAAA,GAAAA,uBAAA;AAErE,MAAME,eAAe,GAAG,oCAAoC;AAC5D,MAAMC,UAAU,GAAG,kBAAkB;AAE9B,MAAMC,mBAAmB,GAAIC,KAAa,IAAoB;EACnE,MAAMC,CAAC,GAAGD,KAAK,CAACE,IAAI,CAAC,CAAC;EACtB,IAAIL,eAAe,CAACM,IAAI,CAACF,CAAC,CAAC,EAAE;IAC3B,OAAO,MAAM;EACf;EACA,IAAIH,UAAU,CAACK,IAAI,CAACF,CAAC,CAAC,EAAE;IACtB,OAAO,MAAM;EACf;EACA,OAAO,KAAK;AACd,CAAC;AAACP,OAAA,CAAAK,mBAAA,GAAAA,mBAAA;AAEK,MAAMK,qBAAqB,GAAGA,CAAA,KACnCC,qBAAQ,CAACC,EAAE,KAAK,KAAK,GAAG,KAAK,GAAG,SAAS;AAACZ,OAAA,CAAAU,qBAAA,GAAAA,qBAAA;AAE5C,MAAMG,mBAAmB,GAAGA,CAACX,KAAU,EAAEY,IAAY,KAA4B;EAC/E,MAAMjB,MAA0B,GAAGK,KAAK,EAAEa,QAAQ,EAAElB,MAAM;EAC1D,MAAMC,IAAI,GAAGI,KAAK,EAAEa,QAAQ,EAAEC,IAAI;EAClC,MAAMC,MAAM,GACT,OAAOnB,IAAI,EAAEI,KAAK,KAAK,QAAQ,IAAIJ,IAAI,CAACI,KAAK,IAC9CA,KAAK,EAAEN,OAAO,IACd,eAAe;EACjB,OAAO,IAAIH,qBAAqB,CAC9BI,MAAM,GACF,GAAGiB,IAAI,kBAAkBjB,MAAM,MAAMoB,MAAM,EAAE,GAC7C,GAAGH,IAAI,YAAYG,MAAM,EAAE,EAC/BpB,MAAM,EACNC,IACF,CAAC;AACH,CAAC;AAED,MAAMoB,mBAAmB,GAAIhB,KAAU,IACrCA,KAAK,EAAEa,QAAQ,EAAElB,MAAM,KAAK,GAAG,IAC/B,cAAc,CAACY,IAAI,CAACU,MAAM,CAACjB,KAAK,EAAEa,QAAQ,EAAEC,IAAI,EAAEd,KAAK,IAAI,EAAE,CAAC,CAAC;AAe1D,MAAMkB,4BAA4B,GAAGA,CAC1Cd,KAAa,EACbe,SAAwB,MACK;EAC7BC,iBAAiB,EAAEhB,KAAK;EACxBiB,UAAU,EAAEb,qBAAqB,CAAC,CAAC;EACnCW;AACF,CAAC,CAAC;AAACrB,OAAA,CAAAoB,4BAAA,GAAAA,4BAAA;AAEI,eAAeI,wBAAwBA,CAAC;EAC7CC,KAAK;EACLnB,KAAK;EACLe,SAAS;EACTK;AAC4B,CAAC,EAAiB;EAC9C,MAAMC,IAAI,GAAG,yBAAyBC,kBAAkB,CAACH,KAAK,CAAC,EAAE;EACjE,MAAMI,OAAO,GAAG;IAAEC,aAAa,EAAEJ;EAAU,CAAC;EAC5C,MAAMK,OAAO,GAAGX,4BAA4B,CAACd,KAAK,EAAEe,SAAS,CAAC;EAE9D,IAAI;IACF,MAAMW,kBAAI,CAACC,IAAI,CAACN,IAAI,EAAEI,OAAO,EAAE;MAAEF;IAAQ,CAAC,CAAC;IAC3C;EACF,CAAC,CAAC,OAAO3B,KAAU,EAAE;IACnB,MAAMgC,YAAY,GAAGb,SAAS,KAAK,MAAM,IAAIA,SAAS,KAAK,KAAK;IAChE,IAAI,EAAEa,YAAY,IAAIhB,mBAAmB,CAAChB,KAAK,CAAC,CAAC,EAAE;MACjD,MAAMW,mBAAmB,CACvBX,KAAK,EACLmB,SAAS,KAAK,MAAM,GAChB,sEAAsE,GACtE,mBACN,CAAC;IACH;EACF;EAEA,IAAI;IACF,MAAMW,kBAAI,CAACC,IAAI,CACbN,IAAI,EACJ;MAAEL,iBAAiB,EAAES,OAAO,CAACT,iBAAiB;MAAEC,UAAU,EAAEQ,OAAO,CAACR;IAAW,CAAC,EAChF;MAAEM;IAAQ,CACZ,CAAC;EACH,CAAC,CAAC,OAAO3B,KAAU,EAAE;IACnB,MAAMW,mBAAmB,CAACX,KAAK,EAAE,mBAAmB,CAAC;EACvD;AACF;AAQO,eAAeiC,0BAA0BA,CAAC;EAC/CV,KAAK;EACLnB,KAAK;EACLoB;AAC8B,CAAC,EAAiB;EAChD,MAAMG,OAAO,GAAG;IAAEC,aAAa,EAAEJ;EAAU,CAAC;EAC5C,IAAI;IACF,MAAMM,kBAAI,CAACI,MAAM,CAAC,yBAAyBR,kBAAkB,CAACH,KAAK,CAAC,EAAE,EAAE;MACtEI,OAAO;MACPb,IAAI,EAAE;QAAEM,iBAAiB,EAAEhB;MAAM;IACnC,CAAC,CAAC;IACF;EACF,CAAC,CAAC,OAAOJ,KAAU,EAAE;IACnB,IAAIA,KAAK,EAAEa,QAAQ,EAAElB,MAAM,KAAK,GAAG,EAAE;MACnC,MAAMgB,mBAAmB,CAACX,KAAK,EAAE,qBAAqB,CAAC;IACzD;EACF;EACA,IAAI;IACF,MAAM8B,kBAAI,CAACI,MAAM,CAAC,qBAAqB,EAAE;MACvCP,OAAO;MACPb,IAAI,EAAE;QAAEqB,QAAQ,EAAE/B;MAAM;IAC1B,CAAC,CAAC;EACJ,CAAC,CAAC,OAAOJ,KAAU,EAAE;IACnB,MAAMW,mBAAmB,CAACX,KAAK,EAAE,qBAAqB,CAAC;EACzD;AACF;AAEA,MAAMoC,iBAAiB,GAAG,sBAAsB;AAiBhD,MAAMC,eAAe,GAAGA,CAAA,KAAc;EACpC,MAAMC,MAAM,GAAGC,gBAAK,CAACC,QAAQ,CAAC,CAAC,CAACC,gBAAgB,EAAEH,MAAM;EACxD,OAAO,CAACA,MAAM,EAAEI,YAAY,EAAEC,IAAI,IAAI,EAAE,EAAErC,IAAI,CAAC,CAAC,IAAI8B,iBAAiB;AACvE,CAAC;AAED,MAAMQ,YAAY,GAAGC,cAAK,CAACC,MAAM,CAAC;EAChCnB,OAAO,EAAE;IAAE,cAAc,EAAE;EAAmB;AAChD,CAAC,CAAC;AAEK,MAAMoB,uBAAuB,GAAGA,CAAC;EACtC3C,KAAK;EACL4C,OAAO;EACPC;AAC+D,CAAC,MAAsC;EACtGA,WAAW;EACX7B,iBAAiB,EAAEhB,KAAK;EACxBiB,UAAU,EAAEb,qBAAqB,CAAC,CAAC;EACnC0C,GAAG,EAAEF,OAAO,CAACG,QAAQ,CAAC,GAAG,CAAC,GAAGH,OAAO,GAAG,GAAGA,OAAO,IAAIX,eAAe,CAAC,CAAC;AACxE,CAAC,CAAC;AAACvC,OAAA,CAAAiD,uBAAA,GAAAA,uBAAA;AAEI,eAAeK,sBAAsBA,CAC1CC,IAA0B,EACX;EACf,IAAI;IACF,MAAMT,YAAY,CAACb,IAAI,CAAC,gBAAgB,EAAEgB,uBAAuB,CAACM,IAAI,CAAC,EAAE;MACvEC,OAAO,EAAED,IAAI,CAACE,MAAM;MACpB5B,OAAO,EAAE;QAAEC,aAAa,EAAE,UAAUyB,IAAI,CAAC7B,SAAS;MAAG;IACvD,CAAC,CAAC;EACJ,CAAC,CAAC,OAAOxB,KAAU,EAAE;IACnB,MAAMW,mBAAmB,CAACX,KAAK,EAAE,2BAA2B,CAAC;EAC/D;AACF","ignoreList":[]}
+{"version":3,"names":["_axios","_interopRequireDefault","require","_reactNative","_roomStore","_apiClient","e","__esModule","default","PushRegistrationError","Error","constructor","message","status","body","name","exports","isPushRegistrationError","error","EXPO_PUSH_TOKEN","APNS_TOKEN","detectPushTokenType","token","t","trim","test","resolvePushDeviceType","Platform","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","http","post","canDowngrade","unregisterPushSubscription","delete","endpoint","DEFAULT_XMPP_HOST","resolveXmppHost","config","store","getState","chatSettingStore","xmppSettings","host","gatewayAxios","axios","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":[]}

package/lib/commonjs/networking/stanzaHandlers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.onRoomKicked = exports.onRealtimeMessage = exports.onReactionMessage = exports.onReactionHistory = exports.onPresenceInRoom = exports.onNewRoomCreated = exports.onMessageHistory = exports.onMessageError = exports.onGetRoomInfo = exports.onGetMembers = exports.onGetLastMessageArchive = exports.onGetChatRooms = exports.onEditMessage = exports.onDeleteMessage = exports.onChatInvite = exports.handleComposing = void 0;
+exports.onRoomKicked = exports.onReceivedReceipt = exports.onRealtimeMessage = exports.onReactionMessage = exports.onReactionHistory = exports.onPresenceInRoom = exports.onNewRoomCreated = exports.onMessageHistory = exports.onMessageError = exports.onGetRoomInfo = exports.onGetMembers = exports.onGetLastMessageArchive = exports.onGetChatRooms = exports.onEditMessage = exports.onDisplayedMarker = exports.onDeleteMessage = exports.onChatInvite = exports.isReceiptMarkerStanza = exports.handleComposing = void 0;
 var _roomStore = require("../roomStore");
 var _mamRouter = require("./xmpp/mamRouter");
 var _mamReactions = require("../helpers/mamReactions");
@@ -20,6 +20,40 @@ var _strings = require("../i18n/strings");
 var _mamQueryIds = require("./xmpp/mamQueryIds");
 var _rooms = require("./api-requests/rooms.api");
 var _pushSubscriptionService = require("../services/pushSubscriptionService");
+var _readReceipts = require("../helpers/readReceipts");
+const RECEIPTS_NS = 'urn:xmpp:receipts';
+const CHAT_MARKERS_NS = 'urn:xmpp:chat-markers:0';
+
+// XEP-0184 / XEP-0333 frames: broadcast to the room, carry no <data>, and are
+// never chat messages (no bubble, no unread, no toast).
+const isReceiptMarkerStanza = stanza => (0, _readReceipts.isReceiptMarkerId)(stanza?.attrs?.id) || !!stanza?.getChild?.('received', RECEIPTS_NS) || !!stanza?.getChild?.('displayed', CHAT_MARKERS_NS);
+
+// XEP-0184: ack a message from someone else so their client can move its
+// tick to "delivered". Our own echo and system messages are never acked.
+exports.isReceiptMarkerStanza = isReceiptMarkerStanza;
+const ackReceivedMessage = (message, roomJID, stanzaFrom, senderJID, xmppWs) => {
+  if (!xmppWs?.sendReceivedReceiptStanza || !message?.id) {
+    return;
+  }
+  if (message.isSystemMessage === 'true') {
+    return;
+  }
+  // A call-log row is built on this device; the sender has no such message.
+  if (String(message.id).startsWith('calllog-')) {
+    return;
+  }
+  const user = _roomStore.store.getState().chatSettingStore.user;
+  if ((0, _notificationPolicy.isOwnIncomingMessage)({
+    message,
+    stanzaFrom,
+    senderJID,
+    user
+  })) {
+    return;
+  }
+  xmppWs.sendReceivedReceiptStanza(String(message.id), roomJID);
+};
+
 // TO DO: we are thinking to refactor this code in the following way:
 // each stanza will be parsed for 'type'
 // then it will be handled based on the type
@@ -29,7 +63,10 @@ var _pushSubscriptionService = require("../services/pushSubscriptionService");
 // types can be added into our chat protocol (XMPP stanza add field type="") to make it easier to parse here
 
 //core default
-const onRealtimeMessage = async stanza => {
+const onRealtimeMessage = async (stanza, xmppWs) => {
+  if (isReceiptMarkerStanza(stanza)) {
+    return;
+  }
   if (!stanza?.getChild('result') && !stanza.getChild('composing') && !stanza.getChild('paused') && !stanza.getChild('subject') && !stanza.is('iq') && stanza.attrs.id !== 'deleteMessageStanza' && !stanza.getChild('reactions')) {
     const body = stanza?.getChild('body');
     const archived = stanza?.getChild('archived');
@@ -96,6 +133,7 @@ const onRealtimeMessage = async stanza => {
       roomJID,
       message
     }));
+    ackReceivedMessage(message, roomJID, stanza.attrs.from, senderJID, xmppWs);
     // A sender missing from usersSet (a big room only carries 30 members)
     // is resolved lazily; known and recently failed ids are dropped inside.
     try {
@@ -153,7 +191,55 @@ const onDeleteMessage = async stanza => {
     }));
   }
 };
+
+// XEP-0184 delivery receipt from an occupant. The real sender travels in the
+// <received> `from` attr, because the stanza's own `from` is the room nick.
 exports.onDeleteMessage = onDeleteMessage;
+const onReceivedReceipt = stanza => {
+  if (!String(stanza?.attrs?.id || '').startsWith('message-received')) {
+    return;
+  }
+  const received = stanza.getChild('received', RECEIPTS_NS);
+  if (!received) {
+    return;
+  }
+  const messageId = received.attrs.id;
+  const fromXmppUsername = String(received.attrs.from || '').split('@')[0];
+  const roomJID = String(stanza.attrs.from || '').split('/')[0];
+  if (!messageId || !fromXmppUsername || !roomJID) {
+    return;
+  }
+  _roomStore.store.dispatch((0, _roomsSlice.setReceivedReceipt)({
+    roomJID,
+    messageId,
+    fromXmppUsername,
+    timestamp: Date.now()
+  }));
+};
+
+// XEP-0333 read marker from an occupant: one watermark per user and room.
+exports.onReceivedReceipt = onReceivedReceipt;
+const onDisplayedMarker = stanza => {
+  if (!String(stanza?.attrs?.id || '').startsWith('message-displayed')) {
+    return;
+  }
+  const displayed = stanza.getChild('displayed', CHAT_MARKERS_NS);
+  if (!displayed) {
+    return;
+  }
+  const messageId = displayed.attrs.id;
+  const xmppUsername = String(displayed.attrs.from || '').split('@')[0];
+  const roomJID = String(stanza.attrs.from || '').split('/')[0];
+  if (!messageId || !xmppUsername || !roomJID) {
+    return;
+  }
+  _roomStore.store.dispatch((0, _roomsSlice.setDisplayedMarker)({
+    roomJID,
+    xmppUsername,
+    messageId
+  }));
+};
+exports.onDisplayedMarker = onDisplayedMarker;
 const onEditMessage = async stanza => {
   if (stanza?.attrs?.id?.includes('edit-message')) {
     const stanzaId = stanza.getChild('stanza-id');
@@ -173,6 +259,11 @@ const isMamResult = stanza => !!stanza?.is?.('message') && stanza.getChild?.('re
 const parseMamResult = async stanza => {
   {
     const forwardedMsg = stanza.getChild('result')?.getChild('forwarded')?.getChild('message');
+    // A receipt or read marker archived with the room is not a message: the
+    // page still counts it (the paging cursor follows it), nothing is shown.
+    if (isReceiptMarkerStanza(forwardedMsg)) {
+      return undefined;
+    }
     if (forwardedMsg?.getChild?.('reactions')) {
       const reaction = (0, _mamReactions.extractReaction)(forwardedMsg, stanza.attrs?.from, stanza.getChild('result')?.attrs?.id);
       if (reaction && !(0, _mamRouter.collectMamReaction)(stanza, reaction)) {
@@ -265,7 +356,7 @@ const parseMamResult = async stanza => {
     return message;
   }
 };
-const onMessageHistory = async stanza => {
+const onMessageHistory = async (stanza, xmppWs) => {
   if (!isMamResult(stanza)) {
     return;
   }
@@ -284,6 +375,12 @@ const onMessageHistory = async stanza => {
       (0, _mamRouter.collectMamMessage)(stanza, message);
     }
   }
+  if (message) {
+    // A message fetched by catch-up never reaches the live ack, so it is
+    // acked here (the client remembers which ones it already acked).
+    const innerFrom = stanza.getChild('result')?.getChild('forwarded')?.getChild('message')?.attrs?.from;
+    ackReceivedMessage(message, String(stanza.attrs?.from || '').split('/')[0], innerFrom, undefined, xmppWs);
+  }
   if (!claimed && message) {
     _roomStore.store.dispatch((0, _roomsSlice.addRoomMessage)({
       roomJID: stanza.attrs.from,