Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
steve02081504 committed Jan 18, 2025
1 parent 6bb7f42 commit 885d84b
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions src/server/parts_loader.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export async function uninstallPartBase(username, parttype, partname, unLoadargs
unLoader = (part) => part.Unload?.(unLoadargs),
pathGetter = () => GetPartPath(username, parttype, partname),
Uninstaller = async (part, path) => {
await part.Uninstall?.(uninstallArgs)
await part?.Uninstall?.(uninstallArgs)
fs.rmSync(path, { recursive: true, force: true })
}
} = {}) {
Expand All @@ -122,7 +122,11 @@ export async function uninstallPartBase(username, parttype, partname, unLoadargs
} catch (error) {
console.error(error)
}
part ??= await baseloadPart(username, parttype, partname, { Loader, pathGetter })
try {
part ??= await baseloadPart(username, parttype, partname, { Loader, pathGetter })
} catch (error) {
console.error(error)
}
await Uninstaller(part, pathGetter())
}

Expand Down Expand Up @@ -156,7 +160,21 @@ export async function getPartDetails(username, parttype, partname) {
let details = parts_details_cache?.[parttype]?.[partname]
if (parts_set?.[username]?.[parttype]?.[partname]) details = undefined
if (details === undefined) {
const part = await baseloadPart(username, parttype, partname).catch(() => loadPart(username, parttype, partname))
try {
const part = await baseloadPart(username, parttype, partname).catch(() => loadPart(username, parttype, partname))
}
catch (error) {
console.error(error)
return {
info: {
name: partname,
avatar: 'https://api.iconify.design/line-md/emoji-frown-open.svg',
description: 'error loading part',
description_markdown: `# error loading part\n\n\`\`\`\`\n${error.message}\n\`\`\`\``,
},
supportedInterfaces: [],
}
}
parts_details_cache[parttype] ??= {}
details = parts_details_cache[parttype][partname] = {
info: JSON.parse(JSON.stringify(part.info)),
Expand Down

0 comments on commit 885d84b

Please sign in to comment.