@pagepocket/cli 0.6.3 → 0.7.1

package/README.md

@@ -14,6 +14,7 @@ npm i -g @pagepocket/cli
 ```bash
 pp https://example.com
 pp https://example.com -o ./snapshots
+pp https://example.com -o ./snapshots --overwrite
 ```
 
 ## Output

package/dist/cli.js

@@ -12,41 +12,72 @@ const chalk_1 = __importDefault(require("chalk"));
 const prepare_output_1 = require("./stages/prepare-output");
 const write_snapshot_1 = require("./stages/write-snapshot");
 const with_spinner_1 = require("./utils/with-spinner");
+const MAX_STATUS_URL_LENGTH = 80;
+const formatStatusUrl = (url) => {
+    if (url.length <= MAX_STATUS_URL_LENGTH) {
+        return url;
+    }
+    return `${url.slice(0, MAX_STATUS_URL_LENGTH - 3)}...`;
+};
 class PagepocketCommand extends core_1.Command {
     async run() {
         const { args, flags } = await this.parse(PagepocketCommand);
         const targetUrl = args.url;
         const outputFlag = flags.output ? flags.output.trim() : undefined;
+        const overwrite = flags.overwrite === true;
         const triggerActions = (flags.action ?? []);
         const runtime = flags.runtime;
+        const timeoutMs = typeof flags.timeout === "number" ? flags.timeout : undefined;
+        const maxDurationMs = typeof flags.maxDuration === "number" ? flags.maxDuration : undefined;
         const headers = {
             "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
             accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
             "accept-language": "en-US,en;q=0.9",
             referer: targetUrl
         };
-        const snapshot = await (0, with_spinner_1.withSpinner)(async () => {
-            const interceptor = runtime === "puppeteer"
-                ? new puppeteer_adapter_1.PuppeteerAdapter({
-                    gotoOptions: { waitUntil: "networkidle0" },
-                    triggerActions
-                })
-                : new lighterceptor_adapter_1.LighterceptorAdapter({ headers, triggerActions });
-            const pagepocket = lib_1.PagePocket.fromURL(targetUrl);
-            return pagepocket.capture({
-                interceptor,
-                completion: { wait: async () => { } }
-            });
-        }, "Capturing snapshot");
-        const { outputDir } = await (0, with_spinner_1.withSpinner)(() => (0, prepare_output_1.prepareOutputDir)(snapshot.title ?? "snapshot", outputFlag), "Preparing output directory");
-        await (0, with_spinner_1.withSpinner)(async () => {
-            await (0, write_snapshot_1.writeSnapshotFiles)({
+        const interceptor = runtime === "puppeteer"
+            ? new puppeteer_adapter_1.PuppeteerAdapter({
+                // gotoOptions: { waitUntil: "networkidle2" },
+                triggerActions
+            })
+            : new lighterceptor_adapter_1.LighterceptorAdapter({ headers, triggerActions });
+        const pagepocket = lib_1.PagePocket.fromURL(targetUrl);
+        const snapshot = await (0, with_spinner_1.withSpinner)(async (spinner) => {
+            const eventsTask = (async () => {
+                for await (const event of pagepocket.interceptedRequestEvents()) {
+                    if (event.type === "request") {
+                        spinner.text = `Freezing page (${formatStatusUrl(event.url)})`;
+                    }
+                }
+            })();
+            try {
+                return await pagepocket.capture({
+                    interceptor,
+                    timeoutMs,
+                    maxDurationMs,
+                    blacklist: [...lib_1.ga, ...lib_1.sw_iframe, ...lib_1.ns]
+                });
+            }
+            finally {
+                try {
+                    await eventsTask;
+                }
+                catch {
+                    // Ignore event stream errors during shutdown.
+                }
+            }
+        }, "Freezing page");
+        const { outputDir } = await (0, with_spinner_1.withSpinner)((_spinner) => (0, prepare_output_1.prepareOutputDir)(snapshot.title ?? "snapshot", outputFlag), "Preparing output directory");
+        const writeResult = await (0, with_spinner_1.withSpinner)(async (_spinner) => {
+            return (0, write_snapshot_1.writeSnapshotFiles)({
                 outputDir,
-                snapshot
+                snapshot,
+                overwrite
             });
         }, "Writing snapshot files");
+        const resolvedOutputDir = writeResult?.outputDir ?? outputDir;
         this.log(chalk_1.default.green("All done! Snapshot created."));
-        this.log(`Snapshot saved to ${chalk_1.default.cyan(outputDir)}`);
+        this.log(`Snapshot saved to ${chalk_1.default.cyan(resolvedOutputDir)}`);
         process.exit();
     }
 }
@@ -65,6 +96,10 @@ PagepocketCommand.flags = {
         char: "o",
         description: "Output path for the snapshot HTML file"
     }),
+    overwrite: core_1.Flags.boolean({
+        description: "Overwrite existing output directory instead of suffixing",
+        default: false
+    }),
     action: core_1.Flags.string({
         char: "a",
         description: "Trigger action to run during/after capture (repeatable). Use -a multiple times to run multiple actions.",
@@ -76,6 +111,15 @@ PagepocketCommand.flags = {
         description: "Interceptor runtime to use",
         options: ["lighterceptor", "puppeteer"],
         default: "lighterceptor"
+    }),
+    timeout: core_1.Flags.integer({
+        char: "t",
+        description: "Network idle duration in milliseconds before capture stops",
+        default: 5000
+    }),
+    maxDuration: core_1.Flags.integer({
+        description: "Hard max capture duration in milliseconds",
+        default: 60000
     })
 };
 exports.default = PagepocketCommand;

package/dist/stages/prepare-output.js

@@ -4,14 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareOutputDir = void 0;
-const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const filename_1 = require("../lib/filename");
 const prepareOutputDir = async (title, outputFlag) => {
     const safeTitle = (0, filename_1.safeFilename)(title || "snapshot");
     const baseDir = outputFlag ? node_path_1.default.resolve(outputFlag) : process.cwd();
     const outputDir = node_path_1.default.join(baseDir, safeTitle);
-    await promises_1.default.mkdir(outputDir, { recursive: true });
     return {
         safeTitle,
         outputDir

package/dist/stages/write-snapshot.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeSnapshotFiles = void 0;
 const writeSnapshotFiles = async (input) => {
-    await input.snapshot.toDirectory(input.outputDir);
+    return input.snapshot.toDirectory(input.outputDir, {
+        overwrite: input.overwrite
+    });
 };
 exports.writeSnapshotFiles = writeSnapshotFiles;

package/dist/utils/with-spinner.js

@@ -8,7 +8,7 @@ const ora_1 = __importDefault(require("ora"));
 const withSpinner = async (run, spinnerText) => {
     const spinner = (0, ora_1.default)(spinnerText).start();
     try {
-        const result = await run();
+        const result = await run(spinner);
         spinner.succeed(spinnerText.replace(/\.$/, "") || spinnerText);
         return result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagepocket/cli",
-  "version": "0.6.3",
+  "version": "0.7.1",
   "description": "CLI for capturing offline snapshots of web pages.",
   "main": "dist/index.js",
   "bin": {
@@ -16,10 +16,10 @@
     "@oclif/core": "^4.0.9",
     "chalk": "^4.1.2",
     "ora": "^9.0.0",
-    "@pagepocket/lib": "0.6.3",
-    "@pagepocket/interceptor": "0.6.3",
-    "@pagepocket/lighterceptor-adapter": "0.6.3",
-    "@pagepocket/puppeteer-adapter": "0.6.3"
+    "@pagepocket/lib": "0.7.1",
+    "@pagepocket/interceptor": "0.7.1",
+    "@pagepocket/puppeteer-adapter": "0.7.1",
+    "@pagepocket/lighterceptor-adapter": "0.7.1"
   },
   "devDependencies": {
     "@types/node": "^20.11.30",