browser_app_base 0.1.8 → 0.2.0

data/lib/template/wsserver.rb

@@ -1,4 +1,6 @@
-require "./server_app_base"
+$LOAD_PATH << File.dirname(File.expand_path(__FILE__))
+
+require "server_app_base"
 require "json"
 require "cgi"
 require "thread"
@@ -18,6 +20,8 @@ class WsServer < Sinatra::Base
     super
     @ws_list = []
     @ws_lock = Mutex.new
+    @json_config = nil
+    @exec_thread = nil
   end
 
   def ws_send(str)
@@ -28,8 +32,8 @@ class WsServer < Sinatra::Base
     end
   end
 
-  json_config = nil
-  exec_thread = nil
+  public :ws_send
+
   get "" do
     if !request.websocket?
       "no supported"
@@ -47,17 +51,24 @@ class WsServer < Sinatra::Base
           if $ws_exit_thread != nil
             puts "ws_exit_thread kill"
             Thread.kill $ws_exit_thread
+            $ws_exit_thread = nil
           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)
+          begin
+            json = JSON.parse(File.read("#{$home_dir}/config/setting.json"))
+            @json_config = config_json_hash(json)
+            $app.set_config(@json_config)
+          rescue
+            puts "Failed to load config/setting.json"
+            @json_config = {}
+          end
+
           if msg =~ /^exec:/
-            if exec_thread == nil
+            if @exec_thread == nil
               argv = msg.gsub(/^exec:/, "")
-              exec_thread = Thread.new {
+              @exec_thread = Thread.new {
                 begin
                   $app.start(argv.split(",")) do |out|
                     ws_send(out)
@@ -70,7 +81,7 @@ class WsServer < Sinatra::Base
                   ws_send("app_end:error")
                 ensure
                   puts "exit thread"
-                  exec_thread = nil
+                  @exec_thread = nil
                 end
               }
             else
@@ -79,19 +90,20 @@ class WsServer < Sinatra::Base
             end
           end
           if msg =~ /^stop/
-            if exec_thread
-              Thread.kill exec_thread
+            if @exec_thread
+              Thread.kill @exec_thread
               ws_send("app_end:stop")
               $app.stop
+              @exec_thread = nil
             end
           end
           if msg =~ /^suspend/
-            if exec_thread
+            if @exec_thread
               $app.suspend
             end
           end
           if msg =~ /^resume/
-            if exec_thread
+            if @exec_thread
               $app.resume
             end
           end
@@ -102,8 +114,8 @@ class WsServer < Sinatra::Base
               File.open("#{$home_dir}/config/setting.json", "w") do |w|
                 w.puts JSON.pretty_generate(json)
               end
-              json_config = config_json_hash(json)
-              $app.set_config(json_config)
+              @json_config = config_json_hash(json)
+              $app.set_config(@json_config)
             rescue
               # jsonファイルではない
               ws_send("app_end:error")
@@ -112,7 +124,11 @@ class WsServer < Sinatra::Base
           if msg =~ /^openfile:/
             file = msg.gsub(/^openfile:/, "")
             Thread.new {
-              system "#{json_config["editor"]} #{CGI.unescapeHTML(file)}"
+              if @json_config && @json_config["editor"]
+                system "#{@json_config["editor"]} #{CGI.unescapeHTML(file)}"
+              else
+                puts "Editor not set in config"
+              end
             }
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser_app_base
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - masataka kuwayama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-11 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: browser application template
 email:
 - masataka.kuwayama@gmail.com
@@ -119,13 +105,13 @@ files:
 - lib/browser_app_base.rb
 - lib/browser_app_base/version.rb
 - lib/template/app_load.rb
+- lib/template/common.rb
 - lib/template/config.ru
 - lib/template/config/browser.json
 - lib/template/config/setting.json
 - lib/template/css/index.css
 - 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