koffi 2.5.6 → 2.5.8

package/CHANGELOG.md

@@ -4,6 +4,19 @@
 
 ### Koffi 2.5
 
+#### Koffi 2.5.8
+
+**Main changes:**
+
+- Add more search paths for native Koffi modules
+- Add section [about bundling](start.md#bundling-koffi) to documentation
+
+#### Koffi 2.5.7
+
+**Main changes:**
+
+- Point package to new repository
+
 #### Koffi 2.5.6
 
 **Main changes:**
@@ -571,11 +584,9 @@ This entry documents changes since version 1.1.0.
 
 The following features and improvements are planned, not necessarily in that order:
 
-- Optimize passing of structs and arrays (avoid setting named properties one by one? separate HFA-specific helper functions?)
+- Optimize passing of structs and arrays (with auto-generated JS)
 - Automate Windows/AArch64 (qemu) and macOS/AArch64 (how? ... thanks Apple) tests
 - Create a real-world example, using several libraries (Raylib, SQLite, libsodium) to illustrate various C API styles
 - Add simple struct type parser
-- Add more ways to manually encode and decode various types to and from byte arrays
-- Add support for unions
 - Port Koffi to PowerPC (POWER9+) ABI
 - Fix assembly unwind and CFI directives for better debugging experience

package/doc/conf.py

@@ -56,22 +56,29 @@ html_static_path = ['static']
 
 html_theme_options = {
     'light_css_variables': {
-        'color-brand-primary': '#FF6600',
-        'color-brand-content': '#FF6600'
+        'font-stack': 'Open Sans',
+        'color-content-foreground': '#383838',
+        'color-brand-primary': '#383838',
+        'color-brand-content': '#e97713'
     },
     'dark_css_variables': {
-        'color-brand-primary': '#FF6600',
-        'color-brand-content': '#FF6600'
+        'font-stack': 'Open Sans',
+        'color-content-foreground': '#ffffffdd',
+        'color-brand-primary': '#ffffffdd',
+        'color-brand-content': '#e97713'
     }
 }
 
 html_link_suffix = ''
 
-html_css_files = ['custom.css']
+html_css_files = [
+    'opensans/OpenSans.css',
+    'custom.css'
+]
 
 html_sidebars = {
     "**": [
-        "sidebar/brand.html",
+        "logo.html",
         "sidebar/search.html",
         "sidebar/scroll-start.html",
         "sidebar/navigation.html",

package/doc/contribute.md

@@ -2,9 +2,9 @@
 
 ## Bugs and feature requests
 
-Use the official repository (named Rygel, because this is a monorepo containing multiple projects) for bugs, ideas and features requests.
+Use the official repository for bugs, ideas and features requests: https://github.com/Koromix/koffi
 
-Go here: https://github.com/Koromix/rygel/
+Please note that the source code is not in this repository, instead it lives in a monorepo: https://github.com/Koromix/rygel/ (in the *src/koffi* subdirectory).
 
 ## Build from source
 

package/doc/pyproject.toml

@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "koffi"
+name = "koffi.dev"
 version = "0.1.0"
 description = ""
 authors = ["Niels Martignène <niels.martignene@protonmail.com>"]

package/doc/start.md

@@ -1,4 +1,4 @@
-# Quick start
+# Get started
 
 ## Install Koffi
 
@@ -18,12 +18,14 @@ const koffi = require('koffi');
 import koffi from 'koffi';
 ```
 
+## Simple examples
+
 Below you can find three examples:
 
 * The first one runs on Linux. The functions are declared with the C-like prototype language.
 * The second one runs on Windows, and uses the node-ffi like syntax to declare functions.
 
-## Small Linux example
+### For Linux
 
 This is a small example for Linux systems, which uses `gettimeofday()`, `localtime_r()` and `printf()` to print the current time.
 
@@ -74,7 +76,7 @@ printf('Hello World!\n');
 printf('Local time: %02d:%02d:%02d\n', 'int', now.tm_hour, 'int', now.tm_min, 'int', now.tm_sec);
 ```
 
-## Small Windows example
+### For Windows
 
 This is a small example targeting the Win32 API, using `MessageBox()` to show a *Hello World!* message to the user.
 
@@ -104,3 +106,42 @@ let ret = MessageBoxA(null, 'Do you want another message box?', 'Koffi', MB_YESN
 if (ret == IDYES)
     MessageBoxW(null, 'Hello World!', 'Koffi', MB_ICONINFORMATION);
 ```
+
+## Bundling Koffi
+
+*Improved in Koffi 2.5.8*
+
+Koffi uses native modules to work. The NPM package contains binaries for various platforms and architectures, and the appropriate module is selected at runtime.
+
+If you use a bundler, you must make sure that the {{ "`node_modules/koffi/build/" ~ stable ~ "`" }} directory is available in your bundled script.
+
+Here is an example that would work:
+
+```{eval-rst}
+.. parsed-literal::
+    koffi/
+        |version|/
+            win32_x64/
+                koffi.node
+            linux_x64/
+                koffi.node
+            ...
+    MyBundle.js
+```
+
+When running in Electron, Koffi will also try to find the native module in `process.resourcesPath`. For an Electron app you could do something like this
+
+```{eval-rst}
+.. parsed-literal::
+    locales/
+    resources/
+        koffi/
+            |version|/
+                darwin_arm64/
+                    koffi.node
+                darwin_x64/
+                    koffi.node
+    MyApp.exe
+```
+
+You must configure your bundler and/or your packager to make this work.

package/doc/static/custom.css

@@ -23,8 +23,48 @@ aside.footnote {
     display: flex;
     margin-top: 6px;
 }
-
 aside.footnote > p {
     margin: 0;
     margin-left: 1rem;
 }
+
+.toctree-l1 > a {
+    font-size: 1.1em;
+}
+
+h1 {
+    font-size: 2rem;
+    text-transform: uppercase;
+    font-weight: normal;
+    margin-bottom: 1.2rem;
+}
+
+h2 {
+    display: table;
+    margin-left: 0;
+    margin-bottom: 1.2rem;
+    padding: 3px 12px 3px 30px;
+    background: var(--color-brand-primary) !important;
+    border-right: 32px solid var(--color-background-primary);
+    border-radius: 0;
+    font-size: 1.6rem;
+    font-weight: normal;
+    text-transform: uppercase;
+    color: var(--color-background-primary) !important;
+    position: relative;
+}
+h2 > a {
+    filter: none !important;
+    position: absolute;
+    left: calc(100% - 32px);
+}
+
+h3 {
+    font-size: 1.4rem;
+    font-weight: normal;
+    margin-bottom: 1.2rem;
+    font-style: italic;
+    padding-left: 50px;
+}
+
+:target > h1, :target > h3 { background: none !important; }

package/doc/static/opensans/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/doc/static/opensans/OpenSans.css

@@ -0,0 +1,39 @@
+/* open-sans-regular - latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans Regular'), local('OpenSans-Regular'),
+       url('OpenSans_v17_Latin_Regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('OpenSans_v17_Latin_Regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* open-sans-italic - latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Open Sans Italic'), local('OpenSans-Italic'),
+       url('OpenSans_v17_Latin_Italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('OpenSans_v17_Latin_Italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* open-sans-700 - latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'),
+       url('OpenSans_v17_Latin_Bold.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('OpenSans_v17_Latin_Bold.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* open-sans-700italic - latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
+       url('OpenSans_v17_Latin_BoldItalic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('OpenSans_v17_Latin_BoldItalic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}

package/doc/templates/badges.html

@@ -1,6 +1,6 @@
 <div style="text-align: center; margin-top: 2em;">
     <a href="https://www.npmjs.com/package/koffi"><img src="https://img.shields.io/badge/NPM-{{ stable }}-brightgreen" alt="NPM"/></a>
-    <a href="https://github.com/Koromix/rygel/tree/master/src/koffi"><img src="https://img.shields.io/badge/GitHub-Koffi-ff6600" alt="GitHub"/></a>
+    <a href="https://github.com/Koromix/koffi"><img src="https://img.shields.io/badge/GitHub-Koffi-ff6600" alt="GitHub"/></a>
 
     <br><br>
     <iframe src="https://github.com/sponsors/Koromix/button" title="Sponsor Koromix" height="35" width="116" style="border: 0;"></iframe>

package/doc/templates/logo.html

@@ -0,0 +1,3 @@
+<div style="text-align: center; padding: 1em;">
+    <a href="/"><img class="sidebar-logo" style="width: 128px;" src="_static/node_c.webp" alt="Logo"/></a>
+</div>

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koffi",
-    "version": "2.5.6",
-    "stable": "2.5.6",
+    "version": "2.5.8",
+    "stable": "2.5.8",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",
@@ -14,7 +14,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/Koromix/rygel.git"
+        "url": "https://github.com/Koromix/koffi"
     },
     "homepage": "https://koffi.dev/",
     "author": "Niels Martignène <niels.martignene@protonmail.com>",
@@ -27,6 +27,6 @@
     "cnoke": {
         "napi": 8,
         "require": "./src/index.js",
-        "output": "build/{{version}}/koffi_{{platform}}_{{arch}}"
+        "output": "build/{{version}}/{{platform}}_{{arch}}"
     }
 }

package/src/core/libcc/libcc.cc

@@ -3804,17 +3804,29 @@ struct PendingIO {
     }
 };
 
-bool ExecuteCommandLine(const char *cmd_line, FunctionRef<Span<const uint8_t>()> in_func,
+bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                        FunctionRef<Span<const uint8_t>()> in_func,
                         FunctionRef<void(Span<uint8_t> buf)> out_func, int *out_code)
 {
     STARTUPINFOW si = {};
 
+    BlockAllocator temp_alloc;
+
     // Convert command line
-    Span<wchar_t> cmd_line_w = AllocateSpan<wchar_t>(nullptr, 2 * strlen(cmd_line) + 1);
-    RG_DEFER { ReleaseSpan(nullptr, cmd_line_w); };
+    Span<wchar_t> cmd_line_w = AllocateSpan<wchar_t>(&temp_alloc, 2 * strlen(cmd_line) + 1);
     if (ConvertUtf8ToWin32Wide(cmd_line, cmd_line_w) < 0)
         return false;
 
+    // Convert work directory
+    Span<wchar_t> work_dir_w;
+    if (work_dir) {
+        work_dir_w = AllocateSpan<wchar_t>(&temp_alloc, 2 * strlen(work_dir) + 1);
+        if (ConvertUtf8ToWin32Wide(work_dir, work_dir_w) < 0)
+            return false;
+    } else {
+        work_dir_w = {};
+    }
+
     // Detect CTRL+C and CTRL+BREAK events
     if (!InitConsoleCtrlHandler())
         return false;
@@ -3887,7 +3899,7 @@ bool ExecuteCommandLine(const char *cmd_line, FunctionRef<Span<const uint8_t>()>
 
         PROCESS_INFORMATION pi = {};
         if (!CreateProcessW(nullptr, cmd_line_w.ptr, nullptr, nullptr, TRUE, CREATE_NEW_PROCESS_GROUP,
-                            nullptr, nullptr, &si, &pi)) {
+                            nullptr, work_dir_w.ptr, &si, &pi)) {
             LogError("Failed to start process: %1", GetWin32ErrorString());
             return false;
         }
@@ -4096,7 +4108,8 @@ void CloseDescriptorSafe(int *fd_ptr)
     *fd_ptr = -1;
 }
 
-bool ExecuteCommandLine(const char *cmd_line, FunctionRef<Span<const uint8_t>()> in_func,
+bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                        FunctionRef<Span<const uint8_t>()> in_func,
                         FunctionRef<void(Span<uint8_t> buf)> out_func, int *out_code)
 {
     // Create read pipes
@@ -4169,9 +4182,14 @@ bool ExecuteCommandLine(const char *cmd_line, FunctionRef<Span<const uint8_t>()>
             return false;
         }
 
-        const char *argv[] = {"sh", "-c", cmd_line, nullptr};
-        if ((errno = posix_spawn(&pid, "/bin/sh", &file_actions, nullptr,
-                                 const_cast<char **>(argv), environ))) {
+        if (work_dir) {
+            const char *argv[] = {"env", "-C", work_dir, "sh", "-c", cmd_line, nullptr };
+            errno = posix_spawn(&pid, "/bin/env", &file_actions, nullptr, const_cast<char **>(argv), environ);
+        } else {
+            const char *argv[] = {"sh", "-c", cmd_line, nullptr};
+            errno = posix_spawn(&pid, "/bin/sh", &file_actions, nullptr, const_cast<char **>(argv), environ);
+        }
+        if (errno) {
             LogError("Failed to start process: %1", strerror(errno));
             return false;
         }
@@ -4311,7 +4329,8 @@ bool ExecuteCommandLine(const char *cmd_line, FunctionRef<Span<const uint8_t>()>
 
 #endif
 
-bool ExecuteCommandLine(const char *cmd_line, Span<const uint8_t> in_buf, Size max_len,
+bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                        Span<const uint8_t> in_buf, Size max_len,
                         HeapArray<uint8_t> *out_buf, int *out_code)
 {
     Size start_len = out_buf->len;
@@ -4333,8 +4352,8 @@ bool ExecuteCommandLine(const char *cmd_line, Span<const uint8_t> in_buf, Size m
     // Don't f*ck up the log
     bool warned = false;
 
-    bool success = ExecuteCommandLine(cmd_line, [&]() { return in_buf; },
-                                                [&](Span<uint8_t> buf) {
+    bool success = ExecuteCommandLine(cmd_line, work_dir, [&]() { return in_buf; },
+                                                          [&](Span<uint8_t> buf) {
         if (out_buf->len - start_len <= max_len - buf.len) {
             out_buf->Append(buf);
         } else if (!warned) {
@@ -4349,6 +4368,40 @@ bool ExecuteCommandLine(const char *cmd_line, Span<const uint8_t> in_buf, Size m
     return true;
 }
 
+Size ReadCommandOutput(const char *cmd_line, Span<char> out_output)
+{
+    Size total_len = 0;
+    const auto write = [&](Span<uint8_t> buf) {
+        Size copy = std::min(out_output.len - total_len, buf.len);
+
+        memcpy_safe(out_output.ptr + total_len, buf.ptr, copy);
+        total_len += copy;
+    };
+
+    int exit_code;
+    if (!ExecuteCommandLine(cmd_line, nullptr, MakeSpan((const uint8_t *)nullptr, 0), write, &exit_code))
+        return -1;
+    if (exit_code) {
+        LogDebug("Command '%1 failed (exit code: %2)", cmd_line, exit_code);
+        return -1;
+    }
+
+    return total_len;
+}
+
+bool ReadCommandOutput(const char *cmd_line, HeapArray<char> *out_output)
+{
+    int exit_code;
+    if (!ExecuteCommandLine(cmd_line, nullptr, {}, Kilobytes(4), out_output, &exit_code))
+        return false;
+    if (exit_code) {
+        LogDebug("Command '%1 failed (exit code: %2)", cmd_line, exit_code);
+        return false;
+    }
+
+    return true;
+}
+
 #ifdef _WIN32
 
 static HANDLE wait_msg_event = CreateEvent(nullptr, TRUE, FALSE, nullptr);
@@ -5114,7 +5167,9 @@ restart:
 int GetRandomIntSafe(int min, int max)
 {
     int range = max - min;
-    RG_ASSERT(range >= 2);
+
+    if (range < 2) [[unlikely]]
+        return min;
 
     unsigned int treshold = (UINT_MAX - UINT_MAX % range);
 
@@ -6882,7 +6937,6 @@ bool ReloadAssets()
         asset_copy.data = AllocateSpan<uint8_t>(&assets_alloc, asset.data.len);
         memcpy_safe((void *)asset_copy.data.ptr, asset.data.ptr, (size_t)asset.data.len);
         asset_copy.compression_type = asset.compression_type;
-        asset_copy.source_map = DuplicateString(asset.source_map, &assets_alloc).ptr;
 
         assets.Append(asset_copy);
     }

package/src/core/libcc/libcc.hh

@@ -4022,14 +4022,18 @@ bool CreatePipe(int pfd[2]);
 void CloseDescriptorSafe(int *fd_ptr);
 #endif
 
-bool ExecuteCommandLine(const char *cmd_line, FunctionRef<Span<const uint8_t>()> in_func,
+bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                        FunctionRef<Span<const uint8_t>()> in_func,
                         FunctionRef<void(Span<uint8_t> buf)> out_func, int *out_code);
-bool ExecuteCommandLine(const char *cmd_line, Span<const uint8_t> in_buf, Size max_len,
+bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                        Span<const uint8_t> in_buf, Size max_len,
                         HeapArray<uint8_t> *out_buf, int *out_code);
 
-static inline bool ExecuteCommandLine(const char *cmd_line, int *out_code)
-    { return ExecuteCommandLine(cmd_line, {}, {}, out_code); }
-static inline bool ExecuteCommandLine(const char *cmd_line, Span<const uint8_t> in_buf,
+// Simple variants
+static inline bool ExecuteCommandLine(const char *cmd_line, const char *work_dir, int *out_code)
+    { return ExecuteCommandLine(cmd_line, work_dir, {}, {}, out_code); }
+static inline bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                                      Span<const uint8_t> in_buf,
                                       FunctionRef<void(Span<uint8_t> buf)> out_func, int *out_code)
 {
     const auto read_once = [&]() {
@@ -4038,18 +4042,27 @@ static inline bool ExecuteCommandLine(const char *cmd_line, Span<const uint8_t>
         return buf;
     };
 
-    return ExecuteCommandLine(cmd_line, read_once, out_func, out_code);
+    return ExecuteCommandLine(cmd_line, work_dir, read_once, out_func, out_code);
 }
-static inline bool ExecuteCommandLine(const char *cmd_line, Span<const char> in_buf,
+
+// Char variants
+static inline bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                                      Span<const char> in_buf,
                                       FunctionRef<void(Span<char> buf)> out_func, int *out_code)
 {
     const auto write = [&](Span<uint8_t> buf) { out_func(buf.As<char>()); };
-    return ExecuteCommandLine(cmd_line, in_buf.As<const uint8_t>(), write, out_code);
+    return ExecuteCommandLine(cmd_line, work_dir, in_buf.As<const uint8_t>(), write, out_code);
 }
-static inline bool ExecuteCommandLine(const char *cmd_line, Span<const char> in_buf, Size max_len,
+static inline bool ExecuteCommandLine(const char *cmd_line, const char *work_dir,
+                                      Span<const char> in_buf, Size max_len,
                                       HeapArray<char> *out_buf, int *out_code)
-    { return ExecuteCommandLine(cmd_line, in_buf.As<const uint8_t>(), max_len,
-                                (HeapArray<uint8_t> *)out_buf, out_code); }
+{
+    return ExecuteCommandLine(cmd_line, work_dir, in_buf.As<const uint8_t>(), max_len,
+                              (HeapArray<uint8_t> *)out_buf, out_code);
+}
+
+Size ReadCommandOutput(const char *cmd_line, Span<char> out_output);
+bool ReadCommandOutput(const char *cmd_line, HeapArray<char> *out_output);
 
 void WaitDelay(int64_t delay);
 
@@ -4700,8 +4713,6 @@ struct AssetInfo {
     CompressionType compression_type;
     Span<const uint8_t> data;
 
-    const char *source_map;
-
     RG_HASHTABLE_HANDLER(AssetInfo, name);
 };
 

package/src/index.js

@@ -38,12 +38,24 @@ if (process.versions.napi == null || process.versions.napi < pkg.cnoke.napi) {
 }
 
 let arch = cnoke.determine_arch();
-let filenames = [__dirname + `/../build/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`];
+
+let filenames = [
+    __dirname + `/../build/${pkg.version}/${process.platform}_${arch}/koffi.node`,
+    __dirname + `/build/koffi/${pkg.version}/${process.platform}_${arch}/koffi.node`,
+    __dirname + `/koffi/${pkg.version}/${process.platform}_${arch}/koffi.node`,
+    __dirname + `/../build/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`,
+    __dirname + `/build/koffi/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`,
+    __dirname + `/koffi/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`
+];
 
 if (process.resourcesPath != null) {
     filenames.push(
-        process.resourcesPath + `/koffi/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`,
-        process.resourcesPath + `/build/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`
+        process.resourcesPath + `/build/${pkg.version}/${process.platform}_${arch}/koffi.node`,
+        process.resourcesPath + `/build/koffi/${pkg.version}/${process.platform}_${arch}/koffi.node`,
+        process.resourcesPath + `/koffi/${pkg.version}/${process.platform}_${arch}/koffi.node`,
+        process.resourcesPath + `/build/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`,
+        process.resourcesPath + `/build/koffi/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`,
+        process.resourcesPath + `/koffi/${pkg.version}/koffi_${process.platform}_${arch}/koffi.node`
     );
 }