selfsdk 0.0.161 → 0.0.166

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c7562e018dee44a3bb70e3f52dcc12dc2e5a5824d68e3d85e9810e1b48afb06
-  data.tar.gz: 831bc7d29fabf7e32dbde64b6fa6d9b8b8466c8e3b203d024d45d4697d96b407
+  metadata.gz: 8c85c6fa67915d806be363e234ac87b2bdffc6d331a48a273f48f737bb476fa6
+  data.tar.gz: fadf3e8a7df24cb74b71fc0e695f647b94510afb4092e58ca86f9aa6e0d2deaa
 SHA512:
-  metadata.gz: 159b597aded28279b54b8a1b1e70dd54f04603b012a0487aa7dd95db0412e8d063e5a3b0af5acfb8711f41918d33cca6038704e136fe6fb6a1ed50773df1990d
-  data.tar.gz: c3c42b8c818150bff70d43b821bf73087925a81535abceabb45f293f3ded2c8b916d4b8f7e4d34da7cde9ba4916414d943c09212358727221800e9d369e09d0f
+  metadata.gz: dfc07013f91c98b460991df709e4526fe86ee37d6f26818d87fe3c29c10c99ec69401d1c51a1f7ab80f1a7bad1248ce81cb7091fa469d584863d962e6c39effa
+  data.tar.gz: 7f3455f82fd7a2dec5579dd67d4a43a80ffc3fb24b35f90f7ab82bffd86d264e8760154decc7119ffc9c9fc6976669f2804f0f8222c7f52a6a0e4ebe55496cc5

data/lib/messages/authentication_message.rb

@@ -9,7 +9,7 @@ module SelfSDK
   module Messages
     class AuthenticationMessage < Base
 
-      def parse(input, original=nil)
+      def parse(input, envelope=nil)
         @input = input
         @typ = @typ
         @payload = get_payload input
@@ -21,6 +21,10 @@ module SelfSDK
         @expires = ::Time.parse(payload[:exp])
         @issued = ::Time.parse(payload[:iat])
         @status = payload[:status]
+        if envelope
+          issuer = envelope.sender.split(":")
+          @from_device = issuer.last
+        end
       end
     end
   end

data/lib/messages/base.rb

@@ -27,10 +27,12 @@ module SelfSDK
         res
       end
 
-      def send_message
+      def send_message(device_id = nil)
         check_credits!
+        dds = devices
+        dds = [device_id] if device_id
         res = []
-        devices.each do |d|
+        dds.each do |d|
           res << @messaging.send_message(proto(d))
           SelfSDK.logger.info "asynchronously requested information to #{@to}:#{d}"
         end

data/lib/messages/fact_request.rb

@@ -39,17 +39,23 @@ module SelfSDK
                         end
       end
 
-      def parse(input)
+      def parse(input, envelope=nil)
         @input = input
         @typ = MSG_TYPE
         @payload = get_payload input
         @id = @payload[:cid]
         @from = @payload[:iss]
         @to = @payload[:sub]
+        @audience = payload[:aud]
         @expires = @payload[:exp]
         @description = @payload.include?(:description) ? @payload[:description] : nil
         @facts = @payload[:facts]
         @options = @payload[:options]
+
+        if envelope
+          issuer = envelope.sender.split(":")
+          @from_device = issuer.last
+        end
       end
 
       def build_response
@@ -59,8 +65,6 @@ module SelfSDK
         m.to = @from
         m.sub = @to
         m.audience = @from
-        m.to_device = @from_device
-        m.from_device = @to_device
         m.facts = @facts
         m
       end

data/lib/messages/fact_response.rb

@@ -13,7 +13,7 @@ module SelfSDK
 
       attr_accessor :facts, :audience
 
-      def parse(input)
+      def parse(input, envelope=nil)
         @input = input
         @typ = MSG_TYPE
         @payload = get_payload input
@@ -35,6 +35,10 @@ module SelfSDK
             SelfSDK.logger.info e.message
           end
         end
+        if envelope
+          issuer = envelope.sender.split(":")
+          @from_device = issuer.last
+        end
       end
 
       def fact(name)
@@ -81,8 +85,7 @@ module SelfSDK
       protected
 
       def proto(to_device)
-
-
+        @to_device = to_device
         Msgproto::Message.new(
           type: Msgproto::MsgType::MSG,
           id: SecureRandom.uuid,

data/lib/messages/message.rb

@@ -10,11 +10,13 @@ require_relative "authentication_req"
 module SelfSDK
   module Messages
     def self.parse(input, messaging, original=nil)
+      envelope = nil
       body = if input.is_a? String
-               input
+                input
              else
-               issuer = input.sender.split(":")
-               messaging.encryption_client.decrypt(input.ciphertext, issuer.first, issuer.last)
+                envelope = input
+                issuer = input.sender.split(":")
+                messaging.encryption_client.decrypt(input.ciphertext, issuer.first, issuer.last)
              end
 
       jwt = JSON.parse(body, symbolize_names: true)
@@ -23,16 +25,16 @@ module SelfSDK
       case payload[:typ]
       when "identities.facts.query.req"
         m = FactRequest.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       when "identities.facts.query.resp"
         m = FactResponse.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       when "identities.authenticate.resp"
         m = AuthenticationResp.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       when "identities.authenticate.req"
         m = AuthenticationReq.new(messaging)
-        m.parse(body)
+        m.parse(body, envelope)
       else
         raise StandardError.new("Invalid message type.")
       end

data/lib/messaging.rb

@@ -286,6 +286,14 @@ module SelfSDK
         @acks["authentication"][:waiting_cond].wait_while { @acks["authentication"][:waiting] }
         @acks.delete("authentication")
       end
+      # In case this does not succeed start the process again.
+      if @acks.include? 'authentication'
+        if @acks['authentication'][:waiting]
+          close
+          start_connection
+        end
+        @acks.delete("authentication")
+      end
     end
 
     # Cleans expired messages

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.161
+  version: 0.0.166
 platform: ruby
 authors:
 - Aldgate Ventures