selfsdk 0.0.200 → 0.0.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f1c051fdeb2d35ce3d50da6c0f84169f99ea0ad403c456a131a1b992da29ae
-  data.tar.gz: a3a869a1ec7240c3bc0076d44540c53456438008636382bd165e1ab89a32e045
+  metadata.gz: ea79de24bb9968fdd994ea934e93665edbd640ab6eb69b129a692f3eee92ae90
+  data.tar.gz: 94bef0e9ad11a2bc9362d02105ef023ec7e635ae253d3b653c263d1130d21e52
 SHA512:
-  metadata.gz: 8723dbb549e965ba752e20a35fddc93034ac9dc719344025858eee1c3c2050f411e93a4db48cd38102182d8a801f45c64cebe67aed45c33ad7196e95b764cb43
-  data.tar.gz: 32971cdca3e179fc85ac190ad87fa5ba48fe92f1b63212f6cc948a6a2c989063c471a0dd65219036895a8a28441da99ed5b4ede67f88bf56c37f3aa4a9d5ca11
+  metadata.gz: b72a3aa8ba3d723404c59854a2d2b1fd96ab5954506f064fc1b34459c5b31cec20551664fd7133929777be3d2def925a2d3a8a991de9c2b76ab2f725a3572335
+  data.tar.gz: 3ef093c5fb94a36cb91ef2576eb5b38f9b401694d8464f35c588f6b45e29860251383fe697d655c66c5af9135b0af759bc6d82a5dea4363b48e1110245b9ad27

data/lib/messages/base.rb

@@ -4,6 +4,10 @@
 
 module SelfSDK
   module Messages
+
+    PRIORITY_VISIBLE   = 1
+    PRIORITY_INVISIBLE = 2
+
     class Base
       attr_accessor :from, :from_device, :to, :to_device, :expires, :id,
                     :fields, :typ, :payload, :status, :input, :intermediary,

data/lib/messages/connection_request.rb

@@ -57,6 +57,8 @@ module SelfSDK
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = recipient
         m.ciphertext = ciphertext
+        m.message_type = MSG_TYPE
+        m.priority = SelfSDK::Messages::PRIORITY_VISIBLE
         m
       end
     end

data/lib/messages/fact_issue.rb

@@ -57,6 +57,8 @@ module SelfSDK
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = recipient
         m.ciphertext = ciphertext
+        m.message_type = MSG_TYPE
+        m.priority = SelfSDK::Messages::PRIORITY_VISIBLE
         m
       end
 

data/lib/messages/fact_request.rb

@@ -119,6 +119,8 @@ module SelfSDK
         m.sender = "#{@jwt.id}:#{@messaging.device_id}"
         m.recipient = recipient
         m.ciphertext = ciphertext
+        m.message_type = MSG_TYPE
+        m.priority = SelfSDK::Messages::PRIORITY_VISIBLE
         m
       end
     end

data/lib/messages/fact_response.rb

@@ -92,19 +92,6 @@ module SelfSDK
       def auth_response?
         @auth == true
       end
-
-      protected
-
-      def proto(to_device)
-        @to_device = to_device
-        Msgproto::Message.new(
-          type: Msgproto::MsgType::MSG,
-          id: SecureRandom.uuid,
-          sender: "#{@jwt.id}:#{@messaging.device_id}",
-          recipient: "#{@to}:#{@to_device}",
-          ciphertext: encrypt_message(@jwt.prepare(body), [{id: @to, device_id: @to_device}])
-        )
-      end
     end
   end
 end

data/lib/messages/message.rb

@@ -10,6 +10,12 @@ require_relative "chat_message_delivered"
 require_relative "chat_invite"
 require_relative "chat_join"
 require_relative "chat_remove"
+require_relative "voice_setup"
+require_relative "voice_start"
+require_relative "voice_accept"
+require_relative "voice_stop"
+require_relative "voice_busy"
+require_relative "voice_summary"
 require_relative "document_sign_resp"
 require_relative "connection_response"
 
@@ -59,6 +65,24 @@ module SelfSDK
       when SelfSDK::Messages::ConnectionResponse::MSG_TYPE
         m = ConnectionResponse.new(messaging)
         m.parse(body, envelope)
+      when SelfSDK::Messages::VoiceSetup::MSG_TYPE
+        m = VoiceSetup.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::VoiceStart::MSG_TYPE
+        m = VoiceStart.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::VoiceAccept::MSG_TYPE
+        m = VoiceAccept.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::VoiceBusy::MSG_TYPE
+        m = VoiceBusy.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::VoiceStop::MSG_TYPE
+        m = VoiceStop.new(messaging)
+        m.parse(body, envelope)
+      when SelfSDK::Messages::VoiceSummary::MSG_TYPE
+        m = VoiceSummary.new(messaging)
+        m.parse(body, envelope)
       else
         raise StandardError.new("Invalid message type #{payload[:typ]}.")
       end

data/lib/messages/voice_accept.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 VoiceAccept < Chat
+      MSG_TYPE = "chat.voice.accept"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/voice_busy.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 VoiceBusy < Chat
+      MSG_TYPE = "chat.voice.busy"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/voice_setup.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 VoiceSetup < Chat
+      MSG_TYPE = "chat.voice.setup"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/voice_start.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 VoiceStart < Chat
+      MSG_TYPE = "chat.voice.start"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/voice_stop.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 VoiceStop < Chat
+      MSG_TYPE = "chat.voice.stop"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messages/voice_summary.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 VoiceSummary < Chat
+      MSG_TYPE = "chat.voice.summary"
+
+      def parse(input, envelope=nil)
+        super
+        @typ = MSG_TYPE
+      end
+
+    end
+  end
+end

data/lib/messaging.rb

@@ -17,6 +17,23 @@ module SelfSDK
     DEFAULT_STORAGE_DIR="./.self_storage"
     ON_DEMAND_CLOSE_CODE=3999
 
+    PRIORITIES = {
+      "chat.invite":                 SelfSDK::Messages::PRIORITY_VISIBLE,
+      "chat.join":                   SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message":                SelfSDK::Messages::PRIORITY_VISIBLE,
+      "chat.message.delete":         SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message.delivered":      SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message.edit":           SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.message.read":           SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "chat.remove":                 SelfSDK::Messages::PRIORITY_INVISIBLE,
+      "document.sign.req":           SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.authenticate.req": SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.connections.req":  SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.facts.query.req":  SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.facts.issue":      SelfSDK::Messages::PRIORITY_VISIBLE,
+      "identities.notify":           SelfSDK::Messages::PRIORITY_VISIBLE
+    }
+
     attr_accessor :client, :jwt, :device_id, :ack_timeout, :timeout, :type_observer, :uuid_observer, :encryption_client, :source
 
     # RestClient initializer
@@ -87,7 +104,8 @@ module SelfSDK
       m.id = SecureRandom.uuid 
       m.sender = "#{@jwt.id}:#{@device_id}"
       m.recipient = "#{recipient}:#{recipient_device}"
-      # TODO: this is unencrypted!!!
+      m.message_type = "identities.facts.query.resp"
+      m.priority = select_priority(m.message_type)
       m.ciphertext = @jwt.prepare(request)
 
       send_message m
@@ -133,6 +151,8 @@ module SelfSDK
         m.sender = current_device
         m.recipient = "#{r[:id]}:#{r[:device_id]}"
         m.ciphertext = ciphertext
+        m.message_type = r[:typ]
+        m.priority = select_priority(r[:typ])
 
         SelfSDK.logger.info " -> to #{m.recipient}"
         send_message m
@@ -394,6 +414,8 @@ module SelfSDK
         SelfSDK.logger.warn "error on #{hdr.id}"
         e = SelfMsg::Notification.new(data: data)
         SelfSDK.logger.warn "#{e.error}"
+        @messages[hdr.id][:response] = {error: e.error}
+        mark_as_acknowledged(hdr.id)
         mark_as_arrived(hdr.id)
       when SelfMsg::MsgTypeACL
         SelfSDK.logger.info "ACL received"
@@ -514,5 +536,9 @@ module SelfSDK
       end
         
     end
+
+    def select_priority(mtype)
+      PRIORITIES[mtype] || SelfSDK::Messages::PRIORITY_VISIBLE
+    end
   end
 end

data/lib/selfsdk.rb

@@ -23,6 +23,7 @@ require_relative 'services/identity'
 require_relative 'services/messaging'
 require_relative 'services/chat'
 require_relative 'services/docs'
+require_relative 'services/voice'
 
 # Namespace for classes and modules that handle Self interactions.
 module SelfSDK
@@ -90,6 +91,11 @@ module SelfSDK
       @chat ||= SelfSDK::Services::Chat.new(messaging, identity)
     end
 
+    # Provides access to SelfSDK::Services::Voice service
+    def voice
+      @voice ||= SelfSDK::Services::Voice.new(messaging)
+    end
+
     # Provides access to SelfSDK::Services::Docs service
     def docs
       @docs ||= SelfSDK::Services::Docs.new(messaging, @client.self_url)

data/lib/services/facts.rb

@@ -116,16 +116,20 @@ module SelfSDK
       class Fact
         attr_accessor :key, :value, :group
 
-        def initialize(key, value, source, group = nil)
+
+        def initialize(key, value, source, opts = {})
           @key = key
           @value = value
           @source = source
-          @group = group
+          @display_name = opts.fetch(:display_name, "")
+          @group = opts.fetch(:group, nil)
+          @type = opts.fetch(:type, nil)
         end
 
         def to_hash
           b = { key: @key, value: @value, source: @source }
           b[:group] = @group.to_hash unless @group.nil?
+          b[:type] = @type unless @type.nil?
           b
         end
       end
@@ -144,6 +148,42 @@ module SelfSDK
           b
         end
       end
+
+      class Delegation
+        TYPE = 'delegation_certificate'
+        attr_accessor :subjects, :actions, :effect, :resources, :conditions, :description
+
+        def initialize(subjects, actions, effect, resources, opts = {})
+          @subjects = subjects
+          @actions = actions
+          @effect = effect
+          @resources = resources
+          @conditions = opts.fetch(:conditions, nil)
+          @description = opts.fetch(:description, nil)
+        end
+
+        def encode
+          cert = {
+            subjects: @subjects,
+            actions: @actions,
+            effect: @effect,
+            resources: @resources,
+          }.to_json
+
+          Base64.urlsafe_encode64(cert, padding: false)
+        end
+
+        def self.parse(input)
+          b = JSON.parse(Base64.urlsafe_decode64(input))
+          Delegation.new(
+            b['subjects'],
+            b['actions'],
+            b['effect'],
+            b['resources'],
+            conditions: b['conditions'],
+            description: b['description'])
+        end
+      end
     end
   end
-end
+end

data/lib/sources.rb

@@ -56,6 +56,12 @@ module SelfSDK
                 chat_remove: SelfSDK::Messages::ChatRemove::MSG_TYPE,
                 document_sign_response: SelfSDK::Messages::DocumentSignResponse::MSG_TYPE,
                 connection_response: SelfSDK::Messages::ConnectionResponse::MSG_TYPE,
+                voice_setup: SelfSDK::Messages::VoiceSetup::MSG_TYPE,
+                voice_start: SelfSDK::Messages::VoiceStart::MSG_TYPE,
+                voice_accept: SelfSDK::Messages::VoiceAccept::MSG_TYPE,
+                voice_busy: SelfSDK::Messages::VoiceBusy::MSG_TYPE,
+                voice_stop: SelfSDK::Messages::VoiceStop::MSG_TYPE,
+                voice_summary: SelfSDK::Messages::VoiceSummary::MSG_TYPE,
                }
       raise "invalid message type '#{s}'" unless types.key? s
       return types[s]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.200
+  version: 0.0.203
 platform: ruby
 authors:
 - Aldgate Ventures
@@ -324,6 +324,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 description: 
 email: 
 executables: []
@@ -356,6 +376,12 @@ files:
 - lib/messages/fact_request.rb
 - lib/messages/fact_response.rb
 - lib/messages/message.rb
+- lib/messages/voice_accept.rb
+- lib/messages/voice_busy.rb
+- lib/messages/voice_setup.rb
+- lib/messages/voice_start.rb
+- lib/messages/voice_stop.rb
+- lib/messages/voice_summary.rb
 - lib/messaging.rb
 - lib/ntptime.rb
 - lib/selfsdk.rb