uses base64 instead of hex encoding, inspects encode param, updates d…

…iscover v2 & explore v2

src/discover/handle-discover.ts

@@ -15,7 +15,7 @@ export async function handleDiscover(request: Request, env: Env, _ctx: Execution
     if (version === VERSIONS.V1) {
         responsePayload = JSON.stringify(discoverData)
     } else {
-        responsePayload = JSON.stringify(makeResponsePayload(JSON.stringify(discoverData), version, env))
+        responsePayload = JSON.stringify(makeResponsePayload(JSON.stringify(discoverData), version, env, request.url))
     }
 
     return new Response(responsePayload, { headers: HEADERS })

src/explore/handle-explore.ts

@@ -1,4 +1,5 @@
 import { Env } from '../../worker-configuration'
+import { getParams } from '../utils/param-utils'
 import { VERSIONS, makeResponsePayload } from '../utils/versioning'
 import { Dataset } from "./storage/dataset"
 
@@ -23,9 +24,9 @@ export async function handleExpore(request: Request, env: Env, _ctx: ExecutionCo
         const version = request.url.includes(VERSIONS.V2) ? VERSIONS.V2 : VERSIONS.V1
         const dataset = new Dataset({ version })
 
+        delete params.encode
         const paramKeys = Object.keys(params)
 
-
         for (const rawKey of paramKeys) {
             if (rawKey === SHOULD_DISPLAY_LINK_KEY) {
                 dataset.addFilter(o => String(!!o.discover) === params[rawKey])
@@ -48,7 +49,7 @@ export async function handleExpore(request: Request, env: Env, _ctx: ExecutionCo
         if (version === VERSIONS.V1) {
             responsePayload = snapshot
         } else {
-            responsePayload = JSON.stringify(makeResponsePayload(snapshot, version, env))
+            responsePayload = JSON.stringify(makeResponsePayload(snapshot, version, env, request.url))
         }
 
         return new Response(responsePayload, { status: 200, headers: HEADERS })
@@ -58,15 +59,3 @@ export async function handleExpore(request: Request, env: Env, _ctx: ExecutionCo
     }
 }
 
-function getParams(requestUrl: string) {
-    const url = new URL(requestUrl)
-
-    const urlParams = new URLSearchParams(url.searchParams)
-    const params: Record<string, string> = {}
-
-    for (const [key, value] of urlParams) {
-        params[key] = value
-    }
-
-    return params
-}

src/utils/param-utils.ts

@@ -0,0 +1,12 @@
+export function getParams(requestUrl: string) {
+    const url = new URL(requestUrl)
+
+    const urlParams = new URLSearchParams(url.searchParams)
+    const params: Record<string, string> = {}
+
+    for (const [key, value] of urlParams) {
+        params[key] = value
+    }
+
+    return params
+}

src/utils/text-utils.ts

@@ -1,11 +1,6 @@
-export function stringToHex(input: string) {
-    let hex
-    let result = ""
+// @ts-nocheck
+import { Buffer } from 'node:buffer'
 
-    for (let i = 0; i < input.length; i++) {
-        hex = input.charCodeAt(i).toString(16)
-        result += ("000" + hex).slice(-4)
-    }
-
-    return result
+export function stringToBase64(input: string) {
+    return Buffer.from(input).toString('base64')
 }

src/utils/versioning.ts

@@ -1,24 +1,36 @@
 import { Env } from "../../worker-configuration"
 import { signData } from "./encrypt"
-import { stringToHex } from "./text-utils"
+import { getParams } from "./param-utils"
+import { stringToBase64 } from "./text-utils"
 
 export enum VERSIONS {
     V1 = "/v1/",
     V2 = "/v2/"
 }
 
-export function makeResponsePayload(payload: any, version: VERSIONS, env: Env) {
+const ENCODE_ENABLED_OPTIONS = new Set(["", "true"])
+
+export function makeResponsePayload(payload: any, version: VERSIONS, env: Env, requestUrl: string) {
     if (version === VERSIONS.V1) {
         return payload
     }
 
-    const hexData = stringToHex(payload)
+    const { encode } = getParams(requestUrl)
+    const shouldEncode = ENCODE_ENABLED_OPTIONS.has(encode)
+
+    let encodedData = payload
+    let displayData = JSON.parse(payload)
+
+    if (shouldEncode) {
+        encodedData = stringToBase64(encodedData)
+        console.log('after encoding::', encodedData)
+        displayData = encodedData
+    }
 
-    const { signature } = signData(hexData, env)
+    const { signature } = signData(encodedData, env)
 
     return {
-        data: JSON.parse(payload),
-        hexData,
+        data: displayData,
         signature,
     }
 }