syscall-napi 0.0.6 → 0.0.8

package/{.eslintrc → eslint.config.js}

@@ -1,19 +1,10 @@
-{
-  "parserOptions": {
-    "ecmaVersion": 2021,
-    "sourceType": "module",
-    "requireConfigFile": false
-  },
-  "env": {
-    "node": true,
-    "es2020": true
-  },
-  "rules": {
+export default {
+  rules: {
     "global-require": "off",
     "quote-props": ["warn", "consistent-as-needed"],
-    "comma-dangle": ["error", {"arrays": "always-multiline", "objects": "always-multiline", "functions": "never"}],
-    "id-length": ["error", {"min": 2, "properties": "always", "exceptions": ["i"]}],
-    "quotes": ["error", "double", { "allowTemplateLiterals": true }],
+    "comma-dangle": ["error", { arrays: "always-multiline", objects: "always-multiline", functions: "never" }],
+    "id-length": ["error", { min: 2, properties: "always", exceptions: ["i"] }],
+    "quotes": ["error", "double", { allowTemplateLiterals: true }],
     "no-plusplus": "error",
     "no-nested-ternary": "error",
     "no-multiple-empty-lines": "error",
@@ -26,14 +17,14 @@
     "no-import-assign": "error",
     "no-multi-assign": "error",
     "keyword-spacing": "error",
-    "max-len": [ "warn", { "code": 140 } ],
+    "max-len": [ "warn", { code: 140 } ],
     "max-params": ["error", 4],
     "max-statements": ["error", 15],
     "no-loss-of-precision": "error",
     "no-unreachable-loop": "error",
     "require-atomic-updates": "error",
     "complexity": ["error", 4],
-    "max-statements-per-line": ["error", { "max": 1 }],
+    "max-statements-per-line": ["error", { max: 1 }],
     "no-tabs": "error",
     "no-negated-condition": "error",
     "no-use-before-define": "error",
@@ -50,10 +41,10 @@
     "no-new-object": "error",
     "no-new-wrappers": "error",
     "no-useless-concat": "error",
-    "no-unused-vars": ["error", {"ignoreRestSiblings": true}],
+    "no-unused-vars": ["error", { ignoreRestSiblings: true }],
     "array-bracket-newline": ["error", "consistent"],
     "func-names": ["error", "never"],
-    "func-style": ["error", "expression", { "allowArrowFunctions": true }],
+    "func-style": ["error", "expression", { allowArrowFunctions: true }],
     "max-depth": ["error", 4],
     "arrow-parens": "error",
     "no-confusing-arrow": "error",
@@ -77,15 +68,14 @@
     "yoda": "error",
     "indent": ["error", 2],
     "object-curly-spacing": [ "error", "always" ],
-    "object-curly-newline": ["error", { "consistent": true, "multiline": true }],
+    "object-curly-newline": ["error", { consistent: true, multiline: true }],
     "space-before-blocks": "error",
     "space-before-function-paren": [ "error", "always" ],
     "spaced-comment": "error",
     "no-whitespace-before-property": "error",
-    "brace-style": ["error", "1tbs", { "allowSingleLine": false }],
+    "brace-style": ["error", "1tbs", { allowSingleLine: false }],
     "eol-last": ["error", "always"],
     "func-call-spacing": ["error", "never"],
-    "semi": ["error", "always"]
+    "semi": ["error", "always"],
   },
-  "extends": "eslint:recommended"
-}
+};

package/lib/index.js

@@ -7,7 +7,7 @@ let native;
 
 try {
   native = require("../build/Release/syscall.node");
-} catch (ex) {
+} catch {
   native = require("../build/Debug/syscall.node");
 }
 

package/native/napilib.h

@@ -30,22 +30,6 @@ static napi_status napilib_maybe_throw_by_status(napi_env env, napi_status statu
 #define NAPILIB_CHECK(x) do { napi_status ret = x; if(ret != napi_ok) { return napilib_maybe_throw_by_status(env, ret); } } while(0)
 #define NAPILIB_CHECK_GOTO_FAIL(x) if((x) != napi_ok) { goto fail; }
 
-static napi_status napilib_create_error_by_errno(napi_env env, int err, napi_value* error) {
-  napi_value code;
-  napi_value message;
-  char c_message[512];
-
-  const char* orig_err = strerror(err);
-
-  snprintf(c_message, sizeof(c_message), "%s", orig_err);
-
-  NAPILIB_CHECK(napi_create_string_utf8(env, "", NAPI_AUTO_LENGTH, &code));
-  NAPILIB_CHECK(napi_create_string_utf8(env, c_message, NAPI_AUTO_LENGTH, &message));
-  NAPILIB_CHECK(napi_create_error(env, code, message, error));
-
-  return napi_ok;
-}
-
 static napi_status napilib_throw_error_by_errno(napi_env env, int err) {
   NAPILIB_CHECK(napi_throw_error(env, "", strerror(err)));
   return napi_pending_exception;

package/native/syscall.c

@@ -11,7 +11,6 @@ struct syscall_ctx {
   long num;
   long native_args[7];
   long res;
-  long error_code;
   napi_ref arg_refs[7];
 };
 
@@ -26,17 +25,14 @@ static void syscall_work(void* opaque) {
                      ctx->native_args[4],
                      ctx->native_args[5],
                      ctx->native_args[6]);
-  if(ctx->res < 0) {
-    ctx->error_code = errno;
-  } else {
-    ctx->error_code = 0;
-  }
 }
 
 static napi_status syscall_done(napi_env env, void* opaque, napi_deferred deferred) {
   struct syscall_ctx* ctx = (struct syscall_ctx*) opaque;
   long res = ctx->res;
-  long error_code = ctx->error_code;
+  napi_value result;
+  napi_value js_errno;
+  napi_value js_ret;
   unsigned int i;
 
   for(i = 0; i < sizeof(ctx->arg_refs) / sizeof(ctx->arg_refs[0]); i += 1) {
@@ -48,18 +44,21 @@ static napi_status syscall_done(napi_env env, void* opaque, napi_deferred deferr
 
   free(ctx);
 
-  if(res < 0) {
-    napi_value error;
+  NAPILIB_CHECK(napi_create_object(env, &result));
 
-    NAPILIB_CHECK(napilib_create_error_by_errno(env, error_code, &error));
-    NAPILIB_CHECK(napi_reject_deferred(env, deferred, error));
+  if (res < 0) {
+    NAPILIB_CHECK(napi_create_int32(env, errno, &js_errno));
+    NAPILIB_CHECK(napi_set_named_property(env, result, "errno", js_errno));
   } else {
-    napi_value result;
+    NAPILIB_CHECK(napi_create_int32(env, 0, &js_errno));
+    NAPILIB_CHECK(napi_set_named_property(env, result, "errno", js_errno));
 
-    NAPILIB_CHECK(napi_create_bigint_int64(env, res, &result));
-    NAPILIB_CHECK(napi_resolve_deferred(env, deferred, result));
+    NAPILIB_CHECK(napi_create_bigint_int64(env, res, &js_ret));
+    NAPILIB_CHECK(napi_set_named_property(env, result, "ret", js_ret));
   }
 
+  NAPILIB_CHECK(napi_resolve_deferred(env, deferred, result));
+
   return napi_ok;
 }
 
@@ -107,8 +106,11 @@ static napi_status syscall_async_entry(napi_env env, napi_value* args, int arg_c
   return napi_ok;
 }
 
-static napi_status syscall_sync_entry(napi_env env, napi_value* args, int arg_count, napi_value* result) {
+static napi_status syscall_sync_entry(napi_env env, napi_value* args, int arg_count, napi_value* result_ptr) {
   int i;
+  napi_value result;
+  napi_value js_errno;
+  napi_value js_ret;
   struct syscall_ctx ctx;
   memset(&ctx, 0, sizeof(ctx));
 
@@ -147,14 +149,21 @@ static napi_status syscall_sync_entry(napi_env env, napi_value* args, int arg_co
                     ctx.native_args[5],
                     ctx.native_args[6]);
 
-  if(ctx.res < 0) {
-    napi_value error;
-    NAPILIB_CHECK(napilib_create_error_by_errno(env, errno, &error));
-    NAPILIB_CHECK(napi_throw(env, error));
+  NAPILIB_CHECK(napi_create_object(env, &result));
+
+  if (ctx.res < 0) {
+    NAPILIB_CHECK(napi_create_int32(env, errno, &js_errno));
+    NAPILIB_CHECK(napi_set_named_property(env, result, "errno", js_errno));
   } else {
-    NAPILIB_CHECK(napi_create_bigint_int64(env, ctx.res, result));
+    NAPILIB_CHECK(napi_create_int32(env, 0, &js_errno));
+    NAPILIB_CHECK(napi_set_named_property(env, result, "errno", js_errno));
+
+    NAPILIB_CHECK(napi_create_bigint_int64(env, ctx.res, &js_ret));
+    NAPILIB_CHECK(napi_set_named_property(env, result, "ret", js_ret));
   }
 
+  *result_ptr = result;
+  
   return napi_ok;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "syscall-napi",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Node.js module to perform promise-based asynchronous syscalls",
   "main": "lib/index.js",
   "scripts": {
@@ -20,9 +20,11 @@
   },
   "homepage": "https://github.com/k13-engineering/node-syscall-napi#readme",
   "devDependencies": {
-    "c8": "^7.9.0",
-    "eslint": "^7.32.0",
-    "mocha": "^9.1.1",
-    "node-archibald": "^0.0.5"
+    "c8": "^10.1.2",
+    "eslint": "^9.7.0",
+    "mocha": "^10.6.0"
+  },
+  "dependencies": {
+    "node-archibald": "^0.0.6"
   }
 }

package/test/basic.js

@@ -6,12 +6,14 @@ import sys from "../lib/index.js";
 
 describe("basic", () => {
   it("should run getpid() correctly [async]", async () => {
-    const pid = await sys.syscall(sys.__NR_getpid);
+    const { errno, ret: pid } = await sys.syscall(sys.__NR_getpid);
+    assert.equal(errno, 0);
     assert.equal(pid, process.pid);
   });
 
   it("should run getpid() correctly [sync]", () => {
-    const pid = sys.syscall.sync(sys.__NR_getpid);
+    const { errno, ret: pid } = sys.syscall.sync(sys.__NR_getpid);
+    assert.equal(errno, 0);
     assert.equal(pid, process.pid);
   });
 });