AmineTMIRI/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapter migrate from vercel to node

Browse Source
This commit is contained in:
MuslemRahimi 2024-09-19 14:36:02 +02:00
parent a825f2a7a0
commit c7cd229cae
6 changed files with 727 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

861
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -21,7 +21,7 @@
"@internationalized/date": "^3.5.5", "@internationalized/date": "^3.5.5",
"@playwright/test": "^1.43.1", "@playwright/test": "^1.43.1",
"@rollup/plugin-dynamic-import-vars": "^2.1.2", "@rollup/plugin-dynamic-import-vars": "^2.1.2",
"@sveltejs/adapter-vercel": "^5.3.0", "@sveltejs/adapter-node": "^5.2.3",
"@sveltejs/kit": "^2.5.15", "@sveltejs/kit": "^2.5.15",
"@sveltejs/vite-plugin-svelte": "^3.1.0", "@sveltejs/vite-plugin-svelte": "^3.1.0",
"@types/gtag.js": "^0.0.19", "@types/gtag.js": "^0.0.19",

26
src/hooks.server.ts
View File

@ -1,30 +1,38 @@
import PocketBase from "pocketbase"; import PocketBase from "pocketbase";
import { serializeNonPOJOs } from "$lib/utils"; import { serializeNonPOJOs } from "$lib/utils";
const usRegion = new Set(["cle1", "iad1", "pdx1", "sfo1"]);
export const handle = async ({ event, resolve }) => { export const handle = async ({ event, resolve }) => {
// Use optional chaining and nullish coalescing for safer property access // Use optional chaining and nullish coalescing for safer property access
const regionHeader = const regionHeader =
event?.request?.headers?.get("x-vercel-id") ?? event?.request?.headers?.get("x-vercel-id") ??
"fra1::fra1::8t4xg-1700258428633-157d82fdfcc7"; "fra1::fra1::8t4xg-1700258428633-157d82fdfcc7";
// Use a more compatible way to get the first element of the split array const ip =
const userRegion = regionHeader.split("::")[0] || ""; event.request.headers.get("x-forwarded-for") ||
event.request.headers.get("remote-address");
const isUsRegion = usRegion.has(userRegion); let isUS = false;
if (ip) {
const geoResponse = await fetch(`https://ipinfo.io/${ip}/geo`);
const geoData = await geoResponse.json();
if (geoData.country === "US") {
isUS = true;
//console.log("yelllo", geoData);
}
}
// Use a ternary operator instead of the logical OR for better compatibility // Use a ternary operator instead of the logical OR for better compatibility
const pbURL = isUsRegion const pbURL = isUS
? import.meta.env.VITE_USEAST_POCKETBASE_URL ? import.meta.env.VITE_USEAST_POCKETBASE_URL
: import.meta.env.VITE_EU_POCKETBASE_URL; : import.meta.env.VITE_EU_POCKETBASE_URL;
const apiURL = isUsRegion const apiURL = isUS
? import.meta.env.VITE_USEAST_API_URL ? import.meta.env.VITE_USEAST_API_URL
: import.meta.env.VITE_EU_API_URL; : import.meta.env.VITE_EU_API_URL;
const fastifyURL = isUsRegion const fastifyURL = isUS
? import.meta.env.VITE_USEAST_FASTIFY_URL ? import.meta.env.VITE_USEAST_FASTIFY_URL
: import.meta.env.VITE_EU_FASTIFY_URL; : import.meta.env.VITE_EU_FASTIFY_URL;
const wsURL = isUsRegion const wsURL = isUS
? import.meta.env.VITE_USEAST_WS_URL ? import.meta.env.VITE_USEAST_WS_URL
: import.meta.env.VITE_EU_WS_URL; : import.meta.env.VITE_EU_WS_URL;

309
src/routes/community/create-post/+page.server.ts
View File

@ -1,53 +1,57 @@
import { createPostTextSchema,createPostImageSchema, createPostLinkSchema } from '$lib/schemas'; import {
import { validateData } from '$lib/utils'; createPostTextSchema,
import { error, fail, redirect } from '@sveltejs/kit'; createPostImageSchema,
import { serialize } from 'object-to-formdata'; createPostLinkSchema,
import { marked } from 'marked'; } from "$lib/schemas";
import { validateData } from "$lib/utils";
import got from 'got'; import { error, fail, redirect } from "@sveltejs/kit";
import cheerio from 'cheerio'; import { serialize } from "object-to-formdata";
import BlobUtil from 'blob-util'; import { marked } from "marked";
import sharp from 'sharp';
export const config = {
runtime: 'nodejs20.x',
};
import got from "got";
import cheerio from "cheerio";
import * as blobUtil from "blob-util"; // Changed import
import sharp from "sharp";
function removeDuplicateClasses(str) { function removeDuplicateClasses(str) {
return str.replace(/class="([^"]*)"/, (match, classAttr) => `class="${[...new Set(classAttr.split(' '))].join(' ')}"`); return str.replace(
/class="([^"]*)"/,
(match, classAttr) =>
`class="${[...new Set(classAttr.split(" "))].join(" ")}"`
);
} }
function addClassesToHtml(htmlString) { function addClassesToHtml(htmlString) {
// Helper function to add a class to a specific tag // Helper function to add a class to a specific tag
function addClassToTag(tag, className) { function addClassToTag(tag, className) {
// Add class if the tag doesn't already have a class attribute // Add class if the tag doesn't already have a class attribute
const regex = new RegExp(`<${tag}(?![^>]*\\bclass=)([^>]*)>`, 'g'); const regex = new RegExp(`<${tag}(?![^>]*\\bclass=)([^>]*)>`, "g");
htmlString = htmlString.replace(regex, `<${tag} class="${className}"$1>`); htmlString = htmlString.replace(regex, `<${tag} class="${className}"$1>`);
// Append the new class to tags that already have a class attribute, ensuring no duplicates // Append the new class to tags that already have a class attribute, ensuring no duplicates
const regexWithClass = new RegExp(`(<${tag}[^>]*\\bclass=["'][^"']*)(?!.*\\b${className}\\b)([^"']*)["']`, 'g'); const regexWithClass = new RegExp(
`(<${tag}[^>]*\\bclass=["'][^"']*)(?!.*\\b${className}\\b)([^"']*)["']`,
"g"
);
htmlString = htmlString.replace(regexWithClass, `$1 ${className}$2"`); htmlString = htmlString.replace(regexWithClass, `$1 ${className}$2"`);
} }
// Add classes to headings // Add classes to headings
addClassToTag('h1', 'text-lg'); addClassToTag("h1", "text-lg");
addClassToTag('h2', 'text-lg'); addClassToTag("h2", "text-lg");
addClassToTag('h3', 'text-lg'); addClassToTag("h3", "text-lg");
addClassToTag('h4', 'text-lg'); addClassToTag("h4", "text-lg");
addClassToTag('h5', 'text-lg'); addClassToTag("h5", "text-lg");
addClassToTag('h6', 'text-lg'); addClassToTag("h6", "text-lg");
// Add classes to anchor tags // Add classes to anchor tags
addClassToTag('a', 'text-blue-400 hover:text-white underline'); addClassToTag("a", "text-blue-400 hover:text-white underline");
// Add classes to ordered lists // Add classes to ordered lists
addClassToTag('ol', 'list-decimal ml-10 text-sm'); addClassToTag("ol", "list-decimal ml-10 text-sm");
// Add classes to unordered lists // Add classes to unordered lists
addClassToTag('ul', 'list-disc ml-10 text-sm -mt-5'); addClassToTag("ul", "list-disc ml-10 text-sm -mt-5");
// Add classes to blockquotes and their paragraphs // Add classes to blockquotes and their paragraphs
function addClassToBlockquote() { function addClassToBlockquote() {
@ -72,131 +76,103 @@ export const config = {
return htmlString; return htmlString;
} }
export const load = async ({ locals }) => { export const load = async ({ locals }) => {
if (!locals.pb.authStore.isValid) { if (!locals.pb.authStore.isValid) {
redirect(303, '/login'); redirect(303, "/login");
} }
}; };
export const actions = { export const actions = {
createPostText: async ({ request, locals }) => { createPostText: async ({ request, locals }) => {
let newPost = "";
let newPost = '';
const body = await request.formData(); const body = await request.formData();
body.delete('thumbnail'); body.delete("thumbnail");
body.append('user', locals?.user?.id); body.append("user", locals?.user?.id);
let { formData, errors } = await validateData(body, createPostTextSchema); let { formData, errors } = await validateData(body, createPostTextSchema);
formData.description = addClassesToHtml(marked(formData?.description)) formData.description = addClassesToHtml(marked(formData?.description));
formData.tagTopic = JSON.parse(formData.tagTopic)[0];
formData.upvote = 1;
formData.tagTopic = JSON.parse(formData.tagTopic)[0] if (errors) {
formData.upvote = 1
if(errors)
{
return fail(400, { return fail(400, {
data: formData, data: formData,
errors: errors.fieldErrors errors: errors.fieldErrors,
}) });
} }
//Each post gives the user +1 Karma points //Each post gives the user +1 Karma points
await locals.pb.collection("users").update(locals.user.id, { await locals.pb.collection("users").update(locals.user.id, {
"karma+": 1, "karma+": 1,
}) });
try { try {
newPost = await locals.pb.collection("posts").create(serialize(formData));
newPost = await locals.pb.collection('posts').create(serialize(formData));
// add the tagTopic manually because serialize does not work on arrays // add the tagTopic manually because serialize does not work on arrays
await locals?.pb.collection("posts").update(newPost.id, { await locals?.pb.collection("posts").update(newPost.id, {
"tagTopic": formData.tagTopic, tagTopic: formData.tagTopic,
}) });
//Save it collection alreadyVoted to keep track if user voted or not //Save it collection alreadyVoted to keep track if user voted or not
//FormData for alreadyVoted //FormData for alreadyVoted
let formDataAlreadyVoted = new FormData(); let formDataAlreadyVoted = new FormData();
formDataAlreadyVoted.append('post', newPost?.id); formDataAlreadyVoted.append("post", newPost?.id);
formDataAlreadyVoted.append('user', newPost?.user); formDataAlreadyVoted.append("user", newPost?.user);
formDataAlreadyVoted.append('type', 'upvote'); formDataAlreadyVoted.append("type", "upvote");
//console.log(formDataAlreadyVoted) //console.log(formDataAlreadyVoted)
await locals.pb.collection('alreadyVoted').create(formDataAlreadyVoted); await locals.pb.collection("alreadyVoted").create(formDataAlreadyVoted);
} catch (err) { } catch (err) {
console.log('Error: ', err); console.log("Error: ", err);
error(err.status, err.message); error(err.status, err.message);
} }
if (newPost?.id?.length !== 0) { if (newPost?.id?.length !== 0) {
redirect(303, '/community/post/'+newPost?.id); redirect(303, "/community/post/" + newPost?.id);
} else { } else {
redirect(303, '/community'); redirect(303, "/community");
} }
}, },
createPostImage: async ({ request, locals }) => { createPostImage: async ({ request, locals }) => {
let newPost = ''; let newPost = "";
const body = await request.formData(); const body = await request.formData();
const thumb = body.get('thumbnail'); const thumb = body.get("thumbnail");
if (thumb?.size === 0) { if (thumb?.size === 0) {
body.delete('thumbnail'); body.delete("thumbnail");
} }
body.append('user', locals?.user?.id); body.append("user", locals?.user?.id);
let { formData, errors } = await validateData(body, createPostImageSchema); let { formData, errors } = await validateData(body, createPostImageSchema);
formData.tagTopic = JSON.parse(formData.tagTopic)[0] formData.tagTopic = JSON.parse(formData.tagTopic)[0];
formData.upvote = 1 formData.upvote = 1;
if(errors)
{
if (errors) {
return fail(400, { return fail(400, {
data: formData, data: formData,
errors: errors.fieldErrors errors: errors.fieldErrors,
}) });
} }
//Each post gives the user +1 Karma points //Each post gives the user +1 Karma points
await locals.pb.collection("users").update(locals?.user?.id, { await locals.pb.collection("users").update(locals?.user?.id, {
"karma+": 1, "karma+": 1,
}) });
if (formData.thumbnail.type.includes("image")) {
if (formData.thumbnail.type.includes('image')) {
try { try {
const image = formData.thumbnail; const image = formData.thumbnail;
const imageBuffer = await image.arrayBuffer(); const imageBuffer = await image.arrayBuffer();
const imageBufferArray = new Uint8Array(imageBuffer); const imageBufferArray = new Uint8Array(imageBuffer);
let optimizedImageBuffer; let optimizedImageBuffer;
if (image.type === 'image/gif') { if (image.type === "image/gif") {
// Process GIF files differently // Process GIF files differently
optimizedImageBuffer = imageBufferArray; optimizedImageBuffer = imageBufferArray;
} else { } else {
@ -216,116 +192,117 @@ export const actions = {
type: image.type, type: image.type,
lastModified: image.lastModified, lastModified: image.lastModified,
}); });
} catch (err) { } catch (err) {
console.log('Error:', err); console.log("Error:", err);
error(err.status, err.message); error(err.status, err.message);
} }
} }
try { try {
newPost = await locals.pb.collection("posts").create(serialize(formData));
newPost = await locals.pb.collection('posts').create(serialize(formData));
// add the tagTopic manually because serialize does not work on arrays // add the tagTopic manually because serialize does not work on arrays
await locals?.pb.collection("posts").update(newPost.id, { await locals?.pb.collection("posts").update(newPost.id, {
"tagTopic": formData?.tagTopic, tagTopic: formData?.tagTopic,
}) });
//Save it collection alreadyVoted to keep track if user voted or not //Save it collection alreadyVoted to keep track if user voted or not
//FormData for alreadyVoted //FormData for alreadyVoted
let formDataAlreadyVoted = new FormData(); let formDataAlreadyVoted = new FormData();
formDataAlreadyVoted.append('post', newPost.id); formDataAlreadyVoted.append("post", newPost.id);
formDataAlreadyVoted.append('user', newPost.user); formDataAlreadyVoted.append("user", newPost.user);
formDataAlreadyVoted.append('type', 'upvote'); formDataAlreadyVoted.append("type", "upvote");
//console.log(formDataAlreadyVoted) //console.log(formDataAlreadyVoted)
await locals.pb.collection('alreadyVoted').create(formDataAlreadyVoted); await locals.pb.collection("alreadyVoted").create(formDataAlreadyVoted);
} catch (err) { } catch (err) {
console.log('Error: ', err); console.log("Error: ", err);
error(err.status, err.message); error(err.status, err.message);
} }
if (newPost?.id?.length !== 0) { if (newPost?.id?.length !== 0) {
redirect(303, '/community/post/'+newPost?.id); redirect(303, "/community/post/" + newPost?.id);
} else { } else {
redirect(303, '/community'); redirect(303, "/community");
} }
}, },
createPostLink: async ({ request, locals }) => { createPostLink: async ({ request, locals }) => {
let newPost = ''; let newPost = "";
const body = await request.formData(); const body = await request.formData();
const url = body.get('link') const url = body.get("link");
let image; let image;
let description; let description;
let imageBlob; let imageBlob;
try { try {
const response = await got(url, { headers: { const response = await got(url, {
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3' headers: {
"user-agent":
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3",
}, },
responseType: 'buffer' }); responseType: "buffer",
});
const $ = cheerio.load(response.body); const $ = cheerio.load(response.body);
//const title = $('head title').text(); //const title = $('head title').text();
description= $('head meta[property="og:description"]').attr('content'); description = $('head meta[property="og:description"]').attr("content");
image = $('head meta[property="og:image"]').attr('content'); image = $('head meta[property="og:image"]').attr("content");
if (!image) { if (!image) {
let largestSize = 0; let largestSize = 0;
let largestImage = ''; let largestImage = "";
$('img').each(async function() { $("img").each(async function () {
if ($(this).attr('src') && $(this).attr('src').match(/\.(webp|jpg|jpeg|png|gif)$/)) { if (
$(this).attr("src") &&
$(this)
.attr("src")
.match(/\.(webp|jpg|jpeg|png|gif)$/)
) {
try { try {
const imageBuffer = await got($(this).attr('src'), { headers: {'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'},responseType: 'buffer' }).then(response => response.body); const imageBuffer = await got(image, {
const imageSize = (await sharp(imageBuffer).metadata()).width * (await sharp(imageBuffer).metadata()).height; headers: {
if (imageSize > largestSize) { "user-agent":
largestSize = imageSize; "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3",
largestImage = $(this).attr('src'); },
} responseType: "buffer",
}).then((response) => response.body);
imageBlob = await blobUtil.createBlob([imageBuffer], {
// Changed usage
type: "image/jpeg",
});
} catch (error) { } catch (error) {
// Handle the error when getting the image // Handle the error when getting the image
console.error('Error getting image:', error); console.error("Error getting image:", error);
} }
} }
}); });
image = largestImage; image = largestImage;
} }
// Download the image and append it to the form data // Download the image and append it to the form data
const imageBuffer = await got(image, { headers: {'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'},responseType: 'buffer' }).then(response => response.body); const imageBuffer = await got(image, {
imageBlob = await BlobUtil.createBlob([imageBuffer], { type: 'image/jpeg' }); headers: {
"user-agent":
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3",
},
responseType: "buffer",
}).then((response) => response.body);
imageBlob = await blobUtil.createBlob([imageBuffer], {
// Changed usage
type: "image/jpeg",
});
} catch (e) {
console.log(e);
} }
catch(e)
{
console.log(e)
}
//body.delete('thumbnail') //body.delete('thumbnail')
//body.append('thumbnail', imageBlob); //body.append('thumbnail', imageBlob);
// Append the title to the form data // Append the title to the form data
//body.append('name', title); //body.append('name', title);
body.append('user', locals.user.id); body.append("user", locals.user.id);
body.append('description', description); body.append("description", description);
/* /*
const thumb = body.get('thumbnail'); const thumb = body.get('thumbnail');
@ -335,63 +312,53 @@ export const actions = {
} }
*/ */
let { formData, errors } = await validateData(body, createPostLinkSchema); let { formData, errors } = await validateData(body, createPostLinkSchema);
formData.tagTopic = JSON.parse(formData.tagTopic)[0] formData.tagTopic = JSON.parse(formData.tagTopic)[0];
formData.upvote = 1 formData.upvote = 1;
if (imageBlob?.length !== 0) { if (imageBlob?.length !== 0) {
formData.thumbnail = imageBlob formData.thumbnail = imageBlob;
} }
if(errors) if (errors) {
{
return fail(400, { return fail(400, {
data: formData, data: formData,
errors: errors.fieldErrors errors: errors.fieldErrors,
}) });
} }
//Each post gives the user +1 Karma points //Each post gives the user +1 Karma points
await locals.pb.collection("users").update(locals?.user?.id, { await locals.pb.collection("users").update(locals?.user?.id, {
"karma+": 1, "karma+": 1,
}) });
try { try {
newPost = await locals.pb.collection('posts').create(serialize(formData)); newPost = await locals.pb.collection("posts").create(serialize(formData));
// add the tagTopic manually because serialize does not work on arrays // add the tagTopic manually because serialize does not work on arrays
await locals.pb.collection("posts").update(newPost.id, { await locals.pb.collection("posts").update(newPost.id, {
"tagTopic": formData.tagTopic, tagTopic: formData.tagTopic,
}) });
//Save it collection alreadyVoted to keep track if user voted or not //Save it collection alreadyVoted to keep track if user voted or not
//FormData for alreadyVoted //FormData for alreadyVoted
let formDataAlreadyVoted = new FormData(); let formDataAlreadyVoted = new FormData();
formDataAlreadyVoted.append('post', newPost.id); formDataAlreadyVoted.append("post", newPost.id);
formDataAlreadyVoted.append('user', newPost.user); formDataAlreadyVoted.append("user", newPost.user);
formDataAlreadyVoted.append('type', 'upvote'); formDataAlreadyVoted.append("type", "upvote");
//console.log(formDataAlreadyVoted) //console.log(formDataAlreadyVoted)
await locals.pb.collection('alreadyVoted').create(formDataAlreadyVoted); await locals.pb.collection("alreadyVoted").create(formDataAlreadyVoted);
} catch (err) { } catch (err) {
console.log('Error: ', err); console.log("Error: ", err);
error(err.status, err.message); error(err.status, err.message);
} }
if (newPost?.id?.length !== 0) { if (newPost?.id?.length !== 0) {
redirect(303, '/community/post/'+newPost?.id); redirect(303, "/community/post/" + newPost?.id);
} else { } else {
redirect(303, '/community'); redirect(303, "/community");
} }
}, },
}; };

4
svelte.config.js
View File

@ -1,5 +1,5 @@
//import adapter from '@sveltejs/adapter-static'; //import adapter from '@sveltejs/adapter-static';
import adapter from "@sveltejs/adapter-vercel"; import adapter from "@sveltejs/adapter-node";
import compression from "compression"; import compression from "compression";
import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"; import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
@ -10,8 +10,6 @@ const config = {
adapter: adapter({ adapter: adapter({
// Add the compression middleware to the adapter options // Add the compression middleware to the adapter options
middleware: (handler) => compression()(handler), middleware: (handler) => compression()(handler),
runtime: "nodejs20.x",
regions: ["fra1"],
worker: true, // Add this line if the adapter supports handling worker files worker: true, // Add this line if the adapter supports handling worker files
}), }),
}, },

26
vite.config.js
View File

@ -1,35 +1,37 @@
import { sveltekit } from '@sveltejs/kit/vite'; import { sveltekit } from "@sveltejs/kit/vite";
import { visualizer } from 'rollup-plugin-visualizer'; import { visualizer } from "rollup-plugin-visualizer";
/** @type {import('vite').UserConfig} */ /** @type {import('vite').UserConfig} */
const config = { const config = {
plugins: [ plugins: [
sveltekit(), sveltekit(),
visualizer({ open: true }) // Plugin to visualize the bundle //visualizer({ open: true }) // Plugin to visualize the bundle
], ],
server: { server: {
cors: true, cors: true,
}, },
build: { build: {
target: 'esnext', target: "esnext",
minify: true, minify: true,
chunkSizeWarningLimit: 500, // Lower this to ensure chunks are appropriately sized chunkSizeWarningLimit: 500, // Lower this to ensure chunks are appropriately sized
rollupOptions: { rollupOptions: {
output: { output: {
manualChunks(id) { manualChunks(id) {
if (id.includes('node_modules')) { if (id.includes("node_modules")) {
return id.toString().split('node_modules/')[1].split('/')[0].toString(); return id
} .toString()
} .split("node_modules/")[1]
.split("/")[0]
.toString();
} }
}, },
},
},
brotliSize: true, // Enable Brotli compression brotliSize: true, // Enable Brotli compression
}, },
optimizeDeps: { optimizeDeps: {
exclude: [ exclude: ["pocketbase"],
'pocketbase', },
],
}
}; };
export default config; export default config;