@snort/system - npm Package Compare versions

Comparing version 1.2.2 to 1.2.3

dist/impl/nip46.d.ts

@@ -18,3 +18,8 @@ import { EventSigner } from "../signer";
     get privateKey(): string | undefined;
-    init(): Promise<void>;
+    /**
+     * Connect to the bunker relay
+     * @param autoConnect Start connect flow for pubkey
+     * @returns
+     */
+    init(autoConnect?: boolean): Promise<void>;
     close(): Promise<void>;
@@ -21,0 +26,0 @@ describe(): Promise<string[]>;

dist/impl/nip46.js

@@ -51,3 +51,8 @@ import { unwrap, bech32ToHex } from "@snort/shared";
     }
-    async init() {
+    /**
+     * Connect to the bunker relay
+     * @param autoConnect Start connect flow for pubkey
+     * @returns
+     */
+    async init(autoConnect = true) {
         const isBunker = this.#proto === "bunker:";
@@ -72,34 +77,36 @@ if (isBunker) {
                 ], () => { });
-                if (isBunker) {
-                    const rsp = await this.#connect(unwrap(this.#remotePubkey));
-                    if (rsp.result === "auth_url") {
-                        // re-insert the command into queue for result of oAuth flow
-                        this.#commandQueue.set(rsp.id, {
-                            resolve: async (o) => {
-                                if (o.result === "ack") {
-                                    resolve();
-                                }
-                                else {
-                                    reject(o.error);
-                                }
+                if (autoConnect) {
+                    if (isBunker) {
+                        const rsp = await this.#connect(unwrap(this.#remotePubkey));
+                        if (rsp.result === "auth_url") {
+                            // re-insert the command into queue for result of oAuth flow
+                            this.#commandQueue.set(rsp.id, {
+                                resolve: async (o) => {
+                                    if (o.result === "ack") {
+                                        resolve();
+                                    }
+                                    else {
+                                        reject(o.error);
+                                    }
+                                },
+                                reject,
+                            });
+                            this.emit("oauth", rsp.error);
+                        }
+                        else if (rsp.result === "ack") {
+                            resolve();
+                        }
+                        else {
+                            reject(rsp.error);
+                        }
+                    }
+                    else {
+                        this.#commandQueue.set("connect", {
+                            reject,
+                            resolve: () => {
+                                resolve();
                             },
-                            reject,
                         });
-                        this.emit("oauth", rsp.error);
                     }
-                    else if (rsp.result === "ack") {
-                        resolve();
-                    }
-                    else {
-                        reject(rsp.error);
-                    }
                 }
-                else {
-                    this.#commandQueue.set("connect", {
-                        reject,
-                        resolve: () => {
-                            resolve();
-                        },
-                    });
-                }
             });
@@ -158,2 +165,3 @@ this.#conn.connect();
     async createAccount(name, domain, email) {
+        await this.init(false);
         const rsp = await this.#rpc("create_account", [name, domain, email ?? ""]);
@@ -176,2 +184,5 @@ if (rsp.result === "auth_url") {
         }
+        else {
+            throw new Error(rsp.error);
+        }
     }
@@ -245,2 +256,2 @@ async #disconnect() {
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nip46.js","sourceRoot":"","sources":["../../src/impl/nip46.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nip46.js","sourceRoot":"","sources":["../../src/impl/nip46.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "@snort/system",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Snort nostr system package",
@@ -5,0 +5,0 @@ "type": "module",

src/impl/nip46.ts

@@ -91,3 +91,8 @@ import { unwrap, bech32ToHex } from "@snort/shared";
 
-  async init() {
+  /**
+   * Connect to the bunker relay
+   * @param autoConnect Start connect flow for pubkey
+   * @returns 
+   */
+  async init(autoConnect = true) {
     const isBunker = this.#proto === "bunker:";
@@ -116,29 +121,31 @@ if (isBunker) {
 
-        if (isBunker) {
-          const rsp = await this.#connect(unwrap(this.#remotePubkey));
-          if (rsp.result === "auth_url") {
-            // re-insert the command into queue for result of oAuth flow
-            this.#commandQueue.set(rsp.id, {
-              resolve: async (o: Nip46Response) => {
-                if (o.result === "ack") {
-                  resolve();
-                } else {
-                  reject(o.error);
-                }
+        if (autoConnect) {
+          if (isBunker) {
+            const rsp = await this.#connect(unwrap(this.#remotePubkey));
+            if (rsp.result === "auth_url") {
+              // re-insert the command into queue for result of oAuth flow
+              this.#commandQueue.set(rsp.id, {
+                resolve: async (o: Nip46Response) => {
+                  if (o.result === "ack") {
+                    resolve();
+                  } else {
+                    reject(o.error);
+                  }
+                },
+                reject,
+              });
+              this.emit("oauth", rsp.error);
+            } else if (rsp.result === "ack") {
+              resolve();
+            } else {
+              reject(rsp.error);
+            }
+          } else {
+            this.#commandQueue.set("connect", {
+              reject,
+              resolve: () => {
+                resolve();
               },
-              reject,
             });
-            this.emit("oauth", rsp.error);
-          } else if (rsp.result === "ack") {
-            resolve();
-          } else {
-            reject(rsp.error);
           }
-        } else {
-          this.#commandQueue.set("connect", {
-            reject,
-            resolve: () => {
-              resolve();
-            },
-          });
         }
@@ -206,2 +213,3 @@ });
   async createAccount(name: string, domain: string, email?: string) {
+    await this.init(false);
     const rsp = await this.#rpc("create_account", [name, domain, email ?? ""]);
@@ -222,2 +230,4 @@ if (rsp.result === "auth_url") {
       });
+    } else {
+      throw new Error(rsp.error);
     }
@@ -224,0 +234,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

803291

increased by0.14%

Lines of code

14425

increased by0.18%

No dependency changes