@pomade/core 0.0.8 → 0.0.11

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,iBAAiB,CAAA;AAmB/D,OAAO,KAAK,EAAC,YAAY,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAC7D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAC,MAAM,EAAe,IAAI,EAA4B,MAAM,aAAa,CAAA;AAChF,OAAO,EAAC,GAAG,EAAE,SAAS,EAAC,MAAM,UAAU,CAAA;AACvC,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,cAAc,CAAA;AAElD,OAAO,EACL,gBAAgB,EAChB,WAAW,EAYX,WAAW,EACX,UAAU,EAWV,aAAa,EACb,cAAc,EACd,aAAa,EACb,eAAe,EACf,aAAa,EACb,WAAW,EAEX,WAAW,EACZ,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,eAAe,EAMhB,MAAM,gBAAgB,CAAA;AAoCvB,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,YAAY,CAAA;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,YAAY,CAAA;IACnB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,YAAY,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAID,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,QAAQ,CAAA;IACjB,aAAa,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC5D,CAAA;AAED,qBAAa,MAAM;IAWL,OAAO,CAAC,OAAO;IAV3B,GAAG,EAAE,GAAG,CAAA;IACR,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,CAAA;IAChC,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,CAAA;IACpC,UAAU,EAAE,WAAW,CAAC,cAAc,CAAC,CAAA;IACvC,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IACxC,mBAAmB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAA;IACpD,oBAAoB,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;IAClD,iBAAiB,EAAE,WAAW,CAAC,eAAe,CAAC,CAAA;gBAE3B,OAAO,EAAE,aAAa;IA8D1C,IAAI;IAOE,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB1D,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA8C/D,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM;IAanD,cAAc,CAAC,KAAK,EAAE,YAAY;;;;;;IAsClC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa;IAgBlD,cAAc,CAAC,MAAM,EAAE,MAAM;IAwB7B,qBAAqB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,eAAe,CAAC;IAoDlE,mBAAmB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,aAAa,CAAC;IA2F9D,sBAAsB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC;IAsCpE,mBAAmB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,aAAa,CAAC;IAoC9D,oBAAoB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,cAAc,CAAC;;;;;;IA2DhE,gBAAgB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,UAAU,CAAC;IAoCxD,iBAAiB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,WAAW,CAAC;;;;;;IAsE1D,iBAAiB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,WAAW,CAAC;IA4D1D,iBAAiB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,WAAW,CAAC;IA6D1D,iBAAiB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,WAAW,CAAC;;;;;;IAiC1D,mBAAmB,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,aAAa,CAAC;CAyCrE"}

package/dist/signer.js

@@ -1,12 +1,27 @@
 import { Lib } from "@frostr/bifrost";
-import { randomBytes, bytesToHex } from "@noble/hashes/utils.js";
-import { now, filter, remove, removeUndefined, append, ms, uniq, between, call, int, ago, MINUTE, HOUR, YEAR, } from "@welshman/lib";
-import { getPubkey, verifyEvent, getTagValue, HTTP_AUTH } from "@welshman/util";
+import { randomBytes } from "@noble/hashes/utils.js";
+import { not, now, filter, remove, removeUndefined, append, ms, uniq, between, call, int, ago, MINUTE, HOUR, YEAR, } from "@welshman/lib";
+import { verifyEvent, getTagValue, HTTP_AUTH } from "@welshman/util";
 import { Method, isPasswordAuth, isOTPAuth } from "./schema.js";
 import { RPC } from "./rpc.js";
-import { hashEmail, encodeChallenge, debug } from "./util.js";
+import { hashEmail, debug } from "./util.js";
 import { isChallengeRequest, isEcdhRequest, isLoginSelect, isLoginStart, isRecoverySetup, isRecoverySelect, isRecoveryStart, isRegisterRequest, isSessionDelete, isSessionList, isSignRequest, makeEcdhResult, makeLoginOptions, makeLoginResult, makeRecoverySetupResult, makeRecoveryOptions, makeRecoveryResult, makeRegisterResult, makeSessionDeleteResult, makeSessionListResult, makeSignResult, } from "./message.js";
+import { isRateLimited, recordAttempt, getRateLimitResetTime, cleanupRateLimits, } from "./ratelimit.js";
+// Rate limiting for client requests (sign + ecdh combined)
+const CLIENT_RATE_LIMITS = {
+    maxAttempts: 100,
+    windowSeconds: int(1, MINUTE),
+};
+const EMAIL_RATE_LIMITS = {
+    maxAttempts: 5,
+    windowSeconds: int(2, MINUTE),
+};
 // Utils
+function randomInt(min, max) {
+    const bytes = randomBytes(4);
+    const value = new DataView(bytes.buffer).getUint32(0);
+    return min + (value % (max - min));
+}
 function makeSessionItem(session) {
     return {
         pubkey: session.group.group_pk.slice(2),
@@ -22,22 +37,24 @@ function makeSessionItem(session) {
 export class Signer {
     options;
     rpc;
-    pubkey;
     intervals;
     logins;
     sessions;
     recoveries;
     challenges;
     sessionsByEmailHash;
+    rateLimitByEmailHash;
+    rateLimitByClient;
     constructor(options) {
         this.options = options;
-        this.pubkey = getPubkey(options.secret);
         this.logins = options.storage.collection("logins");
         this.sessions = options.storage.collection("sessions");
         this.recoveries = options.storage.collection("recoveries");
         this.challenges = options.storage.collection("challenges");
         this.sessionsByEmailHash = options.storage.collection("sessionsByEmailHash");
-        this.rpc = new RPC(options.secret, options.relays);
+        this.rateLimitByEmailHash = options.storage.collection("rateLimitByEmailHash");
+        this.rateLimitByClient = options.storage.collection("rateLimitByClient");
+        this.rpc = new RPC(options.signer, options.relays);
         this.rpc.subscribe(message => {
             // Ignore events with weird timestamps
             if (!between([now() - int(1, HOUR), now() + int(1, HOUR)], message.event.created_at)) {
@@ -66,10 +83,10 @@ export class Signer {
             if (isSessionDelete(message))
                 this.handleSessionDelete(message);
         });
-        // Periodically clean up recovery requests
+        // Periodically clean up recovery requests and rate limits
         this.intervals = [
             setInterval(async () => {
-                debug("[signer]: cleaning up logins and recoveries");
+                debug("[signer]: cleaning up logins, recoveries, and rate limits");
                 for (const [client, recovery] of await this.recoveries.entries()) {
                     if (recovery.event.created_at < ago(15, MINUTE))
                         await this.recoveries.delete(client);
@@ -82,6 +99,8 @@ export class Signer {
                     if (challenge.event.created_at < ago(15, MINUTE))
                         await this.challenges.delete(client);
                 }
+                await cleanupRateLimits(this.rateLimitByEmailHash, EMAIL_RATE_LIMITS.windowSeconds);
+                await cleanupRateLimits(this.rateLimitByClient, CLIENT_RATE_LIMITS.windowSeconds);
             }, ms(int(5, MINUTE))),
         ];
         // Immediately clean up old sessions
@@ -97,35 +116,60 @@ export class Signer {
         this.intervals.forEach(clearInterval);
     }
     // Internal utils
+    async _checkAndRecordRateLimit(client) {
+        const bucket = await this.rateLimitByClient.get(client);
+        if (isRateLimited(bucket, CLIENT_RATE_LIMITS)) {
+            const resetTime = getRateLimitResetTime(bucket, CLIENT_RATE_LIMITS);
+            debug(`[signer]: rate limit exceeded for client ${client.slice(0, 8)}, reset in ${resetTime}s`);
+            return false;
+        }
+        // Record the attempt
+        const updatedBucket = recordAttempt(bucket, CLIENT_RATE_LIMITS);
+        await this.rateLimitByClient.set(client, updatedBucket);
+        return true;
+    }
     async _getAuthenticatedSessions(auth) {
+        // Check rate limit for auth attempts
+        const bucket = await this.rateLimitByEmailHash.get(auth.email_hash);
+        if (isRateLimited(bucket, EMAIL_RATE_LIMITS)) {
+            const resetTime = getRateLimitResetTime(bucket, EMAIL_RATE_LIMITS);
+            debug(`[signer]: rate limit exceeded for email_hash ${auth.email_hash.slice(0, 8)}, reset in ${resetTime}s`);
+            return [];
+        }
         const index = await this.sessionsByEmailHash.get(auth.email_hash);
+        let sessions = [];
         if (index) {
             if (isPasswordAuth(auth)) {
-                return filter(session => session?.password_hash === auth.password_hash, await Promise.all(index.clients.map(client => this.sessions.get(client))));
+                sessions = filter(session => session?.password_hash === auth.password_hash, await Promise.all(index.clients.map(client => this.sessions.get(client))));
             }
             if (isOTPAuth(auth)) {
                 const challenge = await this.challenges.get(auth.email_hash);
                 if (challenge) {
                     await this.challenges.delete(auth.email_hash);
                     if (auth.otp === challenge.otp) {
-                        return removeUndefined(await Promise.all(index.clients.map(client => this.sessions.get(client))));
+                        sessions = removeUndefined(await Promise.all(index.clients.map(client => this.sessions.get(client))));
                     }
                 }
             }
         }
-        return [];
+        // Record failed authentication attempt for rate limiting
+        if (sessions.length === 0) {
+            await this.rateLimitByEmailHash.set(auth.email_hash, recordAttempt(bucket, EMAIL_RATE_LIMITS));
+        }
+        return sessions;
     }
-    _isNip98AuthValid(auth, method) {
+    async _isNip98AuthValid(auth, method) {
+        const pubkey = await this.options.signer.getPubkey();
         return (verifyEvent(auth) &&
             auth.kind === HTTP_AUTH &&
             auth.created_at > ago(15) &&
             auth.created_at < now() + 5 &&
-            getTagValue("u", auth.tags) === this.pubkey &&
+            getTagValue("u", auth.tags) === pubkey &&
             getTagValue("method", auth.tags) === method);
     }
     async _checkKeyReuse(event) {
         if (await this.sessions.get(event.pubkey)) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: session key re-used`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: session key re-used`);
             return this.rpc.channel(event.pubkey, false).send(makeRecoveryOptions({
                 ok: false,
                 message: "Do not re-use session keys.",
@@ -133,7 +177,7 @@ export class Signer {
             }));
         }
         if (await this.recoveries.get(event.pubkey)) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: recovery key re-used`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: recovery key re-used`);
             return this.rpc.channel(event.pubkey, false).send(makeRecoveryOptions({
                 ok: false,
                 message: "Do not re-use recovery keys.",
@@ -141,7 +185,7 @@ export class Signer {
             }));
         }
         if (await this.logins.get(event.pubkey)) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: login key re-used`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: login key re-used`);
             return this.rpc.channel(event.pubkey, false).send(makeRecoveryOptions({
                 ok: false,
                 message: "Do not re-use login keys.",
@@ -189,23 +233,23 @@ export class Signer {
             if (await this._checkKeyReuse(event))
                 return;
             if (!between([0, group.commits.length], group.threshold)) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: invalid group threshold`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: invalid group threshold`);
                 return cb(false, "Invalid group threshold.");
             }
             if (!Lib.is_group_member(group, share)) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: share does not belong to the provided group`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: share does not belong to the provided group`);
                 return cb(false, "Share does not belong to the provided group.");
             }
             if (uniq(group.commits.map(c => c.idx)).length !== group.commits.length) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: group contains duplicate member indices`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: group contains duplicate member indices`);
                 return cb(false, "Group contains duplicate member indices.");
             }
             if (!group.commits.find(c => c.idx === share.idx)) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: share index not found in group commits`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: share index not found in group commits`);
                 return cb(false, "Share index not found in group commits.");
             }
             if (await this.sessions.get(event.pubkey)) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: client is already registered`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: client is already registered`);
                 return cb(false, "Client is already registered.");
             }
             await this._addSession(event.pubkey, {
@@ -216,7 +260,7 @@ export class Signer {
                 recovery,
                 last_activity: now(),
             });
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: registered`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: registered`);
             return cb(true, "Your key has been registered");
         });
     }
@@ -225,7 +269,7 @@ export class Signer {
         return this.options.storage.tx(async () => {
             const session = await this.sessions.get(event.pubkey);
             if (!session) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: no session found for recovery setup`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: no session found for recovery setup`);
                 return this.rpc.channel(event.pubkey, false).send(makeRecoverySetupResult({
                     ok: false,
                     message: "No session found.",
@@ -233,7 +277,7 @@ export class Signer {
                 }));
             }
             if (!session.recovery) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: recovery is disabled for session`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: recovery is disabled for session`);
                 return this.rpc.channel(event.pubkey, false).send(makeRecoverySetupResult({
                     ok: false,
                     message: "Recovery is disabled on this session.",
@@ -243,15 +287,15 @@ export class Signer {
             // recovery method has to be bound at (or shorly after) session, otherwise an attacker with access
             // to any session could escalate permissions by setting up their own recovery method
             if (session.event.created_at < ago(15, MINUTE)) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: recovery method set too late`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: recovery method set too late`);
                 return this.rpc.channel(event.pubkey, false).send(makeRecoverySetupResult({
                     ok: false,
-                    message: "Recovery method must be set within 5 minutes of session.",
+                    message: "Recovery method must be set within 15 minutes of session.",
                     prev: event.id,
                 }));
             }
             if (session.email) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: recovery is already set`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: recovery is already set`);
                 return this.rpc.channel(event.pubkey, false).send(makeRecoverySetupResult({
                     ok: false,
                     message: "Recovery has already been initialized.",
@@ -259,7 +303,7 @@ export class Signer {
                 }));
             }
             if (!payload.password_hash.match(/^[a-f0-9]{64}$/)) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: invalid password_hash provided on setup`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: invalid password_hash provided on setup`);
                 return this.rpc.channel(event.pubkey, false).send(makeRecoverySetupResult({
                     ok: false,
                     message: "Recovery method password hash must be an argon2id hash of user email and password.",
@@ -267,7 +311,8 @@ export class Signer {
                 }));
             }
             const { email, password_hash } = payload;
-            const email_hash = await hashEmail(email, this.pubkey);
+            const pubkey = await this.options.signer.getPubkey();
+            const email_hash = await hashEmail(email, pubkey);
             await this._addSession(event.pubkey, {
                 ...session,
                 last_activity: now(),
@@ -275,7 +320,7 @@ export class Signer {
                 email_hash,
                 password_hash,
             });
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: recovery method initialized`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: recovery method initialized`);
             this.rpc.channel(event.pubkey, false).send(makeRecoverySetupResult({
                 ok: true,
                 message: "Recovery method successfully initialized.",
@@ -284,45 +329,58 @@ export class Signer {
         });
     }
     async handleChallengeRequest({ payload, event }) {
+        // Check rate limit for challenge requests per email_hash
+        const bucket = await this.rateLimitByEmailHash.get(payload.email_hash);
+        if (isRateLimited(bucket, EMAIL_RATE_LIMITS)) {
+            const resetTime = getRateLimitResetTime(bucket, EMAIL_RATE_LIMITS);
+            debug(`[signer]: challenge rate limit exceeded for email_hash ${payload.email_hash.slice(0, 8)}, reset in ${resetTime}s`);
+            return;
+        }
         const index = await this.sessionsByEmailHash.get(payload.email_hash);
         if (index && index.clients.length > 0) {
             const session = await this.sessions.get(index.clients[0]);
             if (session?.email) {
-                const otp = bytesToHex(randomBytes(12));
-                const challenge = encodeChallenge(this.pubkey, otp);
+                await this.rateLimitByEmailHash.set(payload.email_hash, recordAttempt(bucket, EMAIL_RATE_LIMITS));
+                const otp = payload.prefix + randomInt(100000, 1000000).toString();
                 await this.challenges.set(payload.email_hash, { otp, event });
-                this.options.sendChallenge({ email: session.email, challenge });
+                this.options.sendChallenge({ email: session.email, otp });
+                debug(`[client ${event.pubkey.slice(0, 8)}]: challenge sent for ${payload.email_hash}`);
             }
         }
+        else {
+            debug(`[client ${event.pubkey.slice(0, 8)}]: no session found for ${payload.email_hash}`);
+        }
     }
     // Recovery
     async handleRecoveryStart({ payload, event }) {
-        if (await this._checkKeyReuse(event))
-            return;
-        const sessions = await this._getAuthenticatedSessions(payload.auth);
-        if (sessions.length === 0) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: no sessions found for recovery`);
-            return this.rpc.channel(event.pubkey, false).send(makeRecoveryOptions({
-                ok: false,
-                message: "No sessions found.",
+        return this.options.storage.tx(async () => {
+            if (await this._checkKeyReuse(event))
+                return;
+            const sessions = await this._getAuthenticatedSessions(payload.auth);
+            if (sessions.length === 0) {
+                debug(`[client ${event.pubkey.slice(0, 8)}]: no sessions found for recovery`);
+                return this.rpc.channel(event.pubkey, false).send(makeRecoveryOptions({
+                    ok: false,
+                    message: "No sessions found.",
+                    prev: event.id,
+                }));
+            }
+            debug(`[client ${event.pubkey.slice(0, 8)}]: sending recovery options`);
+            const clients = sessions.map(s => s.client);
+            const items = sessions.map(makeSessionItem);
+            await this.recoveries.set(event.pubkey, { event, clients });
+            this.rpc.channel(event.pubkey, false).send(makeRecoveryOptions({
+                items,
+                ok: true,
+                message: "Successfully retrieved recovery options.",
                 prev: event.id,
             }));
-        }
-        debug(`[signer ${event.pubkey.slice(0, 8)}]: sending recovery options`);
-        const clients = sessions.map(s => s.client);
-        const items = sessions.map(makeSessionItem);
-        await this.recoveries.set(event.pubkey, { event, clients });
-        this.rpc.channel(event.pubkey, false).send(makeRecoveryOptions({
-            items,
-            ok: true,
-            message: "Successfully retrieved recovery options.",
-            prev: event.id,
-        }));
+        });
     }
     async handleRecoverySelect({ payload, event }) {
         const recovery = await this.recoveries.get(event.pubkey);
         if (!recovery) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: no active recovery found`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: no active recovery found`);
             return this.rpc.channel(event.pubkey, false).send(makeRecoveryResult({
                 ok: false,
                 message: `No active recovery found.`,
@@ -332,7 +390,7 @@ export class Signer {
         // Cleanup right away
         await this.recoveries.delete(event.pubkey);
         if (!recovery.clients.includes(payload.client)) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: invalid session selected for recovery`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: invalid session selected for recovery`);
             return this.rpc.channel(event.pubkey, false).send(makeRecoveryResult({
                 ok: false,
                 message: `Invalid session selected for recovery.`,
@@ -341,7 +399,7 @@ export class Signer {
         }
         const session = await this.sessions.get(payload.client);
         if (!session) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: recovery session not found`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: recovery session not found`);
             return this.rpc.channel(event.pubkey, false).send(makeRecoveryResult({
                 ok: false,
                 message: `Recovery session not found.`,
@@ -355,36 +413,38 @@ export class Signer {
             share: session.share,
             prev: event.id,
         }));
-        debug(`[signer ${event.pubkey.slice(0, 8)}]: recovery successfully completed`);
+        debug(`[client ${event.pubkey.slice(0, 8)}]: recovery successfully completed`);
     }
     // Login
     async handleLoginStart({ payload, event }) {
-        if (await this._checkKeyReuse(event))
-            return;
-        const sessions = await this._getAuthenticatedSessions(payload.auth);
-        if (sessions.length === 0) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: no sessions found for login`);
-            return this.rpc.channel(event.pubkey, false).send(makeLoginOptions({
-                ok: false,
-                message: "No sessions found.",
+        return this.options.storage.tx(async () => {
+            if (await this._checkKeyReuse(event))
+                return;
+            const sessions = await this._getAuthenticatedSessions(payload.auth);
+            if (sessions.length === 0) {
+                debug(`[client ${event.pubkey.slice(0, 8)}]: no sessions found for login`);
+                return this.rpc.channel(event.pubkey, false).send(makeLoginOptions({
+                    ok: false,
+                    message: "No sessions found.",
+                    prev: event.id,
+                }));
+            }
+            debug(`[client ${event.pubkey.slice(0, 8)}]: sending login options`);
+            const clients = sessions.map(s => s.client);
+            const items = sessions.map(makeSessionItem);
+            await this.logins.set(event.pubkey, { event, clients });
+            this.rpc.channel(event.pubkey, false).send(makeLoginOptions({
+                items,
+                ok: true,
+                message: "Successfully retrieved login options.",
                 prev: event.id,
             }));
-        }
-        debug(`[signer ${event.pubkey.slice(0, 8)}]: sending login options`);
-        const clients = sessions.map(s => s.client);
-        const items = sessions.map(makeSessionItem);
-        await this.logins.set(event.pubkey, { event, clients });
-        this.rpc.channel(event.pubkey, false).send(makeLoginOptions({
-            items,
-            ok: true,
-            message: "Successfully retrieved login options.",
-            prev: event.id,
-        }));
+        });
     }
     async handleLoginSelect({ payload, event }) {
         const login = await this.logins.get(event.pubkey);
         if (!login) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: no active login found`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: no active login found`);
             return this.rpc.channel(event.pubkey, false).send(makeLoginResult({
                 ok: false,
                 message: `No active login found.`,
@@ -394,7 +454,7 @@ export class Signer {
         // Cleanup right away
         await this.logins.delete(event.pubkey);
         if (!login.clients.includes(payload.client)) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: invalid session selected for login`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: invalid session selected for login`);
             return this.rpc.channel(event.pubkey, false).send(makeLoginResult({
                 ok: false,
                 message: `Invalid session selected for login.`,
@@ -403,7 +463,7 @@ export class Signer {
         }
         const session = await this.sessions.get(payload.client);
         if (!session) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: login session not found`);
+            debug(`[client ${event.pubkey.slice(0, 8)}]: login session not found`);
             return this.rpc.channel(event.pubkey, false).send(makeLoginResult({
                 ok: false,
                 message: `Login session not found.`,
@@ -427,25 +487,34 @@ export class Signer {
             group: session.group,
             prev: event.id,
         }));
-        debug(`[signer ${event.pubkey.slice(0, 8)}]: login successfully completed`);
+        debug(`[client ${event.pubkey.slice(0, 8)}]: login successfully completed`);
     }
     // Signing
     async handleSignRequest({ payload, event }) {
         return this.options.storage.tx(async () => {
             const session = await this.sessions.get(event.pubkey);
             if (!session) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: signing failed - no session found`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: signing failed - no session found`);
                 return this.rpc.channel(event.pubkey, false).send(makeSignResult({
                     ok: false,
                     message: "No session found for client",
                     prev: event.id,
                 }));
             }
+            // Check rate limit
+            const allowed = await this._checkAndRecordRateLimit(event.pubkey);
+            if (!allowed) {
+                return this.rpc.channel(event.pubkey, false).send(makeSignResult({
+                    ok: false,
+                    message: "Rate limit exceeded. Please try again later.",
+                    prev: event.id,
+                }));
+            }
             try {
                 const ctx = Lib.get_session_ctx(session.group, payload.request);
                 const partialSignature = Lib.create_psig_pkg(ctx, session.share);
                 await this.sessions.set(event.pubkey, { ...session, last_activity: now() });
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: signing complete`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: signing complete`);
                 this.rpc.channel(event.pubkey, false).send(makeSignResult({
                     result: partialSignature,
                     ok: true,
@@ -454,7 +523,7 @@ export class Signer {
                 }));
             }
             catch (e) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: signing failed - ${e.message || e}`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: signing failed - ${e.message || e}`);
                 return this.rpc.channel(event.pubkey, false).send(makeSignResult({
                     ok: false,
                     message: "Failed to sign event",
@@ -468,18 +537,27 @@ export class Signer {
         return this.options.storage.tx(async () => {
             const session = await this.sessions.get(event.pubkey);
             if (!session) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: ecdh failed - no session found`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: ecdh failed - no session found`);
                 return this.rpc.channel(event.pubkey, false).send(makeSignResult({
                     ok: false,
                     message: "No session found for client",
                     prev: event.id,
                 }));
             }
+            // Check rate limit
+            const allowed = await this._checkAndRecordRateLimit(event.pubkey);
+            if (!allowed) {
+                return this.rpc.channel(event.pubkey, false).send(makeEcdhResult({
+                    ok: false,
+                    message: "Rate limit exceeded. Please try again later.",
+                    prev: event.id,
+                }));
+            }
             const { members, ecdh_pk } = payload;
             try {
                 const ecdhPackage = Lib.create_ecdh_pkg(members, ecdh_pk, session.share);
                 await this.sessions.set(event.pubkey, { ...session, last_activity: now() });
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: ecdh complete`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: ecdh complete`);
                 this.rpc.channel(event.pubkey, false).send(makeEcdhResult({
                     result: ecdhPackage,
                     ok: true,
@@ -488,7 +566,7 @@ export class Signer {
                 }));
             }
             catch (e) {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: ecdh failed - ${e.message || e}`);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: ecdh failed - ${e.message || e}`);
                 return this.rpc.channel(event.pubkey, false).send(makeSignResult({
                     ok: false,
                     message: "Key derivation failed",
@@ -499,8 +577,8 @@ export class Signer {
     }
     // Session management
     async handleSessionList({ payload, event }) {
-        if (!this._isNip98AuthValid(payload.auth, Method.SessionList)) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: invalid auth event for session list`);
+        if (not(await this._isNip98AuthValid(payload.auth, Method.SessionList))) {
+            debug(`[client ${event.pubkey.slice(0, 8)}]: invalid auth event for session list`);
             return this.rpc.channel(event.pubkey, false).send(makeSessionListResult({
                 items: [],
                 ok: false,
@@ -514,7 +592,7 @@ export class Signer {
                 items.push(makeSessionItem(session));
             }
         }
-        debug(`[signer ${event.pubkey.slice(0, 8)}]: successfully retrieved session list`);
+        debug(`[client ${event.pubkey.slice(0, 8)}]: successfully retrieved session list`);
         this.rpc.channel(event.pubkey, false).send(makeSessionListResult({
             items,
             ok: true,
@@ -523,8 +601,8 @@ export class Signer {
         }));
     }
     async handleSessionDelete({ payload, event }) {
-        if (!this._isNip98AuthValid(payload.auth, Method.SessionDelete)) {
-            debug(`[signer ${event.pubkey.slice(0, 8)}]: invalid auth event for session deletion`);
+        if (not(await this._isNip98AuthValid(payload.auth, Method.SessionDelete))) {
+            debug(`[client ${event.pubkey.slice(0, 8)}]: invalid auth event for session deletion`);
             return this.rpc.channel(event.pubkey, false).send(makeSessionDeleteResult({
                 ok: false,
                 message: "Failed to delete selected session.",
@@ -535,7 +613,7 @@ export class Signer {
             const session = await this.sessions.get(payload.client);
             if (session?.group.group_pk.slice(2) === payload.auth.pubkey) {
                 await this._deleteSession(payload.client);
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: deleted session`, payload.client);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: deleted session`, payload.client);
                 this.rpc.channel(event.pubkey, false).send(makeSessionDeleteResult({
                     ok: true,
                     message: "Successfully deleted selected session.",
@@ -543,7 +621,7 @@ export class Signer {
                 }));
             }
             else {
-                debug(`[signer ${event.pubkey.slice(0, 8)}]: failed to delete session`, payload.client);
+                debug(`[client ${event.pubkey.slice(0, 8)}]: failed to delete session`, payload.client);
                 return this.rpc.channel(event.pubkey, false).send(makeSessionDeleteResult({
                     ok: false,
                     message: "Failed to logout selected client.",