Merge pull request #58 from TrueNine/dev

Dev

Author: TrueNine

.github/actions/setup-tauri/action.yml

@@ -18,7 +18,10 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y \
+        sudo apt-get install -y --no-install-recommends \
+          libgtk-3-dev \
+          libglib2.0-dev \
+          pkg-config \
           libwebkit2gtk-4.1-dev \
           libappindicator3-dev \
           librsvg2-dev \
@@ -48,7 +51,7 @@ runs:
         restore-keys: |
           ${{ runner.os }}-cargo-
 
-    - name: Sync Tauri version from CLI
+    - name: Sync Tauri version
       shell: bash
       run: |
         version="${{ inputs.version }}"
@@ -63,4 +66,7 @@ runs:
 
     - name: Clean old bundle artifacts
       shell: bash
-      run: rm -rf gui/src-tauri/target/**/bundle
+      run: |
+        if [ -d "gui/src-tauri/target" ]; then
+          find gui/src-tauri/target -type d -name bundle -prune -exec rm -rf {} +
+        fi

.github/workflows/build-gui-all.yml

@@ -18,33 +18,40 @@ jobs:
         include:
           - os: windows-latest
             platform: windows
+            rust-targets: ''
+            tauri-command: pnpm tauri build
           - os: ubuntu-24.04
             platform: linux
+            rust-targets: ''
+            tauri-command: pnpm tauri build
           - os: macos-14
             platform: macos
+            rust-targets: aarch64-apple-darwin,x86_64-apple-darwin
+            tauri-command: pnpm tauri build --target universal-apple-darwin
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-node-pnpm
       - uses: ./.github/actions/setup-tauri
         with:
+          rust-targets: ${{ matrix.rust-targets }}
           version: ${{ inputs.version }}
 
       - name: Build GUI
         working-directory: ./gui
         env:
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
-        run: pnpm tauri build
+        run: ${{ matrix.tauri-command }}
 
       - name: Upload Windows artifacts
         if: matrix.platform == 'windows'
         uses: actions/upload-artifact@v4
         with:
           name: gui-${{ matrix.os }}
           path: |
-            target/*/release/bundle/**/*.exe
-            target/release/bundle/**/*.exe
+            gui/src-tauri/target/*/release/bundle/**/*.exe
+            gui/src-tauri/target/release/bundle/**/*.exe
           if-no-files-found: error
 
       - name: Upload Linux artifacts
@@ -53,12 +60,12 @@ jobs:
         with:
           name: gui-${{ matrix.os }}
           path: |
-            target/*/release/bundle/**/*.AppImage
-            target/*/release/bundle/**/*.deb
-            target/*/release/bundle/**/*.rpm
-            target/release/bundle/**/*.AppImage
-            target/release/bundle/**/*.deb
-            target/release/bundle/**/*.rpm
+            gui/src-tauri/target/*/release/bundle/**/*.AppImage
+            gui/src-tauri/target/*/release/bundle/**/*.deb
+            gui/src-tauri/target/*/release/bundle/**/*.rpm
+            gui/src-tauri/target/release/bundle/**/*.AppImage
+            gui/src-tauri/target/release/bundle/**/*.deb
+            gui/src-tauri/target/release/bundle/**/*.rpm
           if-no-files-found: error
 
       - name: Upload macOS artifacts
@@ -67,6 +74,6 @@ jobs:
         with:
           name: gui-${{ matrix.os }}
           path: |
-            target/*/release/bundle/**/*.dmg
-            target/release/bundle/**/*.dmg
+            gui/src-tauri/target/*/release/bundle/**/*.dmg
+            gui/src-tauri/target/release/bundle/**/*.dmg
           if-no-files-found: error

.github/workflows/pull-request.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-    types: [opened, synchronize, reopened, closed]
+    types: [opened, synchronize, reopened, ready_for_review]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -13,39 +13,26 @@ concurrency:
 jobs:
   check:
     runs-on: ubuntu-24.04
-    if: github.event.pull_request.merged == false
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache apt packages
-        uses: actions/cache@v4
-        with:
-          path: /var/cache/apt/archives
-          key: apt-gtk-${{ runner.os }}-${{ hashFiles('.github/workflows/pull-request.yml') }}
-          restore-keys: apt-gtk-${{ runner.os }}-
-
-      - name: Install GTK development dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf pkg-config
-
       - uses: ./.github/actions/setup-node-pnpm
 
-      - name: Build
-        run: pnpm exec turbo run build
-
       - uses: ./.github/actions/setup-rust
         with:
           cache-key: pr
 
-      - name: Generate Tauri icons
-        run: pnpm -F @truenine/memory-sync-gui run generate:icons
+      - name: Build
+        run: pnpm run build
+
+      - name: Lint
+        run: pnpm run lint
 
-      - name: Generate route tree
-        run: pnpm -F @truenine/memory-sync-gui run generate:routes
+      - name: Typecheck
+        run: pnpm run typecheck
 
       - name: Run tests
-        run: pnpm exec turbo run test
+        run: pnpm run test
 
       - name: Rust tests (excluding GUI)
         run: cargo test --workspace --exclude memory-sync-gui --lib --bins --tests

.github/workflows/release-cli.yml

@@ -22,6 +22,9 @@ jobs:
       version: ${{ steps.check.outputs.version }}
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 25
 
       - name: Check if should publish
         id: check
@@ -103,20 +106,31 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
           echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-      - name: Build all napi libraries
+      - name: Build all napi native modules
         shell: bash
         run: |
-          for lib in logger md-compiler config init-bundle; do
-            echo "Building napi for $lib..."
-            (cd "libraries/$lib" && pnpm exec napi build --platform --release --target ${{ matrix.target.rust }} --output-dir dist -- --features napi)
+          module_dirs=(libraries/logger libraries/md-compiler cli)
+          for module_dir in "${module_dirs[@]}"; do
+            echo "Building napi in ${module_dir}..."
+            (
+              cd "${module_dir}" && \
+              pnpm exec napi build --platform --release --target ${{ matrix.target.rust }} --output-dir dist -- --features napi
+            )
           done
       - name: Collect .node files into CLI platform package
         shell: bash
         run: |
           target_dir="cli/npm/${{ matrix.target.suffix }}"
           mkdir -p "$target_dir"
-          for lib in logger md-compiler config init-bundle; do
-            cp libraries/$lib/dist/*.node "$target_dir/"
+          shopt -s nullglob
+          module_dirs=(libraries/logger libraries/md-compiler cli)
+          for module_dir in "${module_dirs[@]}"; do
+            node_files=("${module_dir}"/dist/*.node)
+            if [ "${#node_files[@]}" -eq 0 ]; then
+              echo "ERROR: no .node files found in ${module_dir}/dist"
+              exit 1
+            fi
+            cp "${node_files[@]}" "$target_dir/"
           done
           echo "Contents of $target_dir:"
           ls -la "$target_dir/"
@@ -185,7 +199,7 @@ jobs:
           node-version: 25
           registry-url: https://registry.npmjs.org/
       - name: Build
-        run: pnpm exec turbo run build --filter=@truenine/memory-sync-cli...
+        run: pnpm -F @truenine/memory-sync-cli run build
       - name: Publish to npm
         working-directory: ./cli
         run: pnpm publish --access public --no-git-checks
@@ -228,7 +242,7 @@ jobs:
       - name: Build plugin-runtime
         shell: bash
         run: |
-          pnpm exec turbo run build --filter=@truenine/memory-sync-cli...
+          pnpm -F @truenine/memory-sync-cli run build
           ls -la cli/dist/plugin-runtime.mjs
       - uses: ./.github/actions/setup-rust
         with:

Cargo.lock

@@ -4,10 +4,6 @@ members = [
   "cli",
   "libraries/logger",
   "libraries/md-compiler",
-  "libraries/config",
-  "libraries/plugin-shared",
-  "libraries/input-plugins",
-  "libraries/init-bundle",
   "gui/src-tauri",
 ]
 
@@ -23,10 +19,6 @@ repository = "https://github.com/TrueNine/memory-sync"
 tnmsc = { path = "cli" }
 tnmsc-logger = { path = "libraries/logger" }
 tnmsc-md-compiler = { path = "libraries/md-compiler" }
-tnmsc-config = { path = "libraries/config" }
-tnmsc-plugin-shared = { path = "libraries/plugin-shared" }
-tnmsc-input-plugins = { path = "libraries/input-plugins" }
-tnmsc-init-bundle = { path = "libraries/init-bundle" }
 
 # Serialization
 serde = { version = "1", features = ["derive"] }

Cargo.toml

@@ -10,6 +10,7 @@ repository.workspace = true
 [lib]
 name = "tnmsc"
 path = "src/lib.rs"
+crate-type = ["rlib", "cdylib"]
 
 [[bin]]
 name = "tnmsc"
@@ -18,22 +19,24 @@ path = "src/main.rs"
 [features]
 default = []
 embedded-runtime = []
+napi = ["dep:napi", "dep:napi-derive"]
 
 [dependencies]
 tnmsc-logger = { workspace = true }
 tnmsc-md-compiler = { workspace = true }
-tnmsc-config = { workspace = true }
-tnmsc-plugin-shared = { workspace = true }
-tnmsc-input-plugins = { workspace = true }
-tnmsc-init-bundle = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = "2"
 clap = { workspace = true }
 dirs = { workspace = true }
+sha2 = { workspace = true }
+napi = { workspace = true, optional = true }
+napi-derive = { workspace = true, optional = true }
 reqwest = { version = "0.13", default-features = false, features = ["blocking", "json", "rustls", "rustls-native-certs"] }
 
 [dev-dependencies]
 proptest = "1"
 tempfile = "3"
-tnmsc-config = { workspace = true }
+
+[build-dependencies]
+napi-build = { workspace = true }