remove close/abort override

package-lock.json

@@ -11,26 +11,19 @@
         "mime": "^4.1.0"
       },
       "devDependencies": {
-        "@sugoidogo/web-filesystem-types": "^2.0.0",
+        "@sugoidogo/importable-types-web": "^1.0.0",
         "@types/node": "^25.0.9",
         "typescript": "^5.9.3"
       }
     },
-    "node_modules/@sugoidogo/node-web-globals": {
+    "node_modules/@sugoidogo/importable-types-web": {
       "version": "1.0.0",
-      "resolved": "https://gitea.sugoidogo.com/api/packages/sugoidogo/npm/%40sugoidogo%2Fnode-web-globals/-/1.0.0/node-web-globals-1.0.0.tgz",
+      "resolved": "https://gitea.sugoidogo.com/api/packages/sugoidogo/npm/%40sugoidogo%2Fimportable-types-web/-/1.0.0/importable-types-web-1.0.0.tgz",
-      "integrity": "sha512-mE2yB2h2Vg8I+0zkcFHLUZgH+dbpb03e5Zwn+cDeXFRnj/nb/mLCIxXc9OeKUSH06PYyOGtH76XKKwGzey9TnA==",
+      "integrity": "sha512-MqWkQ/WsllO7GiQjqWiFB3ZzsDwJwGPXIWkyd0E24d3CMcI0FKGgsOn6G/RVjCO9k2d/aRlzxqVmyuPAYOZ8tQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@sugoidogo/web-filesystem-types": {
-      "version": "2.0.0",
-      "resolved": "https://gitea.sugoidogo.com/api/packages/sugoidogo/npm/%40sugoidogo%2Fweb-filesystem-types/-/2.0.0/web-filesystem-types-2.0.0.tgz",
-      "integrity": "sha512-ET5F+WlqNZnskgbSACG1flLAKftJBehLPiQgRtUotuh2+pSqIGrHHQT5KC2v6b5/3LM47K1Zjm8GFcJpmXEjmw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sugoidogo/node-web-globals": "^1.0.0"
+        "undici-types": "^7.16.0"
       }
     },
     "node_modules/@types/node": {

package.json

@@ -16,7 +16,7 @@
     "mime": "^4.1.0"
   },
   "devDependencies": {
-    "@sugoidogo/web-filesystem-types": "^2.0.0",
+    "@sugoidogo/importable-types-web": "^1.0.0",
     "@types/node": "^25.0.9",
     "typescript": "^5.9.3"
   }

scripts/test.ts

@@ -1,14 +1,17 @@
-import NodeFileSystemDirectoryHandle from '../dist/NodeFileSystemDirectoryHandle.js'
+import NodeFileSystemDirectoryHandle from '../src/NodeFileSystemDirectoryHandle.ts'
 
+const textText="Hello World!"
 const cwd_directory_handle = new NodeFileSystemDirectoryHandle('.')
-const test_directory_handle=await cwd_directory_handle.getDirectoryHandle('test',{'create':true})
+const test_directory_handle = await cwd_directory_handle.getDirectoryHandle('test', { 'create': true })
-const file_handle = await test_directory_handle.getFileHandle('test.txt', { 'create': true })
+for (let i = 0; i < 10000; i++) {
-const writable = await file_handle.createWritable()
+    const file_handle = await test_directory_handle.getFileHandle(i+'.txt', { 'create': true })
-writable.write('Hello World!')
+    const writable = await file_handle.createWritable()
-writable.close()
+    await writable.write('Hello World!')
-const file = await file_handle.getFile()
+    await writable.close()
-console.log(file.type)
+    const file = await file_handle.getFile()
-console.log(await file.text())
+    const text = await file.text()
+    if(text!==textText) throw new Error("failed to read back written data")
+}
 const result = await cwd_directory_handle.getFileHandle('test/test.txt').catch(error => 'blocked path traversal')
 if (typeof result === 'string') console.log(result)
 else console.error('path traversal not blocked')

src/NodeFileSystemDirectoryHandle.ts

@@ -3,6 +3,14 @@ import * as asyncfs from 'node:fs/promises';
 import * as path from 'node:path';
 import NodeFileSystemHandle from './NodeFileSystemHandle.ts';
 import NodeFileSystemFileHandle from './NodeFileSystemFileHandle.ts';
+import type {
+    FileSystemDirectoryHandle,
+    FileSystemGetDirectoryOptions,
+    FileSystemDirectoryHandleAsyncIterator,
+    FileSystemGetFileOptions,
+    FileSystemRemoveOptions,
+    FileSystemHandle
+} from '@sugoidogo/importable-types-web'
 
 export default class NodeFileSystemDirectoryHandle extends NodeFileSystemHandle implements FileSystemDirectoryHandle {
     declare kind: "directory";

src/NodeFileSystemFileHandle.ts

@@ -4,6 +4,13 @@ import * as path from 'node:path';
 import NodeFileSystemHandle from './NodeFileSystemHandle.ts';
 import NodeFileSystemWritableFileStream from './NodeFileSystemWriteableFileStream.ts';
 import mime from 'mime'
+import type {
+    FileSystemFileHandle,
+    FileSystemGetFileOptions,
+    FileSystemCreateWritableOptions,
+    FileSystemWritableFileStream,
+    File as WebFile
+} from '@sugoidogo/importable-types-web'
 
 export default class NodeFileSystemFileHandle extends NodeFileSystemHandle implements FileSystemFileHandle {
     declare kind: "file";
@@ -17,13 +24,10 @@ export default class NodeFileSystemFileHandle extends NodeFileSystemHandle imple
     async createWritable(options: FileSystemCreateWritableOptions = {}): Promise<FileSystemWritableFileStream> {
         return new NodeFileSystemWritableFileStream(this.path,options)
     }
-    async getFile(): Promise<File> {
+    async getFile(): Promise<WebFile> {
         const stats = await asyncfs.stat(this.path)
         const type = mime.getType(this.name.split('.').pop())
-        return asyncfs.readFile(this.path).then(buffer => Object.assign(new Blob([buffer],{type}), {
+        const buffer = await asyncfs.readFile(this.path)
-            lastModified: stats.mtimeMs,
+        return new File([buffer], this.path, { "lastModified": stats.mtimeMs, "type": type }) as any //TODO Node File and Web File have some incompatibilities
-            name: this.path,
-            webkitRelativePath: this.path
-        }))
     }
 }

src/NodeFileSystemHandle.ts

@@ -1,4 +1,8 @@
 import * as path from 'node:path'
+import type {
+    FileSystemHandle,
+    FileSystemHandleKind
+} from '@sugoidogo/importable-types-web'
 
 export default class NodeFileSystemHandle implements FileSystemHandle {
     kind: FileSystemHandleKind;

src/NodeFileSystemWriteableFileStream.ts

@@ -1,38 +1,47 @@
 import * as fs from 'node:fs'
-import * as asyncfs from 'node:fs/promises'
 import * as path from 'node:path'
 import { Writable } from 'node:stream'
+import type {
+    FileSystemWritableFileStream,
+    FileSystemCreateWritableOptions,
+    FileSystemWriteChunkType,
+    WriteParams
+} from '@sugoidogo/importable-types-web'
 
 export default class NodeFileSystemWritableFileStream extends WritableStream implements FileSystemWritableFileStream {
     #seek_position = 0
-    #name: string
+    #fd: number
-    constructor(name: string, options: FileSystemCreateWritableOptions={}) {
+    constructor(name: string, options: FileSystemCreateWritableOptions = {}) {
         name = path.normalize(name)
-        super(Writable.toWeb(fs.createWriteStream(name)))
+        let flags = 'w'
-        this.#name = name
+        if (!options.keepExistingData) flags = 'r+'
-        if(!options.keepExistingData) this.truncate(0)
+        const fd = fs.openSync(name, flags)
+        super(Writable.toWeb(fs.createWriteStream(name, { "fd": fd })))
+        this.#fd = fd
     }
     async seek(position: number): Promise<void> {
+        if (this.locked) throw new Error("stream is locked")
         this.#seek_position = position
     }
-    truncate(size: number): Promise<void> {
+    async truncate(size: number): Promise<void> {
-        return asyncfs.truncate(this.#name, size)
+        if (this.locked) throw new Error("stream is locked")
+        return fs.ftruncateSync(this.#fd, size)
     }
     async write(wdata: FileSystemWriteChunkType): Promise<void> {
+        if (this.locked) throw new Error("stream is locked")
         if (wdata instanceof Blob) wdata = await wdata.bytes()
         if (typeof wdata === 'string') wdata = new TextEncoder().encode(wdata)
         let wsize: number = null
         let pseek_position = this.#seek_position
         if ((wdata as WriteParams).type) {
             const { type, position, size, data } = (wdata as WriteParams)
-            if (type === 'truncate') return asyncfs.truncate(this.#name, size)
+            if (type === 'truncate') return this.truncate(size)
             if (position) this.#seek_position = position
             if (type === 'seek') return
             if (size) wsize = size
             wdata = data
         }
-        const file = await asyncfs.open(this.#name,'r+')
+        fs.writeSync(this.#fd, (wdata as Uint8Array), null, wsize, this.#seek_position)
-        await file.write((wdata as Uint8Array), null, wsize, this.#seek_position)
         this.#seek_position = pseek_position
     }
 }

tsconfig.json

@@ -3,10 +3,6 @@
         "target": "es2022",
         "module": "es2022",
         "lib": ["ES2022"],
-        "types": [
-            "node",
-            "@sugoidogo/web-filesystem-types"
-        ],
         "moduleResolution": "node",
         "sourceMap": true,
         "declaration": true,