ipcam 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5860e0ddb4768629eb61a15d4a91fc174487f130a22c581ab49263e8bc817fc9
-  data.tar.gz: 3d5a26bd9529d5591c824f6fbe200af084a85baa1c1f98f040697f2b4fd3d0d4
+  metadata.gz: 3673112cdc6871dd10631f4a67f4f5e1c93b3f6056af3acd6fbee4ef1ca3a8f8
+  data.tar.gz: 119f2126a4a68f850285af9f8fe06e32e08324ff4e17b1939ba0e7ad2f818122
 SHA512:
-  metadata.gz: 1b1969bf1a2b71a2dc2a9c445c6bc75939942e3d0982b0ca94f163413bbe55f5eb94c57afce3367f23a96859e26e5e8a2a1942f366f9f7e2ed6e14b27a40ed28
-  data.tar.gz: 160d3da4692663a2eff313d9b5f0f4d604cf57606afd877d8453331b517ea9f417ad75f7f493734aac6a98c710787d3fd5305c8be9952bc51d048fd72d5d4338
+  metadata.gz: 63874cacbf9f2b194b4829a168067b976b3f6692cdf2b1fdc807b1fe66ca1863af4f43857a6b0a89a606af4d050ddb2372a79c21da859a990ba1407951651096
+  data.tar.gz: 871dbee9300615fea6fd5b98e0053f0afe1e5311a1cfe615548a6ed189b45ac4b66d0e8f31d1a1d5dd15c595d8ff5489a1182e36ee7d6b4a4a5353cb1f8390aa

data/README.md

@@ -25,6 +25,7 @@ options:
         --bind=ADDR
         --port=PORT
     -d, --database-file=FILE
+    -e, --extend-header
         --log-file=FILE
         --log-age=AGE
         --log-size=SIZE
@@ -48,6 +49,9 @@ Then connect to port 4567 by http browser and operate. The accessible URLs are a
   <dt>-d, --database-file=FILE</dt>
   <dd>Specify the file name to save the camera setting value. by default, it tries to save to "~/.ipcam.db".</dd>
 
+  <dt>-e, --extend-header</dt>
+  <dd>Add extend header to part data (for debug).</dd>
+
   <dt>--log-file=FILE</dt>
   <dd></dd>
 
@@ -63,7 +67,7 @@ specify target device file (ex: /dev/video1). if omittedm,  it will use "/dev/vi
 
 ## etc
 ### About image data
-いらすとや(https://www.irasutoya.com/)で配布されている『特撮映画のイラスト』(https://www.irasutoya.com/2018/12/blog-post_90.html)を改変して使用しています。
+いらすとや (https://www.irasutoya.com) で配布されている『特撮映画のイラスト』(https://www.irasutoya.com/2018/12/blog-post_90.html) を改変して使用しています。
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/bin/ipcam

@@ -52,7 +52,7 @@ OptionParser.new { |opt|
   }
 
   opt.on('--port=PORT', Integer) { |val|
-    $bind_port = val
+    $http_port = val
     $ws_port   = val + 1
   }
 
@@ -60,6 +60,10 @@ OptionParser.new { |opt|
     $db_file   = Pathname.new(val)
   }
 
+  opt.on('-e', '--extend-header') { |val|
+    $extend_header = true
+  }
+
   opt.on('--log-file=FILE') { |val|
     log[:device] = val
   } 

data/lib/ipcam/main.rb

@@ -23,10 +23,10 @@ module IPCam
       @camera  = nil
       @state   = :STOP
       @img_que = Thread::Queue.new
-      @cam_thr = Thread.new {camera_thread}
-      @snd_thr = Thread.new {sender_thread}
       @clients = []
 
+      start_thread()
+
       WebServer.start(self)
       WebSocket.start(self)
 
@@ -34,19 +34,28 @@ module IPCam
     end
 
     def stop
-      @cam_thr.join
-
-      @snd_thr.raise(Stop)
-      @snd_thr.join
-
+      stop_thread()
 
       WebServer.stop
       EM.stop
     end
 
+    def start_thread
+      @cam_thr = Thread.new {camera_thread}
+    end
+    private :start_thread
+
+    def stop_thread
+      @cam_thr.raise(Stop)
+      @cam_thr.join
+      @cam_thr = nil
+    end
+    private :stop_thread
+
     def restart_camera
       @cam_thr.raise(Restart)
     end
+    private :restart_camera
 
     def select_capabilities(cam)
       ret = cam.frame_capabilities(:MJPEG).instance_eval {
@@ -235,6 +244,8 @@ module IPCam
         raise("#{$target} is not support Motion-JPEG")
       end
 
+      snd_thr = Thread.new {sender_thread}
+
       begin
         @mutex.synchronize {
           @config = load_settings()
@@ -271,6 +282,10 @@ module IPCam
     ensure
       @camera&.close
       @camera = nil
+
+      snd_thr&.raise(Stop)
+      snd_thr&.join
+
       $logger.info("main") {"camera thread stop"}
     end
     private :camera_thread
@@ -285,12 +300,12 @@ module IPCam
       }
 
     rescue Stop
-      $logger.info("main") {"accept stop request"}
       @clients.each {|c| c[:que] << nil}
 
     ensure
       $logger.info("main") {"sender thread stop"}
     end
+    private:sender_thread
 
     def get_camera_info
       @mutex.synchronize {
@@ -370,5 +385,29 @@ module IPCam
     def remove_client(que)
       @clients.reject! {|c| c[:que] == que}
     end
+
+    def start_camera
+      raise("state violation") if @state != :STOP and @state != :ABORT
+
+      start_thread()
+    end
+
+    def stop_camera
+      raise("state violation") if @state != :ALIVE
+
+      stop_thread()
+    end
+
+    def alive?
+      @state == :ALIVE
+    end
+
+    def abort?
+      @state == :ABORT
+    end
+
+    def stop?
+      @state == :STOP
+    end
   end
 end

data/lib/ipcam/version.rb

@@ -1,3 +1,3 @@
 module IPCam
-  VERSION = "0.2.1"
+  VERSION = "0.3.2"
 end

data/lib/ipcam/webserver.rb

@@ -66,6 +66,9 @@ module IPCam
     end
 
     get "/stream" do
+      halt 500 if app.abort?
+      halt 404 if app.stop?
+
       boundary = SecureRandom.hex(20)
       queue    = Thread::Queue.new
 
@@ -83,18 +86,32 @@ module IPCam
         port << "\r\n"
         app.add_client(queue)
 
+        fc = 0
+
         loop {
           data = queue.deq
           break if not data
 
-          port << <<~EOT.b
-            --#{boundary}
-            Content-Type: image/jpeg\r
-            Content-Length: #{data.bytesize}\r
-            \r
-          EOT
+          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
+          end
 
           port << data
+          fc += 1
 
           # データ詰まりを防ぐ為にキューをクリア
           queue.clear

data/lib/ipcam/websock.rb

@@ -106,7 +106,7 @@ module IPCam
           addr = $bind_addr
         end
 
-        return "tcp://#{addr}:#{$http_port}"
+        return "tcp://#{addr}:#{$ws_port}"
       end
       private :bind_url
 
@@ -376,5 +376,31 @@ module IPCam
       return :OK
     end
     remote_public :save_config
+
+    #
+    # カメラの撮影開始
+    #
+    # @return [:OK] 固定値
+    #
+    def start_camera(df)
+      EM.defer {
+        @app.start_camera()
+        df.resolve(:OK)
+      }
+    end
+    remote_async :start_camera
+
+    #
+    # カメラの撮影停止
+    #
+    # @return [:OK] 固定値
+    #
+    def stop_camera(df)
+      EM.defer {
+        @app.stop_camera()
+        df.resolve(:OK)
+      }
+    end
+    remote_async :stop_camera
   end
 end

data/resource/ipcam/js/main.js

@@ -27,6 +27,8 @@
   var previewCanvas;
   var previewGc;
 
+  var cameraState;
+
   /*
    * declar functions
    */
@@ -40,24 +42,28 @@
     var bg;
     var lb;
 
+    cameraState = state;
+
     switch (state) {
       case "STOP":
       default:
         fg = "royalblue";
-        bg = "white";
+        bg = "rgba(160, 160, 160, 0.5)";
         lb = "START";
+        clearPreviewCanvas();
         break;
 
       case "ALIVE":
         fg = "springgreen";
-        bg = "black";
+        bg = "rgba(0, 0, 0, 0.5)";
         lb = "STOP";
         break;
 
       case "ABORT":
         fg = "crimson";
-        bg = "white";
+        bg = "rgba(160, 160, 160, 0.5)";
         lb = "RECOVER";
+        clearPreviewCanvas();
         break;
     }
 
@@ -332,6 +338,8 @@
     previewCanvas.width  = imageWidth;
     previewCanvas.height = imageHeight;
 
+    clearPreviewCanvas();
+
     setTimeout(() => {
       $('div#preview').getNiceScroll().resize();
     }, 0);
@@ -433,14 +441,12 @@
         });
 
     } else {
-      $('h6#device-name').text(null);
-
       $('select#image-size > option').remove();
       $('select#framerate > option').remove();
       $('div#controls').empty();
-
-      setupScreenSize();
     }
+
+    $('button#action').prop('disabled', false);
   }
 
   function startSession() {
@@ -501,6 +507,23 @@
   }
 
   function setupButtons() {
+    $('button#action')
+      .on('click', () => {
+        clearPreviewCanvas();
+        $('button#action').prop('disabled', true);
+
+        switch (cameraState) {
+        case "STOP":
+        case "ABORT":
+          session.startCamera();
+          break;
+
+        case "ALIVE":
+          session.stopCamera();
+          break;
+        }
+      });
+
     $('button#save-config')
       .on('click', () => {
         session.saveConfig();
@@ -516,6 +539,11 @@
       });
   }
 
+  function clearPreviewCanvas() {
+    previewGc.fillStyle = "black";
+    previewGc.fillRect(0, 0, previewCanvas.width, previewCanvas.height);
+  }
+
   function initialize() {
     session       = new Session(WS_URL);
     capabilities  = null;
@@ -529,6 +557,7 @@
 
     setupScreen();
     setupButtons();
+    clearPreviewCanvas();
 
     startSession();
   }

data/resource/ipcam/js/session.js

@@ -57,5 +57,12 @@ if (!msgpack || !msgpack.rpc) {
       return this.remoteCall('save_config');
     }
 
+    startCamera() {
+      return this.remoteCall('start_camera');
+    }
+
+    stopCamera() {
+      return this.remoteCall('stop_camera');
+    }
   }
 })();

data/resource/ipcam/views/main.erb

@@ -26,7 +26,7 @@
     <div id="main-area" class="d-flex d-flex-row">
       <div id="switches">
         <div class="form-grounp mt-3">
-          <button id="action" class="btn btn-primary" disabled>STOP</button>
+          <button id="action" class="btn btn-primary">STOP</button>
         </div>
 
         <div class="form-grounp mt-3">

metadata

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