@goodandready/dsh-cron 0.2.43 → 0.2.45

package/lib/client.js

@@ -1441,14 +1441,23 @@ window.__ModuleLoader__.load({
 
         let timerId = null;
         let isDestroyed = false;
+        let pollController = null;
+        const currentGen = fetchGenRef.current;
 
         const doPoll = () => {
-          if (isDestroyed) return;
+          if (isDestroyed || currentGen !== fetchGenRef.current) return;
           const headers = {};
           if (lastEtagRef.current) headers['If-None-Match'] = lastEtagRef.current;
 
-          fetch('/dsh-cron/tasks?status=' + encodeURIComponent(tab) + '&query=' + encodeURIComponent(query), { headers })
+          if (pollController) pollController.abort();
+          pollController = (typeof AbortController !== 'undefined') ? new AbortController() : null;
+
+          const fetchOpts = { headers };
+          if (pollController) fetchOpts.signal = pollController.signal;
+
+          fetch('/dsh-cron/tasks?status=' + encodeURIComponent(tab) + '&query=' + encodeURIComponent(query), fetchOpts)
             .then(res => {
+              if (isDestroyed || currentGen !== fetchGenRef.current) return null;
               if (res.status === 304) {
                 // Not modified: skip parsing JSON
                 return null;
@@ -1458,15 +1467,18 @@ window.__ModuleLoader__.load({
               return res.json();
             })
             .then(data => {
+              if (isDestroyed || currentGen !== fetchGenRef.current) return;
               if (data && data.ok) {
                 setTasks(data.tasks || []);
                 setRecs(data.recommendations || []);
                 setStats(data.stats || null);
               }
             })
-            .catch(() => {})
+            .catch(err => {
+              if (err && err.name === 'AbortError') return;
+            })
             .finally(() => {
-              if (isDestroyed) return;
+              if (isDestroyed || currentGen !== fetchGenRef.current) return;
               // Adaptive interval: 30s when tab is hidden, 8s when active (#134)
               const intervalMs = (typeof document !== 'undefined' && document.hidden) ? 30000 : 8000;
               timerId = setTimeout(doPoll, intervalMs);
@@ -1490,6 +1502,7 @@ window.__ModuleLoader__.load({
         return () => {
           isDestroyed = true;
           if (timerId) clearTimeout(timerId);
+          if (pollController) pollController.abort();
           if (typeof document !== 'undefined') {
             document.removeEventListener('visibilitychange', onVisibilityChange);
           }
@@ -1507,10 +1520,18 @@ window.__ModuleLoader__.load({
             ...options,
             signal: controller ? controller.signal : options.signal,
           });
-          const data = await res.json().catch(() => ({}));
+          let data = {};
+          try {
+            data = await res.json();
+          } catch (jsonErr) {
+            // Re-throw if body reading aborted/timed out (#242)
+            if (jsonErr && (jsonErr.name === 'AbortError' || controller?.signal.aborted)) {
+              throw jsonErr;
+            }
+          }
           return { res, data };
         } catch (err) {
-          if (err && err.name === 'AbortError') {
+          if (err && (err.name === 'AbortError' || controller?.signal.aborted)) {
             const timeoutErr = new Error(`Request timed out after ${Math.round(timeoutMs / 1000)}s`);
             timeoutErr.isTimeout = true;
             throw timeoutErr;

package/lib/index.js

@@ -80,6 +80,7 @@ import {
   sanitizeSettingsPayload,
   unwrapConfig,
   unwrapConfigValue,
+  plainConfig,
 } from './settings.js';
 import { registerRoutes } from './routes.js';
 
@@ -90,6 +91,7 @@ export {
   sanitizeSettingsPayload,
   unwrapConfig,
   unwrapConfigValue,
+  plainConfig,
 };
 
 export const name = '@goodandready/dsh-cron';
@@ -115,11 +117,31 @@ export {
   LEGACY_ACTION_MAP,
 };
 const pkgUrl = new URL('../package.json', import.meta.url);
+// Helper to access configuration safely in native Cordis Context without throwing missing-inject error (#235)
+function getContextConfig(ctx, rawConfig) {
+  try {
+    if (ctx && ctx.fiber && ctx.fiber.config) return ctx.fiber.config;
+    if (ctx && ctx.scope && ctx.scope.config) return ctx.scope.config;
+    if (ctx && ctx.runtime && ctx.runtime.config) return ctx.runtime.config;
+    if (ctx && typeof ctx === 'object' && 'config' in ctx) {
+      try {
+        const c = ctx.config;
+        if (c) return c;
+      } catch (err) {
+        // Ignore missing inject error on native Cordis Context (#235)
+      }
+    }
+  } catch (err) {
+    // Ignore context access error and fall back to rawConfig (#235)
+  }
+  return rawConfig || {};
+}
+
 const pkgVersion = JSON.parse(fs.readFileSync(pkgUrl, 'utf8')).version || '0.2.29';
 
 export function apply(ctx, rawConfig) {
   if (ctx && ctx.logger) setLogger(ctx.logger);
-  const config = unwrapConfig(rawConfig);
+  const config = plainConfig(rawConfig);
   const storePath = (config && (config.cronDir || config.storePath)) ? (config.storePath || path.join(config.cronDir, 'tasks.json')) : undefined;
   const store = new TaskStore(storePath);
 
@@ -213,7 +235,8 @@ export function apply(ctx, rawConfig) {
   function syncVolatileConfig(updatedConfig) {
     try {
       const isPlainConfigObject = updatedConfig && typeof updatedConfig === 'object' && !Array.isArray(updatedConfig);
-      const cfg = isPlainConfigObject ? { ...(ctx.config || config || {}), ...updatedConfig } : (ctx.config || config || {});
+      const liveConfig = getContextConfig(ctx, rawConfig);
+      const cfg = isPlainConfigObject ? { ...liveConfig, ...updatedConfig } : liveConfig;
       const unwrapped = unwrapConfig(cfg);
       activeVolatileConfig = { ...activeVolatileConfig, ...unwrapped };
       if (typeof unwrapped.maxConcurrent === 'number') {
@@ -284,7 +307,7 @@ export function apply(ctx, rawConfig) {
       try {
         if (req.method === 'GET') {
           const unwrapped = {
-            ...unwrapConfig(ctx.config || config || {}),
+            ...unwrapConfig(getContextConfig(ctx, rawConfig)),
             ...activeVolatileConfig,
           };
           const clientSettings = store.getClientSettings();

package/lib/settings.js

@@ -53,28 +53,21 @@ export const Config = z.object({
 
 
 /**
- * Unwrap a volatile config reference or wrap a config object in a transparent Proxy.
+ * Deeply unwrap Cosmokit/Schemastery Volatile boxes into plain primitives/objects/arrays (#282).
  */
-export function unwrapConfigValue(val) {
-  if (val && typeof val === 'object' && typeof val.get === 'function') {
-    return val.get();
+export function plainConfig(value) {
+  if (value === null || value === undefined) return value;
+  if (typeof value === 'function') return plainConfig(value());
+  if (typeof value.get === 'function') return plainConfig(value.get());
+  if (Array.isArray(value)) return value.map(plainConfig);
+  if (typeof value === 'object') {
+    return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, plainConfig(v)]));
   }
-  return val;
+  return value;
 }
 
-export function unwrapConfig(cfg) {
-  if (!cfg || typeof cfg !== 'object') return cfg;
-  if (typeof cfg.get === 'function') return unwrapConfig(cfg.get());
-  return new Proxy(cfg, {
-    get(target, prop, receiver) {
-      const val = Reflect.get(target, prop, receiver);
-      if (val && typeof val === 'object' && typeof val.get === 'function') {
-        return val.get();
-      }
-      return val;
-    }
-  });
-}
+export const unwrapConfigValue = plainConfig;
+export const unwrapConfig = plainConfig;
 
 export const SETTINGS_SYNC_KEYS = [
   'botToken', 'botTokenRef', 'telegramWebhookSecret', 'chatId', 'notifyTelegram', 'onlyOnFailure', 'kanbanBaseUrl',

package/lib/store.js

@@ -190,8 +190,12 @@ export class TaskStore {
       const tmp = `${this.filePath}.tmp.${process.pid}_${Date.now()}_${rand}`;
       this._currentAsyncTmp = tmp;
 
-      // Use compact serialization without whitespace indentation to eliminate event loop lag on large stores (#244)
+      // Yield to the event loop before CPU serialization so pending timers/I/O are serviced (#244)
+      await new Promise((resolve) => setImmediate(resolve));
+      // Compact serialization reduces payload size; disk write and rename are offloaded asynchronously via fs.promises (#244)
       const payload = JSON.stringify(data);
+      // Yield after serialization before starting disk write I/O
+      await new Promise((resolve) => setImmediate(resolve));
       await fs.promises.writeFile(tmp, payload, { encoding: 'utf-8', mode: 0o600 });
       bestEffort('chmod-tmp', () => fs.chmodSync(tmp, 0o600));
 
@@ -209,8 +213,11 @@ export class TaskStore {
         this._lastWrittenVersion = version;
       } catch (err) {
         this._currentAsyncTmp = null;
-        // If tmp was unlinked by newer sync save, rename will fail with ENOENT - safely ignore
-        if (err.code !== 'ENOENT') throw err;
+        // 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) {
+          return;
+        }
+        throw err;
       }
 
       const now = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.2.43",
+  "version": "0.2.45",
   "description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
   "type": "module",
   "main": "lib/index.js",