@goodandready/dsh-cron 0.3.17 → 0.3.19

package/lib/secrets.js

@@ -147,6 +147,7 @@ export function parseCredentialUri(value) {
  */
 export async function resolveCredentialReference(uri, ctx) {
   if (typeof uri !== 'string') return uri;
+  if (!isCredentialUri(uri)) return uri;
   const parsed = parseCredentialUri(uri);
   if (!parsed) return uri;
 

package/lib/store.js

@@ -213,12 +213,45 @@ export class TaskStore {
    * Asynchronously serialize and write tasks store to disk using fs.promises queue (#244, #301, #303).
    * Safe mode 0600 on files and 0700 on dir (#222).
    */
+  /**
+   * Wait until diskVersion or lastSyncVersion is at least the target version (#372).
+   */
+  _waitForDiskVersion(version) {
+    if ((this._diskVersion || 0) >= version || (this._lastSyncVersion || 0) >= version) {
+      return Promise.resolve();
+    }
+    return new Promise((resolve, reject) => {
+      if (!this._diskWaiters) this._diskWaiters = [];
+      this._diskWaiters.push({ version, resolve, reject });
+    });
+  }
+
+  _notifyDiskVersion(writtenVersion, err = null) {
+    if (!this._diskWaiters || this._diskWaiters.length === 0) return;
+    const remaining = [];
+    for (const waiter of this._diskWaiters) {
+      if (err) {
+        waiter.reject(err);
+      } else if ((this._diskVersion || 0) >= waiter.version || (this._lastSyncVersion || 0) >= waiter.version) {
+        waiter.resolve();
+      } else {
+        remaining.push(waiter);
+      }
+    }
+    this._diskWaiters = remaining;
+  }
+
   async saveAsync() {
+    if (this._saveTimer) {
+      clearTimeout(this._saveTimer);
+      this._saveTimer = null;
+    }
     const version = ++this._saveVersion;
     const data = this._createSnapshot();
 
     const writeOp = async () => {
       if ((this._diskVersion || 0) >= version || (this._lastSyncVersion || 0) >= version) {
+        this._notifyDiskVersion(version);
         return;
       }
       const dir = path.dirname(this.filePath);
@@ -238,12 +271,14 @@ export class TaskStore {
       } catch (writeErr) {
         await fs.promises.unlink(tmp).catch(() => {});
         if (this._currentAsyncTmp === tmp) this._currentAsyncTmp = null;
+        this._notifyDiskVersion(null, writeErr);
         throw writeErr;
       }
 
       if ((this._diskVersion || 0) >= version || (this._lastSyncVersion || 0) >= version || this._saveVersion > version) {
         await fs.promises.unlink(tmp).catch(() => {});
         if (this._currentAsyncTmp === tmp) this._currentAsyncTmp = null;
+        // Do not notify waiters yet: a newer queued saveOp will write to disk and notify (#372)
         return;
       }
 
@@ -251,14 +286,17 @@ export class TaskStore {
         await fs.promises.rename(tmp, this.filePath);
         bestEffort('chmod-store', () => fs.chmodSync(this.filePath, 0o600));
         this._currentAsyncTmp = null;
-        this._diskVersion = version;
-        this._lastWrittenVersion = version;
+        this._diskVersion = Math.max(this._diskVersion || 0, version);
+        this._lastWrittenVersion = this._diskVersion;
+        this._notifyDiskVersion(this._diskVersion);
       } catch (err) {
         this._currentAsyncTmp = null;
         // If tmp was unlinked by newer sync save, rename will fail with ENOENT - safely ignore only in that case (#244)
         if (err.code === 'ENOENT' && (this._lastSyncVersion || 0) >= version) {
+          this._notifyDiskVersion(version);
           return;
         }
+        this._notifyDiskVersion(null, err);
         throw err;
       }
 
@@ -276,7 +314,8 @@ export class TaskStore {
     };
 
     this._savePromise = this._savePromise.then(writeOp, writeOp);
-    return this._savePromise;
+    await this._savePromise;
+    await this._waitForDiskVersion(version);
   }
 
   /**
@@ -410,6 +449,7 @@ export class TaskStore {
       bestEffort('chmod-store', () => fs.chmodSync(this.filePath, 0o600));
       this._diskVersion = Math.max(this._diskVersion || 0, version);
       this._lastWrittenVersion = this._diskVersion;
+      this._notifyDiskVersion(this._diskVersion);
 
       // Throttled backup (.bak): avoid expensive copyFileSync on every micro-save
       const now = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
   "type": "module",
   "main": "lib/index.js",
@@ -12,12 +12,14 @@
   },
   "files": [
     "lib/*.js",
+    "lib/client.css",
     "cordis.patch.yml",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "lib/locales.json"
   ],
   "scripts": {
-    "test": "node --test test/*.test.mjs",
+    "test": "node --test test/*.test.mjs && node scripts/check-pack-size.mjs",
     "build:client": "node scripts/build-client.mjs",
     "pretest": "node scripts/build-client.mjs",
     "preflight": "node scripts/ci-preflight.mjs"
@@ -89,5 +91,14 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"
+  },
+  "devDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-agent": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
+    "@deepseek-ai/dsh-llm": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
+    "@deepseek-ai/dsh-session": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
+    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
+    "@deepseek-ai/dsh-tools": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
+    "@deepseek-ai/schemastery": "^3.18.1"
   }
 }