@aslaluroba/help-center-react 3.2.0 → 3.2.3

package/dist/index.js

@@ -6988,7 +6988,7 @@ var ably = {exports: {}};
       });
       return _withTimeoutAsync2.apply(this, arguments);
     }
-    var version = "2.13.0";
+    var version = "2.15.0";
 
     // src/common/lib/util/defaults.ts
     var agent = "ably-js/" + version;
@@ -7236,10 +7236,10 @@ var ably = {exports: {}};
     };
     function defaultGetHeaders(options) {
       var {
-        format = defaultHeadersOptions.format,
+        format,
         protocolVersion = defaultHeadersOptions.protocolVersion
       } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var accept = contentTypes[format];
+      var accept = contentTypes[format != null ? format : options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */];
       return {
         accept,
         "X-Ably-Version": protocolVersion.toString(),
@@ -7248,11 +7248,11 @@ var ably = {exports: {}};
     }
     function defaultPostHeaders(options) {
       var {
-        format = defaultHeadersOptions.format,
+        format,
         protocolVersion = defaultHeadersOptions.protocolVersion
       } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var contentType;
-      var accept = contentType = contentTypes[format];
+      var accept = contentTypes[format != null ? format : options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */];
+      var contentType = accept;
       return {
         accept,
         "content-type": contentType,
@@ -7576,7 +7576,9 @@ var ably = {exports: {}};
               tokenUri = function tokenUri(host) {
                 return client.baseUri(host) + path;
               };
-            var requestHeaders = defaults_default.defaultPostHeaders(_this3.client.options);
+            var requestHeaders = defaults_default.defaultPostHeaders(_this3.client.options, {
+              format: "json" /* json */
+            });
             if (resolvedAuthOptions.requestHeaders) _mixin(requestHeaders, resolvedAuthOptions.requestHeaders);
             logger_default.logAction(_this3.logger, logger_default.LOG_MICRO, "Auth.requestToken().requestToken", "Sending POST to " + path + "; Token params: " + JSON.stringify(signedTokenParams));
             _whenPromiseSettles(_this3.client.http.do(HttpMethods_default.Post, tokenUri, requestHeaders, JSON.stringify(signedTokenParams), null), (err, result) => err ? tokenCb(err) : tokenCb(result.error, result.body, result.unpacked));
@@ -9268,9 +9270,7 @@ var ably = {exports: {}};
         return _asyncToGenerator(function* () {
           var client = _this26.client;
           var format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultPostHeaders(client.options, {
-              format
-            }),
+            headers = defaults_default.defaultPostHeaders(client.options),
             params = {};
           var body = _mixin({
             recipient
@@ -9294,9 +9294,7 @@ var ably = {exports: {}};
           var client = _this27.client;
           var body = devicedetails_default.fromValues(device);
           var format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultPostHeaders(client.options, {
-              format
-            }),
+            headers = defaults_default.defaultPostHeaders(client.options),
             params = {};
           _mixin(headers, client.options.headers);
           if (client.options.pushFullWait) _mixin(params, {
@@ -9312,9 +9310,7 @@ var ably = {exports: {}};
         return _asyncToGenerator(function* () {
           var client = _this28.client,
             format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            }),
+            headers = defaults_default.defaultGetHeaders(client.options),
             deviceId = deviceIdOrDetails.id || deviceIdOrDetails;
           if (typeof deviceId !== "string" || !deviceId.length) {
             throw new _ErrorInfo2("First argument to DeviceRegistrations#get must be a deviceId string or DeviceDetails", 4e4, 400);
@@ -9330,9 +9326,7 @@ var ably = {exports: {}};
           var client = _this29.client,
             format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
             envelope = _this29.client.http.supportsLinkHeaders ? void 0 : format,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            });
+            headers = defaults_default.defaultGetHeaders(client.options);
           _mixin(headers, client.options.headers);
           return new paginatedresource_default(client, "/push/deviceRegistrations", headers, envelope, /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(function* (body, headers2, unpacked) {
@@ -9348,10 +9342,7 @@ var ably = {exports: {}};
         var _this30 = this;
         return _asyncToGenerator(function* () {
           var client = _this30.client,
-            format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            }),
+            headers = defaults_default.defaultGetHeaders(client.options),
             params = {},
             deviceId = deviceIdOrDetails.id || deviceIdOrDetails;
           if (typeof deviceId !== "string" || !deviceId.length) {
@@ -9392,9 +9383,7 @@ var ably = {exports: {}};
           var client = _this32.client;
           var body = pushchannelsubscription_default.fromValues(subscription);
           var format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultPostHeaders(client.options, {
-              format
-            }),
+            headers = defaults_default.defaultPostHeaders(client.options),
             params = {};
           _mixin(headers, client.options.headers);
           if (client.options.pushFullWait) _mixin(params, {
@@ -9411,9 +9400,7 @@ var ably = {exports: {}};
           var client = _this33.client,
             format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
             envelope = _this33.client.http.supportsLinkHeaders ? void 0 : format,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            });
+            headers = defaults_default.defaultGetHeaders(client.options);
           _mixin(headers, client.options.headers);
           return new paginatedresource_default(client, "/push/channelSubscriptions", headers, envelope, /*#__PURE__*/function () {
             var _ref4 = _asyncToGenerator(function* (body, headers2, unpacked) {
@@ -9446,9 +9433,7 @@ var ably = {exports: {}};
           var client = _this35.client,
             format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
             envelope = _this35.client.http.supportsLinkHeaders ? void 0 : format,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            });
+            headers = defaults_default.defaultGetHeaders(client.options);
           _mixin(headers, client.options.headers);
           if (client.options.pushFullWait) _mixin(params, {
             fullWait: "true"
@@ -9611,9 +9596,7 @@ var ably = {exports: {}};
           var client = _this38.channel.client,
             format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
             envelope = _this38.channel.client.http.supportsLinkHeaders ? void 0 : format,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            });
+            headers = defaults_default.defaultGetHeaders(client.options);
           _mixin(headers, client.options.headers);
           return new paginatedresource_default(client, _this38.channel.client.rest.presenceMixin.basePath(_this38), headers, envelope, /*#__PURE__*/function () {
             var _ref6 = _asyncToGenerator(function* (body, headers2, unpacked) {
@@ -9737,6 +9720,21 @@ var ably = {exports: {}};
         } else if (!this.annotations.summary) {
           this.annotations.summary = {};
         }
+        if (this.annotations && this.annotations.summary) {
+          for (var [type, summaryEntry] of Object.entries(this.annotations.summary)) {
+            if (type.endsWith(":distinct.v1") || type.endsWith(":unique.v1") || type.endsWith(":multiple.v1")) {
+              for (var [, entry] of Object.entries(summaryEntry)) {
+                if (!entry.clipped) {
+                  entry.clipped = false;
+                }
+              }
+            } else if (type.endsWith(":flag.v1")) {
+              if (!summaryEntry.clipped) {
+                summaryEntry.clipped = false;
+              }
+            }
+          }
+        }
       }
       encode(options) {
         var _this40 = this;
@@ -9886,9 +9884,7 @@ var ably = {exports: {}};
             options = client.options,
             format = options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
             idempotentRestPublishing = client.options.idempotentRestPublishing,
-            headers = defaults_default.defaultPostHeaders(client.options, {
-              format
-            });
+            headers = defaults_default.defaultPostHeaders(client.options);
           _mixin(headers, options.headers);
           if (idempotentRestPublishing && allEmptyIds(messages)) {
             var msgIdBase = yield _randomString(MSG_ID_ENTROPY_BYTES);
@@ -9917,6 +9913,38 @@ var ably = {exports: {}};
           return _this46.client.rest.channelMixin.status(_this46);
         })();
       }
+      getMessage(serialOrMessage) {
+        var _this47 = this;
+        return _asyncToGenerator(function* () {
+          logger_default.logAction(_this47.logger, logger_default.LOG_MICRO, "RestChannel.getMessage()", "channel = " + _this47.name);
+          return _this47.client.rest.channelMixin.getMessage(_this47, serialOrMessage);
+        })();
+      }
+      updateMessage(message, operation, params) {
+        var _this48 = this;
+        return _asyncToGenerator(function* () {
+          logger_default.logAction(_this48.logger, logger_default.LOG_MICRO, "RestChannel.updateMessage()", "channel = " + _this48.name);
+          return _this48.client.rest.channelMixin.updateDeleteMessage(_this48, {
+            isDelete: false
+          }, message, operation, params);
+        })();
+      }
+      deleteMessage(message, operation, params) {
+        var _this49 = this;
+        return _asyncToGenerator(function* () {
+          logger_default.logAction(_this49.logger, logger_default.LOG_MICRO, "RestChannel.deleteMessage()", "channel = " + _this49.name);
+          return _this49.client.rest.channelMixin.updateDeleteMessage(_this49, {
+            isDelete: true
+          }, message, operation, params);
+        })();
+      }
+      getMessageVersions(serialOrMessage, params) {
+        var _this50 = this;
+        return _asyncToGenerator(function* () {
+          logger_default.logAction(_this50.logger, logger_default.LOG_MICRO, "RestChannel.getMessageVersions()", "channel = " + _this50.name);
+          return _this50.client.rest.channelMixin.getMessageVersions(_this50, serialOrMessage, params);
+        })();
+      }
     };
     var restchannel_default = RestChannel;
 
@@ -9945,9 +9973,7 @@ var ably = {exports: {}};
         var client = channel.client,
           format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
           envelope = channel.client.http.supportsLinkHeaders ? void 0 : format,
-          headers = defaults_default.defaultGetHeaders(client.options, {
-            format
-          });
+          headers = defaults_default.defaultGetHeaders(client.options);
         _mixin(headers, client.options.headers);
         return new paginatedresource_default(client, this.basePath(channel) + "/messages", headers, envelope, /*#__PURE__*/function () {
           var _ref7 = _asyncToGenerator(function* (body, headers2, unpacked) {
@@ -9960,16 +9986,81 @@ var ably = {exports: {}};
         }()).get(params);
       }
       static status(channel) {
-        var _this47 = this;
+        var _this51 = this;
         return _asyncToGenerator(function* () {
           var format = channel.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */;
-          var headers = defaults_default.defaultPostHeaders(channel.client.options, {
-            format
-          });
-          var response = yield resource_default.get(channel.client, _this47.basePath(channel), headers, {}, format, true);
+          var headers = defaults_default.defaultPostHeaders(channel.client.options);
+          var response = yield resource_default.get(channel.client, _this51.basePath(channel), headers, {}, format, true);
           return response.body;
         })();
       }
+      static getMessage(channel, serialOrMessage) {
+        var _this52 = this;
+        return _asyncToGenerator(function* () {
+          var serial = typeof serialOrMessage === "string" ? serialOrMessage : serialOrMessage.serial;
+          if (!serial) {
+            throw new _ErrorInfo2('This message lacks a serial. Make sure you have enabled "Message annotations, updates, and deletes" in channel settings on your dashboard.', 40003, 400);
+          }
+          var client = channel.client;
+          var format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */;
+          var headers = defaults_default.defaultGetHeaders(client.options);
+          _mixin(headers, client.options.headers);
+          var {
+            body,
+            unpacked
+          } = yield resource_default.get(client, _this52.basePath(channel) + "/messages/" + encodeURIComponent(serial), headers, {}, null, true);
+          var decoded = unpacked ? body : _decodeBody(body, client._MsgPack, format);
+          return _fromEncoded2(decoded, channel);
+        })();
+      }
+      static updateDeleteMessage(channel, opts, message, operation, params) {
+        var _this53 = this;
+        return _asyncToGenerator(function* () {
+          if (!message.serial) {
+            throw new _ErrorInfo2('This message lacks a serial and cannot be updated. Make sure you have enabled "Message annotations, updates, and deletes" in channel settings on your dashboard.', 40003, 400);
+          }
+          var client = channel.client;
+          var format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */;
+          var headers = defaults_default.defaultPostHeaders(client.options);
+          _mixin(headers, client.options.headers);
+          var encoded = null;
+          if (message.data !== void 0) {
+            encoded = yield message_default.fromValues(message).encode(channel.channelOptions);
+          }
+          var req = {
+            serial: message.serial,
+            operation,
+            name: message.name,
+            data: encoded && encoded.data,
+            encoding: encoded && encoded.encoding,
+            extras: message.extras
+          };
+          var requestBody = serialize(req, client._MsgPack, format);
+          var method = opts.isDelete ? resource_default.post : resource_default.patch;
+          var pathSuffix = opts.isDelete ? "/delete" : "";
+          yield method(client, _this53.basePath(channel) + "/messages/" + encodeURIComponent(message.serial) + pathSuffix, requestBody, headers, params || {}, null, true);
+        })();
+      }
+      static getMessageVersions(channel, serialOrMessage, params) {
+        var serial = typeof serialOrMessage === "string" ? serialOrMessage : serialOrMessage.serial;
+        if (!serial) {
+          throw new _ErrorInfo2('This message lacks a serial. Make sure you have enabled "Message annotations, updates, and deletes" in channel settings on your dashboard.', 40003, 400);
+        }
+        var client = channel.client;
+        var format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */;
+        var envelope = channel.client.http.supportsLinkHeaders ? void 0 : format;
+        var headers = defaults_default.defaultGetHeaders(client.options);
+        _mixin(headers, client.options.headers);
+        return new paginatedresource_default(client, this.basePath(channel) + "/messages/" + encodeURIComponent(serial) + "/versions", headers, envelope, /*#__PURE__*/function () {
+          var _ref8 = _asyncToGenerator(function* (body, headers2, unpacked) {
+            var decoded = unpacked ? body : _decodeBody(body, client._MsgPack, format);
+            return _fromEncodedArray2(decoded, channel);
+          });
+          return function (_x62, _x63, _x64) {
+            return _ref8.apply(this, arguments);
+          };
+        }()).get(params || {});
+      }
     };
 
     // src/common/lib/client/restpresencemixin.ts
@@ -9978,22 +10069,20 @@ var ably = {exports: {}};
         return RestChannelMixin.basePath(presence.channel) + "/presence";
       }
       static history(presence, params) {
-        var _this48 = this;
+        var _this54 = this;
         return _asyncToGenerator(function* () {
           var client = presence.channel.client,
             format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
             envelope = presence.channel.client.http.supportsLinkHeaders ? void 0 : format,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            });
+            headers = defaults_default.defaultGetHeaders(client.options);
           _mixin(headers, client.options.headers);
-          return new paginatedresource_default(client, _this48.basePath(presence) + "/history", headers, envelope, /*#__PURE__*/function () {
-            var _ref8 = _asyncToGenerator(function* (body, headers2, unpacked) {
+          return new paginatedresource_default(client, _this54.basePath(presence) + "/history", headers, envelope, /*#__PURE__*/function () {
+            var _ref9 = _asyncToGenerator(function* (body, headers2, unpacked) {
               var decoded = unpacked ? body : _decodeBody(body, client._MsgPack, format);
               return _fromEncodedArray(decoded, presence.channel);
             });
-            return function (_x62, _x63, _x64) {
-              return _ref8.apply(this, arguments);
+            return function (_x65, _x66, _x67) {
+              return _ref9.apply(this, arguments);
             };
           }()).get(params);
         })();
@@ -10015,32 +10104,39 @@ var ably = {exports: {}};
         this.push = new push_default(this.client);
       }
       stats(params) {
-        var _this49 = this;
+        var _this55 = this;
         return _asyncToGenerator(function* () {
-          var headers = defaults_default.defaultGetHeaders(_this49.client.options),
-            format = _this49.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            envelope = _this49.client.http.supportsLinkHeaders ? void 0 : format;
-          _mixin(headers, _this49.client.options.headers);
-          return new paginatedresource_default(_this49.client, "/stats", headers, envelope, function (body, headers2, unpacked) {
-            var statsValues = unpacked ? body : JSON.parse(body);
-            for (var i = 0; i < statsValues.length; i++) statsValues[i] = stats_default.fromValues(statsValues[i]);
-            return statsValues;
-          }).get(params);
+          var headers = defaults_default.defaultGetHeaders(_this55.client.options),
+            format = _this55.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
+            envelope = _this55.client.http.supportsLinkHeaders ? void 0 : format;
+          _mixin(headers, _this55.client.options.headers);
+          return new paginatedresource_default(_this55.client, "/stats", headers, envelope, /*#__PURE__*/function () {
+            var _ref0 = _asyncToGenerator(function* (body, _, unpacked) {
+              var statsValues = unpacked ? body : _decodeBody(body, _this55.client._MsgPack, format);
+              for (var i = 0; i < statsValues.length; i++) statsValues[i] = stats_default.fromValues(statsValues[i]);
+              return statsValues;
+            });
+            return function (_x68, _x69, _x70) {
+              return _ref0.apply(this, arguments);
+            };
+          }()).get(params);
         })();
       }
       time(params) {
-        var _this50 = this;
+        var _this56 = this;
         return _asyncToGenerator(function* () {
-          var headers = defaults_default.defaultGetHeaders(_this50.client.options);
-          if (_this50.client.options.headers) _mixin(headers, _this50.client.options.headers);
+          var headers = defaults_default.defaultGetHeaders(_this56.client.options, {
+            format: "json" /* json */
+          });
+          if (_this56.client.options.headers) _mixin(headers, _this56.client.options.headers);
           var timeUri = host => {
-            return _this50.client.baseUri(host) + "/time";
+            return _this56.client.baseUri(host) + "/time";
           };
           var {
             error,
             body,
             unpacked
-          } = yield _this50.client.http.do(HttpMethods_default.Get, timeUri, headers, null, params);
+          } = yield _this56.client.http.do(HttpMethods_default.Get, timeUri, headers, null, params);
           if (error) {
             throw error;
           }
@@ -10049,47 +10145,47 @@ var ably = {exports: {}};
           if (!time) {
             throw new _ErrorInfo2("Internal error (unexpected result type from GET /time)", 5e4, 500);
           }
-          _this50.client.serverTimeOffset = time - Date.now();
+          _this56.client.serverTimeOffset = time - Date.now();
           return time;
         })();
       }
       request(method, path, version2, params, body, customHeaders) {
-        var _this51 = this;
+        var _this57 = this;
         return _asyncToGenerator(function* () {
           var _a2;
           var [encoder, decoder, format] = (() => {
-            if (_this51.client.options.useBinaryProtocol) {
-              if (!_this51.client._MsgPack) {
+            if (_this57.client.options.useBinaryProtocol) {
+              if (!_this57.client._MsgPack) {
                 _throwMissingPluginError("MsgPack");
               }
-              return [_this51.client._MsgPack.encode, _this51.client._MsgPack.decode, "msgpack" /* msgpack */];
+              return [_this57.client._MsgPack.encode, _this57.client._MsgPack.decode, "msgpack" /* msgpack */];
             } else {
               return [JSON.stringify, JSON.parse, "json" /* json */];
             }
           })();
-          var envelope = _this51.client.http.supportsLinkHeaders ? void 0 : format;
+          var envelope = _this57.client.http.supportsLinkHeaders ? void 0 : format;
           params = params || {};
           var _method = method.toLowerCase();
-          var headers = _method == "get" ? defaults_default.defaultGetHeaders(_this51.client.options, {
+          var headers = _method == "get" ? defaults_default.defaultGetHeaders(_this57.client.options, {
             format,
             protocolVersion: version2
-          }) : defaults_default.defaultPostHeaders(_this51.client.options, {
+          }) : defaults_default.defaultPostHeaders(_this57.client.options, {
             format,
             protocolVersion: version2
           });
           if (typeof body !== "string") {
             body = (_a2 = encoder(body)) != null ? _a2 : null;
           }
-          _mixin(headers, _this51.client.options.headers);
+          _mixin(headers, _this57.client.options.headers);
           if (customHeaders) {
             _mixin(headers, customHeaders);
           }
-          var paginatedResource = new paginatedresource_default(_this51.client, path, headers, envelope, /*#__PURE__*/function () {
-            var _ref9 = _asyncToGenerator(function* (resbody, headers2, unpacked) {
+          var paginatedResource = new paginatedresource_default(_this57.client, path, headers, envelope, /*#__PURE__*/function () {
+            var _ref1 = _asyncToGenerator(function* (resbody, headers2, unpacked) {
               return _ensureArray(unpacked ? resbody : decoder(resbody));
             });
-            return function (_x65, _x66, _x67) {
-              return _ref9.apply(this, arguments);
+            return function (_x71, _x72, _x73) {
+              return _ref1.apply(this, arguments);
             };
           }(), /* useHttpPaginatedResponse: */
           true);
@@ -10104,7 +10200,7 @@ var ably = {exports: {}};
         })();
       }
       batchPublish(specOrSpecs) {
-        var _this52 = this;
+        var _this58 = this;
         return _asyncToGenerator(function* () {
           var requestBodyDTO;
           var singleSpecMode;
@@ -10115,14 +10211,12 @@ var ably = {exports: {}};
             requestBodyDTO = [specOrSpecs];
             singleSpecMode = true;
           }
-          var format = _this52.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultPostHeaders(_this52.client.options, {
-              format
-            });
-          if (_this52.client.options.headers) _mixin(headers, _this52.client.options.headers);
-          var requestBody = _encodeBody(requestBodyDTO, _this52.client._MsgPack, format);
-          var response = yield resource_default.post(_this52.client, "/messages", requestBody, headers, {}, null, true);
-          var batchResults = response.unpacked ? response.body : _decodeBody(response.body, _this52.client._MsgPack, format);
+          var format = _this58.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
+            headers = defaults_default.defaultPostHeaders(_this58.client.options);
+          if (_this58.client.options.headers) _mixin(headers, _this58.client.options.headers);
+          var requestBody = _encodeBody(requestBodyDTO, _this58.client._MsgPack, format);
+          var response = yield resource_default.post(_this58.client, "/messages", requestBody, headers, {}, null, true);
+          var batchResults = response.unpacked ? response.body : _decodeBody(response.body, _this58.client._MsgPack, format);
           if (singleSpecMode) {
             return batchResults[0];
           } else {
@@ -10131,39 +10225,35 @@ var ably = {exports: {}};
         })();
       }
       batchPresence(channels) {
-        var _this53 = this;
+        var _this59 = this;
         return _asyncToGenerator(function* () {
-          var format = _this53.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultPostHeaders(_this53.client.options, {
-              format
-            });
-          if (_this53.client.options.headers) _mixin(headers, _this53.client.options.headers);
+          var format = _this59.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
+            headers = defaults_default.defaultGetHeaders(_this59.client.options);
+          if (_this59.client.options.headers) _mixin(headers, _this59.client.options.headers);
           var channelsParam = channels.join(",");
-          var response = yield resource_default.get(_this53.client, "/presence", headers, {
+          var response = yield resource_default.get(_this59.client, "/presence", headers, {
             channels: channelsParam
           }, null, true);
-          return response.unpacked ? response.body : _decodeBody(response.body, _this53.client._MsgPack, format);
+          return response.unpacked ? response.body : _decodeBody(response.body, _this59.client._MsgPack, format);
         })();
       }
       revokeTokens(specifiers, options) {
-        var _this54 = this;
+        var _this60 = this;
         return _asyncToGenerator(function* () {
-          if (useTokenAuth(_this54.client.options)) {
+          if (useTokenAuth(_this60.client.options)) {
             throw new _ErrorInfo2("Cannot revoke tokens when using token auth", 40162, 401);
           }
-          var keyName = _this54.client.options.keyName;
+          var keyName = _this60.client.options.keyName;
           var resolvedOptions = options != null ? options : {};
           var requestBodyDTO = __spreadValues({
             targets: specifiers.map(specifier => "".concat(specifier.type, ":").concat(specifier.value))
           }, resolvedOptions);
-          var format = _this54.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultPostHeaders(_this54.client.options, {
-              format
-            });
-          if (_this54.client.options.headers) _mixin(headers, _this54.client.options.headers);
-          var requestBody = _encodeBody(requestBodyDTO, _this54.client._MsgPack, format);
-          var response = yield resource_default.post(_this54.client, "/keys/".concat(keyName, "/revokeTokens"), requestBody, headers, {}, null, true);
-          return response.unpacked ? response.body : _decodeBody(response.body, _this54.client._MsgPack, format);
+          var format = _this60.client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
+            headers = defaults_default.defaultPostHeaders(_this60.client.options);
+          if (_this60.client.options.headers) _mixin(headers, _this60.client.options.headers);
+          var requestBody = _encodeBody(requestBodyDTO, _this60.client._MsgPack, format);
+          var response = yield resource_default.post(_this60.client, "/keys/".concat(keyName, "/revokeTokens"), requestBody, headers, {}, null, true);
+          return response.unpacked ? response.body : _decodeBody(response.body, _this60.client._MsgPack, format);
         })();
       }
     };
@@ -10247,7 +10337,7 @@ var ably = {exports: {}};
 
     // src/common/lib/types/annotation.ts
     var actions4 = ["annotation.create", "annotation.delete"];
-    function fromEncoded3(_x68, _x69, _x70) {
+    function fromEncoded3(_x74, _x75, _x76) {
       return _fromEncoded8.apply(this, arguments);
     }
     function _fromEncoded8() {
@@ -10257,7 +10347,7 @@ var ably = {exports: {}};
       });
       return _fromEncoded8.apply(this, arguments);
     }
-    function fromEncodedArray3(_x71, _x72, _x73) {
+    function fromEncodedArray3(_x77, _x78, _x79) {
       return _fromEncodedArray8.apply(this, arguments);
     }
     function _fromEncodedArray8() {
@@ -10268,7 +10358,7 @@ var ably = {exports: {}};
       });
       return _fromEncodedArray8.apply(this, arguments);
     }
-    function _fromEncoded3(_x74, _x75) {
+    function _fromEncoded3(_x80, _x81) {
       return _fromEncoded9.apply(this, arguments);
     }
     function _fromEncoded9() {
@@ -10277,7 +10367,7 @@ var ably = {exports: {}};
       });
       return _fromEncoded9.apply(this, arguments);
     }
-    function _fromEncodedArray3(_x76, _x77) {
+    function _fromEncodedArray3(_x82, _x83) {
       return _fromEncodedArray9.apply(this, arguments);
     }
     function _fromEncodedArray9() {
@@ -10290,10 +10380,10 @@ var ably = {exports: {}};
     }
     var Annotation = class _Annotation extends BaseMessage {
       encode() {
-        var _this55 = this;
+        var _this61 = this;
         return _asyncToGenerator(function* () {
-          var res = Object.assign(new WireAnnotation(), _this55, {
-            action: actions4.indexOf(_this55.action || "annotation.create")
+          var res = Object.assign(new WireAnnotation(), _this61, {
+            action: actions4.indexOf(_this61.action || "annotation.create")
           });
           return encode(res, {});
         })();
@@ -10322,10 +10412,10 @@ var ably = {exports: {}};
         return values.map(v => _WireAnnotation.fromValues(v));
       }
       decode(channelOptions, logger) {
-        var _this56 = this;
+        var _this62 = this;
         return _asyncToGenerator(function* () {
-          var res = Object.assign(new Annotation(), __spreadProps(__spreadValues({}, _this56), {
-            action: actions4[_this56.action]
+          var res = Object.assign(new Annotation(), __spreadProps(__spreadValues({}, _this62), {
+            action: actions4[_this62.action]
           }));
           try {
             yield decode(res, channelOptions);
@@ -10394,47 +10484,43 @@ var ably = {exports: {}};
         this.channel = channel;
       }
       publish(msgOrSerial, annotationValues) {
-        var _this57 = this;
+        var _this63 = this;
         return _asyncToGenerator(function* () {
           var annotation = constructValidateAnnotation(msgOrSerial, annotationValues);
           var wireAnnotation = yield annotation.encode();
-          var client = _this57.channel.client,
+          var client = _this63.channel.client,
             options = client.options,
             format = options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
-            headers = defaults_default.defaultPostHeaders(client.options, {
-              format
-            }),
+            headers = defaults_default.defaultPostHeaders(client.options),
             params = {};
           _mixin(headers, client.options.headers);
           var requestBody = _encodeBody([wireAnnotation], client._MsgPack, format);
-          yield resource_default.post(client, basePathForSerial(_this57.channel, annotation.messageSerial), requestBody, headers, params, null, true);
+          yield resource_default.post(client, basePathForSerial(_this63.channel, annotation.messageSerial), requestBody, headers, params, null, true);
         })();
       }
       delete(msgOrSerial, annotationValues) {
-        var _this58 = this;
+        var _this64 = this;
         return _asyncToGenerator(function* () {
           annotationValues.action = "annotation.delete";
-          return _this58.publish(msgOrSerial, annotationValues);
+          return _this64.publish(msgOrSerial, annotationValues);
         })();
       }
       get(msgOrSerial, params) {
-        var _this59 = this;
+        var _this65 = this;
         return _asyncToGenerator(function* () {
-          var client = _this59.channel.client,
+          var client = _this65.channel.client,
             messageSerial = serialFromMsgOrSerial(msgOrSerial),
             format = client.options.useBinaryProtocol ? "msgpack" /* msgpack */ : "json" /* json */,
             envelope = client.http.supportsLinkHeaders ? void 0 : format,
-            headers = defaults_default.defaultGetHeaders(client.options, {
-              format
-            });
+            headers = defaults_default.defaultGetHeaders(client.options);
           _mixin(headers, client.options.headers);
-          return new paginatedresource_default(client, basePathForSerial(_this59.channel, messageSerial), headers, envelope, /*#__PURE__*/function () {
-            var _ref0 = _asyncToGenerator(function* (body, _, unpacked) {
+          return new paginatedresource_default(client, basePathForSerial(_this65.channel, messageSerial), headers, envelope, /*#__PURE__*/function () {
+            var _ref10 = _asyncToGenerator(function* (body, _, unpacked) {
               var decoded = unpacked ? body : _decodeBody(body, client._MsgPack, format);
-              return _fromEncodedArray3(decoded, _this59.channel);
+              return _fromEncodedArray3(decoded, _this65.channel);
             });
-            return function (_x78, _x79, _x80) {
-              return _ref0.apply(this, arguments);
+            return function (_x84, _x85, _x86) {
+              return _ref10.apply(this, arguments);
             };
           }()).get(params);
         })();
@@ -10605,7 +10691,7 @@ var ably = {exports: {}};
         this._mode = 0;
         this.retryCount = 0;
         this.history = /*#__PURE__*/function () {
-          var _ref1 = _asyncToGenerator(function* (params) {
+          var _ref11 = _asyncToGenerator(function* (params) {
             logger_default.logAction(this.logger, logger_default.LOG_MICRO, "RealtimeChannel.history()", "channel = " + this.name);
             var restMixin = this.client.rest.channelMixin;
             if (params && params.untilAttach) {
@@ -10620,8 +10706,8 @@ var ably = {exports: {}};
             }
             return restMixin.history(this, params);
           });
-          return function (_x81) {
-            return _ref1.apply(this, arguments);
+          return function (_x87) {
+            return _ref11.apply(this, arguments);
           };
         }();
         this.whenState = state => {
@@ -10700,20 +10786,20 @@ var ably = {exports: {}};
         return args;
       }
       setOptions(options) {
-        var _this60 = this;
+        var _this66 = this;
         return _asyncToGenerator(function* () {
           var _a2;
-          var previousChannelOptions = _this60.channelOptions;
+          var previousChannelOptions = _this66.channelOptions;
           var err = validateChannelOptions(options);
           if (err) {
             throw err;
           }
-          _this60.channelOptions = normaliseChannelOptions((_a2 = _this60.client._Crypto) != null ? _a2 : null, _this60.logger, options);
-          if (_this60._decodingContext) _this60._decodingContext.channelOptions = _this60.channelOptions;
-          if (_this60._shouldReattachToSetOptions(options, previousChannelOptions)) {
-            _this60.attachImpl();
+          _this66.channelOptions = normaliseChannelOptions((_a2 = _this66.client._Crypto) != null ? _a2 : null, _this66.logger, options);
+          if (_this66._decodingContext) _this66._decodingContext.channelOptions = _this66.channelOptions;
+          if (_this66._shouldReattachToSetOptions(options, previousChannelOptions)) {
+            _this66.attachImpl();
             return new Promise((resolve, reject) => {
-              _this60._allChannelChanges.once(["attached", "update", "detached", "failed"], function (stateChange) {
+              _this66._allChannelChanges.once(["attached", "update", "detached", "failed"], function (stateChange) {
                 switch (this.event) {
                   case "update":
                   case "attached":
@@ -10750,7 +10836,7 @@ var ably = {exports: {}};
       }
       publish() {
         var _arguments2 = arguments,
-          _this61 = this;
+          _this67 = this;
         return _asyncToGenerator(function* () {
           var messages;
           var argCount = _arguments2.length;
@@ -10768,20 +10854,20 @@ var ably = {exports: {}};
               data: _arguments2.length <= 1 ? undefined : _arguments2[1]
             })];
           }
-          var maxMessageSize = _this61.client.options.maxMessageSize;
-          var wireMessages = yield encodeArray(messages, _this61.channelOptions);
+          var maxMessageSize = _this67.client.options.maxMessageSize;
+          var wireMessages = yield encodeArray(messages, _this67.channelOptions);
           var size = getMessagesSize(wireMessages);
           if (size > maxMessageSize) {
             throw new _ErrorInfo2("Maximum size of messages that can be published at once exceeded (was ".concat(size, " bytes; limit is ").concat(maxMessageSize, " bytes)"), 40009, 400);
           }
-          _this61.throwIfUnpublishableState();
-          logger_default.logAction(_this61.logger, logger_default.LOG_MICRO, "RealtimeChannel.publish()", "sending message; channel state is " + _this61.state + ", message count = " + wireMessages.length);
+          _this67.throwIfUnpublishableState();
+          logger_default.logAction(_this67.logger, logger_default.LOG_MICRO, "RealtimeChannel.publish()", "sending message; channel state is " + _this67.state + ", message count = " + wireMessages.length);
           var pm = fromValues({
             action: actions.MESSAGE,
-            channel: _this61.name,
+            channel: _this67.name,
             messages: wireMessages
           });
-          return _this61.sendMessage(pm);
+          return _this67.sendMessage(pm);
         })();
       }
       throwIfUnpublishableState() {
@@ -10801,13 +10887,13 @@ var ably = {exports: {}};
         }
       }
       attach() {
-        var _this62 = this;
+        var _this68 = this;
         return _asyncToGenerator(function* () {
-          if (_this62.state === "attached") {
+          if (_this68.state === "attached") {
             return null;
           }
           return new Promise((resolve, reject) => {
-            _this62._attach(false, null, (err, result) => err ? reject(err) : resolve(result));
+            _this68._attach(false, null, (err, result) => err ? reject(err) : resolve(result));
           });
         })();
       }
@@ -10865,25 +10951,25 @@ var ably = {exports: {}};
         this.sendMessage(attachMsg).catch(noop);
       }
       detach() {
-        var _this63 = this;
+        var _this69 = this;
         return _asyncToGenerator(function* () {
-          var connectionManager = _this63.connectionManager;
+          var connectionManager = _this69.connectionManager;
           if (!connectionManager.activeState()) {
             throw connectionManager.getError();
           }
-          switch (_this63.state) {
+          switch (_this69.state) {
             case "suspended":
-              _this63.notifyState("detached");
+              _this69.notifyState("detached");
               return;
             case "detached":
               return;
             case "failed":
               throw new _ErrorInfo2("Unable to detach; channel state = failed", 90001, 400);
             default:
-              _this63.requestState("detaching");
+              _this69.requestState("detaching");
             case "detaching":
               return new Promise((resolve, reject) => {
-                _this63.once(function (stateChange) {
+                _this69.once(function (stateChange) {
                   switch (this.event) {
                     case "detached":
                       resolve();
@@ -10912,22 +10998,22 @@ var ably = {exports: {}};
       }
       subscribe() {
         var _arguments3 = arguments,
-          _this64 = this;
+          _this70 = this;
         return _asyncToGenerator(function* () {
           for (var _len0 = _arguments3.length, args = new Array(_len0), _key0 = 0; _key0 < _len0; _key0++) {
             args[_key0] = _arguments3[_key0];
           }
           var [event, listener] = _RealtimeChannel.processListenerArgs(args);
-          if (_this64.state === "failed") {
-            throw _ErrorInfo2.fromValues(_this64.invalidStateError());
+          if (_this70.state === "failed") {
+            throw _ErrorInfo2.fromValues(_this70.invalidStateError());
           }
           if (event && typeof event === "object" && !Array.isArray(event)) {
-            _this64.client._FilteredSubscriptions.subscribeFilter(_this64, event, listener);
+            _this70.client._FilteredSubscriptions.subscribeFilter(_this70, event, listener);
           } else {
-            _this64.subscriptions.on(event, listener);
+            _this70.subscriptions.on(event, listener);
           }
-          if (_this64.channelOptions.attachOnSubscribe !== false) {
-            return _this64.attach();
+          if (_this70.channelOptions.attachOnSubscribe !== false) {
+            return _this70.attach();
           } else {
             return null;
           }
@@ -10966,10 +11052,10 @@ var ably = {exports: {}};
         connectionManager.send(syncMessage);
       }
       sendMessage(msg) {
-        var _this65 = this;
+        var _this71 = this;
         return _asyncToGenerator(function* () {
           return new Promise((resolve, reject) => {
-            _this65.connectionManager.send(msg, _this65.client.options.queueMessages, err => {
+            _this71.connectionManager.send(msg, _this71.client.options.queueMessages, err => {
               if (err) {
                 reject(err);
               } else {
@@ -10980,14 +11066,14 @@ var ably = {exports: {}};
         })();
       }
       sendPresence(presence) {
-        var _this66 = this;
+        var _this72 = this;
         return _asyncToGenerator(function* () {
           var msg = fromValues({
             action: actions.PRESENCE,
-            channel: _this66.name,
+            channel: _this72.name,
             presence
           });
-          return _this66.sendMessage(msg);
+          return _this72.sendMessage(msg);
         })();
       }
       sendState(objectMessages) {
@@ -11000,61 +11086,61 @@ var ably = {exports: {}};
       }
       // Access to this method is synchronised by ConnectionManager#processChannelMessage, in order to synchronise access to the state stored in _decodingContext.
       processMessage(message) {
-        var _this67 = this;
+        var _this73 = this;
         return _asyncToGenerator(function* () {
           if (message.action === actions.ATTACHED || message.action === actions.MESSAGE || message.action === actions.PRESENCE || message.action === actions.OBJECT || message.action === actions.ANNOTATION) {
-            _this67.setChannelSerial(message.channelSerial);
+            _this73.setChannelSerial(message.channelSerial);
           }
           var syncChannelSerial,
             isSync = false;
           switch (message.action) {
             case actions.ATTACHED:
               {
-                _this67.properties.attachSerial = message.channelSerial;
-                _this67._mode = message.getMode();
-                _this67.params = message.params || {};
+                _this73.properties.attachSerial = message.channelSerial;
+                _this73._mode = message.getMode();
+                _this73.params = message.params || {};
                 var modesFromFlags = message.decodeModesFromFlags();
-                _this67.modes = modesFromFlags && _allToLowerCase(modesFromFlags) || void 0;
+                _this73.modes = modesFromFlags && _allToLowerCase(modesFromFlags) || void 0;
                 var resumed = message.hasFlag("RESUMED");
                 var hasPresence = message.hasFlag("HAS_PRESENCE");
                 var hasBacklog = message.hasFlag("HAS_BACKLOG");
                 var hasObjects = message.hasFlag("HAS_OBJECTS");
-                if (_this67.state === "attached") {
+                if (_this73.state === "attached") {
                   if (!resumed) {
-                    if (_this67._presence) {
-                      _this67._presence.onAttached(hasPresence);
+                    if (_this73._presence) {
+                      _this73._presence.onAttached(hasPresence);
                     }
-                    if (_this67._objects) {
-                      _this67._objects.onAttached(hasObjects);
+                    if (_this73._objects) {
+                      _this73._objects.onAttached(hasObjects);
                     }
                   }
-                  var change = new channelstatechange_default(_this67.state, _this67.state, resumed, hasBacklog, message.error);
-                  _this67._allChannelChanges.emit("update", change);
-                  if (!resumed || _this67.channelOptions.updateOnAttached) {
-                    _this67.emit("update", change);
+                  var change = new channelstatechange_default(_this73.state, _this73.state, resumed, hasBacklog, message.error);
+                  _this73._allChannelChanges.emit("update", change);
+                  if (!resumed || _this73.channelOptions.updateOnAttached) {
+                    _this73.emit("update", change);
                   }
-                } else if (_this67.state === "detaching") {
-                  _this67.checkPendingState();
+                } else if (_this73.state === "detaching") {
+                  _this73.checkPendingState();
                 } else {
-                  _this67.notifyState("attached", message.error, resumed, hasPresence, hasBacklog, hasObjects);
+                  _this73.notifyState("attached", message.error, resumed, hasPresence, hasBacklog, hasObjects);
                 }
                 break;
               }
             case actions.DETACHED:
               {
                 var detachErr = message.error ? _ErrorInfo2.fromValues(message.error) : new _ErrorInfo2("Channel detached", 90001, 404);
-                if (_this67.state === "detaching") {
-                  _this67.notifyState("detached", detachErr);
-                } else if (_this67.state === "attaching") {
-                  _this67.notifyState("suspended", detachErr);
-                } else if (_this67.state === "attached" || _this67.state === "suspended") {
-                  _this67.requestState("attaching", detachErr);
+                if (_this73.state === "detaching") {
+                  _this73.notifyState("detached", detachErr);
+                } else if (_this73.state === "attaching") {
+                  _this73.notifyState("suspended", detachErr);
+                } else if (_this73.state === "attached" || _this73.state === "suspended") {
+                  _this73.requestState("attaching", detachErr);
                 }
                 break;
               }
             case actions.SYNC:
               isSync = true;
-              syncChannelSerial = _this67.syncChannelSerial = message.channelSerial;
+              syncChannelSerial = _this73.syncChannelSerial = message.channelSerial;
               if (!message.presence) break;
             case actions.PRESENCE:
               {
@@ -11062,45 +11148,45 @@ var ably = {exports: {}};
                   break;
                 }
                 populateFieldsFromParent(message);
-                var options = _this67.channelOptions;
-                if (_this67._presence) {
+                var options = _this73.channelOptions;
+                if (_this73._presence) {
                   var presenceMessages = yield Promise.all(message.presence.map(wpm => {
-                    return wpm.decode(options, _this67.logger);
+                    return wpm.decode(options, _this73.logger);
                   }));
-                  _this67._presence.setPresence(presenceMessages, isSync, syncChannelSerial);
+                  _this73._presence.setPresence(presenceMessages, isSync, syncChannelSerial);
                 }
                 break;
               }
             case actions.OBJECT:
             case actions.OBJECT_SYNC:
               {
-                if (!_this67._objects || !message.state) {
+                if (!_this73._objects || !message.state) {
                   return;
                 }
                 populateFieldsFromParent(message);
-                var format = _this67.client.connection.connectionManager.getActiveTransportFormat();
-                var objectMessages = message.state.map(om => om.decode(_this67.client, format));
+                var format = _this73.client.connection.connectionManager.getActiveTransportFormat();
+                var objectMessages = message.state.map(om => om.decode(_this73.client, format));
                 if (message.action === actions.OBJECT) {
-                  _this67._objects.handleObjectMessages(objectMessages);
+                  _this73._objects.handleObjectMessages(objectMessages);
                 } else {
-                  _this67._objects.handleObjectSyncMessages(objectMessages, message.channelSerial);
+                  _this73._objects.handleObjectSyncMessages(objectMessages, message.channelSerial);
                 }
                 break;
               }
             case actions.MESSAGE:
               {
-                if (_this67.state !== "attached") {
-                  logger_default.logAction(_this67.logger, logger_default.LOG_MAJOR, "RealtimeChannel.processMessage()", 'Message "' + message.id + '" skipped as this channel "' + _this67.name + '" state is not "attached" (state is "' + _this67.state + '").');
+                if (_this73.state !== "attached") {
+                  logger_default.logAction(_this73.logger, logger_default.LOG_MAJOR, "RealtimeChannel.processMessage()", 'Message "' + message.id + '" skipped as this channel "' + _this73.name + '" state is not "attached" (state is "' + _this73.state + '").');
                   return;
                 }
                 populateFieldsFromParent(message);
                 var encoded = message.messages,
                   firstMessage = encoded[0],
                   lastMessage = encoded[encoded.length - 1];
-                if (firstMessage.extras && firstMessage.extras.delta && firstMessage.extras.delta.from !== _this67._lastPayload.messageId) {
-                  var msg = 'Delta message decode failure - previous message not available for message "' + message.id + '" on this channel "' + _this67.name + '".';
-                  logger_default.logAction(_this67.logger, logger_default.LOG_ERROR, "RealtimeChannel.processMessage()", msg);
-                  _this67._startDecodeFailureRecovery(new _ErrorInfo2(msg, 40018, 400));
+                if (firstMessage.extras && firstMessage.extras.delta && firstMessage.extras.delta.from !== _this73._lastPayload.messageId) {
+                  var msg = 'Delta message decode failure - previous message not available for message "' + message.id + '" on this channel "' + _this73.name + '".';
+                  logger_default.logAction(_this73.logger, logger_default.LOG_ERROR, "RealtimeChannel.processMessage()", msg);
+                  _this73._startDecodeFailureRecovery(new _ErrorInfo2(msg, 40018, 400));
                   break;
                 }
                 var messages = [];
@@ -11108,34 +11194,34 @@ var ably = {exports: {}};
                   var {
                     decoded,
                     err
-                  } = yield encoded[i].decodeWithErr(_this67._decodingContext, _this67.logger);
+                  } = yield encoded[i].decodeWithErr(_this73._decodingContext, _this73.logger);
                   messages[i] = decoded;
                   if (err) {
                     switch (err.code) {
                       case 40018:
-                        _this67._startDecodeFailureRecovery(err);
+                        _this73._startDecodeFailureRecovery(err);
                         return;
                       case 40019:
                       case 40021:
-                        _this67.notifyState("failed", err);
+                        _this73.notifyState("failed", err);
                         return;
                     }
                   }
                 }
-                _this67._lastPayload.messageId = lastMessage.id;
-                _this67._lastPayload.protocolMessageChannelSerial = message.channelSerial;
-                _this67.onEvent(messages);
+                _this73._lastPayload.messageId = lastMessage.id;
+                _this73._lastPayload.protocolMessageChannelSerial = message.channelSerial;
+                _this73.onEvent(messages);
                 break;
               }
             case actions.ANNOTATION:
               {
                 populateFieldsFromParent(message);
-                var _options = _this67.channelOptions;
-                if (_this67._annotations) {
+                var _options = _this73.channelOptions;
+                if (_this73._annotations) {
                   var annotations = yield Promise.all((message.annotations || []).map(wpm => {
-                    return wpm.decode(_options, _this67.logger);
+                    return wpm.decode(_options, _this73.logger);
                   }));
-                  _this67._annotations._processIncoming(annotations);
+                  _this73._annotations._processIncoming(annotations);
                 }
                 break;
               }
@@ -11143,14 +11229,14 @@ var ably = {exports: {}};
               {
                 var _err = message.error;
                 if (_err && _err.code == 80016) {
-                  _this67.checkPendingState();
+                  _this73.checkPendingState();
                 } else {
-                  _this67.notifyState("failed", _ErrorInfo2.fromValues(_err));
+                  _this73.notifyState("failed", _ErrorInfo2.fromValues(_err));
                 }
                 break;
               }
             default:
-              logger_default.logAction(_this67.logger, logger_default.LOG_MAJOR, "RealtimeChannel.processMessage()", "Protocol error: unrecognised message action (" + message.action + ")");
+              logger_default.logAction(_this73.logger, logger_default.LOG_MAJOR, "RealtimeChannel.processMessage()", "Protocol error: unrecognised message action (" + message.action + ")");
           }
         })();
       }
@@ -11306,9 +11392,45 @@ var ably = {exports: {}};
         }
       }
       status() {
-        var _this68 = this;
+        var _this74 = this;
+        return _asyncToGenerator(function* () {
+          return _this74.client.rest.channelMixin.status(_this74);
+        })();
+      }
+      getMessage(serialOrMessage) {
+        var _this75 = this;
+        return _asyncToGenerator(function* () {
+          logger_default.logAction(_this75.logger, logger_default.LOG_MICRO, "RealtimeChannel.getMessage()", "channel = " + _this75.name);
+          var restMixin = _this75.client.rest.channelMixin;
+          return restMixin.getMessage(_this75, serialOrMessage);
+        })();
+      }
+      updateMessage(message, operation, params) {
+        var _this76 = this;
+        return _asyncToGenerator(function* () {
+          logger_default.logAction(_this76.logger, logger_default.LOG_MICRO, "RealtimeChannel.updateMessage()", "channel = " + _this76.name);
+          var restMixin = _this76.client.rest.channelMixin;
+          return restMixin.updateDeleteMessage(_this76, {
+            isDelete: false
+          }, message, operation, params);
+        })();
+      }
+      deleteMessage(message, operation, params) {
+        var _this77 = this;
+        return _asyncToGenerator(function* () {
+          logger_default.logAction(_this77.logger, logger_default.LOG_MICRO, "RealtimeChannel.deleteMessage()", "channel = " + _this77.name);
+          var restMixin = _this77.client.rest.channelMixin;
+          return restMixin.updateDeleteMessage(_this77, {
+            isDelete: true
+          }, message, operation, params);
+        })();
+      }
+      getMessageVersions(serialOrMessage, params) {
+        var _this78 = this;
         return _asyncToGenerator(function* () {
-          return _this68.client.rest.channelMixin.status(_this68);
+          logger_default.logAction(_this78.logger, logger_default.LOG_MICRO, "RealtimeChannel.getMessageVersions()", "channel = " + _this78.name);
+          var restMixin = _this78.client.rest.channelMixin;
+          return restMixin.getMessageVersions(_this78, serialOrMessage, params);
         })();
       }
     };
@@ -11327,31 +11449,31 @@ var ably = {exports: {}};
         this.subscriptions = new eventemitter_default(this.logger);
       }
       publish(msgOrSerial, annotationValues) {
-        var _this69 = this;
+        var _this79 = this;
         return _asyncToGenerator(function* () {
-          var channelName = _this69.channel.name;
+          var channelName = _this79.channel.name;
           var annotation = constructValidateAnnotation(msgOrSerial, annotationValues);
           var wireAnnotation = yield annotation.encode();
-          _this69.channel.throwIfUnpublishableState();
-          logger_default.logAction(_this69.logger, logger_default.LOG_MICRO, "RealtimeAnnotations.publish()", "channelName = " + channelName + ", sending annotation with messageSerial = " + annotation.messageSerial + ", type = " + annotation.type);
+          _this79.channel.throwIfUnpublishableState();
+          logger_default.logAction(_this79.logger, logger_default.LOG_MICRO, "RealtimeAnnotations.publish()", "channelName = " + channelName + ", sending annotation with messageSerial = " + annotation.messageSerial + ", type = " + annotation.type);
           var pm = fromValues({
             action: actions.ANNOTATION,
             channel: channelName,
             annotations: [wireAnnotation]
           });
-          return _this69.channel.sendMessage(pm);
+          return _this79.channel.sendMessage(pm);
         })();
       }
       delete(msgOrSerial, annotationValues) {
-        var _this70 = this;
+        var _this80 = this;
         return _asyncToGenerator(function* () {
           annotationValues.action = "annotation.delete";
-          return _this70.publish(msgOrSerial, annotationValues);
+          return _this80.publish(msgOrSerial, annotationValues);
         })();
       }
       subscribe() {
         var _arguments4 = arguments,
-          _this71 = this;
+          _this81 = this;
         return _asyncToGenerator(function* () {
           for (var _len10 = _arguments4.length, _args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
             _args[_key10] = _arguments4[_key10];
@@ -11359,15 +11481,15 @@ var ably = {exports: {}};
           var args = realtimechannel_default.processListenerArgs(_args);
           var event = args[0];
           var listener = args[1];
-          var channel = _this71.channel;
+          var channel = _this81.channel;
           if (channel.state === "failed") {
             throw _ErrorInfo2.fromValues(channel.invalidStateError());
           }
-          _this71.subscriptions.on(event, listener);
-          if (_this71.channel.channelOptions.attachOnSubscribe !== false) {
+          _this81.subscriptions.on(event, listener);
+          if (_this81.channel.channelOptions.attachOnSubscribe !== false) {
             yield channel.attach();
           }
-          if ((_this71.channel.state === "attached" && _this71.channel._mode & flags.ANNOTATION_SUBSCRIBE) === 0) {
+          if ((_this81.channel.state === "attached" && _this81.channel._mode & flags.ANNOTATION_SUBSCRIBE) === 0) {
             throw new _ErrorInfo2("You are trying to add an annotation listener, but you haven't requested the annotation_subscribe channel mode in ChannelOptions, so this won't do anything (we only deliver annotations to clients who have explicitly requested them)", 93001, 400);
           }
         })();
@@ -11387,9 +11509,9 @@ var ably = {exports: {}};
         }
       }
       get(msgOrSerial, params) {
-        var _this72 = this;
+        var _this82 = this;
         return _asyncToGenerator(function* () {
-          return restannotations_default.prototype.get.call(_this72, msgOrSerial, params);
+          return restannotations_default.prototype.get.call(_this82, msgOrSerial, params);
         })();
       }
     };
@@ -13051,23 +13173,23 @@ var ably = {exports: {}};
         }
       }
       processChannelMessage(message) {
-        var _this73 = this;
+        var _this83 = this;
         return _asyncToGenerator(function* () {
-          yield _this73.realtime.channels.processChannelMessage(message);
+          yield _this83.realtime.channels.processChannelMessage(message);
         })();
       }
       ping() {
-        var _this74 = this;
+        var _this84 = this;
         return _asyncToGenerator(function* () {
           var _a2;
-          if (_this74.state.state !== "connected") {
+          if (_this84.state.state !== "connected") {
             throw new _ErrorInfo2("Unable to ping service; not connected", 4e4, 400);
           }
-          var transport = (_a2 = _this74.activeProtocol) == null ? void 0 : _a2.getTransport();
+          var transport = (_a2 = _this84.activeProtocol) == null ? void 0 : _a2.getTransport();
           if (!transport) {
-            throw _this74.getStateError();
+            throw _this84.getStateError();
           }
-          logger_default.logAction(_this74.logger, logger_default.LOG_MINOR, "ConnectionManager.ping()", "transport = " + transport);
+          logger_default.logAction(_this84.logger, logger_default.LOG_MINOR, "ConnectionManager.ping()", "transport = " + transport);
           var pingStart = Date.now();
           var id = _cheapRandStr();
           return _withTimeoutAsync(new Promise(resolve => {
@@ -13079,7 +13201,7 @@ var ably = {exports: {}};
             };
             transport.on("heartbeat", onHeartbeat);
             transport.ping(id);
-          }), _this74.options.timeouts.realtimeRequestTimeout, "Timeout waiting for heartbeat response");
+          }), _this84.options.timeouts.realtimeRequestTimeout, "Timeout waiting for heartbeat response");
         })();
       }
       abort(error) {
@@ -13228,10 +13350,10 @@ var ably = {exports: {}};
         });
       }
       ping() {
-        var _this75 = this;
+        var _this85 = this;
         return _asyncToGenerator(function* () {
-          logger_default.logAction(_this75.logger, logger_default.LOG_MINOR, "Connection.ping()", "");
-          return _this75.connectionManager.ping();
+          logger_default.logAction(_this85.logger, logger_default.LOG_MINOR, "Connection.ping()", "");
+          return _this85.connectionManager.ping();
         })();
       }
       close() {
@@ -13287,6 +13409,9 @@ var ably = {exports: {}};
       get channels() {
         return this._channels;
       }
+      get clientId() {
+        return this.auth.clientId;
+      }
       connect() {
         logger_default.logAction(this.logger, logger_default.LOG_MINOR, "Realtime.connect()", "");
         this.connection.connect();
@@ -13327,16 +13452,16 @@ var ably = {exports: {}};
       }
       // Access to this method is synchronised by ConnectionManager#processChannelMessage.
       processChannelMessage(msg) {
-        var _this76 = this;
+        var _this86 = this;
         return _asyncToGenerator(function* () {
           var channelName = msg.channel;
           if (channelName === void 0) {
-            logger_default.logAction(_this76.logger, logger_default.LOG_ERROR, "Channels.processChannelMessage()", "received event unspecified channel, action = " + msg.action);
+            logger_default.logAction(_this86.logger, logger_default.LOG_ERROR, "Channels.processChannelMessage()", "received event unspecified channel, action = " + msg.action);
             return;
           }
-          var channel = _this76.all[channelName];
+          var channel = _this86.all[channelName];
           if (!channel) {
-            logger_default.logAction(_this76.logger, logger_default.LOG_ERROR, "Channels.processChannelMessage()", "received event for non-existent channel: " + channelName);
+            logger_default.logAction(_this86.logger, logger_default.LOG_ERROR, "Channels.processChannelMessage()", "received event for non-existent channel: " + channelName);
             return;
           }
           yield channel.processMessage(msg);
@@ -13591,43 +13716,43 @@ var ably = {exports: {}};
         this.pendingPresence = [];
       }
       enter(data) {
-        var _this77 = this;
+        var _this87 = this;
         return _asyncToGenerator(function* () {
-          if (isAnonymousOrWildcard(_this77)) {
+          if (isAnonymousOrWildcard(_this87)) {
             throw new _ErrorInfo2("clientId must be specified to enter a presence channel", 40012, 400);
           }
-          return _this77._enterOrUpdateClient(void 0, void 0, data, "enter");
+          return _this87._enterOrUpdateClient(void 0, void 0, data, "enter");
         })();
       }
       update(data) {
-        var _this78 = this;
+        var _this88 = this;
         return _asyncToGenerator(function* () {
-          if (isAnonymousOrWildcard(_this78)) {
+          if (isAnonymousOrWildcard(_this88)) {
             throw new _ErrorInfo2("clientId must be specified to update presence data", 40012, 400);
           }
-          return _this78._enterOrUpdateClient(void 0, void 0, data, "update");
+          return _this88._enterOrUpdateClient(void 0, void 0, data, "update");
         })();
       }
       enterClient(clientId, data) {
-        var _this79 = this;
+        var _this89 = this;
         return _asyncToGenerator(function* () {
-          return _this79._enterOrUpdateClient(void 0, clientId, data, "enter");
+          return _this89._enterOrUpdateClient(void 0, clientId, data, "enter");
         })();
       }
       updateClient(clientId, data) {
-        var _this80 = this;
+        var _this90 = this;
         return _asyncToGenerator(function* () {
-          return _this80._enterOrUpdateClient(void 0, clientId, data, "update");
+          return _this90._enterOrUpdateClient(void 0, clientId, data, "update");
         })();
       }
       _enterOrUpdateClient(id, clientId, data, action) {
-        var _this81 = this;
+        var _this91 = this;
         return _asyncToGenerator(function* () {
-          var channel = _this81.channel;
+          var channel = _this91.channel;
           if (!channel.connectionManager.activeState()) {
             throw channel.connectionManager.getError();
           }
-          logger_default.logAction(_this81.logger, logger_default.LOG_MICRO, "RealtimePresence." + action + "Client()", "channel = " + channel.name + ", id = " + id + ", client = " + (clientId || "(implicit) " + getClientId(_this81)));
+          logger_default.logAction(_this91.logger, logger_default.LOG_MICRO, "RealtimePresence." + action + "Client()", "channel = " + channel.name + ", id = " + id + ", client = " + (clientId || "(implicit) " + getClientId(_this91)));
           var presence = presencemessage_default.fromData(data);
           presence.action = action;
           if (id) {
@@ -13645,7 +13770,7 @@ var ably = {exports: {}};
               channel.attach();
             case "attaching":
               return new Promise((resolve, reject) => {
-                _this81.pendingPresence.push({
+                _this91.pendingPresence.push({
                   presence: wirePresMsg,
                   callback: err => err ? reject(err) : resolve()
                 });
@@ -13660,22 +13785,22 @@ var ably = {exports: {}};
         })();
       }
       leave(data) {
-        var _this82 = this;
+        var _this92 = this;
         return _asyncToGenerator(function* () {
-          if (isAnonymousOrWildcard(_this82)) {
+          if (isAnonymousOrWildcard(_this92)) {
             throw new _ErrorInfo2("clientId must have been specified to enter or leave a presence channel", 40012, 400);
           }
-          return _this82.leaveClient(void 0, data);
+          return _this92.leaveClient(void 0, data);
         })();
       }
       leaveClient(clientId, data) {
-        var _this83 = this;
+        var _this93 = this;
         return _asyncToGenerator(function* () {
-          var channel = _this83.channel;
+          var channel = _this93.channel;
           if (!channel.connectionManager.activeState()) {
             throw channel.connectionManager.getError();
           }
-          logger_default.logAction(_this83.logger, logger_default.LOG_MICRO, "RealtimePresence.leaveClient()", "leaving; channel = " + _this83.channel.name + ", client = " + clientId);
+          logger_default.logAction(_this93.logger, logger_default.LOG_MICRO, "RealtimePresence.leaveClient()", "leaving; channel = " + _this93.channel.name + ", client = " + clientId);
           var presence = presencemessage_default.fromData(data);
           presence.action = "leave";
           if (clientId) {
@@ -13687,7 +13812,7 @@ var ably = {exports: {}};
               return channel.sendPresence([wirePresMsg]);
             case "attaching":
               return new Promise((resolve, reject) => {
-                _this83.pendingPresence.push({
+                _this93.pendingPresence.push({
                   presence: wirePresMsg,
                   callback: err => err ? reject(err) : resolve()
                 });
@@ -13703,14 +13828,14 @@ var ably = {exports: {}};
         })();
       }
       get(params) {
-        var _this84 = this;
+        var _this94 = this;
         return _asyncToGenerator(function* () {
           var waitForSync = !params || ("waitForSync" in params ? params.waitForSync : true);
           return new Promise((resolve, reject) => {
             function returnMembers(members) {
               resolve(params ? members.list(params) : members.values());
             }
-            if (_this84.channel.state === "suspended") {
+            if (_this94.channel.state === "suspended") {
               if (waitForSync) {
                 reject(_ErrorInfo2.fromValues({
                   statusCode: 400,
@@ -13718,12 +13843,12 @@ var ably = {exports: {}};
                   message: "Presence state is out of sync due to channel being in the SUSPENDED state"
                 }));
               } else {
-                returnMembers(_this84.members);
+                returnMembers(_this94.members);
               }
               return;
             }
-            waitAttached(_this84.channel, err => reject(err), () => {
-              var members = _this84.members;
+            waitAttached(_this94.channel, err => reject(err), () => {
+              var members = _this94.members;
               if (waitForSync) {
                 members.waitSync(function () {
                   returnMembers(members);
@@ -13736,19 +13861,19 @@ var ably = {exports: {}};
         })();
       }
       history(params) {
-        var _this85 = this;
+        var _this95 = this;
         return _asyncToGenerator(function* () {
-          logger_default.logAction(_this85.logger, logger_default.LOG_MICRO, "RealtimePresence.history()", "channel = " + _this85.name);
-          var restMixin = _this85.channel.client.rest.presenceMixin;
+          logger_default.logAction(_this95.logger, logger_default.LOG_MICRO, "RealtimePresence.history()", "channel = " + _this95.name);
+          var restMixin = _this95.channel.client.rest.presenceMixin;
           if (params && params.untilAttach) {
-            if (_this85.channel.state === "attached") {
+            if (_this95.channel.state === "attached") {
               delete params.untilAttach;
-              params.from_serial = _this85.channel.properties.attachSerial;
+              params.from_serial = _this95.channel.properties.attachSerial;
             } else {
-              throw new _ErrorInfo2("option untilAttach requires the channel to be attached, was: " + _this85.channel.state, 4e4, 400);
+              throw new _ErrorInfo2("option untilAttach requires the channel to be attached, was: " + _this95.channel.state, 4e4, 400);
             }
           }
-          return restMixin.history(_this85, params);
+          return restMixin.history(_this95, params);
         })();
       }
       setPresence(presenceSet, isSync, syncChannelSerial) {
@@ -13876,7 +14001,7 @@ var ably = {exports: {}};
       }
       subscribe() {
         var _arguments5 = arguments,
-          _this86 = this;
+          _this96 = this;
         return _asyncToGenerator(function* () {
           for (var _len12 = _arguments5.length, _args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
             _args[_key12] = _arguments5[_key12];
@@ -13884,11 +14009,11 @@ var ably = {exports: {}};
           var args = realtimechannel_default.processListenerArgs(_args);
           var event = args[0];
           var listener = args[1];
-          var channel = _this86.channel;
+          var channel = _this96.channel;
           if (channel.state === "failed") {
             throw _ErrorInfo2.fromValues(channel.invalidStateError());
           }
-          _this86.subscriptions.on(event, listener);
+          _this96.subscriptions.on(event, listener);
           if (channel.channelOptions.attachOnSubscribe !== false) {
             yield channel.attach();
           }
@@ -14060,8 +14185,8 @@ var ably = {exports: {}};
             isRef: !!((_f = (_e = m.extras) == null ? void 0 : _e.ref) == null ? void 0 : _f.timeserial),
             clientId: m.clientId
           };
-          if (Object.entries(filter).find(_ref10 => {
-            var [key, value] = _ref10;
+          if (Object.entries(filter).find(_ref12 => {
+            var [key, value] = _ref12;
             return value !== void 0 ? mapping[key] !== value : false;
           })) {
             return;
@@ -14089,8 +14214,8 @@ var ably = {exports: {}};
           return [];
         }
         if (!realListener && filter) {
-          return Array.from(channel.filteredSubscriptions.entries()).map(_ref11 => {
-            var [key, filterMaps] = _ref11;
+          return Array.from(channel.filteredSubscriptions.entries()).map(_ref13 => {
+            var [key, filterMaps] = _ref13;
             var _a2;
             var listenerMaps = filterMaps.get(filter);
             filterMaps.delete(filter);
@@ -14562,38 +14687,38 @@ var ably = {exports: {}};
           return output;
         }
         encrypt(plaintext) {
-          var _this87 = this;
+          var _this97 = this;
           return _asyncToGenerator(function* () {
-            logger_default.logAction(_this87.logger, logger_default.LOG_MICRO, "CBCCipher.encrypt()", "");
-            var iv = yield _this87.getIv();
-            var cryptoKey = yield crypto.subtle.importKey("raw", _this87.key, _this87.webCryptoAlgorithm, false, ["encrypt"]);
+            logger_default.logAction(_this97.logger, logger_default.LOG_MICRO, "CBCCipher.encrypt()", "");
+            var iv = yield _this97.getIv();
+            var cryptoKey = yield crypto.subtle.importKey("raw", _this97.key, _this97.webCryptoAlgorithm, false, ["encrypt"]);
             var ciphertext = yield crypto.subtle.encrypt({
-              name: _this87.webCryptoAlgorithm,
+              name: _this97.webCryptoAlgorithm,
               iv
             }, cryptoKey, plaintext);
-            return _this87.concat(iv, ciphertext);
+            return _this97.concat(iv, ciphertext);
           })();
         }
         decrypt(ciphertext) {
-          var _this88 = this;
+          var _this98 = this;
           return _asyncToGenerator(function* () {
-            logger_default.logAction(_this88.logger, logger_default.LOG_MICRO, "CBCCipher.decrypt()", "");
+            logger_default.logAction(_this98.logger, logger_default.LOG_MICRO, "CBCCipher.decrypt()", "");
             var ciphertextArrayBuffer = bufferUtils.toArrayBuffer(ciphertext);
             var iv = ciphertextArrayBuffer.slice(0, DEFAULT_BLOCKLENGTH);
             var ciphertextBody = ciphertextArrayBuffer.slice(DEFAULT_BLOCKLENGTH);
-            var cryptoKey = yield crypto.subtle.importKey("raw", _this88.key, _this88.webCryptoAlgorithm, false, ["decrypt"]);
+            var cryptoKey = yield crypto.subtle.importKey("raw", _this98.key, _this98.webCryptoAlgorithm, false, ["decrypt"]);
             return crypto.subtle.decrypt({
-              name: _this88.webCryptoAlgorithm,
+              name: _this98.webCryptoAlgorithm,
               iv
             }, cryptoKey, ciphertextBody);
           })();
         }
         getIv() {
-          var _this89 = this;
+          var _this99 = this;
           return _asyncToGenerator(function* () {
-            if (_this89.iv) {
-              var iv = _this89.iv;
-              _this89.iv = null;
+            if (_this99.iv) {
+              var iv = _this99.iv;
+              _this99.iv = null;
               return iv;
             }
             var randomBlock = yield config.getRandomArrayBuffer(DEFAULT_BLOCKLENGTH);
@@ -14640,7 +14765,7 @@ var ably = {exports: {}};
         if (Platform.Config.xhrSupported && xhrRequestImplementation) {
           this.supportsAuthHeaders = true;
           this.Request = /*#__PURE__*/function () {
-            var _ref12 = _asyncToGenerator(function* (method, uri, headers, params, body) {
+            var _ref14 = _asyncToGenerator(function* (method, uri, headers, params, body) {
               return new Promise(resolve => {
                 var _a3;
                 var req = xhrRequestImplementation.createRequest(uri, headers, params, body, XHRStates_default.REQ_SEND, (_a3 = client && client.options.timeouts) != null ? _a3 : null, this.logger, method);
@@ -14654,8 +14779,8 @@ var ably = {exports: {}};
                 req.exec();
               });
             });
-            return function (_x82, _x83, _x84, _x85, _x86) {
-              return _ref12.apply(this, arguments);
+            return function (_x88, _x89, _x90, _x91, _x92) {
+              return _ref14.apply(this, arguments);
             };
           }();
           if (client == null ? void 0 : client.options.disableConnectivityCheck) {
@@ -14680,11 +14805,11 @@ var ably = {exports: {}};
         } else if (Platform.Config.fetchSupported && fetchRequestImplementation) {
           this.supportsAuthHeaders = true;
           this.Request = /*#__PURE__*/function () {
-            var _ref15 = _asyncToGenerator(function* (method, uri, headers, params, body) {
+            var _ref17 = _asyncToGenerator(function* (method, uri, headers, params, body) {
               return fetchRequestImplementation(method, client != null ? client : null, uri, headers, params, body);
             });
-            return function (_x87, _x88, _x89, _x90, _x91) {
-              return _ref15.apply(this, arguments);
+            return function (_x93, _x94, _x95, _x96, _x97) {
+              return _ref17.apply(this, arguments);
             };
           }();
           if (client == null ? void 0 : client.options.disableConnectivityCheck) {
@@ -14715,14 +14840,14 @@ var ably = {exports: {}};
         return (_b = (_a2 = this.client) == null ? void 0 : _a2.logger) != null ? _b : logger_default.defaultLogger;
       }
       doUri(method, uri, headers, body, params) {
-        var _this90 = this;
+        var _this100 = this;
         return _asyncToGenerator(function* () {
-          if (!_this90.Request) {
+          if (!_this100.Request) {
             return {
               error: new PartialErrorInfo("Request invoked before assigned to", null, 500)
             };
           }
-          return _this90.Request(method, uri, headers, params, body);
+          return _this100.Request(method, uri, headers, params, body);
         })();
       }
       shouldFallback(errorInfo) {
@@ -14852,7 +14977,7 @@ var ably = {exports: {}};
           globalObject4.crypto.getRandomValues(byteArray);
           return byteArray.buffer;
         });
-        function getRandomArrayBuffer(_x92) {
+        function getRandomArrayBuffer(_x98) {
           return _getRandomArrayBuffer.apply(this, arguments);
         }
         return getRandomArrayBuffer;
@@ -15997,7 +16122,7 @@ var ably = {exports: {}};
       });
       return result;
     }
-    function fetchRequest(_x93, _x94, _x95, _x96, _x97, _x98) {
+    function fetchRequest(_x99, _x100, _x101, _x102, _x103, _x104) {
       return _fetchRequest.apply(this, arguments);
     } // src/platform/web/lib/http/request/index.ts
     function _fetchRequest() {
@@ -16146,10 +16271,19 @@ class ClientAblyService {
           token: ablyToken,
           autoConnect: true
         });
+        _this.client.connection.on('failed', stateChange => {
+          var _a;
+          console.error('[AblyService] Connection state: failed', {
+            reason: (_a = stateChange.reason) === null || _a === void 0 ? void 0 : _a.message,
+            error: stateChange.reason
+          });
+        });
         // Wait for connection to be established
         yield new Promise((resolve, reject) => {
           if (!_this.client) {
-            reject(new Error('Failed to initialize Ably client'));
+            var error = new Error('Failed to initialize Ably client');
+            console.error('[AblyService]', error);
+            reject(error);
             return;
           }
           _this.client.connection.once('connected', () => {
@@ -16158,23 +16292,38 @@ class ClientAblyService {
             resolve();
           });
           _this.client.connection.once('failed', stateChange => {
-            var _a;
-            reject(new Error("Ably connection failed: ".concat(((_a = stateChange.reason) === null || _a === void 0 ? void 0 : _a.message) || 'Unknown error')));
+            var _a, _b;
+            var error = new Error("Ably connection failed: ".concat(((_a = stateChange.reason) === null || _a === void 0 ? void 0 : _a.message) || 'Unknown error'));
+            console.error('[AblyService] Connection failed', {
+              reason: (_b = stateChange.reason) === null || _b === void 0 ? void 0 : _b.message,
+              error: stateChange.reason
+            });
+            reject(error);
           });
           _this.client.connection.once('disconnected', stateChange => {
-            var _a;
-            reject(new Error("Ably connection disconnected: ".concat(((_a = stateChange.reason) === null || _a === void 0 ? void 0 : _a.message) || 'Unknown error')));
+            var _a, _b;
+            var error = new Error("Ably connection disconnected: ".concat(((_a = stateChange.reason) === null || _a === void 0 ? void 0 : _a.message) || 'Unknown error'));
+            console.error('[AblyService] Connection disconnected', {
+              reason: (_b = stateChange.reason) === null || _b === void 0 ? void 0 : _b.message
+            });
+            reject(error);
           });
           // Set a timeout for connection
           setTimeout(() => {
             if (!_this.isConnected) {
-              reject(new Error('Ably connection timeout'));
+              var _error = new Error('Ably connection timeout');
+              console.error('[AblyService] Connection timeout after 10 seconds');
+              reject(_error);
             }
           }, 10000);
         });
         // Subscribe to the session room
         yield _this.joinChannel(sessionId, onMessageReceived, tenantId);
       } catch (error) {
+        console.error('[AblyService] Error in startConnection', {
+          error,
+          sessionId
+        });
         _this.isConnected = false;
         _this.sessionId = null;
         throw error;
@@ -16185,23 +16334,53 @@ class ClientAblyService {
     var _this2 = this;
     return _asyncToGenerator(function* () {
       if (!_this2.client) {
-        throw new Error('Chat client not initialized');
+        var error = new Error('Chat client not initialized');
+        console.error('[AblyService] joinChannel error:', error);
+        throw error;
       }
       var roomName = "session:".concat(tenantId, ":").concat(sessionId);
       // Set up raw channel subscription for server messages
       if (_this2.client) {
         _this2.channel = _this2.client.channels.get(roomName);
+        _this2.channel.on('failed', stateChange => {
+          var _a;
+          console.error('[AblyService] Channel failed', {
+            roomName,
+            reason: (_a = stateChange.reason) === null || _a === void 0 ? void 0 : _a.message,
+            error: stateChange.reason
+          });
+        });
         // Subscribe to assistant/system responses
         _this2.channel.subscribe('ReceiveMessage', message => {
-          var _a, _b, _c, _d, _e;
+          var _a, _b, _c, _d, _e, _f, _g, _h;
           try {
-            var messageContent = typeof message.data === 'string' ? message.data : ((_a = message.data) === null || _a === void 0 ? void 0 : _a.content) || ((_b = message.data) === null || _b === void 0 ? void 0 : _b.message);
-            var senderType = ((_c = message.data) === null || _c === void 0 ? void 0 : _c.senderType) || 3; // Assistant
-            var needsAgent = ((_d = message.data) === null || _d === void 0 ? void 0 : _d.needsAgent) || false;
-            var attachments = ((_e = message.data) === null || _e === void 0 ? void 0 : _e.attachments) || [];
-            onMessageReceived(messageContent, senderType, needsAgent, attachments);
+            // Ensure messageContent is always a string (default to empty string if undefined)
+            var messageContent = typeof message.data === 'string' ? message.data : (_d = (_b = (_a = message.data) === null || _a === void 0 ? void 0 : _a.content) !== null && _b !== void 0 ? _b : (_c = message.data) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : '';
+            var senderType = ((_e = message.data) === null || _e === void 0 ? void 0 : _e.senderType) || 3; // Assistant
+            var needsAgent = ((_f = message.data) === null || _f === void 0 ? void 0 : _f.needsAgent) || ((_g = message.data) === null || _g === void 0 ? void 0 : _g.actionType) == 'needs_agent' || false;
+            var attachments = ((_h = message.data) === null || _h === void 0 ? void 0 : _h.attachments) || [];
+            // Extract downloadUrl from attachments (Ably now returns downloadUrl directly)
+            // Attachments can be: strings (URLs), objects with downloadUrl, or objects with id
+            var attachmentUrls = attachments.map(attachment => {
+              if (typeof attachment === 'string') {
+                // If it's already a string, it's a URL
+                return attachment;
+              } else if (attachment === null || attachment === void 0 ? void 0 : attachment.downloadUrl) {
+                // If it's an object with downloadUrl, use that
+                return attachment.downloadUrl;
+              } else if (attachment === null || attachment === void 0 ? void 0 : attachment.url) {
+                // Fallback to url property
+                return attachment.url;
+              }
+              // If it's an object with id, we'll need to keep it for backward compatibility
+              return null;
+            }).filter(url => url !== null);
+            onMessageReceived(messageContent, senderType, needsAgent, attachmentUrls);
           } catch (error) {
-            // Handle error silently
+            console.error('[AblyService] Error processing message', {
+              error,
+              message
+            });
           }
         });
         yield _this2.channel.attach();
@@ -16231,6 +16410,9 @@ class ClientAblyService {
         _this3.isConnected = false;
         _this3.sessionId = null;
       } catch (error) {
+        console.error('[AblyService] Error in stopConnection', {
+          error
+        });
         // Reset state even if there's an error
         _this3.isConnected = false;
         _this3.sessionId = null;
@@ -16383,19 +16565,21 @@ function useTypewriter(text) {
   var onType = arguments.length > 2 ? arguments[2] : undefined;
   var [displayedText, setDisplayedText] = React.useState('');
   React.useEffect(() => {
+    // Ensure text is always a string to prevent errors
+    var safeText = text !== null && text !== void 0 ? text : '';
     var index = 0;
     setDisplayedText('');
     var interval = setInterval(() => {
       setDisplayedText(() => {
-        var next = text.slice(0, index + 1);
+        var next = safeText.slice(0, index + 1);
         index++;
         if (onType) onType();
-        if (index >= text.length) clearInterval(interval);
+        if (index >= safeText.length) clearInterval(interval);
         return next;
       });
     }, speed);
     return () => clearInterval(interval);
-  }, [text]);
+  }, [text, onType]);
   return displayedText;
 }
 
@@ -34182,11 +34366,13 @@ var AgentResponse = _ref => {
     messageId,
     onType
   } = _ref;
+  // Ensure messageContent is always a string to prevent errors
+  var safeMessageContent = messageContent !== null && messageContent !== void 0 ? messageContent : '';
   var shouldAnimate = (senderType === 2 || senderType === 3) && !seenMessagesRef.has(messageId);
-  var animatedText = useTypewriter(messageContent, 20, onType);
-  var finalMessage = shouldAnimate ? animatedText : messageContent;
+  var animatedText = useTypewriter(safeMessageContent, 20, onType);
+  var finalMessage = shouldAnimate ? animatedText : safeMessageContent;
   // Mark message as "seen" after full animation
-  if (shouldAnimate && finalMessage === messageContent) {
+  if (shouldAnimate && finalMessage === safeMessageContent) {
     seenMessagesRef.add(messageId);
   }
   return jsxRuntime.jsx("div", {
@@ -34336,6 +34522,32 @@ var ImagePreviewDialog = _ref => {
       y: 0
     });
   }, []);
+  var handleDownload = React.useCallback(/*#__PURE__*/_asyncToGenerator(function* () {
+    if (!currentImageUrl) return;
+    try {
+      // Fetch the image as a blob
+      var response = yield fetch(currentImageUrl);
+      var blob = yield response.blob();
+      // Create a temporary URL for the blob
+      var blobUrl = URL.createObjectURL(blob);
+      // Extract filename from URL or use a default
+      var urlParts = currentImageUrl.split('/');
+      var filename = urlParts[urlParts.length - 1].split('?')[0] || 'image.png';
+      // Create a temporary anchor element and trigger download
+      var link = document.createElement('a');
+      link.href = blobUrl;
+      link.download = filename;
+      document.body.appendChild(link);
+      link.click();
+      // Cleanup
+      document.body.removeChild(link);
+      URL.revokeObjectURL(blobUrl);
+    } catch (error) {
+      console.error('Failed to download image:', error);
+      // Fallback: open in new tab if download fails
+      window.open(currentImageUrl, '_blank');
+    }
+  }), [currentImageUrl]);
   var handleClose = React.useCallback(() => {
     setZoomLevel(1);
     setImagePosition({
@@ -34536,6 +34748,27 @@ var ImagePreviewDialog = _ref => {
           "aria-label": 'Reset zoom',
           type: 'button',
           children: "Reset"
+        }), jsxRuntime.jsx("div", {
+          className: 'babylai-h-9 babylai-w-px babylai-bg-white/20 babylai-mx-1'
+        }), jsxRuntime.jsx(Button, {
+          variant: 'ghost',
+          size: 'icon',
+          onClick: handleDownload,
+          className: 'babylai-text-white hover:babylai-text-white/80 hover:babylai-bg-white/10 babylai-h-9 babylai-w-9',
+          "aria-label": 'Download image',
+          type: 'button',
+          children: jsxRuntime.jsx("svg", {
+            className: 'babylai-w-5 babylai-h-5',
+            fill: 'none',
+            stroke: 'currentColor',
+            viewBox: '0 0 24 24',
+            children: jsxRuntime.jsx("path", {
+              strokeLinecap: 'round',
+              strokeLinejoin: 'round',
+              strokeWidth: 2,
+              d: 'M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4'
+            })
+          })
         })]
       }), hasMultipleImages && jsxRuntime.jsx("div", {
         className: cn('babylai-absolute babylai-top-4 babylai-z-[60]', 'babylai-bg-black/50 babylai-backdrop-blur-sm babylai-rounded-lg babylai-px-4 babylai-py-2', dir === 'rtl' ? 'babylai-right-1/2 babylai-translate-x-1/2' : 'babylai-left-1/2 -babylai-translate-x-1/2'),
@@ -34569,6 +34802,7 @@ ImagePreviewDialog.displayName = 'ImagePreviewDialog';
 var ImageAttachment = _ref => {
   var {
     fileId,
+    imageUrl: propImageUrl,
     className,
     enablePreview = true,
     onClick
@@ -34576,30 +34810,39 @@ var ImageAttachment = _ref => {
   var {
     i18n
   } = useLocalTranslation();
-  var [imageUrl, setImageUrl] = React.useState(null);
-  var [loading, setLoading] = React.useState(true);
+  var [imageUrl, setImageUrl] = React.useState(propImageUrl || null);
+  var [loading, setLoading] = React.useState(!propImageUrl && !!fileId);
   var [error, setError] = React.useState(false);
   var [isPreviewOpen, setIsPreviewOpen] = React.useState(false);
   React.useEffect(() => {
-    var fetchImageUrl = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* () {
-        try {
-          setLoading(true);
-          setError(false);
-          var response = yield presignDownload(fileId, i18n.language);
-          setImageUrl(response.downloadUrl);
-        } catch (err) {
-          setError(true);
-        } finally {
-          setLoading(false);
-        }
-      });
-      return function fetchImageUrl() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    fetchImageUrl();
-  }, [fileId, i18n.language]);
+    // If we have a direct URL, use it immediately
+    if (propImageUrl) {
+      setImageUrl(propImageUrl);
+      setLoading(false);
+      return;
+    }
+    // If we only have a fileId, fetch the URL using presignDownload
+    if (fileId) {
+      var fetchImageUrl = /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(function* () {
+          try {
+            setLoading(true);
+            setError(false);
+            var response = yield presignDownload(fileId, i18n.language);
+            setImageUrl(response.downloadUrl);
+          } catch (err) {
+            setError(true);
+          } finally {
+            setLoading(false);
+          }
+        });
+        return function fetchImageUrl() {
+          return _ref2.apply(this, arguments);
+        };
+      }();
+      fetchImageUrl();
+    }
+  }, [fileId, propImageUrl, i18n.language]);
   var handleImageClick = () => {
     if (onClick) {
       onClick();
@@ -38151,39 +38394,63 @@ var ChatWindowFooter = props => {
     var _a;
     (_a = fileInputRef.current) === null || _a === void 0 ? void 0 : _a.click();
   }, []);
-  var handleFileSelect = React.useCallback(/*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(function* (e) {
-      var files = Array.from(e.target.files || []);
-      // Validate that all files are images
-      var imageFiles = files.filter(file => file.type.startsWith('image/'));
-      // Only image files are allowed
-      // Create preview URLs and add to selected files
-      var newFiles = imageFiles.map(file => ({
-        file,
-        previewUrl: URL.createObjectURL(file),
-        uploading: false,
-        uploadedId: null,
-        error: null
-      }));
-      setSelectedFiles(prev => [...prev, ...newFiles]);
-      // Clear the input
-      if (fileInputRef.current) {
-        fileInputRef.current.value = '';
+  var handleFileSelect = React.useCallback(e => {
+    var files = Array.from(e.target.files || []);
+    // Validate that all files are images
+    var imageFiles = files.filter(file => file.type.startsWith('image/'));
+    // Create preview URLs and add to selected files (don't upload yet)
+    var newFiles = imageFiles.map(file => ({
+      file,
+      previewUrl: URL.createObjectURL(file),
+      uploading: false,
+      uploadedId: null,
+      error: null
+    }));
+    setSelectedFiles(prev => [...prev, ...newFiles]);
+    // Clear the input
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+    }
+    // Don't upload files immediately - wait for send button click
+  }, []);
+  // Removed handleUploadFiles - files are now uploaded in handleSendMessageWithAttachments
+  var handleRemoveFile = React.useCallback(previewUrl => {
+    setSelectedFiles(prev => {
+      var fileToRemove = prev.find(f => f.previewUrl === previewUrl);
+      if (fileToRemove) {
+        URL.revokeObjectURL(fileToRemove.previewUrl);
       }
-      // Start uploading immediately
-      yield handleUploadFiles(newFiles);
+      return prev.filter(f => f.previewUrl !== previewUrl);
     });
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }(), []);
-  var handleUploadFiles = React.useCallback(/*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(function* (filesToUpload) {
-      // Get session ID
-      var sessionId;
+  }, []);
+  var handleSendMessageWithAttachments = React.useCallback(/*#__PURE__*/_asyncToGenerator(function* () {
+    // Prevent sending if already loading
+    if (props.isLoading) {
+      return;
+    }
+    // Get files that need to be uploaded (those without uploadedId)
+    var filesToUpload = selectedFiles.filter(f => f.uploadedId === null && !f.error);
+    var alreadyUploadedIds = selectedFiles.filter(f => f.uploadedId !== null).map(f => f.uploadedId);
+    // Declare uploadedIds outside the if block so it's accessible later
+    var uploadedIds = [];
+    // If there are files to upload, upload them first
+    if (filesToUpload.length > 0) {
+      // Get session ID - only use existing, never create new one
+      var sessionId = null;
       try {
-        sessionId = yield props.onEnsureSession();
+        // Only use existing sessionId, never call onEnsureSession
+        if (props.sessionId) {
+          sessionId = props.sessionId;
+        } else {
+          // Mark all files as error
+          setSelectedFiles(prev => prev.map(f => filesToUpload.some(ftl => ftl.previewUrl === f.previewUrl) ? _objectSpread2(_objectSpread2({}, f), {}, {
+            error: 'No session available',
+            uploading: false
+          }) : f));
+          return;
+        }
       } catch (error) {
+        console.error('[ChatWindowFooter] Failed to get sessionId for file upload:', error);
         // Mark all files as error
         setSelectedFiles(prev => prev.map(f => filesToUpload.some(ftl => ftl.previewUrl === f.previewUrl) ? _objectSpread2(_objectSpread2({}, f), {}, {
           error: 'Failed to initialize session',
@@ -38191,7 +38458,9 @@ var ChatWindowFooter = props => {
         }) : f));
         return;
       }
-      // Upload each file
+      // Upload each file and collect uploaded IDs
+      uploadedIds = [];
+      var hasUploadErrors = false;
       var _loop = function* _loop(fileDto) {
         try {
           // Mark as uploading
@@ -38202,7 +38471,6 @@ var ChatWindowFooter = props => {
           // Get presigned URL
           var presignResponse = yield presignUpload(sessionId, fileDto.file, i18n.language);
           // Upload file to presigned URL using axios
-          // Important: Content-Type must match the file type (e.g., 'image/png'), not 'multipart/form-data'
           var uploadResponse = yield axios$1.put(presignResponse.uploadUrl, fileDto.file, {
             headers: {
               'Content-Type': fileDto.file.type
@@ -38214,6 +38482,8 @@ var ChatWindowFooter = props => {
           if (uploadResponse.status !== 200 && uploadResponse.status !== 204) {
             throw new Error("Upload failed with status ".concat(uploadResponse.status));
           }
+          // Collect uploaded ID
+          uploadedIds.push(presignResponse.id);
           // Update with uploaded ID
           setSelectedFiles(prev => prev.map(f => f.previewUrl === fileDto.previewUrl ? _objectSpread2(_objectSpread2({}, f), {}, {
             uploading: false,
@@ -38221,6 +38491,8 @@ var ChatWindowFooter = props => {
             error: null
           }) : f));
         } catch (error) {
+          console.error('[ChatWindowFooter] File upload failed:', error);
+          hasUploadErrors = true;
           setSelectedFiles(prev => prev.map(f => f.previewUrl === fileDto.previewUrl ? _objectSpread2(_objectSpread2({}, f), {}, {
             uploading: false,
             error: 'Upload failed',
@@ -38231,43 +38503,28 @@ var ChatWindowFooter = props => {
       for (var fileDto of filesToUpload) {
         yield* _loop(fileDto);
       }
-    });
-    return function (_x2) {
-      return _ref2.apply(this, arguments);
-    };
-  }(), [props.onEnsureSession, i18n.language]);
-  var handleRemoveFile = React.useCallback(previewUrl => {
-    setSelectedFiles(prev => {
-      var fileToRemove = prev.find(f => f.previewUrl === previewUrl);
-      if (fileToRemove) {
-        URL.revokeObjectURL(fileToRemove.previewUrl);
+      // If any uploads failed, don't send the message
+      if (hasUploadErrors) {
+        console.error('[ChatWindowFooter] Some files failed to upload, not sending message');
+        return;
       }
-      return prev.filter(f => f.previewUrl !== previewUrl);
-    });
-  }, []);
-  var handleSendMessageWithAttachments = React.useCallback(() => {
-    // Only allow sending if all files have finished uploading (either successfully or with error)
-    var hasUploadingFiles = selectedFiles.some(f => f.uploading);
-    if (hasUploadingFiles) {
-      return; // Prevent sending if any files are still uploading
-    }
-    // Get all successfully uploaded file IDs
-    var attachmentIds = selectedFiles.filter(f => f.uploadedId !== null).map(f => f.uploadedId);
+    }
+    // Get all successfully uploaded file IDs (already uploaded + newly uploaded)
+    // Use uploadedIds from the upload loop instead of reading from state
+    var allAttachmentIds = [...alreadyUploadedIds, ...uploadedIds];
     // Call the original send message with attachment IDs
-    props.handleSendMessage(attachmentIds);
+    props.handleSendMessage(allAttachmentIds);
     // Clear selected files and revoke URLs
     selectedFiles.forEach(f => URL.revokeObjectURL(f.previewUrl));
     setSelectedFiles([]);
-  }, [selectedFiles, props]);
+  }), [selectedFiles, props, i18n.language]);
   // Check if any files are currently uploading
   var hasUploadingFiles = selectedFiles.some(f => f.uploading);
-  // Check if there are files that haven't finished (no uploadedId, no error, not uploading)
-  // This shouldn't happen in normal flow, but we check for safety
-  var hasPendingFiles = selectedFiles.some(f => !f.uploading && f.uploadedId === null && f.error === null);
-  // Check if all files have errors (no successful uploads)
-  var hasSuccessfulUploads = selectedFiles.some(f => f.uploadedId !== null);
-  var allFilesHaveErrors = selectedFiles.length > 0 && !hasSuccessfulUploads && !hasUploadingFiles && !hasPendingFiles;
-  var isSendDisabled = props.isLoading || props.inputMessage.trim() === '' || hasUploadingFiles || hasPendingFiles || allFilesHaveErrors;
+  // Check if there are files with errors
+  var hasFileErrors = selectedFiles.some(f => f.error !== null);
+  // Allow sending if there's text OR files selected (files will be uploaded on send)
+  var hasContentToSend = props.inputMessage.trim() !== '' || selectedFiles.length > 0;
+  var isSendDisabled = props.isLoading || !hasContentToSend || hasUploadingFiles || hasFileErrors;
   var handleKeyDown = React.useCallback(e => {
     if (e.key === 'Enter' && !e.shiftKey) {
       e.preventDefault();
@@ -38432,10 +38689,12 @@ var MessageComponent = /*#__PURE__*/React__default["default"].memo(_ref => {
   var isFirstHumanAgentMessage = index === firstHumanAgentIndex && message.senderType === 2;
   var textDirection = message.senderType === 1 ? 'babylai-justify-end' : 'babylai-justify-start';
   var handleImageClick = React.useCallback(clickedIndex => {
-    if (message.attachmentIds && message.attachmentIds.length > 0) {
-      onImageClick(message.attachmentIds, clickedIndex);
+    // Use attachmentUrls if available (from Ably), otherwise use attachmentIds (user-sent)
+    var attachments = message.attachmentUrls || message.attachmentIds || [];
+    if (attachments.length > 0) {
+      onImageClick(attachments, clickedIndex);
     }
-  }, [message.attachmentIds, onImageClick]);
+  }, [message.attachmentIds, message.attachmentUrls, onImageClick]);
   return jsxRuntime.jsxs("div", {
     children: [isFirstHumanAgentMessage && jsxRuntime.jsx("div", {
       className: 'babylai-flex babylai-justify-center babylai-items-center babylai-my-4',
@@ -38458,14 +38717,21 @@ var MessageComponent = /*#__PURE__*/React__default["default"].memo(_ref => {
         className: 'babylai-flex-shrink-0 babylai-me-3 babylai-w-8'
       }), jsxRuntime.jsxs("div", {
         className: 'babylai-flex babylai-flex-col babylai-gap-2',
-        children: [message.attachmentIds && message.attachmentIds.length > 0 && jsxRuntime.jsx("div", {
+        children: [message.attachmentUrls && message.attachmentUrls.length > 0 && jsxRuntime.jsx("div", {
+          className: 'babylai-flex babylai-flex-row babylai-flex-wrap babylai-gap-2 babylai-max-w-full',
+          children: message.attachmentUrls.map((attachmentUrl, imgIndex) => jsxRuntime.jsx(ImageAttachment, {
+            imageUrl: attachmentUrl,
+            enablePreview: false,
+            onClick: () => handleImageClick(imgIndex)
+          }, attachmentUrl))
+        }), message.attachmentIds && message.attachmentIds.length > 0 && jsxRuntime.jsx("div", {
           className: 'babylai-flex babylai-flex-row babylai-flex-wrap babylai-gap-2 babylai-max-w-full',
           children: message.attachmentIds.map((attachmentId, imgIndex) => jsxRuntime.jsx(ImageAttachment, {
             fileId: attachmentId,
             enablePreview: false,
             onClick: () => handleImageClick(imgIndex)
           }, attachmentId))
-        }), jsxRuntime.jsx(AgentResponse$1, {
+        }), message.messageContent && message.messageContent.trim() !== '' && jsxRuntime.jsx(AgentResponse$1, {
           messageContent: message.messageContent,
           senderType: message.senderType,
           messageId: message.id,
@@ -38510,7 +38776,8 @@ var ChatWindow = /*#__PURE__*/React__default["default"].memo(_ref3 => {
     onEnsureSession,
     messages,
     assistantStatus = 'loading',
-    needsAgent
+    needsAgent,
+    sessionId
   } = _ref3;
   var {
     i18n
@@ -38553,7 +38820,8 @@ var ChatWindow = /*#__PURE__*/React__default["default"].memo(_ref3 => {
     };
   }, []);
   var handleSendMessage = React.useCallback(attachmentIds => {
-    if (inputMessage.trim()) {
+    // Allow sending if there's text OR attachments
+    if (inputMessage.trim() || attachmentIds.length > 0) {
       onSendMessage(inputMessage, attachmentIds);
       setInputMessage('');
     }
@@ -38564,13 +38832,32 @@ var ChatWindow = /*#__PURE__*/React__default["default"].memo(_ref3 => {
   }, [messages]);
   // Handle image gallery opening
   var handleImageClick = React.useCallback(/*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(function* (attachmentIds, clickedIndex) {
-      if (!attachmentIds || attachmentIds.length === 0) {
+    var _ref4 = _asyncToGenerator(function* (attachmentIdsOrUrls, clickedIndex) {
+      var _a, _b;
+      if (!attachmentIdsOrUrls || attachmentIdsOrUrls.length === 0) {
         return;
       }
       try {
-        // Fetch all image URLs with comprehensive error handling
-        var imageUrlPromises = attachmentIds.map(fileId => {
+        // Check if the first item is a URL (starts with http:// or https://)
+        // If so, they're all URLs from Ably and can be used directly
+        var isUrl = ((_a = attachmentIdsOrUrls[0]) === null || _a === void 0 ? void 0 : _a.startsWith('http://')) || ((_b = attachmentIdsOrUrls[0]) === null || _b === void 0 ? void 0 : _b.startsWith('https://'));
+        var imageUrls;
+        if (isUrl) {
+          // These are already URLs from Ably, use them directly (no async needed)
+          imageUrls = attachmentIdsOrUrls.filter(url => url !== null && url.length > 0);
+          // Open gallery immediately with URLs
+          if (imageUrls.length > 0) {
+            var _adjustedIndex = Math.max(0, Math.min(clickedIndex, imageUrls.length - 1));
+            setGalleryState({
+              isOpen: true,
+              imageUrls,
+              initialIndex: _adjustedIndex
+            });
+          }
+          return; // Exit early since we don't need to fetch anything
+        }
+        // These are file IDs, need to fetch URLs using presignDownload
+        var imageUrlPromises = attachmentIdsOrUrls.map(fileId => {
           if (!fileId || typeof fileId !== 'string') {
             return Promise.resolve(null);
           }
@@ -38584,7 +38871,7 @@ var ChatWindow = /*#__PURE__*/React__default["default"].memo(_ref3 => {
             return null;
           });
         });
-        var imageUrls = (yield Promise.all(imageUrlPromises)).filter(url => url !== null && url.length > 0);
+        imageUrls = (yield Promise.all(imageUrlPromises)).filter(url => url !== null && url.length > 0);
         if (imageUrls.length === 0) {
           return;
         }
@@ -38646,7 +38933,8 @@ var ChatWindow = /*#__PURE__*/React__default["default"].memo(_ref3 => {
       handleSendMessage: handleSendMessage,
       setInputMessage: setInputMessage,
       isLoading: isLoading,
-      onEnsureSession: onEnsureSession
+      onEnsureSession: onEnsureSession,
+      sessionId: sessionId
     }), galleryState.isOpen && galleryState.imageUrls.length > 0 && jsxRuntime.jsx(ImagePreviewDialog, {
       imageUrls: galleryState.imageUrls,
       initialIndex: galleryState.initialIndex,
@@ -39265,7 +39553,8 @@ var HelpPopup = _ref => {
     }
   }, [onStartChat, setSelectedOption, sessionId, setStartNewChatConfirmation, setTempSelectedOption]);
   var handleSendMessage = React.useCallback((message, attachmentIds) => {
-    if (message.trim()) {
+    // Allow sending if there's text OR attachments
+    if (message.trim() || attachmentIds.length > 0) {
       onSendMessage(message.trim(), attachmentIds);
     }
   }, [onSendMessage]);
@@ -39321,7 +39610,8 @@ var HelpPopup = _ref => {
           messages: memoizedMessages,
           assistantStatus: assistantStatus,
           needsAgent: needsAgent,
-          isAblyConnected: isAblyConnected
+          isAblyConnected: isAblyConnected,
+          sessionId: sessionId
         })]
       });
     }
@@ -39460,7 +39750,7 @@ var HelpCenterContent = _ref => {
         sentAt: new Date(),
         isSeen: true
       }, attachments.length > 0 && {
-        attachmentIds: attachments
+        attachmentUrls: attachments
       });
       return [...prevMessages, newMessage];
     });
@@ -39589,10 +39879,11 @@ var HelpCenterContent = _ref => {
   var handleEnsureSession = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator(function* () {
       // If we already have a session ID and connection, return it
-      if (sessionId && isAblyConnected) {
+      // NEVER create a new session if one already exists
+      if (sessionId) {
         return sessionId;
       }
-      // If we have a selected option but no session, create one
+      // Only create a new session if we don't have one and have a selected option
       if (selectedOption) {
         var newSessionId = yield startNewChatSession(selectedOption);
         return newSessionId;
@@ -39606,28 +39897,32 @@ var HelpCenterContent = _ref => {
   var handleSendMessage = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(function* (message) {
       var attachmentIds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-      if (message.trim() !== '') {
+      // Allow sending if there's text OR attachments
+      if (message.trim() !== '' || attachmentIds.length > 0) {
         try {
           setAssistantStatus('typing');
           var userMessage = {
             id: Date.now(),
             senderType: 1,
-            messageContent: message,
+            messageContent: message || '',
+            // Use empty string if message is empty but attachments exist
             sentAt: new Date(),
             isSeen: false,
             attachmentIds: attachmentIds.length > 0 ? attachmentIds : undefined
           };
           setMessages(prevMessages => [...prevMessages, userMessage]);
-          // Handle session creation if needed
+          // Handle session creation if needed - only create if no session exists
           var currentSessionId = sessionId;
-          if (!isAblyConnected && selectedOption) {
+          // Only create a new session if we don't have one and we have a selected option
+          // This ensures session is only created once with the first message
+          if (!currentSessionId && !isAblyConnected && selectedOption) {
             currentSessionId = yield startNewChatSession(selectedOption);
           }
           if (!currentSessionId) {
             throw new Error('No active session available');
           }
           var messageDto = _objectSpread2({
-            messageContent: message
+            messageContent: message || ''
           }, attachmentIds.length > 0 && {
             attachmentIds
           });