add notification immediately after setting up subscription, and tweak messaging

src/App.vue

@@ -291,6 +291,7 @@ interface VapidResponse {
 import { DEFAULT_PUSH_SERVER } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { sendTestThroughPushServer } from "@/libs/util";
 
 interface Notification {
   group: string;
@@ -447,23 +448,34 @@ export default class App extends Vue {
           .then((registration) => {
             return registration.pushManager.getSubscription();
           })
-          .then((subscription) => {
+          .then(async (subscription) => {
             if (subscription) {
-              return this.sendSubscriptionToServer(subscription);
+              await this.$notify(
+                {
+                  group: "alert",
+                  type: "info",
+                  title: "Notification Setup Underway",
+                  text: "Setting up notifications for interesting activity, which takes about 10 seconds. If you don't see a final confirmation, check the 'Troubleshoot' page.",
+                },
+                -1,
+              );
+              this.sendSubscriptionToServer(subscription);
+              return subscription;
             } else {
               throw new Error("Subscription object is not available.");
             }
           })
-          .then(() => {
+          .then(async (subscription) => {
             console.log(
               "Subscription data sent to server and all finished successfully.",
             );
+            await sendTestThroughPushServer(subscription, true);
             this.$notify(
               {
                 group: "alert",
                 type: "success",
                 title: "Notifications Turned On",
-                text: "Notifications are on. You should see one on your device; if not, see the 'Troubleshoot' page.",
+                text: "Notifications are on. You should see at least one on your device; if not, check the 'Troubleshoot' page.",
               },
               -1,
             );

src/libs/util.ts

@@ -1,5 +1,69 @@
 // many of these are also found in endorser-mobile utility.ts
 
+import axios, { AxiosResponse } from "axios";
+
+import { DEFAULT_PUSH_SERVER } from "@/constants/app";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const Buffer = require("buffer/").Buffer;
+
 export const isGlobalUri = (uri: string) => {
   return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
 };
+
+export const sendTestThroughPushServer = async (
+  subscription: PushSubscription,
+  skipFilter: boolean,
+): Promise<AxiosResponse> => {
+  await db.open();
+  const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+  let pushUrl: string = DEFAULT_PUSH_SERVER as string;
+  if (settings?.webPushServer) {
+    pushUrl = settings.webPushServer;
+  }
+
+  // This is a special value that tells the service worker to send a direct notification to the device, skipping filters.
+  // This is shared with the service worker and should be a constant. Look for the same name in additional-scripts.js
+  // Use something other than "Daily Update" https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/3c0e196c11bc98060ec5934e99e7dbd591b5da4d/app.py#L213
+  const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
+
+  const auth = Buffer.from(subscription.getKey("auth"));
+  const authB64 = auth
+    .toString("base64")
+    .replace(/\+/g, "-")
+    .replace(/\//g, "_")
+    .replace(/=+$/, "");
+  const p256dh = Buffer.from(subscription.getKey("p256dh"));
+  const p256dhB64 = p256dh
+    .toString("base64")
+    .replace(/\+/g, "-")
+    .replace(/\//g, "_")
+    .replace(/=+$/, "");
+  const newPayload = {
+    endpoint: subscription.endpoint,
+    keys: {
+      auth: authB64,
+      p256dh: p256dhB64,
+    },
+    message: `Test, where you will see this message ${
+      skipFilter ? "un" : ""
+    }filtered.`,
+    title: skipFilter ? DIRECT_PUSH_TITLE : "Your Web Push",
+  };
+  console.log("Sending a test web push message:", newPayload);
+  const payloadStr = JSON.stringify(newPayload);
+  const response = await axios.post(
+    pushUrl + "/web-push/send-test",
+    payloadStr,
+    {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    },
+  );
+
+  console.log("Got response from web push server:", response);
+  return response;
+};

src/views/AccountViewView.vue

@@ -126,7 +126,7 @@
         </div>
       </div>
       <div v-else>
-        Notification status may have changed. Revisit this page to see the
+        Notification status may have changed. Refresh this page to see the
         latest setting.
       </div>
       <router-link class="px-4 text-sm text-blue-500" to="/help-notifications">

src/views/HelpNotificationsView.vue

@@ -289,16 +289,10 @@
   </section>
 </template>
 <script lang="ts">
-import axios from "axios";
 import { Component, Vue } from "vue-facing-decorator";
 
 import QuickNav from "@/components/QuickNav.vue";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { DEFAULT_PUSH_SERVER } from "@/constants/app";
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Buffer = require("buffer/").Buffer;
+import { sendTestThroughPushServer } from "@/libs/util";
 
 interface Notification {
   group: string;
@@ -346,61 +340,16 @@ export default class HelpNotificationsView extends Vue {
     }
 
     try {
-      await db.open();
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      let pushUrl: string = DEFAULT_PUSH_SERVER as string;
-      if (settings?.webPushServer) {
-        pushUrl = settings.webPushServer;
-      }
-
-      // This is a special value that tells the service worker to send a direct notification to the device, skipping filters.
-      // This is shared with the service worker and should be a constant. Look for the same name in additional-scripts.js
-      // Use something other than "Daily Update" https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/3c0e196c11bc98060ec5934e99e7dbd591b5da4d/app.py#L213
-      const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
-
-      const auth = Buffer.from(this.subscription.getKey("auth"));
-      const authB64 = auth
-        .toString("base64")
-        .replace(/\+/g, "-")
-        .replace(/\//g, "_")
-        .replace(/=+$/, "");
-      const p256dh = Buffer.from(this.subscription.getKey("p256dh"));
-      const p256dhB64 = p256dh
-        .toString("base64")
-        .replace(/\+/g, "-")
-        .replace(/\//g, "_")
-        .replace(/=+$/, "");
-      const newPayload = {
-        endpoint: this.subscription.endpoint,
-        keys: {
-          auth: authB64,
-          p256dh: p256dhB64,
-        },
-        message: `Test, where you will see this message ${
-          skipFilter ? "un" : ""
-        }filtered.`,
-        title: skipFilter ? DIRECT_PUSH_TITLE : "Your Web Push",
-      };
-      console.log("Sending a test web push message:", newPayload);
-      const payloadStr = JSON.stringify(newPayload);
-      const response = await axios.post(
-        pushUrl + "/web-push/send-test",
-        payloadStr,
-        {
-          headers: {
-            "Content-Type": "application/json",
-          },
-        },
-      );
-
-      console.log("Got response from web push server:", response);
+      await sendTestThroughPushServer(this.subscription, skipFilter);
 
       this.$notify(
         {
           group: "alert",
           type: "success",
           title: "Test Web Push Sent",
-          text: "Check your device for the test web push message, depending on the filtering you chose.",
+          text:
+            "Check your device for the test web push message" +
+            (skipFilter ? "." : " if there are new items in your feed."),
         },
         -1,
       );