Merge pull request #146 from altmp/dev

Merge dev into rc

Author: martonp96

.github/workflows/build-deploy.yml

@@ -101,7 +101,7 @@ jobs:
           cd ..
           mkdir -p dist/modules/js-module
           cp ./build-linux/libjs-module.so dist/modules/js-module
-          cp ./deps/nodejs/lib/libnode.so.83 dist/modules/js-module
+          cp ./deps/nodejs/lib/libnode.so.102 dist/modules/js-module
         env:
           VERSION: ${{ steps.version.outputs.VERSION }}
 

.github/workflows/test-client.yml

@@ -3,9 +3,11 @@ on:
   push:
     paths:
       - "client/**"
+      - "shared/**"
   pull_request:
     paths:
       - "client/**"
+      - "shared/**"
 
 env:
   BUILD_TYPE: Release
@@ -16,7 +18,10 @@ jobs:
     runs-on: windows-2019
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
 
     - name: Create LFS file list
       run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
@@ -41,7 +46,7 @@ jobs:
       shell: bash
       run: |
         cd client
-        cmake . -BBUILD
+        cmake . -BBUILD -DDYNAMIC_BUILD=1
 
     - name: Build
       shell: bash

.github/workflows/test-server.yml

@@ -3,9 +3,11 @@ on:
   push:
     paths:
       - "server/**"
+      - "shared/**"
   pull_request:
     paths:
       - "server/**"
+      - "shared/**"
 
 jobs:
   test-server-windows:

.gitignore

@@ -0,0 +1,4 @@
+# Generated
+*.gen
+
+node_modules/

.vscode/launch.json

@@ -76,7 +76,8 @@
         "format": "cpp",
         "forward_list": "cpp",
         "optional": "cpp",
-        "stop_token": "cpp"
+        "stop_token": "cpp",
+        "*.gen": "cpp"
     },
     "editor.defaultFormatter": "xaver.clang-format",
     "editor.formatOnSave": true

.vscode/settings.json

@@ -16,7 +16,7 @@
     {
       "label": "Build server",
       "type": "shell",
-      "command": "cd server && ./build",
+      "command": "cd server && ./build.sh",
       "windows": {
         "command": "cd server && build.bat"
       },

.vscode/tasks.json

@@ -0,0 +1,9 @@
+/// <reference types="@altv/types-shared"/>
+/// <reference types="@altv/types-natives"/>
+import * as altShared from "alt-shared";
+import * as altNatives from "natives";
+
+declare global {
+    export const alt: typeof altShared;
+    export const native: typeof altNatives;
+}

bindings.d.ts

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.19)
-include(cmake/GitUtils.cmake)
 include(FetchContent)
 include(cmake/DepsDownload.cmake)
+include(../shared/cmake/GenerateBindings.cmake)
 
 project(altv-client-js)
 
@@ -10,8 +10,7 @@ set(ALTV_JS_DEPS_DIR ${PROJECT_SOURCE_DIR}/deps)
 # Fetch deps
 # v8
 message("alt:V JS - Fetching v8 deps, can take a while")
-
-DownloadDeps(${ALTV_JS_DEPS_DIR})
+DownloadDeps()
 
 # cpp-sdk
 if(NOT ALTV_JS_CPP_SDK)
@@ -42,6 +41,9 @@ endmacro()
 GroupSources(${PROJECT_SOURCE_DIR}/src "Source Files")
 GroupSources("../shared" "Shared Files")
 
+make_includable("src/bootstrap.js" "src/bootstrap.js.gen")
+GenerateBindings()
+
 include_directories(
   ${ALTV_JS_CPP_SDK}
   ${ALTV_JS_DEPS_DIR}/v8/include
@@ -86,6 +88,8 @@ if(WIN32 AND MSVC)
 endif()
 
 if(DYNAMIC_BUILD)
+  include(${ALTV_JS_CPP_SDK}/cpp-sdk/CMakeLists.txt)
+
   ## SHARED
   add_library(
     ${PROJECT_NAME} SHARED
@@ -102,6 +106,8 @@ if(DYNAMIC_BUILD)
   target_link_libraries(${PROJECT_NAME} PRIVATE
     ${ALTV_JS_LINKS}
   )
+
+  add_dependencies(${PROJECT_NAME} alt-sdk)
 else()
   ## STATIC
   add_library(
@@ -118,6 +124,8 @@ else()
   target_link_libraries(${PROJECT_NAME}-static PRIVATE
     ${ALTV_JS_LINKS}
   )
+
+  add_dependencies(${PROJECT_NAME}-static alt-sdk)
 endif()
 
 if(ALTV_JS_DEINIT_CPPSDK)

client/CMakeLists.txt

@@ -1,55 +1,36 @@
+include(../shared/cmake/DepsHelpers.cmake)
 
 # Set this to false, when using a custom v8 build for testing
 set(__deps_check_enabled true)
 
-function(DownloadDeps basePath)
-    set(__deps_release_lib "${basePath}/v8/lib/Release/v8_monolith.lib")
-    set(__deps_debug_lib "${basePath}/v8/lib/Debug/v8_monolith.lib")
-    set(__deps_headers "${basePath}/v8/include/headers.zip")
-    set(__deps_update_file "${basePath}/v8/update.json")
+function(DownloadDeps)
+    set(__base_path "${PROJECT_SOURCE_DIR}/deps/v8")
+
+    GetBranchAndOS(__deps_branch __deps_os_path_name)
+    set(__deps_url_base_path "https://cdn.altv.mp/deps/v8/dev") # TODO: Use actual branch?
 
     if(__deps_check_enabled)
-        file(DOWNLOAD "https://cdn.altv.mp/deps/v8/dev/update.json" ${__deps_update_file})
-        file(READ ${__deps_update_file} __deps_update_json)
-        string(JSON __deps_hashes GET ${__deps_update_json} hashList)
-        file(REMOVE ${__deps_update_file})
-
-        if(EXISTS ${__deps_release_lib})
-            file(SHA1 ${__deps_release_lib} __deps_release_checksum)
-        else()
-            set(__deps_release_checksum 0)
-        endif()
-        string(JSON __deps_release_checksum_cdn GET ${__deps_hashes} v8_monolith.lib)
-        if(NOT ${__deps_release_checksum} STREQUAL ${__deps_release_checksum_cdn})
-            message("Downloading release binary...")
-            file(DOWNLOAD "https://cdn.altv.mp/deps/v8/dev/v8_monolith.lib" ${__deps_release_lib})
-        endif()
+        message("Checking release binaries...")
+
+        GetCDNInfo("${__deps_url_base_path}/${__deps_os_path_name}/Release" __deps_release_hashes __deps_current_version)
+
+        DownloadFile("v8_monolith.lib" "${__base_path}/lib/Release" "${__deps_os_path_name}/Release" ${__deps_release_hashes})
 
         # Only download debug binary in Debug builds
         if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            if(EXISTS ${__deps_debug_lib})
-                file(SHA1 ${__deps_debug_lib} __deps_debug_checksum)
-            else()
-                set(__deps_debug_checksum 0)
-            endif()
-            string(JSON __deps_debug_checksum_cdn GET ${__deps_hashes} v8_monolithd.lib)
-            if(NOT ${__deps_debug_checksum} STREQUAL ${__deps_debug_checksum_cdn})
-                message("Downloading debug binary...")
-                file(DOWNLOAD "https://cdn.altv.mp/deps/v8/dev/v8_monolithd.lib" ${__deps_debug_lib})
-            endif()
-        endif()
+            message("Checking debug binaries...")
+
+            GetCDNInfo("${__deps_url_base_path}/${__deps_os_path_name}/Debug" __deps_debug_hashes __deps_current_version)
 
-        if(EXISTS ${__deps_headers})
-            file(SHA1 ${__deps_headers} __deps_headers_checksum)
-        else()
-            set(__deps_headers_checksum 0)
+            DownloadFile("v8_monolith.lib" "${__base_path}/lib/Debug" "${__deps_os_path_name}/Debug" ${__deps_debug_hashes})
         endif()
-        string(JSON __deps_headers_checksum_cdn GET ${__deps_hashes} headers.zip)
-        if(NOT ${__deps_headers_checksum} STREQUAL ${__deps_headers_checksum_cdn})
-            message("Downloading headers...")
-            file(DOWNLOAD "https://cdn.altv.mp/deps/v8/dev/headers.zip" ${__deps_headers})
-            message("Extracting headers...")
-            file(ARCHIVE_EXTRACT INPUT ${__deps_headers} DESTINATION "${basePath}")
+
+        GetCDNInfo("${__deps_url_base_path}" __deps_headers_hashes __deps_current_version)
+        DownloadFile("headers.zip" "${__base_path}/include" "" ${__deps_headers_hashes})
+        file(ARCHIVE_EXTRACT INPUT "${__base_path}/include/headers.zip" DESTINATION "${__base_path}/..")
+
+        if(__deps_current_version)
+            message("V8 deps version: ${__deps_current_version}")
         endif()
     endif()
 endfunction()