Merge dev to main #1

Merged
ChrisChrome merged 20 commits from dev into main 2025-10-28 07:58:47 -06:00
Showing only changes of commit 13dc274a36 - Show all commits

View file

@ -31,7 +31,16 @@ const main = () => {
}).then(async (response) => { }).then(async (response) => {
// Responses are an array of objects. The first should always have eventlist: 'start', and last should have eventlist: 'complete'. Remove these, make an array of objects {key, val} based on the rest of the response objects. // Responses are an array of objects. The first should always have eventlist: 'start', and last should have eventlist: 'complete'. Remove these, make an array of objects {key, val} based on the rest of the response objects.
let entries = response.filter(r => r.eventlist !== 'start' && r.eventlist !== 'Complete').map(r => ({ key: r.key, val: r.val })); let entries = response.filter(r => r.eventlist !== 'start' && r.eventlist !== 'Complete').map(r => ({ key: r.key, val: r.val }));
console.log(entries) for (let entry of entries) {
let [type, ext] = entry.key.split('/').shift();
if (cfTypes[type]) {
respData.push({
extension: ext,
type: type,
target: entry.val
});
}
}
}).then(() => { }).then(() => {
sock.getList({ sock.getList({
@ -44,7 +53,7 @@ const main = () => {
if (cfTypes[type]) { if (cfTypes[type]) {
respData.push({ respData.push({
extension: ext, extension: ext,
type: "CFB", type: type,
target: entry.val target: entry.val
}); });
} }
@ -56,7 +65,7 @@ const main = () => {
}).then(async (response) => { }).then(async (response) => {
let entries = response.filter(r => r.eventlist !== 'start' && r.eventlist !== 'Complete').map(r => ({ key: r.key, val: r.val })); let entries = response.filter(r => r.eventlist !== 'start' && r.eventlist !== 'Complete').map(r => ({ key: r.key, val: r.val }));
for (let entry of entries) { for (let entry of entries) {
let [type, ext] = entry.key.split('/'); let [type, ext] = entry.key.split('/').shift();
if (cfTypes[type]) { if (cfTypes[type]) {
respData.push({ respData.push({
extension: ext, extension: ext,