chat_sdk-twilio 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc87081e5f73062ceca69352d629ccd36ef472c3cfc97286155cc0bf986b390
-  data.tar.gz: db50794cf99b08704523fbc4beb5a738c33ba2066bb0968551d2c20383f31bff
+  metadata.gz: d2dd3ae8329cad676f451bc464b2eafeef1ce820389c90d62e07188d0d1972b7
+  data.tar.gz: 6cf517080a7184e81c90a99c6f27a8c61a054212bf6e2051e8088c42b23eff35
 SHA512:
-  metadata.gz: 7ee44299da16c9d8338c329fada752407ff6d239a136b57a60e956f3b2c4ab3d579b5be4664328836f9a386c182d7e0fdac95108ebe3930fc7bd91090c38bf54
-  data.tar.gz: fe4ac529e7287687f4063c3aa81b4d8be0e5feb4a4aa00dff5eddb93c6038990551479a9c7a27873b432be5fc69cd382cab975d2138151268237990fccc2b227
+  metadata.gz: aa5c5d88e8acaf27c337b714fbf86f7697e38419247cbac6ccb5371e5cbfcb9be75ae58c828f32972d91d8e5b139ebb8b68f22bf49f5080ae27f1c3209ab855c
+  data.tar.gz: a117515eafebd41117bdde2c37096ec91220c6e0aea0c677beabbf79702f3c92df6832b856305a100204cc86db488529a06b65ba225e09da4ce4b89f4e6b2e4f

data/lib/chat_sdk/twilio/adapter.rb

@@ -5,16 +5,24 @@ require "rack/utils"
 module ChatSDK
   module Twilio
     class Adapter < ChatSDK::Adapter::Base
-      capabilities :direct_messages, :message_history, :delete_messages
+      capabilities :direct_messages, :message_history, :delete_messages, :typing_indicator
 
       attr_reader :client
 
-      def initialize(account_sid: nil, auth_token: nil, phone_number: nil, messaging_service_sid: nil, webhook_url: nil)
+      def initialize(
+        account_sid: nil,
+        auth_token: nil,
+        phone_number: nil,
+        messaging_service_sid: nil,
+        webhook_url: nil,
+        messaging_api_url: nil
+      )
         @account_sid = account_sid || ENV["TWILIO_ACCOUNT_SID"]
         @auth_token = auth_token || ENV["TWILIO_AUTH_TOKEN"]
         @phone_number = phone_number || ENV["TWILIO_PHONE_NUMBER"]
         @messaging_service_sid = messaging_service_sid || ENV["TWILIO_MESSAGING_SERVICE_SID"]
         @webhook_url = webhook_url
+        @messaging_api_url = messaging_api_url || ENV["TWILIO_MESSAGING_API_URL"] || "https://messaging.twilio.com"
 
         raise ChatSDK::ConfigurationError, "Twilio account_sid required" unless @account_sid
         raise ChatSDK::ConfigurationError, "Twilio auth_token required" unless @auth_token
@@ -72,6 +80,27 @@ module ChatSDK
         parse_twilio_message(result, channel_id)
       end
 
+      def send_template(channel_id:, content_sid:, content_variables: nil)
+        result = @client.send_template(
+          to: channel_id,
+          content_sid: content_sid,
+          content_variables: content_variables,
+          from: @phone_number,
+          messaging_service_sid: @messaging_service_sid
+        )
+
+        parse_twilio_message(result, channel_id)
+      end
+
+      def start_typing(channel_id:, thread_id: nil, message_id: nil) # rubocop:disable Lint/UnusedMethodArgument
+        return if message_id.to_s.empty?
+
+        body = typing_indicator_body(channel_id, message_id)
+        return unless body
+
+        @client.start_typing(body: body, messaging_api_url: @messaging_api_url)
+      end
+
       def fetch_messages(channel_id:, thread_id: nil, limit: 20) # rubocop:disable Lint/UnusedMethodArgument
         result = @client.list_messages(to: channel_id, limit: limit)
         messages = (result["messages"] || []).map do |msg|
@@ -93,7 +122,7 @@ module ChatSDK
         [messages, nil]
       end
 
-      def delete_message(channel_id:, message_id:) # rubocop:disable Lint/UnusedMethodArgument
+      def delete_message(channel_id:, message_id:, **_options) # rubocop:disable Lint/UnusedMethodArgument
         @client.delete_message(message_sid: message_id)
       end
 
@@ -121,6 +150,14 @@ module ChatSDK
         msg.text || msg.card&.fallback_text || ""
       end
 
+      def typing_indicator_body(channel_id, message_id)
+        if channel_id.to_s.start_with?("whatsapp:")
+          {"channel" => "WHATSAPP", "messageId" => message_id}
+        elsif @phone_number.to_s.start_with?("rcs:") && channel_id.to_s.start_with?("rcs:")
+          {"channel" => "RCS", "event" => "START", "from" => @phone_number, "to" => channel_id}
+        end
+      end
+
       def parse_twilio_message(data, channel_id)
         ChatSDK::Message.new(
           id: data["sid"],

data/lib/chat_sdk/twilio/api_client.rb

@@ -20,6 +20,26 @@ module ChatSDK
         handle_response(response)
       end
 
+      def send_template(to:, content_sid:, content_variables: nil, from: nil, messaging_service_sid: nil)
+        params = {"To" => to, "ContentSid" => content_sid}
+        if content_variables
+          params["ContentVariables"] = content_variables.is_a?(String) ? content_variables : JSON.generate(content_variables)
+        end
+        params["From"] = from if from
+        params["MessagingServiceSid"] = messaging_service_sid if messaging_service_sid
+
+        response = connection.post(messages_path, URI.encode_www_form(params))
+        handle_response(response)
+      end
+
+      def start_typing(body:, messaging_api_url: "https://messaging.twilio.com")
+        response = messaging_connection(messaging_api_url).post(
+          "/v3/Indicators/Typing.json",
+          JSON.generate(body)
+        )
+        handle_response(response)
+      end
+
       def list_messages(to: nil, from: nil, limit: 20)
         params = {"PageSize" => limit.to_s}
         params["To"] = to if to
@@ -50,6 +70,15 @@ module ChatSDK
         end
       end
 
+      def messaging_connection(url)
+        Faraday.new(url: url) do |f|
+          f.request :authorization, :basic, @account_sid, @auth_token
+          f.headers["Content-Type"] = "application/json"
+          f.response :json
+          f.adapter :net_http
+        end
+      end
+
       def handle_response(response)
         body = response.body
 
@@ -66,8 +95,10 @@ module ChatSDK
         end
 
         message = body.is_a?(Hash) ? body["message"] : response.status
+        code = body.is_a?(Hash) ? body["code"] : nil
+        error = code ? "Twilio API error (#{code}): #{message}" : "Twilio API error: #{message}"
         raise ChatSDK::PlatformError.new(
-          "Twilio API error: #{message}",
+          error,
           status: response.status,
           body: body,
           adapter_name: :twilio

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-twilio
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Quentin Rousseau
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement