@konemono/nostr-login 1.11.0 → 1.11.1

package/dist/modules/AuthNostrService.d.ts

@@ -3,7 +3,8 @@ import { NostrParams } from './';
 import { EventEmitter } from 'tseep';
 import { Signer } from './Nostr';
 declare class AuthNostrService extends EventEmitter implements Signer {
-    private rxNostr;
+    private ndk;
+    private profileNdk;
     private signer;
     private localSigner;
     private params;
@@ -42,18 +43,6 @@ declare class AuthNostrService extends EventEmitter implements Signer {
     localSignup(name: string, sk?: string): Promise<void>;
     setLocal(info: Info, signup?: boolean): Promise<void>;
     prepareImportUrl(url: string): string;
-    getRelayStatus(): Record<string, string>;
-    getRelayStats(): {
-        total: number;
-        connected: number;
-        connecting: number;
-        disconnected: number;
-        error: number;
-    };
-    connectToRelay(relayUrl: string): Promise<void>;
-    disconnectFromRelay(relayUrl: string): Promise<void>;
-    reconnectAllRelays(): Promise<void>;
-    checkRelayHealth(): Promise<boolean>;
     importAndConnect(cs: ConnectionString): Promise<void>;
     setReadOnly(pubkey: string): void;
     setExtension(pubkey: string): void;
@@ -66,7 +55,7 @@ declare class AuthNostrService extends EventEmitter implements Signer {
     private releaseSigner;
     logout(keepSigner?: boolean): Promise<void>;
     private setUserInfo;
-    exportKeys(): string;
+    exportKeys(): "" | `nsec1${string}`;
     private onAuth;
     private createIframe;
     sendNeedAuth(): Promise<void>;
@@ -92,6 +81,7 @@ declare class AuthNostrService extends EventEmitter implements Signer {
     }): Promise<void>;
     signEvent(event: any): Promise<any>;
     private ensureSigner;
+    private codec_call;
     encrypt04(pubkey: string, plaintext: string): Promise<string>;
     decrypt04(pubkey: string, ciphertext: string): Promise<string>;
     encrypt44(pubkey: string, plaintext: string): Promise<string>;

package/dist/modules/Nip46.d.ts

@@ -1,39 +1,19 @@
-import { RxNostr } from 'rx-nostr';
-import { EventEmitter } from 'tseep';
+import NDK, { NDKEvent, NDKFilter, NDKNip46Signer, NDKNostrRpc, NDKRpcRequest, NDKRpcResponse, NDKSubscription } from '@nostr-dev-kit/ndk';
 import { PrivateKeySigner } from './Signer';
-type NostrFilter = {
-    ids?: string[];
-    kinds?: number[];
-    authors?: string[];
-    since?: number;
-    until?: number;
-    limit?: number;
-    search?: string;
-    [key: `#${string}`]: string[] | undefined;
-};
-type NostrEvent = {
-    id?: string;
-    kind: number;
-    pubkey: string;
-    content: string;
-    tags: string[][];
-    created_at: number;
-    sig?: string;
-};
-type NostrSubscription = {
-    on: (event: string, cb: any) => void;
-    stop: () => void;
-};
-type NDKRpcResponse = {
-    id: string;
-    pubkey: string;
-    content: string;
-    result?: string;
-    error?: string;
-    [key: string]: any;
-};
-declare class NostrRpc extends EventEmitter {
-    rxNostr: RxNostr;
+/**
+ * NDKのリレー接続を待機する
+ */
+export declare function waitForConnection(ndk: NDK, timeout: number): Promise<void>;
+/**
+ * NDKの接続を強制的に確立する
+ */
+export declare function ensureNDKConnection(ndk: NDK, timeout: number): Promise<void>;
+/**
+ * NIP-46専用リレーも含めて接続を確立する
+ */
+export declare function ensureNIP46Connection(ndk: NDK, timeout: number): Promise<void>;
+declare class NostrRpc extends NDKNostrRpc {
+    protected _ndk: NDK;
     protected _signer: PrivateKeySigner;
     protected requests: Set<string>;
     private sub?;
@@ -41,12 +21,12 @@ declare class NostrRpc extends EventEmitter {
     private reconnectAttempts;
     private maxReconnectAttempts;
     private reconnectDelay;
-    constructor(rxNostr: RxNostr, signer: PrivateKeySigner);
-    subscribe(filter: NostrFilter): Promise<NostrSubscription>;
+    constructor(ndk: NDK, signer: PrivateKeySigner);
+    subscribe(filter: NDKFilter): Promise<NDKSubscription>;
     stop(): void;
     setUseNip44(useNip44: boolean): void;
     private isNip04;
-    parseEvent(event: NostrEvent): Promise<any>;
+    parseEvent(event: NDKEvent): Promise<NDKRpcRequest | NDKRpcResponse>;
     parseNostrConnectReply(reply: any, secret: string): Promise<string>;
     listen(nostrConnectSecret: string): Promise<string>;
     connect(pubkey: string, token?: string, perms?: string): Promise<void>;
@@ -58,7 +38,7 @@ declare class NostrRpc extends EventEmitter {
     protected getId(): string;
     sendRequest(remotePubkey: string, method: string, params?: string[], kind?: number, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse>;
     protected setResponseHandler(id: string, cb?: (res: NDKRpcResponse) => void): Promise<NDKRpcResponse>;
-    protected createRequestEvent(id: string, remotePubkey: string, method: string, params?: string[], kind?: number): Promise<NostrEvent>;
+    protected createRequestEvent(id: string, remotePubkey: string, method: string, params?: string[], kind?: number): Promise<NDKEvent>;
 }
 export declare class IframeNostrRpc extends NostrRpc {
     private peerOrigin?;
@@ -67,8 +47,8 @@ export declare class IframeNostrRpc extends NostrRpc {
     private heartbeatInterval?;
     private lastResponseTime;
     private heartbeatTimeoutMs;
-    constructor(rxNostr: RxNostr, localSigner: PrivateKeySigner, iframePeerOrigin?: string);
-    subscribe(filter: NostrFilter): Promise<NostrSubscription>;
+    constructor(ndk: NDK, localSigner: PrivateKeySigner, iframePeerOrigin?: string);
+    subscribe(filter: NDKFilter): Promise<NDKSubscription>;
     private startHeartbeat;
     private stopHeartbeat;
     setWorkerIframePort(port: MessagePort): void;
@@ -81,12 +61,10 @@ export declare class ReadyListener {
     constructor(messages: string[], origin: string);
     wait(): Promise<any>;
 }
-export declare class Nip46Signer extends EventEmitter {
-    remotePubkey: string;
-    rpc: NostrRpc;
+export declare class Nip46Signer extends NDKNip46Signer {
     private _userPubkey;
     private _rpc;
-    constructor(rxNostr: RxNostr, localSigner: PrivateKeySigner, signerPubkey: string, iframeOrigin?: string);
+    constructor(ndk: NDK, localSigner: PrivateKeySigner, signerPubkey: string, iframeOrigin?: string);
     get userPubkey(): string;
     private setSignerPubkey;
     initUserPubkey(hintPubkey?: string): Promise<void>;
@@ -99,12 +77,5 @@ export declare class Nip46Signer extends EventEmitter {
         domain: string;
         perms?: string;
     }): Promise<string>;
-    encrypt(recipient: any, value: string): Promise<string>;
-    decrypt(sender: any, value: string): Promise<string>;
-    encryptNip44(recipient: any, value: string): Promise<string>;
-    decryptNip44(sender: any, value: string): Promise<string>;
-    sign(event: any): Promise<string>;
-    user(): Promise<any>;
-    private rpcSend;
 }
 export {};

package/dist/modules/Signer.d.ts

@@ -1,15 +1,9 @@
-export declare class PrivateKeySigner {
-    privateKey: Uint8Array;
+import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
+export declare class PrivateKeySigner extends NDKPrivateKeySigner {
     private nip44;
-    private __pubkey;
-    constructor(privateKey: Uint8Array);
+    private _pubkey;
+    constructor(privateKey: string);
     get pubkey(): string;
-    user(): Promise<{
-        pubkey: string;
-    }>;
-    sign(event: any): Promise<string>;
-    encrypt(recipientPubkey: string, value: string): Promise<string>;
-    decrypt(senderPubkey: string, value: string): Promise<string>;
-    encryptNip44(recipientPubkey: string, value: string): Promise<string>;
-    decryptNip44(senderPubkey: string, value: string): Promise<string>;
+    encryptNip44(recipient: NDKUser, value: string): Promise<string>;
+    decryptNip44(sender: NDKUser, value: string): Promise<string>;
 }