@automattic/vip 4.0.7 → 4.0.9

package/dist/bin/vip-wp.js

@@ -20,6 +20,7 @@ var _proxyAgent = require("../lib/http/proxy-agent");
 var _token = _interopRequireDefault(require("../lib/token"));
 var _tracker = require("../lib/tracker");
 var _helpers = require("../lib/wp/helpers");
+var _readline2 = require("../lib/wp/readline");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const debug = (0, _debug.default)('@automattic/vip:wp');
@@ -107,8 +108,8 @@ const bindStreamEvents = ({
       subShellRl.close();
       process.exit();
     }
-    subShellRl.resume();
-    subShellRl.prompt();
+    (0, _readline2.safeResume)(subShellRl);
+    (0, _readline2.safePrompt)(subShellRl);
   });
 };
 const getTokenForCommand = async (appId, envId, command) => {
@@ -233,7 +234,7 @@ const bindReconnectEvents = ({
     });
 
     // Resume readline interface
-    subShellRl.resume();
+    (0, _readline2.safeResume)(subShellRl);
   });
   currentJob.socket.on('retry', async () => {
     debug('socket: retry');
@@ -391,6 +392,7 @@ const examples = [{
   const commandState = (0, _helpers.initState)();
   let seenWP = false;
   const subShellRl = _readline.default.createInterface(subShellSettings);
+  (0, _readline2.trackReadline)(subShellRl);
   subShellRl.on('line', async line => {
     if (commandRunning) {
       return;
@@ -398,7 +400,7 @@ const examples = [{
 
     // Handle plain return / newline
     if (!line) {
-      subShellRl.prompt();
+      (0, _readline2.safePrompt)(subShellRl);
       return;
     }
 
@@ -411,7 +413,7 @@ const examples = [{
     if (userCmdCancelled) {
       seenWP = false;
       (0, _helpers.resetState)(commandState);
-      subShellRl.prompt();
+      (0, _readline2.safePrompt)(subShellRl);
       return;
     }
     if (!seenWP && line.trimStart().startsWith('wp ')) {
@@ -426,10 +428,10 @@ const examples = [{
     } else {
       (0, _helpers.resetState)(commandState);
       console.log(_chalk.default.red('Error:'), 'invalid command, please pass a valid WP-CLI command.');
-      subShellRl.prompt();
+      (0, _readline2.safePrompt)(subShellRl);
       return;
     }
-    subShellRl.pause();
+    (0, _readline2.safePause)(subShellRl);
     let result;
     const wpCliCmd = commandState.command.replace(/^wp\s+/, '');
     seenWP = false;
@@ -450,7 +452,7 @@ const examples = [{
         subShellRl.close();
         process.exit(1);
       }
-      subShellRl.prompt();
+      (0, _readline2.safePrompt)(subShellRl);
       return;
     }
     const {
@@ -522,9 +524,9 @@ const examples = [{
   });
   if (!isSubShell) {
     mutableStdout.muted = true;
-    subShellRl.write(`wp ${cmd}\n`);
+    (0, _readline2.safeWrite)(subShellRl, `wp ${cmd}\n`);
     mutableStdout.muted = false;
     return;
   }
-  subShellRl.prompt();
+  (0, _readline2.safePrompt)(subShellRl);
 });

package/dist/lib/client-file-uploader.js

@@ -44,6 +44,43 @@ function parseEtagHeader(etag) {
   return normalizedEtag.replace(/^"(.*)"$/u, '$1');
 }
 const isStreamBody = body => typeof body?.pipe === 'function';
+function createProgressTransform(onChunk) {
+  return new _stream.Transform({
+    transform(chunk, _encoding, callback) {
+      onChunk(chunk);
+      callback(null, chunk);
+    }
+  });
+}
+function omitUnsupportedFetchHeaders(init) {
+  if (!init.headers) {
+    return init;
+  }
+  const headers = new _undici.Headers(init.headers);
+  headers.delete('expect');
+  return {
+    ...init,
+    headers
+  };
+}
+function withCauseMessage(err) {
+  if (!(err instanceof Error)) {
+    return err;
+  }
+  const cause = err.cause;
+  let causeMessage;
+  if (cause instanceof Error) {
+    causeMessage = cause.message;
+  } else if (typeof cause === 'string') {
+    causeMessage = cause;
+  }
+  if (!causeMessage || err.message.includes(causeMessage)) {
+    return err;
+  }
+  return new Error(`${err.message}: ${causeMessage}`, {
+    cause: err
+  });
+}
 
 /**
  * Wraps `fetch` with exponential-backoff retries.
@@ -75,10 +112,10 @@ async function fetchWithRetry(input, init = {}, retries = 3, createBody) {
     }
     try {
       // eslint-disable-next-line no-await-in-loop
-      return await (0, _undici.fetch)(input, requestInit);
+      return await (0, _undici.fetch)(input, omitUnsupportedFetchHeaders(requestInit));
     } catch (err) {
       if (attempt === maxAttempts) {
-        throw err;
+        throw withCauseMessage(err);
       }
       // eslint-disable-next-line no-await-in-loop
       await (0, _promises3.setTimeout)(Math.pow(2, attempt) * 1000); // 1000, 2000, 4000
@@ -260,8 +297,7 @@ async function uploadUsingPutObject({
       return fileContent;
     }
     let readBytes = 0;
-    const progressPassThrough = new _stream.PassThrough();
-    progressPassThrough.on('data', data => {
+    const progressTransform = createProgressTransform(data => {
       readBytes += data.length;
       const percentage = `${Math.floor(100 * readBytes / fileSize)}%`;
       debug(percentage);
@@ -269,7 +305,7 @@ async function uploadUsingPutObject({
         progressCallback(percentage);
       }
     });
-    return (0, _fs.createReadStream)(fileName).pipe(progressPassThrough);
+    return (0, _fs.createReadStream)(fileName).pipe(progressTransform);
   };
   const response = await fetchWithRetry(presignedRequest.url, fetchOptions, 3, createBody);
   if (response.status === 200) {
@@ -507,15 +543,14 @@ async function uploadParts({
     const createBody = () => {
       partBytesRead[index] = 0;
       partPercentages[index] = 0;
-      const progressPassThrough = new _stream.PassThrough();
-      progressPassThrough.on('data', data => {
+      const progressTransform = createProgressTransform(data => {
         partBytesRead[index] += data.length;
         partPercentages[index] = Math.floor(100 * partBytesRead[index] / partSize);
       });
       return (0, _fs.createReadStream)(fileMeta.fileName, {
         start,
         end
-      }).pipe(progressPassThrough);
+      }).pipe(progressTransform);
     };
     await readyForPartUpload();
     const uploadResult = await uploadPart({

package/dist/lib/database.js

@@ -86,21 +86,16 @@ const getSqlFileStreamFromCompressedFile = async filePath => {
   }
   throw new Error('Not a supported compressed file');
 };
+
+// Replaces the byte-size value that mydumper embeds in chunk header comments (e.g. `-- tablename 1234`)
+// with -1. mydumper exports the original file size in those headers, but since we modify the dump,
+// the size is no longer accurate — setting it to -1 tells mydumper to ignore it.
+// Lines starting with `-- metadata` are left untouched as they use the same format but are not chunk headers.
 const fixMyDumperTransform = () => {
-  const regex = /^-- ([^ ]+) \d+$/;
+  const regex = /^-- (?!metadata)([^ ]+) \d+$/gm;
   return new _nodeStream.Transform({
     transform(chunk, _encoding, callback) {
-      const chunkString = chunk.toString();
-      const lineEnding = chunkString.includes('\r\n') ? '\r\n' : '\n';
-      const lines = chunk.toString().split(lineEnding).map(line => {
-        const match = regex.exec(line);
-        if (!match) {
-          return line;
-        }
-        const tablePart = match[1];
-        return `-- ${tablePart} -1`;
-      });
-      callback(null, lines.join(lineEnding));
+      callback(null, chunk.toString().replace(regex, '-- $1 -1'));
     }
   });
 };

package/dist/lib/wp/readline.js

@@ -0,0 +1,112 @@
+"use strict";
+
+exports.__esModule = true;
+exports.isReadlineClosed = isReadlineClosed;
+exports.safePause = safePause;
+exports.safePrompt = safePrompt;
+exports.safeResume = safeResume;
+exports.safeWrite = safeWrite;
+exports.trackReadline = trackReadline;
+/**
+ * Safe wrappers around `readline.Interface` lifecycle methods.
+ *
+ * On Node.js >= 24, calling `resume()`, `pause()`, `prompt()`, or `write()` on a
+ * readline interface that has already been closed throws
+ * `Error [ERR_USE_AFTER_CLOSE]: readline was closed`. On Node 20/22 the same
+ * calls are silent no-ops.
+ *
+ * `vip wp` drives non-interactive, one-shot commands through a readline
+ * interface bound to `process.stdin`. When stdin is redirected from
+ * `/dev/null` (no TTY, e.g. CI or container runs) the interface receives EOF
+ * immediately and closes, while the command keeps streaming output. On a
+ * websocket reconnect during a long-running command the reconnect handler then
+ * calls `resume()` on the already-closed interface, crashing the process on
+ * Node 24.
+ *
+ * These helpers guard every such call so the interface is only driven while it
+ * is still open. Closure is tracked through the documented `'close'` event
+ * rather than any internal interface property, so the behaviour does not depend
+ * on Node.js implementation details.
+ *
+ * Register an interface with {@link trackReadline} once, right after it is
+ * created, so the `'close'` listener is attached before the interface can
+ * close. Calls made through the `safe*` helpers on an untracked-but-open
+ * interface still work; tracking only adds the closed-state guard.
+ *
+ * @see https://nodejs.org/api/readline.html#event-close
+ */
+
+const closedInterfaces = new WeakSet();
+
+/**
+ * Begin tracking a readline interface so its closed state can be detected.
+ *
+ * Attaches a one-time `'close'` listener that records the interface as closed.
+ * Safe to call more than once for the same interface.
+ *
+ * @param rl The readline interface to track.
+ * @returns The same interface, for convenient chaining.
+ */
+function trackReadline(rl) {
+  rl.once('close', () => {
+    closedInterfaces.add(rl);
+  });
+  return rl;
+}
+
+/**
+ * Whether a tracked readline interface has already emitted `'close'`.
+ *
+ * @param rl The readline interface to inspect.
+ * @returns `true` if the interface has been closed, otherwise `false`.
+ */
+function isReadlineClosed(rl) {
+  return closedInterfaces.has(rl);
+}
+
+/**
+ * Resume the readline interface unless it has already been closed.
+ *
+ * @param rl The readline interface to resume.
+ */
+function safeResume(rl) {
+  if (!isReadlineClosed(rl)) {
+    rl.resume();
+  }
+}
+
+/**
+ * Pause the readline interface unless it has already been closed.
+ *
+ * @param rl The readline interface to pause.
+ */
+function safePause(rl) {
+  if (!isReadlineClosed(rl)) {
+    rl.pause();
+  }
+}
+
+/**
+ * Display the prompt unless the readline interface has already been closed.
+ *
+ * @param rl             The readline interface to prompt on.
+ * @param preserveCursor When `true`, prevents the cursor from being reset to 0.
+ */
+function safePrompt(rl, preserveCursor) {
+  if (!isReadlineClosed(rl)) {
+    rl.prompt(preserveCursor);
+  }
+}
+
+/**
+ * Write data into the readline interface unless it has already been closed.
+ *
+ * @param rl   The readline interface to write to.
+ * @param data The data to write.
+ * @param key  An optional key sequence, mirroring `Interface#write`.
+ */
+function safeWrite(rl, data, key) {
+  if (!isReadlineClosed(rl)) {
+    rl.write(data, key);
+  }
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "4.0.7",
+      "version": "4.0.9",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -41,7 +41,7 @@
         "socks-proxy-agent": "^10.0.0",
         "ssh2": "1.17.0",
         "tar": "^7.4.0",
-        "undici": "^7.0.0",
+        "undici": "^8.5.0",
         "update-notifier": "7.3.1",
         "xml2js": "^0.6.2"
       },
@@ -137,7 +137,7 @@
         "typescript": "^6.0.2"
       },
       "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=23.0.0",
+        "node": ">=22.19.0",
         "npm": ">=8"
       },
       "optionalDependencies": {
@@ -11418,9 +11418,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.0.0.tgz",
-      "integrity": "sha512-GSvaPUbk1U+FMZ7rJzF+F8e5YVtu7KnD40et/5rBXXRBv2jCO9L3qCewvIDDdudC0QycTFlf6EAA+h3kxBsuUw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.1.0.tgz",
+      "integrity": "sha512-s8VA5jkR8f22S3NAXmhKPFqGUduqZGlsufabVOgN14iTdw/RXcym7bKkbwjxLK9Yw2lEvvmJjFp119+KPeo8Kg==",
       "funding": [
         {
           "type": "github",
@@ -14624,12 +14624,12 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz",
-      "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-8.5.0.tgz",
+      "integrity": "sha512-xamtWoB1EshgjpmlXd7GGm2VfdDtw1+rD8uhry8pSNW3If6S8E0m2T2+orSKeZXEn/aPJMviCpDBA65WJt8zhg==",
       "license": "MIT",
       "engines": {
-        "node": ">=20.18.1"
+        "node": ">=22.19.0"
       }
     },
     "node_modules/undici-types": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -107,7 +107,7 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": "^20.19.0 || ^22.12.0 || >=23.0.0",
+    "node": ">=22.19.0",
     "npm": ">=8"
   },
   "bugs": {
@@ -172,7 +172,7 @@
     "socks-proxy-agent": "^10.0.0",
     "ssh2": "1.17.0",
     "tar": "^7.4.0",
-    "undici": "^7.0.0",
+    "undici": "^8.5.0",
     "update-notifier": "7.3.1",
     "xml2js": "^0.6.2"
   },