Skip to content

server: Compress index.html with brotli #13619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

server: Compress index.html with brotli #13619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set(TARGET_SRCS
httplib.h
)
set(PUBLIC_ASSETS
index.html.gz
index.html.br
loading.html
)

Expand Down
6 changes: 3 additions & 3 deletions tools/server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@ npm i
# to run the dev server
npm run dev

# to build the public/index.html.gz
# to build the public/index.html.br
npm run build
```
After `public/index.html.gz` has been generated we need to generate the c++
headers (like build/tools/server/index.html.gz.hpp) that will be included
After `public/index.html.br` has been generated we need to generate the c++
headers (like build/tools/server/index.html.br.hpp) that will be included
by server.cpp. This is done by building `llama-server` as described in the
[build](#build) section above.

Expand Down
Binary file added tools/server/public/index.html.br
View file
Open in desktop
Binary file not shown.
Binary file removed tools/server/public/index.html.gz
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions tools/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define MIMETYPE_JSON "application/json; charset=utf-8"

// auto generated files (see README.md for details)
#include "index.html.gz.hpp"
#include "index.html.br.hpp"
#include "loading.html.hpp"

#include <atomic>
Expand Down Expand Up @@ -4701,14 +4701,14 @@ int main(int argc, char ** argv) {
} else {
// using embedded static index.html
svr->Get("/", [](const httplib::Request & req, httplib::Response & res) {
if (req.get_header_value("Accept-Encoding").find("gzip") == std::string::npos) {
res.set_content("Error: gzip is not supported by this browser", "text/plain");
if (req.get_header_value("Accept-Encoding").find("br") == std::string::npos) {
res.set_content("Error: brotli is not supported by this browser", "text/plain");
} else {
res.set_header("Content-Encoding", "gzip");
res.set_header("Content-Encoding", "br");
// COEP and COOP headers, required by pyodide (python interpreter)
res.set_header("Cross-Origin-Embedder-Policy", "require-corp");
res.set_header("Cross-Origin-Opener-Policy", "same-origin");
res.set_content(reinterpret_cast<const char*>(index_html_gz), index_html_gz_len, "text/html; charset=utf-8");
res.set_content(reinterpret_cast<const char*>(index_html_br), index_html_br_len, "text/html; charset=utf-8");
}
return false;
});
Expand Down
8 changes: 0 additions & 8 deletions tools/server/webui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion tools/server/webui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"eslint": "^9.17.0",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.16",
"fflate": "^0.8.2",
"globals": "^15.14.0",
"prettier": "^3.4.2",
"sass-embedded": "^1.83.4",
Expand Down
22 changes: 9 additions & 13 deletions tools/server/webui/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import react from '@vitejs/plugin-react';
import { viteSingleFile } from 'vite-plugin-singlefile';
import path from 'node:path';
import fs from 'node:fs';
import * as fflate from 'fflate';
import zlib from 'node:zlib';

/* eslint-disable */

Expand Down Expand Up @@ -36,19 +36,15 @@ const BUILD_PLUGINS = [
let content =
GUIDE_FOR_FRONTEND + '\n' + fs.readFileSync(outputIndexHtml, 'utf-8');
content = content.replace(/\r/g, ''); // remove windows-style line endings
const compressed = fflate.gzipSync(Buffer.from(content, 'utf-8'), {
level: 9,
const compressed = zlib.brotliCompressSync(Buffer.from(content), {
params: {
[zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,
[zlib.constants.BROTLI_PARAM_QUALITY]:
zlib.constants.BROTLI_MAX_QUALITY,
[zlib.constants.BROTLI_PARAM_SIZE_HINT]: content.length,
},
});

// because gzip header contains machine-specific info, we must remove these data from the header
// timestamp
compressed[0x4] = 0;
compressed[0x5] = 0;
compressed[0x6] = 0;
compressed[0x7] = 0;
// OS
compressed[0x9] = 0;

if (compressed.byteLength > MAX_BUNDLE_SIZE) {
throw new Error(
`Bundle size is too large (${Math.ceil(compressed.byteLength / 1024)} KB).\n` +
Expand All @@ -58,7 +54,7 @@ const BUILD_PLUGINS = [

const targetOutputFile = path.join(
config.build.outDir,
'../../public/index.html.gz'
'../../public/index.html.br'
);
fs.writeFileSync(targetOutputFile, compressed);
},
Expand Down
Loading