selfsdk 0.0.163 → 0.0.168

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5765cd4b687126291084eeeff9cf4e1662fb31c289b0d0f6bd88c3338207b83f
-  data.tar.gz: 2e3b7da25fe3b1e7c6c8d5151fc5ea71b6d5078cf0356b3b04361c8219f8425d
+  metadata.gz: ffcdce1f12b74a382540ad69d30e73e9f4b89316d10831c07917d59646c24764
+  data.tar.gz: 56c549de3f1cc8574760ded98e5ec1c790293e3555e2b3d0ac69376a124c39e9
 SHA512:
-  metadata.gz: 529f816374357065e3b6d168255aa2d02fba2567e92b90fc50dea8727d1d6c1aa5202a261e540c9e6f2d18d5c877f61982cb884f7bc5740eeb5d864d315a9330
-  data.tar.gz: 9a73f8413912aff654a1d17aa6d17115c7b58a031430895f432fa912d5ee9d667df58ceff63a288fa46a3cd711b0ea6fe90cd9a701d66c08cb289f5cbaa00713
+  metadata.gz: 9f9b6c16423ead39824635414bf1de2e5efdf80878b19d234f263663e003c90b8148411fb90498fdfa1525374bfdddf838a97bd28002aa5fcd67224a3b9ab990
+  data.tar.gz: e3143da9abc1cd2e17c0e1e0ed3253761af044a217246ca27978ed7321e542a5ae1c32499f6cf4e9f4ac380e889a096997774ee2ab95c18fedf78a3e8cc8b24a

data/lib/crypto.rb

@@ -24,7 +24,8 @@ module SelfSDK
         keys = @account.otk['curve25519'].map{|k,v| {id: k, key: v}}.to_json
 
         # 1b-iv) post those keys to POST /v1/identities/<selfid>/devices/1/pre_keys/
-        @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys)
+        res = @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys)
+        raise 'unable to push prekeys, please try in a few minutes' if res.code != 200
 
         # 1b-v) store the account to a file
         File.write(account_path, @account.to_pickle(storage_key))

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,7 +39,7 @@ module SelfSDK
                         end
       end
 
-      def parse(input)
+      def parse(input, envelope=nil)
         @input = input
         @typ = MSG_TYPE
         @payload = get_payload input
@@ -51,6 +51,11 @@ module SelfSDK
         @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

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)

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.163
+  version: 0.0.168
 platform: ruby
 authors:
 - Aldgate Ventures