@dittolive/ditto-chat-core 0.1.0 → 0.1.2

package/dist/index.es.js

@@ -7,7 +7,7 @@ const ze = {
   canRemoveOwnReaction: !0,
   canMentionUsers: !0,
   canSubscribeToRoom: !0
-}, He = (e, t, { rbacConfig: r = {} }) => ({
+}, Le = (e, t, { rbacConfig: r = {} }) => ({
   rbacConfig: r,
   /**
    * Check if a specific permission action is allowed.
@@ -24,8 +24,8 @@ const ze = {
    * @returns boolean indicating if action is allowed
    */
   canPerformAction: (s) => {
-    const a = t().rbacConfig[s];
-    return a !== void 0 ? a : ze[s];
+    const c = t().rbacConfig[s];
+    return c !== void 0 ? c : ze[s];
   },
   /**
    * Update the RBAC permission configuration.
@@ -49,7 +49,7 @@ const ze = {
     }));
   }
 });
-var Ae = Symbol.for("immer-nothing"), ye = Symbol.for("immer-draftable"), O = Symbol.for("immer-state"), Le = process.env.NODE_ENV !== "production" ? [
+var Ae = /* @__PURE__ */ Symbol.for("immer-nothing"), ye = /* @__PURE__ */ Symbol.for("immer-draftable"), O = /* @__PURE__ */ Symbol.for("immer-state"), He = process.env.NODE_ENV !== "production" ? [
   // All error codes, starting by 0:
   function(e) {
     return `The plugin for '${e}' has not been loaded into Immer. To enable the plugin, import and call \`enable${e}()\` when initializing your application.`;
@@ -82,7 +82,7 @@ var Ae = Symbol.for("immer-nothing"), ye = Symbol.for("immer-draftable"), O = Sy
 ] : [];
 function T(e, ...t) {
   if (process.env.NODE_ENV !== "production") {
-    const r = Le[e], n = typeof r == "function" ? r.apply(null, t) : r;
+    const r = He[e], n = typeof r == "function" ? r.apply(null, t) : r;
     throw new Error(`[Immer] ${n}`);
   }
   throw new Error(
@@ -94,7 +94,7 @@ function N(e) {
   return !!e && !!e[O];
 }
 function U(e) {
-  return e ? ve(e) || Array.isArray(e) || !!e[ye] || !!e.constructor?.[ye] || H(e) || X(e) : !1;
+  return e ? ve(e) || Array.isArray(e) || !!e[ye] || !!e.constructor?.[ye] || L(e) || X(e) : !1;
 }
 var $e = Object.prototype.constructor.toString(), ge = /* @__PURE__ */ new WeakMap();
 function ve(e) {
@@ -118,7 +118,7 @@ function q(e, t, r = !0) {
 }
 function V(e) {
   const t = e[O];
-  return t ? t.type_ : Array.isArray(e) ? 1 : H(e) ? 2 : X(e) ? 3 : 0;
+  return t ? t.type_ : Array.isArray(e) ? 1 : L(e) ? 2 : X(e) ? 3 : 0;
 }
 function oe(e, t) {
   return V(e) === 2 ? e.has(t) : Object.prototype.hasOwnProperty.call(e, t);
@@ -130,7 +130,7 @@ function Me(e, t, r) {
 function je(e, t) {
   return e === t ? e !== 0 || 1 / e === 1 / t : e !== e && t !== t;
 }
-function H(e) {
+function L(e) {
   return e instanceof Map;
 }
 function X(e) {
@@ -140,7 +140,7 @@ function M(e) {
   return e.copy_ || e.base_;
 }
 function ie(e, t) {
-  if (H(e))
+  if (L(e))
     return new Map(e);
   if (X(e))
     return new Set(e);
@@ -152,13 +152,13 @@ function ie(e, t) {
     delete n[O];
     let s = Reflect.ownKeys(n);
     for (let o = 0; o < s.length; o++) {
-      const a = s[o], c = n[a];
-      c.writable === !1 && (c.writable = !0, c.configurable = !0), (c.get || c.set) && (n[a] = {
+      const c = s[o], a = n[c];
+      a.writable === !1 && (a.writable = !0, a.configurable = !0), (a.get || a.set) && (n[c] = {
         configurable: !0,
         writable: !0,
         // could live with !!desc.set as well here...
-        enumerable: c.enumerable,
-        value: e[a]
+        enumerable: a.enumerable,
+        value: e[c]
       });
     }
     return Object.create(B(e), n);
@@ -171,7 +171,7 @@ function ie(e, t) {
   }
 }
 function fe(e, t = !1) {
-  return Z(e) || N(e) || !U(e) || (V(e) > 1 && Object.defineProperties(e, {
+  return J(e) || N(e) || !U(e) || (V(e) > 1 && Object.defineProperties(e, {
     set: W,
     add: W,
     clear: W,
@@ -184,7 +184,7 @@ function We() {
 var W = {
   value: We
 };
-function Z(e) {
+function J(e) {
   return e === null || typeof e != "object" ? !0 : Object.isFrozen(e);
 }
 var Ge = {};
@@ -210,10 +210,10 @@ function qe(e, t) {
 function he(e, t) {
   t && (P("Patches"), e.patches_ = [], e.inversePatches_ = [], e.patchListener_ = t);
 }
-function ae(e) {
-  ce(e), e.drafts_.forEach(Qe), e.drafts_ = null;
-}
 function ce(e) {
+  ae(e), e.drafts_.forEach(Qe), e.drafts_ = null;
+}
+function ae(e) {
   e === F && (F = e.parent_);
 }
 function be(e) {
@@ -226,21 +226,21 @@ function Qe(e) {
 function _e(e, t) {
   t.unfinalizedDrafts_ = t.drafts_.length;
   const r = t.drafts_[0];
-  return e !== void 0 && e !== r ? (r[O].modified_ && (ae(t), T(4)), U(e) && (e = Q(t, e), t.parent_ || Y(t, e)), t.patches_ && P("Patches").generateReplacementPatches_(
+  return e !== void 0 && e !== r ? (r[O].modified_ && (ce(t), T(4)), U(e) && (e = Q(t, e), t.parent_ || Y(t, e)), t.patches_ && P("Patches").generateReplacementPatches_(
     r[O].base_,
     e,
     t.patches_,
     t.inversePatches_
-  )) : e = Q(t, r, []), ae(t), t.patches_ && t.patchListener_(t.patches_, t.inversePatches_), e !== Ae ? e : void 0;
+  )) : e = Q(t, r, []), ce(t), t.patches_ && t.patchListener_(t.patches_, t.inversePatches_), e !== Ae ? e : void 0;
 }
 function Q(e, t, r) {
-  if (Z(t))
+  if (J(t))
     return t;
   const n = e.immer_.shouldUseStrictIteration(), s = t[O];
   if (!s)
     return q(
       t,
-      (o, a) => we(e, s, t, o, a, r),
+      (o, c) => we(e, s, t, o, c, r),
       n
     ), t;
   if (s.scope_ !== e)
@@ -250,17 +250,17 @@ function Q(e, t, r) {
   if (!s.finalized_) {
     s.finalized_ = !0, s.scope_.unfinalizedDrafts_--;
     const o = s.copy_;
-    let a = o, c = !1;
-    s.type_ === 3 && (a = new Set(o), o.clear(), c = !0), q(
-      a,
-      (d, y) => we(
+    let c = o, a = !1;
+    s.type_ === 3 && (c = new Set(o), o.clear(), a = !0), q(
+      c,
+      (y, g) => we(
         e,
         s,
         o,
-        d,
         y,
+        g,
         r,
-        c
+        a
       ),
       n
     ), Y(e, o, !1), r && e.patches_ && P("Patches").generatePatches_(
@@ -272,23 +272,23 @@ function Q(e, t, r) {
   }
   return s.copy_;
 }
-function we(e, t, r, n, s, o, a) {
-  if (s == null || typeof s != "object" && !a)
+function we(e, t, r, n, s, o, c) {
+  if (s == null || typeof s != "object" && !c)
     return;
-  const c = Z(s);
-  if (!(c && !a)) {
+  const a = J(s);
+  if (!(a && !c)) {
     if (process.env.NODE_ENV !== "production" && s === r && T(5), N(s)) {
-      const d = o && t && t.type_ !== 3 && // Set objects are atomic since they have no keys.
-      !oe(t.assigned_, n) ? o.concat(n) : void 0, y = Q(e, s, d);
-      if (Me(r, n, y), N(y))
+      const y = o && t && t.type_ !== 3 && // Set objects are atomic since they have no keys.
+      !oe(t.assigned_, n) ? o.concat(n) : void 0, g = Q(e, s, y);
+      if (Me(r, n, g), N(g))
         e.canAutoFreeze_ = !1;
       else
         return;
-    } else a && r.add(s);
-    if (U(s) && !c) {
-      if (!e.immer_.autoFreeze_ && e.unfinalizedDrafts_ < 1 || t && t.base_ && t.base_[n] === s && c)
+    } else c && r.add(s);
+    if (U(s) && !a) {
+      if (!e.immer_.autoFreeze_ && e.unfinalizedDrafts_ < 1 || t && t.base_ && t.base_[n] === s && a)
         return;
-      Q(e, s), (!t || !t.scope_.parent_) && typeof n != "symbol" && (H(r) ? r.has(n) : Object.prototype.propertyIsEnumerable.call(r, n)) && Y(e, s);
+      Q(e, s), (!t || !t.scope_.parent_) && typeof n != "symbol" && (L(r) ? r.has(n) : Object.prototype.propertyIsEnumerable.call(r, n)) && Y(e, s);
     }
   }
 }
@@ -321,8 +321,8 @@ function Ye(e, t) {
   };
   let s = n, o = me;
   r && (s = [n], o = z);
-  const { revoke: a, proxy: c } = Proxy.revocable(s, o);
-  return n.draft_ = c, n.revoke_ = a, c;
+  const { revoke: c, proxy: a } = Proxy.revocable(s, o);
+  return n.draft_ = a, n.revoke_ = c, a;
 }
 var me = {
   get(e, t) {
@@ -429,43 +429,43 @@ var Xe = class {
       if (typeof t == "function" && typeof r != "function") {
         const o = r;
         r = t;
-        const a = this;
-        return function(d = o, ...y) {
-          return a.produce(d, (p) => r.call(this, p, ...y));
+        const c = this;
+        return function(y = o, ...g) {
+          return c.produce(y, (p) => r.call(this, p, ...g));
         };
       }
       typeof r != "function" && T(6), n !== void 0 && typeof n != "function" && T(7);
       let s;
       if (U(t)) {
-        const o = be(this), a = le(t, void 0);
-        let c = !0;
+        const o = be(this), c = le(t, void 0);
+        let a = !0;
         try {
-          s = r(a), c = !1;
+          s = r(c), a = !1;
         } finally {
-          c ? ae(o) : ce(o);
+          a ? ce(o) : ae(o);
         }
         return he(o, n), _e(s, o);
       } else if (!t || typeof t != "object") {
         if (s = r(t), s === void 0 && (s = t), s === Ae && (s = void 0), this.autoFreeze_ && fe(s, !0), n) {
-          const o = [], a = [];
-          P("Patches").generateReplacementPatches_(t, s, o, a), n(o, a);
+          const o = [], c = [];
+          P("Patches").generateReplacementPatches_(t, s, o, c), n(o, c);
         }
         return s;
       } else
         T(1, t);
     }, this.produceWithPatches = (t, r) => {
       if (typeof t == "function")
-        return (a, ...c) => this.produceWithPatches(a, (d) => t(d, ...c));
+        return (c, ...a) => this.produceWithPatches(c, (y) => t(y, ...a));
       let n, s;
-      return [this.produce(t, r, (a, c) => {
-        n = a, s = c;
+      return [this.produce(t, r, (c, a) => {
+        n = c, s = a;
       }), n, s];
     }, typeof e?.autoFreeze == "boolean" && this.setAutoFreeze(e.autoFreeze), typeof e?.useStrictShallowCopy == "boolean" && this.setUseStrictShallowCopy(e.useStrictShallowCopy), typeof e?.useStrictIteration == "boolean" && this.setUseStrictIteration(e.useStrictIteration);
   }
   createDraft(e) {
-    U(e) || T(8), N(e) && (e = Ze(e));
+    U(e) || T(8), N(e) && (e = Je(e));
     const t = be(this), r = le(e, void 0);
-    return r[O].isManual_ = !0, ce(t), r;
+    return r[O].isManual_ = !0, ae(t), r;
   }
   finishDraft(e, t) {
     const r = e && e[O];
@@ -519,14 +519,14 @@ var Xe = class {
   }
 };
 function le(e, t) {
-  const r = H(e) ? P("MapSet").proxyMap_(e, t) : X(e) ? P("MapSet").proxySet_(e, t) : Ye(e, t);
+  const r = L(e) ? P("MapSet").proxyMap_(e, t) : X(e) ? P("MapSet").proxySet_(e, t) : Ye(e, t);
   return (t ? t.scope_ : Ce()).drafts_.push(r), r;
 }
-function Ze(e) {
+function Je(e) {
   return N(e) || T(10, e), Pe(e);
 }
 function Pe(e) {
-  if (!U(e) || Z(e))
+  if (!U(e) || J(e))
     return e;
   const t = e[O];
   let r, n = !0;
@@ -544,7 +544,7 @@ function Pe(e) {
     n
   ), t && (t.finalized_ = !1), r;
 }
-var Je = new Xe(), C = Je.produce;
+var Ze = new Xe(), C = Ze.produce;
 const E = [];
 for (let e = 0; e < 256; ++e)
   E.push((e + 256).toString(16).slice(1));
@@ -580,10 +580,10 @@ function Ee(e, t, r) {
     return o(s.value), s.value;
   });
   e((s) => C(s, (o) => {
-    const a = s.rooms.filter(
-      (c) => c.collectionId !== n[0].collectionId
+    const c = s.rooms.filter(
+      (a) => a.collectionId !== n[0].collectionId
     );
-    return o.rooms = a.concat(n), o.roomsLoading = !1, o;
+    return o.rooms = c.concat(n), o.roomsLoading = !1, o;
   }));
 }
 async function ne({
@@ -593,26 +593,26 @@ async function ne({
   collectionId: n,
   messagesId: s,
   participants: o = [],
-  retentionDays: a,
-  isGenerated: c = !1,
-  id: d
+  retentionDays: c,
+  isGenerated: a = !1,
+  id: y
 }) {
   if (e)
     try {
       const p = {
-        _id: d || Ne(),
+        _id: y || Ne(),
         name: r,
         messagesId: s,
         collectionId: n,
-        isGenerated: c,
+        isGenerated: a,
         createdBy: t,
         createdOn: (/* @__PURE__ */ new Date()).toISOString(),
         participants: o || void 0,
-        ...a !== void 0 && { retentionDays: a }
+        ...c !== void 0 && { retentionDays: c }
       }, S = `INSERT INTO \`${n}\` DOCUMENTS (:newDoc) ON ID CONFLICT DO UPDATE`;
       return await e.store.execute(S, { newDoc: p }), p;
-    } catch (y) {
-      console.error(`Error creating ${n}:`, y);
+    } catch (g) {
+      console.error(`Error creating ${n}:`, g);
     }
 }
 const st = (e, t, { ditto: r, userId: n }) => {
@@ -658,18 +658,18 @@ const st = (e, t, { ditto: r, userId: n }) => {
      * @param options.isGenerated - Optional flag to mark room as generated (hidden from main list)
      * @returns Promise resolving to the created Room object, or undefined if permission denied
      */
-    createRoom(o, a) {
+    createRoom(o, c) {
       if (!t().canPerformAction("canCreateRoom"))
         return console.warn("Permission denied: canCreateRoom is false"), Promise.resolve(void 0);
-      const c = t().currentUser;
+      const a = t().currentUser;
       return ne({
         ditto: r,
-        currentUserId: c?._id || n,
+        currentUserId: a?._id || n,
         name: o,
         collectionId: "rooms",
         messagesId: "messages",
-        retentionDays: a?.retentionDays,
-        isGenerated: a?.isGenerated ?? !1
+        retentionDays: c?.retentionDays,
+        isGenerated: c?.isGenerated ?? !1
       });
     },
     /**
@@ -704,16 +704,16 @@ const st = (e, t, { ditto: r, userId: n }) => {
      * @throws Error if either user ID is invalid or missing
      */
     createDMRoom(o) {
-      const a = t().currentUser;
-      if (!a?._id || !o?._id)
+      const c = t().currentUser;
+      if (!c?._id || !o?._id)
         throw Error("Invalid users");
       return ne({
         ditto: r,
-        currentUserId: a?._id || n,
-        name: `${a?.name} & ${o.name}`,
+        currentUserId: c?._id || n,
+        name: `${c?.name} & ${o.name}`,
         collectionId: "dm_rooms",
         messagesId: "dm_messages",
-        participants: [a?._id, o._id]
+        participants: [c?._id, o._id]
       });
     },
     /**
@@ -727,20 +727,20 @@ const st = (e, t, { ditto: r, userId: n }) => {
      * @param name - Display name for the room
      * @returns Promise resolving to the created Room object
      */
-    async createGeneratedRoom(o, a) {
-      const c = t().currentUser, d = await ne({
+    async createGeneratedRoom(o, c) {
+      const a = t().currentUser, y = await ne({
         ditto: r,
-        currentUserId: c?._id || n,
-        name: a,
+        currentUserId: a?._id || n,
+        name: c,
         collectionId: "rooms",
         messagesId: "messages",
         isGenerated: !0,
         id: o
       });
-      return d && e((y) => y.generatedRooms.some((S) => S._id === d._id) ? y : {
-        ...y,
-        generatedRooms: [...y.generatedRooms, d]
-      }), d;
+      return y && e((g) => g.generatedRooms.some((S) => S._id === y._id) ? g : {
+        ...g,
+        generatedRooms: [...g.generatedRooms, y]
+      }), y;
     },
     /**
      * Returns all public rooms, filtering out generated rooms.
@@ -755,18 +755,18 @@ const st = (e, t, { ditto: r, userId: n }) => {
     }
   };
   if (r) {
-    const o = "SELECT * from rooms WHERE isGenerated = false OR isGenerated IS NULL", a = "SELECT * from dm_rooms where (array_contains(participants, :userId))";
-    s.roomsSubscription = r.sync.registerSubscription(o), s.dmRoomsSubscription = r.sync.registerSubscription(a, {
+    const o = "SELECT * from rooms WHERE isGenerated = false OR isGenerated IS NULL", c = "SELECT * from dm_rooms where (array_contains(participants, :userId))";
+    s.roomsSubscription = r.sync.registerSubscription(o), s.dmRoomsSubscription = r.sync.registerSubscription(c, {
       userId: n
     }), s.roomsObserver = r.store.registerObserver(
       o,
-      (c) => {
-        Ee(e, t, c);
+      (a) => {
+        Ee(e, t, a);
       }
     ), s.dmRoomsObserver = r.store.registerObserver(
-      a,
-      (c) => {
-        Ee(e, t, c);
+      c,
+      (a) => {
+        Ee(e, t, a);
       },
       {
         userId: n
@@ -776,14 +776,14 @@ const st = (e, t, { ditto: r, userId: n }) => {
   return s;
 }, Te = (e) => {
   let t;
-  const r = /* @__PURE__ */ new Set(), n = (y, p) => {
-    const S = typeof y == "function" ? y(t) : y;
+  const r = /* @__PURE__ */ new Set(), n = (g, p) => {
+    const S = typeof g == "function" ? g(t) : g;
     if (!Object.is(S, t)) {
       const x = t;
-      t = p ?? (typeof S != "object" || S === null) ? S : Object.assign({}, t, S), r.forEach((L) => L(t, x));
+      t = p ?? (typeof S != "object" || S === null) ? S : Object.assign({}, t, S), r.forEach((H) => H(t, x));
     }
-  }, s = () => t, c = { setState: n, getState: s, getInitialState: () => d, subscribe: (y) => (r.add(y), () => r.delete(y)) }, d = t = e(n, s, c);
-  return c;
+  }, s = () => t, a = { setState: n, getState: s, getInitialState: () => y, subscribe: (g) => (r.add(g), () => r.delete(g)) }, y = t = e(n, s, a);
+  return a;
 }, ot = ((e) => e ? Te(e) : Te), it = (e) => e;
 function xe(e, t = it) {
   const r = k.useSyncExternalStore(
@@ -804,7 +804,7 @@ const Se = (e) => Symbol.iterator in e, Oe = (e) => (
     if (!n.has(s) || !Object.is(o, n.get(s)))
       return !1;
   return !0;
-}, at = (e, t) => {
+}, ct = (e, t) => {
   const r = e[Symbol.iterator](), n = t[Symbol.iterator]();
   let s = r.next(), o = n.next();
   for (; !s.done && !o.done; ) {
@@ -814,8 +814,8 @@ const Se = (e) => Symbol.iterator in e, Oe = (e) => (
   }
   return !!s.done && !!o.done;
 };
-function ct(e, t) {
-  return Object.is(e, t) ? !0 : typeof e != "object" || e === null || typeof t != "object" || t === null || Object.getPrototypeOf(e) !== Object.getPrototypeOf(t) ? !1 : Se(e) && Se(t) ? Oe(e) && Oe(t) ? Re(e, t) : at(e, t) : Re(
+function at(e, t) {
+  return Object.is(e, t) ? !0 : typeof e != "object" || e === null || typeof t != "object" || t === null || Object.getPrototypeOf(e) !== Object.getPrototypeOf(t) ? !1 : Se(e) && Se(t) ? Oe(e) && Oe(t) ? Re(e, t) : ct(e, t) : Re(
     { entries: () => Object.entries(e) },
     { entries: () => Object.entries(t) }
   );
@@ -824,7 +824,7 @@ function ut(e) {
   const t = k.useRef(void 0);
   return (r) => {
     const n = e(r);
-    return ct(t.current, n) ? t.current : t.current = n;
+    return at(t.current, n) ? t.current : t.current = n;
   };
 }
 const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
@@ -849,15 +849,15 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
      *
      * @param user - User object (with optional _id for upsert)
      */
-    async addUser(a) {
+    async addUser(c) {
       if (r)
         try {
           await r.store.execute(
             `INSERT INTO ${s} DOCUMENTS (:newUser) ON ID CONFLICT DO UPDATE`,
-            { newUser: a }
+            { newUser: c }
           );
-        } catch (c) {
-          console.error("Error in addUser:", c);
+        } catch (a) {
+          console.error("Error in addUser:", a);
         }
     },
     /**
@@ -874,19 +874,19 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
      *
      * @param params - Object with _id and fields to update
      */
-    async updateUser({ _id: a, ...c }) {
-      if (r && a)
+    async updateUser({ _id: c, ...a }) {
+      if (r && c)
         try {
-          const d = await t().findUserById(a);
-          if (!d)
+          const y = await t().findUserById(c);
+          if (!y)
             return;
-          const y = { ...d, ...c };
+          const g = { ...y, ...a };
           await r.store.execute(
             `INSERT INTO ${s} DOCUMENTS (:newUser) ON ID CONFLICT DO UPDATE`,
-            { newUser: y }
+            { newUser: g }
           );
-        } catch (d) {
-          console.error("Error in updateUser:", d);
+        } catch (y) {
+          console.error("Error in updateUser:", y);
         }
     },
     /**
@@ -902,16 +902,16 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
      * @param userId - The unique identifier of the user
      * @returns Promise resolving to ChatUser or null
      */
-    async findUserById(a) {
+    async findUserById(c) {
       if (!r)
         return null;
       try {
         return (await r.store.execute(
           `SELECT * FROM ${s} WHERE _id = :id`,
-          { id: a }
+          { id: c }
         )).items?.[0]?.value;
-      } catch (c) {
-        return console.error("Error in findUserById:", c), null;
+      } catch (a) {
+        return console.error("Error in findUserById:", a), null;
       }
     },
     /**
@@ -929,21 +929,21 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
      *
      * @param roomId - ID of the room to mark as read
      */
-    async markRoomAsRead(a) {
+    async markRoomAsRead(c) {
       if (!(!r || !n))
         try {
-          let c = !1;
-          const d = await t().findUserById(n);
-          if (!d)
+          let a = !1;
+          const y = await t().findUserById(n);
+          if (!y)
             return;
-          const y = d.subscriptions || {}, p = d.mentions || {};
-          if (y[a]) {
+          const g = y.subscriptions || {}, p = y.mentions || {};
+          if (g[c]) {
             const S = (/* @__PURE__ */ new Date()).toISOString();
-            y[a] = S, c = !0;
+            g[c] = S, a = !0;
           }
-          p[a] && (p[a] = [], c = !0), c && await t().updateUser({ _id: n, subscriptions: y, mentions: p });
-        } catch (c) {
-          console.error("Error in markRoomAsRead:", c);
+          p[c] && (p[c] = [], a = !0), a && await t().updateUser({ _id: n, subscriptions: g, mentions: p });
+        } catch (a) {
+          console.error("Error in markRoomAsRead:", a);
         }
     },
     /**
@@ -960,49 +960,49 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
      *
      * @param roomId - ID of the room to toggle subscription for
      */
-    async toggleRoomSubscription(a) {
+    async toggleRoomSubscription(c) {
       if (!(!r || !n)) {
         if (!t().canPerformAction("canSubscribeToRoom")) {
           console.warn("Permission denied: canSubscribeToRoom is false");
           return;
         }
         try {
-          const c = await t().findUserById(n);
-          if (!c)
+          const a = await t().findUserById(n);
+          if (!a)
             return;
-          const d = { ...c.subscriptions };
-          if (a in d && d[a] !== null)
-            d[a] = null;
+          const y = { ...a.subscriptions };
+          if (c in y && y[c] !== null)
+            y[c] = null;
           else {
-            const y = (/* @__PURE__ */ new Date()).toISOString();
-            d[a] = y;
+            const g = (/* @__PURE__ */ new Date()).toISOString();
+            y[c] = g;
           }
           await t().updateUser({
             _id: n,
-            subscriptions: d
+            subscriptions: y
           });
-        } catch (c) {
-          console.error("Error in toggleRoomSubscription:", c);
+        } catch (a) {
+          console.error("Error in toggleRoomSubscription:", a);
         }
       }
     }
   };
   if (r) {
-    const a = `SELECT * FROM ${s} WHERE _id = :id`, c = `SELECT * FROM ${s}`, d = { id: n };
+    const c = `SELECT * FROM ${s} WHERE _id = :id`, a = `SELECT * FROM ${s}`, y = { id: n };
     o.userSubscription = r.sync.registerSubscription(
-      a,
-      d
+      c,
+      y
     ), o.userObserver = r.store.registerObserver(
-      a,
-      (y) => {
-        e({ currentUser: y.items?.[0]?.value });
-      },
-      d
-    ), o.allUsersSubscription = r.sync.registerSubscription(c), o.allUsersObserver = r.store.registerObserver(
       c,
-      (y) => {
+      (g) => {
+        e({ currentUser: g.items?.[0]?.value });
+      },
+      y
+    ), o.allUsersSubscription = r.sync.registerSubscription(a), o.allUsersObserver = r.store.registerObserver(
+      a,
+      (g) => {
         e({
-          allUsers: y.items.map((p) => p.value),
+          allUsers: g.items.map((p) => p.value),
           usersLoading: !1
         });
       }
@@ -1014,9 +1014,9 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
   userId: n,
   userCollectionKey: s,
   retentionDays: o,
-  notificationHandler: a
+  notificationHandler: c
 }) => {
-  const c = async (i) => {
+  const a = async (i) => {
     if (!r)
       throw new Error("Ditto not initialized");
     const u = await r.store.execute(
@@ -1026,7 +1026,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
     if (u.items.length === 0)
       throw new Error("Room not found");
     return u.items[0].value;
-  }, d = async () => {
+  }, y = async () => {
     if (!r || !n)
       throw new Error("Ditto not initialized or user not found");
     const u = (await r.store.execute(
@@ -1037,43 +1037,43 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
       id: n,
       name: u?.name ?? n
     };
-  }, y = () => {
+  }, g = () => {
     e((i) => C(i, (u) => {
       u.messagesLoading = !u.rooms.every(
         (l) => l._id in u.messagesByRoom
       );
     }));
   }, p = (i, u, l, f) => {
-    const m = {
+    const d = {
       message: l,
       user: f,
       id: l._id
-    }, g = {
-      ...m,
-      message: m.message,
-      user: m.user
+    }, m = {
+      ...d,
+      message: d.message,
+      user: d.user
     }, b = i.findIndex((h) => h.id === l._id);
-    if (b === -1 && !l.archivedMessage && S(l, u) && a && t().activeRoomId !== u._id) {
+    if (b === -1 && !l.archivedMessage && S(l, u) && c && t().activeRoomId !== u._id) {
       const _ = f?.name || "Unknown User", w = u.name, D = u.collectionId === "dm_rooms" ? `New message from ${_}` : `#${w}: ${_}`, A = l.text ? l.text.substring(0, 30) + (l.text.length > 30 ? "..." : "") : "Sent an attachment";
-      a(D, A);
+      c(D, A);
     }
     if (l.archivedMessage) {
       const h = i.findIndex(
         (_) => _.id === l.archivedMessage
       );
-      h !== -1 ? i[h] = g : b === -1 ? i.push(g) : i[b] = g;
+      h !== -1 ? i[h] = m : b === -1 ? i.push(m) : i[b] = m;
     } else
-      b === -1 ? i.push(g) : i[b] = g;
+      b === -1 ? i.push(m) : i[b] = m;
   }, S = (i, u) => {
-    const f = t().currentUser, m = i.userId === f?._id, g = new Date(i.createdOn).getTime() > Date.now() - ft, b = f?.subscriptions?.[u._id], h = i.mentions?.some(
+    const f = t().currentUser, d = i.userId === f?._id, m = new Date(i.createdOn).getTime() > Date.now() - ft, b = f?.subscriptions?.[u._id], h = i.mentions?.some(
       (w) => w.userId === f?._id
     ), _ = u.collectionId === "dm_rooms";
-    return !m && g && (b || _ || h);
+    return !d && m && (b || _ || h);
   }, x = async (i, u, l = "") => {
     if (!r || !n)
       throw new Error("Ditto not initialized or user not found");
-    const f = await c(i), m = u._id || Ne(), g = {
-      _id: m,
+    const f = await a(i), d = u._id || Ne(), m = {
+      _id: d,
       roomId: i._id,
       userId: n,
       createdOn: (/* @__PURE__ */ new Date()).toISOString(),
@@ -1090,7 +1090,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
     }, b = l ? `COLLECTION ${f.messagesId} ${l}` : f.messagesId;
     if (await r.store.execute(
       `INSERT INTO ${b} DOCUMENTS (:newDoc) ON ID CONFLICT DO UPDATE`,
-      { newDoc: g }
+      { newDoc: m }
     ), u.mentions && u.mentions.length > 0) {
       const h = t().allUsers;
       await Promise.all(
@@ -1100,7 +1100,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
             return;
           const R = {
             ...w.mentions || {},
-            [i._id]: [...w.mentions?.[i._id] || [], m]
+            [i._id]: [...w.mentions?.[i._id] || [], d]
           };
           return r.store.execute(
             "UPDATE users SET mentions = :mentions WHERE _id = :id",
@@ -1109,8 +1109,8 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
         })
       );
     }
-    return g;
-  }, L = async (i, u, l) => {
+    return m;
+  }, H = async (i, u, l) => {
     if (!r)
       throw new Error("Ditto not initialized");
     return await r.store.execute(
@@ -1125,27 +1125,27 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
   }, de = async (i, u, l, f) => {
     if (!r || !n)
       throw new Error("Ditto not initialized or user not found");
-    const m = await d(), g = {
+    const d = await y(), m = {
       thumbnailImageToken: null,
       largeImageToken: null,
       fileAttachmentToken: null
     };
     if (f === "image") {
       const h = await dt(u), _ = await De(h), w = new Uint8Array(await _.arrayBuffer());
-      g.thumbnailImageToken = await r.store.newAttachment(
+      m.thumbnailImageToken = await r.store.newAttachment(
         w,
-        se(m.id, m.name, "thumbnail", u)
+        se(d.id, d.name, "thumbnail", u)
       );
       const R = await De(await ke(u)), D = new Uint8Array(await R.arrayBuffer());
-      g.largeImageToken = await r.store.newAttachment(
+      m.largeImageToken = await r.store.newAttachment(
         D,
-        se(m.id, m.name, "large", u)
+        se(d.id, d.name, "large", u)
       );
     } else {
       const h = new Uint8Array(await u.arrayBuffer());
-      g.fileAttachmentToken = await r.store.newAttachment(
+      m.fileAttachmentToken = await r.store.newAttachment(
         h,
-        se(m.id, m.name, "file", u)
+        se(d.id, d.name, "file", u)
       );
     }
     const b = f === "image" ? "(thumbnailImageToken ATTACHMENT, largeImageToken ATTACHMENT)" : "(fileAttachmentToken ATTACHMENT)";
@@ -1153,7 +1153,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
       i,
       {
         text: l || (f === "file" ? u.name : ""),
-        ...g
+        ...m
       },
       b
     );
@@ -1199,27 +1199,27 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
       const l = i._id;
       if (t().messageSubscriptionsByRoom[l])
         return;
-      const f = u ?? i.retentionDays ?? o ?? Ie, m = new Date(
+      const f = u ?? i.retentionDays ?? o ?? Ie, d = new Date(
         Date.now() - f * 24 * 60 * 60 * 1e3
-      ), g = `SELECT * FROM COLLECTION ${i.messagesId} (thumbnailImageToken ATTACHMENT, largeImageToken ATTACHMENT, fileAttachmentToken ATTACHMENT)
+      ), m = `SELECT * FROM COLLECTION ${i.messagesId} (thumbnailImageToken ATTACHMENT, largeImageToken ATTACHMENT, fileAttachmentToken ATTACHMENT)
         WHERE roomId = :roomId AND createdOn >= :date AND isArchived = false
         ORDER BY createdOn ASC`, b = {
         roomId: i._id,
-        date: m.toISOString()
+        date: d.toISOString()
       };
       try {
-        const h = r.sync.registerSubscription(g, b), _ = t().allUsers, w = r.store.registerObserver(
-          g,
+        const h = r.sync.registerSubscription(m, b), _ = t().allUsers, w = r.store.registerObserver(
+          m,
           async (R) => {
             e((D) => C(D, (A) => {
               if (A.messagesByRoom[i._id] || (A.messagesByRoom[i._id] = []), R.items.length === 0)
                 return A;
               for (const v of R.items) {
-                const $ = v.value, j = A.messagesByRoom[i._id], J = _.find((K) => K._id === $.userId);
-                p(j, i, $, J);
+                const $ = v.value, j = A.messagesByRoom[i._id], Z = _.find((K) => K._id === $.userId);
+                p(j, i, $, Z);
               }
               return A;
-            })), y();
+            })), g();
           },
           b
         );
@@ -1259,17 +1259,17 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
     async subscribeToRoomMessages(i, u, l) {
       if (!r || t().messageSubscriptionsByRoom[i])
         return;
-      const f = l ?? o ?? Ie, m = new Date(
+      const f = l ?? o ?? Ie, d = new Date(
         Date.now() - f * 24 * 60 * 60 * 1e3
-      ), g = `SELECT * FROM COLLECTION ${u} (thumbnailImageToken ATTACHMENT, largeImageToken ATTACHMENT, fileAttachmentToken ATTACHMENT)
+      ), m = `SELECT * FROM COLLECTION ${u} (thumbnailImageToken ATTACHMENT, largeImageToken ATTACHMENT, fileAttachmentToken ATTACHMENT)
         WHERE roomId = :roomId AND createdOn >= :date AND isArchived = false
         ORDER BY createdOn ASC`, b = {
         roomId: i,
-        date: m.toISOString()
+        date: d.toISOString()
       };
       try {
-        const h = r.sync.registerSubscription(g, b), _ = t().allUsers, w = r.store.registerObserver(
-          g,
+        const h = r.sync.registerSubscription(m, b), _ = t().allUsers, w = r.store.registerObserver(
+          m,
           async (R) => {
             const D = {
               _id: i,
@@ -1284,11 +1284,11 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
               if (v.messagesByRoom[i] || (v.messagesByRoom[i] = []), R.items.length === 0)
                 return v;
               for (const $ of R.items) {
-                const j = $.value, J = v.messagesByRoom[i], K = _.find((Be) => Be._id === j.userId);
-                p(J, D, j, K);
+                const j = $.value, Z = v.messagesByRoom[i], K = _.find((Be) => Be._id === j.userId);
+                p(Z, D, j, K);
               }
               return v;
-            })), y();
+            })), g();
           },
           b
         );
@@ -1325,7 +1325,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
      */
     unsubscribeFromRoomMessages(i) {
       const u = t().messageSubscriptionsByRoom[i], l = t().messageObserversByRoom[i];
-      u && !u.isCancelled && u.cancel(), l && !l.isCancelled && l.cancel(), e((f) => C(f, (m) => (delete m.messagesByRoom[i], delete m.messageSubscriptionsByRoom[i], delete m.messageObserversByRoom[i], m)));
+      u && !u.isCancelled && u.cancel(), l && !l.isCancelled && l.cancel(), e((f) => C(f, (d) => (delete d.messagesByRoom[i], delete d.messageSubscriptionsByRoom[i], delete d.messageObserversByRoom[i], d)));
     },
     /**
      * Create a new text message in a room.
@@ -1346,15 +1346,15 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
     async createMessage(i, u, l = []) {
       if (!r || !n)
         return;
-      const f = t().canPerformAction("canMentionUsers"), m = l.length > 0 && !f ? [] : l;
+      const f = t().canPerformAction("canMentionUsers"), d = l.length > 0 && !f ? [] : l;
       l.length > 0 && !f && console.warn("Permission denied: canMentionUsers is false");
       try {
         await x(i, {
           text: u,
-          mentions: m
+          mentions: d
         });
-      } catch (g) {
-        console.error("Error in createMessage:", g);
+      } catch (m) {
+        console.error("Error in createMessage:", m);
       }
     },
     /**
@@ -1378,7 +1378,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
         return;
       }
       try {
-        await L(i, u, {
+        await H(i, u, {
           text: i.text,
           largeImageToken: i.largeImageToken || null,
           thumbnailImageToken: i.thumbnailImageToken || null,
@@ -1419,7 +1419,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
         file: "[deleted file]"
       }[l];
       try {
-        await L(i, u, {
+        await H(i, u, {
           text: f,
           createdOn: (/* @__PURE__ */ new Date()).toISOString(),
           largeImageToken: null,
@@ -1429,8 +1429,8 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
           isDeleted: !0,
           mentions: []
         });
-      } catch (m) {
-        console.error("Error in saveDeletedMessage:", m);
+      } catch (d) {
+        console.error("Error in saveDeletedMessage:", d);
       }
     },
     /**
@@ -1493,6 +1493,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
      * @param token - Attachment token from message
      * @param onProgress - Callback receiving progress (0-1)
      * @param onComplete - Callback receiving AttachmentResult
+     * @returns The fetcher object from the SDK for cleanup
      */
     fetchAttachment(i, u, l) {
       if (!r) {
@@ -1510,30 +1511,31 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
         return;
       }
       try {
-        r.store.fetchAttachment(i, async (f) => {
-          switch (f.type) {
+        const f = i.id || JSON.stringify(i);
+        return r.store.fetchAttachment(i, async (m) => {
+          switch (m.type) {
             case "Progress": {
-              const m = Number(f.downloadedBytes) / (Number(f.totalBytes) || 1);
-              u(m);
+              const b = Number(m.downloadedBytes) / (Number(m.totalBytes) || 1);
+              u(b);
               break;
             }
             case "Completed":
               try {
-                const m = f.attachment.getData(), g = m instanceof Promise ? await m : m;
+                const b = m.attachment.getData(), h = b instanceof Promise ? await b : b;
                 l({
                   success: !0,
-                  data: g,
-                  metadata: f.attachment.metadata || {}
+                  data: h,
+                  metadata: m.attachment.metadata || {}
                 });
-              } catch (m) {
+              } catch (b) {
                 l({
                   success: !1,
-                  error: m instanceof Error ? m : new Error("Unknown error getting attachment data")
+                  error: b instanceof Error ? b : new Error("Unknown error getting attachment data")
                 });
               }
               break;
             case "Deleted":
-              l({
+              console.warn(`[useMessages] Attachment reported as DELETED: ${f}`), l({
                 success: !1,
                 error: new Error("Attachment was deleted")
               });
@@ -1541,10 +1543,10 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
           }
         });
       } catch (f) {
-        l({
+        return l({
           success: !1,
           error: f instanceof Error ? f : new Error("Failed to fetch attachment")
-        });
+        }), null;
       }
     },
     /**
@@ -1576,13 +1578,13 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
     async updateMessageReactions(i, u, l) {
       if (!r || !n)
         return;
-      const f = u._id, m = t().messagesByRoom[f] || [], g = m.findIndex((_) => _.id === i._id);
-      if (g === -1)
+      const f = u._id, d = t().messagesByRoom[f] || [], m = d.findIndex((_) => _.id === i._id);
+      if (m === -1)
         throw new Error("Message not found");
-      const b = m[g].message, h = b.reactions || [];
+      const b = d[m].message, h = b.reactions || [];
       e(
         (_) => C(_, (w) => {
-          w.messagesByRoom[f][g].message.reactions = l;
+          w.messagesByRoom[f][m].message.reactions = l;
         })
       ), setTimeout(async () => {
         try {
@@ -1593,7 +1595,7 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
         } catch (_) {
           console.error("Error updating reactions, rolling back:", _), e(
             (w) => C(w, (R) => {
-              R.messagesByRoom[f][g].message.reactions = h;
+              R.messagesByRoom[f][m].message.reactions = h;
             })
           );
         }
@@ -1622,11 +1624,11 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
         console.warn("Permission denied: canAddReaction is false");
         return;
       }
-      const f = t().messagesByRoom[u._id], m = f.findIndex((h) => h.id === i._id);
-      if (m === -1)
+      const f = t().messagesByRoom[u._id], d = f.findIndex((h) => h.id === i._id);
+      if (d === -1)
         throw new Error("Message not found");
-      const g = f[m].message, b = [...g.reactions || [], l];
-      await t().updateMessageReactions(g, u, b);
+      const m = f[d].message, b = [...m.reactions || [], l];
+      await t().updateMessageReactions(m, u, b);
     },
     /**
      * Remove a reaction from a message.
@@ -1651,13 +1653,13 @@ const lt = (e, t, { ditto: r, userId: n, userCollectionKey: s }) => {
         console.warn("Permission denied: canRemoveOwnReaction is false");
         return;
       }
-      const f = t().messagesByRoom[u._id], m = f.findIndex((h) => h.id === i._id);
-      if (m === -1)
+      const f = t().messagesByRoom[u._id], d = f.findIndex((h) => h.id === i._id);
+      if (d === -1)
         throw new Error("Message not found");
-      const g = f[m].message, b = (g.reactions || []).filter(
+      const m = f[d].message, b = (m.reactions || []).filter(
         (h) => !(h.emoji === l.emoji && h.userId === l.userId)
       );
-      await t().updateMessageReactions(g, u, b);
+      await t().updateMessageReactions(m, u, b);
     }
   };
 };
@@ -1701,12 +1703,12 @@ async function De(e) {
   });
 }
 function se(e, t, r, n) {
-  const s = (/* @__PURE__ */ new Date()).toISOString(), o = t.replace(/\s/g, "-"), a = s.replace(/:/g, "-"), c = r === "file" ? n.name.split(".").pop() || "bin" : "jpg";
+  const s = (/* @__PURE__ */ new Date()).toISOString(), o = t.replace(/\s/g, "-"), c = s.replace(/:/g, "-"), a = r === "file" ? n.name.split(".").pop() || "bin" : "jpg";
   return {
-    filename: `${o}_${r}_${a}.${c}`,
+    filename: `${o}_${r}_${c}.${a}`,
     userId: e,
     username: t,
-    fileformat: `.${c}`,
+    fileformat: `.${a}`,
     filesize: n.size.toString(),
     timestamp: s,
     originalName: n.name
@@ -1721,7 +1723,7 @@ function ht(e) {
       ...st(r, n, e),
       ...lt(r, n, e),
       ...mt(r, n, e),
-      ...He(r, n, e),
+      ...Le(r, n, e),
       activeRoomId: null,
       setActiveRoomId: (s) => r({ activeRoomId: s }),
       chatLogout: () => {
@@ -1755,7 +1757,7 @@ function wt() {
 export {
   ze as DEFAULT_PERMISSIONS,
   I as cancelSubscriptionOrObserver,
-  He as createRBACSlice,
+  Le as createRBACSlice,
   st as createRoomSlice,
   _t as getChatStore,
   wt as resetChatStore,