pagerts 0.1.2 → 0.1.3

package/package.json

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

package/src/main.ts

@@ -5,7 +5,7 @@ import { description, name, version } from '../package.json';
 import { PageExtractor } from "./extractors/PageExtractor";
 import { ResourceExtractor } from "./extractors/ResourceExtractor";
 import { isJSDOM, PageFetcher, type PageResponse } from "./page/PageFetcher";
-import { isPage, type Page, type PageMetadata } from "./page/PageMetadata";
+import { type Page } from "./page/PageMetadata";
 import { JSONStylePrinter } from "./printers/JSONStylePrinter";
 
 const program = new Command();
@@ -20,22 +20,28 @@ const url = createArgument("<url|file...>", "remote URL or local file to extract
     .addArgument(url)
     .action(async (urls: string[]) => {
       const printer = new JSONStylePrinter();
-      const pageFetcher = new PageFetcher()
-      const pageExtractor = new PageExtractor()
-      const resourceExtractor = new ResourceExtractor(["a", "meta", "link", "embed"])
-      const pagesFetched = await pageFetcher.fetchAll(urls);
-      const metadataPages: Page[] = []
-      for (const page of pagesFetched) {
-        // 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);
+      try {
+        const pageFetcher = new PageFetcher()
+        const pageExtractor = new PageExtractor()
+        const resourceExtractor = new ResourceExtractor(["a", "meta", "link", "embed"])
+        const pagesFetched: PageResponse[] = await pageFetcher.fetchAll(urls);
+        const metadataPages: Page[] = []
+        for (const page of pagesFetched) {
+          // 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);
+      } catch (error) {
+        await printer.print({
+          error: error.message
+        })
       }
-      await printer.print(...metadataPages);
     })
     .parseAsync(process.argv);
 })();

package/src/page/PageFetcher.ts

@@ -15,11 +15,7 @@ export class PageFetcher {
             });
             return dom;
         } catch (error) {
-            return {
-                url,
-                title: "Plain resource",
-                error
-            }
+            throw error;
         }
     }
     async fetchAll(urls: string[]): Promise<PageResponse[]> {

package/src/page/PageMetadata.ts

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