selfsdk 0.0.162 → 0.0.167

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b7b3b844225f5fc4419a53bf28aa028e44c264a4ec3b298c269daaea4b05c5
-  data.tar.gz: 64c35eac74be284ab020e2412c27a338f856174e5d154c59dcab0e4625a65276
+  metadata.gz: 425117eb38ae08f2a8d3e65e1ba7ba772b06a4cbc378d17cbe5870a5598d2cb2
+  data.tar.gz: a638bc535a0e81732c7f48e11a779fe7ac08a8ea7f5239b0600af087030df65f
 SHA512:
-  metadata.gz: 1dd9537fd6aa8021b8a2a5d5d3587fc447bd3a389460c5b4ea996f429a91b4a965cdb577673109f69514eb8056963c7f972a6e440edc764c06fbe5934ff9cc7b
-  data.tar.gz: d2cf23e278279d99cef701b0f74f8c31a6ed3ce4f1a44b87a8b648b8fb9e9029b84812431b53a4f7b4e2abf234a977cd7e59b57a1e53532e9ab0bc2f8230e2b3
+  metadata.gz: 69c5dd8b994ddcc2ba6432baac35fb20e03d810d927b991956ae878efa3546a988e617aa12bb831897656fa4a8adb8c6e1180f09934d110703b938cbe3d3e5cf
+  data.tar.gz: 300df2dbe461f01666943f29a5d137e9bc254fc6dbdbdb80763bfaad302b3eca1dc63e35682afcba06a4364f74f7a5f674dccccae7ab6fa69d035af54bcffb59

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 = @messaging.device_id
-        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

@@ -43,6 +43,7 @@ module SelfSDK
       @client = client
       @ack_timeout = 60 # seconds
       @timeout = 120 # seconds
+      @auth_id = SecureRandom.uuid
       @device_id = options.fetch(:device_id, DEFAULT_DEVICE)
       @auto_reconnect = options.fetch(:auto_reconnect, DEFAULT_AUTO_RECONNECT)
       @raw_storage_dir = options.fetch(:storage_dir, DEFAULT_STORAGE_DIR)
@@ -264,8 +265,10 @@ module SelfSDK
     # Start sthe websocket listener
     def start
       SelfSDK.logger.info "starting"
+      auth_id = @auth_id.dup
+
       @mon.synchronize do
-        @acks["authentication"] = { waiting_cond: @mon.new_cond,
+        @acks[auth_id] = { waiting_cond: @mon.new_cond,
                                     waiting: true,
                                     timeout: SelfSDK::Time.now + @ack_timeout }
       end
@@ -283,8 +286,16 @@ module SelfSDK
       end
 
       @mon.synchronize do
-        @acks["authentication"][:waiting_cond].wait_while { @acks["authentication"][:waiting] }
-        @acks.delete("authentication")
+        @acks[auth_id][:waiting_cond].wait_while { @acks[auth_id][:waiting] }
+        @acks.delete(auth_id)
+      end
+      # In case this does not succeed start the process again.
+      if @acks.include? auth_id
+        if @acks[auth_id][:waiting]
+          close
+          start_connection
+        end
+        @acks.delete(auth_id)
       end
     end
 
@@ -404,14 +415,18 @@ module SelfSDK
 
     # Authenticates current client on the websocket server.
     def authenticate
+      @auth_id = SecureRandom.uuid if @auth_id.nil?
+
       SelfSDK.logger.info "authenticating"
       send_raw Msgproto::Auth.new(
         type: Msgproto::MsgType::AUTH,
-        id: "authentication",
+        id: @auth_id,
         token: @jwt.auth_token,
         device: @device_id,
         offset: @offset,
       )
+      
+      @auth_id = nil
     end
 
     def send_raw(msg)

metadata

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