fix: better handle remote storage for utils

nuxt-hub · Mar 1, 2024 · 178d95c · 178d95c
1 parent ab7e216
commit 178d95c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/src/server/api/_hub/database/[command].post.ts b/src/server/api/_hub/database/[command].post.ts
@@ -27,9 +27,12 @@ export default eventHandler(async (event) => {
     const { query, params, colName } = await readValidatedBody(event, z.object({
       query: z.string().min(1).max(1e6).trim(),
       params: z.any().array(),
-      colName: z.string()
+      colName: z.string().optional()
     }).parse)
-    return db.prepare(query).bind(...params).first(colName)
+    if (colName) {
+      return db.prepare(query).bind(...params).first(colName)
+    }
+    return db.prepare(query).bind(...params).first()
   }
 
   if (command === 'batch') {

diff --git a/src/server/utils/analytics.ts b/src/server/utils/analytics.ts
@@ -23,7 +23,7 @@ function _useDataset() {
 
 export function hubAnalytics() {
   const hub = useRuntimeConfig().hub
-  if (import.meta.dev && hub.projectUrl) {
+  if (import.meta.dev && hub.remote && hub.projectUrl) {
     return proxyHubAnalytics(hub.projectUrl, hub.projectSecretKey || hub.userToken)
   }
   const dataset = _useDataset()

diff --git a/src/server/utils/blob.ts b/src/server/utils/blob.ts
@@ -54,7 +54,7 @@ function _useBucket() {
 
 export function hubBlob() {
   const hub = useRuntimeConfig().hub
-  if (import.meta.dev && hub.projectUrl) {
+  if (import.meta.dev && hub.remote && hub.projectUrl) {
     return proxyHubBlob(hub.projectUrl, hub.projectSecretKey || hub.userToken)
   }
   const bucket = _useBucket()

diff --git a/src/server/utils/database.ts b/src/server/utils/database.ts
@@ -12,7 +12,7 @@ export function hubDatabase(): D1Database {
     return _db
   }
   const hub = useRuntimeConfig().hub
-  if (import.meta.dev && hub.projectUrl) {
+  if (import.meta.dev && hub.remote && hub.projectUrl) {
     _db = proxyHubDatabase(hub.projectUrl, hub.projectSecretKey || hub.userToken)
     return _db
   }

diff --git a/src/server/utils/hooks.ts b/src/server/utils/hooks.ts
@@ -9,7 +9,7 @@ export const hubHooks = createHooks<HubHooks>()
 
 export function onHubReady (cb: HubHooks['bindings:ready']) {
   const hub = useRuntimeConfig().hub
-  if (import.meta.dev && !hub.projectUrl) {
+  if (import.meta.dev && !hub.remote) {
     return hubHooks.hookOnce('bindings:ready', cb)
   }
   cb()

diff --git a/src/server/utils/kv.ts b/src/server/utils/kv.ts
@@ -21,7 +21,7 @@ export function hubKV(): HubKV {
     return _kv
   }
   const hub = useRuntimeConfig().hub
-  if (import.meta.dev && hub.projectUrl) {
+  if (import.meta.dev && hub.remote && hub.projectUrl) {
     return proxyHubKV(hub.projectUrl, hub.projectSecretKey || hub.userToken)
   }
   // @ts-ignore