
* first attempt to upgrade express to v5 Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * try to fix https://github.com/maptiler/tileserver-gl/issues/1411 Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup server.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup serve_font.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup sever_rendered.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup server_data.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup serve_style Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * Update serve_style.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * Move UV_THREADPOOL_SIZE to main thred Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup utils.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * Use common app.get for images and static images Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * add allowedTileSizes and option Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup error responses Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * fix /style/id.json with next('route') Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * improve sprite path Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * add parseFloadts around zxy Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * simplify server_data Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * move tile fetch and add fix verbose logging Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * add Handling request to verbose logging Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * first attempt to upgrade express to v5 Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * try to fix https://github.com/maptiler/tileserver-gl/issues/1411 Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup server.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup serve_font.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup sever_rendered.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup server_data.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup serve_style Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * Update serve_style.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * Move UV_THREADPOOL_SIZE to main thred Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup utils.js Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * Use common app.get for images and static images Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * add allowedTileSizes and option Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * cleanup error responses Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * fix /style/id.json with next('route') Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * improve sprite path Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * add parseFloadts around zxy Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * simplify server_data Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * move tile fetch and add fix verbose logging Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * add Handling request to verbose logging Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net> * merge elevation changes * lint format * add verbose logging, improve headers * try to fix codeql Information exposure through a stack trace * test * all tests passing * cleanup unneeded changes * cleanup * try to fix codeql error * font fixes * fix tile size issue * try to improve scale + codeql * codeql for sprite logging * codeql serve fonts * codeql fixes * fix failing test with multiple fonts * Update serve_font.js * codeql * codeql * codeql * Update utils.js * codeql * codeql * codeql * codeql * codeql sanitize * Update serve_font.js * Update serve_font.js * remove useless assignment * move isGzipped * add if-modified-since and cache-control * use consistent cache control * reformat * codeql * codeql * codeql * codeql * codeql * codeql * codeql * Update serve_font.js * Update serve_font.js * Update serve_font.js * Update serve_style.js * Update serve_style.js * Update serve_style.js * Revert "Update serve_style.js" This reverts commite0574b1887
. * Revert "Update serve_style.js" This reverts commitb1e1d72f25
. * Revert "Update serve_style.js" This reverts commit0f3629c752
. * Add readFile function * use readFile, add path.normalize * Update serve_rendered.js * simplify input checking * Update utils.js * codeql * Revert "codeql" This reverts commite18874fda0
. * Revert "Update utils.js" This reverts commit5de617dfe2
. * Revert "simplify input checking" This reverts commit62a3212629
. * move allowed functions to utils.js * use xy[0],xy[1], * uprade canvas per https://github.com/maptiler/tileserver-gl/issues/1433 * make font regex less restrictive * fix regex error * Add version and changelog * Update CHANGELOG.md * Update CHANGELOG.md
331 lines
11 KiB
JavaScript
331 lines
11 KiB
JavaScript
'use strict';
|
|
|
|
import path from 'path';
|
|
import fs from 'node:fs';
|
|
|
|
import clone from 'clone';
|
|
import express from 'express';
|
|
import { validateStyleMin } from '@maplibre/maplibre-gl-style-spec';
|
|
|
|
import {
|
|
allowedSpriteScales,
|
|
allowedSpriteFormats,
|
|
fixUrl,
|
|
readFile,
|
|
} from './utils.js';
|
|
|
|
const httpTester = /^https?:\/\//i;
|
|
|
|
export const serve_style = {
|
|
/**
|
|
* Initializes the serve_style module.
|
|
* @param {object} options Configuration options.
|
|
* @param {object} repo Repository object.
|
|
* @param {object} programOpts - An object containing the program options.
|
|
* @returns {express.Application} The initialized Express application.
|
|
*/
|
|
init: function (options, repo, programOpts) {
|
|
const { verbose } = programOpts;
|
|
const app = express().disable('x-powered-by');
|
|
/**
|
|
* Handles requests for style.json files.
|
|
* @param {express.Request} req - Express request object.
|
|
* @param {express.Response} res - Express response object.
|
|
* @param {express.NextFunction} next - Express next function.
|
|
* @param {string} req.params.id - ID of the style.
|
|
* @returns {Promise<void>}
|
|
*/
|
|
app.get('/:id/style.json', (req, res, next) => {
|
|
const { id } = req.params;
|
|
if (verbose) {
|
|
console.log(
|
|
'Handling style request for: /styles/%s/style.json',
|
|
String(id).replace(/\n|\r/g, ''),
|
|
);
|
|
}
|
|
try {
|
|
const item = repo[id];
|
|
if (!item) {
|
|
return res.sendStatus(404);
|
|
}
|
|
const styleJSON_ = clone(item.styleJSON);
|
|
for (const name of Object.keys(styleJSON_.sources)) {
|
|
const source = styleJSON_.sources[name];
|
|
source.url = fixUrl(req, source.url, item.publicUrl);
|
|
if (typeof source.data == 'string') {
|
|
source.data = fixUrl(req, source.data, item.publicUrl);
|
|
}
|
|
}
|
|
if (styleJSON_.sprite) {
|
|
if (Array.isArray(styleJSON_.sprite)) {
|
|
styleJSON_.sprite.forEach((spriteItem) => {
|
|
spriteItem.url = fixUrl(req, spriteItem.url, item.publicUrl);
|
|
});
|
|
} else {
|
|
styleJSON_.sprite = fixUrl(req, styleJSON_.sprite, item.publicUrl);
|
|
}
|
|
}
|
|
if (styleJSON_.glyphs) {
|
|
styleJSON_.glyphs = fixUrl(req, styleJSON_.glyphs, item.publicUrl);
|
|
}
|
|
return res.send(styleJSON_);
|
|
} catch (e) {
|
|
next(e);
|
|
}
|
|
});
|
|
|
|
/**
|
|
* Handles GET requests for sprite images and JSON files.
|
|
* @param {express.Request} req - Express request object.
|
|
* @param {express.Response} res - Express response object.
|
|
* @param {express.NextFunction} next - Express next function.
|
|
* @param {string} req.params.id - ID of the sprite.
|
|
* @param {string} [req.params.spriteID='default'] - ID of the specific sprite image, defaults to 'default'.
|
|
* @param {string} [req.params.scale] - Scale of the sprite image, defaults to ''.
|
|
* @param {string} req.params.format - Format of the sprite file, 'png' or 'json'.
|
|
* @returns {Promise<void>}
|
|
*/
|
|
app.get(
|
|
`/:id/sprite{/:spriteID}{@:scale}{.:format}`,
|
|
async (req, res, next) => {
|
|
const { spriteID = 'default', id, format, scale } = req.params;
|
|
const sanitizedId = String(id).replace(/\n|\r/g, '');
|
|
const sanitizedScale = scale ? String(scale).replace(/\n|\r/g, '') : '';
|
|
const sanitizedSpriteID = String(spriteID).replace(/\n|\r/g, '');
|
|
const sanitizedFormat = format
|
|
? '.' + String(format).replace(/\n|\r/g, '')
|
|
: '';
|
|
if (verbose) {
|
|
console.log(
|
|
`Handling sprite request for: /styles/%s/sprite/%s%s%s`,
|
|
sanitizedId,
|
|
sanitizedSpriteID,
|
|
sanitizedScale,
|
|
sanitizedFormat,
|
|
);
|
|
}
|
|
const item = repo[id];
|
|
const validatedFormat = allowedSpriteFormats(format);
|
|
if (!item || !validatedFormat) {
|
|
if (verbose)
|
|
console.error(
|
|
`Sprite item or format not found for: /styles/%s/sprite/%s%s%s`,
|
|
sanitizedId,
|
|
sanitizedSpriteID,
|
|
sanitizedScale,
|
|
sanitizedFormat,
|
|
);
|
|
return res.sendStatus(404);
|
|
}
|
|
const sprite = item.spritePaths.find(
|
|
(sprite) => sprite.id === spriteID,
|
|
);
|
|
const spriteScale = allowedSpriteScales(scale);
|
|
if (!sprite || spriteScale === null) {
|
|
if (verbose)
|
|
console.error(
|
|
`Bad Sprite ID or Scale for: /styles/%s/sprite/%s%s%s`,
|
|
sanitizedId,
|
|
sanitizedSpriteID,
|
|
sanitizedScale,
|
|
sanitizedFormat,
|
|
);
|
|
return res.status(400).send('Bad Sprite ID or Scale');
|
|
}
|
|
|
|
const modifiedSince = req.get('if-modified-since');
|
|
const cc = req.get('cache-control');
|
|
if (modifiedSince && (!cc || cc.indexOf('no-cache') === -1)) {
|
|
if (
|
|
new Date(item.lastModified).getTime() ===
|
|
new Date(modifiedSince).getTime()
|
|
) {
|
|
return res.sendStatus(304);
|
|
}
|
|
}
|
|
|
|
const sanitizedSpritePath = sprite.path.replace(/^(\.\.\/)+/, '');
|
|
const filename = `${sanitizedSpritePath}${spriteScale}.${validatedFormat}`;
|
|
if (verbose) console.log(`Loading sprite from: %s`, filename);
|
|
try {
|
|
const data = await readFile(filename);
|
|
|
|
if (validatedFormat === 'json') {
|
|
res.header('Content-type', 'application/json');
|
|
} else if (validatedFormat === 'png') {
|
|
res.header('Content-type', 'image/png');
|
|
}
|
|
if (verbose)
|
|
console.log(
|
|
`Responding with sprite data for /styles/%s/sprite/%s%s%s`,
|
|
sanitizedId,
|
|
sanitizedSpriteID,
|
|
sanitizedScale,
|
|
sanitizedFormat,
|
|
);
|
|
res.set({ 'Last-Modified': item.lastModified });
|
|
return res.send(data);
|
|
} catch (err) {
|
|
if (verbose) {
|
|
console.error(
|
|
'Sprite load error: %s, Error: %s',
|
|
filename,
|
|
String(err),
|
|
);
|
|
}
|
|
return res.sendStatus(404);
|
|
}
|
|
},
|
|
);
|
|
|
|
return app;
|
|
},
|
|
/**
|
|
* Removes an item from the repository.
|
|
* @param {object} repo Repository object.
|
|
* @param {string} id ID of the item to remove.
|
|
* @returns {void}
|
|
*/
|
|
remove: function (repo, id) {
|
|
delete repo[id];
|
|
},
|
|
/**
|
|
* Adds a new style to the repository.
|
|
* @param {object} options Configuration options.
|
|
* @param {object} repo Repository object.
|
|
* @param {object} params Parameters object containing style path
|
|
* @param {string} id ID of the style.
|
|
* @param {object} programOpts - An object containing the program options
|
|
* @param {Function} reportTiles Function for reporting tile sources.
|
|
* @param {Function} reportFont Function for reporting font usage
|
|
* @returns {boolean} true if add is succesful
|
|
*/
|
|
add: function (
|
|
options,
|
|
repo,
|
|
params,
|
|
id,
|
|
programOpts,
|
|
reportTiles,
|
|
reportFont,
|
|
) {
|
|
const { publicUrl } = programOpts;
|
|
const styleFile = path.resolve(options.paths.styles, params.style);
|
|
|
|
let styleFileData;
|
|
try {
|
|
styleFileData = fs.readFileSync(styleFile); // TODO: could be made async if this function was
|
|
} catch (e) {
|
|
console.log(`Error reading style file "${params.style}"`);
|
|
return false;
|
|
}
|
|
|
|
const styleJSON = JSON.parse(styleFileData);
|
|
const validationErrors = validateStyleMin(styleJSON);
|
|
if (validationErrors.length > 0) {
|
|
console.log(`The file "${params.style}" is not a valid style file:`);
|
|
for (const err of validationErrors) {
|
|
console.log(`${err.line}: ${err.message}`);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
for (const name of Object.keys(styleJSON.sources)) {
|
|
const source = styleJSON.sources[name];
|
|
let url = source.url;
|
|
if (
|
|
url &&
|
|
(url.startsWith('pmtiles://') || url.startsWith('mbtiles://'))
|
|
) {
|
|
const protocol = url.split(':')[0];
|
|
|
|
let dataId = url.replace('pmtiles://', '').replace('mbtiles://', '');
|
|
if (dataId.startsWith('{') && dataId.endsWith('}')) {
|
|
dataId = dataId.slice(1, -1);
|
|
}
|
|
|
|
const mapsTo = (params.mapping || {})[dataId];
|
|
if (mapsTo) {
|
|
dataId = mapsTo;
|
|
}
|
|
|
|
const identifier = reportTiles(dataId, protocol);
|
|
if (!identifier) {
|
|
return false;
|
|
}
|
|
source.url = `local://data/${identifier}.json`;
|
|
}
|
|
|
|
let data = source.data;
|
|
if (data && typeof data == 'string' && data.startsWith('file://')) {
|
|
source.data =
|
|
'local://files' +
|
|
path.resolve(
|
|
'/',
|
|
data.replace('file://', '').replace(options.paths.files, ''),
|
|
);
|
|
}
|
|
}
|
|
|
|
for (const obj of styleJSON.layers) {
|
|
if (obj['type'] === 'symbol') {
|
|
const fonts = (obj['layout'] || {})['text-font'];
|
|
if (fonts && fonts.length) {
|
|
fonts.forEach(reportFont);
|
|
} else {
|
|
reportFont('Open Sans Regular');
|
|
reportFont('Arial Unicode MS Regular');
|
|
}
|
|
}
|
|
}
|
|
|
|
let spritePaths = [];
|
|
if (styleJSON.sprite) {
|
|
if (!Array.isArray(styleJSON.sprite)) {
|
|
if (!httpTester.test(styleJSON.sprite)) {
|
|
let spritePath = path.join(
|
|
options.paths.sprites,
|
|
styleJSON.sprite
|
|
.replace('{style}', path.basename(styleFile, '.json'))
|
|
.replace(
|
|
'{styleJsonFolder}',
|
|
path.relative(options.paths.sprites, path.dirname(styleFile)),
|
|
),
|
|
);
|
|
styleJSON.sprite = `local://styles/${id}/sprite`;
|
|
spritePaths.push({ id: 'default', path: spritePath });
|
|
}
|
|
} else {
|
|
for (let spriteItem of styleJSON.sprite) {
|
|
if (!httpTester.test(spriteItem.url)) {
|
|
let spritePath = path.join(
|
|
options.paths.sprites,
|
|
spriteItem.url
|
|
.replace('{style}', path.basename(styleFile, '.json'))
|
|
.replace(
|
|
'{styleJsonFolder}',
|
|
path.relative(options.paths.sprites, path.dirname(styleFile)),
|
|
),
|
|
);
|
|
spriteItem.url = `local://styles/${id}/sprite/` + spriteItem.id;
|
|
spritePaths.push({ id: spriteItem.id, path: spritePath });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (styleJSON.glyphs && !httpTester.test(styleJSON.glyphs)) {
|
|
styleJSON.glyphs = 'local://fonts/{fontstack}/{range}.pbf';
|
|
}
|
|
|
|
repo[id] = {
|
|
styleJSON,
|
|
spritePaths,
|
|
publicUrl,
|
|
name: styleJSON.name,
|
|
lastModified: new Date().toUTCString(),
|
|
};
|
|
|
|
return true;
|
|
},
|
|
};
|