From fef88d1aa6a5fcc679a923ad50ea4a8a861fa41b Mon Sep 17 00:00:00 2001 From: Matthew Linkous Date: Sat, 15 Jun 2024 16:46:49 -0500 Subject: [PATCH] client: Fix connection status not working with web worker --- .changeset/loud-mayflies-approve.md | 5 +++++ packages/client/package.json | 2 +- packages/client/src/transport/websocket-transport.ts | 4 +--- packages/client/src/worker-client/worker-client.ts | 1 - 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 .changeset/loud-mayflies-approve.md diff --git a/.changeset/loud-mayflies-approve.md b/.changeset/loud-mayflies-approve.md new file mode 100644 index 00000000..94765e78 --- /dev/null +++ b/.changeset/loud-mayflies-approve.md @@ -0,0 +1,5 @@ +--- +'@triplit/client': patch +--- + +Fix connection status listening when using web worker client diff --git a/packages/client/package.json b/packages/client/package.json index 3bd0e383..20c6c776 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -47,7 +47,7 @@ "test:unit": "vitest run", "typecheck": "vitest --typecheck.only --no-watch", "publish-pkg": "node ../../scripts/npm-check-version-and-publish.js", - "build-worker": "esbuild ./src/worker-client/worker-client-operator.ts --bundle --minify --platform=browser --outfile=./dist/worker-client/worker-client-operator.js --format=esm --sourcemap", + "build-worker": "esbuild ./src/worker-client/worker-client-operator.ts --bundle --minify --platform=browser --outfile=./dist/worker-client/worker-client-operator.js --format=esm", "validate:types": "node ../../scripts/check-for-local-references-in-declarations.js dist" }, "files": [ diff --git a/packages/client/src/transport/websocket-transport.ts b/packages/client/src/transport/websocket-transport.ts index 59e739c7..01408eb1 100644 --- a/packages/client/src/transport/websocket-transport.ts +++ b/packages/client/src/transport/websocket-transport.ts @@ -158,9 +158,7 @@ function friendlyReadyState(conn: WebSocket): ConnectionStatus { } } -// temporary defensive check for node env -// only run in browser for now -if (typeof document !== 'undefined') { +if (typeof WebSocket !== 'undefined') { // Add any changes to the WebSocket type here (ex more event handlers) var WebSocketProxy = new Proxy(WebSocket, { construct: function (target, args) { diff --git a/packages/client/src/worker-client/worker-client.ts b/packages/client/src/worker-client/worker-client.ts index 51145b6d..0837bbb4 100644 --- a/packages/client/src/worker-client/worker-client.ts +++ b/packages/client/src/worker-client/worker-client.ts @@ -51,7 +51,6 @@ export class WorkerClient { }); this._connectionStatus = 'CLOSED'; this.onConnectionStatusChange((status) => { - console.log('connection status:', status); this._connectionStatus = status; }, true); this.db.updateGlobalVariables = (variables) => {