gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-31 11:44:23 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fix(server): crashing due to bad icon pack

Browse Source
This commit is contained in:
Elian Doran 2025-12-26 19:37:10 +02:00
parent 254511bfbf
commit 2c4ac4ba30
No known key found for this signature in database
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/server/src/routes/index.ts
View File

@ -62,7 +62,10 @@ function index(req: Request, res: Response) {
appPath,
baseApiUrl: 'api/',
currentLocale: getCurrentLocale(),
iconPackCss: iconPacks.map(p => generateCss(p)).join("\n\n"),
iconPackCss: iconPacks
.map(p => generateCss(p))
.filter(Boolean)
.join("\n\n"),
iconRegistry: generateIconRegistry(iconPacks)
});
}

60
apps/server/src/services/icon_packs.ts
View File

@ -4,6 +4,7 @@ import type BAttachment from "../becca/entities/battachment";
import type BNote from "../becca/entities/bnote";
import log from "./log";
import search from "./search/services/search";
import { safeExtractMessageAndStackFromError } from "./utils";
const PREFERRED_MIME_TYPE = [
"font/woff2",
@ -92,32 +93,37 @@ export function determineBestFontAttachment(iconPackNote: BNote) {
}
export function generateCss({ manifest, fontAttachmentId, fontMime }: ProcessResult) {
const iconDeclarations: string[] = [];
for (const [ key, mapping ] of Object.entries(manifest.icons)) {
iconDeclarations.push(`.${manifest.prefix}.${key}::before { content: '\\${mapping.glyph.charCodeAt(0).toString(16)}'; }`);
try {
const iconDeclarations: string[] = [];
for (const [ key, mapping ] of Object.entries(manifest.icons)) {
iconDeclarations.push(`.${manifest.prefix}.${key}::before { content: '\\${mapping.glyph.charCodeAt(0).toString(16)}'; }`);
}
return `\
@font-face {
font-family: 'trilium-icon-pack-${manifest.prefix}';
font-weight: normal;
font-style: normal;
src: url('/api/attachments/${fontAttachmentId}/download') format('${MIME_TO_CSS_FORMAT_MAPPINGS[fontMime]}');
}
.${manifest.prefix} {
font-family: 'trilium-icon-pack-${manifest.prefix}' !important;
font-weight: normal;
font-style: normal;
font-variant: normal;
line-height: 1;
text-rendering: auto;
display: inline-block;
text-transform: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
${iconDeclarations.join("\n")}
`;
} catch (e) {
log.error(safeExtractMessageAndStackFromError(e));
return null;
}
return `\
@font-face {
font-family: 'trilium-icon-pack-${manifest.prefix}';
font-weight: normal;
font-style: normal;
src: url('/api/attachments/${fontAttachmentId}/download') format('${MIME_TO_CSS_FORMAT_MAPPINGS[fontMime]}');
}
.${manifest.prefix} {
font-family: 'trilium-icon-pack-${manifest.prefix}' !important;
font-weight: normal;
font-style: normal;
font-variant: normal;
line-height: 1;
text-rendering: auto;
display: inline-block;
text-transform: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
${iconDeclarations.join("\n")}
`;
}