Immediate: the fix to the annoying camera and mic bug, plus notification updates for chat messages.

Author: gvbvdxxalt2

README.md

@@ -31,12 +31,44 @@ Want to run your own instance? Follow these steps.
 
 ### 1. Prerequisites: Supabase
 **Do not skip this.** You must create a Supabase project to run the server.
+
+_(Create a .env file if you don't want to add enviroment variables to your machine)_
+
 Create a project at [supabase.com](https://supabase.com) and gather the following environment variables:
 
 * `sbBucket`: Your Supabase storage bucket name.
 * `sbAPIKey`: Your Supabase Secret Key (recommended) or API Key.
 * `sbURL`: Your Supabase project URL (e.g., `https://projectid.supabase.co`).
 
+**DO NOT SHARE SUPABASE STORAGE API KEYS AND URLS**, these must remain private so that people don't sneak in and change the account data.
+
+#### 1.2 Enviroment variables for Push Notifications.
+
+This step is optional but highly recommended now. If skipped, push notificiations will not work:
+
+Run the terminal command (tested only in github codespaces) to generate the keys: `npm run webpush` or `yarn webpush`.
+
+Example output:
+```
+=======================================
+
+Public Key:
+<YOUR PUSH NOTIFICATIONS PUBLIC KEY>
+
+Private Key:
+<YOUR PUSH NOTIFICATIONS PRIVATE KEY>
+
+=======================================
+```
+
+Add these enviroment variables:
+
+* `pushWebsite`: The website the server is accesible on. (OPTIONAL, defaults to the random rants + website)
+
+* `publicPushKey`: The public push notifcations key that was in the output of the command above.
+
+* `privatePushKey`: The private push notifcations key that was in the output of the command above. (DO NOT SHARE THE KEY)
+
 ### 2. Local Setup
 I recommend using **Node.js 16.x**.
 

server-src/server.js

@@ -2276,20 +2276,20 @@ async function startRoomWSS(roomid) {
       wss._rrPeopleCount += 1;
       ws.on("close", () => {
         wss.clients.forEach((cli) => {
-            if (!cli._rrIsReady) {
-              return;
-            }
-            cli.send(
-              JSON.stringify({
-                type: "userLeft",
-                username: ws._rrUsername,
-                displayName: displayName,
-                color: ws._rrUserColor,
-                font: ws._rrUserFont,
-                id: ws._rrConnectionID,
-              }),
-            );
-          });
+          if (!cli._rrIsReady) {
+            return;
+          }
+          cli.send(
+            JSON.stringify({
+              type: "userLeft",
+              username: ws._rrUsername,
+              displayName: displayName,
+              color: ws._rrUserColor,
+              font: ws._rrUserFont,
+              id: ws._rrConnectionID,
+            }),
+          );
+        });
         clearTimeout(ws._rrkeepAliveTimeout);
         clearInterval(roomCheckInterval);
         wss._rrPeopleCount -= 1;
@@ -5472,14 +5472,15 @@ setInterval(() => {
   debugLogOnlineSockets();
 }, 2000);*/
 
-/*setInterval(() => {
-  for (var username of Object.keys(notificationsForUsers)) {
-    sendNotify(username, {
+/*
+setInterval(() => {
+  var username = "gvbvdxx";
+  sendNotify(username, {
       type: "test",
     });
     console.log("Send to: " + username);
-  }
-}, 5000);*/
+}, 5000);
+*/
 
 var serverPort = 3000;
 if (process.env.serverPort) {

src/botcheckinterface.js

@@ -5,6 +5,8 @@ class BotCheckDiv {
   constructor() {
     var _this = this;
     this.created = false;
+    this.verified = false;
+    this.onVerifyScreen = false;
     this.jsonElement = {
       element: "div",
       children: [
@@ -25,6 +27,8 @@ class BotCheckDiv {
   }
 
   _botVerificationPassedScreen() {
+    this.verified = true;
+    this.onVerifyScreen = false;
     var divElm = this.divElm;
     var _this = this;
 
@@ -54,6 +58,7 @@ class BotCheckDiv {
   }
 
   _botVerificationFailedScreen() {
+    this.onVerifyScreen = false;
     var divElm = this.divElm;
     var _this = this;
 
@@ -76,9 +81,11 @@ class BotCheckDiv {
   }
 
   _botVerificationScreen() {
+    this.onVerifyScreen = true;
     var divElm = this.divElm;
     var _this = this;
     var checkID = this.checkID;
+    this.verified = false;
 
     var codeInput = null;
     var buttonElement = null;
@@ -218,7 +225,10 @@ class BotCheckDiv {
   }
 
   async _loadID() {
+    this.onVerifyScreen = false;
     var divElm = this.divElm;
+    divElm.onclick = function () {};
+    divElm.className = "botCheckDiv";
     elements.setInnerJSON(divElm, [
       {
         element: "div",
@@ -265,14 +275,20 @@ class BotCheckDiv {
     }
   }
 
+  handleTabTo() {
+    if (!this.onVerifyScreen && !this.verified) {
+      this.divElm.focus();
+      this._loadID();
+    }
+  }
+
   reset() {
+    this.onVerifyScreen = false;
+    this.verified = false;
     var divElm = this.divElm;
     var _this = this;
 
     divElm.onclick = async function () {
-      divElm.onclick = function () {};
-      divElm.className = "botCheckDiv";
-
       await _this._loadID();
     };
     elements.setInnerJSON(divElm, [
@@ -292,12 +308,6 @@ class BotCheckDiv {
     this.reset();
   }
 
-  click() {
-    if (this.created) {
-      this.divElm.click();
-    }
-  }
-
   getCheckID() {
     return this.checkID;
   }

src/chat/interface/chatinterface.js

@@ -541,9 +541,11 @@ require("./darktheme.js");
           }
           if (clientSettings.getSetting("CHAT_NOTIFY")) {
             notify.sendIfNotOnScreen(
-              "New message",
+              `new-message-${json.username || "unknown"}`,
               `${json.displayName}: ${shtml.bracketCodeRemoval(json.message)}`,
-              "New message",
+              json.username
+                ? "New message from @" + json.username
+                : "New message",
             );
           }
         }

src/chat/interface/notify.js

@@ -25,6 +25,9 @@ notify.sendIfNotOnScreen = function (tag, body, title = "Random Rants +") {
             title,
             body,
             tag,
+            data: {
+              targetURL: window.location.href,
+            },
           },
         });
       } else {

src/pages/signin.js

@@ -118,6 +118,6 @@ usernameInput.addEventListener("keydown", function (e) {
 
 passwordInput.addEventListener("keydown", function (e) {
   if (e.key == "Enter") {
-    botCheck.click();
+    botCheck.handleTabTo();
   }
 });

src/pages/signup.js

@@ -157,6 +157,6 @@ usernameInput.addEventListener("keydown", function (e) {
 
 passwordInput.addEventListener("keydown", function (e) {
   if (e.key == "Enter") {
-    botCheck.click();
+    botCheck.handleTabTo();
   }
 });

src/serviceworker/index.js

@@ -1,6 +1,6 @@
 const CHAT_PATH = "/chat";
 const APP_NAME = "Random Rants +";
-const DEFAULT_TAG = "randomrants-plus";
+const DEFAULT_TAG_PREFIX = "randomrants-plus";
 
 var origin = "" + self.location.origin;
 origin = origin.trim();
@@ -21,9 +21,12 @@ async function sendPushNotification({
   title = APP_NAME,
   body = "",
   icon = "/images/push-notify-icon.png",
-  tag = DEFAULT_TAG,
+  tag = DEFAULT_TAG_PREFIX,
   data = {},
 }) {
+  if (tag == DEFAULT_TAG_PREFIX) {
+    tag += "-" + Date.now();
+  }
   await self.registration.showNotification(title, {
     body: body,
     icon: icon,
@@ -156,7 +159,9 @@ self.addEventListener("message", async (event) => {
     // Save the current timestamp
     await cache.put("last-seen-online", new Response(Date.now().toString()));
   } else if (event.data && event.data.type === "NOTIFY") {
-    await sendPushNotification(event.data.payload);
+    if (await isUserSubscribed()) {
+      await sendPushNotification(event.data.payload);
+    }
   }
 });
 
@@ -191,6 +196,23 @@ self.addEventListener("activate", (event) => {
   event.waitUntil(async () => {
     await clients.claim();
 
+    // Check for "Ghost" registrations
+    const registrations = (await self.registration.navigationPreload.getState())
+      ? [] // Preload check
+      : await self.registration.scope;
+
+    const allRegs = (await self.registration.getRegistrations)
+      ? await self.registration.getRegistrations()
+      : [];
+
+    for (let reg of allRegs) {
+      // If there is another worker with a different scope, kill it
+      if (reg.scope !== self.registration.scope) {
+        console.warn("Killing duplicate worker at scope:", reg.scope);
+        await reg.unregister();
+      }
+    }
+
     if (!(await isUserSubscribed())) {
       return;
     }

wpstatic/version.json

@@ -1 +1 @@
-{"timestamp":"1770907446166"}
+{"timestamp":"1770911428376"}