webrtc-rails 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e42286f0f578e7c50fbc02e8718dffc5f137813
-  data.tar.gz: 1bab5500d6106da4d5ab92f731368edba4e05bb5
+  metadata.gz: 9d339834737230df0935d9e8c788cc54265e44b3
+  data.tar.gz: 86f28c8f99f96d7e71b9b96c04234b6e245ced86
 SHA512:
-  metadata.gz: b7c9fe5c45454e28ced58826f3085ad22e7786efbd6c91c78cfd5f84b121173aa07bed10f307b9a34902bb5342031e7a53d70d866ce3e93466ee4f4977487c62
-  data.tar.gz: e41bf81bfcdb494dbeb121f0b4e4bf79ba17a3984c9fa7af256a87e50ffd043d036d31702b342a340f9fc45c245ba4f11ef63f0ef450f45e17016ea04c37fb3a
+  metadata.gz: e97489ca7fd9cb466e9844a62003c308939e0af720ad52829668239126f257e1eac99abef5712e411b621a41286c300913be8f8170a36217bac6d68233de7e9c
+  data.tar.gz: 150ae7a9d38706e3f3531003b923248d6d555627ae457d01dc041d38de95c4ab2b89f7408451b6d169e3fe51e488bc2cf71cf83ad3f3b265a9c2a72bf6a93c1e

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

@@ -8,12 +8,14 @@ class @WebRTC
   onWebSocketConnected: ->
   onWebSocketReconnectingStarted: ->
   onWebSocketReconnected: ->
+  onWebRTCCall: (remoteUserID) ->
   onWebRTCConnected: ->
   onWebRTCReconnectingStarted: ->
   onWebRTCReconnected: ->
   onWebRTCHangedUp: ->
   onWebRTCConnectFailed: (reason) ->
   onServerMessage: (message) ->
+  onUserMessage: (sentUserID, event, message) ->
 
   constructor: (url, userToken, localOutput, remoteOutput) ->
     @localOutput = if localOutput? then (localOutput[0] || localOutput) else null
@@ -48,6 +50,18 @@ class @WebRTC
     else
       alert 'Local stream not running yet - try again.'
 
+  answer: ->
+    @_isCaller = false
+    @_sendOffer()
+    @_peerStarted = true
+
+  sendUserMessage: (userID, event, message) ->
+    @_sendValue('userMessage',
+      userID: String(userID)
+      event: event
+      message: message
+    )
+
   enableVideo: ->
     @setVideoEnabled(true)
 
@@ -91,10 +105,14 @@ class @WebRTC
     @_webSocket.onmessage = (data) =>
       event = JSON.parse(data.data)
       eventType = event['type']
+      if eventType == 'userMessage'
+        @onUserMessage(event['remoteUserID'], event['event'], event['message'])
+        return
+
       if eventType != 'myUserID' && eventType != 'call' && eventType != 'webSocketReconnected'
         if @_remoteUserID != event['remoteUserID']
           return
-        
+
       switch eventType
         when 'myUserID'
           @myUserID = event['myUserID']
@@ -122,10 +140,8 @@ class @WebRTC
           else if event['reconnect'] && @_hangedUp
             @_sendMessage(type: 'hangUp')
           else
-            @_isCaller = false
             @_remoteUserID = event['remoteUserID']
-            @_sendOffer()
-            @_peerStarted = true
+            @onWebRTCCall(@_remoteUserID)
         when 'hangUp'
           @_callAnswerReceived = true
           @_hangUp()
@@ -141,6 +157,8 @@ class @WebRTC
             @_onCandidate(event)
         when 'serverMessage'
           @onServerMessage(event['message'])
+        when 'userMessage'
+          @onUserMessage(event['userType'], event['message'])
 
   _addNetworkEventListener: ->
     window.addEventListener('offline', (event) =>

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

@@ -3,14 +3,20 @@ require 'rails'
 module WebrtcRails
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      def add_gems
-        gem 'daemons-rails'
-        gem 'em-websocket'
-        gem 'em-hiredis'
-      end
+      source_root File.expand_path("../templates", __FILE__)
 
-      def injection
-        generate 'webrtc_rails:injection'
+      def create_initializer_file
+        initializer_path = File.join('config', 'initializers')
+        file_name = 'webrtc_rails.rb'
+        template file_name, File.join(initializer_path, file_name)
+      end
+      
+      def injection_js
+        append_to_file File.join('app', 'assets', 'javascripts', 'application.js') do
+          out = ''
+          out << "\n\n// append by webrtc_rails\n"
+          out << "//= require webrtc_rails/main\n\n"
+        end
       end
     end
   end

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

@@ -0,0 +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.daemon_delegate = 'WebrtcRails::DaemonDelegate'
+end

data/lib/tasks/webrtc_rails.rake

@@ -0,0 +1,56 @@
+require 'webrtc-rails'
+
+namespace :webrtc_rails do
+  desc 'start webrtc daemon'
+  task start: :environment do
+    start
+  end
+
+  desc 'stop webrtc daemon'
+  task stop: :environment do
+    stop
+  end
+
+  desc 'restart webrtc daemon'
+  task restart: :environment do
+    stop
+    start
+  end
+
+  @pid_file = "#{Rails.root}/tmp/pids/webrtc_rails.pid"
+  
+  def start
+    if File.exists?(@pid_file)
+      pid = File.read(@pid_file)
+      begin
+        if Process.kill(0, pid.to_i)
+          puts 'webrtc daemon alrerady exists'
+          return
+        end
+      rescue Errno::ESRCH
+      end
+    end
+    puts 'webrtc daemon started'
+    Process.daemon
+    File.write(@pid_file, Process.pid.to_s)
+    daemon = WebrtcRails::Daemon.new
+    daemon.start
+  end
+
+  def stop
+    unless File.exists?(@pid_file)
+      puts 'webrtc daemon does not exist'
+      return
+    end
+
+    pid = File.read(@pid_file)
+    begin
+      if Process.kill(:INT, pid.to_i)
+        puts 'webrtc daemon stoped'
+        File.delete(@pid_file)
+      end
+    rescue Errno::ESRCH
+      puts 'webrtc daemon does not exist'
+    end
+  end
+end

data/lib/webrtc-rails.rb

@@ -1,2 +1,17 @@
+require 'webrtc_rails/daemon'
+require 'webrtc_rails/daemon_delegate'
 require 'webrtc_rails/server_message'
+require 'webrtc_rails/engine'
+require 'webrtc_rails/configuration'
 require 'webrtc_rails/version'
+
+module WebrtcRails
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    self.configuration ||= WebrtcRails::Configuration.new
+    yield(configuration)
+  end
+end

data/lib/webrtc_rails/configuration.rb

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

data/lib/webrtc_rails/daemon.rb

@@ -0,0 +1,114 @@
+require 'webrtc-rails'
+require 'em-websocket'
+require 'em-hiredis'
+
+module WebrtcRails
+  class Daemon
+    def initialize
+      @websockets = {}
+      @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
+      @daemon_delegate = @config.daemon_delegate.constantize.new
+    end
+
+    def start
+      EM.run do
+        redis = EM::Hiredis.connect
+        pubsub = redis.pubsub
+        pubsub.subscribe('webrtc-rails')
+        pubsub.on(:message) do |channel, message|
+          data = JSON.parse(message, {symbolize_names: true})
+          user_id = data[:user_id].to_s
+          message = data[:message]
+          if @websockets.key?(user_id)
+            for ws in @websockets[user_id]
+              send_data = {
+                type: 'serverMessage',
+                message: message
+              }
+              ws.send JSON.generate(send_data)
+            end
+          end
+        end
+        
+        EM::WebSocket.run(host: 'localhost', port: 3001) do |websocket|
+          my_user_id = 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)
+              end
+            end
+          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)
+                my_user_id = user ? user.send(@user_id).to_s : nil
+                if my_user_id.present?
+                  case data[:event]
+                  when 'userMessage'
+                    user_id = data[:value][:userID]
+                    event = data[:value][:event]
+                    message = data[:value][:message]
+                    if @daemon_delegate.onWantSendUserMessage(my_user_id, user_id, event, message)
+                      message = {
+                        type: 'userMessage',
+                        remoteUserID: my_user_id,
+                        event: event,
+                        message: message
+                      }
+                      sendMessage(user_id, message)
+                    end
+                  when 'setMyToken'
+                    @websockets[my_user_id] ||= []
+                    @websockets[my_user_id].push(websocket)
+                    message = {
+                      type: 'myUserID',
+                      myUserID: my_user_id
+                    }
+                    @daemon_delegate.onWebSocketConnected(my_user_id)
+                    websocket.send JSON.generate(message)
+                  when 'sendMessage'
+                    user_id = data[:value][:userID]
+                    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)
+                        message = data[:value][:message]
+                        message[:remoteUserID] = my_user_id
+                        sendMessage(user_id, message)
+                      end
+                    else
+                      message = {
+                        type: 'callFailed',
+                        reason: 0,
+                        remoteUserID: user_id
+                      }
+                      websocket.send JSON.generate(message)
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    private
+
+    def sendMessage(user_id, message)
+      for ws in @websockets[user_id]
+        ws.send JSON.generate(message)
+      end
+    end
+  end
+end

data/lib/webrtc_rails/daemon_delegate.rb

@@ -0,0 +1,19 @@
+module WebrtcRails
+  class DaemonDelegate
+    def onWebSocketConnected(user_id)
+
+    end
+
+    def onWebSocketDisconnected(user_id)
+
+    end
+
+    def onWantCall(sent_user_id, will_receive_user_id)
+      true
+    end
+
+    def onWantSendUserMessage(sent_user_id, will_receive_user_id, event, message)
+      true
+    end
+  end
+end

data/lib/webrtc_rails/engine.rb

@@ -0,0 +1,5 @@
+module WebrtcRails
+  class Engine < Rails::Engine
+
+  end
+end

data/lib/webrtc_rails/version.rb

@@ -1,3 +1,3 @@
 module WebrtcRails
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/webrtc-rails.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'em-websocket'
-  spec.add_dependency 'redis'
-  spec.add_dependency 'daemons-rails'
+  spec.add_dependency 'em-hiredis'
   
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webrtc-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Koji Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -25,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
-  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
+  name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,17 +97,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/generators/webrtc_rails/injection/USAGE
-- lib/generators/webrtc_rails/injection/injection_generator.rb
+- lib/assets/javascripts/webrtc_rails/main.js.coffee
 - 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/templates/webrtc_ctl
+- lib/generators/webrtc_rails/install/templates/webrtc_rails.rb
+- lib/tasks/webrtc_rails.rake
 - lib/webrtc-rails.rb
+- lib/webrtc_rails/configuration.rb
+- lib/webrtc_rails/daemon.rb
+- lib/webrtc_rails/daemon_delegate.rb
+- lib/webrtc_rails/engine.rb
 - lib/webrtc_rails/server_message.rb
 - lib/webrtc_rails/version.rb
 - webrtc-rails.gemspec

data/lib/generators/webrtc_rails/injection/USAGE

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

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

@@ -1,39 +0,0 @@
-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/templates/daemons

@@ -1,5 +0,0 @@
-#!/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

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

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

@@ -1,85 +0,0 @@
-#!/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
-  redis = EM::Hiredis.connect
-  pubsub = redis.pubsub
-  pubsub.subscribe('webrtc-rails')
-  pubsub.on(:message) do |channel, message|
-    data = JSON.parse(message, {symbolize_names: true})
-    user_id = data[:user_id].to_s
-    message = data[:message]
-    if @websockets.key?(user_id)
-      for ws in @websockets[user_id]
-        send_data = {
-          type: 'serverMessage',
-          message: message
-        }
-        ws.send JSON.generate(send_data)
-      end
-    end
-  end
-  
-  EM::WebSocket.run(host: 'localhost', port: 3001) do |websocket|
-    my_user_id = nil
-    
-    websocket.onclose do
-      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})
-      if data[:event] != 'heartbeat'
-        token = data[:token]
-        if token.present?
-          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
-    end
-  end
-end

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

@@ -1,6 +0,0 @@
-class WebrtcController < ApplicationController
-  def send_message
-    WebsocketRails.users[params[:user_id]].send_message 'webrtc', params[:message]
-    render :json => 'OK'
-  end
-end

data/lib/generators/webrtc_rails/templates/webrtc_ctl

@@ -1,6 +0,0 @@
-#!/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