webrtc-rails 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 972101558691af9ed9c8600270255c0c9b6fbef1
-  data.tar.gz: e70644ff95095a82ed7491eb687cc23e7b6fffeb
+  metadata.gz: 8805d636cb43da43f9396d8c87d1ed5167539918
+  data.tar.gz: d652c0c1d9b11e0eac2d3454745d658701155536
 SHA512:
-  metadata.gz: 34f78ad9fa1b92089d2a498a81b2e716785659b0e7b1422dfa523d0601b42d9eccee23deec30c822f61f2bb3b7873b29aff1a1d9904729eab7354c2791aa0803
-  data.tar.gz: 74d979e58d32f016a8d30223ce7cb71b480fe31a07983f9e57e5cfe885b6204b283b8d4808ae9a9cd0b2e9d2442cbbfd9e34a34b17a7405f874c9730e352d424
+  metadata.gz: d6739cbebb3671b268e321ffde2aa03ddb55f622b1f762589d8a3a96397883a9dd0ea705853a026e4d092d96b2977bd6bce834d2ac6e6ec12239c4c9badf047a
+  data.tar.gz: 4000cee35761f98ee2ee7592450f554787202534e824714a775c3b1a919d5729112a0bc8a8a280e94d19e92787bfd81b6f58cfb79002048c3f9c582ef1ca9acf

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

@@ -17,6 +17,7 @@ class @WebRTC
   onWebRTCConnectFailed: (reason) ->
   onServerMessage: (message) ->
   onUserMessage: (sentUserIdentifier, event, message) ->
+  onSendUserMessageFailed: (sendUserIdentifier, event, message) ->
 
   constructor: (url, userToken, localOutput, remoteOutput) ->
     @localOutput = if localOutput? then (localOutput[0] || localOutput) else null
@@ -138,15 +139,17 @@ class @WebRTC
     @_webSocket.onmessage = (data) =>
       event = JSON.parse(data.data)
       eventType = event['type']
-      if eventType == 'userMessage'
-        @onUserMessage(event['remoteUserIdentifier'], event['event'], event['message'])
-        return
 
-      if eventType != 'myUserIdentifier' && eventType != 'call' && eventType != 'webSocketReconnected'
+      dontNeedRemoteUserCheckType = ['userMessage', 'userMessageFailed', 'myUserIdentifier', 'call', 'webSocketReconnected']
+      if dontNeedRemoteUserCheckType.indexOf(eventType) == -1
         if @remoteUserIdentifier != event['remoteUserIdentifier']
           return
 
       switch eventType
+        when 'userMessage'
+          @onUserMessage(event['remoteUserIdentifier'], event['event'], event['message'])
+        when 'userMessageFailed'
+          @onSendUserMessageFailed(event['remoteUserIdentifier'], event['event'], event['message'])
         when 'myUserIdentifier'
           @myUserIdentifier = event['myUserIdentifier']
           if @_webSocketConnected

data/lib/webrtc_rails/daemon.rb

@@ -43,65 +43,64 @@ module WebrtcRails
           my_user_identifier = nil
           
           websocket.onclose do
-            if my_user_identifier.present?
-              if @websockets[my_user_identifier].present?
-                @websockets[my_user_identifier].delete(websocket)
-                @daemon_delegate.onWebSocketDisconnected(my_user_identifier)
-              end
-            end
+            next if my_user_identifier.blank?
+            next if @websockets[my_user_identifier].blank?
+            @websockets[my_user_identifier].delete(websocket)
+            @daemon_delegate.onWebSocketDisconnected(my_user_identifier)
           end
 
           websocket.onmessage do |message|
             data = JSON.parse(message, {symbolize_names: true})
-            if data[:event] != 'heartbeat'
-              token = data[:token]
-              if token.present?
-                user = @user_class.send(@fetch_user_by_token_method, token.to_s)
-                my_user_identifier = user ? user.send(@user_identifier).to_s : nil
-                if my_user_identifier.present?
-                  case data[:event]
-                  when 'userMessage'
-                    user_identifier = data[:value][:userIdentifier]
-                    event = data[:value][:event]
-                    message = data[:value][:message]
-                    if @daemon_delegate.onWantSendUserMessage(my_user_identifier, user_identifier, event, message)
-                      message = {
-                        type: 'userMessage',
-                        remoteUserIdentifier: my_user_identifier,
-                        event: event,
-                        message: message
-                      }
-                      sendMessage(user_identifier, message)
-                    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)
-                      end
-                    else
-                      message = {
-                        type: 'callFailed',
-                        reason: 0,
-                        remoteUserIdentifier: user_identifier
-                      }
-                      websocket.send JSON.generate(message)
-                    end
-                  end
+            next if data[:event] == 'heartbeat'
+            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
+            next if my_user_identifier.blank?
+
+            case data[:event]
+            when 'userMessage'
+              user_identifier = data[:value][:userIdentifier]
+              event = data[:value][:event]
+              message = data[:value][:message]
+              if @daemon_delegate.onWantSendUserMessage(my_user_identifier, user_identifier, event, message)
+                message = {
+                  type: 'userMessage',
+                  remoteUserIdentifier: my_user_identifier,
+                  event: event,
+                  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)
                 end
+              else
+                message = {
+                  type: 'callFailed',
+                  reason: 0,
+                  remoteUserIdentifier: user_identifier
+                }
+                websocket.send JSON.generate(message)
               end
             end
           end
@@ -113,6 +112,7 @@ module WebrtcRails
 
     def sendMessage(user_identifier, message)
       unless @websockets.key?(user_identifier)
+        yield if block_given?
         return
       end
       for ws in @websockets[user_identifier]

data/lib/webrtc_rails/version.rb

@@ -1,3 +1,3 @@
 module WebrtcRails
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

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