@or3/cloud 0.1.34 → 0.1.35

package/assets/compose.yaml

@@ -51,10 +51,13 @@ services:
       # exits only. Operators should run `or3 doctor`/`or3 restart` for a
       # persistent degraded state.
       test:
-        - CMD
-        - /nodejs/bin/node
-        - -e
-        - "fetch('http://127.0.0.1:3000/api/health?deep=true').then(async r=>{const b=await r.json().catch(()=>({}));if(!r.ok||b.status!=='ok')process.exit(1)}).catch(()=>process.exit(1))"
+        - CMD-SHELL
+        - >-
+          if [ -x /nodejs/bin/node ]; then
+            exec /nodejs/bin/node -e "fetch('http://127.0.0.1:3000/api/health?deep=true').then(async r=>{const b=await r.json().catch(()=>({}));if(!r.ok||b.status!=='ok')process.exit(1)}).catch(()=>process.exit(1))";
+          elif [ -x /usr/local/bin/node ]; then
+            exec /usr/local/bin/node -e "fetch('http://127.0.0.1:3000/api/health?deep=true').then(async r=>{const b=await r.json().catch(()=>({}));if(!r.ok||b.status!=='ok')process.exit(1)}).catch(()=>process.exit(1))";
+          else exit 127; fi
       interval: 10s
       timeout: 5s
       retries: 12

package/dist/cli.mjs

@@ -27,7 +27,7 @@ import { dirname, basename, isAbsolute, join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createGunzip } from "node:zlib";
 var execFile = promisify(execFileCallback);
-var PACKAGE_VERSION = "0.1.34";
+var PACKAGE_VERSION = "0.1.35";
 var IMAGE_REPOSITORY = "ghcr.io/saluana/or3-chat";
 var ASSET_ROOT = resolve(fileURLToPath(new URL("../assets/", import.meta.url)));
 var STATE_SCHEMA_VERSION = 1;
@@ -492,11 +492,23 @@ async function assertSafeComposeBinding(directory, mode, env) {
 var HEALTH_SCRIPT = "fetch('http://127.0.0.1:3000/api/health?deep=true').then(async response=>{const body=await response.json().catch(()=>({}));if(!response.ok||body.status!=='ok')process.exit(1)}).catch(()=>process.exit(1))";
 var MAINTENANCE_SCRIPT = "fetch('http://127.0.0.1:3000/api/health?deep=true').then(async response=>{const body=await response.json().catch(()=>({}));const m=body?.providers?.sync?.details?.maintenance;if(m)console.log(JSON.stringify(m))}).catch(()=>{})";
 var CONTAINER_NODE = "/nodejs/bin/node";
+var LEGACY_CONTAINER_NODE = "/usr/local/bin/node";
+var CONTAINER_HEALTH_SHELL = `if [ -x ${CONTAINER_NODE} ]; then exec ${CONTAINER_NODE} -e "$1"; elif [ -x ${LEGACY_CONTAINER_NODE} ]; then exec ${LEGACY_CONTAINER_NODE} -e "$1"; else exit 127; fi`;
 async function waitForDeepHealthWithArgs(composeCommand, directory, secrets = []) {
   const deadline = Date.now() + DEEP_HEALTH_TIMEOUT_MS;
   let lastError = "health check did not complete";
   while (Date.now() < deadline) {
-    const result = await run("docker", [...composeCommand, "exec", "-T", "or3", CONTAINER_NODE, "-e", HEALTH_SCRIPT], directory);
+    const result = await run("docker", [
+      ...composeCommand,
+      "exec",
+      "-T",
+      "or3",
+      "sh",
+      "-c",
+      CONTAINER_HEALTH_SHELL,
+      "or3-health",
+      HEALTH_SCRIPT
+    ], directory);
     if (result.ok)
       return;
     lastError = redact(result.stderr, secrets);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@or3/cloud",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "Install and operate the OR3 Cloud container distribution",
   "type": "module",
   "license": "GPL-3.0",