Compare commits

...
6 changed files with 29 additions and 56 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
"version": "0.95.0",
"scripts": {
"dev": "vite",
"build": "tsc && vite build && node scripts/compress-dist.mjs",
"build": "tsc && vite build",
"lint": "eslint .",
"preview": "vite preview",
"format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\"",
-48
View File
@@ -1,48 +0,0 @@
import { promises as fs } from "node:fs";
import { join, extname } from "node:path";
import { promisify } from "node:util";
import zlib from "node:zlib";
const gzip = promisify(zlib.gzip);
const brotli = promisify(zlib.brotliCompress);
const DIST = new URL("../dist", import.meta.url).pathname;
// index.html is rewritten by the server at boot, so html must not be precompressed
const COMPRESSIBLE = new Set([".js", ".css", ".svg", ".json", ".txt", ".map"]);
const MIN_SIZE = 1024;
async function* walk(dir) {
for (const entry of await fs.readdir(dir, { withFileTypes: true })) {
const path = join(dir, entry.name);
if (entry.isDirectory()) yield* walk(path);
else yield path;
}
}
const files = [];
for await (const file of walk(DIST)) {
if (!COMPRESSIBLE.has(extname(file))) continue;
const { size } = await fs.stat(file);
if (size >= MIN_SIZE) files.push(file);
}
await Promise.all(
files.map(async (file) => {
const content = await fs.readFile(file);
const [gz, br] = await Promise.all([
gzip(content, { level: 9 }),
brotli(content, {
params: {
[zlib.constants.BROTLI_PARAM_QUALITY]: 11,
[zlib.constants.BROTLI_PARAM_SIZE_HINT]: content.length,
},
}),
]);
await Promise.all([
fs.writeFile(`${file}.gz`, gz),
fs.writeFile(`${file}.br`, br),
]);
}),
);
console.log(`precompressed ${files.length} assets (.gz/.br)`);
@@ -48,7 +48,7 @@ export class SearchService {
const rankColumn = browseByFilters
? sql<number>`0`.as('rank')
: titleOnly
? sql<number>`word_similarity(lower(${titleQuery}), lower(pages.title))`.as(
? sql<number>`word_similarity(lower(f_unaccent(${titleQuery})), lower(f_unaccent(pages.title)))`.as(
'rank',
)
: sql<number>`ts_rank(tsv, to_tsquery('english', f_unaccent(${searchQuery})))`.as(
@@ -84,9 +84,9 @@ export class SearchService {
.$if(!browseByFilters && titleOnly, (qb) =>
qb.where((eb) =>
eb(
sql`lower(pages.title)`,
sql`lower(f_unaccent(pages.title))`,
'like',
sql`lower(${`%${titleLikeQuery}%`})`,
sql`lower(f_unaccent(${`%${titleLikeQuery}%`}))`,
),
),
)
@@ -1,12 +1,34 @@
import { type Kysely, sql } from 'kysely';
export async function up(db: Kysely<any>): Promise<void> {
await sql`CREATE INDEX IF NOT EXISTS pages_title_trgm_idx ON pages USING gin (lower(title) gin_trgm_ops)`.execute(
// f_unaccent must be schema-qualified in its body to be usable inside an index
// expression: Postgres 15+ builds indexes under a secured search_path
// (pg_catalog, pg_temp), so an unqualified unaccent() cannot be resolved during
// CREATE INDEX. Redefine f_unaccent in place (in whatever schema it already
// lives) with the unaccent function and dictionary both qualified.
await sql`
DO $migration$
DECLARE ext_schema text;
BEGIN
SELECT n.nspname INTO ext_schema
FROM pg_extension e JOIN pg_namespace n ON n.oid = e.extnamespace
WHERE e.extname = 'unaccent';
EXECUTE format(
'CREATE OR REPLACE FUNCTION f_unaccent(text) RETURNS text '
|| 'LANGUAGE sql IMMUTABLE PARALLEL SAFE STRICT '
|| 'AS $f$ SELECT %I.unaccent(%L::regdictionary, $1) $f$',
ext_schema, ext_schema || '.unaccent');
END
$migration$;
`.execute(db);
await sql`CREATE INDEX IF NOT EXISTS pages_title_trgm_idx ON pages USING gin (lower(f_unaccent(title)) gin_trgm_ops)`.execute(
db,
);
// separators normalized to spaces so space-typed queries match How_to_export.pdf
await sql`CREATE INDEX IF NOT EXISTS attachments_file_name_trgm_idx ON attachments USING gin (lower(translate(file_name, '_.-', ' ')) gin_trgm_ops)`.execute(
await sql`CREATE INDEX IF NOT EXISTS attachments_file_name_trgm_idx ON attachments USING gin (lower(f_unaccent(translate(file_name, '_.-', ' '))) gin_trgm_ops)`.execute(
db,
);
}
@@ -71,7 +71,6 @@ export class StaticModule implements OnModuleInit {
await app.register(fastifyStatic, {
root: clientDistPath,
wildcard: false,
preCompressed: true,
setHeaders: (reply: any, pathName: string) => {
// Vite content-hashes everything under /assets, so they can be cached forever
if (/[\\/]assets[\\/]/.test(pathName)) {