Public/fifthgrid_browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Scott E. Graves
2025-09-13 22:21:34 -05:00
parent 303cc7390c
commit 73d39c110a
1 changed files with 90 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
src/api.js
View File

@@ -26,12 +26,7 @@ const cleanOldItems = async () => {
try { try {
const key = oldItems.pop(); const key = oldItems.pop();
console.log(`cleaning|key|${key}`); console.log(`cleaning|key|${key}`);
await s3.send( await s3.send(new DeleteObjectCommand({ Bucket: BUCKET, Key: key }));
new DeleteObjectCommand({
Bucket: BUCKET,
Key: key,
}),
);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
@@ -54,8 +49,9 @@ const createDownloadLink = async (key) => {
const getBucketFiles = async (folderName) => { const getBucketFiles = async (folderName) => {
try { try {
folderName = folderName.toLowerCase(); folderName = (folderName || "").toLowerCase();
const folderKey = encodeURIComponent(folderName) + "/"; const folderKey = encodeURIComponent(folderName) + "/";
const data = await s3.send( const data = await s3.send(
new ListObjectsCommand({ new ListObjectsCommand({
Bucket: BUCKET, Bucket: BUCKET,
@@ -63,14 +59,15 @@ const getBucketFiles = async (folderName) => {
}), }),
); );
// SAFETY: guard undefined Contents and ensure Date is a Date const contents = Array.isArray(data?.Contents) ? data.Contents : [];
const ret = (data.Contents || [])
.filter((item) => item.Key !== folderKey) const ret = contents
.map((item) => { .filter((obj) => obj.Key !== folderKey)
.map((obj) => {
const d = const d =
item.LastModified instanceof Date obj.LastModified instanceof Date
? item.LastModified ? obj.LastModified
: new Date(item.LastModified); : new Date(obj.LastModified);
return { return {
date: d date: d
.toLocaleDateString("en-US", { .toLocaleDateString("en-US", {
@@ -82,137 +79,111 @@ const getBucketFiles = async (folderName) => {
second: "2-digit", second: "2-digit",
}) })
.replace(/,/g, ""), .replace(/,/g, ""),
sort: d.getTime(), sort: d.getTime() || 0,
name: item.Key.replace(folderKey, ""), name: (obj.Key || "").replace(folderKey, ""),
key: item.Key, key: obj.Key || "",
}; };
}) })
.sort((a, b) => { .sort((a, b) => (a.sort > b.sort ? -1 : a.sort < b.sort ? 1 : 0));
return a.sort > b.sort ? -1 : a.sort < b.sort ? 1 : 0;
});
const itemCount = {}; const itemCount = {};
const ext = ".tar.gz"; const ext = ".tar.gz";
const filteredItems = ret // pick tars to keep (apply nightly policy)
.filter((it) => it.name.endsWith(ext)) const tars = ret.filter((it) => it.name.endsWith(ext));
.filter((it) => { const keepTarKeys = new Set();
if (folderName === "nightly") {
const parts = it.name.split("_"); for (const t of tars) {
const groupId = `${parts[0]}_${parts[3]}_${parts[4]}`; if (folderName === "nightly") {
itemCount[groupId] = itemCount[groupId] || 0; const parts = t.name.split("_");
if (++itemCount[groupId] <= 3) { // parts[0]=product, parts[3]=platform, parts[4]=arch
return true; const groupId = `${parts[0]}_${parts[3]}_${parts[4]}`;
itemCount[groupId] = itemCount[groupId] || 0;
if (++itemCount[groupId] <= 3) {
keepTarKeys.add(t.key);
} else {
// mark tar + sidecars old
if (!oldItems.includes(t.key)) {
oldItems.push(t.key, t.key + ".sha256", t.key + ".sig");
} }
// mark old: tar + sidecars
if (!oldItems.find((k) => k === it.key)) {
oldItems.push(it.key, it.key + ".sha256", it.key + ".sig");
if (parts[3] === "windows") { // windows companion (_setup.exe) + sidecars
const setup_key = if (parts[3] === "windows") {
it.key.substring(0, it.key.length - ext.length) + "_setup.exe"; const setupKey =
const setup_item = ret.find((r) => r.key === setup_key); t.key.substring(0, t.key.length - ext.length) + "_setup.exe";
if (setup_item) { const setupItem = ret.find((x) => x.key === setupKey);
oldItems.push( if (setupItem && !oldItems.includes(setupKey)) {
setup_key, oldItems.push(setupKey, setupKey + ".sha256", setupKey + ".sig");
setup_key + ".sha256", }
setup_key + ".sig", }
);
} // darwin companion (.dmg) + sidecars
} if (parts[3] === "darwin") {
const dmgKey =
if (parts[3] === "darwin") { t.key.substring(0, t.key.length - ext.length) + ".dmg";
const dmg_key = const dmgItem = ret.find((x) => x.key === dmgKey);
it.key.substring(0, it.key.length - ext.length) + ".dmg"; if (dmgItem && !oldItems.includes(dmgKey)) {
const dmg_item = ret.find((r) => r.key === dmg_key); oldItems.push(dmgKey, dmgKey + ".sha256", dmgKey + ".sig");
if (dmg_item) {
oldItems.push(dmg_key, dmg_key + ".sha256", dmg_key + ".sig");
}
} }
} }
return false;
} }
return true; } else {
}); keepTarKeys.add(t.key);
}
}
const totalCount = filteredItems.length * 3; // fast lookup
const byKey = Object.fromEntries(ret.map((r) => [r.key, r]));
const setup_items = []; // build final list by pushing (no in-place splicing)
const dmg_items = []; // NEW: keep a separate DMG list const out = [];
let setup_offset = 0; for (const t of tars) {
let dmg_offset = 0; // NEW: independent DMG offset if (!keepTarKeys.has(t.key)) continue;
for (let i = 0; i < totalCount && i < filteredItems.length; i += 3) { const parts = t.name.split("_");
const base = filteredItems[i]; const platform = parts[3];
if (!base) break; // SAFETY guard
const parts = base.name.split("_");
// insert tar sidecars for this row // 1) tar + sidecars
let arr = ret.filter((r) => r.name === base.name + ".sha256"); out.push(t);
filteredItems.splice(i + 1, 0, ...arr); const tarSha = byKey[t.key + ".sha256"];
arr = ret.filter((r) => r.name === base.name + ".sig"); if (tarSha) out.push(tarSha);
filteredItems.splice(i + 2, 0, ...arr); const tarSig = byKey[t.key + ".sig"];
if (tarSig) out.push(tarSig);
// queue windows companion block // 2) windows setup + sidecars
if (parts[3] === "windows") { if (platform === "windows") {
const setup_key = const setupKey =
base.key.substring(0, base.key.length - ext.length) + "_setup.exe"; t.key.substring(0, t.key.length - ext.length) + "_setup.exe";
const setup_item = ret.find((r) => r.key === setup_key); const setup = byKey[setupKey];
if (setup_item) { if (setup) {
const setup_item2 = ret.find((r) => r.key === setup_key + ".sha256"); out.push(setup);
const setup_item3 = ret.find((r) => r.key === setup_key + ".sig"); const setupSha = byKey[setupKey + ".sha256"];
setup_items.push([ if (setupSha) out.push(setupSha);
{ idx: i + 3 + setup_offset }, const setupSig = byKey[setupKey + ".sig"];
setup_item, if (setupSig) out.push(setupSig);
setup_item2,
setup_item3,
]);
setup_offset += 3;
} }
} }
// queue darwin companion block // 3) darwin dmg + sidecars
if (parts[3] === "darwin") { if (platform === "darwin") {
const dmg_key = const dmgKey = t.key.substring(0, t.key.length - ext.length) + ".dmg";
base.key.substring(0, base.key.length - ext.length) + ".dmg"; const dmg = byKey[dmgKey];
const dmg_item = ret.find((r) => r.key === dmg_key); if (dmg) {
if (dmg_item) { out.push(dmg);
const dmg_item2 = ret.find((r) => r.key === dmg_key + ".sha256"); const dmgSha = byKey[dmgKey + ".sha256"];
const dmg_item3 = ret.find((r) => r.key === dmg_key + ".sig"); if (dmgSha) out.push(dmgSha);
dmg_items.push([ const dmgSig = byKey[dmgKey + ".sig"];
{ idx: i + 3 + dmg_offset }, // FIX: use dmg_offset if (dmgSig) out.push(dmgSig);
dmg_item,
dmg_item2,
dmg_item3,
]);
dmg_offset += 3; // FIX: increment dmg_offset
} }
} }
} }
// insert queued companion blocks return out;
if (dmg_items.length > 0) {
dmg_items.forEach((items) => {
filteredItems.splice(items[0].idx, 0, items[1]);
if (items[2]) filteredItems.splice(items[0].idx + 1, 0, items[2]);
if (items[3]) filteredItems.splice(items[0].idx + 2, 0, items[3]);
});
}
if (setup_items.length > 0) {
setup_items.forEach((items) => {
filteredItems.splice(items[0].idx, 0, items[1]);
if (items[2]) filteredItems.splice(items[0].idx + 1, 0, items[2]);
if (items[3]) filteredItems.splice(items[0].idx + 2, 0, items[3]);
});
}
return filteredItems;
} catch (err) { } catch (err) {
console.error(err); console.error(err);
return [];
} }
return [];
}; };
export { cleanOldItems, createDownloadLink, getBucketFiles }; export { cleanOldItems, createDownloadLink, getBucketFiles };