se-realtime 0.0.0.beta2 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be232d89599d222902c7b5a6abe0373883d2c1c4de86bb845716da814f0008d
-  data.tar.gz: 810386b632a4015837af3cc003437c1eb2ab97ca1a39216f9b7e0278f867465d
+  metadata.gz: df6fdee6c38b71e56a2aabc911c610f18e1d6da92770d8a3fc2190eb35e1a4a6
+  data.tar.gz: 29bd4cd03a4fd5c6c06eca9855c039b392308a8ad2f516d8b8d0073713bda294
 SHA512:
-  metadata.gz: 83758de91c6098a3ebfee3b3dd0afd318706d6e058d8f7fb5fc85e8873b5470950d3fc3a4d17b7868b08b066b31546871e57eeed5a16cf0b11c41118b2071501
-  data.tar.gz: c2dee666b75a47a25401822cec95875f43dc5c23eaf55bd62cf1abe51620a1e078639c2e7d89ac84498303d605ee12a86a67bd55a5a0572e98c3d573fb44749c
+  metadata.gz: c884b402278a17f3712839fb130e29cb5a1d7d26ac1f94e1a250a616bf349775209887ae3e604beb93a0282dbeb1c54e03a9376e0c804456407df3e6d6d8d877
+  data.tar.gz: 62fba0dba0aa3c9b9d0a43bae3f01d92afaa21911d2b8ed00f11cb047c374e4bc569b4c4f91d450d8d1c133ea287b39f9152622c368c3f7ad0c6e700aa03a260

data/Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     se-realtime (0.0.0.beta2)
       mechanize (~> 2.7)
       nokogiri (~> 1.8)
+      openssl (~> 2.1)
       permessage_deflate (~> 0.1)
       websocket-driver (~> 0.6)
 
@@ -30,14 +31,15 @@ GEM
     minitest (5.10.3)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     ntlm-http (0.1.1)
+    openssl (2.1.0)
     permessage_deflate (0.1.4)
     rake (10.5.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     webrobots (0.1.2)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)

data/lib/se/realtime/version.rb

@@ -1,5 +1,5 @@
 module SE
   module Realtime
-    VERSION = "0.0.0.beta2".freeze
+    VERSION = "0.0.1".freeze
   end
 end

data/lib/se/realtime/websocket.rb

@@ -4,6 +4,7 @@ require "websocket/driver"
 require "json"
 require "permessage_deflate"
 require "open-uri"
+require 'openssl'
 
 module SE
   module Realtime
@@ -11,14 +12,28 @@ module SE
       attr_reader :url, :thread, :driver
       attr_accessor :handler
 
+      # If you're looking back it this, look at super_logger (ws_super_logger, panic switch logging) and logger (realtime, messages (and some warnings))
+
       def initialize(url, cookies, &handler)
+        @super_logger = Logger.new('ws_super_logger.log')
+
         @uri = URI.parse(url)
         @url = "ws#{@uri.scheme.split("")[4]}://#{@uri.host}"
         @driver = WebSocket::Driver.client(self)
-        @socket = TCPSocket.new(@uri.host, 80)
+        if @uri.scheme.split("")[4] == 's'
+          @socket = TCPSocket.new(@uri.host, 443)
+          @super_logger.info "Opened TCP socket for (port 443) #{@uri} (#{@socket})"
+          @socket = OpenSSL::SSL::SSLSocket.new(@socket)
+          @socket.connect
+          @super_logger.info "Upgrade TCP socket to SSL socket socket for #{@uri} (#{@socket})"
+        else
+          @socket = TCPSocket.new(@uri.host, 80)
+          @super_logger.info "Opened TCP socket for (port 80) #{@uri} (#{@socket})"
+        end
         @handler = handler
         @logger = Logger.new "realtime.log"
         @restart = true
+        @super_logger.info "Set @restart to #{@restart}"
 
         @driver.add_extension PermessageDeflate
         @driver.set_header "Cookies", cookies if cookies
@@ -28,6 +43,7 @@ module SE
 
         @driver.on :open, ->(_e) do
           send "155-questions-active"
+          @super_logger.info "Socket open. Subscribed to 155-questions-active"
           @logger.info "WebSocket is open!"
         end
 
@@ -43,8 +59,10 @@ module SE
 
         @driver.on :close, ->(_e) do
           @logger.info "Realtime WebSocket is closing."
+          @super_logger.info "Socket was closed. @restart == #{@restart}"
           if @restart
             @logger.info "Attempting to reopen websocket..."
+            @super_logger.info "Attempting to reopen socket"
             @driver.start
           end
         end
@@ -56,16 +74,19 @@ module SE
         @thread = Thread.new do
           trap("SIGINT") do
             @restart = false
+            @super_logger.info "Got SIGINT. Dying."
             close
             Thread.exit
           end
           loop do
             begin
-              @driver.parse(@socket.recv(1))
+              @driver.parse(@socket.is_a?(TCPSocket) ? @socket.recv(1) : @socket.sysread(1))
             rescue IOError, SystemCallError => e
+              @super_logger.warn "Got some kind of interrupt in the thread. Panic."
               @logger.warn "Recieved #{e} closing TCP socket. You shouldn't be worried :)"
             end
           end
+          @super_logger.warn "Left TCPSocket.recv loop. If you're reading this, panic."
         end
 
         at_exit { @thread.join }
@@ -82,8 +103,9 @@ module SE
       end
 
       def close
+        @super_logger.warn "Was told to close. Was sad."
         @driver.close
-        @socket.shutdown
+        @socket.is_a?(TCPSocket) ? @socket.shutdown : @socket.sysclose
       rescue IOError, Errno::ENOTCONN => e
         @logger.error "Recieved #{e.class} trying to close websocket. Ignoring..."
       end

data/se-realtime.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
     ["nokogiri",           "~> 1.8"],
     ["permessage_deflate", "~> 0.1"],
     ["websocket-driver",   "~> 0.6"],
+    ["openssl",            "~> 2.1"]
   ].each do |g, v|
     spec.add_runtime_dependency g, v
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: se-realtime
 version: !ruby/object:Gem::Version
-  version: 0.0.0.beta2
+  version: 0.0.1
 platform: ruby
 authors:
 - thesecretmaster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: 
 email:
 - thesecretmaster@developingtechnician.com
@@ -144,9 +158,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3