refactor: live streams

packages/app/src/Cache/index.ts

@@ -25,7 +25,7 @@ async function tryUseCacheRelay(url: string) {
     localStorage.setItem("cache-relay", url);
     return conn;
   } catch (e) {
-    console.error(e);
+    console.warn(e);
   }
 }
 
@@ -53,7 +53,7 @@ export async function initRelayWorker() {
   }
 
   try {
-    await workerRelay.debug("");
+    await workerRelay.debug("*");
     await workerRelay.init({
       databasePath: "relay.db",
       insertBatchSize: 100,

packages/app/src/Components/LiveStream/LiveStreams.tsx

@@ -5,7 +5,6 @@ import { CSSProperties, useMemo } from "react";
 import { FormattedMessage } from "react-intl";
 import { Link } from "react-router-dom";
 
-import useFollowsControls from "@/Hooks/useFollowControls";
 import useImgProxy from "@/Hooks/useImgProxy";
 import { findTag } from "@/Utils";
 import { Hour } from "@/Utils/Const";
@@ -13,21 +12,16 @@ import { Hour } from "@/Utils/Const";
 import Avatar from "../User/Avatar";
 
 export function LiveStreams() {
-  const { followList } = useFollowsControls();
   const sub = useMemo(() => {
-    const rb = new RequestBuilder("follows:streams");
+    const rb = new RequestBuilder("streams");
-    if (followList.length > 0) {
     rb.withFilter()
       .kinds([EventKind.LiveEvent])
-        .authors(followList)
       .since(unixNow() - Hour);
     rb.withFilter()
       .kinds([EventKind.LiveEvent])
-        .tag("p", followList)
       .since(unixNow() - Hour);
-    }
     return rb;
-  }, [followList.length]);
+  }, []);
 
   const streams = useRequestBuilder(sub);
   if (streams.length === 0) return null;
@@ -72,16 +66,22 @@ function LiveStreamEvent({ ev }: { ev: NostrEvent }) {
               backgroundImage: `url(${imageProxy})`,
             } as CSSProperties
           }></div>
-        <div className="absolute left-0 top-7 w-full overflow-hidden">
+        <div className="absolute left-0 top-0 w-full overflow-hidden">
-          <div className="whitespace-nowrap px-2 text-ellipsis overflow-hidden text-xs">{title}</div>
+          <div
+            className="whitespace-nowrap px-1 text-ellipsis overflow-hidden text-xs font-medium bg-background opacity-70 text-center"
+            title={title}>
+            {title}
           </div>
-        <div className="absolute top-1 left-1 bg-heart rounded-md px-2 uppercase font-bold">{status}</div>
+        </div>
-        <div className="absolute right-1 top-1">
+        <div className="absolute bottom-1 left-1 bg-heart rounded-md px-2 uppercase font-bold">{status}</div>
+        <div className="absolute right-1 bottom-1">
           <Avatar pubkey={host} user={hostProfile} size={25} className="outline outline-2 outline-highlight" />
         </div>
-        <div className="absolute left-1 bottom-1 rounded-md px-2 py-1 text-xs bg-gray font-medium">
+        {viewers && (
+          <div className="absolute left-1 bottom-7 rounded-md px-2 py-1 text-xs bg-gray font-medium">
             <FormattedMessage defaultMessage="{n} viewers" values={{ n: viewers }} />
           </div>
+        )}
       </div>
     </Link>
   );

packages/app/src/Feed/LoginFeed.ts

@@ -28,11 +28,11 @@ export default function useLoginFeed() {
   }, [login, publisher, system]);
 
   const subLogin = useMemo(() => {
-    if (CONFIG.features.subscriptions && !login.readonly) {
+    const b = new RequestBuilder(`login:sub`);
-      const b = new RequestBuilder(`login`);
     b.withOptions({
       leaveOpen: true,
     });
+    if (CONFIG.features.subscriptions && !login.readonly) {
       if (pubKey) {
         b.withFilter()
           .relay("wss://relay.snort.social/")
@@ -41,8 +41,8 @@ export default function useLoginFeed() {
           .tag("p", [pubKey])
           .limit(10);
       }
-      return b;
     }
+    return b;
   }, [pubKey, login]);
 
   const loginFeed = useRequestBuilder(subLogin);

packages/worker-relay/package.json

@@ -18,7 +18,7 @@
     "dist"
   ],
   "dependencies": {
-    "@sqlite.org/sqlite-wasm": "^3.45.3-build3",
+    "@sqlite.org/sqlite-wasm": "^3.46.1-build3",
     "eventemitter3": "^5.0.1",
     "uuid": "^9.0.1"
   },

packages/worker-relay/src/interface.ts

@@ -64,7 +64,6 @@ export class WorkerRelayInterface {
   }
 
   async delete(req: ReqCommand) {
-    console.debug("DELETE", req);
     return await this.#workerRpc<ReqCommand, Array<string>>("delete", req);
   }
 

packages/worker-relay/src/queue.ts

@@ -4,7 +4,7 @@ export interface WorkQueueItem {
   reject(e: unknown): void;
 }
 
-export async function processWorkQueue(queue?: Array<WorkQueueItem>, queueDelay = 200) {
+export async function processWorkQueue(queue?: Array<WorkQueueItem>) {
   while (queue && queue.length > 0) {
     const v = queue.shift();
     if (v) {
@@ -16,7 +16,6 @@ export async function processWorkQueue(queue?: Array<WorkQueueItem>, queueDelay
       }
     }
   }
-  setTimeout(() => processWorkQueue(queue, queueDelay), queueDelay);
 }
 
 export const barrierQueue = async <T>(queue: Array<WorkQueueItem>, then: () => Promise<T>): Promise<T> => {

packages/worker-relay/src/worker.ts

@@ -24,8 +24,7 @@ let eventWriteQueue: Array<NostrEvent> = [];
 async function insertBatch() {
   // Only insert event batches when the command queue is empty
   // This is to make req's execute first and not block them
-  if (eventWriteQueue.length > 0 && cmdQueue.length === 0) {
+  if (eventWriteQueue.length > 0) {
-    await barrierQueue(cmdQueue, async () => {
     const start = unixNowMs();
     const timeLimit = 1000;
     if (relay) {
@@ -39,7 +38,6 @@ async function insertBatch() {
         relay.eventBatch(batch);
       }
     }
-    });
   }
   setTimeout(() => insertBatch(), 100);
 }
@@ -47,7 +45,6 @@ async function insertBatch() {
 const cmdQueue: Array<WorkQueueItem> = [];
 try {
   setTimeout(() => insertBatch(), 100);
-  processWorkQueue(cmdQueue, 50);
 } catch (e) {
   console.error(e);
 }
@@ -75,7 +72,6 @@ const handleMsg = async (port: MessagePort | DedicatedWorkerGlobalScope, ev: Mes
         break;
       }
       case "init": {
-        await barrierQueue(cmdQueue, async () => {
         const args = msg.args as InitAargs;
         insertBatchSize = args.insertBatchSize ?? 10;
         try {
@@ -91,7 +87,6 @@ const handleMsg = async (port: MessagePort | DedicatedWorkerGlobalScope, ev: Mes
           await relay.init(args.databasePath);
         }
         reply(msg.id, true);
-        });
         break;
       }
       case "event": {
@@ -105,14 +100,11 @@ const handleMsg = async (port: MessagePort | DedicatedWorkerGlobalScope, ev: Mes
         break;
       }
       case "close": {
-        await barrierQueue(cmdQueue, async () => {
         const res = relay!.close();
         reply(msg.id, res);
-        });
         break;
       }
       case "req": {
-        await barrierQueue(cmdQueue, async () => {
         const req = msg.args as ReqCommand;
         const filters = req.slice(2) as Array<ReqFilter>;
         const results: Array<string | NostrEvent> = [];
@@ -128,11 +120,9 @@ const handleMsg = async (port: MessagePort | DedicatedWorkerGlobalScope, ev: Mes
           }
         }
         reply(msg.id, results);
-        });
         break;
       }
       case "count": {
-        await barrierQueue(cmdQueue, async () => {
         const req = msg.args as ReqCommand;
         let results = 0;
         const filters = req.slice(2) as Array<ReqFilter>;
@@ -141,12 +131,9 @@ const handleMsg = async (port: MessagePort | DedicatedWorkerGlobalScope, ev: Mes
           results += c;
         }
         reply(msg.id, results);
-        });
         break;
       }
       case "delete": {
-        console.debug("DELETE", msg.args);
-        await barrierQueue(cmdQueue, async () => {
         const req = msg.args as ReqCommand;
         let results = [];
         const filters = req.slice(2) as Array<ReqFilter>;
@@ -155,35 +142,26 @@ const handleMsg = async (port: MessagePort | DedicatedWorkerGlobalScope, ev: Mes
           results.push(...c);
         }
         reply(msg.id, results);
-        });
         break;
       }
       case "summary": {
-        await barrierQueue(cmdQueue, async () => {
         const res = relay!.summary();
         reply(msg.id, res);
-        });
         break;
       }
       case "dumpDb": {
-        await barrierQueue(cmdQueue, async () => {
         const res = await relay!.dump();
         reply(msg.id, res);
-        });
         break;
       }
       case "forYouFeed": {
-        await barrierQueue(cmdQueue, async () => {
         const res = await getForYouFeed(relay!, msg.args as string);
         reply(msg.id, res);
-        });
         break;
       }
       case "setEventMetadata": {
-        await barrierQueue(cmdQueue, async () => {
         const [id, metadata] = msg.args as [string, EventMetadata];
         relay!.setEventMetadata(id, metadata);
-        });
         break;
       }
       default: {

yarn.lock

@@ -4842,7 +4842,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@snort/worker-relay@workspace:packages/worker-relay"
   dependencies:
-    "@sqlite.org/sqlite-wasm": "npm:^3.45.3-build3"
+    "@sqlite.org/sqlite-wasm": "npm:^3.46.1-build3"
     "@types/debug": "npm:^4.1.12"
     "@types/sharedworker": "npm:^0.0.112"
     "@types/uuid": "npm:^9.0.7"
@@ -4860,12 +4860,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sqlite.org/sqlite-wasm@npm:^3.45.3-build3":
+"@sqlite.org/sqlite-wasm@npm:^3.46.1-build3":
-  version: 3.45.3-build3
+  version: 3.46.1-build3
-  resolution: "@sqlite.org/sqlite-wasm@npm:3.45.3-build3"
+  resolution: "@sqlite.org/sqlite-wasm@npm:3.46.1-build3"
   bin:
     sqlite-wasm: bin/index.js
-  checksum: 10/58dd96936973c8bb3989a7d23d6d6021b05e4b35ae997d617d28b5faf5f370196aaf71d1a060eb1822fed3636acb4b5e0d444807d86687bff2a6efa637f9f1dc
+  checksum: 10/a64225fd784ed2ee8c8bf82f042d05b567b4707fba22a9508fbe3ac42cf1cf7e722d2ede0e1d91556bfec66b140aeb3cf3967546249693f39cc81475d7be90ff
   languageName: node
   linkType: hard