@threadcrumbs/threadnauts 1.1.0 → 1.2.0

package/dist/index.html

@@ -6,9 +6,9 @@
     <meta name="color-scheme" content="dark" />
     <title>Threadnauts</title>
     <link rel="icon" href="/favicon.svg?app=threadnauts" type="image/svg+xml" />
-    <script type="module" crossorigin src="/assets/index-BSPNlXcc.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/shared-CgqOYNxw.js">
-    <link rel="stylesheet" crossorigin href="/assets/index-DoVfuOrP.css">
+    <script type="module" crossorigin src="/assets/index-C46d6g6p.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/shared-DiTtF988.js">
+    <link rel="stylesheet" crossorigin href="/assets/index-PzTcyxAK.css">
   </head>
   <body>
     <div id="app"><div class="boot"><div class="inner">

package/dist/pro-manifest.json

@@ -1,9 +1,9 @@
 {
   "files": [
     {
-      "path": "assets/pro-Cb7jFyCP.js",
-      "sha256": "83dcd0c67e85a2e5b2d8130f86afda3291e10f34e6727ac5157f2ee4dfc72a4b",
-      "bytes": 188138
+      "path": "assets/pro-lBnPFibL.js",
+      "sha256": "e8e7df01da6e616fb37a60ddc2657b63681cfd34adf8fb37116ecad906845a6e",
+      "bytes": 233030
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threadcrumbs/threadnauts",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "description": "A 3D colony sim where every coding-agent thread on your machine is a little bot building something.",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -49,7 +49,8 @@
     "icons": "node tools/build-world-icons.mjs",
     "site": "node tools/build-site.mjs",
     "test": "node --test \"test/**/*.test.mjs\"",
-    "prepack": "pnpm run build"
+    "prepack": "pnpm run build",
+    "auto-publish": "node ../common/tools/release.mjs"
   },
   "dependencies": {
     "@threadcrumbs/common": "^0.1.0"

package/server/api.mjs

@@ -90,9 +90,26 @@ const emptyState = () => ({
 const asObject = (v) => (v && typeof v === 'object' && !Array.isArray(v) ? v : {})
 const asArray = (v) => (Array.isArray(v) ? v : [])
 
+const BUSY_CODES = new Set(['EPERM', 'EBUSY', 'EACCES'])
+const BUSY_WAITS_MS = [50, 150, 400]
+const BUSY_MESSAGE = 'Another program has colony.json open. Threadnauts will try again.'
+const isBusy = (err) => BUSY_CODES.has(err?.code)
+
+async function whileBusy(operation) {
+  for (const wait of BUSY_WAITS_MS) {
+    try {
+      return await operation()
+    } catch (err) {
+      if (!isBusy(err)) throw err
+      await new Promise((resolve) => setTimeout(resolve, wait))
+    }
+  }
+  return operation()
+}
+
 async function readState() {
   try {
-    const raw = migrate(JSON.parse(await fsp.readFile(STATE_FILE, 'utf8')))
+    const raw = migrate(JSON.parse(await whileBusy(() => fsp.readFile(STATE_FILE, 'utf8'))))
     return {
       version: STATE_VERSION,
       archived: asArray(raw.archived),
@@ -109,7 +126,8 @@ async function readState() {
       settings: raw.settings && typeof raw.settings === 'object' ? raw.settings : null,
       updatedAt: Number(raw.updatedAt) || 0,
     }
-  } catch {
+  } catch (err) {
+    if (isBusy(err)) throw err
     return emptyState()
   }
 }
@@ -154,7 +172,7 @@ async function writeState(next) {
     // colony.json names the repos you work in and where they are: the owner's business, not
     // every account on the machine's. A fresh file per write, so the mode always applies.
     await fsp.writeFile(tmp, JSON.stringify(state, null, 2), { mode: 0o600 })
-    await fsp.rename(tmp, STATE_FILE)
+    await whileBusy(() => fsp.rename(tmp, STATE_FILE))
   } catch (err) {
     await fsp.rm(tmp, { force: true }).catch(() => {})
     throw err
@@ -477,7 +495,7 @@ export async function middleware(req, res, next) {
     if (url.pathname === '/api/state' && req.method === 'PUT') {
       const body = await readJsonBody(req)
       const base = Number(body.baseUpdatedAt) || 0
-      return serialise(async () => {
+      return await serialise(async () => {
         const current = await readState()
         if (base && current.updatedAt !== base) return send(res, 409, current)
         return send(res, 200, await writeState(body))
@@ -535,6 +553,7 @@ export async function middleware(req, res, next) {
 
     return send(res, 404, { error: 'Unknown endpoint' })
   } catch (err) {
+    if (isBusy(err)) return send(res, 503, { error: BUSY_MESSAGE })
     return send(res, 500, { error: String(err && err.message ? err.message : err) })
   }
 }