0d2ccec · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge branch 'develop' into ts-filter-mania

commit0d2ccec6d88d3d4bbd4ec02f0360549c786a24c8 authorElliot Cameron <3noch@users.noreply.github.com> dateTue 10 Mar 2020, 17:21 (7 years ago) parentadca9ba 344d5ca

5 files changed+36−4

compare with master

unifiedsplit

ChangeLog.md+4 default.nix+2 dep/snap-core/default.nix+8 dep/snap-core/github.json+8 lib/asset/serve-snap/src/Obelisk/Asset/Serve/Snap.hs+14−4

ChangeLog.md+4

@@ -2,6 +2,10 @@

33This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released, and the date should reflect that release.

5+## Unreleased

7+* Fully support HTTP [Range](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range) requests on static assets to support Safari. ([#664](https://github.com/obsidiansystems/obelisk/pull/664))

59## v0.6.0.0 - 2020-02-21

610

711* Fix a bug in `Obelisk.Route.Frontend` where `routeLink`, `routeLinkDynAttr`, and `dynRouteLink` would not behave exactly like `<a href="...">` when run by JavaScript. These functions now scroll to the top of the page when the link is clicked. ([#540](https://github.com/obsidiansystems/obelisk/pull/540))

default.nix+2

@@ -42,6 +42,8 @@ let

4242 hnix-store-core = self.callHackage "hnix-store-core" "0.1.0.0" {};

4343

4444 ghcid = self.callCabal2nix "ghcid" (hackGet ./dep/ghcid) {};

45+ # Exports more internals

46+ snap-core = haskellLib.dontCheck (self.callCabal2nix "snap-core" (hackGet ./dep/snap-core) {});

4547 })

4648

4749 pkgs.obeliskExecutableConfig.haskellOverlay

dep/snap-core/default.nixnew file+8

@@ -0,0 +1,8 @@

1+# DO NOT HAND-EDIT THIS FILE

2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:

3+ if !fetchSubmodules && !private then builtins.fetchTarball {

4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;

5+ } else (import <nixpkgs> {}).fetchFromGitHub {

6+ inherit owner repo rev sha256 fetchSubmodules private;

7+ };

8+in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))

dep/snap-core/github.jsonnew file+8

@@ -0,0 +1,8 @@

1+{

2+ "owner": "obsidiansystems",

3+ "repo": "snap-core",

4+ "branch": "ts-expose-fileserve-internals",

5+ "private": false,

6+ "rev": "e015fc484e38dd9389c58b277b1884395e553bdf",

7+ "sha256": "1793x1h4lw9vnrii5akhfxx1x9yrgxf3052jf6bs8f1mhaic6mxx"

8+}

lib/asset/serve-snap/src/Obelisk/Asset/Serve/Snap.hs+14−4

@@ -12,12 +12,13 @@ import Obelisk.Asset.Accept (Encoding (..), acceptEncodingBody, chooseEncoding,

1212import Obelisk.Snap.Extras

1313

1414import Snap

15− (MonadSnap, getHeader, getsRequest, modifyResponse, pass, redirect, sendFile, setContentLength, setContentType, setHeader, setResponseCode)

15+ (MonadSnap, getHeader, getRequest, getsRequest, modifyResponse, pass, redirect, sendFile, setContentLength, setContentType, setHeader, setResponseCode)

1616import Snap.Util.FileServe (defaultMimeTypes, fileType, getSafePath, serveFile)

17+import Snap.Internal.Util.FileServe (checkRangeReq)

1718

1819import Control.Applicative ((<|>))

1920import Control.Exception (handleJust, try, throwIO)

20−import Control.Monad (forM, liftM)

21+import Control.Monad (forM, liftM, unless)

2122import Control.Monad.IO.Class (liftIO)

2223import Control.Monad.Fail (MonadFail)

2324import Data.Attoparsec.ByteString (parseOnly, endOfInput)

@@ -94,8 +95,17 @@ serveAsset' doRedirect base fallback p = do

9495 let finalFilename = base </> p </> "encodings" </> T.unpack (decodeUtf8 e)

9596 stat <- liftIO $ getFileStatus finalFilename

9697 modifyResponse $ setHeader "Last-Modified" "Thu, 1 Jan 1970 00:00:00 GMT"

97− modifyResponse $ setResponseCode 200 . setContentLength (fromIntegral $ fileSize stat) . setContentType (fileType defaultMimeTypes p)

98− sendFile finalFilename

98+ . setHeader "Accept-Ranges" "bytes"

99+ . setContentType (fileType defaultMimeTypes p)

100+ let size = fromIntegral $ fileSize stat

101+ req <- getRequest

102+ -- Despite the name, this function actually does all of the work for

103+ -- responding to range requests. We only need to handle *none* range

104+ -- requests ourselves.

105+ wasRange <- checkRangeReq req finalFilename size

106+ unless wasRange $ do

107+ modifyResponse $ setResponseCode 200 . setContentLength size

108+ sendFile finalFilename

99109 Just _ -> cachePermanently >> modifyResponse (setResponseCode 304)

100110 Right "redirect" -> do

101111 mtarget <- liftIO $ getAssetTarget $ base </> p