Merge pull request Lissy93#139 from Lissy93/FEAT/astroify

FEAT - Astroify

Author: Lissy93

.env

@@ -24,3 +24,4 @@ REACT_APP_WHO_API_KEY=''
 # API_CORS_ORIGIN='*'             # Enable CORS, by setting your allowed hostname(s) here
 # API_ENABLE_RATE_LIMIT='true'    # Enable rate limiting for the API
 # REACT_APP_API_ENDPOINT='/api'   # The endpoint for the API (can be local or remote)
+# ENABLE_ANALYTICS='false'        # Enable Plausible hit counter for the frontend

.gitignore

@@ -9,12 +9,14 @@
 /build/
 
 # ------------------------
-#         DEPLOYMENT
+#         BUILT FILES
 # ------------------------
+dist/
 .vercel/
 .netlify/
 .webpack/
 .serverless/
+.astro/
 
 # ------------------------
 #         DEPENDENCIES

Dockerfile

@@ -1,5 +1,5 @@
 # Specify the Node.js version to use
-ARG NODE_VERSION=16
+ARG NODE_VERSION=21
 
 # Specify the Debian version to use, the default is "bullseye"
 ARG DEBIAN_VERSION=bullseye
@@ -30,7 +30,7 @@ COPY package.json yarn.lock ./
 
 # Run yarn install to install dependencies and clear yarn cache
 RUN apt-get update && \
-    yarn install --production --frozen-lockfile --network-timeout 100000 && \
+    yarn install --frozen-lockfile --network-timeout 100000 && \
     rm -rf /app/node_modules/.cache
 
 # Copy all files to working directory
@@ -59,4 +59,4 @@ EXPOSE ${PORT:-3000}
 ENV CHROME_PATH='/usr/bin/chromium'
 
 # Define the command executed when the container starts and start the server.js of the Node.js application
-CMD ["yarn", "serve"]
+CMD ["yarn", "start"]

api/_common/middleware.js

@@ -124,4 +124,8 @@ const commonMiddleware = (handler) => {
   return nativeMode ? vercelHandler : netlifyHandler;
 };
 
-module.exports = commonMiddleware;
+if (PLATFORM === 'NETLIFY') {
+  module.exports = commonMiddleware;
+}
+
+export default commonMiddleware;

api/archives.js

@@ -1,5 +1,5 @@
-const axios = require('axios');
-const middleware = require('./_common/middleware');
+import axios from 'axios';
+import middleware from './_common/middleware.js';
 
 const convertTimestampToDate = (timestamp) => {
   const [year, month, day, hour, minute, second] = [
@@ -46,7 +46,7 @@ const getScanFrequency = (firstScan, lastScan, totalScans, changeCount) => {
   };
 };
 
-const getWaybackData = async (url) => {
+const wayBackHandler = async (url) => {
   const cdxUrl = `https://web.archive.org/cdx/search/cdx?url=${url}&output=json&fl=timestamp,statuscode,digest,length,offset`;
 
   try {
@@ -80,5 +80,5 @@ const getWaybackData = async (url) => {
   }
 };
 
-module.exports = middleware(getWaybackData);
-module.exports.handler = middleware(getWaybackData);
+export const handler = middleware(wayBackHandler);
+export default handler;

api/block-lists.js

@@ -1,6 +1,6 @@
-const dns = require('dns');
-const { URL } = require('url');
-const middleware = require('./_common/middleware');
+import dns from 'dns';
+import { URL } from 'url';
+import middleware from './_common/middleware.js';
 
 const DNS_SERVERS = [
   { name: 'AdGuard', ip: '176.103.130.130' },
@@ -94,12 +94,12 @@ const checkDomainAgainstDnsServers = async (domain) => {
   return results;
 };
 
-const handler = async (url) => {
+export const blockListHandler = async (url) => {
   const domain = new URL(url).hostname;
   const results = await checkDomainAgainstDnsServers(domain);
   return { blocklists: results };
 };
 
-module.exports = middleware(handler);
-module.exports.handler = middleware(handler);
+export const handler = middleware(blockListHandler);
+export default handler;
 

api/carbon.js

@@ -1,7 +1,7 @@
-const https = require('https');
-const middleware = require('./_common/middleware');
+import https from 'https';
+import middleware from './_common/middleware.js';
 
-const handler = async (url) => {
+const carbonHandler = async (url) => {
 
   // First, get the size of the website's HTML
   const getHtmlSize = (url) => new Promise((resolve, reject) => {
@@ -48,5 +48,5 @@ const handler = async (url) => {
   }
 };
 
-module.exports = middleware(handler);
-module.exports.handler = middleware(handler);
+export const handler = middleware(carbonHandler);
+export default handler;

api/cookies.js

@@ -1,6 +1,6 @@
-const axios = require('axios');
-const puppeteer = require('puppeteer');
-const middleware = require('./_common/middleware');
+import axios from 'axios';
+import puppeteer from 'puppeteer';
+import middleware from './_common/middleware.js';
 
 const getPuppeteerCookies = async (url) => {
   const browser = await puppeteer.launch({
@@ -21,7 +21,7 @@ const getPuppeteerCookies = async (url) => {
   }
 };
 
-const handler = async (url) => {
+const cookieHandler = async (url) => {
   let headerCookies = null;
   let clientCookies = null;
 
@@ -54,5 +54,5 @@ const handler = async (url) => {
   return { headerCookies, clientCookies };
 };
 
-module.exports = middleware(handler);
-module.exports.handler = middleware(handler);
+export const handler = middleware(cookieHandler);
+export default handler;

api/dns-server.js

@@ -1,9 +1,8 @@
-const dns = require('dns');
-const dnsPromises = dns.promises;
-const axios = require('axios');
-const middleware = require('./_common/middleware');
+import { promises as dnsPromises, lookup } from 'dns';
+import axios from 'axios';
+import middleware from './_common/middleware.js';
 
-const handler = async (url) => {
+const dnsHandler = async (url) => {
   try {
     const domain = url.replace(/^(?:https?:\/\/)?/i, "");
     const addresses = await dnsPromises.resolve4(domain);
@@ -41,5 +40,7 @@ const handler = async (url) => {
   }
 };
 
-module.exports = middleware(handler);
-module.exports.handler = middleware(handler);
+
+export const handler = middleware(dnsHandler);
+export default handler;
+

api/dns.js

@@ -1,8 +1,8 @@
-const dns = require('dns');
-const util = require('util');
-const middleware = require('./_common/middleware');
+import dns from 'dns';
+import util from 'util';
+import middleware from './_common/middleware.js';
 
-const handler = async (url) => {
+const dnsHandler = async (url) => {
   let hostname = url;
 
   // Handle URLs by extracting hostname
@@ -51,5 +51,5 @@ const handler = async (url) => {
   }
 };
 
-module.exports = middleware(handler);
-module.exports.handler = middleware(handler);
+export const handler = middleware(dnsHandler);
+export default handler;