fix: missing upstash creds legacy

Author: imrim12

nuxt.config.ts

@@ -83,6 +83,11 @@ export default defineNuxtConfig({
       password: process.env.REDIS_PASSWORD,
     },
 
+    upstash: {
+      url: process.env.UPSTASH_REDIS_REST_URL,
+      token: process.env.UPSTASH_REDIS_REST_TOKEN,
+    },
+
     public: {
       appVersion,
       appCredit: process.env.NUXT_PUBLIC_APP_CREDIT || 'Thecodeorigin',
@@ -342,6 +347,10 @@ export default defineNuxtConfig({
       ? {
           driver: {
             name: 'upstash',
+            options: {
+              url: process.env.UPSTASH_REDIS_REST_URL,
+              token: process.env.UPSTASH_REDIS_REST_TOKEN,
+            },
           },
         }
       : process.env.REDIS_HOST && process.env.REDIS_PASSWORD

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thecodeorigin/nuxt",
   "type": "module",
-  "version": "1.11.7",
+  "version": "1.11.8",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"

server/plugins/redis.ts

@@ -7,6 +7,8 @@ export default defineNitroPlugin(() => {
   if (process.env.UPSTASH_REDIS_REST_URL && process.env.UPSTASH_REDIS_REST_TOKEN) {
     const driver = upstashDriver({
       base: 'redis',
+      url: process.env.UPSTASH_REDIS_REST_URL,
+      token: process.env.UPSTASH_REDIS_REST_TOKEN,
     })
 
     storage.mount('redis', driver)

server/utils/storage.ts

@@ -1,3 +1,5 @@
+import type { TransactionOptions } from 'unstorage'
+
 export function getStorageSessionKey(providerAccountId: string) {
   return `session:${providerAccountId}`
 }
@@ -9,14 +11,14 @@ export function getStorageStripeKey(identifier: string) {
 function getStorage() {
   const config = useRuntimeConfig()
 
-  return (config.redis.host && config.redis.port && config.redis.password)
+  return ((config.redis.host && config.redis.port && config.redis.password) || (config.upstash.url && config.upstash.token))
     ? useStorage('redis')
     : config.mongodb.connectionString
       ? useStorage('mongodb')
       : useStorage()
 }
 
-export async function tryWithCache<T>(key: string, getter: () => Promise<T | undefined | null>) {
+export async function tryWithCache<T>(key: string, getter: () => Promise<T | undefined | null>, options?: TransactionOptions) {
   const storage = getStorage()
 
   const cachedResult = await storage.getItem(key)
@@ -27,7 +29,7 @@ export async function tryWithCache<T>(key: string, getter: () => Promise<T | und
   const result = await getter()
 
   if (Array.isArray(result) ? result.length : result)
-    await storage.setItem(key, result as any)
+    await storage.setItem(key, result as any, options)
 
   return result as T
 }