puter-cli 1.8.6 → 2.0.0

package/src/commands/files.js

@@ -13,6 +13,7 @@ import inquirer from 'inquirer';
 import { getAuthToken, getCurrentDirectory, getCurrentUserName } from './auth.js';
 import { updatePrompt } from './shell.js';
 import crypto from '../crypto.js';
+import { getPuter } from '../modules/PuterModule.js';
 
 
 const config = new Conf({ projectName: PROJECT_NAME });
@@ -24,12 +25,8 @@ const config = new Conf({ projectName: PROJECT_NAME });
  * @returns List of files found
  */
 export async function listRemoteFiles(path) {
-    const response = await fetch(`${API_BASE}/readdir`, {
-        method: 'POST',
-        headers: getHeaders(),
-        body: JSON.stringify({ path })
-    });
-    return await response.json();
+    const puter = getPuter();
+    return await puter.fs.readdir(path);
 }
 
 /**
@@ -85,20 +82,14 @@ export async function makeDirectory(args = []) {
     const directoryName = args[0];
     console.log(chalk.green(`Creating directory "${directoryName}" in "${getCurrentDirectory()}"...\n`));
 
-    try {
-        const response = await fetch(`${API_BASE}/mkdir`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                parent: getCurrentDirectory(),
-                path: directoryName,
-                overwrite: false,
-                dedupe_name: true,
-                create_missing_parents: false
-            })
-        });
+    const puter = getPuter();
 
-        const data = await response.json();
+    try {
+        const data = await puter.fs.mkdir(`${getCurrentDirectory()}/${directoryName}`, {
+            overwrite: false,
+            dedupeName: true,
+            createMissingParents: false
+        })
         if (data && data.id) {
             console.log(chalk.green(`Directory "${directoryName}" created successfully!`));
             console.log(chalk.dim(`Path: ${data.path}`));
@@ -127,16 +118,11 @@ export async function renameFileOrDirectory(args = []) {
     const destPath = args[1].startsWith('/') ? args[1] : resolvePath(getCurrentDirectory(), args[1]);
 
     console.log(chalk.green(`Moving "${sourcePath}" to "${destPath}"...\n`));
-
+    
+    const puter = getPuter();
     try {
         // Step 1: Get the source file/directory info
-        const statResponse = await fetch(`${API_BASE}/stat`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({ path: sourcePath })
-        });
-
-        const statData = await statResponse.json();
+        const statData = await puter.fs.stat(sourcePath);
         if (!statData || !statData.uid) {
             console.log(chalk.red(`Could not find source "${sourcePath}".`));
             return;
@@ -146,13 +132,16 @@ export async function renameFileOrDirectory(args = []) {
         const sourceName = statData.name;
 
         // Step 2: Check if destination is an existing directory
-        const destStatResponse = await fetch(`${API_BASE}/stat`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({ path: destPath })
-        });
-
-        const destData = await destStatResponse.json();
+        let destData = null;
+        try {
+            destData = await puter.fs.stat(destPath);
+        } catch (error) {
+            if (error.code == "subject_does_not_exist") {
+                // no-op
+            } else {
+                throw (error);
+            }
+        }
         
         // Determine if this is a rename or move operation
         const isMove = destData && destData.is_dir;
@@ -161,20 +150,11 @@ export async function renameFileOrDirectory(args = []) {
 
         if (isMove) {
             // Move operation: use /move endpoint
-            const moveResponse = await fetch(`${API_BASE}/move`, {
-                method: 'POST',
-                headers: getHeaders(),
-                body: JSON.stringify({
-                    source: sourceUid,
-                    destination: destination,
-                    overwrite: false,
-                    new_name: newName,
-                    create_missing_parents: false,
-                    new_metadata: {}
-                })
+            const moveData = await puter.fs.move(sourceUid, destination, {
+                overwrite: false,
+                newName: newName,
+                createMissingParents: false,
             });
-
-            const moveData = await moveResponse.json();
             if (moveData && moveData.moved) {
                 console.log(chalk.green(`Successfully moved "${sourcePath}" to "${moveData.moved.path}"!`));
             } else {
@@ -182,17 +162,8 @@ export async function renameFileOrDirectory(args = []) {
             }
         } else {
             // Rename operation: use /rename endpoint
-            const renameResponse = await fetch(`${API_BASE}/rename`, {
-                method: 'POST',
-                headers: getHeaders(),
-                body: JSON.stringify({
-                    uid: sourceUid,
-                    new_name: newName
-                })
-            });
-
-            const renameData = await renameResponse.json();
-            if (renameData && renameData.uid) {
+            const renameData = await puter.fs.rename(sourceUid, newName);
+            if (renameData) {
                 console.log(chalk.green(`Successfully renamed "${sourcePath}" to "${renameData.path}"!`));
             } else {
                 console.log(chalk.red('Failed to rename item. Please check your input.'));
@@ -201,6 +172,7 @@ export async function renameFileOrDirectory(args = []) {
     } catch (error) {
         console.log(chalk.red('Failed to move/rename item.'));
         console.error(chalk.red(`Error: ${error.message}`));
+        console.error(error);
     }
 }
 
@@ -213,6 +185,7 @@ export async function renameFileOrDirectory(args = []) {
  */
 async function findMatchingFiles(files, pattern, basePath) {
     const matchedPaths = [];
+    const puter = getPuter();
 
     for (const file of files) {
         const filePath = path.join(basePath, file.name);
@@ -224,14 +197,8 @@ async function findMatchingFiles(files, pattern, basePath) {
 
         // If it's a directory, recursively search its contents
         if (file.is_dir) {
-            const dirResponse = await fetch(`${API_BASE}/readdir`, {
-                method: 'POST',
-                headers: getHeaders(),
-                body: JSON.stringify({ path: filePath })
-            });
-
-            if (dirResponse.ok) {
-                const dirFiles = await dirResponse.json();
+            const dirFiles = await puter.fs.readdir(filePath);
+            if (dirFiles && dirFiles.length > 0) {
                 const dirMatches = await findMatchingFiles(dirFiles, pattern, filePath);
                 matchedPaths.push(...dirMatches);
             }
@@ -283,20 +250,11 @@ export async function removeFileOrDirectory(args = []) {
     const skipConfirmation = args.includes('-f'); // Check the flag if provided
     const names = skipConfirmation ? args.filter(option => option !== '-f') : args;
 
+    const puter = getPuter();
+
     try {
         // Step 1: Fetch the list of files and directories from the server
-        const listResponse = await fetch(`${API_BASE}/readdir`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({ path: getCurrentDirectory() })
-        });
-
-        if (!listResponse.ok) {
-            console.error(chalk.red('Failed to list files from the server.'));
-            return;
-        }
-
-        const files = await listResponse.json();
+        const files = await puter.fs.readdir(getCurrentDirectory());
         if (!Array.isArray(files) || files.length == 0) {
             console.error(chalk.red('No files or directories found on the server.'));
             return;
@@ -347,40 +305,20 @@ export async function removeFileOrDirectory(args = []) {
                 console.log(chalk.green(`Preparing to remove "${path}"...`));
 
                 // Step 4.1: Get the UID of the file/directory
-                const statResponse = await fetch(`${API_BASE}/stat`, {
-                    method: 'POST',
-                    headers: getHeaders(),
-                    body: JSON.stringify({ path })
-                });
-
-                const statData = await statResponse.json();
+                const statData = await puter.fs.stat(path);
                 if (!statData || !statData.uid) {
                     console.error(chalk.red(`Could not find file or directory with path "${path}".`));
                     continue;
                 }
 
                 const uid = statData.uid;
-                const originalPath = statData.path;
 
                 // Step 4.2: Perform the move operation to Trash
-                const moveResponse = await fetch(`${API_BASE}/move`, {
-                    method: 'POST',
-                    headers: getHeaders(),
-                    body: JSON.stringify({
-                        source: uid,
-                        destination: `/${getCurrentUserName()}/Trash`,
-                        overwrite: false,
-                        new_name: uid, // Use the UID as the new name in Trash
-                        create_missing_parents: false,
-                        new_metadata: {
-                            original_name: path.split('/').pop(),
-                            original_path: originalPath,
-                            trashed_ts: Math.floor(Date.now() / 1000) // Current timestamp
-                        }
-                    })
+                const moveData = await puter.fs.move(uid, `/${getCurrentUserName()}/Trash`, {
+                    overwrite: false,
+                    newName: uid,
+                    createMissingParents: false,
                 });
-
-                const moveData = await moveResponse.json();
                 if (moveData && moveData.moved) {
                     console.log(chalk.green(`Successfully moved "${path}" to Trash!`));
                     console.log(chalk.dim(`Moved to: ${moveData.moved.path}`));
@@ -406,6 +344,7 @@ export async function removeFileOrDirectory(args = []) {
 export async function deleteFolder(folderPath, skipConfirmation = false) {
     console.log(chalk.green(`Preparing to delete "${folderPath}"...\n`));
 
+    const puter = getPuter();
     try {
         // Step 1: Prompt for confirmation (unless skipConfirmation is true)
         if (!skipConfirmation) {
@@ -425,18 +364,11 @@ export async function deleteFolder(folderPath, skipConfirmation = false) {
         }
 
         // Step 2: Perform the delete operation
-        const deleteResponse = await fetch(`${API_BASE}/delete`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                paths: [folderPath],
-                descendants_only: true, // Delete only the contents, not the folder itself
-                recursive: true // Delete all subdirectories and files
-            })
+        const deleteData = await puter.fs.delete(folderPath, {
+            descendantsOnly: true,
+            recursive: true
         });
-
-        const deleteData = await deleteResponse.json();
-        if (deleteResponse.ok && Object.keys(deleteData).length == 0) {
+        if (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.'));
@@ -444,6 +376,7 @@ export async function deleteFolder(folderPath, skipConfirmation = false) {
     } catch (error) {
         console.log(chalk.red('Failed to delete folder.'));
         console.error(chalk.red(`Error: ${error.message}`));
+        console.error(error);
     }
 }
 
@@ -462,19 +395,13 @@ export async function emptyTrash(skipConfirmation = true) {
  */
 export async function getInfo(args = []) {
     const names = args.length > 0 ? args : ['.'];
+    const puter = getPuter();
     for (let name of names)
         try {
             name = `${getCurrentDirectory()}/${name}`;
             console.log(chalk.green(`Getting stat info for: "${name}"...\n`));
-            const response = await fetch(`${API_BASE}/stat`, {
-                method: 'POST',
-                headers: getHeaders(),
-                body: JSON.stringify({
-                    path: name
-                })
-            });
-            const data = await response.json();
-            if (response.ok && data) {
+            const data = await puter.fs.stat(name);
+            if (data) {
                 console.log(chalk.cyan('File/Directory Information:'));
                 console.log(chalk.dim('----------------------------------------'));
                 console.log(chalk.cyan(`Name: `) + chalk.white(data.name));
@@ -513,22 +440,15 @@ export async function changeDirectory(args) {
         console.log(chalk.green(currentPath));
         return;
     }
+    const puter = getPuter();
 
     const path = args[0];
     // Handle "/","~",".." and deeper navigation
     const newPath = path.startsWith('/')? path: (path === '~'? `/${getCurrentUserName()}` :resolvePath(currentPath, path));
     try {
         // Check if the new path is a valid directory
-        const response = await fetch(`${API_BASE}/stat`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                path: newPath
-            })
-        });
-
-        const data = await response.json();
-        if (response.ok && data && data.is_dir) {
+        const data = await puter.fs.stat(newPath);
+        if (data && data.is_dir) {
             // Update the newPath to use the correct name from the response
             const arrayDirs = newPath.split('/');
             arrayDirs.pop();
@@ -548,15 +468,10 @@ export async function changeDirectory(args) {
  */
 export async function getDiskUsage(body = null) {
     console.log(chalk.green('Fetching disk usage information...\n'));
+    const puter = getPuter();
     try {
-        const response = await fetch(`${API_BASE}/df`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: body ? JSON.stringify(body) : null
-        });
-
-        const data = await response.json();
-        if (response.ok && data) {
+        const data = await puter.fs.space();
+        if (data) {
             showDiskSpaceUsage(data);
         } else {
             console.error(chalk.red('Unable to fetch disk usage information.'));
@@ -575,18 +490,15 @@ export async function pathExists(filePath) {
         console.log(chalk.red('No path provided.'));
         return false;
     }
+    const puter = getPuter();
     try {
         // Step 1: Check if the file already exists
-        const statResponse = await fetch(`${API_BASE}/stat`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                path: filePath
-            })
-        });
-
-        return statResponse.ok;
+        await puter.fs.stat(filePath);
+        return true;
     } catch (error){
+        if (error.code == "subject_does_not_exist") {
+            return false;
+        }
         console.error(chalk.red('Failed to check if file exists.'));
         console.error('ERROR', error);
             return false;
@@ -615,21 +527,12 @@ export async function createFile(args = []) {
     const dedupeName = false; // Default: false
     const overwrite = true; // Default: true
 
+    const puter = getPuter();
     console.log(chalk.green(`Creating file:\nFileName: "${chalk.dim(fileName)}"\nPath: "${chalk.dim(dirName)}"\nContent Length: ${chalk.dim(content.length)}`));
     try {
         // Step 1: Check if the file already exists
-        const statResponse = await fetch(`${API_BASE}/stat`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                path: fullPath
-            })
-        });
-
-        if (!statResponse.ok) {
-            console.log(chalk.cyan('File does not exists. Il will be created.'));
-        } else {
-            const statData = await statResponse.json();
+        try {
+            const statData = await puter.fs.stat(fullPath);
             if (statData && statData.id) {
                 if (!overwrite) {
                     console.error(chalk.red(`File "${filePath}" already exists. Use --overwrite=true to replace it.`));
@@ -637,21 +540,16 @@ export async function createFile(args = []) {
                 }
                 console.log(chalk.yellow(`File "${filePath}" already exists. It will be overwritten.`));
             }
+        } catch (error) {
+            if (error.code == "subject_does_not_exist") {
+                console.log(chalk.cyan('File does not exists. It will be created.'));
+            } else {
+                throw error;
+            }
         }
 
         // Step 2: Check disk space
-        const dfResponse = await fetch(`${API_BASE}/df`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: null
-        });
-
-        if (!dfResponse.ok) {
-            console.error(chalk.red('Unable to check disk space.'));
-            return false;
-        }
-
-        const dfData = await dfResponse.json();
+        const dfData = await puter.fs.space();
         if (dfData.used >= dfData.capacity) {
             console.error(chalk.red('Not enough disk space to create the file.'));
             showDiskSpaceUsage(dfData); // Display disk usage info
@@ -659,85 +557,32 @@ export async function createFile(args = []) {
         }
 
         // Step 3: Create the nested directories if they don't exist
-        const dirStatResponse = await fetch(`${API_BASE}/stat`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                path: dirName
-            })
-        });
-
-        if (!dirStatResponse.ok || dirStatResponse.status === 404) {
-            // Create the directory if it doesn't exist
-            await fetch(`${API_BASE}/mkdir`, {
-                method: 'POST',
-                headers: getHeaders(),
-                body: JSON.stringify({
-                    parent: path.dirname(dirName),
-                    path: path.basename(dirName),
+        try {
+            await puter.fs.stat(dirName);
+        } catch (error) {
+            if (error.code == "subject_does_not_exist") {
+                // Create the directory if it doesn't exist
+                await puter.fs.mkdir(dirName, {
                     overwrite: false,
-                    dedupe_name: true,
-                    create_missing_parents: true
+                    dedupeName: true,
+                    createMissingParents: true
                 })
-            });
+            } else {
+                throw error;
+            }
         }
 
-        // Step 4: Create the file using /batch
-        const operationId = crypto.randomUUID(); // Generate a unique operation ID
-        const socketId = 'undefined'; // Placeholder socket ID
-        const boundary = `----WebKitFormBoundary${crypto.randomUUID().replace(/-/g, '')}`;
+        // Step 4: Create the file
         const fileBlob = new Blob([content || ''], { type: 'text/plain' });
 
-        const formData = `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="operation_id"\r\n\r\n${operationId}\r\n` +
-            `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="socket_id"\r\n\r\n${socketId}\r\n` +
-            `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="original_client_socket_id"\r\n\r\n${socketId}\r\n` +
-            `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="fileinfo"\r\n\r\n${JSON.stringify({
-                name: fileName,
-                type: 'text/plain',
-                size: fileBlob.size
-            })}\r\n` +
-            `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="operation"\r\n\r\n${JSON.stringify({
-                op: 'write',
-                dedupe_name: dedupeName,
-                overwrite: overwrite,
-                operation_id: operationId,
-                path: dirName,
-                name: fileName,
-                item_upload_id: 0
-            })}\r\n` +
-            `--${boundary}\r\n` +
-            `Content-Disposition: form-data; name="file"; filename="${fileName}"\r\n` +
-            `Content-Type: text/plain\r\n\r\n${content || ''}\r\n` +
-            `--${boundary}--\r\n`;
-
-        // Send the request
-        const createResponse = await fetch(`${API_BASE}/batch`, {
-            method: 'POST',
-            headers: getHeaders(`multipart/form-data; boundary=${boundary}`),
-            body: formData
+        const createData = await puter.fs.upload(fileBlob, dirName, {
+            overwrite: overwrite,
+            dedupeName: dedupeName,
+            name: fileName
         });
-
-        if (!createResponse.ok) {
-            const errorText = await createResponse.text();
-            console.error(chalk.red(`Failed to create file. Server response: ${errorText}. status: ${createResponse.status}`));
-            return false;
-        }
-
-        const createData = await createResponse.json();
-        if (createData && createData.results && createData.results.length > 0) {
-            const file = createData.results[0];
-            console.log(chalk.green(`File "${filePath}" created successfully!`));
-            console.log(chalk.dim(`Path: ${file.path}`));
-            console.log(chalk.dim(`UID: ${file.uid}`));
-        } else {
-            console.error(chalk.red('Failed to create file. Invalid response from server.'));
-            return false;
-        }
+        console.log(chalk.green(`File "${createData.name}" created successfully!`));
+        console.log(chalk.dim(`Path: ${createData.path}`));
+        console.log(chalk.dim(`UID: ${createData.uid}`));
     } catch (error) {
         console.error(chalk.red(`Failed to create file.\nError: ${error.message}`));
         return false;
@@ -754,23 +599,19 @@ export async function readFile(args = []) {
         console.log(chalk.red('Usage: cat <file_path>'));
         return;
     }
+    const puter = getPuter();
 
     const filePath = resolvePath(getCurrentDirectory(), args[0]);
     console.log(chalk.green(`Reading file "${filePath}"...\n`));
 
     try {
-        // Step 1: Fetch the file content
-        const response = await fetch(`${API_BASE}/read?file=${encodeURIComponent(filePath)}`, {
-            method: 'GET',
-            headers: getHeaders()
-        });
-
-        if (!response.ok) {
-            console.error(chalk.red(`Failed to read file. Server response: ${response.statusText}`));
+        // Step 1: Fetch the file content        
+        const fileBlob = await puter.fs.read(filePath);
+        if (!fileBlob) {
+            console.error(chalk.red(`Failed to read file.`));
             return;
         }
-
-        const data = await response.text();
+        const data = await fileBlob.text();
 
         // Step 2: Dispaly the content
         if (data.length) {
@@ -804,6 +645,7 @@ export async function uploadFile(args = []) {
     const overwrite = args.length > 3 ? args[3] === 'true' : false; // Default: false
 
     console.log(chalk.green(`Uploading files from "${localPath}" to "${remotePath}"...\n`));
+    const puter = getPuter();
     try {
         // Step 1: Find all matching files (excluding hidden files)
         const files = glob.sync(localPath, { nodir: true, dot: false });
@@ -814,18 +656,7 @@ export async function uploadFile(args = []) {
         }
 
         // Step 2: Check disk space
-        const dfResponse = await fetch(`${API_BASE}/df`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: null
-        });
-
-        if (!dfResponse.ok) {
-            console.error(chalk.red('Unable to check disk space.'));
-            return;
-        }
-
-        const dfData = await dfResponse.json();
+        const dfData = await puter.fs.space();
         if (dfData.used >= dfData.capacity) {
             console.error(chalk.red('Not enough disk space to upload the files.'));
             showDiskSpaceUsage(dfData); // Display disk usage info
@@ -835,93 +666,23 @@ export async function uploadFile(args = []) {
         // Step 3: Upload each file
         for (const filePath of files) {
             const fileName = path.basename(filePath);
-            const fileContent = fs.readFileSync(filePath, 'utf8');
-
-            // Prepare the upload request
-            const operationId = crypto.randomUUID(); // Generate a unique operation ID
-            const socketId = 'undefined'; // Placeholder socket ID
-            const boundary = `----WebKitFormBoundary${crypto.randomUUID().replace(/-/g, '')}`;
-
-            // Prepare FormData
-            const formData = `--${boundary}\r\n` +
-                `Content-Disposition: form-data; name="operation_id"\r\n\r\n${operationId}\r\n` +
-                `--${boundary}\r\n` +
-                `Content-Disposition: form-data; name="socket_id"\r\n\r\n${socketId}\r\n` +
-                `--${boundary}\r\n` +
-                `Content-Disposition: form-data; name="original_client_socket_id"\r\n\r\n${socketId}\r\n` +
-                `--${boundary}\r\n` +
-                `Content-Disposition: form-data; name="fileinfo"\r\n\r\n${JSON.stringify({
-                    name: fileName,
-                    type: 'text/plain',
-                    size: Buffer.byteLength(fileContent, 'utf8')
-                })}\r\n` +
-                `--${boundary}\r\n` +
-                `Content-Disposition: form-data; name="operation"\r\n\r\n${JSON.stringify({
-                    op: 'write',
-                    dedupe_name: dedupeName,
-                    overwrite: overwrite,
-                    operation_id: operationId,
-                    path: remotePath,
-                    name: fileName,
-                    item_upload_id: 0
-                })}\r\n` +
-                `--${boundary}\r\n` +
-                `Content-Disposition: form-data; name="file"; filename="${fileName}"\r\n` +
-                `Content-Type: text/plain\r\n\r\n${fileContent}\r\n` +
-                `--${boundary}--\r\n`;
-
-            // Send the upload request
-            const uploadResponse = await fetch(`${API_BASE}/batch`, {
-                method: 'POST',
-                headers: getHeaders(`multipart/form-data; boundary=${boundary}`),
-                body: formData
-            });
+            const fileContent = fs.readFileSync(filePath);
+            const blob = new Blob([fileContent]);
 
-            if (!uploadResponse.ok) {
-                const errorText = await uploadResponse.text();
-                console.error(chalk.red(`Failed to upload file "${fileName}". Server response: ${errorText}`));
-                continue;
-            }
-
-            const uploadData = await uploadResponse.json();
-            if (uploadData && uploadData.results && uploadData.results.length > 0) {
-                const file = uploadData.results[0];
-                console.log(chalk.green(`File "${fileName}" uploaded successfully!`));
-                console.log(chalk.dim(`Path: ${file.path}`));
-                console.log(chalk.dim(`UID: ${file.uid}`));
-            } else {
-                console.error(chalk.red(`Failed to upload file "${fileName}". Invalid response from server.`));
-            }
+            const uploadData = await puter.fs.upload(blob, remotePath, {
+                overwrite: overwrite,
+                dedupeName: dedupeName,
+                name: fileName
+            });
+            console.log(chalk.green(`File "${uploadData.name}" uploaded successfully!`));
+            console.log(chalk.dim(`Path: ${uploadData.path}`));
+            console.log(chalk.dim(`UID: ${uploadData.uid}`));
         }
     } catch (error) {
         console.error(chalk.red(`Failed to upload files.\nError: ${error.message}`));
     }
 }
 
-/**
- * Get a temporary CSRF Token
- * @returns The CSRF token
- */
-async function getCsrfToken() {
-    const csrfResponse = await fetch(`${BASE_URL}/get-anticsrf-token`, {
-        method: 'GET',
-        headers: getHeaders()
-    });
-
-    if (!csrfResponse.ok) {
-        console.error(chalk.red('Failed to fetch CSRF token.'));
-        return;
-    }
-
-    const csrfData = await csrfResponse.json();
-    if (!csrfData || !csrfData.token) {
-        console.error(chalk.red('Failed to fetch anti-CSRF token.'));
-        return;
-    }
-
-    return csrfData.token;
-}
-
 /**
  * Download a file from the Puter server to the host machine 
  * @param {Array} args - The arguments passed to the command (remote file path, Optional: local path).
@@ -937,21 +698,10 @@ export async function downloadFile(args = []) {
     const overwrite = args.length > 2 ? args[2] === 'true' : false; // Default: false
 
     console.log(chalk.green(`Downloading files matching "${remotePathPattern}" to "${localBasePath}"...\n`));
-
+    const puter = getPuter();
     try {
         // Step 1: Fetch the list of files and directories from the server
-        const listResponse = await fetch(`${API_BASE}/readdir`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({ path: getCurrentDirectory() })
-        });
-
-        if (!listResponse.ok) {
-            console.error(chalk.red('Failed to list files from the server.'));
-            return;
-        }
-
-        const files = await listResponse.json();
+        const files = await puter.fs.readdir(getCurrentDirectory());
         if (!Array.isArray(files) || files.length === 0) {
             console.error(chalk.red('No files or directories found on the server.'));
             return;
@@ -977,18 +727,8 @@ export async function downloadFile(args = []) {
 
             console.log(chalk.green(`Downloading file "${remoteFilePath}" to "${localFilePath}"...`));
 
-                    // Fetch the anti-CSRF token
-            const antiCsrfToken = await getCsrfToken();
-
-            const downloadResponse = await fetch(`${BASE_URL}/down?path=${remoteFilePath}`, {
-                method: 'POST',
-                headers: {
-                    ...getHeaders('application/x-www-form-urlencoded'),
-                    "cookie": `puter_auth_token=${getAuthToken()};`
-                },
-                "referrerPolicy": "strict-origin-when-cross-origin",
-                body: `anti_csrf=${antiCsrfToken}`
-            });
+            const fileUrl = await puter.fs.getReadURL(remoteFilePath);
+            const downloadResponse = await fetch(fileUrl);
 
             if (!downloadResponse.ok) {
                 console.error(chalk.red(`Failed to download file "${remoteFilePath}". Server response: ${downloadResponse.statusText}`));
@@ -1027,25 +767,20 @@ export async function copyFile(args = []) {
     const destinationPath = args[1].startsWith(`/${getCurrentUserName()}`) ? args[1] : resolvePath(getCurrentDirectory(), args[1]); // Resolve the destination path
 
     console.log(chalk.green(`Copy: "${chalk.dim(sourcePath)}" to: "${chalk.dim(destinationPath)}"...\n`));
+    const puter = getPuter();
     try {
         // Step 1: Check if the source is a directory or a file
-        const statResponse = await fetch(`${API_BASE}/stat`, {
-            method: 'POST',
-            headers: getHeaders(),
-            body: JSON.stringify({
-                path: sourcePath
-            })
-        });
-
-        if (!statResponse.ok) {
-            console.error(chalk.red(`Failed to check source path. Server response: ${await statResponse.text()}`));
-            return;
-        }
-
-        const statData = await statResponse.json();
-        if (!statData || !statData.id) {
-            console.error(chalk.red(`Source path "${sourcePath}" does not exist.`));
-            return;
+        let statData;
+        try {
+            statData = await puter.fs.stat(sourcePath);
+        } catch (error) {
+            if (error == "subject_does_not_exist") {
+                console.error(chalk.red(`Source path "${sourcePath}" does not exist.`));
+                return;
+            } else {
+                console.error(chalk.red(`Failed to check source path. Server response: ${await statResponse.text()}`));
+                return;
+            }
         }
 
         if (statData.is_dir) {
@@ -1055,21 +790,7 @@ export async function copyFile(args = []) {
                 const relativePath = file.path.replace(sourcePath, '');
                 const destPath = path.join(destinationPath, relativePath);
 
-                const copyResponse = await fetch(`${API_BASE}/copy`, {
-                    method: 'POST',
-                    headers: getHeaders(),
-                    body: JSON.stringify({
-                        source: file.path,
-                        destination: destPath
-                    })
-                });
-
-                if (!copyResponse.ok) {
-                    console.error(chalk.red(`Failed to copy file "${file.path}". Server response: ${await copyResponse.text()}`));
-                    continue;
-                }
-
-                const copyData = await copyResponse.json();
+                const copyData = await puter.fs.copy(file.path, destPath);
                 if (copyData && copyData.length > 0 && copyData[0].copied) {
                     console.log(chalk.green(`File "${chalk.dim(file.path)}" copied successfully to "${chalk.dim(copyData[0].copied.path)}"!`));
                 } else {
@@ -1078,21 +799,7 @@ export async function copyFile(args = []) {
             }
         } else {
             // Step 3: If source is a file, copy it directly
-            const copyResponse = await fetch(`${API_BASE}/copy`, {
-                method: 'POST',
-                headers: getHeaders(),
-                body: JSON.stringify({
-                    source: sourcePath,
-                    destination: destinationPath
-                })
-            });
-
-            if (!copyResponse.ok) {
-                console.error(chalk.red(`Failed to copy file. Server response: ${await copyResponse.text()}`));
-                return;
-            }
-
-            const copyData = await copyResponse.json();
+            const copyData = await puter.fs.copy(sourcePath, destinationPath);
             if (copyData && copyData.length > 0 && copyData[0].copied) {
                 console.log(chalk.green(`File "${sourcePath}" copied successfully to "${copyData[0].copied.path}"!`));
                 console.log(chalk.dim(`UID: ${copyData[0].copied.uid}`));
@@ -1235,21 +942,16 @@ async function resolveLocalDirectory(localPath) {
  * @param {string} remotePath - The remote directory path
  */
 async function ensureRemoteDirectoryExists(remotePath) {
+    const puter = getPuter();
     try {
         const exists = await pathExists(remotePath);
         if (!exists) {
             // Create the directory and any missing parents
-            await fetch(`${API_BASE}/mkdir`, {
-                method: 'POST',
-                headers: getHeaders(),
-                body: JSON.stringify({
-                    parent: path.dirname(remotePath),
-                    path: path.basename(remotePath),
-                    overwrite: false,
-                    dedupe_name: true,
-                    create_missing_parents: true
-                })
-            });
+            await puter.fs.mkdir(remotePath, {
+                overwrite: false,
+                dedupeName: true,
+                createMissingParents: true
+            })
         }
     } catch (error) {
         console.error(chalk.red(`Failed to create remote directory: ${remotePath}`));
@@ -1295,10 +997,11 @@ export async function syncDirectory(args = []) {
         }
 
         // Step 2: Fetch remote directory contents
-        let remoteFiles = await listRemoteFiles(remoteDir);
-        if (!Array.isArray(remoteFiles)) {
+        let remoteFiles = [];
+        try {
+            remoteFiles = await listRemoteFiles(remoteDir);
+        } catch (error) {
             console.log(chalk.yellow('Remote directory is empty or does not exist. Continuing...'));
-            remoteFiles = [];
         }
 
         // Step 3: List local files
@@ -1402,32 +1105,23 @@ export async function editFile(args = []) {
   const filePath = args[0].startsWith('/') ? args[0] : resolvePath(getCurrentDirectory(), args[0]);
   console.log(chalk.green(`Fetching file: ${filePath}`));
 
+  const puter = getPuter();
+
   try {
     // Step 1: Check if file exists
-    const statResponse = await fetch(`${API_BASE}/stat`, {
-      method: 'POST',
-      headers: getHeaders(),
-      body: JSON.stringify({ path: filePath })
-    });
-    
-    const statData = await statResponse.json();
-    if (!statData || !statData.uid || statData.is_dir) {
+    const statData = await puter.fs.stat(filePath);
+    if (!statData || statData.is_dir) {
       console.log(chalk.red(`File not found or is a directory: ${filePath}`));
       return;
     }
 
     // Step 2: Download the file content
-    const downloadResponse = await fetch(`${API_BASE}/read?file=${encodeURIComponent(filePath)}`, {
-      method: 'GET',
-      headers: getHeaders()
-    });
-    
-    if (!downloadResponse.ok) {
+    const fileBlob = await puter.fs.read(filePath);
+    const fileContent = await fileBlob.text();
+    if (!fileContent) {
       console.log(chalk.red(`Failed to download file: ${filePath}`));
       return;
     }
-    
-    const fileContent = await downloadResponse.text();
     console.log(chalk.green(`File fetched: ${filePath} (${formatSize(fileContent.length)} bytes)`));
 
     // Step 3: Create a temporary file
@@ -1449,22 +1143,12 @@ export async function editFile(args = []) {
       
       // Read the updated content after editor closes
       const updatedContent = fs.readFileSync(tempFilePath, 'utf8');
+      const blob = new Blob([updatedContent]);
       console.log(chalk.cyan('Uploading changes...'));
       
       // Step 7: Upload the updated file content
       // Step 7.1: Check disk space
-      const dfResponse = await fetch(`${API_BASE}/df`, {
-          method: 'POST',
-          headers: getHeaders(),
-          body: null
-      });
-
-      if (!dfResponse.ok) {
-          console.log(chalk.red('Unable to check disk space.'));
-          return;
-      }
-
-      const dfData = await dfResponse.json();
+      const dfData = await puter.fs.space();
       if (dfData.used >= dfData.capacity) {
           console.log(chalk.red('Not enough disk space to upload the file.'));
           showDiskSpaceUsage(dfData); // Display disk usage info
@@ -1472,60 +1156,15 @@ export async function editFile(args = []) {
       }
 
       // Step 7.2: Uploading the updated file
-      const operationId = crypto.randomUUID(); // Generate a unique operation ID
-      const socketId = 'undefined'; // Placeholder socket ID
-      const boundary = `----WebKitFormBoundary${crypto.randomUUID().replace(/-/g, '')}`;
       const fileName = path.basename(filePath);
       const dirName = path.dirname(filePath);
 
-      // Prepare FormData
-      const formData = `--${boundary}\r\n` +
-          `Content-Disposition: form-data; name="operation_id"\r\n\r\n${operationId}\r\n` +
-          `--${boundary}\r\n` +
-          `Content-Disposition: form-data; name="socket_id"\r\n\r\n${socketId}\r\n` +
-          `--${boundary}\r\n` +
-          `Content-Disposition: form-data; name="original_client_socket_id"\r\n\r\n${socketId}\r\n` +
-          `--${boundary}\r\n` +
-          `Content-Disposition: form-data; name="fileinfo"\r\n\r\n${JSON.stringify({
-              name: fileName,
-              type: 'text/plain',
-              size: Buffer.byteLength(updatedContent, 'utf8')
-          })}\r\n` +
-          `--${boundary}\r\n` +
-          `Content-Disposition: form-data; name="operation"\r\n\r\n${JSON.stringify({
-              op: 'write',
-              dedupe_name: false,
-              overwrite: true,
-              operation_id: operationId,
-              path: dirName,
-              name: fileName,
-              item_upload_id: 0
-          })}\r\n` +
-          `--${boundary}\r\n` +
-          `Content-Disposition: form-data; name="file"; filename="${fileName}"\r\n` +
-          `Content-Type: text/plain\r\n\r\n${updatedContent}\r\n` +
-          `--${boundary}--\r\n`;
-
-      // Send the upload request
-      const uploadResponse = await fetch(`${API_BASE}/batch`, {
-          method: 'POST',
-          headers: getHeaders(`multipart/form-data; boundary=${boundary}`),
-          body: formData
+      const uploadData = await puter.fs.upload(blob, dirName, {
+        overwrite: true,
+        dedupeName: false,
+        name: fileName
       });
-
-      if (!uploadResponse.ok) {
-          const errorText = await uploadResponse.text();
-          console.log(chalk.red(`Failed to save file. Server response: ${errorText}`));
-          return;
-      }
-
-      const uploadData = await uploadResponse.json();
-      if (uploadData && uploadData.results && uploadData.results.length > 0) {
-          const file = uploadData.results[0];
-          console.log(chalk.green(`File saved: ${file.path}`));
-      } else {
-          console.log(chalk.red('Failed to save file. Invalid response from server.'));
-      }
+      console.log(chalk.green(`File saved: ${uploadData.path}`));
     } catch (error) {
       if (error.status === 130) {
         // This is a SIGINT (Ctrl+C), which is normal for some editors