duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-19 23:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Dev' into merge-duckie-main-2026-05-06

Browse Source
This commit is contained in:
DuckieTM
2026-05-08 07:45:17 +02:00
committed by GitHub
parent 57b83c1097 83ee05957d
commit 71725b7f67
18 changed files with 1512 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/secure-assets.ts
+33 -3
View File
@@ -19,6 +19,36 @@ const CLIENT_MODE_DEFAULTS: NitroClientMode = {
secureApiEnabled: true
};
const getDeployBaseUrl = (): string =>
{
try
{
const loaderBase = (window as any).__nitroLoaderBase;
if(typeof loaderBase === 'string' && loaderBase.length) return new URL('..', loaderBase).toString();
}
catch {}
try
{
const moduleUrl = (import.meta as any).url;
if(typeof moduleUrl === 'string' && moduleUrl.length) return new URL('..', new URL('.', moduleUrl)).toString();
}
catch {}
try
{
const base = (import.meta as any).env?.BASE_URL;
if(typeof base === 'string' && base.length)
{
const trimmed = base.replace(/^\/+/, '').replace(/\/+$/, '');
return trimmed ? `${ window.location.origin }/${ trimmed }/` : `${ window.location.origin }/`;
}
}
catch {}
return `${ window.location.origin }/`;
};
const isDebugEnabled = (): boolean =>
{
try
@@ -205,7 +235,7 @@ const getPlainAssetBase = (kind: 'config' | 'gamedata'): string =>
if(typeof configured === 'string' && configured.length) return configured.endsWith('/') ? configured : `${ configured }/`;
if(kind === 'config') return `${ window.location.origin }/configuration/`;
if(kind === 'config') return new URL('configuration/', getDeployBaseUrl()).toString();
return `${ window.location.origin }/nitro/gamedata/`;
};
@@ -227,7 +257,7 @@ export const secureUrl = (kind: 'config' | 'gamedata', file: string, cacheBust =
{
if(!getClientMode().secureAssetsEnabled)
{
const plainUrl = new URL(file.replace(/^\/+/, ''), `${ window.location.origin }/`);
const plainUrl = new URL(file.replace(/^\/+/, ''), getPlainAssetBase(kind));
if(cacheBust) plainUrl.searchParams.set('v', Date.now().toString(36));
@@ -244,7 +274,7 @@ export const configFileUrl = (file: string, cacheBust = false): string =>
{
if(getClientMode().secureAssetsEnabled) return secureUrl('config', file, cacheBust);
const plainUrl = new URL(`configuration/${ file.replace(/^\/+/, '') }`, `${ window.location.origin }/`);
const plainUrl = new URL(file.replace(/^\/+/, ''), getPlainAssetBase('config'));
if(cacheBust) plainUrl.searchParams.set('v', Date.now().toString(36));