Merge upstream: POP standards, latency contracts, device transfer, typed links and NOC downgrades (3.4.0, 3.5.0)
Some checks are pending
CI / plan (push) Waiting to run
CI / part (push) Blocked by required conditions
CI / build (push) Waiting to run
CI / translations (push) Waiting to run
CI / test (push) Blocked by required conditions
CI / timings (push) Blocked by required conditions
Container image / gate (push) Waiting to run
Container image / test (push) Blocked by required conditions
Container image / publish (push) Blocked by required conditions

Conflicts, file by file:
- CHANGELOG.md: the fork's Unreleased bullets on top; 3.5.0 and 3.4.0 exactly as upstream has them.
- src/i18n/en.js, site/i18n/{de,es,fr,it,pt}.js: merged label by label, sorted; the labels each side dropped stay dropped.
- src/agent/10-domains.js, 30-docs.js, 40-read.js: both sides' enums, state docs and tables (popStd as the build standard, popTiers, ip4, mp).
- src/agent/20-commands.js: the fork's wording on accept and upRouter, upstream's acceptFix, utilityKitAll/New and pt*; theme, session and transfer acts in the local table.
- src/game/60-features/80-new-game.js: ip4, rgen and mp next to popTiers.
- src/game/80-simulation/29-route-core.js, 30-compute.js: the route core takes both SATN and the spill tiers (TT).
- src/game/80-simulation/40-billing.js: upstream's gulfPair and borderShut; linkCut() is built on borderShut, linkDown() keeps express and satellite.
- src/game/80-simulation/50-sanitize.js: PNI bundles up to PNI_LAG_MAX next to the fork's link kinds; popStdSanitize then ptSanitize; mpSanitize then lcSanitize.
- src/game/80-simulation/75-customer-lifecycle.js: clGrow() stops at a type's most (#137) and at an IPv4 block that is not free (#150).
- src/game/90-actions/60-links.js: rmLink keeps the express guard and moves on to the next parallel link (#119).
- src/game/90-actions/85-routing-and-routers.js: rmRouter checks the PNIs on its routers (#323), upRouter keeps own().
- src/game/90-actions/89-game-and-settings.js: the menu keeps the build standard and session tiles and gains Send to another device.
- src/game/93-ui/40-hud-and-panels.js, 70-link-panels.js: offers show both the IPv4 note and Buy and sign; link headers name their cities, the closed-border section reads in dark mode; the express count stays.
- src/game/93-ui/50-city-panel.js: the teleport section and Link to a city.
- src/game/94-dashboard/40-connections.js: upstream's per-table next port size replaces the fork's own 400G guard.
- src/game/94-dashboard/90-noc-window.js, 96-map/95-clicks.js, 99-loop.js: both sides' acts and boot steps.
- src/styles/40-modal.css: the dark-mode tag tokens and the transfer textarea.
- tests/mcp-commands.test.js: both sides' sample args.

Interaction fixes:
- POP standards and the build standard: a POP marked as a kind keeps its kind's routers (ptKind). The build
  standard's router jobs and the intern's model swaps leave it alone; every other target still applies. Both sheets say so.
- Spill tiers: pathMs() fills a path's ground latency and satellite edges too, so a tier's detour costs users its
  latency (it went uncharged before).
- Send to another device: a session network goes by the session's own #mp= link; its save file is called a copy.
- Buy and sign (#241) does not buy for an offer whose IPv4 block does not fit.
- Dark mode: the closed-border title and the renewal ticks use the dark-aware red (upstream's #292 test follows).
- Server-run tables: the new acts classified (pt*, acceptFix and utilityKitAll quote their cost); mp-sim fixtures
  written again with tests/lib/mp-sim-fixtures.js.

Review fixes:
- POP standards: ptSave, ptApply, ptPlan, ptAll and popStdSet find a POP with own(), so 'toString' is no POP (also
  decomToggle, decomGo, dkStay).
- Server-run envelope: an arg value that names anything on Object.prototype is refused, in args, drafts and
  ctx.win.ui.
- Decommissioning a POP drops its POP-standard mark, so live state stays what a reload makes of it (the T2 gate
  refused later pt* acts).
- acceptFix, ptApply, ptAll and utilityKitAll take a quote within 1% (quoteNear), like utilityKit and bstdApply:
  router prices drift daily.
- The transfer paste box reads in dark mode (--text, as input.t).
- A session's #mp= link pasted under From another device opens it (saved, then loaded again with it), in MP builds.
- The express and satellite circuit panels name their cities as links (#196); a circuit shows the closed-border
  section (#329).
- CHANGELOG: the fork's 400G connections bullet goes (3.5.0 ships it); bullets for POP kinds, the session link and Buy
  and sign's IPv4 check.
This commit is contained in:
jvanvik 2026-11-12 00:08:12 +01:00
commit 08eb349d87
113 changed files with 2674 additions and 161 deletions

View file

@ -816,3 +816,67 @@ test('multiplayer: with a charter to sign first, the session code and its Share
assert.deepEqual(errors, []);
dom.window.close();
});
test('multiplayer: "Send to another device" moves a session network by the session\'s own link; its save file is a copy', async () => {
const { dom, ev, errors, f } = await started();
const doc = dom.window.document;
ev('save(true);ACT.xfer({})');
assert.ok(await until(() => ev('!!UI.xfer')), 'the send screen opens');
assert.equal(ev('UI.xfer.mp'), CODE);
assert.equal(ev('UI.xfer.link'), ev('mpLink(S.mp)'), 'the link is the session\'s, with the token, not the network itself');
assert.match(ev('UI.xfer.link'), new RegExp(`#mp=${CODE}\\.${PID}\\.[0-9a-f]{64}$`));
const txt = doc.getElementById('modalCard').textContent;
assert.match(txt, /Open this link on your other phone or computer/);
assert.match(txt, /Anyone with this link can play as you/);
assert.match(txt, /The save file is a copy: on another device it plays on alone, outside session K7Q-2XD/);
assert.doesNotMatch(txt, /under From another device/, 'not a transfer link to paste');
// Copying it sends the session the latest save first, as the session panel's own button does.
ev("window.__clip=[];Object.defineProperty(navigator,'clipboard',{configurable:true,value:{writeText:t=>{__clip.push(t);return Promise.resolve();}}})");
await until(() => ev('!MP.busy'));
const k = f.saves().length;
ev("S.name='Packet Pals Two';document.querySelector('#modalCard [data-act=\"xferLink\"]').click()");
assert.ok(await until(() => ev('__clip.length===1')));
assert.equal(ev('__clip[0]'), ev('mpLink(S.mp)'));
assert.ok(await until(() => f.saves().length === k + 1), 'the save goes to the session first');
assert.equal(JSON.parse(f.saves().at(-1).body.data).name, 'Packet Pals Two');
assert.ok(await until(() => /Open it on your other device/.test(ev("document.getElementById('toasts').textContent"))));
// Without the token on this device: no link at all, only the copy.
ev('mpTokSet(S.mp.code,S.mp.pid,null);ACT.xfer({})');
assert.ok(await until(() => ev('UI.xfer.link===null')));
assert.equal(doc.querySelector('#modalCard [data-act="xferLink"]'), null);
assert.match(doc.getElementById('modalCard').textContent, /The save file is a copy/);
assert.deepEqual(errors, []);
dom.window.close();
});
test('multiplayer: the session link pasted under "From another device" opens there as the link would; a plain page has no session links', async () => {
const a = await started();
a.ev("ACT.launchBB({city:'fra'});for(let i=0;i<4;i++)dayTick()");
const data = a.ev('JSON.stringify(packSave(S))'), link = a.ev('mpLink(S.mp)');
// On this device, in a game: the game is saved before the page loads again.
a.ev(`S.name='Saved First';ACT.xferRecv();$('xferIn').value=${lit(link)};ACT.xferPaste()`);
assert.equal(a.ev('location.hash'), `#mp=${CODE}.${PID}.${TOK}`);
assert.equal(a.ev('slotIdx().find(e=>e.id===UI.slot).name'), 'Saved First');
a.dom.window.close();
// The other device's title screen: the link, with whatever a chat adds around it.
const f = fake([[/^GET \/api\/mp\/sessions\/K7Q2XD\/save$/, { status: 200, json: { seq: 4, at: 1, data } }], [/^GET \/api\/mp\/sessions\/K7Q2XD$/, { status: 200, json: roster([me()]) }], okSave]);
const b = load({ mp: MPA, fetch: f });
b.ev(`ACT.xferRecv();$('xferIn').value=${lit('Here: ' + link + '\n')};ACT.xferPaste()`);
assert.equal(b.ev('location.hash'), `#mp=${CODE}.${PID}.${TOK}`, 'the link goes into the address bar and the page loads again (mpBoot reads it at boot)');
assert.doesNotMatch(b.ev("$('toasts').textContent"), /not a transfer link/);
const href = b.ev('location.href');
b.dom.window.close();
// That page, loaded again with the link (jsdom does not reload): the network moves here.
const c = load({ mp: MPA, fetch: f, url: href });
assert.ok(await until(() => c.ev('!!(S&&UI.started)')), 'the network opened');
assert.deepEqual([c.ev('S.mp.code'), c.ev('S.day'), c.ev('location.hash')], [CODE, 4, '']);
assert.equal(c.ev(`localStorage.getItem('sot-mp:${CODE}:${PID}')`), TOK);
// A plain page: not a link it can open.
const p = load();
p.ev(`ACT.xferRecv();$('xferIn').value=${lit(link)};ACT.xferPaste()`);
assert.match(p.ev("$('toasts').textContent"), /not a transfer link/);
assert.equal(p.ev('location.hash'), '');
for (const x of [a, b, c, p]) assert.deepEqual(x.errors, []);
c.dom.window.close();
p.dom.window.close();
});