webrtc-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03e05faa0ccba6c9a1728c52368a65a52c452022
-  data.tar.gz: 1cfb2a164fa7c42499be09ba4b946da5230b762f
+  metadata.gz: d7b6982702ac1ff5a8a1febe6aaea3b29113726b
+  data.tar.gz: 4fda457eecd9ba82e3b4fc299803f91045399cd2
 SHA512:
-  metadata.gz: d6894fb4dd94a92eec96c1ab7f59b514e05ca195371f0d3546d651a29ecb0f55be0d641f089430f9a679ca7f75b8ffafe3c90ac98293f35b9bff52c610e1f90d
-  data.tar.gz: d96db12b7d6299671f7d59dc2224b22d5bbfb342d46ab4ccb6f389825dde5f33657627132be3a5f4502f7a0c4f0af981b02f889b70a7a68df0b3e03ae1113184
+  metadata.gz: 31a1272ad27b944205ee02a68c4539d1e1d85801fdfcdd857070a25bdcaa9cb92748263c21e206bd6128fb5c5a84657f599d5eb73dcc168568344a1fa5648fec
+  data.tar.gz: 65c89139363d3dbd212100e831685a4a960c7ac0cc610884dadb6ef032746ec969d925c10db48ee8e64f1f30e3ce8f8548618228ce4e3ebaa7ae9721eaeae3c9

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

@@ -3,15 +3,15 @@ require 'rails'
 module WebrtcRails
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      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 << '//= require webrtc_rails/main'
-          out << "\n"
+          out << "\n\n// append by webrtc_rails\n"
+          out << "//= require webrtc_rails/main\n\n"
         end
       end
 

data/lib/generators/webrtc_rails/{install/templates → templates}/main.js.coffee

@@ -1,5 +1,11 @@
 class @WebRTC
+  onConnected: ->
+  onHangedUp: ->
+  onReconnectingStarted: ->
+
   constructor: (userID, @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"
@@ -8,6 +14,13 @@ class @WebRTC
         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'
@@ -44,10 +57,13 @@ class @WebRTC
       track.enabled = enabled
 
   hangUp: ->
-    @_stop()
+    @onHangedUp()
+    @_sendMessage(JSON.stringify(type: 'hangUp'))
+    @_hangedUp = true
 
   # private
 
+  _hangedUp: true
   _localStream: null
   _peerConnection: null
   _peerStarted: false
@@ -58,7 +74,7 @@ class @WebRTC
   _sendMessage: (message) ->
     $.ajax(
       type: 'POST'
-      url: 'webrtc'
+      url: '/webrtc'
       data:
         user_id: @remoteUserID
         message: message
@@ -125,6 +141,15 @@ class @WebRTC
           candidate: event.candidate.candidate
         )
 
+    peer.oniceconnectionstatechange = (event) =>
+      switch peer.iceConnectionState
+        when 'disconnected'
+          @onReconnectingStarted()
+        when 'connected', 'completed'
+          if @_hangedUp
+            @onConnected()
+          @_hangedUp = false
+
     peer.addStream(@_localStream)
     peer.addEventListener('addstream', onRemoteStreamAdded, false)
     peer.addEventListener('removestream', onRemoteStreamRemoved, false)
@@ -153,7 +178,7 @@ class @WebRTC
       return
     @_peerConnection.createAnswer(
       (sessionDescription) =>
-        @_peerConnection.setLocalDescription sessionDescription
+        @_peerConnection.setLocalDescription(sessionDescription)
         @_sendSDP(sessionDescription)
       ->
         console.log('Create Answer failed')
@@ -167,6 +192,7 @@ class @WebRTC
     @_peerConnection.setRemoteDescription(new RTCSessionDescription(event))
 
   _stop: ->
+    @_peerConnection.removeStream(@_peerConnection.getRemoteStreams()[0])
     @_peerConnection.close()
     @_peerConnection = null
     @_peerStarted = false

data/lib/generators/webrtc_rails/update/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate webrtc_rails:update Thing
+
+    This will create:
+        what/will/it/create

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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,17 @@
+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

data/lib/webrtc_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webrtc-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Koji Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-rails
@@ -85,8 +85,11 @@ files:
 - bin/setup
 - lib/generators/webrtc_rails/install/USAGE
 - lib/generators/webrtc_rails/install/install_generator.rb
-- lib/generators/webrtc_rails/install/templates/main.js.coffee
-- lib/generators/webrtc_rails/install/templates/webrtc_controller.rb
+- lib/generators/webrtc_rails/templates/main.js.coffee
+- 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/webrtc-rails.rb
 - lib/webrtc_rails/version.rb
 - webrtc-rails.gemspec