@ezetgalaxy/titan 25.14.2 → 25.14.5

package/index.js

@@ -187,66 +187,41 @@ function buildProd() {
 
     const root = process.cwd();
     const appJs = path.join(root, "app", "app.js");
-    const bundler = path.join(root, "titan", "bundle.js");
     const serverDir = path.join(root, "server");
-    const builtActionsDir = path.join(serverDir, "actions");  // REAL output
-    const actionsOut = builtActionsDir;                       // final output
+    const actionsOut = path.join(serverDir, "actions");
 
-    // --------------------------------------------
-    // 0) Basic validation
-    // --------------------------------------------
+    // BASIC CHECKS
     if (!fs.existsSync(appJs)) {
         console.log(red("ERROR: app/app.js not found."));
         process.exit(1);
     }
 
-    if (!fs.existsSync(bundler)) {
-        console.log(red("ERROR: titan/bundle.js not found."));
-        process.exit(1);
-    }
-
-    // --------------------------------------------
-    // 1) Generate routes + action_map via DSL
-    // --------------------------------------------
-    console.log(cyan("→ Generating Titan metadata..."));
+    // ----------------------------------------------------
+    // 1) BUILD METADATA + BUNDLE ACTIONS (ONE TIME ONLY)
+    // ----------------------------------------------------
+    console.log(cyan("→ Building Titan metadata + bundling actions..."));
     execSync("node app/app.js --build", { stdio: "inherit" });
 
-    // --------------------------------------------
-    // 2) Bundle JS actions
-    // --------------------------------------------
-    console.log(cyan("→ Bundling Titan actions..."));
-    execSync("node titan/bundle.js", { stdio: "inherit" });
-
-    // --------------------------------------------
-    // 3) Ensure server/actions exists
-    // --------------------------------------------
+    // ensure actions directory exists
     fs.mkdirSync(actionsOut, { recursive: true });
 
-    // --------------------------------------------
-    // 4) List & verify bundles
-    // --------------------------------------------
-    if (!fs.existsSync(builtActionsDir)) {
-        console.log(red("ERROR: Titan bundler did NOT generate server/actions directory."));
-        console.log(red("This means titan/bundle.js output path is incorrect."));
+    // verify bundled actions exist
+    const bundles = fs.readdirSync(actionsOut).filter(f => f.endsWith(".jsbundle"));
+    if (bundles.length === 0) {
+        console.log(red("ERROR: No actions bundled."));
+        console.log(red("Make sure your DSL outputs to server/actions."));
         process.exit(1);
     }
 
-    const bundles = fs.readdirSync(builtActionsDir)
-        .filter(f => f.endsWith(".jsbundle"));
-
-    if (bundles.length === 0) {
-        console.log(yellow("Warning: No actions bundled."));
-    } else {
-        for (const file of bundles) {
-            console.log(cyan(`→ Found bundle: ${file}`));
-        }
-    }
+    bundles.forEach(file => {
+        console.log(cyan(`→ Found action bundle: ${file}`));
+    });
 
-    console.log(green("✔ Actions copied to server/actions"));
+    console.log(green("✔ Actions ready in server/actions"));
 
-    // --------------------------------------------
-    // 5) Build Rust server
-    // --------------------------------------------
+    // ----------------------------------------------------
+    // 2) BUILD RUST BINARY
+    // ----------------------------------------------------
     console.log(cyan("→ Building Rust release binary..."));
     execSync("cargo build --release", {
         cwd: serverDir,
@@ -257,6 +232,7 @@ function buildProd() {
 }
 
 
+
 /* START PRODUCTION BINARY */
 function startProd() {
     const isWin = process.platform === "win32";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ezetgalaxy/titan",
-  "version": "25.14.2",
+  "version": "25.14.5",
   "description": "JavaScript backend framework that compiles your JS into a Rust + Axum server.",
   "license": "ISC",
   "author": "ezetgalaxy",

package/templates/server/src/main.rs

@@ -10,6 +10,8 @@ use axum::{
     Router,
 };
 
+use std::path::Path;
+
 use boa_engine::{
     js_string,
     native_function::NativeFunction,
@@ -36,8 +38,6 @@ struct RouteVal {
 #[derive(Clone)]
 struct AppState {
     routes: Arc<HashMap<String, RouteVal>>,
-    /// Project root — used only in dev mode
-    project_root: PathBuf,
 }
 
 fn inject_t_fetch(ctx: &mut Context) {
@@ -130,20 +130,30 @@ fn detect_project_root() -> PathBuf {
 }
 
 
-fn resolve_actions_dir(project_root: &PathBuf) -> PathBuf {
-    let exe = std::env::current_exe().unwrap();
-    let exe_dir = exe.parent().unwrap();
+fn resolve_actions_dir() -> PathBuf {
+    let exe = std::env::current_exe().unwrap_or_else(|_| PathBuf::from("."));
+    let exe_dir = exe.parent().unwrap_or(Path::new("/app")).to_path_buf();
+
+    // Detect production if running from Docker binary location
     let is_prod = exe_dir.to_string_lossy().contains("/app")
-        || exe_dir.ends_with("release");
+        || exe.file_name().unwrap_or_default() == "titan-server";
 
     if is_prod {
-        PathBuf::from("/app/actions")
-    } else {
-        project_root.join("server").join("actions")
+        // Final production directory
+        return PathBuf::from("/app/actions");
     }
+
+    // DEV: exe = <root>/server/target/debug/server(.exe)
+    exe_dir
+        .parent()                 // target
+        .unwrap_or(Path::new("."))
+        .parent()                 // server
+        .unwrap_or(Path::new("."))
+        .join("actions")
 }
 
 
+
 async fn dynamic_handler(
     State(state): State<AppState>,
     req: Request<Body>,
@@ -179,7 +189,7 @@ async fn dynamic_handler(
             .into_response();
     }
 
-    let actions_dir = resolve_actions_dir(&state.project_root);
+    let actions_dir = resolve_actions_dir();
     let action_path = actions_dir.join(format!("{}.jsbundle", action_name));
 
     if !action_path.exists() {
@@ -243,11 +253,10 @@ async fn main() -> Result<()> {
     let routes_map: HashMap<String, RouteVal> =
         serde_json::from_value(json["routes"].clone()).unwrap_or_default();
 
-        let project_root = detect_project_root();
+        let _project_root = detect_project_root();
 
 let state = AppState {
     routes: Arc::new(routes_map),
-    project_root,
 };
 
         
@@ -258,7 +267,16 @@ let state = AppState {
         .with_state(state);
 
     let listener = TcpListener::bind(format!("0.0.0.0:{}", port)).await?;
-    println!("Titan server running on {}", port);
+ // TITAN BANNER
+ println!("\n\x1b[38;5;208m████████╗██╗████████╗ █████╗ ███╗   ██╗");
+ println!("╚══██╔══╝██║╚══██╔══╝██╔══██╗████╗  ██║");
+ println!("   ██║   ██║   ██║   ███████║██╔██╗ ██║");
+ println!("   ██║   ██║   ██║   ██╔══██║██║╚██╗██║");
+ println!("   ██║   ██║   ██║   ██║  ██║██║ ╚████║");
+ println!("   ╚═╝   ╚═╝   ╚═╝   ╚═╝  ╚═╝╚═╝  ╚═══╝\x1b[0m\n");
+ 
+
+    println!("\x1b[38;5;39mTitan server running at:\x1b[0m http://localhost:{}", port);
 
     axum::serve(listener, app).await?;
     Ok(())