selfsdk 0.0.140 → 0.0.145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 031a8f44592664c22d59c7c1105822ab9111dde46ffda50ba34b6116d70d4a3f
-  data.tar.gz: e2096831cb8f8d5bcba45fabf93a5173fac96f06ec933b6f6d446d1ed55f015a
+  metadata.gz: 0c59c2a25ba8f895e9a1820e6cf8072c219680ccfc763582f9b8761903ae0f3f
+  data.tar.gz: 9ca32b859e6f0feeddf5c5e87b38309e691f7459e60d3a9b281f1396dc4bc998
 SHA512:
-  metadata.gz: 368a7cdacf1df7204473e6488e299e06e40b6caacc332c366ca039fea96930186e4888e007a333e99a6693d9b6ae18d13b4ae339f7d2cd988a1c412826bfce47
-  data.tar.gz: bc484da9425cc8e9f3b4d7e7af132f15395b1966109636e941ff3b5592ace7d914b65f338de4287de96e8d1d92dac03d5555667f1e146311a4965975b3154888
+  metadata.gz: 65b73466d77d25bfa80dfa9c191f19bb6d525c739754753e653652ebbb59eecb3b3c8936d3205c8b41dd7a71376bef6aa18367fb8f275fe60ef18888633e0a8d
+  data.tar.gz: c39e65926ddb0923673b5e1109ae54dcc01adfa2408a560182acd8cc3160adb8f7085e9a0f22545078108f2efc1f9d432363255086400833ad5bdd5947091867

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

@@ -38,13 +38,12 @@ module SelfSDK
 
       protected
 
-      def proto
-        @to_device = @client.devices(@to).first
+      def proto(to_device)
         Msgproto::Message.new(type: Msgproto::MsgType::MSG,
                               sender: "#{@jwt.id}:#{@messaging.device_id}",
                               id: @id,
-                              recipient: "#{@to}:#{@to_device}",
-                              ciphertext: encrypt_message(@jwt.prepare(body), @to, @to_device))
+                              recipient: "#{@to}:#{to_device}",
+                              ciphertext: encrypt_message(@jwt.prepare(body), @to, to_device))
       end
 
     end

data/lib/messages/base.rb

@@ -15,15 +15,24 @@ module SelfSDK
       end
 
       def request
-        res = @messaging.send_and_wait_for_response(proto, self)
-        SelfSDK.logger.info "synchronously messaging to #{@to}:#{@to_device}"
+        check_credits!
+        msgs = []
+        devices.each do |d|
+          msgs << proto(d)
+        end
+        res = @messaging.send_and_wait_for_response(msgs, self)
+        SelfSDK.logger.info "synchronously messaging to #{@to}:#{@d}"
         res
       end
 
       def send_message
-        res = @messaging.send_message proto
-        SelfSDK.logger.info "asynchronously requested information to #{@to}:#{@to_device}"
-        res
+        check_credits!
+        res = []
+        devices.each do |d|
+          res << @messaging.send_message(proto(d))
+          SelfSDK.logger.info "asynchronously requested information to #{@to}:#{@d}"
+        end
+        res.first
       end
 
       def encrypt_message(message, recipient, recipient_device)
@@ -65,6 +74,17 @@ module SelfSDK
         raise ::StandardError.new("must define this method")
       end
 
+      def devices
+        return @client.devices(@to) if @intermediary.nil?
+                  
+        @client.devices(@intermediary)
+      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
+      end
+
       private
 
       def get_payload(input)

data/lib/messages/fact_request.rb

@@ -85,14 +85,8 @@ module SelfSDK
 
       protected
 
-      def proto
-        devices = if @intermediary.nil?
-                    @client.devices(@to)
-                  else
-                    @client.devices(@intermediary)
-                  end
-        @to_device = devices.first
-
+      def proto(to_device)
+        @to_device = to_device
         if @intermediary.nil?
           recipient = "#{@to}:#{@to_device}"
           ciphertext = encrypt_message(@jwt.prepare(body), @to, @to_device)

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
@@ -94,6 +94,7 @@ 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(
           type: Msgproto::MsgType::MSG,
@@ -142,9 +143,11 @@ module SelfSDK
     # Sends a message and waits for the response
     #
     # @params msg [Msgproto::Message] message object to be sent
-    def send_and_wait_for_response(msg, original)
-      wait_for msg.id, original do
-        send_message msg
+    def send_and_wait_for_response(msgs, original)
+      wait_for msg.first.id, original do
+        msgs.each do |msg|
+          send_message msg
+        end
       end
     end
 

metadata

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