puter-cli 1.8.5 → 2.0.0

package/src/commands/shell.js

@@ -3,18 +3,11 @@ import chalk from 'chalk';
 import Conf from 'conf';
 import { execCommand, getPrompt } from '../executor.js';
 import { PROJECT_NAME } from '../commons.js';
-import SetContextModule from '../modules/SetContextModule.js';
-import ErrorModule from '../modules/ErrorModule.js';
-import ProfileModule from '../modules/ProfileModule.js';
-import putility from '@heyputer/putility';
+import { getProfileModule } from '../modules/ProfileModule.js';
 
 const config = new Conf({ projectName: PROJECT_NAME });
 
-export const rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout,
-  prompt: null
-});
+export let rl;
 
 /**
  * Update the current shell prompt
@@ -28,26 +21,21 @@ export function updatePrompt(currentPath) {
  * Start the interactive shell
  */
 export async function startShell(command) {
-  const modules = [
-    SetContextModule,
-    ErrorModule,
-    ProfileModule,
-  ];
+  const profileModule = getProfileModule();
+  await profileModule.checkLogin();
 
-  const context = new putility.libs.context.Context({
-    events: new putility.libs.event.Emitter(),
-  });
-
-  for ( const module of modules ) module({ context });
-
-  await context.events.emit('check-login', {});
-  
   // This argument enables the `puter <subcommand>` commands
-  if ( command ) {
-    await execCommand(context, command);
+  if (command) {
+    await execCommand(command);
     process.exit(0);
   }
 
+  rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    prompt: null
+  })
+
   try {
     console.log(chalk.green('Welcome to Puter-CLI! Type "help" for available commands.'));
     rl.setPrompt(getPrompt());
@@ -57,7 +45,7 @@ export async function startShell(command) {
       const trimmedLine = line.trim();
       if (trimmedLine) {
         try {
-          await execCommand(context, trimmedLine);
+          await execCommand(trimmedLine);
         } catch (error) {
           console.error(chalk.red(error.message));
         }

package/src/commands/sites.js

@@ -1,23 +1,18 @@
 import chalk from 'chalk';
-import fetch from 'node-fetch';
 import Table from 'cli-table3';
 import { getCurrentUserName, getCurrentDirectory } from './auth.js';
-import { API_BASE, getHeaders, generateAppName, resolveRemotePath, isValidAppName } from '../commons.js';
+import { resolveRemotePath, isValidAppName } from '../commons.js';
 import { displayNonNullValues, formatDate, isValidAppUuid } from '../utils.js';
-import { getSubdomains, createSubdomain, deleteSubdomain } from './subdomains.js';
-import { ErrorAPI } from '../modules/ErrorModule.js';
-
+import { getSubdomains, createSubdomain, deleteSubdomain, updateSubdomain } from './subdomains.js';
+import { getPuter } from '../modules/PuterModule.js';
+import { report } from '../modules/ErrorModule.js';
 
 /**
  * Listing subdomains
  */
-export async function listSites(args = {}, context) {
+export async function listSites(args = {}) {
     try {
-      const data = await getSubdomains(args);
-
-      if (!data.success || !Array.isArray(data.result)) {
-        throw new Error('Failed to fetch subdomains');
-      }
+      const result = await getSubdomains(args);
   
       // Create table instance
       const table = new Table({
@@ -35,7 +30,7 @@ export async function listSites(args = {}, context) {
   
       // Format and add data to table
       let i = 0;
-      data.result.forEach(domain => {
+      result.forEach(domain => {
         let appDir = domain?.root_dir?.path.split('/').pop().split('-');
         table.push([
           i++,
@@ -49,16 +44,16 @@ export async function listSites(args = {}, context) {
       });
   
       // Print table
-      if (data.result.length === 0) {
+      if (result.length === 0) {
         console.log(chalk.yellow('No subdomains found'));
       } else {
         console.log(chalk.bold('\nYour Sites:'));
         console.log(table.toString());
-        console.log(chalk.dim(`Total Sites: ${data.result.length}`));
+        console.log(chalk.dim(`Total Sites: ${result.length}`));
       }
   
     } catch (error) {
-      context.events.emit('error', { error });
+      report(error);
       console.error(chalk.red('Error listing sites:'), error.message);
       throw error;
     }
@@ -73,26 +68,11 @@ export async function infoSite(args = []) {
         console.log(chalk.red('Usage: site <siteUID>'));
         return;
     }
-    for (const subdomainId of args)
+    const puter = getPuter();
+    for (const subdomain of args)
       try {
-        const response = await fetch(`${API_BASE}/drivers/call`, {
-          method: 'POST',
-          headers: getHeaders(),
-          body: JSON.stringify({
-              interface: 'puter-subdomains',
-              method: 'read',
-              args: { uid: subdomainId }
-          })
-        });
-      
-        if (!response.ok) {
-            throw new Error('Failed to fetch subdomains.');
-        }
-        const data = await response.json();
-        if (!data.success || !data.result) {
-          throw new Error(`Failed to get site info: ${data.error?.message}`);
-        }
-        displayNonNullValues(data.result);
+        const result = await puter.hosting.get(subdomain);
+        displayNonNullValues(result);
       } catch (error) {
         console.error(chalk.red('Error getting site info:'), error.message);
       }
@@ -100,43 +80,14 @@ export async function infoSite(args = []) {
   
  /**
   * Delete hosted web site
-  * @param {any[]} args Array of site uuid
+  * @param {any[]} args Array of subdomain
   */
   export async function deleteSite(args = []) {
     if (args.length < 1){
-        console.log(chalk.red('Usage: site:delete <siteUUID>'));
-        return false;
-    }
-    for (const uuid of args)
-        try {
-        if (!uuid){
-          console.log(chalk.yellow(`We could not find the site ID: ${uuid}`));
-          return false;
-        }      
-        // The uuid must be prefixed with: 'subdomainObj-'
-        const response = await fetch(`${API_BASE}/delete-site`, {
-            headers: getHeaders(),
-            method: 'POST',
-            body: JSON.stringify({
-                site_uuid: uuid
-            })
-        });
-    
-        if (!response.ok) {
-            throw new Error(`Failed to delete site (Status: ${response.status})`);
-        }
-    
-        const data = await response.json();
-        if (Object.keys(data).length==0) {
-          console.log(chalk.green(`Site ID: "${uuid}" has been deleted.`));
-          return;
-        }
-
-        console.log(chalk.yellow(`Site ID: "${uuid}" should be deleted.`));
-    } catch (error) {
-        console.error(chalk.red('Error deleting site:'), error.message);
+        console.log(chalk.red('Usage: site:delete <subdomain>'));
         return false;
     }
+    await deleteSubdomain(args);
     return true;
   }
   
@@ -171,12 +122,7 @@ export async function infoSite(args = []) {
         }
   
         // Step 2: Check if the subdomain already exists
-        const data = await getSubdomains();
-        if (!data.success || !Array.isArray(data.result)) {
-          throw new Error('Failed to fetch subdomains');
-        }
-  
-        const subdomains = data.result;
+        const subdomains = await getSubdomains();;
         const subdomainObj = subdomains.find(sd => sd.subdomain === subdomain);      
         if (subdomainObj) {
             console.error(chalk.cyan(`The subdomain "${subdomain}" is already in use and owned by: "${subdomainObj.owner['username']}"`));
@@ -188,35 +134,31 @@ export async function infoSite(args = []) {
                     return;
                 } else {
                     console.log(chalk.yellow(`However, It's linked to different directory at: ${subdomainObj.root_dir?.path}`));
-                    console.log(chalk.cyan(`We'll try to unlink this subdomain from that directory...`));
-                    const result = await deleteSubdomain([subdomainObj?.uid]);
+                    console.log(chalk.cyan(`Updating this subdomain directory...`));
+                    const result = await updateSubdomain(subdomain, remoteDir);
                     if (result) {
-                        console.log(chalk.green('Looks like this subdomain is free again, please try again.'));
+                        console.log(chalk.green('Updating subdomain directory successful.'));
                         return;
                     } else {
-                        console.log(chalk.red('Could not release this subdomain.'));
+                        console.log(chalk.red('Could not update this subdomain directory.'));
+                        return;
                     }
                 }
             }
         } 
-        // 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}"...`));
+        console.log(chalk.cyan(`Hosting site "${appName}" under subdomain "${subdomain}"...`));
         const site = await createSubdomain(subdomain, remoteDir);
         if (!site){
             console.error(chalk.red(`Failed to create subdomain: "${chalk.red(subdomain)}"`));
             return;
         }
   
-        console.log(chalk.green(`App ${chalk.dim(appName)} created successfully and accessible at:`));
+        console.log(chalk.green(`Site ${chalk.dim(appName)} created successfully and accessible at:`));
         console.log(chalk.cyan(`https://${site.subdomain}.puter.site`));
         return site;
     } catch (error) {

package/src/commands/subdomains.js

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import fetch from 'node-fetch';
 import { API_BASE, getHeaders } from '../commons.js';
+import { getPuter } from '../modules/PuterModule.js';
 
 /**
  * Get list of subdomains.
@@ -8,20 +9,16 @@ import { API_BASE, getHeaders } from '../commons.js';
  * @returns {Array} - Array of subdomains.
  */
 export async function getSubdomains(args = {}) {
-    const response = await fetch(`${API_BASE}/drivers/call`, {
-        method: 'POST',
-        headers: getHeaders(),
-        body: JSON.stringify({
-            interface: 'puter-subdomains',
-            method: 'select',
-            args: args
-        })
-    });
+    const puter = getPuter();
+    let result;
 
-    if (!response.ok) {
-        throw new Error('Failed to fetch subdomains.');
+    try {
+        result = await puter.hosting.list();    
+    } catch (error) {
+        console.log(chalk.red(`Error when getting subdomains.\nError: ${error?.message}`));
     }
-    return await response.json();
+
+    return result;
 }
 
 /**
@@ -34,32 +31,22 @@ export async function deleteSubdomain(args = []) {
         console.log(chalk.red('Usage: domain:delete <subdomain_id>'));
         return false;
     }
+    const puter = getPuter();
     const subdomains = args;
-    for (const subdomainId of subdomains)
+    for (const subdomain of subdomains)
         try {
-        const response = await fetch(`${API_BASE}/drivers/call`, {
-            headers: getHeaders(),
-            method: 'POST',
-            body: JSON.stringify({
-            interface: 'puter-subdomains',
-            method: 'delete',
-            args: {
-                id: { subdomain: subdomainId }
-            }
-            })
-        });
+        const success = await puter.hosting.delete(subdomain);
     
-        const data = await response.json();
-        if (!data.success) {
-            if (data.error?.code === 'entity_not_found') {
-                console.log(chalk.red(`Subdomain ID: "${subdomainId}" not found`));
-                return false;
-            }
+        if (!success) {
             console.log(chalk.red(`Failed to delete subdomain: ${data.error?.message}`));
             return false;
         }
         console.log(chalk.green('Subdomain deleted successfully'));
         } catch (error) {
+            if (error.error?.code === 'entity_not_found') {
+                console.log(chalk.red(`Subdomain: "${subdomain}" not found`));
+                return false;
+            }
             console.error(chalk.red('Error deleting subdomain:'), error.message);
         }
         return true;
@@ -72,33 +59,37 @@ export async function deleteSubdomain(args = []) {
  * @returns {Object} - Hosting details (e.g., subdomain).
  */
 export async function createSubdomain(subdomain, remoteDir) {
-    const response = await fetch(`${API_BASE}/drivers/call`, {
-        method: 'POST',
-        headers: getHeaders(),
-        body: JSON.stringify({
-            interface: 'puter-subdomains',
-            method: 'create',
-            args: {
-                object: {
-                    subdomain: subdomain,
-                    root_dir: remoteDir
-                }
-            }
-        })
-    });
+    const puter = getPuter();
+    let result;
 
-    if (!response.ok) {
-        throw new Error('Failed to host directory.');
-    }
-    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}`));
+    try {
+        result = await puter.hosting.create(subdomain, remoteDir);
+    } catch (error) {
+        if (error?.error?.code === 'already_in_use') {
+            console.log(chalk.yellow(`Subdomain already taken!\nMessage: ${error?.error?.message}`));
             return false;
         }
-        console.log(chalk.red(`Error when creating "${subdomain}".\nError: ${data?.error?.message}\nCode: ${data.error?.code}`));
-        return false;
+        console.log(chalk.red(`Error when creating "${subdomain}".\nError: ${error?.error?.message}\nCode: ${error?.error?.code}`));
     }
-    return data.result;
+    return result;
+}
+
+/**
+ * Update a subdomain into remote directory
+ * @param {string} subdomain - Subdomain name.
+ * @param {string} remoteDir - Remote directory path.
+ * @returns {Object} - Hosting details (e.g., subdomain).
+ */
+export async function updateSubdomain(subdomain, remoteDir) {
+    const puter = getPuter();
+    let result;
+
+    try {
+        result = await puter.hosting.update(subdomain, remoteDir);
+    } catch (error) {
+        console.log(chalk.red(`Error when updating "${subdomain}".\nError: ${error?.message}`));
+        return null;
+    }
+
+    return result;
 }

package/src/commons.js

@@ -45,7 +45,7 @@ export function getHeaders(contentType = 'application/json') {
  * @see: [randName](https://github.com/HeyPuter/puter/blob/06a67a3b223a6cbd7ec2e16853b6d2304f621a88/src/puter-js/src/index.js#L389)
  */
 export function generateAppName(separateWith = '-'){
-  console.log(chalk.cyan('Generating random app name...'));
+  console.log(chalk.cyan('Generating random name...'));
   try {        
       const first_adj = ['helpful','sensible', 'loyal', 'honest', 'clever', 'capable','calm', 'smart', 'genius', 'bright', 'charming', 'creative', 'diligent', 'elegant', 'fancy', 
       'colorful', 'avid', 'active', 'gentle', 'happy', 'intelligent', 'jolly', 'kind', 'lively', 'merry', 'nice', 'optimistic', 'polite', 
@@ -63,7 +63,7 @@ export function generateAppName(separateWith = '-'){
       // return a random combination of first_adj + noun + number (between 0 and 9999)
       // e.g. clever-idea-123
       const appName = first_adj[Math.floor(Math.random() * first_adj.length)] + separateWith + nouns[Math.floor(Math.random() * nouns.length)] + separateWith + Math.floor(Math.random() * 10000);
-      console.log(chalk.green(`AppName: "${appName}"`));
+      console.log(chalk.green(`Name: "${appName}"`));
       return appName;
   } catch (error) {
       console.error(`Error: ${error.message}`);

package/src/executor.js

@@ -2,10 +2,12 @@ import chalk from 'chalk';
 import Conf from 'conf';
 import { listApps, appInfo, createApp, updateApp, deleteApp } from './commands/apps.js';
 import { listSites, createSite, deleteSite, infoSite } from './commands/sites.js';
-import { listFiles, makeDirectory, renameFileOrDirectory, 
-  removeFileOrDirectory, emptyTrash, changeDirectory, showCwd, 
-  getInfo, getDiskUsage, createFile, readFile, uploadFile, 
-  downloadFile, copyFile, syncDirectory, editFile } from './commands/files.js';
+import {
+  listFiles, makeDirectory, renameFileOrDirectory,
+  removeFileOrDirectory, emptyTrash, changeDirectory, showCwd,
+  getInfo, getDiskUsage, createFile, readFile, uploadFile,
+  downloadFile, copyFile, syncDirectory, editFile
+} from './commands/files.js';
 import { getUserInfo, getUsageInfo, login } from './commands/auth.js';
 import { deploy } from './commands/deploy.js';
 import { PROJECT_NAME, API_BASE, getHeaders } from './commons.js';
@@ -13,7 +15,7 @@ import inquirer from 'inquirer';
 import { exec } from 'node:child_process';
 import { parseArgs, getSystemEditor } from './utils.js';
 import { rl } from './commands/shell.js';
-import { ErrorAPI } from './modules/ErrorModule.js';
+import { showLast } from './modules/ErrorModule.js'
 
 const config = new Conf({ projectName: PROJECT_NAME });
 
@@ -39,8 +41,8 @@ const commands = {
   whoami: getUserInfo,
   stat: getInfo,
   apps: async (args) => {
-      await listApps({
-        statsPeriod: args[0] || 'all'
+    await listApps({
+      statsPeriod: args[0] || 'all'
     });
   },
   app: appInfo,
@@ -64,9 +66,7 @@ const commands = {
       rl.write(commandToCopy);
     }
   },
-  'last-error': async (_, context) => {
-    context[ErrorAPI].showLast();
-  },
+  'last-error': showLast,
   'app:create': async (rawArgs) => {
     try {
       const args = parseArgs(rawArgs.join(' '));
@@ -88,8 +88,8 @@ const commands = {
   },
   'app:update': async (args) => {
     if (args.length < 1) {
-        console.log(chalk.red('Usage: app:update <name> <remote_dir>'));
-        return;
+      console.log(chalk.red('Usage: app:update <name> <remote_dir>'));
+      return;
     }
     await updateApp(args);
   },
@@ -102,25 +102,25 @@ const commands = {
       }
     });
     if (args._.length < 1) {
-        console.log(chalk.red('You must specify the app name:'));
-        console.log(chalk.yellow('Example: app:delete <name>'));
-        return;
+      console.log(chalk.red('You must specify the app name:'));
+      console.log(chalk.yellow('Example: app:delete <name>'));
+      return;
     }
     const name = args._[0];
     const force = !!args.f;
 
-    if (!force){
+    if (!force) {
       const { confirm } = await inquirer.prompt([
         {
-            type: 'confirm',
-            name: 'confirm',
-            message: chalk.yellow(`Are you sure you want to delete "${name}"?`),
-            default: false
+          type: 'confirm',
+          name: 'confirm',
+          message: chalk.yellow(`Are you sure you want to delete "${name}"?`),
+          default: false
         }
       ]);
       if (!confirm) {
-          console.log(chalk.yellow('Operation cancelled.'));
-          return false;
+        console.log(chalk.yellow('Operation cancelled.'));
+        return false;
       }
     }
     await deleteApp(name);
@@ -155,10 +155,9 @@ const commands = {
  * Execute a command
  * @param {string} input The command line input
  */
-export async function execCommand(context, input) {
-  const [cmd, ...args] = input.split(' ');
+export async function execCommand(input) {
+  const [cmd, ...args] = input ? input.split(' ') : [];
 
-  
   // Add the command to history (skip the "history" command itself)
   if (cmd !== 'history') {
     commandHistory.push(input);
@@ -189,7 +188,7 @@ export async function execCommand(context, input) {
   }
   if (commands[cmd]) {
     try {
-      await commands[cmd](args, context);
+      await commands[cmd](args);
     } catch (error) {
       console.error(chalk.red(`Error executing command: ${error.message}`));
     }
@@ -355,9 +354,9 @@ function showHelp(command) {
       Example: site:create mywebsite /path/to/dir --subdomain=mywebsite
     `,
     'site:deploy': `
-      ${chalk.cyan('site:deploy [<valid_name_app>] [<remote_dir>] [--subdomain=<subdomain>]')}
+      ${chalk.cyan('site:deploy [<remote_dir>] [--subdomain=<subdomain>]')}
       Deploy a local web project to Puter.
-      Example: site:deploy my-app ./my-app --subdomain my-app
+      Example: site:deploy ./my-app --subdomain my-app
     `,
     '!': `
       ${chalk.cyan('!<command>')}

package/src/modules/ErrorModule.js

@@ -1,33 +1,20 @@
-const ERROR_BUFFER_LIMIT = 20;
+export const ERROR_BUFFER_LIMIT = 20;
 
-export const ErrorAPI = Symbol('ErrorAPI');
+export const errors = [];
 
-export default ({ context }) => {
-    // State Variables
-    const errors = [];
-
-    context.events.on('error', (error) => {
-        context[ErrorAPI].report(error);
-    });
-
-    // Module Methods
-    context[ErrorAPI] = {
-        // Add an error to the error history
-        report (error) {
-            errors.push(error);
-            if (errors.length > ERROR_BUFFER_LIMIT) {
-                errors = errors.slice(errors.length - ERROR_BUFFER_LIMIT);
-            }
-        },
-        // Print the last error from the error history,
-        // and remove it from the history
-        showLast () {
-            const err = errors.pop();
-            if (err) {
-                console.error(err);
-            } else {
-                console.log('No errors to report');
-            }
-        }
-    };
-};
+export const report = (error) => {
+  errors.push(error);
+  if (errors.length > ERROR_BUFFER_LIMIT) {
+    errors.splice(0, errors.length - ERROR_BUFFER_LIMIT)
+  }
+}
+export const showLast = () => {
+  // Print the last error from the error history,
+  // and remove it from the history
+  const err = errors.pop();
+  if (err) {
+    console.error(err);
+  } else {
+    console.log('No errors to report');
+  }
+}