selfsdk 0.0.173 → 0.0.177

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3aceb81a7fcf7a714ddad4b62c1f01c01f07e369ecfcb451ad0fdbc649317a
-  data.tar.gz: a020c8ccb70168b6e388d15701d3ec4d08539347ef41c37f7250f24c129ea025
+  metadata.gz: ee70547489ad1f10f9f007fa94720d325a91bd5ea877737280a52915dafc90e9
+  data.tar.gz: c64c1a8f78210943dc6d8ac179b86a2375af9c71e7a6c5f76ab07f19c0fec264
 SHA512:
-  metadata.gz: 3894ed249114a6ae24ba77e27818349eed01999ac186b5312c3ce9e90ffbd9615556ee8a03d197210d21818e30d90cead4b00959ffaf5442e38367f6176a9e50
-  data.tar.gz: f0380ac5b650e6c4be263a3b42a3255f20c49295c470e31db8000799231beb8089f6ec83bea792ce9b77ec5ff5bf7c93bb4b517b67cb77dc28da92e923b9f784
+  metadata.gz: f562adb112bd870e6d92f28cce8acffcfe03a825dbd97a26c87d9e6fa219dc3460b008589d03b24b597222051760ec84e60be0ff4d46be7d9445e1da767ed32c
+  data.tar.gz: 3dcb56852c5473c336e73ec31b5c681a6e25f16974a06bf120d11b308a5e211559fb3fbb5cedf9d282416a9d31f8c4f1ab71be1a5faf11e628dc2fd03d3ee6bb

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

@@ -2,6 +2,7 @@
 
 # frozen_string_literal: true
 
+require 'self_msgproto'
 require_relative 'base'
 require_relative '../ntptime'
 require_relative 'authentication_message'
@@ -41,11 +42,12 @@ module SelfSDK
       protected
 
       def proto(to_device)
-        Msgproto::Message.new(type: Msgproto::MsgType::MSG,
-                              sender: "#{@jwt.id}:#{@messaging.device_id}",
-                              id: SecureRandom.uuid,
-                              recipient: "#{@to}:#{to_device}",
-                              ciphertext: encrypt_message(@jwt.prepare(body), @to, to_device))
+        m = SelfMsg::Message.new
+        m.id = SecureRandom.uuid
+        m.sender = "#{@jwt.id}:#{@messaging.device_id}"
+        m.recipient = "#{@to}:#{to_device}"
+        m.ciphertext = encrypt_message(@jwt.prepare(body), @to, to_device)
+        m
       end
 
     end

data/lib/messages/fact_request.rb

@@ -2,6 +2,7 @@
 
 # frozen_string_literal: true
 
+require 'self_msgproto'
 require_relative 'base'
 require_relative '../ntptime'
 
@@ -103,12 +104,12 @@ module SelfSDK
           ciphertext = encrypt_message(@jwt.prepare(body), @intermediary, @to_device)
         end
 
-        Msgproto::Message.new(
-          type: Msgproto::MsgType::MSG,
-          id: SecureRandom.uuid,
-          sender: "#{@jwt.id}:#{@messaging.device_id}",
-          recipient: recipient,
-          ciphertext: ciphertext )
+        m = SelfMsg::Message.new
+        m.id = SecureRandom.uuid
+        m.sender = "#{@jwt.id}:#{@messaging.device_id}"
+        m.recipient = recipient
+        m.ciphertext = ciphertext
+        m
       end
     end
   end

data/lib/messaging.rb

@@ -6,13 +6,9 @@ require 'json'
 require 'monitor'
 require 'faye/websocket'
 require 'fileutils'
+require 'self_msgproto'
 require_relative 'crypto'
 require_relative 'messages/message'
-require_relative 'proto/auth_pb'
-require_relative 'proto/message_pb'
-require_relative 'proto/msgtype_pb'
-require_relative 'proto/acl_pb'
-require_relative 'proto/aclcommand_pb'
 
 module SelfSDK
   class MessagingClient
@@ -86,13 +82,13 @@ module SelfSDK
     # @param recipient_device [string] device id for the selfID to be requested
     # @param request [string] original message requesing information
     def share_information(recipient, recipient_device, request)
-      send_message Msgproto::Message.new(
-        type: Msgproto::MsgType::MSG,
-        id: SecureRandom.uuid,
-        sender: "#{@jwt.id}:#{@device_id}",
-        recipient: "#{recipient}:#{recipient_device}",
-        ciphertext: @jwt.prepare(request),
-      )
+      m = SelfMsg::Message.new
+      m.id = SecureRandom.uuid 
+      m.sender = "#{@jwt.id}:#{@device_id}"
+      m.recipient = "#{recipient}:#{recipient_device}"
+      m.ciphertext = @jwt.prepare(request)
+
+      send_message m
     end
 
     # Send custom mmessage
@@ -102,24 +98,24 @@ module SelfSDK
     # @param request [hash] original message requesing information
     def send_custom(recipient, request_body)
       @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}",
-          ciphertext: @jwt.prepare(request_body),
-        )
+        m = SelfMsg::Message.new
+        m.id = SecureRandom.uuid
+        m.sender = "#{@jwt.id}:#{@device_id}"
+        m.recipient = "#{recipient}:#{to_device}"
+        m.ciphertext = @jwt.prepare(request_body)
+
+        send_message m
       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),
-          )
+        if to_device != @device_id 
+          m = SelfMsg::Message.new
+          m.id = SecureRandom.uuid
+          m.sender = "#{@jwt.id}:#{@device_id}"
+          m.recipient = "#{recipient}:#{to_device}"
+          m.ciphertext = @jwt.prepare(request_body)
+
+          send_message m
         end
       end
     end
@@ -128,40 +124,40 @@ module SelfSDK
     #
     # @params payload [string] base64 encoded payload to be sent
     def add_acl_rule(payload)
-      send_message Msgproto::AccessControlList.new(
-        type: Msgproto::MsgType::ACL,
-        id: SecureRandom.uuid,
-        command: Msgproto::ACLCommand::PERMIT,
-        payload: payload,
-      )
+      a = SelfMsg::Acl.new
+      a.id = SecureRandom.uuid
+      a.command = SelfMsg::AclCommandPERMIT
+      a.payload = payload
+
+      send_message a
     end
 
     # Blocks incoming messages from specified identities
     #
     # @params payload [string] base64 encoded payload to be sent
     def remove_acl_rule(payload)
-      send_message Msgproto::AccessControlList.new(
-        type: Msgproto::MsgType::ACL,
-        id: SecureRandom.uuid,
-        command: Msgproto::ACLCommand::REVOKE,
-        payload: payload,
-      )
+      a = SelfMsg::Acl.new
+      a.id = SecureRandom.uuid
+      a.command = SelfMsg::AclCommandREVOKE
+      a.payload = payload
+
+      send_message a
     end
 
     # Lists acl rules
     def list_acl_rules
       wait_for 'acl_list' do
-        send_raw Msgproto::AccessControlList.new(
-          type: Msgproto::MsgType::ACL,
-          id: SecureRandom.uuid,
-          command: Msgproto::ACLCommand::LIST,
-        )
+        a = SelfMsg::Acl.new
+        a.id = SecureRandom.uuid
+        a.command = SelfMsg::AclCommandLIST
+
+        send_raw a
       end
     end
 
     # Sends a message and waits for the response
     #
-    # @params msg [Msgproto::Message] message object to be sent
+    # @params msg [SelfMsg::Message] message object to be sent
     def send_and_wait_for_response(msgs, original)
       wait_for msgs.first.id, original do
         msgs.each do |msg|
@@ -202,7 +198,7 @@ module SelfSDK
 
     # Send a message through self network
     #
-    # @params msg [Msgproto::Message] message object to be sent
+    # @params msg [SelfMsg::Message] message object to be sent
     def send_message(msg)
       uuid = msg.id
       @mon.synchronize do
@@ -362,34 +358,39 @@ module SelfSDK
 
     # Process an event when it arrives through the websocket connection.
     def on_message(event)
-      input = Msgproto::Message.decode(event.data.pack('c*'))
-      SelfSDK.logger.info " - received #{input.id} (#{input.type})"
-      case input.type
-      when :ERR
-        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"
-        mark_as_acknowledged input.id
-      when :ACL
+      data = event.data.pack('c*')
+      hdr = SelfMsg::Header.new(data: data)
+
+      SelfSDK.logger.info " - received #{hdr.id} (#{hdr.type})"
+      case hdr.type
+      when SelfMsg::MsgTypeMSG
+        SelfSDK.logger.info "Message #{hdr.id} received"
+        m = SelfMsg::Message.new(data: data)
+        process_incomming_message m
+      when SelfMsg::MsgTypeACK
+        SelfSDK.logger.info "#{hdr.id} acknowledged"
+        mark_as_acknowledged hdr.id
+      when SelfMsg::MsgTypeERR
+        SelfSDK.logger.warn "error on #{hdr.id}"
+        e = SelfMsg::Notification.new(data: data)
+        SelfSDK.logger.warn "#{e.error}"
+        mark_as_arrived(hdr.id)
+      when SelfMsg::MsgTypeACL
         SelfSDK.logger.info "ACL received"
-        process_incomming_acl input
-      when :MSG
-        SelfSDK.logger.info "Message #{input.id} received"
-        process_incomming_message input
+        a = SelfMsg::Acl.new(data: data)
+        process_incomming_acl a
       end
     rescue TypeError
       SelfSDK.logger.info "invalid array message"
     end
 
     def process_incomming_acl(input)
-      list = JSON.parse(input.recipient)
+      list = JSON.parse(input.payload)
 
       @messages['acl_list'][:response] = list
       mark_as_arrived 'acl_list'
     rescue StandardError => e
-      p "Error processing incoming ACL #{input.to_json}"
+      p "Error processing incoming ACL #{input.id} #{input.payload}"
       SelfSDK.logger.info e
       SelfSDK.logger.info e.backtrace
       nil
@@ -422,19 +423,20 @@ module SelfSDK
       @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,
-      )
-      
+
+      a = SelfMsg::Auth.new
+      a.id = @auth_id
+      a.token = @jwt.auth_token
+      a.device = @device_id
+      a.offset = @offset
+
+      send_raw a
+
       @auth_id = nil
     end
 
     def send_raw(msg)
-      @ws.send(msg.to_proto.bytes)
+      @ws.send(msg.to_fb.bytes)
     end
 
     # Marks a message as arrived.

data/lib/selfsdk.rb

@@ -30,7 +30,7 @@ module SelfSDK
   # @attr_reader [Types] app_key the api key for the current app.
   class App
     BASE_URL = "https://api.joinself.com".freeze
-    MESSAGING_URL = "wss://messaging.joinself.com/v1/messaging".freeze
+    MESSAGING_URL = "wss://messaging.joinself.com/v2/messaging".freeze
 
     attr_reader :client
     attr_accessor :messaging_client
@@ -105,7 +105,7 @@ module SelfSDK
 
       def messaging_url(opts)
         return opts[:messaging_url] if opts.key? :messaging_url
-        return "wss://messaging.#{opts[:env].to_s}.joinself.com/v1/messaging" if opts.key? :env
+        return "wss://messaging.#{opts[:env].to_s}.joinself.com/v2/messaging" if opts.key? :env
         MESSAGING_URL
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.173
+  version: 0.0.177
 platform: ruby
 authors:
 - Aldgate Ventures
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: self_msgproto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -327,14 +341,6 @@ files:
 - lib/messages/message.rb
 - lib/messaging.rb
 - lib/ntptime.rb
-- lib/proto/acl_pb.rb
-- lib/proto/aclcommand_pb.rb
-- lib/proto/auth_pb.rb
-- lib/proto/errtype_pb.rb
-- lib/proto/header_pb.rb
-- lib/proto/message_pb.rb
-- lib/proto/msgtype_pb.rb
-- lib/proto/notification_pb.rb
 - lib/selfsdk.rb
 - lib/services/auth.rb
 - lib/services/facts.rb
@@ -350,7 +356,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- lib/proto
 - lib/messages
 - lib/services
 required_ruby_version: !ruby/object:Gem::Requirement

data/lib/proto/acl_pb.rb

@@ -1,21 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: acl.proto
-
-require 'google/protobuf'
-
-require_relative 'msgtype_pb'
-require_relative 'aclcommand_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "msgproto.AccessControlList" do
-    optional :type, :enum, 1, "msgproto.MsgType"
-    optional :id, :string, 2
-    optional :command, :enum, 3, "msgproto.ACLCommand"
-    optional :payload, :bytes, 4
-  end
-end
-
-module Msgproto
-  AccessControlList = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.AccessControlList").msgclass
-end

data/lib/proto/aclcommand_pb.rb

@@ -1,18 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: aclcommand.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_enum "msgproto.ACLCommand" do
-    value :LIST, 0
-    value :PERMIT, 1
-    value :REVOKE, 2
-  end
-end
-
-module Msgproto
-  ACLCommand = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.ACLCommand").enummodule
-end

data/lib/proto/auth_pb.rb

@@ -1,21 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: auth.proto
-
-require 'google/protobuf'
-
-require_relative 'msgtype_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "msgproto.Auth" do
-    optional :type, :enum, 1, "msgproto.MsgType"
-    optional :id, :string, 2
-    optional :token, :string, 3
-    optional :device, :string, 4
-    optional :offset, :int64, 5
-  end
-end
-
-module Msgproto
-  Auth = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.Auth").msgclass
-end

data/lib/proto/errtype_pb.rb

@@ -1,21 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: errtype.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_enum "msgproto.ErrType" do
-    value :ErrConnection, 0
-    value :ErrBadRequest, 1
-    value :ErrInternal, 2
-    value :ErrMessage, 3
-    value :ErrAuth, 4
-    value :ErrACL, 5
-  end
-end
-
-module Msgproto
-  ErrType = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.ErrType").enummodule
-end

data/lib/proto/header_pb.rb

@@ -1,18 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: header.proto
-
-require 'google/protobuf'
-
-require_relative 'msgtype_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "msgproto.Header" do
-    optional :type, :enum, 1, "msgproto.MsgType"
-    optional :id, :string, 2
-  end
-end
-
-module Msgproto
-  Header = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.Header").msgclass
-end

data/lib/proto/message_pb.rb

@@ -1,24 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: message.proto
-
-require 'google/protobuf'
-
-require_relative 'msgtype_pb'
-require 'google/protobuf/timestamp_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "msgproto.Message" do
-    optional :type, :enum, 1, "msgproto.MsgType"
-    optional :id, :string, 2
-    optional :sender, :string, 3
-    optional :recipient, :string, 4
-    optional :ciphertext, :bytes, 5
-    optional :timestamp, :message, 6, "google.protobuf.Timestamp"
-    optional :offset, :int64, 7
-  end
-end
-
-module Msgproto
-  Message = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.Message").msgclass
-end

data/lib/proto/msgtype_pb.rb

@@ -1,20 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: msgtype.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_enum "msgproto.MsgType" do
-    value :MSG, 0
-    value :ACK, 1
-    value :ERR, 2
-    value :AUTH, 3
-    value :ACL, 4
-  end
-end
-
-module Msgproto
-  MsgType = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.MsgType").enummodule
-end

data/lib/proto/notification_pb.rb

@@ -1,21 +0,0 @@
-# Copyright 2020 Self Group Ltd. All Rights Reserved.
-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: notification.proto
-
-require 'google/protobuf'
-
-require_relative 'msgtype_pb'
-require_relative 'errtype_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "msgproto.Notification" do
-    optional :type, :enum, 1, "msgproto.MsgType"
-    optional :id, :string, 2
-    optional :error, :string, 3
-    optional :errtype, :enum, 4, "msgproto.ErrType"
-  end
-end
-
-module Msgproto
-  Notification = Google::Protobuf::DescriptorPool.generated_pool.lookup("msgproto.Notification").msgclass
-end