@bf6mods/cli 1.6.0 → 1.7.0

package/dist/{puppeteer-u5zMrFnK.js → puppeteer-BzRJX4NM.js}

@@ -15595,7 +15595,11 @@ var require_file = /* @__PURE__ */ __commonJS({ "../../node_modules/get-uri/dist
 //#region ../../node_modules/basic-ftp/dist/parseControlResponse.js
 var require_parseControlResponse = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/dist/parseControlResponse.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.positiveIntermediate = exports.positiveCompletion = exports.isMultiline = exports.isSingleLine = exports.parseControlResponse = void 0;
+	exports.parseControlResponse = parseControlResponse;
+	exports.isSingleLine = isSingleLine;
+	exports.isMultiline = isMultiline;
+	exports.positiveCompletion = positiveCompletion;
+	exports.positiveIntermediate = positiveIntermediate;
 	const LF$1 = "\n";
 	/**
 	* Parse an FTP control response as a collection of messages. A message is a complete
@@ -15627,29 +15631,24 @@ var require_parseControlResponse = /* @__PURE__ */ __commonJS({ "../../node_modu
 			rest: tokenRegex ? lines.slice(startAt).join(LF$1) + LF$1 : ""
 		};
 	}
-	exports.parseControlResponse = parseControlResponse;
 	function isSingleLine(line) {
 		return /^\d\d\d(?:$| )/.test(line);
 	}
-	exports.isSingleLine = isSingleLine;
 	function isMultiline(line) {
 		return /^\d\d\d-/.test(line);
 	}
-	exports.isMultiline = isMultiline;
 	/**
 	* Return true if an FTP return code describes a positive completion.
 	*/
 	function positiveCompletion(code) {
 		return code >= 200 && code < 300;
 	}
-	exports.positiveCompletion = positiveCompletion;
 	/**
 	* Return true if an FTP return code describes a positive intermediate response.
 	*/
 	function positiveIntermediate(code) {
 		return code >= 300 && code < 400;
 	}
-	exports.positiveIntermediate = positiveIntermediate;
 	function isNotBlank$1(str) {
 		return str.trim() !== "";
 	}
@@ -16063,7 +16062,9 @@ var require_FileInfo = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 //#region ../../node_modules/basic-ftp/dist/parseListDOS.js
 var require_parseListDOS = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/dist/parseListDOS.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.transformList = exports.parseLine = exports.testLine = void 0;
+	exports.testLine = testLine$2;
+	exports.parseLine = parseLine$2;
+	exports.transformList = transformList$2;
 	const FileInfo_1$2 = require_FileInfo();
 	/**
 	* This parser is based on the FTP client library source code in Apache Commons Net provided
@@ -16080,7 +16081,6 @@ var require_parseListDOS = /* @__PURE__ */ __commonJS({ "../../node_modules/basi
 	function testLine$2(line) {
 		return /^\d{2}/.test(line) && RE_LINE$1.test(line);
 	}
-	exports.testLine = testLine$2;
 	/**
 	* Parse a single line of a DOS-style directory listing.
 	*/
@@ -16100,18 +16100,18 @@ var require_parseListDOS = /* @__PURE__ */ __commonJS({ "../../node_modules/basi
 		file$1.rawModifiedAt = groups[1] + " " + groups[2];
 		return file$1;
 	}
-	exports.parseLine = parseLine$2;
 	function transformList$2(files) {
 		return files;
 	}
-	exports.transformList = transformList$2;
 }) });
 
 //#endregion
 //#region ../../node_modules/basic-ftp/dist/parseListUnix.js
 var require_parseListUnix = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/dist/parseListUnix.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.transformList = exports.parseLine = exports.testLine = void 0;
+	exports.testLine = testLine$1;
+	exports.parseLine = parseLine$1;
+	exports.transformList = transformList$1;
 	const FileInfo_1$1 = require_FileInfo();
 	/**
 	* This parser is based on the FTP client library source code in Apache Commons Net provided
@@ -16152,7 +16152,6 @@ var require_parseListUnix = /* @__PURE__ */ __commonJS({ "../../node_modules/bas
 	function testLine$1(line) {
 		return RE_LINE.test(line);
 	}
-	exports.testLine = testLine$1;
 	/**
 	* Parse a single line of a Unix-style directory listing.
 	*/
@@ -16201,11 +16200,9 @@ var require_parseListUnix = /* @__PURE__ */ __commonJS({ "../../node_modules/bas
 		}
 		return file$1;
 	}
-	exports.parseLine = parseLine$1;
 	function transformList$1(files) {
 		return files;
 	}
-	exports.transformList = transformList$1;
 	function parseMode(r, w, x) {
 		let value = 0;
 		if (r !== "-") value += FileInfo_1$1.FileInfo.UnixPermission.Read;
@@ -16220,7 +16217,10 @@ var require_parseListUnix = /* @__PURE__ */ __commonJS({ "../../node_modules/bas
 //#region ../../node_modules/basic-ftp/dist/parseListMLSD.js
 var require_parseListMLSD = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/dist/parseListMLSD.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.parseMLSxDate = exports.transformList = exports.parseLine = exports.testLine = void 0;
+	exports.testLine = testLine;
+	exports.parseLine = parseLine;
+	exports.transformList = transformList;
+	exports.parseMLSxDate = parseMLSxDate;
 	const FileInfo_1 = require_FileInfo();
 	function parseSize(value, info) {
 		info.size = parseInt(value, 10);
@@ -16304,7 +16304,6 @@ var require_parseListMLSD = /* @__PURE__ */ __commonJS({ "../../node_modules/bas
 	function testLine(line) {
 		return /^\S+=\S+;/.test(line) || line.startsWith(" ");
 	}
-	exports.testLine = testLine;
 	/**
 	* Parse single line as MLSD listing, see specification at https://tools.ietf.org/html/rfc3659#section-7.
 	*/
@@ -16322,7 +16321,6 @@ var require_parseListMLSD = /* @__PURE__ */ __commonJS({ "../../node_modules/bas
 		}
 		return info;
 	}
-	exports.parseLine = parseLine;
 	function transformList(files) {
 		const nonLinksByID = /* @__PURE__ */ new Map();
 		for (const file$1 of files) if (!file$1.isSymbolicLink && file$1.uniqueID !== void 0) nonLinksByID.set(file$1.uniqueID, file$1);
@@ -16336,7 +16334,6 @@ var require_parseListMLSD = /* @__PURE__ */ __commonJS({ "../../node_modules/bas
 		}
 		return resolvedFiles;
 	}
-	exports.transformList = transformList;
 	/**
 	* Parse date as specified in https://tools.ietf.org/html/rfc3659#section-2.3.
 	*
@@ -16346,7 +16343,6 @@ var require_parseListMLSD = /* @__PURE__ */ __commonJS({ "../../node_modules/bas
 	function parseMLSxDate(fact) {
 		return new Date(Date.UTC(+fact.slice(0, 4), +fact.slice(4, 6) - 1, +fact.slice(6, 8), +fact.slice(8, 10), +fact.slice(10, 12), +fact.slice(12, 14), +fact.slice(15, 18)));
 	}
-	exports.parseMLSxDate = parseMLSxDate;
 }) });
 
 //#endregion
@@ -16374,17 +16370,27 @@ var require_parseList = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-f
 	}) : function(o, v) {
 		o["default"] = v;
 	});
-	var __importStar$6 = exports && exports.__importStar || function(mod) {
-		if (mod && mod.__esModule) return mod;
-		var result = {};
-		if (mod != null) {
-			for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding$8(result, mod, k);
-		}
-		__setModuleDefault$6(result, mod);
-		return result;
-	};
+	var __importStar$6 = exports && exports.__importStar || (function() {
+		var ownKeys$1 = function(o) {
+			ownKeys$1 = Object.getOwnPropertyNames || function(o$1) {
+				var ar = [];
+				for (var k in o$1) if (Object.prototype.hasOwnProperty.call(o$1, k)) ar[ar.length] = k;
+				return ar;
+			};
+			return ownKeys$1(o);
+		};
+		return function(mod) {
+			if (mod && mod.__esModule) return mod;
+			var result = {};
+			if (mod != null) {
+				for (var k = ownKeys$1(mod), i$1 = 0; i$1 < k.length; i$1++) if (k[i$1] !== "default") __createBinding$8(result, mod, k[i$1]);
+			}
+			__setModuleDefault$6(result, mod);
+			return result;
+		};
+	})();
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.parseList = void 0;
+	exports.parseList = parseList;
 	/**
 	* Available directory listing parsers. These are candidates that will be tested
 	* in the order presented. The first candidate will be used to parse the whole list.
@@ -16416,7 +16422,6 @@ var require_parseList = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-f
 		const files = lines.map(parser.parseLine).filter((info) => info !== void 0);
 		return parser.transformList(files);
 	}
-	exports.parseList = parseList;
 }) });
 
 //#endregion
@@ -16520,7 +16525,10 @@ var require_StringWriter = /* @__PURE__ */ __commonJS({ "../../node_modules/basi
 //#region ../../node_modules/basic-ftp/dist/netUtils.js
 var require_netUtils = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/dist/netUtils.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.ipIsPrivateV4Address = exports.upgradeSocket = exports.describeAddress = exports.describeTLS = void 0;
+	exports.describeTLS = describeTLS;
+	exports.describeAddress = describeAddress;
+	exports.upgradeSocket = upgradeSocket;
+	exports.ipIsPrivateV4Address = ipIsPrivateV4Address;
 	const tls_1$2 = __require("tls");
 	/**
 	* Returns a string describing the encryption on a given socket instance.
@@ -16532,7 +16540,6 @@ var require_netUtils = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 		}
 		return "No encryption";
 	}
-	exports.describeTLS = describeTLS;
 	/**
 	* Returns a string describing the remote address of a socket.
 	*/
@@ -16540,7 +16547,6 @@ var require_netUtils = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 		if (socket.remoteFamily === "IPv6") return `[${socket.remoteAddress}]:${socket.remotePort}`;
 		return `${socket.remoteAddress}:${socket.remotePort}`;
 	}
-	exports.describeAddress = describeAddress;
 	/**
 	* Upgrade a socket connection with TLS.
 	*/
@@ -16558,7 +16564,6 @@ var require_netUtils = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 			});
 		});
 	}
-	exports.upgradeSocket = upgradeSocket;
 	/**
 	* Returns true if an IP is a private address according to https://tools.ietf.org/html/rfc1918#section-3.
 	* This will handle IPv4-mapped IPv6 addresses correctly but return false for all other IPv6 addresses.
@@ -16570,14 +16575,20 @@ var require_netUtils = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 		const octets = ip.split(".").map((o) => parseInt(o, 10));
 		return octets[0] === 10 || octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31 || octets[0] === 192 && octets[1] === 168 || ip === "127.0.0.1";
 	}
-	exports.ipIsPrivateV4Address = ipIsPrivateV4Address;
 }) });
 
 //#endregion
 //#region ../../node_modules/basic-ftp/dist/transfer.js
 var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/dist/transfer.js": ((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.downloadTo = exports.uploadFrom = exports.connectForPassiveTransfer = exports.parsePasvResponse = exports.enterPassiveModeIPv4 = exports.parseEpsvResponse = exports.enterPassiveModeIPv6 = void 0;
+	exports.enterPassiveModeIPv6 = enterPassiveModeIPv6;
+	exports.parseEpsvResponse = parseEpsvResponse;
+	exports.enterPassiveModeIPv4 = enterPassiveModeIPv4;
+	exports.enterPassiveModeIPv4_forceControlHostIP = enterPassiveModeIPv4_forceControlHostIP;
+	exports.parsePasvResponse = parsePasvResponse;
+	exports.connectForPassiveTransfer = connectForPassiveTransfer;
+	exports.uploadFrom = uploadFrom;
+	exports.downloadTo = downloadTo;
 	const netUtils_1$1 = require_netUtils();
 	const stream_1$1 = __require("stream");
 	const tls_1$1 = __require("tls");
@@ -16594,7 +16605,6 @@ var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 		await connectForPassiveTransfer(controlHost, port, ftp$1);
 		return res;
 	}
-	exports.enterPassiveModeIPv6 = enterPassiveModeIPv6;
 	/**
 	* Parse an EPSV response. Returns only the port as in EPSV the host of the control connection is used.
 	*/
@@ -16605,7 +16615,6 @@ var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 		if (Number.isNaN(port)) throw new Error(`Can't parse response to 'EPSV', port is not a number: ${message}`);
 		return port;
 	}
-	exports.parseEpsvResponse = parseEpsvResponse;
 	/**
 	* Prepare a data socket using passive mode over IPv4.
 	*/
@@ -16618,7 +16627,20 @@ var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 		await connectForPassiveTransfer(target.host, target.port, ftp$1);
 		return res;
 	}
-	exports.enterPassiveModeIPv4 = enterPassiveModeIPv4;
+	/**
+	* Prepare a data socket using passive mode over IPv4. Ignore the IP provided by the PASV response,
+	* and use the control host IP. This is the same behaviour as with the more modern variant EPSV. Use
+	* this to fix issues around NAT or provide more security by preventing FTP bounce attacks.
+	*/
+	async function enterPassiveModeIPv4_forceControlHostIP(ftp$1) {
+		const res = await ftp$1.request("PASV");
+		const target = parsePasvResponse(res.message);
+		if (!target) throw new Error("Can't parse PASV response: " + res.message);
+		const controlHost = ftp$1.socket.remoteAddress;
+		if (controlHost === void 0) throw new Error("Control socket is disconnected, can't get remote address.");
+		await connectForPassiveTransfer(controlHost, target.port, ftp$1);
+		return res;
+	}
 	/**
 	* Parse a PASV response.
 	*/
@@ -16630,7 +16652,6 @@ var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 			port: (parseInt(groups[2], 10) & 255) * 256 + (parseInt(groups[3], 10) & 255)
 		};
 	}
-	exports.parsePasvResponse = parsePasvResponse;
 	function connectForPassiveTransfer(host, port, ftp$1) {
 		return new Promise((resolve, reject) => {
 			let socket = ftp$1._newSocket();
@@ -16661,7 +16682,6 @@ var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 			});
 		});
 	}
-	exports.connectForPassiveTransfer = connectForPassiveTransfer;
 	/**
 	* Helps resolving/rejecting transfers.
 	*
@@ -16757,7 +16777,6 @@ var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 			else if ((0, parseControlResponse_1$1.positiveIntermediate)(res.code)) resolver.onUnexpectedRequest(res);
 		});
 	}
-	exports.uploadFrom = uploadFrom;
 	function downloadTo(destination, config) {
 		if (!config.ftp.dataSocket) throw new Error("Download will be initiated but no data connection is available.");
 		const resolver = new TransferResolver(config.ftp, config.tracker);
@@ -16780,7 +16799,6 @@ var require_transfer = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ft
 			else if ((0, parseControlResponse_1$1.positiveIntermediate)(res.code)) resolver.onUnexpectedRequest(res);
 		});
 	}
-	exports.downloadTo = downloadTo;
 	/**
 	* Calls a function immediately if a condition is met or subscribes to an event and calls
 	* it once the event is emitted.
@@ -16819,6 +16837,7 @@ var require_Client = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/
 	const fsOpen = (0, util_1$7.promisify)(fs_1$3.open);
 	const fsClose = (0, util_1$7.promisify)(fs_1$3.close);
 	const fsUnlink = (0, util_1$7.promisify)(fs_1$3.unlink);
+	const defaultClientOptions = { allowSeparateTransferHost: true };
 	const LIST_COMMANDS_DEFAULT = () => ["LIST -a", "LIST"];
 	const LIST_COMMANDS_MLSD = () => [
 		"MLSD",
@@ -16834,10 +16853,10 @@ var require_Client = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/
 		*
 		* @param timeout  Timeout in milliseconds, use 0 for no timeout. Optional, default is 30 seconds.
 		*/
-		constructor(timeout$1 = 3e4) {
+		constructor(timeout$1 = 3e4, options = defaultClientOptions) {
 			this.availableListCommands = LIST_COMMANDS_DEFAULT();
 			this.ftp = new FtpContext_1.FTPContext(timeout$1);
-			this.prepareTransfer = this._enterFirstCompatibleMode([transfer_1$1.enterPassiveModeIPv6, transfer_1$1.enterPassiveModeIPv4]);
+			this.prepareTransfer = this._enterFirstCompatibleMode([transfer_1$1.enterPassiveModeIPv6, options.allowSeparateTransferHost ? transfer_1$1.enterPassiveModeIPv4 : transfer_1$1.enterPassiveModeIPv4_forceControlHostIP]);
 			this.parseList = parseList_1.parseList;
 			this._progressTracker = new ProgressTracker_1.ProgressTracker();
 		}
@@ -17333,6 +17352,11 @@ var require_Client = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/
 		async _downloadFromWorkingDir(localDirPath) {
 			await ensureLocalDirectory(localDirPath);
 			for (const file$1 of await this.list()) {
+				if (!file$1.name || (0, path_1$7.basename)(file$1.name) !== file$1.name) {
+					const safeName = JSON.stringify(file$1.name);
+					this.ftp.log(`Invalid filename from server listing, will skip file. (${safeName})`);
+					continue;
+				}
 				const localPath = (0, path_1$7.join)(localDirPath, file$1.name);
 				if (file$1.isDirectory) {
 					await this.cd(file$1.name);
@@ -17449,14 +17473,14 @@ var require_Client = /* @__PURE__ */ __commonJS({ "../../node_modules/basic-ftp/
 	async function ensureLocalDirectory(path$4) {
 		try {
 			await fsStat(path$4);
-		} catch (err) {
+		} catch (_a$1) {
 			await fsMkDir(path$4, { recursive: true });
 		}
 	}
 	async function ignoreError(func) {
 		try {
 			return await func();
-		} catch (err) {
+		} catch (_a$1) {
 			return;
 		}
 	}
@@ -42436,4 +42460,4 @@ var puppeteer_default = puppeteer;
 
 //#endregion
 export { ARIAQueryHandler, Accessibility, AsyncDisposableStack, AsyncDisposableStackPolyfill, AsyncIterableUtil, Binding, Browser, BrowserContext, BrowserLauncher, BrowserWebSocketTransport, CDPSession, CDPSessionEvent, CDP_BINDING_PREFIX, CSSCoverage, Callback, CallbackRegistry, CdpBrowser, CdpBrowserContext, CdpCDPSession, CdpDialog, CdpElementHandle, CdpFrame, CdpHTTPRequest, CdpHTTPResponse, CdpJSHandle, CdpKeyboard, CdpMouse, CdpPage, CdpPreloadScript, CdpTarget, CdpTouchHandle, CdpTouchscreen, CdpWebWorker, ChromeLauncher, Connection, ConnectionClosedError, ConsoleMessage, Coverage, CustomQueryHandlerRegistry, DEFAULT_INTERCEPT_RESOLUTION_PRIORITY, DEFAULT_VIEWPORT, Deferred, DelegatedLocator, DevToolsTarget, DeviceRequestPrompt, DeviceRequestPromptDevice, DeviceRequestPromptManager, Dialog, DisposableStack, DisposableStackPolyfill, ElementHandle, EmulatedState, EmulationManager, EventEmitter, ExecutionContext, ExtensionTransport, FileChooser, FilteredLocator, FirefoxLauncher, Frame, FrameEvent, FrameManager, FrameManagerEvent, FrameTree, FunctionLocator, HTTPRequest, HTTPResponse, InitializationStatus, InterceptResolutionAction, IsolatedWorld, JSCoverage, JSHandle, Keyboard, KnownDevices, LazyArg, LifecycleWatcher, Locator, LocatorEvent, MAIN_WORLD, MappedLocator, Mouse, MouseButton, Mutex, NETWORK_IDLE_TIME, NetworkEventManager, NetworkManager, NetworkManagerEvent, NodeLocator, OtherTarget, PQueryHandler, PUPPETEER_REVISIONS, PUPPETEER_WORLD, Page, PageTarget, PierceQueryHandler, PipeTransport, PredefinedNetworkConditions, ProtocolError, Puppeteer, PuppeteerError, PuppeteerNode, PuppeteerURL, QueryHandler, RETRY_DELAY, RaceLocator, Realm, SOURCE_URL_REGEX, STATUS_TEXTS, ScreenRecorder, ScriptInjector, SecurityDetails, SuppressedError$1 as SuppressedError, Target, TargetCloseError, TargetManager, TargetType, TaskManager, TaskQueue, TextQueryHandler, TimeoutError, TimeoutSettings, TouchError, Touchscreen, Tracing, UTILITY_WORLD_NAME, UnsupportedOperation, WEB_PERMISSION_TO_PROTOCOL_PERMISSION, WaitTask, WebWorker, WorkerTarget, XPathQueryHandler, _connectToCdpBrowser, _keyDefinitions, addPageBinding, assert, asyncDisposeSymbol, bindIsolatedHandle, connect, convertCookiesPartitionKeyFromPuppeteerToCdp, createClientError, createEvaluationError, createIncrementalIdGenerator, createProtocolErrorMessage, customQueryHandlers, debug, debugError, puppeteer_default as default, defaultArgs, disposeSymbol, evaluationString, executablePath, filterAsync, fromAbortSignal, fromEmitterEvent, getCapturedLogs, getFeatures, getQueryHandlerAndSelector, getReadableAsTypedArray, getReadableFromProtocolStream, getSourcePuppeteerURLIfAvailable, getSourceUrlComment, handleError, headersArray, importDebug, isDate, isErrnoException, isErrorLike, isNumber, isPlainObject, isRegExp, isString, isTargetClosedError, launch, pageBindingInitString, paperFormats, parsePDFOptions, parsePSelectors, referrerPolicyToProtocol, releaseObject, removeMatchingFlags, rewriteError, scriptInjector, setDefaultScreenshotOptions, setLogCapture, supportedMetrics, throwIfDetached, timeout, transposeIterableHandle, trimCache, unitToPixels, validateDialogType, valueFromRemoteObject, withSourcePuppeteerURLIfNone };
-//# sourceMappingURL=puppeteer-u5zMrFnK.js.map
+//# sourceMappingURL=puppeteer-BzRJX4NM.js.map