puter-cli 1.8.5 → 2.0.0

package/src/commands/apps.js

@@ -9,6 +9,7 @@ import { deleteSite } from './sites.js';
 import { copyFile, createFile, listRemoteFiles, pathExists, removeFileOrDirectory } from './files.js';
 import { getCurrentDirectory } from './auth.js';
 import crypto from '../crypto.js';
+import { getPuter } from '../modules/PuterModule.js';
 
 /**
  * List all apps
@@ -23,22 +24,13 @@ import crypto from '../crypto.js';
  */
 export async function listApps({ statsPeriod = 'all', iconSize = 64 } = {}) {
     console.log(chalk.green(`Listing of apps during period "${chalk.cyan(statsPeriod)}" (try also: today, yesterday, 7d, 30d, this_month, last_month):\n`));
+    const puter = getPuter();
     try {
-        const response = await fetch(`${API_BASE}/drivers/call`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                interface: "puter-apps",
-                method: "select",
-                args: {
-                    params: { icon_size: iconSize },
-                    predicate: ["user-can-edit"],
-                    stats_period: statsPeriod,
-                }
-            })
+        const result = await puter.apps.list({
+            icon_size: iconSize,
+            stats_period: statsPeriod
         });
-        const data = await response.json();
-        if (data && data['result']) {
+        if (result) {
             // Create a new table instance
             const table = new Table({
                 head: [
@@ -57,7 +49,7 @@ export async function listApps({ statsPeriod = 'all', iconSize = 64 } = {}) {
 
             // Populate the table with app data
             let i = 0;
-            for (const app of data['result']) {
+            for (const app of result) {
                 table.push([
                     i++,
                     app['title'],
@@ -72,7 +64,7 @@ export async function listApps({ statsPeriod = 'all', iconSize = 64 } = {}) {
 
             // Display the table
             console.log(table.toString());
-            console.log(chalk.green(`You have in total: ${chalk.cyan(data['result'].length)} application(s).`));
+            console.log(chalk.green(`You have in total: ${chalk.cyan(result.length)} application(s).`));
         } else {
             console.error(chalk.red('Unable to list your apps. Please check your credentials.'));
         }
@@ -97,24 +89,12 @@ export async function appInfo(args = []) {
     }
     const appName = args[0].trim()
     console.log(chalk.green(`Looking for "${chalk.dim(appName)}" app informations:\n`));
+    const puter = getPuter();
     try {
-        const response = await fetch(`${API_BASE}/drivers/call`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                interface: "puter-apps",
-                method: "read",
-                args: {
-                    id: {
-                        name: appName
-                    }
-                }
-            })
-        });
-        const data = await response.json();
-        if (data && data['result']) {
+        const result = await puter.apps.get(appName);
+        if (result) {
             // Display the informations
-            displayNonNullValues(data['result']);
+            displayNonNullValues(result);
         } else {
             console.error(chalk.red('Could not find this app.'));
         }
@@ -150,40 +130,24 @@ export async function createApp(args) {
     console.log(chalk.dim(`Description: ${description}`));
     console.log(chalk.dim(`URL: ${url}`));
 
+    const puter = getPuter();
     try {
         // Step 1: Create the app
-        const createAppResponse = await fetch(`${API_BASE}/drivers/call`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                interface: "puter-apps",
-                method: "create",
-                args: {
-                    object: {
-                        name: name,
-                        index_url: url,
-                        title: name,
-                        description: description,
-                        maximize_on_start: false,
-                        background: false,
-                        metadata: {
-                            window_resizable: true
-                        }
-                    },
-                    options: {
-                        dedupe_name: true
-                    }
-                }
-            })
+        const createAppData = await puter.apps.create({
+            name: name,
+            indexURL: url,
+            title: name,
+            description: description,
+            maximizeOnStart: false,
+            dedupeName: true
         });
-        const createAppData = await createAppResponse.json();
-        if (!createAppData || !createAppData.success) {
+        if (!createAppData) {
             console.error(chalk.red(`Failed to create app "${name}"`));
             return;
         }
-        const appUid = createAppData.result.uid;
-        const appName = createAppData.result.name;
-        const username = createAppData.result.owner.username;
+        const appUid = createAppData.uid;
+        const appName = createAppData.name;
+        const username = createAppData.owner.username;
         console.log(chalk.green(`App "${chalk.dim(name)}" created successfully!`));
         console.log(chalk.cyan(`AppName: ${chalk.dim(appName)}\nUID: ${chalk.dim(appUid)}\nUsername: ${chalk.dim(username)}`));
 
@@ -191,18 +155,11 @@ export async function createApp(args) {
         const uid = crypto.randomUUID();
         const appDir = `/${username}/AppData/${appUid}`;
         console.log(chalk.green(`Creating directory...\nPath: ${chalk.dim(appDir)}\nApp: ${chalk.dim(name)}\nUID: ${chalk.dim(uid)}\n`));
-        const createDirResponse = await fetch(`${API_BASE}/mkdir`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                parent: appDir,
-                path: `app-${uid}`,
-                overwrite: true,
-                dedupe_name: false,
-                create_missing_parents: true
-            })
-        });
-        const createDirData = await createDirResponse.json();
+        const createDirData = await puter.fs.mkdir(`${appDir}/app-${uid}`, {
+            overwrite: true,
+            dedupeName: false,
+            createMissingParents: true,
+        })
         if (!createDirData || !createDirData.uid) {
             console.error(chalk.red(`Failed to create directory for app "${name}"`));
             return;
@@ -246,23 +203,11 @@ export async function createApp(args) {
 
         // Step 5: Update the app's index_url to point to the subdomain
         console.log(chalk.green(`Set "${chalk.dim(subdomainName)}" as a subdomain for app: "${chalk.dim(appName)}"...\n`));
-        const updateAppResponse = await fetch(`${API_BASE}/drivers/call`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                interface: "puter-apps",
-                method: "update",
-                args: {
-                    id: { name: appName },
-                    object: {
-                        index_url: `https://${subdomainName}.puter.site`,
-                        title: name
-                    }
-                }
-            })
-        });
-        const updateAppData = await updateAppResponse.json();
-        if (!updateAppData || !updateAppData.success) {
+        const updateAppData = await puter.apps.update(appName, {
+            indexURL: `https://${subdomainName}.puter.site`,
+            title: name
+        })
+        if (!updateAppData) {
             console.error(chalk.red(`Failed to update app "${name}" with new subdomain`));
             return;
         }
@@ -301,35 +246,25 @@ export async function updateApp(args = []) {
         return;
     }
 
+    const puter = getPuter();
     console.log(chalk.green(`Updating app: "${chalk.dim(name)}" from directory: ${chalk.dim(remoteDir)}\n`));
     try {
         // Step 1: Get the app info
-        const appResponse = await fetch(`${API_BASE}/drivers/call`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                interface: "puter-apps",
-                method: "read",
-                args: {
-                    id: { name }
-                }
-            })
-        });
-        const data = await appResponse.json();
-        if (!data || !data.success) {
+        const data = await puter.apps.get(name);
+        if (!data) {
             console.error(chalk.red(`Failed to find app: "${name}"`));
             return;
         }
-        const appUid = data.result.uid;
-        const appName = data.result.name;
-        const username = data.result.owner.username;
-        const indexUrl = data.result.index_url;
+        const appUid = data.uid;
+        const appName = data.name;
+        const username = data.owner.username;
+        const indexUrl = data.index_url;
         const appDir = `/${username}/AppData/${appUid}`;
         console.log(chalk.cyan(`AppName: ${chalk.dim(appName)}\nUID: ${chalk.dim(appUid)}\nUsername: ${chalk.dim(username)}`));
 
         // Step 2: Find the path from subdomain
         const subdomains = await getSubdomains();
-        const appSubdomain = subdomains.result.find(sd => sd.root_dir?.dirname?.endsWith(appUid));
+        const appSubdomain = subdomains.find(sd => sd.root_dir?.dirname?.endsWith(appUid));
         if (!appSubdomain){
             console.error(chalk.red(`Sorry! We could not find the subdomain for ${chalk.cyan(name)} application.`));
             return;
@@ -361,6 +296,7 @@ export async function updateApp(args = []) {
         console.log(chalk.dim(indexUrl));
     } catch (error) {
         console.error(chalk.red(`Failed to update app "${name}".\nError: ${error.message}`));
+        console.error(error);
     }
 }
 
@@ -374,24 +310,13 @@ export async function deleteApp(name) {
         console.log(chalk.red('Usage: app:delete <name>'));
         return false;
     }
+    const puter = getPuter();
     console.log(chalk.green(`Checking app "${name}"...\n`));
     try {
         // Step 1: Read app details
-        const readResponse = await fetch(`${API_BASE}/drivers/call`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                interface: "puter-apps",
-                method: "read",
-                args: {
-                    id: { name }
-                }
-            })
-        });
-        
-        const readData = await readResponse.json();
+        const readData = await puter.apps.get(name);
 
-        if (!readData.success || !readData.result) {
+        if (!readData) {
             console.log(chalk.red(`App "${chalk.bold(name)}" not found.`));
             return false;
         }
@@ -399,35 +324,24 @@ export async function deleteApp(name) {
         // Show app details and confirm deletion
         console.log(chalk.cyan('\nApp Details:'));
         console.log(chalk.dim('----------------------------------------'));
-        console.log(chalk.dim(`Name: ${chalk.cyan(readData.result.name)}`));
-        console.log(chalk.dim(`Title: ${chalk.cyan(readData.result.title)}`));
-        console.log(chalk.dim(`Created: ${chalk.cyan(formatDate(readData.result.created_at))}`));
-        console.log(chalk.dim(`URL: ${readData.result.index_url}`));
+        console.log(chalk.dim(`Name: ${chalk.cyan(readData.name)}`));
+        console.log(chalk.dim(`Title: ${chalk.cyan(readData.title)}`));
+        console.log(chalk.dim(`Created: ${chalk.cyan(formatDate(readData.created_at))}`));
+        console.log(chalk.dim(`URL: ${readData.index_url}`));
         console.log(chalk.dim('----------------------------------------'));
 
         // Step 2: Delete the app
         console.log(chalk.green(`Deleting app "${chalk.red(name)}"...`));
-        const deleteResponse = await fetch(`${API_BASE}/drivers/call`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                interface: "puter-apps",
-                method: "delete",
-                args: {
-                    id: { name }
-                }
-            })
-        });path
 
-        const deleteData = await deleteResponse.json();
-        if (!deleteData.success) {
+        const deleteData = await puter.apps.delete(name);
+        if (!deleteData) {
             console.error(chalk.red(`Failed to delete app "${name}".\nP.S. Make sure to provide the 'name' attribute not the 'title'.`));
             return false;
         }
         
         // Lookup subdomainUID then delete it
         const subdomains = await getSubdomains();
-        const appSubdomain = subdomains.result.find(sd => sd.root_dir?.dirname?.endsWith(readData.result.uid));
+        const appSubdomain = subdomains.find(sd => sd.root_dir?.dirname?.endsWith(readData.uid));
         const subdomainDeleted = await deleteSite([appSubdomain.uid]);
         if (subdomainDeleted){
             console.log(chalk.green(`Subdomain: ${chalk.dim(appSubdomain.uid)} deleted.`));

package/src/commands/auth.js

@@ -1,21 +1,23 @@
-import fs from 'node:fs';
-import inquirer from 'inquirer';
 import chalk from 'chalk';
 import Conf from 'conf';
 import ora from 'ora';
-import fetch from 'node-fetch';
-import { PROJECT_NAME, API_BASE, getHeaders, BASE_URL } from '../commons.js'
-import { ProfileAPI } from '../modules/ProfileModule.js';
-import { get_context } from '../temporary/context_helpers.js';
+import { PROJECT_NAME, } from '../commons.js'
+import { getProfileModule } from '../modules/ProfileModule.js';
+import { getPuter } from '../modules/PuterModule.js';
 const config = new Conf({ projectName: PROJECT_NAME });
 
 /**
  * Login user
+ * @param {Object} options - Login options
+ * @param {boolean} options.save - Save token to .env file
+ * @param {boolean} options.web - Use browser-based login (default)
+ * @param {boolean} options.withCredentials - Use username/password login
+ * @param {string} options.host - Puter host URL
  * @returns void
  */
-export async function login(args = {}, context) {
-  const profileAPI = context[ProfileAPI];
-  await profileAPI.switchProfileWizard();
+export async function login(options = {}) {
+  const profileAPI = getProfileModule();
+  await profileAPI.switchProfileWizard(options);
 }
 
 /**
@@ -23,20 +25,31 @@ export async function login(args = {}, context) {
  * @returns void
  */
 export async function logout() {
-  
+
   let spinner;
   try {
     spinner = ora('Logging out from Puter...').start();
     const token = config.get('auth_token');
-    if (!token) {
+    const selected_profile = config.get('selected_profile');
+
+    if (token) {
+      // legacy auth
+      config.clear();
+      spinner.succeed(chalk.green('Successfully logged out from Puter!'));
+    } else if (selected_profile) {
+      // multi profile auth
+      config.delete('selected_profile');
+      config.delete('username');
+      config.delete('cwd');
+
+      const profiles = config.get('profiles');
+      config.set('profiles', profiles.filter(profile => profile.uuid != selected_profile));
+      spinner.succeed(chalk.green('Successfully logged out from Puter!'));
+    } else {
       spinner.info(chalk.yellow('Already logged out'));
-      return;
     }
-
-    config.clear(); // Remove all stored data
-    spinner.succeed(chalk.green('Successfully logged out from Puter!'));
   } catch (error) {
-    if (spinner){
+    if (spinner) {
       spinner.fail(chalk.red('Failed to logout'));
     }
     console.error(chalk.red(`Error: ${error.message}`));
@@ -45,12 +58,9 @@ export async function logout() {
 
 export async function getUserInfo() {
   console.log(chalk.green('Getting user info...\n'));
+  const puter = getPuter();
   try {
-    const response = await fetch(`${API_BASE}/whoami`, {
-      method: 'GET',
-      headers: getHeaders()
-    });
-    const data = await response.json();
+    const data = await puter.auth.getUser();
     if (data) {
       console.log(chalk.cyan('User Information:'));
       console.log(chalk.dim('----------------------------------------'));
@@ -80,14 +90,12 @@ export function isAuthenticated() {
 }
 
 export function getAuthToken() {
-  const context = get_context();
-  const profileAPI = context[ProfileAPI];
+  const profileAPI = getProfileModule();;
   return profileAPI.getAuthToken();
 }
 
 export function getCurrentUserName() {
-  const context = get_context();
-  const profileAPI = context[ProfileAPI];
+  const profileAPI = getProfileModule();;
   return profileAPI.getCurrentProfile()?.username;
 }
 
@@ -100,98 +108,88 @@ export function getCurrentDirectory() {
  */
 export async function getUsageInfo() {
   console.log(chalk.green('Fetching usage information...\n'));
+  const puter = getPuter();
   try {
-      const response = await fetch(`${API_BASE}/drivers/usage`, {
-          method: 'GET',
-          headers: getHeaders()
-      });
-
-      const data = await response.json();
-      if (data) {
-          console.log(chalk.cyan('Usage Information:'));
-          console.log(chalk.dim('========================================'));
-
-          // Display user usage in a table
-          if (data.user && data.user.length > 0) {
-              console.log(chalk.cyan('User Usage:'));
-              console.log(chalk.dim('----------------------------------------'));
-              console.log(
-                  chalk.bold('Service'.padEnd(30)) +
-                  chalk.bold('Implementation'.padEnd(20)) +
-                  chalk.bold('Month'.padEnd(10)) +
-                  chalk.bold('Usage'.padEnd(10)) +
-                  chalk.bold('Limit'.padEnd(10)) +
-                  chalk.bold('Rate Limit')
-              );
-              console.log(chalk.dim('----------------------------------------'));
-              data.user.forEach(usage => {
-                  const service = `${usage.service['driver.interface']}.${usage.service['driver.method']}`;
-                  const implementation = usage.service['driver.implementation'];
-                  const month = `${usage.month}/${usage.year}`;
-                  const monthlyUsage = usage.monthly_usage?.toString();
-                  const monthlyLimit = usage.monthly_limit ? usage.monthly_limit.toString() : 'No Limit';
-                  const rateLimit = usage.policy ? `${usage.policy['rate-limit'].max} req/${usage.policy['rate-limit'].period / 1000}s` : 'N/A';
-
-                  console.log(
-                      service.padEnd(30) +
-                      implementation.padEnd(20) +
-                      month.padEnd(10) +
-                      monthlyUsage.padEnd(10) +
-                      monthlyLimit.padEnd(10) +
-                      rateLimit
-                  );
-              });
-              console.log(chalk.dim('----------------------------------------'));
-          }
-
-          // Display app usage in a table (if available)
-          if (data.apps && Object.keys(data.apps).length > 0) {
-              console.log(chalk.cyan('\nApp Usage:'));
-              console.log(chalk.dim('----------------------------------------'));
-              console.log(
-                  chalk.bold('App'.padEnd(30)) +
-                  chalk.bold('Usage'.padEnd(10)) +
-                  chalk.bold('Limit'.padEnd(10))
-              );
-              console.log(chalk.dim('----------------------------------------'));
-              for (const [app, usage] of Object.entries(data.apps)) {
-                  console.log(
-                      app.padEnd(30) +
-                      usage.used.toString().padEnd(10) +
-                      usage.available.toString().padEnd(10)
-                  );
-              }
-              console.log(chalk.dim('----------------------------------------'));
-          }
-
-          // Display general usages in a table (if available)
-          if (data.usages && data.usages.length > 0) {
-              console.log(chalk.cyan('\nGeneral Usages:'));
-              console.log(chalk.dim('----------------------------------------'));
-              console.log(
-                  chalk.bold('Name'.padEnd(30)) +
-                  chalk.bold('Used'.padEnd(10)) +
-                  chalk.bold('Available'.padEnd(10)) +
-                  chalk.bold('Refill')
-              );
-              console.log(chalk.dim('----------------------------------------'));
-              data.usages.forEach(usage => {
-                  console.log(
-                      usage.name.padEnd(30) +
-                      usage.used.toString().padEnd(10) +
-                      usage.available.toString().padEnd(10) +
-                      usage.refill
-                  );
-              });
-              console.log(chalk.dim('----------------------------------------'));
-          }
-
-          console.log(chalk.dim('========================================'));
-          console.log(chalk.green('Done.'));
-      } else {
-          console.error(chalk.red('Unable to fetch usage information.'));
+    const data = await puter.auth.getMonthlyUsage();
+    if (data) {
+      // Display allowance information
+      if (data.allowanceInfo) {
+        console.log(chalk.cyan('Allowance Information:'));
+        console.log(chalk.dim('='.repeat(100)));
+        console.log(chalk.cyan(`Month Usage Allowance: `) + chalk.white(data.allowanceInfo.monthUsageAllowance.toLocaleString()));
+        console.log(chalk.cyan(`Remaining: `) + chalk.white(data.allowanceInfo.remaining.toLocaleString()));
+        const usedPercentage = ((data.allowanceInfo.monthUsageAllowance - data.allowanceInfo.remaining) / data.allowanceInfo.monthUsageAllowance * 100).toFixed(2);
+        console.log(chalk.cyan(`Used: `) + chalk.white(`${usedPercentage}%`));
+        console.log(chalk.dim('='.repeat(100)));
+      }
+
+      // Display usage information per API
+      if (data.usage) {
+        console.log(chalk.cyan('\nAPI Usage:'));
+        console.log(chalk.dim('='.repeat(100)));
+        console.log(
+          chalk.bold('API'.padEnd(50)) +
+          chalk.bold('Count'.padEnd(15)) +
+          chalk.bold('Cost'.padEnd(20)) +
+          chalk.bold('Units')
+        );
+        console.log(chalk.dim('='.repeat(100)));
+
+        // Filter out 'total' and sort entries by cost (descending)
+        const usageEntries = Object.entries(data.usage)
+          .filter(([key]) => key !== 'total')
+          .sort(([, a], [, b]) => b.cost - a.cost);
+
+        usageEntries.forEach(([api, details]) => {
+          console.log(
+            api.padEnd(50) +
+            details.count.toString().padEnd(15) +
+            details.cost.toLocaleString().padEnd(20) +
+            details.units.toLocaleString()
+          );
+        });
+
+        // Display total if available
+        if (data.usage.total !== undefined) {
+          console.log(chalk.dim('='.repeat(100)));
+          console.log(
+            chalk.bold('TOTAL'.padEnd(50)) +
+            ''.padEnd(15) +
+            chalk.bold(data.usage.total.toLocaleString())
+          );
+        }
+        console.log(chalk.dim('='.repeat(100)));
       }
+
+      // Display app totals
+      if (data.appTotals && Object.keys(data.appTotals).length > 0) {
+        console.log(chalk.cyan('\nApp Totals:'));
+        console.log(chalk.dim('='.repeat(100)));
+        console.log(
+          chalk.bold('App'.padEnd(50)) +
+          chalk.bold('Count'.padEnd(15)) +
+          chalk.bold('Total')
+        );
+        console.log(chalk.dim('='.repeat(100)));
+
+        // Sort by total (descending)
+        const appEntries = Object.entries(data.appTotals)
+          .sort(([, a], [, b]) => b.total - a.total);
+
+        appEntries.forEach(([app, details]) => {
+          console.log(
+            app.padEnd(50) +
+            details.count.toString().padEnd(15) +
+            details.total.toLocaleString()
+          );
+        });
+        console.log(chalk.dim('='.repeat(100)));
+      }
+      console.log(chalk.green('Done.'));
+    } else {
+      console.error(chalk.red('Unable to fetch usage information.'));
+    }
   } catch (error) {
-      console.error(chalk.red(`Failed to fetch usage information.\nError: ${error.message}`));
+    console.error(chalk.red(`Failed to fetch usage information.\nError: ${error.message}`));
   }
 }