T-Gander/ProxmoxVEDHelperScripts
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(bot): handle PocketBase returning JSON fields as pre-parsed objects

Browse Source
This commit is contained in:
CanbiZ (MickLesk)
2026-03-18 19:39:44 +01:00
parent 8bb2f28b48
commit b689917eee
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
.github/workflows/pocketbase-bot.yml generated vendored
View File

@@ -213,7 +213,7 @@ jobs:
// ── PocketBase: find record by slug (shared by all paths) ────────── // ── PocketBase: find record by slug (shared by all paths) ──────────
const recordsUrl = apiBase + '/collections/' + encodeURIComponent(coll) + '/records'; const recordsUrl = apiBase + '/collections/' + encodeURIComponent(coll) + '/records';
const filter = "(slug='" + slug.replace(/'/g, "''") + "')"; const filter = "(slug='" + slug.replace(/'/g, "''") + "')";
const listRes = await request(recordsUrl + '?filter=' + encodeURIComponent(filter) + '&perPage=1&expand=install_methods%2Cinstall_methods.type', { const listRes = await request(recordsUrl + '?filter=' + encodeURIComponent(filter) + '&perPage=1', {
headers: { 'Authorization': token } headers: { 'Authorization': token }
}); });
const list = JSON.parse(listRes.body); const list = JSON.parse(listRes.body);
@@ -239,8 +239,12 @@ jobs:
const noteArgsStr = rest.substring(noteMatch[0].length).trim(); const noteArgsStr = rest.substring(noteMatch[0].length).trim();
// Parse notes_json from the already-fetched script record // Parse notes_json from the already-fetched script record
// PocketBase may return JSON fields as already-parsed objects
let notesArr = []; let notesArr = [];
try { notesArr = JSON.parse(record.notes_json || '[]'); } catch (e) { notesArr = []; } try {
const rawNotes = record.notes_json;
notesArr = Array.isArray(rawNotes) ? rawNotes : JSON.parse(rawNotes || '[]');
} catch (e) { notesArr = []; }
// Token parser: unquoted-word OR "quoted string" (supports \" escapes) // Token parser: unquoted-word OR "quoted string" (supports \" escapes)
function parseNoteTokens(str) { function parseNoteTokens(str) {
@@ -393,18 +397,12 @@ jobs:
const methodListMode = !methodArgs || methodArgs.toLowerCase() === 'list'; const methodListMode = !methodArgs || methodArgs.toLowerCase() === 'list';
// Parse install_methods_json from the already-fetched script record // Parse install_methods_json from the already-fetched script record
// PocketBase may return JSON fields as already-parsed objects
let methodsArr = []; let methodsArr = [];
try { methodsArr = JSON.parse(record.install_methods_json || '[]'); } catch (e) { methodsArr = []; } try {
// Fallback: if JSON cache is empty, build from expanded install_methods relation const rawMethods = record.install_methods_json;
if (methodsArr.length === 0 && record.expand && record.expand.install_methods) { methodsArr = Array.isArray(rawMethods) ? rawMethods : JSON.parse(rawMethods || '[]');
methodsArr = (record.expand.install_methods || []).map(function (im) { } catch (e) { methodsArr = []; }
const typeObj = (im.expand && im.expand.type) || {};
return {
type: typeObj.type || (typeof im.type === 'string' ? im.type : '?'),
resources: { cpu: im.resources_cpu, ram: im.resources_ram, hdd: im.resources_hdd }
};
});
}
function formatMethodsList(arr) { function formatMethodsList(arr) {
if (arr.length === 0) return '*None*'; if (arr.length === 0) return '*None*';
@@ -430,20 +428,9 @@ jobs:
if (methodListMode) { if (methodListMode) {
await addReaction('+1'); await addReaction('+1');
let debugInfo = '';
if (methodsArr.length === 0) {
const rawJson = record.install_methods_json;
const expandedIds = Array.isArray(record.install_methods) ? record.install_methods : [];
const expandData = record.expand && record.expand.install_methods;
debugInfo = '\n\n<details><summary>Debug info</summary>\n\n' +
'- `install_methods_json` raw: `' + JSON.stringify(rawJson) + '`\n' +
'- `install_methods` IDs: `' + JSON.stringify(expandedIds) + '`\n' +
'- expand present: `' + (expandData ? JSON.stringify(expandData) : 'none') + '`\n' +
'</details>';
}
await postComment( await postComment(
'ℹ️ **PocketBase Bot**: Install methods for **`' + slug + '`** (' + methodsArr.length + ' total)\n\n' + 'ℹ️ **PocketBase Bot**: Install methods for **`' + slug + '`** (' + methodsArr.length + ' total)\n\n' +
formatMethodsList(methodsArr) + debugInfo formatMethodsList(methodsArr)
); );
} else { } else {
// Parse: <type> cpu=N ram=N hdd=N // Parse: <type> cpu=N ram=N hdd=N