@acrobits/ipc-sdk 0.11.2-alpha.7 → 0.11.2-alpha.8

package/lib/ipc-sdk.js

@@ -38,8 +38,8 @@ function $(s, t) {
   try {
     for (; (t === void 0 || t-- > 0) && !(n = r.next()).done; )
       i.push(n.value);
-  } catch (c) {
-    o = { error: c };
+  } catch (a) {
+    o = { error: a };
   } finally {
     try {
       n && !n.done && (e = r.return) && e.call(r);
@@ -92,15 +92,15 @@ var x = function() {
       if (o)
         if (this._parentage = null, Array.isArray(o))
           try {
-            for (var c = Q(o), a = c.next(); !a.done; a = c.next()) {
-              var u = a.value;
-              u.remove(this);
+            for (var a = Q(o), c = a.next(); !c.done; c = a.next()) {
+              var l = c.value;
+              l.remove(this);
             }
           } catch (v) {
             t = { error: v };
           } finally {
             try {
-              a && !a.done && (e = c.return) && e.call(c);
+              c && !c.done && (e = a.return) && e.call(a);
             } finally {
               if (t)
                 throw t.error;
@@ -115,11 +115,11 @@ var x = function() {
         } catch (v) {
           i = v instanceof V ? v.errors : [v];
         }
-      var l = this._finalizers;
-      if (l) {
+      var u = this._finalizers;
+      if (u) {
         this._finalizers = null;
         try {
-          for (var b = Q(l), p = b.next(); !p.done; p = b.next()) {
+          for (var b = Q(u), p = b.next(); !p.done; p = b.next()) {
             var F = p.value;
             try {
               se(F);
@@ -282,13 +282,13 @@ var Oe = function() {
         complete: n ?? void 0
       };
     else {
-      var c;
-      i && we.useDeprecatedNextContext ? (c = Object.create(e), c.unsubscribe = function() {
+      var a;
+      i && we.useDeprecatedNextContext ? (a = Object.create(e), a.unsubscribe = function() {
         return i.unsubscribe();
       }, o = {
-        next: e.next && H(e.next, c),
-        error: e.error && H(e.error, c),
-        complete: e.complete && H(e.complete, c)
+        next: e.next && H(e.next, a),
+        error: e.error && H(e.error, a),
+        complete: e.complete && H(e.complete, a)
       }) : o = e;
     }
     return i.destination = new Oe(o), i;
@@ -329,8 +329,8 @@ var G = function() {
   }, s.prototype.subscribe = function(t, e, r) {
     var n = this, i = Ve(t) ? t : new N(t, e, r);
     return O(function() {
-      var o = n, c = o.operator, a = o.source;
-      i.add(c ? c.call(i, a) : a ? n._subscribe(i) : n._trySubscribe(i));
+      var o = n, a = o.operator, c = o.source;
+      i.add(a ? a.call(i, c) : c ? n._subscribe(i) : n._trySubscribe(i));
     }), i;
   }, s.prototype._trySubscribe = function(t) {
     try {
@@ -342,11 +342,11 @@ var G = function() {
     var r = this;
     return e = ie(e), new e(function(n, i) {
       var o = new N({
-        next: function(c) {
+        next: function(a) {
           try {
-            t(c);
-          } catch (a) {
-            i(a), o.unsubscribe();
+            t(a);
+          } catch (c) {
+            i(c), o.unsubscribe();
           }
         },
         error: i,
@@ -410,31 +410,31 @@ function Me(s, t, e, r, n) {
 }
 var je = function(s) {
   U(t, s);
-  function t(e, r, n, i, o, c) {
-    var a = s.call(this, e) || this;
-    return a.onFinalize = o, a.shouldUnsubscribe = c, a._next = r ? function(u) {
+  function t(e, r, n, i, o, a) {
+    var c = s.call(this, e) || this;
+    return c.onFinalize = o, c.shouldUnsubscribe = a, c._next = r ? function(l) {
       try {
-        r(u);
+        r(l);
       } catch (h) {
         e.error(h);
       }
-    } : s.prototype._next, a._error = i ? function(u) {
+    } : s.prototype._next, c._error = i ? function(l) {
       try {
-        i(u);
+        i(l);
       } catch (h) {
         e.error(h);
       } finally {
         this.unsubscribe();
       }
-    } : s.prototype._error, a._complete = n ? function() {
+    } : s.prototype._error, c._complete = n ? function() {
       try {
         n();
-      } catch (u) {
-        e.error(u);
+      } catch (l) {
+        e.error(l);
       } finally {
         this.unsubscribe();
       }
-    } : s.prototype._complete, a;
+    } : s.prototype._complete, c;
   }
   return t.prototype.unsubscribe = function() {
     var e;
@@ -466,15 +466,15 @@ var je = function(s) {
       if (r._throwIfClosed(), !r.isStopped) {
         r.currentObservers || (r.currentObservers = Array.from(r.observers));
         try {
-          for (var o = Q(r.currentObservers), c = o.next(); !c.done; c = o.next()) {
-            var a = c.value;
-            a.next(e);
+          for (var o = Q(r.currentObservers), a = o.next(); !a.done; a = o.next()) {
+            var c = a.value;
+            c.next(e);
           }
-        } catch (u) {
-          n = { error: u };
+        } catch (l) {
+          n = { error: l };
         } finally {
           try {
-            c && !c.done && (i = o.return) && i.call(o);
+            a && !a.done && (i = o.return) && i.call(o);
           } finally {
             if (n)
               throw n.error;
@@ -514,9 +514,9 @@ var je = function(s) {
   }, t.prototype._subscribe = function(e) {
     return this._throwIfClosed(), this._checkFinalizedStatuses(e), this._innerSubscribe(e);
   }, t.prototype._innerSubscribe = function(e) {
-    var r = this, n = this, i = n.hasError, o = n.isStopped, c = n.observers;
-    return i || o ? ve : (this.currentObservers = null, c.push(e), new x(function() {
-      r.currentObservers = null, D(c, e);
+    var r = this, n = this, i = n.hasError, o = n.isStopped, a = n.observers;
+    return i || o ? ve : (this.currentObservers = null, a.push(e), new x(function() {
+      r.currentObservers = null, D(a, e);
     }));
   }, t.prototype._checkFinalizedStatuses = function(e) {
     var r = this, n = r.hasError, i = r.thrownError, o = r.isStopped;
@@ -696,19 +696,19 @@ function et(s, t, e) {
   return r ? Ee(function(n, i) {
     var o;
     (o = r.subscribe) === null || o === void 0 || o.call(r);
-    var c = !0;
-    n.subscribe(Me(i, function(a) {
-      var u;
-      (u = r.next) === null || u === void 0 || u.call(r, a), i.next(a);
+    var a = !0;
+    n.subscribe(Me(i, function(c) {
+      var l;
+      (l = r.next) === null || l === void 0 || l.call(r, c), i.next(c);
     }, function() {
-      var a;
-      c = !1, (a = r.complete) === null || a === void 0 || a.call(r), i.complete();
-    }, function(a) {
-      var u;
-      c = !1, (u = r.error) === null || u === void 0 || u.call(r, a), i.error(a);
+      var c;
+      a = !1, (c = r.complete) === null || c === void 0 || c.call(r), i.complete();
+    }, function(c) {
+      var l;
+      a = !1, (l = r.error) === null || l === void 0 || l.call(r, c), i.error(c);
     }, function() {
-      var a, u;
-      c && ((a = r.unsubscribe) === null || a === void 0 || a.call(r)), (u = r.finalize) === null || u === void 0 || u.call(r);
+      var c, l;
+      a && ((c = r.unsubscribe) === null || c === void 0 || c.call(r)), (l = r.finalize) === null || l === void 0 || l.call(r);
     }));
   }) : Ce;
 }
@@ -718,7 +718,7 @@ class d extends Error {
     super(`Incorrect context (${t}). Cannot perform the requested operation.`), I(this, "context"), this.context = t;
   }
 }
-class y extends Error {
+class m extends Error {
   constructor(t, e, r) {
     super(`Invalid parameter (${t}). ${r}`), this.param = t, this.value = e, this.reason = r;
   }
@@ -735,12 +735,12 @@ class st extends Error {
     super(`Invalid version format: ${t}`);
   }
 }
-class ue extends Error {
+class le extends Error {
   constructor(t) {
     super(`${t} needs to be initialized before it can be used.`);
   }
 }
-class le extends Error {
+class ue extends Error {
   constructor(t, e) {
     let r = `Unsupported Protocol ${Array.isArray(t) ? "versions" : "version"}: (${t}).`;
     e && (r += ` Minimum version supported is ${e}.`), super(r), this.version = t;
@@ -802,8 +802,8 @@ function J(s, t) {
   try {
     for (; (t === void 0 || t-- > 0) && !(n = r.next()).done; )
       i.push(n.value);
-  } catch (c) {
-    o = { error: c };
+  } catch (a) {
+    o = { error: a };
   } finally {
     try {
       n && !n.done && (e = r.return) && e.call(r);
@@ -853,15 +853,15 @@ var te = function() {
       if (o)
         if (this._parentage = null, Array.isArray(o))
           try {
-            for (var c = he(o), a = c.next(); !a.done; a = c.next()) {
-              var u = a.value;
-              u.remove(this);
+            for (var a = he(o), c = a.next(); !c.done; c = a.next()) {
+              var l = c.value;
+              l.remove(this);
             }
           } catch (v) {
             t = { error: v };
           } finally {
             try {
-              a && !a.done && (e = c.return) && e.call(c);
+              c && !c.done && (e = a.return) && e.call(a);
             } finally {
               if (t)
                 throw t.error;
@@ -876,11 +876,11 @@ var te = function() {
         } catch (v) {
           i = v instanceof j ? v.errors : [v];
         }
-      var l = this._finalizers;
-      if (l) {
+      var u = this._finalizers;
+      if (u) {
         this._finalizers = null;
         try {
-          for (var b = he(l), p = b.next(); !p.done; p = b.next()) {
+          for (var b = he(u), p = b.next(); !p.done; p = b.next()) {
             var F = p.value;
             try {
               pe(F);
@@ -997,11 +997,11 @@ var re = function(s) {
       this.unsubscribe();
     }
   }, t;
-}(te), ut = Function.prototype.bind;
+}(te), lt = Function.prototype.bind;
 function q(s, t) {
-  return ut.call(s, t);
+  return lt.call(s, t);
 }
-var lt = function() {
+var ut = function() {
   function s(t) {
     this.partialObserver = t;
   }
@@ -1043,16 +1043,16 @@ var lt = function() {
         complete: n ?? void 0
       };
     else {
-      var c;
-      i && Te.useDeprecatedNextContext ? (c = Object.create(e), c.unsubscribe = function() {
+      var a;
+      i && Te.useDeprecatedNextContext ? (a = Object.create(e), a.unsubscribe = function() {
         return i.unsubscribe();
       }, o = {
-        next: e.next && q(e.next, c),
-        error: e.error && q(e.error, c),
-        complete: e.complete && q(e.complete, c)
+        next: e.next && q(e.next, a),
+        error: e.error && q(e.error, a),
+        complete: e.complete && q(e.complete, a)
       }) : o = e;
     }
-    return i.destination = new lt(o), i;
+    return i.destination = new ut(o), i;
   }
   return t;
 }(re);
@@ -1088,10 +1088,10 @@ var gt = function() {
     var e = new s();
     return e.source = this, e.operator = t, e;
   }, s.prototype.subscribe = function(t, e, r) {
-    var n = this, i = yt(t) ? t : new K(t, e, r);
+    var n = this, i = mt(t) ? t : new K(t, e, r);
     return at(function() {
-      var o = n, c = o.operator, a = o.source;
-      i.add(c ? c.call(i, a) : a ? n._subscribe(i) : n._trySubscribe(i));
+      var o = n, a = o.operator, c = o.source;
+      i.add(a ? a.call(i, c) : c ? n._subscribe(i) : n._trySubscribe(i));
     }), i;
   }, s.prototype._trySubscribe = function(t) {
     try {
@@ -1103,11 +1103,11 @@ var gt = function() {
     var r = this;
     return e = ge(e), new e(function(n, i) {
       var o = new K({
-        next: function(c) {
+        next: function(a) {
           try {
-            t(c);
-          } catch (a) {
-            i(a), o.unsubscribe();
+            t(a);
+          } catch (c) {
+            i(c), o.unsubscribe();
           }
         },
         error: i,
@@ -1144,42 +1144,42 @@ function ge(s) {
   var t;
   return (t = s ?? Te.Promise) !== null && t !== void 0 ? t : Promise;
 }
-function mt(s) {
+function yt(s) {
   return s && E(s.next) && E(s.error) && E(s.complete);
 }
-function yt(s) {
-  return s && s instanceof re || mt(s) && Ue(s);
+function mt(s) {
+  return s && s instanceof re || yt(s) && Ue(s);
 }
 function P(s, t, e, r, n) {
   return new vt(s, t, e, r, n);
 }
 var vt = function(s) {
   ee(t, s);
-  function t(e, r, n, i, o, c) {
-    var a = s.call(this, e) || this;
-    return a.onFinalize = o, a.shouldUnsubscribe = c, a._next = r ? function(u) {
+  function t(e, r, n, i, o, a) {
+    var c = s.call(this, e) || this;
+    return c.onFinalize = o, c.shouldUnsubscribe = a, c._next = r ? function(l) {
       try {
-        r(u);
+        r(l);
       } catch (h) {
         e.error(h);
       }
-    } : s.prototype._next, a._error = i ? function(u) {
+    } : s.prototype._next, c._error = i ? function(l) {
       try {
-        i(u);
+        i(l);
       } catch (h) {
         e.error(h);
       } finally {
         this.unsubscribe();
       }
-    } : s.prototype._error, a._complete = n ? function() {
+    } : s.prototype._error, c._complete = n ? function() {
       try {
         n();
-      } catch (u) {
-        e.error(u);
+      } catch (l) {
+        e.error(l);
       } finally {
         this.unsubscribe();
       }
-    } : s.prototype._complete, a;
+    } : s.prototype._complete, c;
   }
   return t.prototype.unsubscribe = function() {
     var e;
@@ -1210,7 +1210,7 @@ function w(s) {
     }));
   });
 }
-function m(s, t) {
+function y(s, t) {
   return R(function(e, r) {
     var n = 0;
     e.subscribe(P(r, function(i) {
@@ -1232,19 +1232,19 @@ function g(s, t, e) {
   return r ? R(function(n, i) {
     var o;
     (o = r.subscribe) === null || o === void 0 || o.call(r);
-    var c = !0;
-    n.subscribe(P(i, function(a) {
-      var u;
-      (u = r.next) === null || u === void 0 || u.call(r, a), i.next(a);
+    var a = !0;
+    n.subscribe(P(i, function(c) {
+      var l;
+      (l = r.next) === null || l === void 0 || l.call(r, c), i.next(c);
     }, function() {
-      var a;
-      c = !1, (a = r.complete) === null || a === void 0 || a.call(r), i.complete();
-    }, function(a) {
-      var u;
-      c = !1, (u = r.error) === null || u === void 0 || u.call(r, a), i.error(a);
+      var c;
+      a = !1, (c = r.complete) === null || c === void 0 || c.call(r), i.complete();
+    }, function(c) {
+      var l;
+      a = !1, (l = r.error) === null || l === void 0 || l.call(r, c), i.error(c);
     }, function() {
-      var a, u;
-      c && ((a = r.unsubscribe) === null || a === void 0 || a.call(r)), (u = r.finalize) === null || u === void 0 || u.call(r);
+      var c, l;
+      a && ((c = r.unsubscribe) === null || c === void 0 || c.call(r)), (l = r.finalize) === null || l === void 0 || l.call(r);
     }));
   }) : xe;
 }
@@ -1257,18 +1257,18 @@ function Ct(s) {
   }
   throw new st(s);
 }
-function me(s) {
+function ye(s) {
   const t = Ct(s), [e, r] = t.split("."), [n, i] = [parseInt(e), parseInt(r)];
   return [n, i];
 }
 function Re(s, t) {
-  const [e, r] = me(s), [n, i] = me(t);
+  const [e, r] = ye(s), [n, i] = ye(t);
   return e < n ? -1 : e > n ? 1 : r < i ? -1 : r > i ? 1 : 0;
 }
 function Et(s, t) {
   return Re(s, t) >= 0;
 }
-const ye = "2.0";
+const me = "2.0";
 class Mt {
   /**
    * Create a new instance of the {@link IpcHelper | IPC Protocol Helper}.
@@ -1280,8 +1280,8 @@ class Mt {
    * @param logService - An instance of a logging service or utility
    */
   constructor(t, e) {
-    if (I(this, "negotiatedProtocolVersion"), I(this, "currentContext"), I(this, "incomingMessages$"), I(this, "inIframe", !1), I(this, "embeddedResult"), I(this, "iframePort1"), I(this, "iframePort2"), this.supportedVersions = t, this.logService = e, this.incomingMessages$ = new Ie(), this.supportedVersions = t.filter((r) => Et(r, ye)), !this.supportedVersions.length)
-      throw new le(t, ye);
+    if (I(this, "negotiatedProtocolVersion"), I(this, "currentContext"), I(this, "incomingMessages$"), I(this, "inIframe", !1), I(this, "embeddedResult"), I(this, "iframePort1"), I(this, "iframePort2"), this.supportedVersions = t, this.logService = e, this.incomingMessages$ = new Ie(), this.supportedVersions = t.filter((r) => Et(r, me)), !this.supportedVersions.length)
+      throw new ue(t, me);
     this.negotiatedProtocolVersion = this.supportedVersions[0], this.embeddedResult = null, this.iframePort2 = null;
   }
   get parent() {
@@ -1303,11 +1303,11 @@ class Mt {
     var t, e, r, n;
     if (this.inIframe) {
       if (!this.iframePort2)
-        throw new ue("port2");
+        throw new le("port2");
       return this.iframePort2;
     } else {
       if (!((e = (t = window.Acrobits) == null ? void 0 : t.messageChannel) != null && e.port2))
-        throw new ue("port2");
+        throw new le("port2");
       return (n = (r = window.Acrobits) == null ? void 0 : r.messageChannel) == null ? void 0 : n.port2;
     }
   }
@@ -1334,12 +1334,12 @@ class Mt {
     const t = "HELLO", e = this.createMessage(t);
     e.protocolVersions = this.supportedVersions, this.logCreated(t, e);
     const r = this.incomingMessages$.pipe(
-      m((n) => n.type === t && n.replyTo === e.id),
+      y((n) => n.type === t && n.replyTo === e.id),
       f((n) => n),
       g(this.logReceived()),
       f((n) => {
         if (!this.supportedVersions.includes(n.protocolVersion))
-          throw new le(n.protocolVersion, this.supportedVersions[0]);
+          throw new ue(n.protocolVersion, this.supportedVersions[0]);
         return n.displayName || (n.displayName = n.cloudUsername), n;
       }),
       g((n) => {
@@ -1366,7 +1366,7 @@ class Mt {
     const t = "TOKEN", e = this.createMessage(t);
     this.logCreated(t, e);
     const r = this.incomingMessages$.pipe(
-      m((n) => n.type === t && n.replyTo === e.id),
+      y((n) => n.type === t && n.replyTo === e.id),
       f((n) => n),
       g(this.logReceived()),
       w(1)
@@ -1395,11 +1395,11 @@ class Mt {
       displayName: n,
       jwtToken: i,
       serverUrl: o,
-      region: c,
-      joinMicMuted: a,
-      joinWithoutCamera: u
-    } = t, h = "JOINING ROOM", l = this.createMessage(h, !1);
-    l.roomName = e, l.jwtToken = i, l.serverUrl = o, l.region = c, l.roomInvite = r, l.joinMicMuted = a ?? !1, l.joinWithoutCamera = u ?? !1, l.displayName = n, this.logCreated(h, l), this.port2.postMessage(l), this.logSent(h, l);
+      region: a,
+      joinMicMuted: c,
+      joinWithoutCamera: l
+    } = t, h = "JOINING ROOM", u = this.createMessage(h, !1);
+    u.roomName = e, u.jwtToken = i, u.serverUrl = o, u.region = a, u.roomInvite = r, u.joinMicMuted = c ?? !1, u.joinWithoutCamera = l ?? !1, u.displayName = n, this.logCreated(h, u), this.port2.postMessage(u), this.logSent(h, u);
   }
   /**
    * Sends a {@link LeavingRoomMessage} lifecycle message to the Host app.
@@ -1449,7 +1449,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "JOIN ROOM";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived()),
       f((e) => e)
@@ -1485,7 +1485,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "LEAVE ROOM";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived()),
       f((e) => e)
@@ -1522,7 +1522,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "CONFIG";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived()),
       f((e) => ({
@@ -1546,7 +1546,7 @@ class Mt {
     const e = "SCREENSHARE SOURCE", r = this.createMessage(e);
     r.sourceTypes = t, this.logCreated(e, r);
     const n = this.incomingMessages$.pipe(
-      m((i) => i.type === e && i.replyTo === r.id),
+      y((i) => i.type === e && i.replyTo === r.id),
       f((i) => i),
       g(this.logReceived()),
       f((i) => i),
@@ -1560,10 +1560,10 @@ class Mt {
     const n = "LAYOUT CHANGE";
     let i, o;
     if (e && r ? (i = this.createMessage(n, !1, r), i.result = e) : (i = this.createMessage(n), o = this.incomingMessages$.pipe(
-      m((c) => c.type === n && c.replyTo === i.id),
-      f((c) => c),
+      y((a) => a.type === n && a.replyTo === i.id),
+      f((a) => a),
       g(this.logReceived()),
-      f((c) => c),
+      f((a) => a),
       w(1)
     ), this.logService.debug(`Created ${n} Reply handler`)), i.layout = t, this.logCreated(n, i), this.port2.postMessage(i), this.logSent(n, i), o)
       return o;
@@ -1604,7 +1604,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "LAYOUT CHANGE";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client" && e.replyTo === null),
+      y((e) => e.type === t && e.target === "client" && e.replyTo === null),
       f((e) => e),
       g(this.logReceived()),
       f((e) => e)
@@ -1617,7 +1617,7 @@ class Mt {
     const e = "OAUTH TOKEN", r = this.createMessage(e);
     r.providerTypes = t, this.logCreated(e, r);
     const n = this.incomingMessages$.pipe(
-      m((i) => i.type === e && i.replyTo === r.id),
+      y((i) => i.type === e && i.replyTo === r.id),
       f((i) => i),
       g(this.logReceived()),
       w(1)
@@ -1635,13 +1635,13 @@ class Mt {
       throw new d(this.currentContext);
     if (this.negotiatedProtocolVersion === "2.0") {
       if (e === void 0 || typeof e == "object")
-        throw new y(
+        throw new m(
           "streamType",
           e,
           "streamType is missing or invalid"
         );
       if (r === void 0 || typeof r == "object" || typeof r == "number")
-        throw new y(
+        throw new m(
           "contactType",
           r,
           "contactType is missing or invalid"
@@ -1654,9 +1654,9 @@ class Mt {
       );
     }
     if (typeof e < "u" && typeof e != "object")
-      throw new y("options", e, "options is invalid");
+      throw new m("options", e, "options is invalid");
     if (typeof r < "u" && !Array.isArray(r))
-      throw new y(
+      throw new m(
         "currentContacts",
         r,
         "currentContacts is invalid"
@@ -1666,120 +1666,148 @@ class Mt {
   selectContactsV2_0(t, e, r, n) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
-    n && n.length > 0 && (n = n.map((a) => a.type === "cloudUsername" && a.contactUser ? {
-      ...a,
-      cloudId: a.cloudId || a.contactUser.cloudId,
-      networkId: a.networkId || a.contactUser.networkId,
-      cloudUsername: a.cloudUsername || a.contactUser.cloudUsername
-    } : a));
+    n && n.length > 0 && (n = n.map((c) => c.type === "cloudUsername" && c.contactUser ? {
+      ...c,
+      cloudId: c.cloudId || c.contactUser.cloudId,
+      networkId: c.networkId || c.contactUser.networkId,
+      cloudUsername: c.cloudUsername || c.contactUser.cloudUsername
+    } : c));
     const i = "SELECT CONTACTS", o = this.createMessage(i, !0);
     o.streamId = t, o.streamType = e, o.contactType = r, o.resultTypes = [r], o.currentContacts = n, this.logCreated(i, o);
-    const c = this.incomingMessages$.pipe(
-      m((a) => a.type === i && a.replyTo === o.id),
+    const a = this.incomingMessages$.pipe(
+      y((c) => c.type === i && c.replyTo === o.id),
       g(this.logReceived()),
-      f((a) => {
-        const u = a;
-        if (u.result === "success") {
-          if (u.streamId !== t)
-            throw new ae(u.streamId, t);
-          e === "direct" && u.contacts.length > 1 && (u.contacts = [u.contacts[0]]);
+      f((c) => {
+        const l = c;
+        if (l.result === "success") {
+          if (l.streamId !== t)
+            throw new ae(l.streamId, t);
+          e === "direct" && l.contacts.length > 1 && (l.contacts = [l.contacts[0]]);
         }
-        return u;
+        return l;
       }),
       w(1)
     );
-    return this.logService.debug(`Created ${i} Reply handler`), this.port2.postMessage(o), this.logSent(i, o), c;
+    return this.logService.debug(`Created ${i} Reply handler`), this.port2.postMessage(o), this.logSent(i, o), a;
   }
   selectContactsV2_1(t, e, r) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
     const n = {
       allowMultipleSelection: (e == null ? void 0 : e.allowMultipleSelection) ?? !1,
+      filterToSelectedType: (e == null ? void 0 : e.filterToSelectedType) ?? !1,
       resultTypes: (e == null ? void 0 : e.resultTypes) ?? ["cloudUsername"],
       streamName: e == null ? void 0 : e.streamName
     };
+    if (n.filterToSelectedType) {
+      if (!n.allowMultipleSelection)
+        throw new m(
+          "filterToSelectedType",
+          n.filterToSelectedType,
+          "filterToSelectedType can only be set when allowMultipleSelection is true"
+        );
+      if (n.resultTypes.length === 1 && this.logService.warn(
+        "[IPC] [SelectContacts] filterToSelectedType is redundant when resultTypes contains only one type"
+      ), r && r.length > 0) {
+        const c = r[0].type;
+        if (r.some((l) => l.type !== c))
+          throw new m(
+            "currentContacts",
+            r,
+            "When filterToSelectedType is true, all items in currentContacts must be of the same type"
+          );
+      }
+    }
     if (r && r.length > 0)
-      for (const a of r) {
-        if (a.contactId === void 0)
-          throw new y(
+      for (const c of r) {
+        if (c.contactId === void 0)
+          throw new m(
             "currentContacts",
             r,
             "ContactItem contactId is required since v2.1 on all contacts"
           );
-        if (a.type === "cloudUsername") {
-          if (!a.contactUser)
-            throw new y(
+        if (c.type === "cloudUsername") {
+          if (!c.contactUser)
+            throw new m(
               "currentContacts",
-              a,
+              c,
               "CloudUsername contact must include contactUser since v2.1"
             );
-          if (!a.contactUser.cloudId || !a.contactUser.networkId || !a.contactUser.cloudUsername)
-            throw new y(
+          if (!c.contactUser.cloudId || !c.contactUser.networkId || !c.contactUser.cloudUsername)
+            throw new m(
               "currentContacts",
-              a,
+              c,
               "CloudContact must define cloudUsername, cloudId, and networkId since v2.1"
             );
         }
       }
     const i = "SELECT CONTACTS", o = this.createMessage(i, !0);
-    o.streamId = t, o.streamName = n.streamName, o.resultTypes = n.resultTypes, o.currentContacts = r, o.allowMultipleSelection = n.allowMultipleSelection, this.logCreated(i, o);
-    const c = this.incomingMessages$.pipe(
-      m((a) => a.type === i && a.replyTo === o.id),
+    o.streamId = t, o.streamName = n.streamName, o.resultTypes = n.resultTypes, o.currentContacts = r, o.allowMultipleSelection = n.allowMultipleSelection, o.filterToSelectedType = n.filterToSelectedType, this.logCreated(i, o);
+    const a = this.incomingMessages$.pipe(
+      y((c) => c.type === i && c.replyTo === o.id),
       g(this.logReceived()),
-      f((a) => {
-        const u = a;
-        if (u.result === "success") {
-          if (u.streamId !== t)
-            throw new ae(u.streamId, t);
-          const h = u.contacts.length;
-          u.contacts = u.contacts.filter(
-            (l) => n.resultTypes.includes(l.type)
-          ), u.contacts.length !== h && this.logService.debug(
-            `[IPC] [SelectContactsReply] Filtered ${h - u.contacts.length} contacts from reply`
-          ), !n.allowMultipleSelection && u.contacts.length > 1 && (u.contacts = [u.contacts[0]]);
-          for (const l of u.contacts) {
-            if (l.type === "cloudUsername") {
-              if (!l.contactUser)
+      f((c) => {
+        const l = c;
+        if (l.result === "success") {
+          if (l.streamId !== t)
+            throw new ae(l.streamId, t);
+          const h = l.contacts.length;
+          if (l.contacts = l.contacts.filter(
+            (u) => n.resultTypes.includes(u.type)
+          ), l.contacts.length !== h && this.logService.debug(
+            `[IPC] [SelectContactsReply] Filtered ${h - l.contacts.length} contacts from reply`
+          ), !n.allowMultipleSelection && l.contacts.length > 1 && (l.contacts = [l.contacts[0]]), n.filterToSelectedType && l.contacts.length > 1) {
+            const u = l.contacts[0].type;
+            if (l.contacts.some(
+              (b) => b.type !== u
+            ))
+              throw new Error(
+                `When filterToSelectedType is true, all contacts in the reply must be of the same type. Expected all contacts to be of type '${u}', but received mixed types.`
+              );
+          }
+          for (const u of l.contacts) {
+            if (u.type === "cloudUsername") {
+              if (!u.contactUser)
                 throw new Error(
                   `CloudUsername contact must include contactUser since v2.1. ContactItem: ${JSON.stringify(
-                    l
+                    u
                   )}`
                 );
-              if (!l.contactUser.cloudId || !l.contactUser.networkId || !l.contactUser.cloudUsername)
+              if (!u.contactUser.cloudId || !u.contactUser.networkId || !u.contactUser.cloudUsername)
                 throw new Error(
                   `CloudContact must define cloudUsername, cloudId, and networkId since v2.1. ContactItem: ${JSON.stringify(
-                    l
+                    u
                   )}`
                 );
             }
-            this.negotiatedProtocolVersion === "2.2" && (l.type === "number" && l.numbers.length > 1 ? l.numbers = [l.numbers[0]] : l.type === "email" && l.emails.length > 1 && (l.emails = [l.emails[0]]));
+            this.negotiatedProtocolVersion === "2.2" && (u.type === "number" && u.numbers.length > 1 ? u.numbers = [u.numbers[0]] : u.type === "email" && u.emails.length > 1 && (u.emails = [u.emails[0]]));
           }
         }
-        return u;
+        return l;
       }),
       w(1)
     );
-    return this.logService.debug(`Created ${i} Reply handler`), this.port2.postMessage(o), this.logSent(i, o), c;
+    return this.logService.debug(`Created ${i} Reply handler`), this.port2.postMessage(o), this.logSent(i, o), a;
   }
   matchContacts(t) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
     if (!Array.isArray(t))
-      throw new y("contacts", t, "contacts is not an array");
+      throw new m("contacts", t, "contacts is not an array");
     if (!t.length)
-      throw new y("contacts", t, "At least one contact is required");
+      throw new m("contacts", t, "At least one contact is required");
     const e = this.createMessage("MATCH CONTACTS");
     if (this.compareVersion("2.1") >= 0) {
       for (const n of t)
         if (n.type === "cloudUsername") {
           if (!n.contactUser)
-            throw new y(
+            throw new m(
               "contacts",
               n,
               "CloudUsername contact must include contactUser"
             );
           if (!n.contactUser.cloudUsername || !n.contactUser.cloudId || !n.contactUser.networkId)
-            throw new y(
+            throw new m(
               "contacts",
               n,
               "CloudContact must define cloudUsername, cloudId, and networkId"
@@ -1793,7 +1821,7 @@ class Mt {
     }
     this.logCreated(e.type, e);
     const r = this.incomingMessages$.pipe(
-      m((n) => n.type === e.type && n.replyTo === e.id),
+      y((n) => n.type === e.type && n.replyTo === e.id),
       g(this.logReceived()),
       f((n) => {
         const i = n;
@@ -1802,29 +1830,29 @@ class Mt {
             throw new Error(
               "MatchContactsMessageReply should return a Record<string, DetailedContactItem> of contacts when using IPC Protocol v2.1+"
             );
-          for (const [o, c] of Object.entries(i.contacts)) {
-            if (c == null) {
+          for (const [o, a] of Object.entries(i.contacts)) {
+            if (a == null) {
               this.logService.debug(
                 `[IPC] [MatchContactsReply] Received null or undefined contact for ${o}`
               );
               continue;
             }
-            if (c.contactId === void 0)
+            if (a.contactId === void 0)
               throw new Error(
                 `ContactItem 'contactId' is required since v2.1. ContactItem: ${JSON.stringify(
-                  c
+                  a
                 )}`
               );
-            if (!c.contactUser && (!c.uri || c.uri.length === 0) && (!c.numbers || c.numbers.length === 0))
+            if (!a.contactUser && (!a.uri || a.uri.length === 0) && (!a.numbers || a.numbers.length === 0))
               throw new Error(
                 `DetailedContactItem must define at least one contact method (contactUser, uri, or numbers). ContactItem: ${JSON.stringify(
-                  c
+                  a
                 )}`
               );
-            if (c.contactUser && (!c.contactUser.cloudId || !c.contactUser.networkId || !c.contactUser.cloudUsername))
+            if (a.contactUser && (!a.contactUser.cloudId || !a.contactUser.networkId || !a.contactUser.cloudUsername))
               throw new Error(
                 `When contactUser is defined, cloudId, networkId, and cloudUsername must also be defined. ContactItem: ${JSON.stringify(
-                  c
+                  a
                 )}`
               );
           }
@@ -1838,14 +1866,14 @@ class Mt {
               "The number of contacts in the reply does not match the number of contacts in the request"
             );
           for (const o of i.contacts) {
-            const c = o;
-            if (c.type === "cloudUsername" && !("cloudUsername" in c))
+            const a = o;
+            if (a.type === "cloudUsername" && !("cloudUsername" in a))
               throw new Error(
                 `CloudUsernameDetailedContactItem must define cloudUsername. ContactItem: ${JSON.stringify(
                   o
                 )}`
               );
-            if (c.type === "uri" && (!("uri" in c) || !Array.isArray(c.uri)))
+            if (a.type === "uri" && (!("uri" in a) || !Array.isArray(a.uri)))
               throw new Error(
                 `UriDetailedContactItem must define uri as an array. ContactItem: ${JSON.stringify(
                   o
@@ -1890,7 +1918,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "PUSH MESSAGE";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived())
     );
@@ -1910,7 +1938,7 @@ class Mt {
     const t = "PUSH TOKEN", e = this.createMessage(t);
     this.logCreated(t, e);
     const r = this.incomingMessages$.pipe(
-      m((n) => n.type === t && n.replyTo === e.id),
+      y((n) => n.type === t && n.replyTo === e.id),
       g(this.logReceived()),
       f((n) => n),
       w(1)
@@ -1949,7 +1977,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "PUSH TOKEN";
     return this.incomingMessages$.pipe(
-      m(
+      y(
         (e) => e.type === t && e.target === "client" && e.replyTo === null && e.expectReply === !1
       ),
       f((e) => {
@@ -1973,7 +2001,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "BADGE QUERY";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived())
     );
@@ -2031,7 +2059,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "LIFECYCLE";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived())
     );
@@ -2071,7 +2099,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "REQUEST LOGS";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived())
     );
@@ -2089,8 +2117,8 @@ class Mt {
   sendRequestLogsMessageReply(t, e, r, n, i) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
-    const o = "REQUEST LOGS", c = this.createMessage(o, !1, i);
-    c.fileId = t, c.fileHash = e, c.fileSize = r, c.format = n, this.logCreated(o, c), this.port2.postMessage(c), this.logSent(o, c);
+    const o = "REQUEST LOGS", a = this.createMessage(o, !1, i);
+    a.fileId = t, a.fileHash = e, a.fileSize = r, a.format = n, this.logCreated(o, a), this.port2.postMessage(a), this.logSent(o, a);
   }
   /**
    * Send a {@link ViewTransitionMessage} to the `Host` app, notifying it of a view transition
@@ -2155,28 +2183,28 @@ class Mt {
   sendFileRequestMessage(t, e, r, n, i) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
-    const o = "FILE REQUEST", c = this.createMessage(o);
-    if (c.fileId = t, c.fileHash = e.toLowerCase(), c.intent = r, c.maxChunkSizeInBytes = i, r === "attachment") {
+    const o = "FILE REQUEST", a = this.createMessage(o);
+    if (a.fileId = t, a.fileHash = e.toLowerCase(), a.intent = r, a.maxChunkSizeInBytes = i, r === "attachment") {
       if (!n)
-        throw new y(
+        throw new m(
           "streamId",
           n,
           "streamId is required for attachment intent"
         );
-      c.streamId = n;
+      a.streamId = n;
     }
-    this.logCreated(o, c);
-    let a = 0;
-    const u = this.incomingMessages$.pipe(
-      m(
-        (h) => h.type === o && h.replyTo === c.id
+    this.logCreated(o, a);
+    let c = 0;
+    const l = this.incomingMessages$.pipe(
+      y(
+        (h) => h.type === o && h.replyTo === a.id
       ),
       g(this.logReceived()),
-      g(() => a++),
+      g(() => c++),
       f((h) => (h.result === "success" && (h.chunkHash = h.chunkHash.toLowerCase(), h.fileHash = h.fileHash.toLowerCase()), h)),
-      wt((h) => h.result === "success" && a < h.totalChunks, !0)
+      wt((h) => h.result === "success" && c < h.totalChunks, !0)
     );
-    return this.port2.postMessage(c), this.logSent(o, c), u;
+    return this.port2.postMessage(a), this.logSent(o, a), l;
   }
   /**
    * Sends a {@link FileRequestMessageReply} to the Host app, to reply to a
@@ -2223,7 +2251,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "FILE REQUEST";
     return this.incomingMessages$.pipe(
-      m(
+      y(
         (e) => e.type === t && e.target === "client" && e.replyTo === null
       ),
       f((e) => (e.fileHash = e.fileHash.toLowerCase(), e)),
@@ -2255,35 +2283,35 @@ class Mt {
   sendFileSelectionMessage(t = "attachment", e, r, n, i, o) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
-    const c = "FILE SELECTION", a = this.createMessage(c);
-    if (a.intent = t, a.maxCount = n, a.maxFileSizeInBytes = i, a.mimeTypes = o, t === "attachment") {
+    const a = "FILE SELECTION", c = this.createMessage(a);
+    if (c.intent = t, c.maxCount = n, c.maxFileSizeInBytes = i, c.mimeTypes = o, t === "attachment") {
       if (!e)
-        throw new y(
+        throw new m(
           "streamId",
           e,
           "streamId is required for attachment intent"
         );
       if (!r)
-        throw new y(
+        throw new m(
           "correlationId",
           r,
           "correlationId is required for attachment intent"
         );
-      a.streamId = e, a.correlationId = r;
+      c.streamId = e, c.correlationId = r;
     }
-    this.logCreated(c, a);
-    const u = this.incomingMessages$.pipe(
-      m(
-        (h) => h.type === c && h.replyTo === a.id
+    this.logCreated(a, c);
+    const l = this.incomingMessages$.pipe(
+      y(
+        (h) => h.type === a && h.replyTo === c.id
       ),
       f((h) => {
-        var l;
-        return h.result === "success" && (h.files = (l = h.files) == null ? void 0 : l.map((b) => (b.original.fileHash = b.original.fileHash.toLowerCase(), b.preview && (b.preview.fileHash = b.preview.fileHash.toLowerCase()), b))), h;
+        var u;
+        return h.result === "success" && (h.files = (u = h.files) == null ? void 0 : u.map((b) => (b.original.fileHash = b.original.fileHash.toLowerCase(), b.preview && (b.preview.fileHash = b.preview.fileHash.toLowerCase()), b))), h;
       }),
       g(this.logReceived()),
       w(1)
     );
-    return this.port2.postMessage(a), this.logSent(c, a), u;
+    return this.port2.postMessage(c), this.logSent(a, c), l;
   }
   /**
    * Sends a {@link FileDownloadProgressQueryMessage} to the Host app, to query the progress of a
@@ -2313,11 +2341,11 @@ class Mt {
     );
     i.fileHash = t.toLowerCase(), i.url = e, i.correlationId = r, this.logCreated(n, i);
     const o = this.incomingMessages$.pipe(
-      m(
-        (c) => c.type === "FILE DOWNLOAD PROGRESS UPDATE" && c.replyTo === i.id
+      y(
+        (a) => a.type === "FILE DOWNLOAD PROGRESS UPDATE" && a.replyTo === i.id
       ),
-      g((c) => this.logReceived(c)),
-      f((c) => (c.fileHash && (c.fileHash = c.fileHash.toLowerCase()), c)),
+      g((a) => this.logReceived(a)),
+      f((a) => (a.fileHash && (a.fileHash = a.fileHash.toLowerCase()), a)),
       w(1)
     );
     return this.port2.postMessage(i), this.logSent(n, i), o;
@@ -2334,7 +2362,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "FILE DOWNLOAD PROGRESS UPDATE";
     return this.incomingMessages$.pipe(
-      m(
+      y(
         (e) => e.type === t && e.target === "client" && e.replyTo === null
       ),
       f((e) => (e.fileHash && (e.fileHash = e.fileHash.toLowerCase()), e)),
@@ -2364,11 +2392,11 @@ class Mt {
     );
     i.fileHash = t.toLowerCase(), i.fileId = e, i.correlationId = r, this.logCreated(n, i);
     const o = this.incomingMessages$.pipe(
-      m(
-        (c) => c.type === "FILE UPLOAD PROGRESS UPDATE" && c.replyTo === i.id
+      y(
+        (a) => a.type === "FILE UPLOAD PROGRESS UPDATE" && a.replyTo === i.id
       ),
       g(this.logReceived()),
-      f((c) => (c.fileHash && (c.fileHash = c.fileHash.toLowerCase()), c)),
+      f((a) => (a.fileHash && (a.fileHash = a.fileHash.toLowerCase()), a)),
       w(1)
     );
     return this.port2.postMessage(i), this.logSent(n, i), o;
@@ -2389,7 +2417,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "FILE UPLOAD PROGRESS UPDATE";
     return this.incomingMessages$.pipe(
-      m(
+      y(
         (e) => e.type === t && e.target === "client" && e.replyTo === null
       ),
       f((e) => (e.fileHash && (e.fileHash = e.fileHash.toLowerCase()), e)),
@@ -2421,39 +2449,39 @@ class Mt {
    * @returns An observable which emits a {@link FileDownloadMessageReply} instance containing the
    * result of the request. Emits once.
    */
-  sendFileDownloadMessage(t, e, r, n, i, o, c, a, u) {
+  sendFileDownloadMessage(t, e, r, n, i, o, a, c, l) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
-    if (a && this.compareVersion("2.1") < 0)
-      a.type === "cloudUsername" && a.contactUser && (a = {
-        ...a,
-        cloudId: a.cloudId || a.contactUser.cloudId,
-        networkId: a.networkId || a.contactUser.networkId,
-        cloudUsername: a.cloudUsername || a.contactUser.cloudUsername
+    if (c && this.compareVersion("2.1") < 0)
+      c.type === "cloudUsername" && c.contactUser && (c = {
+        ...c,
+        cloudId: c.cloudId || c.contactUser.cloudId,
+        networkId: c.networkId || c.contactUser.networkId,
+        cloudUsername: c.cloudUsername || c.contactUser.cloudUsername
       });
-    else if (a && this.compareVersion("2.1") >= 0 && a.type === "cloudUsername") {
-      if (!a.contactUser)
-        throw new y(
+    else if (c && this.compareVersion("2.1") >= 0 && c.type === "cloudUsername") {
+      if (!c.contactUser)
+        throw new m(
           "sender",
-          a,
+          c,
           "CloudUsername contact must include contactUser since v2.1"
         );
-      if (!a.contactUser.cloudId || !a.contactUser.networkId || !a.contactUser.cloudUsername)
-        throw new y(
+      if (!c.contactUser.cloudId || !c.contactUser.networkId || !c.contactUser.cloudUsername)
+        throw new m(
           "sender",
-          a,
+          c,
           "CloudContact must define cloudUsername, cloudId, and networkId since v2.1"
         );
     }
-    const h = "FILE DOWNLOAD", l = this.createMessage(h, !0);
-    l.url = t, l.key = e, l.fileHash = r.toLowerCase(), l.mimeType = n, l.fileName = i, l.streamId = o, l.correlationId = c, l.sender = a, l.intent = u ?? "download", this.logCreated(h, l);
+    const h = "FILE DOWNLOAD", u = this.createMessage(h, !0);
+    u.url = t, u.key = e, u.fileHash = r.toLowerCase(), u.mimeType = n, u.fileName = i, u.streamId = o, u.correlationId = a, u.sender = c, u.intent = l ?? "download", this.logCreated(h, u);
     const b = this.incomingMessages$.pipe(
-      m((p) => p.type === h && p.replyTo === l.id),
+      y((p) => p.type === h && p.replyTo === u.id),
       g(this.logReceived()),
       f((p) => p),
       w(1)
     );
-    return this.port2.postMessage(l), this.logSent(h, l), b;
+    return this.port2.postMessage(u), this.logSent(h, u), b;
   }
   /**
    * Sends a {@link CancelFileDownloadMessage} to the Host app, to cancel downloading of a file
@@ -2490,7 +2518,7 @@ class Mt {
     const r = "FILE REMOVE", n = this.createMessage(r, !0);
     n.hash = t.toLowerCase(), n.streamId = e, this.logCreated(r, n);
     const i = this.incomingMessages$.pipe(
-      m((o) => o.type === r && o.replyTo === n.id),
+      y((o) => o.type === r && o.replyTo === n.id),
       g(this.logReceived()),
       f((o) => o),
       w(1)
@@ -2558,13 +2586,13 @@ class Mt {
    * @returns An observable which emits a {@link SendMessageMessageReply} instance containing the
    * result of the request. Emits once.
    */
-  sendSendMessageMessage(t, e, r, n = "TEXT", i, o, c, a = !0, u) {
+  sendSendMessageMessage(t, e, r, n = "TEXT", i, o, a, c = !0, l) {
     if (!this.isEmbedded())
       throw new d(this.currentContext);
-    const h = "SEND MESSAGE", l = this.createMessage(h, !0);
-    if (l.streamId = t, l.correlationId = e, l.body = r, l.messageType = n, i && i.length > 0)
+    const h = "SEND MESSAGE", u = this.createMessage(h, !0);
+    if (u.streamId = t, u.correlationId = e, u.body = r, u.messageType = n, i && i.length > 0)
       if (this.compareVersion("2.1") < 0)
-        l.mentions = i.map((p) => p.contactUser ? {
+        u.mentions = i.map((p) => p.contactUser ? {
           ...p,
           cloudId: p.cloudId || p.contactUser.cloudId,
           networkId: p.networkId || p.contactUser.networkId,
@@ -2573,30 +2601,30 @@ class Mt {
       else {
         for (const p of i) {
           if (p.type === "cloudUsername" && !p.contactUser)
-            throw new y(
+            throw new m(
               "mentions",
               p,
               "CloudUsername mention must include contactUser"
             );
           if (p.contactUser && (!p.contactUser.cloudId || !p.contactUser.networkId || !p.contactUser.cloudUsername))
-            throw new y(
+            throw new m(
               "mentions",
               p,
               "CloudContact must define cloudUsername, cloudId, and networkId"
             );
         }
-        l.mentions = i;
+        u.mentions = i;
       }
     else
-      l.mentions = [];
-    l.attachments = (o == null ? void 0 : o.map((p) => p.toLowerCase())) ?? [], l.relatedMessageId = c, l.setCursors = a, l.threadId = u, this.logCreated(h, l);
+      u.mentions = [];
+    u.attachments = (o == null ? void 0 : o.map((p) => p.toLowerCase())) ?? [], u.relatedMessageId = a, u.setCursors = c, u.threadId = l, this.logCreated(h, u);
     const b = this.incomingMessages$.pipe(
-      m((p) => p.type === h && p.replyTo === l.id),
+      y((p) => p.type === h && p.replyTo === u.id),
       g(this.logReceived()),
       f((p) => p),
       w(1)
     );
-    return this.port2.postMessage(l), this.logSent(h, l), b;
+    return this.port2.postMessage(u), this.logSent(h, u), b;
   }
   /**
    * Sends a {@link CancelSendMessageMessage} to the Host app, to cancel a message that was being
@@ -2645,7 +2673,7 @@ class Mt {
     const r = "SEND MESSAGE STATUS QUERY", n = this.createMessage(r, !0);
     n.correlationId = t, n.streamId = e, this.logCreated(r, n);
     const i = this.incomingMessages$.pipe(
-      m(
+      y(
         (o) => o.type === "SEND MESSAGE STATUS UPDATE" && o.replyTo === n.id
       ),
       g(this.logReceived()),
@@ -2666,7 +2694,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "SEND MESSAGE STATUS UPDATE";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client" && e.replyTo === null),
+      y((e) => e.type === t && e.target === "client" && e.replyTo === null),
       f((e) => e),
       g(this.logReceived())
     );
@@ -2691,13 +2719,13 @@ class Mt {
       });
     else if (t.type === "cloudUsername") {
       if (!t.contactUser)
-        throw new y(
+        throw new m(
           "contact",
           t,
           "CloudUsername contact must include contactUser since v2.1"
         );
       if (!t.contactUser.cloudId || !t.contactUser.networkId || !t.contactUser.cloudUsername)
-        throw new y(
+        throw new m(
           "contact",
           t,
           "CloudContact must define cloudUsername, cloudId, and networkId since v2.1"
@@ -2760,7 +2788,7 @@ class Mt {
       throw new d(this.currentContext);
     const t = "BUTTONS";
     return this.incomingMessages$.pipe(
-      m((e) => e.type === t && e.target === "client"),
+      y((e) => e.type === t && e.target === "client"),
       f((e) => e),
       g(this.logReceived())
     );
@@ -2961,9 +2989,9 @@ class xt {
     let i;
     if (this.negotiatedVersion === "2.0") {
       if (typeof e != "string")
-        throw new y("mode", e, 'mode must be "single" or "multi"');
+        throw new m("mode", e, 'mode must be "single" or "multi"');
       if (n === "number")
-        throw new y(
+        throw new m(
           "contactType",
           n,
           'contactType cannot be "number" for version 2.0 of the IPC protocol'
@@ -2976,7 +3004,7 @@ class xt {
       );
     } else {
       if (typeof e != "object")
-        throw new y("options", e, "options must be an object");
+        throw new m("options", e, "options must be an object");
       i = this.selectContacts_V2_1(t, e);
     }
     return T(
@@ -2993,7 +3021,7 @@ class xt {
   selectContacts_V2_0(t, e, r, n) {
     if (this.logger.debug("Selecting Contacts: ", ...arguments), e === "multi") {
       if (!r || !Array.isArray(r))
-        throw new y(
+        throw new m(
           "currentContacts",
           r,
           "currentContacts is required for group streams"
@@ -3008,19 +3036,35 @@ class xt {
       return n || (n = "cloudUsername"), this.helper.selectContacts(t.toString(), "direct", n);
   }
   selectContacts_V2_1(t, e) {
-    if (this.logger.debug("Selecting Contacts: ", e), e.mode === "multi" && (!e.currentContacts || !Array.isArray(e.currentContacts)))
-      throw new y(
+    this.logger.debug("Selecting Contacts: ", e);
+    const r = t.toString(), n = e.resultTypes ?? ["cloudUsername"];
+    if (e.mode === "single")
+      return this.helper.selectContacts(r, {
+        allowMultipleSelection: !1,
+        resultTypes: n
+      });
+    if (!e.currentContacts || !Array.isArray(e.currentContacts))
+      throw new m(
         "currentContacts",
         e.currentContacts,
         "currentContacts is required for group streams"
       );
-    return this.helper.selectContacts(
-      t.toString(),
+    return e.filterToSelectedType ? this.helper.selectContacts(
+      r,
+      {
+        allowMultipleSelection: !0,
+        filterToSelectedType: !0,
+        resultTypes: n
+      },
+      e.currentContacts
+    ) : this.helper.selectContacts(
+      r,
       {
-        allowMultipleSelection: e.mode === "multi",
-        resultTypes: e.resultTypes ?? ["cloudUsername"]
+        allowMultipleSelection: !0,
+        filterToSelectedType: !1,
+        resultTypes: n
       },
-      e.mode === "multi" ? e.currentContacts : void 0
+      e.currentContacts
     );
   }
   /**