unprint 0.18.9 → 0.18.12

package/README.md

@@ -228,6 +228,7 @@ Options
 * `select`: Pre-query and initialize a specific element on the page.
 * `selectAll`: Pre-query and initialize multiple specific element on the page.
 * `interface`: Use undici `fetch` (browser-like, default) or `request` (raw)
+* `form`: Encode POST body as urlencoded form rather than JSON
 * `userAgent`: The default user agent header
 * `browserUserAgent`: The default user agent header for browser-like requests (`get` interface `fetch` and `browserRequest`)
 * `apiUserAgent`: The default user agent header for raw requests (`get` interface `request`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unprint",
-  "version": "0.18.9",
+  "version": "0.18.12",
   "description": "Simplify common web scraping tasks while staying in control of the data.",
   "main": "src/app.js",
   "scripts": {},

package/src/app.js

@@ -1114,6 +1114,22 @@ function curateHeaders(headers, options) {
 	return headers;
 }
 
+function curateCookies(headers) {
+	const setCookie = typeof headers.get === 'function'
+		? headers.get('set-cookie')
+		: headers['set-cookie'];
+
+	if (setCookie) {
+		try {
+			return cookie.parseCookie(setCookie);
+		} catch (_error) {
+			// invalid cookie
+		}
+	}
+
+	return null;
+}
+
 function curateResponse(res, data, options, { url, control, customOptions }) {
 	const base = {
 		ok: true,
@@ -1121,6 +1137,7 @@ function curateResponse(res, data, options, { url, control, customOptions }) {
 		status: res.statusCode || res.status,
 		statusText: res.statusText,
 		headers: res.headers,
+		cookies: curateCookies(res.headers),
 		response: res,
 		res,
 		control,
@@ -1355,6 +1372,7 @@ async function browserRequest(url, customOptions = {}) {
 				status,
 				statusText,
 				headers,
+				cookies: curateCookies(headers),
 				response: res,
 				res,
 			};
@@ -1380,6 +1398,7 @@ async function browserRequest(url, customOptions = {}) {
 					status,
 					statusText,
 					headers,
+					cookies: curateCookies(headers),
 					response: res,
 					res,
 				};
@@ -1414,21 +1433,21 @@ async function browserRequest(url, customOptions = {}) {
 	});
 }
 
-function curateRequestBody(body) {
+function curateRequestBody(body, options) {
 	if (!body) {
 		return { body };
 	}
 
-	if (body instanceof undici.FormData) {
-		return {
-			body: qs.stringify(body),
-			headers: {
-				'content-type': 'application/x-www-form-urlencoded',
-			},
-		};
-	}
-
 	if (typeof body === 'object') {
+		if (options.form) {
+			return {
+				body: qs.stringify(body),
+				headers: {
+					'content-type': 'application/x-www-form-urlencoded',
+				},
+			};
+		}
+
 		return {
 			body: JSON.stringify(body),
 			headers: {
@@ -1466,7 +1485,7 @@ async function request(url, body, customOptions = {}, method = 'GET', redirects
 
 	events.emit('requestInit', feedbackBase);
 
-	const curatedBody = curateRequestBody(body);
+	const curatedBody = curateRequestBody(body, options);
 	const curatedCookie = getCookie(options);
 
 	const headers = curateHeaders({
@@ -1521,6 +1540,7 @@ async function request(url, body, customOptions = {}, method = 'GET', redirects
 			status,
 			statusText: res.statusText,
 			headers: res.headers,
+			cookies: curateCookies(res.headers),
 			response: res,
 			res,
 		};