@harperfast/harper 5.2.4 → 5.2.6

package/studio/web/assets/{useEntityRestURL-alqAn3dT.js → useEntityRestURL-qfahJnvr.js}

@@ -1 +1 @@
-import{n as e}from"./authStore-B3IhXrn6.js";import{k as t,z as n}from"./vendor-tanstack-FsM5XZNE.js";import{a as r}from"./pollUnlessForbidden-DIDXGBc5.js";import{nn as i}from"./index-DF1fSnXV.js";function a(e){return new URL(e.match(/^https?:\/\//i)?e:`https://${e}`).toString()}function o(e){if(e?.domains){for(let t of e.domains)if(t.domain)return a(t.domain)}return e?.fqdn?a(e.fqdn):null}function s(){let{clusterId:a,instanceId:s}=t({strict:!1}),c=r(),{data:l}=n(i(a));return a&&e.checkForFabricConnect(a)||s&&e.checkForFabricConnect(s)||l&&!s?o(l):c.defaults.baseURL?c.defaults.baseURL.replace(/:9925\/?/,``):null}export{s as t};
+import{n as e}from"./authStore-B3IhXrn6.js";import{k as t,z as n}from"./vendor-tanstack-FsM5XZNE.js";import{a as r}from"./pollUnlessForbidden-DIDXGBc5.js";import{nn as i}from"./index-BQB9R8Ug.js";function a(e){return new URL(e.match(/^https?:\/\//i)?e:`https://${e}`).toString()}function o(e){if(e?.domains){for(let t of e.domains)if(t.domain)return a(t.domain)}return e?.fqdn?a(e.fqdn):null}function s(){let{clusterId:a,instanceId:s}=t({strict:!1}),c=r(),{data:l}=n(i(a));return a&&e.checkForFabricConnect(a)||s&&e.checkForFabricConnect(s)||l&&!s?o(l):c.defaults.baseURL?c.defaults.baseURL.replace(/:9925\/?/,``):null}export{s as t};

package/studio/web/index.html

@@ -21,7 +21,7 @@
 			} catch (e) {}
 		})();
     </script>
-    <script type="module" crossorigin src="/assets/index-DF1fSnXV.js"></script>
+    <script type="module" crossorigin src="/assets/index-BQB9R8Ug.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-B0Z9INg1.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-core-CddkYGh5.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-datadog-XDrpA25D.js">

package/utility/processManagement/processManagement.js

@@ -10,6 +10,8 @@ const path = require('node:path');
 const { setTimeout: delay } = require('node:timers/promises');
 const { execFile, fork } = require('node:child_process');
 
+const INIT_PROCESS_NAMES = new Set(['catatonit', 'docker-init', 'dumb-init', 'init', 's6-svscan', 'systemd', 'tini']);
+
 module.exports = {
 	start,
 	restart,
@@ -119,13 +121,27 @@ function getHdbPid() {
 	if (!harperPath) return;
 	const pidFile = path.join(harperPath, hdbTerms.HDB_PID_FILE);
 	const hdbPid = readPidFile(pidFile);
-	// If the pid file doesn't exist or the pid is the same as the current process, return.
-	// In a Docker container, the pid is usually 1, and so if a previous process crashed, there will still
-	// be a pid file with 1, even though this process is also 1 (and is running, but is not another harper process).
 	if (!hdbPid || hdbPid === process.pid) return;
+	// A persistent volume from an older image may contain PID 1 after the current image puts an init at that PID.
+	if (hdbPid === 1 && isInitProcess(hdbPid)) return;
 	if (isProcessRunning(hdbPid)) return hdbPid;
 	// return undefined
 }
+
+function isInitProcess(pid) {
+	try {
+		const executable = path.basename(fs.readlinkSync(`/proc/${pid}/exe`)).replace(/ \(deleted\)$/, '');
+		if (INIT_PROCESS_NAMES.has(executable)) return true;
+	} catch {
+		// Some procfs configurations expose the process name but restrict the executable symlink.
+	}
+	try {
+		return INIT_PROCESS_NAMES.has(fs.readFileSync(`/proc/${pid}/comm`, 'utf8').trim());
+	} catch {
+		// Fail closed: an unidentified live PID still blocks a second Harper process.
+		return false;
+	}
+}
 function kill() {
 	for (let process of childProcesses) {
 		process.kill();