fix: Cleanup redundant code, update TS viewer URLs & fix types

Author: micwallace

apps/extension/entrypoints/background.ts

@@ -1,4 +1,3 @@
-import {getTwitterHandle} from "@/lib/get-twitter-handle.ts";
 
 export default defineBackground(() => {
   // never mark the function here async
@@ -7,20 +6,6 @@ export default defineBackground(() => {
       return null
     }
 
-    if (msg.type === "TLINK_API_REQUEST"){
-
-      console.log("Handling TLink API request from background: ", msg);
-
-      handleTlinkApiRequest(msg.method, msg.payload).then((res) => {
-        sendResponse(res);
-      }).catch((err) => {
-        // TODO: Error handling
-        console.error("error handling message", err, msg);
-      })
-
-      return true;
-    }
-
     let rpcMethod: string = ""
     let params: any = []
 
@@ -59,54 +44,6 @@ export default defineBackground(() => {
     return true
   })
 
-  async function handleTlinkApiRequest(method: string, payload: any) {
-    switch (method) {
-      case "getTurnstileToken":
-      case "getRecaptchaToken":
-        return handleTlinkApiViaTSViewerWindow(method, payload);
-    }
-  }
-
-  async function handleTlinkApiViaTSViewerWindow(method: string, payload: any){
-
-    return new Promise(async (resolve, reject) => {
-
-      let popup: WindowProxy|null;
-
-      const requestUrl = `http://localhost:3333/?viewType=tlink-api&method=${method}&payload=${encodeURIComponent(JSON.stringify(payload))}`
-
-      function handleMessage(event: MessageEvent){
-        if (event.source !== popup) {
-          return
-        }
-
-        popup!.onclose = null;
-
-        resolve(event.data);
-      }
-
-      window.addEventListener("message", handleMessage);
-
-
-      //popup = window.open(requestUrl, "", 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=550px,height=800px`');
-      popup = await chrome.windows.create({
-        url: requestUrl,
-        type: 'popup',
-        focused: true,
-        setSelfAsOpener: true
-        // incognito, top, left, ...
-      }) as WindowProxy;
-
-      if (!popup)
-        reject("Failed to open the popup window");
-
-      popup!.onclose = () => {
-        reject("Popup closed");
-      }
-
-    });
-  }
-
   async function handleWalletCommunication({
     tabId,
     rpcMethod,

apps/extension/lib/handle-tlink-api.ts

@@ -1,4 +1,5 @@
 import { getTwitterHandle } from "@/lib/get-twitter-handle"
+import {TS_VIEWER_URL} from "@repo/tlinks/utils";
 
 export async function handleTlinkApiRequest(method: string, payload: any) {
   switch (method) {
@@ -23,7 +24,7 @@ async function handleTlinkApiViaTSViewerWindow(method: string, payload: any){
         let popup: WindowProxy|null;
         let closedTimer;
 
-        const requestUrl = `http://localhost:3333/?viewType=tlink-api&method=${method}&payload=${encodeURIComponent(JSON.stringify(payload))}`
+        const requestUrl = `${TS_VIEWER_URL}?viewType=tlink-api&method=${method}&payload=${encodeURIComponent(JSON.stringify(payload))}`
 
         function handleMessage(event: MessageEvent){
 
@@ -59,7 +60,7 @@ async function handleTlinkApiViaTSViewerWindow(method: string, payload: any){
     });
 }
 
-function popupCenter (url, title, w, h) {
+function popupCenter(url: string, title: string, w: number, h: number) {
     const left = (screen.width/2)-(w/2);
     const top = (screen.height/2)-(h/2);
     return window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left);

packages/tlinks/src/utils/build-ts-ifram-url.ts

@@ -1,3 +1,5 @@
+import {TS_VIEWER_URL} from "./constants.ts";
+
 export const buildTsIframeUrl = ({
   chainId,
   contract,
@@ -26,7 +28,7 @@ export const buildTsIframeUrl = ({
   if (tokenId) dAppUrlParams.append('tokenId', tokenId);
   if (scriptId) dAppUrlParams.append('scriptId', scriptId);
 
-  return `https://viewer-staging.tokenscript.org/?${dAppUrlParams.toString()}${
+  return `${TS_VIEWER_URL}?${dAppUrlParams.toString()}${
     (hash || '').length > 1 ? hash : ''
   }`;
 };

packages/tlinks/src/utils/constants.ts

@@ -116,4 +116,6 @@ export class SimpleActionComponent extends AbstractActionComponent {
         account,
       };
     }
-  }
+  }
+
+export const TS_VIEWER_URL = "https://viewer.tokenscript.org/";