fix video stream
This commit is contained in:
28
lib/api.ts
28
lib/api.ts
@@ -1,20 +1,26 @@
|
||||
// We still export this for use in components where the raw URL is needed,
|
||||
// like the <video> src attribute.
|
||||
// webapp/lib/api.ts
|
||||
|
||||
export const API_URL = process.env.NEXT_PUBLIC_API_URL || 'http://127.0.0.1:8000';
|
||||
|
||||
type ApiRequestOptions = {
|
||||
method?: 'GET' | 'POST' | 'PUT' | 'DELETE';
|
||||
body?: any;
|
||||
token?: string | null;
|
||||
wantsJson?: boolean; // Add this to control response parsing
|
||||
};
|
||||
|
||||
export const apiRequest = async (endpoint: string, options: ApiRequestOptions = {}) => {
|
||||
const { method = 'GET', body = null, token = null } = options;
|
||||
// Set wantsJson to true by default, false for specific cases like file streams
|
||||
const { method = 'GET', body = null, token = null, wantsJson = true } = options;
|
||||
|
||||
const headers: HeadersInit = {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json',
|
||||
};
|
||||
|
||||
// Only set Content-Type for requests with a body
|
||||
if (body) {
|
||||
headers['Content-Type'] = 'application/json';
|
||||
}
|
||||
|
||||
if (token) {
|
||||
headers['Authorization'] = `Bearer ${token}`;
|
||||
@@ -29,20 +35,20 @@ export const apiRequest = async (endpoint: string, options: ApiRequestOptions =
|
||||
config.body = JSON.stringify(body);
|
||||
}
|
||||
|
||||
// Use the API_URL variable to construct the full URL inside the function
|
||||
const response = await fetch(`${API_URL}${endpoint}`, config);
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json().catch(() => ({ detail: 'An unknown error occurred' }));
|
||||
throw new Error(errorData.detail || `HTTP error! status: ${response.status}`);
|
||||
}
|
||||
|
||||
// Handle cases where the response might not be JSON
|
||||
const contentType = response.headers.get("content-type");
|
||||
if (contentType?.includes("application/json")) {
|
||||
return response.json();
|
||||
|
||||
if (wantsJson) {
|
||||
const contentType = response.headers.get("content-type");
|
||||
if (contentType?.includes("application/json")) {
|
||||
return response.json();
|
||||
}
|
||||
}
|
||||
|
||||
// For non-json responses (like video streams or simple text), return the raw response
|
||||
// For non-JSON requests, return the raw response object
|
||||
return response;
|
||||
};
|
||||
Reference in New Issue
Block a user