Merge branch 'Fastcode:main' into main

Author: awann-4ai

.github/workflows/formatting.yml

@@ -33,6 +33,6 @@ jobs:
         uses: DoozyX/clang-format-lint-action@v0.13
         with:
           source: './src'
-          exclude: './src/mio ./src/xxhash ./src/zstr'
+          exclude: './src/third-party'
           extensions: 'h,c,cpp,hpp'
           clangFormatVersion: 12

binding.gyp

@@ -1,15 +1,15 @@
 {
     "targets": [
         {
-            "target_name": "nbs_decoder",
+            "target_name": "nbsdecoder",
             "sources": [
                 "src/binding.cpp",
                 "src/Decoder.cpp",
                 "src/Encoder.cpp",
                 "src/Hash.cpp",
                 "src/Packet.cpp",
                 "src/Timestamp.cpp",
-                "src/xxhash/xxhash.c",
+                "src/third-party/xxhash/xxhash.c",
             ],
             "cflags": [],
             "include_dirs": [
@@ -62,6 +62,10 @@
                 [
                     'OS=="win"',
                     {
+                        "dependencies": ["zlib"],
+                        "include_dirs": [
+                            "src/third-party/zlib",
+                        ],
                         "defines": ["_HAS_EXCEPTIONS=1", "NOMINMAX=1"],
                         "msvs_settings": {
                             "VCCLCompilerTool": {
@@ -71,6 +75,35 @@
                     },
                 ],
             ],
-        }
-    ]
+        },
+    ],
+    "conditions": [
+        ['OS == "win"', {
+            "targets": [
+                # Compile zlib for linking on Windows only
+                {
+                    "target_name": "zlib",
+                    "type": "static_library",
+                    "dependencies": [],
+                    "sources": [
+                        "src/third-party/zlib/adler32.c",
+                        "src/third-party/zlib/compress.c",
+                        "src/third-party/zlib/crc32.c",
+                        "src/third-party/zlib/deflate.c",
+                        "src/third-party/zlib/gzclose.c",
+                        "src/third-party/zlib/gzlib.c",
+                        "src/third-party/zlib/gzread.c",
+                        "src/third-party/zlib/gzwrite.c",
+                        "src/third-party/zlib/infback.c",
+                        "src/third-party/zlib/inffast.c",
+                        "src/third-party/zlib/inflate.c",
+                        "src/third-party/zlib/inftrees.c",
+                        "src/third-party/zlib/trees.c",
+                        "src/third-party/zlib/uncompr.c",
+                        "src/third-party/zlib/zutil.c",
+                    ],
+                },
+            ],
+        }],
+    ],
 }

nbsdecoder.js

@@ -1,7 +1,7 @@
 const bindings = require('bindings');
 
 const binding = bindings({
-  bindings: 'nbs_decoder',
+  bindings: 'nbsdecoder',
 });
 
 module.exports.NbsDecoder = binding.Decoder;

package.json

@@ -1,11 +1,11 @@
 {
   "name": "nbsdecoder.js",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "Node.js module for interacting with NUClear Binary Stream files",
   "main": "nbsdecoder.js",
   "types": "nbsdecoder.d.ts",
   "engines": {
-    "node": ">=18.17.0"
+    "node": ">=14.14.0"
   },
   "files": [
     "nbsdecoder.js",

src/Decoder.hpp

@@ -7,7 +7,7 @@
 #include "Index.hpp"
 #include "Packet.hpp"
 #include "TypeSubtype.hpp"
-#include "mio/mmap.hpp"
+#include "third-party/mio/mmap.hpp"
 
 namespace nbs {
     class Decoder : public Napi::ObjectWrap<Decoder> {

src/Encoder.hpp

@@ -5,7 +5,7 @@
 #include <napi.h>
 
 #include "Packet.hpp"
-#include "zstr/zstr.hpp"
+#include "third-party/zstr/zstr.hpp"
 
 namespace nbs {
     class Encoder : public Napi::ObjectWrap<Encoder> {

src/Hash.hpp

@@ -3,7 +3,7 @@
 
 #include <napi.h>
 
-#include "xxhash/xxhash.h"
+#include "third-party/xxhash/xxhash.h"
 
 namespace nbs {
 

src/Index.hpp

@@ -8,7 +8,8 @@
 
 #include "IndexItem.hpp"
 #include "TypeSubtype.hpp"
-#include "zstr/zstr.hpp"
+#include "third-party/zstr/zstr.hpp"
+
 namespace nbs {
 
     using IndexIterator = std::vector<IndexItemFile>::iterator;

src/IndexItem.hpp

@@ -5,7 +5,7 @@
 #include <fstream>
 #include <vector>
 
-#include "mio/mmap.hpp"
+#include "third-party/mio/mmap.hpp"
 
 namespace nbs {
     // Make the packing match what it would be in the file.

src/Timestamp.cpp

@@ -30,7 +30,7 @@ namespace nbs {
                 uint64_t seconds = ts.Get("seconds").As<Napi::Number>().Int64Value();
                 uint64_t nanos   = ts.Get("nanos").As<Napi::Number>().Int64Value();
 
-                timestamp = seconds * 1e9 + nanos;
+                timestamp = seconds * 1000000000L + nanos;
             }
             else {
                 throw std::runtime_error("expected positive number or BigInt or timestamp object");