+
JavaScript is disabled. Features will be limited.
diff --git a/src/components/Bars.tsx b/src/components/Bars.tsx
index 4f91c64..e8f2f79 100644
--- a/src/components/Bars.tsx
+++ b/src/components/Bars.tsx
@@ -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)"
};
diff --git a/src/components/Btop.tsx b/src/components/Btop.tsx
index 75d6646..2256cb0 100644
--- a/src/components/Btop.tsx
+++ b/src/components/Btop.tsx
@@ -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));
diff --git a/src/context/bars.tsx b/src/context/bars.tsx
index 49263cf..159e272 100644
--- a/src/context/bars.tsx
+++ b/src/context/bars.tsx
@@ -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
;
setLeftBarVisible: (visible: boolean) => void;
diff --git a/src/env/server.ts b/src/env/server.ts
index bda7f50..07ff220 100644
--- a/src/env/server.ts
+++ b/src/env/server.ts
@@ -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",
diff --git a/src/routes/api/Gaze/appcast.xml.ts b/src/routes/api/Gaze/appcast.xml.ts
index 072c280..12967f5 100644
--- a/src/routes/api/Gaze/appcast.xml.ts
+++ b/src/routes/api/Gaze/appcast.xml.ts
@@ -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 {
diff --git a/src/routes/api/downloads/[filename].ts b/src/routes/api/downloads/[filename].ts
index a2198bf..ea4df57 100644
--- a/src/routes/api/downloads/[filename].ts
+++ b/src/routes/api/downloads/[filename].ts
@@ -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"
+ }
+ });
+ }
}
diff --git a/src/server/api/routers/downloads.test.ts b/src/server/api/routers/downloads.test.ts
index 68ff370..e29d08b 100644
--- a/src/server/api/routers/downloads.test.ts
+++ b/src/server/api/routers/downloads.test.ts
@@ -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", () => {
diff --git a/src/server/api/routers/downloads.ts b/src/server/api/routers/downloads.ts
index a2208d8..ed35762 100644
--- a/src/server/api/routers/downloads.ts
+++ b/src/server/api/routers/downloads.ts
@@ -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 = {
/**
* Get the latest Gaze DMG from S3 by finding the most recent file in downloads/ folder
*/
-async function getLatestGazeDMG(client: S3Client, bucket: string): Promise {
+async function getLatestGazeDMG(
+ client: S3Client,
+ bucket: string
+): Promise {
try {
const listCommand = new ListObjectsV2Command({
Bucket: bucket,
@@ -23,19 +30,19 @@ async function getLatestGazeDMG(client: S3Client, bucket: string): Promise 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"
});
}
})
diff --git a/src/server/api/routers/misc.ts b/src/server/api/routers/misc.ts
index 8738b7b..d3de7e9 100644
--- a/src/server/api/routers/misc.ts
+++ b/src/server/api/routers/misc.ts
@@ -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 = {