Merge remote-tracking branch 'origin/master' into time

Cargo.toml

@@ -50,7 +50,7 @@ tempfile = "3.2.0"
 tokio = { version = "1.17.0", features = ["rt-multi-thread"] }
 tokio-stream = "0.1.9"
 tokio-util = {version = "0.7.3", features = ["compat"] }
-tower-http = { version = "0.3.3", features = ["set-header"] }
+tower-http = { version = "0.3.3", features = ["cors", "set-header"] }
 
 [dev-dependencies]
 executable-path = "1.0.0"

src/media.rs

@@ -5,8 +5,10 @@ pub(crate) enum Media {
   Audio,
   Iframe,
   Image,
+  Pdf,
   Text,
   Unknown,
+  Video,
 }
 
 impl Media {
@@ -48,6 +50,7 @@ impl FromStr for Media {
 }
 
 const TABLE: &[(&str, Media, &[&str])] = &[
+  ("application/pdf", Media::Pdf, &["pdf"]),
   ("audio/flac", Media::Audio, &["flac"]),
   ("audio/mpeg", Media::Audio, &["mp3"]),
   ("audio/wav", Media::Audio, &["wav"]),
@@ -59,6 +62,7 @@ const TABLE: &[(&str, Media, &[&str])] = &[
   ("image/webp", Media::Image, &["webp"]),
   ("text/html;charset=utf-8", Media::Iframe, &["html"]),
   ("text/plain;charset=utf-8", Media::Text, &["txt"]),
+  ("video/webm", Media::Video, &["webm"]),
 ];
 
 #[cfg(test)]

src/subcommand/server.rs

@@ -6,8 +6,8 @@ use {
   super::*,
   crate::templates::{
     BlockHtml, ClockSvg, HomeHtml, InputHtml, InscriptionHtml, InscriptionsHtml, OutputHtml,
-    PageContent, PageHtml, PreviewAudioHtml, PreviewImageHtml, PreviewTextHtml, PreviewUnknownHtml,
-    RangeHtml, RareTxt, SatHtml, TransactionHtml,
+    PageContent, PageHtml, PreviewAudioHtml, PreviewImageHtml, PreviewPdfHtml, PreviewTextHtml,
+    PreviewUnknownHtml, PreviewVideoHtml, RangeHtml, RareTxt, SatHtml, TransactionHtml,
   },
   axum::{
     body,
@@ -28,7 +28,10 @@ use {
   },
   std::{cmp::Ordering, str},
   tokio_stream::StreamExt,
-  tower_http::set_header::SetResponseHeaderLayer,
+  tower_http::{
+    cors::{Any, CorsLayer},
+    set_header::SetResponseHeaderLayer,
+  },
 };
 
 mod error;
@@ -163,7 +166,12 @@ impl Server {
         .layer(SetResponseHeaderLayer::overriding(
           header::STRICT_TRANSPORT_SECURITY,
           HeaderValue::from_static("max-age=31536000; includeSubDomains; preload"),
-        ));
+        ))
+        .layer(
+          CorsLayer::new()
+            .allow_methods([http::Method::GET])
+            .allow_origin(Any),
+        );
 
       match (self.http_port(), self.https_port()) {
         (Some(http_port), None) => {
@@ -722,6 +730,10 @@ impl Server {
       header::CONTENT_SECURITY_POLICY,
       HeaderValue::from_static("default-src 'unsafe-eval' 'unsafe-inline'"),
     );
+    headers.insert(
+      header::CACHE_CONTROL,
+      HeaderValue::from_static("max-age=31536000, immutable"),
+    );
 
     Some((headers, inscription.into_body()?))
   }
@@ -736,6 +748,11 @@ impl Server {
 
     return match inscription.media() {
       Media::Audio => Ok(PreviewAudioHtml { inscription_id }.into_response()),
+      Media::Iframe => Ok(
+        Self::content_response(inscription)
+          .ok_or_not_found(|| format!("inscription {inscription_id} content"))?
+          .into_response(),
+      ),
       Media::Image => Ok(
         (
           [(
@@ -746,16 +763,20 @@ impl Server {
         )
           .into_response(),
       ),
-      Media::Iframe => Ok(
-        Self::content_response(inscription)
-          .ok_or_not_found(|| format!("inscription {inscription_id} content"))?
+      Media::Pdf => Ok(
+        (
+          [(
+            header::CONTENT_SECURITY_POLICY,
+            "script-src-elem 'self' https://cdn.jsdelivr.net",
+          )],
+          PreviewPdfHtml { inscription_id },
+        )
           .into_response(),
       ),
       Media::Text => {
         let content = inscription
           .body()
           .ok_or_not_found(|| format!("inscription {inscription_id} content"))?;
-
         Ok(
           PreviewTextHtml {
             text: str::from_utf8(content)
@@ -765,6 +786,7 @@ impl Server {
         )
       }
       Media::Unknown => Ok(PreviewUnknownHtml.into_response()),
+      Media::Video => Ok(PreviewVideoHtml { inscription_id }.into_response()),
     };
   }
 
@@ -1995,6 +2017,27 @@ mod tests {
     );
   }
 
+  #[test]
+  fn pdf_preview() {
+    let server = TestServer::new();
+    server.mine_blocks(1);
+
+    let txid = server.bitcoin_rpc_server.broadcast_tx(TransactionTemplate {
+      inputs: &[(1, 0, 0)],
+      witness: inscription("application/pdf", "hello").to_witness(),
+      ..Default::default()
+    });
+    let inscription_id = InscriptionId::from(txid);
+
+    server.mine_blocks(1);
+
+    server.assert_response_regex(
+      format!("/preview/{inscription_id}"),
+      StatusCode::OK,
+      format!(r".*<canvas data-inscription={inscription_id}></canvas>.*"),
+    );
+  }
+
   #[test]
   fn image_preview() {
     let server = TestServer::new();
@@ -2059,6 +2102,27 @@ mod tests {
     );
   }
 
+  #[test]
+  fn video_preview() {
+    let server = TestServer::new();
+    server.mine_blocks(1);
+
+    let txid = server.bitcoin_rpc_server.broadcast_tx(TransactionTemplate {
+      inputs: &[(1, 0, 0)],
+      witness: inscription("video/webm", "hello").to_witness(),
+      ..Default::default()
+    });
+    let inscription_id = InscriptionId::from(txid);
+
+    server.mine_blocks(1);
+
+    server.assert_response_regex(
+      format!("/preview/{inscription_id}"),
+      StatusCode::OK,
+      format!(r".*<video .*>\s*<source src=/content/{inscription_id}>.*"),
+    );
+  }
+
   #[test]
   fn inscription_page_title() {
     let server = TestServer::new_with_sat_index();
@@ -2194,4 +2258,26 @@ mod tests {
       &fs::read_to_string("templates/preview-unknown.html").unwrap(),
     );
   }
+
+  #[test]
+  fn content_responses_have_cache_control_headers() {
+    let server = TestServer::new();
+    server.mine_blocks(1);
+
+    let txid = server.bitcoin_rpc_server.broadcast_tx(TransactionTemplate {
+      inputs: &[(1, 0, 0)],
+      witness: inscription("text/foo", "hello").to_witness(),
+      ..Default::default()
+    });
+
+    server.mine_blocks(1);
+
+    let response = server.get(format!("/content/{}", InscriptionId::from(txid)));
+
+    assert_eq!(response.status(), StatusCode::OK);
+    assert_eq!(
+      response.headers().get(header::CACHE_CONTROL).unwrap(),
+      "max-age=31536000, immutable"
+    );
+  }
 }

src/templates.rs

@@ -9,7 +9,10 @@ pub(crate) use {
   inscription::InscriptionHtml,
   inscriptions::InscriptionsHtml,
   output::OutputHtml,
-  preview::{PreviewAudioHtml, PreviewImageHtml, PreviewTextHtml, PreviewUnknownHtml},
+  preview::{
+    PreviewAudioHtml, PreviewImageHtml, PreviewPdfHtml, PreviewTextHtml, PreviewUnknownHtml,
+    PreviewVideoHtml,
+  },
   range::RangeHtml,
   rare::RareTxt,
   sat::SatHtml,

src/templates/preview.rs

@@ -10,10 +10,20 @@ pub(crate) struct PreviewImageHtml {
   pub(crate) inscription_id: InscriptionId,
 }
 
+#[derive(boilerplate::Boilerplate)]
+pub(crate) struct PreviewPdfHtml {
+  pub(crate) inscription_id: InscriptionId,
+}
+
 #[derive(boilerplate::Boilerplate)]
 pub(crate) struct PreviewTextHtml<'a> {
   pub(crate) text: &'a str,
 }
 
 #[derive(boilerplate::Boilerplate)]
 pub(crate) struct PreviewUnknownHtml;
+
+#[derive(boilerplate::Boilerplate)]
+pub(crate) struct PreviewVideoHtml {
+  pub(crate) inscription_id: InscriptionId,
+}

static/index.css

@@ -91,7 +91,7 @@ dl {
   overflow-wrap: break-word;
 }
 
-ul, li {
+ul {
   overflow: hidden;
 }
 
@@ -104,7 +104,7 @@ ul, li {
 .blocks {
   font-family: monospace, monospace;
   list-style-position: inside;
-  padding-inline-start: 0;
+  padding-inline-start: 1rem;
   white-space: nowrap;
 }
 

static/index.js

@@ -1,23 +1,25 @@
-let next = document.querySelector("a.next");
+let next = document.querySelector('a.next');
+let previous = document.querySelector('a.previous');
 
-if (next) {
-  window.addEventListener("keydown", e => {
-    if (e.key == "ArrowRight") {
-      window.location = next.href;
-    }
-  });
-}
-
-let previous = document.querySelector("a.previous");
+window.addEventListener('keydown', e => {
+  if (document.activeElement.tagName == 'INPUT') {
+    return;
+  }
 
-if (previous) {
-  window.addEventListener("keydown", e => {
-    if (e.key == "ArrowLeft") {
-      window.location = previous.href;
-    }
-  });
-}
+  switch (e.key) {
+    case 'ArrowRight':
+      if (next) {
+        window.location = next.href;
+      }
+      return;
+    case 'ArrowLeft':
+      if (previous) {
+        window.location = previous.href;
+      }
+      return;
+  }
+});
 
-for (let time of document.body.getElementsByTagName("time")) {
+for (let time of document.body.getElementsByTagName('time')) {
   time.setAttribute('title', new Date(time.textContent));
 }

static/preview-pdf.css

@@ -0,0 +1,14 @@
+html {
+  height: 100%;
+}
+
+body {
+  height: 100%;
+  margin: 0;
+}
+
+canvas {
+  height: 100%;
+  width: 100%;
+  object-fit: contain;
+}

static/preview-pdf.js

@@ -0,0 +1,23 @@
+import pdfjs from 'https://cdn.jsdelivr.net/npm/pdfjs-dist@3.2.146/+esm';
+
+pdfjs.GlobalWorkerOptions.workerSrc = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@3.2.146/build/pdf.worker.min.js';
+
+let canvas = document.querySelector('canvas');
+
+let pdf = await pdfjs.getDocument(`/content/${canvas.dataset.inscription}`).promise;
+
+let page = await pdf.getPage(1);
+
+let scale = window.devicePixelRatio || 1;
+
+let viewport = page.getViewport({ scale });
+
+canvas.width = Math.ceil(viewport.width * scale);
+
+canvas.height = Math.ceil(viewport.height * scale);
+
+page.render({
+  canvasContext: canvas.getContext('2d'),
+  transform: [scale, 0, 0, scale, 0, 0],
+  viewport,
+});

static/preview-video.css

@@ -0,0 +1,16 @@
+html {
+  background-color: #131516;
+  height: 100%;
+}
+
+body {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  margin: 0;
+}
+
+video {
+  height: 100%;
+  width: 100%;
+}

templates/page.html

@@ -24,7 +24,7 @@
       <a href=/rare.txt>rare.txt</a>
 %% }
       <form action=/search method=get>
-        <input type=text autocapitalize=off autocomplete=off autocorrect=off autofocus name=query spellcheck=false>
+        <input type=text autocapitalize=off autocomplete=off autocorrect=off name=query spellcheck=false>
         <input type=submit value=Search>
       </form>
     </nav>

templates/preview-pdf.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang=en>
+  <head>
+    <meta charset=utf-8>
+    <link rel=stylesheet href=/static/preview-pdf.css>
+    <script src=/static/preview-pdf.js defer type=module></script>
+  </head>
+  <body>
+    <canvas data-inscription={{self.inscription_id}}></canvas>
+  </body>
+</html>

templates/preview-video.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang=en>
+  <head>
+    <meta charset=utf-8>
+    <link rel=stylesheet href=/static/preview-video.css>
+  </head>
+  <body>
+    <video controls loop>
+      <source src=/content/{{self.inscription_id}}>
+    </video>
+  </body>
+</html>