puter-cli 1.7.3 → 1.8.1

package/CHANGELOG.md

@@ -4,8 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.8.1](https://github.com/HeyPuter/puter-cli/compare/v1.8.0...v1.8.1)
+
+- fix: better version status handling and error resilience [`ab467e8`](https://github.com/HeyPuter/puter-cli/commit/ab467e8e57cb4f82619424b12136724904df0302)
+
+#### [v1.8.0](https://github.com/HeyPuter/puter-cli/compare/v1.7.3...v1.8.0)
+
+> 2 April 2025
+
+- feat(files): add edit command to modify remote files with local editor [`220b07c`](https://github.com/HeyPuter/puter-cli/commit/220b07c79fa9e9ab2e0e668cfbd7e5260c9746a2)
+
 #### [v1.7.3](https://github.com/HeyPuter/puter-cli/compare/v1.7.2...v1.7.3)
 
+> 16 March 2025
+
 - fix: absolute remote path treated as relative in update #10 [`cb716a3`](https://github.com/HeyPuter/puter-cli/commit/cb716a37afdd9f552c53244a3eb63d7a649e244c)
 
 #### [v1.7.2](https://github.com/HeyPuter/puter-cli/compare/v1.7.1...v1.7.2)

package/README.md

@@ -135,6 +135,12 @@ P.S. These commands consider the current directory as the base path for every op
 ```
 P.S. The `--delete` flag removes files in the remote directory that don't exist locally. The `-r` flag enables recursive synchronization of subdirectories.
 
+- **Edit a file**: Edit remote text files using your preferred local text editor.
+```bash
+  puter> edit <file>
+```
+P.S. This command will download the remote file to your local machine, open it in your default editor, and then upload the changes back to the remote instance. It uses `vim` by default, but you can change it by setting the `EDITOR` environment variable.
+
 #### User Information
 ```
 

package/package.json

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

package/src/commands/files.js

@@ -1,18 +1,20 @@
 import fs from 'node:fs';
+import os from 'node:os';
+import { execSync } from 'node:child_process';
 import { glob } from 'glob';
 import path from 'path';
 import { minimatch } from 'minimatch';
 import chalk from 'chalk';
-import ora from 'ora';
 import Conf from 'conf';
 import fetch from 'node-fetch';
 import { API_BASE, BASE_URL, PROJECT_NAME, getHeaders, showDiskSpaceUsage, resolvePath } from '../commons.js';
-import { formatDate, formatDateTime, formatSize } from '../utils.js';
+import { formatDateTime, formatSize, getSystemEditor } from '../utils.js';
 import inquirer from 'inquirer';
 import { getAuthToken, getCurrentDirectory, getCurrentUserName } from './auth.js';
 import { updatePrompt } from './shell.js';
 import crypto from '../crypto.js';
 
+
 const config = new Conf({ projectName: PROJECT_NAME });
 
 
@@ -1379,3 +1381,162 @@ export async function syncDirectory(args = []) {
         console.error(chalk.red(`Error: ${error.message}`));
     }
 }
+
+/**
+ * Edit a remote file using the local system editor
+ * @param {Array} args - The file path to edit
+ * @returns {Promise<void>}
+ */
+export async function editFile(args = []) {
+  if (args.length < 1) {
+    console.log(chalk.red('Usage: edit <file>'));
+    return;
+  }
+
+  const filePath = args[0].startsWith('/') ? args[0] : resolvePath(getCurrentDirectory(), args[0]);
+  console.log(chalk.green(`Fetching file: ${filePath}`));
+
+  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) {
+      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) {
+      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
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'puter-'));
+    const tempFilePath = path.join(tempDir, path.basename(filePath));
+    fs.writeFileSync(tempFilePath, fileContent, 'utf-8');
+
+    // Step 4: Determine the editor to use
+    const editor = getSystemEditor();
+    console.log(chalk.cyan(`Opening file with ${editor}...`));
+    
+    // Step 5: Open the file in the editor using execSync instead of spawn
+    // This will block until the editor is closed, which is better for terminal-based editors
+    try {
+      execSync(`${editor} "${tempFilePath}"`, { 
+        stdio: 'inherit',
+        env: process.env
+      });
+      
+      // Read the updated content after editor closes
+      const updatedContent = fs.readFileSync(tempFilePath, 'utf8');
+      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();
+      if (dfData.used >= dfData.capacity) {
+          console.log(chalk.red('Not enough disk space to upload the file.'));
+          showDiskSpaceUsage(dfData); // Display disk usage info
+          return;
+      }
+
+      // 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
+      });
+
+      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.'));
+      }
+    } catch (error) {
+      if (error.status === 130) {
+        // This is a SIGINT (Ctrl+C), which is normal for some editors
+        console.log(chalk.yellow('Editor closed without saving.'));
+      } else {
+        console.log(chalk.red(`Error during editing: ${error.message}`));
+      }
+    } finally {
+      // Clean up temporary files
+      try {
+        fs.unlinkSync(tempFilePath);
+        fs.rmdirSync(tempDir);
+      } catch (e) {
+        console.error(chalk.dim(`Failed to clean up temporary files: ${e.message}`));
+      }
+    }
+  } catch (error) {
+    console.log(chalk.red(`Error: ${error.message}`));
+  }
+}

package/src/commons.js

@@ -345,16 +345,46 @@ export async function getVersionFromPackage() {
  * Get latest package info from npm registery
  */
 export async function getLatestVersion(packageName) {
+    let currentVersion = 'unknown';
+    let latestVersion = null;
+    let status = 'offline'; // Default status
+
     try {
-      const response = await fetch(`https://registry.npmjs.org/${packageName}/latest`);
-      let data = await response.json();
-      const currentVersion = await getVersionFromPackage();
-      if (data.version !== currentVersion){
-          return `v${currentVersion} (latest: ${data.version})`;
-      }
-      return `v${currentVersion}`;
+        // Attempt to get the current version first
+        currentVersion = await getVersionFromPackage();
+        if (!currentVersion) {
+            currentVersion = 'unknown'; // Fallback if local version fetch fails
+        }
+
+        // Attempt to fetch the latest version from npm
+        try {
+            const response = await fetch(`https://registry.npmjs.org/${packageName}/latest`);
+            if (response.ok) {
+                const data = await response.json();
+                latestVersion = data.version;
+            }
+        } catch (fetchError) {
+            // Ignore fetch errors
+            // console.warn(chalk.yellow(`Could not fetch latest version for ${packageName}: ${fetchError.message}`));
+        }
+
+        // Determine the status based on fetched versions
+        if (latestVersion) {
+            if (currentVersion !== 'unknown' && latestVersion === currentVersion) {
+                status = 'up-to-date';
+            } else if (currentVersion !== 'unknown' && latestVersion !== currentVersion) {
+                status = `latest: ${latestVersion}`;
+            } else {
+                // If currentVersion is unknown but we got latest, show latest
+                status = `latest: ${latestVersion}`;
+            }
+        }
+        // status remains 'offline'...
+
     } catch (error) {
-        console.error(`ERROR: ${error.message}`);
-        return "<Unknown>";
+        // Catch errors from getVersionFromPackage or other unexpected issues
+        console.error(chalk.red(`Error determining version status: ${error.message}`));
+        status = 'error'; // Indicate an error occurred
     }
-  }
+    return `v${currentVersion} (${status})`;
+}

package/src/executor.js

@@ -5,12 +5,12 @@ 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 } from './commands/files.js';
+  downloadFile, copyFile, syncDirectory, editFile } from './commands/files.js';
 import { getUserInfo, getUsageInfo } from './commands/auth.js';
 import { PROJECT_NAME, API_BASE, getHeaders } from './commons.js';
 import inquirer from 'inquirer';
 import { exec } from 'node:child_process';
-import { parseArgs } from './utils.js';
+import { parseArgs, getSystemEditor } from './utils.js';
 import { rl } from './commands/shell.js';
 import { ErrorAPI } from './modules/ErrorModule.js';
 
@@ -144,6 +144,7 @@ const commands = {
   push: uploadFile,
   pull: downloadFile,
   update: syncDirectory,
+  edit: editFile,
   sites: listSites,
   site: infoSite,
   'site:delete': deleteSite,
@@ -327,6 +328,13 @@ function showHelp(command) {
       Sync local directory with remote cloud.
       Example: update /local/path /remote/path
     `,
+    edit: `
+      ${chalk.cyan('edit <file>')}
+      Edit a remote file using your local text editor.
+      Example: edit /path/to/file
+
+      System editor: ${chalk.green(getSystemEditor())}
+    `,
     sites: `
       ${chalk.cyan('sites')}
       List sites and subdomains.

package/src/utils.js

@@ -120,4 +120,16 @@ export function isValidAppUuid (uuid) {
 export function is_valid_uuid4 (uuid) {
   const uuidV4Regex = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
   return uuidV4Regex.test(uuid);
+}
+
+/**
+ * Get system editor
+ * @returns {string} - System editor
+ * @example
+ * getSystemEditor()
+ * // => 'nano'
+ */
+export function getSystemEditor() {
+  return process.env.EDITOR || process.env.VISUAL || 
+  (process.platform === 'win32' ? 'notepad' : 'vi')
 }