@jxrstudios/jxr 1.2.16 → 1.2.18

package/bin/jxr.js

@@ -275,75 +275,19 @@ if (command === "init") {
   console.log(`🚀 Deploying to ${target === "auto" ? "auto-detected platform" : target}...`);
   
   try {
-    const fs = await import("fs");
-    const path = await import("path");
-    
-    // Auto-detect build output directory
-    let buildDir = path.join(projectPath, "dist");
-    if (!fs.existsSync(buildDir)) {
-      buildDir = path.join(projectPath, "build");
-    }
-    if (!fs.existsSync(buildDir)) {
-      buildDir = path.join(projectPath, "out");
-    }
-    if (!fs.existsSync(buildDir)) {
-      // Look for any directory with index.html
-      const dirs = fs.readdirSync(projectPath, { withFileTypes: true })
-        .filter(d => d.isDirectory() && !d.name.startsWith(".") && !d.name === "node_modules")
-        .map(d => path.join(projectPath, d.name));
-      
-      for (const dir of dirs) {
-        if (fs.existsSync(path.join(dir, "index.html"))) {
-          buildDir = dir;
-          break;
-        }
-      }
-    }
-    
-    if (!fs.existsSync(buildDir)) {
-      console.error("❌ No build output found. Run 'jxr build' first.");
-      process.exit(1);
-    }
-    
-    // Check for jxr-manifest.json for verification
-    const manifestPath = path.join(buildDir, "jxr-manifest.json");
-    if (fs.existsSync(manifestPath)) {
-      const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
-      console.log(`📋 Build manifest: ${manifest.platform} platform`);
-      console.log(`   Files: ${manifest.files.length}`);
-      console.log(`   Signed: ${manifest.algorithm}`);
-    }
-    
-    // Detect if running on Cloudflare Pages
-    const isCloudflarePages = process.env.CF_PAGES === "1" || process.env.CF_PAGES_URL !== undefined;
-    
-    if (target === "cloudflare" || target === "auto" && isCloudflarePages) {
-      console.log("☁️ Deploying to Cloudflare Pages...");
+    // Use JXRDeployer for Cloudflare Pages deployment
+    if (target === "cloudflare" || target === "auto") {
+      const deployer = new JXRDeployer(process.env.JXR_API_KEY || '', process.env.JXR_PROJECT_ID);
+      const result = await deployer.deployToCloudflarePages(projectPath, { environment: env });
       
-      // Get project name from package.json or directory
-      let projectName = process.env.CF_PAGES_PROJECT_NAME;
-      if (!projectName) {
-        try {
-          const pkg = JSON.parse(fs.readFileSync(path.join(projectPath, "package.json"), "utf-8"));
-          projectName = pkg.name;
-        } catch {
-          projectName = path.basename(path.resolve(projectPath));
-        }
-      }
-      
-      // On Cloudflare Pages, the build output is automatically deployed
-      // We just need to ensure it's in the right location
-      console.log(`   Project: ${projectName}`);
-      console.log(`   Environment: ${env}`);
-      
-      if (isCloudflarePages) {
-        console.log(`   URL: https://${projectName}.app.jxrstudios.online`);
-        console.log("✅ Deployment ready for Cloudflare Pages");
-        console.log("   The build output will be deployed automatically.");
+      if (result.success) {
+        console.log("✅ Deployed successfully!");
+        console.log(`   URL: ${result.url}`);
+        result.logs.forEach(log => console.log(`   ${log}`));
       } else {
-        // Manual Cloudflare Pages deployment
-        console.log("   Run 'wrangler pages deploy' to deploy manually");
-        console.log("   Or connect your GitHub repo to Cloudflare Pages for auto-deployment");
+        console.error("❌ Deploy failed");
+        result.logs.forEach(log => console.error(`   ${log}`));
+        process.exit(1);
       }
       
     } else if (target === "deno") {
@@ -355,25 +299,9 @@ if (command === "init") {
       console.log("   Copy the dist/ folder to your Node.js server");
       
     } else {
-      // Use JXRDeployer for other platforms
-      if (!process.env.JXR_API_KEY) {
-        console.error("❌ JXR_API_KEY environment variable required");
-        console.error("   Get your key at: https://jxrstudios.online/dashboard");
-        process.exit(1);
-      }
-      
-      const deployer = new JXRDeployer(process.env.JXR_API_KEY, process.env.JXR_PROJECT_ID);
-      const result = await deployer.deploy(buildDir, { environment: env });
-      
-      if (result.success) {
-        console.log("✅ Deployed successfully!");
-        console.log(`   URL: ${result.url}`);
-        result.logs.forEach(log => console.log(`   ${log}`));
-      } else {
-        console.error("❌ Deploy failed");
-        result.logs.forEach(log => console.error(`   ${log}`));
-        process.exit(1);
-      }
+      console.error(`❌ Unknown target: ${target}`);
+      console.error("   Supported: cloudflare, deno, node, auto");
+      process.exit(1);
     }
     
   } catch (err) {

package/dist/deployer.d.ts

@@ -29,6 +29,23 @@ export declare class JXRDeployer {
     private apiKey;
     private projectId;
     constructor(apiKey: string, projectId?: string);
+    /**
+     * Auto-detect build output directory
+     * Checks dist/, build/, out/, or any directory with index.html
+     */
+    detectBuildDir(projectPath?: string): Promise<string | null>;
+    /**
+     * Detect if running on Cloudflare Pages
+     */
+    isCloudflarePages(): boolean;
+    /**
+     * Get project name from package.json or directory
+     */
+    getProjectName(projectPath?: string): Promise<string>;
+    /**
+     * Deploy to Cloudflare Pages
+     */
+    deployToCloudflarePages(projectPath?: string, config?: DeployConfig): Promise<DeployResult>;
     /**
      * Deploy the current project to JXR infrastructure
      */

package/dist/deployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../src/deployer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,MAAM,WAAW,YAAY;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAC;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAK9C;;OAEG;IACG,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,GAAE,YAAiB,GAAG,OAAO,CAAC,YAAY,CAAC;IA+CnF;;OAEG;YACW,aAAa;IAkB3B;;OAEG;YACW,aAAa;IAgC3B;;OAEG;IACG,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAchE;;OAEG;IACG,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QACvD,EAAE,EAAE,MAAM,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;IAgBH;;OAEG;IACG,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAuB3D,OAAO,CAAC,iBAAiB;CAK1B;AAED,gCAAgC;AAChC,eAAO,MAAM,WAAW,aAGvB,CAAC"}
+{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../src/deployer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,MAAM,WAAW,YAAY;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAC;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAS;gBAEd,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAK9C;;;OAGG;IACG,cAAc,CAAC,WAAW,GAAE,MAAY,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgCvE;;OAEG;IACH,iBAAiB,IAAI,OAAO;IAI5B;;OAEG;IACG,cAAc,CAAC,WAAW,GAAE,MAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAsBhE;;OAEG;IACG,uBAAuB,CAAC,WAAW,GAAE,MAAY,EAAE,MAAM,GAAE,YAAiB,GAAG,OAAO,CAAC,YAAY,CAAC;IAyD1G;;OAEG;IACG,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,GAAE,YAAiB,GAAG,OAAO,CAAC,YAAY,CAAC;IA+CnF;;OAEG;YACW,aAAa;IAkB3B;;OAEG;YACW,aAAa;IAgC3B;;OAEG;IACG,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAchE;;OAEG;IACG,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QACvD,EAAE,EAAE,MAAM,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;IAgBH;;OAEG;IACG,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAuB3D,OAAO,CAAC,iBAAiB;CAK1B;AAED,gCAAgC;AAChC,eAAO,MAAM,WAAW,aAGvB,CAAC"}

package/dist/index.js

@@ -2042,8 +2042,9 @@ export default \`${escapedCSS}\`;
 };
 
 // src/deployer.ts
-import { readFile as readFile2, stat } from "fs/promises";
+import { readFile as readFile2, readdir as readdir2, stat } from "fs/promises";
 import path2 from "path";
+import { existsSync } from "fs";
 import { spawn } from "child_process";
 var JXRDeployer = class {
   apiKey;
@@ -2052,6 +2053,103 @@ var JXRDeployer = class {
     this.apiKey = apiKey;
     this.projectId = projectId || this.generateProjectId();
   }
+  /**
+   * Auto-detect build output directory
+   * Checks dist/, build/, out/, or any directory with index.html
+   */
+  async detectBuildDir(projectPath = ".") {
+    const possibleDirs = ["dist", "build", "out"];
+    for (const dir of possibleDirs) {
+      const fullPath = path2.resolve(projectPath, dir);
+      if (existsSync(fullPath)) {
+        if (existsSync(path2.join(fullPath, "index.html"))) {
+          return fullPath;
+        }
+      }
+    }
+    try {
+      const entries = await readdir2(projectPath, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules") {
+          const dirPath = path2.join(projectPath, entry.name);
+          if (existsSync(path2.join(dirPath, "index.html"))) {
+            return dirPath;
+          }
+        }
+      }
+    } catch {
+    }
+    return null;
+  }
+  /**
+   * Detect if running on Cloudflare Pages
+   */
+  isCloudflarePages() {
+    return process.env.CF_PAGES === "1" || !!process.env.CF_PAGES_URL;
+  }
+  /**
+   * Get project name from package.json or directory
+   */
+  async getProjectName(projectPath = ".") {
+    if (process.env.CF_PAGES_PROJECT_NAME) {
+      return process.env.CF_PAGES_PROJECT_NAME;
+    }
+    try {
+      const pkgPath = path2.join(projectPath, "package.json");
+      const pkgContent = await readFile2(pkgPath, "utf-8");
+      const pkg = JSON.parse(pkgContent);
+      if (pkg.name) {
+        return pkg.name;
+      }
+    } catch {
+    }
+    return path2.basename(path2.resolve(projectPath));
+  }
+  /**
+   * Deploy to Cloudflare Pages
+   */
+  async deployToCloudflarePages(projectPath = ".", config = {}) {
+    const logs = [];
+    try {
+      const buildDir = await this.detectBuildDir(projectPath);
+      if (!buildDir) {
+        throw new Error('No build output found. Run "jxr build" first.');
+      }
+      logs.push(`\u{1F4C1} Build directory: ${buildDir}`);
+      const projectName = await this.getProjectName(projectPath);
+      logs.push(`\u{1F4E6} Project: ${projectName}`);
+      const manifestPath = path2.join(buildDir, "jxr-manifest.json");
+      if (existsSync(manifestPath)) {
+        const manifest = JSON.parse(await readFile2(manifestPath, "utf-8"));
+        logs.push(`\u{1F4CB} Manifest: ${manifest.platform} platform, ${manifest.files?.length || 0} files`);
+      }
+      const env = config.environment || "production";
+      const url = `https://${projectName}.app.jxrstudios.online`;
+      logs.push(`\u{1F310} URL: ${url}`);
+      if (this.isCloudflarePages()) {
+        logs.push("\u2601\uFE0F  Cloudflare Pages auto-detected");
+        logs.push("\u2705 Deployment ready - build output will be deployed automatically");
+        return {
+          success: true,
+          url,
+          deploymentId: `cf-pages-${Date.now()}`,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          logs
+        };
+      }
+      return await this.deploy(buildDir, { ...config, projectId: projectName });
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : "Unknown error";
+      logs.push(`\u274C Error: ${errorMsg}`);
+      return {
+        success: false,
+        url: "",
+        deploymentId: "",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        logs
+      };
+    }
+  }
   /**
    * Deploy the current project to JXR infrastructure
    */
@@ -2068,7 +2166,7 @@ var JXRDeployer = class {
       logs.push(`\u{1F4E6} Created tarball: ${tarballPath}`);
       const uploadResult = await this.uploadTarball(tarballPath, pid, env, branch);
       logs.push(`\u2601\uFE0F  Uploaded to JXR`);
-      const url = `https://${pid}.jxr.dev`;
+      const url = `https://${pid}.app.jxrstudios.online`;
       logs.push(`\u{1F310} Live at: ${url}`);
       return {
         success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxrstudios/jxr",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "description": "JXR.js — Edge OS Runtime Framework for elite developers",
   "type": "module",
   "license": "MIT",

package/src/deployer.ts

@@ -6,7 +6,7 @@
 
 import { readFile, readdir, stat } from "fs/promises";
 import path from "path";
-import { createWriteStream } from "fs";
+import { createWriteStream, existsSync } from "fs";
 import { spawn } from "child_process";
 
 export interface DeployConfig {
@@ -43,6 +43,134 @@ export class JXRDeployer {
     this.projectId = projectId || this.generateProjectId();
   }
 
+  /**
+   * Auto-detect build output directory
+   * Checks dist/, build/, out/, or any directory with index.html
+   */
+  async detectBuildDir(projectPath: string = '.'): Promise<string | null> {
+    const possibleDirs = ['dist', 'build', 'out'];
+    
+    // Check standard build directories
+    for (const dir of possibleDirs) {
+      const fullPath = path.resolve(projectPath, dir);
+      if (existsSync(fullPath)) {
+        // Verify it has index.html
+        if (existsSync(path.join(fullPath, 'index.html'))) {
+          return fullPath;
+        }
+      }
+    }
+    
+    // Search for any directory with index.html
+    try {
+      const entries = await readdir(projectPath, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.isDirectory() && !entry.name.startsWith('.') && entry.name !== 'node_modules') {
+          const dirPath = path.join(projectPath, entry.name);
+          if (existsSync(path.join(dirPath, 'index.html'))) {
+            return dirPath;
+          }
+        }
+      }
+    } catch {
+      // Ignore errors
+    }
+    
+    return null;
+  }
+
+  /**
+   * Detect if running on Cloudflare Pages
+   */
+  isCloudflarePages(): boolean {
+    return process.env.CF_PAGES === '1' || !!process.env.CF_PAGES_URL;
+  }
+
+  /**
+   * Get project name from package.json or directory
+   */
+  async getProjectName(projectPath: string = '.'): Promise<string> {
+    // Check CF_PAGES_PROJECT_NAME first
+    if (process.env.CF_PAGES_PROJECT_NAME) {
+      return process.env.CF_PAGES_PROJECT_NAME;
+    }
+    
+    // Try to read from package.json
+    try {
+      const pkgPath = path.join(projectPath, 'package.json');
+      const pkgContent = await readFile(pkgPath, 'utf-8');
+      const pkg = JSON.parse(pkgContent);
+      if (pkg.name) {
+        return pkg.name;
+      }
+    } catch {
+      // Ignore errors
+    }
+    
+    // Fall back to directory name
+    return path.basename(path.resolve(projectPath));
+  }
+
+  /**
+   * Deploy to Cloudflare Pages
+   */
+  async deployToCloudflarePages(projectPath: string = '.', config: DeployConfig = {}): Promise<DeployResult> {
+    const logs: string[] = [];
+    
+    try {
+      // Auto-detect build directory
+      const buildDir = await this.detectBuildDir(projectPath);
+      if (!buildDir) {
+        throw new Error('No build output found. Run "jxr build" first.');
+      }
+      logs.push(`📁 Build directory: ${buildDir}`);
+      
+      // Get project name
+      const projectName = await this.getProjectName(projectPath);
+      logs.push(`📦 Project: ${projectName}`);
+      
+      // Check for manifest
+      const manifestPath = path.join(buildDir, 'jxr-manifest.json');
+      if (existsSync(manifestPath)) {
+        const manifest = JSON.parse(await readFile(manifestPath, 'utf-8'));
+        logs.push(`📋 Manifest: ${manifest.platform} platform, ${manifest.files?.length || 0} files`);
+      }
+      
+      // Determine URL
+      const env = config.environment || 'production';
+      const url = `https://${projectName}.app.jxrstudios.online`;
+      logs.push(`🌐 URL: ${url}`);
+      
+      // If running on Cloudflare Pages, the deployment is automatic
+      if (this.isCloudflarePages()) {
+        logs.push('☁️  Cloudflare Pages auto-detected');
+        logs.push('✅ Deployment ready - build output will be deployed automatically');
+        
+        return {
+          success: true,
+          url,
+          deploymentId: `cf-pages-${Date.now()}`,
+          timestamp: new Date().toISOString(),
+          logs,
+        };
+      }
+      
+      // Manual deployment via JXR API
+      return await this.deploy(buildDir, { ...config, projectId: projectName });
+      
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : 'Unknown error';
+      logs.push(`❌ Error: ${errorMsg}`);
+      return {
+        success: false,
+        url: '',
+        deploymentId: '',
+        timestamp: new Date().toISOString(),
+        logs,
+      };
+    }
+  }
+
   /**
    * Deploy the current project to JXR infrastructure
    */
@@ -69,7 +197,7 @@ export class JXRDeployer {
       logs.push(`☁️  Uploaded to JXR`);
       
       // Get deployment URL
-      const url = `https://${pid}.jxr.dev`;
+      const url = `https://${pid}.app.jxrstudios.online`;
       logs.push(`🌐 Live at: ${url}`);
       
       return {