π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
fix: initialize redis client and pass it to hocuspocus (#5516)
M. Palanikannan9f12d13dea16
diff --git a/live/package.json b/live/package.jsonindex 31e5add1e9..465ccdba6a 100644--- a/live/package.json+++ b/live/package.json@@ -27,6 +27,7 @@"express": "^4.19.2","express-ws": "^5.0.2","lodash": "^4.17.21",+ "redis": "^4.7.0","y-prosemirror": "^1.2.9","y-protocols": "^1.0.6","yjs": "^13.6.14"diff --git a/live/src/core/config/redis-config.ts b/live/src/core/config/redis-config.tsindex ff52fea414..e2f9c995fa 100644--- a/live/src/core/config/redis-config.ts+++ b/live/src/core/config/redis-config.ts@@ -1,6 +1,4 @@-type RedisConfig = string | { host: string; port: number } | null;--export function getRedisConfig(): RedisConfig {+export function getRedisUrl() {const redisUrl = process.env.REDIS_URL?.trim();const redisHost = process.env.REDIS_HOST?.trim();const redisPort = process.env.REDIS_PORT?.trim();diff --git a/live/src/server.ts b/live/src/server.tsindex a64a6878b2..f79fa24813 100644--- a/live/src/server.ts+++ b/live/src/server.ts@@ -1,5 +1,6 @@import { Server } from "@hocuspocus/server";import { Redis } from "@hocuspocus/extension-redis";+import { createClient } from "redis";import { Database } from "@hocuspocus/extension-database";import { Logger } from "@hocuspocus/extension-logger";@@ -12,13 +13,18 @@ import {updatePageDescription,} from "@/core/lib/page.js";// config-import { getRedisConfig } from "./core/config/redis-config.js";+import { getRedisUrl } from "@/core/config/redis-config.js";// typesimport { TDocumentTypes } from "@/core/types/common.js";// plane live libimport { fetchDocument } from "@/plane-live/lib/fetch-document.js";import { updateDocument } from "@/plane-live/lib/update-document.js";+const redisUrl = getRedisUrl();+const redisClient = await createClient({ url: redisUrl })+ .on("error", (err) => console.log("Redis Client Error", err))+ .connect();+const server = Server.configure({onAuthenticate: async ({requestHeaders,@@ -48,8 +54,7 @@ const server = Server.configure({}},extensions: [- // @ts-expect-error - redis from hocuspocus is not typed properly- new Redis(getRedisConfig()),+ new Redis({ redis: redisClient }),new Logger(),new Database({fetch: async ({@@ -113,7 +118,7 @@ const server = Server.configure({pageId,params,updatedDescription: state,- })+ });}} catch (error) {console.error("Error in updating document", error);diff --git a/yarn.lock b/yarn.lockindex 0015a0cbd7..05f7248908 100644--- a/yarn.lock+++ b/yarn.lock@@ -2533,6 +2533,40 @@"@react-spring/shared" "~9.4.5""@react-spring/types" "~9.4.5"+"@redis/[email protected]":+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"+ integrity sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==++"@redis/[email protected]":+ version "1.6.0"+ resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.6.0.tgz#dcf4ae1319763db6fdddd6de7f0af68a352c30ea"+ integrity sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==+ dependencies:+ cluster-key-slot "1.1.2"+ generic-pool "3.9.0"+ yallist "4.0.0"++"@redis/[email protected]":+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/@redis/graph/-/graph-1.1.1.tgz#8c10df2df7f7d02741866751764031a957a170ea"+ integrity sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==++"@redis/[email protected]":+ version "1.0.7"+ resolved "https://registry.yarnpkg.com/@redis/json/-/json-1.0.7.tgz#016257fcd933c4cbcb9c49cde8a0961375c6893b"+ integrity sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==++"@redis/[email protected]":+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.2.0.tgz#50976fd3f31168f585666f7922dde111c74567b8"+ integrity sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==++"@redis/[email protected]":+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.1.0.tgz#cba454c05ec201bd5547aaf55286d44682ac8eb5"+ integrity sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==+"@remirror/core-constants@^2.0.2":version "2.0.2"resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.2.tgz#f05eccdc69e3a65e7d524b52548f567904a11a1a"@@ -5366,7 +5400,7 @@ clsx@^2.0.0, clsx@^2.1.0, clsx@^2.1.1:resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==-cluster-key-slot@^1.1.0:[email protected], cluster-key-slot@^1.1.0:version "1.1.2"resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==@@ -7125,6 +7159,11 @@ functions-have-names@^1.2.3:resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==+ version "3.9.0"+ resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.9.0.tgz#36f4a678e963f4fdb8707eab050823abc4e8f5e4"+ integrity sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==+gensync@^1.0.0-beta.2:version "1.0.0-beta.2"resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"@@ -10554,6 +10593,18 @@ redis-parser@^3.0.0:dependencies:redis-errors "^1.0.0"+redis@^4.7.0:+ version "4.7.0"+ resolved "https://registry.yarnpkg.com/redis/-/redis-4.7.0.tgz#b401787514d25dd0cfc22406d767937ba3be55d6"+ integrity sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==+ dependencies:+ "@redis/bloom" "1.2.0"+ "@redis/client" "1.6.0"+ "@redis/graph" "1.1.1"+ "@redis/json" "1.0.7"+ "@redis/search" "1.2.0"+ "@redis/time-series" "1.1.0"+redlock@^4.2.0:version "4.2.0"resolved "https://registry.yarnpkg.com/redlock/-/redlock-4.2.0.tgz#c26590768559afd5fff76aa1133c94b411ff4f5f"@@ -11276,8 +11327,16 @@ string-argv@~0.3.2:resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:- name string-width-cjs+"string-width-cjs@npm:string-width@^4.2.0":+ version "4.2.3"+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==+ dependencies:+ emoji-regex "^8.0.0"+ is-fullwidth-code-point "^3.0.0"+ strip-ansi "^6.0.1"++string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:version "4.2.3"resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==@@ -11373,7 +11432,14 @@ string_decoder@^1.1.1:dependencies:safe-buffer "~5.2.0"-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":+ version "6.0.1"+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==+ dependencies:+ ansi-regex "^5.0.1"++strip-ansi@^6.0.0, strip-ansi@^6.0.1:version "6.0.1"resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==@@ -12642,8 +12708,16 @@ word-wrap@^1.2.5:resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:- name wrap-ansi-cjs+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":+ version "7.0.0"+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==+ dependencies:+ ansi-styles "^4.0.0"+ string-width "^4.1.0"+ strip-ansi "^6.0.0"++wrap-ansi@^7.0.0:version "7.0.0"resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==@@ -12735,16 +12809,16 @@ y18n@^5.0.5:resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==[email protected], yallist@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"+ integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==+yallist@^3.0.2:version "3.1.1"resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==-yallist@^4.0.0:- version "4.0.0"- resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"- integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==-yaml@^1.10.0:version "1.10.2"resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"