webrtc-rails 0.3.12 → 0.3.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c4147f593226610ca34d19ffbecbc3277975ab36
4
- data.tar.gz: 54d0d8c7d8e4f482f047b284f458195ad912cfbd
3
+ metadata.gz: 51213994fad483a7358c400c6c9054732a014ce3
4
+ data.tar.gz: 941b0e02f8d72493cf18e129e172bfc713eb9bb2
5
5
  SHA512:
6
- metadata.gz: 80cbf33163749a6730e2fa55b51c72ee0ded9ba587ce2b40523835373a37822e8a647e757b7abc3b08eca20679e4b589728781990563186c87af150c6712c0e1
7
- data.tar.gz: 18f211cc5cdc693b2c27bd9a084e118d268b02add33294a59ab2f64ca2d3567eb162a4bb0f4f87d34f4527f3915e371bbd55ec15a31f11e59a5b6d18a786102b
6
+ metadata.gz: ea03a20429013f684ac6a8660cc46a1fb98fd7dfe2fd8707151820d32e51cefb33ec7b00e1227a13fcaa34be1a4bd4b5fd0927857a0d103ae84f170a1d3c7482
7
+ data.tar.gz: c9b7ea69bab10a8b9dc0861c37110cf3a5a16f5f83daefc19ef361979dbc392af3edc02b02c1dd86a7fcf90ed2b19813c390f987925abea7cdd696f2436cc5da
@@ -320,7 +320,7 @@ class @WebRTC
320
320
  @onWebRTCReconnected()
321
321
 
322
322
  peer.addStream(@_localStream)
323
- peer.onaddstream = (obj) =>
323
+ peer.onaddstream = (event) =>
324
324
  @remoteOutput.src = window.URL.createObjectURL(event.stream)
325
325
 
326
326
  peer
@@ -36,7 +36,9 @@ namespace :webrtc_rails do
36
36
  end
37
37
  end
38
38
  puts 'webrtc daemon started'
39
- Process.daemon(true, true)
39
+ if ENV['WEBRTC_DAEMON'] != 'false'
40
+ Process.daemon(true, true)
41
+ end
40
42
 
41
43
  output_dir = WebrtcRails.configuration.output_dir
42
44
  stdout_file = File.join(output_dir, 'stdout')
@@ -50,61 +50,65 @@ module WebrtcRails
50
50
  end
51
51
 
52
52
  websocket.onmessage do |message|
53
- data = JSON.parse(message, {symbolize_names: true})
54
- token = data[:token]
55
- next if token.blank?
56
- user = @user_class.send(@fetch_user_by_token_method, token.to_s)
57
- my_user_identifier = user ? user.send(@user_identifier).to_s : nil
58
- event = data[:event]
59
- next if my_user_identifier.blank? && event != 'heartbeat'
53
+ begin
54
+ data = JSON.parse(message, {symbolize_names: true})
55
+ token = data[:token]
56
+ next if token.blank?
57
+ user = @user_class.send(@fetch_user_by_token_method, token.to_s)
58
+ my_user_identifier = user ? user.send(@user_identifier).to_s : nil
59
+ event = data[:event]
60
+ next if my_user_identifier.blank? && event != 'heartbeat'
60
61
 
61
- case event
62
- when 'heartbeat'
63
- user_info = data[:value][:userInfo]
64
- @daemon_delegate.onWebSocketHeartbeated(my_user_identifier, user_info)
65
- when 'userMessage'
66
- user_identifier = data[:value][:userIdentifier]
67
- event_value = data[:value][:event]
68
- message = data[:value][:message]
69
- if @daemon_delegate.onWantSendUserMessage(my_user_identifier, user_identifier, event_value, message)
70
- message = {
71
- type: 'userMessage',
72
- remoteUserIdentifier: my_user_identifier,
73
- event: event_value,
74
- message: message
75
- }
76
- sendMessage(user_identifier, message) do
77
- message[:type] = 'userMessageFailed'
78
- sendMessage(my_user_identifier, message)
79
- end
80
- end
81
- when 'setMyToken'
82
- @websockets[my_user_identifier] ||= []
83
- @websockets[my_user_identifier].push(websocket)
84
- message = {
85
- type: 'myUserIdentifier',
86
- myUserIdentifier: my_user_identifier
87
- }
88
- @daemon_delegate.onWebSocketConnected(my_user_identifier)
89
- websocket.send JSON.generate(message)
90
- when 'sendMessage'
91
- user_identifier = data[:value][:userIdentifier]
92
- type = data[:value][:message][:type]
93
- allow_types = %w/call hangUp offer answer candidate callFailed userMessage webSocketReconnected/
94
- if @websockets.key?(user_identifier) && type.present? && allow_types.include?(type)
95
- if type != 'call' || @daemon_delegate.onWantCall(my_user_identifier, user_identifier)
96
- message = data[:value][:message]
97
- message[:remoteUserIdentifier] = my_user_identifier
98
- sendMessage(user_identifier, message)
62
+ case event
63
+ when 'heartbeat'
64
+ user_info = data[:value][:userInfo]
65
+ @daemon_delegate.onWebSocketHeartbeated(my_user_identifier, user_info)
66
+ when 'userMessage'
67
+ user_identifier = data[:value][:userIdentifier]
68
+ event_value = data[:value][:event]
69
+ message = data[:value][:message]
70
+ if @daemon_delegate.onWantSendUserMessage(my_user_identifier, user_identifier, event_value, message)
71
+ message = {
72
+ type: 'userMessage',
73
+ remoteUserIdentifier: my_user_identifier,
74
+ event: event_value,
75
+ message: message
76
+ }
77
+ sendMessage(user_identifier, message) do
78
+ message[:type] = 'userMessageFailed'
79
+ sendMessage(my_user_identifier, message)
80
+ end
99
81
  end
100
- else
82
+ when 'setMyToken'
83
+ @websockets[my_user_identifier] ||= []
84
+ @websockets[my_user_identifier].push(websocket)
101
85
  message = {
102
- type: 'callFailed',
103
- reason: 0,
104
- remoteUserIdentifier: user_identifier
86
+ type: 'myUserIdentifier',
87
+ myUserIdentifier: my_user_identifier
105
88
  }
89
+ @daemon_delegate.onWebSocketConnected(my_user_identifier)
106
90
  websocket.send JSON.generate(message)
91
+ when 'sendMessage'
92
+ user_identifier = data[:value][:userIdentifier]
93
+ type = data[:value][:message][:type]
94
+ allow_types = %w/call hangUp offer answer candidate callFailed userMessage webSocketReconnected/
95
+ if @websockets.key?(user_identifier) && type.present? && allow_types.include?(type)
96
+ if type != 'call' || @daemon_delegate.onWantCall(my_user_identifier, user_identifier)
97
+ message = data[:value][:message]
98
+ message[:remoteUserIdentifier] = my_user_identifier
99
+ sendMessage(user_identifier, message)
100
+ end
101
+ else
102
+ message = {
103
+ type: 'callFailed',
104
+ reason: 0,
105
+ remoteUserIdentifier: user_identifier
106
+ }
107
+ websocket.send JSON.generate(message)
108
+ end
107
109
  end
110
+ rescue => e
111
+ p e
108
112
  end
109
113
  end
110
114
  end
@@ -1,3 +1,3 @@
1
1
  module WebrtcRails
2
- VERSION = "0.3.12"
2
+ VERSION = "0.3.13"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: webrtc-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.12
4
+ version: 0.3.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Koji Murata
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2015-12-09 00:00:00.000000000 Z
11
+ date: 2015-12-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: em-websocket