selfsdk 0.0.182 → 0.0.184

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f69744dc023bc671a461138870259c77060a8631d447abe9e4da89df57fa2c19
-  data.tar.gz: 0a906d47e3b30c43dab5f96ff58452fbb9280a91768516cdb318336598901823
+  metadata.gz: 2c16f1734a708b0ebd37ca4fa0cea0e48db09344d4efb0654e5b4df6a37fd2d4
+  data.tar.gz: 32313fa1c28a57370c43d7100bdacc06bad28f0722ba0589a63c24bd0327bfd2
 SHA512:
-  metadata.gz: 10feb47142b359f87b428719b5e5916ce7d3f173ca73be6ec7670149979ef2985850dbf9b2043cba6f847c5022031b6b45885c3c6930ef103d6303cfd8830524
-  data.tar.gz: bfe025909daadde71071c161acaa389145deea760543aa328c5bd3c4d8da04e88da79918cde1f836d28232f50fe0f7837ca96fb08b04a5cf2addcc2ea7add8ed
+  metadata.gz: 9a015baa1ed364efcc422af5de6a54f87cbb953cdb45de7f397aa8cd2273b99c8ce4f6fbba0fc62f0ef803f38edf8155fbb1e9e14042b4f4ff76b391147da614
+  data.tar.gz: dfec1973db212e016774292d57bda452727cadd201ecdb80ab0f507a97ff3df244887ffde06704a618de63e0d101c75b7e8c879ff983654892d9496a50db7889

data/lib/messages/fact_request.rb

@@ -34,6 +34,7 @@ module SelfSDK
         @options = opts.fetch(:options, false)
         @description = opts.include?(:description) ? opts[:description] : nil
         @exp_timeout = opts.fetch(:exp_timeout, DEFAULT_EXP_TIMEOUT)
+        @allowed_for = opts.fetch(:allowed_for, nil)
 
         @intermediary = if opts.include?(:intermediary)
                           opts[:intermediary]
@@ -89,6 +90,7 @@ module SelfSDK
         }
         b[:options] = @options unless (@options.nil? || @options == false)
         b[:description] = @description unless (@description.nil? || @description.empty?)
+        b[:allowed_until] = (SelfSDK::Time.now + @allowed_for).strftime('%FT%TZ') unless @allowed_for.nil?
         b
       end
 

data/lib/messaging.rb

@@ -92,6 +92,11 @@ module SelfSDK
       send_message m
     end
 
+    def session?(identifier, device)
+      path = @encryption_client.session_path(identifier, device)
+      File.file?(path)
+    end
+
     # Send custom mmessage
     #
     # @param recipient [string] selfID to be requested

data/lib/selfsdk.rb

@@ -85,7 +85,7 @@ module SelfSDK
 
     # Provides access to SelfSDK::Services::Chat service
     def chat
-      @chat ||= SelfSDK::Services::Chat.new(messaging, @client)
+      @chat ||= SelfSDK::Services::Chat.new(messaging, identity)
     end
 
     def app_id

data/lib/services/chat.rb

@@ -14,7 +14,9 @@ module SelfSDK
       def initialize(messaging, client)
         @messaging = messaging
         @client = client
-        @app_id = @client.jwt.id
+        @app_id = @messaging.client.client.jwt.id
+        @auth_token = @messaging.client.client.jwt.auth_token
+        @self_url = @messaging.client.client.self_url
       end
 
       # Sends a message to a list of recipients.
@@ -32,7 +34,7 @@ module SelfSDK
         payload[:rid] = opts[:rid] if opts.key? :rid
         payload[:objects] = opts[:objects] if opts.key? :objects
 
-        m = SelfSDK::Chat::Message.new(self, recipients, payload, @messaging.client.jwt.auth_token, @client.self_url)
+        m = SelfSDK::Chat::Message.new(self, recipients, payload, @auth_token, @self_url)
         _req = send(m.recipients, m.payload)
 
         m
@@ -41,8 +43,7 @@ module SelfSDK
       # Subscribes to an incoming chat message
       def on_message(opts = {}, &block)
         @messaging.subscribe :chat_message do |msg|
-          puts "(#{msg.payload[:iss]}, #{msg.payload[:jti]})"
-          cm = SelfSDK::Chat::Message.new(self, msg.payload[:aud], msg.payload, @messaging.client.jwt.auth_token, @client.self_url)
+          cm = SelfSDK::Chat::Message.new(self, msg.payload[:aud], msg.payload, @auth_token, @self_url)
 
           cm.mark_as_delivered unless opts[:mark_as_delivered] == false
           cm.mark_as_read if opts[:mark_as_read] == true
@@ -127,7 +128,7 @@ module SelfSDK
                     members: members }
 
         if opts.key? :data
-          obj = SelfSDK::Chat::FileObject.new(@messaging.client.jwt.auth_token, @client.self_url)
+          obj = SelfSDK::Chat::FileObject.new(@auth_token, @self_url)
           obj_payload = obj.build_from_data("", opts[:data], opts[:mime]).to_payload
           obj_payload.delete(:name)
           payload.merge! obj_payload
@@ -142,6 +143,12 @@ module SelfSDK
       # @param gid [string] group id.
       # @param members [array] list of group members.
       def join(gid, members)
+        # Allow incoming connections from the given members
+
+        # Create missing sessions with group members.
+        create_missing_sessions(members)
+
+        # Send joining confirmation.
         send(members, typ: 'chat.join', gid: gid, aud: gid)
       end
 
@@ -173,6 +180,31 @@ module SelfSDK
         end
         m
       end
+
+      # Group invites may come with members of the group we haven't set up a session
+      # previously, for those identitiese need to establish a session, but only if
+      # our identity appears before the others in the list members.
+      def create_missing_sessions(members)
+        return if members.empty?
+
+        posterior_members = false
+        requests = []
+
+        members.each do |m|
+          if posterior_members
+            @client.devices(m).each do |d|
+              continue unless @messaging.client.session?(m, d)
+
+              requests << @messaging.send("#{m}:#{d}", {
+                typ: 'sessions.create',
+                aud: m
+              })
+            end
+          end
+
+          posterior_members = true if m == @app_id
+        end
+      end
     end
   end
 end

data/lib/services/facts.rb

@@ -40,6 +40,7 @@ module SelfSDK
       #  @param [Hash] opts the options to authenticate.
       #  @option opts [String] :cid The unique identifier of the authentication request.
       #  @option opts [Integer] :exp_timeout timeout in seconds to expire the request.
+      #  @option opts [Integer] :allowed_for number of seconds for enabling recurrent requests.
       #  @return [Object] SelfSDK:::Messages::FactRequest
       def request(selfid, facts, opts = {}, &block)
         SelfSDK.logger.info "authenticating #{selfid}"

metadata

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