@eliware/vyops 1.0.11 → 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.11",
+    "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",
@@ -48,4 +48,4 @@
         "LICENSE",
         "RELEASE_NOTES.md"
     ]
-}
+}

package/src/deploy.mjs

@@ -67,19 +67,19 @@ async function installScripts(client, config, log, runId) {
     await exec(client, `sudo rm -f -- ${names.map(name => JSON.stringify(`${installDir}/${name}`)).join(' ')}; sudo cp -a ${JSON.stringify(`${backupDir}/.`)} ${JSON.stringify(`${installDir}/`)} 2>/dev/null || true; rm -rf -- ${JSON.stringify(remoteDir)} ${JSON.stringify(backupDir)}`).catch(cleanupError => log(`script rollback failed: ${cleanupError.message}`));
     throw error;
   }
-  return async committed => {
+  return async (committed, activeClient) => {
     if (committed) {
-      await exec(client, `sudo rm -rf -- ${JSON.stringify(backupDir)}; rm -rf -- ${JSON.stringify(remoteDir)}`).catch(error => log(`hook cleanup failed: ${error.message}`));
+      await exec(activeClient, `sudo rm -rf -- ${JSON.stringify(backupDir)}; rm -rf -- ${JSON.stringify(remoteDir)}`).catch(error => log(`hook cleanup failed: ${error.message}`));
       return;
     }
-    await exec(client, `sudo rm -f -- ${names.map(name => JSON.stringify(`${installDir}/${name}`)).join(' ')}; sudo cp -a ${JSON.stringify(`${backupDir}/.`)} ${JSON.stringify(`${installDir}/`)} 2>/dev/null || true; rm -rf -- ${JSON.stringify(remoteDir)} ${JSON.stringify(backupDir)}`).catch(error => log(`script rollback failed: ${error.message}`));
+    await exec(activeClient, `sudo rm -f -- ${names.map(name => JSON.stringify(`${installDir}/${name}`)).join(' ')}; sudo cp -a ${JSON.stringify(`${backupDir}/.`)} ${JSON.stringify(`${installDir}/`)} 2>/dev/null || true; rm -rf -- ${JSON.stringify(remoteDir)} ${JSON.stringify(backupDir)}`).catch(error => log(`script rollback failed: ${error.message}`));
   };
 }
 
 export async function deploy({ target, config, password }) {
   const debugLog = message => log.debug(`[vyops] ${message}`);
   debugLog(`connecting: ${target}`);
-  const client = password === undefined ? await connect(target) : await connect(target, { password });
+  let client = password === undefined ? await connect(target) : await connect(target, { password });
   debugLog('SSH connected');
   let finalizeHooks;
   let hooksFinalized = false;
@@ -91,6 +91,9 @@ export async function deploy({ target, config, password }) {
     await upload(client, config, remote);
     debugLog(`upload complete: ${remote}`);
     finalizeHooks = await installScripts(client, config, debugLog, runId);
+    debugLog('reconnecting before interactive deployment sequence');
+    await close(client);
+    client = password === undefined ? await connect(target) : await connect(target, { password });
     debugLog('starting interactive deployment sequence');
     const output = await interactive(client, [
       'configure',
@@ -99,7 +102,7 @@ export async function deploy({ target, config, password }) {
       "printf '%s\\n' '--- compare ---'",
       'compare',
       "printf '%s\\n' '--- end compare ---'",
-      { command: 'commit-confirm 5', reject: /(?:commit failed|commit aborted|cannot commit|configuration (?:commit )?failed|invalid configuration|error|invalid)/i },
+      { command: 'commit-confirm 5', reject: /(?:commit failed|commit aborted|cannot commit|configuration (?:commit )?failed|invalid configuration)/i },
       { command: 'confirm', reject: /(?:confirm failed|error|invalid)/i },
       { command: 'save', reject: /(?:save failed|error|invalid)/i },
       'exit',
@@ -109,15 +112,18 @@ 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) {
       hooksFinalized = true;
-      await finalizeHooks(true);
+      await finalizeHooks(true, client);
     }
     return 0;
   } catch (error) {
-    if (finalizeHooks && !hooksFinalized && !deploymentCommitted) await finalizeHooks(false);
+    if (finalizeHooks && !hooksFinalized && !deploymentCommitted) await finalizeHooks(false, client);
     throw error;
   } finally {
     debugLog('cleaning up remote file');

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();
       });
     });