puter-cli 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -4,8 +4,15 @@ 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.7.1](https://github.com/HeyPuter/puter-cli/compare/v1.7.0...v1.7.1)
+
+- fix: update command [`38ca9e8`](https://github.com/HeyPuter/puter-cli/commit/38ca9e824642cbf8b1ffdb0d2a6e5426f84c7371)
+- docs: update README [`6e658f6`](https://github.com/HeyPuter/puter-cli/commit/6e658f6a117ee1ba206768905d53fb61c78e136d)
+
 #### [v1.7.0](https://github.com/HeyPuter/puter-cli/compare/v1.6.1...v1.7.0)
 
+> 16 February 2025
+
 - feat: save auth token when login [`55b32b7`](https://github.com/HeyPuter/puter-cli/commit/55b32b7feca050902f4470f06af38f81d3299e6a)
 - fix: create app from host shell [`30e5028`](https://github.com/HeyPuter/puter-cli/commit/30e5028d831d26349e3ae2fc8e34921693b5702c)
 

package/README.md

@@ -63,8 +63,10 @@ Then just follow the prompts, this command doesn't require you to log in.
 #### Authentication
 - **Login**: Log in to your Puter account.
 ```bash
-  puter login
+  puter login [--save]
 ```
+P.S. You can add `--save` to save your authentication `token` to `.env` file as `PUTER_API_KEY` variable.
+
 - **Logout**: Log out of your Puter account.
 ```bash
   puter logout
@@ -127,6 +129,19 @@ Think of it as `git [push|pull]` commands, they're basically simplified equivale
 ```
 P.S. These commands consider the current directory as the base path for every operation, basic wildcards are supported: e.g. `push myapp/*.html`.
 
+- **Synchronize Files**: Bidirectional synchronization between local and remote directories.
+```bash
+  puter> update <local_directory> <remote_directory> [--delete] [-r]
+```
+P.S. The `--delete` flag removes files in the remote directory that don't exist locally. The `-r` flag enables recursive synchronization of subdirectories.
+
+#### User Information
+```
+
+The addition describes the `update` command which allows for bidirectional synchronization between local and remote directories, including the optional flags for deleting files and recursive synchronization.
+---
+
+
 #### User Information
 - **Get User Info**: Display user information.
 ```bash
@@ -157,8 +172,14 @@ P.S. Please check the help command `help apps` for more details about any argume
 ```bash
   puter> app:create <name> [<directory>] [--description="My App Description"] [--url=<url>]
 ```
+- This command works also from your system's terminal:
+```bash
+  $> puter app:create <name> [<directory>] [--description="My App Description"] [--url=<url>]
+```
+
 P.S. By default a new `index.html` with basic content will be created, but you can set a directory when you create a new application as follows: `app:create nameOfApp ./appDir`, so all files will be copied to the `AppData` directory, you can then update your app using `app:update <name> <remote_dir>`. This command will attempt to create a subdomain with a random `uid` prefixed with the name of the app.
 
+
 - **Update Application**: Update an application.
 ```bash
   puter> app:update <name> <remote_dir>

package/package.json

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

package/src/commands/files.js

@@ -1075,28 +1075,34 @@ export async function copyFile(args = []) {
 /**
  * List all files in a local directory.
  * @param {string} localDir - The local directory path.
+ * @param {boolean} recursive - Whether to recursively list files in subdirectories
  * @returns {Array} - Array of local file objects.
  */
-function listLocalFiles(localDir) {
+function listLocalFiles(localDir, recursive = false) {
     const files = [];
-    const walkDir = (dir) => {
+    const walkDir = (dir, baseDir) => {
+
         const entries = fs.readdirSync(dir, { withFileTypes: true });
         for (const entry of entries) {
             const fullPath = path.join(dir, entry.name);
+            const relativePath = path.relative(baseDir, fullPath);
             if (entry.isDirectory()) {
-                walkDir(fullPath);
+                if (recursive) {
+                    walkDir(fullPath, baseDir); // Recursively traverse directories if flag is set
+                }
             } else {
                 files.push({
-                    relativePath: path.relative(localDir, fullPath),
+                    relativePath: relativePath,
                     localPath: fullPath,
                     size: fs.statSync(fullPath).size,
                     modified: fs.statSync(fullPath).mtime.getTime()
                 });
             }
         }
+
     };
 
-    walkDir(localDir);
+    walkDir(localDir, localDir);
     return files;
 }
 
@@ -1190,12 +1196,40 @@ async function resolveLocalDirectory(localPath) {
     return absolutePath;
 }
 
+
+/**
+ * Ensure a remote directory exists, creating it if necessary
+ * @param {string} remotePath - The remote directory path
+ */
+async function ensureRemoteDirectoryExists(remotePath) {
+    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
+                })
+            });
+        }
+    } catch (error) {
+        console.error(chalk.red(`Failed to create remote directory: ${remotePath}`));
+        throw error;
+    }
+}
+
 /**
  * Synchronize a local directory with a remote directory on Puter.
- * @param {string[]} args - Command-line arguments (e.g., [localDir, remoteDir]).
+ * @param {string[]} args - Command-line arguments (e.g., [localDir, remoteDir, --delete, -r]).
  */
 export async function syncDirectory(args = []) {
-    const usageMessage = 'Usage: update <local_directory> <remote_directory> [--delete]';
+    const usageMessage = 'Usage: update <local_directory> <remote_directory> [--delete] [-r]';
     if (args.length < 2) {
         console.log(chalk.red(usageMessage));
         return;
@@ -1204,10 +1238,12 @@ export async function syncDirectory(args = []) {
     let localDir = '';
     let remoteDir = '';
     let deleteFlag = '';
+    let recursiveFlag = false;
     try {
         localDir = await resolveLocalDirectory(args[0]);
         remoteDir = resolvePath(getCurrentDirectory(), args[1]);
         deleteFlag = args.includes('--delete'); // Whether to delete extra files
+        recursiveFlag = args.includes('-r'); // Whether to recursively process subdirectories
     } catch (error) {
         console.error(chalk.red(error.message));
         console.log(chalk.green(usageMessage));
@@ -1231,14 +1267,17 @@ export async function syncDirectory(args = []) {
         }
 
         // Step 3: List local files
-        const localFiles = listLocalFiles(localDir);
+        const localFiles = listLocalFiles(localDir, recursiveFlag);
 
         // Step 4: Compare local and remote files
         let { toUpload, toDownload, toDelete } = compareFiles(localFiles, remoteFiles, localDir, remoteDir);
+        let filteredToUpload = [...toUpload];
+        let filteredToDownload = [...toDownload];
 
         // Step 5: Handle conflicts (if any)
         const conflicts = findConflicts(toUpload, toDownload);
         if (conflicts.length > 0) {
+
             console.log(chalk.yellow('The following files have conflicts:'));
             conflicts.forEach(file => console.log(chalk.dim(`- ${file}`)));
 
@@ -1256,12 +1295,12 @@ export async function syncDirectory(args = []) {
             ]);
 
             if (resolve === 'local') {
-                toDownload = toDownload.filter(file => !conflicts.includes(file.relativePath));
+                filteredToDownload = filteredToDownload.filter(file => !conflicts.includes(file.relativePath));
             } else if (resolve === 'remote') {
-                toUpload = toUpload.filter(file => !conflicts.includes(file.relativePath));
+                filteredToUpload = filteredToUpload.filter(file => !conflicts.includes(file.relativePath));
             } else {
-                toUpload = toUpload.filter(file => !conflicts.includes(file.relativePath));
-                toDownload = toDownload.filter(file => !conflicts.includes(file.relativePath));
+                filteredToUpload = filteredToUpload.filter(file => !conflicts.includes(file.relativePath));
+                filteredToDownload = filteredToDownload.filter(file => !conflicts.includes(file.relativePath));
             }
         }
 
@@ -1269,18 +1308,30 @@ export async function syncDirectory(args = []) {
         console.log(chalk.green('Starting synchronization...'));
 
         // Upload new/updated files
-        for (const file of toUpload) {
+        for (const file of filteredToUpload) {
             console.log(chalk.cyan(`Uploading "${file.relativePath}"...`));
             const dedupeName = 'false';
             const overwrite = 'true';
-            await uploadFile([file.localPath, remoteDir, dedupeName, overwrite]);
+
+            // Create parent directories if needed
+            const remoteFilePath = path.join(remoteDir, file.relativePath);
+            const remoteFileDir = path.dirname(remoteFilePath);
+            
+            // Ensure remote directory exists
+            await ensureRemoteDirectoryExists(remoteFileDir);
+
+            await uploadFile([file.localPath, remoteFileDir, dedupeName, overwrite]);
         }
 
         // Download new/updated files
-        for (const file of toDownload) {
+        for (const file of filteredToDownload) {
             console.log(chalk.cyan(`Downloading "${file.relativePath}"...`));
             const overwrite = 'true';
-            await downloadFile([file.relativePath, file.localPath, overwrite]);
+            // Create local parent directories if needed
+            const localFilePath = path.join(localDir, file.relativePath);
+            // const localFileDir = path.dirname(localFilePath);
+
+            await downloadFile([file.remotePath, localFilePath, overwrite]);
         }
 
         // Delete extra files (if --delete flag is set)

package/src/commons.js

@@ -106,7 +106,7 @@ export function showDiskSpaceUsage(data) {
   console.log(chalk.cyan(`Usage Percentage: `) + chalk.white(`${usagePercentage.toFixed(2)}%`));
   console.log(chalk.dim('----------------------------------------'));
 }
- 
+
 /**
  * Resolve a relative path to an absolute path
  * @param {string} currentPath - The current working directory

package/src/executor.js

@@ -323,7 +323,7 @@ function showHelp(command) {
       Example: pull /path/to/file
     `,
     update: `
-      ${chalk.cyan('update <src> <dest>')}
+      ${chalk.cyan('update <src> <dest> [--delete] [-r]')}
       Sync local directory with remote cloud.
       Example: update /local/path /remote/path
     `,