diff --git a/web/js/damus.js b/web/js/damus.js index 5fdf445..736097b 100644 --- a/web/js/damus.js +++ b/web/js/damus.js @@ -2,14 +2,16 @@ let DAMUS const BOOTSTRAP_RELAYS = [ "wss://relay.damus.io", - //"wss://nostr-relay.wlvs.space", - //"wss://nostr-pub.wellorder.net" + "wss://nostr-relay.wlvs.space", + "wss://nostr-pub.wellorder.net", ] // TODO autogenerate these constants with a bash script const IMG_EVENT_LIKED = "icon/event-liked.svg"; const IMG_EVENT_LIKE = "icon/event-like.svg"; +const SID_PROFILES = "profiles"; + async function damus_web_init() { init_message_textareas(); let tries = 0; @@ -29,49 +31,46 @@ async function damus_web_init() { } async function damus_web_init_ready() { - const model = new_model() - DAMUS = model - model.pubkey = await get_pubkey() - if (!model.pubkey) - return - - model.ids = { - comments: "comments", - profiles: "profiles", - explore: "explore", - refevents: "refevents", - account: "account", - home: "home", - contacts: "contacts", - notifications: "notifications", - unknowns: "unknowns", - dms: "dms", + const model = new_model(); + DAMUS = model; + model.pubkey = await get_pubkey(); + if (!model.pubkey) { + // TODO show welcome screen + return; } - const pool = nostrjs.RelayPool(BOOTSTRAP_RELAYS); - pool.on("open", on_pool_open); - pool.on("event", on_pool_event); - pool.on("notice", on_pool_notice); - pool.on("eose", on_pool_eose); - pool.on("ok", on_pool_ok); - model.pool = pool - + // WARNING Order Matters! + view_show_spinner(true); + document.addEventListener('visibilitychange', () => { + update_title(model); + }); + + // Load our contacts first let err; err = await contacts_load(model); if (err) { window.alert("Unable to load contacts."); } + + // Create our pool so that event processing functions can work + const pool = nostrjs.RelayPool(BOOTSTRAP_RELAYS); + model.pool = pool + pool.on("open", on_pool_open); + pool.on("event", on_pool_event); + pool.on("notice", on_pool_notice); + pool.on("eose", on_pool_eose); + pool.on("ok", on_pool_ok); + + // Load all events from storage and re-process them so that apply correct + // effects. await model_load_events(model, (ev)=> { model_process_event(model, ev); }); - log_debug("loaded events", Object.keys(model.all_events).length); + + // Update our view and apply timer methods once all data is ready to go. view_timeline_update(model); view_timeline_apply_mode(model, VM_FRIENDS); - view_show_spinner(true); - document.addEventListener('visibilitychange', () => { - update_title(model); - }); on_timer_timestamps(); on_timer_invalidations(); on_timer_save(); @@ -121,19 +120,19 @@ async function on_pool_eose(relay, sub_id) { log_info(`EOSE(${relay.url}): ${sub_id}`); const model = DAMUS; const { ids, pool } = model; + + if (sub_id.indexOf(SID_PROFILES) == 0) { + model.pool.unsubscribe(sub_id, relay); + request_profiles(model); + return; + } + switch (sub_id) { case ids.home: - const events = model_events_arr(model); - // TODO filter out events to friends of friends - request_profiles(ids, model, events, relay) pool.unsubscribe(ids.home, relay); if (!model.inited) { model.inited = true; } - view_show_spinner(false); - break; - case ids.profiles: - model.pool.unsubscribe(ids.profiles, relay); break; case ids.unknown: pool.unsubscribe(ids.unknowns, relay); @@ -158,46 +157,57 @@ function on_pool_event(relay, sub_id, ev) { return; } model_process_event(model, ev); -} -//function on_eose_profiles(ids, model, relay) { -// const prefix = difficulty_to_prefix(model.pow); -// const fofs = Array.from(model.contacts.friend_of_friends); -// let pow_filter = {kinds: STANDARD_KINDS, limit: 50}; -// if (model.pow > 0) -// pow_filter.ids = [ prefix ]; -// let explore_filters = [ pow_filter ]; -// if (fofs.length > 0) -// explore_filters.push({kinds: STANDARD_KINDS, authors: fofs, limit: 50}); -// model.pool.subscribe(ids.explore, explore_filters, relay); -//} - -function request_profiles(ids, model, events, relay) { - const pubkeys = events.reduce((s, ev) => { - s.add(ev.pubkey); - for (const tag of ev.tags) { - if (tag.length >= 2 && tag[0] === "p") { - if (!model.profile_events[tag[1]]) - s.add(tag[1]); - } - } - return s; - }, new Set()); - // load profiles and noticed chatrooms - const authors = Array.from(pubkeys) - const profile_filter = { - kinds: [KIND_METADATA, KIND_CONTACT], - authors: authors - }; - let filters = []; - if (authors.length > 0) - filters.push(profile_filter); - if (filters.length === 0) { - //log_debug("No profiles filters to request...") - return + // Request the profile if we have never seen it + if (!model.profile_events[ev.pubkey]) { + model.requested_profiles.push({relay, pubkey: ev.pubkey}); + request_profiles(model); } - //console.log("subscribe", profiles_id, filter, relay) - //log_debug("subscribing to profiles on %s", relay.url) - model.pool.subscribe(ids.profiles, filters, relay) +} + +let request_profiles_timer; +function request_profiles() { + if (request_profiles_timer) + clearTimeout(request_profiles_timer); + request_profiles_timer = setTimeout(()=>{ + if (fetch_queued_profiles(DAMUS)) + request_profiles(); + }, 200); +} + +function fetch_queued_profiles(model) { + const delayed = []; + const m = new Map(); + for(let i = 0; model.requested_profiles.length > 0 && i < 300; i++) { + let r = model.requested_profiles.pop(); + let s; + if (!m.has(r.relay)) { + s = new Set(); + m.set(r.relay, s); + } else { + s = m.get(r.relay); + } + if (s.size >= 50) { + delayed.push(r); + continue; + } + s.add(r.pubkey); + } + model.requested_profiles = model.requested_profiles.concat(delayed); + //log_debug(`m size ${m.size}`); + m.forEach((set, relay) => { + let filters = [{ + kinds: [KIND_METADATA, KIND_CONTACT], + authors: Array.from(set), + }]; + let sid = new_sub_id(SID_PROFILES); + model.pool.subscribe(sid, filters, relay); + log_debug(`(${relay.url}) fetching profiles ${sid} size(${set.size})`); + }) + return model.requested_profiles.length > 0; +} + +function new_sub_id(prefix) { + return `${prefix}:${uuidv4()}`; } diff --git a/web/js/model.js b/web/js/model.js index 8437df8..6c9594f 100644 --- a/web/js/model.js +++ b/web/js/model.js @@ -47,7 +47,7 @@ function model_process_event(model, ev) { schedule_unknown_refetch(model); // Queue event for rendering - model.invalidated.push(ev.id); + model.invalidated.push(ev.id); } /* model_process_event_profile updates the matching profile with the contents found @@ -285,17 +285,19 @@ async function model_load_events(model, fn) { function new_model() { return { - all_events: {}, + all_events: {}, // our master list of all events done_init: {}, notifications: 0, max_depth: 2, reactions_to: {}, chatrooms: {}, + unknown_ids: {}, unknown_pks: {}, + but_wait_theres_more: 0, + deletions: {}, deleted: {}, - but_wait_theres_more: 0, last_event_of_kind: {}, pow: 0, // pow difficulty target profiles: {}, // pubkey => profile data @@ -306,6 +308,19 @@ function new_model() { friend_of_friends: new Set(), }, invalidated: [], // event ids which should be added/removed - elements: {}, + elements: {}, // map of evid > rendered element + requested_profiles: [], // an array of {relay_id, pubkey} to fetching + + ids: { + comments: "comments", + explore: "explore", + refevents: "refevents", + account: "account", + home: "home", + contacts: "contacts", + notifications: "notifications", + unknowns: "unknowns", + dms: "dms", + }, }; } diff --git a/web/js/ui/render.js b/web/js/ui/render.js index 4800494..a061814 100644 --- a/web/js/ui/render.js +++ b/web/js/ui/render.js @@ -292,12 +292,3 @@ function render_pfp(pk, profile, opts={}) { src="${get_picture(pk, profile)}"/>` } -function render_loading_spinner() { - return html` -
-
- -
-
` -} - diff --git a/web/js/ui/state.js b/web/js/ui/state.js index 91f7267..6f0b57d 100644 --- a/web/js/ui/state.js +++ b/web/js/ui/state.js @@ -63,6 +63,7 @@ function view_timeline_apply_mode(model, mode, opts={}) { el.append(fragment); view_set_show_count(0); view_timeline_update_timestamps(); + view_show_spinner(false); } return mode; @@ -168,6 +169,7 @@ function view_timeline_show_new(model) { } if (count > 0) { el.prepend(fragment); + view_show_spinner(false); } view_set_show_count(-count, true); view_timeline_update_timestamps(); diff --git a/web/js/unknowns.js b/web/js/unknowns.js index c2e4aa9..44dd8d2 100644 --- a/web/js/unknowns.js +++ b/web/js/unknowns.js @@ -58,8 +58,7 @@ function get_non_expired_unknowns(unks, type) return ids } -function fetch_unknown_events(damus) -{ +function fetch_unknown_events(damus) { let filters = [] const pks = get_non_expired_unknowns(damus.unknown_pks, 'profiles') const evids = get_non_expired_unknowns(damus.unknown_ids, 'events') @@ -71,26 +70,26 @@ function fetch_unknown_events(damus) } } if (evids.length !== 0) { - const unk_kinds = [1,5,6,7,40,42] // TODO don't hardcode event kinds + const unk_kinds = STANDARD_KINDS; filters.push({ids: evids, kinds: unk_kinds}) - filters.push({"#e": evids, kinds: [1,42], limit: 100}) + filters.push({"#e": evids, kinds: [KIND_NOTE, KIND_CHATROOM], limit: 100}) } if (pks.length !== 0) filters.push({authors: pks, kinds:[0]}) if (filters.length === 0) - return + return; log_debug("fetching unknowns", filters) damus.pool.subscribe('unknowns', filters) } -function schedule_unknown_refetch(damus) -{ +function schedule_unknown_refetch(damus) { + // spams our CPU :( + return; const INTERVAL = 5000 if (!damus.unknown_timer) { log_debug("fetching unknown events now and in %d seconds", INTERVAL / 1000) damus.unknown_timer = setTimeout(() => { fetch_unknown_events(damus) - setTimeout(() => { delete damus.unknown_timer if (damus.but_wait_theres_more > 0) {