fix: Relative URLs in pub-manifest are not resolved properly when the…

… pub-manifest is linked from HTML elsewhere Fixes #661
vivliostyle · Sep 28, 2020 · b6fe7c1 · b6fe7c1
1 parent 9c5cbf5
commit b6fe7c1
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/packages/core/src/vivliostyle/epub.ts b/packages/core/src/vivliostyle/epub.ts
@@ -152,7 +152,7 @@ export class EPUBDocStore extends OPS.OPSDocStore {
               return;
             }
             const opf = new OPFDoc(this, url);
-            opf.initWithWebPubManifest(manifestObj).then(() => {
+            opf.initWithWebPubManifest(manifestObj, undefined, url).then(() => {
               frame.finish(opf);
             });
           });
@@ -288,12 +288,16 @@ export class EPUBDocStore extends OPS.OPSDocStore {
               frame.finish(opf);
             });
           } else {
-            this.loadAsJSON(
-              Base.resolveURL(manifestLink.getAttribute("href"), url),
-            ).then((manifestObj) => {
-              opf.initWithWebPubManifest(manifestObj, doc).then(() => {
-                frame.finish(opf);
-              });
+            const manifestUrl = Base.resolveURL(
+              manifestLink.getAttribute("href"),
+              url,
+            );
+            this.loadAsJSON(manifestUrl).then((manifestObj) => {
+              opf
+                .initWithWebPubManifest(manifestObj, doc, manifestUrl)
+                .then(() => {
+                  frame.finish(opf);
+                });
             });
           }
         } else {
@@ -1154,6 +1158,7 @@ export class OPFDoc {
   initWithWebPubManifest(
     manifestObj: Base.JSON,
     doc?: Document,
+    manifestUrl?: string,
   ): Task.Result<boolean> {
     if (manifestObj["readingProgression"]) {
       this.pageProgression = manifestObj["readingProgression"];
@@ -1225,7 +1230,10 @@ export class OPFDoc {
               /(^|\/)([^/]+\.(x?html|htm|xht)|[^/.]*)([#?]|$)/.test(url)
             ) {
               const param = {
-                url: Base.resolveURL(Base.convertSpecialURL(url), this.pubURL),
+                url: Base.resolveURL(
+                  Base.convertSpecialURL(url),
+                  manifestUrl || this.pubURL,
+                ),
                 index: itemCount++,
                 startPage: null,
                 skipPagesBefore: null,