* ci: pull version from package.json on build

* fix: implicit any type

* feat: inital support for logger

* style: fix lint

* feat: move more logging over to pino

* fix: logging around company importing
This commit is contained in:
Husky
2025-07-08 22:01:23 -04:00
committed by GitHub
parent e4fbc7cd50
commit 2b70cea4e0
33 changed files with 481 additions and 171 deletions
@@ -6,8 +6,8 @@ export default defineDropTask({
name: "Cleanup Invitations",
acls: ["system:maintenance:read"],
taskGroup: "cleanup:invitations",
async run({ log }) {
log("Cleaning invitations");
async run({ progress, logger }) {
logger.info("Cleaning invitations");
const now = new Date();
@@ -19,6 +19,7 @@ export default defineDropTask({
},
});
log("Done");
logger.info("Done");
progress(100);
},
});
+13 -11
View File
@@ -15,36 +15,38 @@ export default defineDropTask({
name: "Cleanup Objects",
acls: ["system:maintenance:read"],
taskGroup: "cleanup:objects",
async run({ progress, log }) {
log("Cleaning unreferenced objects");
async run({ progress, logger }) {
logger.info("Cleaning unreferenced objects");
// get all objects
const objects = await objectHandler.listAll();
log(`searching for ${objects.length} objects`);
logger.info(`searching for ${objects.length} objects`);
progress(30);
// find unreferenced objects
const refMap = buildRefMap();
log("Building reference map");
log(`Found ${Object.keys(refMap).length} models with reference fields`);
log("Searching for unreferenced objects");
logger.info("Building reference map");
logger.info(
`Found ${Object.keys(refMap).length} models with reference fields`,
);
logger.info("Searching for unreferenced objects");
const unrefedObjects = await findUnreferencedStrings(objects, refMap);
log(`found ${unrefedObjects.length} Unreferenced objects`);
// console.log(unrefedObjects);
logger.info(`found ${unrefedObjects.length} Unreferenced objects`);
// logger.info(unrefedObjects);
progress(60);
// remove objects
const deletePromises: Promise<boolean>[] = [];
for (const obj of unrefedObjects) {
log(`Deleting object ${obj}`);
logger.info(`Deleting object ${obj}`);
deletePromises.push(objectHandler.deleteAsSystem(obj));
}
await Promise.all(deletePromises);
// Remove any possible leftover metadata
objectHandler.cleanupMetadata();
await objectHandler.cleanupMetadata(logger);
log("Done");
logger.info("Done");
progress(100);
},
});
+4 -3
View File
@@ -6,9 +6,10 @@ export default defineDropTask({
name: "Cleanup Sessions",
acls: ["system:maintenance:read"],
taskGroup: "cleanup:sessions",
async run({ log }) {
log("Cleaning up sessions");
async run({ progress, logger }) {
logger.info("Cleaning up sessions");
await sessionHandler.cleanupSessions();
log("Done");
logger.info("Done");
progress(100);
},
});
+19 -17
View File
@@ -21,38 +21,38 @@ export default defineDropTask({
name: "Check for Update",
acls: ["system:maintenance:read"],
taskGroup: "check:update",
async run({ log }) {
async run({ progress, logger }) {
// TODO: maybe implement some sort of rate limit thing to prevent this from calling github api a bunch in the event of crashloop or whatever?
// probably will require custom task scheduler for object cleanup anyway, so something to thing about
if (!systemConfig.shouldCheckForUpdates()) {
log("Update check is disabled by configuration");
logger.info("Update check is disabled by configuration");
progress(100);
return;
}
log("Checking for update");
logger.info("Checking for update");
const currVerStr = systemConfig.getDropVersion();
const currVer = semver.coerce(currVerStr);
if (currVer === null) {
const msg = "Drop provided a invalid semver tag";
log(msg);
logger.info(msg);
throw new Error(msg);
}
progress(30);
const response = await fetch(
"https://api.github.com/repos/Drop-OSS/drop/releases/latest",
);
progress(50);
// if response failed somehow
if (!response.ok) {
log(
"Failed to check for update " +
JSON.stringify({
status: response.status,
body: response.body,
}),
);
logger.info("Failed to check for update ", {
status: response.status,
body: response.body,
});
throw new Error(
`Failed to check for update: ${response.status} ${response.body}`,
@@ -63,8 +63,8 @@ export default defineDropTask({
const resJson = await response.json();
const body = latestRelease(resJson);
if (body instanceof type.errors) {
log(body.summary);
log("GitHub Api response" + JSON.stringify(resJson));
logger.info(body.summary);
logger.info("GitHub Api response" + JSON.stringify(resJson));
throw new Error(
`GitHub Api response did not match expected schema: ${body.summary}`,
);
@@ -74,14 +74,15 @@ export default defineDropTask({
const latestVer = semver.coerce(body.tag_name);
if (latestVer === null) {
const msg = "Github Api returned invalid semver tag";
log(msg);
logger.info(msg);
throw new Error(msg);
}
progress(70);
// TODO: handle prerelease identifiers https://github.com/npm/node-semver#prerelease-identifiers
// check if is newer version
if (semver.gt(latestVer, currVer)) {
log("Update available");
logger.info("Update available");
notificationSystem.systemPush({
nonce: `drop-update-available-${currVer}-to-${latestVer}`,
title: `Update available to v${latestVer}`,
@@ -90,9 +91,10 @@ export default defineDropTask({
acls: ["system:notifications:read"],
});
} else {
log("no update available");
logger.info("no update available");
}
log("Done");
logger.info("Done");
progress(100);
},
});