Skip to content

feat(cache): support batch delete #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2024
Merged

feat(cache): support batch delete #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/runtime/cache/server/api/_hub/cache/batch-delete.post.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { eventHandler, readValidatedBody, sendNoContent } from 'h3'
import { eventHandler, readValidatedBody, sendNoContent, getHeader } from 'h3'
import { z } from 'zod'
import { requireNuxtHubAuthorization } from '../../../../../utils/auth'
import { requireNuxtHubFeature } from '../../../../../utils/features'
import { useStorage } from '#imports'
import { useStorage, useRuntimeConfig } from '#imports'

export default eventHandler(async (event) => {
await requireNuxtHubAuthorization(event)
Expand All @@ -13,11 +13,22 @@ export default eventHandler(async (event) => {
}).parse)

const storage = useStorage('cache')
// delete with batch of 25 keys
do {
const keysToDelete = keys.splice(0, 25)
await Promise.all(keysToDelete.map(key => storage.removeItem(key)))
} while (keys.length)

const hub = useRuntimeConfig(event).hub
if (import.meta.dev) {
// delete with batch of 100 keys
do {
const keysToDelete = keys.splice(0, 100)
await Promise.all(keysToDelete.map(storage.removeItem))
} while (keys.length)
} else {
await $fetch(`/api/projects/${process.env.NUXT_HUB_PROJECT_KEY || hub.projectKey}/cache/${process.env.NUXT_HUB_ENV || hub.env}/batch-delete`, {
baseURL: process.env.NUXT_HUB_URL || hub.url,
method: 'POST',
body: { keys },
headers: {
authorization: getHeader(event, 'authorization')
}
})
}
return sendNoContent(event)
})
29 changes: 21 additions & 8 deletions src/runtime/cache/server/api/_hub/cache/clear/[...base].delete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { eventHandler, sendNoContent, getRouterParam, createError } from 'h3'
import { eventHandler, sendNoContent, getRouterParam, createError, getHeader } from 'h3'
import { requireNuxtHubAuthorization } from '../../../../../../utils/auth'
import { requireNuxtHubFeature } from '../../../../../../utils/features'
// @ts-expect-error useStorage not yet typed
import { useStorage } from '#imports'
import { useStorage, useRuntimeConfig } from '#imports'

export default eventHandler(async (event) => {
await requireNuxtHubAuthorization(event)
Expand All @@ -18,11 +17,25 @@ export default eventHandler(async (event) => {

const storage = useStorage(`cache:${base}`)
const keys = await storage.getKeys()
// delete with batch of 25 keys
do {
const keysToDelete = keys.splice(0, 25)
await Promise.all(keysToDelete.map(storage.removeItem))
} while (keys.length)
const hub = useRuntimeConfig(event).hub
if (import.meta.dev) {
// delete with batch of 100 keys
do {
const keysToDelete = keys.splice(0, 100)
await Promise.all(keysToDelete.map(storage.removeItem))
} while (keys.length)
} else {
await $fetch(`/api/projects/${process.env.NUXT_HUB_PROJECT_KEY || hub.projectKey}/cache/${process.env.NUXT_HUB_ENV || hub.env}/batch-delete`, {
baseURL: process.env.NUXT_HUB_URL || hub.url,
method: 'POST',
body: {
keys: keys.map(key => `${base}:${key}`)
},
headers: {
authorization: getHeader(event, 'authorization')
}
})
}

return sendNoContent(event)
})