@twilio/conversations 2.4.1-rc.0 → 2.4.1-rc.1

package/builds/lib.d.ts

@@ -6,8 +6,7 @@ import { ConnectionState as TwilsockConnectionState } from "twilsock";
 import { ReplayEventEmitter } from "@twilio/replay-event-emitter";
 import { ChannelType, Notifications } from "@twilio/notifications";
 import { Notifications as NotificationClient } from "@twilio/notifications";
-import { CancellablePromise, McsClient, MediaCategory, McsMedia } from "@twilio/mcs-client";
-import { MediaCategory as McsMediaCategory } from "@twilio/mcs-client";
+import { CancellablePromise, McsClient, MediaCategory, McsMedia, McsMediaCategory, McsMediaState } from "@twilio/mcs-client";
 interface ConfigurationResponse {
     options: {
         consumption_report_interval: string;
@@ -523,13 +522,6 @@ interface ParticipantBindingOptions {
  * * `'history'`
  */
 type MediaCategory$0 = McsMediaCategory;
-interface MediaState {
-    sid: string;
-    category: MediaCategory$0;
-    filename: string | null;
-    contentType: string;
-    size: number;
-}
 interface MediaServices {
     mcsClient: McsClient;
 }
@@ -543,7 +535,7 @@ declare class Media {
     /**
      * @internal
      */
-    constructor(data: MediaState | McsMedia, services: MediaServices);
+    constructor(data: McsMediaState | McsMedia, services: MediaServices);
     /**
      * Server-assigned unique identifier for the media.
      */
@@ -576,7 +568,7 @@ declare class Media {
     /**
      * @internal
      */
-    _state(): Record<string, unknown>;
+    _state(): McsMediaState;
 }
 /**
  * Signifies the amount of participants which have the status for the message.

package/builds/lib.js

@@ -2191,10 +2191,12 @@ var Media = /*#__PURE__*/function () {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  fetchMediaRequest = _this._fetchMcsMedia();
+                  fetchMediaRequest = _this.mcsMedia ? undefined : _this._fetchMcsMedia();
                   contentUrlRequest = (_this$mcsMedia = _this.mcsMedia) === null || _this$mcsMedia === void 0 ? void 0 : _this$mcsMedia.getContentUrl();
                   onCancel(function () {
-                    fetchMediaRequest.cancel();
+                    if (fetchMediaRequest) {
+                      fetchMediaRequest.cancel();
+                    }
 
                     if (contentUrlRequest) {
                       contentUrlRequest.cancel();
@@ -2202,7 +2204,7 @@ var Media = /*#__PURE__*/function () {
                   });
                   _context.prev = 3;
 
-                  if (_this.mcsMedia) {
+                  if (contentUrlRequest) {
                     _context.next = 9;
                     break;
                   }
@@ -2212,7 +2214,7 @@ var Media = /*#__PURE__*/function () {
 
                 case 7:
                   mcsMedia = _context.sent;
-                  contentUrlRequest = mcsMedia.getContentUrl();
+                  contentUrlRequest = mcsMedia === null || mcsMedia === void 0 ? void 0 : mcsMedia.getContentUrl();
 
                 case 9:
                   _context.t0 = resolve;
@@ -2269,13 +2271,11 @@ var Media = /*#__PURE__*/function () {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
-                  request = _this2.services.mcsClient.get(_this2.state.sid);
-
-                  if (!_this2.services.mcsClient) {
-                    _context2.next = 14;
-                    break;
+                  if (_this2.services.mcsClient === null) {
+                    reject(new Error("Media Content Service is unavailable"));
                   }
 
+                  request = _this2.services.mcsClient.get(_this2.state.sid);
                   onCancel(function () {
                     return request.cancel();
                   });
@@ -2285,27 +2285,22 @@ var Media = /*#__PURE__*/function () {
 
                 case 6:
                   _this2.mcsMedia = _context2.sent;
+                  _this2.state = _this2.mcsMedia._state();
                   resolve(_this2.mcsMedia);
-                  _context2.next = 13;
+                  _context2.next = 14;
                   break;
 
-                case 10:
-                  _context2.prev = 10;
+                case 11:
+                  _context2.prev = 11;
                   _context2.t0 = _context2["catch"](3);
                   reject(_context2.t0);
 
-                case 13:
-                  return _context2.abrupt("return");
-
                 case 14:
-                  reject(new Error("Media Content Service is unavailable"));
-
-                case 15:
                 case "end":
                   return _context2.stop();
               }
             }
-          }, _callee2, null, [[3, 10]]);
+          }, _callee2, null, [[3, 11]]);
         }));
 
         return function (_x4, _x5, _x6) {
@@ -2320,7 +2315,7 @@ var Media = /*#__PURE__*/function () {
   }, {
     key: "_state",
     value: function _state() {
-      return this.mcsMedia ? this.mcsMedia._state() : this.state;
+      return this.state;
     }
   }]);
 
@@ -7883,7 +7878,7 @@ function PushNotification(data) {
   this.data = data.data || {};
 });
 
-var version = "2.4.1-rc.0";
+var version = "2.4.1-rc.1";
 
 function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }