browser_app_base 0.0.8 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf40fc8ffcf491a1fba31012f2e8e3aba1089dc14a8de381f420b33a51d2ca3a
-  data.tar.gz: 3279233418b767f81a01350e5eb27f102f84f7b2c791d784ca0d25f8c58508c7
+  metadata.gz: 32eb1959381928c1c8be5a8760701706f771df4207232dd7a9047940a6f359a8
+  data.tar.gz: 38edd65c1cd9cbf4efa10a714bf1a0675fc9043642379b4c5b731e211ce3e0ad
 SHA512:
-  metadata.gz: d264ee2f1c8d9aed28ea36c523c400d445570fd219271eece7135655831bb02d75c1ad5e4b77eda4fbba7fdeb32ebc7986765c43cc9702e4b8a32ee1351bf199
-  data.tar.gz: 063d377c14dca4341cf963788c3de83a6bc7a6e6ddb93c5abc0bba06f40aa1cbb01596e19b95640ca7a99c11d5b996e1226c73326d9a95305351510dfb5e1a50
+  metadata.gz: e4aca516b044caa09f15225fb1dc0f3b61c256bb1b36351a1575fc0e6bc4e242e0d9c4f682fbb276250a4d6848e6c30d78490e73b2f78e9df4f82c056d266d37
+  data.tar.gz: 7b5ff83d5c26485836a54d41fbb8e71188147fc65663f4a3bfbd87407d45cf0dd701104c7826cff6116bd0f8f31574c45b412b69555dadcbecc5da3ad19a7977

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

@@ -58,12 +58,13 @@ ui application sample
 
 ## Start application
 
-    $ cd ~/test/
-    $ ruby start.rb
+```shell
+$ /tmp/test/bin/start_my_app.rb
+```
 
 ## browser setting
 
-    config/browser.json
+    ${home}/${app_nane}/config/browser.json
     Set the path for your Windows or Linux Chrome browser
 
 ```json
@@ -73,6 +74,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/bin/start_sample.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+require "fileutils"
+require "facter"
+require "tmpdir"
+
+# tmpdirディレクトリにコピー
+dir = File.dirname(File.expand_path(__FILE__ + "/../"))
+home_dir = ENV["HOME"] + "/" + dir.split("/")[-1]
+puts "home_dir=#{$home_dir}"
+Dir.mktmpdir { |tmpdir|
+  outdir = tmpdir + "/" + dir.split("/")[-1]
+  FileUtils.mkdir_p outdir
+  FileUtils.mkdir_p home_dir
+  puts outdir
+  Dir.glob("#{dir}/lib/*") do |f|
+    if f =~ /config$/
+      # configはhomeにコピー
+      if !File.exists? "#{home_dir}/config"
+        puts "#{f} => #{home_dir}/"
+        FileUtils.cp_r f, "#{home_dir}/"
+      end
+    else
+      puts "#{f} => #{outdir}/"
+      FileUtils.cp_r f, "#{outdir}/"
+    end
+  end
+
+  FileUtils.cd "#{outdir}"
+  kernel = Facter.value(:kernel)
+  if kernel == "windows"
+    system "rubyw ./start.rb"
+  elsif kernel == "Linux"
+    system "ruby ./start.rb"
+  else
+    system "ruby ./start.rb"
+  end
+  FileUtils.cd ENV["HOME"]
+}

data/lib/browser_app_base/version.rb

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

data/lib/browser_app_base.rb

@@ -37,28 +37,33 @@ module BrowserAppBase
     puts "create application base #{dir}"
 
     FileUtils.mkdir_p dir
+    FileUtils.mkdir_p dir + "/lib/"
+    FileUtils.mkdir_p dir + "/bin/"
 
-    path = File.dirname(File.expand_path(__FILE__))
-    Dir.glob("#{path}/template/*") do |f|
-      puts "#{f} => #{dir}"
-      FileUtils.cp_r f, "#{dir}/"
+    path = File.dirname(File.expand_path(__FILE__)) + "/../"
+    Dir.glob("#{path}/lib/template/*") do |f|
+      puts "#{f} => #{dir}/lib"
+      FileUtils.cp_r f, "#{dir}/lib"
     end
 
     if app
       app_file = get_app_file(app)
 
+      puts "#{path}/bin/start_sample.rb #{dir}/bin/start_#{app_file}"
+      FileUtils.cp_r "#{path}/bin/start_sample.rb", "#{dir}/bin/start_#{app_file}"
+
       load_app = <<"EOS"
 require '#{app_file}'
 $app = #{get_app_name(app)}.new
 EOS
 
-      File.open("#{dir}/app_load.rb", "w") do |f|
+      File.open("#{dir}/lib/app_load.rb", "w") do |f|
         f.write load_app
       end
 
       puts "create #{app_file}"
-      new_file = "#{dir}/#{app_file}"
-      FileUtils.cp("#{dir}/my_app_sample.rb", new_file)
+      new_file = "#{dir}/lib/#{app_file}"
+      FileUtils.cp("#{dir}/lib/my_app_sample.rb", new_file)
       buf = File.binread(new_file)
       File.binwrite(new_file, buf.gsub(/MyApp/, get_app_name(app)))
     end

data/lib/template/config/browser.json

@@ -1,4 +1,4 @@
 {
     "chrome_win": "start chrome",
-    "chrome_linux": "/bin/google-chrome"
-}
+    "chrome_linux": "google-chrome"
+}

data/lib/template/config/setting.json

@@ -1,7 +1,7 @@
 [
   {
     "name": "name1",
-    "value": "value1",
+    "value": "value1 2 3 4",
     "type": "input",
     "select": "",
     "description": "設定項目1"
@@ -15,7 +15,7 @@
   },
   {
     "name": "name3",
-    "value": "1",
+    "value": "2",
     "type": "select",
     "select": [
       "1",

data/lib/template/config.ru

@@ -8,8 +8,17 @@ require "json"
 require "./server"
 require "./wsserver"
 
+access_log = File.new("#{$home_dir}/logs/sinatra.log", "a+")
+access_log.sync = true
+use Rack::CommonLogger, access_log
+
 get "/" do
-  File.read("index.html")
+  File.read("html/index.html")
+end
+
+get "*.html" do |file|
+  content_type "text/html", :charset => "utf-8"
+  File.read "./html/#{file}.html"
 end
 
 get "/css/:name.css" do
@@ -27,7 +36,26 @@ end
 get "/config/*.*" do |file, ext|
   content_type "text/json", :charset => "utf-8"
   puts "#{file}.#{ext}"
-  File.read "config/#{file}.#{ext}"
+  File.read "#{$home_dir}/config/#{file}.#{ext}"
+end
+
+post "/history/*.*" do |file, ext|
+  content_type "text/json", :charset => "utf-8"
+  puts "#{file}.#{ext}"
+  p = params[:param1]
+  begin
+    buf = File.read "#{$home_dir}/history/#{file}.#{ext}"
+  rescue
+    buf = ""
+  end
+  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
@@ -65,7 +93,7 @@ end
 
 configure do
   set :DoNotReverseLookup, true
-  set :logging, false
+  set :logging, true
   set :default_encoding, "utf-8"
   set :server, :thin
 
@@ -74,6 +102,6 @@ configure do
 
 end
 
-#\ --port 53492
+#\ --port 58656
 
 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;
 }
 
@@ -63,12 +66,21 @@ textarea.long {
     color: black;
 }
 
+.ui-autocomplete.ui-front {
+    max-height: 250px;
+    overflow-y: auto;
+    /* prevent horizontal scrollbar */
+    overflow-x: hidden;
+    /* add padding to account for vertical scrollbar */
+    z-index: 1000 !important;
+}
+
 .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 +89,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 → html/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:58656/js/main.js"></script>
+  <link rel="stylesheet" href="http://localhost:58656/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>
@@ -39,21 +39,21 @@
   </table>
 
   <div id="dialog1" style="display:none;">
-    <input class="inarea" type="text" name="search_str" id="search_str">
+    <input class="inarea" type="search" name="search_str" id="search_str">
   </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>
 
   <div id="dialog2" style="display:none;">
-    <input class="inarea" type="text" name="search_str2" id="search_str2">
+    <input class="inarea" type="search" name="search_str2" id="search_str2">
   </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

@@ -3,26 +3,35 @@
 var $ws = null;
 var $auto_scroll = true;
 var dialog = null;
+var dialog_timeout = null;
 
-function open_dialog(msg) {
+function open_dialog(msg, timeout = 0) {
     console.log("msg=" + msg);
     $("#msg_text").html(msg);
-    $("#msg_dialog").dialog({
+    d = $("#msg_dialog").dialog({
         modal: true
         , show: "slide"         //表示時のアニメーション
         , hide: "slide"       //閉じた時のアニメーション
         , title: "Message"   //ダイアログのタイトル
-        , width: 400            //ダイアログの横幅
-        , height: 200           //ダイアログの高さ
+        , width: 500            //ダイアログの横幅
+        , height: 300           //ダイアログの高さ
         , resizable: true      //リサイズ可
         , closeOnEscape: false  //[ESC]キーで閉じられなくする
         , draggable: true      //ダイアログの移動を可に
         , buttons: {
             "OK": function () {  //Cancelボタン
+                if (dialog_timeout != null) {
+                    clearTimeout(dialog_timeout);
+                }
                 $(this).dialog("close");
             }
         }
     });
+    if (timeout != 0) {
+        dialog_timeout = setTimeout(function () {
+            d.dialog("close");
+        }, timeout);
+    }
 }
 
 function open_dialog_org(msg) {
@@ -58,13 +67,18 @@ 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:stop/)) {
+            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:/, ""), 3000);
         } else {
             var log = "<li>" + evt.data + "</li>";
             $('#log').append(log);
@@ -101,7 +115,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:58656/search?path=" + $("#" + id).val() + "&kind=" + file_kind,
                 type: "GET",
                 cache: false,
                 dataType: "json",
@@ -123,6 +137,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:58656/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);
@@ -163,7 +209,7 @@ function setting_dialog(open_id, dialog_id, json_file) {
                     if (s[i].type == "input") {
                         var h = "<table><tr>"
                             + "<td class='setting_name'>" + s[i].description + "</td>"
-                            + "<td><input class='setting_value' type='text' " + "id=" + s[i].name + "_value " + "value=" + s[i].value + ">"
+                            + "<td><input class='setting_value' type='text' " + "id=" + s[i].name + "_value " + "value=" + "'" + s[i].value + "'" + ">"
                             + "</td></tr></table>"
                         $("dl#wrap").append(h);
                     } else if (s[i].type == "checkbox") {
@@ -276,20 +322,26 @@ function openFile(file) {
 
 // 起動時の処理
 $(document).ready(function () {
+
     // サーバに接続
-    server_connect("ws://localhost:53492/wsserver")
+    server_connect("ws://localhost:58656/wsserver")
+    window.onload = function (e) {
+        // サーバに接続
+        //server_connect("ws://localhost:58656/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 +374,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,26 @@ class AppMainBase
   def resume()
     @suspend = false
   end
+
+  # 履歴の保存
+  def add_history(file, history_data, max = 10)
+    begin
+      buf = File.read "#{$home_dir}history/#{file}"
+    rescue
+      buf = ""
+    end
+    data = eval(buf)
+    if data == nil
+      data = []
+    end
+    if history_data.to_s != ""
+      data.prepend history_data
+    end
+    data = data.uniq[0..max - 1]
+    File.open("#{$home_dir}history/#{file}", "w") do |f|
+      f.write JSON.pretty_generate data
+    end
+  end
 end
 
 require "app_load.rb"

data/lib/template/start.rb

@@ -10,6 +10,53 @@ require "kconv"
 require "json"
 require "facter"
 
+# ログ出力
+module Output
+  def self.console_and_file(output_file, stdout = true)
+    begin
+      defout = File.new(output_file, "a+")
+    rescue
+      puts $!
+      puts $@
+      return nil
+    end
+    class << defout
+      alias_method :write_org, :write
+
+      def initialize(stdout)
+        @stdout = false
+      end
+
+      attr_accessor :stdout
+
+      def puts(str)
+        STDOUT.write(str.to_s + "\n") if @stdout
+        self.write_org(str.to_s + "\n")
+        self.flush
+      end
+
+      def write(str)
+        STDOUT.write(str) if @stdout
+        self.write_org(str)
+        self.flush
+      end
+    end
+    $stdout = defout
+    $stdout.stdout = stdout
+  end
+end
+
+# ディレクトリ移動
+dir = File.dirname(File.expand_path(__FILE__))
+FileUtils.cd dir
+
+# ディレクトリ作成
+$home_dir = ENV["HOME"] + "/" + dir.split("/")[-1] + "/"
+puts "home_dir=#{$home_dir}"
+FileUtils.mkdir_p("#{$home_dir}/logs")
+FileUtils.mkdir_p("#{$home_dir}/history")
+Output.console_and_file("#{$home_dir}/logs/app.log", true)
+
 # 空きポートを取得
 def get_unused_port
   s = TCPServer.open(0)
@@ -33,26 +80,45 @@ buf.gsub!(/localhost:[0-9]+\//, "localhost:#{port}/")
 File.binwrite("js/main.js", buf)
 
 # index.htaの編集
-buf = File.binread("index.html").toutf8
+buf = File.binread("html/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
-}
+File.binwrite("html/index.html", buf)
 
-Rack::Server.start
+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
+
+    puts "start browser"
+    json_file = "#{$home_dir}/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,28 +36,38 @@ 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
+          json = JSON.parse(File.read("#{$home_dir}/config/setting.json"))
+          json_config = config_json_hash(json)
+          $app.set_config(json_config)
           if msg =~ /^exec:/
             if exec_thread == nil
-              json = JSON.parse(File.read("config/setting.json"))
-              json_config = config_json_hash(json)
-              $app.set_config(json_config)
               argv = msg.gsub(/^exec:/, "")
               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,11 +75,13 @@ class WsServer < Sinatra::Base
               }
             else
               puts "app_end:err"
-              ws.send("app_end:error")
+              ws_send("app_end:error")
             end
           end
           if msg =~ /^stop/
             if exec_thread
+              Thread.kill exec_thread
+              ws_send("app_end:stop")
               $app.stop
             end
           end
@@ -70,7 +98,7 @@ class WsServer < Sinatra::Base
           if msg =~ /^setting:/
             json_string = msg.gsub(/^setting:/, "")
             json = JSON.parse(json_string)
-            File.open("config/setting.json", "w") do |w|
+            File.open("#{$home_dir}/config/setting.json", "w") do |w|
               w.puts JSON.pretty_generate(json)
             end
             json_config = config_json_hash(json)
@@ -83,23 +111,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.1.2
 platform: ruby
 authors:
 - masataka kuwayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -99,6 +99,7 @@ email:
 - masataka.kuwayama@gmail.com
 executables:
 - create_browser_app.rb
+- start_sample.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -110,6 +111,7 @@ files:
 - README.md
 - Rakefile
 - bin/create_browser_app.rb
+- bin/start_sample.rb
 - browser_app_base.gemspec
 - lib/browser_app_base.rb
 - lib/browser_app_base/version.rb
@@ -118,7 +120,9 @@ files:
 - lib/template/config/browser.json
 - lib/template/config/setting.json
 - lib/template/css/index.css
-- lib/template/index.html
+- lib/template/history/history.json
+- lib/template/html/index.html
+- lib/template/html/test.html
 - lib/template/js/main.js
 - lib/template/my_app_sample.rb
 - lib/template/server.rb