crimson 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5da65ea222585d02e2af5148b3e4f3b51d1bb1b1a119879484e320717e88674
-  data.tar.gz: 9b11f71db1c618a53df6ac15028d3d7eb76d1fb8773484be30349f65ae754813
+  metadata.gz: d0089dfdf0858ceff35c98db0799998355463be523a13420425294bee18c4a46
+  data.tar.gz: 681a505d387641e482379284548cd6a5055017347792112f179a4c28a0637b8f
 SHA512:
-  metadata.gz: 46eacb8d903a59a88a8375791ced6686000e273914355b10950c48e77b777cf43ccc05fd0f081590a1ace4275d0b74c9df8eaf23275e8ba5cbe0b67cda50970e
-  data.tar.gz: 5ec837a1e8871c71a8c3a09091c263da16414e9b8c878ae83fa12df455f1c0201a2060cc6266e8512a72a0a4da65df19c45ae340ef3a9fe16a11faac0c392b20
+  metadata.gz: 40046a67b7b174c74d585715271278dae16ce786e3ed92c8458cb60ea4c05012cca716f18acf7998ced6a6b1d09ab25810e5747b5f6f95e495f371eb5cbbc8b6
+  data.tar.gz: '0253249eeb2d990a0d88d154647566e4b69b480a8ca77bc37701f889ab9b7edf1b6be5f9c6a363ea64e6d034cae12ff4a587b4bbdef55f3fc21214dce7216e3d'

data/Gemfile

@@ -4,8 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'hashie'
-gem 'thin'
-gem 'sinatra'
 gem 'rubytree'
-gem 'eventmachine'
-gem 'websocket-eventmachine-server'
+gem 'async-websocket'

data/example/{example.rb → config.ru}

@@ -6,8 +6,6 @@ require 'crimson/widgets/window'
 require 'crimson/widgets/form'
 require 'crimson/widgets/input'
 
-server = Crimson::Server.new
-
 desktop = Crimson::Desktop.new
 desktop.style.backgroundColor = "white"
 
@@ -53,6 +51,8 @@ login.content = form
 
 desktop.commit_tree!
 
+server = Crimson::Server.new
+
 server.on_connect do |client|
   puts "#{client.id} connected"
 
@@ -63,4 +63,4 @@ server.on_disconnect do |client|
   puts "#{client.id} disconnected"
 end
 
-server.run
+run server

data/lib/crimson/adapters/faye.rb

@@ -0,0 +1,16 @@
+require 'faye/websocket'
+
+module Crimson
+  module Adapters
+    class Faye < SimpleDelegator
+      def initialize(ws)
+        @ws = ws
+        super(@ws)
+      end
+
+      def write(message)
+        @ws.send(message)
+      end
+    end
+  end
+end

data/lib/crimson/client.rb

@@ -9,15 +9,12 @@ module Crimson
 
     def initialize(id, connection)
       @id = id
-
       @connection = connection
-      @connection.onmessage(&method(:on_message))
-
       @notification_bus = NotificationBus.new
     end
 
-    def on_message(message, type)
-      message = Hashie::Mash.new(JSON.parse(message))
+    def on_message(message)
+      message = Hashie::Mash.new(message)
 
       begin
         case message.action
@@ -30,7 +27,7 @@ module Crimson
     end
 
     def write(message = {})
-      connection.send(message.to_json)
+      connection.write(message)
     end
 
     def on_commit(object, changes)

data/lib/crimson/server.rb

@@ -1,24 +1,18 @@
 # frozen_string_literal: true
 
-require 'thin'
-require 'websocket-eventmachine-server'
+require 'async/websocket/adapters/rack'
+require_relative 'adapters/faye'
 require_relative 'client'
-require_relative 'webserver'
 require_relative 'utilities'
 
 module Crimson
   class Server
     attr_reader :clients
 
-    def initialize(opts = {})
-      @opts = opts || {}
+    def initialize
       @clients = {}
     end
 
-    def host
-      @opts[:host] || '0.0.0.0'
-    end
-
     def on_connect(&block)
       @on_connect = block if block_given?
     end
@@ -27,43 +21,76 @@ module Crimson
       @on_disconnect = block if block_given?
     end
 
-    def port
-      @opts[:port] || 10_000
+    def self.template_html_path
+      File.expand_path("#{__dir__}/../html/template.html")
     end
 
-    def run(websocket_enabled: true, webserver_enabled: true)
-      EM.run do
-        start_websocket if websocket_enabled
-        start_webserver if webserver_enabled
-      end
+    def self.static
+      { :urls => [File.expand_path("#{__dir__}/.."), File.expand_path("#{__dir__}/../javascript")] }
+    end
+
+    def content(port, path = Server.template_html_path)
+      template = File.read(path)
+      template.sub!("{PORT}", port)
+
+      [template]
     end
 
-    def start_webserver
-      template = File.read("#{__dir__}/../html/template.html")
-      template.sub!("{PORT}", websocket_port.to_s)
+    def call(env)
+      call_async(env) or call_faye(env) or serve_template(env)
+    end
+
+    def call_async(env)
+      Async::WebSocket::Adapters::Rack.open(env, protocols: ['ws']) do |connection|
+        id = :"client_#{Utilities.generate_id}"
+        client = Client.new(id, connection)
+        clients[connection] = client
+        
+        @on_connect&.call(client)
 
-      Thin::Server.start(WebServer.new(template), host, port, signals: false)
+        begin
+          while message = connection.read
+            client.on_message(message)
+          end
+        rescue Protocol::WebSocket::ClosedError
+          
+        end
+      ensure
+        @on_disconnect&.call(client)
+        clients.delete(connection)
+        connection.close
+      end
     end
 
-    def start_websocket
-      WebSocket::EventMachine::Server.start(host: host, port: websocket_port) do |ws|
+    def call_faye(env)
+      if Faye::WebSocket.websocket?(env)
+        connection = Crimson::Adapters::Faye.new(Faye::WebSocket.new(env))
         id = :"client_#{Utilities.generate_id}"
-        client = Client.new(id, ws)
+        client = Client.new(id, connection)
+        clients[id] = client
 
-        ws.onopen {
-          clients[id] = client
-          @on_connect.call(client)
-        }
+        @on_connect&.call(client)
 
-        ws.onclose {
-          @on_disconnect.call(client)
+        connection.on :message do |event|
+          client.on_message(JSON.parse(event.data))
+        end
+    
+        connection.on :close do |event|
+          @on_disconnect&.call(client)
           clients.delete(id)
-        }
+          connection = nil
+        end
+
+        return connection.rack_response
       end
     end
 
-    def websocket_port
-      port + 1
+    def serve_template(env)
+      if env['REQUEST_PATH'] != '/'
+        return Rack::Directory.new(File.expand_path("#{__dir__}/..")).call(env)
+      else
+        return [200, {"Content-Type" => "text/html"}, content(env['SERVER_PORT'])]
+      end
     end
   end
 end

data/lib/crimson/version.rb

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

data/lib/javascript/ServerInteractor.js

@@ -2,12 +2,17 @@ import MessageHandler from './MessageHandler.js'
 
 export default class ServerInteractor {
     constructor(uri, objectManager, logger) {
-        let me = this;
+        this.uri = uri;
+        this.messageHandler = new MessageHandler(this, objectManager, logger);
+        this.logger = logger;
 
-        me.messageHandler = new MessageHandler(me, objectManager, logger);
-        me.logger = logger;
+        this.connect();
+    }
+
+    connect() {
+        const me = this;
 
-        me.socket = new WebSocket("ws://" + uri);
+        me.socket = new WebSocket("ws://" + me.uri);
         me.socket.onopen = function (event) { me.onOpen(event); };
         me.socket.onmessage = function (event) { me.onMessage(event); };
         me.socket.onclose = function (event) { me.onClose(event); };
@@ -29,11 +34,18 @@ export default class ServerInteractor {
     }
 
     onClose(event) {
+        const me = this;
+
         if (event.wasClean) {
-            this.logger.log(`[ServerInteractor] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+            me.logger.log(`[ServerInteractor] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
         } else {
-            this.logger.log("[ServerInteractor] Connection died");
+            me.logger.log("[ServerInteractor] Connection died.");
         }
+
+        me.logger.log("[ServerInteractor] Attempting to reestablish connection...")
+        setTimeout(function() {
+            me.connect();
+        }, 5000);
     }
 
     onError(error) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crimson
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rizwan Qureshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,10 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".travis.yml"
-- ".vscode/launch.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -73,10 +71,10 @@ files:
 - crimson.gemspec
 - doc/images/prelim-ruby-js-comms.png
 - doc/images/temperature-readme-example.PNG
-- example/ets.rb
-- example/example.rb
+- example/config.ru
 - lib/crimson.js
 - lib/crimson.rb
+- lib/crimson/adapters/faye.rb
 - lib/crimson/client.rb
 - lib/crimson/icons/close.png
 - lib/crimson/icons/hide.png
@@ -89,7 +87,6 @@ files:
 - lib/crimson/server.rb
 - lib/crimson/utilities.rb
 - lib/crimson/version.rb
-- lib/crimson/webserver.rb
 - lib/crimson/widgets/bottom_resizer.rb
 - lib/crimson/widgets/desktop.rb
 - lib/crimson/widgets/form.rb

data/.github/workflows/gempush.yml

@@ -1,44 +0,0 @@
-name: Ruby Gem
-
-on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Build + Publish
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        version: 2.6.x
-
-    - name: Publish to GPR
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-      env:
-        GEM_HOST_API_KEY: ${{secrets.GPR_AUTH_TOKEN}}
-        OWNER: username
-
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.vscode/launch.json

@@ -1,14 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug Local File",
-            "type": "Ruby",
-            "request": "launch",
-            "program": "${workspaceRoot}/example/ets.rb"
-        }
-    ]
-}

data/example/ets.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../crimson'
-require_relative '../lib/ruby/widgets/desktop'
-
-# server = Crimson::Server.new
-
-# desktop = Crimson::Desktop.new
-# desktop.style.backgroundColor = 'black'
-# desktop.commit_tree!
-
-# server.on_connect do |client|
-#   puts "#{client.id} connected"
-
-#   client.observe(desktop)
-# end
-
-# server.on_disconnect do |client|
-#   puts "#{client.id} disconnected"
-# end
-
-# server.run

data/lib/crimson/webserver.rb

@@ -1,17 +0,0 @@
-require 'sinatra/base'
-
-module Crimson
-  class WebServer < Sinatra::Base
-    set :public_folder, "#{__dir__}/../"
-
-    def initialize(template)
-      super()
-      
-      @template = template
-    end
-
-    get '/' do
-      @template
-    end
-  end
-end