Fix: package server as a VSCode extension.

Author: bjones1

CHANGELOG.md

@@ -22,7 +22,8 @@ Changelog
 [Github master](https://github.com/bjones1/CodeChat_Editor)
 -----------------------------------------------------------
 
-*   No changes.
+*   Embed the CodeChat Editor Server inside the VSCode extension, rather than
+    running it as a standalone binary.
 
 Version 0.1.34 -- 2025-Sep-08
 -----------------------------

builder/src/main.rs

@@ -242,6 +242,11 @@ fn quick_copy_dir<P: AsRef<Path>>(src: P, dest: P, files: Option<P>) -> io::Resu
     }
 }
 
+fn copy_file<P: AsRef<Path> + std::fmt::Debug>(src: P, dest: P) -> io::Result<()> {
+    println!("copy {src:?} -> {dest:?}");
+    fs::copy(src, dest).map(|_| ())
+}
+
 fn remove_dir_all_if_exists<P: AsRef<Path> + std::fmt::Display>(path: P) -> io::Result<()> {
     if Path::new(path.as_ref()).try_exists().unwrap() {
         fs::remove_dir_all(path.as_ref())?;
@@ -357,6 +362,8 @@ fn run_install(dev: bool) -> io::Result<()> {
     run_cmd!(
         info "Builder: cargo fetch";
         cargo fetch --manifest-path=../builder/Cargo.toml;
+        info "VSCode extension: cargo fetch";
+        cargo fetch --manifest-path=../extensions/VSCode/Cargo.toml;
         info "cargo fetch";
         cargo fetch;
     )?;
@@ -387,6 +394,8 @@ fn run_update() -> io::Result<()> {
     run_cmd!(
         info "Builder: cargo update";
         cargo update --manifest-path=../builder/Cargo.toml;
+        info "VSCoe extension: cargo update";
+        cargo update --manifest-path=../extensions/VSCode/Cargo.toml;
         info "cargo update";
         cargo update;
     )?;
@@ -396,6 +405,8 @@ fn run_update() -> io::Result<()> {
     run_cmd!(
         info "Builder: cargo outdated";
         cargo outdated --manifest-path=../builder/Cargo.toml;
+        info "VSCode extension: cargo outdated";
+        cargo outdated --manifest-path=../extensions/VSCode/Cargo.toml;
         info "cargo outdated";
         cargo outdated;
     )?;
@@ -412,11 +423,17 @@ fn run_test() -> io::Result<()> {
         info "Builder: cargo clippy and fmt";
         cargo clippy --all-targets --manifest-path=../builder/Cargo.toml -- -D warnings;
         cargo fmt --check --manifest-path=../builder/Cargo.toml;
+        info "VSCode extension: cargo clippy and fmt";
+        cargo clippy --all-targets --manifest-path=../extensions/VSCode/Cargo.toml -- -D warnings;
+        cargo fmt --check --manifest-path=../extensions/VSCode/Cargo.toml;
         info "cargo sort";
         cargo sort --check;
         cd ../builder;
         info "Builder: cargo sort";
         cargo sort --check;
+        cd ../extensions/VSCode;
+        info "VSCode extension: cargo sort";
+        cargo sort --check;
     )?;
     run_build()?;
     // Verify that compiling for release produces no errors.
@@ -428,6 +445,8 @@ fn run_test() -> io::Result<()> {
     run_cmd!(
         info "Builder: cargo test";
         cargo test --manifest-path=../builder/Cargo.toml;
+        info "VSCode extension: cargo test";
+        cargo test --manifest-path=../extensions/VSCode/Cargo.toml;
         info "cargo test";
         cargo test;
     )?;
@@ -458,6 +477,12 @@ fn run_client_build(
     // checks.
     skip_check_errors: bool,
 ) -> io::Result<()> {
+    // Ensure the JavaScript data structured generated from Rust are up to date.
+    run_cmd!(
+        info "cargo test export_bindings";
+        cargo test export_bindings;
+    )?;
+
     let esbuild = PathBuf::from_slash("node_modules/.bin/esbuild");
     let distflag = if dist { "--minify" } else { "--sourcemap" };
     // This makes the program work from either the `server/` or `client/`
@@ -549,6 +574,13 @@ fn run_extensions_build(
     // directories.
     let rel_path = "../extensions/VSCode";
 
+    // The NAPI build.
+    let mut napi_args = vec!["napi", "build", "--platform", "--output-dir", "src"];
+    if dist {
+        napi_args.push("--release");
+    }
+    run_script("npx", &napi_args, rel_path, true)?;
+
     // The main build for the Client.
     run_script(
         &esbuild,
@@ -561,6 +593,11 @@ fn run_extensions_build(
             "--external:vscode",
             "--outdir=./out",
             distflag,
+            // The binaries produced by NAPI-RS should be copied over.
+            "--loader:.node=copy",
+            // Avoid the default of adding hash names to the `.node` file
+            // generated.
+            "--asset-names=[name]",
         ],
         rel_path,
         true,
@@ -578,10 +615,12 @@ fn run_extensions_build(
 }
 
 fn run_change_version(new_version: &String) -> io::Result<()> {
+    let cargo_regex = r#"(\r?\nversion = ")[\d.]+("\r?\n)"#;
     let replacement_string = format!("${{1}}{new_version}${{2}}");
+    search_and_replace_file("Cargo.toml", cargo_regex, &replacement_string)?;
     search_and_replace_file(
-        "Cargo.toml",
-        r#"(\r?\nversion = ")[\d.]+("\r?\n)"#,
+        "../extensions/VSCode/Cargo.toml",
+        cargo_regex,
         &replacement_string,
     )?;
     search_and_replace_file(
@@ -601,18 +640,20 @@ fn run_prerelease() -> io::Result<()> {
     // Clean out all bundled files before the rebuild.
     remove_dir_all_if_exists("../client/static/bundled")?;
     run_install(true)?;
-    run_cmd!(
-        info "cargo test export_bindings";
-        cargo test export_bindings;
-    )?;
-    run_script("pnpm", &["run", "dist"], "../client", true)?;
-    Ok(())
+    run_client_build(true, false)
 }
 
 fn run_postrelease(target: &str) -> io::Result<()> {
-    let server_dir = "../extensions/VSCode/server";
-    // Only clean the `server/` directory if it exists.
-    remove_dir_all_if_exists(server_dir)?;
+    // Copy all the Client static files needed by the embedded Server to the
+    // VSCode extension.
+    let client_static_dir = "../extensions/VSCode/static";
+    remove_dir_all_if_exists(client_static_dir)?;
+    quick_copy_dir("../client/static/", client_static_dir, None)?;
+    copy_file("log4rs.yml", "../extensions/VSCode/log4rs.yml")?;
+    copy_file(
+        "hashLocations.json",
+        "../extensions/VSCode/hashLocations.json",
+    )?;
 
     // Translate from the target triple to VSCE's target parameter.
     let vsce_target = match target {
@@ -622,13 +663,6 @@ fn run_postrelease(target: &str) -> io::Result<()> {
         "aarch64-apple-darwin" => "darwin-arm64",
         _ => panic!("Unsupported platform {target}."),
     };
-
-    let src_name = format!("codechat-editor-server-{target}");
-    quick_copy_dir(
-        format!("../target/distrib/{src_name}/").as_str(),
-        "../extensions/VSCode/server",
-        None,
-    )?;
     run_script(
         "npx",
         &[

extensions/VSCode/.gitignore

@@ -26,4 +26,9 @@ out/
 # Server
 server/
 
+# NAPI-RS
+src/index.d.ts
+src/index.js
+src/codechat-editor-client.win32-x64-msvc.node
+
 # CodeChat Editor lexer: python. See TODO.

extensions/VSCode/Cargo.toml

@@ -0,0 +1,55 @@
+# Copyright (C) 2025 Bryan A. Jones.
+#
+# This file is part of the CodeChat Editor.
+#
+# The CodeChat Editor is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# The CodeChat Editor is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# the CodeChat Editor. If not, see
+# [http://www.gnu.org/licenses/](http://www.gnu.org/licenses/).
+#
+# `Cargo.toml` -- Rust interface for the VSCode extension
+# =======================================================
+#
+# General package configurations
+# ------------------------------
+[package]
+authors = ["Bryan A. Jones", "Peter Loux"]
+categories = ["development-tools", "text-editors"]
+description = "A programmer's word processor."
+edition = "2024"
+homepage = "https://codechat-editor.onrender.com/fw/fsb/opt/render/project/src/README.md"
+keywords = ["literate programming"]
+license = "GPL-3.0-only"
+name = "codechat-editor-vscode-extension"
+readme = "../README.md"
+repository = "https://github.com/bjones1/CodeChat_Editor"
+version = "0.1.34"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+actix-server = "2.6.0"
+codechat-editor-server = { path = "../../server" }
+log = "0.4.28"
+napi = { version = "3.0.0", features = ["tokio_rt"] }
+napi-derive = "3.0.0"
+tokio = "1.47.1"
+
+[build-dependencies]
+napi-build = "2"
+
+[profile.release]
+codegen-units = 1
+lto = true
+panic = "abort"
+strip = "symbols"

extensions/VSCode/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    napi_build::setup();
+}

extensions/VSCode/package.json

@@ -21,6 +21,15 @@
     ],
     "license": "GPL-3.0-only",
     "main": "out/extension.js",
+    "napi": {
+        "binaryName": "codechat-editor-client",
+        "targets": [
+            "x86_64-pc-windows-msvc",
+            "x86_64-apple-darwin",
+            "x86_64-unknown-linux-gnu",
+            "aarch64-apple-darwin"
+        ]
+    },
     "name": "codechat-editor-client",
     "prettier": {
         "tabWidth": 4
@@ -82,17 +91,23 @@
         "ws": "^8.18.3"
     },
     "devDependencies": {
+        "@emnapi/core": "^1.5.0",
+        "@emnapi/runtime": "^1.5.0",
+        "@napi-rs/cli": "^3.2.0",
+        "@tybys/wasm-util": "^0.10.1",
         "@types/escape-html": "^1.0.4",
         "@types/vscode": "1.61.0",
         "@types/ws": "^8.18.1",
         "@typescript-eslint/eslint-plugin": "^8.43.0",
         "@typescript-eslint/parser": "^8.43.0",
         "@vscode/vsce": "^3.6.0",
+        "chalk": "^5.6.2",
         "esbuild": "^0.25.9",
         "eslint": "^9.35.0",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-node": "^11.1.0",
+        "npm-run-all2": "^8.0.4",
         "ovsx": "^0.10.5",
         "prettier": "^3.6.2",
         "typescript": "^5.9.2"