Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions apps/micropolis/cli/wasm/sim.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
* `extendSimCommands(argv)` adds the `sim` branch using the shared WASM loader.
*/

import { writeFileSync } from 'node:fs';
import type { Argv } from 'yargs';
import type { MainModule, Micropolis } from '../../src/types/micropolisengine.d.js';
import { createNoopJsCallback } from '../../src/lib/wasm/callbacks';
import { loadMicropolisMainModule } from '../../src/lib/wasm/node';
import { normalizeStructuredFormat, stringifyStructured } from '../lib/format.js';

type Flags = { city?: string; ticks?: number; format?: string };
type Flags = { city?: string; ticks?: number; format?: string; output?: string };

function stringFlag(v: unknown, fallback: string): string {
return typeof v === 'string' && v.length > 0 ? v : fallback;
Expand Down Expand Up @@ -53,6 +54,7 @@ function summarize(
async function runSmoke(flags: Flags) {
const ticks = numberFlag(flags.ticks, 10);
const city = stringFlag(flags.city, '/cities/haight.cty');
const output = stringFlag(flags.output, '');
const engine = await loadMicropolisMainModule();
const micropolis = new engine.Micropolis();
const cb = createNoopJsCallback(engine);
Expand All @@ -61,7 +63,18 @@ async function runSmoke(flags: Flags) {
try {
const loaded = micropolis.loadCity(city);
for (let i = 0; i < ticks; i += 1) micropolis.simTick();
return summarize(engine, micropolis, { loaded, city, ticks });
const summary = summarize(engine, micropolis, { loaded, city, ticks });
let saved: string | null = null;
let bytes = 0;
if (output.length > 0) {
const savedPath = '/micropolis-save.cty';
micropolis.saveCityAs(savedPath);
const buf = engine.FS_readFile(savedPath) as Uint8Array;
writeFileSync(output, buf);
saved = output;
bytes = buf.length;
}
return { ...summary, saved, bytes };
} finally {
micropolis.delete();
}
Expand Down Expand Up @@ -104,6 +117,11 @@ export function extendSimCommands(argv: Argv): Argv {
describe: 'Virtual path passed to loadCity (packaged .cty)'
})
.option('ticks', { type: 'number', default: 10, describe: 'Number of simTick() calls' })
.option('output', {
alias: 'o',
type: 'string',
describe: 'Write the city to this .cty file after ticking'
})
.option('format', {
alias: 'f',
type: 'string',
Expand Down
2 changes: 2 additions & 0 deletions apps/micropolis/src/types/micropolisengine.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// TypeScript bindings for emscripten-generated code. Automatically generated at compile time.
declare namespace RuntimeExports {
function FS_readFile(...args: any[]): any;
let HEAPU16: Uint16Array;
let wasmMemory: any;
function FS_createPath(...args: any[]): any;
Expand Down Expand Up @@ -369,6 +370,7 @@ export interface Micropolis extends ClassHandle {
setCallback(_0: Callback | null, _1: any): void;
init(): void;
loadCity(_0: EmbindString): boolean;
saveCityAs(_0: EmbindString): void;
simTick(): void;
simUpdate(): void;
generateSomeRandomCity(): void;
Expand Down
2 changes: 1 addition & 1 deletion packages/micropolis-engine/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ EMLDFLAGS = \
-s EXPORT_ES6=1 \
-s 'ENVIRONMENT=web,worker,node' \
-s ALLOW_MEMORY_GROWTH=1 \
-s 'EXPORTED_RUNTIME_METHODS=["HEAPU16","wasmMemory"]' \
-s 'EXPORTED_RUNTIME_METHODS=["FS_readFile","HEAPU16","wasmMemory"]' \
-lembind \
--emit-tsd=micropolisengine.d.ts \
--shell-file src/micropolisengine_template.html \
Expand Down
1 change: 1 addition & 0 deletions packages/micropolis-engine/src/emscripten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,7 @@ function createTypedArrayFromMap(mapInstance) {
.function("setCallback", &Micropolis::setCallback, allow_raw_pointers())
.function("init", &Micropolis::init)
.function("loadCity", &Micropolis::loadCity)
.function("saveCityAs", &Micropolis::saveCityAs)
.function("simTick", &Micropolis::simTick)
.function("simUpdate", &Micropolis::simUpdate)
.function("generateSomeRandomCity", &Micropolis::generateSomeRandomCity)
Expand Down