@k13engineering/linux-fuse 0.0.7 → 0.1.1

package/dist/lib/syscalls.js

@@ -1,33 +1,6 @@
-import { syscall, syscallNumbers } from "syscall-napi";
+import { syscallNumbers } from "syscall-napi";
 import { toCString } from "./abi.js";
-
-const read = ({
-  fd,
-  buffer
-}/*: {
-  fd: number;
-  buffer: Uint8Array;
-}*/) => {
-
-  return syscall({
-    syscallNumber: syscallNumbers.read,
-    args: [BigInt(fd), buffer, BigInt(buffer.length)]
-  });
-};
-
-const write = ({
-  fd,
-  buffer
-}/*: {
-  fd: number;
-  buffer: Uint8Array;
-}*/) => {
-
-  return syscall({
-    syscallNumber: syscallNumbers.write,
-    args: [BigInt(fd), buffer, BigInt(buffer.length)]
-  });
-};
+/*import type { TKernel } from "./kernel.ts";*/
 
 const toOptionalCStringArg = ({ value }/*: { value: string | undefined }*/) => {
   if (value === undefined) {
@@ -49,6 +22,20 @@ const toOptionalPointerArg = ({ value } /*: { value: string | Uint8Array | undef
   return value;
 };
 
+/*type TOpenatResult = {
+  errno: number;
+  fd: undefined;
+} | {
+  errno: undefined;
+  fd: number;
+};*/
+
+/*type TCloseResult = {
+  errno: number;
+} | {
+  errno: undefined;
+};*/
+
 /*type TFsopenResult = {
   errno: number;
   fsfd: undefined;
@@ -57,73 +44,12 @@ const toOptionalPointerArg = ({ value } /*: { value: string | Uint8Array | undef
   fsfd: number;
 };*/
 
-const fsopen = ({
-  fileSystemName,
-  flags,
-}/*: {
-  fileSystemName: string;
-  flags: bigint;
-}*/)/*: TFsopenResult*/ => {
-  const { errno, ret } = syscall({
-    syscallNumber: syscallNumbers.fsopen,
-    args: [
-      toCString(fileSystemName),
-      flags,
-    ],
-  });
-
-  if (errno !== undefined) {
-    return {
-      errno,
-      fsfd: undefined,
-    };
-  }
-
-  return {
-    errno: undefined,
-    fsfd: Number(ret),
-  };
-};
-
 /*type TFsConfigResult = {
   errno: number;
 } | {
   errno: undefined;
 };*/
 
-const fsconfig = ({
-  fd,
-  command,
-  key,
-  value,
-  auxiliaryValue,
-}/*: {
-  fd: number;
-  command: bigint;
-  key: string | undefined;
-  value: string | Uint8Array | undefined;
-  auxiliaryValue: number;
-}*/)/*: TFsConfigResult*/ => {
-  const { errno } = syscall({
-    syscallNumber: syscallNumbers.fsconfig,
-    args: [
-      BigInt(fd),
-      command,
-      toOptionalCStringArg({ value: key }),
-      toOptionalPointerArg({ value }),
-      BigInt(auxiliaryValue),
-    ],
-  });
-
-  if (errno !== undefined) {
-    throw Error(`fsconfig syscall failed with errno ${errno}`);
-  }
-
-  return {
-    errno: undefined,
-  };
-};
-
 /*type TFsMountResult = {
   errno: number;
   mountFd: undefined;
@@ -132,37 +58,6 @@ const fsconfig = ({
   mountFd: number;
 };*/
 
-const fsmount = ({
-  fd,
-  flags,
-  mountAttributesBitmask,
-}/*: {
-  fd: number;
-  flags: bigint;
-  mountAttributesBitmask: bigint;
-}*/)/*: TFsMountResult*/ => {
-  const { errno, ret } = syscall({
-    syscallNumber: syscallNumbers.fsmount,
-    args: [
-      BigInt(fd),
-      flags,
-      mountAttributesBitmask,
-    ],
-  });
-
-  if (errno !== undefined) {
-    return {
-      errno,
-      mountFd: undefined,
-    };
-  }
-
-  return {
-    errno: undefined,
-    mountFd: Number(ret),
-  };
-};
-
 /*type TMoveMountResult = {
   errno: number;
 } | {
@@ -175,101 +70,289 @@ const fsmount = ({
   errno: undefined;
 };*/
 
-const move_mount = ({
-  fromFd,
-  fromPath,
-  toFd,
-  toPath,
-  flags,
-}/*: {
-  fromFd: number;
-  fromPath?: string;
-  toFd: number;
-  toPath: string | undefined;
-  flags: bigint;
-}*/)/*: TMoveMountResult*/ => {
-  const { errno } = syscall({
-    syscallNumber: syscallNumbers.move_mount,
-    args: [
-      BigInt(fromFd),
-      toOptionalCStringArg({ value: fromPath }),
-      BigInt(toFd),
-      toOptionalCStringArg({ value: toPath }),
-      flags,
-    ],
-  });
-
-  if (errno !== undefined) {
-    return {
-      errno,
-    };
-  }
-
-  return {
-    errno: undefined,
-  };
-};
-
 /*type TUmountResult = {
   errno: number;
 } | {
   errno: undefined;
 };*/
 
-const umount = ({
-  target,
-  flags,
-}/*: {
-  target: string;
-  flags: bigint;
-}*/)/*: TUmountResult*/ => {
-  const { errno } = syscall({
-    syscallNumber: syscallNumbers.umount2,
-    args: [
-      toCString(target),
-      flags,
-    ],
-  });
-
-  if (errno !== undefined) {
+const createSyscalls = ({ kernel }/*: { kernel: TKernel }*/) => {
+
+  const read = ({
+    fd,
+    buffer
+  }/*: {
+    fd: number;
+    buffer: Uint8Array;
+  }*/) => {
+
+    return kernel.syscall({
+      syscallNumber: syscallNumbers.read,
+      args: [BigInt(fd), buffer, BigInt(buffer.length)]
+    });
+  };
+
+  const write = ({
+    fd,
+    buffer
+  }/*: {
+    fd: number;
+    buffer: Uint8Array;
+  }*/) => {
+
+    return kernel.syscall({
+      syscallNumber: syscallNumbers.write,
+      args: [BigInt(fd), buffer, BigInt(buffer.length)]
+    });
+  };
+
+  const openat = ({
+    dirFd,
+    path,
+    flags,
+    mode,
+  }/*: {
+    dirFd: number;
+    path: string;
+    flags: number;
+    mode: number;
+  }*/)/*: TOpenatResult*/ => {
+    const { errno, ret } = kernel.syscall({
+      syscallNumber: syscallNumbers.openat,
+      args: [
+        BigInt(dirFd),
+        toCString(path),
+        BigInt(flags),
+        BigInt(mode),
+      ],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+        fd: undefined,
+      };
+    }
+
     return {
-      errno,
+      errno: undefined,
+      fd: Number(ret),
     };
-  }
+  };
 
-  return {
-    errno: undefined,
+  const close = ({ fd }/*: { fd: number }*/)/*: TCloseResult*/ => {
+    const { errno } = kernel.syscall({
+      syscallNumber: syscallNumbers.close,
+      args: [BigInt(fd)],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+      };
+    }
+
+    return {
+      errno: undefined,
+    };
   };
-};
 
-const fchdir = ({
-  fd,
-}/*: {
-  fd: number;
-}*/)/*: TFchdirResult*/ => {
-  const { errno } = syscall({
-    syscallNumber: syscallNumbers.fchdir,
-    args: [BigInt(fd)],
-  });
+  const fsopen = ({
+    fileSystemName,
+    flags,
+  }/*: {
+    fileSystemName: string;
+    flags: bigint;
+  }*/)/*: TFsopenResult*/ => {
+    const { errno, ret } = kernel.syscall({
+      syscallNumber: syscallNumbers.fsopen,
+      args: [
+        toCString(fileSystemName),
+        flags,
+      ],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+        fsfd: undefined,
+      };
+    }
 
-  if (errno !== undefined) {
     return {
-      errno,
+      errno: undefined,
+      fsfd: Number(ret),
     };
-  }
+  };
+
+  const fsconfig = ({
+    fd,
+    command,
+    key,
+    value,
+    auxiliaryValue,
+  }/*: {
+    fd: number;
+    command: bigint;
+    key: string | undefined;
+    value: string | Uint8Array | undefined;
+    auxiliaryValue: number;
+  }*/)/*: TFsConfigResult*/ => {
+    const { errno } = kernel.syscall({
+      syscallNumber: syscallNumbers.fsconfig,
+      args: [
+        BigInt(fd),
+        command,
+        toOptionalCStringArg({ value: key }),
+        toOptionalPointerArg({ value }),
+        BigInt(auxiliaryValue),
+      ],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+      };
+    }
+
+    return {
+      errno: undefined,
+    };
+  };
+
+  const fsmount = ({
+    fd,
+    flags,
+    mountAttributesBitmask,
+  }/*: {
+    fd: number;
+    flags: bigint;
+    mountAttributesBitmask: bigint;
+  }*/)/*: TFsMountResult*/ => {
+    const { errno, ret } = kernel.syscall({
+      syscallNumber: syscallNumbers.fsmount,
+      args: [
+        BigInt(fd),
+        flags,
+        mountAttributesBitmask,
+      ],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+        mountFd: undefined,
+      };
+    }
+
+    return {
+      errno: undefined,
+      mountFd: Number(ret),
+    };
+  };
+
+  const move_mount = ({
+    fromFd,
+    fromPath,
+    toFd,
+    toPath,
+    flags,
+  }/*: {
+    fromFd: number;
+    fromPath?: string;
+    toFd: number;
+    toPath: string | undefined;
+    flags: bigint;
+  }*/)/*: TMoveMountResult*/ => {
+    const { errno } = kernel.syscall({
+      syscallNumber: syscallNumbers.move_mount,
+      args: [
+        BigInt(fromFd),
+        toOptionalCStringArg({ value: fromPath }),
+        BigInt(toFd),
+        toOptionalCStringArg({ value: toPath }),
+        flags,
+      ],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+      };
+    }
+
+    return {
+      errno: undefined,
+    };
+  };
+
+  const umount = ({
+    target,
+    flags,
+  }/*: {
+    target: string;
+    flags: bigint;
+  }*/)/*: TUmountResult*/ => {
+    const { errno } = kernel.syscall({
+      syscallNumber: syscallNumbers.umount2,
+      args: [
+        toCString(target),
+        flags,
+      ],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+      };
+    }
+
+    return {
+      errno: undefined,
+    };
+  };
+
+  const fchdir = ({
+    fd,
+  }/*: {
+    fd: number;
+  }*/)/*: TFchdirResult*/ => {
+    const { errno } = kernel.syscall({
+      syscallNumber: syscallNumbers.fchdir,
+      args: [BigInt(fd)],
+    });
+
+    if (errno !== undefined) {
+      return {
+        errno,
+      };
+    }
+
+    return {
+      errno: undefined,
+    };
+  };
 
   return {
-    errno: undefined,
+    read,
+    write,
+    openat,
+    close,
+    fsopen,
+    fsconfig,
+    fsmount,
+    move_mount,
+    umount,
+    fchdir,
   };
 };
 
+/*type TSyscalls = ReturnType<typeof createSyscalls>;*/
+
 export {
-  read,
-  write,
-  fsopen,
-  fsconfig,
-  fsmount,
-  move_mount,
-  fchdir,
-  umount
+  createSyscalls,
 };
+
+/*export type {
+  TSyscalls,
+};*/

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.7",
+  "version": "0.1.1",
   "name": "@k13engineering/linux-fuse",
   "type": "module",
   "description": "linux-fuse",
@@ -10,17 +10,17 @@
   "dependencies": {
     "@k13engineering/uv-poll": "^0.0.6",
     "syscall-napi": "^0.2.2",
-    "ya-struct": "^0.0.10"
+    "ya-struct": "^0.0.17"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@k13engineering/eslint-rules": "^0.0.5",
+    "@k13engineering/eslint-rules": "^0.0.6",
     "@k13engineering/releasetool": "^0.0.5",
     "@types/mocha": "^10.0.10",
     "@types/node": "^25.6.0",
     "c8": "^11.0.0",
     "deno-node": "^0.0.12",
-    "mocha": "^11.7.5",
+    "mocha": "^12.0.2",
     "typescript": "^6.0.3"
   },
   "scripts": {},