sftp-push-sync 1.0.20 → 2.0.0

package/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+## [2.0.0] - 2025-11-18
+
+### Breaking
+
+- CLI flags renamed:
+  - `--upload-list` → `--sidecar-upload`
+  - `--download-list` → `--sidecar-download`
+- Configuration per connection restructured:
+  - `localRoot` / `remoteRoot` now under `sync`
+  - `sidecar` block for sidecar uploads/downloads
+
+### Added
+
+- Separate `sidecar.localRoot` / `sidecar.remoteRoot` für Upload-/Download-Listen.
+
+---

package/README.md

@@ -23,6 +23,12 @@ Features:
 
 The file `sftp-push-sync.mjs` is pure JavaScript (ESM), not TypeScript. Node.js can execute it directly as long as "type": "module" is specified in package.json or the file has the extension .mjs.
 
+## Breaking changes in 2.0.0
+
+- The flags `--upload-list` / `--download-list` have been replaced by
+  `--sidecar-upload` / `--sidecar-download`.
+- The settings for sidecars are now located in the `sidecar` block of the connection.
+
 ## Install
 
 ```bash
@@ -47,20 +53,36 @@ Create a `sync.config.json` in the root folder of your project:
       "port": 23,
       "user": "ftpuser",
       "password": "mypassword",
-      "remoteRoot": "/folder/",
-      "localRoot": "public",
       "syncCache": ".sync-cache.prod.json",
-      "worker": 3
+      "worker": 3,
+      "sync": {
+        "localRoot": "public",
+        "remoteRoot": "/folder/"
+      },
+      "sidecar": {
+        "localRoot": "sidecar-local",
+        "remoteRoot": "/sidecar-remote/",
+        "uploadList": [],
+        "downloadList": []
+      }
     },
     "staging": {
       "host": "ftpserver02",
       "port": 22,
       "user": "ftp_user",
       "password": "total_secret",
-      "remoteRoot": "/web/my-page/",
-      "localRoot": "public",
       "syncCache": ".sync-cache.staging.json",
-      "worker": 1
+      "worker": 1,
+      "sync": {
+        "localRoot": "public",
+        "remoteRoot": "/web/my-page/"
+      },
+      "sidecar": {
+        "localRoot": "sidecar-local",
+        "remoteRoot": "/sidecar-remote/",
+        "uploadList": [],
+        "downloadList": []
+      }
     }
   },
   "include": [],
@@ -72,9 +94,7 @@ Create a `sync.config.json` in the root folder of your project:
     "analyzeChunk": 1
   },
   "logLevel": "normal",
-  "logFile": ".sftp-push-sync.{target}.log",
-  "uploadList": [],
-  "downloadList": ["download-counter.json"]
+  "logFile": ".sftp-push-sync.{target}.log"
 }
 ```
 
@@ -84,16 +104,18 @@ Create a `sync.config.json` in the root folder of your project:
 # Normal synchronisation
 node bin/sftp-push-sync.mjs staging
 
-# Consider normal synchronisation + upload list
-node bin/sftp-push-sync.mjs staging --upload-list
+# Normal synchronisation + sidecar upload list
+node bin/sftp-push-sync.mjs staging --sidecar-upload
+
+# Normal synchronisation + sidecar download list
+node bin/sftp-push-sync.mjs staging --sidecar-download
 
-# Only lists, no standard synchronisation
-node bin/sftp-push-sync.mjs staging --skip-sync --upload-list
-node bin/sftp-push-sync.mjs staging --skip-sync --download-list
-node bin/sftp-push-sync.mjs staging --skip-sync --upload-list --download-list
+# Only sidecar lists, no standard synchronisation
+node bin/sftp-push-sync.mjs staging --skip-sync --sidecar-upload
+node bin/sftp-push-sync.mjs staging --skip-sync --sidecar-download
 
 # (optional) only run lists dry
-node bin/sftp-push-sync.mjs staging --skip-sync --upload-list --dry-run
+node bin/sftp-push-sync.mjs staging --skip-sync --sidecar-upload --dry-run
 ```
 
 - Can be conveniently started via the scripts in `package.json`:
@@ -128,30 +150,28 @@ The dry run is a great way to compare files and fill the cache.
 
 A list of files that are excluded from the sync comparison and can be downloaded or uploaded separately.
 
-- `uploadList`
-  - Relative to localRoot "downloads.json"
-  - or with subfolders: "data/downloads.json"
-- `downloadList`
-  - Relative to remoteRoot "download-counter.json"
-  - or e.g. "logs/download-counter.json"
+- `sidecar.uploadList`
+  - Relative to sidecar.localRoot, e.g. "downloads.json" or "data/downloads.json"
+- `sidecar.downloadList`
+  - Relative to sidecar.remoteRoot, e.g. "download-counter.json" or "logs/download-counter.json"
 
 ```bash
 # normal synchronisation
 sftp-push-sync staging
 
-# Normal synchronisation + explicitly transfer upload list
-sftp-push-sync staging --upload-list
+# Normal synchronisation + explicitly transfer sidecar upload list
+sftp-push-sync staging --sidecar-upload
 
-# just fetch the download list from the server (combined with normal synchronisation)
-sftp-push-sync prod --download-list --dry-run   # view first
-sftp-push-sync prod --download-list             # then do
+# just fetch the sidecar download list from the server (combined with normal synchronisation)
+sftp-push-sync prod --sidecar-download --dry-run   # view first
+sftp-push-sync prod --sidecar-download             # then do
 ```
 
-- The `sidecar` is always executed together with `sync` when you use the `--download-list` or `--upload-list` option.
-- However, with `--skip-sync`, you can exclude the sync process and only process the sidecar:
+- The sidecar is always executed together with sync when using `--sidecar-download` or `--sidecar-upload`.
+- With `--skip-sync`, you can exclude the sync process and only process the sidecar:
 
 ```bash
-sftp-push-sync prod --download-list --skip-sync
+sftp-push-sync prod --sidecar-download --skip-sync
 ```
 
 ### Logging Progress

package/bin/sftp-push-sync.mjs

@@ -63,8 +63,8 @@ const tab_b = () => " ".repeat(6);
 const args = process.argv.slice(2);
 const TARGET = args[0];
 const DRY_RUN = args.includes("--dry-run");
-const RUN_UPLOAD_LIST = args.includes("--upload-list");
-const RUN_DOWNLOAD_LIST = args.includes("--download-list");
+const RUN_UPLOAD_LIST = args.includes("--sidecar-upload");
+const RUN_DOWNLOAD_LIST = args.includes("--sidecar-download");
 const SKIP_SYNC = args.includes("--skip-sync");
 
 // logLevel override via CLI (optional)
@@ -81,7 +81,7 @@ if (!TARGET) {
 // Wenn jemand --skip-sync ohne Listen benutzt → sinnlos, also abbrechen
 if (SKIP_SYNC && !RUN_UPLOAD_LIST && !RUN_DOWNLOAD_LIST) {
   console.error(
-    pc.red("❌ --skip-sync requires at least --upload-list or --download-list.")
+    pc.red("❌ --skip-sync requires at least --sidecar-upload or --sidecar-download.")
   );
   process.exit(1);
 }
@@ -205,13 +205,31 @@ if (!TARGET_CONFIG) {
   process.exit(1);
 }
 
+const SYNC_CFG = TARGET_CONFIG.sync ?? TARGET_CONFIG;
+const SIDECAR_CFG = TARGET_CONFIG.sidecar ?? {};
+
+if (!SYNC_CFG.localRoot || !SYNC_CFG.remoteRoot) {
+  console.error(
+    pc.red(
+      `❌ Connection '${TARGET}' is missing sync.localRoot or sync.remoteRoot.`
+    )
+  );
+  process.exit(1);
+}
+
 const CONNECTION = {
   host: TARGET_CONFIG.host,
   port: TARGET_CONFIG.port ?? 22,
   user: TARGET_CONFIG.user,
   password: TARGET_CONFIG.password,
-  localRoot: path.resolve(TARGET_CONFIG.localRoot),
-  remoteRoot: TARGET_CONFIG.remoteRoot,
+  // Main sync roots
+  localRoot: path.resolve(SYNC_CFG.localRoot),
+  remoteRoot: SYNC_CFG.remoteRoot,
+  // Sidecar roots (for uploadList/downloadList)
+  sidecarLocalRoot: path.resolve(
+    SIDECAR_CFG.localRoot ?? SYNC_CFG.localRoot
+  ),
+  sidecarRemoteRoot: SIDECAR_CFG.remoteRoot ?? SYNC_CFG.remoteRoot,
   workers: TARGET_CONFIG.worker ?? 2,
 };
 
@@ -274,7 +292,7 @@ const MEDIA_EXT = CONFIG_RAW.mediaExtensions ?? [
   ".pdf",
 ];
 
-// Special: Lists for targeted uploads/downloads
+// Special: Lists for targeted uploads/downloads (per-connection sidecar)
 function normalizeList(list) {
   if (!Array.isArray(list)) return [];
   return list.flatMap((item) =>
@@ -287,8 +305,9 @@ function normalizeList(list) {
   );
 }
 
-const UPLOAD_LIST = normalizeList(CONFIG_RAW.uploadList ?? []);
-const DOWNLOAD_LIST = normalizeList(CONFIG_RAW.downloadList ?? []);
+// Lists from sidecar config (relative to sidecar.localRoot / sidecar.remoteRoot)
+const UPLOAD_LIST = normalizeList(SIDECAR_CFG.uploadList ?? []);
+const DOWNLOAD_LIST = normalizeList(SIDECAR_CFG.downloadList ?? []);
 
 // Effektive Exclude-Liste: explizites exclude + Upload/Download-Listen
 // → diese Dateien werden im „normalen“ Sync nicht angerührt,
@@ -775,12 +794,12 @@ function describeSftpError(err) {
 // ---------------------------------------------------------------------------
 
 async function collectUploadTargets() {
-  const all = await walkLocalPlain(CONNECTION.localRoot);
+  const all = await walkLocalPlain(CONNECTION.sidecarLocalRoot);
   const results = [];
 
   for (const [rel, meta] of all.entries()) {
     if (matchesAny(UPLOAD_LIST, rel)) {
-      const remotePath = path.posix.join(CONNECTION.remoteRoot, rel);
+      const remotePath = path.posix.join(CONNECTION.sidecarRemoteRoot, rel);
       results.push({
         rel,
         localPath: meta.localPath,
@@ -793,12 +812,12 @@ async function collectUploadTargets() {
 }
 
 async function collectDownloadTargets(sftp) {
-  const all = await walkRemotePlain(sftp, CONNECTION.remoteRoot);
+  const all = await walkRemotePlain(sftp, CONNECTION.sidecarRemoteRoot);
   const results = [];
 
   for (const [rel, meta] of all.entries()) {
     if (matchesAny(DOWNLOAD_LIST, rel)) {
-      const localPath = path.join(CONNECTION.localRoot, rel);
+      const localPath = path.join(CONNECTION.sidecarLocalRoot, rel);
       results.push({
         rel,
         remotePath: meta.remotePath,
@@ -813,6 +832,20 @@ async function collectDownloadTargets(sftp) {
 async function performBypassOnly(sftp) {
   log("");
   log(pc.bold(pc.cyan("🚀 Bypass-Only Mode (skip-sync)")));
+  log(
+    `${tab_a()}Sidecar Local: ${pc.green(CONNECTION.sidecarLocalRoot)}`
+  );
+  log(
+    `${tab_a()}Sidecar Remote: ${pc.green(CONNECTION.sidecarRemoteRoot)}`
+  );
+
+  if (RUN_UPLOAD_LIST && !fs.existsSync(CONNECTION.sidecarLocalRoot)) {
+    elog(
+      pc.red("❌ Sidecar local root does not exist:"),
+      CONNECTION.sidecarLocalRoot
+    );
+    process.exit(1);
+  }
 
   if (RUN_UPLOAD_LIST) {
     log("");
@@ -902,6 +935,14 @@ async function main() {
   );
   log(`${tab_a()}Local: ${pc.green(CONNECTION.localRoot)}`);
   log(`${tab_a()}Remote: ${pc.green(CONNECTION.remoteRoot)}`);
+  if (RUN_UPLOAD_LIST || RUN_DOWNLOAD_LIST || SKIP_SYNC) {
+    log(
+      `${tab_a()}Sidecar Local: ${pc.green(CONNECTION.sidecarLocalRoot)}`
+    );
+    log(
+      `${tab_a()}Sidecar Remote: ${pc.green(CONNECTION.sidecarRemoteRoot)}`
+    );
+  }
   if (DRY_RUN) log(pc.yellow(`${tab_a()}Mode: DRY-RUN (no changes)`));
   if (SKIP_SYNC) log(pc.yellow(`${tab_a()}Mode: SKIP-SYNC (bypass only)`));
   if (RUN_UPLOAD_LIST || RUN_DOWNLOAD_LIST) {
@@ -937,7 +978,7 @@ async function main() {
     connected = true;
     log(pc.green(`${tab_a()}✔ Connected to SFTP.`));
 
-    if (!fs.existsSync(CONNECTION.localRoot)) {
+    if (!SKIP_SYNC && !fs.existsSync(CONNECTION.localRoot)) {
       console.error(
         pc.red("❌ Local root does not exist:"),
         CONNECTION.localRoot

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sftp-push-sync",
-  "version": "1.0.20",
+  "version": "2.0.0",
   "description": "SFTP sync tool for Hugo projects (local to remote, with hash cache)",
   "type": "module",
   "bin": {
@@ -10,7 +10,9 @@
     "release:patch": "npm run build:noop && npm version patch && git push && git push --tags && npm publish --access public",
     "release:minor": "npm run build:noop && npm version minor && git push && git push --tags && npm publish --access public",
     "release:major": "npm run build:noop && npm version major && git push && git push --tags && npm publish --access public",
-    "build:noop": "echo \"nothing to build\""
+    "build:noop": "echo \"nothing to build\"",
+    "ncu-me": "ncu -i --format group",
+    "tree": "tree -a -L 3 ./ > directory structure.txt"
   },
   "keywords": [
     "hugo",
@@ -21,9 +23,9 @@
   "author": "Carsten Nichte",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "ssh2-sftp-client": "^10.0.0",
-    "minimatch": "^9.0.3",
-    "diff": "^5.2.0",
-    "picocolors": "^1.0.0"
+    "ssh2-sftp-client": "^12.0.1",
+    "minimatch": "^10.1.1",
+    "diff": "^8.0.2",
+    "picocolors": "^1.1.1"
   }
 }