@twilio/conversations 3.0.0-canary.13 → 3.0.0-canary.2

package/dist/command-executor.js

@@ -130,11 +130,12 @@ This software includes platform.js under the following license.
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var uuid = require('uuid');
+var twilsock = require('twilsock');
 var operationRetrier = require('@twilio/operation-retrier');
+var nanoid = require('nanoid');
 
 const trimSlashes = (url) => url.replace(/(^\/+|\/+$)/g, "");
-const isMutationConflictResponse = (response) => response.status.code === 202;
+const isMutationConflictResponse = (response) => response.statusCode === 202;
 class CommandExecutor {
     constructor(_serviceUrl, _services, _productId) {
         this._serviceUrl = _serviceUrl;
@@ -159,45 +160,69 @@ class CommandExecutor {
                     getUrl +=
                         "?" +
                             Object.entries(requestBody)
-                                .map((entry) => entry.map(encodeURIComponent).join("="))
+                                .map((entry) => entry
+                                .map((component) => encodeURIComponent(String(component)))
+                                .join("="))
                                 .join("&");
                 }
-                response = await this._services.transport.get(getUrl, finalHeaders, this._productId);
+                response = await this._services.transport.sendRequest(new twilsock.HttpRequest({
+                    url: getUrl,
+                    headers: finalHeaders,
+                    grant: this._productId,
+                }));
                 break;
             case "post":
-                response = await this._services.transport.post(preProcessedUrl, finalHeaders, JSON.stringify(requestBody), this._productId);
+                response = await this._services.transport.sendRequest(new twilsock.HttpRequest({
+                    method: "POST",
+                    url: preProcessedUrl,
+                    headers: finalHeaders,
+                    payload: JSON.stringify(requestBody),
+                    grant: this._productId,
+                }));
                 break;
             case "delete":
-                response = await this._services.transport.delete(preProcessedUrl, finalHeaders, {}, this._productId);
+                response = await this._services.transport.sendRequest(new twilsock.HttpRequest({
+                    method: "DELETE",
+                    url: preProcessedUrl,
+                    headers: finalHeaders,
+                    grant: this._productId,
+                }));
                 break;
         }
-        if (response.status.code < 200 || response.status.code >= 300) {
-            throw new Error(`Request responded with a non-success code ${response.status.code}`);
+        if (response.statusCode < 200 || response.statusCode >= 300) {
+            throw new Error(`Request responded with a non-success code ${response.statusCode}`);
         }
         return response;
     }
     async fetchResource(url, requestBody) {
         const maxAttemptsCount = 6;
         try {
+            // todo: remove any after the release of new Twilsock
             const result = await new operationRetrier.AsyncRetrier({
                 min: 50,
                 max: 1600,
                 maxAttemptsCount,
             }).run(() => this._makeRequest("get", url, requestBody));
-            return result.body;
+            return JSON.parse(result.payload);
         }
-        catch (_a) {
+        catch (E) {
             throw new Error(`Fetch resource from "${url}" failed.`);
         }
     }
     async mutateResource(method, url, requestBody) {
+        // todo: remove any after the release of new Twilsock
         const result = await this._makeRequest(method, url, requestBody, {
-            "X-Twilio-Mutation-Id": uuid.v4(),
+            "X-Twilio-Mutation-Id": nanoid.nanoid(),
         });
+        let parsedPayload = {};
+        try {
+            parsedPayload = JSON.parse(result.payload);
+        }
+        catch (_a) { }
         if (isMutationConflictResponse(result)) {
-            return await this.fetchResource(result.body.resource_url);
+            return await this.fetchResource(parsedPayload.resource_url);
         }
-        return result.body;
+        return parsedPayload;
     }
 }
 

package/dist/command-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-executor.js","sources":["../src/command-executor.ts"],"sourcesContent":["import { TransportResult as Result, Transport } from \"twilsock\";\nimport { MutationConflictResponse } from \"./interfaces/commands/mutation-conflict\";\nimport { v4 as uuidv4 } from \"uuid\";\nimport { AsyncRetrier } from \"@twilio/operation-retrier\";\n\nexport interface CommandExecutorServices {\n  transport: Transport;\n}\n\nconst trimSlashes = (url: string): string => url.replace(/(^\\/+|\\/+$)/g, \"\");\n\nconst isMutationConflictResponse = (\n  response: Result<unknown>\n): response is Result<MutationConflictResponse> => response.status.code === 202;\n\nclass CommandExecutor {\n  constructor(\n    private _serviceUrl: string,\n    private _services: CommandExecutorServices,\n    private _productId?: string\n  ) {}\n\n  private _preProcessUrl(url: string): string {\n    const trimmedUrl = trimSlashes(url);\n\n    if (/^https?:\\/\\//.test(url)) {\n      return trimmedUrl;\n    }\n\n    return `${trimSlashes(this._serviceUrl)}/${trimmedUrl}`;\n  }\n\n  private async _makeRequest<REQ = void, RESP = void>(\n    method: \"get\" | \"post\" | \"delete\",\n    url: string,\n    requestBody?: REQ,\n    headers?: Record<string, string>\n  ): Promise<Result<RESP>> {\n    const preProcessedUrl = this._preProcessUrl(url);\n    const finalHeaders = {\n      \"Content-Type\": \"application/json; charset=utf-8\",\n      ...(headers || {}),\n    };\n    let response: Result<RESP>;\n\n    switch (method) {\n      case \"get\":\n        let getUrl = preProcessedUrl;\n\n        if (requestBody) {\n          getUrl +=\n            \"?\" +\n            Object.entries(requestBody)\n              .map((entry) => entry.map(encodeURIComponent).join(\"=\"))\n              .join(\"&\");\n        }\n\n        response = await this._services.transport.get(\n          getUrl,\n          finalHeaders,\n          this._productId\n        );\n        break;\n      case \"post\":\n        response = await this._services.transport.post(\n          preProcessedUrl,\n          finalHeaders,\n          JSON.stringify(requestBody),\n          this._productId\n        );\n        break;\n      case \"delete\":\n        response = await this._services.transport.delete(\n          preProcessedUrl,\n          finalHeaders,\n          {},\n          this._productId\n        );\n        break;\n    }\n\n    if (response.status.code < 200 || response.status.code >= 300) {\n      throw new Error(\n        `Request responded with a non-success code ${response.status.code}`\n      );\n    }\n\n    return response;\n  }\n\n  public async fetchResource<REQ = void, RESP = void>(\n    url: string,\n    requestBody?: REQ\n  ): Promise<RESP> {\n    const maxAttemptsCount = 6;\n    try {\n      const result = await new AsyncRetrier({\n        min: 50,\n        max: 1600,\n        maxAttemptsCount,\n      }).run(() => this._makeRequest<REQ, RESP>(\"get\", url, requestBody));\n      return result.body;\n    } catch {\n      throw new Error(`Fetch resource from \"${url}\" failed.`);\n    }\n  }\n\n  public async mutateResource<REQ = void, RESP = void>(\n    method: \"post\" | \"delete\",\n    url: string,\n    requestBody?: REQ\n  ): Promise<RESP> {\n    const result = await this._makeRequest<REQ, RESP>(\n      method,\n      url,\n      requestBody,\n      {\n        \"X-Twilio-Mutation-Id\": uuidv4(),\n      }\n    );\n\n    if (isMutationConflictResponse(result)) {\n      return await this.fetchResource<undefined, RESP>(\n        result.body.resource_url\n      );\n    }\n\n    return result.body;\n  }\n}\n\nexport { CommandExecutor };\n"],"names":["AsyncRetrier","uuidv4"],"mappings":"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"}
+{"version":3,"file":"command-executor.js","sources":["../src/command-executor.ts"],"sourcesContent":["import { TwilsockClient, HttpResponse, HttpRequest } from \"twilsock\";\nimport { AsyncRetrier } from \"@twilio/operation-retrier\";\nimport { nanoid } from \"nanoid\";\n\nexport interface CommandExecutorServices {\n  transport: TwilsockClient;\n}\n\nconst trimSlashes = (url: string): string => url.replace(/(^\\/+|\\/+$)/g, \"\");\n\nconst isMutationConflictResponse = (response: HttpResponse): boolean =>\n  response.statusCode === 202;\n\nclass CommandExecutor {\n  constructor(\n    private _serviceUrl: string,\n    private _services: CommandExecutorServices,\n    private _productId?: string\n  ) {}\n\n  private _preProcessUrl(url: string): string {\n    const trimmedUrl = trimSlashes(url);\n\n    if (/^https?:\\/\\//.test(url)) {\n      return trimmedUrl;\n    }\n\n    return `${trimSlashes(this._serviceUrl)}/${trimmedUrl}`;\n  }\n\n  private async _makeRequest<REQ = void, RESP = void>(\n    method: \"get\" | \"post\" | \"delete\",\n    url: string,\n    requestBody?: REQ,\n    headers?: Record<string, string>\n  ): Promise<HttpResponse> {\n    const preProcessedUrl = this._preProcessUrl(url);\n    const finalHeaders = {\n      \"Content-Type\": \"application/json; charset=utf-8\",\n      ...(headers || {}),\n    };\n    let response: HttpResponse;\n\n    switch (method) {\n      case \"get\":\n        let getUrl = preProcessedUrl;\n\n        if (requestBody) {\n          getUrl +=\n            \"?\" +\n            Object.entries(requestBody)\n              .map((entry) =>\n                entry\n                  .map((component) => encodeURIComponent(String(component)))\n                  .join(\"=\")\n              )\n              .join(\"&\");\n        }\n\n        response = await this._services.transport.sendRequest(\n          new HttpRequest({\n            url: getUrl,\n            headers: finalHeaders,\n            grant: this._productId,\n          })\n        );\n        break;\n      case \"post\":\n        response = await this._services.transport.sendRequest(\n          new HttpRequest({\n            method: \"POST\",\n            url: preProcessedUrl,\n            headers: finalHeaders,\n            payload: JSON.stringify(requestBody),\n            grant: this._productId,\n          })\n        );\n        break;\n      case \"delete\":\n        response = await this._services.transport.sendRequest(\n          new HttpRequest({\n            method: \"DELETE\",\n            url: preProcessedUrl,\n            headers: finalHeaders,\n            grant: this._productId,\n          })\n        );\n        break;\n    }\n\n    if (response.statusCode < 200 || response.statusCode >= 300) {\n      throw new Error(\n        `Request responded with a non-success code ${response.statusCode}`\n      );\n    }\n\n    return response;\n  }\n\n  public async fetchResource<REQ = void, RESP = void>(\n    url: string,\n    requestBody?: REQ\n  ): Promise<RESP> {\n    const maxAttemptsCount = 6;\n    try {\n      // todo: remove any after the release of new Twilsock\n      const result = await new AsyncRetrier({\n        min: 50,\n        max: 1600,\n        maxAttemptsCount,\n      }).run(() => this._makeRequest<REQ, RESP>(\"get\", url, requestBody));\n      return JSON.parse(result.payload);\n    } catch (E) {\n      throw new Error(`Fetch resource from \"${url}\" failed.`);\n    }\n  }\n\n  public async mutateResource<REQ = void, RESP = void>(\n    method: \"post\" | \"delete\",\n    url: string,\n    requestBody?: REQ\n  ): Promise<RESP> {\n    // todo: remove any after the release of new Twilsock\n    const result = await this._makeRequest<REQ, RESP>(\n      method,\n      url,\n      requestBody,\n      {\n        \"X-Twilio-Mutation-Id\": nanoid(),\n      }\n    );\n\n    let parsedPayload: any = {};\n    try {\n      parsedPayload = JSON.parse(result.payload);\n    } catch {}\n\n    if (isMutationConflictResponse(result)) {\n      return await this.fetchResource<undefined, RESP>(\n        parsedPayload.resource_url\n      );\n    }\n\n    return parsedPayload;\n  }\n}\n\nexport { CommandExecutor };\n"],"names":["HttpRequest","AsyncRetrier","nanoid"],"mappings":"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"}

package/dist/conversation.js

@@ -443,6 +443,7 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
         const url = new index.UriBuilder(this._configuration.links.conversations)
             .path(this.sid)
             .build();
+        // todo: remove any after the release of new Twilsock
         const response = await this._services.network.get(url);
         return (_a = response.body.participants_count) !== null && _a !== void 0 ? _a : 0;
     }
@@ -476,11 +477,12 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
         const url = new index.UriBuilder(this._configuration.links.conversations)
             .path(this.sid)
             .build();
+        // todo: remove any after the release of new Twilsock
         const response = await this._services.network.get(url);
         return (_a = response.body.messages_count) !== null && _a !== void 0 ? _a : 0;
     }
     /**
-     * Get unread messages count for the user if they are a participant of this
+     * Get count of unread messages for the user if they are a participant of this
      * conversation. Rejects if the user is not a participant of the conversation.
      *
      * Use this method to obtain the number of unread messages together with
@@ -488,17 +490,25 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
      * message indices which may have gaps. See {@link Message.index} for details.
      *
      * This method is semi-realtime. This means that this data will be eventually
-     * correct, but will also be possibly incorrect for a few seconds. The
+     * correct, but it will also be possibly incorrect for a few seconds. The
      * Conversations system does not provide real time events for counter values
      * changes.
      *
      * This is useful for any UI badges, but it is not recommended to build any
      * core application logic based on these counters being accurate in real time.
+     *
+     * If the read horizon is not set, this function will return null. This could mean
+     * that all messages in the conversation are unread, or that the read horizon system
+     * is not being used. How to interpret this `null` value is up to the customer application.
+     *
+     * @return Number of unread messages based on the current read horizon set for
+     * the user or `null` if the read horizon is not set.
      */
     async getUnreadMessagesCount() {
         const url = new index.UriBuilder(this._configuration.links.myConversations)
             .path(this.sid)
             .build();
+        // todo: remove any after the release of new Twilsock
         const response = await this._services.network.get(url);
         if (response.body.conversation_sid !== this.sid) {
             throw new Error("Conversation was not found in the user conversations list");
@@ -545,13 +555,48 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
      * @return Index of the new message.
      */
     async sendMessage(message, messageAttributes, emailOptions) {
-        var _a, _b;
-        if (typeof message === "string" || message === null) {
-            const response = await this._messagesEntity.send(message, messageAttributes, emailOptions);
-            return (_a = index.parseToNumber(response.index)) !== null && _a !== void 0 ? _a : 0;
+        const response = typeof message === "string" || message === null
+            ? await this._messagesEntity.send(message, messageAttributes, emailOptions)
+            : await this._messagesEntity.sendMedia(message, messageAttributes, emailOptions);
+        const type = typeof message === "string" || message === null ? "text" : "media";
+        let responseAttributes;
+        try {
+            responseAttributes = JSON.parse(response.attributes);
         }
-        const response = await this._messagesEntity.sendMedia(message, messageAttributes, emailOptions);
-        return (_b = index.parseToNumber(response.index)) !== null && _b !== void 0 ? _b : 0;
+        catch (e) { }
+        const messageData = {
+            sid: response.sid,
+            text: response.body,
+            type,
+            author: response.author,
+            subject: response.subject,
+            lastUpdatedBy: response.participant_sid,
+            attributes: responseAttributes,
+            dateUpdated: response.date_updated,
+            timestamp: response.date_created,
+            memberSid: response.participant_sid,
+            medias: Array.isArray(response.media)
+                ? response.media.map((media) => ({
+                    sid: media["sid"],
+                    size: Number(media["size"]),
+                    category: media["category"],
+                    filename: media["filename"],
+                    contentType: media["content_type"],
+                }))
+                : null,
+            media: response.media &&
+                typeof response.media === "object" &&
+                !Array.isArray(response.media)
+                ? {
+                    sid: response.media["sid"],
+                    size: Number(response.media["size"]),
+                    category: response.media["category"],
+                    filename: response.media["filename"],
+                    contentType: response.media["content_type"],
+                }
+                : null,
+        };
+        return this._messagesEntity._upsertMessage(response.index, messageData);
     }
     /**
      * New interface to prepare for sending a message.
@@ -576,7 +621,7 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
     }
     /**
      * Set all messages in the conversation unread.
-     * @return Resulting unread messages count in the conversation.
+     * @returns New count of unread messages after this update.
      */
     async setAllMessagesUnread() {
         await this._subscribeStreams();
@@ -624,7 +669,7 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
      * Set the last read message index to the current read horizon.
      * @param index Message index to set as last read. If null is provided, then
      * the behavior is identical to {@link Conversation.setAllMessagesUnread}.
-     * @returns Resulting unread messages count in the conversation.
+     * @returns New count of unread messages after this update.
      */
     async updateLastReadMessageIndex(index) {
         await this._subscribeStreams();
@@ -675,6 +720,29 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
             throw err;
         }
     }
+    /**
+     * Fetch participants and messages of the conversation. This method needs to
+     * be called during conversation initialization to catch broken conversations
+     * (broken conversations are conversations that have essential Sync entities
+     * missing, i.e. the conversation document, the messages list or the
+     * participant map). In case of this conversation being broken, the method
+     * will throw an exception that will be caught and handled gracefully.
+     * @internal
+     */
+    async _fetchStreams() {
+        var _a, _b;
+        await this._subscribe();
+        Conversation._logger.trace("_streamsAvailable, this.entity.data=", (_a = this._entity) === null || _a === void 0 ? void 0 : _a.data);
+        const data = (_b = this._entity) === null || _b === void 0 ? void 0 : _b.data;
+        this._messagesList = await this._services.syncClient.list({
+            id: data.messages,
+            mode: "open_existing",
+        });
+        this._participantsMap = await this._services.syncClient.map({
+            id: data.roster,
+            mode: "open_existing",
+        });
+    }
     /**
      * Load the attributes of this conversation and instantiate its participants
      * and messages. This or _subscribe will need to be called before any events
@@ -683,7 +751,7 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
      * @internal
      */
     async _subscribeStreams() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         try {
             await this._subscribe();
             Conversation._logger.trace("_subscribeStreams, this.entity.data=", (_a = this._entity) === null || _a === void 0 ? void 0 : _a.data);
@@ -691,8 +759,8 @@ class Conversation extends replayEventEmitter.ReplayEventEmitter {
             const messagesObjectName = data.messages;
             const rosterObjectName = data.roster;
             await Promise.all([
-                this._messagesEntity.subscribe(messagesObjectName),
-                this._participantsEntity.subscribe(rosterObjectName),
+                this._messagesEntity.subscribe((_c = this._messagesList) !== null && _c !== void 0 ? _c : messagesObjectName),
+                this._participantsEntity.subscribe((_d = this._participantsMap) !== null && _d !== void 0 ? _d : rosterObjectName),
             ]);
         }
         catch (err) {