Conversation
…e title to reflect this
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.9.3 to 6.0.2. - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Commits](microsoft/TypeScript@v5.9.3...v6.0.2) --- updated-dependencies: - dependency-name: typescript dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…/Site/typescript-6.0.2 Bump typescript from 5.9.3 to 6.0.2 in /Site
…ROVED MERCURY CSS. IMPROVED MERCURY CSS. IMPROVED MERCURY CSS. IMPROVED MERCURY CSS. IMPROVED MERCURY CSS.
…CSS. IMPROVED MERCURY CSS. IMPROVED MERCURY CSS. IMPROVED MERCURY CSS. IMPROVED MERCURY CSS. IMPROVED MERCURY CSS." This reverts commit ed8db7c.
Bumps [@types/nodemailer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/nodemailer) from 7.0.11 to 8.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/nodemailer) --- updated-dependencies: - dependency-name: "@types/nodemailer" dependency-version: 8.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…/Site/types/nodemailer-8.0.0 Bump @types/nodemailer from 7.0.11 to 8.0.0 in /Site
Contributor
There was a problem hiding this comment.
Pull request overview
This PR syncs the forms branch with main, bringing in a mix of runtime behavior tweaks (avatar waiting, dedicated join proxy ports, insecure-domain URL generation) plus dependency/lockfile updates and documentation refreshes.
Changes:
- Add a timeout to the avatar image “wait for generation” behavior.
- Split gameserver vs proxy port ranges (via
proxyOffset) and use proxy ports when joining dedicated servers. - Update Site/Docs dependencies and refresh various documentation pages (including adding a new architecture page).
Reviewed changes
Copilot reviewed 16 out of 19 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| Site/src/routes/api/avatar/[username]/+server.ts | Adds timeout behavior when waiting for avatar image generation. |
| Site/src/routes/(rbxclient)/game/join/+server.ts | Uses proxy port for dedicated server joins. |
| Site/src/routes/(rbxclient)/asset/characterfetch/[username]/+server.ts | Switches asset URLs to DomainInsecure for HTTP-based client consumption. |
| Site/src/lib/server/idToPort.ts | Introduces proxyOffset and adjusts port mapping range. |
| Site/package.json | Bumps Site dependencies/devDependencies. |
| Site/bun.lock | Updates Site lockfile for dependency bumps. |
| Site/Caddyfile | Consolidates host handling for mercs.dev and http://www.mercs.dev. |
| Docs/src/content/docs/services/orbiter.mdoc | Updates linked config line references. |
| Docs/src/content/docs/services/launcher.md | Minor formatting tweak. |
| Docs/src/content/docs/install/surrealdb.md | Updates referenced SurrealDB “latest” version. |
| Docs/src/content/docs/install/go.md | Updates referenced Go “latest” version. |
| Docs/src/content/docs/install/docker.md | Clarifies virtualization terminology. |
| Docs/src/content/docs/install/bun.md | Updates referenced Bun “latest” version. |
| Docs/src/content/docs/history.md | Refines historical details and archive links. |
| Docs/src/content/docs/guides/config.mdoc | Fixes a typo (“surch” → “such”). |
| Docs/src/content/docs/design/mercury3.md | Replaces placeholder content with real text. |
| Docs/src/content/docs/architecture/launchers.md | Adds new architecture documentation page. |
| Docs/package.json | Bumps Docs dependencies/devDependencies. |
| Docs/bun.lock | Updates Docs lockfile. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
20
to
22
| "@types/d3-interpolate": "^3.0.4", | ||
| "@types/nodemailer": "^7.0.11", | ||
| "@types/nodemailer": "^8.0.0", | ||
| "@types/nprogress": "^0.2.3", |
There was a problem hiding this comment.
@types/nodemailer was bumped in package.json, but Site/bun.lock still pins it to ^7.0.11 / @types/nodemailer@7.0.11. Please update/regenerate the lockfile so dependency resolution matches the manifest (otherwise installs may keep using the old types).
Comment on lines
+32
to
+45
| await Promise.race([ | ||
| new Promise<void>(resolve => { | ||
| try { | ||
| const watcher = fs.watch(path, () => { | ||
| watcher.close() | ||
| resolve() | ||
| }) | ||
| } catch { | ||
| resolve() | ||
| }) | ||
| } catch { | ||
| resolve() | ||
| } | ||
| }) | ||
| } | ||
| }), | ||
| // ...but don't wait forever | ||
| new Promise(resolve => setTimeout(resolve, timeout * 1000)), | ||
| ]) |
There was a problem hiding this comment.
Using Promise.race here can leave an fs.watch() watcher open when the timeout wins, because the watcher is only closed inside the watch callback. Over time (or under load) this can leak file descriptors/watch handles. Consider ensuring the watcher is always closed (e.g., create the watcher outside the raced promises and close it in a finally, or have the timeout handler explicitly close the watcher).
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.