single-file-cli 2.0.48 → 2.0.50

package/build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-deno vendor "npm:single-file-core@1.5.12"
+deno vendor "npm:single-file-core@1.5.15"
 
 echo "
 import { build } from 'npm:esbuild';

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@single-file/single-file-cli",
-  "version": "2.0.48",
+  "version": "2.0.50",
   "description": "SingleFile CLI",
   "nodeModulesDir": true,
   "exports": {

package/lib/cdp-client.js

@@ -35,6 +35,7 @@ const EMPTY_PAGE_URL = "about:blank";
 const CAPTURE_SCREENSHOT_FUNCTION_NAME = "captureScreenshot";
 const SET_SCREENSHOT_FUNCTION_NAME = "setScreenshot";
 const SET_PAGE_DATA_FUNCTION_NAME = "setPageData";
+const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308];
 
 export { initialize, getPageData, closeBrowser };
 
@@ -104,8 +105,10 @@ async function getPageData(options) {
 				await Emulation.setUserAgentOverride(agentOptions);
 			}
 		}
-		if (options.httpProxyUsername) {
-			await Fetch.enable({ handleAuthRequests: true });
+		const handleAuthRequests = Boolean(options.httpProxyUsername);
+		const patterns = handleAuthRequests ? [{ requestStage: "Request" }, { requestStage: "Response" }] : [{ requestStage: "Response" }];
+		await Fetch.enable({ handleAuthRequests, patterns });
+		if (handleAuthRequests) {
 			Fetch.addEventListener("authRequired", ({ params }) => Fetch.continueWithAuth({
 				requestId: params.requestId,
 				authChallengeResponse: {
@@ -114,8 +117,42 @@ async function getPageData(options) {
 					password: options.httpProxyPassword
 				}
 			}));
-			Fetch.addEventListener("requestPaused", ({ params }) => Fetch.continueRequest({ requestId: params.requestId }));
 		}
+		let url = options.url;
+		let alternativeUrl = new URL(url);
+		if (!alternativeUrl.pathname.endsWith("/")) {
+			alternativeUrl.pathname = alternativeUrl.pathname + "/";
+		}
+		alternativeUrl = alternativeUrl.href;
+		let httpInfo;
+		delete options.zipScript;
+		Fetch.addEventListener("requestPaused", async ({ params }) => {
+			const { requestId, request, resourceType, responseHeaders, responseStatusCode, responseStatusText } = params;
+			if (options.outputJson && !httpInfo && (request.url == url || request.url == alternativeUrl) && responseStatusCode !== undefined) {
+				if (REDIRECT_STATUS_CODES.includes(responseStatusCode)) {
+					const redirect = responseHeaders.find(header => header.name.toLowerCase() == "location").value;
+					if (redirect) {
+						url = new URL(redirect, url).href;
+					}
+				} else {
+					httpInfo = {
+						request: {
+							url: request.url,
+							method: request.method,
+							headers: request.headers,
+							referrerPolicy: request.referrerPolicy
+						},
+						resourceType,
+						response: {
+							status: responseStatusCode,
+							statusText: responseStatusText,
+							headers: responseHeaders
+						}
+					};
+				}
+			}
+			await Fetch.continueRequest({ requestId });
+		});
 		if (options.httpHeaders && options.httpHeaders.length) {
 			await Network.setExtraHTTPHeaders({ headers: options.httpHeaders });
 		}
@@ -182,7 +219,9 @@ async function getPageData(options) {
 		if (subtype === "error") {
 			throw new Error(description);
 		}
-		return pageDataPromise;
+		const pageData = await pageDataPromise;
+		Object.assign(pageData, httpInfo);
+		return pageData;
 	} catch (error) {
 		if (error.code === LOAD_TIMEOUT_ERROR && options.browserWaitUntilFallback && options.browserWaitUntil) {
 			const browserWaitUntil = NETWORK_STATES[(NETWORK_STATES.indexOf(options.browserWaitUntil) + 1)];