selfsdk 0.0.165 → 0.0.170

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c98f4bd8df938f9c11acb72ffef83f231ddd0c1466c2b507975c5c3f1e4a8b58
-  data.tar.gz: 15109c43f84455b30215b905fdfa556a286a97e04da9c18e0ea7ae24bc69eecc
+  metadata.gz: 2ef1e4f98e83e8c056812dc7fe331a6e409f9e930f3764c2e1a5920f55f646fe
+  data.tar.gz: 1eb25590ddbad6f74edf8dac58f1374582905fc3bafe48fa732d3c2ef60dbb34
 SHA512:
-  metadata.gz: 747b1019940113d76d2b2bf6e5b0fe39a7178f12dedabaa5b555b71aefdfe8e60d0dbe2658b467151a4df8985c48d695dcc622f2a4583ac28491190159c0a183
-  data.tar.gz: c8755a17be9aeed3d189b9116ad189c4e2bb24de1f9af594c1fe1196abad63ba24a1295958e2183e0845fcaf7a29592b62608440415198fa334efa36f8752534
+  metadata.gz: 304a87b8b1b9a01571befe77ff2acadcea0a5254cd7972c9072ea96fe60e21356160e82f98255f17c3df00ebe62c28dc032e7ee711c0d8fe488dc28d9010f48f
+  data.tar.gz: c8c8bca065193c65aa091aacfc727966c5921f502bb80f0d34f0d4716b1a733cb5caaccf6dee5d3d00b496df24bc7d3bb6ee3dd30c7f290cf07160664024c6aa

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/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,22 +415,18 @@ module SelfSDK
 
     # Authenticates current client on the websocket server.
     def authenticate
-      res = wait_for 'authentication' do
-        SelfSDK.logger.info "authenticating"
-        send_raw Msgproto::Auth.new(
-          type: Msgproto::MsgType::AUTH,
-          id: "authentication",
-          token: @jwt.auth_token,
-          device: @device_id,
-          offset: @offset,
-        )
-      end
-
-      return res unless res.nil?
-
-      SelfSDK.logger.info "authentication timed out, retrying ..."
-      close
-      start_connection
+      @auth_id = SecureRandom.uuid if @auth_id.nil?
+
+      SelfSDK.logger.info "authenticating"
+      send_raw Msgproto::Auth.new(
+        type: Msgproto::MsgType::AUTH,
+        id: @auth_id,
+        token: @jwt.auth_token,
+        device: @device_id,
+        offset: @offset,
+      )
+      
+      @auth_id = nil
     end
 
     def send_raw(msg)

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