tiny ui updates & backend lib patches

2 files changed, 12 insertions, 11 deletions

diff --git a/extension/src/entries/background/server-api/endpoints.ts b/extension/src/entries/background/server-api/endpoints.ts
index a7f1488..b27bfa9 100644
--- a/extension/src/entries/background/server-api/endpoints.ts
+++ b/extension/src/entries/background/server-api/endpoints.ts
@@ -20,7 +20,7 @@ import { Method } from "axios";
 export interface EndpointDefinition {
     readonly method: Method
     path(request?: any): string
-    onRequest: (request?: any) => Promise<any>
+    onRequest: (...request: any) => Promise<any>
     onResponse: (response: any, request?: any) => Promise<any>
 }
 
@@ -42,7 +42,7 @@ export const initEndponts = () => {
         return endpoints.get(id);
     }
 
-    const execRequest = async <T>(id: string, request?: any): Promise<T> => {
+    const execRequest = async <T>(id: string, ...request: any): Promise<T> => {
         const endpoint = getEndpoint(id);
         if (!endpoint) {
             throw new Error(`Endpoint ${id} not found`);
@@ -52,7 +52,7 @@ export const initEndponts = () => {
         const path = endpoint.path(request);
 
         //Execute the request handler
-        const req = await endpoint.onRequest(request);
+        const req = await endpoint.onRequest(...request);
 
         //Get axios
         const axios = useAxios(null);
diff --git a/extension/src/entries/background/server-api/index.ts b/extension/src/entries/background/server-api/index.ts
index 3e1ada0..ee6582d 100644
--- a/extension/src/entries/background/server-api/index.ts
+++ b/extension/src/entries/background/server-api/index.ts
@@ -15,9 +15,10 @@
 
 
 import { Ref } from "vue"
+import { get } from '@vueuse/core'
 import { WebMessage } from "@vnuge/vnlib.browser"
 import { initEndponts } from "./endpoints"
-import { NostrEvent, NostrPubKey, NostrRelay } from "../types"
+import { NostrEvent } from "../types"
 
 export enum Endpoints {
     GetKeys = 'getKeys',
@@ -35,7 +36,7 @@ export const initApi = (nostrUrl: Ref<string>) => {
     registerEndpoint({
         id: Endpoints.GetKeys,
         method: 'GET',
-        path: () => `${nostrUrl.value}?type=getKeys`,
+        path: () => `${get(nostrUrl)}?type=getKeys`,
         onRequest: () => Promise.resolve(),
         onResponse: (response) => Promise.resolve(response)
     })
@@ -43,7 +44,7 @@ export const initApi = (nostrUrl: Ref<string>) => {
     registerEndpoint({
         id: Endpoints.DeleteKey,
         method: 'DELETE',
-        path: (key: NostrPubKey) => `${nostrUrl.value}?type=identity&key_id=${key.Id}`,
+        path: ([key]) => `${get(nostrUrl)}?type=identity&key_id=${key.Id}`,
         onRequest: () => Promise.resolve(),
         onResponse: (response: WebMessage) => response.getResultOrThrow()
     })
@@ -51,8 +52,8 @@ export const initApi = (nostrUrl: Ref<string>) => {
     registerEndpoint({
         id: Endpoints.SignEvent,
         method: 'POST',
-        path: () => `${nostrUrl.value}?type=signEvent`,
-        onRequest: (event: NostrEvent) => Promise.resolve(event),
+        path: () => `${get(nostrUrl)}?type=signEvent`,
+        onRequest: ([event]) => Promise.resolve(event),
         onResponse: async (response: WebMessage<NostrEvent>) => {
             return response.getResultOrThrow()
         }
@@ -61,7 +62,7 @@ export const initApi = (nostrUrl: Ref<string>) => {
     registerEndpoint({
         id: Endpoints.GetRelays,
         method: 'GET',
-        path: () => `${nostrUrl.value}?type=getRelays`,
+        path: () => `${get(nostrUrl)}?type=getRelays`,
         onRequest: () => Promise.resolve(),
         onResponse: (response) => Promise.resolve(response)
     })
@@ -69,8 +70,8 @@ export const initApi = (nostrUrl: Ref<string>) => {
     registerEndpoint({
         id: Endpoints.SetRelay,
         method: 'POST',
-        path: () => `${nostrUrl.value}?type=relay`,
-        onRequest: (relay: NostrRelay) => Promise.resolve(relay),
+        path: () => `${get(nostrUrl)}?type=relay`,
+        onRequest: ([relay]) => Promise.resolve(relay),
         onResponse: (response) => Promise.resolve(response)
     })