cabloy 5.1.230 → 5.1.232

package/vona/packages-vona/vona-core/src/lib/core/testClaimFilesystem.test.ts

@@ -164,61 +164,185 @@ test(
   },
 );
 
+async function holdWindowsClaimFile(file: string) {
+  // A native handle denying FILE_SHARE_DELETE prevents replacement. Node opens
+  // with delete sharing, so hold this deliberately through a separate PS7 peer.
+  const { spawn } = await import('node:child_process');
+  const script =
+    '$h=[System.IO.File]::Open($env:VONA_CLAIM_TEST_FILE,[System.IO.FileMode]::Open,[System.IO.FileAccess]::Read,[System.IO.FileShare]::Read);[Console]::Out.WriteLine("ready");[Console]::Out.Flush();[Console]::In.ReadLine()|Out-Null;$h.Dispose()';
+  const child = spawn('pwsh', ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command', script], {
+    windowsHide: true,
+    stdio: ['pipe', 'pipe', 'pipe'],
+    env: { ...process.env, VONA_CLAIM_TEST_FILE: file },
+  });
+  child.stderr.resume();
+  child.stdin.on('error', () => {});
+  const exited = new Promise<void>(resolve => child.once('close', () => resolve()));
+  const release = async () => {
+    child.stdin.end('\n');
+    const timer = setTimeout(() => child.kill(), 5000);
+    try {
+      await exited;
+    } finally {
+      clearTimeout(timer);
+    }
+  };
+  try {
+    await new Promise<void>((resolve, reject) => {
+      const timer = setTimeout(() => reject(new Error('fixture handle readiness timeout')), 15000);
+      child.once('error', error => {
+        clearTimeout(timer);
+        reject(error);
+      });
+      child.once('exit', () => {
+        clearTimeout(timer);
+        reject(new Error('fixture handle exited'));
+      });
+      let output = '';
+      child.stdout.on('data', chunk => {
+        output += String(chunk);
+        if (output.includes('ready')) {
+          clearTimeout(timer);
+          resolve();
+        }
+      });
+    });
+    return release;
+  } catch (error) {
+    await release();
+    throw error;
+  }
+}
+
 test(
-  'Windows replacement failure retains old manifest and removes flushed temporary file',
+  'Windows replacement retries a transient sharing conflict within the same call',
   { skip: process.platform !== 'win32' },
   async () => {
     const f = await fixture();
+    let release: (() => Promise<void>) | undefined;
+    let replacement: Promise<unknown> | undefined;
     try {
       await createTestClaimFile(f.file, 'previous committed inventory');
-      // A native handle denying FILE_SHARE_DELETE prevents replacement. Node opens
-      // with delete sharing, so hold this deliberately through a separate PS7 peer.
-      const { spawn } = await import('node:child_process');
-      const script =
-        '$h=[System.IO.File]::Open($env:VONA_CLAIM_TEST_FILE,[System.IO.FileMode]::Open,[System.IO.FileAccess]::Read,[System.IO.FileShare]::Read);[Console]::Out.WriteLine("ready");[Console]::Out.Flush();[Console]::In.ReadLine()|Out-Null;$h.Dispose()';
-      const child = spawn(
+      release = await holdWindowsClaimFile(f.file);
+      assert.equal(await readTestClaimFile(f.file), 'previous committed inventory');
+      let settled = false;
+      // Attach a rejection handler before polling, including the failure path.
+      replacement = replaceTestClaimFile(f.file, 'new committed inventory').then(
+        () => {
+          settled = true;
+        },
+        error => {
+          settled = true;
+          return error;
+        },
+      );
+      const deadline = Date.now() + 10000;
+      while (!(await readdir(f.directory)).some(name => name.endsWith('.tmp'))) {
+        if (settled) {
+          assert.equal(await replacement, undefined);
+          assert.fail('replacement completed before the held handle was released');
+        }
+        assert.ok(Date.now() < deadline, 'replacement temporary file was not observed');
+        await new Promise(resolve => setTimeout(resolve, 10));
+      }
+      await release();
+      release = undefined;
+      assert.equal(await replacement, undefined);
+      assert.equal(await readTestClaimFile(f.file), 'new committed inventory');
+      assert.deepEqual(await readdir(f.directory), ['claim.json']);
+    } finally {
+      await release?.();
+      await replacement;
+      await f.close();
+    }
+  },
+);
+
+test(
+  'Windows persistent sharing conflict fails boundedly and retains the old manifest',
+  { skip: process.platform !== 'win32' },
+  async () => {
+    const f = await fixture();
+    let release: (() => Promise<void>) | undefined;
+    try {
+      await createTestClaimFile(f.file, 'previous committed inventory');
+      release = await holdWindowsClaimFile(f.file);
+      assert.equal(await readTestClaimFile(f.file), 'previous committed inventory');
+      const started = performance.now();
+      await assert.rejects(replaceTestClaimFile(f.file, 'uncommitted'), {
+        code: 'EBUSY',
+        nativeCode: 32,
+        message: 'Unsafe Windows test claim filesystem operation (EBUSY, nativeCode=32)',
+      });
+      const elapsed = performance.now() - started;
+      assert.ok(elapsed >= 900 && elapsed < 10000, `bounded retry took ${elapsed}ms`);
+      assert.equal(await readFile(f.file, 'utf8'), 'previous committed inventory');
+      assert.deepEqual(await readdir(f.directory), ['claim.json']);
+      await release();
+      release = undefined;
+      await replaceTestClaimFile(f.file, 'new committed inventory');
+      assert.equal(await readTestClaimFile(f.file), 'new committed inventory');
+    } finally {
+      await release?.();
+      await f.close();
+    }
+  },
+);
+
+test(
+  'Windows replacement rejects a read-only target without changing its contents or attributes',
+  { skip: process.platform !== 'win32' },
+  async () => {
+    const f = await fixture();
+    const attributes = (script: string) =>
+      execFileSync(
         'pwsh',
-        ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command', script],
+        [
+          '-NoLogo',
+          '-NoProfile',
+          '-NonInteractive',
+          '-Command',
+          `$ErrorActionPreference='Stop';${script}`,
+        ],
         {
           windowsHide: true,
-          stdio: ['pipe', 'pipe', 'pipe'],
+          encoding: 'utf8',
           env: { ...process.env, VONA_CLAIM_TEST_FILE: f.file },
         },
+      ).trim();
+    let original: number | undefined;
+    try {
+      await createTestClaimFile(f.file, 'previous committed inventory');
+      original = Number(
+        attributes('[int][System.IO.File]::GetAttributes($env:VONA_CLAIM_TEST_FILE)'),
+      );
+      assert.ok(Number.isInteger(original));
+      const readOnly = (original & ~128) | 1;
+      attributes(
+        `[System.IO.File]::SetAttributes($env:VONA_CLAIM_TEST_FILE,[System.IO.FileAttributes]${readOnly})`,
+      );
+      assert.equal(await readTestClaimFile(f.file), 'previous committed inventory');
+      await assert.rejects(replaceTestClaimFile(f.file, 'uncommitted'), {
+        code: 'EACCES',
+        nativeCode: 5,
+        message: 'Unsafe Windows test claim filesystem operation (EACCES, nativeCode=5)',
+      });
+      assert.equal(await readTestClaimFile(f.file), 'previous committed inventory');
+      assert.equal(
+        Number(attributes('[int][System.IO.File]::GetAttributes($env:VONA_CLAIM_TEST_FILE)')),
+        readOnly,
       );
+      assert.deepEqual(await readdir(f.directory), ['claim.json']);
+    } finally {
       try {
-        await new Promise<void>((resolve, reject) => {
-          const timer = setTimeout(
-            () => reject(new Error('fixture handle readiness timeout')),
-            15000,
+        if (original !== undefined) {
+          attributes(
+            `[System.IO.File]::SetAttributes($env:VONA_CLAIM_TEST_FILE,[System.IO.FileAttributes]${original})`,
           );
-          child.once('error', error => {
-            clearTimeout(timer);
-            reject(error);
-          });
-          child.once('exit', () => {
-            clearTimeout(timer);
-            reject(new Error('fixture handle exited'));
-          });
-          child.stdout.once('data', chunk => {
-            clearTimeout(timer);
-            assert.match(String(chunk), /ready/);
-            resolve();
-          });
-        });
-        await assert.rejects(replaceTestClaimFile(f.file, 'uncommitted'));
-        assert.equal(await readFile(f.file, 'utf8'), 'previous committed inventory');
-        assert.deepEqual(await readdir(f.directory), ['claim.json']);
+        }
       } finally {
-        child.stdin.end('\n');
-        await new Promise<void>(resolve => {
-          if (child.exitCode !== null) resolve();
-          else child.once('exit', () => resolve());
-        });
+        await f.close();
       }
-      await replaceTestClaimFile(f.file, 'new committed inventory');
-      assert.equal(await readTestClaimFile(f.file), 'new committed inventory');
-    } finally {
-      await f.close();
     }
   },
 );

package/vona/packages-vona/vona-core/src/lib/core/testClaimFilesystemWindows.cs

@@ -209,10 +209,20 @@ namespace Cabloy {
                     bool created = false;
                     try {
                         Write(temp, bytes); created = true;
-                        using (SafeFileHandle h = Open(file, false, GenericRead)) Private(h);
-                        // No COPY_ALLOWED: same-directory local-NTFS replacement only.
-                        // Both files are flushed first. Failure is never acknowledged.
-                        Check(MoveFileExW(temp, file, 1 | 8)); created = false;
+                        for (int attempt = 0; ; attempt++) {
+                            try {
+                                // Surface denied delete sharing as a sharing violation, not a rename access denial.
+                                // Close our own non-delete-sharing handle before attempting the rename.
+                                using (SafeFileHandle h = Open(file, false, GenericRead | DeleteAccess)) Private(h);
+                                // No COPY_ALLOWED: same-directory local-NTFS replacement of the flushed temporary file.
+                                // Failure is never acknowledged.
+                                Check(MoveFileExW(temp, file, 1 | 8));
+                                created = false; break;
+                            } catch (Win32Exception e) {
+                                if ((e.NativeErrorCode != 32 && e.NativeErrorCode != 33) || attempt >= 10) throw;
+                            }
+                            System.Threading.Thread.Sleep(100);
+                        }
                         using (SafeFileHandle h = Open(file, false, GenericRead)) { if (Read(h) != content) throw Unsafe(); }
                     } finally {
                         if (created) {
@@ -222,8 +232,8 @@ namespace Cabloy {
                     return result;
                 }
             } catch (Win32Exception e) {
-                return new Dictionary<string, object> { { "ok", false }, { "code", e.NativeErrorCode == 80 || e.NativeErrorCode == 183 ? "EEXIST" : e.NativeErrorCode == 2 || e.NativeErrorCode == 3 ? "ENOENT" : "EUNSAFE" } };
-            } catch { return new Dictionary<string, object> { { "ok", false }, { "code", "EUNSAFE" } }; }
+                return new Dictionary<string, object> { { "ok", false }, { "code", e.NativeErrorCode == 80 || e.NativeErrorCode == 183 ? "EEXIST" : e.NativeErrorCode == 2 || e.NativeErrorCode == 3 ? "ENOENT" : e.NativeErrorCode == 32 || e.NativeErrorCode == 33 ? "EBUSY" : e.NativeErrorCode == 5 ? "EACCES" : "EUNSAFE" }, { "nativeCode", e.NativeErrorCode } };
+            } catch { return new Dictionary<string, object> { { "ok", false }, { "code", "EUNSAFE" }, { "nativeCode", 0 } }; }
         }
     }
 }

package/vona/packages-vona/vona-core/src/lib/core/testClaimFilesystemWindows.ts

@@ -62,12 +62,17 @@ function decode(source: string): { exists?: boolean; content?: string } {
     throw new Error('Windows test claim filesystem helper returned an invalid response');
   }
   if (!value || value.ok !== true) {
+    const code = ['EEXIST', 'ENOENT', 'EBUSY', 'EACCES', 'EUNSAFE'].includes(value?.code)
+      ? value.code
+      : 'EUNSAFE';
+    const nativeCode =
+      Number.isInteger(value?.nativeCode) && value.nativeCode >= 0 && value.nativeCode <= 65535
+        ? value.nativeCode
+        : 0;
     const error = new Error(
-      value?.code === 'EEXIST'
-        ? 'Test claim file already exists'
-        : `Unsafe Windows test claim filesystem operation (${value?.code ?? 'unknown'})`,
+      `Unsafe Windows test claim filesystem operation (${code}, nativeCode=${nativeCode})`,
     );
-    Object.assign(error, { code: value?.code ?? 'EUNSAFE' });
+    Object.assign(error, { code, nativeCode });
     throw error;
   }
   return value;

package/vona/packages-vona/vona-core/src/lib/utils/index.ts

@@ -3,5 +3,6 @@ import { zodExtendOpenApi } from './zod-openapi.ts';
 export * from './protocolKey.ts';
 export * from './retry.ts';
 export * from './util.ts';
+export { runWithZodQueryCoercion } from './zod-enhance.ts';
 
 zodExtendOpenApi();

package/vona/packages-vona/vona-core/src/lib/utils/zod-enhance.ts

@@ -3,6 +3,7 @@ import type z from 'zod';
 import { setLocaleAdapter, setLocaleErrors, translateError } from '@cabloy/zod-errors-custom';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import { setParseAdapter } from '@cabloy/zod-query';
+import { AsyncLocalStorage } from 'node:async_hooks';
 
 import type { ILocaleRecord } from '../bean/resource/locale/type.ts';
 import type { VonaApplication } from '../core/application.ts';
@@ -12,6 +13,12 @@ import { useApp } from '../framework/useApp.ts';
 export type ZodLocaleError = () => { localeError: z.core.$ZodErrorMap };
 export type ZodLocaleErrors = Record<keyof ILocaleRecord, ZodLocaleError>;
 
+const queryCoercion = new AsyncLocalStorage<boolean>();
+
+export function runWithZodQueryCoercion<T>(enabled: boolean, fn: () => T): T {
+  return queryCoercion.run(enabled, fn);
+}
+
 export function zodEnhance() {
   setLocaleAdapter((text: string, iss?: object) => {
     const app = useApp();
@@ -23,7 +30,7 @@ export function zodEnhance() {
       iss,
     );
   });
-  setParseAdapter(ZodMetadata);
+  setParseAdapter(ZodMetadata, () => queryCoercion.getStore() !== false);
 }
 
 export function zodSetLocaleErrors(

package/vona/packages-vona/vona-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-mock",
-  "version": "6.1.50",
+  "version": "6.1.51",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona mock",
   "keywords": [