this commit is nice

avafloww · Jul 14, 2023 · 345a8c7 · 345a8c7
1 parent c220963
commit 345a8c7
Show file tree

Hide file tree

Showing 18 changed files with 361 additions and 157 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 # LLRT #
 ########
 [package]
-name = "grebuloff"
+name = "grebuloff-llrt"
 version = "0.1.0"
 edition = "2021"
 build = "build.rs"
@@ -17,24 +17,24 @@ chrono = { workspace = true }
 tokio = { workspace = true }
 windows = { workspace = true }
 anyhow = { workspace = true }
+rmp = { workspace = true }
+rmp-serde = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+bytes = { workspace = true }
 dll-syringe = { workspace = true, features = ["payload-utils"] }
-
 grebuloff-macros = { path = "macros" }
+grebuloff-rpc = { path = "rpc" }
 ffxiv_client_structs = { path = "deps/FFXIVClientStructs/rust/lib", features = ["async-resolution"] }
 ffxiv_client_structs_macros = { path = "deps/FFXIVClientStructs/rust/macros" }
 msgbox = "0.7.0"
-rmp = "0.8.11"
-rmp-serde = "1.1.1"
-serde = { version = "1.0.155", features = ["derive"] }
-serde_json = "1.0.96"
 # deno_core = "0.191.0"
 # deno_ast = { version = "0.27.1", features = ["transpiling"] }
 inventory = "0.3.6"
 itertools = "0.10.5"
 rustc-hash = "1.1.0"
 retour = { version = "0.3.0", features = ["static-detour"] }
 uuid = { version = "1.4.0", features = ["v4", "fast-rng"] }
-bytes = "1.4.0"
 async-trait = "0.1.71"
 
 [build-dependencies]
@@ -44,8 +44,8 @@ chrono = { workspace = true }
 # Workspace #
 #############
 [workspace]
-members = [".", "macros", "injector", "loader"]
-default-members = [".", "injector", "loader"]
+members = [".", "macros", "injector", "loader", "rpc", "hlrt"]
+default-members = [".", "injector", "loader", "rpc", "hlrt"]
 
 [workspace.dependencies]
 dll-syringe = { version = "0.15.2", default-features = false }
@@ -54,6 +54,11 @@ anyhow = { version = "1.0.71" }
 log = { version = "0.4" }
 fern = { version = "0.6.2" }
 chrono = { version = "0.4.26" }
+rmp = "0.8.11"
+rmp-serde = "1.1.1"
+serde = { version = "1.0.155", features = ["derive"] }
+serde_json = "1.0.96"
+bytes = "1.4.0"
 
 [workspace.dependencies.windows]
 version = "0.48.0"

diff --git a/build.rs b/build.rs
@@ -38,10 +38,10 @@ impl Build {
         Command::new("cmd")
             .arg("/C")
             .arg("pnpm")
-            .arg("build-if-changed")
+            .arg("maybe-build:js")
             .current_dir("hlrt")
             .spawn()
-            .expect("failed to run `pnpm build-if-changed` for HLRT");
+            .expect("failed to run `pnpm maybe-build:js` for HLRT");
     }
 }
 

diff --git a/hlrt/.gitignore b/hlrt/.gitignore
@@ -4,3 +4,5 @@ out
 *.log*
 .bic_cache
 electron.vite.config.*.mjs
+target
+*.node
diff --git a/hlrt/Cargo.toml b/hlrt/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "grebuloff-hlrt-native"
+version = "0.1.0"
+edition = "2021"
+exclude = ["*.node"]
+
+[lib]
+crate-type = ["cdylib"]
+path = "src/main/native/lib.rs"
+
+[dependencies]
+anyhow = { workspace = true }
+tokio = { workspace = true }
+
+[dependencies.neon]
+version = "0.10"
+default-features = false
+features = ["napi-6", "promise-api", "task-api", "channel-api"]
diff --git a/hlrt/package.json b/hlrt/package.json
@@ -15,8 +15,10 @@
     "start": "electron-vite preview",
     "dev": "electron-vite dev --sourcemap",
     "dev:renderer": "cross-env LLRT_PIPE_ID=dev electron-vite dev --sourcemap --rendererOnly",
+    "build:all": "pnpm run build:native && pnpm run build:js",
     "build": "pnpm run typecheck && electron-vite build && electron-packager . --platform=win32 --out=../dist --executable-name=grebuloff-hlrt --overwrite",
-    "build-if-changed": "build-if-changed"
+    "build:native": "cargo-cp-artifact -ac grebuloff-hlrt-native out/main/native/native.node -- cargo build --message-format=json-render-diagnostics",
+    "maybe-build:js": "build-if-changed"
   },
   "dependencies": {
     "@electron-toolkit/utils": "^1.0.2",
@@ -46,11 +48,15 @@
     "eslint-plugin-react": "^7.32.2",
     "prettier": "^2.8.8",
     "typescript": "^5.1.6",
-    "vite": "^4.3.9"
+    "vite": "^4.3.9",
+    "cargo-cp-artifact": "^0.1"
   },
   "pnpm": {
     "patchedDependencies": {
       "build-if-changed@1.5.5": "patches/build-if-changed@1.5.5.patch"
     }
-  }
+  },
+  "bic": [
+    "src"
+  ]
 }
diff --git a/hlrt/pnpm-lock.yaml b/hlrt/pnpm-lock.yaml
diff --git a/hlrt/src/main/native/index.ts b/hlrt/src/main/native/index.ts
@@ -0,0 +1 @@
+import native from './native.node';
diff --git a/hlrt/src/main/native/lib.rs b/hlrt/src/main/native/lib.rs
@@ -0,0 +1,11 @@
+use neon::prelude::*;
+
+fn hello(mut cx: FunctionContext) -> JsResult<JsString> {
+    Ok(cx.string("hello node"))
+}
+
+#[neon::main]
+fn main(mut cx: ModuleContext) -> NeonResult<()> {
+    cx.export_function("hello", hello)?;
+    Ok(())
+}
diff --git a/hlrt/tsconfig.node.json b/hlrt/tsconfig.node.json
@@ -3,7 +3,7 @@
   "include": [
     "electron.vite.config.*",
     "src/main/**/*.{ts,tsx}",
-    "src/preload/**/*.{ts,tsx}"
+    "src/preload/**/*.{ts,tsx}",
   ],
   "compilerOptions": {
     "composite": true,
@@ -12,4 +12,4 @@
       "electron-vite/node"
     ],
   }
-}
+}
diff --git a/loader/Cargo.toml b/loader/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "loader"
+name = "grebuloff-loader"
 version = "0.1.0"
 edition = "2021"
 build = "build.rs"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,5 @@ out @@
     *.log*
     .bic_cache
     electron.vite.config.*.mjs
+    target
+    *.node