From f4c9090b8848a23aa77964b4f563a9f1300611dd Mon Sep 17 00:00:00 2001 From: LukeGus Date: Wed, 30 Sep 2026 10:04:17 -0500 Subject: [PATCH] fix: type errors and lint failures from merged plugin prs --- electron/c2s-auth.cjs | 2 +- .../tests/frontend/guacamole-key-release.test.ts | 1 + plugins/session-sharing/manifest.json | 2 +- plugins/session-sharing/tests/backend/helpers.ts | 15 +++++++-------- .../tests/frontend/presenter-takeover.test.ts | 1 + .../terminal/shared-terminal-size.test.ts | 1 + .../frontend/terminal/terminal-unmount.test.ts | 1 + .../tunnels/tests/backend/c2s-relay-auth.test.ts | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/electron/c2s-auth.cjs b/electron/c2s-auth.cjs index 693230048..4bb52944a 100644 --- a/electron/c2s-auth.cjs +++ b/electron/c2s-auth.cjs @@ -33,7 +33,7 @@ function createC2SAuthBridge(ipcMain, getWindow) { window.isDestroyed() || active.size || typeof message.requestId !== "string" || - !["totp", "input", "browser"].includes(message.request?.kind) + !["totp", "input", "browser"].includes(message.request?.kind) // plugin-id-ok: SSH prompt kind, not the plugin ) { ws.close(); return; diff --git a/plugins/remote-desktop/tests/frontend/guacamole-key-release.test.ts b/plugins/remote-desktop/tests/frontend/guacamole-key-release.test.ts index c735cedab..bdfcb05ac 100644 --- a/plugins/remote-desktop/tests/frontend/guacamole-key-release.test.ts +++ b/plugins/remote-desktop/tests/frontend/guacamole-key-release.test.ts @@ -1,3 +1,4 @@ +/// import ts from "typescript"; import Guacamole from "guacamole-common-js"; import { afterEach, describe, expect, it, vi } from "vitest"; diff --git a/plugins/session-sharing/manifest.json b/plugins/session-sharing/manifest.json index 226051a90..c80f1764e 100644 --- a/plugins/session-sharing/manifest.json +++ b/plugins/session-sharing/manifest.json @@ -104,7 +104,7 @@ ] } }, - "uses": ["session.remoteDisplay.token", "terminal.open"] + "uses": ["session.remoteDisplay.token", "terminal.open", "terminal.overlay"] }, "locales": "locales", "platforms": ["linux", "win32", "darwin"] diff --git a/plugins/session-sharing/tests/backend/helpers.ts b/plugins/session-sharing/tests/backend/helpers.ts index 2e6832ee3..1c14b6477 100644 --- a/plugins/session-sharing/tests/backend/helpers.ts +++ b/plugins/session-sharing/tests/backend/helpers.ts @@ -92,14 +92,13 @@ export async function startServer( }, }); const refs = await db.database.refs(); - db.database.refs = async () => - ({ - ...refs, - hosts: sqliteTable("ssh_data", { - id: integer("id").primaryKey(), - syncId: text("sync_id"), - }), - }) as Awaited>; + db.database.refs = (async () => ({ + ...(refs as object), + hosts: sqliteTable("ssh_data", { + id: integer("id").primaryKey(), + syncId: text("sync_id"), + }), + })) as typeof db.database.refs; for (const user of options.users ?? ["alice", "bob", "carol"]) { db.sqlite .prepare("INSERT INTO users (id, username, is_admin) VALUES (?, ?, ?)") diff --git a/plugins/session-sharing/tests/frontend/presenter-takeover.test.ts b/plugins/session-sharing/tests/frontend/presenter-takeover.test.ts index 699c50cef..539e8a6e1 100644 --- a/plugins/session-sharing/tests/frontend/presenter-takeover.test.ts +++ b/plugins/session-sharing/tests/frontend/presenter-takeover.test.ts @@ -1,3 +1,4 @@ +/// import ts from "typescript"; import { describe, expect, it, vi } from "vitest"; import roomSource from "../../src/frontend/CollabRoomTab.tsx?raw"; diff --git a/plugins/ssh-terminal/tests/frontend/terminal/shared-terminal-size.test.ts b/plugins/ssh-terminal/tests/frontend/terminal/shared-terminal-size.test.ts index ec95d0462..0dd01be81 100644 --- a/plugins/ssh-terminal/tests/frontend/terminal/shared-terminal-size.test.ts +++ b/plugins/ssh-terminal/tests/frontend/terminal/shared-terminal-size.test.ts @@ -1,3 +1,4 @@ +/// import ts from "typescript"; import { describe, expect, it, vi } from "vitest"; import sourceText from "../../../src/frontend/terminal/Terminal.tsx?raw"; diff --git a/plugins/ssh-terminal/tests/frontend/terminal/terminal-unmount.test.ts b/plugins/ssh-terminal/tests/frontend/terminal/terminal-unmount.test.ts index 70d44647d..6460a2882 100644 --- a/plugins/ssh-terminal/tests/frontend/terminal/terminal-unmount.test.ts +++ b/plugins/ssh-terminal/tests/frontend/terminal/terminal-unmount.test.ts @@ -1,3 +1,4 @@ +/// import ts from "typescript"; import { afterEach, describe, expect, it, vi } from "vitest"; import sourceText from "../../../src/frontend/terminal/Terminal.tsx?raw"; diff --git a/plugins/tunnels/tests/backend/c2s-relay-auth.test.ts b/plugins/tunnels/tests/backend/c2s-relay-auth.test.ts index 48c234a0a..2fea52c29 100644 --- a/plugins/tunnels/tests/backend/c2s-relay-auth.test.ts +++ b/plugins/tunnels/tests/backend/c2s-relay-auth.test.ts @@ -52,7 +52,7 @@ describe("interactive client relay", () => { return { client, dispose, host: host(), jumpClient: null }; }, ); - mock.ctx.ssh.connect = connect as typeof mock.ctx.ssh.connect; + mock.ctx.ssh.connect = connect as unknown as typeof mock.ctx.ssh.connect; const handle = createC2SRelay(mock.ctx); const anchor = new Socket(); const socket = new Socket();