From 3eacef1bd45f77bc16d6b853ea6e1fb58501306b Mon Sep 17 00:00:00 2001
From: gsovereignty <gsovereignty@proton.me>
Date: Wed, 8 Nov 2023 14:29:00 +0800
Subject: [PATCH] problem: we are making unecessary subscriptions

---
 .../problems/AddProblemModal.svelte           | 232 ------------------
 .../event_sources/relays/livesubscriptions.ts |  13 +-
 .../stores/nostrocket_state/master_state.ts   |  10 +-
 .../nostrocket_state/soft_state/problems.ts   | 136 +++++-----
 src/routes/problems/+page.svelte              |  20 +-
 src/routes/problems/[id]/+page.svelte         |   4 +-
 6 files changed, 90 insertions(+), 325 deletions(-)
 delete mode 100644 src/components/problems/AddProblemModal.svelte

diff --git a/src/components/problems/AddProblemModal.svelte b/src/components/problems/AddProblemModal.svelte
deleted file mode 100644
index cc11c38..0000000
--- a/src/components/problems/AddProblemModal.svelte
+++ /dev/null
@@ -1,232 +0,0 @@
-<script lang="ts">
-  import makeEvent from "$lib/helpers/eventMaker";
-  import {
-  ignitionPubkey,
-    nostrocketIgnitionEvent,
-    nostrocketIgnitionTag,
-    simulateEvents
-  } from "../../settings";
-  import { currentUser } from "$lib/stores/hot_resources/current-user";
-  import type { NDKUser } from "@nostr-dev-kit/ndk";
-  import {
-    Button,
-    Form,
-    Modal,
-    Row,
-    TextArea,
-    TextInput,
-  } from "carbon-components-svelte";
-  import { DataEnrichmentAdd } from "carbon-icons-svelte";
-  import { writable } from "svelte/store";
-  import LoginNip07Button from "../elements/LoginNIP07Button.svelte";
-
-  export let parent = "";
-  let buttonDisabled = true;
-  let notLoggedIn = true;
-
-  const profileData = writable<NDKUser|undefined>(undefined);
-
-  let formOpen: boolean = false;
-  let title_text: string = "";
-  let summary_text = "";
-  let full_text = "";
-  let formValidation = true;
-
-  let titleError = "";
-  let titleInvalid = false;
-
-  $: {
-    if (title_text.length < 10) {
-      titleInvalid = true;
-      titleError =
-        title_text.length.toString() +
-        " characters isn't big enough for anyone...";
-    } else {
-      titleInvalid = false;
-      titleError = "";
-    }
-    if ($currentUser) {
-      notLoggedIn = false;
-    } else {
-      notLoggedIn = true;
-    }
-
-    buttonDisabled = titleInvalid || notLoggedIn;
-  }
-
-  function reset() {
-    title_text = "";
-    titleError = "";
-  }
-
-  function onFormSubmit() {
-    if (!buttonDisabled) {
-      if (parent.length != 64 && $currentUser?.pubkey !== ignitionPubkey) {
-      console.log("todo: add safeguards and user notifications for logging problems at the root level")
-      throw new Error("comment out to log a problem at the root level")
-    }
-      let e = makeEvent({kind: 15171971, rocket: nostrocketIgnitionTag})
-      if (!simulateEvents) {
-        e.publish()
-          .then((x) => {
-            console.log(e.rawEvent(), x);
-            let text_event = textEvent();
-            text_event
-              .publish()
-              .then((y) => {
-                console.log(text_event.rawEvent(), y);
-                let commit_event = commitEvent(e.id, text_event.id, "", "open");
-                commit_event
-                  .publish()
-                  .then((z) => {
-                    console.log(commit_event.rawEvent(), z);
-                    //if we are a maintainer on this problem, publish a new HEAD
-                    if (true) {
-                      let head_event = headEvent(
-                        e.id,
-                        commit_event.id,
-                        "open"
-                      );
-                      head_event
-                        .publish()
-                        .then((a) => {
-                          console.log(head_event.rawEvent(), a);
-                          formOpen = false;
-                          reset();
-                        })
-                        .catch((err) => {
-                          throw new Error(
-                            "failed to publish Problem HEAD event. " + err
-                          );
-                        });
-                    } else {
-                      formOpen = false;
-                      reset();
-                    }
-                  })
-                  .catch((err) => {
-                    throw new Error(
-                      "failed to publish Problem COMMIT event. " + err
-                    );
-                  });
-              })
-              .catch((err) => {
-                throw new Error("failed to publish Problem TEXT event. " + err);
-              });
-          })
-          .catch((err) => {
-            throw new Error("failed to publish Problem ANCHOR event. " + err);
-          });
-      } else {
-        e.sign().then(() => {
-          console.log(e.rawEvent());
-          formOpen = false;
-          reset();
-        });
-      }
-    }
-  }
-
-  function headEvent(anchorID:string, commitID:string, status:string, rocket?:string) {
-    let e = makeEvent({kind:31971})
-    e.tags.push(["e", anchorID, "", "anchor"]);
-    e.tags.push(["d", anchorID])
-    e.tags.push(["e", commitID, "", "commit"]);
-    e.tags.push(["s", status]);
-    if (parent.length == 64) {
-      e.tags.push(["e", parent, "", "parent"]);
-    }
-    //todo get exiting problem from state and include existing parents (etc)
-    let rocketTag = ["e", nostrocketIgnitionEvent, "", "rocket"];
-    if (rocket) {
-      rocketTag[1] = rocket;
-    }
-    e.tags.push(rocketTag);
-    return e;
-  }
-
-  function commitEvent(anchorID:string, textID:string, previous:string, status:string) {
-    let e = makeEvent({kind:15171972})
-    e.tags.push(["e", anchorID, "", "anchor"]);
-    e.tags.push(["e", textID, "", "text"]);
-    if (previous) {
-      e.tags.push(["e", previous, "previous"]);
-    }
-    e.tags.push(["s", status]);
-    return e;
-  }
-
-  function textEvent() {
-    let e = makeEvent({kind: 15171973})
-    e.tags.push(["t", title_text, "title"]);
-    if (summary_text.length > 0) {
-      e.tags.push(["t", summary_text, "summary"]);
-    }
-    if (full_text.length > 0) {
-      e.tags.push(["t", full_text, "full"]);
-    }
-    return e;
-  }
-
-  function onFormOpen() {
-    // Hack form assocation
-    const modal = document.querySelector(".bx--modal");
-    const form = modal.querySelector("form");
-    const button = modal.querySelector(".bx--btn--primary");
-
-    const id = "I" + Math.random().toString().substring(2);
-    form.setAttribute("id", id);
-    button.setAttribute("form", id);
-    // Reverted by binding update on input change
-    button.setAttribute("type", "submit");
-  }
-</script>
-
-<Button size="small" icon={DataEnrichmentAdd}
-  on:click={() => {
-    formOpen = true;
-  }}>{#if parent.length == 64}Create a sub-Problem{:else}New Problem Now{/if} </Button>
-
-<Modal
-  bind:open={formOpen}
-  shouldSubmitOnEnter={false}
-  primaryButtonText="Submit"
-  secondaryButtonText="Cancel"
-  primaryButtonIcon={DataEnrichmentAdd}
-  selectorPrimaryFocus=".bx--text-input"
-  modalHeading="Log a Problem You Currently Face or Have Observed"
-  hasForm
-  primaryButtonDisabled={buttonDisabled}
-  on:open={onFormOpen}
-  on:click:button--secondary={() => ((formOpen = false), reset())}
-  on:submit={() => (formValidation ? onFormSubmit() : null)}
->
-  <Form on:submit={onFormSubmit}>
-    {#if !$currentUser}
-      <Row>
-        <LoginNip07Button />
-      </Row>
-    {/if}
-    <TextInput
-      invalid={titleInvalid}
-      invalidText={titleError}
-      labelText="Problem Title"
-      maxlength={100}
-      bind:value={title_text}
-      required
-      style="margin-bottom:1%;"/>
-    <TextArea
-      bind:value={summary_text}
-      labelText="Problem Summary"
-      maxlength={280}
-      placeholder="Briefly describe the problem you face or have observed. MUST be plaintext, no markdown. Max 280 characters."
-      style="margin-bottom:1%;"/>
-    <TextArea
-      bind:value={full_text}
-      labelText="Full Problem Statement [OPTIONAL]"
-      placeholder="Explain the problem in full. Markdown is allowed."
-      rows={20}
-      style="margin-bottom:1%;"/>
-
-  </Form>
-</Modal>
diff --git a/src/lib/stores/event_sources/relays/livesubscriptions.ts b/src/lib/stores/event_sources/relays/livesubscriptions.ts
index c0da349..cf8b096 100644
--- a/src/lib/stores/event_sources/relays/livesubscriptions.ts
+++ b/src/lib/stores/event_sources/relays/livesubscriptions.ts
@@ -5,18 +5,21 @@ import { defaultRelays, rootEventID } from "../../../../settings";
 import { unixTimeNow } from "$lib/helpers/mundane";
 
 
-export function initLiveSubscriptions():[Writable<NDKFilter>, NDKEventStore<ExtendedBaseType<NDKEvent>>] {
+export function initLiveSubscriptions():[Writable<NDKFilter>, NDKEventStore<ExtendedBaseType<NDKEvent>> | undefined] {
     let _filter:Writable<NDKFilter> = writable({})
     let ndk = get(writable(new NDKSvelte({
         explicitRelayUrls: defaultRelays,
     })))
-    ndk.connect()
-    let f:NDKFilter = {ids: [rootEventID]}
-    let currentsub:NDKEventStore<ExtendedBaseType<NDKEvent>> = ndk.storeSubscribe<NDKEvent>(f, {closeOnEose: true});
+    //ndk.connect()
+    //let f:NDKFilter = {ids: [rootEventID]}
+    let currentsub:NDKEventStore<ExtendedBaseType<NDKEvent>> | undefined = undefined;// = ndk.storeSubscribe<NDKEvent>(f, {closeOnEose: true});
     let lastFilter:NDKFilter;
     let lastTime = 0;
     _filter.subscribe(fi=>{
         if (fi != lastFilter || unixTimeNow() > lastTime+60) {
+            if (!currentsub) {
+                currentsub = ndk.storeSubscribe<NDKEvent>(fi, {closeOnEose: false})
+            }
             lastFilter = fi
             lastTime = unixTimeNow()
             resub(currentsub, fi)
@@ -30,7 +33,7 @@ export function initLiveSubscriptions():[Writable<NDKFilter>, NDKEventStore<Exte
         //     })
         // })
     })
-    setTimeout(()=>{resub(currentsub, lastFilter)}, 2000)
+    //setTimeout(()=>{resub(currentsub, lastFilter)}, 2000)
     return [_filter, currentsub]
 }
 
diff --git a/src/lib/stores/nostrocket_state/master_state.ts b/src/lib/stores/nostrocket_state/master_state.ts
index 6e7c38e..3e4ba1a 100644
--- a/src/lib/stores/nostrocket_state/master_state.ts
+++ b/src/lib/stores/nostrocket_state/master_state.ts
@@ -44,9 +44,11 @@ export let stateChangeEvents = derived(eligibleForProcessing, ($nis)=>{
 
 allNostrocketEvents.subscribe((e) => {
   if (e[0]) {
-    mempool.update((m)=>{
-      return m.set(e[0].id,e[0])
-    })
+    if (!get(mempool).has(e[0].id)) {
+      mempool.update((m)=>{
+        return m.set(e[0].id,e[0])
+      })
+    }
   }
 });
 
@@ -238,7 +240,7 @@ let lastConsensusEventAttempt:string = ""
   async function init() {
     if (!initted) {
       initted = true
-      initProblems(consensusTipState)
+      //initProblems(consensusTipState)
       watchMempool()
     }
   }
\ No newline at end of file
diff --git a/src/lib/stores/nostrocket_state/soft_state/problems.ts b/src/lib/stores/nostrocket_state/soft_state/problems.ts
index 386ec8e..fd34ad3 100644
--- a/src/lib/stores/nostrocket_state/soft_state/problems.ts
+++ b/src/lib/stores/nostrocket_state/soft_state/problems.ts
@@ -6,7 +6,6 @@ import { Mutex } from "async-mutex";
 import { get, writable, type Writable } from "svelte/store";
 import { changeStateMutex } from "../mutex";
 import type { Nostrocket } from "../types";
-import type { NDKEventStore, ExtendedBaseType } from "@nostr-dev-kit/ndk-svelte";
 
 export let problemEvents = writable<Map<string, NDKEvent>>(new Map());
 
@@ -21,7 +20,8 @@ export async function initProblems(consensusTipState:Writable<Nostrocket>) {
     cts = consensusTipState
   //let subsription: NDKEventStore<ExtendedBaseType<NDKEvent>>
   let [filter, subsription] = initLiveSubscriptions()
-  subsription.subscribe(e=>{
+  
+  subsription?.subscribe(e=>{
     if (e[0]) {
       problemEvents.update(pe=>{
         if (!pe.get(e[0].id)) {
@@ -50,72 +50,72 @@ export async function initProblems(consensusTipState:Writable<Nostrocket>) {
 }
 
 export function updateProblems() {
-  changeStateMutex().then((release) => {
-    cts?.update((state) => {
-      state.Problems.forEach((problem) => {
-        if (problem.Head) {
-          let commitID = labelledTag(problem.Head, "commit", "e");
-          if (commitID) {
-            let commitEvent = getProblemEvent(commitID); //get(problemEvents).get(commitID)
-            if (!commitEvent) {filter.update(f=>{
-              if (!f.ids?.includes(commitID!)) {
-                f.ids?.push(commitID!)
-              }
-              return f
-            })}
-            if (commitEvent) {
-              let s = commitEvent.tagValue("s");
-              if (s) {
-                problem.Status = s;
-              }
-              let previous = labelledTag(commitEvent, "previous", "e");
-              if (previous) {
-                if (!problem.CommitHistory) {
-                  problem.CommitHistory = [];
-                }
-                if (!problem.CommitHistory.includes(previous)) {
-                  problem.CommitHistory.push(previous);
-                }
-              }
-              let textEventID = labelledTag(commitEvent, "text", "e");
-              if (textEventID) {
-                let textEvent = getProblemEvent(textEventID);
-                if (!textEvent) {
-                  filter.update(f=>{
-                  if (!f.ids?.includes(textEventID!)) {
-                    if (!f.ids) {
-                      f.ids = []
-                    }
-                    f.ids?.push(textEventID!)
-                  }
-                  return f
-                })}
-                if (textEvent) {
-                  let title = labelledTag(textEvent, "title", "t");
-                  if (title) {
-                    problem.Title = title.length <= 100 ? title : problem.Title;
-                  }
-                  let summary = labelledTag(textEvent, "summary", "t");
-                  if (summary) {
-                    problem.Summary =
-                      summary.length <= 280 ? summary : problem.Summary;
-                  }
-                  let fulltext = labelledTag(textEvent, "full", "t");
-                  if (fulltext) {
-                    problem.FullText = fulltext;
-                  }
-                }
-              }
-            }
-          }
-          //get the text event
-          //populate text content
-        }
-      });
-      return state;
-    });
-    release();
-  });
+  // changeStateMutex().then((release) => {
+  //   cts?.update((state) => {
+  //     state.Problems.forEach((problem) => {
+  //       if (problem.Head) {
+  //         let commitID = labelledTag(problem.Head, "commit", "e");
+  //         if (commitID) {
+  //           let commitEvent = getProblemEvent(commitID); //get(problemEvents).get(commitID)
+  //           if (!commitEvent) {filter.update(f=>{
+  //             if (!f.ids?.includes(commitID!)) {
+  //               f.ids?.push(commitID!)
+  //             }
+  //             return f
+  //           })}
+  //           if (commitEvent) {
+  //             let s = commitEvent.tagValue("s");
+  //             if (s) {
+  //               problem.Status = s;
+  //             }
+  //             let previous = labelledTag(commitEvent, "previous", "e");
+  //             if (previous) {
+  //               if (!problem.CommitHistory) {
+  //                 problem.CommitHistory = [];
+  //               }
+  //               if (!problem.CommitHistory.includes(previous)) {
+  //                 problem.CommitHistory.push(previous);
+  //               }
+  //             }
+  //             let textEventID = labelledTag(commitEvent, "text", "e");
+  //             if (textEventID) {
+  //               let textEvent = getProblemEvent(textEventID);
+  //               if (!textEvent) {
+  //                 filter.update(f=>{
+  //                 if (!f.ids?.includes(textEventID!)) {
+  //                   if (!f.ids) {
+  //                     f.ids = []
+  //                   }
+  //                   f.ids?.push(textEventID!)
+  //                 }
+  //                 return f
+  //               })}
+  //               if (textEvent) {
+  //                 let title = labelledTag(textEvent, "title", "t");
+  //                 if (title) {
+  //                   problem.Title = title.length <= 100 ? title : problem.Title;
+  //                 }
+  //                 let summary = labelledTag(textEvent, "summary", "t");
+  //                 if (summary) {
+  //                   problem.Summary =
+  //                     summary.length <= 280 ? summary : problem.Summary;
+  //                 }
+  //                 let fulltext = labelledTag(textEvent, "full", "t");
+  //                 if (fulltext) {
+  //                   problem.FullText = fulltext;
+  //                 }
+  //               }
+  //             }
+  //           }
+  //         }
+  //         //get the text event
+  //         //populate text content
+  //       }
+  //     });
+  //     return state;
+  //   });
+  //   release();
+  // });
 }
 
 
diff --git a/src/routes/problems/+page.svelte b/src/routes/problems/+page.svelte
index 36f2731..8c623a0 100644
--- a/src/routes/problems/+page.svelte
+++ b/src/routes/problems/+page.svelte
@@ -1,19 +1,11 @@
 <script lang="ts">
-    import {consensusTipState} from "$lib/stores/nostrocket_state/master_state";
-    import {Accordion, Column, Row, Search, Select, SelectItem, SelectItemGroup} from "carbon-components-svelte";
-    import {derived, writable} from "svelte/store";
-    import AddProblem from "../../components/problems/AddProblemModal.svelte";
+    import { problemStatuses } from "$lib/constants";
+    import { consensusTipState } from "$lib/stores/nostrocket_state/master_state";
+    import type { Account, Problem, ProblemStatus } from "$lib/stores/nostrocket_state/types";
+    import { Accordion, Column, Row, Search, Select, SelectItem, SelectItemGroup } from "carbon-components-svelte";
+    import { derived, writable } from "svelte/store";
+    import LogNewProblemModal from "../../components/problems/LogNewProblemModal.svelte";
     import ProblemComponent from "../../components/problems/ProblemComponent.svelte";
-    import type {Account, Problem, ProblemStatus} from "$lib/stores/nostrocket_state/types";
-    import {problemStatuses} from "$lib/constants";
-    import { onMount } from "svelte";
-  import { updateProblems } from "$lib/stores/nostrocket_state/soft_state/problems";
-  import LogNewProblemModal from "../../components/problems/LogNewProblemModal.svelte";
-
-    onMount(()=>{
-        setInterval(()=>{updateProblems()}, 1000)
-        //todo run updateProblems() every second
-    })
 
     let rootNodes: Map<string, Problem>
     let value: string;
diff --git a/src/routes/problems/[id]/+page.svelte b/src/routes/problems/[id]/+page.svelte
index 5fb88c4..58e0992 100644
--- a/src/routes/problems/[id]/+page.svelte
+++ b/src/routes/problems/[id]/+page.svelte
@@ -7,7 +7,7 @@
     import {ndk} from "$lib/stores/event_sources/relays/ndk";
     import type {NDKUserProfile} from "@nostr-dev-kit/ndk";
     import {makeHtml} from "$lib/helpers/mundane";
-    import AddProblemModal from "../../../components/problems/AddProblemModal.svelte";
+  import LogNewProblemModal from "../../../components/problems/LogNewProblemModal.svelte";
 
     let problem: Problem
     let createdBy: NDKUserProfile | undefined
@@ -49,7 +49,7 @@
                             <p style="color: #94a3b8">Logged by <span style="color: #fb923c">{createdBy?.name}</span></p>
                         </Column>
                         <Column md={4} class="problem-item-actions">
-                            <AddProblemModal parent={problem.UID}/>
+                            <LogNewProblemModal parent={problem}/>
                             <OverflowMenu size="sm" flipped light icon={ManageProtection} style="border: 2px solid white; margin-left: 1rem">
                                 <OverflowMenuItem text="Edit" hasDivider />
                                 <OverflowMenuItem text="Tag" hasDivider />