@onekeyfe/onekey-nostr-provider 1.1.51 → 1.1.53

package/dist/ProviderNostr.d.ts

@@ -4,9 +4,11 @@ import { IProviderNostr, NostrProviderEventsMap, Event, IRelay } from "./types";
 declare class ProviderNostr extends ProviderNostrBase implements IProviderNostr {
     private states;
     constructor(props: IInpageProviderConfig);
-    setExecuting(executing: boolean): void;
-    private checkEnabled;
+    private _registerEvents;
+    private _handleDisconnected;
+    private _handleAccountChange;
     on<E extends keyof NostrProviderEventsMap>(event: E, listener: NostrProviderEventsMap[E]): this;
+    off<E extends keyof NostrProviderEventsMap>(event: E, listener: NostrProviderEventsMap[E]): this;
     emit<E extends keyof NostrProviderEventsMap>(event: E, ...args: Parameters<NostrProviderEventsMap[E]>): boolean;
     private _callBridge;
     enable(): Promise<boolean>;

package/dist/ProviderNostr.js

@@ -8,6 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { ProviderNostrBase } from "./ProviderNostrBase";
+function isWalletEventMethodMatch(method, name) {
+    return method === `metamask_${name}` || method === `wallet_events_${name}`;
+}
+const PROVIDER_EVENTS = {
+    'connect': 'connect',
+    'disconnect': 'disconnect',
+    'accountChanged': 'accountChanged',
+    'message_low_level': 'message_low_level',
+};
 class ProviderNostr extends ProviderNostrBase {
     constructor(props) {
         super(props);
@@ -25,25 +34,34 @@ class ProviderNostr extends ProviderNostrBase {
                 return result;
             }),
         };
+        this._registerEvents();
     }
-    setExecuting(executing) {
-        this.states.executing = executing;
+    _registerEvents() {
+        window.addEventListener('onekey_bridge_disconnect', () => {
+            this._handleDisconnected();
+        });
+        this.on(PROVIDER_EVENTS.message_low_level, (payload) => {
+            const { method } = payload;
+            if (isWalletEventMethodMatch(method, PROVIDER_EVENTS.accountChanged)) {
+                this._handleAccountChange();
+            }
+        });
     }
-    checkEnabled(method) {
-        if (!this.states.enabled) {
-            const message = `Please allow the connection request of webln before calling the ${method} method`;
-            alert(message);
-            throw new Error(message);
-        }
-        if (this.states.executing) {
-            const message = `window.webln call already executing`;
-            alert(message);
-            throw new Error(message);
+    _handleDisconnected(options = { emit: true }) {
+        if (options.emit && this.isConnectionStatusChanged('disconnected')) {
+            this.emit('disconnect');
+            this.emit('accountChanged');
         }
     }
+    _handleAccountChange() {
+        this.emit('accountChanged');
+    }
     on(event, listener) {
         return super.on(event, listener);
     }
+    off(event, listener) {
+        return super.off(event, listener);
+    }
     emit(event, ...args) {
         return super.emit(event, ...args);
     }

package/dist/cjs/ProviderNostr.js

@@ -11,6 +11,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProviderNostr = void 0;
 const ProviderNostrBase_1 = require("./ProviderNostrBase");
+function isWalletEventMethodMatch(method, name) {
+    return method === `metamask_${name}` || method === `wallet_events_${name}`;
+}
+const PROVIDER_EVENTS = {
+    'connect': 'connect',
+    'disconnect': 'disconnect',
+    'accountChanged': 'accountChanged',
+    'message_low_level': 'message_low_level',
+};
 class ProviderNostr extends ProviderNostrBase_1.ProviderNostrBase {
     constructor(props) {
         super(props);
@@ -28,25 +37,34 @@ class ProviderNostr extends ProviderNostrBase_1.ProviderNostrBase {
                 return result;
             }),
         };
+        this._registerEvents();
     }
-    setExecuting(executing) {
-        this.states.executing = executing;
+    _registerEvents() {
+        window.addEventListener('onekey_bridge_disconnect', () => {
+            this._handleDisconnected();
+        });
+        this.on(PROVIDER_EVENTS.message_low_level, (payload) => {
+            const { method } = payload;
+            if (isWalletEventMethodMatch(method, PROVIDER_EVENTS.accountChanged)) {
+                this._handleAccountChange();
+            }
+        });
     }
-    checkEnabled(method) {
-        if (!this.states.enabled) {
-            const message = `Please allow the connection request of webln before calling the ${method} method`;
-            alert(message);
-            throw new Error(message);
-        }
-        if (this.states.executing) {
-            const message = `window.webln call already executing`;
-            alert(message);
-            throw new Error(message);
+    _handleDisconnected(options = { emit: true }) {
+        if (options.emit && this.isConnectionStatusChanged('disconnected')) {
+            this.emit('disconnect');
+            this.emit('accountChanged');
         }
     }
+    _handleAccountChange() {
+        this.emit('accountChanged');
+    }
     on(event, listener) {
         return super.on(event, listener);
     }
+    off(event, listener) {
+        return super.off(event, listener);
+    }
     emit(event, ...args) {
         return super.emit(event, ...args);
     }

package/dist/types.d.ts

@@ -64,7 +64,7 @@ declare const PROVIDER_EVENTS: {
 export declare type NostrProviderEventsMap = {
     [PROVIDER_EVENTS.connect]: (account: string) => void;
     [PROVIDER_EVENTS.disconnect]: () => void;
-    [PROVIDER_EVENTS.accountChanged]: (account: string | null) => void;
+    [PROVIDER_EVENTS.accountChanged]: () => void;
     [PROVIDER_EVENTS.message_low_level]: (payload: IJsonRpcRequest) => void;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-nostr-provider",
-  "version": "1.1.51",
+  "version": "1.1.53",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,10 +28,10 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "1.1.51",
-    "@onekeyfe/cross-inpage-provider-errors": "1.1.51",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.51",
-    "@onekeyfe/extension-bridge-injected": "1.1.51"
+    "@onekeyfe/cross-inpage-provider-core": "1.1.53",
+    "@onekeyfe/cross-inpage-provider-errors": "1.1.53",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.53",
+    "@onekeyfe/extension-bridge-injected": "1.1.53"
   },
-  "gitHead": "dc579c5d16a7d2c8abac2c7c7e431e3a8e7d2d84"
+  "gitHead": "33ed7e15f71c3efd6e957765dde80d22085a91a3"
 }