slanger 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718475355eadf95bb9b4005136ce10c950c11226
-  data.tar.gz: 0323db0e1b1fe76d985911f62f4c4a12a5b2dadb
+  metadata.gz: abbd4b1fc22d16cd1a72b1bd647fa4f3703f580d
+  data.tar.gz: 0b6db960a6b39f26a219b8cb7cf56826b02ca111
 SHA512:
-  metadata.gz: af59b0d0f70cd6777a92d1953da00c0e06205a3a5c84c29e18f33859aa452eda38ee43bfd990a774266c355598b3ea9df7a1afc6e9a8c49e1bc5b59df11dd8f5
-  data.tar.gz: 1b55c415f494f76693bd62f154417c9606a5d441ed7d3425b6fc653840508e8b91db6725716c801d337f88ad2b881197129778526b238afc075f93d1ab56dc34
+  metadata.gz: 2a5cab2cc4a2672405ec12bc830dd43c0051183a68aa54c24a07426d4012c0570a5dda15b1c9a78178347137e61fc2001c3ee9ca4bd716ba3b89b601384e1882
+  data.tar.gz: a2fc49dbb668a8a343c69c852fb946faaa29d89cdadc4f50386a3b810b578bd388cdd0e93d73ad81462797825711badab9a59b91ffa7096d4e777ebb744c3f1c

data/README.md

@@ -103,14 +103,14 @@ Pusher.port   = 4567
 
 You will also need to do the same to the Pusher JavaScript client in your client side JavaScript, e.g
 
-```javascript
+```html
 <script type="text/javascript">
-  ...
-
-  Pusher.host    = 'slanger.example.com'
-  Pusher.ws_port = 8080
-  Pusher.wss_port = 8080
-
+  var pusher = new Pusher('#{Pusher.key}', {
+    wsHost: "0.0.0.0",
+    wsPort: "8080",
+    wssPort: "8080",
+    enabledTransports: ['ws', 'flash']
+  });
 </script>
 ```
 
@@ -140,8 +140,9 @@ Slanger supports several configuration options, which can be supplied as command
 -c or --cert_file Certificate file for SSL support. This argument is optional, if given, SSL will be enabled
 
 -v or --[no-]verbose This makes Slanger run verbosely, meaning WebSocket frames will be echoed to STDOUT. Useful for debugging
-```
 
+--pid_file  The path to a file you want slanger to write it's PID to. Optional.
+```
 
 # Why use Slanger instead of Pusher?
 

data/bin/slanger

@@ -64,6 +64,10 @@ OptionParser.new do |opts|
     options[:activity_timeout] = t
   end
 
+  opts.on '--pid_file PIDFILE', "The Slanger process ID file name." do |k|
+    options[:pid_file] = k
+  end
+
   opts.parse!
 
   %w<app_key secret>.each do |parameter|
@@ -85,12 +89,20 @@ if options[:tls_options]
   end
 end
 
+STDOUT.sync = true
+
 EM.epoll
 EM.kqueue
 
 EM.run do
   File.tap { |f| require f.expand_path(f.join(f.dirname(__FILE__),'..', 'slanger.rb')) }
   Slanger::Config.load options
+
+  # Write PID to file
+  unless options[:pid_file].nil?
+    File.open(options[:pid_file], 'w') { |f| f.puts Process.pid }
+  end
+
   Slanger::Service.run
 
   puts "\n"

data/lib/slanger/api_server.rb

@@ -28,6 +28,7 @@ module Slanger
       # Send event to each channel
       data["channels"].each { |channel| publish(channel, data['name'], data['data']) }
 
+      status 202
       return {}.to_json
     end
 
@@ -36,6 +37,7 @@ module Slanger
 
       publish(params[:channel_id], params['name'],  request.body.read.tap{ |s| s.force_encoding('utf-8') })
 
+      status 202
       return {}.to_json
     end
 
@@ -56,18 +58,7 @@ module Slanger
     end
 
     def publish(channel, event, data)
-      f = Fiber.current
-
-      # Publish the event in Redis and translate the result into an HTTP
-      # status to return to the client.
-      Slanger::Redis.publish(channel, payload(channel, event, data)).tap do |r|
-        r.callback { f.resume [202, {}, "202 ACCEPTED\n"] }
-        r.errback  { f.resume [500, {}, "500 INTERNAL SERVER ERROR\n"] }
-      end
-
-      Fiber.yield
+      Slanger::Redis.publish(channel, payload(channel, event, data))
     end
-
   end
 end
-

data/lib/slanger/connection.rb

@@ -17,21 +17,25 @@ module Slanger
     end
 
     def error e
-      send_payload nil, 'pusher:error', e
+      begin
+        send_payload nil, 'pusher:error', e
+      rescue EventMachine::WebSocket::WebSocketError
+        # Raised if connecection already closed. Only seen with Thor load testing tool
+      end
     end
 
     def establish
       @socket_id = SecureRandom.uuid
       send_payload nil, 'pusher:connection_established', {
-          socket_id: @socket_id,
-          activity_timeout: Slanger::Config.activity_timeout
-        }
+        socket_id: @socket_id,
+        activity_timeout: Slanger::Config.activity_timeout
+      }
     end
 
     private
 
     def format(channel_id, event_name, payload = {})
-      body = { event: event_name, data: payload }
+      body = { event: event_name, data: payload.to_json }
       body[:channel] = channel_id if channel_id
       body.to_json
     end

data/lib/slanger/handler.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/hash'
 require 'securerandom'
 require 'signature'
 require 'fiber'
+require 'rack'
 
 module Slanger
   class Handler
@@ -23,7 +24,10 @@ module Slanger
     # Dispatches message handling to method with same name as
     # the event name
     def onmessage(msg)
-      msg   = JSON.parse msg
+      msg = JSON.parse(msg)
+
+      msg['data'] = JSON.parse(msg['data']) if msg['data'].is_a? String
+
       event = msg['event'].gsub(/^pusher:/, 'pusher_')
 
       if event =~ /^client-/
@@ -47,10 +51,19 @@ module Slanger
     end
 
     def authenticate
-      return connection.establish if valid_app_key? app_key
+      if !valid_app_key? app_key
+        error({ code: 4001, message: "Could not find app by key #{app_key}" })
+        @socket.close_websocket
+      elsif !valid_protocol_version?
+        error({ code: 4007, message: "Unsupported protocol version" })
+        @socket.close_websocket
+      else
+        return connection.establish
+      end
+    end
 
-      error({ code: 4001, message: "Could not find app by key #{app_key}" })
-      @socket.close_websocket
+    def valid_protocol_version?
+      protocol_version.between?(3, 7)
     end
 
     def pusher_ping(msg)
@@ -83,6 +96,11 @@ module Slanger
       @handshake.path.split(/\W/)[2]
     end
 
+    def protocol_version
+      @query_string ||= Rack::Utils.parse_nested_query(@handshake.query_string)
+      @query_string["protocol"].to_i || -1
+    end
+
     def valid_app_key? app_key
       Slanger::Config.app_key == app_key
     end

data/lib/slanger/presence_channel.rb

@@ -127,7 +127,7 @@ module Slanger
         # Don't tell the channel subscriptions the member has been removed if the subscriber data
         # still remains in the subscriptions hash, i.e. multiple browser windows open.
         subscriber = subscriptions.delete message['subscription_id']
-        unless subscriptions.has_value? subscriber
+        if subscriber && !subscriptions.has_value?(subscriber)
           push payload('pusher_internal:member_removed', { user_id: subscriber['user_id'] })
         end
       end

data/lib/slanger/subscription.rb

@@ -5,7 +5,7 @@ module Slanger
 
     def initialize socket, socket_id, msg
       @connection = Connection.new socket, socket_id
-      @msg       = msg
+      @msg        = msg
     end
 
     def subscribe

data/lib/slanger/version.rb

@@ -1,3 +1,3 @@
 module Slanger
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/slanger/webhook.rb

@@ -10,11 +10,16 @@ module Slanger
         time_ms: Time.now.strftime('%s%L'), events: [payload]
       }.to_json
 
-      digest   = OpenSSL::Digest::SHA256.new
-      hmac     = OpenSSL::HMAC.hexdigest(digest, Slanger::Config.secret, payload)
+      digest        = OpenSSL::Digest::SHA256.new
+      hmac          = OpenSSL::HMAC.hexdigest(digest, Slanger::Config.secret, payload)
+      content_type  = 'application/json'
 
       EM::HttpRequest.new(Slanger::Config.webhook_url).
-        post(body: payload, head: { "X-Pusher-Key" => Slanger::Config.app_key, "X-Pusher-Secret" => hmac })
+        post(body: payload, head: { 
+          "X-Pusher-Key" => Slanger::Config.app_key, 
+          "X-Pusher-Signature" => hmac, 
+          "Content-Type" => content_type 
+        })
         # TODO: Exponentially backed off retries for errors
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slanger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Stevie Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: A websocket service compatible with Pusher libraries
 email: sjtgraham@mac.com
 executables:
@@ -298,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -306,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A websocket service compatible with Pusher libraries