canada-api 5.1.5 → 5.1.6

package/README.md

@@ -9,7 +9,7 @@ Cross platform API for fetching public data from [canada.ca](https://www.canada.
 ## Browser
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.5"></script>
+<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.6"></script>
 ```
 
 ## Node 18+
@@ -152,7 +152,7 @@ API multiplateforme pour récupérer des données publiques de [canada.ca](https
 ## Navigateur
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.4"></script>
+<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.6"></script>
 ```
 
 ## Node 18+

package/dist/ca.js

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("ca",[],e):"object"==typeof exports?exports.ca=e():t.ca=e()}(Object("undefined"!=typeof self?self:this),()=>(()=>{"use strict";var t={d:(e,a)=>{for(var r in a)t.o(a,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:a[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>c});const a="https://www.canada.ca",r=t=>{if("string"==typeof t)t=new URL(t,a);else{if(!(t instanceof URL))throw new TypeError("string or URL object expected");t=new URL(t.href)}if(t.origin!==a)throw new Error("URL must start with "+a);if(t.pathname=t.pathname.replace(/^\/content\/canadasite/,""),t.pathname=t.pathname.replace(/\.[^/]*$/,"").replace(/\/+$/,""),!t.pathname.startsWith("/en/")&&!t.pathname.startsWith("/fr/"))throw new Error(`Invalid path: "${t.pathname}" must start with /en/ or /fr/`);return t},n=async(t,e={})=>{t=new URL(t,a);const{headers:r={},...n}=e;let o;try{o=await fetch(t,{signal:AbortSignal.timeout(3e4),...n,headers:{"User-Agent":"canada-api/5.1.5",Accept:"*/*",...r}})}catch(e){throw e.url=t.toString(),e}if(!o.ok){const e=new Error(`${o.status} ${o.statusText}`);throw e.url=t.toString(),e}let s=await o.text();const c=o.headers.get("content-type")?.includes("application/json");if(c)try{s=JSON.parse(s)}catch(e){throw e.url=t.toString(),e}return{data:s,status:o.status,statusText:o.statusText,headers:Object.fromEntries(o.headers)}},o={Jan:"01",Feb:"02",Mar:"03",Apr:"04",May:"05",Jun:"06",Jul:"07",Aug:"08",Sep:"09",Oct:"10",Nov:"11",Dec:"12"};function s(t){if(/^\d{4}-\d{2}-\d{2}$/.test(t))return new Date(t).toISOString();let e=/^\w{3} (\w{3}) (\d{2}) (\d{4}) ([\d:]{8}) GMT([\-+]\d{4})$/.exec(t);return e?new Date(`${e[3]}-${o[e[1]]}-${e[2]}T${e[4]}${e[5]}`).toISOString():t}const c={normalize:r,request:n,children:async t=>{const e=r(t);e.pathname+=".sitemap.xml",e.searchParams.set("_",Date.now());const a=await n(e,{redirect:"error"});return a.data=[...a.data.matchAll(/<url>([\s\S]*?)<\/url>/g)].map(([,t])=>{const e=t.match(/<loc>([\s\S]*?)<\/loc>/)?.[1],a=t.match(/<lastmod>([\s\S]*?)<\/lastmod>/)?.[1];return{loc:e,lastmod:a}}).filter(t=>t.loc).map(t=>({path:r(t.loc).pathname,lastmod:t.lastmod?new Date(t.lastmod).toISOString():null})),a},content:async t=>{const e=r(t);return e.pathname+=".html",e.searchParams.set("_",Date.now()),n(e,{signal:AbortSignal.timeout(1e4),redirect:"error"})},meta:async t=>{const e=r(t);e.pathname+="/_jcr_content.json",e.searchParams.set("_",Date.now());const a=await n(e,{signal:AbortSignal.timeout(1e4),redirect:"error"});return a.data=(t=>{const e={};for(const[a,n]of Object.entries(t))a.endsWith("@TypeHint")||Array.isArray(n)&&0===n.length||("true"===n?e[a]=!0:"false"===n?e[a]=!1:"gcAltLanguagePeer"===a?(e[a]=n,e.peer=r(n).pathname):e[a]="string"==typeof n?s(n.trim()):n);return Object.keys(e).sort().reduce((t,a)=>(t[a]=e[a],t),{})})(a.data),a}};return e.default})());
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("ca",[],e):"object"==typeof exports?exports.ca=e():t.ca=e()}(Object("undefined"!=typeof self?self:this),()=>(()=>{"use strict";var t={d:(e,r)=>{for(var a in r)t.o(r,a)&&!t.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:r[a]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>c});const r="https://www.canada.ca",a=t=>{if("string"==typeof t)t=new URL(t,r);else{if(!(t instanceof URL))throw new TypeError("string or URL object expected");t=new URL(t.href)}if(t.origin!==r)throw new Error("URL must start with "+r);if(t.pathname=t.pathname.replace(/^\/content\/canadasite/,""),t.pathname=t.pathname.replace(/\.[^/]*$/,"").replace(/\/+$/,""),!t.pathname.startsWith("/en/")&&!t.pathname.startsWith("/fr/"))throw new Error(`Invalid path: "${t.pathname}" must start with /en/ or /fr/`);return t},n=async(t,e={})=>{(t=new URL(t,r)).searchParams.set("_",Date.now());const{headers:a={},...n}=e;let o;try{o=await fetch(t,{signal:AbortSignal.timeout(3e4),...n,headers:{"User-Agent":"canada-api/5.1.6",Accept:"*/*",...a}})}catch(e){throw e.url=t.toString(),e}if(!o.ok){const e=new Error(`Request to ${t} failed: ${o.status} ${o.statusText}`);throw e.url=t.toString(),e}let s=await o.text();const c=o.headers.get("content-type")?.includes("application/json");if(c)try{s=JSON.parse(s)}catch(e){const r=new Error(`Failed to parse JSON response from ${t}: ${e.message}`);throw r.url=t.toString(),r}return{data:s,status:o.status,statusText:o.statusText,headers:Object.fromEntries(o.headers)}},o={Jan:"01",Feb:"02",Mar:"03",Apr:"04",May:"05",Jun:"06",Jul:"07",Aug:"08",Sep:"09",Oct:"10",Nov:"11",Dec:"12"};function s(t){if(/^\d{4}-\d{2}-\d{2}$/.test(t))return new Date(t).toISOString();let e=/^\w{3} (\w{3}) (\d{2}) (\d{4}) ([\d:]{8}) GMT([\-+]\d{4})$/.exec(t);return e?new Date(`${e[3]}-${o[e[1]]}-${e[2]}T${e[4]}${e[5]}`).toISOString():t}const c={normalize:a,request:n,children:async t=>{const e=a(t);e.pathname+=".sitemap.xml";const r=await n(e,{redirect:"error"});return r.data=[...r.data.matchAll(/<url>([\s\S]*?)<\/url>/g)].map(([,t])=>{const e=t.match(/<loc>([\s\S]*?)<\/loc>/)?.[1],r=t.match(/<lastmod>([\s\S]*?)<\/lastmod>/)?.[1];return{loc:e,lastmod:r}}).filter(t=>t.loc).map(t=>({path:a(t.loc).pathname,lastmod:t.lastmod?new Date(t.lastmod).toISOString():null})),r},content:async t=>{const e=a(t);return e.pathname+=".html",n(e,{redirect:"error"})},meta:async t=>{const e=a(t);e.pathname+="/_jcr_content.json";const r=await n(e,{redirect:"error"});return r.data=(t=>{const e={};for(const[r,n]of Object.entries(t))r.endsWith("@TypeHint")||Array.isArray(n)&&0===n.length||("true"===n?e[r]=!0:"false"===n?e[r]=!1:"gcAltLanguagePeer"===r?(e[r]=n,e.peer=a(n).pathname):e[r]="string"==typeof n?s(n.trim()):n);return Object.keys(e).sort().reduce((t,r)=>(t[r]=e[r],t),{})})(r.data),r}};return e.default})());

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "canada-api",
-	"version": "5.1.5",
+	"version": "5.1.6",
 	"description": "Cross platform API to fetch data from canada.ca",
 	"type": "module",
 	"main": "src/index.js",

package/src/children.js

@@ -1,49 +1,48 @@
-import normalize from "./normalize.js";
-import request from "./request.js";
-
-/**
- * Represents a single URL entry from a sitemap
- * @typedef {object} SitemapEntry
- * @property {string} path - The normalized URL path (e.g., '/en/page')
- * @property {string|null} lastmod - ISO 8601 timestamp or null if not present
- */
-
-/**
- * Parse XML sitemap data into structured URL entries
- * @param {string} data - Raw XML sitemap content
- * @returns {SitemapEntry[]} Array of sitemap entries with path and lastmod. Entries missing a `<loc>` element are skipped.
- */
-export const parseSitemap = (xml) => {
-    return [...xml.matchAll(/<url>([\s\S]*?)<\/url>/g)]
-        .map(([, inner]) => {
-            const loc = inner.match(/<loc>([\s\S]*?)<\/loc>/)?.[1];
-            const lastmod = inner.match(/<lastmod>([\s\S]*?)<\/lastmod>/)?.[1];
-            return { loc, lastmod };
-        })
-        .filter(item => item.loc)
-        .map(item => ({
-            path: normalize(item.loc).pathname,
-            lastmod: item.lastmod ? new Date(item.lastmod).toISOString() : null,
-        }));
-}
-
-/**
- * Fetch and parse sitemap children for a canada.ca page
- * @param {string|URL} url - Absolute or relative URL
- * @returns {Promise<{data: SitemapEntry[], status: number, statusText: string, headers: object}>}
- * @throws {Error} If the request fails or returns a non-2xx status
- */
-const children = async (url) => {
-    const target = normalize(url);
-    target.pathname += '.sitemap.xml';
-    target.searchParams.set('_', Date.now());
-
-    const response = await request(target, {
-        redirect: 'error'
-    });
-
-    response.data = parseSitemap(response.data);
-    return response;
-};
-
+import normalize from "./normalize.js";
+import request from "./request.js";
+
+/**
+ * Represents a single URL entry from a sitemap
+ * @typedef {object} SitemapEntry
+ * @property {string} path - The normalized URL path (e.g., '/en/page')
+ * @property {string|null} lastmod - ISO 8601 timestamp or null if not present
+ */
+
+/**
+ * Parse XML sitemap data into structured URL entries
+ * @param {string} data - Raw XML sitemap content
+ * @returns {SitemapEntry[]} Array of sitemap entries with path and lastmod. Entries missing a `<loc>` element are skipped.
+ */
+export const parseSitemap = (xml) => {
+    return [...xml.matchAll(/<url>([\s\S]*?)<\/url>/g)]
+        .map(([, inner]) => {
+            const loc = inner.match(/<loc>([\s\S]*?)<\/loc>/)?.[1];
+            const lastmod = inner.match(/<lastmod>([\s\S]*?)<\/lastmod>/)?.[1];
+            return { loc, lastmod };
+        })
+        .filter(item => item.loc)
+        .map(item => ({
+            path: normalize(item.loc).pathname,
+            lastmod: item.lastmod ? new Date(item.lastmod).toISOString() : null,
+        }));
+}
+
+/**
+ * Fetch and parse sitemap children for a canada.ca page
+ * @param {string|URL} url - Absolute or relative URL
+ * @returns {Promise<{data: SitemapEntry[], status: number, statusText: string, headers: object}>}
+ * @throws {Error} If the request fails or returns a non-2xx status
+ */
+const children = async (url) => {
+    const target = normalize(url);
+    target.pathname += '.sitemap.xml';
+
+    const response = await request(target, {
+        redirect: 'error'
+    });
+
+    response.data = parseSitemap(response.data);
+    return response;
+};
+
 export default children;

package/src/content.js

@@ -1,21 +1,19 @@
-import normalize from "./normalize.js";
-import request from "./request.js";
-
-/**
- * Fetch HTML content for a canada.ca page
- * @param {string|URL} url - Absolute or relative URL
- * @returns {Promise<{data: string, status: number, statusText: string, headers: object}>}
- * @throws {Error} If the request fails or returns a non-2xx status
- */
-const content = async (url) => {
-    const target = normalize(url);
-    target.pathname += '.html';
-    target.searchParams.set('_', Date.now());
-
-    return request(target, { 
-        signal: AbortSignal.timeout(10000),
-        redirect: 'error'
-    });
-};
-
+import normalize from "./normalize.js";
+import request from "./request.js";
+
+/**
+ * Fetch HTML content for a canada.ca page
+ * @param {string|URL} url - Absolute or relative URL
+ * @returns {Promise<{data: string, status: number, statusText: string, headers: object}>}
+ * @throws {Error} If the request fails or returns a non-2xx status
+ */
+const content = async (url) => {
+    const target = normalize(url);
+    target.pathname += '.html';
+
+    return request(target, {
+        redirect: 'error'
+    });
+};
+
 export default content;

package/src/index.js

@@ -1,25 +1,25 @@
-import normalize from "./normalize.js";
-import request from "./request.js";
-import children from "./children.js";
-import content from "./content.js";
-import meta from "./meta.js";
-
-/**
- * @typedef {object} CanadaAPI
- * @property {function} normalize - Normalize and validate canada.ca URLs
- * @property {function} request - Raw HTTP client for canada.ca requests
- * @property {function} children - Fetch and parse sitemap hierarchies
- * @property {function} content - Fetch HTML content pages
- * @property {function} meta - Fetch and format JCR metadata
- */
-
-/** @type {CanadaAPI} */
-const ca = {
-    normalize,
-    request,
-    children,
-    content,
-    meta
-}
-
+import normalize from "./normalize.js";
+import request from "./request.js";
+import children from "./children.js";
+import content from "./content.js";
+import meta from "./meta.js";
+
+/**
+ * @typedef {object} CanadaAPI
+ * @property {function} normalize - Normalize and validate canada.ca URLs
+ * @property {function} request - Raw HTTP client for canada.ca requests
+ * @property {function} children - Fetch and parse sitemap hierarchies
+ * @property {function} content - Fetch HTML content pages
+ * @property {function} meta - Fetch and format JCR metadata
+ */
+
+/** @type {CanadaAPI} */
+const ca = {
+    normalize,
+    request,
+    children,
+    content,
+    meta
+}
+
 export default ca

package/src/meta.js

@@ -1,103 +1,101 @@
-import normalize from "./normalize.js";
-import request from "./request.js";
-
-/**
- * Month name to number mapping
- * @const {Record<string, string>}
- * @private
- */
-const months = {
-    'Jan': '01',
-    'Feb': '02',
-    'Mar': '03',
-    'Apr': '04',
-    'May': '05',
-    'Jun': '06',
-    'Jul': '07',
-    'Aug': '08',
-    'Sep': '09',
-    'Oct': '10',
-    'Nov': '11',
-    'Dec': '12'
-}
-
-/**
- * Try to parse and format date strings from JCR into ISO 8601
- * @param {string} text - Potential date string to format
- * @returns {string} ISO 8601 timestamp or original text if not a recognized date
- * @description Supports YYYY-MM-DD and JCR date format (e.g. "Wed Nov 20 2019 13:17:13 GMT-0500").
- * Uses explicit parsing to ensure consistent output across Node.js and browsers.
- * @private
- */
-function formatDate(text) {
-    // Simple YYYY-MM-DD format
-    if (/^\d{4}-\d{2}-\d{2}$/.test(text)) {
-        return new Date(text).toISOString()
-    }
-
-    // RFC1123 format
-    let m = /^\w{3} (\w{3}) (\d{2}) (\d{4}) ([\d:]{8}) GMT([\-+]\d{4})$/.exec(text)
-    if (m) {
-        return new Date(`${m[3]}-${months[m[1]]}-${m[2]}T${m[4]}${m[5]}`).toISOString()
-    }
-
-    return text
-}
-
-/**
- * Format and normalize metadata object
- * @param {Record<string, any>} data - Raw metadata object from JCR
- * @returns {Record<string, any>} Formatted metadata with normalized types and sorted keys
- * @description Converts string booleans to native booleans, formats dates to ISO 8601,
- * removes @TypeHint properties and empty arrays, sorts keys alphabetically, and adds a
- * normalized `peer` field when `gcAltLanguagePeer` is present.
- */
-export const formatMeta = (data) => {
-    const result = {}
-
-    for (const [key, value] of Object.entries(data)) {
-        if (key.endsWith('@TypeHint')) continue
-        if (Array.isArray(value) && value.length === 0) continue
-
-        if (value === 'true') {
-            result[key] = true
-        } else if (value === 'false') {
-            result[key] = false
-        } else if (key === 'gcAltLanguagePeer') {
-            result[key] = value
-            result['peer'] = normalize(value).pathname
-        } else if (typeof value === 'string') {
-            result[key] = formatDate(value.trim())
-        } else {
-            result[key] = value
-        }
-    }
-
-    // Sort object keys alphabetically for readability
-    return Object.keys(result).sort().reduce((obj, key) => {
-        obj[key] = result[key]
-        return obj
-    }, {})
-}
-
-/**
- * Fetch and format JCR metadata for a canada.ca page
- * @param {string|URL} url - Absolute or relative URL
- * @returns {Promise<{data: Record<string, any>, status: number, statusText: string, headers: object}>}
- * @throws {Error} If the request fails or returns a non-2xx status
- */
-const meta = async (url) => {
-    const target = normalize(url);
-    target.pathname += '/_jcr_content.json';
-    target.searchParams.set('_', Date.now());
-
-    const response = await request(target, {
-        signal: AbortSignal.timeout(10000),
-        redirect: 'error'
-    });
-    
-    response.data = formatMeta(response.data);
-    return response;
-};
-
+import normalize from "./normalize.js";
+import request from "./request.js";
+
+/**
+ * Month name to number mapping
+ * @const {Record<string, string>}
+ * @private
+ */
+const months = {
+    'Jan': '01',
+    'Feb': '02',
+    'Mar': '03',
+    'Apr': '04',
+    'May': '05',
+    'Jun': '06',
+    'Jul': '07',
+    'Aug': '08',
+    'Sep': '09',
+    'Oct': '10',
+    'Nov': '11',
+    'Dec': '12'
+}
+
+/**
+ * Try to parse and format date strings from JCR into ISO 8601
+ * @param {string} text - Potential date string to format
+ * @returns {string} ISO 8601 timestamp or original text if not a recognized date
+ * @description Supports YYYY-MM-DD and JCR date format (e.g. "Wed Nov 20 2019 13:17:13 GMT-0500").
+ * Uses explicit parsing to ensure consistent output across Node.js and browsers.
+ * @private
+ */
+function formatDate(text) {
+    // Simple YYYY-MM-DD format
+    if (/^\d{4}-\d{2}-\d{2}$/.test(text)) {
+        return new Date(text).toISOString()
+    }
+
+    // RFC1123 format
+    let m = /^\w{3} (\w{3}) (\d{2}) (\d{4}) ([\d:]{8}) GMT([\-+]\d{4})$/.exec(text)
+    if (m) {
+        return new Date(`${m[3]}-${months[m[1]]}-${m[2]}T${m[4]}${m[5]}`).toISOString()
+    }
+
+    return text
+}
+
+/**
+ * Format and normalize metadata object
+ * @param {Record<string, any>} data - Raw metadata object from JCR
+ * @returns {Record<string, any>} Formatted metadata with normalized types and sorted keys
+ * @description Converts string booleans to native booleans, formats dates to ISO 8601,
+ * removes @TypeHint properties and empty arrays, sorts keys alphabetically, and adds a
+ * normalized `peer` field when `gcAltLanguagePeer` is present.
+ */
+export const formatMeta = (data) => {
+    const result = {}
+
+    for (const [key, value] of Object.entries(data)) {
+        if (key.endsWith('@TypeHint')) continue
+        if (Array.isArray(value) && value.length === 0) continue
+
+        if (value === 'true') {
+            result[key] = true
+        } else if (value === 'false') {
+            result[key] = false
+        } else if (key === 'gcAltLanguagePeer') {
+            result[key] = value
+            result['peer'] = normalize(value).pathname
+        } else if (typeof value === 'string') {
+            result[key] = formatDate(value.trim())
+        } else {
+            result[key] = value
+        }
+    }
+
+    // Sort object keys alphabetically for readability
+    return Object.keys(result).sort().reduce((obj, key) => {
+        obj[key] = result[key]
+        return obj
+    }, {})
+}
+
+/**
+ * Fetch and format JCR metadata for a canada.ca page
+ * @param {string|URL} url - Absolute or relative URL
+ * @returns {Promise<{data: Record<string, any>, status: number, statusText: string, headers: object}>}
+ * @throws {Error} If the request fails or returns a non-2xx status
+ */
+const meta = async (url) => {
+    const target = normalize(url);
+    target.pathname += '/_jcr_content.json';
+
+    const response = await request(target, {
+        redirect: 'error'
+    });
+    
+    response.data = formatMeta(response.data);
+    return response;
+};
+
 export default meta;

package/src/normalize.js

@@ -1,38 +1,38 @@
-import { BASE_URL } from './config.js';
-
-/**
- * Normalize a canada.ca URL to a clean pathname
- * @param {string|URL} url - A full URL or relative path (e.g., 'https://www.canada.ca/en/page' or '/en/page')
- * @returns {URL} Normalized URL object with cleaned pathname
- * @throws {TypeError} If url is not a string or URL object
- * @throws {Error} If URL is not from canada.ca or path doesn't start with /en/ or /fr/
- */
-const normalize = (url) => {
-
-    if (typeof url === 'string') {
-        url = new URL(url, BASE_URL)
-    } else if (url instanceof URL) {
-        url = new URL(url.href)
-    } else {
-        throw new TypeError('string or URL object expected')
-    }
-
-    // Verify domain
-    if (url.origin !== BASE_URL) {
-        throw new Error('URL must start with ' + BASE_URL)
-    }
-
-    url.pathname = url.pathname.replace(/^\/content\/canadasite/, '');
-
-    // Remove file extensions (like .html, .xml) and trailing slashes
-    url.pathname = url.pathname.replace(/\.[^/]*$/, '').replace(/\/+$/, '');
-
-    // Verify root language
-    if (!url.pathname.startsWith('/en/') && !url.pathname.startsWith('/fr/')) {
-        throw new Error(`Invalid path: "${url.pathname}" must start with /en/ or /fr/`)
-    }
-
-    return url
-}
-
+import { BASE_URL } from './config.js';
+
+/**
+ * Normalize a canada.ca URL to a clean pathname
+ * @param {string|URL} url - A full URL or relative path (e.g., 'https://www.canada.ca/en/page' or '/en/page')
+ * @returns {URL} Normalized URL object with cleaned pathname
+ * @throws {TypeError} If url is not a string or URL object
+ * @throws {Error} If URL is not from canada.ca or path doesn't start with /en/ or /fr/
+ */
+const normalize = (url) => {
+
+    if (typeof url === 'string') {
+        url = new URL(url, BASE_URL)
+    } else if (url instanceof URL) {
+        url = new URL(url.href)
+    } else {
+        throw new TypeError('string or URL object expected')
+    }
+
+    // Verify domain
+    if (url.origin !== BASE_URL) {
+        throw new Error('URL must start with ' + BASE_URL)
+    }
+
+    url.pathname = url.pathname.replace(/^\/content\/canadasite/, '');
+
+    // Remove file extensions (like .html, .xml) and trailing slashes
+    url.pathname = url.pathname.replace(/\.[^/]*$/, '').replace(/\/+$/, '');
+
+    // Verify root language
+    if (!url.pathname.startsWith('/en/') && !url.pathname.startsWith('/fr/')) {
+        throw new Error(`Invalid path: "${url.pathname}" must start with /en/ or /fr/`)
+    }
+
+    return url
+}
+
 export default normalize;

package/src/request.js

@@ -1,5 +1,8 @@
 import { BASE_URL } from "./config.js";
 
+/** @type {number} Default request timeout in ms. Callers can override by passing a `signal` in options. */
+const DEFAULT_TIMEOUT = 30000;
+
 /**
  * Raw HTTP client for canada.ca
  * @param {string|URL} url - Relative or absolute URL on canada.ca
@@ -9,16 +12,17 @@ import { BASE_URL } from "./config.js";
  */
 const request = async (url, options = {}) => {
     url = new URL(url, BASE_URL);
+    url.searchParams.set('_', Date.now());
 
     const { headers: customHeaders = {}, ...requestOptions } = options;
 
     let response;
     try {
         response = await fetch(url, {
-            signal: AbortSignal.timeout(30000),
+            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
             ...requestOptions,
             headers: {
-                'User-Agent': 'canada-api/5.1.5',
+                'User-Agent': 'canada-api/5.1.6',
                 'Accept': '*/*',
                 ...customHeaders
             }
@@ -29,7 +33,7 @@ const request = async (url, options = {}) => {
     }
 
     if (!response.ok) {
-        const error = new Error(`${response.status} ${response.statusText}`);
+        const error = new Error(`Request to ${url} failed: ${response.status} ${response.statusText}`);
         error.url = url.toString();
         throw error;
     }
@@ -41,8 +45,9 @@ const request = async (url, options = {}) => {
         try {
             data = JSON.parse(data);
         } catch (e) {
-            e.url = url.toString();
-            throw e;
+            const error = new Error(`Failed to parse JSON response from ${url}: ${e.message}`);
+            error.url = url.toString();
+            throw error;
         }
     }