browser_app_base 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf40fc8ffcf491a1fba31012f2e8e3aba1089dc14a8de381f420b33a51d2ca3a
-  data.tar.gz: 3279233418b767f81a01350e5eb27f102f84f7b2c791d784ca0d25f8c58508c7
+  metadata.gz: d8f803f44d98065ce973ec89c418d7d9d8fb75ce8c1f6dc74f8e449681a3a0f5
+  data.tar.gz: 0bf164a5280e040b5efa5fe0221ae17f19d77b4569c3c4db5e4893d19a5e0efb
 SHA512:
-  metadata.gz: d264ee2f1c8d9aed28ea36c523c400d445570fd219271eece7135655831bb02d75c1ad5e4b77eda4fbba7fdeb32ebc7986765c43cc9702e4b8a32ee1351bf199
-  data.tar.gz: 063d377c14dca4341cf963788c3de83a6bc7a6e6ddb93c5abc0bba06f40aa1cbb01596e19b95640ca7a99c11d5b996e1226c73326d9a95305351510dfb5e1a50
+  metadata.gz: 881fd8551b75678a1825a1cb227918f22ce9e6db9377e940bd7b25d04d7827d491c4f42c0c4da372607666533ada91239fb4f79f3792b3252dedf3c589424de4
+  data.tar.gz: 1c630a5c7affe753747bc2aee0789b384249676f6a90a036fce54471084e0bf471c2c88bdd701e13851f5f7d33f53e8360a52e6898a29bc09e9f045183791b9d

data/.vscode/launch.json

@@ -5,10 +5,16 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Debug Local File",
+            "name": "Debug create_browser_app.rb",
             "type": "Ruby",
             "request": "launch",
-            "cwd": "${workspaceRoot}/lib/template/",
+            "program": "${workspaceRoot}/bin/create_browser_app.rb"
+        },
+        {
+            "name": "Debug start.rb",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}/lib/template",
             "program": "${workspaceRoot}/lib/template/start.rb"
         }
     ]

data/README.md

@@ -73,6 +73,34 @@ ui application sample
 }
 ```
 
+## Send a message from your browser application to your ruby application
+
+Use the send_message function
+
+main.js sample
+```javascript
+$("#exec").click(function () {
+    send_message("exec:" + $("#upFile").val());
+});
+
+```
+
+## Send a message from the ruby application to the browser application
+
+Use the app_send function
+
+my_app_sample.rb sample
+```ruby
+class MyApp < AppMainBase
+  def start(argv)
+    # popup message
+    app_send("popup:message string")
+
+    # log message
+    yield "log message"
+    end
+end
+```
 
 ## Development
 

data/lib/browser_app_base/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrowserAppBase
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/template/config/setting.json

@@ -1,50 +1,50 @@
-[
-  {
-    "name": "name1",
-    "value": "value1",
-    "type": "input",
-    "select": "",
-    "description": "設定項目1"
-  },
-  {
-    "name": "name2",
-    "value": true,
-    "type": "checkbox",
-    "select": "",
-    "description": "有効にする場合はチェック"
-  },
-  {
-    "name": "name3",
-    "value": "1",
-    "type": "select",
-    "select": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5"
-    ],
-    "description": "選択項目"
-  },
-  {
-    "name": "name4",
-    "value": "value4",
-    "type": "input",
-    "select": "",
-    "description": "設定項目4"
-  },
-  {
-    "name": "name5",
-    "value": "value5",
-    "type": "input",
-    "select": "",
-    "description": "設定項目5"
-  },
-  {
-    "name": "name6",
-    "value": "value6",
-    "type": "input",
-    "select": "",
-    "description": "設定項目6"
-  }
-]
+[
+    {
+        "name": "name1",
+        "value": "value1",
+        "type": "input",
+        "select": "",
+        "description": "設定項目1"
+    },
+    {
+        "name": "name2",
+        "value": true,
+        "type": "checkbox",
+        "select": "",
+        "description": "有効にする場合はチェック"
+    },
+    {
+        "name": "name3",
+        "value": "1",
+        "type": "select",
+        "select": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5"
+        ],
+        "description": "選択項目"
+    },
+    {
+        "name": "name4",
+        "value": "value4",
+        "type": "input",
+        "select": "",
+        "description": "設定項目4"
+    },
+    {
+        "name": "name5",
+        "value": "value5",
+        "type": "input",
+        "select": "",
+        "description": "設定項目5"
+    },
+    {
+        "name": "name6",
+        "value": "value6",
+        "type": "input",
+        "select": "",
+        "description": "設定項目6"
+    }
+]

data/lib/template/config.ru

@@ -30,6 +30,21 @@ get "/config/*.*" do |file, ext|
   File.read "config/#{file}.#{ext}"
 end
 
+post "/history/*.*" do |file, ext|
+  content_type "text/json", :charset => "utf-8"
+  puts "#{file}.#{ext}"
+  p = params[:param1]
+  buf = File.read "history/#{file}.#{ext}"
+  data = eval(buf)
+  if data != nil
+    if p != ""
+      JSON.generate data.find_all { |d| d =~ Regexp.new(p) }
+    else
+      JSON.generate data
+    end
+  end
+end
+
 get "/open_dialog" do
   dialog_html = <<'EOS'
   <!DOCTYPE html>
@@ -74,6 +89,6 @@ configure do
 
 end
 
-#\ --port 53492
+#\ --port 61047
 
 run Sinatra::Application

data/lib/template/css/index.css

@@ -1,6 +1,6 @@
 body {
     color: #000000;
-	background-color: #cac3ec4f;
+    background-color: #cac3ec4f;
     overflow: hidden;
     font-size: 12px;
 }
@@ -8,9 +8,12 @@ body {
 hr {
     color: #ffffff;
     background-color: #000000;
-    height: 1px; /* 線の太さ */
-    border: 1px; /* 枠の太さ */
-    border-style: solid; /* 枠の種類 */
+    height: 1px;
+    /* 線の太さ */
+    border: 1px;
+    /* 枠の太さ */
+    border-style: solid;
+    /* 枠の種類 */
 }
 
 .error {
@@ -19,7 +22,7 @@ hr {
 
 .outarea {
     background-color: #FFFFFF;
-    margin: 5px; 
+    margin: 5px;
     padding: 5px;
     width: 95vw;
     height: 50vh;
@@ -28,15 +31,15 @@ hr {
 
 .inarea {
     border: thin solid #000000;
-    margin: 5px; 
+    margin: 5px;
     padding: 5px;
     width: 95%;
 }
 
 input.long {
     width: 90%;
-	background-color: #FAFAFA;
-    margin: 5px; 
+    background-color: #FAFAFA;
+    margin: 5px;
     padding: 5px;
 }
 
@@ -64,11 +67,11 @@ textarea.long {
 }
 
 .ui-dialog {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: .2em;
+    outline: 0;
 }
 
 .long {
@@ -77,28 +80,36 @@ textarea.long {
 
 #setting_dialog {
     color: #796fe9;
-	background-color: #000000;
+    background-color: #000000;
 }
 
 .setting_name {
     width: 200px;
     color: #796fe9;
-	background-color: #000000;
+    background-color: #000000;
 }
 
 .setting_value {
     width: 300px;
     color: #796fe9;
-	background-color: #000000;
+    background-color: #000000;
 }
 
 .setting_checkbox {
     color: #796fe9;
-	background-color: #000000;
+    background-color: #000000;
 }
 
 ul.log {
-    list-style-type: decimal;   
+    list-style-type: decimal;
     font-size: 12px;
     color: #5d0a94;
+}
+
+input[type="search"] {
+    -webkit-appearance: searchfield;
+}
+
+input[type="search"]::-webkit-search-cancel-button {
+    -webkit-appearance: searchfield-cancel-button;
 }

data/lib/template/index.html

@@ -11,15 +11,15 @@
   <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
   <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
 
-  <script src="http://localhost:53492/js/main.js"></script>
-  <link rel="stylesheet" href="http://localhost:53492/css/index.css" type="text/css">
+  <script src="http://localhost:61047/js/main.js"></script>
+  <link rel="stylesheet" href="http://localhost:61047/css/index.css" type="text/css">
 </head>
 
 <body>
   <div id="msg_dialog" style="display:none;">
     <div id="msg_text">message</div>
   </div>
-  <h4>GrepFind</h4>
+  <h4>RubyAppBase</h4>
   <hr>
   <table>
     <tr>
@@ -43,7 +43,7 @@
   </div>
   <table>
     <tr>
-      <td class="long"><input class="inarea" type="text" id="upFile" name="upFile"></td>
+      <td class="long"><input class="inarea" type="search" id="upFile" name="upFile"></td>
       <td><input type="button" id="select_file" value="ファイル選択" /></td>
     </tr>
   </table>
@@ -53,7 +53,7 @@
   </div>
   <table>
     <tr>
-      <td class="long"><input class="inarea" type="text" id="upDir" name="upDir"></td>
+      <td class="long"><input class="inarea" type="search" id="upDir" name="upDir"></td>
       <td><input type="button" id="select_dir" value="フォルダ選択" /></td>
     </tr>
   </table>

data/lib/template/js/main.js

@@ -58,13 +58,15 @@ function server_connect(url) {
 
         if (evt.data.match(/^startup:/)) {
             file_name = evt.data.replace(/^startup:/, "");
-            //alert(file_name);
         }
         else if (evt.data.match(/^app_end:normal/)) {
             open_dialog("終了しました");
         }
         else if (evt.data.match(/^app_end:error/)) {
             open_dialog("<font color='red'>エラーが発生しました</font>");
+        }
+        else if (evt.data.match(/^popup:/)) {
+            open_dialog(evt.data.replace(/^popup:/, ""));
         } else {
             var log = "<li>" + evt.data + "</li>";
             $('#log').append(log);
@@ -101,7 +103,7 @@ function autocomp(id, file_kind) {
         },
         source: function (req, resp) {
             $.ajax({
-                url: "http://localhost:53492/search?path=" + $("#" + id).val() + "&kind=" + file_kind,
+                url: "http://localhost:61047/search?path=" + $("#" + id).val() + "&kind=" + file_kind,
                 type: "GET",
                 cache: false,
                 dataType: "json",
@@ -123,6 +125,38 @@ function autocomp(id, file_kind) {
     });
 }
 
+function autocomp_history(id, file_name) {
+    $("#" + id).autocomplete({
+        autoFocus: true,
+        minLength: 0,
+        delay: 0,
+        select: function (event, ui) {
+            jQuery("#" + id).val(ui.item.value);
+            $(this).keydown();
+        },
+        source: function (req, resp) {
+            $.ajax({
+                url: "http://localhost:61047/history/" + file_name,
+                type: "POST",
+                cache: false,
+                dataType: "json",
+                data: {
+                    param1: req.term
+                },
+                success: function (o) {
+                    resp(o);
+                },
+                error: function (xhr, ts, err) {
+                    resp(['']);
+                }
+            });
+
+        }
+    }).focus(function () {
+        $(this).keydown();
+    });
+}
+
 function select_file_dialog(search_id, file_kind, dialog_id, select_file, file_name) {
     $("#" + select_file).click(function () {
         autocomp(search_id, file_kind);
@@ -276,20 +310,25 @@ function openFile(file) {
 
 // 起動時の処理
 $(document).ready(function () {
-    // サーバに接続
-    server_connect("ws://localhost:53492/wsserver")
+
+    window.onload = function (e) {
+        console.log("onload");
+        // サーバに接続
+        server_connect("ws://localhost:61047/wsserver")
+    }
+
     // ウインドウサイズ
     var width = 800;
     var height = 600;
     $(window).resize(function () {
-        $(".outarea").height($(window).height() - 300);
+        $(".outarea").height($(window).height() - 220);
     });
     // ウインドウの位置
     $(function () {
         window.resizeTo(width, height);
         window.moveTo((window.screen.width / 2) - (width / 2), (screen.height / 2) - (height / 2));
         //window.moveTo(0,0);
-        $(".outarea").height($(window).height() - 300);
+        $(".outarea").height($(window).height() - 220);
     });
 
     $('.outarea').scroll(function () {
@@ -322,5 +361,7 @@ $(document).ready(function () {
 
     setting_dialog("setting", "setting_dialog", "config/setting.json");
 
+    autocomp_history("upFile", "history.json")
+
 });
 

data/lib/template/my_app_sample.rb

@@ -10,8 +10,16 @@ class MyApp < AppMainBase
       argv.each do |v|
         yield v if block_given?
       end
+
+      # Browserにメッセージ送信
+      app_send("popup:start app #{argv[0]}")
+
+      # 履歴の保存
+      add_history("history.json", argv[0])
+
       while true
         yield Time.now.to_s if block_given?
+        puts Time.now.to_s
         yield @config["name1"]
         sleep 1
         break if @abort

data/lib/template/server_app_base.rb

@@ -5,6 +5,17 @@ class AppMainBase
     @aboet = false
     @exec = false
     @suspend = false
+    @ws = nil
+  end
+
+  def app_send(str)
+    if @ws != nil
+      @ws.send(str)
+    end
+  end
+
+  def set_ws(ws)
+    @ws = ws
   end
 
   def set_config(config)
@@ -27,6 +38,21 @@ class AppMainBase
   def resume()
     @suspend = false
   end
+
+  # 履歴の保存
+  def add_history(file, history_data)
+    buf = File.read "history/#{file}"
+    data = eval(buf)
+    if data == nil
+      data = []
+    end
+    if history_data.to_s != ""
+      data.prepend history_data
+    end
+    File.open("history/#{file}", "w") do |f|
+      f.write JSON.pretty_generate data.uniq
+    end
+  end
 end
 
 require "app_load.rb"

data/lib/template/start.rb

@@ -10,6 +10,35 @@ require "kconv"
 require "json"
 require "facter"
 
+# ログ出力
+module Output
+  def self.console_and_file(output_file)
+    defout = File.new(output_file, "a+")
+    class << defout
+      alias_method :write_org, :write
+
+      def puts(str)
+        STDOUT.write(str.to_s + "\n")
+        self.write_org(str.to_s + "\n")
+        self.flush
+      end
+
+      def write(str)
+        STDOUT.write(str)
+        self.write_org(str)
+        self.flush
+      end
+    end
+    $stdout = defout
+  end
+end
+
+Output.console_and_file("log.txt")
+
+# ディレクトリ移動
+dir = File.dirname(File.expand_path(__FILE__))
+FileUtils.cd dir
+
 # 空きポートを取得
 def get_unused_port
   s = TCPServer.open(0)
@@ -37,22 +66,41 @@ buf = File.binread("index.html").toutf8
 buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
 File.binwrite("index.html", buf)
 
-Thread.start {
-  puts "start browser"
-  json_file = File.dirname(File.expand_path(__FILE__)) + "/config/browser.json"
-  json = JSON.parse(File.read json_file)
-  puts json
-  kernel = Facter.value(:kernel)
-  if kernel == "windows"
-    browser = json["chrome_win"]
-  elsif kernel == "Linux"
-    browser = json["chrome_linux"]
-  else
-    browser = json["chrome_win"]
-  end
-  browser += " -app=http://localhost:#{port}"
-  puts browser
-  system browser
-}
+begin
+  Thread.start {
+    puts "wait start web server"
+    while true
+      begin
+        s = TCPSocket.open("localhost", port)
+        s.close
+        break
+      rescue
+        puts $!
+        sleep 0.1
+      end
+    end
 
-Rack::Server.start
+    puts "start browser"
+    json_file = File.dirname(File.expand_path(__FILE__)) + "/config/browser.json"
+    json = JSON.parse(File.read json_file)
+    puts json
+    kernel = Facter.value(:kernel)
+    if kernel == "windows"
+      browser = json["chrome_win"]
+    elsif kernel == "Linux"
+      browser = json["chrome_linux"]
+    else
+      browser = json["chrome_win"]
+    end
+    browser += " -app=http://localhost:#{port}"
+    puts browser
+    system browser
+  }
+
+  # start web server
+  Rack::Server.start
+rescue
+  puts $!
+  puts $@
+  exit
+end

data/lib/template/wsserver.rb

@@ -1,6 +1,7 @@
 require "./server_app_base"
 require "json"
 require "cgi"
+require "thread"
 
 def config_json_hash(json)
   config = {}
@@ -10,8 +11,23 @@ def config_json_hash(json)
   return config
 end
 
+$ws_exit_thread = nil
+
 class WsServer < Sinatra::Base
-  $ws_list = []
+  def initialize
+    super
+    @ws_list = []
+    @ws_lock = Mutex.new
+  end
+
+  def ws_send(str)
+    @ws_lock.synchronize do
+      if @ws_list[0] != nil
+        @ws_list[0].send(str)
+      end
+    end
+  end
+
   json_config = nil
   exec_thread = nil
   get "" do
@@ -20,8 +36,18 @@ class WsServer < Sinatra::Base
     else
       request.websocket do |ws|
         ws.onopen do
-          ws.send("startup:#{$startup_file}")
-          $ws_list << ws
+          puts "ws.open"
+          @ws_lock.synchronize do
+            @ws_list << ws
+            $app.set_ws(ws)
+            pp "ws=#{ws}"
+          end
+          ws_send("startup:#{$startup_file}")
+          puts "ws_exit_thread=#{$ws_exit_thread}"
+          if $ws_exit_thread != nil
+            puts "ws_exit_thread kill"
+            Thread.kill $ws_exit_thread
+          end
         end
         ws.onmessage do |msg|
           puts msg
@@ -34,14 +60,14 @@ class WsServer < Sinatra::Base
               exec_thread = Thread.new {
                 begin
                   $app.start(argv.split(",")) do |out|
-                    ws.send(out)
+                    ws_send(out)
                   end
-                  ws.send("app_end:normal")
+                  ws_send("app_end:normal")
                 rescue
                   puts $!
                   puts $@
                   puts "app_end:err"
-                  ws.send("app_end:error")
+                  ws_send("app_end:error")
                 ensure
                   puts "exit thread"
                   exec_thread = nil
@@ -49,7 +75,7 @@ class WsServer < Sinatra::Base
               }
             else
               puts "app_end:err"
-              ws.send("app_end:error")
+              ws_send("app_end:error")
             end
           end
           if msg =~ /^stop/
@@ -83,23 +109,27 @@ class WsServer < Sinatra::Base
             }
           end
 
+          # アプリケーション終了
           if msg == "exit"
-            unless ENV["OCRA"] == "true"
-              halt
-              #exit
-            end
+            #halt
+            exit
           end
         end
+
+        # close websocket
         ws.onclose do
           puts "websocket closed"
-          $ws_list.delete(ws)
-          puts $ws_list.size
-          if $ws_list.size == 0
-            puts ENV["OCRA"]
-            unless ENV["OCRA"] == "true"
+          @ws_lock.synchronize do
+            @ws_list.delete(ws)
+          end
+          puts @ws_list.size
+          if @ws_list.size == 0
+            $ws_exit_thread = Thread.start {
+              sleep 1
               #halt
               exit
-            end
+            }
+            puts "ws_exit_thread=#{$ws_exit_thread}"
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser_app_base
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - masataka kuwayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -118,6 +118,7 @@ files:
 - lib/template/config/browser.json
 - lib/template/config/setting.json
 - lib/template/css/index.css
+- lib/template/history/history.json
 - lib/template/index.html
 - lib/template/js/main.js
 - lib/template/my_app_sample.rb