feat(useSurrealWS): handle response destr

sandros94 · Jun 2, 2024 · cbaab1f · cbaab1f
1 parent d0e1d09
commit cbaab1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/playground/pages/ws-examples.vue b/playground/pages/ws-examples.vue
@@ -8,17 +8,17 @@
         Fetch examples
       </NuxtLink>
     </div>
-    <div>
-      {{ _data }}
-    </div>
+    <pre>
+      {{ data }}
+    </pre>
     <button @click="userInfo">
       Get user info
     </button>
   </div>
 </template>
 
 <script setup lang="ts">
-const { _data, rpc } = useSurrealWS('staging')
+const { data, rpc } = useSurrealWS('staging')
 
 rpc({
   method: 'live',

diff --git a/src/runtime/composables/surreal-ws.ts b/src/runtime/composables/surreal-ws.ts
@@ -1,5 +1,6 @@
 import { useWebSocket } from '@vueuse/core'
 import { joinURL } from 'ufo'
+import { destr } from 'destr'
 
 import type { Overrides, RpcRequestWS, RpcResponse } from '../types'
 import type { MaybeRef } from '#imports'
@@ -57,8 +58,10 @@ export function useSurrealWS<T = any>(database?: Overrides['database'], options?
     },
   })
 
+  const data = computed(() => destr<RpcResponse<T> | null>(_data.value))
+
   function rpc<T = any>(req: RpcRequestWS<T>) {
-    if (status.value !== 'OPEN') return
+    if (status.value === 'CLOSED') return
     return _send(JSON.stringify({
       id: idCounter.value++,
       ...req,
@@ -68,6 +71,7 @@ export function useSurrealWS<T = any>(database?: Overrides['database'], options?
   return {
     close,
     _data,
+    data,
     open,
     rpc,
     _send,