unprint 0.10.2 → 0.10.4

package/package.json

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

package/src/app.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const { JSDOM, VirtualConsole } = require('jsdom');
+const http = require('http');
+const https = require('https');
 const axios = require('axios').default;
 const moment = require('moment-timezone');
 const merge = require('deepmerge');
@@ -601,12 +603,12 @@ function extractDuration(durationString, match) {
 }
 
 function extractTimestamp(durationString) {
-	const timestampMatch = durationString?.match(/(\d+H)?\s*(\d+M)?\s*\d+S?/i);
+	const timestampMatch = durationString?.match(/(\d+\s*H)?.*(\d+\s*M)?.*(\d+\s*(S|$))?/i)?.[0];
 
 	if (timestampMatch) {
-		const hours = timestampMatch[0].match(/(\d+)H/i)?.[1] || 0;
-		const minutes = timestampMatch[0].match(/(\d+)M/i)?.[1] || 0;
-		const seconds = timestampMatch[0].match(/(\d+)(S|$)/i)?.[1] || 0;
+		const hours = timestampMatch.match(/(\d+)\s*H/i)?.[1] || 0;
+		const minutes = timestampMatch.match(/(\d+)\s*M/i)?.[1] || 0;
+		const seconds = timestampMatch.match(/(\d+)\s*(s(ec\w*)?)|$/i)?.[1] || 0;
 
 		return (Number(hours) * 3600) + (Number(minutes) * 60) + Number(seconds);
 	}
@@ -791,8 +793,8 @@ async function request(url, body, customOptions = {}, method = 'GET') {
 		...options,
 		timeout: options.timeout,
 		signal: options.abortSignal,
-		httpAgent: options.httpAgent,
-		httpsAgent: options.httpsAgent,
+		httpAgent: new http.Agent({ ...options.agent }),
+		httpsAgent: new https.Agent({ ...options.agent }),
 	});
 
 	if (!(res.status >= 200 && res.status < 300)) {

package/tests/index.html

@@ -32,6 +32,7 @@
 
 		<div id="duration">01:15:33</div>
 		<div id="timestamp">PT1H34M18S</div>
+		<div id="timestring">1 hour 40 minutes 5 seconds</div>
 
 		<img class="image" src="https://i.redd.it/vn9h981hlx281.png">
 		<img class="image" src="https://i.redd.it/1s22dsrqy0181.jpg">

package/tests/init.js

@@ -21,6 +21,7 @@ async function initTest() {
 	console.log('date xpath', res.context.query.date('//div[contains(text(), "Today:")]', 'MMM DD, YYYY'));
 	console.log('duration', res.context.query.duration('#duration'));
 	console.log('timestamp', res.context.query.duration('#timestamp'));
+	console.log('timestring', res.context.query.duration('#timestring'));
 	console.log('number', res.context.query.number('.number'));
 	console.log('numbers', res.context.query.numbers('.number'));
 	console.log('number indexed', res.context.query.number('.number', { match: /(\d+)/, matchIndex: 1 }));