erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-06 14:07:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #6298 from keymanapp/fix/developer/6297-server-font

Browse source 
fix(developer): server font support
This commit is contained in:
Marc Durdin 2022-03-01 11:58:38 +11:00 • committed by GitHub
commit 95fd726b8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
developer/server/src/data.ts
View file

@ -75,7 +75,7 @@ export class DebugFont implements DebugObject {
facename: string;
filenameFromId(id: string): string {
return id.replace(/[^a-z0-9A-Z-]/g, '_') + '.ttf';
return simplifyId(id) + '.ttf';
}
};
@ -114,3 +114,8 @@ export let data: SiteData = new SiteData();
export function isValidId(id: string) {
return !id.match(/\.\.|\/|\\/);
}
export function simplifyId(id: string) {
return id.replace(/[^_a-zA-Z0-9-]/g, '_');
}

4
developer/server/src/handlers/api/debugobject/register.ts
View file

@ -1,5 +1,5 @@
import express = require('express');
import { DebugObject, isValidId } from "../../../data";
import { DebugObject, isValidId, simplifyId } from "../../../data";
import fs = require('fs');
import crypto = require('crypto');
import { configuration } from '../../../config';
@ -21,6 +21,8 @@ export function apiRegisterFile<O extends DebugObject> (intf: new () => O, root:
return false;
}
id = simplifyId(id);
let keys = Object.keys(root);
if(keys.length > MAX_OBJECTS) {
// remove least recently used objects

15
developer/server/src/handlers/api/font/register.ts Normal file
View file

@ -0,0 +1,15 @@
import chalk = require('chalk');
import express = require('express');
import { data, DebugFont, simplifyId } from "../../../data";
export default function apiKeyboardRegister (req: express.Request, res: express.Response, next: express.NextFunction) {
const id = simplifyId(req.body['id']);
const font: DebugFont = data.fonts[id];
if(!font) {
console.error(chalk.red('unexpected missing font'));
return;
}
// The registered 'id' will be a font face name, but the id is simplified
font.facename = req.body['id'];
next();
}

6
developer/server/src/handlers/inc/keyboards-css.ts
View file

@ -1,4 +1,5 @@
import express = require('express');
import path = require('path');
import { data, SiteData } from "../../data";
export default function handleIncKeyboardsCss (req: express.Request, res: express.Response) {
@ -14,11 +15,12 @@ function emitCSS(data: SiteData) {
for(let id in data.fonts) {
const font = data.fonts[id];
const filename = path.basename(font.filename.replace(path.sep=='/'?'\\':'/',path.sep));
response += `
@font-face {
font-family: ${JSON.stringify(font.facename)}
font-family: ${JSON.stringify(font.facename)};
src: local(${JSON.stringify(font.facename)}),
url(${JSON.stringify('/data/font/'+font.filename)}) format("truetype");
url(${JSON.stringify('/data/font/'+filename)}) format("truetype");
font-weight: normal;
font-style: normal;
}

4
developer/server/src/routes.ts
View file

@ -6,6 +6,7 @@ import { data, DebugFont, DebugKeyboard, DebugModel, DebugObject, DebugPackage,
import apiGet from './handlers/api/debugobject/get';
import apiRegister, { apiRegisterFile } from './handlers/api/debugobject/register';
import apiKeyboardRegister from './handlers/api/keyboard/register';
import apiFontRegister from './handlers/api/font/register';
import apiUnregister from './handlers/api/debugobject/unregister';
import handleIncPackagesJson from './handlers/inc/packages-json';
import apiPackageRegister from './handlers/api/package/register';
@ -96,12 +97,13 @@ export default function setupRoutes(app: express.Express, upload: multer.Multer,
appGetData(app, /\/data\/keyboard\/(.+)\.js$/, data.keyboards);
appGetData(app, /\/data\/model\/(.+)\.model\.js$/, data.models);
appGetData(app, /\/data\/package\/(.+)\.kmp$/, data.packages);
appGetData(app, /\/data\/font\/(.+)/, data.fonts);
appGetData(app, /\/data\/font\/(.+)\.ttf$/, data.fonts);
app.get('/api/font', (req,res,next)=>apiGet(data.fonts,req,res,next));
app.post('/api/font/register',
upload.single('file'),
(req,res,next)=>apiRegister(DebugFont, data.fonts, req, res, next),
apiFontRegister,
saveState,
(req,res,next)=>notifyClients(wsServer,req,res,next)
);