Merge pull request #12 from HeyPuter/feature/profiles

bitsnaps · web-flow · commit 2068154bf265 · 2025-09-01T21:44:45.000+01:00
feat: support multiple user profiles and hosts
diff --git a/bin/index.js b/bin/index.js
@@ -20,7 +20,9 @@ async function main() {
     .command('login')
     .description('Login to Puter account')
     .option('-s, --save', 'Save authentication token in .env file', '')
-    .action(login);
+    .action(() => {
+      startShell('login');
+    });
 
   program
     .command('logout')
diff --git a/src/commands/auth.js b/src/commands/auth.js
@@ -5,109 +5,17 @@ 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';
 const config = new Conf({ projectName: PROJECT_NAME });
 
 /**
  * Login user
  * @returns void
  */
-export async function login(args = {}) {
-  const answers = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'username',
-      message: 'Username:',
-      validate: input => input.length >= 1 || 'Username is required'
-    },
-    {
-      type: 'password',
-      name: 'password',
-      message: 'Password:',
-      mask: '*',
-      validate: input => input.length >= 1 || 'Password is required'
-    }
-  ]);
-
-  let spinner;
-  try {
-    spinner = ora('Logging in to Puter...').start();
-    
-    const response = await fetch(`${BASE_URL}/login`, {
-      method: 'POST',
-      headers: getHeaders(),
-      body: JSON.stringify({
-        username: answers.username,
-        password: answers.password
-      })
-    });
-
-    let data = await response.json();
-
-    while ( data.proceed && data.next_step ) {
-      if ( data.next_step === 'otp') {
-        spinner.succeed(chalk.green('2FA is enabled'));
-        const answers = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'otp',
-            message: 'Authenticator Code:',
-            validate: input => input.length === 6 || 'OTP must be 6 digits'
-          }
-        ]);
-        spinner = ora('Logging in to Puter...').start();
-        const response = await fetch(`${BASE_URL}/login/otp`, {
-          method: 'POST',
-          headers: getHeaders(),
-          body: JSON.stringify({
-            token: data.otp_jwt_token,
-            code: answers.otp,
-          }),
-        });
-        data = await response.json();
-        continue;
-      }
-
-      if ( data.next_step === 'complete' ) break;
-
-      spinner.fail(chalk.red(`Unrecognized login step "${data.next_step}"; you might need to update puter-cli.`));
-      return;
-    }
-
-    if (data.proceed && data.token) {
-      config.set('auth_token', data.token);
-      config.set('username', answers.username);
-      config.set('cwd', `/${answers.username}`);
-      if (spinner){
-        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.'));
-    }
-  } catch (error) {
-    if (spinner) {
-      spinner.fail(chalk.red('Failed to login'));
-    } else {
-      console.error(chalk.red(`Failed to login: ${error.message}`));
-    }
-  }
+export async function login(args = {}, context) {
+  const profileAPI = context[ProfileAPI];
+  await profileAPI.switchProfileWizard();
 }
 
 /**
@@ -164,14 +72,17 @@ export async function getUserInfo() {
     }
   } catch (error) {
     console.error(chalk.red(`Failed to get user info.\nError: ${error.message}`));
+    console.log(error);
   }
 }
 export function isAuthenticated() {
   return !!config.get('auth_token');
 }
 
 export function getAuthToken() {
-  return config.get('auth_token');
+  const context = get_context();
+  const profileAPI = context[ProfileAPI];
+  return profileAPI.getAuthToken();
 }
 
 export function getCurrentUserName() {
diff --git a/src/commands/files.js b/src/commands/files.js
@@ -588,6 +588,7 @@ export async function pathExists(filePath) {
         return statResponse.ok;
     } catch (error){
         console.error(chalk.red('Failed to check if file exists.'));
+        console.error('ERROR', error);
             return false;
     }    
 }
diff --git a/src/commands/shell.js b/src/commands/shell.js
@@ -2,9 +2,10 @@ import readline from 'node:readline';
 import chalk from 'chalk';
 import Conf from 'conf';
 import { execCommand, getPrompt } from '../executor.js';
-import { getAuthToken, login } from './auth.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';
 
 const config = new Conf({ projectName: PROJECT_NAME });
@@ -26,16 +27,11 @@ export function updatePrompt(currentPath) {
 /**
  * Start the interactive shell
  */
-export async function startShell() {
-  if (!getAuthToken()) {
-    console.log(chalk.cyan('Please login first (or use CTRL+C to exit):'));
-    await login();
-    console.log(chalk.green(`Now just type: ${chalk.cyan('puter')} to begin.`));
-    process.exit(0);
-  }
-
+export async function startShell(command) {
   const modules = [
+    SetContextModule,
     ErrorModule,
+    ProfileModule,
   ];
 
   const context = new putility.libs.context.Context({
@@ -44,6 +40,14 @@ export async function startShell() {
 
   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);
+    process.exit(0);
+  }
+
   try {
     console.log(chalk.green('Welcome to Puter-CLI! Type "help" for available commands.'));
     rl.setPrompt(getPrompt());
@@ -66,4 +70,4 @@ export async function startShell() {
   } catch (error) {
     console.error(chalk.red('Error starting shell:', error));
   }
-}
+}
diff --git a/src/commons.js b/src/commons.js
@@ -10,8 +10,14 @@ dotenv.config();
 
 export const PROJECT_NAME = 'puter-cli';
 // If you haven't defined your own values in .env file, we'll assume you're running Puter on a local instance:
-export const API_BASE = process.env.PUTER_API_BASE || 'https://api.puter.com';
-export const BASE_URL = process.env.PUTER_BASE_URL || 'https://puter.com';
+export let API_BASE = process.env.PUTER_API_BASE || 'https://api.puter.com';
+export let BASE_URL = process.env.PUTER_BASE_URL || 'https://puter.com';
+export const NULL_UUID = '00000000-0000-0000-0000-000000000000';
+
+export const reconfigureURLs = ({ api, base }) => {
+    API_BASE = api;
+    BASE_URL = base;
+};
 
 /**
  * Get headers with the correct Content-Type for multipart form data.
diff --git a/src/executor.js b/src/executor.js
@@ -6,7 +6,7 @@ import { listFiles, makeDirectory, renameFileOrDirectory,
   removeFileOrDirectory, emptyTrash, changeDirectory, showCwd, 
   getInfo, getDiskUsage, createFile, readFile, uploadFile, 
   downloadFile, copyFile, syncDirectory, editFile } from './commands/files.js';
-import { getUserInfo, getUsageInfo } from './commands/auth.js';
+import { getUserInfo, getUsageInfo, login } from './commands/auth.js';
 import { PROJECT_NAME, API_BASE, getHeaders } from './commons.js';
 import inquirer from 'inquirer';
 import { exec } from 'node:child_process';
@@ -34,6 +34,7 @@ const commands = {
     await import('./commands/auth.js').then(m => m.logout());
     process.exit(0);
   },
+  login: login,
   whoami: getUserInfo,
   stat: getInfo,
   apps: async (args) => {
diff --git a/src/modules/ProfileModule.js b/src/modules/ProfileModule.js
diff --git a/src/modules/SetContextModule.js b/src/modules/SetContextModule.js
diff --git a/src/temporary/context_helpers.js b/src/temporary/context_helpers.js

Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,7 @@ export async function pathExists(filePath) {`
`588`	`588`	`return statResponse.ok;`
`589`	`589`	`} catch (error){`
`590`	`590`	`console.error(chalk.red('Failed to check if file exists.'));`
	`591`	`+ console.error('ERROR', error);`
`591`	`592`	`return false;`
`592`	`593`	`}`
`593`	`594`	`}`