koffi 0.9.18 → 0.9.19

package/CMakeLists.txt

@@ -83,10 +83,6 @@ target_include_directories(raylib PRIVATE vendor/raylib/src/external/glfw/includ
 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()
@@ -96,6 +92,22 @@ else()
                                           -Wno-unused-result)
 endif()
 
+if(WIN32)
+    target_compile_definitions(raylib PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+    target_link_libraries(raylib PRIVATE winmm)
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "BSD")
+    target_include_directories(raylib PRIVATE /usr/local/include)
+endif()
+
+if(APPLE)
+    target_compile_options(raylib PRIVATE -Wno-unknown-warning-option -Wno-macro-redefined)
+    target_compile_definitions(raylib PRIVATE GL_SILENCE_DEPRECATION)
+    set_source_files_properties(vendor/raylib/src/rglfw.c PROPERTIES COMPILE_FLAGS "-x objective-c")
+    target_link_libraries(raylib PRIVATE "-framework Cocoa" "-framework IOKit" "-framework CoreFoundation" "-framework OpenGL")
+endif()
+
 # ---- SQLite ----
 
 add_library(sqlite3 SHARED vendor/sqlite3/sqlite3.c)

package/README.md

@@ -11,7 +11,7 @@
 
 Koffi is a fast and easy-to-use FFI module for Node.js, with support for complex data types such as structs.
 
-The following platforms __are supported__ at the moment:
+The following platforms __are officially supported and tested__ at the moment:
 
 * Windows x86 *(cdecl, stdcall, fastcall)*
 * Windows x86_64
@@ -19,13 +19,21 @@ The following platforms __are supported__ at the moment:
 * Linux x86_64
 * Linux ARM32+VFP Little Endian
 * Linux ARM64 Little Endian
+* FreeBSD x86
+* FreeBSD x86_64
+* FreeBSD ARM64 Little Endian
+* macOS x86_64
 
-The following platforms are __not yet supported__ but will be soon:
+The following platforms will __soon be officially supported__:
 
-* macOS x86_64
 * macOS ARM64
-* FreeBSD/NetBSD/OpenBSD x86_64
-* FreeBSD/NetBSD/OpenBSD ARM64
+
+The following platforms __may be supported__ but are not tested:
+
+* NetBSD x86_64
+* NetBSD ARM64
+* OpenBSD x86_64
+* OpenBSD ARM64
 
 This is still in development, bugs are to expected. More tests will come in the near future.
 
@@ -123,7 +131,7 @@ const Font = koffi.struct('Font', {
 });
 
 // Fix the path to Raylib DLL if needed
-let lib = koffi.load('build/raylib' + (process.platform == 'win32' ? '.dll' : '.so'));
+let lib = koffi.load('build/raylib' + koffi.extension);
 
 const InitWindow = lib.cdecl('InitWindow', 'void', ['int', 'int', 'string']);
 const SetTargetFPS = lib.cdecl('SetTargetFPS', 'void', ['int']);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",

package/src/call_x64_sysv_fwd.S

@@ -11,20 +11,26 @@
 // 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/.
 
+#ifdef __APPLE__
+    #define SYMBOL(Symbol) _ ## Symbol
+#else
+    #define SYMBOL(Symbol) Symbol
+#endif
+
 // These five are the same, but they differ (in the C side) by their return type.
 // Unlike the five next functions, these ones don't forward XMM argument registers.
-.global ForwardCallGG
-.global ForwardCallF
-.global ForwardCallDG
-.global ForwardCallGD
-.global ForwardCallDD
+.global SYMBOL(ForwardCallGG)
+.global SYMBOL(ForwardCallF)
+.global SYMBOL(ForwardCallDG)
+.global SYMBOL(ForwardCallGD)
+.global SYMBOL(ForwardCallDD)
 
 // The X variants are slightly slower, and are used when XMM arguments must be forwarded.
-.global ForwardCallXGG
-.global ForwardCallXF
-.global ForwardCallXDG
-.global ForwardCallXGD
-.global ForwardCallXDD
+.global SYMBOL(ForwardCallXGG)
+.global SYMBOL(ForwardCallXF)
+.global SYMBOL(ForwardCallXDG)
+.global SYMBOL(ForwardCallXGD)
+.global SYMBOL(ForwardCallXDD)
 
 // Copy function pointer to RAX, in order to save it through argument forwarding.
 // Save RSP in RBX (non-volatile), and use carefully assembled stack provided by caller.
@@ -37,8 +43,7 @@
     .cfi_def_cfa rsp, 16
     movq %rsp, %rbx
     .cfi_def_cfa rbx, 16
-    movq %rsi, %rsp
-    addq $112, %rsp
+    leaq 112(%rsi), %rsp
 .endm
 
 // Call native function.
@@ -75,56 +80,56 @@
     movsd 48(%rsi), %xmm0
 .endm
 
-ForwardCallGG:
+SYMBOL(ForwardCallGG):
     prologue
     forward_int
     epilogue
 
-ForwardCallF:
+SYMBOL(ForwardCallF):
     prologue
     forward_int
     epilogue
 
-ForwardCallDG:
+SYMBOL(ForwardCallDG):
     prologue
     forward_int
     epilogue
 
-ForwardCallGD:
+SYMBOL(ForwardCallGD):
     prologue
     forward_int
     epilogue
 
-ForwardCallDD:
+SYMBOL(ForwardCallDD):
     prologue
     forward_int
     epilogue
 
-ForwardCallXGG:
+SYMBOL(ForwardCallXGG):
     prologue
     forward_xmm
     forward_int
     epilogue
 
-ForwardCallXF:
+SYMBOL(ForwardCallXF):
     prologue
     forward_xmm
     forward_int
     epilogue
 
-ForwardCallXDG:
+SYMBOL(ForwardCallXDG):
     prologue
     forward_xmm
     forward_int
     epilogue
 
-ForwardCallXGD:
+SYMBOL(ForwardCallXGD):
     prologue
     forward_xmm
     forward_int
     epilogue
 
-ForwardCallXDD:
+SYMBOL(ForwardCallXDD):
     prologue
     forward_xmm
     forward_int

package/src/ffi.cc

@@ -611,7 +611,15 @@ static void InitInternal(v8::Local<v8::Object> target, v8::Local<v8::Value>,
     SetValue(env, target, "in", Napi::Function::New(env_napi, MarkIn));
     SetValue(env, target, "out", Napi::Function::New(env_napi, MarkOut));
     SetValue(env, target, "inout", Napi::Function::New(env_napi, MarkInOut));
+
     SetValue(env, target, "internal", Napi::Boolean::New(env_napi, true));
+#if defined(_WIN32)
+    SetValue(env, target, "extension", Napi::String::New(env_napi, ".dll"));
+#elif defined(__APPLE__)
+    SetValue(env, target, "extension", Napi::String::New(env_napi, ".dylib"));
+#else
+    SetValue(env, target, "extension", Napi::String::New(env_napi, ".so"));
+#endif
 
     Napi::Object types = InitBaseTypes(env_cxx);
     SetValue(env, target, "types", types);
@@ -636,7 +644,15 @@ static Napi::Object InitModule(Napi::Env env, Napi::Object exports)
     exports.Set("in", Napi::Function::New(env, MarkIn));
     exports.Set("out", Napi::Function::New(env, MarkOut));
     exports.Set("inout", Napi::Function::New(env, MarkInOut));
+
     exports.Set("internal", Napi::Boolean::New(env, false));
+#if defined(_WIN32)
+    exports.Set("extension", Napi::String::New(env, ".dll"));
+#elif defined(__APPLE__)
+    exports.Set("extension", Napi::String::New(env, ".dylib"));
+#else
+    exports.Set("extension", Napi::String::New(env, ".so"));
+#endif
 
     Napi::Object types = InitBaseTypes(env);
     exports.Set("types", types);

package/test/registry/machines.json

@@ -4,7 +4,7 @@
 
         "qemu": {
             "binary": "qemu-system-arm",
-            "arguments": ["-M", "virt", "-cpu", "cortex-a15", "-m", "2G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-armmp-lpae", "-initrd", "initrd.img-5.10.0-12-armmp-lpae", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22201-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:11"]
+            "arguments": ["-M", "virt", "-cpu", "cortex-a15", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-armmp-lpae", "-initrd", "initrd.img-5.10.0-12-armmp-lpae", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22201-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:11"]
         },
 
         "info": {
@@ -39,7 +39,7 @@
 
         "qemu": {
             "binary": "qemu-system-aarch64",
-            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "2G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-arm64", "-initrd", "initrd.img-5.10.0-12-arm64", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22202-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:12"]
+            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-arm64", "-initrd", "initrd.img-5.10.0-12-arm64", "-append", "root=/dev/vda2 apparmor=0", "-drive", "if=none,file=disk.qcow2,format=qcow2,id=hd", "-device", "virtio-blk-device,drive=hd", "-netdev", "user,id=mynet,hostfwd=tcp::22202-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:12"]
         },
 
         "info": {
@@ -74,7 +74,7 @@
 
         "qemu": {
             "binary": "qemu-system-i386",
-            "arguments": ["-cpu", "max", "-m", "2G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-686-pae", "-initrd", "initrd.img-5.10.0-12-686-pae", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22203-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:13"]
+            "arguments": ["-cpu", "max", "-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-686-pae", "-initrd", "initrd.img-5.10.0-12-686-pae", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22203-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:13"]
         },
 
         "info": {
@@ -109,7 +109,7 @@
 
         "qemu": {
             "binary": "qemu-system-x86_64",
-            "arguments": ["-m", "2G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-amd64", "-initrd", "initrd.img-5.10.0-12-amd64", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22204-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:14"]
+            "arguments": ["-m", "1G", "-smp", 2, "-kernel", "vmlinuz-5.10.0-12-amd64", "-initrd", "initrd.img-5.10.0-12-amd64", "-append", "root=/dev/sda1 apparmor=0", "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22204-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:14"]
         },
 
         "info": {
@@ -182,5 +182,144 @@
                 }
             }
         }
+    },
+
+    "freebsd_x64": {
+        "name": "FreeBSD x64",
+
+        "qemu": {
+            "binary": "qemu-system-x86_64",
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22206-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:16"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "freebsd",
+            "arch": "x64",
+
+            "ssh_port": 22206,
+            "vnc_port": 5916,
+
+            "username": "freebsd",
+            "password": "freebsd",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "tests": {
+            "FreeBSD x64": {
+                "directory": "/home/freebsd/luigi",
+                "build": "npm install --production",
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/tests/raylib.js",
+                    "Test Misc": "node test/tests/misc.js",
+                    "Test SQLite": "node test/tests/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "freebsd_i386": {
+        "name": "FreeBSD i386",
+
+        "qemu": {
+            "binary": "qemu-system-i386",
+            "arguments": ["-m", "1G", "-smp", 2, "-hda", "disk.qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22207-:22", "-device", "e1000,netdev=mynet", "-vnc", "127.0.0.1:17"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "freebsd",
+            "arch": "ia32",
+
+            "ssh_port": 22207,
+            "vnc_port": 5917,
+
+            "username": "freebsd",
+            "password": "freebsd",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "tests": {
+            "FreeBSD i386": {
+                "directory": "/home/freebsd/luigi",
+                "build": "npm install --production",
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/tests/raylib.js",
+                    "Test Misc": "node test/tests/misc.js",
+                    "Test SQLite": "node test/tests/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "freebsd_arm64": {
+        "name": "FreeBSD ARM64",
+
+        "qemu": {
+            "binary": "qemu-system-aarch64",
+            "arguments": ["-M", "virt", "-cpu", "cortex-a53", "-m", "1G", "-smp", 2, "-drive", "if=pflash,format=raw,file=QEMU_EFI.img", "-drive", "if=pflash,file=varstore.img", "-drive", "if=virtio,file=disk.qcow2,format=qcow2", "-netdev", "user,id=mynet,hostfwd=tcp::22208-:22", "-device", "virtio-net-device,netdev=mynet", "-vnc", "127.0.0.1:18"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "freebsd",
+            "arch": "arm64",
+
+            "ssh_port": 22208,
+            "vnc_port": 5918,
+
+            "username": "freebsd",
+            "password": "freebsd",
+
+            "shutdown": "sudo poweroff"
+        },
+
+        "tests": {
+            "FreeBSD ARM64": {
+                "directory": "/home/freebsd/luigi",
+                "build": "npm install --production",
+                "commands": {
+                    "Test Raylib": "xvfb-run node test/tests/raylib.js",
+                    "Test Misc": "node test/tests/misc.js",
+                    "Test SQLite": "node test/tests/sqlite.js"
+                }
+            }
+        }
+    },
+
+    "macos_x64": {
+        "name": "macOS x64",
+
+        "qemu": {
+            "binary": "qemu-system-x86_64",
+            "arguments": ["-m", "3G", "-machine", "q35", "-smp", 2, "-cpu", "Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc", "-device", "isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc", "-smbios", "type=2", "-drive", "if=pflash,format=raw,readonly=on,file=OVMF_CODE.fd", "-drive", "if=pflash,format=raw,file=OVMF_VARS-1024x768.fd", "-vga", "qxl", "-device", "ich9-intel-hda", "-device", "hda-output", "-usb", "-device", "usb-kbd", "-device", "usb-tablet", "-netdev", "user,id=net0,hostfwd=tcp::22209-:22", "-device", "e1000-82545em,netdev=net0,id=net0,mac=52:54:00:c9:18:27", "-device", "ich9-ahci,id=sata", "-drive", "id=ESP,if=none,format=qcow2,file=ESP.qcow2", "-device", "ide-hd,bus=sata.2,drive=ESP", "-drive", "id=SystemDisk,if=none,file=macOS.qcow2", "-device", "ide-hd,bus=sata.4,drive=SystemDisk", "-vnc", "127.0.0.1:19"]
+        },
+
+        "info": {
+            "version": 1,
+            "platform": "darwin",
+            "arch": "x64",
+
+            "ssh_port": 22209,
+            "vnc_port": 5919,
+
+            "username": "macos",
+            "password": "macos",
+
+            "shutdown": "sudo shutdown -h now"
+        },
+
+        "tests": {
+            "macOS x64": {
+                "directory": "/Users/macos/luigi",
+                "build": "PATH=/usr/local/bin:/usr/bin:/bin npm install --production && PATH=/usr/local/bin:/usr/bin:/bin SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX11.3.sdk ../cnoke/cnoke.js",
+                "commands": {
+                    "Test Misc": "PATH=/usr/local/bin:/usr/bin:/bin node test/tests/misc.js",
+                    "Test SQLite": "PATH=/usr/local/bin:/usr/bin:/bin node test/tests/sqlite.js"
+                }
+            }
+        }
     }
 }

package/test/registry/sha256sum.txt

@@ -22,3 +22,24 @@ ed05b84b7759ec945bb5422305a3a3c5b61d89e231844656ea31e07d89451a20 *qemu/debian_i3
 292a61c415a99a9c63a9337f1e074bea6c5df594e16bc40ded76141963c67ea4 *qemu/debian_i386/install.sh
 8dc1360e1c23ea21931f5eb94461d15fac6bcec00cf42bf1e590b7fb937e80c1 *qemu/debian_i386/initrd.img-5.10.0-12-686-pae
 338602d969f953cd88c2df736b9f8f7ee53029d233c83c7398258ae5bcb4e286 *qemu/debian_i386/disk.qcow2
+6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_arm64/VERSION
+5daea533330eb8d2f8df946561680e09f8dacc467fbf03d28caa2115d94386b5 *qemu/freebsd_arm64/QEMU_EFI.img
+a083e4e1f58f477e4a9e8ae30f75660e82275b88f77b5e2c7f5d6ee1deb43b41 *qemu/freebsd_arm64/varstore.img
+53a4dc48317e1c9de4a088cd45ba39a1810f0bafad75c7f810e18d4e3eb340e3 *qemu/freebsd_arm64/install.sh
+a19ad06aec7972f3b95a56fb9bb8ac8a6afcd61b586f398691d58c704e8c466e *qemu/freebsd_arm64/disk.qcow2
+10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_arm64/xvfb-run.sh
+6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_x64/VERSION
+06eef544fe9c61d3905b0e588c306d1dedac7ee7d4c01df154ff6ed64e25ef77 *qemu/freebsd_x64/install.sh
+060b66901313ddfcd434c20a7b13052b3e5126e43c4e44884b85191560bd99eb *qemu/freebsd_x64/disk.qcow2
+10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_x64/xvfb-run.sh
+6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b *qemu/freebsd_i386/VERSION
+bdeac2cca1d22d70c2d388a50709d5cba3069bbd4bd1bcb102955b0ee12ca3e9 *qemu/freebsd_i386/install.sh
+8191cea63d738cdca6df0b2d2d6953675e1dd33cac4d98fff88ba4367b182b64 *qemu/freebsd_i386/disk.qcow2
+10f2bc603b171368cacda43485f8f72567af0a9a490b7e0fa0c14c983ae66f16 *qemu/freebsd_i386/xvfb-run.sh
+16a4f09b3e70b97f5cfb1cf9b913d67d0ec45c4342d202cc9a2b2cfee852a8de *qemu/macos_x64/ESP.qcow2
+35abfe68efe9bb81b21399a41ebdf9074c377e09079d9b55ae6f8c6da0580a06 *qemu/macos_x64/install.md
+5d2ac383371b408398accee7ec27c8c09ea5b74a0de0ceea6513388b15be5d1e *qemu/macos_x64/OVMF_VARS.fd
+fd0c3cbabd3f9744fc82f1b9b290c215cd8400b8501767b61ce7b7b30438db7c *qemu/macos_x64/macOS.qcow2
+51d13e3b6a6c579019f45a1b500fb41f4bfebef227cd605d3e07247d37476963 *qemu/macos_x64/OVMF_VARS-1024x768.fd
+4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865 *qemu/macos_x64/VERSION
+2a247500e8ad9aa479994097ba5976bd881fde4de1516abd14491f3dba9fe060 *qemu/macos_x64/OVMF_CODE.fd

package/test/test.js

@@ -572,7 +572,8 @@ async function join(machine, tries) {
                 host: '127.0.0.1',
                 port: machine.info.ssh_port,
                 username: machine.info.username,
-                password: machine.info.password
+                password: machine.info.password,
+                tryKeyboard: true
             });
 
             break;

package/test/tests/misc.js

@@ -36,8 +36,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/misc' +
-                       (process.platform == 'win32' ? '.dll' : '.so');
+    let lib_filename = path.dirname(__filename) + '/../../build/misc' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const FillPack3 = lib.cdecl('FillPack3', 'void', ['int', 'int', 'int', koffi.out(koffi.pointer(Pack3))]);

package/test/tests/raylib.js

@@ -83,8 +83,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/raylib' +
-                       (process.platform == 'win32' ? '.dll' : '.so');
+    let lib_filename = path.dirname(__filename) + '/../../build/raylib' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const InitWindow = lib.cdecl('InitWindow', 'void', ['int', 'int', 'string']);

package/test/tests/sqlite.js

@@ -36,8 +36,7 @@ async function main() {
 }
 
 async function test() {
-    let lib_filename = path.dirname(__filename) + '/../../build/sqlite3' +
-                       (process.platform == 'win32' ? '.dll' : '.so');
+    let lib_filename = path.dirname(__filename) + '/../../build/sqlite3' + koffi.extension;
     let lib = koffi.load(lib_filename);
 
     const sqlite3_open_v2 = lib.cdecl('sqlite3_open_v2', 'int', ['string', koffi.out(koffi.pointer(sqlite3_db)), 'int', 'string']);
@@ -50,7 +49,7 @@ async function test() {
     const sqlite3_finalize = lib.cdecl('sqlite3_finalize', 'int', [sqlite3_stmt]);
     const sqlite3_close_v2 = lib.cdecl('sqlite3_close_v2', 'int', [sqlite3_db]);
 
-    let filename = create_temporary_file(path.join(os.tmpdir(), 'test_sqlite'));
+    let filename = await create_temporary_file(path.join(os.tmpdir(), 'test_sqlite'));
     let db = {};
 
     try {
@@ -78,7 +77,7 @@ async function test() {
     }
 }
 
-function create_temporary_file(prefix) {
+async function create_temporary_file(prefix) {
     let buf = Buffer.allocUnsafe(4);
 
     for (;;) {
@@ -88,7 +87,12 @@ function create_temporary_file(prefix) {
             let suffix = buf.toString('hex').padStart(8, '0');
             let filename = `${prefix}.${suffix}`;
 
-            let file = fs.createWriteStream(filename, { flags: 'wx', mode: 0o644 });
+            let file = await new Promise((resolve, reject) => {
+                let file = fs.createWriteStream(filename, { flags: 'wx', mode: 0o644 });
+
+                file.on('open', () => resolve(file));
+                file.on('error', reject);
+            });
             file.close();
 
             return filename;

package/vendor/libcc/libcc.cc

@@ -82,6 +82,7 @@
     extern char **environ;
 #endif
 #ifdef __APPLE__
+    #include <sys/random.h>
     #include <mach-o/dyld.h>
 
     #define off64_t off_t
@@ -4295,12 +4296,23 @@ bool NotifySystemd()
         return false;
     }
 
+#ifdef __APPLE__
+    int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+    if (fd < 0) {
+        LogError("Failed to create UNIX socket: %1", strerror(errno));
+        return false;
+    }
+    RG_DEFER { close(fd); };
+
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
+#else
     int fd = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
     if (fd < 0) {
         LogError("Failed to create UNIX socket: %1", strerror(errno));
         return false;
     }
     RG_DEFER { close(fd); };
+#endif
 
     struct iovec iov = {};
     struct msghdr msg = {};
@@ -4880,13 +4892,22 @@ int OpenUnixSocket(const char *path, SocketMode mode)
         case SocketMode::Messages: { flags = SOCK_SEQPACKET; } break;
     }
 
-#ifdef _WIN32
+#if defined(_WIN32)
     SOCKET fd = socket(AF_UNIX, flags, 0);
     if (fd == INVALID_SOCKET) {
         LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
         return -1;
     }
     RG_DEFER_N(err_guard) { closesocket(fd); };
+#elif defined(__APPLE__)
+    int fd = (int)socket(AF_UNIX, flags, 0);
+    if (fd < 0) {
+        LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
+        return -1;
+    }
+    RG_DEFER_N(err_guard) { close(fd); };
+
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
 #else
     flags |= SOCK_CLOEXEC;
 
@@ -4924,13 +4945,22 @@ int ConnectToUnixSocket(const char *path, SocketMode mode)
         case SocketMode::Messages: { flags = SOCK_SEQPACKET; } break;
     }
 
-#ifdef _WIN32
+#if defined(_WIN32)
     SOCKET fd = socket(AF_UNIX, flags, 0);
     if (fd == INVALID_SOCKET) {
         LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
         return -1;
     }
     RG_DEFER_N(err_guard) { closesocket(fd); };
+#elif defined(__APPLE__)
+    int fd = (int)socket(AF_UNIX, flags, 0);
+    if (fd < 0) {
+        LogError("Failed to create AF_UNIX socket: %1", strerror(errno));
+        return -1;
+    }
+    RG_DEFER_N(err_guard) { close(fd); };
+
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
 #else
     flags |= SOCK_CLOEXEC;
 

package/vendor/libcc/libcc.hh

@@ -35,7 +35,7 @@
 #include <utility>
 #if defined(_WIN32)
     #include <intrin.h>
-#elif !defined(__linux__) || defined(__GLIBC__)
+#elif !defined(__APPLE__) && (!defined(__linux__) || defined(__GLIBC__))
     #define RG_FIBER_USE_UCONTEXT
     #include <ucontext.h>
 #else