From e91f2e8492cee3c82fb50a0f848c981f869a412c Mon Sep 17 00:00:00 2001
From: Alastair D'Silva <alastair@d-silva.org>
Date: Sat, 3 May 2025 19:19:10 +1000
Subject: [PATCH 1/6] fix(spelling): 'Extension'

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
 README.md                                         | 6 +++---
 docs/scrape.md                                    | 6 +++---
 src/classes/scrape-command.class.ts               | 4 ++--
 src/commands/scrape/amazon/helpers/file.helper.ts | 4 ++--
 src/interfaces/amazon-options.interface.ts        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4c92c0c2..5ed05c42 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ Used to get invoices from amazon
 ```
 USAGE
   $ docudigger scrape amazon -u <value> -p <value> [--json] [--logLevel trace|debug|info|warn|error] [-d] [-l
-    <value>] [-c <value> -r] [--fileDestinationFolder <value>] [--fileFallbackExentension <value>] [-t <value>]
+    <value>] [-c <value> -r] [--fileDestinationFolder <value>] [--fileFallbackExtension <value>] [-t <value>]
     [--yearFilter <value>] [--pageFilter <value>] [--onlyNew]
 
 FLAGS
@@ -109,8 +109,8 @@ FLAGS
   -r, --recurring
   -t, --tld=<value>                  [default: de] Amazon top level domain
   -u, --username=<value>             (required) Username
-  --fileDestinationFolder=<value>    [default: ./data/] Amazon top level domain
-  --fileFallbackExentension=<value>  [default: .pdf] Amazon top level domain
+  --fileDestinationFolder=<value>    [default: ./data/] Where to save the invoices
+  --fileFallbackExtension=<value>    [default: .pdf] File extension for unknown file type
   --logLevel=<option>                [default: info] Specify level for logging.
                                      <options: trace|debug|info|warn|error>
   --onlyNew                          Gets only new invoices
diff --git a/docs/scrape.md b/docs/scrape.md
index 8ec152fd..847fa9cd 100644
--- a/docs/scrape.md
+++ b/docs/scrape.md
@@ -34,7 +34,7 @@ Scrapes amazon invoices
 ```
 USAGE
   $ document-scraper scrape amazon -u <value> -p <value> [-l <value>] [-l <value>] [--fileDestinationFolder
-    <value>] [--fileFallbackExentension <value>] [-t <value>] [--yearFilter <value>] [--pageFilter <value>] [-d]
+    <value>] [--fileFallbackExtension <value>] [-t <value>] [--yearFilter <value>] [--pageFilter <value>] [-d]
 
 FLAGS
   -d, --debug
@@ -43,8 +43,8 @@ FLAGS
   -p, --password=<value>             (required) Username
   -t, --tld=<value>                  [default: de] Amazon top level domain
   -u, --username=<value>             (required) Username
-  --fileDestinationFolder=<value>    [default: ./data/] Amazon top level domain
-  --fileFallbackExentension=<value>  [default: .pdf] Amazon top level domain
+  --fileDestinationFolder=<value>    [default: ./data/] Where to save the invoices
+  --fileFallbackExtension=<value>    [default: .pdf] File extension for unknown file type
   --pageFilter=<value>               Filters a page
   --yearFilter=<value>               Filters a year
 
diff --git a/src/classes/scrape-command.class.ts b/src/classes/scrape-command.class.ts
index 06137f05..699fcd7c 100644
--- a/src/classes/scrape-command.class.ts
+++ b/src/classes/scrape-command.class.ts
@@ -46,8 +46,8 @@ export abstract class ScrapeCommand<
       description: `Amazon top level domain`,
       env: `FILE_DESTINATION_FOLDER`,
     }),
-    fileFallbackExentension: Flags.string({
-      aliases: [`fileFallbackExentension`],
+    fileFallbackExtension: Flags.string({
+      aliases: [`fileFallbackExtension`],
       default: `.pdf`,
       description: `Amazon top level domain`,
       env: `FILE_FALLBACK_EXTENSION`,
diff --git a/src/commands/scrape/amazon/helpers/file.helper.ts b/src/commands/scrape/amazon/helpers/file.helper.ts
index 1c1f26bd..17c1331c 100644
--- a/src/commands/scrape/amazon/helpers/file.helper.ts
+++ b/src/commands/scrape/amazon/helpers/file.helper.ts
@@ -36,9 +36,9 @@ export class FileHandler<T extends typeof Command> {
       path.join(this.flags.fileDestinationFolder, this.flags.subFolderForPages ? this.pluginName : ``, `/`),
       `./`
     );
-    const fileExtention = path.extname(invoiceUrl).split(`?`)[0] ?? this.flags.fileFallbackExentension;
+    const fileExtension = path.extname(invoiceUrl).split(`?`)[0] ?? this.flags.fileFallbackExtension;
     const fileName = `${order.date}_AMZ_${order.number}_${invoiceIndex + 1}`;
-    const fullFilePath = path.resolve(destPluginFileFolder, `${fileName}${fileExtention}`);
+    const fullFilePath = path.resolve(destPluginFileFolder, `${fileName}${fileExtension}`);
     const pathNormalized = path.normalize(fullFilePath);
     return { destPluginFileFolder, pathNormalized };
   }
diff --git a/src/interfaces/amazon-options.interface.ts b/src/interfaces/amazon-options.interface.ts
index 52794589..5ac7526e 100644
--- a/src/interfaces/amazon-options.interface.ts
+++ b/src/interfaces/amazon-options.interface.ts
@@ -9,7 +9,7 @@ export interface AmazonOptions {
     username: string,
     password: string,
     fileDestinationFolder: string,
-    fileFallbackExentension: string,
+    fileFallbackExtension: string,
     tld: string,
     yearFilter: number,
     pageFilter: number,

From 71e2d582bb217b9f30b33ae6aee7112b7b70f4be Mon Sep 17 00:00:00 2001
From: Alastair D'Silva <alastair@d-silva.org>
Date: Sat, 3 May 2025 19:20:20 +1000
Subject: [PATCH 2/6] fix(permissions): dev command should be executable

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
 bin/dev | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/dev

diff --git a/bin/dev b/bin/dev
old mode 100644
new mode 100755

From 1986eb7a4db45eec9acdf97c3ab3f0e191eb3722 Mon Sep 17 00:00:00 2001
From: Alastair D'Silva <alastair@d-silva.org>
Date: Sat, 3 May 2025 20:02:51 +1000
Subject: [PATCH 3/6] fix(timeout): increase timeout for popover

The popover timeout is too low and false triggers on slower connections

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
 src/classes/scrape-command.class.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/classes/scrape-command.class.ts b/src/classes/scrape-command.class.ts
index 699fcd7c..53f99e50 100644
--- a/src/classes/scrape-command.class.ts
+++ b/src/classes/scrape-command.class.ts
@@ -29,7 +29,7 @@ export abstract class ScrapeCommand<
     `--disable-setuid-sandbox`,
   ];
 
-  public selectorWaitTimeout = 2000;
+  public selectorWaitTimeout = 10000;
 
   protected flags!: ScrapeFlags<T>;
   static baseFlags = {

From dc6f6698beb910ba62b43704aad1cfd95a404d56 Mon Sep 17 00:00:00 2001
From: Alastair D'Silva <alastair@d-silva.org>
Date: Sat, 3 May 2025 20:09:02 +1000
Subject: [PATCH 4/6] fix(tld): support the Australian Amazon site

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
 src/commands/scrape/amazon/index.ts | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/commands/scrape/amazon/index.ts b/src/commands/scrape/amazon/index.ts
index aed15013..1f0c203b 100644
--- a/src/commands/scrape/amazon/index.ts
+++ b/src/commands/scrape/amazon/index.ts
@@ -319,13 +319,31 @@ export default class Amazon extends ScrapeCommand<typeof Amazon> {
     exit(this.logger, options.recurring);
   }
 
+  private getLoginPage(tld: string) {
+    switch (tld) {
+      case 'au':
+        return `https://www.amazon.com.au/ap/signin?openid.pape.max_auth_age=0&openid.return_to=https%3A%2F%2Fwww.amazon.com.au%2Fgp%2Fyourstore%2Fhome%3Fpath%3D%252Fgp%252Fyourstore%252Fhome%26signIn%3D1%26useRedirectOnSuccess%3D1%26action%3Dsign-out%26ref_%3Dnav_AccountFlyout_signout&openid.assoc_handle=auflex&openid.mode=checkid_setup&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0`;
+      default:
+        return `https://www.amazon.${tld}/ap/signin?openid.pape.max_auth_age=0&openid.return_to=https%3A%2F%2Fwww.amazon.de%2F%3Fref_%3Dnav_signin&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.assoc_handle=deflex&openid.mode=checkid_setup&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&`;
+    }
+  }
+
+  private getOrderPage(tld: string) {
+    switch (tld) {
+      case 'au':
+        return `https://www.amazon.com.au/gp/css/order-history`;
+      default:
+        return `https://www.amazon.${tld}/gp/css/order-history`;
+    }
+  }
+
   private getSelectors(tld: string): { amazonSelectors: AmazonSelectors, amazon: AmazonDefinition } {
     this.logger.debug(`Getting selectors...`);
     const amazon: AmazonDefinition = {
       lang: null,
       tld,
-      loginPage: `https://www.amazon.${tld}/ap/signin?openid.pape.max_auth_age=0&openid.return_to=https%3A%2F%2Fwww.amazon.de%2F%3Fref_%3Dnav_signin&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.assoc_handle=deflex&openid.mode=checkid_setup&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&`,
-      orderPage: `https://www.amazon.${tld}/gp/css/order-history`
+      loginPage: this.getLoginPage(tld),
+      orderPage: this.getOrderPage(tld)
     };
     return { amazonSelectors, amazon };
   }

From 7b82c3df09bf08a3ecfee3eae5b9d2f0ce03e4d2 Mon Sep 17 00:00:00 2001
From: Alastair D'Silva <alastair@d-silva.org>
Date: Sat, 3 May 2025 20:10:32 +1000
Subject: [PATCH 5/6] fix(downloads): if there is no PDF invoice, save the
 printable order summary

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
 .../scrape/amazon/helpers/file.helper.ts         | 10 +++++++++-
 src/commands/scrape/amazon/index.ts              | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/commands/scrape/amazon/helpers/file.helper.ts b/src/commands/scrape/amazon/helpers/file.helper.ts
index 17c1331c..60cd5837 100644
--- a/src/commands/scrape/amazon/helpers/file.helper.ts
+++ b/src/commands/scrape/amazon/helpers/file.helper.ts
@@ -36,10 +36,18 @@ export class FileHandler<T extends typeof Command> {
       path.join(this.flags.fileDestinationFolder, this.flags.subFolderForPages ? this.pluginName : ``, `/`),
       `./`
     );
-    const fileExtension = path.extname(invoiceUrl).split(`?`)[0] ?? this.flags.fileFallbackExtension;
+
+    const urlLower = invoiceUrl.toLowerCase();
+    const isHTML = urlLower.includes('.html') && !urlLower.endsWith('.pdf');
+
+    const fileExtension = isHTML
+      ? '.html'
+      : (path.extname(invoiceUrl).split('?')[0] || this.flags.fileFallbackExtension);
+
     const fileName = `${order.date}_AMZ_${order.number}_${invoiceIndex + 1}`;
     const fullFilePath = path.resolve(destPluginFileFolder, `${fileName}${fileExtension}`);
     const pathNormalized = path.normalize(fullFilePath);
+
     return { destPluginFileFolder, pathNormalized };
   }
 
diff --git a/src/commands/scrape/amazon/index.ts b/src/commands/scrape/amazon/index.ts
index 1f0c203b..f656fa85 100644
--- a/src/commands/scrape/amazon/index.ts
+++ b/src/commands/scrape/amazon/index.ts
@@ -273,6 +273,22 @@ export default class Amazon extends ScrapeCommand<typeof Amazon> {
       this.logger.debug(`Got popover ${(orderIndex + 1)} -> ${popover}`);
       const invoiceList = await popover.waitForSelector(this.selectors.invoiceList, { timeout: this.selectorWaitTimeout });
       invoiceUrls = await invoiceList.$$eval(this.selectors.invoiceLinks, (handles: HTMLAnchorElement[]) => handles.map(a => a.href));
+
+      // if no invoices, fall back to the printable order summary link
+      if (invoiceUrls.length === 0) {
+        const printSummaryUrls = await invoiceList.$$eval(
+          'a[href*=".html"]:not([href*="contact.html"])',
+          (handles: HTMLAnchorElement[]) => handles.map(a => a.href)
+        );
+
+        if (printSummaryUrls.length > 0) {
+          this.logger.info(
+            `No invoices found, using Printable Order Summary URL [#${orderIndex + 1}]: ${JSON.stringify(printSummaryUrls)}`
+          );
+          invoiceUrls = printSummaryUrls;
+        }
+      }
+
       this.logger.debug(`Got invoiceUrls ${(orderIndex + 1)} -> ${invoiceUrls}`);
     } catch (ex) {
       this.logger.error(`Couldn't get popover ${popoverSelectorResolved} within ${this.selectorWaitTimeout}ms. Skipping. ${ex.message}`);

From c3be5593fdff4976b4faccba9b894dad331ecef2 Mon Sep 17 00:00:00 2001
From: Alastair D'Silva <alastair@d-silva.org>
Date: Sat, 3 May 2025 20:11:41 +1000
Subject: [PATCH 6/6] fix(style): getInvoiceDocumentsFromOrder does't just deal
 with pdfs, so rename pdfPage

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
 src/commands/scrape/amazon/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commands/scrape/amazon/index.ts b/src/commands/scrape/amazon/index.ts
index f656fa85..c14ea2a2 100644
--- a/src/commands/scrape/amazon/index.ts
+++ b/src/commands/scrape/amazon/index.ts
@@ -217,12 +217,12 @@ export default class Amazon extends ScrapeCommand<typeof Amazon> {
     for (const [invoiceIndex, invoice] of order.invoices.entries()) {
       const invoiceUrl = invoice.url;
       await new Promise(resolve => setTimeout(resolve, 100));
-      const pdfPage = await this.newPage();
-      await pdfPage.goto(invoiceUrl);
+      const page = await this.newPage();
+      await page.goto(invoiceUrl);
       invoice.status = InvoiceStatus.opened;
 
       try {
-        const fileReaderString = await this.fileHandler.getFileReaderString(pdfPage, invoiceUrl);
+        const fileReaderString = await this.fileHandler.getFileReaderString(page, invoiceUrl);
         const fileBuffer = this.fileHandler.getFileBuffer(fileReaderString, invoice, order, invoiceUrl);
         if (fileBuffer) {
           this.logger.debug(`Buffer exists`);
@@ -235,7 +235,7 @@ export default class Amazon extends ScrapeCommand<typeof Amazon> {
       }
 
       this.logger.debug(`Closing invoice page`);
-      await pdfPage.close();
+      await page.close();
     }
   }