puter-cli 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -4,8 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.7.0](https://github.com/HeyPuter/puter-cli/compare/v1.6.1...v1.7.0)
+
+- feat: save auth token when login [`55b32b7`](https://github.com/HeyPuter/puter-cli/commit/55b32b7feca050902f4470f06af38f81d3299e6a)
+- fix: create app from host shell [`30e5028`](https://github.com/HeyPuter/puter-cli/commit/30e5028d831d26349e3ae2fc8e34921693b5702c)
+
+#### [v1.6.1](https://github.com/HeyPuter/puter-cli/compare/v1.6.0...v1.6.1)
+
+> 16 February 2025
+
+- fix: set subdomain when creating a site [`6329ed1`](https://github.com/HeyPuter/puter-cli/commit/6329ed1c766b8eb722ac8c03c9ffe61dbba4a66c)
+
 #### [v1.6.0](https://github.com/HeyPuter/puter-cli/compare/v1.5.7...v1.6.0)
 
+> 16 February 2025
+
 - feat: improve init command [`2bd51ee`](https://github.com/HeyPuter/puter-cli/commit/2bd51ee01d0636b7979a9f55d3c746287c3b512a)
 - chore: improve error message [`46fb3b0`](https://github.com/HeyPuter/puter-cli/commit/46fb3b063c1c74d0006138cd400b6ad207e784d9)
 - chore: update package repo [`f6960ed`](https://github.com/HeyPuter/puter-cli/commit/f6960ed6f8e6fb793a6b8340476ab22778b44c14)

package/bin/index.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
+import chalk from 'chalk';
 import { login, logout } from '../src/commands/auth.js';
 import { init } from '../src/commands/init.js';
 import { startShell } from '../src/commands/shell.js';
 import { PROJECT_NAME, getLatestVersion } from '../src/commons.js';
+import { createApp } from '../src/commands/apps.js';
 
 async function main() {
   const version = await getLatestVersion(PROJECT_NAME);
@@ -17,6 +19,7 @@ async function main() {
   program
     .command('login')
     .description('Login to Puter account')
+    .option('-s, --save', 'Save authentication token in .env file', '')
     .action(login);
 
   program
@@ -37,23 +40,24 @@ async function main() {
 
   // App commands
   program
-    .command('app:create <name>')
+    .command('app:create')
     .description('Create a new Puter application')
     .argument('<name>', 'Name of the application')
-    .argument('[directory]', 'Local directory path')
-    .option('-d, --description <description>', 'Application description')
+    .argument('[remoteDir]', 'Remote directory path')
+    .option('-d, --description [description]', 'Application description', '')
     .option('-u, --url <url>', 'Application URL', 'https://dev-center.puter.com/coming-soon.html')
-    .action(async (name, directory, options) => {
+    .action(async (name, remoteDir, options) => {
       try {
         await createApp({
           name,
-          directory: directory || '',
+          directory: remoteDir || '',
           description: options.description || '',
           url: options.url
         });
       } catch (error) {
         console.error(chalk.red(error.message));
       }
+      process.exit(0);
     });
 
   if (process.argv.length === 2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puter-cli",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Command line interface for Puter cloud platform",
   "main": "index.js",
   "bin": {

package/src/commands/auth.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 import Conf from 'conf';
@@ -10,7 +11,7 @@ const config = new Conf({ projectName: PROJECT_NAME });
  * Login user
  * @returns void
  */
-export async function login() {
+export async function login(args = {}) {
   const answers = await inquirer.prompt([
     {
       type: 'input',
@@ -80,6 +81,23 @@ export async function login() {
         spinner.succeed(chalk.green('Successfully logged in to Puter!'));
       }
       console.log(chalk.dim(`Token: ${data.token.slice(0, 5)}...${data.token.slice(-5)}`));
+      // Save token
+      if (args.save){
+        const localEnvFile = '.env';
+        try {
+            // Check if the file exists, if so then delete it before writing.
+            if (fs.existsSync(localEnvFile)) {
+              console.log(chalk.yellow(`File "${localEnvFile}" already exists... Adding token.`));
+              fs.appendFileSync(localEnvFile, `\nPUTER_API_KEY="${data.token}"`, 'utf8');
+            } else {
+              console.log(chalk.cyan(`Saving token to ${chalk.green(localEnvFile)} file.`));
+              fs.writeFileSync(localEnvFile, `PUTER_API_KEY="${data.token}"`, 'utf8');
+            }
+        } catch (error) {
+          console.error(chalk.red(`Cannot save token to .env file. Error: ${error.message}`));
+          console.log(chalk.cyan(`PUTER_API_KEY="${data.token}"`));
+        }
+      }
     } else {
       spinner.fail(chalk.red('Login failed. Please check your credentials.'));
     }

package/src/commands/files.js

@@ -402,8 +402,8 @@ export async function deleteFolder(folderPath, skipConfirmation = false) {
         });
 
         const deleteData = await deleteResponse.json();
-        if (deleteResponse.ok) {
-            console.log(chalk.green(`Successfully deleted all contents of "${folderPath}"!`));
+        if (deleteResponse.ok && Object.keys(deleteData).length == 0) {
+            console.log(chalk.green(`Successfully deleted all contents from: ${chalk.cyan(folderPath)}`));
         } else {
             console.log(chalk.red('Failed to delete folder. Please check your input.'));
         }

package/src/commands/sites.js

@@ -192,12 +192,16 @@ export async function infoSite(args = []) {
                     }
                 }
             }
-        } else {
-            console.log(chalk.yellow(`The subdomain: "${subdomain}" is already taken, so let's generate a new random one:`));
-            subdomain = generateAppName(); // Generate a random subdomain
-            console.log(chalk.cyan(`New generated subdomain: "${subdomain}" will be used.`));
-        }
-  
+        } 
+        // else {
+            // console.log(chalk.yellow(`The subdomain: "${subdomain}" is already taken, so let's generate a new random one:`));
+            // subdomain = generateAppName(); // Generate a random subdomain
+            // console.log(chalk.cyan(`New generated subdomain: "${subdomain}" will be used.`));
+            // }
+            
+        // Use the chosen "subdomain"
+        console.log(chalk.cyan(`New generated subdomain: "${subdomain}" will be used if its not already in use.`));
+
         // Step 3: Host the current directory under the subdomain
         console.log(chalk.cyan(`Hosting app "${appName}" under subdomain "${subdomain}"...`));
         const site = await createSubdomain(subdomain, remoteDir);

package/src/commands/subdomains.js

@@ -93,6 +93,7 @@ export async function createSubdomain(subdomain, remoteDir) {
     const data = await response.json();
     if (!data.success || !data.result) {
         if (data.error?.code === 'already_in_use') {
+            // data.error?.status===409
             console.log(chalk.yellow(`Subdomain already taken!\nMessage: ${data?.error?.message}`));
             return false;
         }