driq 0.2.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb5ee5b3d3bdf18dc5f0f228868d99aaa915f72b023d0054c38842730773be3
-  data.tar.gz: 3d5b872a9d5e94e9ea7ffbb70764b312a484b9f66c3f2e55c9430ca4a80977ba
+  metadata.gz: 6b19bed9a7c00d3a975d83d18c05fc0506bda4a10298089bd7649e6e4284ff4a
+  data.tar.gz: 88bd1c8cfae747649ee1924bf6bc637b385d8b7f176f69130b2a90a17be08cba
 SHA512:
-  metadata.gz: 21f8fcdead5170e9ddae226845bde6af3225fce7776cde26463f57eb45fa3c6ac04e278cbf2d82c2854e827ba3873a892a2a47d3614762f49229e70a59b5f0b8
-  data.tar.gz: f83aed8ea7c7c7adefa6db38ad976f89f8d08a6e80911fc057adeef3033f5c644701cbd7c052708832359a447e6187303fac6d11c9a2f7b0ff92e10449ff80fd
+  metadata.gz: cfe39da41d8d14647b23d506e553b5e429c20bcb2daeba0b1294366554653afaceeda23e7e528c5d6e2cd5068de168bdb96b42c219b77a7fe928488da2967c26
+  data.tar.gz: a8d6162074a0e5f4669e24163159a0862a0e4363d2605586b65260239c438277a026992b93f6f0633db4cbcda23f21c49ac128d7ca944b15833fb12d9c4b97dd

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Masatoshi SEKI
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/driq.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "test-unit", "~> 3.3"
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/driq.rb

@@ -5,10 +5,11 @@ require "json"
 class Driq
   include MonitorMixin
 
-  def initialize(max_size=100)
+  def initialize(size=100)
     super()
     @last = 0
-    @max_size = max_size
+    @floor = size
+    @ceil = size * 2
     @list = []
     @event = new_cond
     @closed = false
@@ -18,14 +19,15 @@ class Driq
     synchronize do
       cell = [make_key, value]
       @list.push(cell)
+      @list = @list.last(@floor) if @list.size > @ceil
       @event.broadcast
       return cell.first
     end
   end
   alias push write
 
-  def read(key)
-    readpartial(key, 1).first
+  def read(key, timeout=nil)
+    readpartial(key, 1, timeout).first
   end
 
   def last(if_empty=nil)
@@ -38,18 +40,18 @@ class Driq
     @last
   end
 
-  def readpartial(key, size)
+  def readpartial(key, size, timeout=nil)
     synchronize do
       key = @last unless key
       raise ClosedQueueError if @closed
       idx = seek(key)
       if idx.nil?
         key = @last
-        @event.wait
+        @event.wait(timeout)
         idx = seek(key)
       end
       raise ClosedQueueError if @closed
-      @list.slice(idx, size)
+      idx ? @list.slice(idx, size) : []
     end
   end
 
@@ -72,12 +74,38 @@ class Driq
   end
 end
 
+class DriqDownstream < Driq
+  def initialize(upper, size=100)
+    super(size)
+    @upper = upper
+    Thread.new { download }
+  end
+
+  def write(value)
+    @upper.write(value)
+  end
+
+  def download
+    while true
+      ary = @upper.readpartial(@last, @ceil)
+      synchronize do
+        @list += ary
+        @list = @list.last(@floor) if @list.size > @ceil
+        @last = ary.last[0]
+        @event.broadcast
+      end
+    end
+  end
+end
+
 class Driq
   class EventSource
-    def initialize(driq = nil)
+    def initialize(driq = nil, timeout = 60)
       @driq = driq || Driq.new
+      @timeout = timeout
     end
     attr_reader :driq
+    attr_accessor :timeout
 
     def write(value)
       @driq.write([nil, value])
@@ -111,7 +139,7 @@ class Driq
     end
 
     def read(cursor)
-      cursor, value = @driq.read(cursor)
+      cursor, value = @driq.read(cursor, @timeout) || [cursor, [:ping, 'keep']]
       return cursor, build_packet(cursor, value[0], value[1])
     end
   end

data/lib/driq/version.rb

@@ -1,3 +1,3 @@
 class Driq
-  VERSION = "0.2.0"
+  VERSION = "0.4.3"
 end

data/sample/co2/co2-service.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /home/pi/src/Driq/sample/co2
+/usr/bin/ruby -I ../../../ruby-mh-z19/lib co2.rb

data/sample/co2/co2.html

@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CO2</title>
+  </head>
+  <style type="text/css" media="screen">
+    body {
+        font-family: Helvetica;
+        background: #FFFFFF;
+        color: #000000;　
+    }
+
+    #myChart {
+      position: relative;
+      height:300; width:150
+    }
+  </style>
+  <body>
+    <div class="head">
+      <h2>CO2 <span id="co2"></span></h2>
+    </div>
+    <div class="main">
+    <canvas id="myChart" style="position: relative; height:100; width:150"></canvas>
+    </div>
+
+  </body>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.bundle.min.js"></script>
+  <script>
+
+var evt = new EventSource('stream');
+
+evt.onmessage = function(e) {
+  var it = JSON.parse(e.data);
+  console.log(it);
+  console.log(new Date(Number(e.lastEventId) * 0.001));
+  time = new Date(Number(e.lastEventId) * 0.001);
+  add_data(it['concentration'], it['temperature'], time);
+};
+
+var co2_text = document.getElementById("co2");
+
+function add_data(concentration, temperature, time) {
+  chartDataSet.data.datasets[0].data.push({
+    y: concentration,
+    t: time
+  });
+  chartDataSet.data.datasets[1].data.push({
+    y: temperature,
+    t: time
+  });
+  while (time - chartDataSet.data.datasets[0].data[0].t > 3600000) {
+    chartDataSet.data.datasets[0].data.shift();
+    chartDataSet.data.datasets[1].data.shift();
+  }
+  chart.update();
+  co2_text.textContent = concentration + 'ppm';
+  document.title = concentration + 'ppm';
+}
+
+var ctx = document.getElementById("myChart").getContext('2d');
+const chartDataSet = {
+  type: 'line',
+  responsive: false,
+  aspectRatio: 2,
+  data: {
+    datasets: [{
+      label: 'ppm',
+      data: [],
+      borderColor: "rgb(54, 162, 235)",
+      fill: false,
+      yAxisID: "y-axis-1"
+    }, {
+      label: 'temp',
+      data: [],
+      borderColor: "rgb(235, 0, 0)",
+      fill: false,
+      yAxisID: "y-axis-2"
+    }]
+  },
+  options: {
+    scales: {
+      xAxes: [{
+        type: 'time',
+        time: {
+            displayFormats: {
+                millisecond: 'h:mm',
+                second: 'h:mm',
+                minute: 'h:mm'
+            },
+            unit: 'minute'
+        },
+        distribution: 'linear',
+        ticks: {
+          maxTicksLimit:6,
+          source: 'data'
+        },
+        gridLines: {
+          display: false
+        }
+      }],
+      yAxes: [{
+        id: 'y-axis-1',
+        ticks: {
+          source: 'data',
+          min: 200,
+          max: 2000
+        }
+      }, {
+        id: 'y-axis-2',
+        position: 'right',
+        ticks: {
+          source: 'data',
+          min: -5,
+          max: 40
+        },
+        gridLines: {
+          display: false
+        }
+      }]
+    }
+  }
+};
+var chart = new Chart(ctx, chartDataSet);
+</script>
+</html>

data/sample/co2/co2.rb

@@ -0,0 +1,60 @@
+require 'webrick'
+require 'driq'
+require 'driq/webrick'
+require 'mh-z19'
+
+class CO2
+  def initialize(port)
+    @src = Driq::EventSource.new
+    @svr = WEBrick::HTTPServer.new(:Port => port)
+
+    @svr.mount_proc('/') do |req, res|
+      on_index(req, res)
+    end
+
+    @svr.mount_proc('/stream') do |req, res|
+      on_stream(req, res)
+    end
+
+    @front = {"src" => @src, 
+              "webrick" => @svr, 
+              "body" => File.read('co2.html')}
+  end
+
+  def on_index(req, res)
+    res.body = File.read("co2.html")
+  end
+
+  def on_stream(req, res)
+    last_event_id = req["Last-Event-ID"] || 0
+    res.content_type = 'text/event-stream'
+    res.chunked = true
+    res.body = WEBrick::ChunkedStream.new(Driq::EventStream.new(@src, last_event_id))
+  end
+
+  def start
+    Thread.new { co2_loop }
+    @svr.start
+  end
+
+  def co2_loop
+    co2 = MH_Z19::Serial.new('/dev/serial0')
+    last = nil
+    sleep 3
+    loop do
+      begin
+        detail = co2.read_concentration_detail rescue nil
+        @src.write(detail) unless last == detail
+        last = detail
+      rescue MH_Z19::Serial::InvalidPacketException
+p $!
+      end
+      sleep 60
+    end
+  end
+end
+
+port = Integer(ENV['PORT']) rescue 8080
+
+co2 = CO2.new(port)
+co2.start

data/sample/co2/co2.service

@@ -0,0 +1,16 @@
+#
+
+[Unit]
+Description=MH-Z14A CO2 Server
+After=network.target
+After=syslog.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+User=pi
+Group=pi
+Type=simple
+ExecStart=/home/pi/src/Driq/sample/co2/co2-service.sh
+Restart=always

data/sample/koto/koto.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Koto</title>
+  </head>
+  <style type="text/css" media="screen">
+    body {
+        font-family: Helvetica;
+        background: #FFFFFF;
+        color: #000000;　
+    }
+    
+    .EnterTofu input {
+        box-sizing: border-box;
+        width: 100%;
+        padding: 16px 6px 6px 6px;
+        font-size: 16px;
+        font-weight: normal;
+        background: #6d84a2;
+    }
+    
+    .ListTofu > ul {
+        margin: 0;
+        padding: 0;
+    }
+    
+    .ListTofu > ul > li {
+        border-bottom: 1px solid #E0E0E0;
+        padding: 8px 0 8px 10px;
+        font-size: 14px;
+        font-weight: bold;
+        list-style: none:
+    }
+    
+    .ListTofu > ul > li.group {
+        top: -1px;
+        margin-bottom: -2px;
+        border-top: 1px solid #7d7d7d;
+        border-bottom: 1px solid #999999;
+        padding: 1px 5px;
+        font-size: 13px;
+        font-weight: bold;
+        text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
+        color: #FFFFFF;
+    }
+  </style>
+  <body>
+    <div class="EnterTofu">
+    <input id='enter' type='text' size='40' name='str' value='' autocomplete='off' autofocus onchange="postNews();"/>
+    </div>
+    <div class="ListTofu">
+    <ul id="list">
+    </ul>
+    </div>
+  </body>
+  <script>
+  var evt = new EventSource('stream');
+  var input = document.querySelector("#enter");
+  var eventList = document.getElementById('list');
+
+  evt.onmessage = function(e) {
+    var entry = JSON.parse(e.data);
+
+    var newString = document.createElement("li");
+    newString.textContent = entry["text"];
+
+    var newGroup = document.createElement("li");
+    newGroup.textContent = entry["group"];
+    newGroup.classList.add("group");
+    newGroup.style.color = entry["color"];
+
+    eventList.prepend(newGroup, newString);
+
+    document.title = entry["text"];
+  };
+
+  function postNews() {
+    var xhr = new XMLHttpRequest();
+    xhr.open("POST", "news");
+    xhr.setRequestHeader("Content-Type", "application/json");
+    xhr.send(JSON.stringify({"text": input.value}));
+    input.value = "";
+  }
+  </script>
+</html>

data/sample/koto/koto.rb

@@ -0,0 +1,74 @@
+require 'webrick'
+require 'driq'
+require 'driq/webrick'
+require 'drb'
+require 'digest/md5'
+
+class Koto
+  def initialize(port, drb_url)
+    @src = Driq::EventSource.new
+    @svr = WEBrick::HTTPServer.new(:Port => port)
+
+    @svr.mount_proc('/') do |req, res|
+      on_index(req, res)
+    end
+
+    @svr.mount_proc('/stream') do |req, res|
+      on_stream(req, res)
+    end
+
+    @svr.mount_proc('/news') do |req, res|
+      on_news(req, res)
+    end
+
+    @front = {"src" => @src, 
+              "webrick" => @svr, 
+              "body" => File.read('koto.html')}
+    DRb.start_service(drb_url, @front)
+  end
+
+  def on_index(req, res)
+    res.body = @front["body"]
+  end
+
+  def on_stream(req, res)
+    last_event_id = req["Last-Event-ID"] || 0
+    res.content_type = 'text/event-stream'
+    res.chunked = true
+    res.body = WEBrick::ChunkedStream.new(Driq::EventStream.new(@src, last_event_id))
+  end
+
+  def on_news(req, res)
+    it = make_entry(req)
+    @src.write(it)
+    res.content_type = "text/plain"
+    res.body = "i know";
+  end
+
+  Color = Hash.new do |h, k|
+    md5 = Digest::MD5.new
+    md5 << k.to_s
+    r = 0b01111111 & md5.digest[0].unpack("c").first
+    g = 0b01111111 & md5.digest[1].unpack("c").first
+    b = 0b01111111 & md5.digest[2].unpack("c").first
+    h[k] = sprintf("#%02x%02x%02x", r, g, b)
+  end
+
+  def make_entry(req)
+    text = JSON.parse(req.body)["text"] || ""
+    from = req["X-Forwarded-For"] || req.peeraddr[2]
+    color = Color[from]
+    group = [from, Time.now.strftime("%H:%M")].join(" @ ")
+    {"text" => text, "group" => group, "color" => color}
+  end
+
+  def start
+    @svr.start
+  end
+end
+
+port = Integer(ENV['TOFU_PORT']) rescue 10510
+drb_url = 'druby://localhost:55443'
+
+koto = Koto.new(port, drb_url)
+koto.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: driq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Masatoshi SEKI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -75,12 +75,19 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - driq.gemspec
 - lib/driq.rb
 - lib/driq/version.rb
 - lib/driq/webrick.rb
+- sample/co2/co2-service.sh
+- sample/co2/co2.html
+- sample/co2/co2.rb
+- sample/co2/co2.service
+- sample/koto/koto.html
+- sample/koto/koto.rb
 homepage: https://github.com/seki/Driq
 licenses: []
 metadata: {}
@@ -99,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: simple rd-stream