selfsdk 0.0.179 → 0.0.184

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f79c82e418ad27688b7d9f0f2635937a69f7c805a71611a02529a8d10ced9709
-  data.tar.gz: aa77a30f37b6a71acf1aeed6a77112ca08505f91598b462962fb68f45e483c31
+  metadata.gz: 2c16f1734a708b0ebd37ca4fa0cea0e48db09344d4efb0654e5b4df6a37fd2d4
+  data.tar.gz: 32313fa1c28a57370c43d7100bdacc06bad28f0722ba0589a63c24bd0327bfd2
 SHA512:
-  metadata.gz: ef6bb03cab8de8e44af7fad1f19a623345c6cd6fe00a4c1e0f35ab526e6b6523e2d8cd668c66d17cd85b5cf254f31a9e0dad4bbfc9c0a4301c3d67a044910d2f
-  data.tar.gz: e7d3ce5591ea749537a6a2ee580b240b7033a6b4f6f2ba8fa3d64d11814d722844862e40a06c495a447bda01888be2f9b4e085fedb5534a5a89a75c7cfa4e965
+  metadata.gz: 9a015baa1ed364efcc422af5de6a54f87cbb953cdb45de7f397aa8cd2273b99c8ce4f6fbba0fc62f0ef803f38edf8155fbb1e9e14042b4f4ff76b391147da614
+  data.tar.gz: dfec1973db212e016774292d57bda452727cadd201ecdb80ab0f507a97ff3df244887ffde06704a618de63e0d101c75b7e8c879ff983654892d9496a50db7889

data/lib/chat/file_object.rb

@@ -0,0 +1,97 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+require 'open-uri'
+
+module SelfSDK
+  module Chat
+    class FileObject
+      attr_accessor :link, :mime, :content, :key, :nonce, :ciphertext
+
+      def initialize(token, url)
+        @token = token
+        @url = url
+      end
+
+      def build_from_data(name, data, mime)
+        @key = SelfCrypto::Util.aead_xchacha20poly1305_ietf_keygen
+        @nonce = SelfCrypto::Util.aead_xchacha20poly1305_ietf_nonce
+        @content = data
+        @name = name
+        @mime = mime
+
+        # encrypt the object
+        @ciphertext = SelfCrypto::Util.aead_xchacha20poly1305_ietf_encrypt(@key, @nonce, @content)
+
+        # Upload
+        remote_object = upload(ciphertext)
+        @link = "#{@url}/v1/objects/#{remote_object["id"]}"
+        @expires = remote_object["expires"]
+
+        self
+      end
+
+      # Incoming objects
+      def build_from_object(input)
+        # Download from CDN
+        ciphertext = URI.open(input[:link], "Authorization" => "Bearer #{@token}").read
+
+        @content = ciphertext
+        @key = nil
+        @nonce = nil
+        if input.key?(:key) && !input[:key].empty?
+          # Decrypt
+          composed_key = extract_key(input[:key])
+          @key =   composed_key[:key]
+          @nonce = composed_key[:nonce]
+
+          @content = SelfCrypto::Util.aead_xchacha20poly1305_ietf_decrypt(@key, @nonce, ciphertext)
+        end
+
+        @name =  input[:name]
+        @link =  input[:link]
+        @mime =  input[:mime]
+        @expires = input[:expires]
+
+        self
+      end
+
+      def to_payload
+        {
+          name: @name,
+          link: @link,
+          key: build_key(@key, @nonce),
+          mime: @mime,
+          expires: @expires
+        }
+      end
+
+      def save(path)
+        File.open(path, 'wb') { |file| file.write(@content) }
+      end
+
+      private
+
+      def upload(ciphertext)
+        uri = URI.parse("#{@url}/v1/objects")
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        req = Net::HTTP::Post.new(uri.path)
+        req["Authorization"] = "Bearer #{@token}"
+        req.body = ciphertext.force_encoding("UTF-8")
+        res = https.request(req)
+        JSON.parse(res.body)
+      end
+
+      def build_key(key, nonce)
+        Base64.urlsafe_encode64("#{key}#{nonce}", padding: false)
+      end
+
+      def extract_key(shareable_key)
+        k = Base64.urlsafe_decode64(shareable_key)
+        { key: k[0, 32],
+          nonce: k[32, (k.length - 32)] }
+      end
+    end
+  end
+end

data/lib/chat/group.rb

@@ -0,0 +1,51 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+module SelfSDK
+  module Chat
+    class Group
+      attr_accessor :gid, :name, :members, :payload
+
+      def initialize(chat, payload)
+        @chat = chat
+        @payload = payload
+        @gid = payload[:gid]
+        @members = payload[:members]
+        @name = payload[:name]
+        @link = payload[:link] if payload.key? :link
+        @key = payload[:key] if payload.key? :key
+        @mime = payload[:mime] if payload.key? :mime
+      end
+
+      # Sends an invitation to the specified user to join
+      # the group.
+      #
+      # @param user [String] user to be invited.
+      def invite(user)
+        raise "invalid input" if user.empty?
+
+        @members << user
+        @chat.invite(@gid, @name, @members)
+      end
+
+      # Sends a message to leave the current group.
+      def leave
+        @chat.leave(@gid, @members)
+      end
+
+      # Sends a confi¡rmation message that has joined the group.
+      def join
+        @chat.join(@gid, @members)
+      end
+
+      # Sends a message to the current group
+      #
+      # @param body [String] message body to be sent.
+      def message(body, opts = {})
+        opts[:gid] = @gid
+        @chat.message(@members, body, opts)
+      end
+    end
+  end
+end

data/lib/chat/message.rb

@@ -0,0 +1,101 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+module SelfSDK
+  module Chat
+    class Message
+      attr_accessor :gid, :body, :from, :payload, :recipients, :objects
+
+      def initialize(chat, recipients, payload, auth_token, self_url)
+        @chat = chat
+        @recipients = recipients
+        @recipients = [@recipients] if @recipients.is_a? String
+        @gid = payload[:gid] if payload.key? :gid
+        @payload = payload
+        @payload[:jti] = SecureRandom.uuid unless @payload.include?(:jti)
+        @body = @payload[:msg]
+        @from = @payload[:iss]
+        return unless @payload.key?(:objects)
+
+        @objects = []
+        @payload[:objects].each do |o|
+          @objects << if o.key? :link
+                        SelfSDK::Chat::FileObject.new(auth_token, self_url).build_from_object(o)
+                      else
+                        SelfSDK::Chat::FileObject.new(auth_token, self_url).build_from_data(o[:name], o[:data], o[:mime])
+                      end
+        end
+        @payload[:objects] = []
+        @payload[:objects] = payload[:raw_objects] if payload[:raw_objects]
+        @objects.each do |o|
+          @payload[:objects] << o.to_payload
+        end
+      end
+
+      # delete! deletes the current message from the conversation.
+      def delete!
+        @chat.delete(@recipients, @payload[:jti], @payload[:gid])
+      end
+
+      # edit changes the current message body for all participants.
+      #
+      # @param body [string] the new message body.
+      def edit(body)
+        return if @recipients == [@chat.app_id]
+
+        @body = body
+        @chat.edit(@recipients, @payload[:jti], body, @payload[:gid])
+      end
+
+      # mark_as_delivered marks the current message as delivered if 
+      # it comes from another recipient.
+      def mark_as_delivered
+        return if @recipients != [@chat.app_id]
+
+        @chat.delivered(@payload[:iss], @payload[:jti], @payload[:gid])
+      end
+
+      # mark_as_read marks the current message as read if it comes from
+      # another recipient.
+      def mark_as_read
+        return if @recipients != [@chat.app_id]
+
+        @chat.read(@payload[:iss], @payload[:jti], @payload[:gid])
+      end
+
+      # respond sends a direct response to the current message.
+      #
+      # @param body [string] the new message body.
+      #
+      # @return ChatMessage
+      def respond(body)
+        opts = {}
+        opts[:aud] = @payload[:gid] if @payload.key? :gid
+        opts[:gid] = @payload[:gid] if @payload.key? :gid
+        opts[:rid] = @payload[:jti]
+
+        to = @recipients
+        to = [@payload[:iss]] if @recipients == [@chat.app_id]
+
+        @chat.message(to, body, opts)
+      end
+
+      # message sends a new message to the same conversation as the current message.
+      #
+      # @param body [string] the new message body.
+      #
+      # @return ChatMessage
+      def message(body, opts = {})
+        opts[:aud] = @payload[:gid] if @payload.key? :gid
+        opts[:gid] = @payload[:gid] if @payload.key? :gid
+
+        to = opts[:recipients] if opts.key? :recipients
+        to = [@payload[:iss]] if @recipients == [@chat.app_id]
+
+        @chat.message(to, body, opts)
+      end
+
+    end
+  end
+end

data/lib/crypto.rb

@@ -32,9 +32,82 @@ module SelfSDK
       end
     end
 
-    def encrypt(message, recipient, recipient_device)
-      session_file_name = session_path(recipient, recipient_device)
+    def encrypt(message, recipients)
+      ::SelfSDK.logger.debug('encrypting a message')
 
+      # create a group session and set the identity of the account youre using
+      ::SelfSDK.logger.debug('create a group session and set the identity of the account youre using')
+      gs = SelfCrypto::GroupSession.new("#{@client.jwt.id}:#{@device}")
+
+      sessions = {}
+      ::SelfSDK.logger.debug('managing sessions with all recipients')
+      recipients.each do |r|
+        session_file_name = session_path(r[:id], r[:device_id])
+        session_with_bob = nil
+
+        begin
+          session_with_bob = get_outbound_session_with_bob(r[:id], r[:device_id], session_file_name)
+        rescue => e
+          ::SelfSDK.logger.warn("  there is a problem adding group participant #{r[:id]}:#{r[:device_id]}, skipping...")
+          ::SelfSDK.logger.warn(e)
+          next
+        end
+
+        ::SelfSDK.logger.debug("  adding group participant #{r[:id]}:#{r[:device_id]}")
+        gs.add_participant("#{r[:id]}:#{r[:device_id]}", session_with_bob)
+        sessions[session_file_name] = session_with_bob
+      end
+
+      # 5) encrypt a message
+      ::SelfSDK.logger.debug("group encrypting message")
+      ct = gs.encrypt(message).to_s
+
+      # 6) store the session to a file
+      ::SelfSDK.logger.debug("storing sessions")
+      sessions.each do |session_file_name, session_with_bob|
+        File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
+      end
+
+      ct
+    end
+
+    def decrypt(message, sender, sender_device)
+      ::SelfSDK.logger.debug("decrypting a message")
+      session_file_name = session_path(sender, sender_device)
+
+      ::SelfSDK.logger.debug("loading sessions")
+      session_with_bob = get_inbound_session_with_bob(message, session_file_name)
+
+      # 8) create a group session and set the identity of the account you're using
+      ::SelfSDK.logger.debug("create a group session and set the identity of the account #{@client.jwt.id}:#{@device}")
+      gs = SelfCrypto::GroupSession.new("#{@client.jwt.id}:#{@device}")
+
+      # 9) add all recipients and their sessions
+      ::SelfSDK.logger.debug("add all recipients and their sessions #{@sender}:#{@sender_device}")
+      gs.add_participant("#{sender}:#{sender_device}", session_with_bob)
+
+      # 10) decrypt the message ciphertext
+      ::SelfSDK.logger.debug("decrypt the message ciphertext")
+      pt = gs.decrypt("#{sender}:#{sender_device}", message).to_s
+
+      # 11) store the session to a file
+      ::SelfSDK.logger.debug("store the session to a file")
+      File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
+
+      pt
+    end
+
+    private
+
+    def account_path
+      "#{@storage_folder}/account.pickle"
+    end
+
+    def session_path(selfid, device)
+      "#{@storage_folder}/#{selfid}:#{device}-session.pickle"
+    end
+
+    def get_outbound_session_with_bob(recipient, recipient_device, session_file_name)
       if File.exist?(session_file_name)
         # 2a) if bob's session file exists load the pickle from the file
         session_with_bob = SelfCrypto::Session.from_pickle(File.read(session_file_name), @storage_key)
@@ -61,24 +134,10 @@ module SelfSDK
         session_with_bob = @account.outbound_session(curve25519_identity_key, one_time_key)
       end
 
-      # 3) create a group session and set the identity of the account youre using
-      gs = SelfCrypto::GroupSession.new("#{@client.jwt.id}:#{@device}")
-
-      # 4) add all recipients and their sessions
-      gs.add_participant("#{recipient}:#{recipient_device}", session_with_bob)
-
-      # 5) encrypt a message
-      ct = gs.encrypt(message).to_s
-
-      # 6) store the session to a file
-      File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
-
-      ct
+      session_with_bob
     end
 
-    def decrypt(message, sender, sender_device)
-      session_file_name = session_path(sender, sender_device)
-
+    def get_inbound_session_with_bob(message, session_file_name)
       if File.exist?(session_file_name)
         # 7a) if carol's session file exists load the pickle from the file
         session_with_bob = SelfCrypto::Session.from_pickle(File.read(session_file_name), @storage_key)
@@ -113,29 +172,8 @@ module SelfSDK
         File.write(account_path, @account.to_pickle(@storage_key))
       end
 
-      # 8) create a group session and set the identity of the account you're using
-      gs = SelfCrypto::GroupSession.new("#{@client.jwt.id}:#{@device}")
-
-      # 9) add all recipients and their sessions
-      gs.add_participant("#{sender}:#{sender_device}", session_with_bob)
-
-      # 10) decrypt the message ciphertext
-      pt = gs.decrypt("#{sender}:#{sender_device}", message).to_s
-
-      # 11) store the session to a file
-      File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
-
-      pt
+      session_with_bob
     end
 
-    private
-
-    def account_path
-      "#{@storage_folder}/account.pickle"
-    end
-
-    def session_path(selfid, device)      
-      "#{@storage_folder}/#{selfid}:#{device}-session.pickle"
-    end
   end
 end

data/lib/messages/authentication_req.rb

@@ -43,10 +43,10 @@ module SelfSDK
 
       def proto(to_device)
         m = SelfMsg::Message.new
-        m.id = SecureRandom.uuid
+        m.id = @id
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = "#{@to}:#{to_device}"
-        m.ciphertext = encrypt_message(@jwt.prepare(body), @to, to_device)
+        m.ciphertext = encrypt_message(@jwt.prepare(body), [{ id: @to, device_id: to_device }])
         m
       end
 

data/lib/messages/base.rb

@@ -10,6 +10,7 @@ module SelfSDK
                     :description, :sub, :exp_timeout
 
       def initialize(messaging)
+        @intermediary = nil
         @client = messaging.client
         @jwt = @client.jwt
         @messaging = messaging
@@ -44,8 +45,8 @@ module SelfSDK
         res.first
       end
 
-      def encrypt_message(message, recipient, recipient_device)
-        @messaging.encryption_client.encrypt(message, recipient, recipient_device)
+      def encrypt_message(message, recipients)
+        @messaging.encryption_client.encrypt(message, recipients)
       end
 
       def unauthorized?

data/lib/messages/chat.rb

@@ -0,0 +1,28 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require 'self_msgproto'
+require_relative 'base'
+require_relative '../ntptime'
+
+module SelfSDK
+  module Messages
+    class Chat < Base
+      def parse(input, envelope=nil)
+        @input = input
+        @payload = get_payload input
+        @id = @payload[:jti]
+        @from = @payload[:iss]
+        @to = @payload[:sub]
+        @audience = payload[:aud]
+        @expires = @payload[:exp]
+
+        if envelope
+          issuer = envelope.sender.split(":")
+          @from_device = issuer.last
+        end
+      end
+    end
+  end
+end

data/lib/messages/chat_invite.rb

@@ -0,0 +1,19 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require_relative 'chat'
+
+module SelfSDK
+  module Messages
+    class ChatInvite < Chat
+      MSG_TYPE = "chat.invite"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/chat_join.rb

@@ -0,0 +1,19 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require_relative 'chat'
+
+module SelfSDK
+  module Messages
+    class ChatJoin < Chat
+      MSG_TYPE = "chat.join"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/chat_message.rb

@@ -0,0 +1,23 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require_relative 'chat'
+
+module SelfSDK
+  module Messages
+    class ChatMessage < Chat
+      MSG_TYPE = "chat.message"
+      DEFAULT_EXP_TIMEOUT = 900
+
+      attr_accessor :body
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+        @body = @payload[:msg]
+      end
+
+    end
+  end
+end

data/lib/messages/chat_message_delivered.rb

@@ -0,0 +1,21 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require 'self_msgproto'
+require_relative 'chat'
+require_relative '../ntptime'
+
+module SelfSDK
+  module Messages
+    class ChatMessageDelivered < Chat
+      MSG_TYPE = "chat.message.delivered"
+      DEFAULT_EXP_TIMEOUT = 900
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+    end
+  end
+end

data/lib/messages/chat_message_read.rb

@@ -0,0 +1,20 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require_relative 'chat'
+
+module SelfSDK
+  module Messages
+    class ChatMessageRead < Chat
+      MSG_TYPE = "chat.message.read"
+      DEFAULT_EXP_TIMEOUT = 900
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/chat_remove.rb

@@ -0,0 +1,19 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require_relative 'chat'
+
+module SelfSDK
+  module Messages
+    class ChatRemove < Chat
+      MSG_TYPE = "chat.remove"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/fact_request.rb

@@ -34,6 +34,7 @@ module SelfSDK
         @options = opts.fetch(:options, false)
         @description = opts.include?(:description) ? opts[:description] : nil
         @exp_timeout = opts.fetch(:exp_timeout, DEFAULT_EXP_TIMEOUT)
+        @allowed_for = opts.fetch(:allowed_for, nil)
 
         @intermediary = if opts.include?(:intermediary)
                           opts[:intermediary]
@@ -89,6 +90,7 @@ module SelfSDK
         }
         b[:options] = @options unless (@options.nil? || @options == false)
         b[:description] = @description unless (@description.nil? || @description.empty?)
+        b[:allowed_until] = (SelfSDK::Time.now + @allowed_for).strftime('%FT%TZ') unless @allowed_for.nil?
         b
       end
 
@@ -98,14 +100,14 @@ module SelfSDK
         @to_device = to_device
         if @intermediary.nil?
           recipient = "#{@to}:#{@to_device}"
-          ciphertext = encrypt_message(@jwt.prepare(body), @to, @to_device)
+          ciphertext = encrypt_message(@jwt.prepare(body), [{id: @to, device_id: @to_device}])
         else
           recipient = "#{@intermediary}:#{@to_device}"
-          ciphertext = encrypt_message(@jwt.prepare(body), @intermediary, @to_device)
+          ciphertext = encrypt_message(@jwt.prepare(body), [{id: @intermediary, device_id: @to_device}])
         end
 
         m = SelfMsg::Message.new
-        m.id = SecureRandom.uuid
+        m.id = @id
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = recipient
         m.ciphertext = ciphertext

data/lib/messages/fact_response.rb

@@ -91,7 +91,7 @@ module SelfSDK
           id: SecureRandom.uuid,
           sender: "#{@jwt.id}:#{@messaging.device_id}",
           recipient: "#{@to}:#{@to_device}",
-          ciphertext: encrypt_message(@jwt.prepare(body), @to, @to_device)
+          ciphertext: encrypt_message(@jwt.prepare(body), [{id: @to, device_id: @to_device}])
         )
       end
     end

data/lib/messages/message.rb

@@ -6,6 +6,12 @@ require_relative "fact_request"
 require_relative "fact_response"
 require_relative "authentication_resp"
 require_relative "authentication_req"
+require_relative "chat_message"
+require_relative "chat_message_read"
+require_relative "chat_message_delivered"
+require_relative "chat_invite"
+require_relative "chat_join"
+require_relative "chat_remove"
 
 module SelfSDK
   module Messages
@@ -35,8 +41,26 @@ module SelfSDK
       when "identities.authenticate.req"
         m = AuthenticationReq.new(messaging)
         m.parse(body, envelope)
+      when SelfSDK::Messages::ChatMessage::MSG_TYPE
+        m = ChatMessage.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::ChatMessageDelivered::MSG_TYPE
+        m = ChatMessageDelivered.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::ChatMessageRead::MSG_TYPE
+        m = ChatMessageRead.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::ChatInvite::MSG_TYPE
+        m = ChatInvite.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::ChatRemove::MSG_TYPE
+        m = ChatRemove.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::ChatJoin::MSG_TYPE
+        m = ChatJoin.new(messaging)
+        m.parse(body, envelope)
       else
-        raise StandardError.new("Invalid message type.")
+        raise StandardError.new("Invalid message type #{payload[:typ]}.")
       end
       return m
     end

data/lib/messaging.rb

@@ -86,38 +86,56 @@ module SelfSDK
       m.id = SecureRandom.uuid 
       m.sender = "#{@jwt.id}:#{@device_id}"
       m.recipient = "#{recipient}:#{recipient_device}"
+      # TODO: this is unencrypted!!!
       m.ciphertext = @jwt.prepare(request)
 
       send_message m
     end
 
+    def session?(identifier, device)
+      path = @encryption_client.session_path(identifier, device)
+      File.file?(path)
+    end
+
     # Send custom mmessage
     #
     # @param recipient [string] selfID to be requested
     # @param type [string] message type
     # @param request [hash] original message requesing information
-    def send_custom(recipient, request_body)
-      @client.devices(recipient).each do |to_device|
+    def send_custom(recipients, request_body)
+      # convert argument into an array if is a string
+      recipients = [recipients] if recipients.is_a? String
+
+      # send to current identity devices except the current one.
+      recipients |= [@jwt.id]
+
+      # build recipients list
+      recs = []
+      recipients.each do |r|
+        @client.devices(r).each do |to_device|
+          recs << { id: r, device_id: to_device }
+        end
+      end
+
+      SelfSDK.logger.info "sending custom message #{request_body.to_json}"
+      current_device = "#{@jwt.id}:#{@device_id}"
+
+      recs.each do |r|
+        next if current_device == "#{r[:id]}:#{r[:device_id]}"
+
+        request_body[:sub] = r[:id]
+        request_body[:aud] = r[:id] unless request_body.key?(:aud)
+        ciphertext = @encryption_client.encrypt(@jwt.prepare(request_body), recs)
+
         m = SelfMsg::Message.new
         m.id = SecureRandom.uuid
-        m.sender = "#{@jwt.id}:#{@device_id}"
-        m.recipient = "#{recipient}:#{to_device}"
-        m.ciphertext = @jwt.prepare(request_body)
+        m.sender = current_device
+        m.recipient = "#{r[:id]}:#{r[:device_id]}"
+        m.ciphertext = ciphertext
 
+        SelfSDK.logger.info " -> to #{m.recipient}"
         send_message m
       end
-
-      @client.devices(@jwt.id).each do |to_device|
-        if to_device != @device_id 
-          m = SelfMsg::Message.new
-          m.id = SecureRandom.uuid
-          m.sender = "#{@jwt.id}:#{@device_id}"
-          m.recipient = "#{recipient}:#{to_device}"
-          m.ciphertext = @jwt.prepare(request_body)
-
-          send_message m
-        end
-      end
     end
 
     # Allows incomming messages from the given identity
@@ -159,6 +177,7 @@ module SelfSDK
     #
     # @params msg [SelfMsg::Message] message object to be sent
     def send_and_wait_for_response(msgs, original)
+      SelfSDK.logger.info "sending/wait for #{msgs.first.id}"
       wait_for msgs.first.id, original do
         msgs.each do |msg|
           send_message msg
@@ -414,7 +433,7 @@ module SelfSDK
     rescue StandardError => e
       p "Error processing incoming message #{input.to_json}"
       SelfSDK.logger.info e
-      p e.backtrace
+      # p e.backtrace
       nil
     end
 

data/lib/selfsdk.rb

@@ -20,6 +20,7 @@ require_relative 'services/auth'
 require_relative 'services/facts'
 require_relative 'services/identity'
 require_relative 'services/messaging'
+require_relative 'services/chat'
 
 # Namespace for classes and modules that handle Self interactions.
 module SelfSDK
@@ -82,6 +83,11 @@ module SelfSDK
       @messaging ||= SelfSDK::Services::Messaging.new(@messaging_client)
     end
 
+    # Provides access to SelfSDK::Services::Chat service
+    def chat
+      @chat ||= SelfSDK::Services::Chat.new(messaging, identity)
+    end
+
     def app_id
       client.jwt.id
     end

data/lib/services/chat.rb

@@ -0,0 +1,210 @@
+# Copyright 2020 Self Group Ltd. All Rights Reserved.
+
+# frozen_string_literal: true
+
+require 'self_crypto'
+require_relative '../chat/file_object'
+require_relative '../chat/group'
+require_relative '../chat/message'
+module SelfSDK
+  module Services
+    class Chat
+      attr_accessor :app_id
+
+      def initialize(messaging, client)
+        @messaging = messaging
+        @client = client
+        @app_id = @messaging.client.client.jwt.id
+        @auth_token = @messaging.client.client.jwt.auth_token
+        @self_url = @messaging.client.client.self_url
+      end
+
+      # Sends a message to a list of recipients.
+      #
+      # @param recipients [array]  list of recipients to send the message to.
+      # @param body [string] the message content to be sent
+      def message(recipients, body, opts = {})
+        payload = {
+          typ: "chat.message",
+          msg: body,
+        }
+        payload[:jti] = opts[:jti] if opts.key? :jti
+        payload[:aud] = opts[:gid] if opts.key? :gid
+        payload[:gid] = opts[:gid] if opts.key? :gid
+        payload[:rid] = opts[:rid] if opts.key? :rid
+        payload[:objects] = opts[:objects] if opts.key? :objects
+
+        m = SelfSDK::Chat::Message.new(self, recipients, payload, @auth_token, @self_url)
+        _req = send(m.recipients, m.payload)
+
+        m
+      end
+
+      # Subscribes to an incoming chat message
+      def on_message(opts = {}, &block)
+        @messaging.subscribe :chat_message do |msg|
+          cm = SelfSDK::Chat::Message.new(self, msg.payload[:aud], msg.payload, @auth_token, @self_url)
+
+          cm.mark_as_delivered unless opts[:mark_as_delivered] == false
+          cm.mark_as_read if opts[:mark_as_read] == true
+
+          block.call(cm)
+        end
+      end
+
+      # Sends a message to confirm a list of messages (identified by it's cids)
+      # have been delivered.
+      #
+      # @param recipients [array]  list of recipients to send the message to.
+      # @param cids [array] list of message cids to be marked as delivered.
+      # @param gid [string] group id where the conversation ids are referenced.
+      def delivered(recipients, cids, gid = nil)
+        confirm('delivered', recipients, cids, gid)
+      end
+
+      # Sends a message to confirm a list of messages (identified by it's cids)
+      # have been read.
+      #
+      # @param recipients [array]  list of recipients to send the message to.
+      # @param cids [array] list of message cids to be marked as read.
+      # @param gid [string] group id where the conversation ids are referenced.
+      def read(recipients, cids, gid = nil)
+        confirm('read', recipients, cids, gid)
+      end
+
+      # Modifies a previously sent message
+      #
+      # @param recipients [array]  list of recipients to send the message to.
+      # @param cids [array] list of message cids to be marked as read.
+      # @param body [string] the new body to replace the previous one.
+      # @param gid [string] group id where the conversation ids are referenced.
+      def edit(recipients, cid, body, gid = nil)
+        send(recipients, typ: "chat.message.edit",
+                         cid: cid,
+                         msg: body,
+                         gid: gid)
+      end
+
+      # Sends a message to delete a specific message.
+      #
+      # @param recipient [string] the recipient of the message
+      # @param cid [string] message cid to be marked as read.
+      # @param gid [string] group id where the conversation ids are referenced.
+      def delete(recipients, cids, gid = nil)
+        cids = [cids] if cids.is_a? String
+        send(recipients, typ: "chat.message.delete",
+                         cids: cids,
+                         gid: gid)
+      end
+
+      def on_invite(&block)
+        @messaging.subscribe :chat_invite do |msg|
+          g = SelfSDK::Chat::Group.new(self, msg.payload)
+          block.call(g)
+        end
+      end
+
+      def on_join(&block)
+        @messaging.subscribe :chat_join do |msg|
+          block.call(iss: msg.payload[:iss], gid: msg.payload[:gid])
+        end
+      end
+
+      def on_leave(&block)
+        @messaging.subscribe :chat_remove do |msg|
+          block.call(iss: msg.payload[:iss], gid: msg.payload[:gid])
+        end
+      end
+
+      # Invite sends group invitation to a list of members.
+      #
+      # @param gid [string] group id.
+      # @param name [string] name of the group.
+      # @param members [array] list of group members.
+      def invite(gid, name, members, opts = {})
+        payload = { typ: "chat.invite",
+                    gid: gid,
+                    name: name,
+                    members: members }
+
+        if opts.key? :data
+          obj = SelfSDK::Chat::FileObject.new(@auth_token, @self_url)
+          obj_payload = obj.build_from_data("", opts[:data], opts[:mime]).to_payload
+          obj_payload.delete(:name)
+          payload.merge! obj_payload
+        end
+
+        @messaging.send(members, payload)
+        SelfSDK::Chat::Group.new(self, payload)
+      end
+
+      # Join a group
+      #
+      # @param gid [string] group id.
+      # @param members [array] list of group members.
+      def join(gid, members)
+        # Allow incoming connections from the given members
+
+        # Create missing sessions with group members.
+        create_missing_sessions(members)
+
+        # Send joining confirmation.
+        send(members, typ: 'chat.join', gid: gid, aud: gid)
+      end
+
+      # Leaves a group
+      #
+      # @param gid [string] group id.
+      # @members members [array] list of group members.
+      def leave(gid, members)
+        send(members, typ: "chat.remove", gid: gid )
+      end
+
+      private
+
+      # sends a confirmation for a list of messages to a list of recipients.
+      def confirm(action, recipients, cids, gid = nil)
+        cids = [cids] if cids.is_a? String
+        gid = recipients if gid.nil? || gid.empty?
+        send(recipients, typ: "chat.message.#{action}",
+                         cids: cids,
+                         gid: gid)
+      end
+
+      # sends a message to a list of recipients.
+      def send(recipients, body)
+        recipients = [recipients] if recipients.is_a? String
+        m = []
+        recipients.each do |r|
+          m << @messaging.send(r, body)
+        end
+        m
+      end
+
+      # Group invites may come with members of the group we haven't set up a session
+      # previously, for those identitiese need to establish a session, but only if
+      # our identity appears before the others in the list members.
+      def create_missing_sessions(members)
+        return if members.empty?
+
+        posterior_members = false
+        requests = []
+
+        members.each do |m|
+          if posterior_members
+            @client.devices(m).each do |d|
+              continue unless @messaging.client.session?(m, d)
+
+              requests << @messaging.send("#{m}:#{d}", {
+                typ: 'sessions.create',
+                aud: m
+              })
+            end
+          end
+
+          posterior_members = true if m == @app_id
+        end
+      end
+    end
+  end
+end

data/lib/services/facts.rb

@@ -40,6 +40,7 @@ module SelfSDK
       #  @param [Hash] opts the options to authenticate.
       #  @option opts [String] :cid The unique identifier of the authentication request.
       #  @option opts [Integer] :exp_timeout timeout in seconds to expire the request.
+      #  @option opts [Integer] :allowed_for number of seconds for enabling recurrent requests.
       #  @return [Object] SelfSDK:::Messages::FactRequest
       def request(selfid, facts, opts = {}, &block)
         SelfSDK.logger.info "authenticating #{selfid}"

data/lib/services/messaging.rb

@@ -77,21 +77,20 @@ module SelfSDK
         @client.uuid_observer[cid]
       end
 
-
       # Send custom mmessage
       #
-      # @param recipient [string] recipient for the message
+      # @param recipients [String|array] recipient for the message
       # @param type [string] message type
       # @param request [hash] message to be sent
-      def send(recipient, request)
-        request[:jti] = SecureRandom.uuid
+      def send(recipients, request)
+        request[:jti] = SecureRandom.uuid unless request.include?(:jti)
         request[:iss] = @client.jwt.id
-        request[:sub] = recipient
-        request[:iat] = SelfSDK::Time.now.strftime('%FT%TZ'),
-        request[:exp] = (SelfSDK::Time.now + 300).strftime('%FT%TZ'),
-        request[:cid] = SecureRandom.uuid unless request.include? :cid
+        request[:iat] = SelfSDK::Time.now.strftime('%FT%TZ')
+        request[:exp] = (SelfSDK::Time.now + 300).strftime('%FT%TZ')        
+        request[:cid] = SecureRandom.uuid unless request.include?(:cid)
 
-        @client.send_custom(recipient, request)
+        @client.send_custom(recipients, request)
+        request
       end
 
       def notify(recipient, message)

data/lib/sources.rb

@@ -33,8 +33,15 @@ module SelfSDK
       types = { authentication_request: SelfSDK::Messages::AuthenticationReq::MSG_TYPE,
                 authentication_response: SelfSDK::Messages::AuthenticationResp::MSG_TYPE,
                 fact_request: SelfSDK::Messages::FactRequest::MSG_TYPE,
-                fact_response: SelfSDK::Messages::FactResponse::MSG_TYPE }
-      raise "invalid message type" unless types.key? s
+                fact_response: SelfSDK::Messages::FactResponse::MSG_TYPE,
+                chat_message: SelfSDK::Messages::ChatMessage::MSG_TYPE,
+                chat_message_deivered: SelfSDK::Messages::ChatMessageDelivered::MSG_TYPE,
+                chat_message_read: SelfSDK::Messages::ChatMessageRead::MSG_TYPE,
+                chat_invite: SelfSDK::Messages::ChatInvite::MSG_TYPE,
+                chat_join: SelfSDK::Messages::ChatJoin::MSG_TYPE,
+                chat_remove: SelfSDK::Messages::ChatRemove::MSG_TYPE,
+               }
+      raise "invalid message type '#{s}'" unless types.key? s
       return types[s]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.179
+  version: 0.0.184
 platform: ruby
 authors:
 - Aldgate Ventures
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +326,9 @@ extra_rdoc_files: []
 files:
 - lib/acl.rb
 - lib/authenticated.rb
+- lib/chat/file_object.rb
+- lib/chat/group.rb
+- lib/chat/message.rb
 - lib/client.rb
 - lib/crypto.rb
 - lib/jwt_service.rb
@@ -335,6 +338,13 @@ files:
 - lib/messages/authentication_req.rb
 - lib/messages/authentication_resp.rb
 - lib/messages/base.rb
+- lib/messages/chat.rb
+- lib/messages/chat_invite.rb
+- lib/messages/chat_join.rb
+- lib/messages/chat_message.rb
+- lib/messages/chat_message_delivered.rb
+- lib/messages/chat_message_read.rb
+- lib/messages/chat_remove.rb
 - lib/messages/fact.rb
 - lib/messages/fact_request.rb
 - lib/messages/fact_response.rb
@@ -343,6 +353,7 @@ files:
 - lib/ntptime.rb
 - lib/selfsdk.rb
 - lib/services/auth.rb
+- lib/services/chat.rb
 - lib/services/facts.rb
 - lib/services/identity.rb
 - lib/services/messaging.rb