@hypersoniclabs/helix-cli 0.1.27-helix3.562 → 0.1.27-helix3.564
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/dist/city/assemble/sceneVisuals.d.ts +25 -0
- package/dist/city/assemble/sceneVisuals.js +15 -2
- package/dist/city/assemble/sceneVisuals.js.map +1 -1
- package/dist/city/convert/publish.d.ts +12 -1
- package/dist/city/convert/publish.js +120 -2
- package/dist/city/convert/publish.js.map +1 -1
- package/dist/city/convert/spawnPick.d.ts +1 -1
- package/dist/city/convert/spawnPick.js +4 -2
- package/dist/city/convert/spawnPick.js.map +1 -1
- package/dist/city/convert/stages.d.ts +19 -0
- package/dist/city/convert/stages.js.map +1 -1
- package/dist/cs2/convert/trees.js +4 -2
- package/dist/cs2/convert/trees.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/plugins/beamng-vehicle/bin/__pycache__/beamng_abs.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/beamng_audio.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/beamng_engine.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/beamng_expression.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/beamng_jbeam.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/beamng_materials.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/beamng_stock_events.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/fmod_studio.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/fsb5.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/sim_audio.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/sim_audio_ac.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/sim_audio_beamng.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/sim_audio_fixtures.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/test_beamng_engine.cpython-312.pyc +0 -0
- package/plugins/beamng-vehicle/bin/__pycache__/test_sim_audio.cpython-312.pyc +0 -0
|
@@ -30,11 +30,36 @@ export interface SceneVisualsConfig {
|
|
|
30
30
|
};
|
|
31
31
|
look: {
|
|
32
32
|
preset: string;
|
|
33
|
+
presets?: {
|
|
34
|
+
day: CityDayLook;
|
|
35
|
+
};
|
|
33
36
|
};
|
|
34
37
|
exposure?: {
|
|
35
38
|
compensation: number;
|
|
36
39
|
};
|
|
37
40
|
}
|
|
41
|
+
/** The overrides a city look puts on the engine's built-in `day` preset (partial: what it does not say, `day` keeps). */
|
|
42
|
+
export interface CityDayLook {
|
|
43
|
+
finish: {
|
|
44
|
+
shadowTint: [number, number, number];
|
|
45
|
+
highlightTint: [number, number, number];
|
|
46
|
+
toning: number;
|
|
47
|
+
saturation: number;
|
|
48
|
+
lift: number;
|
|
49
|
+
};
|
|
50
|
+
sky: {
|
|
51
|
+
gain: number;
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* The shade of a CS2 street. The engine's `day` look cools its shadows (shadow tint 0.9 / 0.97 / 1.1, toning 0.35) and keeps the display
|
|
56
|
+
* toe closed, which suits open country; under a canyon of towers every street is shade, lit by the (blue) sky alone, and a
|
|
57
|
+
* dark asphalt in it reads blue-black (measured: B - R = +24 in the shade, +23 in the sun, against Granit's -4 and -17). Neutralise
|
|
58
|
+
* the cool shadow tint, warm the highlights a touch, and open the toe (`finish.lift`: "so a shadowed street keeps its texture").
|
|
59
|
+
* The sky's own contribution to the light is eased to 0.8 so the blue does not return in the canyon.
|
|
60
|
+
* Measured on Leonida's downtown asphalt (live shell, 6 yaws): shade B - R +24 -> -5..-7, sun +23 -> -8..-16 (Granit: -4..-7 and -9..-19).
|
|
61
|
+
*/
|
|
62
|
+
export declare const CS2_DAY_LOOK: CityDayLook;
|
|
38
63
|
/** What the far edge of the map keeps of its contrast through the fog. */
|
|
39
64
|
export declare const FOG_FAR_EDGE_TRANSMITTANCE = 0.2;
|
|
40
65
|
/** Ground fog is this much denser than the air above it. */
|
|
@@ -15,12 +15,25 @@
|
|
|
15
15
|
// the air at any map size (Leonida, 14,336 m: 0.00011; a 6.4 km map comes out at 0.00025, the value Granit's file has).
|
|
16
16
|
// Ground fog (`heightDensity`) is 1.8 x that. `scale` multiplies both (an art knob; 1 keeps the rule).
|
|
17
17
|
// exposure CS2 buildings come from a game that exposes its HDR; +1.5 EV keeps the converted facades from reading dim.
|
|
18
|
+
// look a CS2 map's `day` look is overridden for the shade of its streets (`CS2_DAY_LOOK`).
|
|
18
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
exports.CS2_EXPOSURE_COMPENSATION = exports.DEFAULT_HOURS = exports.FICTIONAL_LATITUDE_DEG = exports.GROUND_FOG_RATIO = exports.FOG_FAR_EDGE_TRANSMITTANCE = void 0;
|
|
20
|
+
exports.CS2_EXPOSURE_COMPENSATION = exports.DEFAULT_HOURS = exports.FICTIONAL_LATITUDE_DEG = exports.GROUND_FOG_RATIO = exports.FOG_FAR_EDGE_TRANSMITTANCE = exports.CS2_DAY_LOOK = void 0;
|
|
20
21
|
exports.deriveSceneVisuals = deriveSceneVisuals;
|
|
21
22
|
exports.writeSceneVisualsFile = writeSceneVisualsFile;
|
|
22
23
|
const node_fs_1 = require("node:fs");
|
|
23
24
|
const node_path_1 = require("node:path");
|
|
25
|
+
/**
|
|
26
|
+
* The shade of a CS2 street. The engine's `day` look cools its shadows (shadow tint 0.9 / 0.97 / 1.1, toning 0.35) and keeps the display
|
|
27
|
+
* toe closed, which suits open country; under a canyon of towers every street is shade, lit by the (blue) sky alone, and a
|
|
28
|
+
* dark asphalt in it reads blue-black (measured: B - R = +24 in the shade, +23 in the sun, against Granit's -4 and -17). Neutralise
|
|
29
|
+
* the cool shadow tint, warm the highlights a touch, and open the toe (`finish.lift`: "so a shadowed street keeps its texture").
|
|
30
|
+
* The sky's own contribution to the light is eased to 0.8 so the blue does not return in the canyon.
|
|
31
|
+
* Measured on Leonida's downtown asphalt (live shell, 6 yaws): shade B - R +24 -> -5..-7, sun +23 -> -8..-16 (Granit: -4..-7 and -9..-19).
|
|
32
|
+
*/
|
|
33
|
+
exports.CS2_DAY_LOOK = {
|
|
34
|
+
finish: { shadowTint: [1.1, 0.98, 0.8], highlightTint: [1.12, 1.0, 0.82], toning: 0.7, saturation: 0.92, lift: 1.0 },
|
|
35
|
+
sky: { gain: 0.8 },
|
|
36
|
+
};
|
|
24
37
|
/** What the far edge of the map keeps of its contrast through the fog. */
|
|
25
38
|
exports.FOG_FAR_EDGE_TRANSMITTANCE = 0.2;
|
|
26
39
|
/** Ground fog is this much denser than the air above it. */
|
|
@@ -49,7 +62,7 @@ function deriveSceneVisuals(manifest, scale = 1) {
|
|
|
49
62
|
shadows: { extent: 200 },
|
|
50
63
|
fog: { density, heightDensity: round5(density * exports.GROUND_FOG_RATIO) },
|
|
51
64
|
sky: { model: 'hillaire', mieScale: 1.0, groundBounceAlbedo: 0.25 },
|
|
52
|
-
look: { preset: 'day' },
|
|
65
|
+
look: projection.kind === 'cs2' ? { preset: 'day', presets: { day: exports.CS2_DAY_LOOK } } : { preset: 'day' },
|
|
53
66
|
...(projection.kind === 'cs2' ? { exposure: { compensation: exports.CS2_EXPOSURE_COMPENSATION } } : {}),
|
|
54
67
|
};
|
|
55
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sceneVisuals.js","sourceRoot":"","sources":["../../../src/city/assemble/sceneVisuals.ts"],"names":[],"mappings":";AAAA,+HAA+H;AAC/H,oIAAoI;AACpI,8HAA8H;AAC9H,6HAA6H;AAC7H,EAAE;AACF,kIAAkI;AAClI,uIAAuI;AACvI,EAAE;AACF,mIAAmI;AACnI,2HAA2H;AAC3H,6EAA6E;AAC7E,oGAAoG;AACpG,kIAAkI;AAClI,2IAA2I;AAC3I,0HAA0H;AAC1H,gIAAgI;;;
|
|
1
|
+
{"version":3,"file":"sceneVisuals.js","sourceRoot":"","sources":["../../../src/city/assemble/sceneVisuals.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ContentRating, ConvertConfig } from './config';
|
|
2
|
-
import type { ConvertPaths, StageDef } from './stages';
|
|
2
|
+
import type { ConvertPaths, HeadRow, StageDef, WarmReport } from './stages';
|
|
3
3
|
export declare const DEFAULT_REMOTE = "R2:instant-worlds-dev/instant-worlds";
|
|
4
4
|
export declare const DEFAULT_CDN_BASE = "https://eu.instant-worlds.dev.helix-cdn.com/instant-worlds";
|
|
5
5
|
export declare const IMMUTABLE_CACHE = "Cache-Control: public, max-age=31536000, immutable";
|
|
@@ -30,6 +30,10 @@ export declare function stageGzipData(sceneRoot: string, into: string): {
|
|
|
30
30
|
raw: number;
|
|
31
31
|
stored: number;
|
|
32
32
|
};
|
|
33
|
+
/** GET every URL once (parallel, bodies drained) and count what the edge answered: a MISS here is the origin round trip the first visitor no longer pays. */
|
|
34
|
+
export declare function warmUrls(urls: string[], fetchImpl?: typeof fetch, concurrency?: number): Promise<WarmReport>;
|
|
35
|
+
/** The objects a first visit reads, as paths under the data prefix: the startup packs and their indexes, each root document and its pin and ocean, the lighting files, world.json. */
|
|
36
|
+
export declare function startupWarmPaths(publishDir: string, roots: string[]): string[];
|
|
33
37
|
export interface UploadReceipt {
|
|
34
38
|
schema: 'helix.city-upload/1';
|
|
35
39
|
world: string;
|
|
@@ -41,9 +45,16 @@ export interface UploadReceipt {
|
|
|
41
45
|
files: number;
|
|
42
46
|
raw: number;
|
|
43
47
|
stored: number;
|
|
48
|
+
headerRepairs?: number;
|
|
44
49
|
};
|
|
45
50
|
packs: number;
|
|
51
|
+
/** The CDN warm-up of the startup set (absent on a run that did not warm). */
|
|
52
|
+
warm?: WarmReport;
|
|
46
53
|
}
|
|
54
|
+
/** HEAD every URL (parallel) asking for gzip: the headers the CDN serves a browser. A HEAD per object through rclone's lsjson is ~6 objects a second; this is seconds. */
|
|
55
|
+
export declare function headUrls(urls: string[], fetchImpl?: typeof fetch, concurrency?: number): Promise<HeadRow[]>;
|
|
56
|
+
/** The URLs whose answer is not the one the World needs: gzip-encoded data served without `Content-Encoding: gzip`, or without the immutable `Cache-Control`, or not at all. */
|
|
57
|
+
export declare function wrongHeaders(rows: HeadRow[]): string[];
|
|
47
58
|
export declare function uploadStage(): StageDef;
|
|
48
59
|
export declare function worldStage(): StageDef;
|
|
49
60
|
/** The slug and title of the World the data was uploaded for, through the platform API with the CLI's own login. */
|
|
@@ -14,6 +14,10 @@ exports.GZIP_DATA = exports.IMMUTABLE_CACHE = exports.DEFAULT_CDN_BASE = exports
|
|
|
14
14
|
exports.uploadSettings = uploadSettings;
|
|
15
15
|
exports.dataTag = dataTag;
|
|
16
16
|
exports.stageGzipData = stageGzipData;
|
|
17
|
+
exports.warmUrls = warmUrls;
|
|
18
|
+
exports.startupWarmPaths = startupWarmPaths;
|
|
19
|
+
exports.headUrls = headUrls;
|
|
20
|
+
exports.wrongHeaders = wrongHeaders;
|
|
17
21
|
exports.uploadStage = uploadStage;
|
|
18
22
|
exports.worldStage = worldStage;
|
|
19
23
|
exports.lookupWorld = lookupWorld;
|
|
@@ -91,7 +95,83 @@ function stageGzipData(sceneRoot, into) {
|
|
|
91
95
|
}
|
|
92
96
|
return { files, raw, stored };
|
|
93
97
|
}
|
|
94
|
-
|
|
98
|
+
/** GET every URL once (parallel, bodies drained) and count what the edge answered: a MISS here is the origin round trip the first visitor no longer pays. */
|
|
99
|
+
async function warmUrls(urls, fetchImpl = fetch, concurrency = 12) {
|
|
100
|
+
const report = { requested: urls.length, ok: 0, failed: 0, bytes: 0, cache: {} };
|
|
101
|
+
let next = 0;
|
|
102
|
+
const worker = async () => {
|
|
103
|
+
for (;;) {
|
|
104
|
+
const url = urls[next++];
|
|
105
|
+
if (url === undefined)
|
|
106
|
+
return;
|
|
107
|
+
try {
|
|
108
|
+
const res = await fetchImpl(url, { headers: { 'accept-encoding': 'gzip' } });
|
|
109
|
+
const body = await res.arrayBuffer();
|
|
110
|
+
if (!res.ok) {
|
|
111
|
+
report.failed += 1;
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
114
|
+
report.ok += 1;
|
|
115
|
+
report.bytes += body.byteLength;
|
|
116
|
+
const status = res.headers.get('cf-cache-status') ?? 'none';
|
|
117
|
+
report.cache[status] = (report.cache[status] ?? 0) + 1;
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
report.failed += 1;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
await Promise.all(Array.from({ length: Math.min(concurrency, urls.length) }, worker));
|
|
125
|
+
return report;
|
|
126
|
+
}
|
|
127
|
+
/** The objects a first visit reads, as paths under the data prefix: the startup packs and their indexes, each root document and its pin and ocean, the lighting files, world.json. */
|
|
128
|
+
function startupWarmPaths(publishDir, roots) {
|
|
129
|
+
const out = [];
|
|
130
|
+
for (const file of listFiles((0, node_path_1.join)(publishDir, 'packs')))
|
|
131
|
+
out.push((0, node_path_1.relative)(publishDir, file));
|
|
132
|
+
for (const root of roots)
|
|
133
|
+
for (const name of ['scene.helix-scene.json', 'pin.json', 'ocean.json', 'ocean.rgba'])
|
|
134
|
+
if ((0, node_fs_1.existsSync)((0, node_path_1.join)(publishDir, 'scene', root, name)))
|
|
135
|
+
out.push(`scene/${root}/${name}`);
|
|
136
|
+
for (const file of listFiles((0, node_path_1.join)(publishDir, 'scene-visuals')))
|
|
137
|
+
out.push((0, node_path_1.relative)(publishDir, file));
|
|
138
|
+
if ((0, node_fs_1.existsSync)((0, node_path_1.join)(publishDir, 'world.json')))
|
|
139
|
+
out.push('world.json');
|
|
140
|
+
return out;
|
|
141
|
+
}
|
|
142
|
+
// `--no-update-modtime` is load-bearing: onto a prefix that already holds an identical object (a seeded prefix, a rerun), a differing local
|
|
143
|
+
// mtime makes rclone "touch" the destination with a server-side copy-to-self that REPLACEs the metadata and silently drops
|
|
144
|
+
// `Content-Encoding: gzip` and `Cache-Control` (reproduced on R2). The Scene then boots on gzip bytes served as raw data and fails.
|
|
145
|
+
// `--size-only`: the prefix is immutable and content-addressed, so a same-named same-size object is the same object; a rerun then lists
|
|
146
|
+
// the 120k objects instead of reading a modtime and a hash for each (minutes), and uploads only what is missing.
|
|
147
|
+
const rcloneFlags = ['--transfers', '64', '--checkers', '64', '--retries', '6', '--low-level-retries', '20', '--no-update-modtime', '--size-only', '--stats-one-line', '--stats-log-level', 'NOTICE'];
|
|
148
|
+
const GZIP_HEADER = 'Content-Encoding: gzip';
|
|
149
|
+
/** HEAD every URL (parallel) asking for gzip: the headers the CDN serves a browser. A HEAD per object through rclone's lsjson is ~6 objects a second; this is seconds. */
|
|
150
|
+
async function headUrls(urls, fetchImpl = fetch, concurrency = 32) {
|
|
151
|
+
const rows = new Array(urls.length);
|
|
152
|
+
let next = 0;
|
|
153
|
+
const worker = async () => {
|
|
154
|
+
for (;;) {
|
|
155
|
+
const at = next++;
|
|
156
|
+
const url = urls[at];
|
|
157
|
+
if (url === undefined)
|
|
158
|
+
return;
|
|
159
|
+
try {
|
|
160
|
+
const res = await fetchImpl(url, { method: 'HEAD', headers: { 'accept-encoding': 'gzip' } });
|
|
161
|
+
rows[at] = { url, status: res.status, encoding: res.headers.get('content-encoding'), cache: res.headers.get('cache-control') };
|
|
162
|
+
}
|
|
163
|
+
catch {
|
|
164
|
+
rows[at] = { url, status: 0, encoding: null, cache: null };
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
};
|
|
168
|
+
await Promise.all(Array.from({ length: Math.min(concurrency, urls.length) }, worker));
|
|
169
|
+
return rows;
|
|
170
|
+
}
|
|
171
|
+
/** The URLs whose answer is not the one the World needs: gzip-encoded data served without `Content-Encoding: gzip`, or without the immutable `Cache-Control`, or not at all. */
|
|
172
|
+
function wrongHeaders(rows) {
|
|
173
|
+
return rows.filter((r) => r.status !== 200 || r.encoding !== 'gzip' || !/immutable/.test(r.cache ?? '')).map((r) => r.url);
|
|
174
|
+
}
|
|
95
175
|
function uploadStage() {
|
|
96
176
|
return {
|
|
97
177
|
id: 'upload', title: 'Upload the Scene data to the World\'s CDN prefix (immutable, gzip-encoded data files, startup packs)', optimizations: ['publish.r2-upload'],
|
|
@@ -138,6 +218,38 @@ function uploadStage() {
|
|
|
138
218
|
const worldJson = (0, node_path_1.join)(ctx.paths.publish, 'world.json');
|
|
139
219
|
if ((0, node_fs_1.existsSync)(worldJson))
|
|
140
220
|
await must('upload.world-json', 'rclone', ['copyto', worldJson, `${base}/world.json`, '--header-upload', 'Cache-Control: public, max-age=300', ...rcloneFlags]);
|
|
221
|
+
// 3c. Prove the served headers (a HEAD per object through the CDN, asking for gzip): a gzip-encoded object stored without `Content-Encoding: gzip` serves compressed bytes as raw data (the
|
|
222
|
+
// World fails to boot), and rclone skips an identical existing object, so a prefix seeded or half-written earlier keeps whatever it had.
|
|
223
|
+
// Check every gzip-encoded object by name; force-rewrite the wrong ones with the right headers; fail if they are still wrong.
|
|
224
|
+
const expectedGz = [
|
|
225
|
+
...listFiles((0, node_path_1.join)(ctx.paths.out, 'upload-gz')).map((f) => `scene/${(0, node_path_1.relative)((0, node_path_1.join)(ctx.paths.out, 'upload-gz'), f)}`),
|
|
226
|
+
...packFiles.filter((f) => f.endsWith('.pack')).map((f) => `packs/${(0, node_path_1.relative)(packsDir, f)}`),
|
|
227
|
+
];
|
|
228
|
+
const cdnUrl = (rel) => `${settings.cdnBase.replace(/\/+$/, '')}/${settings.world}/scene-data/${tag}/${rel}`;
|
|
229
|
+
const wrongRels = async (rels) => {
|
|
230
|
+
const bad = new Set(wrongHeaders(await (ctx.headCdn ?? ((urls) => headUrls(urls)))(rels.map(cdnUrl))));
|
|
231
|
+
return rels.filter((rel) => bad.has(cdnUrl(rel)));
|
|
232
|
+
};
|
|
233
|
+
let repaired = 0;
|
|
234
|
+
if (expectedGz.length > 0) {
|
|
235
|
+
const bad = await wrongRels(expectedGz);
|
|
236
|
+
if (bad.length > 0) {
|
|
237
|
+
repaired = bad.length;
|
|
238
|
+
const fix = async (id, prefix, from) => {
|
|
239
|
+
const list = bad.filter((r) => r.startsWith(`${prefix}/`)).map((r) => r.slice(prefix.length + 1));
|
|
240
|
+
if (list.length === 0)
|
|
241
|
+
return;
|
|
242
|
+
const file = (0, node_path_1.join)(ctx.paths.publish, `${id}.txt`);
|
|
243
|
+
(0, node_fs_1.writeFileSync)(file, `${list.join('\n')}\n`);
|
|
244
|
+
await must(id, 'rclone', ['copy', from, `${base}/${prefix}`, '--files-from', file, '--ignore-times', '--header-upload', exports.IMMUTABLE_CACHE, '--header-upload', GZIP_HEADER, ...rcloneFlags]);
|
|
245
|
+
};
|
|
246
|
+
await fix('upload.fix-scene', 'scene', (0, node_path_1.join)(ctx.paths.out, 'upload-gz'));
|
|
247
|
+
await fix('upload.fix-packs', 'packs', packsDir);
|
|
248
|
+
const still = await wrongRels(expectedGz);
|
|
249
|
+
if (still.length > 0)
|
|
250
|
+
throw new Error(`${still.length} gzip-encoded object(s) are stored without Content-Encoding: gzip or the immutable Cache-Control after a rewrite (first: ${still[0]}); the World would not boot`);
|
|
251
|
+
}
|
|
252
|
+
}
|
|
141
253
|
// 4. Prove it landed: object counts (the gzip pass keeps the object count, whatever the stored bytes).
|
|
142
254
|
const sceneLocal = listFiles(ctx.paths.publishScene).filter((f) => !f.includes(`${(0, node_path_1.join)(ctx.paths.publishScene, '.keys')}/`)).length;
|
|
143
255
|
const wanted = sceneLocal + packFiles.length + visualFiles.length + ((0, node_fs_1.existsSync)(worldJson) ? 1 : 0);
|
|
@@ -145,9 +257,15 @@ function uploadStage() {
|
|
|
145
257
|
const size = JSON.parse(sizeOut.slice(sizeOut.indexOf('{'), sizeOut.lastIndexOf('}') + 1));
|
|
146
258
|
if (size.count < wanted)
|
|
147
259
|
throw new Error(`the CDN prefix holds ${size.count} objects, expected ${wanted}: rerun with --from upload`);
|
|
260
|
+
// 5. Warm the edge: a new immutable prefix is a cache MISS everywhere, and the first visitor's cold start would pay ~70 origin round trips (measured: 66 MISS in a 26.9 s cold load).
|
|
261
|
+
const roots = ctx.config.tiers.map((t) => ctx.paths.finalRoot(t));
|
|
262
|
+
const warmUrls0 = startupWarmPaths(ctx.paths.publish, roots).map((p) => `${settings.cdnBase.replace(/\/+$/, '')}/${settings.world}/scene-data/${tag}/${p}`);
|
|
263
|
+
const warm = await (ctx.warmCdn ?? ((urls) => warmUrls(urls)))(warmUrls0).catch(() => undefined);
|
|
264
|
+
if (warm)
|
|
265
|
+
ctx.log(`upload: warmed ${warm.ok}/${warm.requested} startup objects (${(warm.bytes / 1e6).toFixed(1)} MB; edge ${JSON.stringify(warm.cache)})`);
|
|
148
266
|
const receipt = {
|
|
149
267
|
schema: 'helix.city-upload/1', world: settings.world, tag, dataBase: `${settings.cdnBase.replace(/\/+$/, '')}/${settings.world}/scene-data/${tag}`,
|
|
150
|
-
objects: size.count, bytes: size.bytes, gzip: gz, packs: packFiles.length,
|
|
268
|
+
objects: size.count, bytes: size.bytes, gzip: { ...gz, headerRepairs: repaired }, packs: packFiles.length, ...(warm ? { warm } : {}),
|
|
151
269
|
};
|
|
152
270
|
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(ctx.paths.publish, 'uploaded.json'), `${JSON.stringify(receipt, null, 2)}\n`);
|
|
153
271
|
return { commands, outputs: { dataBase: receipt.dataBase, objects: String(size.count) }, facts: receipt };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/city/convert/publish.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/city/convert/publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export interface PickedSpawn {
|
|
|
14
14
|
}
|
|
15
15
|
/** Terrain height at a plan point from the source's DEM raster (bilinear), or `null` when the source has none. */
|
|
16
16
|
export declare function demHeightSampler(source: CitySource): ((x: number, z: number) => number) | null;
|
|
17
|
-
/** The densest downtown: the 256 m cell, summed with its eight neighbours, holding the most
|
|
17
|
+
/** The densest downtown: the 256 m cell, summed with its eight neighbours, holding the most height-weighted buildings (a tower counts for far more than a house). */
|
|
18
18
|
export declare function findDowntown(buildings: readonly CityBuilding[]): {
|
|
19
19
|
x: number;
|
|
20
20
|
z: number;
|
|
@@ -108,7 +108,7 @@ class FootprintIndex {
|
|
|
108
108
|
return false;
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
|
-
/** The densest downtown: the 256 m cell, summed with its eight neighbours, holding the most
|
|
111
|
+
/** The densest downtown: the 256 m cell, summed with its eight neighbours, holding the most height-weighted buildings (a tower counts for far more than a house). */
|
|
112
112
|
function findDowntown(buildings) {
|
|
113
113
|
if (!buildings.length)
|
|
114
114
|
return null;
|
|
@@ -119,7 +119,9 @@ function findDowntown(buildings) {
|
|
|
119
119
|
continue;
|
|
120
120
|
const [cx, cz] = centroid(b.ring);
|
|
121
121
|
const key = `${Math.floor(cx / DENSITY_CELL_M)},${Math.floor(cz / DENSITY_CELL_M)}`;
|
|
122
|
-
|
|
122
|
+
// A downtown is its skyline: height counts quadratically, so thirty towers outweigh seventy houses (Leonida: the plain count
|
|
123
|
+
// opened the World in a low-rise suburb, the height-weighted one in the tower core).
|
|
124
|
+
score.set(key, (score.get(key) ?? 0) + 1 + (Math.min(b.heightM ?? 0, 300) / 40) ** 2);
|
|
123
125
|
count.set(key, (count.get(key) ?? 0) + 1);
|
|
124
126
|
}
|
|
125
127
|
let best = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawnPick.js","sourceRoot":"","sources":["../../../src/city/convert/spawnPick.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"spawnPick.js","sourceRoot":"","sources":["../../../src/city/convert/spawnPick.ts"],"names":[],"mappings":";AAAA,kIAAkI;AAClI,kIAAkI;AAClI,8HAA8H;AAC9H,oEAAoE;;AAwBpE,4CAeC;AA6DD,oCAsBC;AAMD,4CAuCC;AAzJD,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC9F,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAClC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,qFAAqF;AACrF,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B,kHAAkH;AAClH,SAAgB,gBAAgB,CAAC,MAAkB;IACjD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC/B,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACpD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAClC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACtE,MAAM,EAAE,GAAG,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1K,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACd,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC3G,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACnE,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;IACvH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACjB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAAC,CAAC;IAC/C,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,qDAAqD;AACrD,SAAS,QAAQ,CAAC,EAAU,EAAE,EAAU,EAAE,CAAO,EAAE,CAAO;IACxD,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAC/B,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAClG,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;IACvD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,WAAW,CAAC,EAAU,EAAE,EAAU,EAAE,IAAY;IACvD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QAC9D,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE;YAAE,MAAM,GAAG,CAAC,MAAM,CAAC;IACjG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+FAA+F;AAC/F,MAAM,cAAc;IACT,KAAK,GAAG,EAAE,CAAC;IACX,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;IACnD,YAAY,SAAkC;QAC5C,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,IAAI,IAAI,GAAG,QAAQ,EAAE,IAAI,GAAG,QAAQ,EAAE,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC;YACzE,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;gBAAC,IAAI,CAAC,GAAG,IAAI;oBAAE,IAAI,GAAG,CAAC,CAAC;gBAAC,IAAI,CAAC,GAAG,IAAI;oBAAE,IAAI,GAAG,CAAC,CAAC;gBAAC,IAAI,CAAC,GAAG,IAAI;oBAAE,IAAI,GAAG,CAAC,CAAC;gBAAC,IAAI,CAAC,GAAG,IAAI;oBAAE,IAAI,GAAG,CAAC,CAAC;YAAC,CAAC;YAChI,KAAK,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC1F,KAAK,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;oBAC1F,MAAM,GAAG,GAAG,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC;oBAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACjC,IAAI,IAAI;wBAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;wBAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,kFAAkF;IAClF,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,MAAc;QACvC,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,CAAC;QAC3B,KAAK,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;YAC1G,KAAK,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC1G,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;oBACpD,IAAI,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;wBAAE,OAAO,IAAI,CAAC;oBAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC;wBAAE,IAAI,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;4BAAE,OAAO,IAAI,CAAC;oBAC/G,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;wBAAE,OAAO,IAAI,CAAC;gBACnG,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,qKAAqK;AACrK,SAAgB,YAAY,CAAC,SAAkC;IAC7D,IAAI,CAAC,SAAS,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAAE,SAAS;QAC7B,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,cAAc,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,cAAc,CAAC,EAAE,CAAC;QACpF,6HAA6H;QAC7H,qFAAqF;QACrF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACtF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,IAAI,GAAkE,IAAI,CAAC;IAC/E,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC/B,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;YAAE,KAAK,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;gBAAE,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACzH,IAAI,CAAC,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAAE,IAAI,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IACjJ,CAAC;IACD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,OAAO,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,cAAc,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;AAC3H,CAAC;AAED,SAAS,WAAW,CAAC,IAAc;IACjC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;AACtE,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAkB,EAAE,UAA+B,EAAE;IACpF,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACnD,MAAM,UAAU,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,CAAS,EAAW,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC;IAChI,IAAI,IAAI,GAAsF,IAAI,CAAC;IACnG,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,SAAS;QAC9C,IAAI,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,KAAK,YAAY;YAAE,SAAS;QAC5G,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC;YAAE,SAAS;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACzD,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,aAAa;gBAAE,SAAS;YAC3D,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,EAAE,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACvD,4FAA4F;YAC5F,MAAM,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YACrC,IAAI,IAAI,IAAI,CAAC,GAAG,OAAO,IAAI,IAAI,CAAC,CAAC;gBAAE,SAAS;YAC5C,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzB,IAAI,CAAC,GAAG,gBAAgB;oBAAE,SAAS;gBACnC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,qBAAqB;oBAAE,SAAS;YAC/G,CAAC;YACD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,GAAG,CAAC,GAAG,uBAAuB,CAAC;gBAAE,SAAS;YAC3E,IAAI,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC;gBAAE,SAAS;YACnC,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC;QAC3E,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;IAChE,OAAO;QACL,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;QAC3H,MAAM,EAAE,0BAA0B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,iCAAiC,QAAQ,CAAC,SAAS,4BAA4B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,kCAAkC;QAC1L,QAAQ;KACT,CAAC;AACJ,CAAC"}
|
|
@@ -45,6 +45,21 @@ export interface Facts {
|
|
|
45
45
|
meshMode: 'real' | 'masses';
|
|
46
46
|
seaLevelM?: number;
|
|
47
47
|
}
|
|
48
|
+
/** What a CDN warm-up fetched: files that answered, bytes, and the edge's cache status per answer (`cf-cache-status`: HIT, MISS, ...). */
|
|
49
|
+
export interface WarmReport {
|
|
50
|
+
requested: number;
|
|
51
|
+
ok: number;
|
|
52
|
+
failed: number;
|
|
53
|
+
bytes: number;
|
|
54
|
+
cache: Record<string, number>;
|
|
55
|
+
}
|
|
56
|
+
/** One URL's answer to a HEAD: what a client that accepts gzip is served. */
|
|
57
|
+
export interface HeadRow {
|
|
58
|
+
url: string;
|
|
59
|
+
status: number;
|
|
60
|
+
encoding: string | null;
|
|
61
|
+
cache: string | null;
|
|
62
|
+
}
|
|
48
63
|
export interface StageContext {
|
|
49
64
|
config: ConvertConfig;
|
|
50
65
|
paths: ConvertPaths;
|
|
@@ -58,6 +73,10 @@ export interface StageContext {
|
|
|
58
73
|
slug: string;
|
|
59
74
|
title: string;
|
|
60
75
|
}>;
|
|
76
|
+
/** Fetches URLs once through the CDN so the first visitor's cold start does not pay the origin round trips (replaced in tests; the upload stage defaults to a parallel GET). */
|
|
77
|
+
warmCdn?: (urls: string[]) => Promise<WarmReport>;
|
|
78
|
+
/** HEADs URLs through the CDN with `Accept-Encoding: gzip`: the headers a client is served (replaced in tests; the upload stage defaults to a parallel HEAD). */
|
|
79
|
+
headCdn?: (urls: string[]) => Promise<HeadRow[]>;
|
|
61
80
|
log: (line: string) => void;
|
|
62
81
|
/** Parallel child processes for sharded prototype builds. */
|
|
63
82
|
jobs: number;
|