adminix 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1985bdd230259c3aae11486b88bc516ec098b2cb
-  data.tar.gz: cecd82eb9b1639acfa71c1e370f7df0ffec97bed
+  metadata.gz: 323d686c0df911e68419b1d4a094d07517fc1728
+  data.tar.gz: b0b3a2c75899feceaa21a2e2cab960475293edbf
 SHA512:
-  metadata.gz: 6f3aaba67ebd6e6c9b311e80e85156bc86670a2826034a99ae8d78e0555ea3c7c09a96c221c001e9bc6e9cfd9578ba66adb0d5fc1f829428949cf22e88b7a44d
-  data.tar.gz: 84e2d76fcfdcf60808c0eae1744af418ed6021d9137fd9137273370f16b230f73c3f57dd23aa18dd7244518ed744edfd28ea4b31936480e772648d45c29fc89d
+  metadata.gz: '061087a77def56a10ad4f6c47284d609da99a36783ab271a57e3f488176470ef170dee6ff14f2faf05b5444d37b7f09034c7f132cc3dcdf571e36862a766005a'
+  data.tar.gz: 8c803731f17b32992c68714e9675e5611c5d7df6a2e149faf6375add59a8281e455af6f8f2170ab66cb61d08b8af8335e35b391a4dbb7ee883e2e42ac33845ee

data/adminix.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "eventmachine", "1.2.3"
-  spec.add_dependency "em-websocket-client", "0.1.2"
+  spec.add_dependency "action_cable_client", "2.0.0"
   spec.add_dependency "sinatra", "1.4.8"
 
   spec.add_development_dependency "bundler", "~> 1.14"

data/lib/adminix/service.rb

@@ -24,7 +24,7 @@ module Adminix
       }
     end
 
-    def sync(watcher, data)
+    def sync(ws_client, data)
       @process_id = data['process_id']
       config.commands = data['commands'] || []
 
@@ -32,7 +32,7 @@ module Adminix
       commands_queue.each do |q|
         if q['status'] != 'processed'
           res = execute_command(q['command_key'], q['process_id'], q['args'] || {})
-          watcher.publish_message(:task_completed, res)
+          ws_client.perform(:task_completed, res)
         end
       end
     end
@@ -60,7 +60,7 @@ module Adminix
     end
 
     def fetch_options
-      uri = URI.parse("#{config.host}/v1/services/#{id}/options")
+      uri = URI.parse("#{config.host}/api/v1/services/#{id}/options")
       request = Net::HTTP::Get.new(uri)
       request["Authorization"] = "Bearer #{config.secret_key}"
 

data/lib/adminix/version.rb

@@ -1,3 +1,3 @@
 module Adminix
-  VERSION = "0.1.23"
+  VERSION = "0.1.24"
 end

data/lib/adminix/watcher.rb

@@ -1,5 +1,5 @@
 require "eventmachine"
-require "em-websocket-client"
+require "action_cable_client"
 
 module Adminix
   class Watcher
@@ -9,51 +9,51 @@ module Adminix
       if options[:stop_daemon]
         watcher.stop
       else
-        if options[:daemonize]
-          watcher.start
-        else
-          watcher.run!
-        end
+        options[:daemonize] ? watcher.start : watcher.run!
       end
     end
 
     SYNC_PERIOD = 5.freeze
-    WEBSOCKET_HOST = 'wss://api.adminix.io/websocket'.freeze
+    DEFAULT_WEBSOCKET_HOST = 'wss://api.adminix.io/websocket'.freeze
     SERVICE_CHANNEL = 'ServiceChannel'.freeze
 
     def initialize(opts)
-      @socket_url = opts[:websocket_host] || ENV['ADMINIX_WEBSOCKET_HOST'] || WEBSOCKET_HOST
-      @socket_url = "#{@socket_url}?secret_key=#{config.secret_key}"
-      @service = Service.instance
-      @client = nil
       @pid_full = '/tmp/adminix.pid'
+      @service = Service.instance
+      
+      @ws_client = nil
+      ws_path = opts[:websocket_host] || ENV['ADMINIX_WEBSOCKET_HOST'] || DEFAULT_WEBSOCKET_HOST
+      @ws_uri = "#{ws_path}?secret_key=#{config.secret_key}"
+      @ws_channel = { channel: 'ServiceChannel', service_id: @service.id }
     end
 
     def run!
       trap_signal
       
       EventMachine.run do
-        @client = WebsocketClient.new(@socket_url) do
-          on_disconnect(@client)
+        @ws_client = ActionCableClient.new(@ws_uri, @ws_channel)
+        @ws_client.connected do |msg|
+          puts 'Connection established'
         end
-
-        @client.connect do |message|
-          on_message_receive(@client, message)
+        @ws_client.disconnected do
+          system.log 'Disconnected. Reconnecting...'
+          sleep(2)
+          @ws_client.connect!
+        end
+        @ws_client.received do |msg|
+          message = msg['message'] || {}
+          case message['type']
+            when 'restart' then @service.restart!
+            when 'sync' then @service.sync(@ws_client, message['data'])
+          end
         end
-        
+
         EventMachine.add_periodic_timer(SYNC_PERIOD) do
-          publish_message(:sync, @service.to_cable) if @client.connected
+          @ws_client.perform(:sync, @service.to_cable) if @ws_client.subscribed?
         end
       end
     end
 
-    def publish_message(action, data)
-      identifier = { channel: SERVICE_CHANNEL, service_id: @service.id }
-      data = { action: action, data: data }
-
-      @client.publish(identifier, data)
-    end
-
     def get_pid
       if File.exists?(@pid_full)
         file = File.new(@pid_full, "r")
@@ -106,61 +106,15 @@ module Adminix
 
     private
 
-    def config
-      Config.instance
-    end
-
-    def system
-      System.instance
-    end
-
-    def on_message_receive(client, message)
-      case message['type']
-      when 'welcome'
-        system.log 'Connected to channel'
-        on_success_connect(client)
-      when 'ping'
-        #system.log 'ping from server'
-        # do something
-      else
-        # do something
-      end
-    end
-
-    def on_disconnect(client)
-      system.log 'Disconnected. Reconnecting...'
-      client.connect do |message|
-        system.log message
-        on_message_receive(client, message)
-      end
-
-      #EventMachine.stop_event_loop
-    end
-
-    def on_success_connect(client)
-      client.subscribe(channel: SERVICE_CHANNEL, service_id: @service.id) do |message|
-        type = message['type'] || message['message']['type']
-        data = message['message']['data'] rescue {} 
-        on_service_message_receive(type, data)
-      end
-    end
-
-    def on_service_message_receive(type, data)
-      case type
-      when 'confirm_subscription'
-      when 'restart'
-        @service.restart!
-      when 'sync'
-        @service.sync(self, data)
-      end
-    end
-
     def trap_signal
        Signal.trap("SIGINT") do
          system.log "Stopping..."
          EventMachine.stop
        end
     end
+
+    def config() Config.instance end
+    def system() System.instance end
   end
 end
 

data/lib/adminix.rb

@@ -1,5 +1,4 @@
 require 'adminix/version'
-require 'adminix/websocket_client'
 require 'adminix/config'
 require 'adminix/service'
 require 'adminix/system'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Christian Dyl
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
-  name: em-websocket-client
+  name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,6 @@ files:
 - lib/adminix/system.rb
 - lib/adminix/version.rb
 - lib/adminix/watcher.rb
-- lib/adminix/websocket_client.rb
 - views/daemon_scripts/upstart.conf.erb
 homepage: http://adminix.io
 licenses:

data/lib/adminix/websocket_client.rb

@@ -1,90 +0,0 @@
-require 'json'
-
-module Adminix
-  class WebsocketClient
-    attr_accessor :client
-    attr_accessor :connected
-    attr_accessor :connection_handler
-    attr_accessor :channel_handlers
-    attr_accessor :disconnect_handler
-    attr_accessor :url
-
-    def initialize(url, &disconnect_handler)
-      self.url = url
-      self.disconnect_handler = disconnect_handler
-    end
-
-    def connect(&block)
-      self.connection_handler = block
-      self.channel_handlers = {}
-      self.client = EventMachine::WebSocketClient.connect(url)
-      client.callback do
-        system.log "Connected WebSocket to #{url}."
-        self.connected = true
-      end
-      client.stream do |raw|
-        message = parse_message(raw.to_s)
-        if message['identifier']
-          channel_handlers[message['identifier'].to_json].call(message)
-        else
-          connection_handler.call(message)
-        end
-      end
-      client.disconnect do
-        self.connected = false
-        disconnect_handler.call
-      end
-     end
-
-    def subscribe(identifier, &block)
-      push(create_subscribe_message(identifier))
-      channel_handlers[identifier.to_json] = block
-    end
-
-    def push(msg)
-      client.send_msg(msg)
-    end
-
-    def publish(identifier, data)
-      msg = create_publish_message(identifier, data)
-      # puts "PUSHING: #{msg}"
-      push(msg)
-    end
-
-    def create_publish_message(identifier, data)
-      message = {
-        command: 'message',
-        identifier: identifier
-      }
-      message[:data] = data.to_json if data
-      message[:identifier] = message[:identifier].to_json
-      message.to_json
-    end
-
-    def create_subscribe_message(identifier)
-      message = {
-          command: 'subscribe',
-          identifier: identifier.to_json
-      }
-      # message[:identifier].merge!(data) if data
-      # message[:data] = data.to_json if data
-      # message[:identifier] = message[:identifier].to_json
-      # puts message
-      message.to_json
-    end
-
-    def parse_message(message)
-      result = JSON.parse(message)
-      result['identifier'] = JSON.parse(result['identifier']) if result['identifier']
-      result['data'] = JSON.parse(result['data']) if result['data']
-      result
-    end
-
-    private
-
-    def system
-      System.instance
-    end
-  end
-end
-