@gjsify/fs 0.0.4 → 0.1.1

package/lib/esm/file-handle.js

@@ -4,14 +4,52 @@ import { WriteStream } from "./write-stream.js";
 import { Stats } from "./stats.js";
 import { getEncodingFromOptions, encodeUint8Array } from "./encoding.js";
 import GLib from "@girs/glib-2.0";
-import { ReadableStream } from "stream/web";
-import { Buffer } from "buffer";
+import Gio from "@girs/gio-2.0";
+import { ReadableStream } from "node:stream/web";
+import { Buffer } from "node:buffer";
+const GLIB_FILE_ERROR_TO_NODE = {
+  0: "EEXIST",
+  1: "EISDIR",
+  2: "EACCES",
+  3: "ENAMETOOLONG",
+  4: "ENOENT",
+  5: "ENOTDIR",
+  6: "ENXIO",
+  7: "ENODEV",
+  8: "EROFS",
+  11: "ELOOP",
+  12: "ENOSPC",
+  13: "ENOMEM",
+  14: "EMFILE",
+  15: "ENFILE",
+  16: "EBADF",
+  17: "EINVAL",
+  18: "EPIPE",
+  21: "EIO",
+  22: "EPERM",
+  24: "EIO"
+};
+function mapOpenError(err, path) {
+  const gErr = err;
+  const msg = gErr?.message ?? "";
+  const code = GLIB_FILE_ERROR_TO_NODE[gErr?.code ?? -1] ?? "EIO";
+  const error = new Error(`${code}: ${msg || "unknown error"}, open '${path}'`);
+  error.code = code;
+  error.syscall = "open";
+  error.path = path;
+  return error;
+}
 class FileHandle {
   constructor(options) {
     this.options = options;
     this.options.flags ||= "r";
     this.options.mode ||= 438;
-    this._file = GLib.IOChannel.new_file(options.path.toString(), this.options.flags);
+    try {
+      this._file = GLib.IOChannel.new_file(options.path.toString(), this.options.flags);
+    } catch (err) {
+      throw mapOpenError(err, options.path.toString());
+    }
+    this._file.set_encoding(null);
     this.fd = this._file.unix_get_fd();
     FileHandle.instances[this.fd] = this;
     return FileHandle.getInstance(this.fd);
@@ -46,8 +84,7 @@ class FileHandle {
     if (typeof data === "string") {
       data = Buffer.from(data);
     }
-    if (encoding)
-      this._file.set_encoding(encoding);
+    if (encoding) this._file.set_encoding(encoding);
     const [status, written] = this._file.write_chars(data, data.length);
     if (status === GLib.IOStatus.ERROR) {
       throw new Error("Error on append to file!");
@@ -92,7 +129,7 @@ class FileHandle {
    * destroyed.  Set the `emitClose` option to `false` to change this behavior.
    *
    * ```js
-   * import { open } from 'fs/promises';
+   * import { open } from 'node:fs/promises';
    *
    * const fd = await open('/dev/input/event0');
    * // Create a stream from some character device.
@@ -118,7 +155,7 @@ class FileHandle {
    * An example to read the last 10 bytes of a file which is 100 bytes long:
    *
    * ```js
-   * import { open } from 'fs/promises';
+   * import { open } from 'node:fs/promises';
    *
    * const fd = await open('sample.txt');
    * fd.createReadStream({ start: 90, end: 99 });
@@ -168,12 +205,12 @@ class FileHandle {
   async sync() {
     warnNotImplemented("fs.FileHandle.sync");
   }
-  async read(args) {
+  async read(...args) {
     let buffer;
     let offset;
     let length;
     let position;
-    if (typeof args[0] === "object") {
+    if (typeof args[0] === "object" && !(args[0] instanceof Uint8Array) && !(args[0] instanceof Buffer)) {
       const options = args[0];
       buffer = options.buffer;
       offset = options.offset;
@@ -185,25 +222,18 @@ class FileHandle {
       length = args[2];
       position = args[3];
     }
-    if (offset) {
-      const status2 = this._file.seek_position(offset, GLib.SeekType.CUR);
-      if (status2 === GLib.IOStatus.ERROR) {
-        throw new Error("Error on set offset!");
-      }
-    }
-    if (length)
-      this._file.set_buffer_size(length);
-    if (position) {
-      const status2 = this._file.seek_position(position, GLib.SeekType.SET);
-      if (status2 === GLib.IOStatus.ERROR) {
-        throw new Error("Error on set position!");
-      }
+    const bufView = buffer;
+    const bufOffset = offset ?? 0;
+    const readLength = length ?? bufView?.byteLength ?? 65536;
+    const gFile = Gio.File.new_for_path(this.options.path.toString());
+    const [, fileContents] = gFile.load_contents(null);
+    const fileData = fileContents;
+    const startPos = position ?? 0;
+    const readData = fileData.slice(startPos, startPos + readLength);
+    const bytesRead = readData.length;
+    if (bufView && bytesRead > 0) {
+      bufView.set(readData, bufOffset);
     }
-    const [status, buf, bytesRead] = this._file.read_chars();
-    if (status === GLib.IOStatus.ERROR) {
-      throw new Error("Error on read!");
-    }
-    buffer = buf;
     return {
       bytesRead,
       buffer
@@ -216,7 +246,7 @@ class FileHandle {
    * or closing.
    *
    * ```js
-   * import { open } from 'fs/promises';
+   * import { open } from 'node:fs/promises';
    *
    * const file = await open('./some/file/to/read');
    *
@@ -242,8 +272,7 @@ class FileHandle {
    */
   async readFile(options) {
     const encoding = getEncodingFromOptions(options, "buffer");
-    if (encoding)
-      this._file.set_encoding(encoding);
+    if (encoding) this._file.set_encoding(encoding);
     const [status, buf] = this._file.read_to_end();
     if (status === GLib.IOStatus.ERROR) {
       throw new Error("Error on read from file!");
@@ -283,7 +312,7 @@ class FileHandle {
    * The following example retains only the first four bytes of the file:
    *
    * ```js
-   * import { open } from 'fs/promises';
+   * import { open } from 'node:fs/promises';
    *
    * let filehandle = null;
    * try {
@@ -302,8 +331,14 @@ class FileHandle {
    * @param [len=0]
    * @return Fulfills with `undefined` upon success.
    */
-  async truncate(len) {
-    warnNotImplemented("fs.FileHandle.truncate");
+  async truncate(len = 0) {
+    const effectiveLen = Math.max(0, len);
+    this._file.flush();
+    const gFile = Gio.File.new_for_path(this.options.path.toString());
+    const [, currentContent] = gFile.load_contents(null);
+    const newContent = new Uint8Array(effectiveLen);
+    newContent.set(currentContent.slice(0, Math.min(effectiveLen, currentContent.length)));
+    gFile.replace_contents(newContent, null, false, Gio.FileCreateFlags.NONE, null);
   }
   /**
    * Change the file system timestamps of the object referenced by the `FileHandle` then resolves the promise with no arguments upon success.
@@ -331,7 +366,19 @@ class FileHandle {
    * @since v10.0.0
    */
   async writeFile(data, options) {
-    warnNotImplemented("fs.FileHandle.writeFile");
+    const encoding = getEncodingFromOptions(options);
+    let buf;
+    if (typeof data === "string") {
+      buf = Buffer.from(data, encoding || "utf8");
+    } else {
+      buf = data;
+    }
+    this._file.seek_position(0, GLib.SeekType.SET);
+    const [status] = this._file.write_chars(buf, buf.length);
+    if (status === GLib.IOStatus.ERROR) {
+      throw new Error("Error writing to file!");
+    }
+    this._file.flush();
   }
   async write(data, ...args) {
     let position = null;
@@ -347,39 +394,31 @@ class FileHandle {
       position = args[2];
     }
     encoding = getEncodingFromOptions(encoding, typeof data === "string" ? "utf8" : null);
-    if (encoding) {
-      console.log("set_encoding", encoding, this._file.get_encoding(), typeof data);
-      this._file.set_encoding(encoding === "buffer" ? null : encoding);
-    }
-    if (offset) {
-      const status2 = this._file.seek_position(offset, GLib.SeekType.CUR);
-      if (status2 === GLib.IOStatus.ERROR) {
-        throw new Error("Error on set offset!");
-      }
-    }
-    if (length)
-      this._file.set_buffer_size(length);
-    if (position) {
-      const status2 = this._file.seek_position(position, GLib.SeekType.SET);
-      if (status2 === GLib.IOStatus.ERROR) {
-        throw new Error("Error on set position!");
-      }
-    }
-    let bytesWritten = 0;
-    let status;
+    let writeBuf;
     if (typeof data === "string") {
-      status = this._file.write_unichar(data);
-      bytesWritten = data.length;
+      writeBuf = new TextEncoder().encode(data);
     } else {
-      const [_status, _bytesWritten] = this._file.write_chars(data, length);
-      bytesWritten = _bytesWritten;
-      status = _status;
+      writeBuf = data;
     }
-    if (status === GLib.IOStatus.ERROR) {
-      throw new Error("Error on write to file!");
+    const bufOffset = offset ?? 0;
+    const writeLength = length ?? writeBuf.byteLength - bufOffset;
+    const writeSlice = writeBuf.slice(bufOffset, bufOffset + writeLength);
+    const writePos = position ?? 0;
+    const gFile = Gio.File.new_for_path(this.options.path.toString());
+    let existingData;
+    try {
+      const [, existing] = gFile.load_contents(null);
+      existingData = existing;
+    } catch {
+      existingData = new Uint8Array(0);
     }
+    const newSize = Math.max(existingData.length, writePos + writeSlice.length);
+    const newContent = new Uint8Array(newSize);
+    newContent.set(existingData);
+    newContent.set(writeSlice, writePos);
+    gFile.replace_contents(newContent, null, false, Gio.FileCreateFlags.NONE, null);
     return {
-      bytesWritten,
+      bytesWritten: writeSlice.length,
       buffer: data
     };
   }
@@ -402,7 +441,7 @@ class FileHandle {
     warnNotImplemented("fs.FileHandle.writev");
     return {
       bytesWritten: 0,
-      buffers: []
+      buffers
     };
   }
   /**
@@ -415,7 +454,7 @@ class FileHandle {
     warnNotImplemented("fs.FileHandle.readv");
     return {
       bytesRead: 0,
-      buffers: []
+      buffers
     };
   }
   /**
@@ -423,7 +462,7 @@ class FileHandle {
    * complete.
    *
    * ```js
-   * import { open } from 'fs/promises';
+   * import { open } from 'node:fs/promises';
    *
    * let filehandle;
    * try {
@@ -436,7 +475,10 @@ class FileHandle {
    * @return Fulfills with `undefined` upon success.
    */
   async close() {
-    this._file.close();
+    this._file.shutdown(true);
+  }
+  async [Symbol.asyncDispose]() {
+    await this.close();
   }
 }
 export {

package/lib/esm/fs-watcher.js

@@ -1,31 +1,68 @@
+import GLib from "@girs/glib-2.0";
 import Gio from "@girs/gio-2.0";
-import { EventEmitter } from "events";
+import { EventEmitter } from "node:events";
 const privates = /* @__PURE__ */ new WeakMap();
 class FSWatcher extends EventEmitter {
   constructor(filename, options, listener) {
     super();
     if (!options || typeof options !== "object")
       options = { persistent: true };
+    const persistent = options.persistent !== false;
     const cancellable = Gio.Cancellable.new();
     const file = Gio.File.new_for_path(filename);
     const watcher = file.monitor(Gio.FileMonitorFlags.NONE, cancellable);
     watcher.connect("changed", changed.bind(this));
+    let sourceId = null;
+    if (persistent) {
+      sourceId = GLib.timeout_add(GLib.PRIORITY_LOW, 2147483647, () => GLib.SOURCE_CONTINUE);
+    }
     privates.set(this, {
-      persistent: options.persistent,
+      persistent,
       cancellable,
+      sourceId,
       // even if never used later on, the monitor needs to be
       // attached to this instance or GJS reference counter
       // will ignore it and no watch will ever happen
       watcher
     });
-    if (listener)
-      this.on("change", listener);
+    if (listener) this.on("change", listener);
   }
   close() {
-    const { cancellable, persistent } = privates.get(this);
-    if (!cancellable.is_cancelled()) {
-      cancellable.cancel();
+    const priv = privates.get(this);
+    if (!priv.cancellable.is_cancelled()) {
+      priv.cancellable.cancel();
+      if (priv.sourceId !== null) {
+        GLib.source_remove(priv.sourceId);
+        priv.sourceId = null;
+      }
+    }
+  }
+  /**
+   * When called, requests that the Node.js event loop not exit so long as the
+   * FSWatcher is active. Calling ref() multiple times has no effect.
+   */
+  ref() {
+    const priv = privates.get(this);
+    if (!priv.persistent && !priv.cancellable.is_cancelled()) {
+      priv.persistent = true;
+      priv.sourceId = GLib.timeout_add(GLib.PRIORITY_LOW, 2147483647, () => GLib.SOURCE_CONTINUE);
+    }
+    return this;
+  }
+  /**
+   * When called, the active FSWatcher will not require the Node.js event loop
+   * to remain active. Calling unref() multiple times has no effect.
+   */
+  unref() {
+    const priv = privates.get(this);
+    if (priv.persistent) {
+      priv.persistent = false;
+      if (priv.sourceId !== null) {
+        GLib.source_remove(priv.sourceId);
+        priv.sourceId = null;
+      }
     }
+    return this;
   }
 }
 ;

package/lib/esm/index.js

@@ -13,7 +13,16 @@ import {
   openSync,
   realpathSync,
   symlinkSync,
-  lstatSync
+  lstatSync,
+  renameSync,
+  copyFileSync,
+  accessSync,
+  appendFileSync,
+  readlinkSync,
+  linkSync,
+  truncateSync,
+  chmodSync,
+  chownSync
 } from "./sync.js";
 import {
   open,
@@ -24,16 +33,86 @@ import {
   realpath,
   readdir,
   symlink,
-  lstat
+  lstat,
+  stat,
+  rename,
+  copyFile,
+  access,
+  appendFile,
+  readlink,
+  truncate,
+  chmod,
+  chown,
+  mkdir,
+  rmdir,
+  readFile,
+  writeFile,
+  unlink,
+  link
 } from "./callback.js";
 import FSWatcher from "./fs-watcher.js";
 import {
   createReadStream,
   ReadStream
 } from "./read-stream.js";
+import {
+  createWriteStream,
+  WriteStream
+} from "./write-stream.js";
 import * as promises from "./promises.js";
-var src_default = {
+import { Stats, BigIntStats } from "./stats.js";
+import { Dirent } from "./dirent.js";
+const constants = {
+  // File access constants
+  F_OK: 0,
+  R_OK: 4,
+  W_OK: 2,
+  X_OK: 1,
+  // File copy constants
+  COPYFILE_EXCL: 1,
+  COPYFILE_FICLONE: 2,
+  COPYFILE_FICLONE_FORCE: 4,
+  // File open constants
+  O_RDONLY: 0,
+  O_WRONLY: 1,
+  O_RDWR: 2,
+  O_CREAT: 64,
+  O_EXCL: 128,
+  O_TRUNC: 512,
+  O_APPEND: 1024,
+  O_SYNC: 1052672,
+  O_NONBLOCK: 2048,
+  O_DIRECTORY: 65536,
+  O_NOFOLLOW: 131072,
+  // File type constants
+  S_IFMT: 61440,
+  S_IFREG: 32768,
+  S_IFDIR: 16384,
+  S_IFCHR: 8192,
+  S_IFBLK: 24576,
+  S_IFIFO: 4096,
+  S_IFLNK: 40960,
+  S_IFSOCK: 49152,
+  // File mode constants
+  S_IRWXU: 448,
+  S_IRUSR: 256,
+  S_IWUSR: 128,
+  S_IXUSR: 64,
+  S_IRWXG: 56,
+  S_IRGRP: 32,
+  S_IWGRP: 16,
+  S_IXGRP: 8,
+  S_IRWXO: 7,
+  S_IROTH: 4,
+  S_IWOTH: 2,
+  S_IXOTH: 1
+};
+var index_default = {
   FSWatcher,
+  Stats,
+  BigIntStats,
+  Dirent,
+  constants,
   existsSync,
   readdirSync,
   readFileSync,
@@ -48,9 +127,20 @@ var src_default = {
   realpathSync,
   symlinkSync,
   lstatSync,
+  renameSync,
+  copyFileSync,
+  accessSync,
+  appendFileSync,
+  readlinkSync,
+  linkSync,
+  truncateSync,
+  chmodSync,
+  chownSync,
   watch,
   createReadStream,
   ReadStream,
+  createWriteStream,
+  WriteStream,
   promises,
   open,
   close,
@@ -60,36 +150,81 @@ var src_default = {
   realpath,
   readdir,
   symlink,
-  lstat
+  lstat,
+  stat,
+  rename,
+  copyFile,
+  access,
+  appendFile,
+  readlink,
+  truncate,
+  chmod,
+  chown,
+  mkdir,
+  rmdir,
+  readFile,
+  writeFile,
+  unlink,
+  link
 };
 export {
+  BigIntStats,
+  Dirent,
   FSWatcher,
   ReadStream,
+  Stats,
+  WriteStream,
+  access,
+  accessSync,
+  appendFile,
+  appendFileSync,
+  chmod,
+  chmodSync,
+  chown,
+  chownSync,
   close,
+  constants,
+  copyFile,
+  copyFileSync,
   createReadStream,
-  src_default as default,
+  createWriteStream,
+  index_default as default,
   existsSync,
+  link,
+  linkSync,
   lstat,
   lstatSync,
+  mkdir,
   mkdirSync,
   mkdtempSync,
   open,
   openSync,
   promises,
   read,
+  readFile,
   readFileSync,
   readdir,
   readdirSync,
+  readlink,
+  readlinkSync,
   realpath,
   realpathSync,
+  rename,
+  renameSync,
   rm,
   rmSync,
+  rmdir,
   rmdirSync,
+  stat,
   statSync,
   symlink,
   symlinkSync,
+  truncate,
+  truncateSync,
+  unlink,
   unlinkSync,
   watch,
   write,
+  writeFile,
   writeFileSync
 };