pagerts 0.1.1 → 0.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pagerts",
   "description": "A tool for viewing external relations in a webpage",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "main.js",
   "bin": {
     "pagerts": "bin/main.js"

package/src/main.ts

@@ -4,8 +4,8 @@ import { Command, createArgument } from "commander";
 import { description, name, version } from '../package.json';
 import { PageExtractor } from "./extractors/PageExtractor";
 import { ResourceExtractor } from "./extractors/ResourceExtractor";
-import { PageFetcher } from "./page/PageFetcher";
-import type { PageMetadata } from "./page/PageMetadata";
+import { isJSDOM, PageFetcher, type PageResponse } from "./page/PageFetcher";
+import { isPage, type Page, type PageMetadata } from "./page/PageMetadata";
 import { JSONStylePrinter } from "./printers/JSONStylePrinter";
 
 const program = new Command();
@@ -24,13 +24,16 @@ const url = createArgument("<url|file...>", "remote URL or local file to extract
       const pageExtractor = new PageExtractor()
       const resourceExtractor = new ResourceExtractor(["a", "meta", "link", "embed"])
       const pagesFetched = await pageFetcher.fetchAll(urls);
-      const metadataPages:PageMetadata[] = []
+      const metadataPages: Page[] = []
       for (const page of pagesFetched) {
-        const resources = await resourceExtractor.extract(page);
-        const descriptor = await pageExtractor.extract(page);
-        metadataPages.push({
+        // check if page has an error
+        if (isJSDOM(page)) {
+          const resources = await resourceExtractor.extract(page);
+          const descriptor = await pageExtractor.extract(page);
+          metadataPages.push({
             ...descriptor, resources
           });
+        } else metadataPages.push(page);
       }
       await printer.print(...metadataPages);
     })

package/src/page/PageFetcher.ts

@@ -1,16 +1,29 @@
 import { JSDOM, VirtualConsole } from 'jsdom';
+import type { Page } from './PageMetadata';
+
+export type PageResponse = JSDOM | Page
+
+export const isJSDOM = (page: PageResponse): page is JSDOM => 'window' in page;
 
 export class PageFetcher {
-    async fetchPage(url: string): Promise<JSDOM> {
-        const dom = await JSDOM.fromURL(url, {
-            virtualConsole: new VirtualConsole().on('jsdomError', (error) => {
-                console.error(`Error parsing ${url}:`, error.message);
-            })
-        });
-        return dom;
+    async fetchPage(url: string): Promise<PageResponse> {
+        try {
+            const dom = await JSDOM.fromURL(url, {
+                virtualConsole: new VirtualConsole().on('jsdomError', (error) => {
+                    console.error(`Error parsing ${url}:`, error.message);
+                })
+            });
+            return dom;
+        } catch (error) {
+            return {
+                url,
+                title: "Plain resource",
+                error
+            }
+        }
     }
-    async fetchAll(urls:string[]): Promise<JSDOM[]> {
+    async fetchAll(urls: string[]): Promise<PageResponse[]> {
         return await Promise.all(urls.map(url => this.fetchPage(url)));
     }
-    constructor() {}
+    constructor() { }
 }

package/src/page/PageMetadata.ts

@@ -1,4 +1,9 @@
 import type { ExternalResource } from "../resource";
+import type { PageResponse } from "./PageFetcher";
+
+type mightHaveError = {
+    error: Error 
+}
 
 type hasTitle = {
     title: string;
@@ -8,8 +13,13 @@ type hasUrl = {
     url: string;
 };
 
-export type PageDescriptor = hasTitle & hasUrl;
+export type PageDescriptor = hasTitle & hasUrl 
 
 export type PageMetadata = {
     resources: ExternalResource[];
-} & PageDescriptor;
+} 
+
+export type Page = (PageDescriptor & (PageMetadata | mightHaveError))
+
+export const isPage = (page: any): page is Page => 
+  "resources" in page && Array.isArray(page.resources);

package/src/printers/AbstractResourcePrinter.ts

@@ -1,6 +1,6 @@
-import type { PageMetadata } from "../page/PageMetadata";
+import type { Page } from "../page/PageMetadata";
 
 export abstract class AbstractResourcePrinter {
     constructor() {  }
-    abstract print(...pages: PageMetadata[]): void | Promise<void>;
+    abstract print(...pages: Page[]): void | Promise<void>;
 }

package/src/printers/JSONStylePrinter.ts

@@ -1,9 +1,9 @@
-import type { PageMetadata } from "../page/PageMetadata";
+import type { Page } from "../page/PageMetadata";
 import { AbstractResourcePrinter } from "./AbstractResourcePrinter";
 
 
 export class JSONStylePrinter extends AbstractResourcePrinter {
-    print(...pages: PageMetadata[]): void | Promise<void> {
+    print(...pages: Page[]): void | Promise<void> {
         const json = JSON.stringify(pages);
         process.stdout.write(json + "\n")
     }