From 26663c2f74b161f02453b5f1aa224cea9ce385e7 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 16:24:58 +0000 Subject: [PATCH 1/5] Bumping sdk dependency to 2.43.0-beta.11 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ecd18ff..00863e2 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.43.0-beta.10", + "@drift-labs/sdk": "2.43.0-beta.11", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index 9ff7218..e42271d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,10 +80,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.43.0-beta.10": - version "2.43.0-beta.10" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.10.tgz#afe05e7b6aaf557d495a2e4743767be4b6c27435" - integrity sha512-NqQ2jV7ewiAkL2nNdxnoi1C+tefnxskFo9rHtl6yUF6NpygE08usOcbCu5to+Cyrtx6cSAymHsxCrDU1c7lkQw== +"@drift-labs/sdk@2.43.0-beta.11": + version "2.43.0-beta.11" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.11.tgz#57346a482505effdf50a9557e9262c444ee596cd" + integrity sha512-vtTd0kq9OjXduWu7/TD8Jf5lfaJwAQnE5MUFcZ3T0mlGI73YVXw/nPZQNahapvp0PewRGMw3XJw6K94I7LfLow== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 3d284507b17aa02e2f25d0cca25a01b77e2b13e7 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 16:41:24 +0000 Subject: [PATCH 2/5] Bumping sdk dependency to 2.43.0-beta.12 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 00863e2..94dcf76 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.43.0-beta.11", + "@drift-labs/sdk": "2.43.0-beta.12", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index e42271d..0b6c37c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,10 +80,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.43.0-beta.11": - version "2.43.0-beta.11" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.11.tgz#57346a482505effdf50a9557e9262c444ee596cd" - integrity sha512-vtTd0kq9OjXduWu7/TD8Jf5lfaJwAQnE5MUFcZ3T0mlGI73YVXw/nPZQNahapvp0PewRGMw3XJw6K94I7LfLow== +"@drift-labs/sdk@2.43.0-beta.12": + version "2.43.0-beta.12" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.12.tgz#f675c872b2a163b9999f4a9b14d40ec04646e0d4" + integrity sha512-RFNJYj5sgQnr/q6gTcYutVQUm+K+t+sMW476eB7qis0QYZQsKxRUI3aLhKwPxgQM/EoE9xHnl1CwHTxAatDwLA== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From b6e47e6cb4bcf3bdf74710fed92cc37fb02c49dd Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 20:01:57 +0000 Subject: [PATCH 3/5] Bumping sdk dependency to 2.43.0-beta.13 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 94dcf76..880b777 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.43.0-beta.12", + "@drift-labs/sdk": "2.43.0-beta.13", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index 0b6c37c..a57c096 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,10 +80,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.43.0-beta.12": - version "2.43.0-beta.12" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.12.tgz#f675c872b2a163b9999f4a9b14d40ec04646e0d4" - integrity sha512-RFNJYj5sgQnr/q6gTcYutVQUm+K+t+sMW476eB7qis0QYZQsKxRUI3aLhKwPxgQM/EoE9xHnl1CwHTxAatDwLA== +"@drift-labs/sdk@2.43.0-beta.13": + version "2.43.0-beta.13" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.13.tgz#fbaf8d02312eb3b3ce61a0e26e0571ea9a1d731d" + integrity sha512-B93GUQmPtTp9dtR0cGDe0LKrjBY+IpyWYRLatP/wHM6GA2TcFOjs6Zlx1gr1eqzDRkK34Ktyzy+oVoCIjU8NHw== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 65e575ac6793ce7de707f2e81a54a6c212a18434 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 20:38:11 +0000 Subject: [PATCH 4/5] Bumping sdk dependency to 2.43.0-beta.14 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 880b777..5979d04 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.43.0-beta.13", + "@drift-labs/sdk": "2.43.0-beta.14", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index a57c096..eaa8947 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,10 +80,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.43.0-beta.13": - version "2.43.0-beta.13" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.13.tgz#fbaf8d02312eb3b3ce61a0e26e0571ea9a1d731d" - integrity sha512-B93GUQmPtTp9dtR0cGDe0LKrjBY+IpyWYRLatP/wHM6GA2TcFOjs6Zlx1gr1eqzDRkK34Ktyzy+oVoCIjU8NHw== +"@drift-labs/sdk@2.43.0-beta.14": + version "2.43.0-beta.14" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.43.0-beta.14.tgz#0cd2ada9cda91519d341d7963ad7d18f6d3f1dff" + integrity sha512-9o+zbpBo0U5nRxcspobV2J4vYGssJaJRvOCOHYql/bnlzXd8qweXg3zRZI2XD1T9vQX4Si12DW5Hw5+jsxIsuw== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 384e785371adcacb3687e824c1d7ecb0919023ea Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Fri, 10 Nov 2023 08:54:29 -0800 Subject: [PATCH 5/5] resub on redis reconnect --- src/wsConnectionManager.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/wsConnectionManager.ts b/src/wsConnectionManager.ts index 270002e..60928ea 100644 --- a/src/wsConnectionManager.ts +++ b/src/wsConnectionManager.ts @@ -36,6 +36,16 @@ async function main() { const channelSubscribers = new Map>(); const subscribedChannels = new Set(); + redisClient.client.on('connect', () => { + subscribedChannels.forEach(async (channel) => { + try { + await redisClient.client.subscribe(channel); + } catch (error) { + console.error(`Error subscribing to ${channel}:`, error); + } + }); + }); + redisClient.client.on('message', (subscribedChannel, message) => { const subscribers = channelSubscribers.get(subscribedChannel); subscribers.forEach((ws) => { @@ -132,7 +142,6 @@ async function main() { // Listen for pong messages ws.on('pong', () => { - console.log('poooooooong'); isAlive = true; clearTimeout(pongTimeoutId); }); @@ -146,6 +155,7 @@ async function main() { if (subscribers.delete(ws) && subscribers.size === 0) { redisClient.client.unsubscribe(channel); channelSubscribers.delete(channel); + subscribedChannels.delete(channel); } }); });