webrtc-rails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 994645e1d94a760fe2a08e28b93597efb8bab401
-  data.tar.gz: 45a5bf72635604e39776493580bbf49ffdcbf385
+  metadata.gz: 643e6f36529bf140d6da5ebf72f924c7700b9bea
+  data.tar.gz: 498a7b8496a5c3831aa642cb3d42012d9c2904cc
 SHA512:
-  metadata.gz: c4bf71305a37d52ae82ca4cd9a75a08872e0d5df4d1a22f61a887dbeaef03bd9c8086165d3ca9282fbca15eeeafb60c1d8389a3cc322fd2e0b60d692d33be7de
-  data.tar.gz: bd8a114ddf75fc0efa79a5a1cc20d64b5d08432274c943985d2f22c3843da7f36b6ac80a58efc73e3b9fb93c4d479db8378e9d56bcd9a89ac55015d25876d5fc
+  metadata.gz: 6e02dc861006c7434f994335bfdeed68d1a22843995a7fad893006e15ab5350e25e75aceeb42633a4a0c9e02ab5f31b21c0f67722fe3d36947c29f4b2e3b70fe
+  data.tar.gz: b03c263bde72518cef778a4d2ea4905b50efed172d01ce3c36ead625546eb2db9bf90185a82e60bc12c0485695783cf08dfadb2d25dc06684c25472e0b798fc7

data/lib/generators/webrtc_rails/templates/main.js.coffee

@@ -1,30 +1,49 @@
 class @WebRTC
+  @DISCONNECTED: 0
+  @TIMEOUT: 1
+  @CALLING: 2
+
   myUserID: null
 
   onWebSocketConnected: ->
   onWebSocketReconnectingStarted: ->
-  onWebSocketReConnected: ->
+  onWebSocketReconnected: ->
   onWebRTCConnected: ->
   onWebRTCReconnectingStarted: ->
   onWebRTCReconnected: ->
   onWebRTCHangedUp: ->
+  onWebRTCConnectFailed: (reason) ->
 
-  constructor: (url, userToken, @localOutput, @remoteOutput) ->
-    @localOutput = @localOutput[0] || @localOutput
-    @remoteOutput = @remoteOutput[0] || @remoteOutput
-    @_startOutput(@localOutput.tagName.toUpperCase() == 'VIDEO')
+  constructor: (url, userToken, localOutput, remoteOutput) ->
+    @localOutput = if localOutput? then (localOutput[0] || localOutput) else null
+    @remoteOutput = remoteOutput[0] || remoteOutput
+    @_startOutput(@localOutput)
     @_webSocketInitialize(url, userToken)
     @_addNetworkEventListener()
 
   connect: (remoteUserID) ->
+    if @_webRTCReconnecting && @_hangedUp
+      @_webRTCReconnecting = false
+      return
+
+    @_isCaller = true
     @_remoteUserID = remoteUserID
     if !@_peerStarted && @_localStream
       @_sendMessage(
         type: 'call'
         remoteUserID: @myUserID
+        reconnect: @_webRTCReconnecting
+      )
+      @_callAnswerReceived = false
+      window.setTimeout(
+        =>
+          unless @_callAnswerReceived
+            if @_webRTCReconnecting
+              @connect(remoteUserID)
+            else
+              @onWebRTCConnectFailed(WebRTC.TIMEOUT)
+        5000
       )
-      @_sendOffer()
-      @_peerStarted = true
     else
       alert 'Local stream not running yet - try again.'
 
@@ -39,8 +58,8 @@ class @WebRTC
       track.enabled = enabled
 
   hangUp: ->
+    @_hangUp()
     @_sendMessage(type: 'hangUp')
-    @_hangedUp = true
 
   # private
 
@@ -53,40 +72,65 @@ class @WebRTC
     'OfferToReceiveVideo': true
 
   _webSocketInitialize: (url, userToken) ->
-    @_url = url
     @_userToken = userToken
     @_webSocket = new WebSocket(url)
     @_webSocket.onopen = =>
       @_startHeartbeat()
-      @_sendValue('setMyToken',
-        token: String(userToken)
-      )
-      if @_webRTCRreconnecting
+      @_sendValue('setMyToken')
+      if @_wantWebRTCReconnecting
+        @_wantWebRTCReconnecting = false
         @connect(@_remoteUserID)
 
     @_webSocket.onclose = (event) =>
-      @onWebSocketReconnectingStarted()
+      unless @_isWebSocketReconnectingStarted
+        @_isWebSocketReconnectingStarted = true
+        @onWebSocketReconnectingStarted()
       @_webSocketInitialize(url, userToken)
 
     @_webSocket.onmessage = (data) =>
       event = JSON.parse(data.data)
-      switch event['type']
+      eventType = event['type']
+      if eventType != 'myUserID' && eventType != 'call' && eventType != 'webSocketReconnected'
+        if @_remoteUserID != event['remoteUserID']
+          return
+        
+      switch eventType
         when 'myUserID'
           @myUserID = event['myUserID']
           if @_webSocketConnected
-            @onWebSocketReConnected()
+            @onWebSocketReconnected()
+            if @_hangedUp
+              @_sendMessage(type: 'hangUp')
+            else
+              @_sendMessage(type: 'webSocketReconnected')
           else
             @onWebSocketConnected()
             @_webSocketConnected = true
+        when 'webSocketReconnected'
+          if @_hangedUp || @_remoteUserID != event['remoteUserID']
+            @_sendMessageToOther(type: 'hangUp', event['remoteUserID'])
+        when 'callFailed'
+          @_callAnswerReceived = true
+          @onWebRTCConnectFailed(event['reason'] || WebRTC.UNKNOWN)
         when 'call'
-          @_remoteUserID = event['remoteUserID']
+          if @_peerStarted
+            message =
+              type: 'callFailed'
+              reason: WebRTC.CALLING
+            @_sendMessageToOther(message, event['remoteUserID'])
+          else if event['reconnect'] && @_hangedUp
+            @_sendMessage(type: 'hangUp')
+          else
+            @_isCaller = false
+            @_remoteUserID = event['remoteUserID']
+            @_sendOffer()
+            @_peerStarted = true
         when 'hangUp'
-          @_hangedUp = true
-          @_sendMessage(type: 'hangUpAnswer')
-          @_stop()
-        when 'hangUpAnswer'
-          @_stop()
+          @_callAnswerReceived = true
+          @_hangUp()
         when 'offer'
+          @_callAnswerReceived = true
+          @_webRTCReconnecting = false
           @_onOffer(event)
         when 'answer'
           if @_peerStarted
@@ -96,7 +140,7 @@ class @WebRTC
             @_onCandidate(event)
 
   _addNetworkEventListener: ->
-    window.addEventListener('online', (event) =>
+    window.addEventListener('offline', (event) =>
       @_webSocket.close()
     )
 
@@ -116,25 +160,31 @@ class @WebRTC
   _sendValue: (event, value) ->
     if @_webSocket.readyState == WebSocket.OPEN
       @_webSocket.send(JSON.stringify(
+        token: @_userToken
         event: event
         value: value
       ))
 
-  _sendMessage: (message) ->
+  _sendMessageToOther: (message, userID) ->
     @_sendValue('sendMessage',
-      userID: String(@_remoteUserID)
+      userID: String(userID)
       message: message
     )
+    
+  _sendMessage: (message) ->
+    @_sendMessageToOther(message, @_remoteUserID)
 
-  _startOutput: (video) ->
+  _startOutput: (localOutput) ->
+    isVideo = (@localOutput? && @localOutput.tagName.toUpperCase() == 'VIDEO')
     navigator.webkitGetUserMedia(
-      video: video
+      video: isVideo
       audio: true
       (stream) =>
         @_localStream = stream
-        @localOutput.src = window.URL.createObjectURL(@_localStream)
-        @localOutput.play()
-        @localOutput.volume = 0
+        if @localOutput?
+          @localOutput.src = window.URL.createObjectURL(@_localStream)
+          @localOutput.play()
+          @localOutput.volume = 0
       (error) =>
         console.error('An error occurred: [CODE ' + error.code + ']')
     )
@@ -190,12 +240,16 @@ class @WebRTC
         when 'disconnected'
           @_reconnectPeer()
           @onWebRTCReconnectingStarted()
+        when 'checking'
+          @_checking = true
         when 'connected', 'completed'
-          if @_hangedUp
-            @onWebRTCConnected()
-          else
-            @onWebRTCReconnected()
-          @_hangedUp = false
+          if @_checking
+            @_checking = false
+            if @_hangedUp
+              @onWebRTCConnected()
+              @_hangedUp = false
+            else
+              @onWebRTCReconnected()
 
     peer.addStream(@_localStream)
     peer.addEventListener('addstream', onRemoteStreamAdded, false)
@@ -204,10 +258,12 @@ class @WebRTC
 
   _reconnectPeer: ->
     @_stop()
-    if @_webSocket.readyState == WebSocket.OPEN
-      @connect()
-    else
-      @_webRTCRreconnecting = true
+    if @_isCaller
+      @_webRTCReconnecting = true
+      if @_webSocket.readyState == WebSocket.OPEN
+        @connect(@_remoteUserID)
+      else 
+        @_wantWebRTCReconnecting = true
 
   _sendOffer: ->
     @_peerConnection = @_prepareNewConnection()
@@ -245,8 +301,14 @@ class @WebRTC
       return
     @_peerConnection.setRemoteDescription(new RTCSessionDescription(event))
 
+  _hangUp: ->
+    @_stop()
+    @_hangedUp = true
+    @onWebRTCHangedUp()
+
   _stop: ->
-    @_peerConnection.removeStream(@_peerConnection.getRemoteStreams()[0])
-    @_peerConnection.close()
-    @_peerConnection = null
+    if @_peerConnection?
+      @_peerConnection.removeStream(@_peerConnection.getRemoteStreams()[0])
+      @_peerConnection.close()
+      @_peerConnection = null
     @_peerStarted = false

data/lib/generators/webrtc_rails/templates/webrtc.rb

@@ -15,33 +15,50 @@ EM.run do
     my_user_id = nil
     
     websocket.onclose do
-      if my_user_id
-        @websockets[my_user_id].delete(websocket)
+      if my_user_id.present?
+        if @websockets[my_user_id].present?
+          @websockets[my_user_id].delete(websocket)
+        end
       end
     end
 
     websocket.onmessage do |message|
       data = JSON.parse(message, {symbolize_names: true})
-      case data[:event]
-      when 'setMyToken'
-        token = data[:value][:token]
+      if data[:event] != 'heartbeat'
+        token = data[:token]
         if token.present?
-          my_user_id = User.fetch_by_token(token).id.to_s
-          @websockets[my_user_id] ||= []
-          @websockets[my_user_id].push(websocket)
-          message = {
-            type: 'myUserID',
-            myUserID: my_user_id
-          }
-          websocket.send JSON.generate(message)
-        end
-      when 'sendMessage'
-        user_id = data[:value][:userID]
-        type = data[:value][:message][:type]
-        allow_types = %w/call hangUp hangUpAnswer offer answer candidate/
-        if @websockets[user_id] && type.present? && allow_types.include?(type)
-          for ws in @websockets[user_id]
-            ws.send JSON.generate(data[:value][:message])
+          user = User.fetch_by_token(token)
+          my_user_id = user ? user.id.to_s : nil
+          if my_user_id.present?
+            case data[:event]
+            when 'setMyToken'
+              @websockets[my_user_id] ||= []
+              @websockets[my_user_id].push(websocket)
+              message = {
+                type: 'myUserID',
+                myUserID: my_user_id
+              }
+              websocket.send JSON.generate(message)
+            when 'sendMessage'
+              user_id = data[:value][:userID]
+              type = data[:value][:message][:type]
+              Rails.logger.info type
+              allow_types = %w/call hangUp offer answer candidate callFailed webSocketReconnected/
+              if @websockets.key?(user_id) && type.present? && allow_types.include?(type)
+                for ws in @websockets[user_id]
+                  message = data[:value][:message]
+                  message[:remoteUserID] = my_user_id
+                  ws.send JSON.generate(message)
+                end
+              else
+                message = {
+                  type: 'callFailed',
+                  reason: 0,
+                  remoteUserID: user_id
+                }
+                websocket.send JSON.generate(message)
+              end
+            end
           end
         end
       end

data/lib/webrtc_rails/version.rb

@@ -1,3 +1,3 @@
 module WebrtcRails
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webrtc-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Koji Murata