webrtc-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b6982702ac1ff5a8a1febe6aaea3b29113726b
-  data.tar.gz: 4fda457eecd9ba82e3b4fc299803f91045399cd2
+  metadata.gz: 8c0b6f6041f627cd8c936ca0b81af0199dc41c03
+  data.tar.gz: 7f794a8d1d5d3ce91b43d6c0fc0b4dc7ba77be0f
 SHA512:
-  metadata.gz: 31a1272ad27b944205ee02a68c4539d1e1d85801fdfcdd857070a25bdcaa9cb92748263c21e206bd6128fb5c5a84657f599d5eb73dcc168568344a1fa5648fec
-  data.tar.gz: 65c89139363d3dbd212100e831685a4a960c7ac0cc610884dadb6ef032746ec969d925c10db48ee8e64f1f30e3ce8f8548618228ce4e3ebaa7ae9721eaeae3c9
+  metadata.gz: 2665d656620c6f168325ce82f03dddc2073ff2976ca7d9d959d6f401a758397be83a5ea56b89aa8933ad61ddd15d9348c6828d83f1eef29fbd6d27f0b84f2ab2
+  data.tar.gz: d91a50fd716b32a8304895be64f173d80d9cbbc1b7e5e619d57f76c1bb78fa65c6e7ce6a1d6b9ea240720f0abb32c3491efd54ae38e0d17918b7b912d5f3c182

data/lib/generators/webrtc_rails/{update → injection}/USAGE

@@ -2,7 +2,7 @@ Description:
     Explain the generator
 
 Example:
-    rails generate webrtc_rails:update Thing
+    rails generate webrtc_rails:injection Thing
 
     This will create:
         what/will/it/create

data/lib/generators/webrtc_rails/injection/injection_generator.rb

@@ -0,0 +1,39 @@
+require 'rails'
+
+module WebrtcRails
+  module Generators
+    class InjectionGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates", __FILE__)
+
+      def generate_daemon
+        daemons_dir = ::Daemons::Rails.configuration.daemons_directory
+        unless File.exists?(Rails.root.join(daemons_dir, 'daemons'))
+          copy_file "daemons", daemons_dir.join('daemons')
+          chmod daemons_dir.join('daemons'), 0755
+        end
+
+        script_path = daemons_dir.join('webrtc.rb')
+        template 'webrtc.rb', script_path
+        chmod script_path, 0755
+
+        ctl_path = daemons_dir.join('webrtc_ctl')
+        template "webrtc_ctl", ctl_path
+        chmod ctl_path, 0755
+
+        unless File.exists?(Rails.root.join('config', 'daemons.yml'))
+          copy_file 'daemons.yml', 'config/daemons.yml'
+        end
+      end
+
+      def create_events_initializer_file
+        js_path = File.join('app', 'assets', 'javascripts')
+        template 'main.js.coffee', File.join(js_path, 'webrtc_rails', 'main.js.coffee')
+        append_to_file File.join(js_path, 'application.js') do
+          out = ''
+          out << "\n\n// append by webrtc_rails\n"
+          out << "//= require webrtc_rails/main\n\n"
+        end
+      end
+    end
+  end
+end

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

@@ -3,25 +3,13 @@ require 'rails'
 module WebrtcRails
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      def create_events_initializer_file
-        js_path = File.join('app', 'assets', 'javascripts')
-        template 'main.js.coffee', File.join(js_path, 'webrtc_rails', 'main.js.coffee')
-        append_to_file File.join(js_path, 'application.js') do
-          out = ''
-          out << "\n\n// append by webrtc_rails\n"
-          out << "//= require webrtc_rails/main\n\n"
-        end
-      end
-
-      def create_webrtc_controller
-        controller_path = File.join('app', 'controllers')
-        template 'webrtc_controller.rb', File.join(controller_path, 'webrtc_controller.rb')
+      def add_gems
+        gem 'daemons-rails'
+        gem 'em-websocket'
       end
 
-      def add_route
-        route "post '/webrtc', :to => 'webrtc#send_message'"
+      def injection
+        generate 'webrtc_rails:injection'
       end
     end
   end

data/lib/generators/webrtc_rails/templates/daemons

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+results = []
+Dir[File.dirname(__FILE__) + "/*_ctl"].each {|f| results << `ruby #{f} #{ARGV.first}`}
+results.delete_if { |result| result.nil? || result.empty? }
+puts results.join unless results.empty?

data/lib/generators/webrtc_rails/templates/daemons.yml

@@ -0,0 +1,6 @@
+dir_mode: script
+dir: ../../log
+multiple: false
+backtrace: true
+monitor: false
+ontop: false

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

@@ -1,46 +1,26 @@
 class @WebRTC
-  onConnected: ->
-  onHangedUp: ->
-  onReconnectingStarted: ->
-
-  constructor: (userID, @localOutput, @remoteOutput) ->
+  onWebSocketConnected: ->
+  onWebSocketReconnectingStarted: ->
+  onWebSocketReConnected: ->
+  onWebRTCConnected: ->
+  onWebRTCReconnectingStarted: ->
+  onWebRTCReconnected: ->
+  onWebRTCHangedUp: ->
+
+  constructor: (userToken, @localOutput, @remoteOutput) ->
     @localOutput = @localOutput[0] || @localOutput
     @remoteOutput = @remoteOutput[0] || @remoteOutput
     @_startOutput(@localOutput.tagName.toUpperCase() == 'VIDEO')
-    @wsRails = new WebSocketRails(location.host + "/websocket?webrtc=true&user_identifier=" + userID)
-    @wsRails.bind("webrtc"
-      (data) =>
-        event = JSON.parse(data)
-        switch event['type']
-          when 'call'
-            @remoteUserID = event['remoteUserID']
-          when 'hangUp'
-            @onHangedUp()
-            @_hangedUp = true
-            @_sendMessage(JSON.stringify(type: 'hangUpAnswer'))
-            @_stop()
-          when 'hangUpAnswer'
-            @_stop()
-          when 'offer'
-            @_onOffer(event)
-          when 'answer'
-            if @_peerStarted
-              @_onAnswer(event)
-          when 'candidate'
-            if @_peerStarted
-              @_onCandidate(event)
-          when 'user disconnected'
-            if @_peerStarted
-              @_stop()
-    )
+    @_webSocketInitialize(userToken)
+    @_addNetworkEventListener()
 
-  connect: (myUserID, remoteUserID) ->
-    @remoteUserID = remoteUserID
+  connect: (remoteUserID) ->
+    @_remoteUserID = remoteUserID
     if !@_peerStarted && @_localStream
-      @_sendMessage(JSON.stringify(
+      @_sendMessage(
         type: 'call'
-        remoteUserID: myUserID
-      ))
+        remoteUserID: @_myUserID
+      )
       @_sendOffer()
       @_peerStarted = true
     else
@@ -57,8 +37,7 @@ class @WebRTC
       track.enabled = enabled
 
   hangUp: ->
-    @onHangedUp()
-    @_sendMessage(JSON.stringify(type: 'hangUp'))
+    @_sendMessage(type: 'hangUp')
     @_hangedUp = true
 
   # private
@@ -71,13 +50,80 @@ class @WebRTC
     'OfferToReceiveAudio': true
     'OfferToReceiveVideo': true
 
+  _webSocketInitialize: (userToken) ->
+    @_webSocket = new WebSocket('ws://' + location.host + '/websocket')
+    @_webSocket.onopen = =>
+      @_startHeartbeat()
+      @_sendValue('setMyToken',
+        token: String(userToken)
+      )
+      if @_webRTCRreconnecting
+        @connect(@_remoteUserID)
+
+    @_webSocket.onclose = (event) =>
+      @onWebSocketReconnectingStarted()
+      @_webSocketInitialize(userToken)
+
+    @_webSocket.onmessage = (data) =>
+      event = JSON.parse(data.data)
+      switch event['type']
+        when 'myUserID'
+          @_myUserID = event['myUserID']
+          if @_webSocketConnected
+            @onWebSocketReConnected()
+          else
+            @onWebSocketConnected()
+            @_webSocketConnected = true
+        when 'call'
+          @_remoteUserID = event['remoteUserID']
+        when 'hangUp'
+          @_hangedUp = true
+          @_sendMessage(type: 'hangUpAnswer')
+          @_stop()
+        when 'hangUpAnswer'
+          @_stop()
+        when 'offer'
+          @_onOffer(event)
+        when 'answer'
+          if @_peerStarted
+            @_onAnswer(event)
+        when 'candidate'
+          if @_peerStarted
+            @_onCandidate(event)
+
+  _addNetworkEventListener: ->
+    window.addEventListener('online', (event) =>
+      @_webSocket.close()
+    )
+    window.addEventListener('online', (event) =>
+      @_webSocket = null
+      @_webSocketInitialize()
+    )
+
+  _startHeartbeat: ->
+    if !@_heartbeating
+      @_heartbeating = true
+      @_heartbeat()
+
+  _heartbeat: ->
+    @_sendValue('heartbeat', null)
+    window.setTimeout(
+      =>
+        @_heartbeat()
+      5000
+    )
+
+  _sendValue: (event, value) ->
+    if @_webSocket.readyState == WebSocket.OPEN
+      @_webSocket.send(JSON.stringify(
+        event: event
+        value: value
+      ))
+
   _sendMessage: (message) ->
-    $.ajax(
-      type: 'POST'
-      url: '/webrtc'
-      data:
-        user_id: @remoteUserID
-        message: message
+    @_sendValue('sendMessage',
+      userID: String(@_remoteUserID)
+      message: message
     )
 
   _startOutput: (video) ->
@@ -110,12 +156,10 @@ class @WebRTC
     @_peerConnection.addIceCandidate(candidate)
 
   _sendSDP: (sdp) ->
-    text = JSON.stringify(sdp)
-    @_sendMessage(text)
+    @_sendMessage(sdp)
 
   _sendCandidate: (candidate) ->
-    text = JSON.stringify(candidate)
-    @_sendMessage(text)
+    @_sendMessage(candidate)
 
   _prepareNewConnection: ->
     pcConfig = 'iceServers': [ "url": "stun:stun.l.google.com:19302" ]
@@ -144,10 +188,13 @@ class @WebRTC
     peer.oniceconnectionstatechange = (event) =>
       switch peer.iceConnectionState
         when 'disconnected'
-          @onReconnectingStarted()
+          @_reconnectPeer()
+          @onWebRTCReconnectingStarted()
         when 'connected', 'completed'
           if @_hangedUp
-            @onConnected()
+            @onWebRTCConnected()
+          else
+            @onWebRTCReconnected()
           @_hangedUp = false
 
     peer.addStream(@_localStream)
@@ -155,6 +202,13 @@ class @WebRTC
     peer.addEventListener('removestream', onRemoteStreamRemoved, false)
     peer
 
+  _reconnectPeer: ->
+    @_stop()
+    if @_webSocket.readyState == WebSocket.OPEN
+      @connect()
+    else
+      @_webRTCRreconnecting = true
+
   _sendOffer: ->
     @_peerConnection = @_prepareNewConnection()
     @_peerConnection.createOffer(
@@ -162,7 +216,7 @@ class @WebRTC
         @_peerConnection.setLocalDescription(sessionDescription)
         @_sendSDP(sessionDescription)
       ->
-        console.log 'Create Offer failed'
+        console.log('Create Offer failed')
       @_mediaConstraints
     )
 

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

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= "production"
+
+root = File.expand_path(File.dirname(__FILE__))
+root = File.dirname(root) until File.exists?(File.join(root, 'config'))
+Dir.chdir(root)
+
+require File.join(root, "config", "environment")
+
+@websockets = {}
+
+EM.run do
+  EM::WebSocket.run(host: 'localhost', port: 3001) do |websocket|
+    my_user_id = nil
+    
+    websocket.onclose do
+      if my_user_id
+        @websockets[my_user_id].delete(websocket)
+      end
+    end
+
+    websocket.onmessage do |message|
+      data = JSON.parse(message, {symbolize_names: true})
+      case data[:event]
+      when 'setMyToken'
+        token = data[:value][: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])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/webrtc_rails/templates/webrtc_ctl

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'daemons/rails/config'
+
+config = Daemons::Rails::Config.for_controller(File.expand_path(__FILE__))
+Daemons::Rails.run config[:script], config.to_hash

data/lib/webrtc_rails/version.rb

@@ -1,3 +1,3 @@
 module WebrtcRails
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/webrtc-rails.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'websocket-rails'
+  spec.add_dependency 'em-websocket'
+  spec.add_dependency 'daemons-rails'
   
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: webrtc-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Koji Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: websocket-rails
+  name: em-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: daemons-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,13 +97,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/generators/webrtc_rails/injection/USAGE
+- lib/generators/webrtc_rails/injection/injection_generator.rb
 - lib/generators/webrtc_rails/install/USAGE
 - lib/generators/webrtc_rails/install/install_generator.rb
+- lib/generators/webrtc_rails/templates/daemons
+- lib/generators/webrtc_rails/templates/daemons.yml
 - lib/generators/webrtc_rails/templates/main.js.coffee
+- lib/generators/webrtc_rails/templates/webrtc.rb
 - lib/generators/webrtc_rails/templates/webrtc_controller.rb
-- lib/generators/webrtc_rails/update/USAGE
-- lib/generators/webrtc_rails/update/install_generator.rb
-- lib/generators/webrtc_rails/update/update_generator.rb
+- lib/generators/webrtc_rails/templates/webrtc_ctl
 - lib/webrtc-rails.rb
 - lib/webrtc_rails/version.rb
 - webrtc-rails.gemspec
@@ -113,9 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple Ruby on Rails WebRTC integration.
 test_files: []
-has_rdoc: 

data/lib/generators/webrtc_rails/update/install_generator.rb

@@ -1,28 +0,0 @@
-require 'rails'
-
-module WebrtcRails
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      def create_events_initializer_file
-        js_path = File.join('app', 'assets', 'javascripts')
-        template 'main.js.coffee', File.join(js_path, 'webrtc_rails', 'main.js.coffee')
-        append_to_file File.join(js_path, 'application.js') do
-          out = ''
-          out << "\n\n// append by webrtc_rails\n"
-          out << "//= require webrtc_rails/main\n\n"
-        end
-      end
-
-      def create_webrtc_controller
-        controller_path = File.join('app', 'controllers')
-        template 'webrtc_controller.rb', File.join(controller_path, 'webrtc_controller.rb')
-      end
-
-      def add_route
-        route "post '/webrtc', :to => 'webrtc#send_message'"
-      end
-    end
-  end
-end

data/lib/generators/webrtc_rails/update/update_generator.rb

@@ -1,17 +0,0 @@
-require 'rails'
-
-module WebrtcRails
-  module Generators
-    class UpdateGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      def update_all_files
-        js_path = File.join('app', 'assets', 'javascripts')
-        template 'main.js.coffee', File.join(js_path, 'webrtc_rails', 'main.js.coffee')
-        controller_path = File.join('app', 'controllers')
-        template 'webrtc_controller.rb', File.join(controller_path, 'webrtc_controller.rb')
-      end
-
-    end
-  end
-end