single-file-cli 2.7.0 → 2.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/deno.json +1 -1
  2. package/lib/cdp-client.js +16 -7
  3. package/lib/version.js +1 -1
  4. package/package.json +3 -2
  5. package/test/e2e/navigation.test.js +43 -0
  6. package/update-core.sh +9 -0
package/deno.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@single-file/single-file-cli",
3
- "version": "2.7.0",
3
+ "version": "2.7.1",
4
4
  "description": "SingleFile CLI",
5
5
  "exports": {
6
6
  ".": "./single-file-cli-api.js"
package/lib/cdp-client.js CHANGED
@@ -605,7 +605,7 @@ async function waitForPageReadyState({ Page }, state, { options, debugMessages }
605
605
  Page.removeEventListener(FRAME_NAVIGATED_EVENT_TYPE, onFrameNavigated);
606
606
  };
607
607
  const onLifecycleEvent = createLifecycleEventHandler(state, timeoutState, resolve, cleanup, { options, debugMessages });
608
- const onFrameNavigated = createFrameNavigatedHandler(timeoutState, reject, cleanup, { options, debugMessages });
608
+ const onFrameNavigated = createFrameNavigatedHandler(state, timeoutState, reject, cleanup, { options, debugMessages });
609
609
  state.settle = () => {
610
610
  clearTimeout(timeoutState.timeoutId);
611
611
  cleanup();
@@ -643,15 +643,24 @@ function createLifecycleEventHandler(state, timeoutState, resolve, cleanup, { op
643
643
  };
644
644
  };
645
645
 
646
- function createFrameNavigatedHandler(timeoutState, reject, cleanup, { options, debugMessages }) {
646
+ function createFrameNavigatedHandler(state, timeoutState, reject, cleanup, { options, debugMessages }) {
647
647
  const UNREACHABLE_URL_ERROR_MESSAGE = "Unreachable URL";
648
648
  return ({ params }) => {
649
649
  const { frame } = params;
650
- if (!frame.parentId && frame.unreachableUrl) {
651
- logData(["Detecting unreachable URL", frame.unreachableUrl], { options, debugMessages });
652
- clearTimeout(timeoutState.timeoutId);
653
- cleanup();
654
- reject(new Error(UNREACHABLE_URL_ERROR_MESSAGE + ": " + frame.unreachableUrl));
650
+ if (!frame.parentId) {
651
+ if (frame.unreachableUrl) {
652
+ logData(["Detecting unreachable URL", frame.unreachableUrl], { options, debugMessages });
653
+ clearTimeout(timeoutState.timeoutId);
654
+ cleanup();
655
+ reject(new Error(UNREACHABLE_URL_ERROR_MESSAGE + ": " + frame.unreachableUrl));
656
+ } else {
657
+ // a new document starts the wait over: the states the previous one
658
+ // reached and the delay it started say nothing about this one
659
+ logData(["Detecting navigation", frame.url], { options, debugMessages });
660
+ clearTimeout(timeoutState.timeoutId);
661
+ timeoutState.timeoutId = undefined;
662
+ state.reachedStateIndex = -1;
663
+ }
655
664
  }
656
665
  };
657
666
  }
package/lib/version.js CHANGED
@@ -1 +1 @@
1
- export const version = "2.7.0";
1
+ export const version = "2.7.1";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "single-file-cli",
3
- "version": "2.7.0",
3
+ "version": "2.7.1",
4
4
  "description": "SingleFile CLI",
5
5
  "author": "Gildas Lormeau",
6
6
  "license": "AGPL-3.0-or-later",
@@ -17,7 +17,8 @@
17
17
  "scripts": {
18
18
  "test": "node --test --test-concurrency=2 \"test/**/*.test.js\"",
19
19
  "test:dev": "SINGLE_FILE_TARGET=dev node --test --test-concurrency=2 \"test/**/*.test.js\"",
20
- "lint": "eslint ."
20
+ "lint": "eslint .",
21
+ "update-core": "bash update-core.sh"
21
22
  },
22
23
  "bin": {
23
24
  "single-file": "single-file-node.js"
package/test/e2e/navigation.test.js ADDED
@@ -0,0 +1,43 @@
1
+ /* global setTimeout */
2
+
3
+ import { test } from "node:test";
4
+ import assert from "node:assert/strict";
5
+ import { createServer } from "node:http";
6
+ import { execFile } from "node:child_process";
7
+ import { promisify } from "node:util";
8
+ import { mkdtemp, rm, readFile } from "node:fs/promises";
9
+ import { tmpdir } from "node:os";
10
+ import { join } from "node:path";
11
+ import process from "node:process";
12
+ import { cliDirectory } from "../target.js";
13
+
14
+ const execFileAsync = promisify(execFile);
15
+
16
+ // The first page redirects itself once its network went quiet, inside the
17
+ // settle delay of the wait. The second page keeps its body for longer than
18
+ // that delay, so a capture decided by the first page's state saves it empty.
19
+ test("a page that navigates after its network went quiet is captured once the new page loaded", { timeout: 120000 }, async () => {
20
+ const server = createServer((request, response) => {
21
+ response.writeHead(200, { "content-type": "text/html" });
22
+ if (request.url == "/second") {
23
+ response.write("<!doctype html><title>second</title><p>second page head</p>");
24
+ setTimeout(() => response.end("<p id=late>second page body arrived late</p>"), 4000);
25
+ } else {
26
+ response.end("<!doctype html><title>first</title><p id=first>first page content</p><script>setTimeout(() => location.href = '/second', 800)</script>");
27
+ }
28
+ });
29
+ await new Promise(resolve => server.listen(0, "localhost", resolve));
30
+ const directory = await mkdtemp(join(tmpdir(), "single-file-test-"));
31
+ try {
32
+ const url = "http://localhost:" + server.address().port + "/";
33
+ const output = join(directory, "out.html");
34
+ await execFileAsync(process.execPath, ["single-file-node.js", url, output], { cwd: cliDirectory });
35
+ const content = await readFile(output, "utf8");
36
+ assert.ok(content.includes("second page body arrived late"), "the page was captured before the second page loaded");
37
+ assert.ok(!content.includes("first page content"), "the first page was captured");
38
+ } finally {
39
+ await rm(directory, { recursive: true });
40
+ server.closeAllConnections();
41
+ server.close();
42
+ }
43
+ });
package/update-core.sh ADDED
@@ -0,0 +1,9 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ version="${1:-$(npm view single-file-core version)}"
6
+ sed -i.bak "s#^CORE_PACKAGE=\"npm:single-file-core@.*\"#CORE_PACKAGE=\"npm:single-file-core@$version\"#" build.sh
7
+ rm build.sh.bak
8
+ bash build.sh
9
+ echo "single-file-core $version"