pusher-chatkit-server 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e70875d940a106dfbf2fbc0bc25aaad3b77250c5
-  data.tar.gz: 1964d162f71ad76702585857fac6554e9f3e2881
+SHA256:
+  metadata.gz: f132c6890c4c1b9c7ca4230ba21170ec33279c8dddc1d8a8536bf7210e5f4bcb
+  data.tar.gz: 4fa2791c7b84d65494cd71554dfda3bff2d2eec030cda828bc6dd1647d235a16
 SHA512:
-  metadata.gz: 54ca178a9cf6477f6e7e211f777d159ba665c6ab9f1e05d5007bf3f9d30b6504f4f3210bde47551dc603e79e382d5b03d0d5bdb192b7a467adfc55d38597aff8
-  data.tar.gz: e739b131e772e32a34d2bcf8e331dfcd4772eeb8e7490604a5ff19275cbbbc5d9e05ae49c2891b49673a19971b28fedf8c91aeb9720e3d2079dc4f52d3736bfa
+  metadata.gz: 60220ad10c2e728fc8e2cf7fb902c79226707a992c5ccabcc1ade0387af24accdaa9787ae3b020116f762d8d82d33ffc6dfb3b21f21716c493d78345d2a1e185
+  data.tar.gz: c3c01e8ed88377b3b0fc494bc3ddc12f13b63479b043675906b61b46a495e1b2307f61c3d54e09e314b9c781e5187fb77dc8cfabc7b70caf3d367e37d580f268

data/lib/chatkit/client.rb

@@ -1,10 +1,12 @@
 require 'pusher-platform'
 require 'json'
 require 'cgi'
+require 'excon'
 
 require_relative './error'
 require_relative './missing_parameter_error'
 require_relative './response_error'
+require_relative './upload_error'
 
 module Chatkit
 
@@ -12,7 +14,10 @@ module Chatkit
   GLOBAL_SCOPE = "global"
 
   class Client
-    attr_accessor :api_instance, :authorizer_instance, :cursors_instance
+    attr_accessor :api_instance,
+                  :api_v2_instance,
+                  :authorizer_instance,
+                  :cursors_instance
 
     def initialize(options)
       base_options = {
@@ -27,13 +32,20 @@ module Chatkit
         })
       }
 
-      @api_instance = PusherPlatform::Instance.new(
+      @api_v2_instance = PusherPlatform::Instance.new(
         base_options.merge({
           service_name: 'chatkit',
           service_version: 'v2'
         })
       )
 
+      @api_instance = PusherPlatform::Instance.new(
+        base_options.merge({
+          service_name: 'chatkit',
+          service_version: 'v3'
+        })
+      )
+
       @authorizer_instance = PusherPlatform::Instance.new(
         base_options.merge({
           service_name: 'chatkit_authorizer',
@@ -206,7 +218,7 @@ module Chatkit
         name: options[:name],
         private: options[:private] || false
       }
-      
+
       body[:custom_data] = options[:custom_data] unless options[:custom_data].nil?
 
       unless options[:user_ids].nil?
@@ -328,6 +340,26 @@ module Chatkit
 
     # Messages API
 
+    def fetch_multipart_messages(options)
+      verify({
+        room_id: "You must provide the ID of the room to send the message to",
+      }, options)
+
+      if !options[:limit].nil? and options[:limit] <= 0
+        raise Chatkit::MissingParameterError.new("Limit must be greater than 0")
+      end
+
+      optional_params = [:initial_id, :direction, :limit]
+      query_params = options.select { |key,_| optional_params.include? key }
+
+      api_request({
+        method: "GET",
+        path: "/rooms/#{CGI::escape options[:room_id]}/messages",
+        query: query_params,
+        jwt: generate_su_token[:token]
+      })
+    end
+
     def get_room_messages(options)
       if options[:room_id].nil?
         raise Chatkit::MissingParameterError.new("You must provide the ID of the room to fetch messages from")
@@ -338,7 +370,7 @@ module Chatkit
       query_params[:direction] = options[:direction] unless options[:direction].nil?
       query_params[:limit] = options[:limit] unless options[:limit].nil?
 
-      api_request({
+      api_v2_request({
         method: "GET",
         path: "/rooms/#{CGI::escape options[:room_id]}/messages",
         query: query_params,
@@ -346,6 +378,65 @@ module Chatkit
       })
     end
 
+    def send_simple_message(options)
+      verify({text: "You must provide some text for the message",
+             }, options)
+
+      options[:parts] = [{type: "text/plain",
+                          content: options[:text]
+                         }]
+
+      send_multipart_message(options)
+    end
+
+    def send_multipart_message(options)
+      verify({
+        room_id: "You must provide the ID of the room to send the message to",
+        sender_id: "You must provide the ID of the user sending the message",
+        parts: "You must provide a parts array",
+      }, options)
+
+      if not options[:parts].length > 0
+        raise Chatkit::MissingParameterError.new("parts array must have at least one item")
+      end
+
+      # this assumes the token lives long enough to finish all S3 uploads
+      token = generate_su_token({ user_id: options[:sender_id] })[:token]
+
+      request_parts = options[:parts].map { |part|
+        verify({type: "Each part must define a type"}, part)
+
+        if !part[:content].nil?
+          {
+            type: part[:type],
+            content: part[:content]
+          }
+        elsif !part[:url].nil?
+          {
+            type: part[:type],
+            url: part[:url]
+          }
+        elsif !part[:file].nil?
+          attachment_id = upload_attachment(token, options[:room_id], part)
+          {
+            type: part[:type],
+            attachment: {id: attachment_id},
+            name: part[:name],
+            customData: part[:customData]
+          }.reject{ |_,v| v.nil? }
+        else
+          raise Chatkit::MissingParameterError.new("Each part must have one of :file, :content or :url")
+        end
+      }
+
+      api_request({
+        method: "POST",
+        path: "/rooms/#{CGI::escape options[:room_id]}/messages",
+        body: {parts: request_parts},
+        jwt: token
+      })
+    end
+
     def send_message(options)
       if options[:room_id].nil?
         raise Chatkit::MissingParameterError.new("You must provide the ID of the room to send the message to")
@@ -380,7 +471,7 @@ module Chatkit
         attachment: options[:attachment]
       }
 
-      api_request({
+      api_v2_request({
         method: "POST",
         path: "/rooms/#{CGI::escape options[:room_id]}/messages",
         body: payload,
@@ -551,6 +642,10 @@ module Chatkit
 
     # Service-specific helpers
 
+    def api_v2_request(options)
+      make_request(@api_v2_instance, options)
+    end
+
     def api_request(options)
       make_request(@api_instance, options)
     end
@@ -713,5 +808,54 @@ module Chatkit
         jwt: generate_su_token[:token]
       })
     end
+
+    def upload_attachment(token, room_id, part)
+      body = part[:file]
+      content_length = body.length
+      content_type = part[:type]
+
+      if content_length <= 0
+        raise Chatkit::MissingParameterError.new("File contents size must be greater than 0")
+      end
+
+      attachment_req = {
+        content_type: content_type,
+        content_length: content_length
+      }
+
+      attachment_response = api_request({
+        method: "POST",
+        path: "/rooms/#{CGI::escape room_id}/attachments",
+        body: attachment_req,
+        jwt: token
+      })
+
+      url = attachment_response[:body][:upload_url]
+      connection = Excon.new(url, :omit_default_port => true)
+      upload_response = connection.put(
+        :body => body,
+        :headers => {
+          "Content-Type" => content_type,
+          "Content-Length" => content_length
+        }
+      )
+
+      if upload_response.status != 200
+        error = {message: "Failed to upload attachment",
+                 response_object: upload_response
+                }
+        raise Chatkit::UploadError.new(error)
+      end
+
+      attachment_response[:body][:attachment_id]
+    end
+
+    def verify(required, options)
+      required.each { |field_name, message|
+        if options[field_name].nil?
+          raise Chatkit::MissingParameterError.new(message)
+        end
+      }
+    end
   end
 end

data/lib/chatkit/upload_error.rb

@@ -0,0 +1,17 @@
+require_relative './error'
+
+module Chatkit
+  class UploadError < Chatkit::Error
+    attr_accessor :message, :response_object
+
+    def initialize(error)
+      @message = error[:message]
+      @response_object = error[:response_object]
+    end
+
+    def to_s
+      "Chatkit::MissingParameterError - #{@message}"
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-chatkit-server
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pusher-platform
@@ -35,6 +35,7 @@ files:
 - lib/chatkit/error.rb
 - lib/chatkit/missing_parameter_error.rb
 - lib/chatkit/response_error.rb
+- lib/chatkit/upload_error.rb
 homepage: 
 licenses:
 - MIT
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Pusher Chatkit Ruby SDK