webrtc-rails 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5acc76973316c7f4862f065ff04f8e22e9b447f2
-  data.tar.gz: b4d38046a0464556fefabfc6bad6e4137c3d564c
+  metadata.gz: 419827da35a81ffe543136d565e7088ba90a3880
+  data.tar.gz: de113a1dcd30ce90c3b4b3fefcfc9ed87943a92f
 SHA512:
-  metadata.gz: 92f150f4342830813fe048708af6e61c1863db65de7c380ad2944cb7b6d2c304e02899b131c88af0593ed6205f33ade9c39a7f52f5047df7e9ca7f9551e78376
-  data.tar.gz: 7613f98f970fbf2a5a9a18fa1cbf0166988471ba909dcede6512eda27a7ebfc95c6cb9270993ec40dee4c32b98f047cdc5737480465ed6416cdf6f14e655eaf4
+  metadata.gz: a71896b612d7dc16e3dd664f7ecc2a3e8446d9a63e6aaa91415d6e5e43fb73552e649c25e267a6d65bb0270c1407fa3f529ecf813e78ae6dde38cb72e6daaaae
+  data.tar.gz: abbba85d848e9cd5bfdf9bed4de669acc63c9e3cd246f468f054d8c973916e42adf42d0e54d0dae82c4a66870792c88ecf90c68a3bb64a868b060ba4f3f2ecf5

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

@@ -3,19 +3,19 @@ class @WebRTC
   @TIMEOUT: 1
   @CALLING: 2
 
-  myUserID: null
+  myUserIdentifier: null
 
   onWebSocketConnected: ->
   onWebSocketReconnectingStarted: ->
   onWebSocketReconnected: ->
-  onWebRTCCall: (remoteUserID) ->
+  onWebRTCCall: (remoteUserIdentifier) ->
   onWebRTCConnected: ->
   onWebRTCReconnectingStarted: ->
   onWebRTCReconnected: ->
   onWebRTCHangedUp: ->
   onWebRTCConnectFailed: (reason) ->
   onServerMessage: (message) ->
-  onUserMessage: (sentUserID, event, message) ->
+  onUserMessage: (sentUserIdentifier, event, message) ->
 
   constructor: (url, userToken, localOutput, remoteOutput) ->
     @localOutput = if localOutput? then (localOutput[0] || localOutput) else null
@@ -24,17 +24,17 @@ class @WebRTC
     @_webSocketInitialize(url, userToken)
     @_addNetworkEventListener()
 
-  connect: (remoteUserID) ->
+  call: (remoteUserIdentifier) ->
     if @_webRTCReconnecting && @_hangedUp
       @_webRTCReconnecting = false
       return
 
     @_isCaller = true
-    @_remoteUserID = remoteUserID
+    @_remoteUserIdentifier = remoteUserIdentifier
     if !@_peerStarted && @_localStream
       @_sendMessage(
         type: 'call'
-        remoteUserID: @myUserID
+        remoteUserIdentifier: @myUserIdentifier
         reconnect: @_webRTCReconnecting
       )
       @_callAnswerReceived = false
@@ -42,7 +42,7 @@ class @WebRTC
         =>
           unless @_callAnswerReceived
             if @_webRTCReconnecting
-              @connect(remoteUserID)
+              @connect(remoteUserIdentifier)
             else
               @onWebRTCConnectFailed(WebRTC.TIMEOUT)
         5000
@@ -55,9 +55,9 @@ class @WebRTC
     @_sendOffer()
     @_peerStarted = true
 
-  sendUserMessage: (userID, event, message) ->
+  sendUserMessage: (userIdentifier, event, message) ->
     @_sendValue('userMessage',
-      userID: String(userID)
+      userIdentifier: String(userIdentifier)
       event: event
       message: message
     )
@@ -94,7 +94,7 @@ class @WebRTC
       @_sendValue('setMyToken')
       if @_wantWebRTCReconnecting
         @_wantWebRTCReconnecting = false
-        @connect(@_remoteUserID)
+        @connect(@_remoteUserIdentifier)
 
     @_webSocket.onclose = (event) =>
       unless @_isWebSocketReconnectingStarted
@@ -106,16 +106,16 @@ class @WebRTC
       event = JSON.parse(data.data)
       eventType = event['type']
       if eventType == 'userMessage'
-        @onUserMessage(event['remoteUserID'], event['event'], event['message'])
+        @onUserMessage(event['remoteUserIdentifier'], event['event'], event['message'])
         return
 
-      if eventType != 'myUserID' && eventType != 'call' && eventType != 'webSocketReconnected'
-        if @_remoteUserID != event['remoteUserID']
+      if eventType != 'myUserIdentifier' && eventType != 'call' && eventType != 'webSocketReconnected'
+        if @_remoteUserIdentifier != event['remoteUserIdentifier']
           return
 
       switch eventType
-        when 'myUserID'
-          @myUserID = event['myUserID']
+        when 'myUserIdentifier'
+          @myUserIdentifier = event['myUserIdentifier']
           if @_webSocketConnected
             @onWebSocketReconnected()
             if @_hangedUp
@@ -126,8 +126,8 @@ class @WebRTC
             @onWebSocketConnected()
             @_webSocketConnected = true
         when 'webSocketReconnected'
-          if @_hangedUp || @_remoteUserID != event['remoteUserID']
-            @_sendMessageToOther(type: 'hangUp', event['remoteUserID'])
+          if @_hangedUp || @_remoteUserIdentifier != event['remoteUserIdentifier']
+            @_sendMessageToOther(type: 'hangUp', event['remoteUserIdentifier'])
         when 'callFailed'
           @_callAnswerReceived = true
           @onWebRTCConnectFailed(event['reason'] || WebRTC.UNKNOWN)
@@ -136,12 +136,12 @@ class @WebRTC
             message =
               type: 'callFailed'
               reason: WebRTC.CALLING
-            @_sendMessageToOther(message, event['remoteUserID'])
+            @_sendMessageToOther(message, event['remoteUserIdentifier'])
           else if event['reconnect'] && @_hangedUp
             @_sendMessage(type: 'hangUp')
           else
-            @_remoteUserID = event['remoteUserID']
-            @onWebRTCCall(@_remoteUserID)
+            @_remoteUserIdentifier = event['remoteUserIdentifier']
+            @onWebRTCCall(@_remoteUserIdentifier)
         when 'hangUp'
           @_callAnswerReceived = true
           @_hangUp()
@@ -186,14 +186,14 @@ class @WebRTC
         value: value
       ))
 
-  _sendMessageToOther: (message, userID) ->
+  _sendMessageToOther: (message, userIdentifier) ->
     @_sendValue('sendMessage',
-      userID: String(userID)
+      userIdentifier: String(userIdentifier)
       message: message
     )
     
   _sendMessage: (message) ->
-    @_sendMessageToOther(message, @_remoteUserID)
+    @_sendMessageToOther(message, @_remoteUserIdentifier)
 
   _startOutput: (localOutput) ->
     isVideo = (@localOutput? && @localOutput.tagName.toUpperCase() == 'VIDEO')
@@ -282,7 +282,7 @@ class @WebRTC
     if @_isCaller
       @_webRTCReconnecting = true
       if @_webSocket.readyState == WebSocket.OPEN
-        @connect(@_remoteUserID)
+        @connect(@_remoteUserIdentifier)
       else 
         @_wantWebRTCReconnecting = true
 

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

@@ -1,6 +1,6 @@
 WebrtcRails.configure do |config|
   # config.user_model_class = 'User'
   # config.fetch_user_by_token_method = :fetch_by_token
-  # config.user_id = :id
+  # config.user_identifier = :id
   # config.daemon_delegate = 'WebrtcRails::DaemonDelegate'
 end

data/lib/webrtc_rails/configuration.rb

@@ -1,11 +1,11 @@
 module WebrtcRails
   class Configuration
-    attr_accessor :user_model_class, :fetch_user_by_token_method, :user_id, :daemon_delegate
+    attr_accessor :user_model_class, :fetch_user_by_token_method, :user_identifier, :daemon_delegate
 
     def initialize
       @user_model_class = 'User'
       @fetch_user_by_token_method = :fetch_by_token
-      @user_id = :id
+      @user_identifier = :id
       @daemon_delegate = 'WebrtcRails::DaemonDelegate'
     end
   end

data/lib/webrtc_rails/daemon.rb

@@ -9,7 +9,7 @@ module WebrtcRails
       @config = WebrtcRails.configuration
       @user_class = @config.user_model_class.constantize
       @fetch_user_by_token_method = @config.fetch_user_by_token_method
-      @user_id = @config.user_id
+      @user_identifier = @config.user_identifier
       @daemon_delegate = @config.daemon_delegate.constantize.new
     end
 
@@ -20,10 +20,10 @@ module WebrtcRails
         pubsub.subscribe('webrtc-rails')
         pubsub.on(:message) do |channel, message|
           data = JSON.parse(message, {symbolize_names: true})
-          user_id = data[:user_id].to_s
+          user_identifier = data[:user_identifier].to_s
           message = data[:message]
-          if @websockets.key?(user_id)
-            for ws in @websockets[user_id]
+          if @websockets.key?(user_identifier)
+            for ws in @websockets[user_identifier]
               send_data = {
                 type: 'serverMessage',
                 message: message
@@ -34,13 +34,13 @@ module WebrtcRails
         end
         
         EM::WebSocket.run(host: 'localhost', port: 3001) do |websocket|
-          my_user_id = nil
+          my_user_identifier = nil
           
           websocket.onclose do
-            if my_user_id.present?
-              if @websockets[my_user_id].present?
-                @websockets[my_user_id].delete(websocket)
-                @daemon_delegate.onWebSocketDisconnected(my_user_id)
+            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
           end
@@ -51,46 +51,46 @@ module WebrtcRails
               token = data[:token]
               if token.present?
                 user = @user_class.send(@fetch_user_by_token_method, token)
-                my_user_id = user ? user.send(@user_id).to_s : nil
-                if my_user_id.present?
+                my_user_identifier = user ? user.send(@user_identifier).to_s : nil
+                if my_user_identifier.present?
                   case data[:event]
                   when 'userMessage'
-                    user_id = data[:value][:userID]
+                    user_identifier = data[:value][:userIdentifier]
                     event = data[:value][:event]
                     message = data[:value][:message]
-                    if @daemon_delegate.onWantSendUserMessage(my_user_id, user_id, event, message)
+                    if @daemon_delegate.onWantSendUserMessage(my_user_identifier, user_identifier, event, message)
                       message = {
                         type: 'userMessage',
-                        remoteUserID: my_user_id,
+                        remoteUserIdentifier: my_user_identifier,
                         event: event,
                         message: message
                       }
-                      sendMessage(user_id, message)
+                      sendMessage(user_identifier, message)
                     end
                   when 'setMyToken'
-                    @websockets[my_user_id] ||= []
-                    @websockets[my_user_id].push(websocket)
+                    @websockets[my_user_identifier] ||= []
+                    @websockets[my_user_identifier].push(websocket)
                     message = {
-                      type: 'myUserID',
-                      myUserID: my_user_id
+                      type: 'myUserIdentifier',
+                      myUserIdentifier: my_user_identifier
                     }
-                    @daemon_delegate.onWebSocketConnected(my_user_id)
+                    @daemon_delegate.onWebSocketConnected(my_user_identifier)
                     websocket.send JSON.generate(message)
                   when 'sendMessage'
-                    user_id = data[:value][:userID]
+                    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_id) && type.present? && allow_types.include?(type)
-                      if type != 'call' || @daemon_delegate.onWantCall(my_user_id, user_id)
+                    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[:remoteUserID] = my_user_id
-                        sendMessage(user_id, message)
+                        message[:remoteUserIdentifier] = my_user_identifier
+                        sendMessage(user_identifier, message)
                       end
                     else
                       message = {
                         type: 'callFailed',
                         reason: 0,
-                        remoteUserID: user_id
+                        remoteUserIdentifier: user_identifier
                       }
                       websocket.send JSON.generate(message)
                     end
@@ -105,8 +105,8 @@ module WebrtcRails
 
     private
 
-    def sendMessage(user_id, message)
-      for ws in @websockets[user_id]
+    def sendMessage(user_identifier, message)
+      for ws in @websockets[user_identifier]
         ws.send JSON.generate(message)
       end
     end

data/lib/webrtc_rails/daemon_delegate.rb

@@ -1,18 +1,18 @@
 module WebrtcRails
   class DaemonDelegate
-    def onWebSocketConnected(user_id)
+    def onWebSocketConnected(user_identifier)
 
     end
 
-    def onWebSocketDisconnected(user_id)
+    def onWebSocketDisconnected(user_identifier)
 
     end
 
-    def onWantCall(sent_user_id, will_receive_user_id)
+    def onWantCall(sent_user_identifier, will_receive_user_identifier)
       true
     end
 
-    def onWantSendUserMessage(sent_user_id, will_receive_user_id, event, message)
+    def onWantSendUserMessage(sent_user_identifier, will_receive_user_identifier, event, message)
       true
     end
   end

data/lib/webrtc_rails/server_message.rb

@@ -3,9 +3,9 @@ require 'json'
 
 module WebrtcRails
   module ServerMessage
-    def send(user_id, message)
+    def send(user_identifier, message)
       data = {
-        user_id: user_id,
+        user_identifier: user_identifier,
         message: message,
       }
       redis = Redis.new

data/lib/webrtc_rails/version.rb

@@ -1,3 +1,3 @@
 module WebrtcRails
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webrtc-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Koji Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket