lee/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-05-04 16:40:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

clean(apps): merge fns only called by get_app_icon_url (#2617)
Docker Image CI / build-and-push-image (push) Has been cancelled
Details
Maintain Release Merge PR / update-release-pr (push) Has been cancelled
Details
release-please / release-please (push) Has been cancelled
Details
test / test-backend (24.x) (push) Has been cancelled
Details
test / API tests (node env, api-test) (24.x) (push) Has been cancelled
Details
test / puterjs (node env, vitest) (24.x) (push) Has been cancelled
Details

Browse Source 
Each of these methods is only being called by get_app_icon_url. By
changing that ternary operator into an `if` block with an early return
we can move the bodies of these functions here. If one of the former
functions ever needs to be used in more than one place, it's easy to
extract it out of here agian - for now though let's not pay the cost of
jumping to another function definition while trying to understand this
code if we're not gaining anything from it.
This commit is contained in:
Eric Dubé
2026-03-06 20:07:14 -05:00
committed by GitHub
parent 2a027ed410
commit 0fa0340ca2
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/src/helpers.js
+33 -34
View File
@@ -145,37 +145,6 @@ const isBase64AppIcon = (app) => {
return isRawBase64ImageString(trimmed);
};
const buildAppIconSubdomainUrl = (app_uid, size = DEFAULT_APP_ICON_SIZE) => {
if ( ! app_uid ) return null;
const normalized_uid = normalizeAppUid(app_uid);
const iconSize = Number.isFinite(Number(size)) ? Number(size) : DEFAULT_APP_ICON_SIZE;
const static_hosting_domain = config.static_hosting_domain || config.static_hosting_domain_alt;
if ( ! static_hosting_domain ) return null;
const protocol = config.protocol || 'https';
return `${protocol}://${APP_ICONS_SUBDOMAIN}.${static_hosting_domain}/${normalized_uid}-${iconSize}.png`;
};
const buildAppIconEndpointUrl = (app_uid, size = DEFAULT_APP_ICON_SIZE) => {
if ( ! app_uid ) return null;
const normalized_uid = normalizeAppUid(app_uid);
const iconSize = Number.isFinite(Number(size)) ? Number(size) : DEFAULT_APP_ICON_SIZE;
try {
const svc_appIcon = servicesContainer.services?.get?.('app-icon');
const iconPath = svc_appIcon?.getAppIconPath?.({
appUid: normalized_uid,
size: iconSize,
});
if ( iconPath ) return iconPath;
} catch {
// Fall back to direct URL generation below.
}
const apiBaseUrl = String(config.api_base_url || '').replace(/\/+$/, '');
if ( ! apiBaseUrl ) return null;
return `${apiBaseUrl}/app-icon/${normalized_uid}/${iconSize}`;
};
export async function is_empty (dir_uuid) {
/** @type BaseDatabaseAccessService */
const db = servicesContainer.services.get('database').get(DB_READ, 'filesystem');
@@ -514,9 +483,39 @@ export async function get_app (options) {
const get_app_icon_url = (app, size) => {
const iconIsBase64 = isBase64AppIcon(app);
const svc_appIcon = servicesContainer.services.get('app-icon');
return (iconIsBase64 || svc_appIcon.config.no_subdomain)
? buildAppIconEndpointUrl(app.uid ?? app.uuid, size)
: buildAppIconSubdomainUrl(app.uid ?? app.uuid, size);
const app_uid = app.uid ?? app.uuid;
// For base64 icons, or if `no_subdomain` was set in config, use the
// `/app-icon` endpoint on Puter's backend as the URL for this icon.
if ( iconIsBase64 || svc_appIcon.config.no_subdomain ) {
if ( ! app_uid ) return null;
const normalized_uid = normalizeAppUid(app_uid);
const iconSize = Number.isFinite(Number(size)) ? Number(size) : DEFAULT_APP_ICON_SIZE;
try {
const iconPath = svc_appIcon?.getAppIconPath?.({
appUid: normalized_uid,
size: iconSize,
});
if ( iconPath ) return iconPath;
} catch {
// Fall back to direct URL generation below.
}
const apiBaseUrl = String(config.api_base_url || '').replace(/\/+$/, '');
if ( ! apiBaseUrl ) return null;
return `${apiBaseUrl}/app-icon/${normalized_uid}/${iconSize}`;
}
// Otherwise, the icon has a URL under `puter-app-icons.puter.site`
// (or the `puter-app-icons` subdomain of this Puter instance's static hosting domain)
if ( ! app_uid ) return null;
const normalized_uid = normalizeAppUid(app_uid);
const iconSize = Number.isFinite(Number(size)) ? Number(size) : DEFAULT_APP_ICON_SIZE;
const static_hosting_domain = config.static_hosting_domain || config.static_hosting_domain_alt;
if ( ! static_hosting_domain ) return null;
const protocol = config.protocol || 'https';
return `${protocol}://${APP_ICONS_SUBDOMAIN}.${static_hosting_domain}/${normalized_uid}-${iconSize}.png`;
};
/**