christianV/Craze-Data-check
1
0
Fork 0
mirror of https://github.com/christianvidalwolf-prog/Craze-Data-check.git synced 2026-08-03 12:35:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(sync): harden Dropbox loading

Browse Source
This commit is contained in:
Christian Vidal Wolf
2026-05-21 13:58:52 +02:00
parent fa998ec9bf
commit 290b298544
2 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.tsx
+26 -39
View File
@@ -192,18 +192,12 @@ export default function App() {
setDefaultLoadError(null); setDefaultLoadError(null);
try { try {
const isDev = import.meta.env.DEV;
let rows: any[][]; let rows: any[][];
let allData: any[][]; let allData: any[][];
let fileMeta = { rev: '', size: 0 }; let fileMeta = { rev: '', size: 0 };
if (isDev) { const loadWorkbookFromUrl = async (url: string) => {
const cacheBuster = `t_${Date.now()}`; const response = await fetch(url, { cache: 'no-store' });
const fileUrl = `/dropbox-file/scl/fi/usa8me7ywgylrij2bt6hj/Data-Matrix.xlsx?rlkey=tsec8csrhye54u1fdvk15ped1&st=qbxxs4cn&dl=0&${cacheBuster}=${Date.now()}`;
console.log('Fetching Data-Matrix.xlsx from Dropbox (hard refresh)...');
try {
const response = await fetch(fileUrl, { cache: 'no-store' });
if (!response.ok) throw new Error(`HTTP ${response.status}`); if (!response.ok) throw new Error(`HTTP ${response.status}`);
const contentType = response.headers.get('content-type'); const contentType = response.headers.get('content-type');
@@ -219,41 +213,34 @@ export default function App() {
const ws = wb.Sheets[wsname]; const ws = wb.Sheets[wsname];
allData = XLSX.utils.sheet_to_json<any[]>(ws, { header: 1 }); allData = XLSX.utils.sheet_to_json<any[]>(ws, { header: 1 });
rows = allData.slice(1); rows = allData.slice(1);
fileMeta = { rev: 'dev', size: arrayBuffer.byteLength }; return arrayBuffer.byteLength;
} catch (devErr) { };
console.error('Dropbox dev load failed:', devErr);
throw devErr;
}
} else {
console.log('Fetching file info from Dropbox...');
const infoRes = await fetch('/api/dropbox-proxy?info=1');
if (infoRes.ok) {
fileMeta = await infoRes.json();
console.log('File meta:', fileMeta);
}
console.log('Fetching Data-Matrix.xlsx from proxy (hard refresh)...'); const dropboxSources = import.meta.env.DEV
? [
'/api/dropbox-proxy',
`/dropbox-file/scl/fi/usa8me7ywgylrij2bt6hj/Data-Matrix.xlsx?rlkey=tsec8csrhye54u1fdvk15ped1&st=qbxxs4cn&dl=0&t=${Date.now()}`
]
: [
'/api/dropbox-proxy'
];
let lastError: unknown = null;
for (const source of dropboxSources) {
try { try {
const response = await fetch('/api/dropbox-proxy', { cache: 'no-store' }); console.log(`Fetching Data-Matrix.xlsx from ${source.includes('/api/') ? 'proxy' : 'Dropbox'}...`);
if (!response.ok) throw new Error(`HTTP ${response.status}`); const size = await loadWorkbookFromUrl(source);
fileMeta = { rev: source, size };
const contentType = response.headers.get('content-type'); lastError = null;
if (contentType && contentType.includes('text/html')) { break;
throw new Error('Dropbox returned an HTML page instead of the Excel file.'); } catch (err) {
lastError = err;
console.warn(`Dropbox source failed for ${source}:`, err);
}
} }
const arrayBuffer = await response.arrayBuffer(); if (lastError) {
if (arrayBuffer.byteLength < 100) throw new Error('File too small'); throw lastError instanceof Error ? lastError : new Error(String(lastError));
const wb = XLSX.read(arrayBuffer, { type: 'array' });
const wsname = wb.SheetNames[0];
const ws = wb.Sheets[wsname];
allData = XLSX.utils.sheet_to_json<any[]>(ws, { header: 1 });
rows = allData.slice(1);
} catch (prodErr) {
console.error('Dropbox prod load failed:', prodErr);
throw prodErr;
}
} }
if (rows.length > 0) { if (rows.length > 0) {
vite.config.ts
+2 -1
View File
@@ -31,6 +31,7 @@ async function readJsonBody(req: any): Promise<any> {
export default defineConfig(({mode}) => { export default defineConfig(({mode}) => {
const env = loadEnv(mode, '.', ''); const env = loadEnv(mode, '.', '');
const prodEnv = loadEnv('production', '.', '');
return { return {
plugins: [ plugins: [
react(), react(),
@@ -44,7 +45,7 @@ export default defineConfig(({mode}) => {
const config = getBcConfig(env); const config = getBcConfig(env);
// Populate process.env with loaded env variables for serverless handlers // Populate process.env with loaded env variables for serverless handlers
Object.assign(process.env, env); Object.assign(process.env, prodEnv, env);
// Helper to adapt Node.js req/res to Vercel signature // Helper to adapt Node.js req/res to Vercel signature
const adaptVercelHandler = async (handler: any) => { const adaptVercelHandler = async (handler: any) => {