locktime field, uuid for token

3 files changed, 51 insertions, 25 deletions

diff --git a/lib/nostr.js b/lib/nostr.js
index 99265f7d..4730883f 100644
--- a/lib/nostr.js
+++ b/lib/nostr.js
@@ -5,22 +5,16 @@ import { broadcast } from "$lib/sockets";
 import store from "$lib/store";
 import redis from "$lib/redis";
 import proxy from "@fastify/http-proxy";
+import { wait } from "$lib/utils";
 
 app.register(proxy, {
   upstream: config.nostr,
   prefix: "/nostr",
   rewritePrefix: "",
-  disableRequestLogging: true,
+  disableRequestLogging: true
 });
 
-const relays = [
-  config.relay,
-  "wss://relay.damus.io",
-  "wss://nostr-pub.wellorder.net",
-  "wss://nostr.rocks",
-];
-
-export const pool = RelayPool(relays);
+export const pool = RelayPool(config.relays);
 
 pool.on("open", relay => {
   if (relay.url.includes(config.relay)) coinos = relay;
@@ -31,38 +25,63 @@ export let coinos;
 let now = () => Math.round(Date.now() / 1000);
 
 let timeouts = {};
-export let q = async (sub, query, timeout = 8000) =>
+export let q = async (sub, query, timeout = 20000) =>
   new Promise(async (r, j) => {
+    let start = Date.now();
+    let seen = [];
     let rejected;
-    if (!coinos) return j(new Error("relay not initialized"));
     query.since = await redis.get(`since:${sub}`);
     if (now() - query.since < 3600) return r();
 
+    let done = { [sub]: [] };
 
-    coinos.on("eose", s => {
-      return !rejected && s === sub && r(timeouts[sub].clear());
-    });
+    let check = s => {
+      let elapsed = Date.now() - start;
+      if (rejected) return true;
+      if (done[s].length === pool.relays.length || elapsed > 200) {
+        r();
+        if (timeouts[s]) timeouts[s].clear();
+        return true;
+      }
+    };
 
     timeouts[sub] = {
       async clear() {
         clearTimeout(this.timer);
         delete timeouts[sub];
-        coinos.unsubscribe(sub);
+        pool.unsubscribe(sub);
         await redis.set(`since:${sub}`, now());
       },
-      extend(t = timeout) {
+      extend(ev) {
+        if (ev) {
+          if (seen.includes(ev.id)) return;
+          seen.push(ev.id);
+          seen.length > 1000 && seen.shift();
+        }
+
         clearTimeout(this.timer);
         this.timer = setTimeout(() => {
           j(new Error(`query timed out: ${sub} ${Date.now()}`));
-          coinos.unsubscribe(sub);
+          pool.unsubscribe(sub);
           rejected = true;
-        }, t);
+        }, timeout);
       },
       timer: undefined
     };
 
-    timeouts[sub].extend(timeout);
-    coinos.subscribe(sub, query);
+    timeouts[sub].extend();
+    pool.subscribe(sub, query);
+
+    pool.on("eose", (relay, s) => {
+      if (done[s]) done[s].push(relay.url);
+      check(s);
+    });
+
+    try {
+      await wait(() => check(sub));
+    } catch (e) {
+      console.log(e);
+    }
   });
 
 let seen = [];
@@ -75,7 +94,7 @@ let getUser = async pubkey =>
   };
 
 pool.on("event", async (relay, sub, ev) => {
-  if (timeouts[sub]) timeouts[sub].extend();
+  if (timeouts[sub]) timeouts[sub].extend(ev);
   try {
     let content;
     try {
diff --git a/lib/passport.js b/lib/passport.js
index ac2949a5..1244aab5 100644
--- a/lib/passport.js
+++ b/lib/passport.js
@@ -35,13 +35,19 @@ fastifyPassport.use(
     },
     async (payload, next) => {
       try {
-        let { username } = payload;
+        let { username, uuid } = payload;
+        let where = {};
+
+        if (username)
+          where.username = { [Op.or]: [username, username.replace(/ /g, "")] };
+
+        if (uuid) where.uuid = uuid;
+
         let user = await db.User.findOne({
-          where: {
-            username: { [Op.or]: [username, username.replace(/ /g, "")] }
-          },
+          where,
           include: { model: db.Account, as: "account" }
         });
+
         if (user.locked) throw new Error("account is locked");
         next(null, user);
       } catch (e) {
diff --git a/lib/whitelist.js b/lib/whitelist.js
index e78bc8e5..4e4dc14e 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -16,6 +16,7 @@ export default [
   "id",
   "index",
   "keys",
+  "locktime",
   "payments",
   "pubkey",
   "profile",