selfsdk 0.0.169 → 0.0.174

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e525b40ab24f81c5e2ece5c34a8bdb312fae674074981ba8188d168a4c27644d
-  data.tar.gz: c97ce7cf0278006e0ef0a3fff16b5ce80f0d5564c84b0419354dc41dab35bd21
+  metadata.gz: 2c5f337bf8029e978de8dfc0e81f9689f34ce7c746db0ee49da981a48f621a33
+  data.tar.gz: baf4784345f281cfda38d86e9a24a5f2c8f1991f587696ac6d2e655ce379a02c
 SHA512:
-  metadata.gz: b069aaabdcc6a10a941c7ecdff18ec69d57d6773275903b9b8f9e1192ec045d1b43d361e57e8203abffd77878b184ac43ae84a2b0cd771112124a58e4860c1d4
-  data.tar.gz: 66d71475ac439e52ab6982e676348547a90cfd3455f80a091dbf8fb7af777185fe9aff65c341fda2d0ec406cb217557fdbdaa513a6a666326128d9dfdd370965
+  metadata.gz: 11161a22d7e15e23e85e4871fd10bb5ee501f5ace89046f5155c897e58b4384a64dcdfcfb1b9869009fa40ff017370b6740c89073805a66fe852226de1e10e1f
+  data.tar.gz: 025fb47e5b70062d7c861bba26084d6ffdfd953a5eebf496066da3f3358e670e7b7a5fcbbffa0bb012d6dded72b8530b9276d625f5b41c9bd661b7c5b7654b31

data/lib/acl.rb

@@ -11,16 +11,19 @@ module SelfSDK
     def initialize(messaging)
       @messaging = messaging
       @jwt = @messaging.jwt
+      @acl_rules = []
     end
 
     # Lists allowed connections.
     def list
       SelfSDK.logger.info "Listing allowed connections"
-      @messaging.list_acl_rules
+      @acl_rules = @messaging.list_acl_rules if @acl_rules.empty?
+      @acl_rules
     end
 
     # Allows incomming messages from the given identity.
     def allow(id)
+      @acl_rules << id
       SelfSDK.logger.info "Allowing connections from #{id}"
       @messaging.add_acl_rule(@jwt.prepare(jti: SecureRandom.uuid,
                                            cid: SecureRandom.uuid,
@@ -35,6 +38,7 @@ module SelfSDK
 
     # Deny incomming messages from the given identity.
     def deny(id)
+      @acl_rules.delete(id)
       SelfSDK.logger.info "Denying connections from #{id}"
       @messaging.remove_acl_rule(@jwt.prepare(jti: SecureRandom.uuid,
                                                cid: SecureRandom.uuid,

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)
@@ -363,7 +366,8 @@ module SelfSDK
       SelfSDK.logger.info " - received #{input.id} (#{input.type})"
       case input.type
       when :ERR
-        SelfSDK.logger.info "error #{input.sender} on #{input.id}"
+        SelfSDK.logger.warn "error #{input.sender} on #{input.id}"
+        SelfSDK.logger.warn "#{input.to_json}"
         mark_as_arrived(input.id)
       when :ACK
         SelfSDK.logger.info "#{input.id} acknowledged"

metadata

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