webrtc-rails 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4147f593226610ca34d19ffbecbc3277975ab36
-  data.tar.gz: 54d0d8c7d8e4f482f047b284f458195ad912cfbd
+  metadata.gz: 51213994fad483a7358c400c6c9054732a014ce3
+  data.tar.gz: 941b0e02f8d72493cf18e129e172bfc713eb9bb2
 SHA512:
-  metadata.gz: 80cbf33163749a6730e2fa55b51c72ee0ded9ba587ce2b40523835373a37822e8a647e757b7abc3b08eca20679e4b589728781990563186c87af150c6712c0e1
-  data.tar.gz: 18f211cc5cdc693b2c27bd9a084e118d268b02add33294a59ab2f64ca2d3567eb162a4bb0f4f87d34f4527f3915e371bbd55ec15a31f11e59a5b6d18a786102b
+  metadata.gz: ea03a20429013f684ac6a8660cc46a1fb98fd7dfe2fd8707151820d32e51cefb33ec7b00e1227a13fcaa34be1a4bd4b5fd0927857a0d103ae84f170a1d3c7482
+  data.tar.gz: c9b7ea69bab10a8b9dc0861c37110cf3a5a16f5f83daefc19ef361979dbc392af3edc02b02c1dd86a7fcf90ed2b19813c390f987925abea7cdd696f2436cc5da

data/lib/assets/javascripts/webrtc_rails/main.js.coffee

@@ -320,7 +320,7 @@ class @WebRTC
               @onWebRTCReconnected()
 
     peer.addStream(@_localStream)
-    peer.onaddstream = (obj) =>
+    peer.onaddstream = (event) =>
       @remoteOutput.src = window.URL.createObjectURL(event.stream)
 
     peer

data/lib/tasks/webrtc_rails.rake

@@ -36,7 +36,9 @@ namespace :webrtc_rails do
       end
     end
     puts 'webrtc daemon started'
-    Process.daemon(true, true)
+    if ENV['WEBRTC_DAEMON'] != 'false'
+      Process.daemon(true, true)
+    end
 
     output_dir = WebrtcRails.configuration.output_dir
     stdout_file = File.join(output_dir, 'stdout')

data/lib/webrtc_rails/daemon.rb

@@ -50,61 +50,65 @@ module WebrtcRails
           end
 
           websocket.onmessage do |message|
-            data = JSON.parse(message, {symbolize_names: true})
-            token = data[:token]
-            next if token.blank?
-            user = @user_class.send(@fetch_user_by_token_method, token.to_s)
-            my_user_identifier = user ? user.send(@user_identifier).to_s : nil
-            event = data[:event]
-            next if my_user_identifier.blank? && event != 'heartbeat'
+            begin
+              data = JSON.parse(message, {symbolize_names: true})
+              token = data[:token]
+              next if token.blank?
+              user = @user_class.send(@fetch_user_by_token_method, token.to_s)
+              my_user_identifier = user ? user.send(@user_identifier).to_s : nil
+              event = data[:event]
+              next if my_user_identifier.blank? && event != 'heartbeat'
 
-            case event
-            when 'heartbeat'
-              user_info = data[:value][:userInfo]
-              @daemon_delegate.onWebSocketHeartbeated(my_user_identifier, user_info)
-            when 'userMessage'
-              user_identifier = data[:value][:userIdentifier]
-              event_value = data[:value][:event]
-              message = data[:value][:message]
-              if @daemon_delegate.onWantSendUserMessage(my_user_identifier, user_identifier, event_value, message)
-                message = {
-                  type: 'userMessage',
-                  remoteUserIdentifier: my_user_identifier,
-                  event: event_value,
-                  message: message
-                }
-                sendMessage(user_identifier, message) do
-                  message[:type] = 'userMessageFailed'
-                  sendMessage(my_user_identifier, message)
-                end
-              end
-            when 'setMyToken'
-              @websockets[my_user_identifier] ||= []
-              @websockets[my_user_identifier].push(websocket)
-              message = {
-                type: 'myUserIdentifier',
-                myUserIdentifier: my_user_identifier
-              }
-              @daemon_delegate.onWebSocketConnected(my_user_identifier)
-              websocket.send JSON.generate(message)
-            when 'sendMessage'
-              user_identifier = data[:value][:userIdentifier]
-              type = data[:value][:message][:type]
-              allow_types = %w/call hangUp offer answer candidate callFailed userMessage webSocketReconnected/
-              if @websockets.key?(user_identifier) && type.present? && allow_types.include?(type)
-                if type != 'call' || @daemon_delegate.onWantCall(my_user_identifier, user_identifier)
-                  message = data[:value][:message]
-                  message[:remoteUserIdentifier] = my_user_identifier
-                  sendMessage(user_identifier, message)
+              case event
+              when 'heartbeat'
+                user_info = data[:value][:userInfo]
+                @daemon_delegate.onWebSocketHeartbeated(my_user_identifier, user_info)
+              when 'userMessage'
+                user_identifier = data[:value][:userIdentifier]
+                event_value = data[:value][:event]
+                message = data[:value][:message]
+                if @daemon_delegate.onWantSendUserMessage(my_user_identifier, user_identifier, event_value, message)
+                  message = {
+                    type: 'userMessage',
+                    remoteUserIdentifier: my_user_identifier,
+                    event: event_value,
+                    message: message
+                  }
+                  sendMessage(user_identifier, message) do
+                    message[:type] = 'userMessageFailed'
+                    sendMessage(my_user_identifier, message)
+                  end
                 end
-              else
+              when 'setMyToken'
+                @websockets[my_user_identifier] ||= []
+                @websockets[my_user_identifier].push(websocket)
                 message = {
-                  type: 'callFailed',
-                  reason: 0,
-                  remoteUserIdentifier: user_identifier
+                  type: 'myUserIdentifier',
+                  myUserIdentifier: my_user_identifier
                 }
+                @daemon_delegate.onWebSocketConnected(my_user_identifier)
                 websocket.send JSON.generate(message)
+              when 'sendMessage'
+                user_identifier = data[:value][:userIdentifier]
+                type = data[:value][:message][:type]
+                allow_types = %w/call hangUp offer answer candidate callFailed userMessage webSocketReconnected/
+                if @websockets.key?(user_identifier) && type.present? && allow_types.include?(type)
+                  if type != 'call' || @daemon_delegate.onWantCall(my_user_identifier, user_identifier)
+                    message = data[:value][:message]
+                    message[:remoteUserIdentifier] = my_user_identifier
+                    sendMessage(user_identifier, message)
+                  end
+                else
+                  message = {
+                    type: 'callFailed',
+                    reason: 0,
+                    remoteUserIdentifier: user_identifier
+                  }
+                  websocket.send JSON.generate(message)
+                end
               end
+            rescue => e
+              p e
             end
           end
         end

data/lib/webrtc_rails/version.rb

@@ -1,3 +1,3 @@
 module WebrtcRails
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webrtc-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Koji Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket