open-in-editor-bridge 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b59090b703a55c7194b9898ffc6753cda0df2a3e3b1d1d311c1cd0dcd0fa57d9
-  data.tar.gz: d57211d78ebeb9048b963a853621ba575825115c45fdd2a651d75961b2062ee6
+  metadata.gz: 0ec2cde5e04f7296d806dcfeff4926492de642d4b09983478295b3bc45a68f08
+  data.tar.gz: 60e87f9f41f6207bd75bb58fce1c0daa4118af0b3bbbd4cb64030eedd83a3f56
 SHA512:
-  metadata.gz: 86eccd454213ccc64074b85d2eb4a91ddfaec7bb879c0e7e7da0dc53a924ab9d926658d6ece2600ce699e2f5f46b97565d4bd17f1b9dd6358f15fc9bfca78224
-  data.tar.gz: 4be766b7b327ee39aa94f763979ab93b46a9a6c226774a80e3773c303f7f24d58870c6700e2685fc1399afcd8ee8424bfc47f976fffc99f25fb121f40ffb280b
+  metadata.gz: 8e767cca6409335c11dee8e522f1ba6b04e973ec638bad090a089ac2e998544ac347287805f4475a9739cd61448d6dbe3cd13577a95dde1733b4def30b040959
+  data.tar.gz: 5b48df59f4d402e62c3cff453ba6523b4c775c4744c00c48324f0cbb145f258a8d97bae825542fd2b44967614c9dfa880955793a5356545107a5a646c4c7e6b8

data/lib/open_in_editor_bridge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class OpenInEditorBridge
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/open_in_editor_bridge.rb

@@ -98,7 +98,7 @@ class OpenInEditorBridge
   end
 
   def shutdown
-    pid = running_pid
+    pid = running_pid(validate_health: true)
     return unless pid
 
     Process.kill("TERM", -pid)
@@ -253,7 +253,7 @@ class OpenInEditorBridge
   def respond_to_get_request(socket, path, params)
     case path
     when HEALTH_PATH
-      write_json_response(socket, payload: { ok: true })
+      write_json_response(socket, payload: { ok: true, pid: Process.pid })
     when OPEN_IN_EDITOR_PATH
       open_in_editor(socket, params)
     else
@@ -281,7 +281,7 @@ class OpenInEditorBridge
     return nil unless File.exist?(config[:pid_file])
 
     pid = Integer(File.read(config[:pid_file]).strip)
-    return pid if process_running?(pid) && (!validate_health || bridge_healthy?)
+    return pid if process_running?(pid) && (!validate_health || bridge_healthy?(expected_pid: pid))
 
     delete_pid_file
     nil
@@ -301,7 +301,7 @@ class OpenInEditorBridge
     deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + config[:startup_timeout]
     loop do
       raise StartupError, "Editor bridge failed to start. See #{config[:log_file]}." unless process_running?(pid)
-      return if bridge_healthy?
+      return if bridge_healthy?(expected_pid: pid)
 
       raise StartupError, "Editor bridge did not become ready." if Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline
       sleep 0.05
@@ -317,16 +317,18 @@ class OpenInEditorBridge
     end
   end
 
-  def bridge_healthy?
+  def bridge_healthy?(expected_pid: nil)
     socket = TCPSocket.new("127.0.0.1", config[:port])
     response = Timeout.timeout(0.25) do
       socket.write("GET /health HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: close\r\n\r\n")
       socket.read
     end
     headers, body = response.split("\r\n\r\n", 2)
+    payload = JSON.parse(body.to_s)
     headers&.start_with?("HTTP/1.1 200 ") &&
       headers.lines.any? { |line| line.casecmp("X-Open-In-Editor-Bridge: 1\r\n").zero? } &&
-      JSON.parse(body.to_s).fetch("ok") == true
+      payload.fetch("ok") == true &&
+      (expected_pid.nil? || payload.fetch("pid") == expected_pid)
   rescue Errno::ECONNREFUSED, JSON::ParserError, KeyError, Timeout::Error
     false
   ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open-in-editor-bridge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marlen Brunner