@openclaw/fs-safe 0.17.0 → 0.18.0

package/dist/replace-file-temp-owner.js

@@ -57,6 +57,15 @@ function cleanupFailure(originalFailure, cleanupError) {
     }
     return isErrorValue(cleanupError) ? cleanupError : new Error(describeFailure(cleanupError));
 }
+function closeFailure(closeError, params, cleanupFailure) {
+    return {
+        error: cleanupFailure
+            ? new AggregateError([cleanupFailure.error, closeError], "Atomic temp cleanup and close failed")
+            : params.originalFailure
+                ? new AggregateError([params.originalFailure.error, closeError], "Atomic file replace and close failed")
+                : closeError,
+    };
+}
 async function cleanupOwnedPath(params) {
     try {
         await removeOwnedPath(params);
@@ -92,36 +101,48 @@ function cleanupOwnedPathSync(params) {
         return false;
     }
 }
-export class AsyncAtomicTempOwner {
+class AtomicTempOwner {
     pathname;
-    #handle;
-    #identity;
-    #exists = false;
-    #unregister;
+    resource;
+    recordedIdentity;
+    exists = false;
+    unregister;
     constructor(pathname) {
         this.pathname = pathname;
-        this.#unregister = registerTempPathForExit(pathname, { singleLinkFile: true });
+        this.unregister = registerTempPathForExit(pathname, { singleLinkFile: true });
     }
     start() {
-        this.#exists = true;
+        this.exists = true;
     }
     onIdentity = (identity) => {
-        this.#identity = identity;
-        this.#unregister.setIdentity(identity);
+        this.recordedIdentity = identity;
+        this.unregister.setIdentity(identity);
     };
-    adopt(temp) {
-        this.#handle = temp.handle;
-        this.onIdentity(temp.identity);
-    }
     get identity() {
-        if (!this.#identity)
+        if (!this.recordedIdentity)
             throw new Error("Atomic temp owner has no identity");
-        return this.#identity;
+        return this.recordedIdentity;
+    }
+    markRenamed() {
+        this.exists = false;
+        this.unregister();
+    }
+    takeResource() {
+        // A throwing close may already have released the descriptor for reuse.
+        const resource = this.resource;
+        this.resource = undefined;
+        return resource;
+    }
+}
+export class AsyncAtomicTempOwner extends AtomicTempOwner {
+    adopt(temp) {
+        this.resource = temp.handle;
+        this.onIdentity(temp.identity);
     }
     async assertCurrent(fsModule, pathname = this.pathname) {
         const opened = await inspectFileIdentity(async () => {
-            const stat = fsModule === fs ? syncFs.fstatSync(this.#handle.fd, { bigint: true })
-                : await this.#handle.stat({ bigint: true });
+            const stat = fsModule === fs ? syncFs.fstatSync(this.resource.fd, { bigint: true })
+                : await this.resource.stat({ bigint: true });
             assertOwnedFile(stat, pathname, false);
             return stat;
         }, this.identity);
@@ -178,30 +199,30 @@ export class AsyncAtomicTempOwner {
             if (sha256Hex(await published.readFile()) !== expectedHash) {
                 throw new FsSafeError("path-mismatch", `Atomic replace published content changed: ${pathname}`);
             }
-            const previousHandle = this.#handle;
-            this.#handle = undefined;
+            const previousHandle = this.takeResource();
             await previousHandle?.close();
-            this.#handle = published;
-            this.#identity = identity;
+            this.resource = published;
+            this.recordedIdentity = identity;
             published = undefined;
         }
         finally {
-            await published?.close().catch(() => undefined);
+            try {
+                await published?.close();
+            }
+            catch {
+                // Preserve the selected verification or previous-handle close failure.
+            }
         }
     }
-    markRenamed() {
-        this.#exists = false;
-        this.#unregister();
-    }
     async finish(params) {
         let deferredFailure;
-        let cleanupComplete = !this.#exists;
-        if (this.#exists) {
+        let cleanupComplete = !this.exists;
+        if (this.exists) {
             try {
                 cleanupComplete = await cleanupOwnedPath({
                     fsModule: params.fsModule,
                     pathname: this.pathname,
-                    identity: this.#identity,
+                    identity: this.recordedIdentity,
                     originalFailure: params.originalFailure,
                     throwOnCleanupError: params.throwOnCleanupError,
                 });
@@ -211,54 +232,26 @@ export class AsyncAtomicTempOwner {
             }
         }
         if (cleanupComplete)
-            this.#unregister();
-        const handle = this.#handle;
-        this.#handle = undefined;
+            this.unregister();
+        const handle = this.takeResource();
         try {
             await handle?.close();
         }
         catch (closeError) {
-            deferredFailure = {
-                error: deferredFailure
-                    ? new AggregateError([deferredFailure.error, closeError], "Atomic temp cleanup and close failed")
-                    : params.originalFailure
-                        ? new AggregateError([params.originalFailure.error, closeError], "Atomic file replace and close failed")
-                        : closeError,
-            };
+            deferredFailure = closeFailure(closeError, params, deferredFailure);
         }
         if (deferredFailure)
             throw deferredFailure.error;
     }
 }
-export class SyncAtomicTempOwner {
-    pathname;
-    #fd;
-    #identity;
-    #exists = false;
-    #unregister;
-    constructor(pathname) {
-        this.pathname = pathname;
-        this.#unregister = registerTempPathForExit(pathname, { singleLinkFile: true });
-    }
-    start() {
-        this.#exists = true;
-    }
-    onIdentity = (identity) => {
-        this.#identity = identity;
-        this.#unregister.setIdentity(identity);
-    };
+export class SyncAtomicTempOwner extends AtomicTempOwner {
     adopt(temp) {
-        this.#fd = temp.fd;
+        this.resource = temp.fd;
         this.onIdentity(temp.identity);
     }
-    get identity() {
-        if (!this.#identity)
-            throw new Error("Atomic temp owner has no identity");
-        return this.#identity;
-    }
     assertCurrent(fsModule, pathname = this.pathname) {
         const opened = inspectFileIdentitySync(() => {
-            const stat = fsModule.fstatSync(this.#fd, { bigint: true });
+            const stat = fsModule.fstatSync(this.resource, { bigint: true });
             assertOwnedFile(stat, pathname, false);
             return stat;
         }, this.identity);
@@ -312,11 +305,10 @@ export class SyncAtomicTempOwner {
             if (sha256Hex(fsModule.readFileSync(publishedFd)) !== expectedHash) {
                 throw new FsSafeError("path-mismatch", `Atomic replace published content changed: ${pathname}`);
             }
-            const previousFd = this.#fd;
-            this.#fd = undefined;
+            const previousFd = this.takeResource();
             fsModule.closeSync(previousFd);
-            this.#fd = publishedFd;
-            this.#identity = identity;
+            this.resource = publishedFd;
+            this.recordedIdentity = identity;
             publishedFd = undefined;
         }
         finally {
@@ -330,19 +322,15 @@ export class SyncAtomicTempOwner {
             }
         }
     }
-    markRenamed() {
-        this.#exists = false;
-        this.#unregister();
-    }
     finish(params) {
         let deferredFailure;
-        let cleanupComplete = !this.#exists;
-        if (this.#exists) {
+        let cleanupComplete = !this.exists;
+        if (this.exists) {
             try {
                 cleanupComplete = cleanupOwnedPathSync({
                     fsModule: params.fsModule,
                     pathname: this.pathname,
-                    identity: this.#identity,
+                    identity: this.recordedIdentity,
                     originalFailure: params.originalFailure,
                     throwOnCleanupError: params.throwOnCleanupError,
                 });
@@ -352,21 +340,14 @@ export class SyncAtomicTempOwner {
             }
         }
         if (cleanupComplete)
-            this.#unregister();
-        if (this.#fd !== undefined) {
-            const fd = this.#fd;
-            this.#fd = undefined;
+            this.unregister();
+        const fd = this.takeResource();
+        if (fd !== undefined) {
             try {
                 params.fsModule.closeSync(fd);
             }
             catch (closeError) {
-                deferredFailure = {
-                    error: deferredFailure
-                        ? new AggregateError([deferredFailure.error, closeError], "Atomic temp cleanup and close failed")
-                        : params.originalFailure
-                            ? new AggregateError([params.originalFailure.error, closeError], "Atomic file replace and close failed")
-                            : closeError,
-                };
+                deferredFailure = closeFailure(closeError, params, deferredFailure);
             }
         }
         if (deferredFailure)

package/dist/replace-file.d.ts

@@ -56,4 +56,3 @@ export type ReplaceFileAtomicResult = {
 export declare function replaceFileAtomic(options: ReplaceFileAtomicOptions): Promise<ReplaceFileAtomicResult>;
 export declare function replaceFileAtomicWithDirectorySync(options: ReplaceFileAtomicOptions, syncParent?: (directoryPath: string) => Promise<unknown>): Promise<ReplaceFileAtomicResult>;
 export declare function replaceFileAtomicSync(options: ReplaceFileAtomicSyncOptions): ReplaceFileAtomicResult;
-//# sourceMappingURL=replace-file.d.ts.map

package/dist/retained-directory-replacement.d.ts

@@ -23,4 +23,3 @@ export declare class RetainedDirectoryReplacement {
     close(): void;
 }
 export {};
-//# sourceMappingURL=retained-directory-replacement.d.ts.map

package/dist/root-boundary.d.ts

@@ -27,4 +27,3 @@ export declare function admitPathInsideRoot(params: {
         ino: bigint;
     }>) => void;
 }): AdmittedRootPath | undefined;
-//# sourceMappingURL=root-boundary.d.ts.map

package/dist/root-context.d.ts

@@ -41,4 +41,3 @@ export declare function resolvePathInRoot(root: RootContext, relativePath: strin
     rootWithSep: string;
     resolved: string;
 }>;
-//# sourceMappingURL=root-context.d.ts.map

package/dist/root-create-input.d.ts

@@ -14,4 +14,3 @@ export declare function rethrowCreateInputError(error: unknown): never;
 export declare function createInputOptions(data: RootWriteParams["data"], options: RootCreateOptions & RootCreateStreamOptions, defaultMaxBytes?: number): RootCreateOptions & RootCreateStreamOptions;
 export declare function rootWriteInput(params: RootWriteParams): PinnedWriteInput;
 export {};
-//# sourceMappingURL=root-create-input.d.ts.map

package/dist/root-directory-creation.d.ts

@@ -10,4 +10,3 @@ export declare function mkdirPathFallback(root: RootContext, resolved: {
     rootReal: string;
     resolved: string;
 }, assertBeforeMutation?: () => void, rejectSymlinks?: boolean, mutationAdmission?: PinnedWriteMutationAdmission, privateMode?: boolean): Promise<void>;
-//# sourceMappingURL=root-directory-creation.d.ts.map

package/dist/root-directory-list.d.ts

@@ -36,4 +36,3 @@ export type RootDirectoryListingOptions = {
     admitEntry(): boolean;
 };
 export declare function openRootDirectoryListing(root: RootContext, directory: string, options: RootDirectoryListingOptions): Promise<RootDirectoryListing>;
-//# sourceMappingURL=root-directory-list.d.ts.map

package/dist/root-directory.d.ts

@@ -20,4 +20,3 @@ export declare function ensureDirectoryWithinRoot(params: {
     defaultDirName?: string;
     mode?: number;
 }): Promise<DirectoryResult>;
-//# sourceMappingURL=root-directory.d.ts.map

package/dist/root-entries.d.ts

@@ -8,4 +8,3 @@ export type RootEntriesOptions = {
     symlinks?: SymlinkPolicy;
 };
 export declare function entriesInRoot(root: RootContext, relativePath: string, options: RootEntriesOptions): AsyncGenerator<DirEntry>;
-//# sourceMappingURL=root-entries.d.ts.map

package/dist/root-errors.d.ts

@@ -10,4 +10,3 @@ export declare function normalizePinnedPathError(error: unknown, details?: FsSaf
 export declare function normalizeRemoveGuardError(error: unknown, details?: FsSafeErrorDetails): Error;
 export declare function normalizeRemovePathError(error: unknown, details?: FsSafeErrorDetails): Error;
 export declare function throwFsSafeReadError(error: unknown, label: string): never;
-//# sourceMappingURL=root-errors.d.ts.map

package/dist/root-file-final-admission.d.ts

@@ -18,4 +18,3 @@ export declare function createRootFileFinalAdmission(ioFs: RootFileAdmissionFs,
     ok: true;
 }>, boundaryLabel: string, rejectHardlinks?: boolean): PinnedOpenSyncFinalAdmission;
 export {};
-//# sourceMappingURL=root-file-final-admission.d.ts.map

package/dist/root-file.d.ts

@@ -44,4 +44,3 @@ export declare function matchRootFileOpenFailure<T>(failure: RootFileOpenFailure
 }): T;
 export declare function openRootFile(params: OpenRootFileParams): Promise<RootFileOpenResult>;
 export {};
-//# sourceMappingURL=root-file.d.ts.map

package/dist/root-impl.d.ts

@@ -62,14 +62,12 @@ export interface Root {
     walk(relativePath: string, options: RootWalkOptions): AsyncIterableIterator<RootWalkEntry>;
 }
 export declare class RootHandle implements Root {
-    private readonly rootGuard;
-    private readonly rootIdentity;
+    private readonly context;
     readonly rootDir: string;
     readonly rootReal: string;
     readonly rootWithSep: string;
     readonly defaults: RootDefaults;
     constructor(context: RootContext, defaults?: RootDefaults);
-    private get context();
     private mutationOptions;
     resolve(relativePath: string): Promise<string>;
     open(relativePath: string, options?: RootOpenOptions): Promise<OpenResult>;
@@ -119,12 +117,6 @@ export declare function readLocalFileSafely(params: {
 export declare function openLocalFileSafely(params: {
     filePath: string;
 }): Promise<OpenResult>;
-export type WritableOpenResult = {
-    handle: FileHandle;
-    containment: ContainmentGuarantee;
+export type WritableOpenResult = OpenResult & {
     createdForWrite: boolean;
-    realPath: string;
-    stat: Stats;
-    [Symbol.asyncDispose](): Promise<void>;
 };
-//# sourceMappingURL=root-impl.d.ts.map