optimizer: Restore runtime-host path functionality (#1264)

mdmower · web-flow · commit 1c33cc793d3d · 2021-10-04T13:55:38.000+02:00
PR #855 introduced two regressions: - It became impossible to specify a runtime-host with a path in the URL (e.g. https://example.com/amp-runtime) - The --rtv flag led to inconsistent AMP script URLs because runtime-host dropped /rtv/<rtv> One of the advertised features of self-hosting from https://github.com/ampproject/amphtml/blob/main/docs/spec/amp-framework-hosting.md is: - serve AMP pages and the framework from the same host, potentially improving content delivery times. For this to be possible, the runtime should be served from a path under the same domain as the amp pages.
diff --git a/packages/optimizer/lib/transformers/RewriteAmpUrls.js b/packages/optimizer/lib/transformers/RewriteAmpUrls.js
@@ -129,7 +129,7 @@ class RewriteAmpUrls {
     if (!this._usesAmpCacheUrl(host) && !params.lts) {
       try {
         const url = new URL(host);
-        this._addMeta(head, 'runtime-host', url.origin);
+        this._addMeta(head, 'runtime-host', url.origin + url.pathname);
       } catch (e) {
         this.log.warn('ampUrlPrefix must be an absolute URL');
       }
diff --git a/packages/optimizer/spec/end-to-end/hello-world/expected_output.paired.html b/packages/optimizer/spec/end-to-end/hello-world/expected_output.paired.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,minimum-scale=1">
-  <meta name="runtime-host" content="https://example.com">
+  <meta name="runtime-host" content="https://example.com/amp/rtv/123456789000000">
   <meta name="amp-geo-api" content="/geo"><style amp-runtime i-amphtml-version="123456789000000">/* example.com v0.css */amp-img[i-amphtml-ssr]:not(.i-amphtml-element):not([layout=container])>*{display: block;}</style><script async src="https://example.com/amp/rtv/123456789000000/v0.mjs" type="module" crossorigin="anonymous"></script><script async nomodule src="https://example.com/amp/rtv/123456789000000/v0.js" crossorigin="anonymous"></script><script async custom-element="amp-experiment" src="https://example.com/amp/rtv/123456789000000/v0/amp-experiment-0.1.mjs" type="module" crossorigin="anonymous"></script><script async nomodule src="https://example.com/amp/rtv/123456789000000/v0/amp-experiment-0.1.js" crossorigin="anonymous" custom-element="amp-experiment"></script><script async custom-element="amp-analytics" src="https://example.com/amp/rtv/123456789000000/v0/amp-analytics-0.1.mjs" type="module" crossorigin="anonymous"></script><script async nomodule src="https://example.com/amp/rtv/123456789000000/v0/amp-analytics-0.1.js" crossorigin="anonymous" custom-element="amp-analytics"></script><script async custom-element="amp-video" src="https://example.com/amp/rtv/123456789000000/v0/amp-video-0.1.mjs" type="module" crossorigin="anonymous"></script><script async nomodule src="https://example.com/amp/rtv/123456789000000/v0/amp-video-0.1.js" crossorigin="anonymous" custom-element="amp-video"></script>
   <link rel="canonical" href="self.html"><style amp-custom>h1{margin:16px}</style>
   <link rel="amphtml" href="/amp-version.html">

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ class RewriteAmpUrls {`
`129`	`129`	`if (!this._usesAmpCacheUrl(host) && !params.lts) {`
`130`	`130`	`try {`
`131`	`131`	`const url = new URL(host);`
`132`		`- this._addMeta(head, 'runtime-host', url.origin);`
	`132`	`+ this._addMeta(head, 'runtime-host', url.origin + url.pathname);`
`133`	`133`	`} catch (e) {`
`134`	`134`	`this.log.warn('ampUrlPrefix must be an absolute URL');`
`135`	`135`	`}`