ipcam 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6417acb08bb6a9f12d87c6415ac262af7b33abe45a13c861ba3f8285792d8346
-  data.tar.gz: e6c3d45e5e8ab073e8ed61518140636b69354f2767f31907f1913370e16d62c8
+  metadata.gz: 364d7aea8083301b5c3bfd0ec5c26d8afa68ac6496433495da0e56812f4dafe0
+  data.tar.gz: '09776c05b93354b60adaf89314d3c4f0ba1878ef83bd4cef1410cc72ba0639bb'
 SHA512:
-  metadata.gz: e413a40ad853c87b4d51c9b572de699188a684c35d23bf3eee5eb64e938a284e5b065dde725bab3603984570e2fe51d0ba5787e35580482d7d6db5238cb30206
-  data.tar.gz: 7d9a455266293089e9fd757ee526c95587b6e33f1cdea00fb63f042064c921cbe5fb8698a84da348a14c32b543681bb01db0b10968dd1c0b21f5d5dfb76ab133
+  metadata.gz: 983cdf9103d28102f42f76f8b230b84c5ece86c41f94d01c78cce4a1d97461e7ff25c60eb344f508e107a338a3fedcd9eb880b11fe9712a121692580b33cb549
+  data.tar.gz: eb89a8b0d1ad4e512f764e292c9fb61b237571bfc4bf4d785db335020704d58fe025ea0257f090911cd21fde6007c26423d74a9fe77f787bb2032ab326df33c0

data/lib/ipcam/version.rb

@@ -1,3 +1,3 @@
 module IPCam
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/ipcam/webserver.rb

@@ -8,7 +8,6 @@
 #
 
 require 'sinatra/base'
-require 'sinatra/streaming'
 require 'puma'
 require 'puma/configuration'
 require 'puma/events'
@@ -65,58 +64,91 @@ module IPCam
       erb :settings
     end
 
+    head "/stream" do
+      halt 500 if app.abort?
+      halt 404 if app.stop?
+      halt 503 if not env["rack.hijack?"]
+
+      headers = {
+        "Content-Type" =>"multipart/x-mixed-replace;",
+        "Connection"   => "close",
+      }
+
+      [200, headers, nil]
+    end
+
     get "/stream" do
       halt 500 if app.abort?
       halt 404 if app.stop?
+      halt 503 if not env["rack.hijack?"]
 
       boundary = SecureRandom.hex(20)
       queue    = Thread::Queue.new
+      headers  = {
+        "Content-Type"   =>"multipart/x-mixed-replace; boundary=#{boundary}",
+        "Connection"     => "close",
 
-      content_type("multipart/x-mixed-replace; boundary=#{boundary}")
+        # Rackのhijack API経由で生ソケットを用いてストリーミングを行う
+        "rack.hijack"    => -> (sock) {
+          begin
+            app.add_client(queue)
+
+            sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_QUICKACK, 1)
+            sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+            sock.write("\r\n".b)
+            sock.flush
+
+            fc = 0
+
+            loop {
+              body = queue.deq
+              break if not body
+
+              if $extend_header
+                header = <<~EOT.b
+                  --#{boundary}
+                  Content-Type: image/jpeg\r
+                  Content-Length: #{body.bytesize}\r
+                  X-Frame-Number: #{fc}
+                  X-Timestamp: #{(Time.now.to_f * 1000).round}
+                  \r
+                EOT
+              else
+                header = <<~EOT.b
+                  --#{boundary}
+                  Content-Type: image/jpeg\r
+                  Content-Length: #{body.bytesize}\r
+                  \r
+                EOT
+              end
+
+              sock.write(header, body)
+              sock.flush
+              fc += 1
+
+              # データ詰まりを防ぐ為にキューをクリア
+              queue.clear
+            }
+
+          rescue
+            # ignore
 
-      # pumaで:keep_openが動作しないのでちょっと面倒な方法で
-      # 対応
-      stream do |port|
-        port.callback {
-          app.remove_client(queue)
-          queue.clear
-          queue << nil
-        }
+          ensure
+            sock.close
 
-        port << "\r\n"
-        app.add_client(queue)
-
-        fc = 0
-
-        loop {
-          data = queue.deq
-          break if not data
-
-          if $extend_header
-            port << <<~EOT.b
-              --#{boundary}
-              Content-Type: image/jpeg\r
-              Content-Length: #{data.bytesize}\r
-              X-Frame-Number: #{fc}
-              X-Timestamp: #{(Time.now.to_f * 1000).round}
-              \r
-            EOT
-          else
-            port << <<~EOT.b
-              --#{boundary}
-              Content-Type: image/jpeg\r
-              Content-Length: #{data.bytesize}\r
-              \r
-            EOT
+            app.remove_client(queue)
+            queue.clear
           end
-
-          port << data
-          fc += 1
-
-          # データ詰まりを防ぐ為にキューをクリア
-          queue.clear
         }
+      }
+
+      # ↓力業でsinatraがContent-Lengthを付与仕様とするのを抑止している
+      def response.calculate_content_length?
+        return false
       end
+
+      [200, headers, nil]
     end
 
     get %r{/css/(.+).scss} do |name|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipcam
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler