puter-cli 1.8.6 → 2.0.0

package/src/commands/deploy.js

@@ -1,51 +1,53 @@
 import chalk from 'chalk';
-import { generateAppName, isValidAppName } from '../commons.js';
+import { generateAppName } from '../commons.js';
 import { syncDirectory } from './files.js';
 import { createSite } from './sites.js';
-import { getCurrentDirectory } from './auth.js';
-import { getSubdomains } from './subdomains.js';
+import { getPuter } from '../modules/PuterModule.js';
 
 /**
  * Deploy a local web project to Puter.
- * @param {string[]} args - Command-line arguments (e.g., [<remote_dir>] [--subdomain=<subdomain>]).
+ * @param {string[]} args - Command-line arguments (e.g., <local_dir> [--subdomain=<subdomain>]).
  */
 export async function deploy(args = []) {
-  if (args.length > 2 || args.some(arg => arg.startsWith('--') && !arg.startsWith('--subdomain='))) {
-    console.log(chalk.red('Usage: site:deploy [<remote_dir>] [--subdomain=<subdomain>]'));
-    console.log(chalk.yellow('Example: site:deploy'));
-    console.log(chalk.yellow('Example: site:deploy'));
-    console.log(chalk.yellow('Example: site:deploy ./my-app'));
-    console.log(chalk.yellow('Example: site:deploy ./my-app --subdomain=my-app-new'));
+  if (args.length < 1) {
+    console.log(chalk.red('Usage: site:deploy <local_dir> [--subdomain=<subdomain>]'));
+    console.log(chalk.yellow('Example: site:deploy .'));
+    console.log(chalk.yellow('Example: site:deploy ./dist'));
+    console.log(chalk.yellow('Example: site:deploy ./dist --subdomain=my-app-new'));
     return;
   }
-  const appName = generateAppName();
-  const remoteDirArg = args.find(arg => !arg.startsWith('--'));
-  const remoteDir = remoteDirArg || '.';
-  const subdomain = args.find(arg => arg.startsWith('--subdomain='))?.split('=')[1] || appName;
-  const sourceDir = '.'; // Deploy from the current directory
+  const puter = getPuter();
 
-  console.log(chalk.cyan(`Deploying '${appName}' from local '${sourceDir}' to remote '${remoteDir}' at '${subdomain}.puter.site'...`));
+  const sourceDirArg = args.find(arg => !arg.startsWith('--'));
+  const sourceDir = sourceDirArg || '.';
+
+  let subdomain = args.find(arg => arg.startsWith('--subdomain='))?.split('=')[1];
+  if (!subdomain) {
+    subdomain = generateAppName();
+  }
+
+  const remoteDir = `~/sites/${subdomain}/deployment`;
+
+  // this will handle the increments
+  const directory = await puter.fs.mkdir(remoteDir, {
+    dedupeName: true,
+    createMissingParents: true
+  })
+
+  console.log(chalk.cyan(`Deploying '${sourceDir}' to '${subdomain}.puter.site'...`));
 
   try {
     // 1. Upload files
-    console.log(chalk.cyan(`Uploading files from '${sourceDir}' to '${remoteDir}'...`));
-    await syncDirectory([sourceDir, remoteDir, '--delete', '-r', '--overwrite']);
+    await syncDirectory([sourceDir, directory.path, '--delete', '-r', '--overwrite']);
 
     // 2. Create the site
-    console.log(chalk.cyan(`Creating site...`));
-    const site = await createSite([appName, remoteDir, `--subdomain=${subdomain}`]);
+    const site = await createSite([subdomain, directory.path, `--subdomain=${subdomain}`]);
 
     if (site) {
-      console.log(chalk.green('Deployment successful!'));      
+      console.log(chalk.green('Deployment successful!'));
     } else {
       console.log(chalk.yellow('Deployment successfuly updated!'));
     }
-    if (subdomain){
-      console.log(chalk.cyan('Your site is live at:'));
-      console.log(chalk.green(`https://${subdomain}.puter.site`));
-    } else {
-      console.log(chalk.red('Deployment failed. Subdomain cannot be reserved!'));
-    }
   } catch (error) {
     console.error(chalk.red(`Deployment failed: ${error.message}`));
   }