Remove ws dep

2025-12-14 14:39:16 +00:00 · 2025-12-14 14:39:16 +00:00 · 63867be48a
commit 63867be48a
parent a21b1e8c03
11 changed files with 171 additions and 143 deletions
--- a/frontend/local-client-cli/Dockerfile
+++ b/frontend/local-client-cli/Dockerfile
@ -1,4 +1,4 @@
-FROM node:22-slim AS builder
+FROM node:25-slim AS builder

 WORKDIR /build

@ -7,7 +7,7 @@ COPY . .
 RUN npm ci
 RUN npm run build

-FROM node:22-alpine
+FROM node:25-alpine

 LABEL org.opencontainers.image.title="VaultLink Local CLI"
 LABEL org.opencontainers.image.description="Standalone CLI for VaultLink sync client"
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@ -11,11 +11,9 @@
        "build": "webpack --mode production",
        "test": "tsx --test 'src/**/*.test.ts'"
    },
-    "dependencies": {
-        "commander": "^14.0.2",
-        "watcher": "^2.3.1"
-    },
    "devDependencies": {
+        "commander": "^14.0.2",
+        "watcher": "^2.3.1",
        "@types/node": "^25.0.2",
        "sync-client": "file:../sync-client",
        "ts-loader": "^9.5.4",
--- a/frontend/local-client-cli/webpack.config.js
+++ b/frontend/local-client-cli/webpack.config.js
@ -2,32 +2,32 @@ const path = require("path");
 const webpack = require("webpack");

 module.exports = {
-        entry: {
-            cli: "./src/cli.ts",
-            healthcheck: "./src/healthcheck.ts"
-        },
-        target: "node",
-        mode: "production",
-        optimization: {
-            minimize: false
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.ts$/,
-                    use: "ts-loader"
-                }
-            ]
-        },
-        resolve: {
-            extensions: [".ts", ".js"]
-        },
-        output: {
-            globalObject: "this",
-            filename: "[name].js",
-            path: path.resolve(__dirname, "dist")
-        },
-        plugins: [
-        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+    entry: {
+        cli: "./src/cli.ts",
+        healthcheck: "./src/healthcheck.ts"
+    },
+    target: "node",
+    mode: "production",
+    optimization: {
+        minimize: false
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: "ts-loader"
+            }
        ]
+    },
+    resolve: {
+        extensions: [".ts", ".js"]
+    },
+    output: {
+        globalObject: "this",
+        filename: "[name].js",
+        path: path.resolve(__dirname, "dist")
+    },
+    plugins: [
+        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+    ]
 };
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -22,20 +22,18 @@
        },
        "local-client-cli": {
            "version": "0.13.1",
-            "dependencies": {
-                "commander": "^14.0.2",
-                "watcher": "^2.3.1"
-            },
            "bin": {
                "vaultlink": "dist/cli.js"
            },
            "devDependencies": {
                "@types/node": "^25.0.2",
+                "commander": "^14.0.2",
                "sync-client": "file:../sync-client",
                "ts-loader": "^9.5.4",
                "tslib": "2.8.1",
                "tsx": "^4.21.0",
                "typescript": "5.9.3",
+                "watcher": "^2.3.1",
                "webpack": "^5.103.0",
                "webpack-cli": "^6.0.1"
            }
@ -1735,6 +1733,7 @@
            "version": "14.0.2",
            "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
            "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
+            "dev": true,
            "license": "MIT",
            "engines": {
                "node": ">=20"
@ -1888,6 +1887,7 @@
            "version": "1.0.5",
            "resolved": "https://registry.npmjs.org/dettle/-/dettle-1.0.5.tgz",
            "integrity": "sha512-ZVyjhAJ7sCe1PNXEGveObOH9AC8QvMga3HJIghHawtG7mE4K5pW9nz/vDGAr/U7a3LWgdOzEE7ac9MURnyfaTA==",
+            "dev": true,
            "license": "MIT"
        },
        "node_modules/dunder-proto": {
@ -3291,6 +3291,7 @@
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/promise-make-counter/-/promise-make-counter-1.0.2.tgz",
            "integrity": "sha512-FJAxTBWQuQoAs4ZOYuKX1FHXxEgKLEzBxUvwr4RoOglkTpOjWuM+RXsK3M9q5lMa8kjqctUrhwYeZFT4ygsnag==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "promise-make-naked": "^3.0.2"
@ -3300,6 +3301,7 @@
            "version": "3.0.2",
            "resolved": "https://registry.npmjs.org/promise-make-naked/-/promise-make-naked-3.0.2.tgz",
            "integrity": "sha512-B+b+kQ1YrYS7zO7P7bQcoqqMUizP06BOyNSBEnB5VJKDSWo8fsVuDkfSmwdjF0JsRtaNh83so5MMFJ95soH5jg==",
+            "dev": true,
            "license": "MIT"
        },
        "node_modules/punycode": {
@ -3744,7 +3746,8 @@
        "node_modules/stubborn-fs": {
            "version": "1.2.5",
            "resolved": "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-1.2.5.tgz",
-            "integrity": "sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g=="
+            "integrity": "sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==",
+            "dev": true
        },
        "node_modules/style-mod": {
            "version": "4.1.3",
@ -3933,6 +3936,7 @@
            "version": "2.7.4",
            "resolved": "https://registry.npmjs.org/tiny-readdir/-/tiny-readdir-2.7.4.tgz",
            "integrity": "sha512-721U+zsYwDirjr8IM6jqpesD/McpZooeFi3Zc6mcjy1pse2C+v19eHPFRqz4chGXZFw7C3KITDjAtHETc2wj7Q==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "promise-make-counter": "^1.0.2"
@ -4218,6 +4222,7 @@
            "version": "2.3.1",
            "resolved": "https://registry.npmjs.org/watcher/-/watcher-2.3.1.tgz",
            "integrity": "sha512-d3yl+ey35h05r5EFP0TafE2jsmQUJ9cc2aernRVyAkZiu0J3+3TbNugNcqdUJDoWOfL2p+bNsN427stsBC/HnA==",
+            "dev": true,
            "dependencies": {
                "dettle": "^1.0.2",
                "stubborn-fs": "^1.2.5",
@ -4480,28 +4485,6 @@
                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
            }
        },
-        "node_modules/ws": {
-            "version": "8.18.3",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-            "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": ">=5.0.2"
-            },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
-            }
-        },
        "node_modules/y18n": {
            "version": "5.0.8",
            "dev": true,
@ -4616,8 +4599,7 @@
                "uuid": "^13.0.0",
                "webpack": "^5.103.0",
                "webpack-cli": "^6.0.1",
-                "webpack-merge": "^6.0.1",
-                "ws": "^8.18.3"
+                "webpack-merge": "^6.0.1"
            }
        },
        "sync-client/node_modules/minimatch": {
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@ -26,7 +26,6 @@
        "webpack": "^5.103.0",
        "webpack-cli": "^6.0.1",
        "webpack-merge": "^6.0.1",
-        "@sentry/browser": "^10.30.0",
-        "ws": "^8.18.3"
+        "@sentry/browser": "^10.30.0"
    }
 }
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@ -2,7 +2,7 @@ import type { RelativePath } from "../persistence/database";
 import type { FileSystemOperations } from "./filesystem-operations";
 import type { Logger } from "../tracing/logger";
 import { Locks } from "../utils/data-structures/locks";
-import { FileNotFoundError } from "./file-not-found-error";
+import { FileNotFoundError } from "../errors/file-not-found-error";
 import type { TextWithCursors } from "reconcile-text";

 /**
--- a/frontend/sync-client/src/services/websocket-manager.test.ts
+++ b/frontend/sync-client/src/services/websocket-manager.test.ts
@ -4,8 +4,6 @@ import assert from "node:assert";
 import { WebSocketManager } from "./websocket-manager";
 import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const WebSocket = require("ws") as typeof globalThis.WebSocket;

 class MockCloseEvent extends Event {
    public code: number;
@ -91,10 +89,8 @@ function createMockFn<T extends (...args: unknown[]) => unknown>(
 describe("WebSocketManager", () => {
    let mockLogger: Logger = undefined as unknown as Logger;
    let mockSettings: Settings = undefined as unknown as Settings;
-    let deviceId = "test-device-123";

    beforeEach(() => {
-        deviceId = "test-device-123";
        const noop = (): void => {
            // Intentionally empty for mock
        };
@ -116,7 +112,6 @@ describe("WebSocketManager", () => {

    it("cleans up promises after message handling", async () => {
        const manager = new WebSocketManager(
-            deviceId,
            mockLogger,
            mockSettings,
            MockWebSocket as unknown as typeof WebSocket
@ -146,7 +141,6 @@ describe("WebSocketManager", () => {

    it("cleans up cursor position promises", async () => {
        const manager = new WebSocketManager(
-            deviceId,
            mockLogger,
            mockSettings,
            MockWebSocket as unknown as typeof WebSocket
@ -176,7 +170,6 @@ describe("WebSocketManager", () => {

    it("logs handshake send errors", async () => {
        const manager = new WebSocketManager(
-            deviceId,
            mockLogger,
            mockSettings,
            MockWebSocket as unknown as typeof WebSocket
@ -205,7 +198,6 @@ describe("WebSocketManager", () => {

    it("completes stop with timeout protection", async () => {
        const manager = new WebSocketManager(
-            deviceId,
            mockLogger,
            mockSettings,
            MockWebSocket as unknown as typeof WebSocket
@ -220,7 +212,6 @@ describe("WebSocketManager", () => {

    it("clears old handlers on reconnection", async () => {
        const manager = new WebSocketManager(
-            deviceId,
            mockLogger,
            mockSettings,
            MockWebSocket as unknown as typeof WebSocket
@ -257,7 +248,6 @@ describe("WebSocketManager", () => {

    it("tracks message handling promises", async () => {
        const manager = new WebSocketManager(
-            deviceId,
            mockLogger,
            mockSettings,
            MockWebSocket as unknown as typeof WebSocket
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@ -31,28 +31,12 @@ export class WebSocketManager {
    private readonly outstandingPromises: Promise<unknown>[] = [];

    private webSocket: WebSocket | undefined;
-    private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;

    public constructor(
-        private readonly deviceId: string,
        private readonly logger: Logger,
        private readonly settings: Settings,
-        webSocketImplementation?: typeof globalThis.WebSocket
-    ) {
-        if (webSocketImplementation) {
-            this.webSocketFactoryImplementation = webSocketImplementation;
-        } else {
-            if (
-                typeof globalThis !== "undefined" &&
-                typeof globalThis.WebSocket === "undefined"
-            ) {
-                // eslint-disable-next-line
-                this.webSocketFactoryImplementation = require("ws"); // polyfill for WebSocket in Node.js
-            } else {
-                this.webSocketFactoryImplementation = WebSocket;
-            }
-        }
-    }
+        private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket = WebSocket
+    ) {}

    public get isWebSocketConnected(): boolean {
        return (
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@ -195,7 +195,6 @@ export class SyncClient {
        );

        const webSocketManager = new WebSocketManager(
-            deviceId,
            logger,
            settings,
            webSocket
--- a/frontend/sync-client/webpack.config.js
+++ b/frontend/sync-client/webpack.config.js
@ -49,11 +49,6 @@ module.exports = [
                type: "umd"
            },
            globalObject: "this"
-        },
-        resolve: {
-            fallback: {
-                ws: false // Exclude `ws` from the browser bundle
-            }
        }
    }),
    merge(common, {
@ -62,10 +57,6 @@ module.exports = [
            path: path.resolve(__dirname, "dist"),
            filename: "sync-client.node.js",
            libraryTarget: "commonjs2"
-        },
-        externals: {
-            bufferutil: "bufferutil",
-            "utf-8-validate": "utf-8-validate" // required for ws: https://github.com/websockets/ws/issues/2245#issuecomment-2250318733
        }
    })
 ];