sinatra_sockets 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15ceae9b0ffb57cf0402226553bbf1d0cead1365
-  data.tar.gz: 1c6991d6bff221887618e35f20946e61b7320161
+  metadata.gz: 4d379215d2220dba3ac97637d938c45e7695624d
+  data.tar.gz: c1a7fc1db29382e26218b6913be59094f72e9ddb
 SHA512:
-  metadata.gz: 8d9bfe79ce004845abb884862540554e14ed3713b2c11fb2594ab0600138aa048b6d9500a6726ae40b12ec19652a97c12aa8d2de3df084b2aca4d833c18ca38d
-  data.tar.gz: b5daeb4d873e9f103fbf0fb4f50173adec5e18040a6baf508fac4c86c5577aeb56107f5001ab9fa1f5ea1804924a9fcbd1e17b26e2c2f145859e4377569adcf0
+  metadata.gz: 7306077f348c70d269327f3bc70e5fd2b52a419ec8c0f81e9235e73257ce74d95b72f62760e7b2d1e03cfd263ace17f23572c5b45623850cd3739cfdfb40edf2
+  data.tar.gz: a39381a435fcea01b45610b981d05ee2b527a0db1b42e7b2914e6c7bcfc6a17569a1b21b87c017ced25dba3558bf198b5e0560e3e1158c41c73272a62d94dd78

data/lib/server_skeleton/Gemfile.lock

@@ -8,73 +8,30 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    awesome_print (1.7.0)
     byebug (9.0.6)
-    coderay (1.1.1)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    colored (1.2)
     concurrent-ruby (1.0.4)
-    corefines (1.9.0)
     daemons (1.2.4)
     dotenv (2.2.0)
-    engtagger (0.2.1)
     eventmachine (1.2.2)
-    execjs (2.7.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     faye-websocket (0.10.6)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.9.17)
-    gemmyrb (0.1.6)
-      activesupport
-      awesome_print
-      byebug
-      colored
-      corefines
-      engtagger
-      minitest
-      odyssey
-      pry
-      sentence_interpreter
-      thor
     i18n (0.8.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    method_source (0.8.2)
     minitest (5.10.1)
     multipart-post (2.0.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    odyssey (0.2.0)
-      require_all
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     public_suffix (2.0.5)
     rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rack-proxy (0.6.0)
       rack
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    require_all (1.4.0)
-    rerun (0.11.0)
-      listen (~> 3.0)
-    ruby_dep (1.5.0)
-    sass (3.4.23)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    sentence_interpreter (0.0.7)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
@@ -83,16 +40,10 @@ GEM
     sinatra_auth_github (1.2.0)
       sinatra (~> 1.0)
       warden-github (~> 1.2.0)
-    slim (3.0.7)
-      temple (~> 0.7.6)
-      tilt (>= 1.3.3, < 2.1)
-    slop (3.6.0)
-    temple (0.7.7)
     thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.6)
     tzinfo (1.2.2)
@@ -111,17 +62,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  coffee-script
+  byebug
   dotenv
   faye-websocket
-  gemmyrb
   rack-proxy
-  rerun
-  sass
   sinatra
   sinatra-cross_origin
   sinatra_auth_github
-  slim
   thin
 
 BUNDLED WITH

data/lib/server_skeleton/lib/routes/ws.rb

@@ -1,27 +1,29 @@
 class Routes::Ws
 
+  # Opens a new websocket connection from a request
   def self.run(request)
     return unless Faye::WebSocket.websocket?(request.env)
-    socket = Faye::WebSocket.new(req.env)
-    socket.onopen { onopen(request, socket) }
-    socket.onmessage { |msg| onmessage(request, ws, msg) }
-    socket.onclose { onclose(request, ws) }
+    socket = Faye::WebSocket.new(request.env)
+    socket.onopen = Proc.new { |e| onopen(request, socket) }
+    socket.onmessage = Proc.new { |e| onmessage(request, socket, e.data) }
+    socket.onclose = Proc.new { |e| onclose(request, socket) }
     socket.rack_response
   end
 
   def self.onopen(request, ws)
     token = request.params["token"]
-    unless token
-      ws.send({
-        msg: "no valid token was sent with websocket; invalid"
-      }.to_json)
+    if token
+      Sockets[token] = ws
+    else
       ws.close
-      return
     end
-    Sockets[token] = ws
   end
 
-  def self.onmessage(request, ws, msg)
+  def self.onmessage(request, ws, msg_data)
+    data = JSON.parse msg_data
+    if data["action"] == "try_authenticate"
+      try_authenticate(ws, data["token"])
+    end
   end
 
   def self.onclose(request, ws)
@@ -32,6 +34,15 @@ class Routes::Ws
 
     private
 
+    def try_authenticate(ws, token)
+      if username = AuthenticatedTokens[token]
+        ws.send({
+          action: "logged_in",
+          username: username  
+        }.to_json)
+      end
+    end
+
     def send_json_message(ws, msg)
       EM.next_tick { ws.send msg.to_json }
     end

data/lib/server_skeleton/server.rb

@@ -94,13 +94,20 @@ class Server < Sinatra::Base
   end
 
   # Then they authenticate with Github
-  # TODO render a proper HTML page after this not just plaintext
+  #
+  # If the client refreshes the page after logging in, they should have stored
+  # the token in a cookie. If they hit this route with the same token, it
+  # keeps them logged in.
+  #
+  # This needs to be clicked like a regular link - no AJAX
+  #
+  # TODO render a proper HTML page after authenticating not just plaintext
   # saying they can close the window.
 
   get '/authenticate' do
     if token = params["token"]
       if socket = Sockets[token]
-        if !AuthenticatedTokens[token]
+        unless username = AuthenticatedTokens[token]
           authenticate!
           username = get_username
           Users[username] << (token)
@@ -119,20 +126,23 @@ class Server < Sinatra::Base
     end
   end
 
+  # This is hit over AJAX
+  # This closes the websocket connection
+  # Clients should request a new token and reconnect to ws after logging out
+
   get '/logout' do
+    cross_origin allow_origin: "http://localhost:8080"
     token = params[:token]
     if token
       if username = AuthenticatedTokens[token]
         logout!
-        Sockets[token].send({
-          action: "logged_out"
-        }.to_json)
+        AuthenticatedTokens.delete token
+        Users[username].delete token
+        Sockets[token].close
+        Sockets.delete token
+        { success: "logged out" }.to_json
       else
-        if ws = Sockets[token]
-          ws.send({msg: "can't find user to log out"}.to_json)
-        else
-          {error: "can't find user to log out"}.to_json
-        end
+        { error: "can't find user to log out" }.to_json
       end
     else
       { error: 'cant log out; no token provided' }.to_json

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SinatraSockets
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_sockets
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - maxpleaner