Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build specific api files #226

Merged
merged 3 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
"type": "module",
"scripts": {
"dev": "vite",
"dev:wails": "VITE_NWC_APP_TYPE=WAILS vite",
"dev:wails": "yarn prepare:wails && VITE_NWC_APP_TYPE=WAILS vite",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VITE_NWC_APP_TYPE should not be needed now, right?

Should we delete the original request.ts file and add it to .gitignore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you think that's a doable way, we can go forward with that.

"build": "tsc && vite build",
"build:wails": "tsc && VITE_NWC_APP_TYPE=WAILS vite build",
"prepare:wails": "cp ./platform_specific/wails/src/utils/request.ts src/utils/request.ts",
"prepare:http": "cp ./platform_specific/http/src/utils/request.ts src/utils/request.ts",
"build:wails": "yarn prepare:wails && tsc && VITE_NWC_APP_TYPE=WAILS vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
Expand Down
34 changes: 34 additions & 0 deletions frontend/platform_specific/http/src/utils/request.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import toast from "../components/Toast";
import { ErrorResponse } from "../types";

export const request = async <T,>(
...args: Parameters<typeof fetch>
): Promise<T | undefined> => {
try {
const fetchResponse = await fetch(...args);

let body: T | undefined;
try {
body = await fetchResponse.json();
} catch (error) {
console.error(error);
}

if (!fetchResponse.ok) {
throw new Error(
fetchResponse.status +
" " +
((body as ErrorResponse)?.message || "Unknown error"),
);
}
return body;
} catch (error) {
console.error("Failed to fetch", error);
throw error;
}
};

export function handleRequestError(message: string, error: unknown) {
console.error(message, error);
toast.error(message + ": " + error);
}
30 changes: 30 additions & 0 deletions frontend/platform_specific/wails/src/utils/request.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import toast from "../components/Toast";

import { WailsRequestRouter } from "wailsjs/go/main/WailsApp";

export const request = async <T,>(
...args: Parameters<typeof fetch>
): Promise<T | undefined> => {
try {
const res = await WailsRequestRouter(
args[0].toString(),
args[1]?.method || "GET",
args[1]?.body?.toString() || "",
);

console.log("Wails request", ...args, res);
if (res.error) {
throw new Error(res.error);
}

return res.body;
} catch (error) {
console.error("Failed to fetch", error);
throw error;
}
};

export function handleRequestError(message: string, error: unknown) {
console.error(message, error);
toast.error(message + ": " + error);
}
Loading