selfsdk 0.0.167 → 0.0.172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 425117eb38ae08f2a8d3e65e1ba7ba772b06a4cbc378d17cbe5870a5598d2cb2
-  data.tar.gz: a638bc535a0e81732c7f48e11a779fe7ac08a8ea7f5239b0600af087030df65f
+  metadata.gz: 6e68f10b976ff9d53d2a5983300d48d1893ea831b18128198ee022e7191f9184
+  data.tar.gz: bf4d068f07d59e804700b278d1f12062301fdb4922960f71c7f6fbefd30a81fc
 SHA512:
-  metadata.gz: 69c5dd8b994ddcc2ba6432baac35fb20e03d810d927b991956ae878efa3546a988e617aa12bb831897656fa4a8adb8c6e1180f09934d110703b938cbe3d3e5cf
-  data.tar.gz: 300df2dbe461f01666943f29a5d137e9bc254fc6dbdbdb80763bfaad302b3eca1dc63e35682afcba06a4364f74f7a5f674dccccae7ab6fa69d035af54bcffb59
+  metadata.gz: 4b9d95c1241a0852ed1b8a11965fbab426f380929ffa27dbce41b2a761b6aacaa971fdc608aaeefc90d605646f03fa798bde4491def9b98dbbb01a2c1070289f
+  data.tar.gz: 93615191987f3bbce66d7f544afefc66869a740864a910666cb4b4374f580cd75dacd3a9b4a624b93c7569008ff73b1ffb598fd8fd775793b2a76ab58e268d59

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))
@@ -89,6 +90,27 @@ module SelfSDK
 
         # 7b-ii) use the initial message to create a session for bob or carol
         session_with_bob = @account.inbound_session(m)
+
+        # 7b-iii) remove the session's prekey from the account
+        @account.remove_one_time_keys(session_with_bob)
+
+        current_one_time_keys = @account.otk['curve25519']
+
+        # 7b-iv) if the number of remaining prekeys is below a certain threshold, publish new keys
+        if current_one_time_keys.length < 10
+          @account.gen_otk(100)
+
+          keys = Array.new
+
+          @account.otk['curve25519'].each do |k,v|
+            keys.push({id: k, key: v}) if current_one_time_keys[k].nil?
+          end
+
+          res = @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys.to_json)
+          raise 'unable to push prekeys, please try in a few minutes' if res.code != 200
+        end
+
+        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

data/lib/messages/authentication_req.rb

@@ -43,7 +43,7 @@ module SelfSDK
       def proto(to_device)
         Msgproto::Message.new(type: Msgproto::MsgType::MSG,
                               sender: "#{@jwt.id}:#{@messaging.device_id}",
-                              id: @id,
+                              id: SecureRandom.uuid,
                               recipient: "#{@to}:#{to_device}",
                               ciphertext: encrypt_message(@jwt.prepare(body), @to, to_device))
       end

data/lib/messages/base.rb

@@ -21,8 +21,13 @@ module SelfSDK
         msgs = []
         devices.each do |d|
           msgs << proto(d)
-          SelfSDK.logger.info "synchronously messaging to #{@to}:#{d}"
         end
+        current_devices.each do |d|
+          if d != @messaging.device_id
+            msgs << proto(d)
+          end
+        end
+        SelfSDK.logger.info "synchronously messaging to #{@to}"
         res = @messaging.send_and_wait_for_response(msgs, self)
         res
       end
@@ -84,6 +89,10 @@ module SelfSDK
         @client.devices(@intermediary)
       end
 
+      def current_devices
+        @client.devices(@jwt.id)
+      end
+
       def check_credits!
         app = @client.app(@jwt.id)
         raise "Your credits have expired, please log in to the developer portal and top up your account." if app[:paid_actions] == false

data/lib/messages/fact_request.rb

@@ -105,7 +105,7 @@ module SelfSDK
 
         Msgproto::Message.new(
           type: Msgproto::MsgType::MSG,
-          id: @id,
+          id: SecureRandom.uuid,
           sender: "#{@jwt.id}:#{@messaging.device_id}",
           recipient: recipient,
           ciphertext: ciphertext )

data/lib/messaging.rb

@@ -101,15 +101,27 @@ module SelfSDK
     # @param type [string] message type
     # @param request [hash] original message requesing information
     def send_custom(recipient, request_body)
-      # TODO (adriacidre) this is sending the message to the first device only
-        @to_device = @client.devices(recipient).first
-        send_message msg = Msgproto::Message.new(
+      @client.devices(recipient).each do |to_device|
+        send_message Msgproto::Message.new(
           type: Msgproto::MsgType::MSG,
           id: SecureRandom.uuid,
           sender: "#{@jwt.id}:#{@device_id}",
-          recipient: "#{recipient}:#{@to_device}",
+          recipient: "#{recipient}:#{to_device}",
           ciphertext: @jwt.prepare(request_body),
         )
+      end
+
+      @client.devices(@jwt.id).each do |to_device|
+        if to-device != @device_id 
+          send_message Msgproto::Message.new(
+            type: Msgproto::MsgType::MSG,
+            id: SecureRandom.uuid,
+            sender: "#{@jwt.id}:#{@device_id}",
+            recipient: "#{recipient}:#{to_device}",
+            ciphertext: @jwt.prepare(request_body),
+          )
+        end
+      end
     end
 
     # Allows incomming messages from the given identity
@@ -281,10 +293,6 @@ module SelfSDK
         loop { sleep 10; clean_timeouts }
       end
 
-      Thread.new do
-        loop { sleep 30; ping }
-      end
-
       @mon.synchronize do
         @acks[auth_id][:waiting_cond].wait_while { @acks[auth_id][:waiting] }
         @acks.delete(auth_id)
@@ -351,11 +359,6 @@ module SelfSDK
       end
     end
 
-    # Pings the websocket server to keep the connection alive.
-    def ping
-      # SelfSDK.logger.info "ping"
-      @ws&.ping
-    end
 
     # Process an event when it arrives through the websocket connection.
     def on_message(event)

data/lib/signature_graph.rb

@@ -261,7 +261,7 @@ module SelfSDK
 
       sk = @keys[operation.signing_key]
 
-      raise "operation specifies a signing key that does not exist" if k.nil?
+      raise "operation specifies a signing key that does not exist" if sk.nil?
 
       # if this is an account recovery, nuke all existing keys
       if sk.type == KEY_TYPE_RECOVERY

metadata

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