@openchambery/relay-server 1.18.7-beta.2 → 1.18.7-beta.3

package/src/push/apns.js

@@ -0,0 +1,138 @@
+import crypto from 'node:crypto';
+import http2 from 'node:http2';
+
+const APNS_HOST = {
+  production: 'https://api.push.apple.com',
+  sandbox: 'https://api.sandbox.push.apple.com',
+};
+const JWT_TTL_MS = 50 * 60 * 1000;
+const SESSION_TTL_MS = 30 * 60 * 1000;
+const REQUEST_TIMEOUT_MS = 5_000;
+const MAX_RESPONSE_BYTES = 4_096;
+export const DEAD_TOKEN_REASONS = new Set(['BadDeviceToken', 'Unregistered', 'DeviceTokenNotForTopic']);
+
+const normalizePem = (value) => (typeof value === 'string' ? value.replace(/\\n/g, '\n').trim() : '');
+
+export const createApnsProvider = (options = {}) => {
+  const clock = { now: Date.now, setTimeout, clearTimeout, ...options.clock };
+  const connect = options.http2?.connect ?? http2.connect;
+  const sessionTtlMs = options.sessionTtlMs ?? SESSION_TTL_MS;
+  let privateKey;
+  try {
+    privateKey = crypto.createPrivateKey(normalizePem(options.p8));
+  } catch {
+    throw new Error('Invalid APNs key');
+  }
+  const bundleId = options.bundleId;
+  const sessions = new Map();
+  let cachedJwt = null;
+
+  const signJwt = () => {
+    const header = Buffer.from(JSON.stringify({ alg: 'ES256', kid: options.keyId })).toString('base64url');
+    const claims = Buffer.from(JSON.stringify({ iss: options.teamId, iat: Math.floor(clock.now() / 1000) })).toString('base64url');
+    const signingInput = `${header}.${claims}`;
+    const signature = crypto.sign('sha256', Buffer.from(signingInput), { key: privateKey, dsaEncoding: 'ieee-p1363' }).toString('base64url');
+    return `${signingInput}.${signature}`;
+  };
+
+  const getJwt = (force) => {
+    const now = clock.now();
+    if (!force && cachedJwt && now - cachedJwt.issuedAtMs < JWT_TTL_MS) return cachedJwt.token;
+    cachedJwt = { token: signJwt(), issuedAtMs: now };
+    return cachedJwt.token;
+  };
+
+  const dropSession = (env, client) => {
+    const current = sessions.get(env);
+    if (current?.client === client) sessions.delete(env);
+    try { client.close(); } catch { /* session already gone */ }
+  };
+
+  const getSession = (env) => {
+    const existing = sessions.get(env);
+    if (existing?.client && !existing.client.closed && existing.client.destroyed !== true) {
+      if (clock.now() - existing.createdAt < sessionTtlMs) return existing.client;
+      dropSession(env, existing.client);
+    }
+    const client = connect(APNS_HOST[env]);
+    client.on('error', () => dropSession(env, client));
+    client.on('close', () => { if (sessions.get(env)?.client === client) sessions.delete(env); });
+    sessions.set(env, { client, createdAt: clock.now() });
+    return client;
+  };
+
+  const dispatch = (input, forceJwt) => new Promise((resolve) => {
+    const jwt = getJwt(forceJwt);
+    let client;
+    try { client = getSession(input.env); } catch { resolve({ ok: false }); return; }
+    const liveActivity = input.pushType === 'liveactivity';
+    const headers = {
+      ':method': 'POST',
+      ':path': `/3/device/${input.token}`,
+      authorization: `bearer ${jwt}`,
+      'apns-topic': liveActivity ? `${bundleId}.push-type.liveactivity` : bundleId,
+      'apns-push-type': liveActivity ? 'liveactivity' : 'alert',
+      'apns-priority': '10',
+    };
+    if (!liveActivity && input.collapseId) headers['apns-collapse-id'] = input.collapseId;
+    let req;
+    try { req = client.request(headers); } catch {
+      dropSession(input.env, client);
+      resolve({ ok: false });
+      return;
+    }
+    let status = 0;
+    const chunks = [];
+    let responseBytes = 0;
+    let settled = false;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      clock.clearTimeout(timer);
+      resolve(result);
+    };
+    const timer = clock.setTimeout(() => {
+      try { req.close(); } catch { /* ignore */ }
+      finish({ ok: false });
+    }, options.requestTimeoutMs ?? REQUEST_TIMEOUT_MS);
+    req.on('response', (responseHeaders) => { status = Number(responseHeaders[':status']) || 0; });
+    req.on('data', (chunk) => {
+      if (responseBytes >= MAX_RESPONSE_BYTES) return;
+      const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+      const take = buf.length > MAX_RESPONSE_BYTES - responseBytes ? buf.subarray(0, MAX_RESPONSE_BYTES - responseBytes) : buf;
+      chunks.push(take);
+      responseBytes += take.length;
+    });
+    req.on('end', () => {
+      if (status === 200) { finish({ ok: true }); return; }
+      let reason = '';
+      try { reason = JSON.parse(Buffer.concat(chunks, responseBytes).toString('utf8'))?.reason || ''; } catch { /* non-JSON */ }
+      if (reason === 'ExpiredProviderToken') { finish({ ok: false, expired: true }); return; }
+      if (status === 410 || DEAD_TOKEN_REASONS.has(reason)) { finish({ ok: false, drop: true }); return; }
+      finish({ ok: false });
+    });
+    req.on('error', () => {
+      if (!settled) dropSession(input.env, client);
+      finish({ ok: false });
+    });
+    req.end(JSON.stringify(input.payload));
+  });
+
+  return {
+    async send(input) {
+      const first = await dispatch(input, false);
+      if (first.expired) {
+        const retry = await dispatch(input, true);
+        return { ok: retry.ok === true, drop: retry.drop === true ? true : undefined };
+      }
+      return { ok: first.ok === true, drop: first.drop === true ? true : undefined };
+    },
+    close() {
+      for (const [env, entry] of sessions) {
+        sessions.delete(env);
+        try { entry.client.close(); } catch { /* ignore */ }
+      }
+      cachedJwt = null;
+    },
+  };
+};

package/src/push/cli.js

@@ -0,0 +1,73 @@
+import { startPushRelayServer } from './server.js';
+import { buildPushRelayConfig, fail, formatPushRelayUrl } from './config.js';
+
+export { buildPushRelayConfig } from './config.js';
+
+export const parsePushRelayArgs = (argv = []) => {
+  const parsed = {};
+  const values = new Map([['--host', 'host'], ['--port', 'port']]);
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index];
+    if (values.has(arg)) {
+      const value = argv[++index];
+      if (!value || value.startsWith('--')) fail(arg);
+      parsed[values.get(arg)] = value;
+      continue;
+    }
+    if (arg === '--trust-proxy') { parsed.trustProxy = true; continue; }
+    if (arg === '--no-trust-proxy') { parsed.trustProxy = false; continue; }
+    if (arg === '--json') { parsed.json = true; continue; }
+    if (arg === '--quiet' || arg === '-q') { parsed.quiet = true; continue; }
+    if (arg === '--help' || arg === '-h') { parsed.help = true; continue; }
+    if (arg === '--version' || arg === '-v') { parsed.version = true; continue; }
+    fail(arg);
+  }
+  return parsed;
+};
+
+const helpText = 'Usage: openchamber-push-relay [--host HOST] [--port PORT] [--trust-proxy] [--json] [--quiet]\nEnable --trust-proxy only when public ingress reaches this relay through a trusted reverse proxy.\n';
+const writeJson = (stdout, payload) => stdout.write(`${JSON.stringify(payload)}\n`);
+
+export const runPushRelayCli = async (argv, dependencies = {}) => {
+  const processLike = dependencies.process ?? process;
+  const stdout = dependencies.stdout ?? process.stdout;
+  const stderr = dependencies.stderr ?? process.stderr;
+  const version = dependencies.version ?? '0.0.0';
+  let parsed;
+  try { parsed = parsePushRelayArgs(argv ?? processLike.argv?.slice(2) ?? []); } catch (error) {
+    const json = (argv ?? processLike.argv?.slice(2) ?? []).includes('--json');
+    if (json) writeJson(stdout, { status: 'error', error: error.message }); else stderr.write(`${error.message}\n`);
+    processLike.exitCode = 1; return 1;
+  }
+  const json = parsed.json;
+  const respond = (payload, error = false, essential = false) => {
+    if (json) writeJson(stdout, payload);
+    else if (payload.message && (essential || !parsed.quiet || error)) (error ? stderr : stdout).write(`${payload.message}\n`);
+  };
+  if (parsed.help) { respond(json ? { status: 'ok', help: helpText.trim() } : { message: helpText.trim() }, false, true); return 0; }
+  if (parsed.version) { respond(json ? { status: 'ok', version } : { message: version }, false, true); return 0; }
+  let config;
+  try { config = buildPushRelayConfig(parsed, processLike.env ?? {}); } catch (error) { respond({ status: 'error', error: error.message, message: error.message }, true); processLike.exitCode = 1; return 1; }
+  try {
+    const relay = await (dependencies.start ?? startPushRelayServer)(config);
+    const port = relay.address?.()?.port ?? config.port;
+    const url = formatPushRelayUrl(config.host, port);
+    respond(json ? { status: 'ok', url, host: config.host, port } : { message: `Push relay listening at ${url}` });
+    let stopping = false;
+    const stop = async () => {
+      if (stopping) return Promise.resolve();
+      stopping = true;
+      processLike.off?.('SIGINT', stop); processLike.off?.('SIGTERM', stop);
+      try {
+        await relay.stop();
+        processLike.exit?.(0);
+      } catch {
+        processLike.exitCode = 1;
+        if (json) writeJson(stderr, { status: 'error', error: 'Push relay stop failed' }); else stderr.write('Push relay stop failed\n');
+        processLike.exit?.(1);
+      }
+    };
+    processLike.on?.('SIGINT', stop); processLike.on?.('SIGTERM', stop);
+    return 0;
+  } catch (error) { respond({ status: 'error', error: error.message, message: error.message }, true); processLike.exitCode = 1; return 1; }
+};

package/src/push/combined.js

@@ -0,0 +1,34 @@
+import { buildPushRelayConfig, ENV_PREFIX } from './config.js';
+import { createPushRelayHandler } from './handler.js';
+
+const APNS_ENV_PREFIX = `${ENV_PREFIX}APNS_`;
+
+const hasPushApnsEnv = (env) => {
+  for (const [key, value] of Object.entries(env ?? {})) {
+    if (!key.startsWith(APNS_ENV_PREFIX)) continue;
+    if (typeof value === 'string' && value.trim().length > 0) return true;
+  }
+  return false;
+};
+
+export const createCombinedPushMount = (env = process.env, deps = {}) => {
+  if (!hasPushApnsEnv(env)) return null;
+  const config = buildPushRelayConfig({}, env);
+  // Combined mode ignores OPENCHAMBER_PUSH_RELAY_HOST / OPENCHAMBER_PUSH_RELAY_PORT;
+  // Push HTTP is mounted on the Layer 1 listener at /v1/push/* instead of opening its own port.
+  const handler = createPushRelayHandler({
+    databasePath: config.databasePath,
+    trustProxy: config.trustProxy,
+    limits: config.limits,
+    apns: config.apns,
+    apnsProvider: deps.apnsProvider,
+    clock: deps.clock,
+    claimHealthEndpoints: false,
+  });
+  return {
+    requestHandler: handler.handleRequest,
+    start: () => handler.activate(),
+    stop: () => handler.deactivate(),
+    getSnapshot: handler.getSnapshot,
+  };
+};

package/src/push/config.js

@@ -0,0 +1,145 @@
+import fs from 'node:fs';
+import { isIP } from 'node:net';
+
+export const DEFAULT_HOST = '127.0.0.1';
+export const DEFAULT_PORT = 8788;
+export const DEFAULT_DATABASE_PATH = './data/push-relay.sqlite';
+export const DEFAULT_BUNDLE_ID = 'com.yee94.openchamber';
+export const ENV_PREFIX = 'OPENCHAMBER_PUSH_RELAY_';
+export const DEFAULT_LIMITS = {
+  timestampSkewMs: 300_000,
+  replayMs: 600_000,
+  maxReplayEntries: 10_000,
+  registerLimitPerMinute: 60,
+  sendLimitPerMinute: 60,
+  serverSendLimitPerMinute: 120,
+  maxTokens: 100_000,
+  maxInFlight: 64,
+  maxRateLimitEntries: 10_000,
+  jsonBodyBytes: 16 * 1024,
+};
+
+const LIMIT_KEYS = ['timestampSkewMs', 'replayMs', 'maxReplayEntries', 'registerLimitPerMinute', 'sendLimitPerMinute', 'serverSendLimitPerMinute', 'maxTokens', 'maxInFlight'];
+
+export const resolvePushRelayClientIp = (request, trustProxy = false) => {
+  const remoteAddress = request.socket.remoteAddress ?? 'unknown';
+  if (!trustProxy) return remoteAddress;
+  const forwarded = request.headers['x-forwarded-for'];
+  const candidate = typeof forwarded === 'string' && !forwarded.includes(',') ? forwarded.trim() : '';
+  return isIP(candidate) ? candidate : remoteAddress;
+};
+
+export const formatPushRelayUrl = (host, port) => `http://${isIP(host) === 6 ? `[${host}]` : host}:${port}`;
+
+const upperSnake = (key) => key.replace(/[A-Z]/g, (letter) => `_${letter}`).toUpperCase();
+export const envName = (key) => `${ENV_PREFIX}${upperSnake(key)}`;
+export const fail = (name) => { throw new Error(`Invalid ${name}`); };
+
+export const positive = (name, value) => {
+  if (!/^[1-9][0-9]*$/.test(String(value))) fail(name);
+  const number = Number(value);
+  if (!Number.isSafeInteger(number)) fail(name);
+  return number;
+};
+
+export const bool = (name, value) => {
+  if (value === undefined) return false;
+  if (value === 'true' || value === '1' || value === true) return true;
+  if (value === 'false' || value === '0' || value === false) return false;
+  fail(name);
+};
+
+export const validHost = (name, value) => {
+  if (typeof value !== 'string' || value.trim() !== value || value.length === 0 || value.includes('/') || value.includes('\\') || value.includes('@') || value.includes(':') && !isIP(value) || (!isIP(value) && !/^(?=.{1,253}$)(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)(?:\.(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?))*$/.test(value))) fail(name);
+  return value;
+};
+
+export const validDatabasePath = (name, value) => {
+  if (typeof value !== 'string' || value.trim() !== value || value.length === 0 || value.includes('\0')) fail(name);
+  return value;
+};
+
+export const normalizePem = (value) => (typeof value === 'string' ? value.replace(/\\n/g, '\n').trim() : '');
+
+export const validatePushRelayLimits = (limits) => {
+  if (limits.replayMs < limits.timestampSkewMs * 2 || limits.maxReplayEntries < 1) throw new RangeError('invalid replay limits');
+  if (limits.maxTokens < 1 || limits.maxInFlight < 1 || limits.registerLimitPerMinute < 1 || limits.sendLimitPerMinute < 1 || limits.serverSendLimitPerMinute < 1) {
+    throw new RangeError('invalid push limits');
+  }
+  return limits;
+};
+
+export const normalizePushRelayOptions = (options = {}) => {
+  const limits = validatePushRelayLimits({ ...DEFAULT_LIMITS, ...options.limits });
+  const host = options.host ?? DEFAULT_HOST;
+  validHost('host', host);
+  const port = options.port ?? DEFAULT_PORT;
+  if (!Number.isSafeInteger(port) || port < 0 || port > 65535) fail('port');
+  const databasePath = options.databasePath ?? DEFAULT_DATABASE_PATH;
+  validDatabasePath('databasePath', databasePath);
+  if (!options.apnsProvider) {
+    const apns = options.apns ?? {};
+    if (!apns.keyId || !apns.teamId || !apns.p8 || !apns.bundleId) throw new Error('Invalid APNs configuration');
+  }
+  return {
+    host,
+    port,
+    trustProxy: Boolean(options.trustProxy),
+    databasePath,
+    limits,
+    apns: options.apns,
+    apnsProvider: options.apnsProvider,
+    clock: options.clock,
+    logger: options.logger,
+    resolveClientIp: options.resolveClientIp,
+    store: options.store,
+    http2: options.http2,
+  };
+};
+
+const envValue = (env, key) => {
+  const value = env[envName(key)];
+  return typeof value === 'string' && value.trim().length === 0 ? undefined : value;
+};
+
+const loadP8 = (env) => {
+  const inline = envValue(env, 'apnsP8') ?? env[`${ENV_PREFIX}APNS_P8`];
+  if (typeof inline === 'string' && inline.trim().length > 0) return normalizePem(inline);
+  const p8Path = envValue(env, 'apnsP8Path') ?? env[`${ENV_PREFIX}APNS_P8_PATH`];
+  if (typeof p8Path === 'string' && p8Path.trim().length > 0) {
+    try { return normalizePem(fs.readFileSync(p8Path.trim(), 'utf8')); } catch { fail(`${ENV_PREFIX}APNS_P8_PATH`); }
+  }
+  fail(`${ENV_PREFIX}APNS_P8`);
+};
+
+export const buildPushRelayConfig = (parsed = {}, env = process.env) => {
+  const pick = (key, fallback) => parsed[key] ?? envValue(env, key) ?? fallback;
+  const portValue = pick('port', DEFAULT_PORT);
+  const port = positive(parsed.port !== undefined ? '--port' : envName('port'), portValue);
+  if (port > 65535) fail(parsed.port !== undefined ? '--port' : envName('port'));
+  const host = validHost(parsed.host !== undefined ? '--host' : envName('host'), pick('host', DEFAULT_HOST));
+  const databasePath = validDatabasePath(envName('databasePath'), pick('databasePath', DEFAULT_DATABASE_PATH));
+  const limits = {};
+  for (const key of LIMIT_KEYS) {
+    const value = pick(key, undefined);
+    if (value !== undefined) limits[key] = positive(parsed[key] !== undefined ? `--${upperSnake(key).toLowerCase().replaceAll('_', '-')}` : envName(key), value);
+  }
+  const merged = { ...DEFAULT_LIMITS, ...limits };
+  if (merged.replayMs < merged.timestampSkewMs * 2) fail(parsed.replayMs !== undefined ? '--replay-ms' : envName('replayMs'));
+  validatePushRelayLimits(merged);
+  const keyId = pick('apnsKeyId', env[`${ENV_PREFIX}APNS_KEY_ID`]);
+  const teamId = pick('apnsTeamId', env[`${ENV_PREFIX}APNS_TEAM_ID`]);
+  const bundleId = pick('apnsBundleId', env[`${ENV_PREFIX}APNS_BUNDLE_ID`]) || DEFAULT_BUNDLE_ID;
+  if (typeof keyId !== 'string' || keyId.trim().length === 0) fail(`${ENV_PREFIX}APNS_KEY_ID`);
+  if (typeof teamId !== 'string' || teamId.trim().length === 0) fail(`${ENV_PREFIX}APNS_TEAM_ID`);
+  const p8 = loadP8(env);
+  if (!p8) fail(`${ENV_PREFIX}APNS_P8`);
+  return {
+    host,
+    port,
+    databasePath,
+    trustProxy: parsed.trustProxy ?? bool(envName('trustProxy'), envValue(env, 'trustProxy')),
+    limits: merged,
+    apns: { keyId: keyId.trim(), teamId: teamId.trim(), p8, bundleId: String(bundleId).trim() },
+  };
+};

package/src/push/crypto.js

@@ -0,0 +1,34 @@
+import crypto from 'node:crypto';
+
+const B64 = /^[A-Za-z0-9_-]+$/;
+
+export const canonicalPublicJwkString = (jwk) => JSON.stringify({ crv: jwk.crv, kty: jwk.kty, x: jwk.x, y: jwk.y });
+
+export const b64urlExact = (value, length) => {
+  if (typeof value !== 'string' || !B64.test(value)) return null;
+  try {
+    const decoded = Buffer.from(value, 'base64url');
+    return decoded.length === length && decoded.toString('base64url') === value ? decoded : null;
+  } catch {
+    return null;
+  }
+};
+
+export const parsePublicJwk = (value) => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  const keys = Object.keys(value);
+  if (keys.length !== 4 || !keys.includes('crv') || !keys.includes('kty') || !keys.includes('x') || !keys.includes('y')) return null;
+  if (value.kty !== 'EC' || value.crv !== 'P-256' || !b64urlExact(value.x, 32) || !b64urlExact(value.y, 32)) return null;
+  return { crv: value.crv, kty: value.kty, x: value.x, y: value.y };
+};
+
+export const deriveServerId = (jwk) => crypto.createHash('sha256').update(canonicalPublicJwkString(jwk)).digest('base64url');
+
+export const verifyP1363 = (message, jwk, signature) => {
+  try {
+    const key = crypto.createPublicKey({ key: { kty: jwk.kty, crv: jwk.crv, x: jwk.x, y: jwk.y }, format: 'jwk' });
+    return crypto.verify('SHA256', Buffer.from(message), { key, dsaEncoding: 'ieee-p1363' }, signature);
+  } catch {
+    return false;
+  }
+};

package/src/push/guard.js

@@ -0,0 +1,145 @@
+export const createReplayGuard = ({ replayMs, maxReplayEntries, now }) => {
+  const replay = new Map();
+  const purge = () => {
+    const ts = now();
+    for (const [key, expiry] of replay) if (expiry <= ts) replay.delete(key);
+  };
+  return {
+    has(key) {
+      purge();
+      return replay.has(key);
+    },
+    remember(key) {
+      purge();
+      if (replay.size >= maxReplayEntries && !replay.has(key)) return false;
+      replay.set(key, now() + replayMs);
+      return true;
+    },
+    clear() { replay.clear(); },
+    get size() { return replay.size; },
+  };
+};
+
+export const createSlidingWindowLimiter = ({ windowMs, maxCount, maxEntries, now }) => {
+  const entries = new Map();
+  const pruneKey = (key, cutoff) => {
+    const stamps = entries.get(key);
+    if (!stamps) return null;
+    let index = 0;
+    while (index < stamps.length && stamps[index] <= cutoff) index += 1;
+    if (index) stamps.splice(0, index);
+    if (stamps.length === 0) { entries.delete(key); return null; }
+    return stamps;
+  };
+  const purge = (cutoff) => {
+    for (const key of [...entries.keys()]) pruneKey(key, cutoff);
+  };
+  return {
+    allow(key) {
+      const ts = now();
+      const cutoff = ts - windowMs;
+      let stamps = pruneKey(key, cutoff);
+      if (!stamps) {
+        if (entries.size >= maxEntries) {
+          purge(cutoff);
+          if (entries.size >= maxEntries) return false;
+        }
+        stamps = [];
+        entries.set(key, stamps);
+      }
+      if (stamps.length >= maxCount) return false;
+      stamps.push(ts);
+      return true;
+    },
+    clear() { entries.clear(); },
+  };
+};
+
+export const createInFlightGate = (maxInFlight) => {
+  const maxWaiters = maxInFlight;
+  let generation = 1;
+  let active = 0;
+  let accepting = true;
+  const waiters = [];
+  const idleWaiters = [];
+  const notifyIdle = () => {
+    if (active !== 0) return;
+    while (idleWaiters.length) idleWaiters.shift()();
+  };
+  return {
+    acquire() {
+      if (!accepting) return Promise.resolve(false);
+      if (active < maxInFlight) {
+        active += 1;
+        return Promise.resolve(generation);
+      }
+      if (waiters.length >= maxWaiters) return Promise.resolve(false);
+      const gen = generation;
+      return new Promise((resolve) => {
+        waiters.push(() => {
+          if (!accepting || generation !== gen) { resolve(false); return; }
+          resolve(generation);
+        });
+      });
+    },
+    release(ticket) {
+      if (ticket !== generation) return;
+      if (accepting) {
+        const next = waiters.shift();
+        if (next) { next(); return; }
+      } else {
+        while (waiters.length) waiters.shift()();
+      }
+      active = Math.max(0, active - 1);
+      notifyIdle();
+    },
+    rejectWaiters() {
+      accepting = false;
+      while (waiters.length) waiters.shift()();
+    },
+    reset() {
+      generation += 1;
+      accepting = true;
+      active = 0;
+      waiters.length = 0;
+      while (idleWaiters.length) idleWaiters.shift()();
+    },
+    whenIdle() {
+      if (active === 0) return Promise.resolve();
+      return new Promise((resolve) => { idleWaiters.push(resolve); });
+    },
+    get active() { return active; },
+    get waiting() { return waiters.length; },
+  };
+};
+
+export const createWorkTracker = () => {
+  let generation = 1;
+  let active = 0;
+  const idleWaiters = [];
+  const notifyIdle = () => {
+    if (active !== 0) return;
+    while (idleWaiters.length) idleWaiters.shift()();
+  };
+  return {
+    begin() {
+      active += 1;
+      const gen = generation;
+      return () => {
+        if (gen !== generation) return;
+        active = Math.max(0, active - 1);
+        notifyIdle();
+      };
+    },
+    whenIdle() {
+      if (active === 0) return Promise.resolve();
+      return new Promise((resolve) => { idleWaiters.push(resolve); });
+    },
+    reset() {
+      generation += 1;
+      active = 0;
+      while (idleWaiters.length) idleWaiters.shift()();
+    },
+    get active() { return active; },
+  };
+};