changes and misc and stuff (#77)

* audit functions?

* no more newsletter

* use kvstore for page stats

* kvstore all the things

* fixes

* update content

Author: dshomoye

content

@@ -0,0 +1,64 @@
+const fetch = require("node-fetch")
+
+const KVstoreEndpoint = "https://kvstore.dmlas.workers.dev"
+console.log("key ", process.env.PRESHARED_KEY)
+const headers = {
+  PRESHARED_KEY: process.env.PRESHARED_KEY,
+}
+
+const get = async (key) => {
+  const r = await fetch(KVstoreEndpoint, {
+    headers,
+    method: "POST",
+    body: JSON.stringify({
+      op: "READ",
+      key,
+    }),
+  })
+  const res = await r.text()
+  return res
+}
+
+const put = async (key, value) => {
+  await fetch(KVstoreEndpoint, {
+    headers,
+    method: "POST",
+    body: JSON.stringify({
+      op: "WRITE",
+      key,
+      value,
+    }),
+  })
+  return
+}
+
+const clear = async (key) => {
+  await fetch(KVstoreEndpoint, {
+    headers,
+    method: "POST",
+    body: JSON.stringify({
+      op: "DELETE",
+      key,
+    }),
+  })
+  return
+}
+
+const list = async (prefix) => {
+  const r = await fetch(KVstoreEndpoint, {
+    headers,
+    method: "POST",
+    body: JSON.stringify({
+      op: "LIST",
+      prefix,
+    }),
+  })
+  const res = await r.json()
+  return res
+}
+
+exports.get = get
+exports.put = put
+exports.clear = clear
+exports.list = list
+

functions/kvstoreclient.js

@@ -1,68 +1,48 @@
-const { GraphQLClient } = require("graphql-request")
+const { get, put } = require("./kvstoreclient")
 
-const hasuraEndpoint = "https://dshomoye.hasura.app/v1/graphql"
-const hasuraAdminKey = process.env.HASURA_ADMIN_KEY
-
-const client = new GraphQLClient(hasuraEndpoint, {
-  headers: {
-    "x-hasura-admin-secret": hasuraAdminKey,
-  },
-})
+const buildKey = (pathname, hostname) =>
+  `dshomoye.dev:page_stats:likes:${hostname}:${pathname}`
 
 const getPageLikes = async (pathname, hostname) => {
-  const query = `query MyQuery {
-    page_stats(where: {pathname: {_eq: "${pathname}"}, hostname: {_eq: "${hostname}"}}) {
-      hostname
-      likes
-      pathname
-    }
-  }`
-  const data = await client.request(query)
-  return data.page_stats
-}
-
-const addPage = async (pathname, hostname) => {
-  const query = `mutation MyMutation {
-    insert_page_stats(objects: {hostname: "${hostname}", pathname: "${pathname}"}) {
-      returning {
-        likes
-      }
-    }
-  }`
-  const res = await client.request(query)
-  return res.insert_page_stats.returning
+  const res = await get(buildKey(pathname, hostname))
+  return res
 }
 
 const updatePageLike = async (pathname, hostname, by = 1) => {
-  const query = `mutation MyMutation {
-    update_page_stats(where: {hostname: {_eq: "${hostname}"}, pathname: {_eq: "${pathname}"}}, _inc: {likes: ${by}}) {
-      returning {
-        likes
-      }
-    }
-  }`
-  const res = await client.request(query)
-  return res.update_page_stats.returning
+  const current = await getPageLikes(pathname, hostname)
+  if (!current) {
+    const nextVal = by > 0 ? by : 0;
+    console.log('updating page, current is ', nextVal)
+    await put(buildKey(pathname, hostname), nextVal)
+    return nextVal
+  } else {
+    let count = parseInt(current)
+    count += by
+    await put(buildKey(pathname, hostname), count)
+    return count
+  }
 }
 
 exports.handler = async (event) => {
+  if (event.httpMethod != "POST") {
+    return {
+      statusCode: 404,
+      body: `{"error": "Not Found"}`,
+    }
+  }
   const eventData = JSON.parse(event.body)
   if (eventData.action === "get_likes") {
     const { pathname, hostname } = eventData.payload
     let res = await getPageLikes(pathname, hostname)
-    if (res.length > 0) {
+    if (!res) {
       return {
         statusCode: 200,
-        body: JSON.stringify({
-          likes: res[0].likes,
-        }),
+        body: JSON.stringify({ likes: 0 }),
       }
-    }
-    res = await addPage(pathname, hostname)
-    if (res.length > 0) {
+    } else {
       return {
         statusCode: 200,
-        body: JSON.stringify(res[0]),
+        body: JSON.stringify({ likes: res }),
       }
     }
   } else if (
@@ -77,7 +57,7 @@ exports.handler = async (event) => {
     )
     return {
       statusCode: 200,
-      body: JSON.stringify(res[0]),
+      body: JSON.stringify({ likes: res }),
     }
   }
 

functions/package-lock.json

@@ -1,14 +1,5 @@
-const { GraphQLClient } = require("graphql-request")
 const webpush = require("web-push")
-
-const hasuraEndpoint = "https://dshomoye.hasura.app/v1/graphql"
-const hasuraAdminKey = process.env.HASURA_ADMIN_KEY
-
-const client = new GraphQLClient(hasuraEndpoint, {
-  headers: {
-    "x-hasura-admin-secret": hasuraAdminKey,
-  },
-})
+const { get, list } = require("./kvstoreclient")
 
 const vapidPrivateKey = process.env.VAPID_PRIVATE_KEY
 const vapidPublicKey =
@@ -30,20 +21,18 @@ const isAuthenticated = (event) => {
   return false
 }
 
-const getAllSubscriptions = async () => {
-  const query = `query MyQuery {
-    push_subscriptions {
-      subscription
+const allSubscriptions = async () => {
+  /** @type {string[]} */
+  const allKeys = await list(`dshomoye.dev:push-subscriptions:`)
+  const promises = allKeys.map(async (k) => {
+    const r = await get(k)
+    if (typeof r === "string") {
+      return JSON.parse(r)
     }
-  }`
-  try {
-    const data = await client.request(query)
-    const subscriptions = data.push_subscriptions
-    return subscriptions
-  } catch (error) {
-    console.error("error getting subs ", error)
-    return []
-  }
+    return r
+  })
+  const result = await Promise.all(promises)
+  return result
 }
 
 const sendPushMsg = async (subscription, message) => {
@@ -70,7 +59,7 @@ exports.handler = async (event) => {
   }
   switch (method) {
     case "POST":
-      const subscriptions = await getAllSubscriptions()
+      const subscriptions = await allSubscriptions()
       const promises = subscriptions.map(async (subscription) => {
         return await sendPushMsg(subscription.subscription, event.body)
       })
@@ -86,7 +75,7 @@ exports.handler = async (event) => {
     default:
       return {
         statusCode: 400,
-        body: `{"error": "Unsupportd method"}`,
+        body: `{"error": "Unsupported method"}`,
       }
   }
 }

functions/page-stats.js

@@ -1,72 +1,20 @@
-const { GraphQLClient } = require("graphql-request")
 const { pushToSubscription } = require("./push-notification")
+const { put, clear } = require("./kvstoreclient")
 
-const hasuraEndpoint = "https://dshomoye.hasura.app/v1/graphql"
-const hasuraAdminKey = process.env.HASURA_ADMIN_KEY
-
-const client = new GraphQLClient(hasuraEndpoint, {
-  headers: {
-    "x-hasura-admin-secret": hasuraAdminKey,
-  },
-})
+const buildKey = (endpoint) => `dshomoye.dev:push-subscriptions:${endpoint}`
 
 const addSubscription = async (subscription) => {
-  const query = `mutation MyMutation($endpoint: String, $subscription: jsonb) {
-    insert_push_subscriptions_one(object: {endpoint: $endpoint, subscription: $subscription}) {
-      endpoint
-      created_at
-      subscription
-      updated_at
-    }
-  }`
-  const variables = {
-    endpoint: subscription.endpoint,
-    subscription,
-  }
-  try {
-    const { status, errors } = await client.rawRequest(query, variables)
-    console.log("status, error ", status, errors)
-    if (status >= 300) {
-      throw new Error(`Failed to add subscription: ${errors.toString()}`)
-    }
-    const welcomeMsg = JSON.stringify({
-      title: "Awesome!",
-      message: "Push Notifications are now enabled.",
-    })
-    const sent = await pushToSubscription(subscription, welcomeMsg)
-    return {
-      statusCode: 201,
-      body: JSON.stringify({
-        sent,
-      }),
-    }
-  } catch (error) {
-    console.error("error adding subsription: ", error)
-    return {
-      statusCode: 500,
-      body: `${error}`,
-    }
-  }
+  await put(buildKey(subscription.endpoint), JSON.stringify(subscription))
+  const welcomeMsg = JSON.stringify({
+    title: "Awesome!",
+    message: "Push Notifications are now enabled.",
+  })
+  const sent = await pushToSubscription(subscription, welcomeMsg)
+  return sent
 }
 
 const removeSubscription = async (endpoint) => {
-  const query = `mutation MyMutation {
-    delete_push_subscriptions_by_pk(endpoint: "${endpoint}") {
-      updated_at
-    }
-  }`
-  try {
-    await client.request(query)
-    return {
-      statusCode: 204,
-    }
-  } catch (error) {
-    console.error("error deleting subscripton ", error)
-    return {
-      statusCode: 500,
-      body: JSON.stringify(error),
-    }
-  }
+  await clear(buildKey(endpoint))
 }
 
 exports.handler = async function (event) {
@@ -75,8 +23,13 @@ exports.handler = async function (event) {
     case "POST":
       try {
         const addResponse = await addSubscription(JSON.parse(event.body))
-        console.log("New Subscription handled.")
-        return addResponse
+        return {
+          statusCode: 201,
+          body: JSON.stringify({
+            message: "saved",
+            sent: addResponse
+          })
+        }
       } catch (error) {
         console.error("Error saving subscription ", error)
         return {
@@ -87,9 +40,11 @@ exports.handler = async function (event) {
     case "DELETE":
       try {
         const eventData = JSON.parse(event.body)
-        const delResponse = await removeSubscription(eventData.endpoint)
+        await removeSubscription(eventData.endpoint)
         console.log("Successfully unsubsribed: ", eventData.endpoint)
-        return delResponse
+        return {
+          statusCode: 204
+        }
       } catch (error) {
         console.error("Failed to delete subscription ", error)
         return {