web_lib

commit 8633e5104b122b4ffdc0035cf5c058e4c4d7ad6d
parent 73892ee9abe1babc0eae57fa17648da3d22b9b0e
Author: triesap <137732411+triesap@users.noreply.github.com>
Date:   Thu, 10 Apr 2025 21:56:31 +0000

client: add/edit client methods, fix incorrect nostr key add command

Diffstat:
M
client/src/datastore/tauri.ts
 | 
1
+
M
client/src/http/tauri.ts
 | 
2
--
M
client/src/keys/tauri.ts
 | 
26
++++++++++++++++----------

3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/client/src/datastore/tauri.ts b/client/src/datastore/tauri.ts
@@ -6,6 +6,7 @@ const ds_map_param = {
 } as const;
 
 const ds_map = {
+    init_nostr: `init:nostr:publickey`,
     key_nostr: `nostr:publickey`,
     role: `config:role`,
     is_setup: `config:is_setup`,
diff --git a/client/src/http/tauri.ts b/client/src/http/tauri.ts
@@ -25,7 +25,6 @@ export class TauriClientHttp implements IClientHttp {
         try {
             const { url, options } = http_fetch_opts(opts);
             const response = await fetch(url, options);
-            console.log(`response `, response)
             return lib_http_parse_response(response);
         } catch (e) {
             console.log(`e fetch`, e)
@@ -46,7 +45,6 @@ export class TauriClientHttp implements IClientHttp {
             switch (response.ok) {
                 case true: {
                     const blob = await response.blob();
-
                     return {
                         status: response.status,
                         url: response.url,
diff --git a/client/src/keys/tauri.ts b/client/src/keys/tauri.ts
@@ -1,21 +1,27 @@
 
-import { err_msg, is_pass_response, is_result_response, is_results_response } from '@radroots/util';
+import { lib_nostr_secret_key_validate } from '@radroots/nostr-util';
+import { err_msg, ErrorMessage, is_pass_response, is_result_response, is_results_response } from '@radroots/util';
 import { invoke } from '@tauri-apps/api/core';
 import type { IClientKeys, IClientKeysNostrAddResolve, IClientKeysNostrCreateResolve, IClientKeysNostrDeleteResolve, IClientKeysNostrKeystoreResetResolve, IClientKeysNostrReadAllResolve, IClientKeysNostrReadResolve } from './types';
-import { lib_nostr_secret_key_validate } from '@radroots/nostr-util';
 
 export class TauriClientKeys implements IClientKeys {
     private async command(cmd: string, opts?: any): Promise<any> {
         return await invoke<any>(cmd, opts ? opts : undefined);
     };
 
+    private handle_error = (e: any): ErrorMessage<string> => {
+        const err = String(e);
+        if (err) return err_msg(err);
+        return err_msg(`*`);
+    }
+
     public nostr_gen = async (): Promise<IClientKeysNostrCreateResolve> => {
         try {
             const response = await this.command("keys_nostr_gen");
             if (is_result_response(response)) return { public_key: response.result };
             return err_msg(`*-result`);
         } catch (e) {
-            return err_msg(`*`);
+            return this.handle_error(e);
         }
     }
 
@@ -23,11 +29,11 @@ export class TauriClientKeys implements IClientKeys {
         try {
             const secret_key = lib_nostr_secret_key_validate(nsec_or_hex);
             if (!secret_key) return err_msg(`*-key`);
-            const response = await this.command("keys_nostr_create", { secret_key });
+            const response = await this.command("keys_nostr_add", { secret_key });
             if (is_result_response(response)) return { public_key: response.result };
             return err_msg(`*-result`);
         } catch (e) {
-            return err_msg(`*`);
+            return this.handle_error(e);
         }
     }
 
@@ -37,7 +43,7 @@ export class TauriClientKeys implements IClientKeys {
             if (is_result_response(response)) return { secret_key: response.result };
             return err_msg(`*-result`);
         } catch (e) {
-            return err_msg(`*`);
+            return this.handle_error(e);
         }
     }
 
@@ -47,7 +53,7 @@ export class TauriClientKeys implements IClientKeys {
             if (is_results_response(response)) return { results: response.results };
             return err_msg(`*-result`);
         } catch (e) {
-            return err_msg(`*`);
+            return this.handle_error(e);
         }
     }
 
@@ -57,7 +63,7 @@ export class TauriClientKeys implements IClientKeys {
             if (is_pass_response(response)) return { pass: true };
             return err_msg(`*-result`);
         } catch (e) {
-            return err_msg(`*`);
+            return this.handle_error(e);
         }
     }
 
@@ -65,9 +71,9 @@ export class TauriClientKeys implements IClientKeys {
         try {
             const response = await this.command("keys_nostr_keystore_reset");
             if (is_pass_response(response)) return { pass: true };
-            return err_msg(`*`);
+            return err_msg(`*-result`);
         } catch (e) {
-            return err_msg(`*`);
+            return this.handle_error(e);
         }
     }
 }