chiitiler 1.23.2 → 1.23.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -0
- package/dist/cli.js +21 -1
- package/dist/render/warmup.d.ts +9 -0
- package/dist/render/warmup.js +35 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -121,8 +121,11 @@ All options can be set via CLI flag or environment variable.
|
|
|
121
121
|
| `--port <n>` | `CHIITILER_PORT` | `3000` |
|
|
122
122
|
| `--debug` | `CHIITILER_DEBUG` | `false` |
|
|
123
123
|
| `--user-agent <ua>` | `CHIITILER_USER_AGENT` | (none) |
|
|
124
|
+
| `--prewarm` | `CHIITILER_PREWARM` | `false` |
|
|
124
125
|
| — | `CHIITILER_PROCESSES` | `1` (set `0` for all CPUs) |
|
|
125
126
|
|
|
127
|
+
With prewarm enabled, one tile is rendered at startup **before** the server starts listening, so renderer initialization (GL context, sharp/libvips, JIT) doesn't hit the first request. On AWS Lambda with Lambda Web Adapter, the readiness check keeps this inside the INIT phase, which runs with a full CPU boost.
|
|
128
|
+
|
|
126
129
|
### Cache
|
|
127
130
|
|
|
128
131
|
| Flag | Env | Default |
|
package/dist/cli.js
CHANGED
|
@@ -3,6 +3,7 @@ import { Command } from 'commander';
|
|
|
3
3
|
import { initServer } from './server/index.js';
|
|
4
4
|
import * as caches from './cache/index.js';
|
|
5
5
|
import { setUserAgent } from './source/userAgent.js';
|
|
6
|
+
import { prewarm } from './render/warmup.js';
|
|
6
7
|
function parseCacheStrategy(method, options) {
|
|
7
8
|
// command-line option
|
|
8
9
|
if (method === 'memory')
|
|
@@ -71,6 +72,10 @@ function parsePort(port) {
|
|
|
71
72
|
// undefined or invalid
|
|
72
73
|
return 3000;
|
|
73
74
|
}
|
|
75
|
+
function parsePrewarm(prewarmFlag) {
|
|
76
|
+
// command-line option, then env
|
|
77
|
+
return prewarmFlag === true || process.env.CHIITILER_PREWARM === 'true';
|
|
78
|
+
}
|
|
74
79
|
function parseDebug(debug) {
|
|
75
80
|
// command-line option
|
|
76
81
|
if (debug)
|
|
@@ -101,8 +106,9 @@ export function createProgram() {
|
|
|
101
106
|
.option('--gcs-api-endpoint <api-endpoint>', 'gcs api endpoint', '')
|
|
102
107
|
.option('-p, --port <port>', 'port number')
|
|
103
108
|
.option('--user-agent <user-agent>', 'User-Agent header for outbound HTTP requests')
|
|
109
|
+
.option('--prewarm', 'render one tile at startup before listening, to warm up the renderer')
|
|
104
110
|
.option('-D, --debug', 'debug mode')
|
|
105
|
-
.action((options) => {
|
|
111
|
+
.action(async (options) => {
|
|
106
112
|
// env fallback (CHIITILER_USER_AGENT) is handled in userAgent.ts
|
|
107
113
|
if (options.userAgent !== undefined)
|
|
108
114
|
setUserAgent(options.userAgent);
|
|
@@ -130,6 +136,20 @@ export function createProgram() {
|
|
|
130
136
|
console.log(`debug page: http://localhost:${serverOptions.port}/debug`);
|
|
131
137
|
console.log(`editor page: http://localhost:${serverOptions.port}/editor`);
|
|
132
138
|
}
|
|
139
|
+
// warm up BEFORE listening: Lambda Web Adapter polls the
|
|
140
|
+
// readiness check until the port opens, so work done here
|
|
141
|
+
// stays inside the INIT phase (full CPU boost)
|
|
142
|
+
if (parsePrewarm(options.prewarm)) {
|
|
143
|
+
const startedAt = Date.now();
|
|
144
|
+
try {
|
|
145
|
+
await prewarm(serverOptions.cache);
|
|
146
|
+
console.log(`prewarm done in ${Date.now() - startedAt}ms`);
|
|
147
|
+
}
|
|
148
|
+
catch (err) {
|
|
149
|
+
// 温まらないだけでサーバとしては動けるので起動は続行する
|
|
150
|
+
console.warn(`prewarm failed: ${err}`);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
133
153
|
const { start } = initServer(serverOptions);
|
|
134
154
|
start();
|
|
135
155
|
});
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Cache } from '../cache/index.js';
|
|
2
|
+
/**
|
|
3
|
+
* Render one z0 tile ahead of the first request so that renderer
|
|
4
|
+
* initialization happens at startup — on AWS Lambda (with Lambda Web
|
|
5
|
+
* Adapter's readiness check) this moves the work into the INIT phase,
|
|
6
|
+
* which runs with a full CPU boost.
|
|
7
|
+
*/
|
|
8
|
+
declare function prewarm(cache: Cache): Promise<void>;
|
|
9
|
+
export { prewarm };
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { getRenderedTile } from './index.js';
|
|
2
|
+
// スタイル固有のリソース(タイル/glyphs/sprite)は温まらないが、
|
|
3
|
+
// EGL/GLコンテキスト・Xvfb接続・sharp(libvips)・JITの初期化は共通で効く。
|
|
4
|
+
const MINIMAL_STYLE = {
|
|
5
|
+
version: 8,
|
|
6
|
+
sources: {},
|
|
7
|
+
layers: [
|
|
8
|
+
{
|
|
9
|
+
id: 'background',
|
|
10
|
+
type: 'background',
|
|
11
|
+
paint: { 'background-color': '#ffffff' },
|
|
12
|
+
},
|
|
13
|
+
],
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* Render one z0 tile ahead of the first request so that renderer
|
|
17
|
+
* initialization happens at startup — on AWS Lambda (with Lambda Web
|
|
18
|
+
* Adapter's readiness check) this moves the work into the INIT phase,
|
|
19
|
+
* which runs with a full CPU boost.
|
|
20
|
+
*/
|
|
21
|
+
async function prewarm(cache) {
|
|
22
|
+
const sharp = await getRenderedTile({
|
|
23
|
+
stylejson: MINIMAL_STYLE,
|
|
24
|
+
z: 0,
|
|
25
|
+
x: 0,
|
|
26
|
+
y: 0,
|
|
27
|
+
tileSize: 512,
|
|
28
|
+
cache,
|
|
29
|
+
margin: 0,
|
|
30
|
+
ext: 'png',
|
|
31
|
+
quality: 100,
|
|
32
|
+
});
|
|
33
|
+
await sharp.toBuffer(); // force the actual encode
|
|
34
|
+
}
|
|
35
|
+
export { prewarm };
|