@eliware/vyops 1.0.12 → 1.0.13

package/RELEASE_NOTES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## Unreleased
+
+- Close SFTP channels after uploads and downloads to prevent SSH channel exhaustion during script synchronization.
+- Reconnect after interactive deployments before downloading live configuration and cleaning up remote files.
+- Make Git path handling and the `test:gaps` coverage command portable across Windows and Linux.
+- Expand Windows and real-VyOS integration coverage to maintain 100% statements, branches, functions, and lines coverage.
+
 ## 1.0.11
 
 - Fix VyOS 1.5 `commit-confirm` handling by answering confirmation prompts

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "@eliware/vyops",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "description": "Deploy native VyOS configuration files over SSH.",
     "main": "vyops.mjs",
     "scripts": {
         "lint": "npx oxlint .",
         "test": "npx --node-options=\"--experimental-vm-modules --no-warnings\" jest --detectOpenHandles --silent --coverage",
         "deploy": "./vyops.mjs",
-        "test:gaps": "npm test 2>&1 | grep '|' | grep -vF '|     100 |      100 |     100 |     100 |'",
+        "test:gaps": "node scripts/test-gaps.mjs",
         "pack": "npm pack --dry-run",
         "validate:package": "npm pack --dry-run --json | node scripts/validate-package.mjs",
-        "audit": "npm audit --omit=dev --audit-level=moderate"
+        "audit": "node scripts/audit.mjs"
     },
     "keywords": [
         "vyos",

package/src/deploy.mjs

@@ -112,6 +112,9 @@ export async function deploy({ target, config, password }) {
     deploymentCommitted = true;
     const compare = extractCompare(output);
     if (compare) log.info(compare);
+    debugLog('reconnecting after interactive deployment sequence');
+    await close(client);
+    client = password === undefined ? await connect(target) : await connect(target, { password });
     debugLog(`syncing live config: /config/config.boot -> ${config}`);
     await download(client, '/config/config.boot', config);
     if (finalizeHooks) {

package/src/git.mjs

@@ -72,7 +72,7 @@ async function repositoryRoot(config) {
 export async function shouldSkip(config) {
   const repo = await repositoryRoot(config);
   if (!repo) return false;
-  const relative = config.startsWith(`${repo}/`) ? config.slice(repo.length + 1) : config;
+  const relative = config.startsWith(repo) ? config.slice(repo.length).replace(/^[/\\]/, '') : config;
   const { stdout: status } = await git(['status', '--porcelain', '--', relative], repo);
   if (status.trim()) return false;
   const { stdout: subject } = await git(['log', '-1', '--format=%s'], repo);
@@ -83,7 +83,7 @@ export async function pushBack(config, { force = false } = {}) {
   const repo = await repositoryRoot(config);
   if (!repo) return false;
   return withRepositoryLock(repo, async () => {
-    const relative = config.startsWith(`${repo}/`) ? config.slice(repo.length + 1) : config;
+    const relative = config.startsWith(repo) ? config.slice(repo.length).replace(/^[/\\]/, '') : config;
     const { stdout: diff } = await git(['diff', 'HEAD', '--', relative], repo);
     if (!diff) return false;
     await git(['add', '--', relative], repo);

package/src/ssh.mjs

@@ -122,6 +122,7 @@ export async function upload(client, local, remote, mode = 0o600) {
       if (error) { clearTimeout(timer); return reject(error); }
       sftp.writeFile(remote, data, { mode }, error2 => {
         clearTimeout(timer);
+        sftp.end?.();
         return error2 ? reject(error2) : resolve();
       });
     });
@@ -136,6 +137,7 @@ export function download(client, remote, local) {
       if (error) { clearTimeout(timer); return reject(error); }
       sftp.fastGet(remote, local, error2 => {
         clearTimeout(timer);
+        sftp.end?.();
         return error2 ? reject(error2) : resolve();
       });
     });