koffi 0.9.8 → 0.9.11

package/CMakeLists.txt

@@ -0,0 +1,111 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see https://www.gnu.org/licenses/.
+
+cmake_minimum_required(VERSION 3.11)
+project(koffi C CXX ASM)
+
+find_package(CNoke)
+
+set(CMAKE_CXX_STANDARD 17)
+if(MSVC)
+    enable_language(ASM_MASM)
+endif()
+
+# ---- Koffi ----
+
+set(KOFFI_SRC
+    src/call_arm32.cc
+    src/call_arm64.cc
+    src/call_x64_sysv.cc
+    src/call_x64_win.cc
+    src/call_x86.cc
+    src/ffi.cc
+    src/util.cc
+    vendor/libcc/libcc.cc
+)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    if(WIN32)
+        list(APPEND KOFFI_SRC src/call_x64_win_fwd.asm)
+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+        list(APPEND KOFFI_SRC src/call_arm64_fwd.S)
+    else()
+        list(APPEND KOFFI_SRC src/call_x64_sysv_fwd.S)
+    endif()
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    if(WIN32)
+        list(APPEND KOFFI_SRC src/call_x86_fwd.asm)
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86|x86|AMD64")
+        list(APPEND KOFFI_SRC src/call_x86_fwd.S)
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv[678]l")
+        list(APPEND KOFFI_SRC src/call_arm32_fwd.S)
+    endif()
+endif()
+
+add_node_addon(NAME koffi SOURCES ${KOFFI_SRC})
+target_include_directories(koffi PRIVATE . vendor/node-addon-api)
+
+target_compile_definitions(koffi PRIVATE FELIX_TARGET=koffi NAPI_DISABLE_CPP_EXCEPTIONS)
+if(WIN32)
+    target_compile_definitions(koffi PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+    target_link_libraries(koffi PRIVATE ws2_32)
+endif()
+if(MSVC)
+    target_compile_options(koffi PRIVATE /wd4200)
+else()
+    target_compile_options(koffi PRIVATE -fno-exceptions -Wno-missing-field-initializers
+                                         -fno-strict-aliasing)
+endif()
+
+# ---- Raylib ----
+
+add_library(raylib SHARED
+    vendor/raylib/src/rcore.c
+    vendor/raylib/src/rshapes.c
+    vendor/raylib/src/rtextures.c
+    vendor/raylib/src/rtext.c
+    vendor/raylib/src/rmodels.c
+    vendor/raylib/src/utils.c
+    vendor/raylib/src/rglfw.c
+    vendor/raylib/src/raudio.c
+)
+set_target_properties(raylib PROPERTIES PREFIX "")
+target_include_directories(raylib PRIVATE vendor/raylib/src/external/glfw/include)
+target_compile_definitions(raylib PRIVATE PLATFORM_DESKTOP GRAPHICS_API_OPENGL_21
+                                          BUILD_LIBTYPE_SHARED NDEBUG)
+
+if(WIN32)
+    target_compile_definitions(raylib PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+    target_link_libraries(raylib PRIVATE winmm)
+endif()
+if(MSVC)
+    target_compile_options(raylib PRIVATE /wd4244 /wd4305)
+else()
+    target_compile_options(raylib PRIVATE -Wno-sign-compare -Wno-old-style-declaration
+                                          -Wno-unused-function -Wno-missing-field-initializers
+                                          -Wno-unused-value -Wno-implicit-fallthrough -Wno-stringop-overflow
+                                          -Wno-unused-result)
+endif()
+
+# ---- SQLite ----
+
+add_library(sqlite3 SHARED vendor/sqlite3/sqlite3.c)
+set_target_properties(sqlite3 PROPERTIES PREFIX "")
+
+if(WIN32)
+    target_compile_definitions(sqlite3 PRIVATE SQLITE_API=__declspec\(dllexport\))
+endif()
+
+# ---- Misc ----
+
+add_library(misc SHARED test/tests/misc.c)
+set_target_properties(misc PROPERTIES PREFIX "")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "0.9.8",
+  "version": "0.9.11",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",
@@ -18,10 +18,13 @@
   "author": "Niels Martignène <niels.martignene@protonmail.com>",
   "main": "build/koffi.node",
   "scripts": {
-    "install": "node ../cnoke/cnoke.js",
+    "install": "cnoke.js",
     "test": "node test/test.js"
   },
   "license": "AGPL-3.0",
+  "dependencies": {
+    "cnoke": "^0.9.22"
+  },
   "devDependencies": {
     "chalk": "^4.1.2",
     "node-ssh": "^12.0.3"
@@ -34,6 +37,7 @@
     "test/test.js",
     "vendor",
     "LICENSE.txt",
-    "README.md"
+    "README.md",
+    "CMakeLists.txt"
   ]
 }

package/src/ffi.cc

@@ -166,7 +166,7 @@ static Napi::Value CreateHandleType(const Napi::CallbackInfo &info)
     {
         RecordMember member = {};
 
-        member.name = "ptr";
+        member.name = "value";
         member.type = instance->types_map.FindValue("void *", nullptr);
         RG_ASSERT(member.type);
 

package/test/registry/machines.json

@@ -27,7 +27,8 @@
                 "build": "npm install --production",
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
-                    "Test Misc": "node test/tests/misc.js"
+                    "Test Misc": "node test/tests/misc.js",
+                    "Test SQLite": "node test/tests/sqlite.js"
                 }
             }
         }
@@ -61,7 +62,8 @@
                 "build": "npm install --production",
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
-                    "Test Misc": "node test/tests/misc.js"
+                    "Test Misc": "node test/tests/misc.js",
+                    "Test SQLite": "node test/tests/sqlite.js"
                 }
             }
         }
@@ -95,7 +97,8 @@
                 "build": "npm install --production",
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
-                    "Test Misc": "node test/tests/misc.js"
+                    "Test Misc": "node test/tests/misc.js",
+                    "Test SQLite": "node test/tests/sqlite.js"
                 }
             }
         }
@@ -129,7 +132,8 @@
                 "build": "npm install --production",
                 "commands": {
                     "Test Raylib": "xvfb-run node test/tests/raylib.js",
-                    "Test Misc": "node test/tests/misc.js"
+                    "Test Misc": "node test/tests/misc.js",
+                    "Test SQLite": "node test/tests/sqlite.js"
                 }
             }
         }
@@ -168,7 +172,8 @@
                 "build": "C:\\Node32\\node32.cmd npm install --production",
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node32\\node32.cmd node test/tests/raylib.js",
-                    "Test Misc": "C:\\Node32\\node32.cmd node test/tests/misc.js"
+                    "Test Misc": "C:\\Node32\\node32.cmd node test/tests/misc.js",
+                    "Test SQLite": "C:\\Node32\\node32.cmd node test/tests/sqlite.js"
                 }
             },
 
@@ -177,7 +182,8 @@
                 "build": "C:\\Node64\\node64.cmd npm install --production",
                 "commands": {
                     "Test Raylib": "seatsh C:\\Node64\\node64.cmd node test/tests/raylib.js",
-                    "Test Misc": "C:\\Node64\\node64.cmd node test/tests/misc.js"
+                    "Test Misc": "C:\\Node64\\node64.cmd node test/tests/misc.js",
+                    "Test SQLite": "C:\\Node64\\node64.cmd node test/tests/sqlite.js"
                 }
             }
         }

package/test/test.js

@@ -107,6 +107,14 @@ async function main() {
         }
     }
 
+    // Sanity checks
+    if (parseInt(process.versions.node, 10) < 16)
+        throw new Error('Please use Node version >= 16');
+    if (spawnSync('ssh', ['-V']).status !== 0)
+        throw new Error('Missing ssh binary in PATH');
+    if (spawnSync('sshpass', ['-V']).status !== 0)
+        throw new Error('Missing sshpass binary in PATH');
+
     // Load machine registry
     let machines_map;
     {
@@ -414,7 +422,7 @@ async function ssh() {
     let args = [
         '-p' + machine.info.password,
         'ssh', '-o', 'StrictHostKeyChecking=no',
-               '-o', 'UserKnownHostsFile=' + (process.platform == 'win32' ? 'NUL' : '/dev/null'),
+               '-o', 'UserKnownHostsFile=' + (process.platform == 'win32' ? '\\\\.\\NUL' : '/dev/null'),
                '-p', machine.info.ssh_port, machine.info.username + '@127.0.0.1'
     ];
 
@@ -526,7 +534,7 @@ async function boot(machine, dirname, detach) {
 
     if (machine.qemu.accelerate)
         args.push('-accel', machine.qemu.accelerate);
-    args.push('-display', 'none');
+    // args.push('-display', 'none');
 
     try {
         let binary = qemu_prefix + machine.qemu.binary + (process.platform == 'win32' ? '.exe' : '');

package/test/tests/sqlite.js

@@ -0,0 +1,101 @@
+#!/usr/bin/env node
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see https://www.gnu.org/licenses/.
+
+const crypto = require('crypto');
+const koffi = require('../../build/koffi.node');
+const assert = require('assert');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const sqlite3_db = koffi.handle('sqlite3_db');
+const sqlite3_stmt = koffi.handle('sqlite3_stmt');
+
+main();
+
+async function main() {
+    try {
+        await test();
+        console.log('Success!');
+    } catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+}
+
+async function test() {
+    let lib_filename = path.dirname(__filename) + '/../../build/sqlite3' +
+                       (process.platform == 'win32' ? '.dll' : '.so');
+
+    let sqlite3 = koffi.load(lib_filename, {
+        sqlite3_open_v2: ['int', ['string', koffi.out(koffi.pointer(sqlite3_db)), 'int', 'string']],
+        sqlite3_exec: ['int', [sqlite3_db, 'string', 'void *', 'void *', 'void *']],
+        sqlite3_prepare_v2: ['int', [sqlite3_db, 'string', 'int', koffi.out(koffi.pointer(sqlite3_stmt)), 'string']],
+        sqlite3_reset: ['int', [sqlite3_stmt]],
+        sqlite3_bind_text: ['int', [sqlite3_stmt, 'int', 'string', 'int', 'void *']],
+        sqlite3_bind_int: ['int', [sqlite3_stmt, 'int', 'int']],
+        sqlite3_step: ['int', [sqlite3_stmt]],
+        sqlite3_finalize: ['int', [sqlite3_stmt]],
+        sqlite3_close_v2: ['int', [sqlite3_db]]
+    });
+
+    let filename = create_temporary_file(path.join(os.tmpdir(), 'test_sqlite'));
+    let db = {};
+
+    try {
+        if (sqlite3.sqlite3_open_v2(filename, db, 0x2 | 0x4, null) != 0)
+            throw new Error('Failed to open database');
+        if (sqlite3.sqlite3_exec(db, 'CREATE TABLE foo (id INTEGER PRIMARY KEY, bar TEXT, value INT);', null, null, null) != 0)
+            throw new Error('Failed to create table');
+
+        let stmt = {};
+        if (sqlite3.sqlite3_prepare_v2(db, "INSERT INTO foo (bar, value) VALUES (?1, ?2)", -1, stmt, null) != 0)
+            throw new Error('Failed to prepare insert statement for table foo');
+        for (let i = 0; i < 200; i++) {
+            sqlite3.sqlite3_reset(stmt);
+
+            sqlite3.sqlite3_bind_text(stmt, 1, `TXT ${i}`, -1, null);
+            sqlite3.sqlite3_bind_int(stmt, 2, i * 2);
+
+            if (sqlite3.sqlite3_step(stmt) != 101)
+                throw new Erorr('Failed to insert new test row');
+        }
+        sqlite3.sqlite3_finalize(stmt);
+    } finally {
+        sqlite3.sqlite3_close_v2(db);
+        fs.unlinkSync(filename);
+    }
+}
+
+function create_temporary_file(prefix) {
+    let buf = Buffer.allocUnsafe(4);
+
+    for (;;) {
+        try {
+            crypto.randomFillSync(buf);
+
+            let suffix = buf.toString('hex').padStart(8, '0');
+            let filename = `${prefix}.${suffix}`;
+
+            let file = fs.createWriteStream(filename, { flags: 'wx', mode: 0o644 });
+            file.close();
+
+            return filename;
+        } catch (err) {
+            if (err.code != 'EEXIST')
+                throw err;
+        }
+    }
+}