New Cache Storage: Upstash Redis (#634)

ardatan · github-actions[bot] · web-flow · commit 2292a335181b · 2025-02-11T18:53:51.000+03:00
Co-authored-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;
diff --git a/.changeset/@graphql-hive_gateway-634-dependencies.md b/.changeset/@graphql-hive_gateway-634-dependencies.md
@@ -0,0 +1,7 @@
+---
+'@graphql-hive/gateway': patch
+---
+
+dependencies updates: 
+
+- Added dependency [`@graphql-mesh/cache-upstash-redis@^0.0.1` ↗︎](https://www.npmjs.com/package/@graphql-mesh/cache-upstash-redis/v/0.0.1) (to `dependencies`)
diff --git a/.changeset/fifty-olives-explain.md b/.changeset/fifty-olives-explain.md
@@ -0,0 +1,7 @@
+---
+'@graphql-hive/gateway': minor
+---
+
+Redis Sentinel Support
+
+See the relevant doc section; [Providing Cache Storage](https://the-guild.dev/graphql/hive/docs/gateway/other-features/performance#providing-cache-storage)
diff --git a/.changeset/two-tools-look.md b/.changeset/two-tools-look.md
@@ -0,0 +1,7 @@
+---
+'@graphql-hive/gateway': minor
+---
+
+New Upstash Redis Cache support;
+
+See the relevant doc section; [Providing Cache Storage](https://the-guild.dev/graphql/hive/docs/gateway/other-features/performance#providing-cache-storage)
diff --git a/packages/gateway/package.json b/packages/gateway/package.json
@@ -61,6 +61,7 @@
     "@graphql-mesh/cache-cfw-kv": "^0.104.12",
     "@graphql-mesh/cache-localforage": "^0.103.13",
     "@graphql-mesh/cache-redis": "^0.103.13",
+    "@graphql-mesh/cache-upstash-redis": "^0.0.1",
     "@graphql-mesh/cross-helpers": "^0.4.9",
     "@graphql-mesh/hmac-upstream-signature": "workspace:^",
     "@graphql-mesh/plugin-deduplicate-request": "^0.103.0",
diff --git a/packages/gateway/src/cli.ts b/packages/gateway/src/cli.ts
@@ -15,6 +15,7 @@ import type {
   GatewayGraphOSReportingOptions,
   GatewayHiveReportingOptions,
 } from '@graphql-hive/gateway-runtime';
+import type UpstashRedisCache from '@graphql-mesh/cache-upstash-redis';
 import type { JWTAuthPluginOptions } from '@graphql-mesh/plugin-jwt-auth';
 import type { OpenTelemetryMeshPluginOptions } from '@graphql-mesh/plugin-opentelemetry';
 import type { PrometheusPluginOptions } from '@graphql-mesh/plugin-prometheus';
@@ -143,14 +144,18 @@ export interface GatewayCLIBuiltinPluginConfig {
     | KeyValueCacheFactoryFn
     | GatewayCLILocalforageCacheConfig
     | GatewayCLIRedisCacheConfig
-    | GatewayCLICloudflareKVCacheConfig;
+    | GatewayCLICloudflareKVCacheConfig
+    | GatewayCLIUpstashRedisCacheConfig;
 }
 
 export type GatewayCLILocalforageCacheConfig = YamlConfig.LocalforageConfig & {
   type: 'localforage';
 };
 
-export type GatewayCLIRedisCacheConfig = YamlConfig.RedisConfig & {
+export type GatewayCLIRedisCacheConfig = (
+  | YamlConfig.RedisConfigSingle
+  | YamlConfig.RedisConfigSentinel
+) & {
   type: 'redis';
 };
 
@@ -159,6 +164,10 @@ export type GatewayCLICloudflareKVCacheConfig =
     type: 'cfw-kv';
   };
 
+export type GatewayCLIUpstashRedisCacheConfig = {
+  type: 'upstash-redis';
+} & ConstructorParameters<typeof UpstashRedisCache>[0];
+
 /**
  * Type helper for defining the config.
  */
diff --git a/packages/gateway/src/config.ts b/packages/gateway/src/config.ts
@@ -176,6 +176,15 @@ export async function getCacheInstanceFromConfig(
           ...config.cache,
         });
       }
+      case 'upstash-redis': {
+        const { default: UpstashRedisCache } = await import(
+          '@graphql-mesh/cache-upstash-redis'
+        );
+        return new UpstashRedisCache({
+          ...ctx,
+          ...config.cache,
+        });
+      }
     }
     if (config.cache.type !== 'localforage') {
       ctx.logger.warn(
diff --git a/packages/gateway/src/index.ts b/packages/gateway/src/index.ts
@@ -12,6 +12,7 @@ export { default as useSnapshot } from '@graphql-mesh/plugin-snapshot';
 export { default as CloudflareKVCacheStorage } from '@graphql-mesh/cache-cfw-kv';
 export { default as RedisCacheStorage } from '@graphql-mesh/cache-redis';
 export { default as LocalForageCacheStorage } from '@graphql-mesh/cache-localforage';
+export { default as UpstashRedisCache } from '@graphql-mesh/cache-upstash-redis';
 export { default as usePrometheus } from '@graphql-mesh/plugin-prometheus';
 export {
   type WSTransportOptions,
diff --git a/yarn.lock b/yarn.lock
@@ -594,7 +594,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.2":
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.26.2":
   version: 7.26.2
   resolution: "@babel/code-frame@npm:7.26.2"
   dependencies:
@@ -605,21 +605,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.26.5":
-  version: 7.26.5
-  resolution: "@babel/compat-data@npm:7.26.5"
-  checksum: 10c0/9d2b41f0948c3dfc5de44d9f789d2208c2ea1fd7eb896dfbb297fe955e696728d6f363c600cd211e7f58ccbc2d834fe516bb1e4cf883bbabed8a32b038afc1a0
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.26.8":
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.26.5, @babel/compat-data@npm:^7.26.8":
   version: 7.26.8
   resolution: "@babel/compat-data@npm:7.26.8"
   checksum: 10c0/66408a0388c3457fff1c2f6c3a061278dd7b3d2f0455ea29bb7b187fa52c60ae8b4054b3c0a184e21e45f0eaac63cf390737bc7504d1f4a088a6e7f652c068ca
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.26.8":
+"@babel/core@npm:7.26.8, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.9, @babel/core@npm:^7.23.9, @babel/core@npm:^7.24.7":
   version: 7.26.8
   resolution: "@babel/core@npm:7.26.8"
   dependencies:
@@ -643,43 +636,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.9, @babel/core@npm:^7.23.9, @babel/core@npm:^7.24.7":
-  version: 7.26.7
-  resolution: "@babel/core@npm:7.26.7"
-  dependencies:
-    "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.26.2"
-    "@babel/generator": "npm:^7.26.5"
-    "@babel/helper-compilation-targets": "npm:^7.26.5"
-    "@babel/helper-module-transforms": "npm:^7.26.0"
-    "@babel/helpers": "npm:^7.26.7"
-    "@babel/parser": "npm:^7.26.7"
-    "@babel/template": "npm:^7.25.9"
-    "@babel/traverse": "npm:^7.26.7"
-    "@babel/types": "npm:^7.26.7"
-    convert-source-map: "npm:^2.0.0"
-    debug: "npm:^4.1.0"
-    gensync: "npm:^1.0.0-beta.2"
-    json5: "npm:^2.2.3"
-    semver: "npm:^6.3.1"
-  checksum: 10c0/fbd2cd9fc23280bdcaca556e558f715c0a42d940b9913c52582e8e3d24e391d269cb8a9cd6589172593983569021c379e28bba6b19ea2ee08674f6068c210a9d
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.26.2, @babel/generator@npm:^7.26.5, @babel/generator@npm:^7.7.2":
-  version: 7.26.5
-  resolution: "@babel/generator@npm:7.26.5"
-  dependencies:
-    "@babel/parser": "npm:^7.26.5"
-    "@babel/types": "npm:^7.26.5"
-    "@jridgewell/gen-mapping": "npm:^0.3.5"
-    "@jridgewell/trace-mapping": "npm:^0.3.25"
-    jsesc: "npm:^3.0.2"
-  checksum: 10c0/3be79e0aa03f38858a465d12ee2e468320b9122dc44fc85984713e32f16f4d77ce34a16a1a9505972782590e0b8d847b6f373621f9c6fafa1906d90f31416cb0
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.26.8":
+"@babel/generator@npm:^7.26.2, @babel/generator@npm:^7.26.8, @babel/generator@npm:^7.7.2":
   version: 7.26.8
   resolution: "@babel/generator@npm:7.26.8"
   dependencies:
@@ -886,7 +843,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.2, @babel/parser@npm:^7.26.3, @babel/parser@npm:^7.26.5, @babel/parser@npm:^7.26.7, @babel/parser@npm:^7.26.8":
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.26.2, @babel/parser@npm:^7.26.3, @babel/parser@npm:^7.26.8":
   version: 7.26.8
   resolution: "@babel/parser@npm:7.26.8"
   dependencies:
@@ -1955,18 +1912,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.25.9, @babel/template@npm:^7.3.3":
-  version: 7.25.9
-  resolution: "@babel/template@npm:7.25.9"
-  dependencies:
-    "@babel/code-frame": "npm:^7.25.9"
-    "@babel/parser": "npm:^7.25.9"
-    "@babel/types": "npm:^7.25.9"
-  checksum: 10c0/ebe677273f96a36c92cc15b7aa7b11cc8bc8a3bb7a01d55b2125baca8f19cae94ff3ce15f1b1880fb8437f3a690d9f89d4e91f16fc1dc4d3eb66226d128983ab
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.26.8":
+"@babel/template@npm:^7.25.9, @babel/template@npm:^7.26.8, @babel/template@npm:^7.3.3":
   version: 7.26.8
   resolution: "@babel/template@npm:7.26.8"
   dependencies:
@@ -1977,22 +1923,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.5, @babel/traverse@npm:^7.26.7":
-  version: 7.26.7
-  resolution: "@babel/traverse@npm:7.26.7"
-  dependencies:
-    "@babel/code-frame": "npm:^7.26.2"
-    "@babel/generator": "npm:^7.26.5"
-    "@babel/parser": "npm:^7.26.7"
-    "@babel/template": "npm:^7.25.9"
-    "@babel/types": "npm:^7.26.7"
-    debug: "npm:^4.3.1"
-    globals: "npm:^11.1.0"
-  checksum: 10c0/b23a36ce40d2e4970741431c45d4f92e3f4c2895c0a421456516b2729bd9e17278846e01ee3d9039b0adf5fc5a071768061c17fcad040e74a5c3e39517449d5b
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.26.8":
+"@babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.5, @babel/traverse@npm:^7.26.8":
   version: 7.26.8
   resolution: "@babel/traverse@npm:7.26.8"
   dependencies:
@@ -2007,27 +1938,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.8, @babel/types@npm:^7.20.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.26.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
-  version: 7.26.5
-  resolution: "@babel/types@npm:7.26.5"
-  dependencies:
-    "@babel/helper-string-parser": "npm:^7.25.9"
-    "@babel/helper-validator-identifier": "npm:^7.25.9"
-  checksum: 10c0/0278053b69d7c2b8573aa36dc5242cad95f0d965e1c0ed21ccacac6330092e59ba5949753448f6d6eccf6ad59baaef270295cc05218352e060ea8c68388638c4
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.26.7":
-  version: 7.26.7
-  resolution: "@babel/types@npm:7.26.7"
-  dependencies:
-    "@babel/helper-string-parser": "npm:^7.25.9"
-    "@babel/helper-validator-identifier": "npm:^7.25.9"
-  checksum: 10c0/7810a2bca97b13c253f07a0863a628d33dbe76ee3c163367f24be93bfaf4c8c0a325f73208abaaa050a6b36059efc2950c2e4b71fb109c0f07fa62221d8473d4
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.26.8":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.8, @babel/types@npm:^7.20.7, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.26.7, @babel/types@npm:^7.26.8, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
   version: 7.26.8
   resolution: "@babel/types@npm:7.26.8"
   dependencies:
@@ -3374,6 +3285,7 @@ __metadata:
     "@graphql-mesh/cache-cfw-kv": "npm:^0.104.12"
     "@graphql-mesh/cache-localforage": "npm:^0.103.13"
     "@graphql-mesh/cache-redis": "npm:^0.103.13"
+    "@graphql-mesh/cache-upstash-redis": "npm:^0.0.1"
     "@graphql-mesh/cross-helpers": "npm:^0.4.9"
     "@graphql-mesh/hmac-upstream-signature": "workspace:^"
     "@graphql-mesh/plugin-deduplicate-request": "npm:^0.103.0"
@@ -3532,6 +3444,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@graphql-mesh/cache-upstash-redis@npm:^0.0.1":
+  version: 0.0.1
+  resolution: "@graphql-mesh/cache-upstash-redis@npm:0.0.1"
+  dependencies:
+    "@graphql-mesh/cross-helpers": "npm:^0.4.9"
+    "@graphql-mesh/types": "npm:^0.103.14"
+    "@graphql-mesh/utils": "npm:^0.103.14"
+    "@upstash/redis": "npm:^1.34.3"
+    "@whatwg-node/disposablestack": "npm:^0.0.5"
+    tslib: "npm:^2.4.0"
+  peerDependencies:
+    graphql: "*"
+  checksum: 10c0/66b769c0c119bc3e1c519383610f89b6a2d1789f5a9d4ee3acf4ab46fd6a2e616c2a12c4ef1828f6344415aa18b0d1a863d481620c2971e6eebd8a67d8a836bb
+  languageName: node
+  linkType: hard
+
 "@graphql-mesh/compose-cli@npm:^1.2.13, @graphql-mesh/compose-cli@npm:^1.2.7, @graphql-mesh/compose-cli@npm:^1.3.3, @graphql-mesh/compose-cli@npm:^1.3.5":
   version: 1.3.7
   resolution: "@graphql-mesh/compose-cli@npm:1.3.7"
@@ -3874,19 +3802,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-mesh/store@npm:^0.103.13":
-  version: 0.103.13
-  resolution: "@graphql-mesh/store@npm:0.103.13"
+"@graphql-mesh/store@npm:^0.103.14":
+  version: 0.103.14
+  resolution: "@graphql-mesh/store@npm:0.103.14"
   dependencies:
     "@graphql-inspector/core": "npm:6.2.1"
     "@graphql-mesh/cross-helpers": "npm:^0.4.10"
-    "@graphql-mesh/types": "npm:^0.103.13"
-    "@graphql-mesh/utils": "npm:^0.103.13"
+    "@graphql-mesh/types": "npm:^0.103.14"
+    "@graphql-mesh/utils": "npm:^0.103.14"
     "@graphql-tools/utils": "npm:^10.8.0"
     tslib: "npm:^2.4.0"
   peerDependencies:
     graphql: "*"
-  checksum: 10c0/1e74d3a960cc8c7d1c473272f07fb99288e877b83bf83ce9da98bf3935c23d718c26fcfb65f805e06a99b56a7bc895350db5547c862729556662c26aa824223c
+  checksum: 10c0/44ce3f4c0797bb1af1628134b31acd27415479b78d6494f4b7d0123a9396d47cdc79552d12937bdfd4ad823921e560718a5618bc563472bcffe9d3295253a899
   languageName: node
   linkType: hard
 
@@ -4028,29 +3956,29 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@graphql-mesh/types@npm:^0.103.13, @graphql-mesh/types@npm:^0.103.6":
-  version: 0.103.13
-  resolution: "@graphql-mesh/types@npm:0.103.13"
+"@graphql-mesh/types@npm:^0.103.13, @graphql-mesh/types@npm:^0.103.14, @graphql-mesh/types@npm:^0.103.6":
+  version: 0.103.14
+  resolution: "@graphql-mesh/types@npm:0.103.14"
   dependencies:
-    "@graphql-mesh/store": "npm:^0.103.13"
+    "@graphql-mesh/store": "npm:^0.103.14"
     "@graphql-tools/batch-delegate": "npm:^9.0.10"
     "@graphql-tools/delegate": "npm:^10.0.28"
     "@graphql-tools/utils": "npm:^10.8.0"
     "@graphql-typed-document-node/core": "npm:^3.2.0"
     tslib: "npm:^2.4.0"
   peerDependencies:
     graphql: "*"
-  checksum: 10c0/3b286cd4fc219c178cd3deb0e1d71f66f8879719f4659118f068542965c997c78a727af2935953bcedc0c2934e9f5b7596336f5886939d0961a3f1f3935e1854
+  checksum: 10c0/6056b5d291e2b985ebac8faaf71125d1eb24f0443355ec836bb04a26c3cb1ed1f6e5a8c3b0caad2cfcba5f7750076140bbe35b01fed76c7a094b86f12c25bb4b
   languageName: node
   linkType: hard
 
-"@graphql-mesh/utils@npm:^0.103.13, @graphql-mesh/utils@npm:^0.103.6":
-  version: 0.103.13
-  resolution: "@graphql-mesh/utils@npm:0.103.13"
+"@graphql-mesh/utils@npm:^0.103.13, @graphql-mesh/utils@npm:^0.103.14, @graphql-mesh/utils@npm:^0.103.6":
+  version: 0.103.14
+  resolution: "@graphql-mesh/utils@npm:0.103.14"
   dependencies:
     "@graphql-mesh/cross-helpers": "npm:^0.4.10"
     "@graphql-mesh/string-interpolation": "npm:^0.5.8"
-    "@graphql-mesh/types": "npm:^0.103.13"
+    "@graphql-mesh/types": "npm:^0.103.14"
     "@graphql-tools/batch-delegate": "npm:^9.0.16"
     "@graphql-tools/delegate": "npm:^10.0.28"
     "@graphql-tools/utils": "npm:^10.8.0"
@@ -4065,7 +3993,7 @@ __metadata:
     tslib: "npm:^2.4.0"
   peerDependencies:
     graphql: "*"
-  checksum: 10c0/be0831add1bf674dc6365b4275965f4f19c08276a235fc74613ac53c13dfe337009828885b821294c002a9f1e560d9c13d76fc2914392a3d75c1197404452830
+  checksum: 10c0/6ab645c34c2e4b7cfff4678adb43dfb460454a9b0ec3cd34cf79a506e3a2f6c2e9055b33c5d8063b2bef0b4e054d99ef202141bc58a2db8384a21d8e1d526dc1
   languageName: node
   linkType: hard
 
@@ -6993,6 +6921,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@upstash/redis@npm:^1.34.3":
+  version: 1.34.4
+  resolution: "@upstash/redis@npm:1.34.4"
+  dependencies:
+    crypto-js: "npm:^4.2.0"
+  checksum: 10c0/5253ad1646959ed284d0bf1f6fb9299111202f58eedce6cedb06b11022f484cba981df1a7e86359dfc3e047c20e5fc0a74ff17853260eee1cc738684dbcecd8a
+  languageName: node
+  linkType: hard
+
 "@vitest/expect@npm:3.0.5":
   version: 3.0.5
   resolution: "@vitest/expect@npm:3.0.5"
@@ -9200,6 +9137,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"crypto-js@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "crypto-js@npm:4.2.0"
+  checksum: 10c0/8fbdf9d56f47aea0794ab87b0eb9833baf80b01a7c5c1b0edc7faf25f662fb69ab18dc2199e2afcac54670ff0cd9607a9045a3f7a80336cccd18d77a55b9fdf0
+  languageName: node
+  linkType: hard
+
 "data-uri-to-buffer@npm:^2.0.0":
   version: 2.0.2
   resolution: "data-uri-to-buffer@npm:2.0.2"
