Merge pull request #109 from godaddy/AsyncAwait

Add async/await support and reorganize

.editorconfig

@@ -1,11 +1,19 @@
 root = true
 
-[*]
+[src/*.{cc,h}]
 indent_style = space
 indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[{src,test}/*.{ts,json,js}]
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
 [*.md]
 trim_trailing_whitespace = false

.github/workflows/publish.yml

@@ -3,13 +3,13 @@ name: Publish Asherah-Node
 on:
   release:
     types: [published] # Trigger when release is created
-
+  
 jobs:
   publish-package:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     container:
-      image: node:bullseye
+      image: node:bookworm
       options: --ulimit core=-1 --ulimit memlock=-1:-1
     steps:
     - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -11,7 +11,7 @@ env:
   MYSQL_DATABASE: testdb
   MYSQL_USERNAME: root
   MYSQL_PASSWORD: Password123
-
+  
 jobs:
   test-package:
     timeout-minutes: 15
@@ -21,12 +21,12 @@ jobs:
         image: mysql:5.7
         env:
           MYSQL_DATABASE: ${{ env.MYSQL_DATABASE }}
-          MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_PASSWORD }}
+          MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_PASSWORD }}          
         ports:
           - 3306:3306
         options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 10
     container:
-      image: node:bullseye
+      image: node:bookworm
       options: --ulimit core=-1 --ulimit memlock=-1:-1
     steps:
     - uses: actions/checkout@v4
@@ -45,10 +45,10 @@ jobs:
           PRIMARY KEY (id, created),
           INDEX (created)
         );"
-    - name: Set up Go
-      uses: actions/setup-go@v2
+    - name: Setup Go environment
+      uses: actions/setup-go@v5.0.1
       with:
-        go-version: 1.20.7
+        go-version: 1.22.3
     - name: Test Cross-Language
       env:
         TEST_DB_NAME: ${{ env.MYSQL_DATABASE }}

.tool-versions

@@ -1 +1 @@
-nodejs 20.8.0
+nodejs 22.1.0

.vscode/c_cpp_properties.json

@@ -0,0 +1,27 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceFolder}/src/**",
+                "${workspaceFolder}/node_modules/node-addon-api/**",
+                "${workspaceFolder}/node_modules/node-api-headers/include/**",
+                "${workspaceFolder}/lib/**"
+            ],
+            "forcedInclude": [
+                "${workspaceFolder}/node_modules/node-addon-api/napi.h",
+                "${workspaceFolder}/lib/libasherah.h",
+                "${workspaceFolder}/node_modules/node-api-headers/include/node_api.h"
+            ],
+            "defines": [],
+            "macFrameworkPath": [
+                "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "macos-clang-arm64"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -67,6 +67,8 @@
         "variant": "cpp",
         "vector": "cpp",
         "algorithm": "cpp",
-        "format": "cpp"
+        "format": "cpp",
+        "execution": "cpp",
+        "__memory": "cpp"
     }
 }

binding.gyp

@@ -2,9 +2,9 @@
   'targets': [
       {
       'target_name': 'asherah',
-      'include_dirs': ["<!(node -p \"require('node-addon-api').include_dir\")"],
-      "cflags": ["-fexceptions", "-g", "-O3", "-std=c++17", "-fPIC"],
-      "cflags_cc": ["-fexceptions", "-g", "-O3", "-std=c++17", "-fPIC"],
+      'include_dirs': ["<!(node -p \"require('node-addon-api').include_dir\")", "lib/", "src/"],
+      "cflags": ["-fexceptions", "-g", "-O3", "-std=c++17", "-fPIC", "-Wno-unknown-pragmas"],
+      "cflags_cc": ["-fexceptions", "-g", "-O3", "-std=c++17", "-fPIC", "-Wno-unknown-pragmas"],
       "cflags!": [ "-fno-exceptions"],
       "cflags_cc!": [ "-fno-exceptions" ],
       'xcode_settings': {
@@ -17,17 +17,16 @@
           '-fPIC'
         ],
       },
-      'defines': [ 'NAPI_CPP_EXCEPTIONS', 'NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS', 'NODE_ADDON_API_DISABLE_DEPRECATED', 'NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED' ],
+      'defines': [ 
+        'NAPI_CPP_EXCEPTIONS',
+        'NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS',
+        'NODE_ADDON_API_DISABLE_DEPRECATED',
+        'NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED'
+        ],
       'sources': [
-        'lib/libasherah.h',
-        'src/asherah.h',
         'src/asherah.cc',
         'src/logging.cc',
-        'src/logging.h',
-        'src/cobhan_napi_interop.h',
-        'src/cobhan.h',
-        'src/cobhan.cc',
-        'src/hints.h'
+        'src/logging_napi.cc'
       ],
       'libraries': [ '../lib/libasherah.a' ]
     }