Skip to content

Commit d72ae80

Browse files
ikreymerikreymer
committed
remove RWP /misc endpoint, just use 'replaywebpage', update to latest
1 parent 721090a commit d72ae80

File tree

9 files changed

+47
-85
lines changed

9 files changed

+47
-85
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"dependencies": {
1111
"@fortawesome/fontawesome-free": "^5.13.0",
1212
"@ipld/car": "^5.3.1",
13-
"@webrecorder/awp-sw": "^0.4.4",
14-
"@webrecorder/wabac": "github:webrecorder/wabac.js#ts-5",
13+
"@webrecorder/awp-sw": "^0.5.0-beta.2",
14+
"@webrecorder/wabac": "^2.20.0-beta.2",
1515
"auto-js-ipfs": "^2.3.0",
1616
"browsertrix-behaviors": "^0.6.4",
1717
"btoa": "^1.2.1",

‎src/electron/rec-window.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
css,
55
wrapCss,
66
clickOnSpacebarPress,
7-
} from "replaywebpage/misc";
7+
} from "replaywebpage";
88

99
import fasRefresh from "@fortawesome/fontawesome-free/svgs/solid/redo-alt.svg";
1010
//import fasFullscreen from '@fortawesome/fontawesome-free/svgs/solid/desktop.svg';

‎src/recorder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1452,9 +1452,9 @@ class Recorder {
14521452
const data = reqresp.toDBRecord(reqresp.payload, this.pageInfo);
14531453

14541454
// top-level URL is a non-GET request
1455-
// @ts-expect-error - TS2339 - Property 'pageInfo' does not exist on type 'Recorder'.
14561455
if (
14571456
data?.requestUrl &&
1457+
// @ts-expect-error - TS2339 - Property 'pageInfo' does not exist on type 'Recorder'.
14581458
data.requestUrl === this.pageInfo.url &&
14591459
!sessions.length
14601460
) {

‎src/ui/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { html, css, wrapCss, IS_APP, apiPrefix } from "replaywebpage/misc";
1+
import { html, css, wrapCss, IS_APP, apiPrefix } from "replaywebpage";
22

33
// replaywebpage imports
44
import { ReplayWebApp, Embed, Loader } from "replaywebpage";

‎src/ui/coll-index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import { ItemIndex } from "replaywebpage";
1+
import { ItemIndex, html } from "replaywebpage";
22
import type { PropertyValues } from "lit";
33
import { property } from "lit/decorators.js";
44

5-
import { html } from "replaywebpage/misc";
6-
75
import prettyBytes from "pretty-bytes";
86
import { type WrRecCollInfo } from "./coll-info";
97
import { type WrRecItem } from "../types";

‎src/ui/coll-info.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { html, css, wrapCss, apiPrefix } from "replaywebpage/misc";
1+
import { html, css, wrapCss, apiPrefix } from "replaywebpage";
22

33
import prettyBytes from "pretty-bytes";
44

@@ -182,7 +182,8 @@ class WrRecCollInfo extends ItemInfo {
182182
<p class="minihead">Actions</p>
183183
<div class="button-row is-flex">
184184
<a
185-
href="${apiPrefix}/c/${this.item?.id}/dl?format=wacz&pages=all"
185+
href="${apiPrefix}/c/${this.item
186+
?.id}/dl?format=wacz&amp;pages=all"
186187
class="button is-small"
187188
title="Download WACZ"
188189
>

‎src/ui/coll.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
wrapCss,
55
clickOnSpacebarPress,
66
apiPrefix,
7-
} from "replaywebpage/misc";
7+
} from "replaywebpage";
88

99
import fasDownload from "@fortawesome/fontawesome-free/svgs/solid/download.svg";
1010

‎src/ui/upload.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { html, css, wrapCss, apiPrefix, LitElement } from "replaywebpage/misc";
1+
import { html, css, wrapCss, apiPrefix, LitElement } from "replaywebpage";
22
import prettyBytes from "pretty-bytes";
33

44
import fasSync from "@fortawesome/fontawesome-free/svgs/solid/sync-alt.svg";

‎yarn.lock

Lines changed: 36 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,6 +1257,16 @@
12571257
multiformats "^13.0.0"
12581258
varint "^6.0.0"
12591259

1260+
"@ipld/car@^5.3.2":
1261+
version "5.3.2"
1262+
resolved "https://registry.yarnpkg.com/@ipld/car/-/car-5.3.2.tgz#b6f9b5e30e0de5d45aff4494e8c3e2667ce9e0a4"
1263+
integrity sha512-Bb4XrCFlnsCb9tTzZ1I8zo9O61D9qm7HfvuYrQ9gzdE8YhjyVIjrjmHmnoSWV/uCmyc2/bcqiDPIg+9WljXNzg==
1264+
dependencies:
1265+
"@ipld/dag-cbor" "^9.0.7"
1266+
cborg "^4.0.5"
1267+
multiformats "^13.0.0"
1268+
varint "^6.0.0"
1269+
12601270
"@ipld/dag-cbor@^9.0.7":
12611271
version "9.2.0"
12621272
resolved "https://registry.yarnpkg.com/@ipld/dag-cbor/-/dag-cbor-9.2.0.tgz#3a3f0bee02d7e1c2f15582e896843d5b00fbba9f"
@@ -2253,60 +2263,32 @@
22532263
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
22542264
integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
22552265

2256-
"@webrecorder/awp-sw@^0.4.4":
2257-
version "0.4.4"
2258-
resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.4.4.tgz#6b9c5fd86868442d81732e8176b686d21a71f675"
2259-
integrity sha512-H+ISFpLBGbSYyZGvF/esKh6AGLIUhNJjg7ixPEU+zN54xtOh+m4u9hc2BbXlRR4yUovdwzze0vBGGjWR7KGs9w==
2266+
"@webrecorder/awp-sw@^0.5.0-beta.2":
2267+
version "0.5.0-beta.2"
2268+
resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.5.0-beta.2.tgz#8e1aa04f2ea75babbeae4b71a1b94c9c56f02299"
2269+
integrity sha512-Fp/k4bjbou5HninHe8nFNFVTw7fXj8uzRrnNAQlBP6ORql8/wkUZ0+OQXvHrX/DTrxD4HC5YAy1ILV1r5UXbXg==
22602270
dependencies:
2261-
"@ipld/car" "^5.3.1"
2271+
"@ipld/car" "^5.3.2"
22622272
"@ipld/unixfs" "^3.0.0"
2263-
"@webrecorder/wabac" "^2.18.1"
2273+
"@webrecorder/wabac" "^2.20.0-beta.2"
22642274
auto-js-ipfs "^2.3.0"
22652275
client-zip "^2.3.0"
22662276
hash-wasm "^4.9.0"
22672277
idb "^7.1.1"
2268-
p-queue "^7.3.4"
2278+
p-queue "^8.0.1"
22692279
uuid "^9.0.0"
2270-
warcio "^2.2.1"
2271-
2272-
"@webrecorder/wabac@^2.18.1":
2273-
version "2.19.9"
2274-
resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.19.9.tgz#21d357077bc2a85419e7a6002c81a4bc4fec2514"
2275-
integrity sha512-lyvbKVrdUZMUGxwKg5ZFQnyjGUSqZSGOF3NFG9rXLA+Ni0YcQjZCMexGSmqCwY+BksyrVJISCMs3xQ2WQAekgw==
2276-
dependencies:
2277-
"@peculiar/asn1-ecc" "^2.3.4"
2278-
"@peculiar/asn1-schema" "^2.3.3"
2279-
"@peculiar/x509" "^1.9.2"
2280-
"@webrecorder/wombat" "^3.8.2"
2281-
acorn "^8.10.0"
2282-
auto-js-ipfs "^2.1.1"
2283-
base64-js "^1.5.1"
2284-
brotli "^1.3.3"
2285-
buffer "^6.0.3"
2286-
fast-xml-parser "^4.4.1"
2287-
hash-wasm "^4.9.0"
2288-
http-link-header "^1.1.3"
2289-
http-status-codes "^2.1.4"
2290-
idb "^7.1.1"
2291-
js-levenshtein "^1.1.6"
2292-
js-yaml "^4.1.0"
2293-
pako "^1.0.11"
2294-
parse5-html-rewriting-stream "^7.0.0"
2295-
parse5-sax-parser "^7.0.0"
2296-
path-parser "^6.1.0"
2297-
process "^0.11.10"
2298-
stream-browserify "^3.0.0"
2299-
warcio "^2.3.0"
2280+
warcio "^2.3.1"
23002281

2301-
"@webrecorder/wabac@^2.20.0-beta.1", "@webrecorder/wabac@github:webrecorder/wabac.js#ts-5":
2302-
version "2.20.0-beta.1"
2303-
resolved "https://codeload.github.com/webrecorder/wabac.js/tar.gz/932fa89e36c2d5062d844e644aebd5a071d90e63"
2282+
"@webrecorder/wabac@^2.20.0-beta.2":
2283+
version "2.20.0-beta.2"
2284+
resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.20.0-beta.2.tgz#532b6457cb970039812e3b1470134725d7e72ca5"
2285+
integrity sha512-ENVlZOvnFpQO/iMDQX9IZzXrStqlKbDrXe5Tl1aEq0Diun+HI7RKZPF3jJjYEZr0GCON4yY8FNEZhodJCI7dGA==
23042286
dependencies:
23052287
"@peculiar/asn1-ecc" "^2.3.4"
23062288
"@peculiar/asn1-schema" "^2.3.3"
23072289
"@peculiar/x509" "^1.9.2"
23082290
"@types/js-levenshtein" "^1.1.3"
2309-
"@webrecorder/wombat" "^3.8.1"
2291+
"@webrecorder/wombat" "^3.8.2"
23102292
acorn "^8.10.0"
23112293
auto-js-ipfs "^2.1.1"
23122294
base64-js "^1.5.1"
@@ -2327,13 +2309,6 @@
23272309
stream-browserify "^3.0.0"
23282310
warcio "^2.3.1"
23292311

2330-
"@webrecorder/wombat@^3.8.1":
2331-
version "3.8.1"
2332-
resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.8.1.tgz#d1030aa80da3826691b2c9355d895545e6b02fa3"
2333-
integrity sha512-A9Ed7OMHNjigruXoNAVdLuMzmsCIwh2GQUoZvGbGceV381Ka6Tx5FyeEe9vDoJD/hPGDeGdxbyCOB2/2t8NV9w==
2334-
dependencies:
2335-
warcio "^2.3.1"
2336-
23372312
"@webrecorder/wombat@^3.8.2":
23382313
version "3.8.2"
23392314
resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.8.2.tgz#e46e18719834d633175eec52ce753a4dc4e48e27"
@@ -6218,13 +6193,13 @@ p-locate@^5.0.0:
62186193
dependencies:
62196194
p-limit "^3.0.2"
62206195

6221-
p-queue@^7.3.4:
6222-
version "7.4.1"
6223-
resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-7.4.1.tgz#7f86f853048beca8272abdbb7cec1ed2afc0f265"
6224-
integrity sha512-vRpMXmIkYF2/1hLBKisKeVYJZ8S2tZ0zEAmIJgdVKP2nq0nh4qCdf8bgw+ZgKrkh71AOCaqzwbJJk1WtdcF3VA==
6196+
p-queue@^8.0.1:
6197+
version "8.0.1"
6198+
resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-8.0.1.tgz#718b7f83836922ef213ddec263ff4223ce70bef8"
6199+
integrity sha512-NXzu9aQJTAzbBqOt2hwsR63ea7yvxJc0PwN/zobNAudYfb1B7R08SzB4TsLeSbUCuG467NhnoT0oO6w1qRO+BA==
62256200
dependencies:
62266201
eventemitter3 "^5.0.1"
6227-
p-timeout "^5.0.2"
6202+
p-timeout "^6.1.2"
62286203

62296204
p-retry@^6.2.0:
62306205
version "6.2.0"
@@ -6235,10 +6210,10 @@ p-retry@^6.2.0:
62356210
is-network-error "^1.0.0"
62366211
retry "^0.13.1"
62376212

6238-
p-timeout@^5.0.2:
6239-
version "5.1.0"
6240-
resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b"
6241-
integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==
6213+
p-timeout@^6.1.2:
6214+
version "6.1.2"
6215+
resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-6.1.2.tgz#22b8d8a78abf5e103030211c5fc6dee1166a6aa5"
6216+
integrity sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ==
62426217

62436218
p-try@^2.0.0:
62446219
version "2.2.0"
@@ -6812,12 +6787,12 @@ repeat-string@^1.6.1:
68126787
integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
68136788

68146789
"replaywebpage@github:webrecorder/replayweb.page#wabac-ts-work":
6815-
version "2.1.5"
6816-
resolved "https://codeload.github.com/webrecorder/replayweb.page/tar.gz/2c46fe4c0e7eb6143c9e00cfbb3b8e20477f8562"
6790+
version "2.1.6"
6791+
resolved "https://codeload.github.com/webrecorder/replayweb.page/tar.gz/a6e9f2848e76fd8ba03928ba4e9631115e59ec1f"
68176792
dependencies:
68186793
"@fortawesome/fontawesome-free" "^5.15.4"
68196794
"@shoelace-style/shoelace" "~2.15.1"
6820-
"@webrecorder/wabac" "^2.20.0-beta.1"
6795+
"@webrecorder/wabac" "^2.20.0-beta.2"
68216796
bulma "^0.9.3"
68226797
electron-log "^4.4.1"
68236798
electron-updater "^6.3.2"
@@ -8166,19 +8141,7 @@ verror@^1.10.0:
81668141
core-util-is "1.0.2"
81678142
extsprintf "^1.2.0"
81688143

8169-
warcio@^2.2.1:
8170-
version "2.2.1"
8171-
resolved "https://registry.yarnpkg.com/warcio/-/warcio-2.2.1.tgz#3619728fde716291c9b364744c276362a94bacec"
8172-
integrity sha512-KPLoz3aFtdTjexG+QQaubMyuLiNANzvcadGMyNKdpcmhl0k6lBHQQVpxZw3Hx9+4pbyqDXyiF4cr/h2tS8kvcw==
8173-
dependencies:
8174-
base32-encode "^2.0.0"
8175-
hash-wasm "^4.9.0"
8176-
pako "^1.0.11"
8177-
tempy "^3.1.0"
8178-
uuid-random "^1.3.2"
8179-
yargs "^17.6.2"
8180-
8181-
warcio@^2.3.0, warcio@^2.3.1:
8144+
warcio@^2.3.1:
81828145
version "2.3.1"
81838146
resolved "https://registry.yarnpkg.com/warcio/-/warcio-2.3.1.tgz#8ac9de897de1a556161168f2a3938b60929908ca"
81848147
integrity sha512-PjcWqzXfs6HdWfHi1V/i8MoMmV5M0Csg3rOa2mqCJ1dmCJXswVfQ0VXbEVumwavNIW2oFFj6LJoCHHeL4Ls/zw==

0 commit comments

Comments
 (0)