Merge pull request #26 from depatchedmode/v0.8.2

v0.8.2

Author: depatchedmode

.eslintrc

@@ -0,0 +1,12 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
+  "env": {
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
+  ]
+}

.gitignore

@@ -14,11 +14,14 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
+*.js
+
 # sharp issue: https://sharp.pixelplumbing.com/install#cross-platform
 package-lock.json 
 
 node_modules
 dist
+built
 dist-ssr
 *.local
 

api/frame.js

@@ -1,11 +1,11 @@
-import { getFrameMessage } from "frames.js"
-import landingPage from '../src/landing-page';
-import { parseRequest, objectToURLSearchParams } from '../modules/utils';
-import buildButtons from '../modules/buildButtons';
-import buildInputs from '../modules/buildInputs';
-import getTargetFrame from '../modules/getTargetFrame';
+import { getFrameMessage } from "frames.js";
+import landingPage from '../src/landing-page.js';
+import { parseRequest, objectToURLSearchParams } from '../modules/utils.js';
+import buildButtons from '../modules/buildButtons.js';
+import buildInputs from '../modules/buildInputs.js';
+import getTargetFrame from '../modules/getTargetFrame.js';
 
-export default async (req, context) => {
+export default async (req) => {
     try {
         const requestURL = new URL(req.url);
         const payload = await parseRequest(req);
@@ -40,14 +40,15 @@ const respondWithRedirect = (redirectURL) => {
         {
             status: 302,
             headers: { 
-                'Location': internalRedirectURL,
+                'Location': internalRedirectURL.toString(),
             },
         }
     );
 }
 
 const respondWithFrame = async (targetFrame, frameMessage) => {
     const searchParams = {
+        t: new Date().valueOf(),
         targetFrameName: targetFrame.name, 
         frameMessage
     }

api/index.js renamed to api/index.ts

@@ -1,22 +1,22 @@
 import satori from "satori";
 import sharp from "sharp";
 import { html } from "satori-html";
-import fonts from "../src/fonts";
-import frames from "../src/frames";
-import { URLSearchParamsToObject } from '../modules/utils';
+import fonts from "../src/fonts.js";
+import frames from "../src/frames/index.js";
+import { URLSearchParamsToObject } from '../modules/utils.js';
 
-export default async (req, context) => {
+export default async (req) => {
     const url = new URL(req.url);
     const params = URLSearchParamsToObject(url.searchParams);
-    const targetFrame = frames[params.targetFrameName];
-    const markup = await targetFrame.build(params.frameMessage);
+    const targetFrame = frames[params['targetFrameName']];
+    const markup = await targetFrame.build(params['frameMessage']);
 
     const svg = await satori(
         html(markup), 
         {
             width: 1200,
             height: 630,
-            fonts
+            fonts: fonts,
         }
     );
     const svgBuffer = Buffer.from(svg);

api/og-image.js renamed to api/og-image.ts

@@ -1,10 +1,9 @@
 import { getStore } from '@netlify/blobs';
-import frame from '../api/frame';
 
 // Utility functions to abstract the fetching and setting operations
 const fetchData = async (key) => {
     const store = getStore('antiTheft');
-    let data = await store.get(key, 'json') || [];
+    let data = await store.get(key, { type: 'json' } ) || [];
     if (!data.length) {
         data = process.env[key] ? JSON.parse(process.env[key]) : [];
     }
@@ -25,15 +24,15 @@ const setBoundCasts = (castHashes) => setData('BOUND_CAST_HASHES', castHashes);
 
 // Modified functions to use the updated getters and setters
 const addToList = async (getter, setter, item) => {
-    let list = await getter();
+    const list = await getter();
     if (!list.includes(item)) {
         list.push(item);
         await setter(list);
     }
 };
 
 const removeFromList = async (getter, setter, item) => {
-    let list = await getter();
+    const list = await getter();
     const index = list.indexOf(item);
     if (index > -1) {
         list.splice(index, 1);
@@ -52,10 +51,8 @@ const removeBoundCast = (castHash) => removeFromList(getBoundCasts, setBoundCast
 // 2. The castHash is in boundCasts.
 // 3. Both boundCasts & boundAccounts are empty.
 const isFrameStolen = async (frameMessage) => {
-    console.log('isFrameStolen', frameMessage);
     const { castId, requestURL } = frameMessage;
     if (!castId || !requestURL) {
-        console.log('isFrameStolen:quickExit', castId, requestURL);
         return false;
     }
 
@@ -67,11 +64,23 @@ const isFrameStolen = async (frameMessage) => {
     const isCastAllowed = boundCasts.includes(castHash) || boundCasts.length === 0;
     const isFirstParty = requestURL ? requestURL.indexOf(process.env.URL) > -1 : true;
 
-    console.log('isAuthorAllowed', isAuthorAllowed, castAuthorID, boundAccounts);
-    console.log('isCastAllowed', isCastAllowed, castHash, boundCasts);
-    console.log('isFirstParty', isFirstParty);
+    const isStolen = !isFirstParty || !isAuthorAllowed || !isCastAllowed;
 
-    return !isFirstParty || !isAuthorAllowed || !isCastAllowed;
+    // record the theft
+    if (isStolen) {
+        const store = getStore('stolenFrames');
+        const stolenFrame = await store.get(castHash, { type: 'json' }) || {
+            castHash,
+            castAuthorID,
+            views: 0,
+            firstView: new Date().toUTCString(),
+        };
+        stolenFrame.view++;
+        stolenFrame.lastView = new Date().toUTCString();
+        store.setJSON(castHash, stolenFrame);
+    }
+
+    return isStolen;
 };
 
 export {

api/redirect.js renamed to api/redirect.ts

@@ -1,8 +1,8 @@
-import buildTextInput from "./buildTextInput";
+import buildTextInput from "./buildTextInput.js";
 
 export default (inputs) => {
     return inputs
-        .map((input, index) => {
+        .map((input) => {
             switch (input.type) {
                 case 'text':
                     return buildTextInput(input);