em-pusher-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b6613c790b8733c6c079eef2f2363a6b9cab073
-  data.tar.gz: 7a8d966f51b78a1dfe666951a36ae5e9b7a5e347
+  metadata.gz: 4fd6883f4b562541f783fe9c959e945c2ae002cd
+  data.tar.gz: a50e5b95bdb7aac64c8e83e43621726c32bf3767
 SHA512:
-  metadata.gz: 1985a4aa80bf970dc44cb817aa40408b87460ff561cbe24f9e1b4aa3839387dec6dad01dfb7b7b4f0fede179d857eb921a0d605454468ae00caaf5ab29603317
-  data.tar.gz: 9b24b97a39619613c27f125073d972f7e92e213cb8a29d9f107685512914d08d3361982131f9bbb18dd011eaf47b8d418639cf856a18aca81f56e03a8e7a4636
+  metadata.gz: 7461898ed226b93ece2013c3bf1e71e9cff92eca5a115bce66761eecdaae0b397cb9db11523aa29d3806a6b09cbbcfad8c83f9ba0c1b6c0f05f9377c5a3fd851
+  data.tar.gz: 0cd868c86f26b9ae71f5457a576d17b48bf02d62a2f0dd855f220c32b59599042cd8f68e1adcfac013a829105dccf3a2ef53203de484fa1740f60d146ae3c39f

data/examples/private.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require './lib/em/pusher/client'
+
+pusher_key = 'pusher_key'
+channel = 'private-channel'
+pusher_secret = 'pusher_secret'
+
+EM.run do
+  opts = {
+    key: pusher_key,
+    cluster: 'us2',
+    port: 80,
+    scheme: 'ws',
+  }
+  EM::Pusher::Client.connect(opts) do |conn|
+    conn.connected do
+      puts 'connected'
+    end
+
+    conn.connection_established do |socket_id|
+      puts 'callback'
+      auth = EM::Pusher::Client.build_auth(pusher_secret, pusher_key, socket_id, channel)
+      msg = {
+        event: 'pusher:subscribe',
+        data: {
+          channel: channel,
+          auth: auth,
+        },
+      }
+      conn.send_msg(msg)
+    end
+
+    conn.errback do |e|
+      puts "Got error: #{e}"
+    end
+
+    conn.stream do |msg|
+      case msg.event
+      when 'pusher:connection_established'
+        puts 'Connection Established'
+      when 'pusher_internal:subscription_succeeded'
+        puts "Subscribed to #{msg.json['channel']}"
+      when 'someevent'
+        puts "#{msg.type}: #{msg.event} >> #{msg.data}"
+      else
+        puts "unexpected event (#{msg.type}): <#{msg}>"
+      end
+      # conn.close_connection if closed?
+    end
+
+    conn.disconnect do
+      puts 'gone'
+      EM.stop_event_loop
+    end
+  end
+end

data/lib/em/pusher/client.rb

@@ -27,6 +27,17 @@ module EM
         end
       end
 
+      def self.sign(secret, socket_id, channel_name)
+        digest = OpenSSL::Digest::SHA256.new
+        string_to_sign = "#{socket_id}:#{channel_name}"
+        OpenSSL::HMAC.hexdigest(digest, secret, string_to_sign)
+      end
+
+      def self.build_auth(secret, key, socket_id, channel_name)
+        sig = sign(secret, socket_id, channel_name)
+        "#{key}:#{sig}"
+      end
+
       def self.url(options)
         opts = DEFAULT_OPTIONS.merge(options)
         REQUIRED_OPTIONS.each { |opt| fail ArgumentError, "option #{opt} is required" unless opts[opt] }

data/lib/em/pusher/client/connection.rb

@@ -4,6 +4,7 @@ require 'eventmachine'
 require 'uri'
 require 'json'
 require 'websocket'
+require 'openssl'
 
 module EM
   module Pusher
@@ -53,6 +54,14 @@ module EM
           @disconnect = cback
         end
 
+        def connection_established(&cback)
+          @connection_established = cback
+        end
+
+        def ping(&cback)
+          @ping = cback
+        end
+
         # https://pusher.com/docs/pusher_protocol#subscription-events
         def subscribe(channel, auth = nil, channel_data = nil)
           msg = {
@@ -98,8 +107,34 @@ module EM
         def handle_received_data(data)
           @frame << data
           while (msg = @frame.next)
-            @stream.call(EM::Pusher::Client::MsgParser.new(msg)) if @stream
+            process_data(EM::Pusher::Client::MsgParser.new(msg))
+          end
+        end
+
+        def process_data(parser)
+          if parser.event == 'pusher:connection_established'
+            process_connection(parser)
+          elsif parser.type == :ping
+            process_ping
+          elsif parser.type == :close
+            process_close
           end
+          @stream.call(parser) if @stream
+        end
+
+        def process_connection(parser)
+          socket_id = JSON.parse(parser.json['data'])['socket_id']
+          @connection_established.yield(socket_id) if @connection_established
+        end
+
+        def process_ping
+          @ping.yield if @ping
+          send_msg(event: 'pusher:pong')
+        end
+
+        def process_close
+          unbind
+          close_connection
         end
       end
     end

data/lib/em/pusher/client/msg_parser.rb

@@ -4,14 +4,12 @@ module EM
   module Pusher
     module Client
       class MsgParser
-        attr_reader :json,
-                    :data
-
         def initialize(msg)
-          parse(msg)
+          @msg = msg
         end
 
         def event
+          return '{}' unless json
           @event ||= json['event']
         end
 
@@ -19,20 +17,25 @@ module EM
           @msg.to_s
         end
 
-      private
+        def type
+          @msg.type
+        end
+
+        def json
+          @json ||= JSON.parse(@msg.data)
+        rescue JSON::ParserError
+          {}
+        end
 
-        def parse(msg)
-          @msg = msg
-          @json = JSON.parse(msg.data)
+        def data
           @data =
             if json['data'].is_a?(String)
               JSON.parse(json['data'])
             else
               json['data']
             end
-        rescue JSON::ParserError => e
-          puts "Error parsing event '#{event}': '#{e.message}'"
-          # logger.error("Error parsing msg #{e}")
+        rescue JSON::ParserError
+          {}
         end
       end
     end

data/lib/em/pusher/client/version.rb

@@ -3,7 +3,7 @@
 module Em
   module Pusher
     module Client
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-pusher-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -174,6 +174,7 @@ files:
 - em-pusher-client.gemspec
 - em-pusher-client.sublime-project
 - examples/normal.rb
+- examples/private.rb
 - lib/em/pusher/client.rb
 - lib/em/pusher/client/connection.rb
 - lib/em/pusher/client/msg_parser.rb