Merge pull request #431 from tp-link-extender/catalogfixes

Fix bungled branch

Author: Heliodex

Site/bun.lock

@@ -15,7 +15,7 @@
 		"logs": "bun x pm2 logs"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.3.9",
+		"@biomejs/biome": "^2.3.10",
 		"@types/bun": "^1.3.4",
 		"@types/d3-interpolate": "^3.0.4",
 		"@types/nprogress": "^0.2.3",
@@ -25,7 +25,7 @@
 	"type": "module",
 	"dependencies": {
 		"@sveltejs/adapter-node": "^5.4.0",
-		"@sveltejs/kit": "^2.49.1",
+		"@sveltejs/kit": "^2.49.2",
 		"@sveltejs/vite-plugin-svelte": "^6.2.1",
 		"@unocss/extractor-svelte": "^66.5.10",
 		"@unocss/preset-tagify": "^66.5.10",

Site/package.json

@@ -119,7 +119,7 @@ export async function handle(e) {
 	)
 		redirect(302, "/moderation")
 
-	await stipend(user.id)
+	await stipend(e.event.fetch, user.id)
 
 	return await finish(e)
 }

Site/src/hooks.server.ts

@@ -10,9 +10,12 @@ export type ReturnErr = { ok: true } | { ok: false; msg: string }
 
 const tryFetch =
 	<T>(transform: (res: Response) => Promise<T>) =>
-	async (url: string): Promise<ReturnValue<T>> => {
+	async (
+		f: typeof globalThis.fetch,
+		url: string
+	): Promise<ReturnValue<T>> => {
 		try {
-			const res = await fetch(url)
+			const res = await f(url)
 			if (!res.ok) return { ok: false }
 			return { ok: true, value: await transform(res) }
 		} catch {
@@ -23,9 +26,10 @@ const tryFetch =
 const tryFetchValue = tryFetch(async res => +(await res.text()))
 const tryFetchJson = <T>() => tryFetch(async res => (await res.json()) as T) // type assertion much?¿
 
-export const getStipend = () => tryFetchValue(`${economyUrl}/currentStipend`)
-export const getBalance = (user: string) =>
-	tryFetchValue(`${economyUrl}/balance/${user}`)
+export const getStipend = (f: typeof globalThis.fetch) =>
+	tryFetchValue(f, `${economyUrl}/currentStipend`)
+export const getBalance = (f: typeof globalThis.fetch, user: string) =>
+	tryFetchValue(f, `${economyUrl}/balance/${user}`)
 
 type BaseTx = {
 	Note: string
@@ -58,21 +62,20 @@ type TxTypes =
 
 type ReceivedTx = BaseTx & TxTypes
 
-export const getTransactions = (user: string) =>
-	tryFetchJson<ReceivedTx[]>()(`${economyUrl}/transactions/${user}`)
-export const getAdminTransactions = () =>
-	tryFetchJson<ReceivedTx[]>()(`${economyUrl}/transactions`)
+export const getTransactions = (f: typeof globalThis.fetch, user: string) =>
+	tryFetchJson<ReceivedTx[]>()(f, `${economyUrl}/transactions/${user}`)
+export const getAdminTransactions = (f: typeof globalThis.fetch) =>
+	tryFetchJson<ReceivedTx[]>()(f, `${economyUrl}/transactions`)
 
 // doin nothing with returns rn
-export async function stipend(To: string) {
+export async function stipend(f: typeof globalThis.fetch, To: string) {
 	try {
-		await fetch(`${economyUrl}/stipend/${To}`, {
-			method: "post",
-		})
+		await f(`${economyUrl}/stipend/${To}`, { method: "post" })
 	} catch {}
 }
 
 export async function transact(
+	f: typeof globalThis.fetch,
 	From: string,
 	To: string,
 	Amount: number,
@@ -81,7 +84,7 @@ export async function transact(
 	Returns: { [_: number]: number }
 ): Promise<ReturnErr> {
 	try {
-		const res = await fetch(`${economyUrl}/transact`, {
+		const res = await f(`${economyUrl}/transact`, {
 			method: "post",
 			body: JSON.stringify({ From, To, Amount, Note, Link, Returns }),
 		})
@@ -94,6 +97,7 @@ export async function transact(
 }
 
 async function burn(
+	f: typeof globalThis.fetch,
 	From: string,
 	Amount: number,
 	Note: string,
@@ -106,7 +110,7 @@ async function burn(
 		// When my campaign turned to a cam-pain
 		// We got $2.5 trillion stored on the blockchain
 		// Uh, ₿urn ₿aby ₿urn
-		const res = await fetch(`${economyUrl}/burn`, {
+		const res = await f(`${economyUrl}/burn`, {
 			method: "post",
 			body: JSON.stringify({ From, Amount, Note, Link, Returns }),
 		})
@@ -127,13 +131,15 @@ export const getGroupPrice = () => getFeeBasedPrice(50)
 // export const getPlacePrice = () => getFeeBasedPrice(50)
 
 export async function createAsset(
+	f: typeof globalThis.fetch,
 	To: string,
 	id: number,
 	name: string,
 	slug: string
 ): Promise<ReturnErr> {
 	const price = getAssetPrice()
 	return await burn(
+		f,
 		To,
 		price,
 		`Created asset ${name}`,
@@ -143,13 +149,15 @@ export async function createAsset(
 }
 
 // export async function createPlace(
+// 	f: typeof globalThis.fetch,
 // 	To: string,
 // 	id: number,
 // 	name: string,
 // 	slug: string
 // ): Promise<ReturnErr> {
 // 	const price = getPlacePrice()
 // 	return await burn(
+// 		fee,
 // 		To,
 // 		price,
 // 		`Created place ${name}`,
@@ -159,11 +167,19 @@ export async function createAsset(
 // }
 
 export async function createGroup(
+	f: typeof globalThis.fetch,
 	To: string,
 	name: string
 ): Promise<ReturnErr> {
 	const price = getGroupPrice()
-	return await burn(To, price, `Created group ${name}`, `/groups/${name}`, {})
+	return await burn(
+		f,
+		To,
+		price,
+		`Created group ${name}`,
+		`/groups/${name}`,
+		{}
+	)
 }
 
 export async function transformTransactions(list: ReceivedTx[]) {

Site/src/lib/server/economy.ts

@@ -8,9 +8,11 @@ type Gameserver = {
 
 type GameserverId = [number, Gameserver]
 
-export async function listGameservers(): ReturnValue<GameserverId[]> {
+export async function listGameservers(
+	f: typeof globalThis.fetch
+): ReturnValue<GameserverId[]> {
 	try {
-		const res = await fetch(config.OrbiterPrivateURL)
+		const res = await f(config.OrbiterPrivateURL)
 		if (!res.ok) return { ok: false }
 		return { ok: true, value: await res.json() }
 	} catch {
@@ -19,11 +21,12 @@ export async function listGameservers(): ReturnValue<GameserverId[]> {
 }
 
 async function fetchGameserver(
+	f: typeof globalThis.fetch,
 	path: string | number,
 	method: string
 ): Promise<ReturnErr> {
 	try {
-		const res = await fetch(`${config.OrbiterPrivateURL}/${path}`, { method })
+		const res = await f(`${config.OrbiterPrivateURL}/${path}`, { method })
 		if (!res.ok) return { ok: false, msg: await res.text() }
 	} catch (err) {
 		const e = err as Error
@@ -32,8 +35,12 @@ async function fetchGameserver(
 	return { ok: true }
 }
 
-export const startGameserver = async (placeId: number) =>
-	fetchGameserver(placeId, "put")
+export const startGameserver = async (
+	f: typeof globalThis.fetch,
+	placeId: number
+) => fetchGameserver(f, placeId, "put")
 
-export const closeGameserver = async (placeId: number) =>
-	fetchGameserver(placeId, "delete")
+export const closeGameserver = async (
+	f: typeof globalThis.fetch,
+	placeId: number
+) => fetchGameserver(f, placeId, "delete")

Site/src/lib/server/orbiter.ts

@@ -20,6 +20,7 @@ type Render = {
  * @param wait Whether to wait for the render to be completed before resolving.
  */
 export default async function (
+	f: typeof globalThis.fetch,
 	renderType: RenderType,
 	relativeId: string | number,
 	relativeName = relativeId,
@@ -85,7 +86,7 @@ export default async function (
 	await Promise.all([
 		waiter,
 		// Uhh carrot just got the
-		fetch(`${config.RCCServiceProxyURL}/${renderId}`, {
+		f(`${config.RCCServiceProxyURL}/${renderId}`, {
 			method: "post",
 			body: script,
 		}),

Site/src/lib/server/requestRender.ts

@@ -80,7 +80,7 @@ actions.rerender = async e => {
 	if (limit) return limit
 
 	try {
-		await requestRender("Clothing", id)
+		await requestRender(e.fetch, "Clothing", id)
 	} catch (e) {
 		console.error(e)
 		fail(500, { msg: "Failed to request render" })

Site/src/routes/(main)/admin/asset/+page.server.ts

@@ -46,7 +46,7 @@ actions.default = async ({ locals, request }) => {
 	if (!fs.existsSync("../data/thumbnails")) fs.mkdirSync("../data/thumbnails")
 
 	const { asset, description, name, price, type: assetType } = data
-	form.data.asset = null // make sure to return as a POJO
+	form.data.asset = null as unknown as File// make sure to return as a POJO
 
 	const [, id] = await db.query<string[]>(createQuery, {
 		description,
@@ -59,7 +59,7 @@ actions.default = async ({ locals, request }) => {
 	await Bun.write(`../data/assets/${id}`, await asset.arrayBuffer())
 
 	// we'll just assume it's a model 4 now
-	// await requestRender("Model", id)
+	// await requestRender(f, "Model", id)
 
 	redirect(302, `/catalog/${id}`)
 }

Site/src/routes/(main)/admin/create/+page.server.ts

@@ -2,10 +2,10 @@ import { error } from "@sveltejs/kit"
 import { authorise } from "$lib/server/auth"
 import { listGameservers } from "$lib/server/orbiter"
 
-export async function load({ locals }) {
+export async function load({ fetch: f, locals }) {
 	await authorise(locals, 5)
 
-	const gameservers = await listGameservers()
+	const gameservers = await listGameservers(f)
 	if (!gameservers.ok) error(500, "Failed to fetch gameservers")
 
 	return {