Mike/freno-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quick fix

Browse Source
This commit is contained in:
Mike Freno
2026-02-02 15:24:28 -05:00
parent cda7784298
commit 80daaa29dc
11 changed files with 143 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bun.lockb
View File

Binary file not shown.

4
src/app.tsx
View File

@@ -160,10 +160,10 @@ function AppLayout(props: { children: any }) {
<LeftBar />
<div
id="center-body"
class="bg-base relative h-screen w-screen overflow-x-hidden md:ml-62.5 md:w-[calc(100vw-500px)]"
class="bg-base relative h-screen w-screen overflow-x-hidden md:ml-62.5 md:w-[calc(100vw-500px)] 2xl:ml-72 2xl:w-[calc(100vw-576px)]"
>
<noscript>
<div class="bg-yellow text-crust border-text fixed top-0 z-150 border-b-2 p-4 text-center font-semibold md:w-[calc(100vw-500px)]">
<div class="bg-yellow text-crust border-text fixed top-0 z-150 border-b-2 p-4 text-center font-semibold md:w-[calc(100vw-500px)] xl:ml-72 xl:w-[calc(100vw-576px)]">
JavaScript is disabled. Features will be limited.
</div>
</noscript>

2
src/components/Bars.tsx
View File

@@ -366,7 +366,7 @@ export function LeftBar() {
const getMainNavStyles = () => {
const baseStyles = {
"transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)",
width: "250px",
width: windowWidth() < 1536 ? "250px" : "288px",
"padding-top": "env(safe-area-inset-top)",
"padding-bottom": "env(safe-area-inset-bottom)"
};

4
src/components/Btop.tsx
View File

@@ -39,10 +39,10 @@ export function Btop(props: BtopProps) {
onMount(() => {
if (typeof window !== "undefined") {
setIsMobile(window.innerWidth < BREAKPOINTS.MOBILE);
setIsMobile(window.innerWidth < BREAKPOINTS.MOBILE_MAX_WIDTH);
const handleResize = () => {
setIsMobile(window.innerWidth < BREAKPOINTS.MOBILE);
setIsMobile(window.innerWidth < BREAKPOINTS.MOBILE_MAX_WIDTH);
};
window.addEventListener("resize", handleResize);
onCleanup(() => window.removeEventListener("resize", handleResize));

2
src/context/bars.tsx
View File

@@ -1,8 +1,6 @@
import { Accessor, createContext, useContext } from "solid-js";
import { createSignal } from "solid-js";
export const STATIC_BAR_SIZE = 250;
const BarsContext = createContext<{
leftBarVisible: Accessor<boolean>;
setLeftBarVisible: (visible: boolean) => void;

8
src/env/server.ts vendored
View File

@@ -5,8 +5,8 @@ const serverEnvSchema = z.object({
JWT_SECRET_KEY: z.string().min(1),
AWS_REGION: z.string().min(1),
AWS_S3_BUCKET_NAME: z.string().min(1),
_AWS_ACCESS_KEY: z.string().min(1),
_AWS_SECRET_KEY: z.string().min(1),
MY_AWS_ACCESS_KEY: z.string().min(1),
MY_AWS_SECRET_KEY: z.string().min(1),
GOOGLE_CLIENT_SECRET: z.string().min(1),
GITHUB_CLIENT_SECRET: z.string().min(1),
EMAIL_SERVER: z.string().min(1),
@@ -113,8 +113,8 @@ export const getMissingEnvVars = (): string[] => {
"JWT_SECRET_KEY",
"AWS_REGION",
"AWS_S3_BUCKET_NAME",
"_AWS_ACCESS_KEY",
"_AWS_SECRET_KEY",
"MY_AWS_ACCESS_KEY",
"MY_AWS_SECRET_KEY",
"GOOGLE_CLIENT_SECRET",
"GITHUB_CLIENT_SECRET",
"EMAIL_SERVER",

4
src/routes/api/Gaze/appcast.xml.ts
View File

@@ -13,8 +13,8 @@ export async function GET(event: APIEvent) {
const key = "api/Gaze/appcast.xml";
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
try {

187
src/routes/api/downloads/[filename].ts
View File

@@ -5,104 +5,107 @@ import { env } from "~/env/server";
/**
* Serves Gaze DMG files and delta updates from S3
* This endpoint is used by Sparkle updater to download updates
*
*
* Handles:
* - Full DMG files: /api/downloads/Gaze-0.2.2.dmg
* - Delta updates: /api/downloads/Gaze3-2.delta
*
*
* URL: https://freno.me/api/downloads/[filename]
*/
export async function GET(event: APIEvent) {
const filename = event.params.filename;
if (!filename) {
return new Response("Filename required", {
status: 400,
headers: {
"Content-Type": "text/plain"
}
});
}
// Validate filename format (only allow Gaze files)
if (!filename.startsWith("Gaze") || (!filename.endsWith(".dmg") && !filename.endsWith(".delta"))) {
return new Response("Invalid file format", {
status: 400,
headers: {
"Content-Type": "text/plain"
}
});
}
const bucket = env.VITE_DOWNLOAD_BUCKET_STRING;
const key = `downloads/${filename}`;
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
};
try {
const client = new S3Client({
region: env.AWS_REGION,
credentials: credentials
});
const command = new GetObjectCommand({
Bucket: bucket,
Key: key
});
const response = await client.send(command);
if (!response.Body) {
console.error(`File not found in S3: ${key}`);
return new Response("File not found", {
status: 404,
headers: {
"Content-Type": "text/plain"
}
});
const filename = event.params.filename;
if (!filename) {
return new Response("Filename required", {
status: 400,
headers: {
"Content-Type": "text/plain"
}
});
}
// Validate filename format (only allow Gaze files)
if (
!filename.startsWith("Gaze") ||
(!filename.endsWith(".dmg") && !filename.endsWith(".delta"))
) {
return new Response("Invalid file format", {
status: 400,
headers: {
"Content-Type": "text/plain"
}
});
}
const bucket = env.VITE_DOWNLOAD_BUCKET_STRING;
const key = `downloads/${filename}`;
const credentials = {
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
try {
const client = new S3Client({
region: env.AWS_REGION,
credentials: credentials
});
const command = new GetObjectCommand({
Bucket: bucket,
Key: key
});
const response = await client.send(command);
if (!response.Body) {
console.error(`File not found in S3: ${key}`);
return new Response("File not found", {
status: 404,
headers: {
"Content-Type": "text/plain"
}
// Get content type based on file extension
const contentType = filename.endsWith(".dmg")
? "application/x-apple-diskimage"
: "application/octet-stream";
// Stream the file content from S3
const body = await response.Body.transformToByteArray();
console.log(`✓ Serving ${filename} (${body.length} bytes)`);
return new Response(body, {
status: 200,
headers: {
"Content-Type": contentType,
"Content-Length": body.length.toString(),
"Content-Disposition": `attachment; filename="${filename}"`,
"Cache-Control": "public, max-age=86400", // Cache for 24 hours
"Access-Control-Allow-Origin": "*"
}
});
} catch (error) {
console.error(`Failed to fetch ${filename} from S3:`, error);
// Check if it's a not found error
if (error instanceof Error && error.name === "NoSuchKey") {
return new Response("File not found in storage", {
status: 404,
headers: {
"Content-Type": "text/plain"
}
});
}
return new Response("Internal Server Error", {
status: 500,
headers: {
"Content-Type": "text/plain"
}
});
});
}
// Get content type based on file extension
const contentType = filename.endsWith(".dmg")
? "application/x-apple-diskimage"
: "application/octet-stream";
// Stream the file content from S3
const body = await response.Body.transformToByteArray();
console.log(`✓ Serving ${filename} (${body.length} bytes)`);
return new Response(body, {
status: 200,
headers: {
"Content-Type": contentType,
"Content-Length": body.length.toString(),
"Content-Disposition": `attachment; filename="${filename}"`,
"Cache-Control": "public, max-age=86400", // Cache for 24 hours
"Access-Control-Allow-Origin": "*"
}
});
} catch (error) {
console.error(`Failed to fetch ${filename} from S3:`, error);
// Check if it's a not found error
if (error instanceof Error && error.name === "NoSuchKey") {
return new Response("File not found in storage", {
status: 404,
headers: {
"Content-Type": "text/plain"
}
});
}
return new Response("Internal Server Error", {
status: 500,
headers: {
"Content-Type": "text/plain"
}
});
}
}

4
src/server/api/routers/downloads.test.ts
View File

@@ -27,8 +27,8 @@ vi.mock("@aws-sdk/s3-request-presigner", () => ({
// Mock environment variables
process.env.AWS_REGION = "us-east-1";
process.env._AWS_ACCESS_KEY = "test-access-key";
process.env._AWS_SECRET_KEY = "test-secret-key";
process.env.MY_AWS_ACCESS_KEY = "test-access-key";
process.env.MY_AWS_SECRET_KEY = "test-secret-key";
process.env.VITE_DOWNLOAD_BUCKET_STRING = "test-bucket";
describe("downloads router", () => {

40
src/server/api/routers/downloads.ts
View File

@@ -1,6 +1,10 @@
import { createTRPCRouter, publicProcedure } from "../utils";
import { z } from "zod";
import { S3Client, GetObjectCommand, ListObjectsV2Command } from "@aws-sdk/client-s3";
import {
S3Client,
GetObjectCommand,
ListObjectsV2Command
} from "@aws-sdk/client-s3";
import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
import { env } from "~/env/server";
import { TRPCError } from "@trpc/server";
@@ -14,7 +18,10 @@ const assets: Record<string, string> = {
/**
* Get the latest Gaze DMG from S3 by finding the most recent file in downloads/ folder
*/
async function getLatestGazeDMG(client: S3Client, bucket: string): Promise<string> {
async function getLatestGazeDMG(
client: S3Client,
bucket: string
): Promise<string> {
try {
const listCommand = new ListObjectsV2Command({
Bucket: bucket,
@@ -23,19 +30,19 @@ async function getLatestGazeDMG(client: S3Client, bucket: string): Promise<strin
});
const response = await client.send(listCommand);
if (!response.Contents || response.Contents.length === 0) {
throw new Error("No Gaze DMG files found in S3");
}
// Filter for .dmg files only and sort by LastModified (newest first)
const dmgFiles = response.Contents
.filter((obj) => obj.Key?.endsWith(".dmg"))
.sort((a, b) => {
const dateA = a.LastModified?.getTime() || 0;
const dateB = b.LastModified?.getTime() || 0;
return dateB - dateA; // Descending order (newest first)
});
const dmgFiles = response.Contents.filter((obj) =>
obj.Key?.endsWith(".dmg")
).sort((a, b) => {
const dateA = a.LastModified?.getTime() || 0;
const dateB = b.LastModified?.getTime() || 0;
return dateB - dateA; // Descending order (newest first)
});
if (dmgFiles.length === 0) {
throw new Error("No .dmg files found in downloads/Gaze-* prefix");
@@ -55,10 +62,10 @@ export const downloadsRouter = createTRPCRouter({
.input(z.object({ asset_name: z.string() }))
.query(async ({ input }) => {
const bucket = env.VITE_DOWNLOAD_BUCKET_STRING;
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
const client = new S3Client({
@@ -75,7 +82,7 @@ export const downloadsRouter = createTRPCRouter({
} else {
// Use static mapping for other assets
fileKey = assets[input.asset_name];
if (!fileKey) {
throw new TRPCError({
code: "NOT_FOUND",
@@ -98,7 +105,10 @@ export const downloadsRouter = createTRPCRouter({
console.error(error);
throw new TRPCError({
code: "INTERNAL_SERVER_ERROR",
message: error instanceof Error ? error.message : "Failed to generate download URL"
message:
error instanceof Error
? error.message
: "Failed to generate download URL"
});
}
})

20
src/server/api/routers/misc.ts
View File

@@ -46,8 +46,8 @@ export const miscRouter = createTRPCRouter({
}
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
try {
@@ -80,8 +80,8 @@ export const miscRouter = createTRPCRouter({
)
.mutation(async ({ input }) => {
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
try {
@@ -135,8 +135,8 @@ export const miscRouter = createTRPCRouter({
.query(async ({ input }) => {
try {
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
const client = new S3Client({
@@ -195,8 +195,8 @@ export const miscRouter = createTRPCRouter({
.mutation(async ({ input }) => {
try {
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
const s3params = {
@@ -234,8 +234,8 @@ export const miscRouter = createTRPCRouter({
.mutation(async ({ input }) => {
try {
const credentials = {
accessKeyId: env._AWS_ACCESS_KEY,
secretAccessKey: env._AWS_SECRET_KEY
accessKeyId: env.MY_AWS_ACCESS_KEY,
secretAccessKey: env.MY_AWS_SECRET_KEY
};
const s3params = {