@ezetgalaxy/titan 26.8.2 → 26.9.0

package/templates/js/server/src/utils.rs

@@ -1,33 +1,33 @@
-pub fn blue(s: &str) -> String {
-    format!("\x1b[38;5;39m{}\x1b[0m", s)
-}
-pub fn white(s: &str) -> String {
-    format!("\x1b[39m{}\x1b[0m", s)
-}
-pub fn yellow(s: &str) -> String {
-    format!("\x1b[33m{}\x1b[0m", s)
-}
-pub fn green(s: &str) -> String {
-    format!("\x1b[32m{}\x1b[0m", s)
-}
-pub fn gray(s: &str) -> String {
-    format!("\x1b[90m{}\x1b[0m", s)
-}
-pub fn red(s: &str) -> String {
-    format!("\x1b[31m{}\x1b[0m", s)
-}
-
-pub fn parse_expires_in(value: &str) -> Option<u64> {
-    let (num, unit) = value.split_at(value.len() - 1);
-    let n: u64 = num.parse().ok()?;
-
-    match unit {
-        "s" => Some(n),
-        "m" => Some(n * 60),
-        "h" => Some(n * 60 * 60),
-        "d" => Some(n * 60 * 60 * 24),
-        _ => None,
-    }
-}
-
-
+pub fn blue(s: &str) -> String {
+    format!("\x1b[38;5;39m{}\x1b[0m", s)
+}
+pub fn white(s: &str) -> String {
+    format!("\x1b[39m{}\x1b[0m", s)
+}
+pub fn yellow(s: &str) -> String {
+    format!("\x1b[33m{}\x1b[0m", s)
+}
+pub fn green(s: &str) -> String {
+    format!("\x1b[32m{}\x1b[0m", s)
+}
+pub fn gray(s: &str) -> String {
+    format!("\x1b[90m{}\x1b[0m", s)
+}
+pub fn red(s: &str) -> String {
+    format!("\x1b[31m{}\x1b[0m", s)
+}
+
+pub fn parse_expires_in(value: &str) -> Option<u64> {
+    let (num, unit) = value.split_at(value.len() - 1);
+    let n: u64 = num.parse().ok()?;
+
+    match unit {
+        "s" => Some(n),
+        "m" => Some(n * 60),
+        "h" => Some(n * 60 * 60),
+        "d" => Some(n * 60 * 60 * 24),
+        _ => None,
+    }
+}
+
+

package/templates/js/titan/bundle.js

@@ -1,78 +1,78 @@
-import fs from "fs";
-import path from "path";
-import esbuild from "esbuild";
-
-const root = process.cwd();
-const actionsDir = path.join(root, "app", "actions");
-const outDir = path.join(root, "server", "actions");
-
-export async function bundle() {
-  const start = Date.now();
-  await bundleJs();
-  // console.log(`[Titan] Bundle finished in ${((Date.now() - start) / 1000).toFixed(2)}s`);
-}
-
-async function bundleJs() {
-  // console.log("[Titan] Bundling JS actions...");
-
-  fs.mkdirSync(outDir, { recursive: true });
-
-  // Clean old bundles
-  if (fs.existsSync(outDir)) {
-    const oldFiles = fs.readdirSync(outDir);
-    for (const file of oldFiles) {
-      fs.unlinkSync(path.join(outDir, file));
-    }
-  }
-
-  const files = fs.readdirSync(actionsDir).filter(f => f.endsWith(".js") || f.endsWith(".ts"));
-  if (files.length === 0) return;
-
-  // console.log(`[Titan] Bundling ${files.length} JS actions...`);
-
-  for (const file of files) {
-    const actionName = path.basename(file, path.extname(file));
-
-    const entry = path.join(actionsDir, file);
-
-    // Rust runtime expects `.jsbundle` extension — consistent with previous design
-    const outfile = path.join(outDir, actionName + ".jsbundle");
-
-    // console.log(`[Titan] Bundling ${entry} → ${outfile}`);
-
-    await esbuild.build({
-      entryPoints: [entry],
-      outfile,
-      bundle: true,
-      format: "iife",
-      globalName: "__titan_exports",
-      platform: "neutral",
-      target: "es2020",
-      logLevel: "silent",
-      banner: {
-        js: "const defineAction = (fn) => fn;"
-      },
-
-      footer: {
-        js: `
-    (function () {
-      const fn =
-        __titan_exports["${actionName}"] ||
-        __titan_exports.default;
-    
-      if (typeof fn !== "function") {
-        throw new Error("[Titan] Action '${actionName}' not found or not a function");
-      }
-    
-      globalThis["${actionName}"] = function(request_arg) {
-         globalThis.req = request_arg;
-         return fn(request_arg);
-      };
-    })();
-    `
-      }
-    });
-  }
-
-  // console.log("[Titan] JS Bundling finished.");
-}
+import fs from "fs";
+import path from "path";
+import esbuild from "esbuild";
+
+const root = process.cwd();
+const actionsDir = path.join(root, "app", "actions");
+const outDir = path.join(root, "server", "actions");
+
+export async function bundle() {
+  const start = Date.now();
+  await bundleJs();
+  // console.log(`[Titan] Bundle finished in ${((Date.now() - start) / 1000).toFixed(2)}s`);
+}
+
+async function bundleJs() {
+  // console.log("[Titan] Bundling JS actions...");
+
+  fs.mkdirSync(outDir, { recursive: true });
+
+  // Clean old bundles
+  if (fs.existsSync(outDir)) {
+    const oldFiles = fs.readdirSync(outDir);
+    for (const file of oldFiles) {
+      fs.unlinkSync(path.join(outDir, file));
+    }
+  }
+
+  const files = fs.readdirSync(actionsDir).filter(f => f.endsWith(".js") || f.endsWith(".ts"));
+  if (files.length === 0) return;
+
+  // console.log(`[Titan] Bundling ${files.length} JS actions...`);
+
+  for (const file of files) {
+    const actionName = path.basename(file, path.extname(file));
+
+    const entry = path.join(actionsDir, file);
+
+    // Rust runtime expects `.jsbundle` extension — consistent with previous design
+    const outfile = path.join(outDir, actionName + ".jsbundle");
+
+    // console.log(`[Titan] Bundling ${entry} → ${outfile}`);
+
+    await esbuild.build({
+      entryPoints: [entry],
+      outfile,
+      bundle: true,
+      format: "iife",
+      globalName: "__titan_exports",
+      platform: "neutral",
+      target: "es2020",
+      logLevel: "silent",
+      banner: {
+        js: "const defineAction = (fn) => fn;"
+      },
+
+      footer: {
+        js: `
+    (function () {
+      const fn =
+        __titan_exports["${actionName}"] ||
+        __titan_exports.default;
+    
+      if (typeof fn !== "function") {
+        throw new Error("[Titan] Action '${actionName}' not found or not a function");
+      }
+    
+      globalThis["${actionName}"] = function(request_arg) {
+         globalThis.req = request_arg;
+         return fn(request_arg);
+      };
+    })();
+    `
+      }
+    });
+  }
+
+  // console.log("[Titan] JS Bundling finished.");
+}

package/templates/js/titan/dev.js

@@ -3,7 +3,6 @@ import { spawn, execSync } from "child_process";
 import path from "path";
 import { fileURLToPath } from "url";
 import fs from "fs";
-import { bundle } from "./bundle.js";
 
 // Required for __dirname in ES modules
 const __filename = fileURLToPath(import.meta.url);
@@ -39,12 +38,20 @@ function getTitanVersion() {
                 cur = path.join(cur, "..");
             }
         } catch (e2) { }
+
+        try {
+            // Fallback to calling tit --version
+            const output = execSync("tit --version", { encoding: "utf-8" }).trim();
+            const match = output.match(/v(\d+\.\d+\.\d+)/);
+            if (match) return match[1];
+        } catch (e3) { }
     }
     return "0.1.0";
 }
 
 let serverProcess = null;
 let isKilling = false;
+let isFirstBoot = true;
 
 // ... (killServer same as before) 
 async function killServer() {
@@ -156,7 +163,24 @@ async function startRustServer(retryCount = 0) {
                 isReady = true;
                 clearTimeout(slowTimer);
                 stopSpinner(true, "Your app is now orbiting Titan Planet");
-                process.stdout.write(stdoutBuffer);
+
+                if (isFirstBoot) {
+                    process.stdout.write(stdoutBuffer);
+                    isFirstBoot = false;
+                } else {
+                    // On subsequent reloads, only print non-banner lines from the buffer
+                    const lines = stdoutBuffer.split("\n");
+                    for (const line of lines) {
+                        const isBanner = line.includes("Titan server running") ||
+                            line.includes("████████╗") ||
+                            line.includes("╚══") ||
+                            line.includes("   ██║") ||
+                            line.includes("   ╚═╝");
+                        if (!isBanner && line.trim()) {
+                            process.stdout.write(line + "\n");
+                        }
+                    }
+                }
                 stdoutBuffer = "";
             }
         } else {
@@ -203,7 +227,15 @@ async function startDev() {
         hasRust = fs.readdirSync(actionsDir).some(f => f.endsWith(".rs"));
     }
 
-    const mode = hasRust ? "Rust + JS Actions" : "JS Actions";
+    const isTs = fs.existsSync(path.join(root, "tsconfig.json")) ||
+        fs.existsSync(path.join(root, "app", "app.ts"));
+
+    let mode = "";
+    if (hasRust) {
+        mode = isTs ? "Rust + TS Actions" : "Rust + JS Actions";
+    } else {
+        mode = isTs ? "TS Actions" : "JS Actions";
+    }
     const version = getTitanVersion();
 
     console.clear();

package/templates/js/titan/titan.js

@@ -1,122 +1,122 @@
-import fs from "fs";
-import path from "path";
-import { bundle } from "./bundle.js";
-
-const cyan = (t) => `\x1b[36m${t}\x1b[0m`;
-const green = (t) => `\x1b[32m${t}\x1b[0m`;
-
-const routes = {};
-const dynamicRoutes = {};
-const actionMap = {};
-
-function addRoute(method, route) {
-  const key = `${method.toUpperCase()}:${route}`;
-
-
-  return {
-    reply(value) {
-      routes[key] = {
-        type: typeof value === "object" ? "json" : "text",
-        value
-      };
-    },
-
-    action(name) {
-      if (route.includes(":")) {
-        if (!dynamicRoutes[method]) dynamicRoutes[method] = [];
-        dynamicRoutes[method].push({
-          method: method.toUpperCase(),
-          pattern: route,
-          action: name
-        });
-      } else {
-        routes[key] = {
-          type: "action",
-          value: name
-        };
-        actionMap[key] = name;
-      }
-    }
-  };
-}
-
-/**
- * @typedef {Object} RouteHandler
- * @property {(value: any) => void} reply - Send a direct response
- * @property {(name: string) => void} action - Bind to a server-side action
- */
-
-/**
- * Titan App Builder
- */
-const t = {
-  /**
-   * Define a GET route
-   * @param {string} route 
-   * @returns {RouteHandler}
-   */
-  get(route) {
-    return addRoute("GET", route);
-  },
-
-  /**
-   * Define a POST route
-   * @param {string} route 
-   * @returns {RouteHandler}
-   */
-  post(route) {
-    return addRoute("POST", route);
-  },
-
-  log(module, msg) {
-    console.log(`[\x1b[35m${module}\x1b[0m] ${msg}`);
-  },
-
-  /**
-   * Start the Titan Server
-   * @param {number} [port=3000] 
-   * @param {string} [msg=""] 
-   */
-  async start(port = 3000, msg = "") {
-    try {
-      console.log(cyan("[Titan] Preparing runtime..."));
-      await bundle();
-
-      const base = path.join(process.cwd(), "server");
-      if (!fs.existsSync(base)) {
-        fs.mkdirSync(base, { recursive: true });
-      }
-
-      const routesPath = path.join(base, "routes.json");
-      const actionMapPath = path.join(base, "action_map.json");
-
-      fs.writeFileSync(
-        routesPath,
-        JSON.stringify(
-          {
-            __config: { port },
-            routes,
-            __dynamic_routes: Object.values(dynamicRoutes).flat()
-          },
-          null,
-          2
-        )
-      );
-
-      fs.writeFileSync(
-        actionMapPath,
-        JSON.stringify(actionMap, null, 2)
-      );
-
-      console.log(green("✔ Titan metadata written successfully"));
-      if (msg) console.log(cyan(msg));
-
-    } catch (e) {
-      console.error(`\x1b[31m[Titan] Build Error: ${e.message}\x1b[0m`);
-      process.exit(1);
-    }
-  }
-};
-
-
-export default t;
+import fs from "fs";
+import path from "path";
+import { bundle } from "./bundle.js";
+
+const cyan = (t) => `\x1b[36m${t}\x1b[0m`;
+const green = (t) => `\x1b[32m${t}\x1b[0m`;
+
+const routes = {};
+const dynamicRoutes = {};
+const actionMap = {};
+
+function addRoute(method, route) {
+  const key = `${method.toUpperCase()}:${route}`;
+
+
+  return {
+    reply(value) {
+      routes[key] = {
+        type: typeof value === "object" ? "json" : "text",
+        value
+      };
+    },
+
+    action(name) {
+      if (route.includes(":")) {
+        if (!dynamicRoutes[method]) dynamicRoutes[method] = [];
+        dynamicRoutes[method].push({
+          method: method.toUpperCase(),
+          pattern: route,
+          action: name
+        });
+      } else {
+        routes[key] = {
+          type: "action",
+          value: name
+        };
+        actionMap[key] = name;
+      }
+    }
+  };
+}
+
+/**
+ * @typedef {Object} RouteHandler
+ * @property {(value: any) => void} reply - Send a direct response
+ * @property {(name: string) => void} action - Bind to a server-side action
+ */
+
+/**
+ * Titan App Builder
+ */
+const t = {
+  /**
+   * Define a GET route
+   * @param {string} route 
+   * @returns {RouteHandler}
+   */
+  get(route) {
+    return addRoute("GET", route);
+  },
+
+  /**
+   * Define a POST route
+   * @param {string} route 
+   * @returns {RouteHandler}
+   */
+  post(route) {
+    return addRoute("POST", route);
+  },
+
+  log(module, msg) {
+    console.log(`[\x1b[35m${module}\x1b[0m] ${msg}`);
+  },
+
+  /**
+   * Start the Titan Server
+   * @param {number} [port=3000] 
+   * @param {string} [msg=""] 
+   */
+  async start(port = 3000, msg = "") {
+    try {
+      console.log(cyan("[Titan] Preparing runtime..."));
+      await bundle();
+
+      const base = path.join(process.cwd(), "server");
+      if (!fs.existsSync(base)) {
+        fs.mkdirSync(base, { recursive: true });
+      }
+
+      const routesPath = path.join(base, "routes.json");
+      const actionMapPath = path.join(base, "action_map.json");
+
+      fs.writeFileSync(
+        routesPath,
+        JSON.stringify(
+          {
+            __config: { port },
+            routes,
+            __dynamic_routes: Object.values(dynamicRoutes).flat()
+          },
+          null,
+          2
+        )
+      );
+
+      fs.writeFileSync(
+        actionMapPath,
+        JSON.stringify(actionMap, null, 2)
+      );
+
+      console.log(green("✔ Titan metadata written successfully"));
+      if (msg) console.log(cyan(msg));
+
+    } catch (e) {
+      console.error(`\x1b[31m[Titan] Build Error: ${e.message}\x1b[0m`);
+      process.exit(1);
+    }
+  }
+};
+
+
+export default t;

package/templates/rust/Dockerfile

@@ -1,66 +1,66 @@
-# ================================================================
-# STAGE 1 — Build Titan (JS → Rust)
-# ================================================================
-FROM rust:1.91.1 AS builder
-
-# Install Node for Titan CLI + bundler
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install -y nodejs
-
-# Install Titan CLI (latest)
-RUN npm install -g @ezetgalaxy/titan@latest
-
-WORKDIR /app
-
-# Copy project files
-COPY . .
-
-# Install JS dependencies (needed for Titan DSL + bundler)
-RUN npm install
-
-SHELL ["/bin/bash", "-c"]
-
-# Extract Titan extensions into .ext
-RUN mkdir -p /app/.ext && \
-    find /app/node_modules -maxdepth 5 -type f -name "titan.json" -print0 | \
-    while IFS= read -r -d '' file; do \
-    pkg_dir="$(dirname "$file")"; \
-    pkg_name="$(basename "$pkg_dir")"; \
-    echo "Copying Titan extension: $pkg_name from $pkg_dir"; \
-    cp -r "$pkg_dir" "/app/.ext/$pkg_name"; \
-    done && \
-    echo "Extensions in .ext:" && \
-    ls -R /app/.ext
-
-# Build Titan metadata + bundle JS actions
-RUN titan build
-
-# Build Rust binary
-RUN cd server && cargo build --release
-
-
-
-# ================================================================
-# STAGE 2 — Runtime Image (Lightweight)
-# ================================================================
-FROM debian:stable-slim
-
-WORKDIR /app
-
-# Copy Rust binary from builder stage
-COPY --from=builder /app/server/target/release/titan-server ./titan-server
-
-# Copy Titan routing metadata
-COPY --from=builder /app/server/routes.json ./routes.json
-COPY --from=builder /app/server/action_map.json ./action_map.json
-
-# Copy Titan JS bundles
-RUN mkdir -p /app/actions
-COPY --from=builder /app/server/actions /app/actions
-
-# Copy only Titan extensions
-COPY --from=builder /app/.ext ./.ext
-
-EXPOSE 3000
-
-CMD ["./titan-server"]
+# ================================================================
+# STAGE 1 — Build Titan (JS → Rust)
+# ================================================================
+FROM rust:1.91.1 AS builder
+
+# Install Node for Titan CLI + bundler
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y nodejs
+
+# Install Titan CLI (latest)
+RUN npm install -g @ezetgalaxy/titan@latest
+
+WORKDIR /app
+
+# Copy project files
+COPY . .
+
+# Install JS dependencies (needed for Titan DSL + bundler)
+RUN npm install
+
+SHELL ["/bin/bash", "-c"]
+
+# Extract Titan extensions into .ext
+RUN mkdir -p /app/.ext && \
+    find /app/node_modules -maxdepth 5 -type f -name "titan.json" -print0 | \
+    while IFS= read -r -d '' file; do \
+    pkg_dir="$(dirname "$file")"; \
+    pkg_name="$(basename "$pkg_dir")"; \
+    echo "Copying Titan extension: $pkg_name from $pkg_dir"; \
+    cp -r "$pkg_dir" "/app/.ext/$pkg_name"; \
+    done && \
+    echo "Extensions in .ext:" && \
+    ls -R /app/.ext
+
+# Build Titan metadata + bundle JS actions
+RUN titan build
+
+# Build Rust binary
+RUN cd server && cargo build --release
+
+
+
+# ================================================================
+# STAGE 2 — Runtime Image (Lightweight)
+# ================================================================
+FROM debian:stable-slim
+
+WORKDIR /app
+
+# Copy Rust binary from builder stage
+COPY --from=builder /app/server/target/release/titan-server ./titan-server
+
+# Copy Titan routing metadata
+COPY --from=builder /app/server/routes.json ./routes.json
+COPY --from=builder /app/server/action_map.json ./action_map.json
+
+# Copy Titan JS bundles
+RUN mkdir -p /app/actions
+COPY --from=builder /app/server/actions /app/actions
+
+# Copy only Titan extensions
+COPY --from=builder /app/.ext ./.ext
+
+EXPOSE 3000
+
+CMD ["./titan-server"]

package/templates/rust/_dockerignore

@@ -1,3 +1,3 @@
-node_modules
-npm-debug.log
-.git
+node_modules
+npm-debug.log
+.git