hsync-cli 1.1.2 → 1.1.3

package/dist/bin.js

@@ -69670,16 +69670,15 @@ async function scanLocalPath(targetPath, rootDir) {
 function parseRemoteTarget(target) {
   const parts = target.split(":");
   const slug = parts[0];
-  const remotePath = (parts.slice(1).join(":") || "").replace(/^\/+|\/+$/g, "");
-  return { slug, remotePath };
+  const rawPath = parts.slice(1).join(":") || "";
+  const endsWithSlash = rawPath.endsWith("/");
+  const remotePath = rawPath.replace(/^\/+|\/+$/g, "");
+  return { slug, remotePath, endsWithSlash };
 }
 async function push(localPath, remoteTarget, options) {
-  const forceYes = options.yes || false;
   try {
     const config = await loadConfig();
-    const serverUrl = config.serverUrl;
-    const apiKey = config.apiKey;
-    if (!serverUrl || !apiKey) {
+    if (!config.serverUrl || !config.apiKey) {
       console.error(source_default.red("Error: CLI not authenticated. Please run: hsync config set-server <url> && hsync login"));
       process.exit(1);
     }
@@ -69694,22 +69693,28 @@ async function push(localPath, remoteTarget, options) {
     const spinner = ora2("Scanning local files...").start();
     const localFiles = await scanLocalPath(resolvedLocalPath, resolvedLocalPath);
     spinner.text = "Fetching remote file tree...";
-    const remoteClient = new RemoteClient(serverUrl, apiKey);
+    const remoteClient = new RemoteClient(config.serverUrl, config.apiKey);
     const remoteFiles = await remoteClient.getTree(remote.slug, remote.remotePath);
     spinner.stop();
     console.log(source_default.cyan(`Found ${localFiles.length} local files, ${remoteFiles.length} remote files.`));
-    const prompter = new OverwritePrompter(forceYes);
+    let isRemoteDir = !(await fs3.stat(resolvedLocalPath)).isFile() || remote.endsWithSlash;
+    if (!isRemoteDir) {
+      if (remoteFiles.length > 1) {
+        isRemoteDir = true;
+      } else if (remoteFiles.length === 1 && remoteFiles[0].path !== "") {
+        isRemoteDir = true;
+      }
+    }
+    const prompter = new OverwritePrompter(options.yes || false);
     let pushCount = 0;
     let skipCount = 0;
     for (const localFile of localFiles) {
-      const remoteFile = remoteFiles.find((f) => f.path === localFile.relativePath);
-      const destinationPath = remote.remotePath ? `${remote.remotePath}/${localFile.relativePath}` : localFile.relativePath;
+      const remoteFile = remoteFiles.find((f) => f.path === (isRemoteDir ? localFile.relativePath : ""));
       let shouldUpload = false;
       if (!remoteFile) {
         shouldUpload = true;
       } else if (remoteFile.hash !== localFile.hash) {
-        const confirm = await prompter.shouldOverwrite(localFile.relativePath);
-        if (confirm) {
+        if (await prompter.shouldOverwrite(localFile.relativePath)) {
           shouldUpload = true;
         } else {
           skipCount++;
@@ -69720,7 +69725,7 @@ async function push(localPath, remoteTarget, options) {
       if (shouldUpload) {
         const fileSpinner = ora2(`Pushing ${localFile.relativePath}...`).start();
         try {
-          await remoteClient.uploadFile(remote.slug, destinationPath, localFile.absolutePath);
+          await remoteClient.uploadFile(remote.slug, isRemoteDir ? remote.remotePath ? `${remote.remotePath}/${localFile.relativePath}` : localFile.relativePath : remote.remotePath, localFile.absolutePath);
           fileSpinner.succeed(source_default.green(`Pushed ${localFile.relativePath}`));
           pushCount++;
         } catch (uploadErr) {
@@ -69736,38 +69741,65 @@ async function push(localPath, remoteTarget, options) {
   }
 }
 async function pull(remoteTarget, localPath, options) {
-  const forceYes = options.yes || false;
   try {
     const config = await loadConfig();
-    const serverUrl = config.serverUrl;
-    const apiKey = config.apiKey;
-    if (!serverUrl || !apiKey) {
+    if (!config.serverUrl || !config.apiKey) {
       console.error(source_default.red("Error: CLI not authenticated. Please run: hsync config set-server <url> && hsync login"));
       process.exit(1);
     }
     const remote = parseRemoteTarget(remoteTarget);
     const resolvedLocalPath = path4.resolve(localPath);
     const spinner = ora2("Fetching remote file tree...").start();
-    const remoteClient = new RemoteClient(serverUrl, apiKey);
+    const remoteClient = new RemoteClient(config.serverUrl, config.apiKey);
     const remoteFiles = await remoteClient.getTree(remote.slug, remote.remotePath);
     spinner.text = "Scanning local files...";
-    await fs3.mkdir(resolvedLocalPath, { recursive: true });
-    const localFiles = await scanLocalPath(resolvedLocalPath, resolvedLocalPath);
+    const isRemoteFile = remoteFiles.length === 1 && remoteFiles[0].path === "";
+    let isLocalDir = false;
+    try {
+      const localStat = await fs3.stat(resolvedLocalPath);
+      isLocalDir = localStat.isDirectory();
+    } catch {
+      isLocalDir = localPath.endsWith("/") || localPath.endsWith(path4.sep);
+    }
+    if (isRemoteFile && !isLocalDir) {
+      await fs3.mkdir(path4.dirname(resolvedLocalPath), { recursive: true });
+    } else {
+      await fs3.mkdir(resolvedLocalPath, { recursive: true });
+    }
+    let localFiles = [];
+    try {
+      localFiles = await scanLocalPath(resolvedLocalPath, resolvedLocalPath);
+    } catch (err) {
+      if (err.code !== "ENOENT") {
+        throw err;
+      }
+    }
     spinner.stop();
     console.log(source_default.cyan(`Found ${remoteFiles.length} remote files, ${localFiles.length} local files.`));
-    const prompter = new OverwritePrompter(forceYes);
+    const prompter = new OverwritePrompter(options.yes || false);
     let pullCount = 0;
     let skipCount = 0;
     for (const remoteFile of remoteFiles) {
-      const localFile = localFiles.find((f) => f.relativePath === remoteFile.path);
-      const localDestPath = path4.join(resolvedLocalPath, remoteFile.path);
-      const sourcePath = remote.remotePath ? `${remote.remotePath}/${remoteFile.path}` : remoteFile.path;
+      let localDestPath;
+      let localFile;
+      if (isRemoteFile) {
+        if (isLocalDir) {
+          localDestPath = path4.join(resolvedLocalPath, path4.basename(remote.remotePath));
+          localFile = localFiles.find((f) => f.relativePath === path4.basename(remote.remotePath));
+        } else {
+          localDestPath = resolvedLocalPath;
+          localFile = localFiles.length > 0 ? localFiles[0] : undefined;
+        }
+      } else {
+        localDestPath = path4.join(resolvedLocalPath, remoteFile.path);
+        localFile = localFiles.find((f) => f.relativePath === remoteFile.path);
+      }
       let shouldDownload = false;
       if (!localFile) {
         shouldDownload = true;
       } else if (localFile.hash !== remoteFile.hash) {
-        const confirm = await prompter.shouldOverwrite(remoteFile.path);
-        if (confirm) {
+        const promptPath = isRemoteFile ? remote.remotePath || path4.basename(localDestPath) : remoteFile.path;
+        if (await prompter.shouldOverwrite(promptPath)) {
           shouldDownload = true;
         } else {
           skipCount++;
@@ -69776,13 +69808,14 @@ async function pull(remoteTarget, localPath, options) {
         skipCount++;
       }
       if (shouldDownload) {
-        const fileSpinner = ora2(`Pulling ${remoteFile.path}...`).start();
+        const logPath = isRemoteFile ? remote.remotePath || path4.basename(localDestPath) : remoteFile.path;
+        const fileSpinner = ora2(`Pulling ${logPath}...`).start();
         try {
-          await remoteClient.downloadFile(remote.slug, sourcePath, localDestPath);
-          fileSpinner.succeed(source_default.green(`Pulled ${remoteFile.path}`));
+          await remoteClient.downloadFile(remote.slug, isRemoteFile ? remote.remotePath : remote.remotePath ? `${remote.remotePath}/${remoteFile.path}` : remoteFile.path, localDestPath);
+          fileSpinner.succeed(source_default.green(`Pulled ${logPath}`));
           pullCount++;
         } catch (downloadErr) {
-          fileSpinner.fail(source_default.red(`Failed to pull ${remoteFile.path}: ${downloadErr.message}`));
+          fileSpinner.fail(source_default.red(`Failed to pull ${logPath}: ${downloadErr.message}`));
         }
       }
     }
@@ -71190,7 +71223,7 @@ async function editSyncJob2(name, options) {
 }
 
 // src/commands/ui.ts
-var __dirname = "/media/hyper2/HYPER/projects/node/hmd/file-sync-v2/packages/cli/src/commands";
+var __dirname = "/home/hamid/packages/node/hmd/file-sync/packages/cli/src/commands";
 function openBrowser(url2) {
   const start = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   exec(`${start} ${url2}`).unref();
@@ -71415,7 +71448,7 @@ Press Ctrl+C to stop the server...
 // package.json
 var package_default = {
   name: "hsync-cli",
-  version: "1.1.2",
+  version: "1.1.3",
   description: "hsync CLI for file sync operations",
   bin: {
     hsync: "./dist/bin.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsync-cli",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "hsync CLI for file sync operations",
   "bin": {
     "hsync": "./dist/bin.js"