selfsdk 0.0.139 → 0.0.144

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7dee3974b09378a7893e93df82bf77a9e082dfcc386b61dc5def8660276233
-  data.tar.gz: b2cc3bec34b678a941cb13ca7f46e82851a7b29ef2f5a4c0a6d5047dfb0aa73d
+  metadata.gz: d9d49a7cde97a88c5c56c6233b964b72c66d9b046b2521cac189475646be55f2
+  data.tar.gz: 600b68b342c99830aba799eb13da1650d02cecd4bd824aeb38f51c768c77a13a
 SHA512:
-  metadata.gz: 603796714f57dae9c509dd5d8bfdae2a9433f41d6bdeb653e55ec8e0aeb6c3b953799fac5651f21e83f3a9526c276e84bd55b655a489074765e13baf21924764
-  data.tar.gz: 3e8b669f3449d9e2335e113fbc638795fc42ac2ef3b5463f14d560460a1bd6ff5d542e453e8b8702ef19454038fcc53f95205e5f21e63965428238b4662bc9d6
+  metadata.gz: 3c7989e1245b7b2993e4c5784373d05c25870a1e4e695da1a49571e5ada8d779fb90c5d5f37fd9174e3cef51b054655c9efdb8470f573a98bdfa10ea950d1d8c
+  data.tar.gz: 8e30b0e94b496efdc80f6dc4d5bdb655e8236ff098880bf28f46bc8433f08182fe7bfca3942abe893cfd698f8be720ae598611ae24ea6c98b4adfac2db1c9c5b

data/lib/client.rb

@@ -66,19 +66,31 @@ module SelfSDK
     end
 
     def post(endpoint, body)
-      p HTTParty.post("#{@self_url}#{endpoint}",
-                    headers: {
-                        'Content-Type' => 'application/json',
-                        'Authorization' => "Bearer #{@jwt.auth_token}"
-                    },
-                    body: body)
+      res = nil
+      loop do
+        res = HTTParty.post("#{@self_url}#{endpoint}",
+                      headers: {
+                          'Content-Type' => 'application/json',
+                          'Authorization' => "Bearer #{@jwt.auth_token}"
+                      },
+                      body: body)
+        break if res.code != 503
+        sleep 2
+      end
+      return res
     end
 
     def get(endpoint)
-      HTTParty.get("#{@self_url}#{endpoint}", headers: {
+      res = nil
+      loop do
+        res = HTTParty.get("#{@self_url}#{endpoint}", headers: {
           'Content-Type' => 'application/json',
           'Authorization' => "Bearer #{@jwt.auth_token}"
-      })
+        })
+        break if res.code != 503
+        sleep 2
+      end
+      return res
     end
 
     # Lists all public keys stored on self for the given ID

data/lib/crypto.rb

@@ -8,9 +8,9 @@ module SelfSDK
       @storage_key = storage_key
       @storage_folder = storage_folder
 
-      if File.exist?('account.pickle')
+      if File.exist?(account_path)
         # 1a) if alice's account file exists load the pickle from the file
-        @account = SelfCrypto::Account.from_pickle(File.read('account.pickle'), @storage_key)
+        @account = SelfCrypto::Account.from_pickle(File.read(account_path), @storage_key)
       else
         # 1b-i) if create a new account for alice if one doesn't exist already
         @account = SelfCrypto::Account.from_seed(@client.jwt.key)
@@ -25,12 +25,12 @@ module SelfSDK
         @client.post("/v1/apps/#{@client.jwt.id}/devices/#{@device}/pre_keys", keys)
 
         # 1b-v) store the account to a file
-        File.write('account.pickle', @account.to_pickle(storage_key))
+        File.write(account_path, @account.to_pickle(storage_key))
       end
     end
 
     def encrypt(message, recipient, recipient_device)
-      session_file_name = "#{recipient}:#{recipient_device}-session.pickle"
+      session_file_name = session_path(recipient, recipient_device)
 
       if File.exist?(session_file_name)
         # 2a) if bob's session file exists load the pickle from the file
@@ -55,9 +55,6 @@ module SelfSDK
 
         # 2b-iv) create the session with bob
         session_with_bob = @account.outbound_session(curve25519_identity_key, one_time_key)
-
-        # 2b-v) store the session to a file
-        File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
       end
 
       # 3) create a group session and set the identity of the account youre using
@@ -67,11 +64,16 @@ module SelfSDK
       gs.add_participant("#{recipient}:#{recipient_device}", session_with_bob)
 
       # 5) encrypt a message
-      gs.encrypt(message).to_s
+      ct = gs.encrypt(message).to_s
+
+      # 6) store the session to a file
+      File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
+
+      ct
     end
 
     def decrypt(message, sender, sender_device)
-      session_file_name = "#{sender}:#{sender_device}-session.pickle"
+      session_file_name = session_path(sender, sender_device)
 
       if File.exist?(session_file_name)
         # 7a) if carol's session file exists load the pickle from the file
@@ -84,9 +86,6 @@ 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) store the session to a file
-        File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
       end
 
       # 8) create a group session and set the identity of the account you're using
@@ -96,7 +95,22 @@ module SelfSDK
       gs.add_participant("#{sender}:#{sender_device}", session_with_bob)
 
       # 10) decrypt the message ciphertext
-      gs.decrypt("#{sender}:#{sender_device}", message).to_s
+      pt = gs.decrypt("#{sender}:#{sender_device}", message).to_s
+
+      # 11) store the session to a file
+      File.write(session_file_name, session_with_bob.to_pickle(@storage_key))
+
+      pt
+    end
+
+    private
+
+    def account_path
+      "#{@storage_folder}/account.pickle"
+    end
+
+    def session_path(selfid, device)
+      "#{@storage_folder}/#{selfid}:#{device}-session.pickle"
     end
   end
 end

data/lib/messages/authentication_req.rb

@@ -39,6 +39,9 @@ module SelfSDK
       protected
 
       def proto
+        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
+
         @to_device = @client.devices(@to).first
         Msgproto::Message.new(type: Msgproto::MsgType::MSG,
                               sender: "#{@jwt.id}:#{@messaging.device_id}",

data/lib/messages/fact_request.rb

@@ -86,6 +86,9 @@ module SelfSDK
       protected
 
       def proto
+        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
+
         devices = if @intermediary.nil?
                     @client.devices(@to)
                   else

data/lib/messages/message.rb

@@ -11,7 +11,7 @@ module SelfSDK
       body = if input.is_a? String
                input
              else
-               issuer = input.recipient.split(":")
+               issuer = input.sender.split(":")
                messaging.encryption_client.decrypt(input.ciphertext, issuer.first, issuer.last)
              end
 

data/lib/messaging.rb

@@ -30,7 +30,7 @@ module SelfSDK
     # @params storage_folder [String] folder to perist messaging encryption
     # @option opts [Bool] :auto_reconnect Automatically reconnects to websocket if connection is lost (defaults to true).
     # @option opts [String] :device_id The device id to be used by the app defaults to "1".
-    def initialize(url, client, storage_key, storage_folder, options = {})
+    def initialize(url, client, storage_key, options = {})
       @mon = Monitor.new
       @url = url
       @messages = {}
@@ -49,7 +49,7 @@ module SelfSDK
 
       FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       unless options.include? :no_crypto
-        @encryption_client = Crypto.new(@client, @device_id, storage_folder, storage_key)
+        @encryption_client = Crypto.new(@client, @device_id, @storage_dir, storage_key)
       end
 
       if options.include? :ws

metadata

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