koffi 2.8.9 → 2.8.11

package/src/cnoke/src/builder.js

@@ -45,8 +45,9 @@ function Builder(config = {}) {
     app_dir = app_dir.replace(/\\/g, '/');
     project_dir = project_dir.replace(/\\/g, '/');
     if (package_dir == null)
-        package_dir = project_dir;
-    package_dir = package_dir.replace(/\\/g, '/');
+        package_dir = find_parent_directory(project_dir, 'package.json');
+    if (package_dir != null)
+        package_dir = package_dir.replace(/\\/g, '/');
 
     let runtime_version = config.runtime_version;
     let arch = config.arch;
@@ -64,27 +65,29 @@ function Builder(config = {}) {
     if (arch == null)
         arch = tools.determine_arch();
 
+    let options = null;
+
     let cache_dir = get_cache_directory();
     let build_dir = config.build_dir;
     let work_dir = null;
 
     if (build_dir == null) {
-        let pkg = read_package_json();
-
-        if (pkg.cnoke.output != null) {
-            build_dir = expand_path(pkg.cnoke.output);
+        let options = read_cnoke_options();
 
-            if (!tools.path_is_absolute(build_dir))
-                build_dir = package_dir + '/' + build_dir;
+        if (options.output != null) {
+            build_dir = expand_path(options.output, options.directory);
         } else {
             build_dir = project_dir + '/build';
         }
     }
+    build_dir = build_dir.replace(/\\/g, '/');
     work_dir = build_dir + `/v${runtime_version}_${arch}`;
 
     let cmake_bin = null;
 
     this.configure = async function(retry = true) {
+        let options = read_cnoke_options();
+
         let args = [project_dir];
 
         check_cmake();
@@ -94,63 +97,68 @@ function Builder(config = {}) {
         console.log(`>> Target: ${process.platform}_${arch}`);
 
         // Prepare build directory
-        fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
         fs.mkdirSync(build_dir, { recursive: true, mode: 0o755 });
         fs.mkdirSync(work_dir, { recursive: true, mode: 0o755 });
 
         retry &= fs.existsSync(work_dir + '/CMakeCache.txt');
 
-        // Download Node headers
-        {
-            let basename = `node-v${runtime_version}-headers.tar.gz`;
-            let urls = [
-                `https://nodejs.org/dist/v${runtime_version}/${basename}`,
-                // `https://unofficial-builds.nodejs.org/download/release/v${runtime_version}/${basename}`
-            ];
-            let destname = `${cache_dir}/${basename}`;
-
-            if (!fs.existsSync(destname))
-                await tools.download_http(urls, destname);
+        // Download or use Node headers
+        if (options.api == null) {
+            let destname = `${cache_dir}/node-v${runtime_version}-headers.tar.gz`;
+
+            if (!fs.existsSync(destname)) {
+                fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
+
+                let url = `https://nodejs.org/dist/v${runtime_version}/node-v${runtime_version}-headers.tar.gz`;
+                await tools.download_http(url, destname);
+            }
+
             await tools.extract_targz(destname, work_dir + '/headers', 1);
+
+            args.push(`-DNODE_JS_INCLUDE_DIRS=${work_dir}/headers/include/node`);
+        } else {
+            console.log(`>> Using local node-api headers`);
+            args.push(`-DNODE_JS_INCLUDE_DIRS=${options.api}/include`);
         }
 
-        // Download Node import library (Windows)
-        if (process.platform === 'win32') {
-            let dirname;
-            switch (arch) {
-                case 'ia32': { dirname = 'win-x86'; } break;
-                case 'x64': { dirname = 'win-x64'; } break;
-                case 'arm64': { dirname = 'win-arm64'; } break;
+        // Download or create Node import library (Windows)
+        if (process.platform == 'win32') {
+            if (options.api == null) {
+                let dirname;
+                switch (arch) {
+                    case 'ia32': { dirname = 'win-x86'; } break;
+                    case 'x64': { dirname = 'win-x64'; } break;
+                    case 'arm64': { dirname = 'win-arm64'; } break;
 
-                default: {
-                    throw new Error(`Unsupported architecture '${arch}' for Node on Windows`);
-                } break;
-            }
+                    default: {
+                        throw new Error(`Unsupported architecture '${arch}' for Node on Windows`);
+                    } break;
+                }
 
-            let destname = `${cache_dir}/node_v${runtime_version}_${arch}.lib`;
+                let destname = `${cache_dir}/node_v${runtime_version}_${arch}.lib`;
 
-            if (!fs.existsSync(destname)) {
-                let urls = [
-                    `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`,
-                    // `https://unofficial-builds.nodejs.org/download/release/v${runtime_version}/${dirname}/node.lib`
-                ];
-                await tools.download_http(urls, destname);
-            }
+                if (!fs.existsSync(destname)) {
+                    fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
 
-            fs.copyFileSync(destname, work_dir + '/node.lib');
+                    let url = `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`;
+                    await tools.download_http(url, destname);
+                }
+
+                fs.copyFileSync(destname, work_dir + '/node.lib');
+            } else {
+                args.push(`-DNODE_JS_LINK_DEF=${options.api}/def/node_api.def`);
+            }
         }
 
         args.push(`-DCMAKE_MODULE_PATH=${app_dir}/assets`);
 
-        args.push(`-DNODE_JS_INCLUDE_DIRS=${work_dir}/headers/include/node`);
-
         // Set platform flags
         switch (process.platform) {
             case 'win32': {
                 fs.copyFileSync(`${app_dir}/assets/win_delay_hook.c`, work_dir + '/win_delay_hook.c');
 
                 args.push(`-DNODE_JS_SOURCES=${work_dir}/win_delay_hook.c`);
-                args.push(`-DNODE_JS_LIBRARIES=${work_dir}/node.lib`);
+                args.push(`-DNODE_JS_LINK_LIB=${work_dir}/node.lib`);
 
                 switch (arch) {
                     case 'ia32': {
@@ -256,56 +264,27 @@ function Builder(config = {}) {
     };
 
     async function check_prebuild() {
-        let pkg = read_package_json();
+        let options = read_cnoke_options();
 
-        if (pkg.cnoke.prebuild != null) {
+        if (options.prebuild != null) {
             fs.mkdirSync(build_dir, { recursive: true, mode: 0o755 });
 
-            let url = expand_path(pkg.cnoke.prebuild);
-            let basename = path.basename(url);
-
-            try {
-                let archive_filename = null;
-
-                if (url.startsWith('file:/')) {
-                    if (url.startsWith('file://localhost/')) {
-                        url = url.substr(16);
-                    } else {
-                        let offset = 6;
-                        while (offset < 9 && url[offset] == '/')
-                            offset++;
-                        url = url.substr(offset - 1);
-                    }
+            let archive_filename = expand_path(options.prebuild, options.directory);
 
-                    if (process.platform == 'win32' && url.match(/^\/[a-zA-Z]+:[\\\/]/))
-                        url = url.substr(1);
+            if (fs.existsSync(archive_filename)) {
+                try {
+                    console.log('>> Extracting prebuilt binaries...');
+                    await tools.extract_targz(archive_filename, build_dir, 1);
+                } catch (err) {
+                    console.error('Failed to find prebuilt binary for your platform, building manually');
                 }
-
-                if (url.match(/^[a-z]+:\/\//)) {
-                    archive_filename = build_dir + '/' + basename;
-                    await tools.download_http(url, archive_filename);
-                } else {
-                    archive_filename = url;
-
-                    if (!tools.path_is_absolute(archive_filename))
-                        archive_filename = path.join(package_dir, archive_filename);
-
-                    if (!fs.existsSync(archive_filename))
-                        throw new Error('Cannot find local prebuilt archive');
-                }
-
-                console.log('>> Extracting prebuilt binaries...');
-                await tools.extract_targz(archive_filename, build_dir, 1);
-            } catch (err) {
-                console.error('Failed to find prebuilt binary for your platform, building manually');
+            } else {
+                console.error('Cannot find local prebuilt archive');
             }
         }
 
-        if (pkg.cnoke.require != null) {
-            let require_filename = expand_path(pkg.cnoke.require);
-
-            if (!tools.path_is_absolute(require_filename))
-                require_filename = path.join(package_dir, require_filename);
+        if (options.require != null) {
+            let require_filename = expand_path(options.require, options.directory);
 
             if (fs.existsSync(require_filename)) {
                 let proc = spawnSync(process.execPath, ['-e', 'require(process.argv[1])', require_filename]);
@@ -403,47 +382,72 @@ function Builder(config = {}) {
     }
 
     function check_compatibility() {
-        let pkg = read_package_json();
+        let options = read_cnoke_options();
 
-        if (pkg.cnoke.node != null && tools.cmp_version(runtime_version, pkg.cnoke.node) < 0)
-            throw new Error(`Project ${pkg.name} requires Node.js >= ${pkg.cnoke.node}`);
+        if (options.node != null && tools.cmp_version(runtime_version, options.node) < 0)
+            throw new Error(`Project ${options.name} requires Node.js >= ${options.node}`);
 
-        if (pkg.cnoke.napi != null) {
+        if (options.napi != null) {
             let major = parseInt(runtime_version, 10);
-            let required = tools.get_napi_version(pkg.cnoke.napi, major);
+            let required = tools.get_napi_version(options.napi, major);
 
             if (required == null)
-                throw new Error(`Project ${pkg.name} does not support the Node ${major}.x branch (old or missing N-API)`);
+                throw new Error(`Project ${options.name} does not support the Node ${major}.x branch (old or missing N-API)`);
             if (tools.cmp_version(runtime_version, required) < 0)
-                throw new Error(`Project ${pkg.name} requires Node >= ${required} in the Node ${major}.x branch (with N-API >= ${pkg.engines.napi})`);
+                throw new Error(`Project ${options.name} requires Node >= ${required} in the Node ${major}.x branch (with N-API >= ${options.napi})`);
         }
     }
 
-    function read_package_json() {
-        let pkg = {};
+    function read_cnoke_options() {
+        if (options != null)
+            return options;
+
+        let directory = project_dir;
+        let pkg = null;
+        let cnoke = null;
 
         if (package_dir != null) {
             try {
                 let json = fs.readFileSync(package_dir + '/package.json', { encoding: 'utf-8' });
+
                 pkg = JSON.parse(json);
+                directory = package_dir;
             } catch (err) {
                 if (err.code != 'ENOENT')
                     throw err;
             }
         }
 
-        if (pkg.cnoke == null)
-            pkg.cnoke = {};
+        try {
+            let json = fs.readFileSync(project_dir + '/CNoke.json', { encoding: 'utf-8' });
+
+            cnoke = JSON.parse(json);
+            directory = project_dir;
+        } catch (err) {
+            if (err.code != 'ENOENT')
+                throw err;
+        }
+
+        if (cnoke == null)
+            cnoke = pkg?.cnoke ?? {};
+
+        options = {
+            name: pkg?.name ?? path.basename(project_dir),
+            version: pkg?.version ?? null,
 
-        return pkg;
+            directory: directory,
+            ...cnoke
+        };
+
+        return options;
     }
 
-    function expand_path(str) {
-        let ret = str.replace(/{{ *([a-zA-Z_][a-zA-Z_0-9]*) *}}/g, (match, p1) => {
+    function expand_path(str, root_dir) {
+        let expanded = str.replace(/{{ *([a-zA-Z_][a-zA-Z_0-9]*) *}}/g, (match, p1) => {
             switch (p1) {
                 case 'version': {
-                    let pkg = read_package_json();
-                    return pkg.version || '';
+                    let options = read_cnoke_options();
+                    return options.version || '';
                 } break;
                 case 'platform': return process.platform;
                 case 'arch': return arch;
@@ -452,7 +456,10 @@ function Builder(config = {}) {
             }
         });
 
-        return ret;
+        if (!tools.path_is_absolute(expanded))
+            expanded = path.join(root_dir, expanded);
+
+        return expanded;
     }
 }
 

package/src/cnoke/src/tools.js

@@ -28,22 +28,6 @@ const path = require('path');
 const zlib = require('zlib');
 
 async function download_http(url, dest) {
-    if (Array.isArray(url)) {
-        let urls = url;
-
-        for (let url of urls) {
-            try {
-                await download_http(url, dest);
-                return;
-            } catch (err) {
-                if (err.code != 404)
-                    throw err;
-            }
-        }
-
-        throw new Error('All URLs returned error 404');
-    }
-
     console.log('>> Downloading ' + url);
 
     let [tmp_name, file] = open_temporary_stream(dest);
@@ -255,17 +239,15 @@ function determine_arch() {
     if (arch == 'riscv32' || arch == 'riscv64') {
         let buf = read_file_header(process.execPath, 512);
         let header = decode_elf_header(buf);
-        let float_abi = (header.e_flags & 0x6) >> 1;
+        let float_abi = (header.e_flags & 0x6);
 
         switch (float_abi) {
-            case 0: { arch += 'sf'; } break;
-            case 1: { arch += 'hf32'; } break;
-            case 2: { arch += 'hf64'; } break;
-            case 3: { arch += 'hf128'; } break;
+            case 0: {} break;
+            case 2: { arch += 'f'; } break;
+            case 4: { arch += 'd'; } break;
+            case 6: { arch += 'q'; } break;
         }
     } else if (arch == 'arm') {
-        arch = 'arm32';
-
         let buf = read_file_header(process.execPath, 512);
         let header = decode_elf_header(buf);
 

package/src/koffi/CMakeLists.txt

@@ -34,7 +34,7 @@ include(CheckCXXCompilerFlag)
 set(CMAKE_CXX_STANDARD 20)
 if(MSVC)
     set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus /Zc:preprocessor /W4 /wd4200 /wd4201 /wd4127 /wd4458 /wd4706 /wd4702 /wd4324")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus /Zc:preprocessor /Zc:twoPhase- /W4 /wd4200 /wd4201 /wd4127 /wd4458 /wd4706 /wd4702 /wd4324")
 
     # ASM_MASM does not (yet) work on Windows ARM64
     if(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64")
@@ -50,17 +50,7 @@ endif()
 
 # ---- Koffi ----
 
-# Recompute the version string after each commit
-if(EXISTS "${CMAKE_SOURCE_DIR}/../../.git/logs/HEAD")
-    configure_file("${CMAKE_SOURCE_DIR}/../../.git/logs/HEAD" git_logs_HEAD COPYONLY)
-endif()
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/package.json)
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/package.json PKG)
-else()
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../../package.json PKG)
-endif()
-string(REGEX MATCH "\"version\": \"([^\"]+)\"" XX "${PKG}")
-set(KOFFI_VERSION ${CMAKE_MATCH_1})
+set(KOFFI_VERSION 2.8.10)
 
 set_source_files_properties(src/ffi.cc PROPERTIES COMPILE_DEFINITIONS VERSION=${KOFFI_VERSION})
 

package/vendor/node-api-headers/CHANGELOG.md

@@ -0,0 +1,79 @@
+# node-api-headers Changelog
+
+## 2023-08-05 Version 1.1.0, @NickNaso
+
+### Notable changes
+
+- Update headers from nodejs/node tag v20.3.0.
+
+### Commits
+
+- \[[`1f5a85dbb0`](https://github.com/nodejs/node-api-headers/commit/1f5a85dbb0)] - Update headers from nodejs/node tag v20.3.0 (#30) (github-actions\[bot])
+
+## 2023-05-18 Version 1.0.1, @NickNaso
+
+### Notable changes
+
+- Update headers from nodejs/node tag v20.2.0.
+
+### Commits
+
+- \[[`d61451e6a3`](https://github.com/nodejs/node-api-headers/commit/d61451e6a3)] - Update headers from nodejs/node tag v20.2.0 (#27) (github-actions\[bot])
+
+## 2023-04-20 Version 1.0.0, @NickNaso
+
+### Notable changes
+
+- Explain package version rationale.
+- Update headers from nodejs/node tag v19.9.0.
+
+### Commits
+
+- \[[`130338da33`](https://github.com/nodejs/node-api-headers/commit/130338da33)] - **doc**: explain package version rationale (#26) (Chengzhong Wu)
+- \[[`1a328031da`](https://github.com/nodejs/node-api-headers/commit/1a328031da)] - Update headers from nodejs/node tag v19.9.0 (#24) (github-actions\[bot])
+
+## 2023-04-06 Version 0.0.5, @NickNaso
+
+### Notable changes
+
+- Provide def file for windows import lib.
+
+### Commits
+
+- \[[`15477c5898`](https://github.com/nodejs/node-api-headers/commit/15477c5898)] - Update headers from nodejs/node tag v19.8.1 (#22) (github-actions\[bot])
+- \[[`d7fa23b60e`](https://github.com/nodejs/node-api-headers/commit/d7fa23b60e)] - Use git status instead of git diff for change calculation (#21) (Kevin Eady)
+- \[[`ea0dc01425`](https://github.com/nodejs/node-api-headers/commit/ea0dc01425)] - **fix**: moved def files on a proper folder. (#19) (Nicola Del Gobbo)
+- \[[`069c3eb6f8`](https://github.com/nodejs/node-api-headers/commit/069c3eb6f8)] - **doc**: how to create a new release. (#18) (Nicola Del Gobbo)
+- \[[`d23c2879c8`](https://github.com/nodejs/node-api-headers/commit/d23c2879c8)] - Provide def file for windows import lib (#17) (Leonid Pospelov)
+
+## 2023-03-17 Version 0.0.4, @NickNaso
+
+### Notable changes
+
+- Update headers from nodejs/node tag v19.8.0.
+
+### Commits
+
+- \[[`a1f0d41240`](https://github.com/nodejs/node-api-headers/commit/a1f0d41240)] - Merge pull request #14 from nodejs/update-headers/v19.8.0 (Nicola Del Gobbo)
+- \[[`7548267285`](https://github.com/nodejs/node-api-headers/commit/7548267285)] - Update headers from nodejs/node tag v19.8.0 (github-actions\[bot])
+
+## 2023-03-08 Version 0.0.3, @NickNaso
+
+### Notable changes
+
+- Add helper scripts for updating headers and symbols.js.
+
+### Commits
+
+- \[[`4fdbdd1710`](https://github.com/nodejs/node-api-headers/commit/4fdbdd1710)] - Update headers from nodejs/node tag v19.6.0 (#9) (github-actions\[bot])
+- \[[`ecefbdd00f`](https://github.com/nodejs/node-api-headers/commit/ecefbdd00f)] - Add helper scripts for updating headers and symbols.js (#7) (Kevin Eady)
+
+## 2022-12-29 Version 0.0.2, @NickNaso
+
+### Notable changes
+
+- Fixed wrong symblos in v6.
+
+### Commits
+
+- \[[`9c0b4ecaa5`](https://github.com/nodejs/node-api-headers/commit/9c0b4ecaa5)] - **fix**: wrong symblos in v6 (#6) (Nicola Del Gobbo)

package/vendor/node-api-headers/CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+# Code of Conduct
+
+The Node.js Code of Conduct, which applies to this project, can be found at
+https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md.

package/vendor/node-api-headers/CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+* (a) The contribution was created in whole or in part by me and I
+  have the right to submit it under the open source license
+  indicated in the file; or
+
+* (b) The contribution is based upon previous work that, to the best
+  of my knowledge, is covered under an appropriate open source
+  license and I have the right under that license to submit that
+  work with modifications, whether created in whole or in part
+  by me, under the same open source license (unless I am
+  permitted to submit under a different license), as indicated
+  in the file; or
+
+* (c) The contribution was provided directly to me by some other
+  person who certified (a), (b) or (c) and I have not modified
+  it.
+
+* (d) I understand and agree that this project and the contribution
+  are public and that a record of the contribution (including all
+  personal information I submit with it, including my sign-off) is
+  maintained indefinitely and may be redistributed consistent with
+  this project or the open source license(s) involved.
+
+## Moderation Policy
+
+The [Node.js Moderation Policy] applies to this project.
+
+[Node.js Moderation Policy]:
+https://github.com/nodejs/admin/blob/master/Moderation-Policy.md

package/vendor/node-api-headers/CREATING_A_RELEASE.md

@@ -0,0 +1,58 @@
+# Creating a release
+
+Only collaborators in npm for **node-api-headers** can create releases. If you
+want to be able to do releases ask one of the existing collaborators to add
+you. If necessary you can ask the build Working Group who manages the Node.js
+npm user to add you if there are no other active collaborators.
+
+## Prerequisites
+
+Before to start creating a new release check if you have installed the following
+tools:
+
+* [Changelog maker](https://www.npmjs.com/package/changelog-maker)
+
+If not please follow the instruction reported in the tool's documentation to
+install it.
+
+## Publish new release
+
+These are the steps to follow to create a new release:
+
+* Open an issue in the **node-api-headers** repo documenting the intent to
+create a new release. Give people some time to comment or suggest PRs that
+should land first.
+
+* Update the version in **package.json** appropriately.
+
+* Update the [README.md][] to show the latest stable version of Node-API.
+
+* Generate the changelog for the new version using **changelog maker** tool.
+From the root folder of the repo launch the following command:
+
+```bash
+> changelog-maker --format=markdown
+```
+
+* Use the output generated by **changelog maker** to update the
+[CHANGELOG.md][] following the style used in publishing the previous release.
+
+* Add any new contributors to the "contributors" section in the
+**package.json**.
+
+* Do a clean checkout of `node-api-headers`.
+
+* Login and then run `npm publish`.
+
+* Create a release in Github (look at existing releases for an example).
+
+* Validate that you can run `npm install node-api-headers` successfully
+and that the correct version is installed.
+
+* Comment on the issue opened in the first step that the release has been created
+and close the issue.
+
+* Tweet that the release has been created.
+
+[README.md]: ./README.md
+[CHANGELOG.md]: ./CHANGELOG.md

package/vendor/node-api-headers/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Node.js
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.