Compute unique collection id using full sourceUrl if relative url giv…

…en (#179) * loading: update sourceToId to resolve any pathname to absolute URL (via document.baseURI) for computing unique id (eg. to avoid conflicts of two 'webarchive.wacz' loaded from different paths) - matches behavior used in embed embed demo: fix typo, don't change default service worker name
webrecorder · Jun 15, 2023 · b26f4b0 · b26f4b0
1 parent 99a034a
commit b26f4b0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 ## CHANGES
 
+v1.8.1
+- Loading: Resolve sourceUrl to absolute url when computing default id
+
 v1.8.0
 - UI: Add 'Show All Pages' option to show non-seed pages that are previously only available via search
 - Embeds: add 'swName' option to allow customizing 'sw.js' to a different filename

diff --git a/_data/package.json b/_data/package.json
@@ -1,7 +1,7 @@
 {
   "name": "replaywebpage",
   "productName": "ReplayWeb.page",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Serverless Web Archive Replay",
   "repository": "https://github.com/webrecorder/replayweb.page",
   "homepage": "https://replayweb.page/",

diff --git a/embed.html b/embed.html
@@ -9,7 +9,7 @@
 </head>
 <body>
 
-<replay-web-page swname="custom.js" replaybase="./" embed="replay-with-info" src="./docs/assets/tweet-example.wacz" url="page:0"></replay-web-page>
+<replay-web-page replaybase="./" embed="replay-with-info" src="./docs/assets/tweet-example.wacz" url="page:0"></replay-web-page>
 
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "replaywebpage",
   "productName": "ReplayWeb.page",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Serverless Web Archive Replay",
   "repository": "https://github.com/webrecorder/replayweb.page",
   "homepage": "https://replayweb.page/",

diff --git a/src/pageutils.js b/src/pageutils.js
@@ -60,6 +60,13 @@ function getReplayLink(view, url, ts) {
 
 // ===========================================================================
 async function sourceToId(url) {
+  try {
+    new URL(url);
+  } catch (e) {
+    // if source is not a valid url, resolve as relative filename to current URL
+    url = new URL(url, document.baseURI).href;
+  }
+
   const digest = await digestMessage(url, "SHA-256");
   const coll = "id-" + digest.slice(0, 12);
   return {url, coll};

diff --git a/ui.js b/ui.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
     </head>
     <body>
-    <replay-web-page swname="custom.js" replaybase="./" embed="replay-with-info" src="./docs/assets/tweet-example.wacz" url="page:0"></replay-web-page>
+    <replay-web-page replaybase="./" embed="replay-with-info" src="./docs/assets/tweet-example.wacz" url="page:0"></replay-web-page>
     </body>
     </html>