mirror of
https://github.com/coder/code-server.git
synced 2026-05-05 03:55:18 +02:00
feat: expose --reconnection-grace-time CLI flag (#7678)
* feat: expose --reconnection-grace-time CLI flag Pass through VS Code Server's --reconnection-grace-time argument, allowing users to configure how long the server waits for a disconnected client to reconnect before cleaning up the session. This is useful for users whose client machines sleep overnight, causing the default 3-hour grace period to expire and forcing a "Reload Window" on wake. The flag can also be set via CODE_SERVER_RECONNECTION_GRACE_TIME env var or in config.yaml.
This commit is contained in:
11
docs/FAQ.md
11
docs/FAQ.md
@@ -22,6 +22,7 @@
|
|||||||
- [How do I debug issues with code-server?](#how-do-i-debug-issues-with-code-server)
|
- [How do I debug issues with code-server?](#how-do-i-debug-issues-with-code-server)
|
||||||
- [What is the healthz endpoint?](#what-is-the-healthz-endpoint)
|
- [What is the healthz endpoint?](#what-is-the-healthz-endpoint)
|
||||||
- [What is the heartbeat file?](#what-is-the-heartbeat-file)
|
- [What is the heartbeat file?](#what-is-the-heartbeat-file)
|
||||||
|
- [How do I change the reconnection grace time?](#how-do-i-change-the-reconnection-grace-time)
|
||||||
- [How do I change the password?](#how-do-i-change-the-password)
|
- [How do I change the password?](#how-do-i-change-the-password)
|
||||||
- [Can I store my password hashed?](#can-i-store-my-password-hashed)
|
- [Can I store my password hashed?](#can-i-store-my-password-hashed)
|
||||||
- [Is multi-tenancy possible?](#is-multi-tenancy-possible)
|
- [Is multi-tenancy possible?](#is-multi-tenancy-possible)
|
||||||
@@ -326,6 +327,16 @@ If you want to shutdown code-server if there hasn't been an active connection
|
|||||||
after a predetermined amount of time, you can use the --idle-timeout-seconds flag
|
after a predetermined amount of time, you can use the --idle-timeout-seconds flag
|
||||||
or set an `CODE_SERVER_IDLE_TIMEOUT_SECONDS` environment variable.
|
or set an `CODE_SERVER_IDLE_TIMEOUT_SECONDS` environment variable.
|
||||||
|
|
||||||
|
## How do I change the reconnection grace time?
|
||||||
|
|
||||||
|
Pass `--reconnection-grace-time <seconds>` to `code-server`, set
|
||||||
|
`CODE_SERVER_RECONNECTION_GRACE_TIME=<seconds>`, or add
|
||||||
|
`reconnection-grace-time: <seconds>` to
|
||||||
|
`~/.config/code-server/config.yaml`.
|
||||||
|
|
||||||
|
The default is `10800` (3 hours). If a client stays disconnected longer than
|
||||||
|
this, it must reload the window.
|
||||||
|
|
||||||
## How do I change the password?
|
## How do I change the password?
|
||||||
|
|
||||||
Edit the `password` field in the code-server config file at
|
Edit the `password` field in the code-server config file at
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ export interface UserProvidedCodeArgs {
|
|||||||
"disable-workspace-trust"?: boolean
|
"disable-workspace-trust"?: boolean
|
||||||
"disable-getting-started-override"?: boolean
|
"disable-getting-started-override"?: boolean
|
||||||
"disable-proxy"?: boolean
|
"disable-proxy"?: boolean
|
||||||
|
"reconnection-grace-time"?: string
|
||||||
"session-socket"?: string
|
"session-socket"?: string
|
||||||
"cookie-suffix"?: string
|
"cookie-suffix"?: string
|
||||||
"link-protection-trusted-domains"?: string[]
|
"link-protection-trusted-domains"?: string[]
|
||||||
@@ -315,6 +316,12 @@ export const options: Options<Required<UserProvidedArgs>> = {
|
|||||||
type: "number",
|
type: "number",
|
||||||
description: "Timeout in seconds to wait before shutting down when idle.",
|
description: "Timeout in seconds to wait before shutting down when idle.",
|
||||||
},
|
},
|
||||||
|
"reconnection-grace-time": {
|
||||||
|
type: "string",
|
||||||
|
description:
|
||||||
|
"Override the reconnection grace time in seconds. Clients who disconnect for longer than this duration will need to \n" +
|
||||||
|
"reload the window. Defaults to 10800 (3 hours).",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const optionDescriptions = (opts: Partial<Options<Required<UserProvidedArgs>>> = options): string[] => {
|
export const optionDescriptions = (opts: Partial<Options<Required<UserProvidedArgs>>> = options): string[] => {
|
||||||
@@ -632,6 +639,10 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config
|
|||||||
args["github-auth"] = process.env.GITHUB_TOKEN
|
args["github-auth"] = process.env.GITHUB_TOKEN
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (process.env.CODE_SERVER_RECONNECTION_GRACE_TIME) {
|
||||||
|
args["reconnection-grace-time"] = process.env.CODE_SERVER_RECONNECTION_GRACE_TIME
|
||||||
|
}
|
||||||
|
|
||||||
if (process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS) {
|
if (process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS) {
|
||||||
if (isNaN(Number(process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS))) {
|
if (isNaN(Number(process.env.CODE_SERVER_IDLE_TIMEOUT_SECONDS))) {
|
||||||
logger.info("CODE_SERVER_IDLE_TIMEOUT_SECONDS must be a number")
|
logger.info("CODE_SERVER_IDLE_TIMEOUT_SECONDS must be a number")
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ describe("parser", () => {
|
|||||||
delete process.env.PASSWORD
|
delete process.env.PASSWORD
|
||||||
delete process.env.CS_DISABLE_FILE_DOWNLOADS
|
delete process.env.CS_DISABLE_FILE_DOWNLOADS
|
||||||
delete process.env.CS_DISABLE_GETTING_STARTED_OVERRIDE
|
delete process.env.CS_DISABLE_GETTING_STARTED_OVERRIDE
|
||||||
|
delete process.env.CODE_SERVER_RECONNECTION_GRACE_TIME
|
||||||
delete process.env.VSCODE_PROXY_URI
|
delete process.env.VSCODE_PROXY_URI
|
||||||
delete process.env.CS_DISABLE_PROXY
|
delete process.env.CS_DISABLE_PROXY
|
||||||
console.log = jest.fn()
|
console.log = jest.fn()
|
||||||
@@ -115,6 +116,8 @@ describe("parser", () => {
|
|||||||
|
|
||||||
["--session-socket", "/tmp/override-code-server-ipc-socket"],
|
["--session-socket", "/tmp/override-code-server-ipc-socket"],
|
||||||
|
|
||||||
|
["--reconnection-grace-time", "86400"],
|
||||||
|
|
||||||
["--host", "0.0.0.0"],
|
["--host", "0.0.0.0"],
|
||||||
"4",
|
"4",
|
||||||
"--",
|
"--",
|
||||||
@@ -151,6 +154,7 @@ describe("parser", () => {
|
|||||||
version: true,
|
version: true,
|
||||||
"bind-addr": "192.169.0.1:8080",
|
"bind-addr": "192.169.0.1:8080",
|
||||||
"session-socket": "/tmp/override-code-server-ipc-socket",
|
"session-socket": "/tmp/override-code-server-ipc-socket",
|
||||||
|
"reconnection-grace-time": "86400",
|
||||||
"abs-proxy-base-path": "/codeserver/app1",
|
"abs-proxy-base-path": "/codeserver/app1",
|
||||||
"skip-auth-preflight": true,
|
"skip-auth-preflight": true,
|
||||||
})
|
})
|
||||||
@@ -457,6 +461,19 @@ describe("parser", () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("should use env var CODE_SERVER_RECONNECTION_GRACE_TIME for reconnection grace time", async () => {
|
||||||
|
process.env.CODE_SERVER_RECONNECTION_GRACE_TIME = "86400"
|
||||||
|
const args = parse([])
|
||||||
|
expect(args).toEqual({})
|
||||||
|
|
||||||
|
const defaultArgs = await setDefaults(args)
|
||||||
|
expect(defaultArgs).toEqual({
|
||||||
|
...defaults,
|
||||||
|
"reconnection-grace-time": "86400",
|
||||||
|
})
|
||||||
|
delete process.env.CODE_SERVER_RECONNECTION_GRACE_TIME
|
||||||
|
})
|
||||||
|
|
||||||
it("should error if password passed in", () => {
|
it("should error if password passed in", () => {
|
||||||
expect(() => parse(["--password", "supersecret123"])).toThrowError(
|
expect(() => parse(["--password", "supersecret123"])).toThrowError(
|
||||||
"--password can only be set in the config file or passed in via $PASSWORD",
|
"--password can only be set in the config file or passed in via $PASSWORD",
|
||||||
|
|||||||
Reference in New Issue
Block a user