Skip to content

Restore on webgl context loss#3968

Merged
evanpelle merged 7 commits into
mainfrom
webgl-contextrestore
May 21, 2026
Merged

Restore on webgl context loss#3968
evanpelle merged 7 commits into
mainfrom
webgl-contextrestore

Conversation

@VariableVince
Copy link
Copy Markdown
Contributor

@VariableVince VariableVince commented May 19, 2026

Description:

When WebGL context is lost, restore context and all elements.

In GameView, handle potentially transient undefined states during context loss gracefully.

Test with chrome://gpucrash from another tab, then return to the game tab to see it being restored
(This fake gpucrash only works once sometimes. Because the second time the browser might reject the tab it thinks caused the gpu crash, access to hardware acceleration. And after even more tries even disables it browser-wide. A browser restart resets it in that case.)

Please complete the following:

  • I have added screenshots for all UI updates
  • I process any text displayed to the user through translateText() and I've added it to the en.json file
  • I have added relevant tests to the test directory
  • I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced

Please put your Discord username so you can be contacted if a bug or regression is found:

tryout33

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 19, 2026

Review Change Stack

Walkthrough

GameView defers renderer init and emits contextrestored. WebGLFrameBuilder gains clearCaches(). ClientGameRunner listens for contextrestored and performs a full GPU-state reupload (terrain, tiles, trails, structures, railroad, units). Territory/Trail dirty-row updates are guarded while full uploads are pending.

Changes

WebGL Context Recovery + Render-pass updates

Layer / File(s) Summary
Context restored event contract
src/client/render/gl/Events.ts
contextrestored event added to GameViewEventMap with payload { type: "restored" }.
GameView nullable renderer and recovery infrastructure
src/client/render/gl/GameView.ts
Make GPURenderer nullable, add initRenderer() for lazy init, install WebGL context lost/restored listeners, cache radial icons and frame callbacks, convert renderer facades to optional chaining, and remove listeners on dispose.
WebGLFrameBuilder cache clearing
src/client/WebGLFrameBuilder.ts
Add clearCaches() to reset knownSmallIDs and localPlayerSmallID so next update() re-syncs players.
Context restoration orchestration in client runner
src/client/ClientGameRunner.ts
mountWebGLFrameLoop keeps a persistent WebGLFrameBuilder, registers contextrestored handler that clears caches, regenerates terrain refs/bytes for all tiles, re-uploads tile/trail/frameData (including units as Map<number, UnitState>), forces structure/railroad uploads, and flushes via builder.update(gameView); returns { builder }.
Territory & Trail dirty-row guards
src/client/render/gl/passes/TerritoryPass.ts, src/client/render/gl/passes/TrailPass.ts
When a full upload is pending, drainDripBucket/flushAllDripBuckets and applyLiveDelta avoid recomputing or narrowing dirtyRowMin/dirtyRowMax, preserving full-upload semantics.

Sequence Diagram

sequenceDiagram
  participant WebGL as WebGL Context
  participant GameView
  participant Client as ClientGameRunner
  participant FrameBuilder as WebGLFrameBuilder
  participant GPURenderer
  WebGL->>GameView: contextlost
  GameView->>GPURenderer: dispose() and set renderer = null
  GameView->>Client: emit "contextrestored" { type: "restored" }
  Client->>FrameBuilder: clearCaches()
  Client->>FrameBuilder: regenerate terrain refs/bytes & reupload frameData (tiles/trails/units)
  FrameBuilder->>GameView: update(gameView)
  GameView->>GPURenderer: initRenderer() (lazy)
Loading

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

Possibly related PRs

Suggested reviewers

  • evanpelle

Poem

When contexts drop and pixels sleep,
Builders wake and caches sweep,
Terrain reborn, the tiles align,
Renderer wakes — frames stream fine. 🎮✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the main objective: restoring WebGL context after loss, which is the primary focus of all code changes in the changeset.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description check ✅ Passed The pull request description clearly describes implementing WebGL context loss restoration with specific test instructions and implementation details aligned with the changeset.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/client/render/gl/GameView.ts`:
- Around line 255-256: The updatePalette method currently only calls
this.renderer.updatePalette(paletteData) and neglects to update the cached
palette used during restore; modify updatePalette (in class GameView) to also
store a copy of the incoming palette into this.paletteData (e.g.,
this.paletteData = new Float32Array(paletteData) or similar) so the
restore/rebuild path uses the runtime-updated palette; keep the existing
renderer.updatePalette call intact.
- Around line 74-105: The new GPURenderer is created with a default camera after
a context loss because we never save/reapply the previous camera; modify the
class to capture the current camera into a cachedCameraState before disposing
(in onContextLost — call renderer.getCameraState() or read renderer.camera) and
then, inside initRenderer (or immediately after creating the new GPURenderer),
reapply that state via renderer.setCameraState(cachedCameraState) (or assign
renderer.camera = cachedCameraState) so the view is restored; ensure
onContextRestored still calls initRenderer and that cachedCameraState is
cleared/validated as needed.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 07c6744a-4b13-4e52-aeeb-066be4871586

📥 Commits

Reviewing files that changed from the base of the PR and between 15ac42b and b6750bc.

📒 Files selected for processing (5)
  • src/client/ClientGameRunner.ts
  • src/client/WebGLFrameBuilder.ts
  • src/client/render/gl/Events.ts
  • src/client/render/gl/GameView.ts
  • src/client/render/gl/passes/TerritoryPass.ts

Comment thread src/client/render/gl/GameView.ts
Comment thread src/client/render/gl/GameView.ts
@github-project-automation github-project-automation Bot moved this from Triage to Development in OpenFront Release Management May 19, 2026
coderabbitai[bot]
coderabbitai Bot previously approved these changes May 19, 2026
@VariableVince VariableVince marked this pull request as ready for review May 19, 2026 03:01
@VariableVince VariableVince requested a review from a team as a code owner May 19, 2026 03:01
coderabbitai[bot]
coderabbitai Bot previously approved these changes May 19, 2026
@evanpelle
Copy link
Copy Markdown
Collaborator

sorry about the conflicts :(

commit 513057a
Author: VariableVince <24507472+VariableVince@users.noreply.github.com>
Date:   Wed May 20 03:17:26 2026 +0200

    WebGL: show alliance request+duration icon, show ally and team mate targets too, some optimization (#3971)

    Show nuke icons during replay too (when there's no localPlayer).
    Show alliance request envelope icon, and duration in alliance icon
    (weren't calculated yet).
    Show ally and team mates' targets too (weren't calculated yet).

    Remove unnecessary allocations. Nukes loop allocated two new sets,
    transitive targets was a new set and now uses predicate with fallback to
    localPlayer.targets, localPlayer.allies and localPlayer.embargoes were
    both put in new set instead of using .includes directly.

    - [x] I have added screenshots for all UI updates
    - [x] I process any text displayed to the user through translateText()
    and I've added it to the en.json file
    - [x] I have added relevant tests to the test directory
    - [x] I confirm I have thoroughly tested these changes and take full
    responsibility for any bugs introduced
    regression is found:

    tryout33

commit c82b078
Author: Evan <evanpelle@gmail.com>
Date:   Tue May 19 17:35:25 2026 -0700

    Stagger territory tile rendering across frames (#3973)

    relates to #893

    Territory updates were uploaded in one shot per game tick, producing a
    10 Hz tile update which looked choppy. This change drips each tick's
    tile changes across the ~6 render frames between ticks so the fill flows
    continuously instead of stepping.

    Inside TerritoryPass, each changed tile is hashed by ref into one of N
    buckets (configurable via tileDrip.bucketCount, set to 9 — gives ~50 ms
    of jitter headroom over the tick period without making attacks feel
    laggy). One bucket drains per render frame. The stable per-ref hash
    keeps repeated updates to the same tile in arrival order, so the latest
    owner always wins.

    While in there, moved trail state ownership out of TerritoryPass and
    into TrailPass where it belongs — the territory shader doesn't sample
    trailTex, so the colocation was just code-reuse drift.

    - [x] I have added screenshots for all UI updates
    - [x] I process any text displayed to the user through translateText()
    and I've added it to the en.json file
    - [x] I have added relevant tests to the test directory
    - [x] I confirm I have thoroughly tested these changes and take full
    responsibility for any bugs introduced
    regression is found:

    evan

commit 6a8b6a1
Author: RickD004 <realtacoco@gmail.com>
Date:   Tue May 19 15:40:07 2026 -0600

    Changes for Rebalancing the Taiwan Strait map (#3970)

    Resizes the Taiwan Strait map for v32, to rebalance it for 2 team games:

    Yesterday the map was tested in a stream and it turned out to be
    unbalanced due to the size difference of the landmasses:
    https://youtu.be/gildSwTdd4I?t=2516

    Adds Team spawnzones for 2 teams.

    Also removes and adds new nations , suggested by its map creator
    crunchybbbbb_59469 on Discord

    - [x] I have added screenshots for all UI updates
    - [x] I process any text displayed to the user through translateText()
    and I've added it to the en.json file
    - [x] I have added relevant tests to the test directory
    - [x] I confirm I have thoroughly tested these changes and take full
    responsibility for any bugs introduced
    regression is found:

    tri.star1011

    Taiwan Strait map by crunchybbbbb_59469 on Discord, who i worked with in
    this rebalance

    ---------

    Co-authored-by: FloPinguin <25036848+FloPinguin@users.noreply.github.com>

commit 0ace428
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 18 19:43:28 2026 -0700

    Bump the npm_and_yarn group across 1 directory with 3 updates (#3964)

    Bumps the npm_and_yarn group with 3 updates in the / directory:
    [protobufjs](https://github.com/protobufjs/protobuf.js),
    [@opentelemetry/exporter-logs-otlp-http](https://github.com/open-telemetry/opentelemetry-js)
    and
    [@opentelemetry/exporter-metrics-otlp-http](https://github.com/open-telemetry/opentelemetry-js).

    Removes `protobufjs`

    Updates `@opentelemetry/exporter-logs-otlp-http` from 0.216.0 to 0.218.0
    <details>
    <summary>Release notes</summary>
    <p><em>Sourced from <a
    href="https://github.com/open-telemetry/opentelemetry-js/releases">@​opentelemetry/exporter-logs-otlp-http's
    releases</a>.</em></p>
    <blockquote>
    <h2>experimental/v0.218.0</h2>
    <h2>0.218.0</h2>
    <h3>:rocket: Features</h3>
    <ul>
    <li>feat(otlp-transformer): replace protobufjs metrics serialization
    with custom implementation <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6629">#6625</a>
    <a
    href="https://github.com/pichlermarc"><code>@​pichlermarc</code></a></li>
    <li>feat(configuration): show all config validation errors, if there are
    multiple <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6683">#6683</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>feat(sdk-node): allow startNodeSDK() without an arg <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6688">#6688</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    </ul>
    <h3>:house: Internal</h3>
    <ul>
    <li>refactor(sdk-logs): alias <code>LoggerProviderConfig</code> to
    <code>LoggerProviderOptions</code> <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6691">#6691</a>
    <a
    href="https://github.com/david-luna"><code>@​david-luna</code></a></li>
    <li>refactor(sdk-logs): use <code>Logger.enabled()</code> within
    <code>Logger.emit()</code> implementation <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6680">#6680</a>
    <a
    href="https://github.com/david-luna"><code>@​david-luna</code></a></li>
    </ul>
    <h2>experimental/v0.217.0</h2>
    <h2>0.217.0</h2>
    <h3>:rocket: Features</h3>
    <ul>
    <li>feat(otlp-transformer): replace protobufjs trace serialization with
    custom implementation <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6625">#6625</a>
    <a
    href="https://github.com/pichlermarc"><code>@​pichlermarc</code></a></li>
    <li>feat(configuration): auto-generate TypeScript types from OTel
    declarative config JSON schema (stable v1.0.0) using
    <code>json-schema-to-typescript</code> and <code>ajv</code> <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6533">#6533</a>
    <a
    href="https://github.com/MikeGoldsmith"><code>@​MikeGoldsmith</code></a></li>
    <li>feat(configuration, sdk-node): <code>startNodeSDK()</code> code path
    now uses <code>log_level</code> configuration to setup a
    DiagConsoleLogger <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6668">#6668</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a>
    <ul>
    <li>Note that allowed values for <code>log_level</code> in a
    configuration YAML file are <em>not</em> the same set as for
    <code>OTEL_LOG_LEVEL</code>. Use <code>log_level: trace</code> to see
    <em>all</em> logs (equivalent of <code>OTEL_LOG_LEVEL=ALL</code>). Use
    <code>log_level: fatal</code> to effectively disable the SDK's internal
    diagnostic logger (equivalent of <code>OTEL_LOG_LEVEL=NONE</code>).</li>
    <li>If <code>log_level</code> is not specified, a diagnostic console
    logger at &quot;info&quot; level will be setup.</li>
    <li>An invalid YAML config file will now result in a noop OTel SDK.</li>
    </ul>
    </li>
    </ul>
    <h3>:bug: Bug Fixes</h3>
    <ul>
    <li>fix(configuration): do not validate <code>OTEL_CONFIG_FILE</code>
    value before using it for file config <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6643">#6643</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): improve how 'additionalProperties' in JSON
    schema is translated to TS types <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6650">#6650</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): remove stripMinItems and preprocessNullArrays
    from validation/parsing <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6657">#6657</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): improve handling of enums in generated types <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6659">#6659</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): improve the technique for removing '| null' on
    types the JSON Schema <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6662">#6662</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(sampler-jaeger-remote): add missing axios dep <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6656">#6656</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(exporter-prometheus): handle malformed URLs in Prometheus
    exporter request handler <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6674">#6674</a>
    <a href="https://github.com/homanp"><code>@​homanp</code></a></li>
    </ul>
    </blockquote>
    </details>
    <details>
    <summary>Commits</summary>
    <ul>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/06ad0eaaecbd49f5ead871325f852cc2a3454079"><code>06ad0ea</code></a>
    chore: prepare next release (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6703">#6703</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/38ca257e64ebd13f5603d5539f8a48d6d9232037"><code>38ca257</code></a>
    feat(otlp-transformer): replace protobufjs metrics serialization with
    custom ...</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/013c60085b84351a4c1e4e4f79e3dd67c56661cd"><code>013c600</code></a>
    chore: prepare next release (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6699">#6699</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/b7a0c63bde39d7916fdb73cbb3d64cf1c93282c5"><code>b7a0c63</code></a>
    feat(semantic-conventions): update semantic conventions to v1.41.1 (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6695">#6695</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/774143b2c6667c6537c000ab48ea5ce998278ca0"><code>774143b</code></a>
    chore(renovate): add minimumReleaseAge to config (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6697">#6697</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/e0dafe0d9fadaccf7dd8d7b02dd85531356e2ac1"><code>e0dafe0</code></a>
    fix(otlp-exporter-base): remove brackets from IPv6 hostname in HTTP
    transport...</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/f804c93d1d6d903036b8bf38f8c3713dbbaf0360"><code>f804c93</code></a>
    chore(deps): update github/codeql-action digest to 68bde55 (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6682">#6682</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/95e48e7afcc475ded350b95b43070c54591ecbbb"><code>95e48e7</code></a>
    refactor(sdk-logs): alias <code>LoggerProviderConfig</code> to
    <code>LoggerProviderOptions</code> (...</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/907b627d9ada25844b0f06551ecd9bbda5c0ea4f"><code>907b627</code></a>
    feat(sdk-node): allow startNodeSDK() without an arg (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6688">#6688</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/0d1526198fafe7f90078ff353103d0427e6c64d4"><code>0d15261</code></a>
    docs: Add SIG meeting info and welcoming language (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6689">#6689</a>)</li>
    <li>Additional commits viewable in <a
    href="https://github.com/open-telemetry/opentelemetry-js/compare/experimental/v0.216.0...experimental/v0.218.0">compare
    view</a></li>
    </ul>
    </details>
    <br />

    Updates `@opentelemetry/exporter-metrics-otlp-http` from 0.216.0 to
    0.218.0
    <details>
    <summary>Release notes</summary>
    <p><em>Sourced from <a
    href="https://github.com/open-telemetry/opentelemetry-js/releases">@​opentelemetry/exporter-metrics-otlp-http's
    releases</a>.</em></p>
    <blockquote>
    <h2>experimental/v0.218.0</h2>
    <h2>0.218.0</h2>
    <h3>:rocket: Features</h3>
    <ul>
    <li>feat(otlp-transformer): replace protobufjs metrics serialization
    with custom implementation <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6629">#6625</a>
    <a
    href="https://github.com/pichlermarc"><code>@​pichlermarc</code></a></li>
    <li>feat(configuration): show all config validation errors, if there are
    multiple <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6683">#6683</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>feat(sdk-node): allow startNodeSDK() without an arg <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6688">#6688</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    </ul>
    <h3>:house: Internal</h3>
    <ul>
    <li>refactor(sdk-logs): alias <code>LoggerProviderConfig</code> to
    <code>LoggerProviderOptions</code> <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6691">#6691</a>
    <a
    href="https://github.com/david-luna"><code>@​david-luna</code></a></li>
    <li>refactor(sdk-logs): use <code>Logger.enabled()</code> within
    <code>Logger.emit()</code> implementation <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6680">#6680</a>
    <a
    href="https://github.com/david-luna"><code>@​david-luna</code></a></li>
    </ul>
    <h2>experimental/v0.217.0</h2>
    <h2>0.217.0</h2>
    <h3>:rocket: Features</h3>
    <ul>
    <li>feat(otlp-transformer): replace protobufjs trace serialization with
    custom implementation <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6625">#6625</a>
    <a
    href="https://github.com/pichlermarc"><code>@​pichlermarc</code></a></li>
    <li>feat(configuration): auto-generate TypeScript types from OTel
    declarative config JSON schema (stable v1.0.0) using
    <code>json-schema-to-typescript</code> and <code>ajv</code> <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6533">#6533</a>
    <a
    href="https://github.com/MikeGoldsmith"><code>@​MikeGoldsmith</code></a></li>
    <li>feat(configuration, sdk-node): <code>startNodeSDK()</code> code path
    now uses <code>log_level</code> configuration to setup a
    DiagConsoleLogger <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6668">#6668</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a>
    <ul>
    <li>Note that allowed values for <code>log_level</code> in a
    configuration YAML file are <em>not</em> the same set as for
    <code>OTEL_LOG_LEVEL</code>. Use <code>log_level: trace</code> to see
    <em>all</em> logs (equivalent of <code>OTEL_LOG_LEVEL=ALL</code>). Use
    <code>log_level: fatal</code> to effectively disable the SDK's internal
    diagnostic logger (equivalent of <code>OTEL_LOG_LEVEL=NONE</code>).</li>
    <li>If <code>log_level</code> is not specified, a diagnostic console
    logger at &quot;info&quot; level will be setup.</li>
    <li>An invalid YAML config file will now result in a noop OTel SDK.</li>
    </ul>
    </li>
    </ul>
    <h3>:bug: Bug Fixes</h3>
    <ul>
    <li>fix(configuration): do not validate <code>OTEL_CONFIG_FILE</code>
    value before using it for file config <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6643">#6643</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): improve how 'additionalProperties' in JSON
    schema is translated to TS types <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6650">#6650</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): remove stripMinItems and preprocessNullArrays
    from validation/parsing <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6657">#6657</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): improve handling of enums in generated types <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6659">#6659</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(configuration): improve the technique for removing '| null' on
    types the JSON Schema <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6662">#6662</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(sampler-jaeger-remote): add missing axios dep <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6656">#6656</a>
    <a href="https://github.com/trentm"><code>@​trentm</code></a></li>
    <li>fix(exporter-prometheus): handle malformed URLs in Prometheus
    exporter request handler <a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/pull/6674">#6674</a>
    <a href="https://github.com/homanp"><code>@​homanp</code></a></li>
    </ul>
    </blockquote>
    </details>
    <details>
    <summary>Commits</summary>
    <ul>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/06ad0eaaecbd49f5ead871325f852cc2a3454079"><code>06ad0ea</code></a>
    chore: prepare next release (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6703">#6703</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/38ca257e64ebd13f5603d5539f8a48d6d9232037"><code>38ca257</code></a>
    feat(otlp-transformer): replace protobufjs metrics serialization with
    custom ...</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/013c60085b84351a4c1e4e4f79e3dd67c56661cd"><code>013c600</code></a>
    chore: prepare next release (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6699">#6699</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/b7a0c63bde39d7916fdb73cbb3d64cf1c93282c5"><code>b7a0c63</code></a>
    feat(semantic-conventions): update semantic conventions to v1.41.1 (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6695">#6695</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/774143b2c6667c6537c000ab48ea5ce998278ca0"><code>774143b</code></a>
    chore(renovate): add minimumReleaseAge to config (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6697">#6697</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/e0dafe0d9fadaccf7dd8d7b02dd85531356e2ac1"><code>e0dafe0</code></a>
    fix(otlp-exporter-base): remove brackets from IPv6 hostname in HTTP
    transport...</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/f804c93d1d6d903036b8bf38f8c3713dbbaf0360"><code>f804c93</code></a>
    chore(deps): update github/codeql-action digest to 68bde55 (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6682">#6682</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/95e48e7afcc475ded350b95b43070c54591ecbbb"><code>95e48e7</code></a>
    refactor(sdk-logs): alias <code>LoggerProviderConfig</code> to
    <code>LoggerProviderOptions</code> (...</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/907b627d9ada25844b0f06551ecd9bbda5c0ea4f"><code>907b627</code></a>
    feat(sdk-node): allow startNodeSDK() without an arg (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6688">#6688</a>)</li>
    <li><a
    href="https://github.com/open-telemetry/opentelemetry-js/commit/0d1526198fafe7f90078ff353103d0427e6c64d4"><code>0d15261</code></a>
    docs: Add SIG meeting info and welcoming language (<a
    href="https://redirect.github.com/open-telemetry/opentelemetry-js/issues/6689">#6689</a>)</li>
    <li>Additional commits viewable in <a
    href="https://github.com/open-telemetry/opentelemetry-js/compare/experimental/v0.216.0...experimental/v0.218.0">compare
    view</a></li>
    </ul>
    </details>
    <br />

    Dependabot will resolve any conflicts with this PR as long as you don't
    alter it yourself. You can also trigger a rebase manually by commenting
    `@dependabot rebase`.

    [//]: # (dependabot-automerge-start)
    [//]: # (dependabot-automerge-end)

    ---

    <details>
    <summary>Dependabot commands and options</summary>
    <br />

    You can trigger Dependabot actions by commenting on this PR:
    - `@dependabot rebase` will rebase this PR
    - `@dependabot recreate` will recreate this PR, overwriting any edits
    that have been made to it
    - `@dependabot show <dependency name> ignore conditions` will show all
    of the ignore conditions of the specified dependency
    - `@dependabot ignore <dependency name> major version` will close this
    group update PR and stop Dependabot creating any more for the specific
    dependency's major version (unless you unignore this specific
    dependency's major version or upgrade to it yourself)
    - `@dependabot ignore <dependency name> minor version` will close this
    group update PR and stop Dependabot creating any more for the specific
    dependency's minor version (unless you unignore this specific
    dependency's minor version or upgrade to it yourself)
    - `@dependabot ignore <dependency name>` will close this group update PR
    and stop Dependabot creating any more for the specific dependency
    (unless you unignore this specific dependency or upgrade to it yourself)
    - `@dependabot unignore <dependency name>` will remove all of the ignore
    conditions of the specified dependency
    - `@dependabot unignore <dependency name> <ignore condition>` will
    remove the ignore condition of the specified dependency and ignore
    conditions
    You can disable automated security fix PRs for this repo from the
    [Security Alerts
    page](https://github.com/openfrontio/OpenFrontIO/network/alerts).

    </details>

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 6591b05
Author: RickD004 <realtacoco@gmail.com>
Date:   Mon May 18 20:43:02 2026 -0600

    Adds map of Venice 🛶 (#3935)

    Adds map of Venice. A relatively small map (similar land area to World)
    for heavy trade and lots of boating.

    Because of the very low difference of elevation of the zone, terrain is
    instead used to show buildings.

    Map source from OpenStreetMap, already credited in CREDITS.md

    Very requested map, with 2 discord posts suggesting it with +15 upvotes
    each

    <img width="794" height="569" alt="image"
    src="https://github.com/user-attachments/assets/ca7d44f2-cfc9-4e93-b7d4-43dbe62f74d4"
    />

    - [x] I have added screenshots for all UI updates
    - [x] I process any text displayed to the user through translateText()
    and I've added it to the en.json file
    - [x] I have added relevant tests to the test directory
    - [x] I confirm I have thoroughly tested these changes and take full
    responsibility for any bugs introduced
    regression is found:

    tri.star1011

commit 15ac42b
Author: Ryan <7389646+ryanbarlow97@users.noreply.github.com>
Date:   Tue May 19 03:20:29 2026 +0100

    streamer mode bugfix (#3953)

    fixes
    #3572

    streamer mode bufix

    - [x] I have added screenshots for all UI updates
    - [x] I process any text displayed to the user through translateText()
    and I've added it to the en.json file
    - [x] I have added relevant tests to the test directory
    - [x] I confirm I have thoroughly tested these changes and take full
    responsibility for any bugs introduced
    regression is found:

    w.o.n

commit a2aa782
Author: VariableVince <24507472+VariableVince@users.noreply.github.com>
Date:   Tue May 19 04:19:02 2026 +0200

    Display player flags next to their names again (#3965)

    Display flags again.

    - [x] I have added screenshots for all UI updates
    - [x] I process any text displayed to the user through translateText()
    and I've added it to the en.json file
    - [x] I have added relevant tests to the test directory
    - [x] I confirm I have thoroughly tested these changes and take full
    responsibility for any bugs introduced
    regression is found:

    tryout33

commit 17e3ac4
Author: evanpelle <evanpelle@gmail.com>
Date:   Mon May 18 19:15:01 2026 -0700

    make spawn glow follow the player's currently selected spawn tile

    Plumb spawnTile through PlayerUpdate / PlayerState / applyStateUpdate
    so the WebGL spawn overlay can read it directly. The glow was reading
    nameData.x/y (territory centroid for label placement) which only
    recomputes every 2 ticks and only when largestClusterBoundingBox has
    been updated by PlayerExecution — both lag the player's actual spawn
    click. Using spawnTile updates the same tick setSpawnTile() fires.

    Also adds spawnTile to diffPlayerUpdate / applyStateUpdate so changes
    after the initial full snapshot actually propagate (the recent
    diff-only PlayerUpdate path silently dropped any field not enumerated
    in those helpers).

commit 0eb8578
Author: evanpelle <evanpelle@gmail.com>
Date:   Mon May 18 17:39:27 2026 -0700

    Fix nations not spawning in singleplayer when player picks fast

    NationExecution gated its first SpawnExecution by the same
    attackRate/attackTick throttle used for AI actions, so a nation
    could wait up to ~100 ticks before scheduling its spawn. In
    singleplayer the human's spawn ends the spawn phase immediately,
    stranding any nation that hadn't yet reached its attackTick — on
    the next tick its NationExecution sees inSpawnPhase()=false and
    isAlive()=false (no tiles), and deactivates itself.

    First spawn now fires on tick 1, gated by a one-shot flag to
    avoid queuing duplicates. The attackRate cadence is preserved for
    subsequent re-spawns so nations still hop locations during the
    spawn phase.
coderabbitai[bot]

This comment was marked as resolved.

coderabbitai[bot]
coderabbitai Bot previously approved these changes May 21, 2026
@VariableVince
Copy link
Copy Markdown
Contributor Author

sorry about the conflicts :(

yeah fu ;) but have resolved them and made it work with the bucket-changes. Please review again when possible

@github-project-automation github-project-automation Bot moved this from Development to Final Review in OpenFront Release Management May 21, 2026
@evanpelle evanpelle merged commit 7acf1ae into main May 21, 2026
18 checks passed
@github-project-automation github-project-automation Bot moved this from Final Review to Complete in OpenFront Release Management May 21, 2026
@evanpelle evanpelle deleted the webgl-contextrestore branch May 21, 2026 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Complete

Development

Successfully merging this pull request may close these issues.

2 participants