@ethora/chat-component-rn 26.8.6 → 26.8.7

package/lib/commonjs/e2ee/send.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sendEncrypted = sendEncrypted;
+exports.sendSealedMedia = sendSealedMedia;
+exports.shouldEncrypt = shouldEncrypt;
+var _index = require("./index");
+function shouldEncrypt(roomJID) {
+  return (0, _index.isE2eeEnabled)() && (0, _index.isE2eeRoom)(roomJID);
+}
+let queue = Promise.resolve();
+function sendEncrypted(client, roomJID, id, data, body, plain) {
+  queue = queue.then(async () => {
+    let stanza = plain;
+    try {
+      const crypto = await (0, _index.omemoReady)();
+      if (!crypto) {
+        throw new Error('omemo_not_ready');
+      }
+      const recipients = await (0, _index.resolveRecipients)(roomJID, (0, _index.accountDomain)(client));
+      stanza = await crypto.encryptGroupMessage(roomJID, recipients, [body], id, [data]);
+    } catch (error) {
+      const reason = String(error?.message || error);
+      if (reason.startsWith('omemo_members_unknown')) {
+        console.warn(`OMEMO: not sending to ${roomJID} - ${reason}`);
+        return;
+      }
+      console.warn(`OMEMO: sending to ${roomJID} in clear - ${reason}`);
+    }
+    try {
+      await client.send(stanza);
+    } catch (error) {
+      console.error('An error occurred while sending message:', error);
+    }
+  });
+}
+function sendSealedMedia(client, roomJID, id, body, cleartext) {
+  queue = queue.then(async () => {
+    try {
+      const crypto = await (0, _index.omemoReady)();
+      if (!crypto) {
+        throw new Error('omemo_not_ready');
+      }
+      const recipients = await (0, _index.resolveRecipients)(roomJID, (0, _index.accountDomain)(client));
+      const stanza = await crypto.encryptGroupMessage(roomJID, recipients, [body], id, cleartext);
+      await client.send(stanza);
+    } catch (error) {
+      console.error(`OMEMO: refusing to send sealed attachment to ${roomJID} - ${String(error?.message || error)}`);
+    }
+  });
+}
+//# sourceMappingURL=send.js.map

package/lib/commonjs/e2ee/send.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_index","require","shouldEncrypt","roomJID","isE2eeEnabled","isE2eeRoom","queue","Promise","resolve","sendEncrypted","client","id","data","body","plain","then","stanza","crypto","omemoReady","Error","recipients","resolveRecipients","accountDomain","encryptGroupMessage","error","reason","String","message","startsWith","console","warn","send","sendSealedMedia","cleartext"],"sourceRoot":"../../../src","sources":["e2ee/send.ts"],"mappings":";;;;;;;;AAEA,IAAAA,MAAA,GAAAC,OAAA;AAQO,SAASC,aAAaA,CAACC,OAAe,EAAW;EACtD,OAAO,IAAAC,oBAAa,EAAC,CAAC,IAAI,IAAAC,iBAAU,EAACF,OAAO,CAAC;AAC/C;AAEA,IAAIG,KAAoB,GAAGC,OAAO,CAACC,OAAO,CAAC,CAAC;AAErC,SAASC,aAAaA,CAC3BC,MAAc,EACdP,OAAe,EACfQ,EAAU,EACVC,IAAa,EACbC,IAAa,EACbC,KAAc,EACR;EACNR,KAAK,GAAGA,KAAK,CAACS,IAAI,CAAC,YAAY;IAC7B,IAAIC,MAAM,GAAGF,KAAK;IAClB,IAAI;MACF,MAAMG,MAAM,GAAG,MAAM,IAAAC,iBAAU,EAAC,CAAC;MACjC,IAAI,CAACD,MAAM,EAAE;QAAC,MAAM,IAAIE,KAAK,CAAC,iBAAiB,CAAC;MAAC;MACjD,MAAMC,UAAU,GAAG,MAAM,IAAAC,wBAAiB,EAAClB,OAAO,EAAE,IAAAmB,oBAAa,EAACZ,MAAM,CAAC,CAAC;MAC1EM,MAAM,GAAG,MAAMC,MAAM,CAACM,mBAAmB,CAACpB,OAAO,EAAEiB,UAAU,EAAE,CAACP,IAAI,CAAC,EAAEF,EAAE,EAAE,CAACC,IAAI,CAAC,CAAC;IACpF,CAAC,CAAC,OAAOY,KAAK,EAAE;MACd,MAAMC,MAAM,GAAGC,MAAM,CAAEF,KAAK,EAAYG,OAAO,IAAIH,KAAK,CAAC;MACzD,IAAIC,MAAM,CAACG,UAAU,CAAC,uBAAuB,CAAC,EAAE;QAC9CC,OAAO,CAACC,IAAI,CAAC,yBAAyB3B,OAAO,MAAMsB,MAAM,EAAE,CAAC;QAC5D;MACF;MACAI,OAAO,CAACC,IAAI,CAAC,qBAAqB3B,OAAO,eAAesB,MAAM,EAAE,CAAC;IACnE;IACA,IAAI;MACF,MAAMf,MAAM,CAACqB,IAAI,CAACf,MAAM,CAAC;IAC3B,CAAC,CAAC,OAAOQ,KAAK,EAAE;MACdK,OAAO,CAACL,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;IAClE;EACF,CAAC,CAAC;AACJ;AAEO,SAASQ,eAAeA,CAC7BtB,MAAc,EACdP,OAAe,EACfQ,EAAU,EACVE,IAAa,EACboB,SAAoB,EACd;EACN3B,KAAK,GAAGA,KAAK,CAACS,IAAI,CAAC,YAAY;IAC7B,IAAI;MACF,MAAME,MAAM,GAAG,MAAM,IAAAC,iBAAU,EAAC,CAAC;MACjC,IAAI,CAACD,MAAM,EAAE;QAAC,MAAM,IAAIE,KAAK,CAAC,iBAAiB,CAAC;MAAC;MACjD,MAAMC,UAAU,GAAG,MAAM,IAAAC,wBAAiB,EAAClB,OAAO,EAAE,IAAAmB,oBAAa,EAACZ,MAAM,CAAC,CAAC;MAC1E,MAAMM,MAAM,GAAG,MAAMC,MAAM,CAACM,mBAAmB,CAACpB,OAAO,EAAEiB,UAAU,EAAE,CAACP,IAAI,CAAC,EAAEF,EAAE,EAAEsB,SAAS,CAAC;MAC3F,MAAMvB,MAAM,CAACqB,IAAI,CAACf,MAAM,CAAC;IAC3B,CAAC,CAAC,OAAOQ,KAAK,EAAE;MACdK,OAAO,CAACL,KAAK,CACX,gDAAgDrB,OAAO,MAAMuB,MAAM,CAChEF,KAAK,EAAYG,OAAO,IAAIH,KAC/B,CAAC,EACH,CAAC;IACH;EACF,CAAC,CAAC;AACJ","ignoreList":[]}

package/lib/commonjs/e2ee/stanza.js

@@ -0,0 +1,114 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.decryptStanzaInPlace = decryptStanzaInPlace;
+exports.encryptedCarrier = encryptedCarrier;
+exports.placeholderKey = placeholderKey;
+exports.rewriteEncryptedStanza = rewriteEncryptedStanza;
+var _ltx = require("ltx");
+var _roomStore = require("../roomStore");
+var _strings = require("../i18n/strings");
+var _ns = require("./ns");
+var _index = require("./index");
+const READY_TIMEOUT_MS = 8000;
+function encryptedCarrier(stanza, depth = 0) {
+  if (depth > 4 || !stanza?.getChild) {
+    return undefined;
+  }
+  if (stanza.name === 'message' && stanza.getChild('encrypted', _ns.NS_OMEMO)) {
+    return stanza;
+  }
+  for (const child of stanza.children ?? []) {
+    if (typeof child === 'string') {
+      continue;
+    }
+    const found = encryptedCarrier(child, depth + 1);
+    if (found) {
+      return found;
+    }
+  }
+  return undefined;
+}
+const PLACEHOLDER_KEY = {
+  unsupported: 'e2ee.unsupportedMessage',
+  'other-device': 'e2ee.otherDevice',
+  failed: 'e2ee.undecryptable'
+};
+function placeholderKey(error) {
+  return PLACEHOLDER_KEY[error] ?? PLACEHOLDER_KEY.failed;
+}
+function placeholder(error) {
+  const settings = _roomStore.store.getState()?.chatSettingStore;
+  return new _ltx.Element('body', {}).t((0, _strings.translateKey)(placeholderKey(error), settings?.config?.i18n?.locale || settings?.langSource, settings?.config?.i18n?.strings));
+}
+function mark(carrier, error) {
+  let data = carrier.getChild('data');
+  if (!data) {
+    data = new _ltx.Element('data', {});
+    carrier.append(data);
+  }
+  data.attrs.omemoEncrypted = 'true';
+  if (error) {
+    data.attrs.undecryptable = 'true';
+    data.attrs.e2eeError = error;
+  }
+}
+function strip(carrier) {
+  carrier.remove('encrypted', _ns.NS_OMEMO);
+  carrier.remove('encryption', 'urn:xmpp:eme:0');
+  carrier.remove('body');
+}
+function close(carrier, error) {
+  strip(carrier);
+  carrier.append(placeholder(error));
+  mark(carrier, error);
+  return 'undecryptable';
+}
+function rewriteEncryptedStanza(stanza) {
+  const carrier = encryptedCarrier(stanza);
+  if (!carrier) {
+    return 'not-encrypted';
+  }
+  const encrypted = carrier.getChild('encrypted', _ns.NS_OMEMO);
+  if (!encrypted?.getChild('payload')) {
+    return 'drop';
+  }
+  return close(carrier, 'unsupported');
+}
+const waitForDevice = () => {
+  let timer;
+  const timeout = new Promise(resolve => {
+    timer = setTimeout(() => resolve(undefined), READY_TIMEOUT_MS);
+  });
+  return Promise.race([(0, _index.omemoReady)(), timeout]).finally(() => {
+    if (timer) {
+      clearTimeout(timer);
+    }
+  });
+};
+async function decryptStanzaInPlace(stanza, domain) {
+  const carrier = encryptedCarrier(stanza);
+  if (!carrier) {
+    return 'not-encrypted';
+  }
+  const encrypted = carrier.getChild('encrypted', _ns.NS_OMEMO);
+  if (!encrypted?.getChild('payload')) {
+    return 'drop';
+  }
+  const from = String(carrier.attrs?.from || '');
+  const roomJid = from.split('/')[0];
+  const sender = (0, _index.senderJidFromMuc)(from, domain);
+  const crypto = await waitForDevice();
+  const decrypted = sender ? await crypto?.decrypt(carrier, sender, roomJid) : undefined;
+  if (!decrypted?.content) {
+    return close(carrier, decrypted?.error === 'omemo_not_encrypted_for_this_device' ? 'other-device' : 'failed');
+  }
+  strip(carrier);
+  const wrapper = (0, _ltx.parse)(`<omemo-content>${decrypted.content}</omemo-content>`);
+  carrier.append(...wrapper.children);
+  mark(carrier);
+  return 'decrypted';
+}
+//# sourceMappingURL=stanza.js.map

package/lib/commonjs/e2ee/stanza.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_ltx","require","_roomStore","_strings","_ns","_index","READY_TIMEOUT_MS","encryptedCarrier","stanza","depth","getChild","undefined","name","NS_OMEMO","child","children","found","PLACEHOLDER_KEY","unsupported","failed","placeholderKey","error","placeholder","settings","store","getState","chatSettingStore","Element","t","translateKey","config","i18n","locale","langSource","strings","mark","carrier","data","append","attrs","omemoEncrypted","undecryptable","e2eeError","strip","remove","close","rewriteEncryptedStanza","encrypted","waitForDevice","timer","timeout","Promise","resolve","setTimeout","race","omemoReady","finally","clearTimeout","decryptStanzaInPlace","domain","from","String","roomJid","split","sender","senderJidFromMuc","crypto","decrypted","decrypt","content","wrapper","parse"],"sourceRoot":"../../../src","sources":["e2ee/stanza.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/e2ee/store.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMemoryBackend = createMemoryBackend;
+exports.createMemoryStore = createMemoryStore;
+exports.createStore = createStore;
+exports.decodeValue = decodeValue;
+exports.encodeValue = encodeValue;
+var _crypto = require("./crypto");
+const BYTES_TAG = '$bytes';
+function encodeValue(value) {
+  return JSON.stringify(value, (_key, item) => item instanceof Uint8Array ? {
+    [BYTES_TAG]: (0, _crypto.toBase64)(item)
+  } : item);
+}
+function decodeValue(text) {
+  return JSON.parse(text, (_key, item) => item && typeof item === 'object' && typeof item[BYTES_TAG] === 'string' ? (0, _crypto.fromBase64)(item[BYTES_TAG]) : item);
+}
+function createStore(backend, jid) {
+  const prefix = `${jid.toLowerCase()}|`;
+  return {
+    get: async key => {
+      const raw = await backend.getItem(prefix + key);
+      return raw === null ? undefined : decodeValue(raw);
+    },
+    set: (key, value) => backend.setItem(prefix + key, encodeValue(value)),
+    delete: key => backend.removeItem(prefix + key)
+  };
+}
+function createMemoryBackend() {
+  const data = new Map();
+  return {
+    getItem: async key => data.get(key) ?? null,
+    setItem: async (key, value) => void data.set(key, value),
+    removeItem: async key => void data.delete(key)
+  };
+}
+function createMemoryStore(jid = 'memory') {
+  return createStore(createMemoryBackend(), jid);
+}
+//# sourceMappingURL=store.js.map

package/lib/commonjs/e2ee/store.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_crypto","require","BYTES_TAG","encodeValue","value","JSON","stringify","_key","item","Uint8Array","toBase64","decodeValue","text","parse","fromBase64","createStore","backend","jid","prefix","toLowerCase","get","key","raw","getItem","undefined","set","setItem","delete","removeItem","createMemoryBackend","data","Map","createMemoryStore"],"sourceRoot":"../../../src","sources":["e2ee/store.ts"],"mappings":";;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAQA,MAAMC,SAAS,GAAG,QAAQ;AAEnB,SAASC,WAAWA,CAACC,KAAc,EAAU;EAClD,OAAOC,IAAI,CAACC,SAAS,CAACF,KAAK,EAAE,CAACG,IAAI,EAAEC,IAAI,KACtCA,IAAI,YAAYC,UAAU,GAAG;IAAE,CAACP,SAAS,GAAG,IAAAQ,gBAAQ,EAACF,IAAI;EAAE,CAAC,GAAGA,IACjE,CAAC;AACH;AAEO,SAASG,WAAWA,CAAIC,IAAY,EAAK;EAC9C,OAAOP,IAAI,CAACQ,KAAK,CAACD,IAAI,EAAE,CAACL,IAAI,EAAEC,IAAI,KACjCA,IAAI,IAAI,OAAOA,IAAI,KAAK,QAAQ,IAAI,OAAOA,IAAI,CAACN,SAAS,CAAC,KAAK,QAAQ,GACnE,IAAAY,kBAAU,EAACN,IAAI,CAACN,SAAS,CAAC,CAAC,GAC3BM,IACN,CAAC;AACH;AAQO,SAASO,WAAWA,CAACC,OAAsB,EAAEC,GAAW,EAAc;EAC3E,MAAMC,MAAM,GAAG,GAAGD,GAAG,CAACE,WAAW,CAAC,CAAC,GAAG;EACtC,OAAO;IACLC,GAAG,EAAE,MAAUC,GAAW,IAAK;MAC7B,MAAMC,GAAG,GAAG,MAAMN,OAAO,CAACO,OAAO,CAACL,MAAM,GAAGG,GAAG,CAAC;MAC/C,OAAOC,GAAG,KAAK,IAAI,GAAGE,SAAS,GAAGb,WAAW,CAAIW,GAAG,CAAC;IACvD,CAAC;IACDG,GAAG,EAAEA,CAACJ,GAAG,EAAEjB,KAAK,KAAKY,OAAO,CAACU,OAAO,CAACR,MAAM,GAAGG,GAAG,EAAElB,WAAW,CAACC,KAAK,CAAC,CAAC;IACtEuB,MAAM,EAAGN,GAAG,IAAKL,OAAO,CAACY,UAAU,CAACV,MAAM,GAAGG,GAAG;EAClD,CAAC;AACH;AAEO,SAASQ,mBAAmBA,CAAA,EAAkB;EACnD,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAiB,CAAC;EACtC,OAAO;IACLR,OAAO,EAAE,MAAOF,GAAG,IAAKS,IAAI,CAACV,GAAG,CAACC,GAAG,CAAC,IAAI,IAAI;IAC7CK,OAAO,EAAE,MAAAA,CAAOL,GAAG,EAAEjB,KAAK,KAAK,KAAK0B,IAAI,CAACL,GAAG,CAACJ,GAAG,EAAEjB,KAAK,CAAC;IACxDwB,UAAU,EAAE,MAAOP,GAAG,IAAK,KAAKS,IAAI,CAACH,MAAM,CAACN,GAAG;EACjD,CAAC;AACH;AAEO,SAASW,iBAAiBA,CAACf,GAAG,GAAG,QAAQ,EAAc;EAC5D,OAAOF,WAAW,CAACc,mBAAmB,CAAC,CAAC,EAAEZ,GAAG,CAAC;AAChD","ignoreList":[]}

package/lib/commonjs/helpers/accountName.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.accountNameOf = void 0;
+const accountNameOf = (user, appId) => {
+  for (const raw of [user?.xmppUsername, user?.userJID, user?.id, user?._id]) {
+    const value = String(raw || '').split('@')[0].trim();
+    if (!value) {
+      continue;
+    }
+    if (value.includes('_')) {
+      return value;
+    }
+    if (appId) {
+      return `${appId}_${value}`;
+    }
+  }
+  return '';
+};
+exports.accountNameOf = accountNameOf;
+//# sourceMappingURL=accountName.js.map

package/lib/commonjs/helpers/accountName.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["accountNameOf","user","appId","raw","xmppUsername","userJID","id","_id","value","String","split","trim","includes","exports"],"sourceRoot":"../../../src","sources":["helpers/accountName.ts"],"mappings":";;;;;;AAAO,MAAMA,aAAa,GAAGA,CAC3BC,IAGa,EACbC,KAAa,KACF;EACX,KAAK,MAAMC,GAAG,IAAI,CAACF,IAAI,EAAEG,YAAY,EAAEH,IAAI,EAAEI,OAAO,EAAEJ,IAAI,EAAEK,EAAE,EAAEL,IAAI,EAAEM,GAAG,CAAC,EAAE;IAC1E,MAAMC,KAAK,GAAGC,MAAM,CAACN,GAAG,IAAI,EAAE,CAAC,CAACO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAEC,IAAI,CAAC,CAAC;IACrD,IAAI,CAACH,KAAK,EAAE;MAAC;IAAS;IACtB,IAAIA,KAAK,CAACI,QAAQ,CAAC,GAAG,CAAC,EAAE;MAAC,OAAOJ,KAAK;IAAC;IACvC,IAAIN,KAAK,EAAE;MAAC,OAAO,GAAGA,KAAK,IAAIM,KAAK,EAAE;IAAC;EACzC;EACA,OAAO,EAAE;AACX,CAAC;AAACK,OAAA,CAAAb,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/helpers/createMessageFromXml.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMessageFromXml = void 0;
+var _e2ee = require("../e2ee");
+var _displayName = require("./displayName");
+var _sealedBody = require("../e2ee/sealedBody");
 /**
  * Build an IMessage from XML.
  *
@@ -81,11 +84,14 @@ const createMessageFromXml = async (arg, bodyEl, positionalId, positionalFrom, p
   // Synthesize user.name from sender attrs (web reads usersSet from
   // redux in <Message>; we fix it once at the source so Avatar /
   // MessageHeader render the actual sender instead of "??").
-  const firstName = (merged.senderFirstName || '').toString().trim();
-  const lastName = (merged.senderLastName || '').toString().trim();
+  const firstName = (merged.senderFirstName || merged.firstName || '').toString().trim();
+  const lastName = (merged.senderLastName || merged.lastName || '').toString().trim();
   const fullName = (merged.fullName || '').toString().trim();
   const senderJID = (merged.senderJID || '').toString();
-  const senderLocal = senderJID.includes('@') ? senderJID.split('@')[0] : senderJID;
+  const senderBare = senderJID.split('/')[0] || '';
+  const senderResource = senderJID.includes('/') ? senderJID.split('/')[1] || '' : '';
+  const senderIsOccupant = !!senderResource && (senderBare === String(merged.roomJid || '') || /@conference\./i.test(senderBare));
+  const senderLocal = senderIsOccupant ? senderResource : senderBare.includes('@') ? senderBare.split('@')[0] : senderBare;
 
   // Bug #41 root cause: the resource of the MUC `from` (room@conference/
   // occupant-id) is the SAME field getDataFromXml uses to derive
@@ -104,11 +110,20 @@ const createMessageFromXml = async (arg, bodyEl, positionalId, positionalFrom, p
   // the "official" fetch lands.
   const xmppFrom = (merged.xmppFrom || '').toString();
   const fromResource = xmppFrom.includes('/') ? xmppFrom.split('/')[1] : '';
-  const composed = [firstName, lastName].filter(Boolean).join(' ').trim();
+  const composed = (0, _displayName.composeName)(firstName, lastName);
   const existingName = String(merged?.user?.name || '').trim();
   const resolvedName = existingName || composed || fullName || senderLocal || merged?.user?.id || '';
+  const unencrypted = merged.omemoEncrypted !== 'true' && (0, _e2ee.isE2eeRoom)(String(merged.roomJid || ''));
+  const sealedKeys = merged.clientEncrypted === 'true' ? (0, _sealedBody.parseSealedMediaBody)(merged.body) : undefined;
   const message = {
     ...merged,
+    ...(unencrypted ? {
+      unencrypted: true
+    } : {}),
+    ...(sealedKeys ? {
+      e2eeKeys: sealedKeys,
+      body: 'media'
+    } : {}),
     user: {
       ...(merged.user || {}),
       id: merged?.user?.id || fromResource || senderLocal,

package/lib/commonjs/helpers/createMessageFromXml.js.map

@@ -1 +1 @@
-{"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","fromResource","composed","filter","Boolean","join","existingName","resolvedName","message","exports"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_e2ee","require","_displayName","_sealedBody","createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderBare","senderResource","includes","senderIsOccupant","test","senderLocal","fromResource","composed","composeName","existingName","resolvedName","unencrypted","omemoEncrypted","isE2eeRoom","sealedKeys","clientEncrypted","parseSealedMediaBody","message","e2eeKeys","exports"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/createUserNameFromSetUser.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveSenderDisplayName = exports.createUserNameFromSetUser = void 0;
+var _displayName = require("./displayName");
 /**
  * Cache-only lookup. Returns the literal "Deleted User" as a MISS sentinel
  * when `usersSet` has no entry for `userId` yet, callers that want a
@@ -21,7 +22,7 @@ const createUserNameFromSetUser = (usersSet, userId) => {
   // members (no REST match yet) carry just the roster `name` attr —
   // fall back to that before giving up and returning the raw id.
   const bareName = user.name?.trim() || '';
-  return `${firstName} ${lastName}`.trim() || bareName || userId;
+  return (0, _displayName.composeName)(firstName, lastName) || bareName || userId;
 };
 
 /**

package/lib/commonjs/helpers/createUserNameFromSetUser.js.map

@@ -1 +1 @@
-{"version":3,"names":["createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","bareName","name","exports","resolveSenderDisplayName","message","rawUserId","String","id","localUserId","split","currentNameRaw","currentName","dataFullName","fullName","dataFirst","senderFirstName","dataLast","senderLastName","composedFromData","usersSetName","usersSetNameAlt","isUsersSetUseful"],"sourceRoot":"../../../src","sources":["helpers/createUserNameFromSetUser.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMA,yBAAyB,GAAGA,CACvCC,QAAoC,EACpCC,MAAc,KACH;EACX,MAAMC,IAAI,GAAGF,QAAQ,CAACC,MAAM,CAAC;EAE7B,IAAI,CAACC,IAAI,EAAE;IAAC,OAAO,cAAc;EAAC;EAElC,MAAMC,SAAS,GAAGD,IAAI,CAACC,SAAS,EAAEC,IAAI,CAAC,CAAC,IAAI,EAAE;EAC9C,MAAMC,QAAQ,GAAGH,IAAI,CAACG,QAAQ,EAAED,IAAI,CAAC,CAAC,IAAI,EAAE;EAC5C;EACA;EACA;EACA,MAAME,QAAQ,GAAGJ,IAAI,CAACK,IAAI,EAAEH,IAAI,CAAC,CAAC,IAAI,EAAE;EAExC,OAAO,GAAGD,SAAS,IAAIE,QAAQ,EAAE,CAACD,IAAI,CAAC,CAAC,IAAIE,QAAQ,IAAIL,MAAM;AAChE,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AApBAO,OAAA,CAAAT,yBAAA,GAAAA,yBAAA;AAqBO,MAAMU,wBAAwB,GAAGA,CACtCC,OAIC,EACDV,QAAoC,KACzB;EACX,MAAMW,SAAS,GAAGC,MAAM,CAACF,OAAO,EAAER,IAAI,EAAEW,EAAE,IAAI,EAAE,CAAC;EACjD,MAAMC,WAAW,GAAGH,SAAS,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,cAAc,GAAGJ,MAAM,CAACF,OAAO,EAAER,IAAI,EAAEK,IAAI,IAAI,EAAE,CAAC,CAACH,IAAI,CAAC,CAAC;EAC/D;EACA;EACA,MAAMa,WAAW,GAAGD,cAAc,KAAK,cAAc,GAAG,EAAE,GAAGA,cAAc;EAE3E,MAAME,YAAY,GAAGN,MAAM,CAACF,OAAO,EAAES,QAAQ,IAAI,EAAE,CAAC,CAACf,IAAI,CAAC,CAAC;EAC3D,MAAMgB,SAAS,GAAGR,MAAM,CAACF,OAAO,EAAEW,eAAe,IAAI,EAAE,CAAC,CAACjB,IAAI,CAAC,CAAC;EAC/D,MAAMkB,QAAQ,GAAGV,MAAM,CAACF,OAAO,EAAEa,cAAc,IAAI,EAAE,CAAC,CAACnB,IAAI,CAAC,CAAC;EAC7D,MAAMoB,gBAAgB,GAAGN,YAAY,IAAI,GAAGE,SAAS,IAAIE,QAAQ,EAAE,CAAClB,IAAI,CAAC,CAAC;EAE1E,MAAMqB,YAAY,GAAG1B,yBAAyB,CAACC,QAAQ,EAAEc,WAAW,CAAC;EACrE,MAAMY,eAAe,GAAG3B,yBAAyB,CAACC,QAAQ,EAAEW,SAAS,CAAC;EACtE,MAAMgB,gBAAgB,GAAIpB,IAAY,IAAK,CAAC,CAACA,IAAI,IAAIA,IAAI,KAAK,cAAc;EAE5E,OACEU,WAAW,IACVU,gBAAgB,CAACF,YAAY,CAAC,IAAIA,YAAa,IAC/CE,gBAAgB,CAACD,eAAe,CAAC,IAAIA,eAAgB,IACtDF,gBAAgB,IAChBV,WAAW,IACXH,SAAS,IACT,cAAc;AAElB,CAAC;AAACH,OAAA,CAAAC,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["_displayName","require","createUserNameFromSetUser","usersSet","userId","user","firstName","trim","lastName","bareName","name","composeName","exports","resolveSenderDisplayName","message","rawUserId","String","id","localUserId","split","currentNameRaw","currentName","dataFullName","fullName","dataFirst","senderFirstName","dataLast","senderLastName","composedFromData","usersSetName","usersSetNameAlt","isUsersSetUseful"],"sourceRoot":"../../../src","sources":["helpers/createUserNameFromSetUser.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,yBAAyB,GAAGA,CACvCC,QAAoC,EACpCC,MAAc,KACH;EACX,MAAMC,IAAI,GAAGF,QAAQ,CAACC,MAAM,CAAC;EAE7B,IAAI,CAACC,IAAI,EAAE;IAAC,OAAO,cAAc;EAAC;EAElC,MAAMC,SAAS,GAAGD,IAAI,CAACC,SAAS,EAAEC,IAAI,CAAC,CAAC,IAAI,EAAE;EAC9C,MAAMC,QAAQ,GAAGH,IAAI,CAACG,QAAQ,EAAED,IAAI,CAAC,CAAC,IAAI,EAAE;EAC5C;EACA;EACA;EACA,MAAME,QAAQ,GAAGJ,IAAI,CAACK,IAAI,EAAEH,IAAI,CAAC,CAAC,IAAI,EAAE;EAExC,OAAO,IAAAI,wBAAW,EAACL,SAAS,EAAEE,QAAQ,CAAC,IAAIC,QAAQ,IAAIL,MAAM;AAC/D,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AApBAQ,OAAA,CAAAV,yBAAA,GAAAA,yBAAA;AAqBO,MAAMW,wBAAwB,GAAGA,CACtCC,OAIC,EACDX,QAAoC,KACzB;EACX,MAAMY,SAAS,GAAGC,MAAM,CAACF,OAAO,EAAET,IAAI,EAAEY,EAAE,IAAI,EAAE,CAAC;EACjD,MAAMC,WAAW,GAAGH,SAAS,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,cAAc,GAAGJ,MAAM,CAACF,OAAO,EAAET,IAAI,EAAEK,IAAI,IAAI,EAAE,CAAC,CAACH,IAAI,CAAC,CAAC;EAC/D;EACA;EACA,MAAMc,WAAW,GAAGD,cAAc,KAAK,cAAc,GAAG,EAAE,GAAGA,cAAc;EAE3E,MAAME,YAAY,GAAGN,MAAM,CAACF,OAAO,EAAES,QAAQ,IAAI,EAAE,CAAC,CAAChB,IAAI,CAAC,CAAC;EAC3D,MAAMiB,SAAS,GAAGR,MAAM,CAACF,OAAO,EAAEW,eAAe,IAAI,EAAE,CAAC,CAAClB,IAAI,CAAC,CAAC;EAC/D,MAAMmB,QAAQ,GAAGV,MAAM,CAACF,OAAO,EAAEa,cAAc,IAAI,EAAE,CAAC,CAACpB,IAAI,CAAC,CAAC;EAC7D,MAAMqB,gBAAgB,GAAGN,YAAY,IAAI,GAAGE,SAAS,IAAIE,QAAQ,EAAE,CAACnB,IAAI,CAAC,CAAC;EAE1E,MAAMsB,YAAY,GAAG3B,yBAAyB,CAACC,QAAQ,EAAEe,WAAW,CAAC;EACrE,MAAMY,eAAe,GAAG5B,yBAAyB,CAACC,QAAQ,EAAEY,SAAS,CAAC;EACtE,MAAMgB,gBAAgB,GAAIrB,IAAY,IAAK,CAAC,CAACA,IAAI,IAAIA,IAAI,KAAK,cAAc;EAE5E,OACEW,WAAW,IACVU,gBAAgB,CAACF,YAAY,CAAC,IAAIA,YAAa,IAC/CE,gBAAgB,CAACD,eAAe,CAAC,IAAIA,eAAgB,IACtDF,gBAAgB,IAChBV,WAAW,IACXH,SAAS,IACT,cAAc;AAElB,CAAC;AAACH,OAAA,CAAAC,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/helpers/displayName.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.composeName = void 0;
+const composeName = (first, last) => {
+  const f = String(first ?? '').trim();
+  const l = String(last ?? '').trim();
+  if (f && f.includes('@') && f.toLowerCase() === l.toLowerCase()) {
+    return f;
+  }
+  return `${f} ${l}`.trim();
+};
+exports.composeName = composeName;
+//# sourceMappingURL=displayName.js.map

package/lib/commonjs/helpers/displayName.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["composeName","first","last","f","String","trim","l","includes","toLowerCase","exports"],"sourceRoot":"../../../src","sources":["helpers/displayName.ts"],"mappings":";;;;;;AAAO,MAAMA,WAAW,GAAGA,CACzBC,KAAqB,EACrBC,IAAoB,KACT;EACX,MAAMC,CAAC,GAAGC,MAAM,CAACH,KAAK,IAAI,EAAE,CAAC,CAACI,IAAI,CAAC,CAAC;EACpC,MAAMC,CAAC,GAAGF,MAAM,CAACF,IAAI,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACnC,IAAIF,CAAC,IAAIA,CAAC,CAACI,QAAQ,CAAC,GAAG,CAAC,IAAIJ,CAAC,CAACK,WAAW,CAAC,CAAC,KAAKF,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;IAAC,OAAOL,CAAC;EAAC;EAC3E,OAAO,GAAGA,CAAC,IAAIG,CAAC,EAAE,CAACD,IAAI,CAAC,CAAC;AAC3B,CAAC;AAACI,OAAA,CAAAT,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/commonjs/helpers/persistCrypto.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.__resetPersistCryptoKeyForTests = void 0;
 exports.decryptFromPersist = decryptFromPersist;
 exports.encryptForPersist = encryptForPersist;
+exports.isPersistKeyKept = isPersistKeyKept;
 var _cryptoJs = _interopRequireDefault(require("crypto-js"));
 var _secureKeyValue = require("./secureKeyValue");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -66,6 +67,10 @@ const loadOrCreateKey = () => {
   })();
   return cachedKeyPromise;
 };
+async function isPersistKeyKept() {
+  const key = await loadOrCreateKey();
+  return (await (0, _secureKeyValue.secureGet)(CIPHER_KEY_STORE_KEY)) === _cryptoJs.default.enc.Base64.stringify(key);
+}
 
 /** Encrypt a JSON-serialisable payload for storage. Returns the string to persist. */
 async function encryptForPersist(plaintext) {

package/lib/commonjs/helpers/persistCrypto.js.map

@@ -1 +1 @@
-{"version":3,"names":["_cryptoJs","_interopRequireDefault","require","_secureKeyValue","e","__esModule","default","CIPHER_KEY_STORE_KEY","ENVELOPE_VERSION","KEY_BYTES","IV_BYTES","randomWordArray","byteLength","bytes","Uint8Array","global","crypto","getRandomValues","words","i","length","push","CryptoJS","lib","WordArray","create","cachedKeyPromise","loadOrCreateKey","existing","secureGet","enc","Base64","parse","key","secureSet","stringify","encryptForPersist","plaintext","iv","encrypted","AES","encrypt","mode","CBC","padding","pad","Pkcs7","envelope","v","ct","ciphertext","toString","JSON","decryptFromPersist","stored","decrypted","decrypt","Utf8","__resetPersistCryptoKeyForTests","exports"],"sourceRoot":"../../../src","sources":["helpers/persistCrypto.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_cryptoJs","_interopRequireDefault","require","_secureKeyValue","e","__esModule","default","CIPHER_KEY_STORE_KEY","ENVELOPE_VERSION","KEY_BYTES","IV_BYTES","randomWordArray","byteLength","bytes","Uint8Array","global","crypto","getRandomValues","words","i","length","push","CryptoJS","lib","WordArray","create","cachedKeyPromise","loadOrCreateKey","existing","secureGet","enc","Base64","parse","key","secureSet","stringify","isPersistKeyKept","encryptForPersist","plaintext","iv","encrypted","AES","encrypt","mode","CBC","padding","pad","Pkcs7","envelope","v","ct","ciphertext","toString","JSON","decryptFromPersist","stored","decrypted","decrypt","Utf8","__resetPersistCryptoKeyForTests","exports"],"sourceRoot":"../../../src","sources":["helpers/persistCrypto.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/secureKeyValue.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.__resetSecureKeyValueWarningForTests = void 0;
 exports.secureGet = secureGet;
+exports.secureGetOrCreate = secureGetOrCreate;
 exports.secureRemove = secureRemove;
 exports.secureSet = secureSet;
 var _asyncStorage = _interopRequireDefault(require("@react-native-async-storage/async-storage"));
@@ -74,6 +75,25 @@ async function secureRemove(key) {
   }
   await _asyncStorage.default.removeItem(FALLBACK_PREFIX + key).catch(() => undefined);
 }
+async function secureGetOrCreate(key, create) {
+  const existing = await secureGet(key);
+  if (existing) {
+    return {
+      value: existing,
+      created: false
+    };
+  }
+  const value = create();
+  await secureSet(key, value);
+  if ((await secureGet(key)) !== value) {
+    (0, _devLogger.pushLog)('warn', `secureStore: ${key} was not kept`);
+    return null;
+  }
+  return {
+    value,
+    created: true
+  };
+}
 
 /** Test seam only. */
 const __resetSecureKeyValueWarningForTests = () => {

package/lib/commonjs/helpers/secureKeyValue.js.map

@@ -1 +1 @@
-{"version":3,"names":["_asyncStorage","_interopRequireDefault","require","_secureStoreRuntime","_devLogger","e","__esModule","default","FALLBACK_PREFIX","warnedFallback","warnFallbackOnce","pushLog","secureGet","key","store","loadSecureStore","getItemAsync","AsyncStorage","getItem","secureSet","value","setItemAsync","removeItem","catch","undefined","setItem","secureRemove","deleteItemAsync","__resetSecureKeyValueWarningForTests","exports"],"sourceRoot":"../../../src","sources":["helpers/secureKeyValue.ts"],"mappings":";;;;;;;;;AAAA,IAAAA,aAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAA6C,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE7C;AACA;AACA;AACA;AACA,MAAMG,eAAe,GAAG,0BAA0B;AAElD,IAAIC,cAAc,GAAG,KAAK;AAC1B,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;EAC7B,IAAID,cAAc,EAAE;IAAC;EAAO;EAC5BA,cAAc,GAAG,IAAI;EACrB,IAAAE,kBAAO,EACL,MAAM,EACN,6DAA6D,GAC3D,gEAAgE,GAChE,mEAAmE,GACnE,mEAAmE,GACnE,yBACJ,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeC,SAASA,CAACC,GAAW,EAA0B;EACnE,MAAMC,KAAK,GAAG,IAAAC,mCAAe,EAAC,CAAC;EAC/B,IAAID,KAAK,EAAE;IACT,IAAI;MACF,OAAO,MAAMA,KAAK,CAACE,YAAY,CAACH,GAAG,CAAC;IACtC,CAAC,CAAC,OAAOR,CAAC,EAAE;MACV,IAAAM,kBAAO,EAAC,MAAM,EAAE,6BAA6BE,GAAG,UAAU,EAAER,CAAC,CAAC;MAC9D,OAAO,IAAI;IACb;EACF;EACAK,gBAAgB,CAAC,CAAC;EAClB,OAAOO,qBAAY,CAACC,OAAO,CAACV,eAAe,GAAGK,GAAG,CAAC;AACpD;AAEO,eAAeM,SAASA,CAACN,GAAW,EAAEO,KAAa,EAAiB;EACzE,MAAMN,KAAK,GAAG,IAAAC,mCAAe,EAAC,CAAC;EAC/B,IAAID,KAAK,EAAE;IACT,IAAI;MACF,MAAMA,KAAK,CAACO,YAAY,CAACR,GAAG,EAAEO,KAAK,CAAC;MACpC;MACA;MACAH,qBAAY,CAACK,UAAU,CAACd,eAAe,GAAGK,GAAG,CAAC,CAACU,KAAK,CAAC,MAAMC,SAAS,CAAC;MACrE;IACF,CAAC,CAAC,OAAOnB,CAAC,EAAE;MACV,IAAAM,kBAAO,EAAC,MAAM,EAAE,6BAA6BE,GAAG,UAAU,EAAER,CAAC,CAAC;MAC9D;IACF;EACF;EACAK,gBAAgB,CAAC,CAAC;EAClB,MAAMO,qBAAY,CAACQ,OAAO,CAACjB,eAAe,GAAGK,GAAG,EAAEO,KAAK,CAAC;AAC1D;AAEO,eAAeM,YAAYA,CAACb,GAAW,EAAiB;EAC7D,MAAMC,KAAK,GAAG,IAAAC,mCAAe,EAAC,CAAC;EAC/B,IAAID,KAAK,EAAE;IACT,IAAI;MACF,MAAMA,KAAK,CAACa,eAAe,CAACd,GAAG,CAAC;IAClC,CAAC,CAAC,MAAM;MACN;MACA;IAAA;EAEJ;EACA,MAAMI,qBAAY,CAACK,UAAU,CAACd,eAAe,GAAGK,GAAG,CAAC,CAACU,KAAK,CAAC,MAAMC,SAAS,CAAC;AAC7E;;AAEA;AACO,MAAMI,oCAAoC,GAAGA,CAAA,KAAY;EAC9DnB,cAAc,GAAG,KAAK;AACxB,CAAC;AAACoB,OAAA,CAAAD,oCAAA,GAAAA,oCAAA","ignoreList":[]}
+{"version":3,"names":["_asyncStorage","_interopRequireDefault","require","_secureStoreRuntime","_devLogger","e","__esModule","default","FALLBACK_PREFIX","warnedFallback","warnFallbackOnce","pushLog","secureGet","key","store","loadSecureStore","getItemAsync","AsyncStorage","getItem","secureSet","value","setItemAsync","removeItem","catch","undefined","setItem","secureRemove","deleteItemAsync","secureGetOrCreate","create","existing","created","__resetSecureKeyValueWarningForTests","exports"],"sourceRoot":"../../../src","sources":["helpers/secureKeyValue.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/videoCache.js

@@ -0,0 +1,136 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.markStreamingUnsupported = exports.isStreamingUnsupported = exports.isRemoteUrl = exports.getVideoCacheUri = exports.findCachedVideo = exports.downloadVideoToCache = exports.__resetVideoCacheForTests = void 0;
+var FileSystem = _interopRequireWildcard(require("expo-file-system/legacy"));
+var _mimeToExtension = require("./mimeToExtension");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+// Containers the native players open from a local file by extension.
+const VIDEO_EXT_RE = /\.(mp4|mov|m4v|webm|3gp|mkv|mpeg)$/i;
+const hashString = value => {
+  let hash = 5381;
+  for (let i = 0; i < value.length; i++) {
+    hash = hash * 33 ^ value.charCodeAt(i);
+  }
+  return (hash >>> 0).toString(36);
+};
+const isRemoteUrl = url => /^https?:\/\//i.test(url || '');
+exports.isRemoteUrl = isRemoteUrl;
+const hostOf = url => (/^https?:\/\/(?:[^@/]+@)?([^:/?#]+)/i.exec(url)?.[1] || '').toLowerCase();
+
+// The query carries the short-lived file token; the file is the same.
+const withoutQuery = url => url.split('#')[0].split('?')[0];
+
+/**
+ * Where a remote video is kept once downloaded. The extension matters:
+ * AVFoundation picks the demuxer of a local file by it.
+ */
+const getVideoCacheUri = (url, mimetype, cacheDirectory) => {
+  const fromUrl = VIDEO_EXT_RE.exec((0, _mimeToExtension.filenameFromUrl)(url))?.[0];
+  const fromMime = (0, _mimeToExtension.getExtensionForMime)(mimetype);
+  const ext = (fromUrl || (VIDEO_EXT_RE.test(fromMime) ? fromMime : '.mp4')).toLowerCase();
+  return `${cacheDirectory}ethora-video-${hashString(withoutQuery(url))}${ext}`;
+};
+
+/**
+ * Hosts that answered a streaming attempt with an error. AVPlayer refuses a
+ * server that replies 200 to a byte-range request ("server is not correctly
+ * configured"), so for those the next video skips the doomed stream and
+ * downloads straight away.
+ */
+exports.getVideoCacheUri = getVideoCacheUri;
+const hostsWithoutStreaming = new Set();
+const markStreamingUnsupported = url => {
+  const host = hostOf(url);
+  if (host) {
+    hostsWithoutStreaming.add(host);
+  }
+};
+exports.markStreamingUnsupported = markStreamingUnsupported;
+const isStreamingUnsupported = url => hostsWithoutStreaming.has(hostOf(url));
+exports.isStreamingUnsupported = isStreamingUnsupported;
+const findCachedVideo = async (url, mimetype) => {
+  const cacheDirectory = FileSystem.cacheDirectory;
+  if (!cacheDirectory || !isRemoteUrl(url)) {
+    return null;
+  }
+  try {
+    const uri = getVideoCacheUri(url, mimetype, cacheDirectory);
+    const info = await FileSystem.getInfoAsync(uri);
+    return info.exists ? uri : null;
+  } catch {
+    return null;
+  }
+};
+exports.findCachedVideo = findCachedVideo;
+const inFlight = new Map();
+
+/**
+ * Downloads the video next to the app's other caches and resolves with the
+ * local uri. One download per file however many callers ask; `onProgress`
+ * gets 0..1 when the server reports a length.
+ */
+const downloadVideoToCache = (url, mimetype, onProgress) => {
+  const cacheDirectory = FileSystem.cacheDirectory;
+  if (!cacheDirectory) {
+    return Promise.reject(new Error('video_cache_unavailable'));
+  }
+  const finalUri = getVideoCacheUri(url, mimetype, cacheDirectory);
+  const running = inFlight.get(finalUri);
+  if (running) {
+    if (onProgress) {
+      running.listeners.add(onProgress);
+    }
+    return running.promise;
+  }
+  const listeners = new Set();
+  if (onProgress) {
+    listeners.add(onProgress);
+  }
+  const run = async () => {
+    // Download under another name: an interrupted download must not be
+    // mistaken for the cached file next time.
+    const part = `${finalUri}.part`;
+    await FileSystem.deleteAsync(part, {
+      idempotent: true
+    }).catch(() => {});
+    const task = FileSystem.createDownloadResumable(url, part, {}, p => {
+      if (p.totalBytesExpectedToWrite > 0) {
+        const fraction = Math.min(1, p.totalBytesWritten / p.totalBytesExpectedToWrite);
+        listeners.forEach(listener => listener(fraction));
+      }
+    });
+    const result = await task.downloadAsync();
+    if (!result || result.status < 200 || result.status >= 300) {
+      await FileSystem.deleteAsync(part, {
+        idempotent: true
+      }).catch(() => {});
+      throw new Error(`video_download_status_${result?.status ?? 'cancelled'}`);
+    }
+    await FileSystem.deleteAsync(finalUri, {
+      idempotent: true
+    }).catch(() => {});
+    await FileSystem.moveAsync({
+      from: part,
+      to: finalUri
+    });
+    return finalUri;
+  };
+  const promise = run().finally(() => {
+    inFlight.delete(finalUri);
+  });
+  inFlight.set(finalUri, {
+    promise,
+    listeners
+  });
+  return promise;
+};
+exports.downloadVideoToCache = downloadVideoToCache;
+const __resetVideoCacheForTests = () => {
+  hostsWithoutStreaming.clear();
+  inFlight.clear();
+};
+exports.__resetVideoCacheForTests = __resetVideoCacheForTests;
+//# sourceMappingURL=videoCache.js.map