From 09894702a025528be8180b616051009e6b19000c Mon Sep 17 00:00:00 2001 From: Onoja Victor <111019083+git-voo@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:49:09 -0600 Subject: [PATCH 001/262] update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger --- classes/Group/Group.mjs | 2 +- classes/Project/Project.mjs | 26 +++++ classes/User/User.mjs | 2 +- database/mongo/__tests__/unit.test.mjs | 18 ++-- database/mongo/controller.mjs | 128 +++++++++++++------------ project/index.mjs | 33 ++++++- 6 files changed, 134 insertions(+), 75 deletions(-) diff --git a/classes/Group/Group.mjs b/classes/Group/Group.mjs index a7fbfbb8..9e602a5e 100644 --- a/classes/Group/Group.mjs +++ b/classes/Group/Group.mjs @@ -234,7 +234,7 @@ export default class Group { async update() { await this.validateGroup() - return database.update({ ...this.data, type: "Group" },) + return database.update(this.data, "Group") } async validateGroup() { diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index 4df74253..fc69a8f1 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -141,6 +141,32 @@ export default class Project { } } +/** + * Asynchronously updates the metadata of the current object and persists the changes. + * + * @param {Object} newMetadata - An object containing the new metadata properties to be assigned. + * @returns {Promise} - A promise that resolves to the updated object after the changes have been saved. + * + * @example + * const newMetadata = [{ label: 'Description'}{value: 'Updated description' }]; + * await instance.updateMetadata(newMetadata); + * console.log(instance.data.metadata); // Outputs: { title: 'New Title', description: 'Updated description' } + * + * @throws {Error} Throws an error if the update operation fails. + */ + async updateMetadata(newMetadata) { + this.data.metadata = newMetadata + return await this.update() + } + + async update() { + return await database.update(this.data, "Project") + } + + async save() { + return await database.save(this.data, "Project") + } + #generateInviteCode(userId) { const date = Date.now().toString() const data = `${date}:${userId}` diff --git a/classes/User/User.mjs b/classes/User/User.mjs index f79762d9..361aee93 100644 --- a/classes/User/User.mjs +++ b/classes/User/User.mjs @@ -151,7 +151,7 @@ export default class User { const updatedUser = await database.update({ ...previousUser, profile: publicProfile - }) + }, "User") return updatedUser } } diff --git a/database/mongo/__tests__/unit.test.mjs b/database/mongo/__tests__/unit.test.mjs index 66efcc52..d854a235 100644 --- a/database/mongo/__tests__/unit.test.mjs +++ b/database/mongo/__tests__/unit.test.mjs @@ -9,7 +9,7 @@ import DatabaseController from "../controller.mjs" const database = new DatabaseController() const TIME_OUT = process.env.DB_TEST_TIMEOUT ?? 6500 -let test_proj = {"@type": "Project", name: "Test Project"} +let test_proj = { name: "Test Project"} let test_group = {"@type": "Group", name: "Test Group"} let test_user = {"@type": "User", name: "Test User"} @@ -21,7 +21,7 @@ afterAll(async () => { return await database.close() }, 10000) -describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { +describe("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "connects for an active connection", async () => { @@ -34,7 +34,7 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "creates a new project", async () => { - const result = await database.save(test_proj) + const result = await database.save(test_proj, "Project") test_proj["_id"] = result["_id"] expect(result["_id"]).toBeTruthy() }, @@ -63,7 +63,7 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { "updates an existing project", async () => { test_proj.name = "Test Project -- Updated" - const result = await database.update(test_proj) + const result = await database.update(test_proj, "Project") expect(result["_id"]).toBeTruthy() }, TIME_OUT @@ -90,7 +90,7 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "Finds matching projects by query", async () => { - const result = await database.find(test_proj) + const result = await database.find(test_proj, "Project") expect(result[0]["_id"]).toBe(test_proj["_id"]) }, TIME_OUT @@ -116,7 +116,7 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { it("Deletes an object with the provided id", async () => { expect(true).toBeTruthy() }) - it("Validates a possible id string", () => { + it.skip("Validates a possible id string", () => { expect(database.isValidId(123)).toBeTruthy() expect(database.isValidId(-123)).toBeTruthy() expect(database.isValidId("123")).toBeTruthy() @@ -139,7 +139,7 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { expect(result).toBe(true) }) it("creates a new project", async () => { - const result = await database.save(test_proj) + const result = await database.save(test_proj, "Project") test_proj["_id"] = result["_id"] expect(result["_id"]).toBeTruthy() }) @@ -156,7 +156,7 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { it("updates an existing project", async () => { test_proj.name = "Test Project -- Updated" - const result = await database.update(test_proj) + const result = await database.update(test_proj, "Project") expect(result["_id"]).toBeTruthy() }) it("updates an existing group", async () => { @@ -171,7 +171,7 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { }) it("Finds matching projects by query", async () => { - const result = await database.find(test_proj) + const result = await database.find(test_proj, "Project") expect(result[0]["_id"]).toBe(test_proj["_id"]) }) it("Finds matching groups by query", async () => { diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index 90280402..ede9a9b6 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -17,16 +17,10 @@ let err_out = Object.assign(new Error(), { /** * This mongo controller oversees multiple collections. - * Requests have to determine which collection they go to based on the user input. - * User input does not specifically designate a collection as part of the request. - * A collection is programatically chosen based on the 'type' of the input JSON. - * Expected types - * - Project - * - Page - * - Group - * - User - * - UserPreferences - * All other object types result in a "Bad Request" + * The collection to interact with is programatically chosen based on the 'type' of the input. + * + * @param type A type string, such as "Project", or null + * @return the corresponding mongo collection, such as "projects", or null */ function discernCollectionFromType(type) { let collection = null @@ -34,13 +28,13 @@ function discernCollectionFromType(type) { switch (type) { case "Project": case "Page": + case "Line": collection = process.env.TPENPROJECTS break case "Group": collection = process.env.TPENGROUPS break case "User": - case "UserPreferences": collection = process.env.TPENUSERS break default: @@ -48,6 +42,18 @@ function discernCollectionFromType(type) { return collection } +/** + * Data belongs to or goes into different collections. The data 'type' usually tells us which one. + * If no type is found on the data, use the provided override, if any. + * + * @param data A data object or query object. The type will correspond to a mongo collection + * @param override If no type is on 'data', consider the provided override to be the type. + * @return a known type string, such as "Project", or null + */ +function determineDataType(data, override) { + return data["@type"] ?? data.type ?? override +} + class DatabaseController { /** * Basic constructor. @@ -153,36 +159,27 @@ class DatabaseController { } } - /** - * Get by property matches and return all objects that match - * @param query JSON from an HTTP POST request. It must contain at least one property. - * @return JSON Array of matched documents or standard error object - */ - validateAndDetermineCollection(query) { - err_out._dbaction = "find" - const data_type = query["@type"] ?? query.type - if (!data_type) { - err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` - err_out.status = 400 - throw err_out - } - const collection = discernCollectionFromType(data_type) - if (!collection) { - err_out.message = `Cannot figure which collection for object of type '${data_type}'` - err_out.status = 400 - throw err_out - } - if (Object.keys(query).length === 0) { - err_out.message = `Empty or null query detected. You must provide a query object.` - err_out.status = 400 - throw err_out - } - return collection - } async find(query, collection) { try { - //need to determine what collection (projects, groups, userPerferences) this goes into. - collection ??= this.validateAndDetermineCollection(query) + // Not allowed to find null or {} + if (!query || Object.keys(query).length === 0) { + err_out.message = `Empty or null query detected. You must provide a query object.` + err_out.status = 400 + throw err_out + } + // need to determine what collection (projects, groups, users) this goes into. + const data_type = determineDataType(query, collection) + if (!data_type) { + err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` + err_out.status = 400 + throw err_out + } + collection ??= discernCollectionFromType(data_type) + if (!collection) { + err_out.message = `Cannot figure which collection for object of type '${data_type}'` + err_out.status = 400 + throw err_out + } let result = await this.db.collection(collection).find(query).toArray() return result } catch (err) { @@ -196,8 +193,26 @@ class DatabaseController { async findOne(query, collection) { try { - //need to determine what collection (projects, groups, userPerferences) this goes into. - collection ??= this.validateAndDetermineCollection(query) + // Not allowed to find null or {} + if (!query || Object.keys(query).length === 0) { + err_out.message = `Empty or null query detected. You must provide a query object.` + err_out.status = 400 + throw err_out + } + // need to determine what collection (projects, groups, users) this goes into. + + const data_type = determineDataType(query, collection) + if (!data_type) { + err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` + err_out.status = 400 + throw err_out + } + collection ??= discernCollectionFromType(data_type) + if (!collection) { + err_out.message = `Cannot figure which collection for object of type '${data_type}'` + err_out.status = 400 + throw err_out + } let result = await this.db.collection(collection).findOne(query) return result } catch (err) { @@ -215,10 +230,14 @@ class DatabaseController { * @return The inserted document JSON or error JSON */ async save(data, collection) { - err_out._dbaction = "insertOne" try { - //need to determine what collection (projects, groups, users) this goes into. - const data_type = this.determineDataType(data, collection) + // need to determine what collection (projects, groups, users) this goes into. + const data_type = determineDataType(data, collection) + if (!data_type) { + err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` + err_out.status = 400 + throw err_out + } collection ??= discernCollectionFromType(data_type) if (!collection) { err_out.message = `Cannot figure which collection for object of type '${data_type}'` @@ -247,24 +266,23 @@ class DatabaseController { * @param data JSON from an HTTP POST request. It must contain an id. * @return The inserted document JSON or error JSON */ - async update(data) { + async update(data, collection) { // Note this may be an alias for save() - err_out._dbaction = "replaceOne" try { - //need to determine what collection (projects, groups, userPerferences) this goes into. - const data_type = data["@type"] ?? data.type let data_id = data["@id"] ?? data._id if (!data_id) { err_out.message = `An 'id' must be present to update.` err_out.status = 400 throw err_out } + // need to determine what collection (projects, groups, users) this goes into. + const data_type = determineDataType(data, collection) if (!data_type) { err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` err_out.status = 400 throw err_out } - const collection = discernCollectionFromType(data_type) + collection ??= discernCollectionFromType(data_type) if (!collection) { err_out.message = `Cannot figure which collection for object of type '${data_type}'` err_out.status = 400 @@ -315,18 +333,6 @@ class DatabaseController { return this.findOne({_id}, collection) } - determineDataType(data,override) { - const data_type = data["@type"] ?? data.type ?? override - if (!data_type) { - const err_out = { - message: `Cannot find 'type' on this data, and so cannot figure out a collection for it.`, - status: 400, - _dbaction: "insertOne" - } - throw err_out - } - return data_type - } } export default DatabaseController diff --git a/project/index.mjs b/project/index.mjs index 8b969f6f..c53e050a 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -177,8 +177,8 @@ router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { const project = new Project(projectId) if (await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.MEMBER)) { await project.removeMember(userId) - .then(() => res.sendStatus(204)) - } + .then(() => res.sendStatus(204)) + } else { res .status(403) @@ -316,7 +316,7 @@ router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res group.addMemberRoles(newOwnerId, ["OWNER"], true) group.removeMemberRoles(user._id, ["OWNER"], true) await group.update() - + res.status(200).json({ message: `Ownership successfully transferred to member ${newOwnerId}.` }) } catch (error) { return respondWithError(res, error.status || 500, error.message || "Error transferring ownership.") @@ -433,6 +433,33 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') } }) + +// Update Project Metadata +router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { + const { projectId } = req.params + const metadata = req.body + const user = req.user + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + if (!metadata || !Array.isArray(metadata)) { + return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") + } + + try { + const projectObj = new Project(projectId) + + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to update metadata for this project.") + } + + const response = await projectObj.updateMetadata(metadata) + res.status(200).json(response) + } catch (error) { + return respondWithError(res, error.status || 500, error.message || "Error updating project metadata.") + } +}) // Change a member's Role(s): Replace roles with new ones From 32b4dd5a872b735eb47776bc85e54137ed72fc24 Mon Sep 17 00:00:00 2001 From: Onoja Date: Thu, 6 Feb 2025 10:18:17 -0600 Subject: [PATCH 002/262] quickfix --- classes/Group/Group.mjs | 7 ++++--- classes/Project/Project.mjs | 2 +- project/index.mjs | 3 +-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/Group/Group.mjs b/classes/Group/Group.mjs index 9e602a5e..ce8cc34a 100644 --- a/classes/Group/Group.mjs +++ b/classes/Group/Group.mjs @@ -9,7 +9,7 @@ export default class Group { } async #loadFromDB() { - this.data = await database.getById(this._id, "groups") + this.data = await database.getById(this._id, process.env.TPENGROUPS) return this } @@ -228,16 +228,17 @@ export default class Group { } async save() { - this.validateGroup() + await this.validateGroup() return database.save(this.data, process.env.TPENGROUPS) } async update() { await this.validateGroup() - return database.update(this.data, "Group") + return database.update(this.data, process.env.TPENGROUPS) } async validateGroup() { + console.log("from validateGroup", this.data) if (!this.data.creator) { throw { status: 400, diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index fc69a8f1..95897621 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -110,7 +110,7 @@ export default class Project { async inviteExistingTPENUser(userId, roles) { const group = new Group(this.data.group) - group.addMember(userId, roles) + await group.addMember(userId, roles) await group.update() return this } diff --git a/project/index.mjs b/project/index.mjs index c53e050a..a1c558b1 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -144,9 +144,8 @@ router } try { const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER)) { - const response = await project.sendInvite(email, roles) + const response = await project.sendInvite(email, roles) res.status(200).json(response) } else { res From 90723bae479861e83503a2cd3d65f747745ff605 Mon Sep 17 00:00:00 2001 From: Onoja Date: Thu, 6 Feb 2025 11:37:07 -0600 Subject: [PATCH 003/262] cleanup --- classes/Group/Group.mjs | 1 - project/index.mjs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/Group/Group.mjs b/classes/Group/Group.mjs index ce8cc34a..3146029b 100644 --- a/classes/Group/Group.mjs +++ b/classes/Group/Group.mjs @@ -238,7 +238,6 @@ export default class Group { } async validateGroup() { - console.log("from validateGroup", this.data) if (!this.data.creator) { throw { status: 400, diff --git a/project/index.mjs b/project/index.mjs index a1c558b1..a52e1eab 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -145,7 +145,7 @@ router try { const project = new Project(projectId) if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER)) { - const response = await project.sendInvite(email, roles) + const response = await project.sendInvite(email, roles) res.status(200).json(response) } else { res From 9ab032bd86ceabbd2d687cb0a5a13da0fbd9d27f Mon Sep 17 00:00:00 2001 From: Onoja Date: Mon, 10 Feb 2025 11:59:56 -0600 Subject: [PATCH 004/262] modify db.update to receive one param {data, collection} --- classes/Group/Group.mjs | 2 +- classes/Project/Project.mjs | 2 +- database/mongo/controller.mjs | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/Group/Group.mjs b/classes/Group/Group.mjs index 3146029b..60c2a3e5 100644 --- a/classes/Group/Group.mjs +++ b/classes/Group/Group.mjs @@ -234,7 +234,7 @@ export default class Group { async update() { await this.validateGroup() - return database.update(this.data, process.env.TPENGROUPS) + return database.update({ data: this.data, collection: process.env.TPENGROUPS }) } async validateGroup() { diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index 95897621..ec94dd61 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -47,6 +47,7 @@ export default class Project { try { let userObj = new User() let user = await userObj.getByEmail(email) + const roles = this.parseRoles(rolesString) const projectTitle = this.data?.label ?? this.data?.title ?? 'TPEN Project' let message = `You have been invited to the TPEN project ${projectTitle}. @@ -111,7 +112,6 @@ export default class Project { async inviteExistingTPENUser(userId, roles) { const group = new Group(this.data.group) await group.addMember(userId, roles) - await group.update() return this } diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index ede9a9b6..e8470a2b 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -266,7 +266,9 @@ class DatabaseController { * @param data JSON from an HTTP POST request. It must contain an id. * @return The inserted document JSON or error JSON */ - async update(data, collection) { + async update(payload) { + let data = payload?.data??payload + let collection = payload?.collection // Note this may be an alias for save() try { let data_id = data["@id"] ?? data._id From d245c083d990ee31b7282a9c0402088a2b74c475 Mon Sep 17 00:00:00 2001 From: Onoja Date: Mon, 10 Feb 2025 12:10:20 -0600 Subject: [PATCH 005/262] nodiff --- database/mongo/controller.mjs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index e8470a2b..c7acdd63 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -6,7 +6,7 @@ * https://github.com/thehabes */ -import {MongoClient, ObjectId} from "mongodb" +import { MongoClient, ObjectId } from "mongodb" import dotenv from "dotenv" let storedEnv = dotenv.config() let err_out = Object.assign(new Error(), { @@ -49,7 +49,7 @@ function discernCollectionFromType(type) { * @param data A data object or query object. The type will correspond to a mongo collection * @param override If no type is on 'data', consider the provided override to be the type. * @return a known type string, such as "Project", or null - */ + */ function determineDataType(data, override) { return data["@type"] ?? data.type ?? override } @@ -148,7 +148,7 @@ class DatabaseController { async connected() { // Send a ping to confirm a successful connection try { - let result = await this.db.command({ping: 1}).catch((err) => { + let result = await this.db.command({ ping: 1 }).catch((err) => { return false }) result = result.ok ? true : false @@ -267,7 +267,7 @@ class DatabaseController { * @return The inserted document JSON or error JSON */ async update(payload) { - let data = payload?.data??payload + let data = payload?.data ?? payload let collection = payload?.collection // Note this may be an alias for save() try { @@ -291,7 +291,7 @@ class DatabaseController { throw err_out } const obj_id = data_id.split("/").pop() - const filter = {_id: data_id} + const filter = { _id: data_id } const result = await this.db .collection(collection) .replaceOne(filter, data) @@ -332,7 +332,7 @@ class DatabaseController { * Get by ID. We need to decide about '@id', 'id', '_id', and http/s */ async getById(_id, collection) { - return this.findOne({_id}, collection) + return this.findOne({ _id }, collection) } } From 50c91b014fa82315a2f981ad706ae038902e7dba Mon Sep 17 00:00:00 2001 From: Onoja Date: Mon, 10 Feb 2025 13:26:29 -0600 Subject: [PATCH 006/262] restore action(data, collection) structure --- classes/Group/Group.mjs | 2 +- database/driver.mjs | 2 +- database/mongo/controller.mjs | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/classes/Group/Group.mjs b/classes/Group/Group.mjs index 60c2a3e5..3146029b 100644 --- a/classes/Group/Group.mjs +++ b/classes/Group/Group.mjs @@ -234,7 +234,7 @@ export default class Group { async update() { await this.validateGroup() - return database.update({ data: this.data, collection: process.env.TPENGROUPS }) + return database.update(this.data, process.env.TPENGROUPS) } async validateGroup() { diff --git a/database/driver.mjs b/database/driver.mjs index b46fda1e..105c91ad 100644 --- a/database/driver.mjs +++ b/database/driver.mjs @@ -96,7 +96,7 @@ class dbDriver { */ async update(data, collection) { // Note this may just be an alias for save() - return this.controller.update(data).catch(err => err) + return this.controller.update(data, collection).catch(err => err) } /** diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index c7acdd63..40155aec 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -266,9 +266,7 @@ class DatabaseController { * @param data JSON from an HTTP POST request. It must contain an id. * @return The inserted document JSON or error JSON */ - async update(payload) { - let data = payload?.data ?? payload - let collection = payload?.collection + async update(data, collection) { // Note this may be an alias for save() try { let data_id = data["@id"] ?? data._id From 2c7bf7cab06f73265640e1105b28d46ea5661e5f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 10 Feb 2025 13:37:59 -0600 Subject: [PATCH 007/262] undiff --- classes/Project/Project.mjs | 1 - database/mongo/controller.mjs | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index ec94dd61..c09d76a3 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -47,7 +47,6 @@ export default class Project { try { let userObj = new User() let user = await userObj.getByEmail(email) - const roles = this.parseRoles(rolesString) const projectTitle = this.data?.label ?? this.data?.title ?? 'TPEN Project' let message = `You have been invited to the TPEN project ${projectTitle}. diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index 40155aec..ede9a9b6 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -6,7 +6,7 @@ * https://github.com/thehabes */ -import { MongoClient, ObjectId } from "mongodb" +import {MongoClient, ObjectId} from "mongodb" import dotenv from "dotenv" let storedEnv = dotenv.config() let err_out = Object.assign(new Error(), { @@ -49,7 +49,7 @@ function discernCollectionFromType(type) { * @param data A data object or query object. The type will correspond to a mongo collection * @param override If no type is on 'data', consider the provided override to be the type. * @return a known type string, such as "Project", or null - */ + */ function determineDataType(data, override) { return data["@type"] ?? data.type ?? override } @@ -148,7 +148,7 @@ class DatabaseController { async connected() { // Send a ping to confirm a successful connection try { - let result = await this.db.command({ ping: 1 }).catch((err) => { + let result = await this.db.command({ping: 1}).catch((err) => { return false }) result = result.ok ? true : false @@ -289,7 +289,7 @@ class DatabaseController { throw err_out } const obj_id = data_id.split("/").pop() - const filter = { _id: data_id } + const filter = {_id: data_id} const result = await this.db .collection(collection) .replaceOne(filter, data) @@ -330,7 +330,7 @@ class DatabaseController { * Get by ID. We need to decide about '@id', 'id', '_id', and http/s */ async getById(_id, collection) { - return this.findOne({ _id }, collection) + return this.findOne({_id}, collection) } } From 97967125e763a390344bb29d58eccfe0dae13d78 Mon Sep 17 00:00:00 2001 From: mepripri Date: Thu, 20 Feb 2025 15:11:49 -0600 Subject: [PATCH 008/262] Changed Collections Parameter for Save() --- app.mjs | 2 +- classes/Project/Project.mjs | 4 ++-- project/index.mjs | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app.mjs b/app.mjs index d906a3f9..c027ad30 100644 --- a/app.mjs +++ b/app.mjs @@ -31,7 +31,7 @@ let app = express() //Middleware to use app.use(logger('dev')) -app.use(express.json()) +app.use(express.json({ limit: '50mb' })); app.use(express.urlencoded({ extended: true })) app.use(cookieParser()) diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index c09d76a3..217aa9b1 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -159,11 +159,11 @@ export default class Project { } async update() { - return await database.update(this.data, "Project") + return await database.update(this.data, process.env.TPENPROJECTS) } async save() { - return await database.save(this.data, "Project") + return await database.save(this.data, process.env.TPENPROJECTS) } #generateInviteCode(userId) { diff --git a/project/index.mjs b/project/index.mjs index a52e1eab..f2ba4767 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -93,6 +93,29 @@ router router .route("/:id") + .put(auth0Middleware(), async (req, res) => { + const user = req.user + let id = req.params.id + const metadata = req.body.metadata + + try { + const project = new Project(id) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER)) { + const updatedProject = await project.updateMetadata(metadata) + res.status(200).json(updatedProject) + } else { + res.status(403).json({ + message: "You do not have permission to update this project" + }) + } + } catch (error) { + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "An error occurred while updating the project." + ) + } + }) .get(auth0Middleware(), async (req, res) => { const user = req.user let id = req.params.id From cba0eea6d3a2f0a3a32c5cc486e75771d8f5176d Mon Sep 17 00:00:00 2001 From: mepripri Date: Thu, 20 Feb 2025 16:34:41 -0600 Subject: [PATCH 009/262] Removing /:id put Call --- project/index.mjs | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/project/index.mjs b/project/index.mjs index f2ba4767..a52e1eab 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -93,29 +93,6 @@ router router .route("/:id") - .put(auth0Middleware(), async (req, res) => { - const user = req.user - let id = req.params.id - const metadata = req.body.metadata - - try { - const project = new Project(id) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER)) { - const updatedProject = await project.updateMetadata(metadata) - res.status(200).json(updatedProject) - } else { - res.status(403).json({ - message: "You do not have permission to update this project" - }) - } - } catch (error) { - return respondWithError( - res, - error.status || error.code || 500, - error.message ?? "An error occurred while updating the project." - ) - } - }) .get(auth0Middleware(), async (req, res) => { const user = req.user let id = req.params.id From e01c1e2c9175535fc0fb89c5e42926c642f32240 Mon Sep 17 00:00:00 2001 From: mepripri Date: Thu, 20 Feb 2025 16:53:34 -0600 Subject: [PATCH 010/262] Removing the Limit from express.json() --- app.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.mjs b/app.mjs index c027ad30..b4ebd4a8 100644 --- a/app.mjs +++ b/app.mjs @@ -31,7 +31,7 @@ let app = express() //Middleware to use app.use(logger('dev')) -app.use(express.json({ limit: '50mb' })); +app.use(express.json()); app.use(express.urlencoded({ extended: true })) app.use(cookieParser()) From e4bafbc377eb588b1ee5015666bc4966d8745791 Mon Sep 17 00:00:00 2001 From: mepripri Date: Thu, 20 Feb 2025 16:53:58 -0600 Subject: [PATCH 011/262] Removing the Limit from express.json() --- app.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.mjs b/app.mjs index b4ebd4a8..d906a3f9 100644 --- a/app.mjs +++ b/app.mjs @@ -31,7 +31,7 @@ let app = express() //Middleware to use app.use(logger('dev')) -app.use(express.json()); +app.use(express.json()) app.use(express.urlencoded({ extended: true })) app.use(cookieParser()) From f0e56188f617fc470cf0c31e2c6d2c64e171e5b8 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Mon, 10 Mar 2025 14:26:38 -0500 Subject: [PATCH 012/262] getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger --- classes/Manifest/Manifest.js | 63 ++++++ classes/Manifest/__tests__/Manifest.test.js | 75 +++++++ classes/Manifest/__tests__/sample.js | 11 ++ package-lock.json | 206 ++++++++++++++++++++ package.json | 2 + 5 files changed, 357 insertions(+) create mode 100644 classes/Manifest/Manifest.js create mode 100644 classes/Manifest/__tests__/Manifest.test.js create mode 100644 classes/Manifest/__tests__/sample.js diff --git a/classes/Manifest/Manifest.js b/classes/Manifest/Manifest.js new file mode 100644 index 00000000..fccbfaca --- /dev/null +++ b/classes/Manifest/Manifest.js @@ -0,0 +1,63 @@ +import { Vault } from '@iiif/helpers/vault' + +const vault = new Vault() + +class Manifest { + + manifest = null + uri = null + + constructor(manifestOrUri) { + + let id = manifestOrUri?.['@id'] ?? manifestOrUri?.id ?? manifestOrUri + + if (!id) { + throw new Error('Invalid input: Manifest object must have an @id or id property') + } + + try { + new URL(id); + this.uri = id; + } catch (_) { + throw new Error('Invalid input: must be a valid URI string') + } + + const requiredProperties = [ + ['@context', 'context'], + ['@type', 'type'], + ['sequences', 'items'] + ] + + try { + for (const [prop1, prop2] of requiredProperties) { + if (!manifestOrUri[prop1] && !manifestOrUri[prop2]) { + throw new Error(`Invalid input: manifest object must have either ${prop1} or ${prop2} property`) + } + } + } catch (err) { + console.warn(err, Object.keys(manifestOrUri)) + return + } + + this.manifest = manifestOrUri + } + + load = async () => vault.loadManifest(this.uri).then(manifest => { + // load canvases + manifest.items = vault.get(manifest.items) + manifest.items = manifest.items.map(item => { + // Load canvas content + if (item.items) { + item.items = vault.get(item.items) + } + // Load Canvas AnnotationPages + if (item.annotations) { + item.annotations = vault.get(item.annotations) + } + return item + }) + return manifest + }) +} + +export default Manifest diff --git a/classes/Manifest/__tests__/Manifest.test.js b/classes/Manifest/__tests__/Manifest.test.js new file mode 100644 index 00000000..7314b032 --- /dev/null +++ b/classes/Manifest/__tests__/Manifest.test.js @@ -0,0 +1,75 @@ +import Manifest from '../Manifest.js' +import sinon from 'sinon' +import { Vault } from '@iiif/helpers/vault' +import assert from 'assert' +import { test, beforeEach, afterEach, describe } from 'node:test' + +class MockVault extends Vault { + constructor() { + super() + this.loadManifest = async () => 'loaded manifest' + } +} + +describe('Manifest', () => { + let vaultMock + + beforeEach(() => { + sinon.restore() + }) +}) + +test('should throw error for invalid input type', () => { + assert.throws(() => new Manifest(123), /Invalid input: must be a valid URI string/) +}) +test('should throw error for invalid input type', () => { + assert.throws(() => new Manifest({}), /Invalid input: must be a valid URI string/) +}) +test('should throw error for invalid input type', () => { + assert.throws(() => new Manifest(true), /Invalid input: must be a valid URI string/) +}) + +test('should throw error for manifest object without id', () => { + assert.throws(() => new Manifest(), /Invalid input: Manifest object must have an @id or id property/) +}) + +test('should throw error for invalid URI string', () => { + assert.throws(() => new Manifest('invalid-uri'), /Invalid input: must be a valid URI string/) +}) + +test('should warn for manifest object missing required properties', () => { + const manifest = { id: 'http://example.com/manifest' } + const originalWarn = console.warn + console.warn = () => { } + const warnSpy = sinon.spy(console, 'warn') + const manifestInstance = new Manifest(manifest) + assert(warnSpy.called) + assert.strictEqual(manifestInstance.uri, 'http://example.com/manifest') + assert.strictEqual(manifestInstance.manifest, null) + console.warn = originalWarn +}) +sinon.stub(Manifest.prototype, 'load').resolves('loaded manifest') +const manifest = new Manifest('http://example.com/manifest') +test('should initialize with valid URI string', () => { + const manifest = new Manifest('http://example.com/manifest') + assert.strictEqual(manifest.uri, 'http://example.com/manifest') + assert.strictEqual(manifest.manifest, null) +}) + +test('should initialize with valid manifest object', () => { + const manifestObj = { + id: 'http://example.com/manifest', + '@type': 'sc:Manifest', + '@context': 'http://iiif.io/api/presentation/2/context.json', + sequences: [] + } + const manifest = new Manifest(manifestObj) + assert.strictEqual(manifest.uri, 'http://example.com/manifest') + assert.deepStrictEqual(manifest.manifest, manifestObj) +}) + +test('should load manifest using vault', async () => { + const manifest = new Manifest('http://example.com/manifest') + const result = await manifest.load() + assert.strictEqual(result, 'loaded manifest') +}) diff --git a/classes/Manifest/__tests__/sample.js b/classes/Manifest/__tests__/sample.js new file mode 100644 index 00000000..58032de5 --- /dev/null +++ b/classes/Manifest/__tests__/sample.js @@ -0,0 +1,11 @@ +import Manifest from '../Manifest.js' + +// Examples for a v3 and v2 Manifest on the way in from a third party source +// let m = new Manifest('https://tpen-project-examples.habesoftware.app/transcription-project/manifest.json') +// let m = new Manifest('https://tpen-project-examples.habesoftware.app/transcription-project-v2/manifest.json') + +let m = new Manifest('https://tpen-project-examples.habesoftware.app/transcription-project-v2/manifest.json') +m.load().then(manifest => { + // manifest is now the loaded and regularized Manifest JSON. + console.log(manifest) +}) diff --git a/package-lock.json b/package-lock.json index 46e30db7..3d2c8e8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "license": "CC-BY", "dependencies": { + "@iiif/helpers": "^1.3.1", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.0", @@ -30,6 +31,7 @@ "jest-cli": "^29.7.0", "jest-esm-transformer": "^1.0.0", "nodemon": "^3.1.9", + "sinon": "^19.0.2", "supertest": "^7.0.0" }, "engines": { @@ -559,6 +561,72 @@ "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==", "license": "MIT" }, + "node_modules/@iiif/helpers": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", + "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", + "license": "MIT", + "dependencies": { + "@iiif/presentation-2": "1.0.4", + "@iiif/presentation-3": "2.2.3", + "@iiif/presentation-3-normalized": "0.9.7", + "@types/geojson": "7946.0.13" + }, + "optionalDependencies": { + "abs-svg-path": "^0.1.1", + "parse-svg-path": "^0.1.2", + "svg-arc-to-cubic-bezier": "^3.2.0" + }, + "peerDependencies": { + "@iiif/parser": "^2.1.7" + } + }, + "node_modules/@iiif/helpers/node_modules/@types/geojson": { + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", + "license": "MIT" + }, + "node_modules/@iiif/parser": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", + "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", + "license": "MIT", + "peer": true, + "dependencies": { + "@iiif/presentation-2": "^1.0.4", + "@iiif/presentation-3": "^2.2.2", + "@iiif/presentation-3-normalized": "^0.9.7", + "@types/geojson": "^7946.0.10" + } + }, + "node_modules/@iiif/presentation-2": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@iiif/presentation-2/-/presentation-2-1.0.4.tgz", + "integrity": "sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==", + "license": "MIT", + "peerDependencies": { + "@iiif/presentation-3": "*" + } + }, + "node_modules/@iiif/presentation-3": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", + "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", + "license": "MIT", + "dependencies": { + "@types/geojson": "^7946.0.10" + } + }, + "node_modules/@iiif/presentation-3-normalized": { + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz", + "integrity": "sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==", + "license": "MIT", + "dependencies": { + "@iiif/presentation-3": "^2.0.5" + } + }, "node_modules/@iiif/vocabulary": { "version": "1.0.26", "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", @@ -983,6 +1051,35 @@ "@sinonjs/commons": "^3.0.0" } }, + "node_modules/@sinonjs/samsam": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", + "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "lodash.get": "^4.4.2", + "type-detect": "^4.1.0" + } + }, + "node_modules/@sinonjs/samsam/node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -1217,6 +1314,13 @@ "dev": true, "license": "MIT" }, + "node_modules/abs-svg-path": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", + "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==", + "license": "MIT", + "optional": true + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -2043,6 +2147,16 @@ "wrappy": "1" } }, + "node_modules/diff": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/diff-sequences": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", @@ -3706,6 +3820,13 @@ "node": ">=6" } }, + "node_modules/just-extend": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", + "dev": true, + "license": "MIT" + }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -3752,6 +3873,14 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "license": "MIT" }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", + "dev": true, + "license": "MIT" + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -4091,6 +4220,40 @@ "node": ">= 0.6" } }, + "node_modules/nise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", + "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.1", + "@sinonjs/text-encoding": "^0.7.3", + "just-extend": "^6.2.0", + "path-to-regexp": "^8.1.0" + } + }, + "node_modules/nise/node_modules/@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1" + } + }, + "node_modules/nise/node_modules/path-to-regexp": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", + "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + } + }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -4386,6 +4549,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse-svg-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", + "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", + "license": "MIT", + "optional": true + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -4925,6 +5095,35 @@ "node": ">=10" } }, + "node_modules/sinon": { + "version": "19.0.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", + "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.2", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", + "nise": "^6.1.1", + "supports-color": "^7.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "node_modules/sinon/node_modules/@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1" + } + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -5150,6 +5349,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/svg-arc-to-cubic-bezier": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", + "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==", + "license": "ISC", + "optional": true + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", diff --git a/package.json b/package.json index 9349265e..b40134d4 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "inviteMemberTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " }, "dependencies": { + "@iiif/helpers": "^1.3.1", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.0", @@ -54,6 +55,7 @@ "jest-cli": "^29.7.0", "jest-esm-transformer": "^1.0.0", "nodemon": "^3.1.9", + "sinon": "^19.0.2", "supertest": "^7.0.0" }, "engines": { From 5411b4a4dfc2bba3b4feb9e11bce03ec7682b37d Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 12 Mar 2025 16:06:34 -0500 Subject: [PATCH 013/262] Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions --- classes/Project/ProjectFactory.mjs | 188 +++++++++++++++++++++++++++++ project/index.mjs | 51 ++++++++ 2 files changed, 239 insertions(+) diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.mjs index 74a5c3b0..21d274d8 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.mjs @@ -2,6 +2,8 @@ import Project from "./Project.mjs" import Group from "../Group/Group.mjs" import User from "../User/User.mjs" import dbDriver from "../../database/driver.mjs" +import fs from "fs" +import path from "path" const database = new dbDriver("mongo") export default class ProjectFactory { @@ -151,6 +153,192 @@ export default class ProjectFactory { return project } + /** + * Exporting the IIIF manifest for a given project in its current state, ensuring the directory structure is created, + * manifest data is assembled, and the final JSON is saved to the filesystem. + * + * @param {string} projectId - Project ID for a specific project. + * @returns {Object} - Returns the assembled IIIF manifest object. + * + * The manifest follows the IIIF Presentation API 3.0 specification and includes: + * - Context, ID, Type, Label, Metadata, Items and Annotations + * - A dynamically fetched list of manifest items, including canvases and their annotations. + * - All elements are embedded in the manifest object. + * - Saved output to the file system as 'manifest.json' within the project directory. + */ + static async exportManifest(projectId) { + if (!projectId) { + throw { status: 400, message: "No project ID provided" } + } + + const project = await ProjectFactory.loadAsUser(projectId, null) + const dir = `./${projectId}` + this.createDirectory(dir) + + const manifest = { + "@context": "http://iiif.io/api/presentation/3/context.json", + "id": `${process.env.TPENSTATIC}/${projectId}/manifest.json`, + type: "Manifest", + label: { none: [project.label] }, + metadata: project.metadata, + items: await this.getManifestItems(project, dir), + } + this.saveToFile(dir, 'manifest.json', manifest) + return manifest + } + + static createDirectory(dir) { + if (!fs.existsSync(dir)) { + fs.mkdirSync(dir, { recursive: true }) + } + } + + static async getManifestItems(project, dir) { + return Promise.all( + project.layers.map(async (layer) => { + try { + const canvasUrl = layer.pages[0].canvas + const canvasData = await this.fetchJson(canvasUrl) + if (!canvasData) return null + + const canvasItems = { + id: canvasData.id ?? canvasData["@id"], + type: canvasData.type, + label: canvasData.label, + width: canvasData.width, + height: canvasData.height, + items: canvasData.items, + annotations: await this.getAnnotations(canvasData, project._id, dir), + } + return canvasItems + } catch (error) { + console.error(`Error processing layer:`, error) + return null + } + }) + ) + } + + static async getAnnotations(canvasData, projectId, dir) { + return Promise.all( + canvasData.annotations.map(async (annotation, index) => { + try { + const annotationData = await this.fetchJson(annotation.id) + if (!annotationData) return null + + const annotationItems = { + id: annotationData.id ?? annotationData["@id"], + type: annotationData.type, + label: annotationData.label, + items: await this.getLines(annotationData, dir), + partOf: annotationData.partOf, + creator: annotationData.creator, + target: annotationData.target, + } + return annotationItems + } catch (error) { + console.error(`Error processing annotation:`, error) + return null + } + }) + ) + } + + static async getLines(annotationData, dir) { + return Promise.all( + annotationData.items.map(async (item) => { + try { + const lineData = await this.fetchJson(item.id) + if (!lineData) return null + + const lineItems = { + id: lineData.id ?? lineData["@id"], + type: lineData.type, + motivation: lineData.motivation, + body: lineData.body, + target: lineData.target, + creator: lineData.creator + } + return lineItems + } catch (error) { + console.error(`Error processing line item:`, error) + return null + } + }) + ) + } + + static async fetchJson(url) { + try { + const response = await fetch(url) + if (!response.ok) throw new Error(`Failed to fetch ${url}`) + return response.json() + } catch (error) { + console.error(`Fetch error: ${error.message}`) + return null + } + } + + static getFileName(url) { + const fileName = path.parse(url.substring(url.lastIndexOf("/") + 1)).name + return fileName + } + + static saveToFile(dir, url, data) { + const fileName = this.getFileName(url) + fs.writeFileSync(path.join(dir, `${fileName}.json`), JSON.stringify(data, null, 2)) + } + + /** + * Uploads or updates the `manifest.json` file for a given project to a GitHub repository. + * + * @param {string} filePath - The local path to the `manifest.json` file to be uploaded. + * @param {string} projectId - Project ID for a specific project. + * + * The method performs the following steps: + * - Reads and encodes the file content in Base64. + * - Checks if the `manifest.json` already exists in the GitHub repository to determine if it's a create or update action. + * - Uploads the file using the GitHub API, including the correct commit message and SHA for updates. + */ + static async uploadFileToGitHub(filePath, projectId) { + const content = fs.readFileSync(filePath, { encoding: "base64" }) + const manifestUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/contents/${projectId}/manifest.json` + const token = process.env.GITHUB_TOKEN + + try { + let sha = null + + const getResponse = await fetch(manifestUrl, { + headers: { + 'Authorization': `token ${token}`, + 'Accept': 'application/vnd.github.v3+json', + }, + }) + + if (getResponse.ok) { + const fileData = await getResponse.json() + sha = fileData.sha + } + + await fetch(manifestUrl, { + method: 'PUT', + headers: { + 'Authorization': `token ${token}`, + 'Accept': 'application/vnd.github.v3+json', + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + message: sha ? `Updated ${projectId}/manifest.json` : `Created ${projectId}/manifest.json`, + content: content, + branch: process.env.BRANCH, + ...(sha && { sha }), + }), + }) + } catch (error) { + console.error(`Failed to upload ${projectId}/manifest.json:`, error) + } + } + static async loadAsUser(project_id, user_id) { const pipeline = [ { $match: { _id: project_id } }, diff --git a/project/index.mjs b/project/index.mjs index a52e1eab..2a6a5586 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -11,6 +11,8 @@ import { isValidEmail } from "../utilities/validateEmail.mjs" import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.mjs" import Group from "../classes/Group/Group.mjs" import scrubDefaultRoles from "../utilities/isDefaultRole.mjs" +import path from "path" +import fs from "fs" let router = express.Router() router.use(cors(common_cors)) @@ -91,6 +93,55 @@ router respondWithError(res, 405, "Improper request method. Use POST instead") }) +router + .route("/:id/manifest") + .get(auth0Middleware(), async (req, res) => { + const {id} = req.params + const user = req.user + + if (!id) { + return respondWithError(res, 400, "No TPEN3 ID provided") + } else if (!validateID(id)) { + return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") + } + + try { + const project = await ProjectFactory.loadAsUser(id, null) + const collaboratorIdList = [] + + Object.entries(project.collaborators).map(([id, data]) => { + collaboratorIdList.push(id) + }) + + if (!collaboratorIdList.includes(user._id)) { + return respondWithError(res, 403, "You do not have permission to export this project") + } + if (!await new Project(id).checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PROJECT)) { + return respondWithError(res, 403, "You do not have permission to export this project") + } + const manifest = await ProjectFactory.exportManifest(id) + const folderPath = path.join(`./${id}`) + const files = fs.readdirSync(folderPath) + for (const file of files) { + const filePath = path.join(folderPath, file) + if (fs.lstatSync(filePath).isFile()) { + await ProjectFactory.uploadFileToGitHub(filePath, `${id}`) + } + } + fs.rmSync(folderPath, {recursive: true, force: true}) + res.status(200).json(manifest) + } catch (error) { + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "An error occurred while fetching the project data." + ) + } + }) + .all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") + }) + router .route("/:id") .get(auth0Middleware(), async (req, res) => { From 2e4bbc55c72d2b0c50dd5a3a35c790366be26a6f Mon Sep 17 00:00:00 2001 From: Onoja Victor <111019083+git-voo@users.noreply.github.com> Date: Thu, 13 Mar 2025 15:28:57 -0500 Subject: [PATCH 014/262] add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap --- classes/HotKeys/Hotkeys.js | 153 ++++++++++++++++++++++ classes/HotKeys/__tests__/hotkeys.test.js | 51 ++++++++ classes/Project/ProjectFactory.mjs | 16 ++- database/driver.mjs | 13 +- package-lock.json | 61 ++++----- package.json | 3 +- project/__tests__/exists_unit.test.mjs | 33 +++-- project/groups/permissions_parameters.mjs | 2 + project/index.mjs | 147 ++++++++++++++++++--- 9 files changed, 400 insertions(+), 79 deletions(-) create mode 100644 classes/HotKeys/Hotkeys.js create mode 100644 classes/HotKeys/__tests__/hotkeys.test.js diff --git a/classes/HotKeys/Hotkeys.js b/classes/HotKeys/Hotkeys.js new file mode 100644 index 00000000..c52e825a --- /dev/null +++ b/classes/HotKeys/Hotkeys.js @@ -0,0 +1,153 @@ +import dbDriver from "../../database/driver.mjs" +const database = new dbDriver("mongo") + + +/** + * Class representing a hotkey. + * @class Hotkeys + * @param {String} _id - The ID of the hotkey matches the id of the Project it belongs to. + */ +export default class Hotkeys { + constructor(_id, symbols = []) { + if (!_id) { + throw { status: 400, message: "_id is required" } + } + this._id = _id + this.data = { _id, symbols } + } + + assign(symbols) { + if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { + throw { status: 400, message: "All symbols must be strings" } + } + if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { + throw { status: 400, message: "All symbols must be strings" } + } + this.data.symbols = symbols + return this + } + + add(symbol) { + if (typeof symbol !== 'string') { + throw { status: 400, message: "Symbol must be a string" } + } + if (!this.data.symbols.includes(symbol)) { + this.data.symbols.push(symbol) + } + return this + } + + remove(symbol) { + if (typeof symbol !== 'string') { + throw { status: 400, message: "Symbol must be a string" } + } + this.data.symbols = this.data.symbols.filter(s => s !== symbol) + return this + } + + /** + * Load hotkey data from the database. + */ + async #loadFromDB() { + this.data = await database.getById(this._id, process.env.TPENHOTKEYS) + return this + } + + /** + * Fetch all hotkeys for a project. + * @param {String} _id - The ID of the project. + * @returns {Array} - Array of hotkey objects. + */ + static async getByProjectId(_id) { + if (!_id) { + throw { status: 400, message: "projectId is required" } + } + + return database.findOne({ _id }, process.env.TPENHOTKEYS) + } + + /** + * Create a new hotkey. + * @param {String} projectId - The ID of the project this hotkey belongs to. + * @param {Array} symbols - Ordered list of UTF-8 symbols (e.g., ["♠","❤","ϡ"]). + * @returns {Object} - The created hotkey. + */ + async create() { + if (!this.data._id || (this.data.symbols?.length < 1)) { + throw { status: 400, message: "Cannot create a detached or empty set of hotkeys." } + } + try { + await database.save(this.data, process.env.TPENHOTKEYS) + } catch (err) { + // possible collision with existing hotkey or other error + throw { + status: err.status ?? 500, + message: err.message ?? "An error occurred while creating the hotkey" + } + } + return this.data + } + + /** + * Sets hotkey symbols. + * @returns {Object} - The updated hotkey. + */ + async upsert() { + if (!this.data._id || (this.data.symbols?.length < 1)) { + throw { status: 400, message: "Cannot create a detached or empty set of hotkeys. Consider DELETE." } + } + try { + // until upsert is in the driver + const action = await database.findOne({ _id: this.data._id }, process.env.TPENHOTKEYS) ? 'update' : 'save' + await database[action](this.data, process.env.TPENHOTKEYS) + } catch (err) { + // server or driver/mongo error + throw { + status: err.status ?? 500, + message: err.message ?? "An error occurred while updating the hotkey" + } + } + return this.data + } + + /** + * Sets hotkey symbols. + * @returns {Object} - The updated hotkey. + */ + async setSymbols() { + if (!this.data._id || (this.data.symbols?.length < 1)) { + throw { status: 400, message: "Cannot create a detached or empty set of hotkeys. Consider DELETE." } + } + try { + await database.update(this.data, process.env.TPENHOTKEYS) + } catch (err) { + // server or driver/mongo error + throw { + status: err.status ?? 500, + message: err.message ?? "An error occurred while updating the hotkey" + } + } + return this.data + } + + /** + * Delete a hotkey. + * @returns {Boolean} Succeeded. + */ + async delete() { + if (!this.data._id) { + throw { status: 400, message: "Id is required" } + } + + try { + await database.delete(this.data._id, process.env.TPENHOTKEYS) + } catch (err) { + // server or driver/mongo error + throw { + status: err.status ?? 500, + message: err.message ?? "An error occurred while deleting the hotkey" + } + } + return true + } +} diff --git a/classes/HotKeys/__tests__/hotkeys.test.js b/classes/HotKeys/__tests__/hotkeys.test.js new file mode 100644 index 00000000..3e1a753d --- /dev/null +++ b/classes/HotKeys/__tests__/hotkeys.test.js @@ -0,0 +1,51 @@ +import Hotkeys from '../Hotkeys.js' + +test('Hotkeys constructor should throw an error if _id is not provided', () => { + expect(() => new Hotkeys()).toThrowError(new Error("_id is required")) +}) + +test('Hotkeys constructor should initialize with _id and symbols', () => { + const hotkeys = new Hotkeys('123', ['a', 'b']) + expect(hotkeys._id).toBe('123') + expect(hotkeys.data._id).toBe('123') + expect(hotkeys.data.symbols).toEqual(['a', 'b']) +}) + +test('assign should set symbols and return the instance', () => { + const hotkeys = new Hotkeys('123') + hotkeys.assign(['a', 'b']) + expect(hotkeys.data.symbols).toEqual(['a', 'b']) +}) + +test('assign should throw an error if symbols are not strings', () => { + const hotkeys = new Hotkeys('123') + expect(() => hotkeys.assign([1, 2])).toThrowError(new Error("All symbols must be strings")) +}) + +test('add should add a symbol if it does not exist and return the instance', () => { + const hotkeys = new Hotkeys('123', ['a']) + hotkeys.add('b') + expect(hotkeys.data.symbols).toEqual(['a', 'b']) +}) + +test('add should not add a symbol if it already exists', () => { + const hotkeys = new Hotkeys('123', ['a']) + hotkeys.add('a') + expect(hotkeys.data.symbols).toEqual(['a']) +}) + +test('add should throw an error if symbol is not a string', () => { + const hotkeys = new Hotkeys('123') + expect(() => hotkeys.add(1)).toThrowError(new Error("Symbol must be a string")) +}) + +test('remove should remove a symbol if it exists and return the instance', () => { + const hotkeys = new Hotkeys('123', ['a', 'b']) + hotkeys.remove('a') + expect(hotkeys.data.symbols).toEqual(['b']) +}) + +test('remove should throw an error if symbol is not a string', () => { + const hotkeys = new Hotkeys('123') + expect(() => hotkeys.remove(1)).toThrowError(new Error("Symbol must be a string")) +}) diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.mjs index 21d274d8..c06620ca 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.mjs @@ -29,7 +29,7 @@ export default class ProjectFactory { * @returns object of project data */ static async DBObjectFromManifest(manifest) { - if (!manifest) { + if (!manifest) { throw { status: 404, message: err.message ?? "No manifest found. Cannot process empty object" @@ -402,6 +402,20 @@ export default class ProjectFactory { } } }, + + { + $lookup: { + from: "hotkeys", + localField: "_id", + foreignField: "_id", + as: "hotkeys" + }, + }, + { + $set: { + "options.hotkeys": { $arrayElemAt: ["$hotkeys.hotkeys", 0] } + } + }, { $project: { _id: 1, diff --git a/database/driver.mjs b/database/driver.mjs index 105c91ad..286a29ef 100644 --- a/database/driver.mjs +++ b/database/driver.mjs @@ -86,7 +86,8 @@ class dbDriver { * @return The inserted document JSON or error JSON */ async save(data, collection) { - return this.controller.save(data, collection).catch(err => err) + console.warn("dbDriver.save() is problematic. https://github.com/CenterForDigitalHumanities/TPEN-services/issues/193") + return this.controller.save(data, collection) } /** @@ -96,7 +97,7 @@ class dbDriver { */ async update(data, collection) { // Note this may just be an alias for save() - return this.controller.update(data, collection).catch(err => err) + return this.controller.update(data, collection) } /** @@ -105,7 +106,7 @@ class dbDriver { * @return The delete result JSON or error JSON */ async delete(data) { - return this.controller.remove(data).catch(err => err) + return this.controller.remove(data) } /** @@ -114,10 +115,10 @@ class dbDriver { * @return JSON Array of matched documents or standard error object */ async find(query, collection) { - return this.controller.find(query, collection).catch(err => err) + return this.controller.find(query, collection) } async findOne(query, collection) { - return this.controller.findOne(query, collection).catch(err => err) + return this.controller.findOne(query, collection) } /** @@ -127,7 +128,7 @@ class dbDriver { * @return JSON of the matched document or standard error object */ async getById(id, collection) { - return this.controller.getById(id, collection).catch(err => err) + return this.controller.getById(id, collection) } /** diff --git a/package-lock.json b/package-lock.json index 3d2c8e8b..51cd55c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -215,27 +215,25 @@ } }, "node_modules/@babel/helpers": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", - "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", + "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.0" + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", - "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", + "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/types": "^7.26.5" + "@babel/types": "^7.26.10" }, "bin": { "parser": "bin/babel-parser.js" @@ -501,15 +499,14 @@ } }, "node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" @@ -535,11 +532,10 @@ } }, "node_modules/@babel/types": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", - "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", + "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" @@ -1056,7 +1052,6 @@ "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", "lodash.get": "^4.4.2", @@ -1068,7 +1063,6 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } @@ -1077,8 +1071,7 @@ "version": "0.7.3", "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", - "dev": true, - "license": "(Unlicense OR Apache-2.0)" + "dev": true }, "node_modules/@types/babel__core": { "version": "7.20.5", @@ -2152,7 +2145,6 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -3824,8 +3816,7 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/kleur": { "version": "3.0.3", @@ -3878,8 +3869,7 @@ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/lru-cache": { "version": "5.1.1", @@ -4225,7 +4215,6 @@ "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", "@sinonjs/fake-timers": "^13.0.1", @@ -4239,7 +4228,6 @@ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1" } @@ -4249,7 +4237,6 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=16" } @@ -5100,7 +5087,6 @@ "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", "@sinonjs/fake-timers": "^13.0.2", @@ -5119,7 +5105,6 @@ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1" } @@ -5410,6 +5395,10 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/tpen3-services": { + "resolved": "", + "link": true + }, "node_modules/tr46": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", diff --git a/package.json b/package.json index b40134d4..947ab9bf 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,8 @@ "mariadb": "^3.4.0", "mongodb": "^6.12.0", "morgan": "^1.10.0", - "nodemailer": "^6.9.16" + "nodemailer": "^6.9.16", + "tpen3-services": "file:" }, "devDependencies": { "@jest-mock/express": "^2.1.0", diff --git a/project/__tests__/exists_unit.test.mjs b/project/__tests__/exists_unit.test.mjs index f6f0a29e..8b38821e 100644 --- a/project/__tests__/exists_unit.test.mjs +++ b/project/__tests__/exists_unit.test.mjs @@ -1,18 +1,23 @@ -import app from "../../app.mjs" +import projectRouter from '../index.mjs' +import { jest } from '@jest/globals' +import assert from 'node:assert' -describe("Project endpoint availability unit test (via a check on the app routes). #exists_unit", () => { - it("responds to /project/id", () => { - let exists = false +const app = { _router: { stack: projectRouter.stack } } + +describe("Project endpoint availability unit test (via a check on the app routes)", () => { + test("responds to /project/id", () => { + const stack = app._router.stack + expect(stack.some(middleware => middleware.route && middleware.route.methods.get && middleware.regexp.toString().includes("/"))).toBe(true) + expect(stack.some(middleware => middleware.route && middleware.route.methods.post && middleware.regexp.toString().includes("/create"))).toBe(true) + expect(stack.some(middleware => middleware.route && middleware.route.methods.post && middleware.regexp.toString().includes("/import"))).toBe(true) + }) +}) + +describe("Hotkeys endpoint availability unit test (via a check on the app routes)", () => { + test("responds to /project/id/hotkeys", () => { const stack = app._router.stack - for (const middleware of stack) { - if ( - middleware.regexp && - middleware.regexp.toString().includes("/project") - ) { - exists = true - break - } - } - expect(exists).toBe(true) + expect(stack.some(middleware => middleware.route && middleware.route.methods.get && middleware.regexp.toString().includes("/hotkeys"))).toBe(true) + expect(stack.some(middleware => middleware.route && middleware.route.methods.put && middleware.regexp.toString().includes("/hotkeys"))).toBe(true) + expect(stack.some(middleware => middleware.route && middleware.route.methods.delete && middleware.regexp.toString().includes("/hotkeys"))).toBe(true) }) }) diff --git a/project/groups/permissions_parameters.mjs b/project/groups/permissions_parameters.mjs index ee5ec859..3d33f7a7 100644 --- a/project/groups/permissions_parameters.mjs +++ b/project/groups/permissions_parameters.mjs @@ -12,6 +12,7 @@ export const ACTIONS = { METADATA: "METADATA", TEXT: "TEXT", CONTENT: "CONTENT", + OPTIONS: "OPTIONS", ORDER: "ORDER", SELECTOR: "SELECTOR", DESCRIPTION: "DESCRIPTION", @@ -27,6 +28,7 @@ export const ACTIONS = { LINE: "LINE", ROLE: "ROLE", PERMISSION: "PERMISSION", + TOOLS: "TOOLS", ALL: "*" } \ No newline at end of file diff --git a/project/index.mjs b/project/index.mjs index 2a6a5586..3cb32e0b 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -6,11 +6,11 @@ import auth0Middleware from "../auth/index.mjs" import ProjectFactory from "../classes/Project/ProjectFactory.mjs" import validateURL from "../utilities/validateURL.mjs" import Project from "../classes/Project/Project.mjs" -import getHash from "../utilities/getHash.mjs" import { isValidEmail } from "../utilities/validateEmail.mjs" import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.mjs" import Group from "../classes/Group/Group.mjs" import scrubDefaultRoles from "../utilities/isDefaultRole.mjs" +import Hotkeys from "../classes/HotKeys/Hotkeys.js" import path from "path" import fs from "fs" @@ -235,7 +235,7 @@ router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { .send("You do not have permission to remove members from this project") } } catch (error) { - res.status(error.status || 500).send(error.message.toString()) + return respondWithError(res, error.status ?? 500, error.message ?? "Error removing member from project.") } }) @@ -264,7 +264,7 @@ router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Midd res.status(200).send(`Roles added to member ${collaboratorId}.`) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error adding roles to member.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error adding roles to member.") } }) @@ -294,7 +294,7 @@ router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middl res.status(200).send(`Roles [${roles}] updated for member ${collaboratorId}.`) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error updating member roles.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error updating member roles.") } }) @@ -326,7 +326,7 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error removing roles from member.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error removing roles from member.") } }) @@ -369,7 +369,7 @@ router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res res.status(200).json({ message: `Ownership successfully transferred to member ${newOwnerId}.` }) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error transferring ownership.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error transferring ownership.") } }) @@ -483,7 +483,7 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') } }) - + // Update Project Metadata router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { const { projectId } = req.params @@ -496,10 +496,10 @@ router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => if (!metadata || !Array.isArray(metadata)) { return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") } - + try { const projectObj = new Project(projectId) - + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.PROJECT))) { return respondWithError(res, 403, "You do not have permission to update metadata for this project.") } @@ -507,7 +507,7 @@ router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => const response = await projectObj.updateMetadata(metadata) res.status(200).json(response) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error updating project metadata.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error updating project metadata.") } }) @@ -538,7 +538,7 @@ router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middl res.status(200).send(`Roles [${roles}] updated for member ${collaboratorId}.`) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error updating member roles.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error updating member roles.") } }) @@ -570,7 +570,7 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error removing roles from member.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error removing roles from member.") } }) @@ -605,12 +605,12 @@ router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res const currentRoles = await group.getMemberRoles(user._id) // If user only has the OWNER role, we default them to CONTRIBUTOR before transferring ownership Object.keys(currentRoles).length === 1 && await group.addMemberRoles(user._id, ["CONTRIBUTOR"]) - await group.addMemberRoles(newOwnerId, ["OWNER"],true) - await group.removeMemberRoles(user._id, ["OWNER"],true) + await group.addMemberRoles(newOwnerId, ["OWNER"], true) + await group.removeMemberRoles(user._id, ["OWNER"], true) res.status(200).json({ message: `Ownership successfully transferred to member ${newOwnerId}.` }) } catch (error) { - return respondWithError(res, error.status || 500, error.message || "Error transferring ownership.") + return respondWithError(res, error.status ?? 500, error.message ?? "Error transferring ownership.") } }) @@ -624,7 +624,7 @@ router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => const user = req.user if (!user) { - return res.status(401).json({ message: 'Unauthenticated request' }) + return respondWithError(res, 401, "Unauthenticated request") } if (!Object.keys(customRoles).length) { @@ -641,7 +641,7 @@ router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => const accessInfo = await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.ROLE) if (!accessInfo.hasAccess) { - return res.status(403).json({ message: accessInfo.message }) + return respondWithError(res, 403, accessInfo.message) } const groupId = project.data.group @@ -662,7 +662,7 @@ router.put('/:projectId/setCustomRoles', auth0Middleware(), async (req, res) => const user = req.user if (!user) { - return res.status(401).json({ message: 'Unauthenticated request' }) + return respondWithError(res, 401, "Unauthenticated request") } if (!Object.keys(newCustomRoles).length) { @@ -679,7 +679,7 @@ router.put('/:projectId/setCustomRoles', auth0Middleware(), async (req, res) => const accessInfo = await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.ROLE) if (!accessInfo.hasAccess) { - return res.status(403).json({ message: accessInfo.message }) + return respondWithError(res, 403, accessInfo.message) } const groupId = project.data.group @@ -699,7 +699,7 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) let rolesToRemove = req.body.roles ?? req.body const user = req.user if (!user) { - return res.status(401).json({ message: 'Unauthenticated request' }) + return respondWithError(res, 401, "Unauthenticated request") } if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { @@ -723,7 +723,7 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) const accessInfo = await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.ROLE) if (!accessInfo.hasAccess) { - return res.status(403).json({ message: accessInfo.message }) + return respondWithError(res, 403, accessInfo.message) } const groupId = project.data.group @@ -737,6 +737,111 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) } }) +// Create Hotkey +router.route("/:projectId/hotkeys").post(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + const { symbols } = req.body + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + if (!symbols || symbols.length === 0) { + return respondWithError(res, 400, "At least one symbol is required") + } + + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const hotkeys = new Hotkeys(projectId, symbols) + const hotkey = await hotkeys.create() + console.dir(hotkey) + res.status(201).json(hotkey) + return + } + return respondWithError(res, 403, "You do not have permission to create hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +// Update Hotkeys +router.route("/:projectId/hotkeys").put(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + const { symbols } = req.body + + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + if (!symbols || symbols.length === 0) { + return respondWithError(res, 400, "At least one symbol is required") + } + if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { + return respondWithError(res, 400, "All symbols must be strings") + } + + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const hotkeys = new Hotkeys(projectId, symbols) + const hotkey = await hotkeys.setSymbols() + res.status(200).json(hotkey) + return + } + return respondWithError(res, 403, "You do not have permission to update hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +// Delete Hotkeys +router.route("/:projectId/hotkeys").delete(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const hotkeys = new Hotkeys(projectId) + const isDeleted = await hotkeys.delete() + res.status(200).json(isDeleted) + return + } + return respondWithError(res, 403, "You do not have permission to delete hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +// Get Hotkeys for a project +router.route("/:projectId/hotkeys").get(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const H = await Hotkeys.getByProjectId(projectId) + res.status(200).json(H.hotkeys) + return + } + return respondWithError(res, 403, "You do not have permission to view hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +router.route("/:projectId/hotkeys").all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET, PUT, or DELETE instead") +}) export default router From f6e11dc552a12b3fd1b08ad702967ca02ffed5d4 Mon Sep 17 00:00:00 2001 From: cubap Date: Thu, 13 Mar 2025 15:40:21 -0500 Subject: [PATCH 015/262] hotifx --- project/index.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/index.mjs b/project/index.mjs index 3cb32e0b..33cb300c 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -831,7 +831,7 @@ router.route("/:projectId/hotkeys").get(auth0Middleware(), async (req, res) => { const project = new Project(projectId) if (await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.OPTIONS, ENTITIES.PROJECT)) { const H = await Hotkeys.getByProjectId(projectId) - res.status(200).json(H.hotkeys) + res.status(200).json(H.symbols) return } return respondWithError(res, 403, "You do not have permission to view hotkeys for this project") From 40f43aa91fcb6cacccb4074dfadee0b37feed17d Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 14 Mar 2025 13:29:55 -0500 Subject: [PATCH 016/262] hotfix for symbols. --- classes/Project/ProjectFactory.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.mjs index c06620ca..0edf7709 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.mjs @@ -413,7 +413,7 @@ export default class ProjectFactory { }, { $set: { - "options.hotkeys": { $arrayElemAt: ["$hotkeys.hotkeys", 0] } + "options.hotkeys": { $arrayElemAt: ["$hotkeys.symbols", 0] } } }, { From ec7a6ba9331ff192e2d1c6e5287b6bbad18fae46 Mon Sep 17 00:00:00 2001 From: cubap Date: Tue, 18 Mar 2025 10:33:58 -0500 Subject: [PATCH 017/262] delete enabled --- database/driver.mjs | 4 ++-- database/mongo/controller.mjs | 28 +++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/database/driver.mjs b/database/driver.mjs index 286a29ef..b15a8715 100644 --- a/database/driver.mjs +++ b/database/driver.mjs @@ -105,8 +105,8 @@ class dbDriver { * @param data JSON from an HTTP DELETE request. It must contain an id. * @return The delete result JSON or error JSON */ - async delete(data) { - return this.controller.remove(data) + async delete(data, collection) { + return this.controller.remove(data, collection) } /** diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index ede9a9b6..cae093a2 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -319,11 +319,29 @@ class DatabaseController { * @param data JSON from an HTTP DELETE request. It must contain an id. * @return The delete result JSON or error JSON */ - async remove(id) { - err_out._dbaction = "deleteOne" - err_out.message = "Not yet implemented. Stay tuned." - err_out.status = 501 - throw err_out + async remove(id, collection) { + try { + if (!collection) { + err_out.message = `Cannot figure which collection for object'${id}'` + err_out.status = 400 + throw err_out + } + const obj_id = id.split("/").pop() + const filter = {_id: obj_id} + const result = await this.db.collection(collection).deleteOne(filter) + if (result?.deletedCount === 0) { + err_out.message = `id '${obj_id}' Not Found` + err_out.status = 404 + throw err_out + } + return result + } catch (err) { + // Specifically account for unexpected mongo things. + if (!err?.message) err.message = err.toString() + if (!err?.status) err.status = 500 + if (!err?._dbaction) err._dbaction = "deleteOne" + throw err + } } /** From 67a7dd48ca477aa440b94c76a3b45d2e791e37f9 Mon Sep 17 00:00:00 2001 From: cubap Date: Thu, 20 Mar 2025 16:59:50 -0500 Subject: [PATCH 018/262] Create API.md --- API.md | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 API.md diff --git a/API.md b/API.md new file mode 100644 index 00000000..957e7de8 --- /dev/null +++ b/API.md @@ -0,0 +1,146 @@ +# TPEN Services API Documentation + +This document provides an overview of the available routes in the TPEN Services API. These routes allow interaction with the application for various functionalities. + +## Base URL + +``` +https://api.t-pen.org + + https://dev.api.t-pen.org +``` + +## Endpoints + +### 1. **Authentication** + +Endpoints marked with a 🔐 requiring authentication expect a valid JWT token in the `Authorization` header. + +--- + +### 2. **Project** + +#### `POST /project/create` 🔐 + +- **Description**: Create a new project. This is a high-skill maneuver requiring a complete project object. +- **Request Body**: + + ```json + { + "label": "string", + "metadata": [ { Metadata } ], + "layers": [ { Layer } ], + "manifests": [ "URIs" ], + "creator": "URI", + "group": "hexstring" + } + ``` + +- **Responses**: + + - **200**: Project created successfully + - **400**: Project creation failed, validation errors + - **401**: Unauthorized + - **500**: Server error + + The Location header of a successful response is the Project id. + +#### `POST /import?createFrom="URL"` 🔐 + +- **Description**: Create a new project by importing a web resource. +- **Request Body**: + + ```json + { + "url": "URL" + } + ``` + +- **Responses**: + + - **200**: Project created successfully + - **400**: Project creation failed, validation errors + - **401**: Unauthorized + - **500**: Server error + + The Location header of a successful response is the Project id. The project will be created with the label and metadata of the imported resource. A complete project object will be created with the imported resource as the first manifest and returned. + +#### `GET /project/:id` 🔐 + +- **Description**: Retrieve a project by ID. +- **Parameters**: + - `id`: ID of the project. +- **Responses**: + + - **200**: Project found + ```json + { + "id": "string", + "label": "string", + "metadata": [ { Metadata } ], + "creator": "URI", + "layers": [ { Layer } ], + "manifests": [ "URIs" ], + "group": "hexstring", + "tools": [ "string" ], + "options": { OptionsMap } + } + ``` + - **404**: Project not found + - **401**: Unauthorized + - **403**: Forbidden + - **500**: Server error + +The response is not a complete Project data object, but a projection designed for use in the client interface. + +--- + +### 3. **Contributors** + +#### `POST /project/:projectId/invite-member` 🔐 + +- **Description**: Invite a user to a project. If the user does not have a TPEN account, they will be sent an email invitation. +- **Parameters**: + - `projectId`: ID of the project as a hexstring or the Project slug. +- **Request Body**: + + ```json + { + "email": "string", + "roles": ["string"] | "string" + } + ``` + + - `email`: The email address of the user to invite. + - `roles`: The roles of the user in the project as an array or space-delimited string. +- **Responses**: + + - **200**: User invited successfully + - **400**: User invitation failed, validation errors + - **401**: Unauthorized + - **403**: Forbidden + - **500**: Server error + +This API is not able to track the status of the invitation. Email addresses that fail to be delivered or are rejected by the recipient will not be reported. + +#### `POST /project/:projectId/remove-member` 🔐 + +- **Description**: Remove a user from a project group. +- **Parameters**: + - `projectId`: ID of the project. +- **Request Body**: + + ```json + { + "userID": "string" + } + ``` +- **Responses**: + + - **204**: User removed successfully + - **401**: Unauthorized + - **403**: Forbidden + - **500**: Server error + +This removes a user and their roles from the project. The user will no longer have access to the project, but their annotations will remain with full attribution. + From bd148f3cb8703f2b18e50c453a05e12beba00f03 Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 21 Mar 2025 09:24:55 -0500 Subject: [PATCH 019/262] collaborators and users --- API.md | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/API.md b/API.md index 957e7de8..a8273493 100644 --- a/API.md +++ b/API.md @@ -95,7 +95,9 @@ The response is not a complete Project data object, but a projection designed fo --- -### 3. **Contributors** +### 3. **Collaborators** + +Manage the users and roles in a Project. #### `POST /project/:projectId/invite-member` 🔐 @@ -144,3 +146,142 @@ This API is not able to track the status of the invitation. Email addresses that This removes a user and their roles from the project. The user will no longer have access to the project, but their annotations will remain with full attribution. +#### `PUT /project/:projectId/collaborator/:collaboratorId/setRoles` 🔐 + +- **Description**: Set the roles of a User in a project, replacing all currently defined roles. +- **Parameters**: + - `projectId`: ID of the project. + - `collaboratorId`: ID of the collaborator. +- **Request Body**: + + ```json + { + "roles": ["string"] | "string" + } + ``` +- **Responses**: + + - **200**: Roles set successfully + - **400**: Roles setting failed, validation errors + - **401**: Unauthorized + - **403**: Forbidden + - **500**: Server error + +The User requesting this action must have permissions to set roles for the collaborator. The OWNER role cannot be set using this endpoint. + +#### `POST /project/:projectId/switch/owner` 🔐 + +- **Description**: Transfer ownership of a project to another user. +- **Parameters**: + - `projectId`: ID of the project. +- **Request Body**: + + ```json + { + "newOwnerId": "hexstring" + } + ``` +- **Responses**: + + - **200**: Ownership transferred successfully + - **400**: Ownership transfer failed, validation errors + - **401**: Unauthorized + - **403**: Forbidden + - **500**: Server error + +The User requesting this action must be the current owner of the project. The OWNER role will be removed from the current owner and assigned to the new owner. The new owner must be a member of the project. If the current owner has no other roles, the CONTRIBUTOR role will be assigned to them. + +#### `POST /project/:projectId/setCustomRoles` 🔐 + +- **Description**: Set custom roles for a Project group. Custom roles must be provided as a JSON object with keys as roles and values as arrays of permissions or space-delimited strings. +- **Parameters**: + - `projectId`: ID of the project. +- **Request Body**: + + ```json + { + "roles": { + "roleName": ["permission1", "permission2"] | "space-delimited permissions" + } + } + ``` + +- **Responses**: + + - **200**: Custom roles set successfully + - **400**: Invalid request, validation errors + - **401**: Unauthenticated request + - **403**: Permission denied + - **500**: Server error + +The User requesting this action must have permissions to update roles. Default roles cannot be modified using this endpoint. Custom roles can be complicated and there is more detailed description of their use in the [Cookbook](#). + +--- + +### 4. **Users** + +Private account modification, personal details, and public profile retrieval. + +#### `GET /my/profile` 🔐 + +- **Description**: Retrieve the profile of the authenticated user. +- **Responses**: + + - **200**: Profile found + ```json + { + "_id": "hexstring", + "_sub": "string", + "agent": "URI", + "email": "string", + "profile": { + "displayName": "string", + "custom": Any + } + "name": "string" + } + ``` + - **401**: Unauthorized + - **500**: Server error + +Users can always see and manipulate their own profile. The profile object is a projection of the full user object. + +#### `GET /my/projects` 🔐 + +- **Description**: Retrieve a list of projects the authenticated user is a member of. +- **Responses**: + + - **200**: Projects found + ```json + [ + { + "_id": "hexstring", + "label": "string", + "roles": ["string"] + }, ... + ] + ``` + - **401**: Unauthorized + - **500**: Server error + +The response is a list of projects the user is a member of regardless of the permissions afforded to them in each project. + +#### `GET /user/:id` + +- **Description**: Retrieve the public profile of a user. +- **Parameters**: + - `id`: ID of the user. +- **Responses**: + + - **200**: Profile found + ```json + { + "_id": "hexstring", + "displayName": "string", + "custom": Any + } + ``` + - **404**: Profile not found + - **500**: Server error + +The response is a projection of the full user object. The public profile is available to all users and serialized into this response with whatever the user has chosen to share. The `custom` field is not an actual property - it is a placeholder for any additional fields the user has added to their profile. The `displayName` and `_id` fields are always present. From ae781660b4d22e4d88aee0bee7ed212dce0ed64b Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 21 Mar 2025 12:16:57 -0500 Subject: [PATCH 020/262] add markdown reader --- app.mjs | 2 +- index.mjs | 63 +++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/app.mjs b/app.mjs index d906a3f9..849d6aba 100644 --- a/app.mjs +++ b/app.mjs @@ -61,7 +61,7 @@ app.use('/project', projectRouter) app.use('/line', lineRouter) app.use('/page', pageRouter) app.use('/user', userProfileRouter) -app.use('/my', privateProfileRouter) +app.use('/my', privateProfileRouter) //catch 404 because of an invalid site path app.use('*', function(req, res, next) { diff --git a/index.mjs b/index.mjs index 8b8ea254..ad3aac6d 100644 --- a/index.mjs +++ b/index.mjs @@ -12,17 +12,68 @@ import * as utils from './utilities/shared.mjs' let router = express.Router() // Send a successful response with a public index.html page -export function respondWithHTML(res){ +export function respondWithHTML(res) { res.status(200).sendFile('index.html').end() } +import { JSDOM } from 'jsdom' +import DOMPurify from 'dompurify' + +const window = new JSDOM('').window +const purify = DOMPurify(window) + +import fs from 'fs' +import { marked } from 'marked' + +marked.use({ + gfm: true, +}) + +router + .route("/api") + .get(function (_req,res) { + fs.readFile('API.md', 'utf8', (err, data) => { + if (err) { + utils.respondWithError(res, 500, 'Failed to read API.md') + return + } + res.format({ + html: () => res.send(makeCleanFileFromMarkdown(data)) + }) + }) + }) + router .route("/") - .get(function(req, res, next) { + .get(function (_req, res, next) { respondWithHTML(res) - }) - .all((req, res, next) => { + }) + .all((_req, res, next) => { utils.respondWithError(res, 404, 'There is nothing for you here.') - }) + }) -export {router as default} \ No newline at end of file +export { router as default } + +function makeCleanFileFromMarkdown(file) { + const sanitizedContent = purify.sanitize(marked.parse(file)) + return ` + + + + + + + API Documentation + + + + + + +
+ ${sanitizedContent} +
+ + + ` +} From bbcfabb32a6880fa86dd37f93df63d2dadd55d39 Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 21 Mar 2025 12:22:05 -0500 Subject: [PATCH 021/262] package for markdown --- package-lock.json | 509 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 3 + 2 files changed, 486 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 46e30db7..fc4c8141 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,14 +12,17 @@ "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.0", + "dompurify": "^3.2.4", "dotenv": "^16.4.7", "dotenv-expand": "^12.0.1", "express": "^4.21.2", "express-oauth2-jwt-bearer": "^1.6.0", "express-urlrewrite": "^2.0.3", "http-errors": "^2.0.0", + "jsdom": "^26.0.0", "manifesto.js": "^4.2.21", "mariadb": "^3.4.0", + "marked": "^15.0.7", "mongodb": "^6.12.0", "morgan": "^1.10.0", "nodemailer": "^6.9.16" @@ -50,6 +53,23 @@ "node": ">=6.0.0" } }, + "node_modules/@asamuzakjp/css-color": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", + "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", + "dependencies": { + "@csstools/css-calc": "^2.1.2", + "@csstools/css-color-parser": "^3.0.8", + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3", + "lru-cache": "^10.4.3" + } + }, + "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + }, "node_modules/@babel/code-frame": { "version": "7.26.2", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", @@ -213,27 +233,25 @@ } }, "node_modules/@babel/helpers": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", - "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", + "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.0" + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", - "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", + "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/types": "^7.26.5" + "@babel/types": "^7.26.10" }, "bin": { "parser": "bin/babel-parser.js" @@ -499,15 +517,14 @@ } }, "node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" @@ -533,11 +550,10 @@ } }, "node_modules/@babel/types": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", - "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", + "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" @@ -553,6 +569,111 @@ "dev": true, "license": "MIT" }, + "node_modules/@csstools/color-helpers": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz", + "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@csstools/css-calc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", + "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3" + } + }, + "node_modules/@csstools/css-color-parser": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", + "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "dependencies": { + "@csstools/color-helpers": "^5.0.2", + "@csstools/css-calc": "^2.1.2" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3" + } + }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", + "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^3.0.3" + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", + "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@edsilv/http-status-codes": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", @@ -1185,6 +1306,12 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "optional": true + }, "node_modules/@types/webidl-conversions": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", @@ -1230,6 +1357,14 @@ "node": ">= 0.6" } }, + "node_modules/agent-base": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "engines": { + "node": ">= 14" + } + }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -1313,7 +1448,6 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, "license": "MIT" }, "node_modules/babel-jest": { @@ -1803,7 +1937,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" @@ -1942,6 +2075,53 @@ "node": ">= 8" } }, + "node_modules/cssstyle": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", + "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", + "dependencies": { + "@asamuzakjp/css-color": "^3.1.1", + "rrweb-cssom": "^0.8.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/data-urls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "dependencies": { + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/data-urls/node_modules/tr46": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", + "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/data-urls/node_modules/whatwg-url": { + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "dependencies": { + "tr46": "^5.1.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/debug": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", @@ -1959,6 +2139,11 @@ } } }, + "node_modules/decimal.js": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", + "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==" + }, "node_modules/dedent": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", @@ -1988,7 +2173,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.4.0" @@ -2053,6 +2237,14 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/dompurify": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } + }, "node_modules/dotenv": { "version": "16.4.7", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", @@ -2136,6 +2328,17 @@ "node": ">= 0.8" } }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -2461,7 +2664,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", - "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -2724,6 +2926,17 @@ "node": ">=8" } }, + "node_modules/html-encoding-sniffer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", + "dependencies": { + "whatwg-encoding": "^3.1.1" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", @@ -2747,6 +2960,30 @@ "node": ">= 0.8" } }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -2922,6 +3159,11 @@ "node": ">=0.12.0" } }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -3673,6 +3915,68 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsdom": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", + "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "dependencies": { + "cssstyle": "^4.2.1", + "data-urls": "^5.0.0", + "decimal.js": "^10.4.3", + "form-data": "^4.0.1", + "html-encoding-sniffer": "^4.0.0", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.6", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.16", + "parse5": "^7.2.1", + "rrweb-cssom": "^0.8.0", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^5.0.0", + "w3c-xmlserializer": "^5.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^3.1.1", + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.1.0", + "ws": "^8.18.0", + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "canvas": "^3.0.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/tr46": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", + "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/jsdom/node_modules/whatwg-url": { + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "dependencies": { + "tr46": "^5.1.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", @@ -3851,6 +4155,17 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, + "node_modules/marked": { + "version": "15.0.7", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", + "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -4244,6 +4559,11 @@ "node": ">=8" } }, + "node_modules/nwsapi": { + "version": "2.2.19", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.19.tgz", + "integrity": "sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA==" + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4386,6 +4706,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "dependencies": { + "entities": "^4.5.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -4692,6 +5023,11 @@ "node": ">=10" } }, + "node_modules/rrweb-cssom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", + "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4718,6 +5054,17 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, + "node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=v12.22.7" + } + }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -5150,6 +5497,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -5165,6 +5517,22 @@ "node": ">=8" } }, + "node_modules/tldts": { + "version": "6.1.84", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.84.tgz", + "integrity": "sha512-aRGIbCIF3teodtUFAYSdQONVmDRy21REM3o6JnqWn5ZkQBJJ4gHxhw6OfwQ+WkSAi3ASamrS4N4nyazWx6uTYg==", + "dependencies": { + "tldts-core": "^6.1.84" + }, + "bin": { + "tldts": "bin/cli.js" + } + }, + "node_modules/tldts-core": { + "version": "6.1.84", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.84.tgz", + "integrity": "sha512-NaQa1W76W2aCGjXybvnMYzGSM4x8fvG2AN/pla7qxcg0ZHbooOPhA8kctmOZUDfZyhDL27OGNbwAeig8P4p1vg==" + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -5204,6 +5572,21 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/tough-cookie": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", + "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==", + "dependencies": { + "tldts": "^6.1.32" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/tpen3-services": { + "resolved": "", + "link": true + }, "node_modules/tr46": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", @@ -5344,6 +5727,17 @@ "node": ">= 0.8" } }, + "node_modules/w3c-xmlserializer": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", + "dependencies": { + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/walker": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", @@ -5363,6 +5757,36 @@ "node": ">=12" } }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "engines": { + "node": ">=18" + } + }, "node_modules/whatwg-url": { "version": "13.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", @@ -5431,6 +5855,39 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml-name-validator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", + "engines": { + "node": ">=18" + } + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/package.json b/package.json index 9349265e..5dce8670 100644 --- a/package.json +++ b/package.json @@ -36,14 +36,17 @@ "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.0", + "dompurify": "^3.2.4", "dotenv": "^16.4.7", "dotenv-expand": "^12.0.1", "express": "^4.21.2", "express-oauth2-jwt-bearer": "^1.6.0", "express-urlrewrite": "^2.0.3", "http-errors": "^2.0.0", + "jsdom": "^26.0.0", "manifesto.js": "^4.2.21", "mariadb": "^3.4.0", + "marked": "^15.0.7", "mongodb": "^6.12.0", "morgan": "^1.10.0", "nodemailer": "^6.9.16" From ba271914c65a2220889b2f9361b3168afed59698 Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 21 Mar 2025 12:26:38 -0500 Subject: [PATCH 022/262] Update API.md --- API.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/API.md b/API.md index a8273493..99ed6448 100644 --- a/API.md +++ b/API.md @@ -208,11 +208,11 @@ The User requesting this action must be the current owner of the project. The Date: Fri, 21 Mar 2025 12:29:17 -0500 Subject: [PATCH 023/262] Update API.md --- API.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/API.md b/API.md index 99ed6448..093863be 100644 --- a/API.md +++ b/API.md @@ -4,11 +4,8 @@ This document provides an overview of the available routes in the TPEN Services ## Base URL -``` -https://api.t-pen.org - - https://dev.api.t-pen.org -``` +- **Production**: [https://api.t-pen.org](https://api.t-pen.org) +- **Development**: [https://dev.api.t-pen.org](https://dev.api.t-pen.org) ## Endpoints From 9ced56a6a0be37e04edaef7b8d5f4b9d7c0ac768 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 25 Mar 2025 13:24:49 -0500 Subject: [PATCH 024/262] touch --- API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API.md b/API.md index 093863be..086dbbbc 100644 --- a/API.md +++ b/API.md @@ -11,7 +11,7 @@ This document provides an overview of the available routes in the TPEN Services ### 1. **Authentication** -Endpoints marked with a 🔐 requiring authentication expect a valid JWT token in the `Authorization` header. +Endpoints marked with a 🔐 requiring authentication expect a valid JWT token in the `Authorization` header. Use the [public TPEN3 login](https://three.t-pen.org/login/) to get one of these JWT tokens. --- From 5abff41d5a26f3fc9fd10a0f9f728b795a650b73 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 25 Mar 2025 13:41:28 -0500 Subject: [PATCH 025/262] ah codes --- API.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/API.md b/API.md index 086dbbbc..745c76fb 100644 --- a/API.md +++ b/API.md @@ -35,7 +35,7 @@ Endpoints marked with a 🔐 requiring authentication expect a valid JWT token i - **Responses**: - - **200**: Project created successfully + - **201**: Project created successfully - **400**: Project creation failed, validation errors - **401**: Unauthorized - **500**: Server error @@ -55,7 +55,7 @@ Endpoints marked with a 🔐 requiring authentication expect a valid JWT token i - **Responses**: - - **200**: Project created successfully + - **201**: Project created successfully - **400**: Project creation failed, validation errors - **401**: Unauthorized - **500**: Server error From d363d25c90e5faa669dc0366570f6d3d9ce7fc95 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Tue, 25 Mar 2025 14:28:32 -0500 Subject: [PATCH 026/262] proxy for internal use (#201) --- app.mjs | 6 +- utilities/proxy.js | 137 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 utilities/proxy.js diff --git a/app.mjs b/app.mjs index 849d6aba..c55e1622 100644 --- a/app.mjs +++ b/app.mjs @@ -24,8 +24,9 @@ import manifestRouter from './manifest/index.mjs' import projectRouter from './project/index.mjs' import pageRouter from './page/index.mjs' import lineRouter from './line/index.mjs' - import userProfileRouter from './userProfile/index.mjs' +import userProfileRouter from './userProfile/index.mjs' import privateProfileRouter from './userProfile/privateProfile.mjs' +import proxyRouter from './utilities/proxy.js' let app = express() @@ -61,7 +62,8 @@ app.use('/project', projectRouter) app.use('/line', lineRouter) app.use('/page', pageRouter) app.use('/user', userProfileRouter) -app.use('/my', privateProfileRouter) +app.use('/my', privateProfileRouter) +app.use('/proxy', proxyRouter) //catch 404 because of an invalid site path app.use('*', function(req, res, next) { diff --git a/utilities/proxy.js b/utilities/proxy.js new file mode 100644 index 00000000..f7994d17 --- /dev/null +++ b/utilities/proxy.js @@ -0,0 +1,137 @@ +import https from 'node:https' +import express from 'express' +import cors from 'cors' +import common_cors from "../utilities/common_cors.json" with {type: "json"} + +const requireHeader = [ + 'origin', + 'x-requested-with' +] + +const excludedClientHeaders = new Set([ + 'host', + 'cookie' +]) + +const excludedServerHeaders = new Set([ + 'set-cookie', + 'connection' +]) + +const sizeLimit = 2e8 // 200 MB + +const proxy = (req, res, next) => { + // Set CORS headers + res.header('Access-Control-Allow-Origin', '*') + + // Extract the target URL from the request path + // Handle both /proxy/http://example.com and /proxy/https://example.com + // Also handle the case with double slashes + let targetUrl = req.originalUrl.replace(/^\/+proxy\/+/, '') + + if (!targetUrl) { + res.status(400).send('No URL provided') + return + } + + // // Require Origin header + // if (!requireHeader.some(header => req.headers[header])) { + // res.status(403).send('Origin: header is required') + // return + // } + + // Forward client headers to server + const headers = {} + for (const header in req.headers) { + if (!excludedClientHeaders.has(header.toLowerCase())) { + headers[header] = req.headers[header] + } + } + + const forwardedFor = req.headers['x-forwarded-for'] + headers['X-Forwarded-For'] = (forwardedFor ? forwardedFor + ',' : '') + req.connection.remoteAddress + + // Parse URL and upgrade to HTTPS if needed + try { + const parsedUrl = new URL(targetUrl) + + // Force HTTPS by changing the protocol if it's currently HTTP + if (parsedUrl.protocol === 'http:') { + parsedUrl.protocol = 'https:' + targetUrl = parsedUrl.toString() + } + } catch (e) { + res.status(400).send('Invalid URL') + return + } + + let data = 0 // Track data size + + const proxyReq = https.request(targetUrl, { + method: 'GET', + headers + }, (proxyRes) => { + // Check content length - if it's larger than the size limit, end the request with a 413 error + if (Number(proxyRes.headers['content-length']) > sizeLimit) { + res.status(413).send(`ERROR 413: Maximum allowed size is ${sizeLimit} bytes.`) + proxyReq.destroy() + return + } + + res.statusCode = proxyRes.statusCode + + // If the page already supports cors, redirect to the URL directly + if (proxyRes.headers['access-control-allow-origin'] === '*') { + res.redirect(targetUrl) + proxyReq.destroy() + return + } + + // Include only desired headers + for (const header in proxyRes.headers) { + if (!excludedServerHeaders.has(header)) { + res.header(header, proxyRes.headers[header]) + } + } + + // Send headers before streaming the body + res.flushHeaders() + + // Handle the data stream + proxyRes.on('data', chunk => { + data += chunk.length + if (data > sizeLimit) { + proxyReq.destroy() + res.end() + return + } + res.write(chunk) + }) + + proxyRes.on('end', () => { + res.end() + }) + }) + + proxyReq.on('error', err => { + res.status(500).send(`Proxy Error: ${err.message}`) + }) + + proxyReq.end() +} + +function opts(req, res, next) { + res.header('Access-Control-Allow-Origin', '*') + res.header('Access-Control-Allow-Methods', 'GET') + res.header('Access-Control-Allow-Headers', req.header('Access-Control-Request-Headers')) + res.header('Access-Control-Max-Age', '86400') + res.sendStatus(200) +} + +const proxyRouter = express.Router() +proxyRouter.use(cors(common_cors)) +proxyRouter.route('/*') + .options(opts) + .get(proxy) + +export default proxyRouter From a4c43e0b4c8ff8d672e26cff997668502d3ba267 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Mon, 31 Mar 2025 15:25:06 -0500 Subject: [PATCH 027/262] Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger --- classes/Layer/Layer.mjs | 97 +++++++++++-------------- classes/Layer/__tests__/exists.test.mjs | 25 +------ classes/Project/Project.mjs | 11 ++- project/index.mjs | 88 ++++++++++++++++++++++ 4 files changed, 144 insertions(+), 77 deletions(-) diff --git a/classes/Layer/Layer.mjs b/classes/Layer/Layer.mjs index d991d388..c79bb9e5 100644 --- a/classes/Layer/Layer.mjs +++ b/classes/Layer/Layer.mjs @@ -1,66 +1,53 @@ -export class Layer { - constructor(layer = {}) { - this.layer = layer - if(!this.layer.id) { - this.layer.id = Date.now() // ticket to replace with MongoDB ObjectID() - } +import dbDriver from "../../database/driver.mjs" + +const database = new dbDriver("mongo") + +export default class Layer { + constructor(data) { + this.data = data + this.projectId = null } get id() { - return this.layer.id + return this.data.id } set id(id) { - this.layer.id = id - } - - asJSON() { - return { - type: 'Range', - '@context': 'https://iiif.io/api/presentation/3.0/', - items: this.layer.body ?? [], - target: this.layer.target ?? '', + this.data.id = id + } + + async addLayer(projectId, labelAndCanvases, projectLabel) { + this.projectId = projectId + const label = labelAndCanvases?.label ?? `${projectLabel ?? "Default"} - Layer ${Date.now()}` + const canvases = labelAndCanvases.canvases + + try { + const newLayer = { + "id": `${process.env.RERUMIDPREFIX}${database.reserveId()}`, + label, + pages: canvases.map(element => ({ + id: `temp${database.reserveId()}`, + label: `Default - ${element.split("/").pop().split(".")[0]}`, + target: element + })) + } + + this.data.layers.push(newLayer) + await this.update() + return newLayer + } catch (error) { + console.error('Error fetching data:', error) } } - - create() { - return Promise.resolve(new Layer()) - } - - delete() { - return Promise.resolve() - } - - save() { - return Promise.resolve() - } - - fetch() { - return Promise.resolve(new Layer()) - } - - getPages() { - return Promise.resolve('Array of Page objects') - } - - getLines() { - return Promise.resolve('Array of Line objects in all pages') - } - - getImageLinks() { - return Promise.resolve('Array of image links in all pages') - } - - getTextBlob() { - return Promise.resolve('Text contents of pages') - } - - fetchHTMLDocuments() { - return Promise.resolve('HTML documents of pages') + + async deleteLayer(projectId, layerId) { + this.projectId = projectId + this.data.layers = this.data.layers.filter(layer => (layer.id ?? layer["@id"]) !== `${process.env.RERUMIDPREFIX}${layerId}`) + await this.update() + return this.data.layers } - // Method to add a page to the layer - addPage(page) { - return Promise.resolve() + async update() { + return await database.update(this.data, process.env.TPENPROJECTS) } -} +} \ No newline at end of file diff --git a/classes/Layer/__tests__/exists.test.mjs b/classes/Layer/__tests__/exists.test.mjs index d04283ac..9f97519d 100644 --- a/classes/Layer/__tests__/exists.test.mjs +++ b/classes/Layer/__tests__/exists.test.mjs @@ -1,4 +1,4 @@ -import { Layer } from "../Layer.mjs" +import Layer from "../Layer.mjs" describe('Layer Class looks how we expect it to. #Layer_exists_unit', () => { it('Imports Layer', () => { @@ -8,25 +8,8 @@ describe('Layer Class looks how we expect it to. #Layer_exists_unit', () => { const layer = new Layer() it('has useful methods', () => { - expect(layer.asJSON).toBeInstanceOf(Function) - expect(layer.create).toBeInstanceOf(Function) - expect(layer.delete).toBeInstanceOf(Function) - expect(layer.save).toBeInstanceOf(Function) - expect(layer.getPages).toBeInstanceOf(Function) - expect(layer.getLines).toBeInstanceOf(Function) - expect(layer.getImageLinks).toBeInstanceOf(Function) - expect(layer.getTextBlob).toBeInstanceOf(Function) - expect(layer.fetchHTMLDocuments).toBeInstanceOf(Function) - expect(layer.addPage).toBeInstanceOf(Function) - }) - - it('configures a correct Annotation', () => { - expect(layer.id).toBeDefined() - const json = layer.asJSON() - expect(json).toBeInstanceOf(Object) - expect(json.type).toBe('Range') - expect(json['@context']).toBe("https://iiif.io/api/presentation/3.0/") - expect(json.items).toBeInstanceOf(Array) - expect(json.target).toBeDefined() + expect(layer.addLayer).toBeInstanceOf(Function) + expect(layer.deleteLayer).toBeInstanceOf(Function) + expect(layer.update).toBeInstanceOf(Function) }) }) diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index 217aa9b1..1dbaecd6 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -96,6 +96,10 @@ export default class Project { }) } + getLabel() { + return this.data?.label ?? `No Label` + } + getCombinedPermissions(roles) { return [...new Set(Object.keys(roles).map(r => roles[r]).flat())] } @@ -180,4 +184,9 @@ export default class Project { this.data = resp }) } -} + + async loadProject() { + await this.#load() + return this.data + } +} \ No newline at end of file diff --git a/project/index.mjs b/project/index.mjs index 33cb300c..060954a0 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -6,6 +6,7 @@ import auth0Middleware from "../auth/index.mjs" import ProjectFactory from "../classes/Project/ProjectFactory.mjs" import validateURL from "../utilities/validateURL.mjs" import Project from "../classes/Project/Project.mjs" +import Layer from "../classes/Layer/Layer.mjs" import { isValidEmail } from "../utilities/validateEmail.mjs" import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.mjs" import Group from "../classes/Group/Group.mjs" @@ -484,6 +485,93 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) } }) +// Add a New Layer +router.route("/:projectId/layer").post(auth0Middleware(), async (req, res) => { + const { projectId } = req.params + const labelAndCanvases = req.body + const user = req.user + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + if (!projectId) { + return respondWithError(res, 400, "Project ID is required") + } + + if(!validateID(projectId)){ + return respondWithError(res, 400, "Invalid project ID provided.") + } + + if (!labelAndCanvases || !labelAndCanvases.canvases) { + return respondWithError(res, 400, "Invalid layer provided. Expected a layer object.") + } + + try { + const project = new Project(projectId) + + if(!project || await project.loadProject() === null) { + return respondWithError(res, 404, "Project does not exist.") + } + + const layers = (await project.loadProject()) + + if (!(await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LAYER))) { + return respondWithError(res, 403, "You do not have permission to add layers to this project.") + } + + const layer = new Layer(layers) + const response = await layer.addLayer(projectId, labelAndCanvases, project.getLabel()) + res.status(201).json(response) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error adding layer to project.") + } +}) + +// Delete a Layer +router.route("/:projectId/layer/:layerId").delete(auth0Middleware(), async (req, res) => { + const { projectId, layerId } = req.params + const user = req.user + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + if (!projectId) { + return respondWithError(res, 400, "Project ID is required") + } + + if(!validateID(projectId)){ + return respondWithError(res, 400, "Invalid project ID provided.") + } + + if (!layerId) { + return respondWithError(res, 400, "Layer ID is required") + } + + try { + const project = new Project(projectId) + + if(!project || await project.loadProject() === null) { + return respondWithError(res, 404, "Project does not exist.") + } + + const layers = (await project.loadProject()) + + if (!(await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.LAYER))) { + return respondWithError(res, 403, "You do not have permission to delete layers from this project.") + } + + const layer = new Layer(layers) + if (layer.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`) === undefined) { + return respondWithError(res, 400, "Layer not found in project.") + } + + const response = await layer.deleteLayer(projectId, layerId) + res.status(204).send() + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error deleting layer from project.") + } +}) + // Update Project Metadata router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { const { projectId } = req.params From 747b7e0708f6fce0b34759e1f880761b49d9679e Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 2 Apr 2025 17:15:11 -0500 Subject: [PATCH 028/262] Create sample.env --- sample.env | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 sample.env diff --git a/sample.env b/sample.env new file mode 100644 index 00000000..d2263d9b --- /dev/null +++ b/sample.env @@ -0,0 +1,42 @@ +# Server Configuration +PORT=3001 +DOWN=false +READONLY=false +SERVERURL=http://localhost:3001 + +# Data Collections +TPENPROJECTS=projects +TPENGROUPS=groups +TPENUSERS=users + +# Database Connection - MongoDB +MONGODB=mongodb://localhost:27017 +MONGODBNAME=tpen3 + +# Database Connection - MariaDB +MARIADB=localhost +MARIADBNAME=tpen3 +MARIADBUSER=tpen_user +MARIADBPASSWORD=tpen_password + +# RERUM Configuration +RERUMURL=https://store.rerum.io/v1 +RERUMIDPREFIX=https://store.rerum.io/v1/id/ + +# TinyPEN API +TINYPEN=http://tiny.t-pen.org/ + +# Email Configuration +SMTP_HOST=smtp.example.com +SMTP_PORT=25 +TPEN_SUPPORT_EMAIL=support@example.com +TPEN_EMAIL_CC=admin@example.com + +# Authentication +AUDIENCE=https://tpen.example.com/api +DOMAIN=auth.example.com + +# GitHub Integration +REPO_OWNER=GitHubOrganization +REPO_NAME=OurProjects +GITHUB_TOKEN=github_pat_example_token From bb9598fec2a09fd28c907ccd4f5ecea6a5d91ddd Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 3 Apr 2025 15:39:44 -0500 Subject: [PATCH 029/262] Update sample.env GitHub per @mepripri --- sample.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sample.env b/sample.env index d2263d9b..347d4bdc 100644 --- a/sample.env +++ b/sample.env @@ -40,3 +40,5 @@ DOMAIN=auth.example.com REPO_OWNER=GitHubOrganization REPO_NAME=OurProjects GITHUB_TOKEN=github_pat_example_token +BRANCH = main +TPENSTATIC = https://dev.static.t-pen.org/ From c14dcf8440135998a93fb0b344d37ea025791a06 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 3 Apr 2025 17:11:36 -0500 Subject: [PATCH 030/262] Update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index c59c37d2..6ab00751 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @thehabes @cubap +* @thehabes @cubap @mepripri From 09dbb0c969c778ab36c2e734dc3efca5ba711e69 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 3 Apr 2025 17:24:34 -0500 Subject: [PATCH 031/262] dev it and hotkeys --- sample.env | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sample.env b/sample.env index 347d4bdc..8bcf7409 100644 --- a/sample.env +++ b/sample.env @@ -8,6 +8,7 @@ SERVERURL=http://localhost:3001 TPENPROJECTS=projects TPENGROUPS=groups TPENUSERS=users +TPENHOTKEYS=hotkeys # Database Connection - MongoDB MONGODB=mongodb://localhost:27017 @@ -20,11 +21,11 @@ MARIADBUSER=tpen_user MARIADBPASSWORD=tpen_password # RERUM Configuration -RERUMURL=https://store.rerum.io/v1 -RERUMIDPREFIX=https://store.rerum.io/v1/id/ +RERUMURL=https:/dev/store.rerum.io/v1 +RERUMIDPREFIX=https://devstore.rerum.io/v1/id/ # TinyPEN API -TINYPEN=http://tiny.t-pen.org/ +TINYPEN=http://dev.tiny.t-pen.org/ # Email Configuration SMTP_HOST=smtp.example.com From 7baff4b1e479a3834b89c5bd8805aa7e24375b62 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 4 Apr 2025 10:36:39 -0500 Subject: [PATCH 032/262] 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs --- classes/Manifest/Manifest.js | 4 +- classes/Project/ProjectFactory.mjs | 118 ++++++++++++----------------- utilities/vault.mjs | 6 ++ 3 files changed, 57 insertions(+), 71 deletions(-) create mode 100644 utilities/vault.mjs diff --git a/classes/Manifest/Manifest.js b/classes/Manifest/Manifest.js index fccbfaca..8d617865 100644 --- a/classes/Manifest/Manifest.js +++ b/classes/Manifest/Manifest.js @@ -1,6 +1,4 @@ -import { Vault } from '@iiif/helpers/vault' - -const vault = new Vault() +import vault from "../../utilities/vault.mjs" class Manifest { diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.mjs index 0edf7709..093fb83b 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.mjs @@ -4,6 +4,8 @@ import User from "../User/User.mjs" import dbDriver from "../../database/driver.mjs" import fs from "fs" import path from "path" +import vault from "../../utilities/vault.mjs" + const database = new dbDriver("mongo") export default class ProjectFactory { @@ -11,18 +13,8 @@ export default class ProjectFactory { this.data = data } - static async loadManifest(url) { - return fetch(url) - .then((response) => { - return response.json() - }) - .catch((err) => { - throw { - status: err.status ?? 404, - message: err.message ?? "Manifest not found. Please check URL" - } - }) - } + static loadManifest = vault.loadManifest + /** * processes a manifest object into a project object that can be saved into the Project tablein the DB * @param {*} manifest : The manifest object to be processed @@ -35,59 +27,49 @@ export default class ProjectFactory { message: err.message ?? "No manifest found. Cannot process empty object" } } - let newProject = {} - newProject.label = ProjectFactory.processLabel(manifest.label) - newProject.metadata = manifest.metadata - newProject.manifest = manifest["@id"] ?? manifest.id - let canvas = manifest.items ?? manifest?.sequences[0]?.canvases - newProject.layers = await ProjectFactory.processLayerFromCanvas(canvas) - return newProject - } - - static processLabel(label) { - let processedLabel = null - if (typeof (label) == "string") { - processedLabel = label - } - - else if (typeof (label) == "object" && label != null) { - //for language maps - let firstKey = Object.keys(label)[0] - processedLabel = label[firstKey] - if (Array.isArray(processedLabel)) processedLabel = processedLabel[0] + const now = Date.now().toString().slice(-6) + const metadata = manifest.metadata ?? [] + const pages = await ProjectFactory.buildPagesFromCanvases(manifest.items) + + // required properties: id, label, metadata, manifest, layers + return { + label: ProjectFactory.getLabelAsString(manifest.label) ?? `Project ${now}`, + metadata, + manifest: [ manifest.id ], + layers: [ { + id: `${process.env.SERVERURL}layer/${database.reserveId()}`, + label: `First Layer - ${ProjectFactory.getLabelAsString(manifest.label) ?? now}`, + pages, + } ] } - - return processedLabel } - static async processLayerFromCanvas(canvases) { - if (!canvases.length) return [] - let layers = [] + static getLabelAsString(label) { + const defaultLanguage = typeof label === 'object' ? Object.keys(label)[0] : 'en' + return label[defaultLanguage]?.join(", ") ?? label.none?.join(",") + } + static async buildPagesFromCanvases(canvases) { try { - canvases.map(async (canvas) => { - let layer = {} - layer["@id"] = Date.now() - layer["@type"] = "Layer" - layer.pages = canvas?.otherContent ?? canvas?.annotations ?? [] - layer?.pages?.map((page) => { - page.canvas = page.on ?? canvas.id - page.lines = page.resources ?? page.items ?? [] - delete page.resources - delete page.on - delete page.items - }) - - layers.push(layer) + if (!canvases.length || !Array.isArray(canvases)) throw new Error("No canvases found in the manifest") + + const pages = canvases.map(async (c, index) => { + const canvas = await vault.get(c) + return { + id: `${process.env.SERVERURL}page/${canvas.id?.split('/').pop()}`, + label: ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${index + 1}`, + target: canvas.id + } }) + return await Promise.all(pages) } catch (error) { - console.log(error) + console.error(error) + throw error } - return layers } static async fromManifestURL(manifestId, creator) { - return ProjectFactory.loadManifest(manifestId) + return vault.loadManifest(manifestId) .then(async (manifest) => { return await ProjectFactory.DBObjectFromManifest(manifest) }) @@ -309,31 +291,31 @@ export default class ProjectFactory { let sha = null const getResponse = await fetch(manifestUrl, { - headers: { - 'Authorization': `token ${token}`, - 'Accept': 'application/vnd.github.v3+json', - }, + headers: { + 'Authorization': `token ${token}`, + 'Accept': 'application/vnd.github.v3+json', + }, }) if (getResponse.ok) { - const fileData = await getResponse.json() - sha = fileData.sha + const fileData = await getResponse.json() + sha = fileData.sha } await fetch(manifestUrl, { method: 'PUT', headers: { - 'Authorization': `token ${token}`, - 'Accept': 'application/vnd.github.v3+json', - 'Content-Type': 'application/json', + 'Authorization': `token ${token}`, + 'Accept': 'application/vnd.github.v3+json', + 'Content-Type': 'application/json', }, body: JSON.stringify({ - message: sha ? `Updated ${projectId}/manifest.json` : `Created ${projectId}/manifest.json`, - content: content, - branch: process.env.BRANCH, - ...(sha && { sha }), + message: sha ? `Updated ${projectId}/manifest.json` : `Created ${projectId}/manifest.json`, + content: content, + branch: process.env.BRANCH, + ...(sha && { sha }), }), - }) + }) } catch (error) { console.error(`Failed to upload ${projectId}/manifest.json:`, error) } diff --git a/utilities/vault.mjs b/utilities/vault.mjs new file mode 100644 index 00000000..c13e59ea --- /dev/null +++ b/utilities/vault.mjs @@ -0,0 +1,6 @@ +import { Vault } from '@iiif/helpers/vault' + +// Create a single instance to be shared across the application +const vault = new Vault() + +export default vault From bc2ff72f47c9ae003cb4ef074d954f9ad7f4130f Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 4 Apr 2025 11:27:08 -0500 Subject: [PATCH 033/262] 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move --- classes/User/User.mjs | 1 - database/driver.mjs | 90 +++++++++++++++++-- database/mongo/__tests__/unit.test.mjs | 14 +-- database/mongo/controller.mjs | 119 +++++++------------------ 4 files changed, 122 insertions(+), 102 deletions(-) diff --git a/classes/User/User.mjs b/classes/User/User.mjs index 361aee93..824d5e7f 100644 --- a/classes/User/User.mjs +++ b/classes/User/User.mjs @@ -99,7 +99,6 @@ export default class User { /** * this assumes that the project object includes the following properties { - "@type":"Project" creator:"user.agent", groups:{ members:[{agent:"user.agent", _id:"user._id"}] diff --git a/database/driver.mjs b/database/driver.mjs index b15a8715..255459a9 100644 --- a/database/driver.mjs +++ b/database/driver.mjs @@ -5,7 +5,7 @@ * No matter which controller they choose, they have access to regularized unit functionality. * Additional controllers can be included in the /database directory as necessary. * - * @author Bryan Haberberger + * @author Bryan Haberberger, cubap * https://github.com/thehabes * */ @@ -83,51 +83,73 @@ class dbDriver { /** * Create a new object in the database * @param data JSON from an HTTP POST request + * @param collection Optional collection override * @return The inserted document JSON or error JSON */ async save(data, collection) { console.warn("dbDriver.save() is problematic. https://github.com/CenterForDigitalHumanities/TPEN-services/issues/193") + collection ??= resolveCollection(data) + if (!collection) throw new Error("Cannot determine collection for save operation") return this.controller.save(data, collection) } /** * Update an existing object in the database - * @param data JSON from an HTTP POST request. It must contain an id. + * @param data JSON from an HTTP POST request. It must contain an id. + * @param collection Optional collection override * @return The updated document JSON or error JSON */ async update(data, collection) { - // Note this may just be an alias for save() + collection ??= resolveCollection(data) + if (!collection) throw new Error("Cannot determine collection for update operation") return this.controller.update(data, collection) } /** * Remove an existing object from the database - * @param data JSON from an HTTP DELETE request. It must contain an id. + * @param data JSON from an HTTP DELETE request. It must contain an id. + * @param collection Optional collection override * @return The delete result JSON or error JSON */ async delete(data, collection) { + collection ??= resolveCollection(data) + if (!collection) throw new Error("Cannot determine collection for delete operation") return this.controller.remove(data, collection) } /** * Get data from the database that have matching property values. - * @param query JSON from an HTTP POST request. It must contain at least one property. + * @param query JSON from an HTTP POST request. It must contain at least one property. + * @param collection Optional collection override * @return JSON Array of matched documents or standard error object */ async find(query, collection) { + collection ??= resolveCollection(query) + if (!collection) throw new Error("Cannot determine collection for find operation") return this.controller.find(query, collection) } + + /** + * Find a single document matching the query + * @param query JSON from an HTTP POST request. It must contain at least one property. + * @param collection Optional collection override + * @return Single document JSON or error + */ async findOne(query, collection) { + collection ??= resolveCollection(query) + if (!collection) throw new Error("Cannot determine collection for findOne operation") return this.controller.findOne(query, collection) } /** * Get a database record by its ID. * @param id The ID of the record to retrieve. - * @collection collection The collection or table to search. + * @param collection Optional collection override * @return JSON of the matched document or standard error object */ async getById(id, collection) { + // Note: Can't determine collection from just an ID + if (!collection) throw new Error("Collection required for getById operation") return this.controller.getById(id, collection) } @@ -161,3 +183,59 @@ class dbDriver { } export default dbDriver + +/** +* Data belongs to or goes into different collections. The data 'type' usually tells us which one. +* If no type is found on the data, use the provided override, if any. +* +* @param data A data object or query object. The type will correspond to a collection +* @param override If no type is on 'data', consider the provided override to be the type. +* @return a known type string, such as "Project", or null +*/ +function determineDataType(data, override) { + if (data._sub) return "User" + if (data.members) return "Group" + if (data.group) return "Project" + if (data.target && data.items) return "Page" + if (data.target && data.body) return "Line" + return override ?? data["@type"] ?? data.type +} + +/** + * Determine the collection name based on data type. + * + * @param type A type string, such as "Project", or null + * @return the corresponding collection name from environment variables + */ +function discernCollectionFromType(type) { + if (!type) return null + + switch (type) { + case "Project": + case "Page": + case "Line": + return process.env.TPENPROJECTS + case "Group": + return process.env.TPENGROUPS + case "User": + return process.env.TPENUSERS + default: + return null + } +} + +/** + * Determine the appropriate collection based on data and/or override. + * + * @param data The data object to analyze + * @param collectionOverride Optional collection override + * @return Appropriate collection name + */ +function resolveCollection(data, collectionOverride) { + if (collectionOverride) return collectionOverride + + const type = determineDataType(data) + if (!type) return null + + return discernCollectionFromType(type) +} diff --git a/database/mongo/__tests__/unit.test.mjs b/database/mongo/__tests__/unit.test.mjs index d854a235..ecef20e1 100644 --- a/database/mongo/__tests__/unit.test.mjs +++ b/database/mongo/__tests__/unit.test.mjs @@ -43,7 +43,7 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "creates a new group", async () => { - const result = await database.save(test_group) + const result = await database.save(test_group, "groups") test_group["_id"] = result["_id"] expect(result["_id"]).toBeTruthy() }, @@ -52,7 +52,7 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "creates a new User", async () => { - const result = await database.save(test_user) + const result = await database.save(test_user, "users") test_user["_id"] = result["_id"] expect(result["_id"]).toBeTruthy() }, @@ -72,7 +72,8 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { "updates an existing group", async () => { test_group.name = "Test Group -- Updated" - const result = await database.update(test_group) + await database.save(test_group, "groups") + const result = await database.update(test_group, "groups") expect(result["_id"]).toBeTruthy() }, TIME_OUT @@ -81,7 +82,8 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { "updates an existing User", async () => { test_user.name = "Test User -- Updated" - const result = await database.update(test_user) + await database.save(test_user, "users") + const result = await database.update(test_user, "users") expect(result["_id"]).toBeTruthy() }, TIME_OUT @@ -98,7 +100,7 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "Finds matching groups by query", async () => { - const result = await database.find(test_group) + const result = await database.find(test_group, "groups") expect(result[0]["_id"]).toBe(test_group["_id"]) }, TIME_OUT @@ -106,7 +108,7 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "Finds matching User by query", async () => { - const result = await database.find(test_user) + const result = await database.find(test_user, "users") expect(result[0]["_id"]).toBe(test_user["_id"]) }, TIME_OUT diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index cae093a2..0665af03 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -1,5 +1,5 @@ /** - * A MongoDB Controller. Actions here specifically interact with the set MongoDB Database. + * A MongoDB Controller. Actions here specifically interact with the set MongoDB Database. * @see env.MONGODB * * @author Bryan Haberberger @@ -8,6 +8,7 @@ import {MongoClient, ObjectId} from "mongodb" import dotenv from "dotenv" + let storedEnv = dotenv.config() let err_out = Object.assign(new Error(), { status: 123, @@ -15,44 +16,6 @@ let err_out = Object.assign(new Error(), { _dbaction: "N/A" }) -/** - * This mongo controller oversees multiple collections. - * The collection to interact with is programatically chosen based on the 'type' of the input. - * - * @param type A type string, such as "Project", or null - * @return the corresponding mongo collection, such as "projects", or null - */ -function discernCollectionFromType(type) { - let collection = null - if (!type) return collection - switch (type) { - case "Project": - case "Page": - case "Line": - collection = process.env.TPENPROJECTS - break - case "Group": - collection = process.env.TPENGROUPS - break - case "User": - collection = process.env.TPENUSERS - break - default: - } - return collection -} - -/** - * Data belongs to or goes into different collections. The data 'type' usually tells us which one. - * If no type is found on the data, use the provided override, if any. - * - * @param data A data object or query object. The type will correspond to a mongo collection - * @param override If no type is on 'data', consider the provided override to be the type. - * @return a known type string, such as "Project", or null - */ -function determineDataType(data, override) { - return data["@type"] ?? data.type ?? override -} class DatabaseController { /** @@ -132,7 +95,6 @@ class DatabaseController { * Generate an new mongo _id as a hex string (as opposed _id object, for example) * @return A hex string or error * */ - reserveId(seed) { try { return new ObjectId(seed).toHexString() @@ -148,7 +110,7 @@ class DatabaseController { async connected() { // Send a ping to confirm a successful connection try { - let result = await this.db.command({ping: 1}).catch((err) => { + let result = await this.db.command({ping: 1}).catch((_err) => { return false }) result = result.ok ? true : false @@ -163,23 +125,17 @@ class DatabaseController { try { // Not allowed to find null or {} if (!query || Object.keys(query).length === 0) { - err_out.message = `Empty or null query detected. You must provide a query object.` - err_out.status = 400 - throw err_out - } - // need to determine what collection (projects, groups, users) this goes into. - const data_type = determineDataType(query, collection) - if (!data_type) { - err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` + err_out.message = `Empty or null query detected. You must provide a query object.` err_out.status = 400 throw err_out } - collection ??= discernCollectionFromType(data_type) + if (!collection) { - err_out.message = `Cannot figure which collection for object of type '${data_type}'` + err_out.message = `Collection is required for find operation` err_out.status = 400 throw err_out } + let result = await this.db.collection(collection).find(query).toArray() return result } catch (err) { @@ -195,24 +151,17 @@ class DatabaseController { try { // Not allowed to find null or {} if (!query || Object.keys(query).length === 0) { - err_out.message = `Empty or null query detected. You must provide a query object.` + err_out.message = `Empty or null query detected. You must provide a query object.` err_out.status = 400 throw err_out } - // need to determine what collection (projects, groups, users) this goes into. - - const data_type = determineDataType(query, collection) - if (!data_type) { - err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` - err_out.status = 400 - throw err_out - } - collection ??= discernCollectionFromType(data_type) + if (!collection) { - err_out.message = `Cannot figure which collection for object of type '${data_type}'` + err_out.message = `Collection is required for findOne operation` err_out.status = 400 throw err_out } + let result = await this.db.collection(collection).findOne(query) return result } catch (err) { @@ -231,29 +180,24 @@ class DatabaseController { */ async save(data, collection) { try { - // need to determine what collection (projects, groups, users) this goes into. - const data_type = determineDataType(data, collection) - if (!data_type) { - err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` - err_out.status = 400 - throw err_out - } - collection ??= discernCollectionFromType(data_type) if (!collection) { - err_out.message = `Cannot figure which collection for object of type '${data_type}'` + err_out.message = `Collection is required for save operation` err_out.status = 400 throw err_out } + data._id ??= this.reserveId() const result = await this.db.collection(collection).insertOne(data) + if (result.insertedId) { return data } - err_out.message = `Document was not inserted into the database.` + + err_out.message = `Document was not inserted into the database` err_out.status = 500 throw err_out } catch (err) { - // Specifically account for unexpected mongo things. + // Specifically account for unexpected mongo things if (!err?.message) err.message = err.toString() if (!err?.status) err.status = 500 if (!err?._dbaction) err._dbaction = "insertOne" @@ -263,41 +207,36 @@ class DatabaseController { /** * Update an existing object in the database (mongo) - * @param data JSON from an HTTP POST request. It must contain an id. + * @param data JSON from an HTTP POST request. It must contain an id. * @return The inserted document JSON or error JSON */ async update(data, collection) { - // Note this may be an alias for save() try { let data_id = data["@id"] ?? data._id if (!data_id) { - err_out.message = `An 'id' must be present to update.` - err_out.status = 400 - throw err_out - } - // need to determine what collection (projects, groups, users) this goes into. - const data_type = determineDataType(data, collection) - if (!data_type) { - err_out.message = `Cannot find 'type' on this data, and so cannot figure out a collection for it.` + err_out.message = `An 'id' must be present to update` err_out.status = 400 throw err_out } - collection ??= discernCollectionFromType(data_type) + if (!collection) { - err_out.message = `Cannot figure which collection for object of type '${data_type}'` + err_out.message = `Collection is required for update operation.` err_out.status = 400 throw err_out } + const obj_id = data_id.split("/").pop() const filter = {_id: data_id} const result = await this.db .collection(collection) .replaceOne(filter, data) + if (result?.matchedCount === 0) { err_out.message = `id '${obj_id}' Not Found` err_out.status = 404 throw err_out } + if (result?.modifiedCount >= 0) { return data } else { @@ -316,24 +255,27 @@ class DatabaseController { /** * Make an existing object in the database be gone from the normal flow of things (mongo) - * @param data JSON from an HTTP DELETE request. It must contain an id. + * @param data JSON from an HTTP DELETE request. It must contain an id. * @return The delete result JSON or error JSON */ async remove(id, collection) { try { if (!collection) { - err_out.message = `Cannot figure which collection for object'${id}'` + err_out.message = `Collection is required for remove operation.` err_out.status = 400 throw err_out } + const obj_id = id.split("/").pop() const filter = {_id: obj_id} const result = await this.db.collection(collection).deleteOne(filter) + if (result?.deletedCount === 0) { err_out.message = `id '${obj_id}' Not Found` err_out.status = 404 throw err_out } + return result } catch (err) { // Specifically account for unexpected mongo things. @@ -345,12 +287,11 @@ class DatabaseController { } /** - * Get by ID. We need to decide about '@id', 'id', '_id', and http/s + * Get by ID. We need to decide about '@id', 'id', '_id', and http/s */ async getById(_id, collection) { return this.findOne({_id}, collection) } - } export default DatabaseController From 726a2dc53429f0b71c97b74b5bcd72bee0034705 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 4 Apr 2025 11:31:13 -0500 Subject: [PATCH 034/262] align with main --- database/driver.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/driver.mjs b/database/driver.mjs index 255459a9..6d615a9b 100644 --- a/database/driver.mjs +++ b/database/driver.mjs @@ -87,7 +87,7 @@ class dbDriver { * @return The inserted document JSON or error JSON */ async save(data, collection) { - console.warn("dbDriver.save() is problematic. https://github.com/CenterForDigitalHumanities/TPEN-services/issues/193") + data._createdAt = new Date() collection ??= resolveCollection(data) if (!collection) throw new Error("Cannot determine collection for save operation") return this.controller.save(data, collection) @@ -100,6 +100,7 @@ class dbDriver { * @return The updated document JSON or error JSON */ async update(data, collection) { + data._modifiedAt = new Date() collection ??= resolveCollection(data) if (!collection) throw new Error("Cannot determine collection for update operation") return this.controller.update(data, collection) From 6ca236e4772fd49d2f5fd073e1d5eb31d13c6e9d Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 4 Apr 2025 11:49:25 -0500 Subject: [PATCH 035/262] Update driver.mjs (#217) From ee38a054c602bcc8e0c5406abda891b258d26dec Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 4 Apr 2025 15:22:18 -0500 Subject: [PATCH 036/262] 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate --- .../Project/__tests__/exists_unit.test.mjs | 4 +-- .../__tests__/functionality_unit.test.mjs | 35 ++----------------- database/mongo/__tests__/unit.test.mjs | 14 ++++++-- 3 files changed, 16 insertions(+), 37 deletions(-) diff --git a/classes/Project/__tests__/exists_unit.test.mjs b/classes/Project/__tests__/exists_unit.test.mjs index 0e51c223..8a2fb2c3 100644 --- a/classes/Project/__tests__/exists_unit.test.mjs +++ b/classes/Project/__tests__/exists_unit.test.mjs @@ -14,8 +14,8 @@ describe("ProjectFactory Class #importTests", () => { expect(typeof ProjectFactory.DBObjectFromManifest).toBe("function") }) - it("should have a static processLayerFromCanvas method", () => { - expect(typeof ProjectFactory.processLayerFromCanvas).toBe("function") + it("should have a static buildPagesFromCanvases method", () => { + expect(typeof ProjectFactory.buildPagesFromCanvases).toBe("function") }) it("should have a static fromManifest method", () => { diff --git a/classes/Project/__tests__/functionality_unit.test.mjs b/classes/Project/__tests__/functionality_unit.test.mjs index a4b24ed8..664a7f0c 100644 --- a/classes/Project/__tests__/functionality_unit.test.mjs +++ b/classes/Project/__tests__/functionality_unit.test.mjs @@ -1,36 +1,7 @@ import {jest} from "@jest/globals" import ProjectFactory from "../ProjectFactory.mjs" -describe("ProjectFactory.loadManifest #importTests", () => { - beforeEach(() => { - global.fetch = jest.fn() - }) - - afterEach(() => { - jest.resetAllMocks() - }) - - it("should return a manifest object", async () => { - const mockManifest = { - "@id": "http://example.com/manifest/1", - label: "Example Manifest", - metadata: {}, - items: [] - } - - global.fetch.mockResolvedValue({ - json: jest.fn().mockResolvedValue(mockManifest) - }) - - const manifestURL = "https://examplemanifest.com/001" - const result = await ProjectFactory.loadManifest(manifestURL) - - expect(global.fetch).toHaveBeenCalledWith(manifestURL) - expect(result).toEqual(mockManifest) - }) -}) - -describe("ProjectFactory.DBObjectFromManifest/processLayerFromCanvas #importTests", () => { +describe("ProjectFactory.DBObjectFromManifest/buildPagesFromCanvases #importTests", () => { it("should process the manifest correctly with layers", async () => { const mockManifest = { "@id": "http://example.com/manifest/1", @@ -55,7 +26,7 @@ describe("ProjectFactory.DBObjectFromManifest/processLayerFromCanvas #importTest ] } - jest.spyOn(ProjectFactory, "processLayerFromCanvas").mockResolvedValue([ + jest.spyOn(ProjectFactory, "buildPagesFromCanvases").mockResolvedValue([ { "@id": "http://example.com/canvas/1", "@type": "Layer", @@ -101,7 +72,7 @@ describe("ProjectFactory.DBObjectFromManifest/processLayerFromCanvas #importTest const result = await ProjectFactory.DBObjectFromManifest(mockManifest) - expect(ProjectFactory.processLayerFromCanvas).toHaveBeenCalledWith( + expect(ProjectFactory.buildPagesFromCanvases).toHaveBeenCalledWith( mockManifest.items ) }) diff --git a/database/mongo/__tests__/unit.test.mjs b/database/mongo/__tests__/unit.test.mjs index ecef20e1..ffb12667 100644 --- a/database/mongo/__tests__/unit.test.mjs +++ b/database/mongo/__tests__/unit.test.mjs @@ -9,9 +9,17 @@ import DatabaseController from "../controller.mjs" const database = new DatabaseController() const TIME_OUT = process.env.DB_TEST_TIMEOUT ?? 6500 -let test_proj = { name: "Test Project"} -let test_group = {"@type": "Group", name: "Test Group"} -let test_user = {"@type": "User", name: "Test User"} +let test_proj = { + name: "Test Project", + group: "Test Group", + metadata: [], + layers: [], + label: "Test Label", + manifest: ["Test Manifest"], + creator: "Test Creator" +} +let test_group = {"@type": "Group", name: "Test Group", members: []} +let test_user = {"@type": "User", name: "Test User", _sub: "auth0|321"} beforeAll(async () => { return await database.connect() From a05f665e9559dc9bbe647fb52974a9500d7ca793 Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 4 Apr 2025 16:30:15 -0500 Subject: [PATCH 037/262] =?UTF-8?q?hulk=20smash=20=F0=9F=91=8A=F0=9F=8F=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/driver.mjs | 5 +-- database/mongo/__tests__/unit.test.mjs | 57 +++++++++++++++----------- database/mongo/controller.mjs | 2 +- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/database/driver.mjs b/database/driver.mjs index 6d615a9b..6096ae9f 100644 --- a/database/driver.mjs +++ b/database/driver.mjs @@ -157,11 +157,10 @@ class dbDriver { /** * Reserve a valid ID from the database for use in building a record * without collision. - * @param seed A seed to base the ID on, depending on the driver. * @return The reserved ID or error JSON */ - reserveId(seed) { - return this.controller.reserveId(seed) + reserveId() { + return this.controller.reserveId() } /** diff --git a/database/mongo/__tests__/unit.test.mjs b/database/mongo/__tests__/unit.test.mjs index ffb12667..10f8ada8 100644 --- a/database/mongo/__tests__/unit.test.mjs +++ b/database/mongo/__tests__/unit.test.mjs @@ -19,17 +19,33 @@ let test_proj = { creator: "Test Creator" } let test_group = {"@type": "Group", name: "Test Group", members: []} -let test_user = {"@type": "User", name: "Test User", _sub: "auth0|321"} +let test_user = {"@type": "User", name: "Test User", _sub: `auth${Date.now().toString().slice(-8)}`, agent: `agent${Date.now().toString().slice(-8)}`} + +// Initialize the IDs to null to avoid cleanup attempts of non-existent objects +test_proj._id = null +test_group._id = null +test_user._id = null beforeAll(async () => { return await database.connect() }, 10000) afterAll(async () => { - return await database.close() + // Only attempt to remove objects if they have valid IDs + const testObjects = [ + { obj: test_proj, collection: "project" }, + { obj: test_group, collection: "groups" }, + { obj: test_user, collection: "users" } + ] + const cleanupPromises = testObjects + .filter(({ obj }) => obj._id) + .map(({ obj, collection }) => database.remove(obj._id, collection)) + await Promise.all(cleanupPromises) + await database.close() + return }, 10000) -describe("Mongo Database Unit Functions. #mongo_unit #db", () => { +describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { it( "connects for an active connection", async () => { @@ -43,26 +59,28 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { "creates a new project", async () => { const result = await database.save(test_proj, "Project") - test_proj["_id"] = result["_id"] - expect(result["_id"]).toBeTruthy() + test_proj._id = result._id + expect(result._id).toBeTruthy() }, TIME_OUT ) + it( "creates a new group", async () => { const result = await database.save(test_group, "groups") - test_group["_id"] = result["_id"] - expect(result["_id"]).toBeTruthy() + test_group._id = result._id + expect(result._id).toBeTruthy() }, TIME_OUT ) + it( "creates a new User", async () => { const result = await database.save(test_user, "users") - test_user["_id"] = result["_id"] - expect(result["_id"]).toBeTruthy() + test_user._id = result._id + expect(result._id).toBeTruthy() }, TIME_OUT ) @@ -80,7 +98,7 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { "updates an existing group", async () => { test_group.name = "Test Group -- Updated" - await database.save(test_group, "groups") + await database.update(test_group, "groups") const result = await database.update(test_group, "groups") expect(result["_id"]).toBeTruthy() }, @@ -90,7 +108,7 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { "updates an existing User", async () => { test_user.name = "Test User -- Updated" - await database.save(test_user, "users") + await database.update(test_user, "users") const result = await database.update(test_user, "users") expect(result["_id"]).toBeTruthy() }, @@ -126,13 +144,12 @@ describe("Mongo Database Unit Functions. #mongo_unit #db", () => { it("Deletes an object with the provided id", async () => { expect(true).toBeTruthy() }) - it.skip("Validates a possible id string", () => { + it("Validates a possible id string", () => { expect(database.isValidId(123)).toBeTruthy() expect(database.isValidId(-123)).toBeTruthy() expect(database.isValidId("123")).toBeTruthy() expect(database.isValidId({})).toBeFalsy() expect(database.isValidId("123abc123abc123abc123abc")).toBeTruthy() - expect(database.isValidId("123abc123abc123abc123abcTooLong")).toBeFalsy() expect(database.asValidId(123)).toBe(123) expect(database.asValidId("123abc123abc123abc123abc")).toBe( @@ -201,16 +218,8 @@ describe.skip("Mongo Database Unit Functions. #mongo_unit #db", () => { describe("Mongo Database Utilities. #mongo_unit #db", () => { it("Assigns a new id for an Object", async () => { - const noSeedResult = database.reserveId() - const badSeedResult = database.reserveId("🕵️‍♀️🍤") - const goodSeedResult = database.reserveId(500) - const exactSeedResult = database.reserveId("662bceca0b2fbab1bb0c6d4f") - expect(typeof noSeedResult).toEqual("string") - expect(noSeedResult).toHaveLength(24) - expect(typeof badSeedResult).toEqual("string") - expect(badSeedResult).toHaveLength(24) - expect(typeof goodSeedResult).toEqual("string") - expect(goodSeedResult).toHaveLength(24) - expect(exactSeedResult).toEqual("662bceca0b2fbab1bb0c6d4f") + const newId = database.reserveId() + expect(typeof newId).toEqual("string") + expect(newId).toHaveLength(24) }) }) diff --git a/database/mongo/controller.mjs b/database/mongo/controller.mjs index 0665af03..5b863cd8 100644 --- a/database/mongo/controller.mjs +++ b/database/mongo/controller.mjs @@ -97,7 +97,7 @@ class DatabaseController { * */ reserveId(seed) { try { - return new ObjectId(seed).toHexString() + return ObjectId.generate(seed).toHexString() } catch (err) { return new ObjectId().toHexString() } From 3f69eaecb2a50e633f48f39b65fac3a3c5c6dc75 Mon Sep 17 00:00:00 2001 From: cubap Date: Mon, 7 Apr 2025 13:50:46 -0500 Subject: [PATCH 038/262] _sub is no longer missing on invitees --- classes/Project/Project.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index 1dbaecd6..8428c5f6 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -123,6 +123,7 @@ export default class Project { const inviteCode = this.#generateInviteCode(user._id) const agent = `https://store.rerum.io/v1/id/${user._id}` const profile = { displayName: email.split("@")[0] } + const _sub = `temp-${user._id}` // This is a temporary sub for the user until they verify their email user.data = { email, profile, agent, inviteCode } await user.save() await this.inviteExistingTPENUser(user._id, roles) @@ -189,4 +190,4 @@ export default class Project { await this.#load() return this.data } -} \ No newline at end of file +} From 546348241e0764c8bc232d04c0d7e14f2000ba79 Mon Sep 17 00:00:00 2001 From: cubap Date: Mon, 7 Apr 2025 14:06:44 -0500 Subject: [PATCH 039/262] add temp sub to new user --- classes/Project/Project.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index 8428c5f6..8b8ef05b 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -124,7 +124,7 @@ export default class Project { const agent = `https://store.rerum.io/v1/id/${user._id}` const profile = { displayName: email.split("@")[0] } const _sub = `temp-${user._id}` // This is a temporary sub for the user until they verify their email - user.data = { email, profile, agent, inviteCode } + user.data = { email, _sub, profile, agent, inviteCode } await user.save() await this.inviteExistingTPENUser(user._id, roles) From 4271df84f623e129a885b7908dff4168399a145b Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Mon, 7 Apr 2025 14:47:37 -0500 Subject: [PATCH 040/262] Update cd_dev.yaml --- .github/workflows/cd_dev.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index bd6de5c1..0e3a149f 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -27,6 +27,10 @@ jobs: envkey_TINYPEN: ${{ secrets.TINYPENDEV }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} envkey_DOMAIN: ${{ secrets.DOMAIN }} + envkey_TPEN_SUPPORT_EMAIL: ${{ secrets.TPEN_SUPPORT_EMAIL }} + envkey_SMTP_HOST: ${{ secrets.SMTP_HOST }} + envkey_SMTP_PORT: ${{ secrets.SMTP_PORT }} + envkey_TPEN_EMAIL_CC: ${{ secrets.TPEN_EMAIL_CC }} - name: Setup Node.js uses: actions/setup-node@master with: From 24c38aa3151f52a9d60bfe1f6505e7aff102fd91 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Mon, 7 Apr 2025 14:47:37 -0500 Subject: [PATCH 041/262] Update cd_dev.yaml From 923196ae2c1fbaf6948b112788e5fca75831656f Mon Sep 17 00:00:00 2001 From: cubap Date: Mon, 7 Apr 2025 15:34:48 -0500 Subject: [PATCH 042/262] stop if things are missing --- utilities/mailer/index.mjs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/utilities/mailer/index.mjs b/utilities/mailer/index.mjs index 505b1a3e..3efd8dc7 100644 --- a/utilities/mailer/index.mjs +++ b/utilities/mailer/index.mjs @@ -36,6 +36,23 @@ export const sendMail = async (email, subject, message) => { htmlTemplate = htmlTemplate.replace("{{subject}}", subject) htmlTemplate = htmlTemplate.replace("{{messageBody}}", message) + // Stop execution if any of the required environment variables are not set + const requiredEnvVars = [ + "SMTP_HOST", + "SMTP_PORT", + "TPEN_SUPPORT_EMAIL", + "TPEN_EMAIL_CC" + ] + + requiredEnvVars.forEach(varName => { + if (!process.env[varName]) { + return { + status: 500, + message: `${varName} environment variable is not set.` + } + } + }) + try { const transporter = nodemailer.createTransport({ host: process.env.SMTP_HOST, From 7d97630f710655287f36840534b8a3e61cab20bc Mon Sep 17 00:00:00 2001 From: cubap Date: Mon, 7 Apr 2025 16:27:25 -0500 Subject: [PATCH 043/262] adding verify on main --- utilities/mailer/index.mjs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utilities/mailer/index.mjs b/utilities/mailer/index.mjs index 3efd8dc7..074eaaaf 100644 --- a/utilities/mailer/index.mjs +++ b/utilities/mailer/index.mjs @@ -59,6 +59,14 @@ export const sendMail = async (email, subject, message) => { port: process.env.SMTP_PORT, }) + transporter.verify((error, success) => { + if (error) { + console.log("Error in SMTP configuration: ", error) + return {status: 500, message: error.toString()} + } + console.log("Server is ready to take our messages") + }) + const mailOptions = { from: process.env.TPEN_SUPPORT_EMAIL, to: email, From c2922a4bbdbaafb3cd5dc5769bc8984c4d658549 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Thu, 10 Apr 2025 10:03:00 -0500 Subject: [PATCH 044/262] Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger --- classes/Project/ProjectFactory.mjs | 58 ++++++++++-------------------- project/index.mjs | 12 +------ 2 files changed, 20 insertions(+), 50 deletions(-) diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.mjs index 093fb83b..5bc0fb04 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.mjs @@ -136,7 +136,7 @@ export default class ProjectFactory { } /** - * Exporting the IIIF manifest for a given project in its current state, ensuring the directory structure is created, + * Exporting the IIIF manifest for a given project in its current state, * manifest data is assembled, and the final JSON is saved to the filesystem. * * @param {string} projectId - Project ID for a specific project. @@ -146,7 +146,6 @@ export default class ProjectFactory { * - Context, ID, Type, Label, Metadata, Items and Annotations * - A dynamically fetched list of manifest items, including canvases and their annotations. * - All elements are embedded in the manifest object. - * - Saved output to the file system as 'manifest.json' within the project directory. */ static async exportManifest(projectId) { if (!projectId) { @@ -154,8 +153,6 @@ export default class ProjectFactory { } const project = await ProjectFactory.loadAsUser(projectId, null) - const dir = `./${projectId}` - this.createDirectory(dir) const manifest = { "@context": "http://iiif.io/api/presentation/3/context.json", @@ -163,23 +160,16 @@ export default class ProjectFactory { type: "Manifest", label: { none: [project.label] }, metadata: project.metadata, - items: await this.getManifestItems(project, dir), + items: await this.getManifestItems(project), } - this.saveToFile(dir, 'manifest.json', manifest) return manifest } - static createDirectory(dir) { - if (!fs.existsSync(dir)) { - fs.mkdirSync(dir, { recursive: true }) - } - } - - static async getManifestItems(project, dir) { + static async getManifestItems(project) { return Promise.all( project.layers.map(async (layer) => { try { - const canvasUrl = layer.pages[0].canvas + const canvasUrl = layer.pages[0].target const canvasData = await this.fetchJson(canvasUrl) if (!canvasData) return null @@ -190,7 +180,7 @@ export default class ProjectFactory { width: canvasData.width, height: canvasData.height, items: canvasData.items, - annotations: await this.getAnnotations(canvasData, project._id, dir), + annotations: await this.getAnnotations(canvasData), } return canvasItems } catch (error) { @@ -201,9 +191,9 @@ export default class ProjectFactory { ) } - static async getAnnotations(canvasData, projectId, dir) { + static async getAnnotations(canvasData) { return Promise.all( - canvasData.annotations.map(async (annotation, index) => { + canvasData.annotations.map(async (annotation) => { try { const annotationData = await this.fetchJson(annotation.id) if (!annotationData) return null @@ -212,7 +202,7 @@ export default class ProjectFactory { id: annotationData.id ?? annotationData["@id"], type: annotationData.type, label: annotationData.label, - items: await this.getLines(annotationData, dir), + items: await this.getLines(annotationData), partOf: annotationData.partOf, creator: annotationData.creator, target: annotationData.target, @@ -226,7 +216,7 @@ export default class ProjectFactory { ) } - static async getLines(annotationData, dir) { + static async getLines(annotationData) { return Promise.all( annotationData.items.map(async (item) => { try { @@ -261,29 +251,18 @@ export default class ProjectFactory { } } - static getFileName(url) { - const fileName = path.parse(url.substring(url.lastIndexOf("/") + 1)).name - return fileName - } - - static saveToFile(dir, url, data) { - const fileName = this.getFileName(url) - fs.writeFileSync(path.join(dir, `${fileName}.json`), JSON.stringify(data, null, 2)) - } - /** * Uploads or updates the `manifest.json` file for a given project to a GitHub repository. * - * @param {string} filePath - The local path to the `manifest.json` file to be uploaded. + * @param {string} manifest - JSON Object representing the IIIF manifest. * @param {string} projectId - Project ID for a specific project. * * The method performs the following steps: - * - Reads and encodes the file content in Base64. + * - Creates a GitHub API URL for the `manifest.json` file in the GitHub repository. * - Checks if the `manifest.json` already exists in the GitHub repository to determine if it's a create or update action. * - Uploads the file using the GitHub API, including the correct commit message and SHA for updates. */ - static async uploadFileToGitHub(filePath, projectId) { - const content = fs.readFileSync(filePath, { encoding: "base64" }) + static async uploadFileToGitHub(manifest, projectId) { const manifestUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/contents/${projectId}/manifest.json` const token = process.env.GITHUB_TOKEN @@ -310,12 +289,13 @@ export default class ProjectFactory { 'Content-Type': 'application/json', }, body: JSON.stringify({ - message: sha ? `Updated ${projectId}/manifest.json` : `Created ${projectId}/manifest.json`, - content: content, - branch: process.env.BRANCH, - ...(sha && { sha }), - }), - }) + message: sha ? `Updated ${projectId}/manifest.json` : `Created ${projectId}/manifest.json`, + content: Buffer.from(JSON.stringify(manifest)).toString('base64'), + branch: process.env.BRANCH, + ...(sha && { sha }), + }) + }) + } catch (error) { console.error(`Failed to upload ${projectId}/manifest.json:`, error) } diff --git a/project/index.mjs b/project/index.mjs index dbae7252..7b092c36 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -12,8 +12,6 @@ import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.mjs" import Group from "../classes/Group/Group.mjs" import scrubDefaultRoles from "../utilities/isDefaultRole.mjs" import Hotkeys from "../classes/HotKeys/Hotkeys.js" -import path from "path" -import fs from "fs" let router = express.Router() router.use(cors(common_cors)) @@ -121,15 +119,7 @@ router return respondWithError(res, 403, "You do not have permission to export this project") } const manifest = await ProjectFactory.exportManifest(id) - const folderPath = path.join(`./${id}`) - const files = fs.readdirSync(folderPath) - for (const file of files) { - const filePath = path.join(folderPath, file) - if (fs.lstatSync(filePath).isFile()) { - await ProjectFactory.uploadFileToGitHub(filePath, `${id}`) - } - } - fs.rmSync(folderPath, {recursive: true, force: true}) + await ProjectFactory.uploadFileToGitHub(manifest, `${id}`) res.status(200).json(manifest) } catch (error) { return respondWithError( From 94af0543c0756c7eb9f2d68d0e9e570628c65aba Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 10 Apr 2025 15:08:02 -0500 Subject: [PATCH 045/262] 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? --- app.mjs | 8 +++++- feedback/feedbackController.js | 51 ++++++++++++++++++++++++++++++++++ feedback/feedbackRoutes.js | 10 +++++++ feedback/githubService.js | 23 +++++++++++++++ feedback/index.js | 40 ++++++++++++++++++++++++++ utilities/mailer/index.mjs | 25 +++++++++++++++++ 6 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 feedback/feedbackController.js create mode 100644 feedback/feedbackRoutes.js create mode 100644 feedback/githubService.js create mode 100644 feedback/index.js diff --git a/app.mjs b/app.mjs index c55e1622..8020e0a3 100644 --- a/app.mjs +++ b/app.mjs @@ -27,7 +27,10 @@ import lineRouter from './line/index.mjs' import userProfileRouter from './userProfile/index.mjs' import privateProfileRouter from './userProfile/privateProfile.mjs' import proxyRouter from './utilities/proxy.js' - + +// Beta Feedback routes +import feedbackRouter from './feedback/feedbackRoutes.js' + let app = express() //Middleware to use @@ -65,6 +68,9 @@ app.use('/user', userProfileRouter) app.use('/my', privateProfileRouter) app.use('/proxy', proxyRouter) +// Beta Feedback routes +app.use('/beta', feedbackRouter) + //catch 404 because of an invalid site path app.use('*', function(req, res, next) { let message = res.statusMessage ?? "This page does not exist" diff --git a/feedback/feedbackController.js b/feedback/feedbackController.js new file mode 100644 index 00000000..cfed7ea2 --- /dev/null +++ b/feedback/feedbackController.js @@ -0,0 +1,51 @@ +import { createGitHubIssue } from './githubService.js' +import { respondWithError } from "../utilities/shared.mjs" + +/** + * + * @param {user, body: page, feedback } req auth offers user and API is used with body: page:URL, feedback:String + * @param {Response} res Express response object + * @description This function handles the submission of feedback from the user. It creates a GitHub issue with the feedback details. + * @returns 200 if feedback is submitted successfully, 204 if no feedback is provided, or an error response if the submission fails. + */ +export async function submitFeedback(req, res) { + const user = req.user ? `${req.user.profile.displayName} (${req.user._id})` : 'Anonymous' + const { page, feedback } = req.body + + if (!feedback) { + return res.status(204).send() + } + try { + await createGitHubIssue('Feedback', `Feedback from ${user}`, `Page: ${page}\n\nFeedback: ${sanitizeUserInput(feedback)}`) + res.status(200).json({ message: 'Feedback submitted successfully' }) + } catch (error) { + respondWithError(res, error.status ?? 500, error.message ?? 'Failed to submit feedback') + } +} + +/** + * + * @param {user, body: page, bugDescription } req auth offers user and API is used with body: page:URL, bugDescription:String + * @param {Response} res Express response object + * @description This function handles the submission of bug reports from the user. It creates a GitHub issue with the bug details. + * @returns 200 if the bug report is submitted successfully, 204 if no bug description is provided, or an error response if the submission fails. + */ +export async function submitBug(req, res) { + const user = req.user ? `${req.user.profile.displayName} (${req.user._id})` : 'Anonymous' + const { page, bugDescription } = req.body + + if (!bugDescription) { + return res.status(204).send() + } + + try { + await createGitHubIssue('Bug Report', `Bug reported by ${user}`, `Page: ${page}\n\nBug: ${sanitizeUserInput(bugDescription)}`) + res.status(200).json({ message: 'Bug report submitted successfully' }) + } catch (error) { + respondWithError(res, error.status ?? 500, error.message ??'Failed to submit bug report') + } +} + +function sanitizeUserInput(input) { + return input.replace(/[^\w\s.,!?'"()-]/g, '') +} diff --git a/feedback/feedbackRoutes.js b/feedback/feedbackRoutes.js new file mode 100644 index 00000000..bdd2e9f3 --- /dev/null +++ b/feedback/feedbackRoutes.js @@ -0,0 +1,10 @@ +import express from 'express' +import auth0Middleware from "../auth/index.mjs" +import { submitFeedback, submitBug } from './feedbackController.js' + +const feedbackRouter = express.Router() + +feedbackRouter.route('/feedback').post(auth0Middleware(), submitFeedback) +feedbackRouter.route('/bug').post(auth0Middleware(), submitBug) + +export default feedbackRouter diff --git a/feedback/githubService.js b/feedback/githubService.js new file mode 100644 index 00000000..c5d73e45 --- /dev/null +++ b/feedback/githubService.js @@ -0,0 +1,23 @@ +export async function createGitHubIssue(label, title, body) { + const url = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/issues` + const headers = { + Authorization: `token ${process.env.GITHUB_TOKEN}`, + Accept: 'application/vnd.github.v3+json', + 'Content-Type': 'application/json' + } + + const response = await fetch(url, { + method: 'POST', + headers, + body: JSON.stringify({ + title, + body, + labels: [label] + }) + }) + + if (!response.ok) { + const error = await response.json() + throw new Error(`GitHub API error: ${error.message}`) + } +} diff --git a/feedback/index.js b/feedback/index.js new file mode 100644 index 00000000..968b31b5 --- /dev/null +++ b/feedback/index.js @@ -0,0 +1,40 @@ +import express from 'express' +import bodyParser from 'body-parser' +import { createGitHubIssue } from './githubService.js' + +const feedbackRouter = express.Router() +feedbackRouter.use(bodyParser.json()) + +// Endpoint for feedback form submissions +feedbackRouter.post('/submit-feedback', async (req, res) => { + const { user, page, feedback } = req.body + + if (!feedback) { + return res.status(400).json({ error: 'Feedback is required' }) + } + + try { + await createGitHubIssue('Feedback', `Feedback from ${user}`, `Page: ${page}\n\nFeedback: ${feedback}`) + res.status(200).json({ message: 'Feedback submitted successfully' }) + } catch (error) { + res.status(500).json({ error: 'Failed to submit feedback' }) + } +}) + +// Endpoint for bug report submissions +feedbackRouter.post('/submit-bug', async (req, res) => { + const { user, page, bugDescription } = req.body + + if (!bugDescription) { + return res.status(400).json({ error: 'Bug description is required' }) + } + + try { + await createGitHubIssue('Bug Report', `Bug reported by ${user}`, `Page: ${page}\n\nBug: ${bugDescription}`) + res.status(200).json({ message: 'Bug report submitted successfully' }) + } catch (error) { + res.status(500).json({ error: 'Failed to submit bug report' }) + } +}) + +export default feedbackRouter diff --git a/utilities/mailer/index.mjs b/utilities/mailer/index.mjs index 505b1a3e..074eaaaf 100644 --- a/utilities/mailer/index.mjs +++ b/utilities/mailer/index.mjs @@ -36,12 +36,37 @@ export const sendMail = async (email, subject, message) => { htmlTemplate = htmlTemplate.replace("{{subject}}", subject) htmlTemplate = htmlTemplate.replace("{{messageBody}}", message) + // Stop execution if any of the required environment variables are not set + const requiredEnvVars = [ + "SMTP_HOST", + "SMTP_PORT", + "TPEN_SUPPORT_EMAIL", + "TPEN_EMAIL_CC" + ] + + requiredEnvVars.forEach(varName => { + if (!process.env[varName]) { + return { + status: 500, + message: `${varName} environment variable is not set.` + } + } + }) + try { const transporter = nodemailer.createTransport({ host: process.env.SMTP_HOST, port: process.env.SMTP_PORT, }) + transporter.verify((error, success) => { + if (error) { + console.log("Error in SMTP configuration: ", error) + return {status: 500, message: error.toString()} + } + console.log("Server is ready to take our messages") + }) + const mailOptions = { from: process.env.TPEN_SUPPORT_EMAIL, to: email, From c5822ee24e8ea42fbd61704bf2251051cb2bdfc3 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 10 Apr 2025 15:26:25 -0500 Subject: [PATCH 046/262] cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml --- .github/workflows/cd_prod.yaml | 4 ++++ .github/workflows/ci_dev.yaml | 6 +++++- .github/workflows/ci_prod.yaml | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 8a1a6f65..846e2249 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -27,6 +27,10 @@ jobs: envkey_TINYPEN: ${{ secrets.TINYPEN }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} envkey_DOMAIN: ${{ secrets.DOMAIN }} + envkey_TPEN_SUPPORT_EMAIL: ${{ secrets.TPEN_SUPPORT_EMAIL }} + envkey_SMTP_HOST: ${{ secrets.SMTP_HOST }} + envkey_SMTP_PORT: ${{ secrets.SMTP_PORT }} + envkey_TPEN_EMAIL_CC: ${{ secrets.TPEN_EMAIL_CC }} - name: Setup Node.js uses: actions/setup-node@master with: diff --git a/.github/workflows/ci_dev.yaml b/.github/workflows/ci_dev.yaml index b77f9a9d..c8c45aaf 100644 --- a/.github/workflows/ci_dev.yaml +++ b/.github/workflows/ci_dev.yaml @@ -27,6 +27,10 @@ jobs: envkey_TINYPEN: ${{ secrets.TINYPENDEV }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} envkey_DOMAIN: ${{ secrets.DOMAIN }} + envkey_TPEN_SUPPORT_EMAIL: ${{ secrets.TPEN_SUPPORT_EMAIL }} + envkey_SMTP_HOST: ${{ secrets.SMTP_HOST }} + envkey_SMTP_PORT: ${{ secrets.SMTP_PORT }} + envkey_TPEN_EMAIL_CC: ${{ secrets.TPEN_EMAIL_CC }} - name: Setup Node.js uses: actions/setup-node@master with: @@ -47,4 +51,4 @@ jobs: run: | npm install npm run E2Etests - \ No newline at end of file + diff --git a/.github/workflows/ci_prod.yaml b/.github/workflows/ci_prod.yaml index fa208401..f78714aa 100644 --- a/.github/workflows/ci_prod.yaml +++ b/.github/workflows/ci_prod.yaml @@ -27,6 +27,10 @@ jobs: envkey_TINYPEN: ${{ secrets.TINYPEN }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} envkey_DOMAIN: ${{ secrets.DOMAIN }} + envkey_TPEN_SUPPORT_EMAIL: ${{ secrets.TPEN_SUPPORT_EMAIL }} + envkey_SMTP_HOST: ${{ secrets.SMTP_HOST }} + envkey_SMTP_PORT: ${{ secrets.SMTP_PORT }} + envkey_TPEN_EMAIL_CC: ${{ secrets.TPEN_EMAIL_CC }} - name: Setup Node.js uses: actions/setup-node@master with: @@ -47,4 +51,4 @@ jobs: run: | npm install npm run E2Etests - \ No newline at end of file + From 73112d38d03f3d3a59d952a10c51feac27c207bf Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Mon, 14 Apr 2025 16:30:04 -0500 Subject: [PATCH 047/262] 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS --- feedback/feedbackRoutes.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/feedback/feedbackRoutes.js b/feedback/feedbackRoutes.js index bdd2e9f3..e68d94e7 100644 --- a/feedback/feedbackRoutes.js +++ b/feedback/feedbackRoutes.js @@ -1,9 +1,13 @@ import express from 'express' import auth0Middleware from "../auth/index.mjs" +import cors from 'cors' import { submitFeedback, submitBug } from './feedbackController.js' +import common_cors from '../utilities/common_cors.json' with {type: 'json'} const feedbackRouter = express.Router() - +feedbackRouter.use( + cors(common_cors) +) feedbackRouter.route('/feedback').post(auth0Middleware(), submitFeedback) feedbackRouter.route('/bug').post(auth0Middleware(), submitBug) From 5ce579a9544de7376fe336d49da1f7e0c5dd1adf Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 16 Apr 2025 10:02:45 -0500 Subject: [PATCH 048/262] API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs --- classes/User/User.mjs | 11 +++++++++++ userProfile/privateProfile.mjs | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/classes/User/User.mjs b/classes/User/User.mjs index 824d5e7f..d952fc26 100644 --- a/classes/User/User.mjs +++ b/classes/User/User.mjs @@ -18,6 +18,12 @@ export default class User { return this } + async updateProfile(data) { + this.data = await this.getSelf() + this.data.profile = data + return await this.update() + } + async getSelf() { return await (this.data ?? this.#loadFromDB().then(u => u.data)) } @@ -106,6 +112,11 @@ export default class User { } * @returns project object */ + + async update(){ + return database.update(this.data, "users") + } + async getProjects() { return database.controller .db.collection('projects').aggregate([ diff --git a/userProfile/privateProfile.mjs b/userProfile/privateProfile.mjs index 76eec73d..0503fbc9 100644 --- a/userProfile/privateProfile.mjs +++ b/userProfile/privateProfile.mjs @@ -18,7 +18,17 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { } catch(error) { respondWithError(res, error.status || error.code || 500, error.message?? "An error occurred while fetching the user data.") } -}).all((req, res)=> respondWithError(res, 405, "Improper request method. Use GET instead")) +}).put(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthorized user") + try { + const userObj = new User(user._id) + const userProfile = await userObj.updateProfile(req.body) + res.status(200).json(userProfile) + } catch (error) { + respondWithError(res, error.status || error.code || 500, error.message?? "An error occurred while fetching the user data.") + } +}).all((req, res)=> respondWithError(res, 405, "Improper request method. Use PUT instead")) router.route("/projects").get(auth0Middleware(), async (req, res) => { const user = await req.user From b87b7315fd05f4f5a64a1ec9c8c043524a8b635d Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 23 Apr 2025 15:10:57 -0500 Subject: [PATCH 049/262] Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba --- app.mjs | 2 - classes/Layer/Layer.mjs | 195 +- classes/Layer/__tests__/exists.test.mjs | 30 +- classes/Page/Page.mjs | 235 +- classes/Page/__tests__/exists.test.mjs | 46 +- classes/Project/Project.mjs | 17 +- classes/Project/ProjectFactory.mjs | 31 +- layer/index.mjs | 61 + package-lock.json | 9438 +++++++++++++++++++++-- page/index.mjs | 60 +- project/index.mjs | 47 +- 11 files changed, 9149 insertions(+), 1013 deletions(-) create mode 100644 layer/index.mjs diff --git a/app.mjs b/app.mjs index 8020e0a3..fba83345 100644 --- a/app.mjs +++ b/app.mjs @@ -22,7 +22,6 @@ import cors from 'cors' import indexRouter from './index.mjs' import manifestRouter from './manifest/index.mjs' import projectRouter from './project/index.mjs' -import pageRouter from './page/index.mjs' import lineRouter from './line/index.mjs' import userProfileRouter from './userProfile/index.mjs' import privateProfileRouter from './userProfile/privateProfile.mjs' @@ -63,7 +62,6 @@ app.use('/', indexRouter) app.use('/manifest', manifestRouter) app.use('/project', projectRouter) app.use('/line', lineRouter) -app.use('/page', pageRouter) app.use('/user', userProfileRouter) app.use('/my', privateProfileRouter) app.use('/proxy', proxyRouter) diff --git a/classes/Layer/Layer.mjs b/classes/Layer/Layer.mjs index 162003d3..eec07b86 100644 --- a/classes/Layer/Layer.mjs +++ b/classes/Layer/Layer.mjs @@ -1,84 +1,151 @@ import dbDriver from "../../database/driver.mjs" const database = new dbDriver("mongo") +const databaseTiny = new dbDriver("tiny") + +import Page from "../Page/Page.mjs" export default class Layer { - constructor(data) { - this.data = data - this.projectId = null + #tinyAction = 'create' +/** + * Constructs a Layer from the JSON Object in the Project `layers` Array. This + * never creates a new Layer, but rather wraps existing data in a Layer object. + * Use the `build` method to create a new Layer. + * @param {hexString} projectId For the project this layer belongs to + * @param {string} id The ID of the layer. This is the Layer stored in the Project. + * @param {string} label The label of the layer. This is the Layer stored in the Project. + * @param {Array} pages The pages in the layer by reference. + * @seeAlso {@link Layer.build} + */ + constructor(projectId, {id, label, pages}) { + if (!projectId) { + throw new Error("Project ID is required to create a Layer instance.") + } + if (!id || !label || !pages) { + throw new Error("Layer data is malformed.") + } + this.projectId = projectId + this.id = id + this.label = label + this.pages = pages.map(this.#getPageReference) + if(this.id.startsWith(process.env.RERUMIDPREFIX)) { + this.#tinyAction = 'update' + } + return this } - get id() { - return this.data.id - } + static build(projectId = database.reserveId(), label, canvases, projectLabel = "Default") { + if (!projectId) { + throw new Error("Project ID is required to create a Layer instance.") + } + this.projectId = projectId + this.label = label ?? `${projectLabel} - Layer ${Date.now()}` + + if (!Array.isArray(canvases)) { + if (!canvases) { + throw new Error("At least one Canvas must be included.") + } + canvases = [canvases] + } - set id(id) { - this.data.id = id + this.id = `${process.env.SERVERURL}layer/${databaseTiny.reserveId()}` + const pages = canvases.map(c => Page.build(id, c)) + + pages.forEach((page, index) => { + if (index > 0) page.prev = pages[index - 1].id + if (index < pages.length - 1) page.next = pages[index + 1].id + }) + return this } - async addLayer(projectId, labelAndCanvases, projectLabel) { - this.projectId = projectId - const label = labelAndCanvases?.label ?? `${projectLabel ?? "Default"} - Layer ${Date.now()}` - const canvases = labelAndCanvases.canvases + #setRerumId() { + if (this.#tinyAction === 'create') { + this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}` + } + return this + } - try { - const newLayer = { - "id": `${process.env.RERUMIDPREFIX}${database.reserveId()}`, - label, - pages: canvases.map(element => ({ - id: `temp${database.reserveId()}`, - label: `Default - ${element.split("/").pop().split(".")[0]}`, - target: element - })) - } - - this.data.layers.push(newLayer) - await this.update() - return newLayer - } catch (error) { - console.error('Error fetching data:', error) + async delete() { + if(this.#tinyAction === 'update') { + // delete the associated pages in RERUM + await Promise.all(this.pages.map(page => { + const p = new Page(this.id, page) + return p.delete() + })) + await databaseTiny.remove(this.id) + .catch(err => false) } + return true } - - async deleteLayer(projectId, layerId) { - this.projectId = projectId - this.data.layers = this.data.layers.filter(layer => (layer.id ?? layer["@id"]) !== `${process.env.RERUMIDPREFIX}${layerId}`) - await this.update() - return this.data.layers + + /** + * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. + * @returns {Promise} Resolves to the updated Layer object as stored in Project. + */ + async update() { + if (this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { + await this.#setRerumId().#saveCollectionToRerum() + } + return this.#updateCollectionForProject() } - async updatePages(layerId, pages) { - this.data.layers = this.data.layers.map(layer => { - if((layer.id ?? layer["@id"]) === `${process.env.RERUMIDPREFIX}${layerId}`) - { - layer.pages = pages - .map((page) => { - const itemIndex = layer.pages.findIndex((item) => page === (item.id ?? item["@id"])) - if (itemIndex !== -1) { - return layer.pages[itemIndex] - } - }) - .filter(Boolean) - } - return layer - }) - await this.update() - return this.data.layers + #updateCollectionForProject() { + // Layer in local MongoDB is in the Project.layers Array and looks like: + // { + // label: "Layer 1", + // id: "https://api.t-pen.org/layer/layerID", + // pages: [ { id: "https://api.t-pen.org/layer/layerID/page/pageID", label: "Page 1" } ] + // } + return { + label: this.label, + id: this.id, + pages: this.pages.map(this.#getPageReference) + } } - async updateLayerMetadata(layerId, label) { - this.data.layers = this.data.layers.map(layer => { - if((layer.id ?? layer["@id"]) === `${process.env.RERUMIDPREFIX}${layerId}`) - { - layer.label = label.label - } - return layer - }) - await this.update() - return this.data.layers + #getPageReference({ id, label, target }) { + return { id, label, target } } - async update() { - return await database.update(this.data, process.env.TPENPROJECTS) + async #saveCollectionToRerum() { + // Layer in Rerum is an AnnotationCollection and looks like: + // { + // "@context": "http://www.w3.org/ns/anno.jsonld", + // id: "https://store.t-pen.org/v1/id/layerID", + // type: "AnnotationCollection", + // label: { "none": ["Layer 1"] }, + // items: [ "https://store.t-pen.org/v1/id/pageID" ], + // total: 1, + // first: "https://store.t-pen.org/v1/id/pageID", + // last: "https://store.t-pen.org/v1/id/pageID" + // } + + const layerAsCollection = { + "@context": "http://www.w3.org/ns/anno.jsonld", + id: this.id, + type: "AnnotationCollection", + label: { "none": [this.label] }, + total: this.pages.length, + first: this.pages.at(0).id, + last: this.pages.at(-1).id + } + + if (this.#tinyAction === 'create') { + await databaseTiny.save(layerAsCollection) + .catch(err => { + console.error(err,layerAsCollection) + throw new Error(`Failed to save Layer to RERUM: ${err.message}`) + }) + this.#tinyAction = 'update' + return this + } + // ...else Update the existing collection in RERUM + const existingLayer = await fetch(this.id).then(res => res.json()) + if (!existingLayer) { + throw new Error(`Layer not found in RERUM: ${this.id}`) + } + updatedLayer = { ...existingLayer, ...layerAsCollection } + await databaseTiny.overwrite(updatedLayer) + return this } -} \ No newline at end of file +} diff --git a/classes/Layer/__tests__/exists.test.mjs b/classes/Layer/__tests__/exists.test.mjs index 4a37c255..d93dfb21 100644 --- a/classes/Layer/__tests__/exists.test.mjs +++ b/classes/Layer/__tests__/exists.test.mjs @@ -2,16 +2,28 @@ import Layer from "../Layer.mjs" describe('Layer Class looks how we expect it to. #Layer_exists_unit', () => { it('Imports Layer', () => { - expect(Layer.constructor).toBeInstanceOf(Function) + expect(typeof Layer).toBe('function') }) - const layer = new Layer() - + const layer = new Layer("projectID", { id: "layerID", label: "Layer Label", pages: [{ id: "pageID", label: "Page Label", target: "https://example.com/canvas" }] }) + it('has useful methods', () => { - expect(layer.addLayer).toBeInstanceOf(Function) - expect(layer.deleteLayer).toBeInstanceOf(Function) - expect(layer.update).toBeInstanceOf(Function) - expect(layer.updatePages).toBeInstanceOf(Function) - expect(layer.updateLayerMetadata).toBeInstanceOf(Function) + expect(typeof layer.update).toBe('function') + expect(typeof layer.delete).toBe('function') + }) + + it('has expected properties', () => { + expect(layer).toHaveProperty('id') + expect(layer).toHaveProperty('label') + expect(layer).toHaveProperty('pages') + }) + + it('throws an error for poorly formed new Layer calls', () => { + expect(() => new Layer()).toThrow() // No arguments + expect(() => new Layer("projectID")).toThrow() // Missing required arguments + expect(() => new Layer("projectID", null)).toThrow() // Null layer object + expect(() => new Layer("projectID", { id: null, label: "Layer Label", pages: [] })).toThrow() // Invalid layer ID + expect(() => new Layer("projectID", { id: "layerID", label: null, pages: [] })).toThrow() // Invalid layer label + expect(() => new Layer("projectID", { id: "layerID", label: "Layer Label", pages: null })).toThrow() // Invalid pages array }) -}) \ No newline at end of file +}) diff --git a/classes/Page/Page.mjs b/classes/Page/Page.mjs index 06c3fd8d..c806cc46 100644 --- a/classes/Page/Page.mjs +++ b/classes/Page/Page.mjs @@ -1,136 +1,125 @@ -export class Page { - constructor(page = {}) { - this.page = page - if(!this.page.id) { - this.page.id = Date.now().toString(); // ticket to replace with MongoDB ObjectID() - } - } - - get id() { - return this.page.id - } - - set id(id) { - this.page.id = id - } - - // Method to represent the page as a canvas with annotation page layer - asCanvas() { - return { - type: 'Canvas', - '@context': 'http://iiif.io/api/presentation/3/context.json', - id:this.page.id ?? 0, - height: this.page.height ?? 0, - width: this.page.width ?? 0, - //label: this.page.label ?? '', - //summary: this.page.summary ?? '', - //thumbnail: this.page.thumbnail ?? '', - //navDate:this.page.navDate ?? '', - //placeHolderCanvas:this.page.placeHolderCanvas ?? '', - //accompanyingCanvas:this.accompanyingCanvas ?? '', - //duration:this.duration ?? '', - //start:this.start ?? '', - //rendering:this.rendering ?? '', - //items:this.items ?? [], - } - } - - // Method to create a new page - create() { - return Promise.resolve(new Page()) - } - - // Method to remove a page - remove() { - return Promise.resolve() - } - - // Method to save changes to a page - save() { - return Promise.resolve() - } - - // Method to fetch a page - fetch() { - return Promise.resolve(new Page()) - } - - // Method to add membership reference to manifest - addMembershipToManifest(manifest) { - // Assuming manifest is a reference to the Manifest container object - // Add the current page to the manifest's membership reference - manifest.addPageMembership(this.page) - - // Return a promise indicating that the operation is complete - return Promise.resolve() - } - - - // Method to get the previous page - getPreviousPage() { - return Promise.resolve(new Page()) - } - - // Method to get the next page - getNextPage() { - return Promise.resolve(new Page()) - } - +import dbDriver from "../../database/driver.mjs" - // Method to handle text blob - handleTextBlob(lines) { - // Assuming lines is an array of Line objects - // If you want to return a continuous concatenated string - const continuousText = lines.map(line => line.body).join('') - // If you want to return an array of Line.body strings - const lineBodies = lines.map(line => line.body) - // Depending on your desired behavior, you can choose which one to return - return Promise.resolve(continuousText) - // Or return Promise.resolve(lineBodies) - } +const databaseTiny = new dbDriver("tiny") - // Method to handle image annotation - // Method to handle image annotation - handleImageAnnotation(url) { - // Assuming url is the URL of the image being annotated - // Here you would process the annotation and determine how to handle it - // For now, let's just return the URL as it is - return Promise.resolve(url) - } +export default class Page { - // Method to get sibling pages - getSiblingPages() { - return Promise.resolve('sibling pages retrieved') + #tinyAction = 'create' + #setRerumId() { + if (this.#tinyAction === 'create') { + this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}` + } + return this + } + + /** + * Constructs a Page from the JSON Object in the Project `layers` Array reference. This + * never creates a new Page, but rather wraps existing data in a Page object. + * Use the `build` method to create a new Page. + * @param {hexString} projectId For the project this layer belongs to + * @param {String} id The ID of the layer. This is the Layer stored in the Project. + * @param {String} label The label of the layer. This is the Layer stored in the Project. + * @param {String} target The uri of the targeted Canvas. + * @seeAlso {@link Page.build} + */ + constructor(layerId, { id, label, target }) { + if (!id || !label || !target) { + throw new Error("Page data is malformed.") + } + Object.assign(this, { id, label, target, partOf: layerId }) + if(this.id.startsWith(process.env.RERUMIDPREFIX)) { + this.#tinyAction = 'update' + } + return this } + static build(layerId, canvas, prev, next, lines = []) { + if (!layerId) { + throw new Error("Layer ID is required to create a Page instance.") + } + if (!canvas || !canvas.id) { + throw new Error("Canvas with id is required to create a Page instance.") + } - // Method to get project - getProject() { - return Promise.resolve('Project retrieved') - } - - // Method to get parent/sibling/children/project information - getPageInfo(type) { - switch(type) { - case 'siblings': - return Promise.resolve('Sibling pages information retrieved') - case 'project': - return Promise.resolve('Project information retrieved') - default: - throw new Error('Invalid type specified. Valid types are: parent, siblings, children, project') + const id = lines.length + ? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}` + : `${process.env.SERVERURL}layer/${layerId.split("/").pop()}/page/${databaseTiny.reserveId()}` + this.data = { + "@context": "http://www.w3.org/ns/anno.jsonld", + id, + type: "AnnotationPage", + label: canvas.label, + target: canvas.id, + partOf: layerId, + items: lines, + prev, + next } + return this + } + + async #savePageToRerum() { + const pageAsAnnotationPage = { + "@context": "http://www.w3.org/ns/anno.jsonld", + id: this.id, + type: "AnnotationPage", + label: { "none": [this.label] }, + target: this.target, + partOf: this.partOf, + items: this.data.items ?? [], + prev: this.prev ?? null, + next: this.next ?? null + } + if (this.#tinyAction === 'create') { + await databaseTiny.save(pageAsAnnotationPage) + .catch(err => { + console.error(err,pageAsAnnotationPage) + throw new Error(`Failed to save Page to RERUM: ${err.message}`) + }) + this.#tinyAction = 'update' + return this + } + // ...else Update the existing page in RERUM + const existingPage = await fetch(this.id).then(res => res.json()) + if (!existingPage) { + throw new Error(`Failed to find Page in RERUM: ${this.id}`) + } + const updatedPage = { ...existingPage, ...pageAsAnnotationPage } + await databaseTiny.overwrite(updatedPage) + return this + } + + /** + * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. + * @returns {Promise} Resolves to the updated Layer object as stored in Project. + */ + async update() { + if (this.#tinyAction === 'update' || this.items.length) { + await this.#setRerumId().#savePageToRerum() + } + return this.#updatePageForProject() } - - - // Method to retrieve metadata only - getMetadata() { - return Promise.resolve('Metadata of the page') + async #updatePageForProject() { + // Page in local MongoDB is in the Project.layers.pages Array and looks like: + // { + // id: "https://api.t-pen.org/layer/layerID/page/pageID", + // label: "Page 1", + // target: "https://canvas.uri" + // } + return { + id: this.id, + label: this.label, + target: this.target + } } - // Method to retrieve as HTML document - asHTML() { - return Promise.resolve('This is the HTML document content.') + async delete() { + if(this.#tinyAction === 'update') { + // associated Annotations in RERUM will be left intact + await databaseTiny.remove(this.id) + .catch(err => false) + } + return true } - } diff --git a/classes/Page/__tests__/exists.test.mjs b/classes/Page/__tests__/exists.test.mjs index 66f3b0f1..91df614e 100644 --- a/classes/Page/__tests__/exists.test.mjs +++ b/classes/Page/__tests__/exists.test.mjs @@ -1,37 +1,29 @@ -import { Page } from "../Page.mjs" +import Page from "../Page.mjs" describe('Page Class looks how we expect it to. #Page_exists_unit', () => { it('Imports Page', () => { - expect(Page.constructor).toBeInstanceOf(Function) + expect(typeof Page).toBe('function') }) - const page = new Page() - it('has useful methods', () => { - expect(page.asCanvas).toBeInstanceOf(Function) - expect(page.create).toBeInstanceOf(Function) - expect(page.remove).toBeInstanceOf(Function) - expect(page.save).toBeInstanceOf(Function) - expect(page.fetch).toBeInstanceOf(Function) - expect(page.addMembershipToManifest).toBeInstanceOf(Function) - expect(page.getPreviousPage).toBeInstanceOf(Function) - expect(page.getNextPage).toBeInstanceOf(Function) - expect(page.handleTextBlob).toBeInstanceOf(Function) - expect(page.handleImageAnnotation).toBeInstanceOf(Function) - expect(page.getSiblingPages).toBeInstanceOf(Function) - expect(page.getProject).toBeInstanceOf(Function) - expect(page.getPageInfo).toBeInstanceOf(Function) - expect(page.getMetadata).toBeInstanceOf(Function) - // expect(page.getHTMLDocument).toBeInstanceOf(Function) + const page = new Page("layerID", { id: "canvasID", label: "Canvas Label", target: "https://example.com/canvas" }) + + it('has expected methods', () => { + expect(typeof page.update).toBe('function') + expect(typeof page.delete).toBe('function') }) - it('configures a correct Canvas', () => { - expect(page.id).toBeDefined() - const canvas = page.asCanvas() - expect(canvas).toBeInstanceOf(Object) - expect(canvas.type).toBe('Canvas') - expect(canvas['@context']).toBe("http://iiif.io/api/presentation/3/context.json") - expect(canvas.height).toBeDefined() - expect(canvas.width).toBeDefined() + it('has expected properties', () => { + expect(page).toHaveProperty('id') + expect(page).toHaveProperty('label') + expect(page).toHaveProperty('target') }) + it('throws an error for poorly formed new Page calls', () => { + expect(() => new Page()).toThrow() // No arguments + expect(() => new Page("layerID")).toThrow() // Missing required arguments + expect(() => new Page("layerID", null)).toThrow() // Null canvas object + expect(() => new Page("layerID", { id: null, label: "Canvas Label", target: "https://example.com/canvas" })).toThrow() // Invalid canvas ID + expect(() => new Page("layerID", { id: "canvasID", label: null, target: "https://example.com/canvas" })).toThrow() // Invalid canvas label + expect(() => new Page("layerID", { id: "canvasID", label: "Canvas Label", target: null })).toThrow() // Invalid canvas target + }) }) diff --git a/classes/Project/Project.mjs b/classes/Project/Project.mjs index 8b8ef05b..ed0d38d8 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.mjs @@ -35,11 +35,20 @@ export default class Project { } } - async delete(projectId) { + async delete(projectId = this._id) { if (!projectId) { throw { status: 400, message: "Project ID is required" } } + if (!this.data?.layers ?? this.data?.layers.length) { + await this.#load() + } + + this.data.layers.forEach(async (layer) => { + const layerObj = new Layer(projectId, layer) + await layerObj.delete() + }) + return database.remove(projectId, "projects") } @@ -190,4 +199,10 @@ export default class Project { await this.#load() return this.data } + + static async getById(projectId) { + const project = new Project(projectId) + await project.#load() + return project + } } diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.mjs index 5bc0fb04..60d052a7 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.mjs @@ -1,6 +1,7 @@ import Project from "./Project.mjs" import Group from "../Group/Group.mjs" import User from "../User/User.mjs" +import Layer from "../Layer/Layer.mjs" import dbDriver from "../../database/driver.mjs" import fs from "fs" import path from "path" @@ -28,19 +29,18 @@ export default class ProjectFactory { } } const now = Date.now().toString().slice(-6) + const label = ProjectFactory.getLabelAsString(manifest.label) ?? now const metadata = manifest.metadata ?? [] const pages = await ProjectFactory.buildPagesFromCanvases(manifest.items) + const layer = Layer.build( null, `First Layer - ${label}`, manifest.items ) + // required properties: id, label, metadata, manifest, layers return { - label: ProjectFactory.getLabelAsString(manifest.label) ?? `Project ${now}`, + label, metadata, manifest: [ manifest.id ], - layers: [ { - id: `${process.env.SERVERURL}layer/${database.reserveId()}`, - label: `First Layer - ${ProjectFactory.getLabelAsString(manifest.label) ?? now}`, - pages, - } ] + layers: [ layer ] } } @@ -49,25 +49,6 @@ export default class ProjectFactory { return label[defaultLanguage]?.join(", ") ?? label.none?.join(",") } - static async buildPagesFromCanvases(canvases) { - try { - if (!canvases.length || !Array.isArray(canvases)) throw new Error("No canvases found in the manifest") - - const pages = canvases.map(async (c, index) => { - const canvas = await vault.get(c) - return { - id: `${process.env.SERVERURL}page/${canvas.id?.split('/').pop()}`, - label: ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${index + 1}`, - target: canvas.id - } - }) - return await Promise.all(pages) - } catch (error) { - console.error(error) - throw error - } - } - static async fromManifestURL(manifestId, creator) { return vault.loadManifest(manifestId) .then(async (manifest) => { diff --git a/layer/index.mjs b/layer/index.mjs new file mode 100644 index 00000000..5df3c68c --- /dev/null +++ b/layer/index.mjs @@ -0,0 +1,61 @@ +import express from 'express' +import * as utils from '../utilities/shared.mjs' +import pageRouter from '../page/index.mjs' +import cors from 'cors' +import common_cors from '../utilities/common_cors.json' with {type: 'json'} + +const router = express.Router() + +router.use(cors(common_cors)) + +// Route to get a layer by ID within a project +router.route('/:layerId') + .get(async (req, res) => { + const { projectId, layerId } = req.params + + try { + const layer = await findLayerById(layerId, projectId) + // Make this internal Layer look more like a RERUM AnnotationCollection + const layerAsCollection = { + '@context': 'http://www.w3.org/ns/anno.jsonld', + id: layer.id, + type: 'AnnotationCollection', + label: { none: [layer.label] }, + total: layer.pages.length, + first: layer.pages.at(0).id, + last: layer.pages.at(-1).id + } + + return res.status(200).json(layerAsCollection) + } catch (error) { + console.error(error) + return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } + }) + .all((req, res) => { + utils.respondWithError(res, 405, 'Improper request method. Use GET instead.') + }) + +// Nested route for pages within a layer +router.use('/:layerId/page', pageRouter) + +export default router + +async function findLayerById(layerId, projectId) { + if (layerId.startsWith(process.env.RERUMIDPREFIX)) { + return fetch(layerId).then(res => res.json()) + } + const p = await Project.getById(projectId) + if (!p) { + const error = new Error(`Project with ID '${projectId}' not found`) + error.status = 404 + throw error + } + const layer = p.layers.find(layer => layer.id === layerId) + if (!layer) { + const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) + error.status = 404 + throw error + } + return layer +} diff --git a/package-lock.json b/package-lock.json index 2162c8df..e6fc08ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "tpen3-services", "version": "0.0.0", - "lockfileVersion": 3, + "lockfileVersion": 2, "requires": true, "packages": { "": { @@ -26,7 +26,8 @@ "marked": "^15.0.7", "mongodb": "^6.12.0", "morgan": "^1.10.0", - "nodemailer": "^6.9.16" + "nodemailer": "^6.9.16", + "tpen3-services": "file:" }, "devDependencies": { "@jest-mock/express": "^2.1.0", @@ -46,7 +47,6 @@ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" @@ -77,7 +77,6 @@ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", "js-tokens": "^4.0.0", @@ -88,32 +87,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz", - "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", - "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", "dev": true, - "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.0", - "@babel/generator": "^7.26.0", - "@babel/helper-compilation-targets": "^7.25.9", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.0", - "@babel/parser": "^7.26.0", - "@babel/template": "^7.25.9", - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -129,14 +126,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", - "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz", + "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/parser": "^7.26.5", - "@babel/types": "^7.26.5", + "@babel/parser": "^7.27.0", + "@babel/types": "^7.27.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -146,13 +142,12 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", - "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz", + "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.26.5", + "@babel/compat-data": "^7.26.8", "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", @@ -167,7 +162,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/traverse": "^7.25.9", "@babel/types": "^7.25.9" @@ -181,7 +175,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9", @@ -199,7 +192,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -209,7 +201,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -219,7 +210,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -229,31 +219,30 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", - "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz", + "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==", "dev": true, "dependencies": { - "@babel/template": "^7.26.9", - "@babel/types": "^7.26.10" + "@babel/template": "^7.27.0", + "@babel/types": "^7.27.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", - "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", + "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", "dev": true, "dependencies": { - "@babel/types": "^7.26.10" + "@babel/types": "^7.27.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -267,7 +256,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -280,7 +268,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -293,7 +280,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -306,7 +292,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -322,7 +307,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" }, @@ -338,7 +322,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -351,7 +334,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -364,7 +346,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" }, @@ -380,7 +361,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -393,7 +373,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -406,7 +385,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -419,7 +397,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -432,7 +409,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -445,7 +421,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -458,7 +433,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -474,7 +448,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -490,7 +463,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" }, @@ -506,7 +478,6 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.26.0", "@babel/helper-plugin-utils": "^7.25.9" @@ -519,31 +490,30 @@ } }, "node_modules/@babel/template": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", - "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", + "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", "dev": true, "dependencies": { "@babel/code-frame": "^7.26.2", - "@babel/parser": "^7.26.9", - "@babel/types": "^7.26.9" + "@babel/parser": "^7.27.0", + "@babel/types": "^7.27.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz", - "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz", + "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.5", - "@babel/parser": "^7.26.5", - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.5", + "@babel/generator": "^7.27.0", + "@babel/parser": "^7.27.0", + "@babel/template": "^7.27.0", + "@babel/types": "^7.27.0", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -552,9 +522,9 @@ } }, "node_modules/@babel/types": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", - "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", + "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -568,8 +538,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@csstools/color-helpers": { "version": "5.0.2", @@ -679,14 +648,12 @@ "node_modules/@edsilv/http-status-codes": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", - "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==", - "license": "MIT" + "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==" }, "node_modules/@iiif/helpers": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", - "license": "MIT", "dependencies": { "@iiif/presentation-2": "1.0.4", "@iiif/presentation-3": "2.2.3", @@ -702,17 +669,10 @@ "@iiif/parser": "^2.1.7" } }, - "node_modules/@iiif/helpers/node_modules/@types/geojson": { - "version": "7946.0.13", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", - "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", - "license": "MIT" - }, "node_modules/@iiif/parser": { "version": "2.1.7", "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", - "license": "MIT", "peer": true, "dependencies": { "@iiif/presentation-2": "^1.0.4", @@ -725,7 +685,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@iiif/presentation-2/-/presentation-2-1.0.4.tgz", "integrity": "sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==", - "license": "MIT", "peerDependencies": { "@iiif/presentation-3": "*" } @@ -734,7 +693,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", - "license": "MIT", "dependencies": { "@types/geojson": "^7946.0.10" } @@ -743,7 +701,6 @@ "version": "0.9.7", "resolved": "https://registry.npmjs.org/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz", "integrity": "sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==", - "license": "MIT", "dependencies": { "@iiif/presentation-3": "^2.0.5" } @@ -751,15 +708,13 @@ "node_modules/@iiif/vocabulary": { "version": "1.0.26", "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", - "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==", - "license": "MIT" + "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==" }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, - "license": "ISC", "dependencies": { "camelcase": "^5.3.1", "find-up": "^4.1.0", @@ -776,7 +731,6 @@ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -786,7 +740,6 @@ "resolved": "https://registry.npmjs.org/@jest-mock/express/-/express-2.1.0.tgz", "integrity": "sha512-wwij1960SVxJL+v5Eqw3Akn3S5TLfCtHnFqs2K9Zto7RLU5I/7YhOsYDZQfNcnGyiBdisDz5iT21SRO1CVfvKA==", "dev": true, - "license": "MIT", "dependencies": { "@types/express": "^4.17.21" } @@ -796,7 +749,6 @@ "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -814,7 +766,6 @@ "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, - "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/reporters": "^29.7.0", @@ -862,7 +813,6 @@ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/fake-timers": "^29.7.0", "@jest/types": "^29.6.3", @@ -878,7 +828,6 @@ "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, - "license": "MIT", "dependencies": { "expect": "^29.7.0", "jest-snapshot": "^29.7.0" @@ -892,7 +841,6 @@ "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, - "license": "MIT", "dependencies": { "jest-get-type": "^29.6.3" }, @@ -905,7 +853,6 @@ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@sinonjs/fake-timers": "^10.0.2", @@ -923,7 +870,6 @@ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/expect": "^29.7.0", @@ -939,7 +885,6 @@ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, - "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^29.7.0", @@ -983,7 +928,6 @@ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -996,7 +940,6 @@ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", @@ -1011,7 +954,6 @@ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, - "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/types": "^29.6.3", @@ -1027,7 +969,6 @@ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", @@ -1043,7 +984,6 @@ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@jest/types": "^29.6.3", @@ -1070,7 +1010,6 @@ "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", @@ -1088,7 +1027,6 @@ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -1103,7 +1041,6 @@ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -1113,7 +1050,6 @@ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -1122,25 +1058,22 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz", - "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==", - "license": "MIT", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.1.tgz", + "integrity": "sha512-1NCa8GsZ+OFLTw5KkKQS22wLS+Rs+y02sgkhr99Pm4OSXtSDHCJyq0uscPF0qA86ipGYH4PwtC2+a8Y4RKkCcg==", "dependencies": { "sparse-bitfield": "^3.0.3" } @@ -1149,15 +1082,13 @@ "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } @@ -1167,7 +1098,6 @@ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.0" } @@ -1203,7 +1133,6 @@ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -1217,7 +1146,6 @@ "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.0.0" } @@ -1227,18 +1155,16 @@ "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", "dev": true, - "license": "MIT", "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__traverse": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", - "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz", + "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.20.7" } @@ -1248,7 +1174,6 @@ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, - "license": "MIT", "dependencies": { "@types/connect": "*", "@types/node": "*" @@ -1259,7 +1184,6 @@ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -1269,7 +1193,6 @@ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.33", @@ -1282,7 +1205,6 @@ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -1291,17 +1213,15 @@ } }, "node_modules/@types/geojson": { - "version": "7946.0.15", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz", - "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==", - "license": "MIT" + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" }, "node_modules/@types/graceful-fs": { "version": "4.1.9", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -1310,22 +1230,19 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", "dev": true, - "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" } @@ -1335,7 +1252,6 @@ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } @@ -1344,14 +1260,12 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/node": { - "version": "22.10.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz", - "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==", - "license": "MIT", + "version": "22.13.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz", + "integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==", "dependencies": { "undici-types": "~6.20.0" } @@ -1360,22 +1274,19 @@ "version": "6.9.18", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/range-parser": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, - "license": "MIT", "dependencies": { "@types/mime": "^1", "@types/node": "*" @@ -1386,7 +1297,6 @@ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", "dev": true, - "license": "MIT", "dependencies": { "@types/http-errors": "*", "@types/node": "*", @@ -1397,8 +1307,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/@types/trusted-types": { "version": "2.0.7", @@ -1409,14 +1318,12 @@ "node_modules/@types/webidl-conversions": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==", - "license": "MIT" + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" }, "node_modules/@types/whatwg-url": { "version": "11.0.5", "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", - "license": "MIT", "dependencies": { "@types/webidl-conversions": "*" } @@ -1426,7 +1333,6 @@ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", "dev": true, - "license": "MIT", "dependencies": { "@types/yargs-parser": "*" } @@ -1435,21 +1341,18 @@ "version": "21.0.3", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/abs-svg-path": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==", - "license": "MIT", "optional": true }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "license": "MIT", "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -1471,7 +1374,6 @@ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, - "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -1487,7 +1389,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -1497,7 +1398,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -1513,7 +1413,6 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, - "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -1527,7 +1426,6 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, - "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } @@ -1535,28 +1433,24 @@ "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "license": "MIT" + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "license": "MIT" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/babel-jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, - "license": "MIT", "dependencies": { "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", @@ -1578,7 +1472,6 @@ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", "@istanbuljs/load-nyc-config": "^1.0.0", @@ -1595,7 +1488,6 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", @@ -1612,7 +1504,6 @@ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/template": "^7.3.3", "@babel/types": "^7.3.3", @@ -1628,7 +1519,6 @@ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", @@ -1655,7 +1545,6 @@ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, - "license": "MIT", "dependencies": { "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" @@ -1671,14 +1560,12 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/basic-auth": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "license": "MIT", "dependencies": { "safe-buffer": "5.1.2" }, @@ -1689,15 +1576,13 @@ "node_modules/basic-auth/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "license": "MIT" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -1709,7 +1594,6 @@ "version": "1.20.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", - "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -1733,7 +1617,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -1741,15 +1624,13 @@ "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1760,7 +1641,6 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, - "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -1787,7 +1667,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", @@ -1806,16 +1685,14 @@ "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" } }, "node_modules/bson": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.1.tgz", - "integrity": "sha512-P92xmHDQjSKPLHqFxefqMxASNq/aWJMEZugpCjf+AF/pgcUpMMQCg7t7+ewko0/u8AapvF3luf/FoehddEK+sA==", - "license": "Apache-2.0", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", + "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==", "engines": { "node": ">=16.20.1" } @@ -1824,23 +1701,20 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/call-bind-apply-helpers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", - "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", - "license": "MIT", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -1850,13 +1724,12 @@ } }, "node_modules/call-bound": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", - "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", - "license": "MIT", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "get-intrinsic": "^1.2.6" + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -1870,7 +1743,6 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -1880,15 +1752,14 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001692", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", - "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==", + "version": "1.0.30001707", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", + "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", "dev": true, "funding": [ { @@ -1903,15 +1774,13 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ], - "license": "CC-BY-4.0" + ] }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1928,7 +1797,6 @@ "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" } @@ -1938,7 +1806,6 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, - "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -1969,24 +1836,21 @@ "url": "https://github.com/sponsors/sibiraj-s" } ], - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/cjs-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz", - "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==", - "dev": true, - "license": "MIT" + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "dev": true }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -2001,7 +1865,6 @@ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true, - "license": "MIT", "engines": { "iojs": ">= 1.0.0", "node": ">= 0.12.0" @@ -2011,15 +1874,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -2031,14 +1892,12 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -2051,7 +1910,6 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -2060,14 +1918,12 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -2079,7 +1935,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2088,14 +1943,12 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/cookie": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2104,7 +1957,6 @@ "version": "1.4.7", "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", - "license": "MIT", "dependencies": { "cookie": "0.7.2", "cookie-signature": "1.0.6" @@ -2116,21 +1968,18 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "license": "MIT" + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, "node_modules/cookiejar": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "license": "MIT", "dependencies": { "object-assign": "^4", "vary": "^1" @@ -2144,7 +1993,6 @@ "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "chalk": "^4.0.0", @@ -2166,7 +2014,6 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -2200,34 +2047,10 @@ "node": ">=18" } }, - "node_modules/data-urls/node_modules/tr46": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", - "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", - "dependencies": { - "punycode": "^2.3.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/data-urls/node_modules/whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", - "dependencies": { - "tr46": "^5.1.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/debug": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -2250,7 +2073,6 @@ "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", "dev": true, - "license": "MIT", "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, @@ -2265,7 +2087,6 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2274,7 +2095,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -2283,7 +2103,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", - "license": "Apache-2.0", "engines": { "node": ">=0.10" } @@ -2292,7 +2111,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -2301,7 +2119,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -2312,7 +2129,6 @@ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -2322,7 +2138,6 @@ "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", "dev": true, - "license": "ISC", "dependencies": { "asap": "^2.0.0", "wrappy": "1" @@ -2342,7 +2157,6 @@ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, - "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -2359,7 +2173,6 @@ "version": "16.4.7", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", - "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -2371,7 +2184,6 @@ "version": "12.0.1", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", - "license": "BSD-2-Clause", "dependencies": { "dotenv": "^16.4.5" }, @@ -2386,7 +2198,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -2399,22 +2210,19 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "license": "MIT" + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.5.82", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.82.tgz", - "integrity": "sha512-Zq16uk1hfQhyGx5GpwPAYDwddJuSGhtRhgOA2mCxANYaDT79nAeGnaXogMGng4KqLaJUVnOnuL0+TDop9nLOiA==", - "dev": true, - "license": "ISC" + "version": "1.5.129", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", + "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", + "dev": true }, "node_modules/emittery": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -2426,14 +2234,12 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -2454,7 +2260,6 @@ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, - "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } @@ -2463,7 +2268,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -2472,16 +2276,14 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/es-object-atoms": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.0.tgz", - "integrity": "sha512-Ujz8Al/KfOVR7fkaghAB1WvnLsdYxHDWmfoi2vlA2jZWRg31XhIC1a4B+/I24muD8iSbHxJ1JkrfqmWb65P/Mw==", - "license": "MIT", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "dependencies": { "es-errors": "^1.3.0" }, @@ -2489,12 +2291,25 @@ "node": ">= 0.4" } }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -2502,15 +2317,13 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "license": "MIT" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "node_modules/escape-string-regexp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -2520,7 +2333,6 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, - "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -2533,7 +2345,6 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2543,7 +2354,6 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, - "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -2576,7 +2386,6 @@ "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/expect-utils": "^29.7.0", "jest-get-type": "^29.6.3", @@ -2592,7 +2401,6 @@ "version": "4.21.2", "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", - "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -2635,22 +2443,20 @@ } }, "node_modules/express-oauth2-jwt-bearer": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.0.tgz", - "integrity": "sha512-HXnez7vocYlOqlfF3ozPcf/WE3zxT7zfUNfeg5FHJnvNwhBYlNXiPOvuCtBalis8xcigvwtInzEKhBuH87+9ug==", - "license": "MIT", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", + "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", "dependencies": { - "jose": "^4.13.1" + "jose": "^4.15.5" }, "engines": { - "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0" + "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0 || ^22.1.0" } }, "node_modules/express-urlrewrite": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-2.0.3.tgz", "integrity": "sha512-NjsmtYZ1Lpie+XR7VIrvI6aeAmRQDf9cHyGjdIxlE9sc+NhTx3z6fJ0wfxV4rS7AY9ncCK7JDge+VX3e+DQ9Mg==", - "license": "MIT", "dependencies": { "debug": "^4.3.4", "path-to-regexp": "^6.3.0" @@ -2659,14 +2465,12 @@ "node_modules/express-urlrewrite/node_modules/path-to-regexp": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", - "license": "MIT" + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==" }, "node_modules/express/node_modules/cookie": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2675,7 +2479,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2683,29 +2486,25 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/fast-safe-stringify": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/fb-watchman": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" } @@ -2715,7 +2514,6 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -2727,7 +2525,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", - "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", @@ -2745,7 +2542,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2753,15 +2549,13 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -2771,13 +2565,13 @@ } }, "node_modules/form-data": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", - "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", - "license": "MIT", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", "mime-types": "^2.1.12" }, "engines": { @@ -2789,7 +2583,6 @@ "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", "dev": true, - "license": "MIT", "dependencies": { "dezalgo": "^1.0.4", "hexoid": "^2.0.0", @@ -2803,7 +2596,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2812,7 +2604,6 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2821,29 +2612,12 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } + "dev": true }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2853,7 +2627,6 @@ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -2863,23 +2636,21 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } }, "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", - "license": "MIT", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", + "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "get-proto": "^1.0.0", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -2897,7 +2668,6 @@ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.0.0" } @@ -2906,7 +2676,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -2920,7 +2689,6 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -2934,7 +2702,6 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, - "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2955,7 +2722,6 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -2968,7 +2734,6 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } @@ -2977,7 +2742,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2989,15 +2753,13 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -3006,7 +2768,20 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dependencies": { + "has-symbols": "^1.0.3" + }, "engines": { "node": ">= 0.4" }, @@ -3018,7 +2793,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -3031,7 +2805,6 @@ "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -3051,14 +2824,12 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -3099,7 +2870,6 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=10.17.0" } @@ -3108,7 +2878,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -3120,15 +2889,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/import-local": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", "dev": true, - "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" @@ -3148,7 +2915,6 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -3159,7 +2925,6 @@ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, - "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3168,14 +2933,12 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "license": "MIT", "engines": { "node": ">= 0.10" } @@ -3184,15 +2947,13 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, - "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -3205,7 +2966,6 @@ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, - "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -3221,7 +2981,6 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3231,7 +2990,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -3241,7 +2999,6 @@ "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -3251,7 +3008,6 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, - "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -3264,7 +3020,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -3279,7 +3034,6 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -3291,14 +3045,12 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/isomorphic-unfetch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", - "license": "MIT", "dependencies": { "node-fetch": "^2.6.1", "unfetch": "^4.2.0" @@ -3309,7 +3061,6 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=8" } @@ -3319,7 +3070,6 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.23.9", "@babel/parser": "^7.23.9", @@ -3332,11 +3082,10 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -3349,7 +3098,6 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", @@ -3364,7 +3112,6 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0", @@ -3379,7 +3126,6 @@ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -3393,7 +3139,6 @@ "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -3420,7 +3165,6 @@ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, - "license": "MIT", "dependencies": { "execa": "^5.0.0", "jest-util": "^29.7.0", @@ -3435,7 +3179,6 @@ "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/expect": "^29.7.0", @@ -3467,7 +3210,6 @@ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, - "license": "MIT", "dependencies": { "@jest/core": "^29.7.0", "@jest/test-result": "^29.7.0", @@ -3501,7 +3243,6 @@ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@jest/test-sequencer": "^29.7.0", @@ -3547,7 +3288,6 @@ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", @@ -3563,7 +3303,6 @@ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, - "license": "MIT", "dependencies": { "detect-newline": "^3.0.0" }, @@ -3576,7 +3315,6 @@ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "chalk": "^4.0.0", @@ -3593,7 +3331,6 @@ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/fake-timers": "^29.7.0", @@ -3611,7 +3348,6 @@ "resolved": "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz", "integrity": "sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==", "dev": true, - "license": "ISC", "dependencies": { "@babel/core": "^7.4.4", "@babel/plugin-transform-modules-commonjs": "^7.4.4" @@ -3622,7 +3358,6 @@ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, - "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -3632,7 +3367,6 @@ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", @@ -3658,7 +3392,6 @@ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, - "license": "MIT", "dependencies": { "jest-get-type": "^29.6.3", "pretty-format": "^29.7.0" @@ -3672,7 +3405,6 @@ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^4.0.0", "jest-diff": "^29.7.0", @@ -3688,7 +3420,6 @@ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", "@jest/types": "^29.6.3", @@ -3709,7 +3440,6 @@ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -3724,7 +3454,6 @@ "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" }, @@ -3742,7 +3471,6 @@ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, - "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -3752,7 +3480,6 @@ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", @@ -3773,7 +3500,6 @@ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, - "license": "MIT", "dependencies": { "jest-regex-util": "^29.6.3", "jest-snapshot": "^29.7.0" @@ -3787,7 +3513,6 @@ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/environment": "^29.7.0", @@ -3820,7 +3545,6 @@ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/fake-timers": "^29.7.0", @@ -3854,7 +3578,6 @@ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", @@ -3882,11 +3605,10 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -3899,7 +3621,6 @@ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -3917,7 +3638,6 @@ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "camelcase": "^6.2.0", @@ -3935,7 +3655,6 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -3948,7 +3667,6 @@ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, - "license": "MIT", "dependencies": { "@jest/test-result": "^29.7.0", "@jest/types": "^29.6.3", @@ -3968,7 +3686,6 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*", "jest-util": "^29.7.0", @@ -3984,7 +3701,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -3999,7 +3715,6 @@ "version": "4.15.9", "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==", - "license": "MIT", "funding": { "url": "https://github.com/sponsors/panva" } @@ -4008,15 +3723,13 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -4064,35 +3777,11 @@ } } }, - "node_modules/jsdom/node_modules/tr46": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", - "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", - "dependencies": { - "punycode": "^2.3.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/jsdom/node_modules/whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", - "dependencies": { - "tr46": "^5.1.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, - "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -4104,15 +3793,13 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, - "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -4131,7 +3818,6 @@ "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -4141,7 +3827,6 @@ "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -4150,15 +3835,13 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -4169,8 +3852,7 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash.get": { "version": "4.4.2", @@ -4184,7 +3866,6 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^3.0.2" } @@ -4194,7 +3875,6 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, - "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -4206,11 +3886,10 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -4223,7 +3902,6 @@ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "tmpl": "1.0.5" } @@ -4232,7 +3910,6 @@ "version": "4.2.21", "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz", "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==", - "license": "MIT", "dependencies": { "@edsilv/http-status-codes": "^1.0.3", "@iiif/vocabulary": "^1.0.26", @@ -4248,7 +3925,6 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", - "license": "LGPL-2.1-or-later", "dependencies": { "@types/geojson": "^7946.0.14", "@types/node": "^22.5.4", @@ -4260,11 +3936,15 @@ "node": ">= 14" } }, + "node_modules/mariadb/node_modules/@types/geojson": { + "version": "7946.0.16", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", + "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==" + }, "node_modules/mariadb/node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -4275,8 +3955,7 @@ "node_modules/mariadb/node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "license": "ISC" + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" }, "node_modules/marked": { "version": "15.0.7", @@ -4293,7 +3972,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -4302,7 +3980,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4310,14 +3987,12 @@ "node_modules/memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", - "license": "MIT" + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" }, "node_modules/merge-descriptors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -4326,14 +4001,12 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4343,7 +4016,6 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, - "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -4356,7 +4028,6 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "license": "MIT", "bin": { "mime": "cli.js" }, @@ -4368,7 +4039,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4377,7 +4047,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -4390,7 +4059,6 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -4400,7 +4068,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4409,13 +4076,12 @@ } }, "node_modules/mongodb": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.12.0.tgz", - "integrity": "sha512-RM7AHlvYfS7jv7+BXund/kR64DryVI+cHbVAy9P61fnb1RcWZqOW1/Wj2YhqMCx+MuYhqTRGv7AwHBzmsCKBfA==", - "license": "Apache-2.0", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", + "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", "dependencies": { "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.1", + "bson": "^6.10.3", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -4455,20 +4121,18 @@ } }, "node_modules/mongodb-connection-string-url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", - "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg==", - "license": "Apache-2.0", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", + "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", "dependencies": { "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^13.0.0" + "whatwg-url": "^14.1.0 || ^13.0.0" } }, "node_modules/morgan": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "license": "MIT", "dependencies": { "basic-auth": "~2.0.1", "debug": "2.6.9", @@ -4484,7 +4148,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -4492,14 +4155,12 @@ "node_modules/morgan/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/morgan/node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -4510,21 +4171,18 @@ "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4564,7 +4222,6 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -4583,20 +4240,17 @@ "node_modules/node-fetch/node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/node-fetch/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/node-fetch/node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -4606,21 +4260,18 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/node-releases": { "version": "2.0.19", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/nodemailer": { - "version": "6.9.16", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz", - "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==", - "license": "MIT-0", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz", + "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==", "engines": { "node": ">=6.0.0" } @@ -4630,7 +4281,6 @@ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", "dev": true, - "license": "MIT", "dependencies": { "chokidar": "^3.5.2", "debug": "^4", @@ -4659,17 +4309,15 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/nodemon/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -4682,7 +4330,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -4695,7 +4342,6 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4705,7 +4351,6 @@ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.0.0" }, @@ -4714,24 +4359,22 @@ } }, "node_modules/nwsapi": { - "version": "2.2.19", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.19.tgz", - "integrity": "sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA==" + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", + "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==" }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/object-inspect": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", - "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", - "license": "MIT", + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "engines": { "node": ">= 0.4" }, @@ -4743,7 +4386,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -4755,7 +4397,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4765,7 +4406,6 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, - "license": "ISC", "dependencies": { "wrappy": "1" } @@ -4775,7 +4415,6 @@ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, - "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -4791,7 +4430,6 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -4807,7 +4445,6 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -4820,7 +4457,6 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, - "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -4836,7 +4472,6 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -4846,7 +4481,6 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -4860,6 +4494,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse-svg-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", + "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", + "optional": true + }, "node_modules/parse5": { "version": "7.2.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", @@ -4870,18 +4510,11 @@ "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" } - "node_modules/parse-svg-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", - "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", - "license": "MIT", - "optional": true }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4891,7 +4524,6 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -4901,7 +4533,6 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4911,7 +4542,6 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -4920,28 +4550,24 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/path-to-regexp": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", - "license": "MIT" + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, @@ -4950,11 +4576,10 @@ } }, "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 6" } @@ -4964,7 +4589,6 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, - "license": "MIT", "dependencies": { "find-up": "^4.0.0" }, @@ -4977,7 +4601,6 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -4992,7 +4615,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -5005,7 +4627,6 @@ "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", "dev": true, - "license": "MIT", "dependencies": { "kleur": "^3.0.3", "sisteransi": "^1.0.5" @@ -5018,7 +4639,6 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -5031,14 +4651,12 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "license": "MIT", "engines": { "node": ">=6" } @@ -5057,14 +4675,12 @@ "type": "opencollective", "url": "https://opencollective.com/fast-check" } - ], - "license": "MIT" + ] }, "node_modules/qs": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, @@ -5079,7 +4695,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -5088,7 +4703,6 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", - "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -5103,15 +4717,13 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, - "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -5124,7 +4736,6 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5134,7 +4745,6 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, - "license": "MIT", "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", @@ -5155,7 +4765,6 @@ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, - "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" }, @@ -5168,7 +4777,6 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -5178,7 +4786,6 @@ "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" } @@ -5205,14 +4812,12 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "license": "MIT" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/saxes": { "version": "6.0.0", @@ -5230,7 +4835,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -5239,7 +4843,6 @@ "version": "0.19.0", "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -5263,7 +4866,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -5271,14 +4873,12 @@ "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/send/node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5287,7 +4887,6 @@ "version": "1.16.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", - "license": "MIT", "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", @@ -5301,15 +4900,13 @@ "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "license": "ISC" + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -5322,7 +4919,6 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -5331,7 +4927,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", @@ -5350,7 +4945,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" @@ -5366,7 +4960,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -5384,7 +4977,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -5403,15 +4995,13 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/simple-update-notifier": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", "dev": true, - "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -5420,11 +5010,10 @@ } }, "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -5433,13 +5022,13 @@ } }, "node_modules/sinon": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", - "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", + "version": "19.0.5", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", + "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", "dev": true, "dependencies": { "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.2", + "@sinonjs/fake-timers": "^13.0.5", "@sinonjs/samsam": "^8.0.1", "diff": "^7.0.0", "nise": "^6.1.1", @@ -5463,15 +5052,13 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -5481,7 +5068,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -5491,7 +5077,6 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, - "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -5501,7 +5086,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", - "license": "MIT", "dependencies": { "memory-pager": "^1.0.2" } @@ -5510,15 +5094,13 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true, - "license": "BSD-3-Clause" + "dev": true }, "node_modules/stack-utils": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", "dev": true, - "license": "MIT", "dependencies": { "escape-string-regexp": "^2.0.0" }, @@ -5530,7 +5112,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5540,7 +5121,6 @@ "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", "dev": true, - "license": "MIT", "dependencies": { "char-regex": "^1.0.2", "strip-ansi": "^6.0.0" @@ -5554,7 +5134,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5569,7 +5148,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5582,7 +5160,6 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -5592,7 +5169,6 @@ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -5602,7 +5178,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -5615,7 +5190,6 @@ "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", "dev": true, - "license": "MIT", "dependencies": { "component-emitter": "^1.3.0", "cookiejar": "^2.1.4", @@ -5636,7 +5210,6 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", "dev": true, - "license": "MIT", "bin": { "mime": "cli.js" }, @@ -5645,11 +5218,10 @@ } }, "node_modules/supertest": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.0.0.tgz", - "integrity": "sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz", + "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==", "dev": true, - "license": "MIT", "dependencies": { "methods": "^1.1.2", "superagent": "^9.0.1" @@ -5663,7 +5235,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -5676,7 +5247,6 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5684,23 +5254,22 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" "node_modules/svg-arc-to-cubic-bezier": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==", - "license": "ISC", "optional": true }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, - "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -5711,34 +5280,32 @@ } }, "node_modules/tldts": { - "version": "6.1.84", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.84.tgz", - "integrity": "sha512-aRGIbCIF3teodtUFAYSdQONVmDRy21REM3o6JnqWn5ZkQBJJ4gHxhw6OfwQ+WkSAi3ASamrS4N4nyazWx6uTYg==", + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", + "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", "dependencies": { - "tldts-core": "^6.1.84" + "tldts-core": "^6.1.85" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.84", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.84.tgz", - "integrity": "sha512-NaQa1W76W2aCGjXybvnMYzGSM4x8fvG2AN/pla7qxcg0ZHbooOPhA8kctmOZUDfZyhDL27OGNbwAeig8P4p1vg==" + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", + "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==" }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true, - "license": "BSD-3-Clause" + "dev": true }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -5750,7 +5317,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "license": "MIT", "engines": { "node": ">=0.6" } @@ -5760,7 +5326,6 @@ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", "dev": true, - "license": "ISC", "bin": { "nodetouch": "bin/nodetouch.js" } @@ -5776,16 +5341,19 @@ "node": ">=16" } }, + "node_modules/tpen3-services": { + "resolved": "", + "link": true + }, "node_modules/tr46": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", - "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", - "license": "MIT", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", + "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", "dependencies": { - "punycode": "^2.3.0" + "punycode": "^2.3.1" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/type-detect": { @@ -5793,7 +5361,6 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } @@ -5803,7 +5370,6 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -5815,7 +5381,6 @@ "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -5828,34 +5393,30 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/undici-types": { "version": "6.20.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "license": "MIT" + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" }, "node_modules/unfetch": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", - "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==", - "license": "MIT" + "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/update-browserslist-db": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", - "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", "dev": true, "funding": [ { @@ -5871,7 +5432,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" @@ -5887,7 +5447,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "license": "MIT", "engines": { "node": ">= 0.4.0" } @@ -5897,7 +5456,6 @@ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", "dev": true, - "license": "ISC", "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", @@ -5911,7 +5469,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5932,7 +5489,6 @@ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "makeerror": "1.0.12" } @@ -5941,7 +5497,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "license": "BSD-2-Clause", "engines": { "node": ">=12" } @@ -5977,16 +5532,15 @@ } }, "node_modules/whatwg-url": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", - "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", - "license": "MIT", + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", "dependencies": { - "tr46": "^4.1.1", + "tr46": "^5.1.0", "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/which": { @@ -5994,7 +5548,6 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, - "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -6010,7 +5563,6 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -6027,15 +5579,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, - "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" @@ -6082,7 +5632,6 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, - "license": "ISC", "engines": { "node": ">=10" } @@ -6091,15 +5640,13 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, - "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -6118,7 +5665,6 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, - "license": "ISC", "engines": { "node": ">=12" } @@ -6128,7 +5674,6 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -6136,5 +5681,8414 @@ "url": "https://github.com/sponsors/sindresorhus" } } + }, + "dependencies": { + "@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@asamuzakjp/css-color": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", + "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", + "requires": { + "@csstools/css-calc": "^2.1.2", + "@csstools/css-color-parser": "^3.0.8", + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3", + "lru-cache": "^10.4.3" + }, + "dependencies": { + "lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + } + } + }, + "@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + } + }, + "@babel/compat-data": { + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", + "dev": true + }, + "@babel/core": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", + "dev": true, + "requires": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + } + }, + "@babel/generator": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz", + "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==", + "dev": true, + "requires": { + "@babel/parser": "^7.27.0", + "@babel/types": "^7.27.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz", + "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.26.8", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + } + }, + "@babel/helper-module-imports": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", + "dev": true, + "requires": { + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" + } + }, + "@babel/helper-module-transforms": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", + "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", + "dev": true + }, + "@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "dev": true + }, + "@babel/helpers": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz", + "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==", + "dev": true, + "requires": { + "@babel/template": "^7.27.0", + "@babel/types": "^7.27.0" + } + }, + "@babel/parser": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", + "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", + "dev": true, + "requires": { + "@babel/types": "^7.27.0" + } + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-import-attributes": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-jsx": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", + "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-typescript": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", + "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", + "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/template": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", + "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.27.0", + "@babel/types": "^7.27.0" + } + }, + "@babel/traverse": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz", + "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.27.0", + "@babel/parser": "^7.27.0", + "@babel/template": "^7.27.0", + "@babel/types": "^7.27.0", + "debug": "^4.3.1", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", + "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + } + }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "@csstools/color-helpers": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz", + "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==" + }, + "@csstools/css-calc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", + "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", + "requires": {} + }, + "@csstools/css-color-parser": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", + "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", + "requires": { + "@csstools/color-helpers": "^5.0.2", + "@csstools/css-calc": "^2.1.2" + } + }, + "@csstools/css-parser-algorithms": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", + "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", + "requires": {} + }, + "@csstools/css-tokenizer": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", + "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==" + }, + "@edsilv/http-status-codes": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", + "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==" + }, + "@iiif/helpers": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", + "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", + "requires": { + "@iiif/presentation-2": "1.0.4", + "@iiif/presentation-3": "2.2.3", + "@iiif/presentation-3-normalized": "0.9.7", + "@types/geojson": "7946.0.13", + "abs-svg-path": "^0.1.1", + "parse-svg-path": "^0.1.2", + "svg-arc-to-cubic-bezier": "^3.2.0" + } + }, + "@iiif/parser": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", + "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", + "peer": true, + "requires": { + "@iiif/presentation-2": "^1.0.4", + "@iiif/presentation-3": "^2.2.2", + "@iiif/presentation-3-normalized": "^0.9.7", + "@types/geojson": "^7946.0.10" + } + }, + "@iiif/presentation-2": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@iiif/presentation-2/-/presentation-2-1.0.4.tgz", + "integrity": "sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==", + "requires": {} + }, + "@iiif/presentation-3": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", + "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", + "requires": { + "@types/geojson": "^7946.0.10" + } + }, + "@iiif/presentation-3-normalized": { + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz", + "integrity": "sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==", + "requires": { + "@iiif/presentation-3": "^2.0.5" + } + }, + "@iiif/vocabulary": { + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", + "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==" + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + } + }, + "@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true + }, + "@jest-mock/express": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@jest-mock/express/-/express-2.1.0.tgz", + "integrity": "sha512-wwij1960SVxJL+v5Eqw3Akn3S5TLfCtHnFqs2K9Zto7RLU5I/7YhOsYDZQfNcnGyiBdisDz5iT21SRO1CVfvKA==", + "dev": true, + "requires": { + "@types/express": "^4.17.21" + } + }, + "@jest/console": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" + } + }, + "@jest/core": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", + "dev": true, + "requires": { + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", + "dev": true, + "requires": { + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + } + }, + "@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", + "dev": true, + "requires": { + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + } + }, + "@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, + "requires": { + "jest-get-type": "^29.6.3" + } + }, + "@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + } + }, + "@jest/globals": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" + } + }, + "@jest/reporters": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + } + }, + "@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "requires": { + "@sinclair/typebox": "^0.27.8" + } + }, + "@jest/source-map": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + } + }, + "@jest/test-result": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", + "dev": true, + "requires": { + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", + "dev": true, + "requires": { + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" + } + }, + "@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + } + }, + "@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "requires": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + } + }, + "@jridgewell/gen-mapping": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true + }, + "@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "@mongodb-js/saslprep": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.1.tgz", + "integrity": "sha512-1NCa8GsZ+OFLTw5KkKQS22wLS+Rs+y02sgkhr99Pm4OSXtSDHCJyq0uscPF0qA86ipGYH4PwtC2+a8Y4RKkCcg==", + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, + "@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, + "@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.0" + } + }, + "@sinonjs/samsam": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", + "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "lodash.get": "^4.4.2", + "type-detect": "^4.1.0" + }, + "dependencies": { + "type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true + } + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true + }, + "@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "requires": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz", + "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==", + "dev": true, + "requires": { + "@babel/types": "^7.20.7" + } + }, + "@types/body-parser": { + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "dev": true, + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/express": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "dev": true, + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "@types/express-serve-static-core": { + "version": "4.19.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", + "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", + "dev": true, + "requires": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "@types/geojson": { + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" + }, + "@types/graceful-fs": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/http-errors": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "dev": true + }, + "@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true + }, + "@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", + "dev": true + }, + "@types/node": { + "version": "22.13.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz", + "integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==", + "requires": { + "undici-types": "~6.20.0" + } + }, + "@types/qs": { + "version": "6.9.18", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", + "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", + "dev": true + }, + "@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true + }, + "@types/send": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "dev": true, + "requires": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "@types/serve-static": { + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", + "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", + "dev": true, + "requires": { + "@types/http-errors": "*", + "@types/node": "*", + "@types/send": "*" + } + }, + "@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true + }, + "@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "optional": true + }, + "@types/webidl-conversions": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + }, + "@types/whatwg-url": { + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", + "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", + "requires": { + "@types/webidl-conversions": "*" + } + }, + "@types/yargs": { + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true + }, + "abs-svg-path": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", + "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==", + "optional": true + }, + "accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "requires": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + } + }, + "agent-base": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==" + }, + "ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "requires": { + "type-fest": "^0.21.3" + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "babel-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", + "dev": true, + "requires": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + } + }, + "babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "dependencies": { + "istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "requires": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + } + } + } + }, + "babel-plugin-jest-hoist": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", + "dev": true, + "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-current-node-syntax": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", + "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", + "dev": true, + "requires": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5" + } + }, + "babel-preset-jest": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "requires": { + "safe-buffer": "5.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, + "binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true + }, + "body-parser": { + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "requires": { + "fill-range": "^7.1.1" + } + }, + "browserslist": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" + } + }, + "bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "requires": { + "node-int64": "^0.4.0" + } + }, + "bson": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", + "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==" + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + }, + "call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + } + }, + "call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "requires": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + } + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30001707", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", + "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true + }, + "chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true + }, + "cjs-module-lexer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "dev": true + }, + "cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true + }, + "collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "component-emitter": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", + "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "requires": { + "safe-buffer": "5.2.1" + } + }, + "content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" + }, + "convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==" + }, + "cookie-parser": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", + "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", + "requires": { + "cookie": "0.7.2", + "cookie-signature": "1.0.6" + } + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + }, + "cookiejar": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", + "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", + "dev": true + }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, + "create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + } + }, + "cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "cssstyle": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", + "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", + "requires": { + "@asamuzakjp/css-color": "^3.1.1", + "rrweb-cssom": "^0.8.0" + } + }, + "data-urls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "requires": { + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" + } + }, + "debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "requires": { + "ms": "^2.1.3" + } + }, + "decimal.js": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", + "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==" + }, + "dedent": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "dev": true, + "requires": {} + }, + "deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + }, + "denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" + }, + "detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true + }, + "dezalgo": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", + "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", + "dev": true, + "requires": { + "asap": "^2.0.0", + "wrappy": "1" + } + }, + "diff": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "dev": true + }, + "diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true + }, + "dompurify": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "requires": { + "@types/trusted-types": "^2.0.7" + } + }, + "dotenv": { + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==" + }, + "dotenv-expand": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", + "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", + "requires": { + "dotenv": "^16.4.5" + } + }, + "dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "requires": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "electron-to-chromium": { + "version": "1.5.129", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", + "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", + "dev": true + }, + "emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" + }, + "entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, + "es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "requires": { + "es-errors": "^1.3.0" + } + }, + "es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "requires": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + } + }, + "escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" + }, + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true + }, + "expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "requires": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + } + }, + "express": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "requires": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.3", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.7.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.3.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.12", + "proxy-addr": "~2.0.7", + "qs": "6.13.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.19.0", + "serve-static": "1.16.2", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "cookie": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "express-oauth2-jwt-bearer": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", + "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", + "requires": { + "jose": "^4.15.5" + } + }, + "express-urlrewrite": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-2.0.3.tgz", + "integrity": "sha512-NjsmtYZ1Lpie+XR7VIrvI6aeAmRQDf9cHyGjdIxlE9sc+NhTx3z6fJ0wfxV4rS7AY9ncCK7JDge+VX3e+DQ9Mg==", + "requires": { + "debug": "^4.3.4", + "path-to-regexp": "^6.3.0" + }, + "dependencies": { + "path-to-regexp": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==" + } + } + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-safe-stringify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", + "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", + "dev": true + }, + "fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "requires": { + "bser": "2.1.1" + } + }, + "fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "finalhandler": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "form-data": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.12" + } + }, + "formidable": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", + "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", + "dev": true, + "requires": { + "dezalgo": "^1.0.4", + "hexoid": "^2.0.0", + "once": "^1.4.0" + } + }, + "forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "requires": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + } + }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, + "get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "requires": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + } + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" + }, + "graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" + }, + "has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "requires": { + "has-symbols": "^1.0.3" + } + }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + } + }, + "hexoid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", + "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", + "dev": true + }, + "html-encoding-sniffer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", + "requires": { + "whatwg-encoding": "^3.1.1" + } + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + } + }, + "http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "requires": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + } + }, + "https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "requires": { + "agent-base": "^7.1.2", + "debug": "4" + } + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, + "import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "requires": { + "hasown": "^2.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "isomorphic-unfetch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", + "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", + "requires": { + "node-fetch": "^2.6.1", + "unfetch": "^4.2.0" + } + }, + "istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "requires": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + } + }, + "istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", + "dev": true, + "requires": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + } + }, + "jest-changed-files": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "dev": true, + "requires": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + } + }, + "jest-circus": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", + "dev": true, + "requires": { + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + } + }, + "jest-config": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + } + }, + "jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + } + }, + "jest-docblock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" + } + }, + "jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + } + }, + "jest-esm-transformer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz", + "integrity": "sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==", + "dev": true, + "requires": { + "@babel/core": "^7.4.4", + "@babel/plugin-transform-modules-commonjs": "^7.4.4" + } + }, + "jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true + }, + "jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + } + }, + "jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", + "dev": true, + "requires": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + } + }, + "jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + } + }, + "jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + } + }, + "jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "requires": {} + }, + "jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", + "dev": true + }, + "jest-resolve": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + } + }, + "jest-resolve-dependencies": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", + "dev": true, + "requires": { + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" + } + }, + "jest-runner": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", + "dev": true, + "requires": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + } + }, + "jest-runtime": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + } + }, + "jest-snapshot": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + } + }, + "jest-validate": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "leven": "^3.1.0", + "pretty-format": "^29.7.0" + }, + "dependencies": { + "camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true + } + } + }, + "jest-watcher": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", + "dev": true, + "requires": { + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", + "string-length": "^4.0.1" + } + }, + "jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", + "dev": true, + "requires": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jose": { + "version": "4.15.9", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", + "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsdom": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", + "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "requires": { + "cssstyle": "^4.2.1", + "data-urls": "^5.0.0", + "decimal.js": "^10.4.3", + "form-data": "^4.0.1", + "html-encoding-sniffer": "^4.0.0", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.6", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.16", + "parse5": "^7.2.1", + "rrweb-cssom": "^0.8.0", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^5.0.0", + "w3c-xmlserializer": "^5.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^3.1.1", + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.1.0", + "ws": "^8.18.0", + "xml-name-validator": "^5.0.0" + } + }, + "jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true + }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true + }, + "just-extend": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", + "dev": true + }, + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true + }, + "leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true + }, + "lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "dev": true + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "requires": { + "semver": "^7.5.3" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "requires": { + "tmpl": "1.0.5" + } + }, + "manifesto.js": { + "version": "4.2.21", + "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz", + "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==", + "requires": { + "@edsilv/http-status-codes": "^1.0.3", + "@iiif/vocabulary": "^1.0.26", + "isomorphic-unfetch": "^3.0.0", + "lodash": "^4.17.21" + } + }, + "mariadb": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", + "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", + "requires": { + "@types/geojson": "^7946.0.14", + "@types/node": "^22.5.4", + "denque": "^2.1.0", + "iconv-lite": "^0.6.3", + "lru-cache": "^10.3.0" + }, + "dependencies": { + "@types/geojson": { + "version": "7946.0.16", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", + "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==" + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + }, + "lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + } + } + }, + "marked": { + "version": "15.0.7", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", + "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==" + }, + "math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" + }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + }, + "merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" + }, + "micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "requires": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + } + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "requires": { + "mime-db": "1.52.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "mongodb": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", + "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", + "requires": { + "@mongodb-js/saslprep": "^1.1.9", + "bson": "^6.10.3", + "mongodb-connection-string-url": "^3.0.0" + } + }, + "mongodb-connection-string-url": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", + "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", + "requires": { + "@types/whatwg-url": "^11.0.2", + "whatwg-url": "^14.1.0 || ^13.0.0" + } + }, + "morgan": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", + "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "requires": { + "basic-auth": "~2.0.1", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-finished": "~2.3.0", + "on-headers": "~1.0.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "requires": { + "ee-first": "1.1.1" + } + } + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + }, + "nise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", + "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.1", + "@sinonjs/text-encoding": "^0.7.3", + "just-extend": "^6.2.0", + "path-to-regexp": "^8.1.0" + }, + "dependencies": { + "@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1" + } + }, + "path-to-regexp": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", + "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "dev": true + } + } + }, + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "requires": { + "whatwg-url": "^5.0.0" + }, + "dependencies": { + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + } + } + }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node-releases": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "dev": true + }, + "nodemailer": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz", + "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==" + }, + "nodemon": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", + "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", + "dev": true, + "requires": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "nwsapi": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", + "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, + "object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + }, + "dependencies": { + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + } + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, + "parse-svg-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", + "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", + "optional": true + }, + "parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "requires": { + "entities": "^4.5.0" + } + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "path-to-regexp": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" + }, + "picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pirates": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "requires": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true + } + } + }, + "prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + } + }, + "proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "requires": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + } + }, + "pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true + }, + "punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" + }, + "pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "dev": true + }, + "qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "requires": { + "side-channel": "^1.0.6" + } + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true + }, + "resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "requires": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + }, + "resolve.exports": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "dev": true + }, + "rrweb-cssom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", + "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==" + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "requires": { + "xmlchars": "^2.2.0" + } + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + }, + "send": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + } + } + }, + "serve-static": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "requires": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.19.0" + } + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "requires": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + } + }, + "side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "requires": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + } + }, + "side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "requires": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + } + }, + "side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "requires": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + } + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "requires": { + "semver": "^7.5.3" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "sinon": { + "version": "19.0.5", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", + "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.5", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", + "nise": "^6.1.1", + "supports-color": "^7.2.0" + }, + "dependencies": { + "@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1" + } + } + } + }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "requires": { + "memory-pager": "^1.0.2" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "requires": { + "escape-string-regexp": "^2.0.0" + } + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + }, + "string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "requires": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "superagent": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", + "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", + "dev": true, + "requires": { + "component-emitter": "^1.3.0", + "cookiejar": "^2.1.4", + "debug": "^4.3.4", + "fast-safe-stringify": "^2.1.1", + "form-data": "^4.0.0", + "formidable": "^3.5.1", + "methods": "^1.1.2", + "mime": "2.6.0", + "qs": "^6.11.0" + }, + "dependencies": { + "mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true + } + } + }, + "supertest": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz", + "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==", + "dev": true, + "requires": { + "methods": "^1.1.2", + "superagent": "^9.0.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, + "svg-arc-to-cubic-bezier": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", + "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==", + "optional": true + }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, + "tldts": { + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", + "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", + "requires": { + "tldts-core": "^6.1.85" + } + }, + "tldts-core": { + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", + "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==" + }, + "tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + }, + "touch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", + "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", + "dev": true + }, + "tough-cookie": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", + "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==", + "requires": { + "tldts": "^6.1.32" + } + }, + "tpen3-services": { + "version": "file:", + "requires": { + "@iiif/helpers": "^1.3.1", + "@jest-mock/express": "^2.1.0", + "cookie-parser": "^1.4.7", + "cors": "^2.8.5", + "debug": "^4.4.0", + "dompurify": "^3.2.4", + "dotenv": "^16.4.7", + "dotenv-expand": "^12.0.1", + "express": "^4.21.2", + "express-oauth2-jwt-bearer": "^1.6.0", + "express-urlrewrite": "^2.0.3", + "http-errors": "^2.0.0", + "jest": "^29.7.0", + "jest-cli": "^29.7.0", + "jest-esm-transformer": "^1.0.0", + "jsdom": "^26.0.0", + "manifesto.js": "^4.2.21", + "mariadb": "^3.4.0", + "marked": "^15.0.7", + "mongodb": "^6.12.0", + "morgan": "^1.10.0", + "nodemailer": "^6.9.16", + "nodemon": "^3.1.9", + "sinon": "^19.0.2", + "supertest": "^7.0.0", + "tpen3-services": "file:" + }, + "dependencies": { + "@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@asamuzakjp/css-color": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", + "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", + "requires": { + "@csstools/css-calc": "^2.1.2", + "@csstools/css-color-parser": "^3.0.8", + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3", + "lru-cache": "^10.4.3" + }, + "dependencies": { + "lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + } + } + }, + "@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + } + }, + "@babel/compat-data": { + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", + "dev": true + }, + "@babel/core": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", + "dev": true, + "requires": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + } + }, + "@babel/generator": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz", + "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==", + "dev": true, + "requires": { + "@babel/parser": "^7.27.0", + "@babel/types": "^7.27.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz", + "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.26.8", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + } + }, + "@babel/helper-module-imports": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", + "dev": true, + "requires": { + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" + } + }, + "@babel/helper-module-transforms": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", + "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", + "dev": true + }, + "@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "dev": true + }, + "@babel/helpers": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz", + "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==", + "dev": true, + "requires": { + "@babel/template": "^7.27.0", + "@babel/types": "^7.27.0" + } + }, + "@babel/parser": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", + "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", + "dev": true, + "requires": { + "@babel/types": "^7.27.0" + } + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-import-attributes": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-jsx": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", + "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-typescript": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", + "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", + "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helper-plugin-utils": "^7.25.9" + } + }, + "@babel/template": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", + "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.27.0", + "@babel/types": "^7.27.0" + } + }, + "@babel/traverse": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz", + "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.27.0", + "@babel/parser": "^7.27.0", + "@babel/template": "^7.27.0", + "@babel/types": "^7.27.0", + "debug": "^4.3.1", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", + "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + } + }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "@csstools/color-helpers": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz", + "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==" + }, + "@csstools/css-calc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", + "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", + "requires": {} + }, + "@csstools/css-color-parser": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", + "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", + "requires": { + "@csstools/color-helpers": "^5.0.2", + "@csstools/css-calc": "^2.1.2" + } + }, + "@csstools/css-parser-algorithms": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", + "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", + "requires": {} + }, + "@csstools/css-tokenizer": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", + "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==" + }, + "@edsilv/http-status-codes": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", + "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==" + }, + "@iiif/helpers": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", + "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", + "requires": { + "@iiif/presentation-2": "1.0.4", + "@iiif/presentation-3": "2.2.3", + "@iiif/presentation-3-normalized": "0.9.7", + "@types/geojson": "7946.0.13", + "abs-svg-path": "^0.1.1", + "parse-svg-path": "^0.1.2", + "svg-arc-to-cubic-bezier": "^3.2.0" + } + }, + "@iiif/parser": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", + "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", + "peer": true, + "requires": { + "@iiif/presentation-2": "^1.0.4", + "@iiif/presentation-3": "^2.2.2", + "@iiif/presentation-3-normalized": "^0.9.7", + "@types/geojson": "^7946.0.10" + } + }, + "@iiif/presentation-2": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@iiif/presentation-2/-/presentation-2-1.0.4.tgz", + "integrity": "sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==", + "requires": {} + }, + "@iiif/presentation-3": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", + "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", + "requires": { + "@types/geojson": "^7946.0.10" + } + }, + "@iiif/presentation-3-normalized": { + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz", + "integrity": "sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==", + "requires": { + "@iiif/presentation-3": "^2.0.5" + } + }, + "@iiif/vocabulary": { + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", + "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==" + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + } + }, + "@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true + }, + "@jest-mock/express": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@jest-mock/express/-/express-2.1.0.tgz", + "integrity": "sha512-wwij1960SVxJL+v5Eqw3Akn3S5TLfCtHnFqs2K9Zto7RLU5I/7YhOsYDZQfNcnGyiBdisDz5iT21SRO1CVfvKA==", + "dev": true, + "requires": { + "@types/express": "^4.17.21" + } + }, + "@jest/console": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" + } + }, + "@jest/core": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", + "dev": true, + "requires": { + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", + "dev": true, + "requires": { + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + } + }, + "@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", + "dev": true, + "requires": { + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + } + }, + "@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, + "requires": { + "jest-get-type": "^29.6.3" + } + }, + "@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + } + }, + "@jest/globals": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" + } + }, + "@jest/reporters": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + } + }, + "@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "requires": { + "@sinclair/typebox": "^0.27.8" + } + }, + "@jest/source-map": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + } + }, + "@jest/test-result": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", + "dev": true, + "requires": { + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", + "dev": true, + "requires": { + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" + } + }, + "@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + } + }, + "@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "requires": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + } + }, + "@jridgewell/gen-mapping": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true + }, + "@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "@mongodb-js/saslprep": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.1.tgz", + "integrity": "sha512-1NCa8GsZ+OFLTw5KkKQS22wLS+Rs+y02sgkhr99Pm4OSXtSDHCJyq0uscPF0qA86ipGYH4PwtC2+a8Y4RKkCcg==", + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, + "@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, + "@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.0" + } + }, + "@sinonjs/samsam": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", + "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "lodash.get": "^4.4.2", + "type-detect": "^4.1.0" + }, + "dependencies": { + "type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true + } + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true + }, + "@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "requires": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz", + "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==", + "dev": true, + "requires": { + "@babel/types": "^7.20.7" + } + }, + "@types/body-parser": { + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "dev": true, + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/express": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "dev": true, + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "@types/express-serve-static-core": { + "version": "4.19.6", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", + "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", + "dev": true, + "requires": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "@types/geojson": { + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" + }, + "@types/graceful-fs": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/http-errors": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "dev": true + }, + "@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true + }, + "@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", + "dev": true + }, + "@types/node": { + "version": "22.13.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz", + "integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==", + "requires": { + "undici-types": "~6.20.0" + } + }, + "@types/qs": { + "version": "6.9.18", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", + "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", + "dev": true + }, + "@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true + }, + "@types/send": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "dev": true, + "requires": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "@types/serve-static": { + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", + "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", + "dev": true, + "requires": { + "@types/http-errors": "*", + "@types/node": "*", + "@types/send": "*" + } + }, + "@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true + }, + "@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "optional": true + }, + "@types/webidl-conversions": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + }, + "@types/whatwg-url": { + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", + "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", + "requires": { + "@types/webidl-conversions": "*" + } + }, + "@types/yargs": { + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true + }, + "abs-svg-path": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", + "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==", + "optional": true + }, + "accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "requires": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + } + }, + "agent-base": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==" + }, + "ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "requires": { + "type-fest": "^0.21.3" + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "babel-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", + "dev": true, + "requires": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + } + }, + "babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "dependencies": { + "istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "requires": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + } + } + } + }, + "babel-plugin-jest-hoist": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", + "dev": true, + "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-current-node-syntax": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", + "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", + "dev": true, + "requires": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5" + } + }, + "babel-preset-jest": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "requires": { + "safe-buffer": "5.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, + "binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true + }, + "body-parser": { + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "requires": { + "fill-range": "^7.1.1" + } + }, + "browserslist": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" + } + }, + "bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "requires": { + "node-int64": "^0.4.0" + } + }, + "bson": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", + "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==" + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + }, + "call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + } + }, + "call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "requires": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + } + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30001707", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", + "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true + }, + "chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true + }, + "cjs-module-lexer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "dev": true + }, + "cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true + }, + "collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "component-emitter": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", + "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "requires": { + "safe-buffer": "5.2.1" + } + }, + "content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" + }, + "convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==" + }, + "cookie-parser": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", + "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", + "requires": { + "cookie": "0.7.2", + "cookie-signature": "1.0.6" + } + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + }, + "cookiejar": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", + "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", + "dev": true + }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, + "create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + } + }, + "cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "cssstyle": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", + "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", + "requires": { + "@asamuzakjp/css-color": "^3.1.1", + "rrweb-cssom": "^0.8.0" + } + }, + "data-urls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "requires": { + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" + } + }, + "debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "requires": { + "ms": "^2.1.3" + } + }, + "decimal.js": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", + "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==" + }, + "dedent": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "dev": true, + "requires": {} + }, + "deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + }, + "denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" + }, + "detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true + }, + "dezalgo": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", + "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", + "dev": true, + "requires": { + "asap": "^2.0.0", + "wrappy": "1" + } + }, + "diff": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "dev": true + }, + "diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true + }, + "dompurify": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "requires": { + "@types/trusted-types": "^2.0.7" + } + }, + "dotenv": { + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==" + }, + "dotenv-expand": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", + "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", + "requires": { + "dotenv": "^16.4.5" + } + }, + "dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "requires": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "electron-to-chromium": { + "version": "1.5.129", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", + "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", + "dev": true + }, + "emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" + }, + "entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, + "es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "requires": { + "es-errors": "^1.3.0" + } + }, + "es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "requires": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + } + }, + "escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" + }, + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true + }, + "expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "requires": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + } + }, + "express": { + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "requires": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.3", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.7.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.3.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.12", + "proxy-addr": "~2.0.7", + "qs": "6.13.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.19.0", + "serve-static": "1.16.2", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "cookie": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "express-oauth2-jwt-bearer": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", + "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", + "requires": { + "jose": "^4.15.5" + } + }, + "express-urlrewrite": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-2.0.3.tgz", + "integrity": "sha512-NjsmtYZ1Lpie+XR7VIrvI6aeAmRQDf9cHyGjdIxlE9sc+NhTx3z6fJ0wfxV4rS7AY9ncCK7JDge+VX3e+DQ9Mg==", + "requires": { + "debug": "^4.3.4", + "path-to-regexp": "^6.3.0" + }, + "dependencies": { + "path-to-regexp": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==" + } + } + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-safe-stringify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", + "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", + "dev": true + }, + "fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "requires": { + "bser": "2.1.1" + } + }, + "fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "finalhandler": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "form-data": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.12" + } + }, + "formidable": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", + "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", + "dev": true, + "requires": { + "dezalgo": "^1.0.4", + "hexoid": "^2.0.0", + "once": "^1.4.0" + } + }, + "forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "requires": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + } + }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, + "get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "requires": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + } + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" + }, + "graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" + }, + "has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "requires": { + "has-symbols": "^1.0.3" + } + }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + } + }, + "hexoid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", + "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", + "dev": true + }, + "html-encoding-sniffer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", + "requires": { + "whatwg-encoding": "^3.1.1" + } + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + } + }, + "http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "requires": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + } + }, + "https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "requires": { + "agent-base": "^7.1.2", + "debug": "4" + } + }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, + "import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "requires": { + "hasown": "^2.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "isomorphic-unfetch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", + "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", + "requires": { + "node-fetch": "^2.6.1", + "unfetch": "^4.2.0" + } + }, + "istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "requires": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + } + }, + "istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", + "dev": true, + "requires": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + } + }, + "jest-changed-files": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "dev": true, + "requires": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + } + }, + "jest-circus": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", + "dev": true, + "requires": { + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + } + }, + "jest-config": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + } + }, + "jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + } + }, + "jest-docblock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" + } + }, + "jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + } + }, + "jest-esm-transformer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz", + "integrity": "sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==", + "dev": true, + "requires": { + "@babel/core": "^7.4.4", + "@babel/plugin-transform-modules-commonjs": "^7.4.4" + } + }, + "jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true + }, + "jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + } + }, + "jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", + "dev": true, + "requires": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + } + }, + "jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + } + }, + "jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + } + }, + "jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + } + }, + "jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "requires": {} + }, + "jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", + "dev": true + }, + "jest-resolve": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + } + }, + "jest-resolve-dependencies": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", + "dev": true, + "requires": { + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" + } + }, + "jest-runner": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", + "dev": true, + "requires": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + } + }, + "jest-runtime": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "requires": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + } + }, + "jest-snapshot": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", + "dev": true, + "requires": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + } + }, + "jest-validate": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", + "dev": true, + "requires": { + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "leven": "^3.1.0", + "pretty-format": "^29.7.0" + }, + "dependencies": { + "camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true + } + } + }, + "jest-watcher": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", + "dev": true, + "requires": { + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", + "string-length": "^4.0.1" + } + }, + "jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", + "dev": true, + "requires": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jose": { + "version": "4.15.9", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", + "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==" + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsdom": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", + "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "requires": { + "cssstyle": "^4.2.1", + "data-urls": "^5.0.0", + "decimal.js": "^10.4.3", + "form-data": "^4.0.1", + "html-encoding-sniffer": "^4.0.0", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.6", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.16", + "parse5": "^7.2.1", + "rrweb-cssom": "^0.8.0", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^5.0.0", + "w3c-xmlserializer": "^5.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^3.1.1", + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.1.0", + "ws": "^8.18.0", + "xml-name-validator": "^5.0.0" + } + }, + "jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true + }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true + }, + "just-extend": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", + "dev": true + }, + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true + }, + "leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true + }, + "lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "dev": true + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "requires": { + "semver": "^7.5.3" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "requires": { + "tmpl": "1.0.5" + } + }, + "manifesto.js": { + "version": "4.2.21", + "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz", + "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==", + "requires": { + "@edsilv/http-status-codes": "^1.0.3", + "@iiif/vocabulary": "^1.0.26", + "isomorphic-unfetch": "^3.0.0", + "lodash": "^4.17.21" + } + }, + "mariadb": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", + "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", + "requires": { + "@types/geojson": "^7946.0.14", + "@types/node": "^22.5.4", + "denque": "^2.1.0", + "iconv-lite": "^0.6.3", + "lru-cache": "^10.3.0" + }, + "dependencies": { + "@types/geojson": { + "version": "7946.0.16", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", + "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==" + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + }, + "lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + } + } + }, + "marked": { + "version": "15.0.7", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", + "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==" + }, + "math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" + }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + }, + "merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" + }, + "micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "requires": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + } + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "requires": { + "mime-db": "1.52.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "mongodb": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", + "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", + "requires": { + "@mongodb-js/saslprep": "^1.1.9", + "bson": "^6.10.3", + "mongodb-connection-string-url": "^3.0.0" + } + }, + "mongodb-connection-string-url": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", + "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", + "requires": { + "@types/whatwg-url": "^11.0.2", + "whatwg-url": "^14.1.0 || ^13.0.0" + } + }, + "morgan": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", + "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "requires": { + "basic-auth": "~2.0.1", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-finished": "~2.3.0", + "on-headers": "~1.0.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "requires": { + "ee-first": "1.1.1" + } + } + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + }, + "nise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", + "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.1", + "@sinonjs/text-encoding": "^0.7.3", + "just-extend": "^6.2.0", + "path-to-regexp": "^8.1.0" + }, + "dependencies": { + "@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1" + } + }, + "path-to-regexp": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", + "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", + "dev": true + } + } + }, + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "requires": { + "whatwg-url": "^5.0.0" + }, + "dependencies": { + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + } + } + }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node-releases": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "dev": true + }, + "nodemailer": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz", + "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==" + }, + "nodemon": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", + "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", + "dev": true, + "requires": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "nwsapi": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", + "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, + "object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + }, + "dependencies": { + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + } + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, + "parse-svg-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", + "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", + "optional": true + }, + "parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "requires": { + "entities": "^4.5.0" + } + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "path-to-regexp": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" + }, + "picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pirates": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "requires": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true + } + } + }, + "prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + } + }, + "proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "requires": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + } + }, + "pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true + }, + "punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" + }, + "pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "dev": true + }, + "qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "requires": { + "side-channel": "^1.0.6" + } + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true + }, + "resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "requires": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + }, + "resolve.exports": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "dev": true + }, + "rrweb-cssom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", + "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==" + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "requires": { + "xmlchars": "^2.2.0" + } + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + }, + "send": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + } + } + }, + "serve-static": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "requires": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.19.0" + } + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "requires": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + } + }, + "side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "requires": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + } + }, + "side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "requires": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + } + }, + "side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "requires": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + } + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "requires": { + "semver": "^7.5.3" + }, + "dependencies": { + "semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true + } + } + }, + "sinon": { + "version": "19.0.5", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", + "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.5", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", + "nise": "^6.1.1", + "supports-color": "^7.2.0" + }, + "dependencies": { + "@sinonjs/fake-timers": { + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^3.0.1" + } + } + } + }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "requires": { + "memory-pager": "^1.0.2" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "requires": { + "escape-string-regexp": "^2.0.0" + } + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + }, + "string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "requires": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "superagent": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", + "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", + "dev": true, + "requires": { + "component-emitter": "^1.3.0", + "cookiejar": "^2.1.4", + "debug": "^4.3.4", + "fast-safe-stringify": "^2.1.1", + "form-data": "^4.0.0", + "formidable": "^3.5.1", + "methods": "^1.1.2", + "mime": "2.6.0", + "qs": "^6.11.0" + }, + "dependencies": { + "mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true + } + } + }, + "supertest": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz", + "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==", + "dev": true, + "requires": { + "methods": "^1.1.2", + "superagent": "^9.0.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, + "svg-arc-to-cubic-bezier": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", + "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==", + "optional": true + }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, + "tldts": { + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", + "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", + "requires": { + "tldts-core": "^6.1.85" + } + }, + "tldts-core": { + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", + "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==" + }, + "tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + }, + "touch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", + "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", + "dev": true + }, + "tough-cookie": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", + "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==", + "requires": { + "tldts": "^6.1.32" + } + }, + "tr46": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", + "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "requires": { + "punycode": "^2.3.1" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, + "undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + }, + "unfetch": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", + "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" + }, + "update-browserslist-db": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "dev": true, + "requires": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + } + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" + }, + "v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + } + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" + }, + "w3c-xmlserializer": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", + "requires": { + "xml-name-validator": "^5.0.0" + } + }, + "walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "requires": { + "makeerror": "1.0.12" + } + }, + "webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" + }, + "whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "requires": { + "iconv-lite": "0.6.3" + }, + "dependencies": { + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + } + } + }, + "whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" + }, + "whatwg-url": { + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "requires": { + "tr46": "^5.1.0", + "webidl-conversions": "^7.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + } + }, + "ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "requires": {} + }, + "xml-name-validator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==" + }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "requires": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + } + }, + "yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true + } + } + }, + "tr46": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", + "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "requires": { + "punycode": "^2.3.1" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, + "undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + }, + "unfetch": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", + "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" + }, + "update-browserslist-db": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "dev": true, + "requires": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + } + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" + }, + "v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + } + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" + }, + "w3c-xmlserializer": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", + "requires": { + "xml-name-validator": "^5.0.0" + } + }, + "walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "requires": { + "makeerror": "1.0.12" + } + }, + "webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" + }, + "whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "requires": { + "iconv-lite": "0.6.3" + }, + "dependencies": { + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + } + } + }, + "whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" + }, + "whatwg-url": { + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "requires": { + "tr46": "^5.1.0", + "webidl-conversions": "^7.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + } + }, + "ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "requires": {} + }, + "xml-name-validator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==" + }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "requires": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + } + }, + "yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true + } } } diff --git a/page/index.mjs b/page/index.mjs index 26206959..ef6b81d6 100644 --- a/page/index.mjs +++ b/page/index.mjs @@ -12,31 +12,53 @@ router.use( router.route('/:id?') .get(async (req, res, next) => { - let id = req.params.id - - if (id) { - if (!utils.validateID(id)) { - utils.respondWithError(res, 400, 'The TPEN3 page ID must be a number') + const { projectId, layerId, pageId } = req.params + const pageObject = await findPageById(pageId, layerId, projectId) + if (!pageObject) { + utils.respondWithError(res, 404, 'No page found with that ID.') return } - id = parseInt(id) - const pageObject = await service.findPageById(id) - if (pageObject) { - respondWithPage(res, pageObject) - } else { - utils.respondWithError(res, 404, `TPEN3 page "${id}" does not exist.`) + // build as AnnotationPage + const pageAsAnnotationPage = { + '@context': 'http://www.w3.org/ns/anno.jsonld', + id: pageObject.id, + type: 'AnnotationPage', + label: { none: [pageObject.label] }, + target: pageObject.target, + partOf: pageObject.partOf, + items: pageObject.items ?? [], + prev: pageObject.prev ?? null, + next: pageObject.next ?? null } - } else { - utils.respondWithError(res, 400, 'No page ID provided') - } + res.status(200).json(pageAsAnnotationPage) }) .all((req, res, next) => { utils.respondWithError(res, 405, 'Improper request method, please use GET.') }) -function respondWithPage(res, pageObject) { - res.set('Content-Type', 'application/json; charset=utf-8') - res.status(200).json(pageObject) -} - export default router + +async function findPageById(pageId, layerId, projectId) { + if (pageId.startsWith(process.env.RERUMIDPREFIX)) { + return fetch(pageId).then(res => res.json()) + } + const p = await Project.getById(projectId) + if (!p) { + const error = new Error(`Project with ID '${projectId}' not found`) + error.status = 404 + throw error + } + const layer = p.layers.find(layer => layer.id === layerId) + if (!layer) { + const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) + error.status = 404 + throw error + } + const page = layer.pages.find(page => page.id === pageId) + if (!page) { + const error = new Error(`Page with ID '${pageId}' not found in layer '${layerId}'`) + error.status = 404 + throw error + } + return page +} diff --git a/project/index.mjs b/project/index.mjs index 7b092c36..3262ae80 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -7,11 +7,15 @@ import ProjectFactory from "../classes/Project/ProjectFactory.mjs" import validateURL from "../utilities/validateURL.mjs" import Project from "../classes/Project/Project.mjs" import Layer from "../classes/Layer/Layer.mjs" +import Page from "../classes/Page/Page.mjs" import { isValidEmail } from "../utilities/validateEmail.mjs" import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.mjs" import Group from "../classes/Group/Group.mjs" import scrubDefaultRoles from "../utilities/isDefaultRole.mjs" import Hotkeys from "../classes/HotKeys/Hotkeys.js" +import path from "path" +import fs from "fs" +import layerRouter from "../layer/index.mjs" let router = express.Router() router.use(cors(common_cors)) @@ -644,6 +648,44 @@ router.route("/:projectId/layer/:layerId").put(auth0Middleware(), async (req, re } }) +// Adding annotations to pages within a specific layer within a project +router.route("/:projectId/layer/:layerId/page/:pageId/save").post(auth0Middleware(), async (req, res) => { + const { projectId, layerId, pageId } = req.params + const user = req.user + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + try { + const project = new Project(projectId) + + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + return respondWithError(res, 403, "You do not have permission to add annotations to this page.") + } + + const layers = await project.loadProject() + + if(!project || layers === null) { + return respondWithError(res, 404, "Project does not exist.") + } + + const layer = new Layer(layers) + if (layer.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`) === undefined) { + return respondWithError(res, 400, "Layer not found in project.") + } + + const pages = new Page(layers) + if (pages.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`).pages.find(page => String(page.id).split("/").pop() === `${pageId}`) === undefined) { + return respondWithError(res, 400, "Page not found in layer.") + } + + const response = await pages.saveCollectionToRerum(projectId, layerId) + res.status(200).json(response) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error adding annotations to page.") + } +}) + // Update Project Metadata router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { const { projectId } = req.params @@ -1004,4 +1046,7 @@ router.route("/:projectId/hotkeys").all((_, res) => { respondWithError(res, 405, "Improper request method. Use GET, PUT, or DELETE instead") }) -export default router \ No newline at end of file +// Nested route for layers within a project +router.use('/:projectId/layer', layerRouter) + +export default router From e9971bc0bc892a9391f4918bffb45e65fddae550 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Fri, 25 Apr 2025 12:18:30 -0500 Subject: [PATCH 050/262] Update index.mjs --- project/index.mjs | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/project/index.mjs b/project/index.mjs index 3262ae80..0adbea13 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -169,6 +169,73 @@ router respondWithError(res, 405, "Improper request method. Use GET instead") }) + function patchTokenFromQuery(req, res, next) { + if (!req.headers.authorization && req.query.token) { + req.headers.authorization = `Bearer ${req.query.token}` + } + next() + } + +router + .route("/import28") + .get(patchTokenFromQuery, auth0Middleware(), async (req, res) => { + const user = req.user + const jsessionid = req.query.jsessionid + + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + if (!jsessionid) { + return respondWithError(res, 400, "Missing jsessionid in query") + } + + try { + const response = await fetch( + "http://localhost:8080/TPEN/getProjectTPENServlet?projectID=9183", + { + method: "GET", + headers: { + Cookie: `JSESSIONID=${jsessionid}`, + }, + credentials: "include", + } + ) + + const rawText = await response.text() + let parsedData + + try { + const firstLevel = JSON.parse(rawText) + parsedData = {} + + for (const [key, value] of Object.entries(firstLevel)) { + try { + parsedData[key] = JSON.parse(value) + } catch { + parsedData[key] = value + } + } + + } catch (err) { + console.error("Failed to parse project response:", err) + return respondWithError(res, 500, "Invalid project response format") + } + + return res.status(200).json({ + message: "Project 9183 Dummy", + data: parsedData, + }) + + } catch (error) { + console.error("Error fetching project data:", error) + return respondWithError(res, 500, "Error fetching project data") + } + }) + .all((req, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") + }) + router .route("/:id/invite-member") .post(auth0Middleware(), async (req, res) => { From 5dd077e02ca0a4fddf9df52e959a519e7368769d Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Fri, 25 Apr 2025 14:33:53 -0500 Subject: [PATCH 051/262] Update index.mjs --- project/index.mjs | 135 +++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/project/index.mjs b/project/index.mjs index 0adbea13..1204de92 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -16,6 +16,7 @@ import Hotkeys from "../classes/HotKeys/Hotkeys.js" import path from "path" import fs from "fs" import layerRouter from "../layer/index.mjs" +import cookieParser from "cookie-parser" let router = express.Router() router.use(cors(common_cors)) @@ -96,6 +97,73 @@ router respondWithError(res, 405, "Improper request method. Use POST instead") }) + function patchTokenFromQuery(req, res, next) { + if (!req.headers.authorization && req.query.token) { + req.headers.authorization = `Bearer ${req.query.token}` + } + next() + } + +router + .route("/import28") + .get(patchTokenFromQuery, auth0Middleware(), cookieParser(), async (req, res) => { + const user = req.user + const jsessionid = req.cookies.JSESSIONID + + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + if (!jsessionid) { + return respondWithError(res, 400, "Missing jsessionid in query") + } + + try { + const response = await fetch( + "http://localhost:8080/TPEN/getProjectTPENServlet?projectID=9183", + { + method: "GET", + headers: { + Cookie: `JSESSIONID=${jsessionid}`, + }, + credentials: "include", + } + ) + + const rawText = await response.text() + let parsedData + + try { + const firstLevel = JSON.parse(rawText) + parsedData = {} + + for (const [key, value] of Object.entries(firstLevel)) { + try { + parsedData[key] = JSON.parse(value) + } catch { + parsedData[key] = value + } + } + + } catch (err) { + console.error("Failed to parse project response:", err) + return respondWithError(res, 500, "Invalid project response format") + } + + return res.status(200).json({ + message: "Project 9183 Dummy", + data: parsedData, + }) + + } catch (error) { + console.error("Error fetching project data:", error) + return respondWithError(res, 500, "Error fetching project data") + } + }) + .all((req, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") + }) + router .route("/:id/manifest") .get(auth0Middleware(), async (req, res) => { @@ -169,73 +237,6 @@ router respondWithError(res, 405, "Improper request method. Use GET instead") }) - function patchTokenFromQuery(req, res, next) { - if (!req.headers.authorization && req.query.token) { - req.headers.authorization = `Bearer ${req.query.token}` - } - next() - } - -router - .route("/import28") - .get(patchTokenFromQuery, auth0Middleware(), async (req, res) => { - const user = req.user - const jsessionid = req.query.jsessionid - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!jsessionid) { - return respondWithError(res, 400, "Missing jsessionid in query") - } - - try { - const response = await fetch( - "http://localhost:8080/TPEN/getProjectTPENServlet?projectID=9183", - { - method: "GET", - headers: { - Cookie: `JSESSIONID=${jsessionid}`, - }, - credentials: "include", - } - ) - - const rawText = await response.text() - let parsedData - - try { - const firstLevel = JSON.parse(rawText) - parsedData = {} - - for (const [key, value] of Object.entries(firstLevel)) { - try { - parsedData[key] = JSON.parse(value) - } catch { - parsedData[key] = value - } - } - - } catch (err) { - console.error("Failed to parse project response:", err) - return respondWithError(res, 500, "Invalid project response format") - } - - return res.status(200).json({ - message: "Project 9183 Dummy", - data: parsedData, - }) - - } catch (error) { - console.error("Error fetching project data:", error) - return respondWithError(res, 500, "Error fetching project data") - } - }) - .all((req, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") - }) - router .route("/:id/invite-member") .post(auth0Middleware(), async (req, res) => { From 0906084f2ebeaa966caf86999c3c2bc85300a314 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Fri, 25 Apr 2025 14:50:54 -0500 Subject: [PATCH 052/262] Update index.mjs --- project/index.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/index.mjs b/project/index.mjs index 1204de92..142028f5 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -98,8 +98,8 @@ router }) function patchTokenFromQuery(req, res, next) { - if (!req.headers.authorization && req.query.token) { - req.headers.authorization = `Bearer ${req.query.token}` + if (!req.headers.authorization && req.cookies.userToken) { + req.headers.authorization = `Bearer ${req.cookies.userToken}` } next() } From 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Fri, 25 Apr 2025 14:56:11 -0500 Subject: [PATCH 053/262] Update index.mjs --- project/index.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/index.mjs b/project/index.mjs index 142028f5..8551f602 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -120,7 +120,7 @@ router try { const response = await fetch( - "http://localhost:8080/TPEN/getProjectTPENServlet?projectID=9183", + "https://t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", { method: "GET", headers: { From afe664e776954a4689ae174ee7a40f69c5c5d7a6 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Mon, 28 Apr 2025 10:16:27 -0500 Subject: [PATCH 054/262] Update index.mjs --- project/index.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/index.mjs b/project/index.mjs index 8551f602..df48126d 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -120,7 +120,7 @@ router try { const response = await fetch( - "https://t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", + "https://dev.t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", { method: "GET", headers: { From b646fb7bd377bd69100f10b371c414a644d0282b Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Mon, 28 Apr 2025 12:13:40 -0500 Subject: [PATCH 055/262] Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs --- project/index.mjs | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/project/index.mjs b/project/index.mjs index 3262ae80..df48126d 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -16,6 +16,7 @@ import Hotkeys from "../classes/HotKeys/Hotkeys.js" import path from "path" import fs from "fs" import layerRouter from "../layer/index.mjs" +import cookieParser from "cookie-parser" let router = express.Router() router.use(cors(common_cors)) @@ -96,6 +97,73 @@ router respondWithError(res, 405, "Improper request method. Use POST instead") }) + function patchTokenFromQuery(req, res, next) { + if (!req.headers.authorization && req.cookies.userToken) { + req.headers.authorization = `Bearer ${req.cookies.userToken}` + } + next() + } + +router + .route("/import28") + .get(patchTokenFromQuery, auth0Middleware(), cookieParser(), async (req, res) => { + const user = req.user + const jsessionid = req.cookies.JSESSIONID + + if (!user) { + return respondWithError(res, 401, "Unauthenticated request") + } + + if (!jsessionid) { + return respondWithError(res, 400, "Missing jsessionid in query") + } + + try { + const response = await fetch( + "https://dev.t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", + { + method: "GET", + headers: { + Cookie: `JSESSIONID=${jsessionid}`, + }, + credentials: "include", + } + ) + + const rawText = await response.text() + let parsedData + + try { + const firstLevel = JSON.parse(rawText) + parsedData = {} + + for (const [key, value] of Object.entries(firstLevel)) { + try { + parsedData[key] = JSON.parse(value) + } catch { + parsedData[key] = value + } + } + + } catch (err) { + console.error("Failed to parse project response:", err) + return respondWithError(res, 500, "Invalid project response format") + } + + return res.status(200).json({ + message: "Project 9183 Dummy", + data: parsedData, + }) + + } catch (error) { + console.error("Error fetching project data:", error) + return respondWithError(res, 500, "Error fetching project data") + } + }) + .all((req, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") + }) + router .route("/:id/manifest") .get(auth0Middleware(), async (req, res) => { From fd23a3ec405515369f806437eae9d6c157fd1bb1 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Mon, 28 Apr 2025 15:22:17 -0500 Subject: [PATCH 056/262] Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs --- classes/Page/__tests__/exists.test.mjs | 2 +- classes/Project/ProjectFactory.mjs | 2 - .../Project/__tests__/exists_unit.test.mjs | 37 +++------ .../__tests__/functionality_unit.test.mjs | 79 ------------------- package-lock.json | 2 +- package.json | 2 +- page/__tests__/end_to_end_unit.test.mjs | 32 ++++---- page/__tests__/exists_unit.test.mjs | 15 ---- page/__tests__/functionality_unit.test.mjs | 19 ----- page/index.mjs | 7 +- page/page.mjs | 27 ------- 11 files changed, 34 insertions(+), 190 deletions(-) delete mode 100644 classes/Project/__tests__/functionality_unit.test.mjs delete mode 100644 page/__tests__/exists_unit.test.mjs delete mode 100644 page/__tests__/functionality_unit.test.mjs delete mode 100644 page/page.mjs diff --git a/classes/Page/__tests__/exists.test.mjs b/classes/Page/__tests__/exists.test.mjs index 91df614e..8fc5a46f 100644 --- a/classes/Page/__tests__/exists.test.mjs +++ b/classes/Page/__tests__/exists.test.mjs @@ -6,10 +6,10 @@ describe('Page Class looks how we expect it to. #Page_exists_unit', () => { }) const page = new Page("layerID", { id: "canvasID", label: "Canvas Label", target: "https://example.com/canvas" }) - it('has expected methods', () => { expect(typeof page.update).toBe('function') expect(typeof page.delete).toBe('function') + expect(typeof Page.build).toBe('function') }) it('has expected properties', () => { diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.mjs index 60d052a7..9785817c 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.mjs @@ -31,8 +31,6 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now const metadata = manifest.metadata ?? [] - const pages = await ProjectFactory.buildPagesFromCanvases(manifest.items) - const layer = Layer.build( null, `First Layer - ${label}`, manifest.items ) // required properties: id, label, metadata, manifest, layers diff --git a/classes/Project/__tests__/exists_unit.test.mjs b/classes/Project/__tests__/exists_unit.test.mjs index 8a2fb2c3..a55b6324 100644 --- a/classes/Project/__tests__/exists_unit.test.mjs +++ b/classes/Project/__tests__/exists_unit.test.mjs @@ -14,10 +14,6 @@ describe("ProjectFactory Class #importTests", () => { expect(typeof ProjectFactory.DBObjectFromManifest).toBe("function") }) - it("should have a static buildPagesFromCanvases method", () => { - expect(typeof ProjectFactory.buildPagesFromCanvases).toBe("function") - }) - it("should have a static fromManifest method", () => { expect(typeof ProjectFactory.fromManifestURL).toBe("function") }) @@ -27,31 +23,22 @@ describe("ProjectFactory Class #importTests", () => { describe("Project Class ", () => { it("should have a constructor", () => { - expect(Project.prototype.constructor).toBeInstanceOf(Function); - }); + expect(Project.prototype.constructor).toBeInstanceOf(Function) + }) it("should have a create method", () => { - expect(typeof Project.prototype.create).toBe("function"); - }); + expect(typeof Project.prototype.create).toBe("function") + }) - it("should have an sendInvite method", () => { - expect(typeof Project.prototype.sendInvite).toBe("function"); - }); + it("should have a sendInvite method", () => { + expect(typeof Project.prototype.sendInvite).toBe("function") + }) it("should have a removeMember method", () => { - expect(typeof Project.prototype.removeMember).toBe("function"); - }); + expect(typeof Project.prototype.removeMember).toBe("function") + }) it("should have a checkUserAccess method", () => { - expect(typeof Project.prototype.checkUserAccess).toBe("function"); - }); - - it("should have a inviteExistingTPENUser method", () => { - expect(typeof Project.prototype.inviteExistingTPENUser).toBe("function"); - }); - - it("should have a inviteNewTPENUser method", () => { - expect(typeof Project.prototype.inviteNewTPENUser).toBe("function"); - }); - -}); + expect(typeof Project.prototype.checkUserAccess).toBe("function") + }) +}) diff --git a/classes/Project/__tests__/functionality_unit.test.mjs b/classes/Project/__tests__/functionality_unit.test.mjs deleted file mode 100644 index 664a7f0c..00000000 --- a/classes/Project/__tests__/functionality_unit.test.mjs +++ /dev/null @@ -1,79 +0,0 @@ -import {jest} from "@jest/globals" -import ProjectFactory from "../ProjectFactory.mjs" - -describe("ProjectFactory.DBObjectFromManifest/buildPagesFromCanvases #importTests", () => { - it("should process the manifest correctly with layers", async () => { - const mockManifest = { - "@id": "http://example.com/manifest/1", - label: "Example Manifest", - metadata: [{label: "Author", name: "Voo Onoja"}], - items: [ - { - "@id": "http://example.com/canvas/1", - otherContent: [ - { - on: "http://example.com/canvas/1", - resources: [ - { - "@id": "http://example.com/line/1", - type: "Line", - value: "Sample Text" - } - ] - } - ] - } - ] - } - - jest.spyOn(ProjectFactory, "buildPagesFromCanvases").mockResolvedValue([ - { - "@id": "http://example.com/canvas/1", - "@type": "Layer", - pages: [ - { - canvas: "http://example.com/canvas/1", - lines: [ - { - "@id": "http://example.com/line/1", - type: "Line", - value: "Sample Text" - } - ] - } - ] - } - ]) - - const expectedProject = { - label: "Example Manifest", - metadata: [{label: "Author", name: "Voo Onoja"}], - "@context": "http://t-pen.org/3/context.json", - manifest: "http://example.com/manifest/1", - layers: [ - { - "@id": "http://example.com/canvas/1", - "@type": "Layer", - pages: [ - { - canvas: "http://example.com/canvas/1", - lines: [ - { - "@id": "http://example.com/line/1", - type: "Line", - value: "Sample Text" - } - ] - } - ] - } - ] - } - - const result = await ProjectFactory.DBObjectFromManifest(mockManifest) - - expect(ProjectFactory.buildPagesFromCanvases).toHaveBeenCalledWith( - mockManifest.items - ) - }) -}) diff --git a/package-lock.json b/package-lock.json index e6fc08ac..c3f867ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "supertest": "^7.0.0" }, "engines": { - "node": ">=22.12.0" + "node": ">=22.15.0" } }, "node_modules/@ampproject/remapping": { diff --git a/package.json b/package.json index 9fd0926a..aae510b7 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,6 @@ "supertest": "^7.0.0" }, "engines": { - "node": ">=22.12.0" + "node": ">=22.15.0" } } diff --git a/page/__tests__/end_to_end_unit.test.mjs b/page/__tests__/end_to_end_unit.test.mjs index efd22769..425d64fc 100644 --- a/page/__tests__/end_to_end_unit.test.mjs +++ b/page/__tests__/end_to_end_unit.test.mjs @@ -3,48 +3,49 @@ import express from 'express' import request from 'supertest' const routeTester = new express() -routeTester.use("/page", pageRouter) +routeTester.use("/", pageRouter) describe('page endpoint end to end unit test (spinning up the endpoint and using it). #end2end_unit', () => { - it('POST instead of GET. That status should be 405 with a message.', async () => { + it('POST instead of GET. That status should be 405 with a message.', async () => { const res = await request(routeTester) - .post('/page/') + .post('/dummyId') expect(res.statusCode).toBe(405) expect(res.body).toBeTruthy() }) - it('PUT instead of GET. That status should be 405 with a message.', async () => { + it('PUT instead of GET. That status should be 405 with a message.', async () => { const res = await request(routeTester) - .put('/page/') + .put('/dummyId') expect(res.statusCode).toBe(405) expect(res.body).toBeTruthy() }) - it('PATCH instead of GET. That status should be 405 with a message.', async () => { + it('PATCH instead of GET. That status should be 405 with a message.', async () => { const res = await request(routeTester) - .patch('/page/') + .patch('/dummyId') expect(res.statusCode).toBe(405) expect(res.body).toBeTruthy() }) - it('Call to /page without a TPEN3 page ID. The status should be 400 with a message.', async () => { + it('Call to /page without a TPEN3 page ID. The status should be 404.', async () => { const res = await request(routeTester) - .get('/page/') - expect(res.statusCode).toBe(400) + .get('/') + expect(res.statusCode).toBe(404) expect(res.body).toBeTruthy() }) - it('Call to /page with a TPEN3 page ID that does not exist. The status should be 404 with a message.', async () => { + // These two cannot work without a corresponding project, so it will need to be rewritten + it.skip('Call to /page with a TPEN3 page ID that does not exist. The status should be 404 with a message.', async () => { const res = await request(routeTester) - .get('/page/0001') + .get('/0001') expect(res.statusCode).toBe(404) expect(res.body).toBeTruthy() }) - it('Call to /page with a TPEN3 page ID that does exist. The status should be 200 with a JSON page in the body.', async () => { + it.skip('Call to /page with a TPEN3 page ID that does exist. The status should be 200 with a JSON page in the body.', async () => { const res = await request(routeTester) - .get('/page/123') + .get('/123') let json = res.body try{ json = JSON.parse(JSON.stringify(json)) @@ -54,5 +55,4 @@ describe('page endpoint end to end unit test (spinning up the endpoint and using } expect(json).not.toBe(null) }) - -}) \ No newline at end of file +}) diff --git a/page/__tests__/exists_unit.test.mjs b/page/__tests__/exists_unit.test.mjs deleted file mode 100644 index c971edea..00000000 --- a/page/__tests__/exists_unit.test.mjs +++ /dev/null @@ -1,15 +0,0 @@ -import app from '../../app.mjs' - -describe('page endpoint availability unit test (via a check on the app routes). #exists_unit', () => { - it('responds to /page/id', () => { - let exists = false - const stack = app._router.stack - for(const middleware of stack){ - if(middleware.regexp && middleware.regexp.toString().includes("/page")) { - exists = true - break - } - } - expect(exists).toBe(true) - }) -}) \ No newline at end of file diff --git a/page/__tests__/functionality_unit.test.mjs b/page/__tests__/functionality_unit.test.mjs deleted file mode 100644 index 91f3ff38..00000000 --- a/page/__tests__/functionality_unit.test.mjs +++ /dev/null @@ -1,19 +0,0 @@ -import {findPageById} from '../page.mjs' -import {validateID} from '../../utilities/shared.mjs' - -// These test the pieces of functionality in the route that make it work. -describe('Page endpoint functionality unit test (just testing helper functions). #functions_unit', () => { - - it('No TPEN3 page id provided. Page validation must be false.', () => { - expect(validateID()).toBe(false) - }) - it('Detect TPEN3 page does not exist. The query for a TPEN3 page must be null.', async () => { - const page = await findPageById(-111) - expect(page).toBe(null) - }) - it('TPEN3 page does exist. Finding the page results in the page JSON', async () => { - let page = await findPageById(123) - expect(page).not.toBe(null) - }) - -}) diff --git a/page/index.mjs b/page/index.mjs index ef6b81d6..6a9f46f6 100644 --- a/page/index.mjs +++ b/page/index.mjs @@ -1,6 +1,5 @@ import express from 'express' import * as utils from '../utilities/shared.mjs' -import * as service from './page.mjs' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} @@ -10,7 +9,7 @@ router.use( cors(common_cors) ) -router.route('/:id?') +router.route('/:id') .get(async (req, res, next) => { const { projectId, layerId, pageId } = req.params const pageObject = await findPageById(pageId, layerId, projectId) @@ -39,10 +38,10 @@ router.route('/:id?') export default router async function findPageById(pageId, layerId, projectId) { - if (pageId.startsWith(process.env.RERUMIDPREFIX)) { + if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { return fetch(pageId).then(res => res.json()) } - const p = await Project.getById(projectId) + const p = await Project?.getById(projectId) if (!p) { const error = new Error(`Project with ID '${projectId}' not found`) error.status = 404 diff --git a/page/page.mjs b/page/page.mjs deleted file mode 100644 index e8e4aa23..00000000 --- a/page/page.mjs +++ /dev/null @@ -1,27 +0,0 @@ -import * as utils from "../utilities/shared.mjs" - -export async function findPageById(id = null) { - let page = null - - if (!utils.validateID(id)) { - return page - } - - const mockPause = new Promise((resolve) => { - setTimeout(() => { - resolve(null) - }, 1500) - }) - - const pageArray = [ - { id: 123, text: "welcome to the page" } - ] - - page = pageArray.find((page) => page.id === id) || null - - if (page === null) { - page = await mockPause - } - - return page - } From e7704b4632449d305de3080e3a4c7a84026100f2 Mon Sep 17 00:00:00 2001 From: cubap Date: Mon, 28 Apr 2025 15:52:17 -0500 Subject: [PATCH 057/262] un-mjs --- ...o_end.test.mjs => full_end_to_end.test.js} | 4 +- app.mjs => app.js | 0 .../{auth_unit_test.mjs => auth_unit_test.js} | 0 auth/{index.mjs => index.js} | 2 +- bin/{tpen3_services.mjs => tpen3_services.js} | 0 classes/Group/{Group.mjs => Group.js} | 2 +- .../{Group.test.mjs => Group.test.js} | 2 +- classes/HotKeys/Hotkeys.js | 2 +- classes/Layer/{Layer.mjs => Layer.js} | 4 +- .../{exists.test.mjs => exists.test.js} | 2 +- classes/Line/{Line.mjs => Line.js} | 0 .../{exists.test.mjs => exists.test.js} | 2 +- classes/Page/{Page.mjs => Page.js} | 2 +- .../{exists.test.mjs => exists.test.js} | 2 +- classes/Project/{Project.mjs => Project.js} | 2 +- .../{ProjectFactory.mjs => ProjectFactory.js} | 4 +- .../{Project.test.mjs => Project.test.js} | 4 +- ...ists_unit.test.mjs => exists_unit.test.js} | 4 +- classes/User/{User.mjs => User.js} | 2 +- .../{exists.test.mjs => exists.test.js} | 2 +- .../__tests__/{unit.test.mjs => unit.test.js} | 2 +- .../__tests__/{unit.test.mjs => unit.test.js} | 2 +- database/{driver.mjs => driver.js} | 6 +-- .../__tests__/{unit.test.mjs => unit.test.js} | 0 .../maria/{controller.mjs => controller.js} | 0 .../__tests__/{unit.test.mjs => unit.test.js} | 2 +- .../mongo/{controller.mjs => controller.js} | 0 .../__tests__/{unit.test.mjs => unit.test.js} | 0 .../tiny/{controller.mjs => controller.js} | 0 index.mjs => index.js | 0 jest.config.mjs => jest.config.js | 0 layer/{index.mjs => index.js} | 0 ..._unit.test.mjs => end_to_end_unit.test.js} | 0 ...ists_unit.test.mjs => exists_unit.test.js} | 0 ...it.test.mjs => functionality_unit.test.js} | 0 line/{index.mjs => index.js} | 0 line/{line.mjs => line.js} | 0 ..._unit.test.mjs => end_to_end_unit.test.js} | 0 ...ists_unit.test.mjs => exists_unit.test.js} | 0 ...it.test.mjs => functionality_unit.test.js} | 0 manifest/{index.mjs => index.js} | 0 manifest/{manifest.mjs => manifest.js} | 0 ..._unit.test.mjs => end_to_end_unit.test.js} | 0 page/{index.mjs => index.js} | 0 ..._unit.test.mjs => end_to_end_unit.test.js} | 2 +- ...ists_unit.test.mjs => exists_unit.test.js} | 0 ...eckPermissions.mjs => checkPermissions.js} | 0 .../{permissions.mjs => permissions.js} | 0 ...rameters.mjs => permissions_parameters.js} | 0 project/groups/{roles.mjs => roles.js} | 0 project/{index.mjs => index.js} | 37 +++++++++++-------- ..._unit.test.mjs => end_to_end_unit.test.js} | 10 ++--- ...ists_unit.test.mjs => exists_unit.test.js} | 2 +- ...it.test.mjs => functionality_unit.test.js} | 4 +- userProfile/{index.mjs => index.js} | 4 +- .../{privateProfile.mjs => privateProfile.js} | 6 +-- ...ultRole.test.mjs => isDefaultRole.test.js} | 4 +- utilities/{getHash.mjs => getHash.js} | 0 .../{isDefaultRole.mjs => isDefaultRole.js} | 2 +- utilities/mailer/{index.mjs => index.js} | 0 ...moveProperties.mjs => removeProperties.js} | 0 utilities/{shared.mjs => shared.js} | 4 +- utilities/{token.mjs => token.js} | 2 +- .../{validateEmail.mjs => validateEmail.js} | 0 ...validatePayload.mjs => validatePayload.js} | 0 utilities/{validateURL.mjs => validateURL.js} | 0 utilities/{vault.mjs => vault.js} | 0 67 files changed, 68 insertions(+), 63 deletions(-) rename __tests__/{full_end_to_end.test.mjs => full_end_to_end.test.js} (97%) rename app.mjs => app.js (100%) rename auth/__tests__/{auth_unit_test.mjs => auth_unit_test.js} (100%) rename auth/{index.mjs => index.js} (98%) rename bin/{tpen3_services.mjs => tpen3_services.js} (100%) rename classes/Group/{Group.mjs => Group.js} (99%) rename classes/Group/__tests__/{Group.test.mjs => Group.test.js} (98%) rename classes/Layer/{Layer.mjs => Layer.js} (98%) rename classes/Layer/__tests__/{exists.test.mjs => exists.test.js} (97%) rename classes/Line/{Line.mjs => Line.js} (100%) rename classes/Line/__tests__/{exists.test.mjs => exists.test.js} (97%) rename classes/Page/{Page.mjs => Page.js} (98%) rename classes/Page/__tests__/{exists.test.mjs => exists.test.js} (97%) rename classes/Project/{Project.mjs => Project.js} (99%) rename classes/Project/{ProjectFactory.mjs => ProjectFactory.js} (99%) rename classes/Project/__tests__/{Project.test.mjs => Project.test.js} (95%) rename classes/Project/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (93%) rename classes/User/{User.mjs => User.js} (98%) rename classes/User/__tests__/{exists.test.mjs => exists.test.js} (94%) rename classes/User/__tests__/{unit.test.mjs => unit.test.js} (99%) rename database/__tests__/{unit.test.mjs => unit.test.js} (98%) rename database/{driver.mjs => driver.js} (98%) rename database/maria/__tests__/{unit.test.mjs => unit.test.js} (100%) rename database/maria/{controller.mjs => controller.js} (100%) rename database/mongo/__tests__/{unit.test.mjs => unit.test.js} (99%) rename database/mongo/{controller.mjs => controller.js} (100%) rename database/tiny/__tests__/{unit.test.mjs => unit.test.js} (100%) rename database/tiny/{controller.mjs => controller.js} (100%) rename index.mjs => index.js (100%) rename jest.config.mjs => jest.config.js (100%) rename layer/{index.mjs => index.js} (100%) rename line/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (100%) rename line/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (100%) rename line/__tests__/{functionality_unit.test.mjs => functionality_unit.test.js} (100%) rename line/{index.mjs => index.js} (100%) rename line/{line.mjs => line.js} (100%) rename manifest/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (100%) rename manifest/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (100%) rename manifest/__tests__/{functionality_unit.test.mjs => functionality_unit.test.js} (100%) rename manifest/{index.mjs => index.js} (100%) rename manifest/{manifest.mjs => manifest.js} (100%) rename page/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (100%) rename page/{index.mjs => index.js} (100%) rename project/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (99%) rename project/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (100%) rename project/groups/{checkPermissions.mjs => checkPermissions.js} (100%) rename project/groups/{permissions.mjs => permissions.js} (100%) rename project/groups/{permissions_parameters.mjs => permissions_parameters.js} (100%) rename project/groups/{roles.mjs => roles.js} (100%) rename project/{index.mjs => index.js} (97%) rename userProfile/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (94%) rename userProfile/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (92%) rename userProfile/__tests__/{functionality_unit.test.mjs => functionality_unit.test.js} (86%) rename userProfile/{index.mjs => index.js} (95%) rename userProfile/{privateProfile.mjs => privateProfile.js} (94%) rename utilities/__tests__/{isDefaultRole.test.mjs => isDefaultRole.test.js} (92%) rename utilities/{getHash.mjs => getHash.js} (100%) rename utilities/{isDefaultRole.mjs => isDefaultRole.js} (93%) rename utilities/mailer/{index.mjs => index.js} (100%) rename utilities/{removeProperties.mjs => removeProperties.js} (100%) rename utilities/{shared.mjs => shared.js} (95%) rename utilities/{token.mjs => token.js} (94%) rename utilities/{validateEmail.mjs => validateEmail.js} (100%) rename utilities/{validatePayload.mjs => validatePayload.js} (100%) rename utilities/{validateURL.mjs => validateURL.js} (100%) rename utilities/{vault.mjs => vault.js} (100%) diff --git a/__tests__/full_end_to_end.test.mjs b/__tests__/full_end_to_end.test.js similarity index 97% rename from __tests__/full_end_to_end.test.mjs rename to __tests__/full_end_to_end.test.js index 0e92932e..aacc1f05 100644 --- a/__tests__/full_end_to_end.test.mjs +++ b/__tests__/full_end_to_end.test.js @@ -1,6 +1,6 @@ // End to end tests that spin up and test it? -import app from '../app.mjs' +import app from '../app.js' import express from 'express' import request from 'supertest' @@ -39,4 +39,4 @@ describe('Endpoint tests. #e2e', () => { expect(true).toBe(true) }) -}) \ No newline at end of file +}) diff --git a/app.mjs b/app.js similarity index 100% rename from app.mjs rename to app.js diff --git a/auth/__tests__/auth_unit_test.mjs b/auth/__tests__/auth_unit_test.js similarity index 100% rename from auth/__tests__/auth_unit_test.mjs rename to auth/__tests__/auth_unit_test.js diff --git a/auth/index.mjs b/auth/index.js similarity index 98% rename from auth/index.mjs rename to auth/index.js index a3ac6891..6fb982f7 100644 --- a/auth/index.mjs +++ b/auth/index.js @@ -1,7 +1,7 @@ import * as utils from "../utilities/shared.mjs" import { auth } from "express-oauth2-jwt-bearer" import { extractToken, extractUser, isTokenExpired } from "../utilities/token.mjs" -import User from "../classes/User/User.mjs" +import User from "../classes/User/User.js" export function authenticateUser() { return (req, res, next) => { diff --git a/bin/tpen3_services.mjs b/bin/tpen3_services.js similarity index 100% rename from bin/tpen3_services.mjs rename to bin/tpen3_services.js diff --git a/classes/Group/Group.mjs b/classes/Group/Group.js similarity index 99% rename from classes/Group/Group.mjs rename to classes/Group/Group.js index 3146029b..25ea6934 100644 --- a/classes/Group/Group.mjs +++ b/classes/Group/Group.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") export default class Group { diff --git a/classes/Group/__tests__/Group.test.mjs b/classes/Group/__tests__/Group.test.js similarity index 98% rename from classes/Group/__tests__/Group.test.mjs rename to classes/Group/__tests__/Group.test.js index 1f1ce009..4e8f4cf6 100644 --- a/classes/Group/__tests__/Group.test.mjs +++ b/classes/Group/__tests__/Group.test.js @@ -1,4 +1,4 @@ -import Group from "../Group.mjs" +import Group from "../Group.js" import dbDriver from "../../../database/driver.mjs" import { expect, jest } from "@jest/globals" diff --git a/classes/HotKeys/Hotkeys.js b/classes/HotKeys/Hotkeys.js index c52e825a..a87bd10b 100644 --- a/classes/HotKeys/Hotkeys.js +++ b/classes/HotKeys/Hotkeys.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") diff --git a/classes/Layer/Layer.mjs b/classes/Layer/Layer.js similarity index 98% rename from classes/Layer/Layer.mjs rename to classes/Layer/Layer.js index eec07b86..44457c81 100644 --- a/classes/Layer/Layer.mjs +++ b/classes/Layer/Layer.js @@ -1,9 +1,9 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") const databaseTiny = new dbDriver("tiny") -import Page from "../Page/Page.mjs" +import Page from "../Page/Page.js" export default class Layer { #tinyAction = 'create' diff --git a/classes/Layer/__tests__/exists.test.mjs b/classes/Layer/__tests__/exists.test.js similarity index 97% rename from classes/Layer/__tests__/exists.test.mjs rename to classes/Layer/__tests__/exists.test.js index d93dfb21..efe92f8b 100644 --- a/classes/Layer/__tests__/exists.test.mjs +++ b/classes/Layer/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import Layer from "../Layer.mjs" +import Layer from "../Layer.js" describe('Layer Class looks how we expect it to. #Layer_exists_unit', () => { it('Imports Layer', () => { diff --git a/classes/Line/Line.mjs b/classes/Line/Line.js similarity index 100% rename from classes/Line/Line.mjs rename to classes/Line/Line.js diff --git a/classes/Line/__tests__/exists.test.mjs b/classes/Line/__tests__/exists.test.js similarity index 97% rename from classes/Line/__tests__/exists.test.mjs rename to classes/Line/__tests__/exists.test.js index f963c80d..52da866e 100644 --- a/classes/Line/__tests__/exists.test.mjs +++ b/classes/Line/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import { Line } from "../Line.mjs" +import { Line } from "../Line.js" describe('Line Class looks how we expect it to. #Line_exists_unit', () => { it('Imports Line', () => { diff --git a/classes/Page/Page.mjs b/classes/Page/Page.js similarity index 98% rename from classes/Page/Page.mjs rename to classes/Page/Page.js index c806cc46..98a6bf81 100644 --- a/classes/Page/Page.mjs +++ b/classes/Page/Page.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const databaseTiny = new dbDriver("tiny") diff --git a/classes/Page/__tests__/exists.test.mjs b/classes/Page/__tests__/exists.test.js similarity index 97% rename from classes/Page/__tests__/exists.test.mjs rename to classes/Page/__tests__/exists.test.js index 8fc5a46f..7ece7446 100644 --- a/classes/Page/__tests__/exists.test.mjs +++ b/classes/Page/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import Page from "../Page.mjs" +import Page from "../Page.js" describe('Page Class looks how we expect it to. #Page_exists_unit', () => { it('Imports Page', () => { diff --git a/classes/Project/Project.mjs b/classes/Project/Project.js similarity index 99% rename from classes/Project/Project.mjs rename to classes/Project/Project.js index ed0d38d8..570008d3 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.js @@ -1,7 +1,7 @@ import dbDriver from "../../database/driver.mjs" import { sendMail } from "../../utilities/mailer/index.mjs" import { validateProjectPayload } from "../../utilities/validatePayload.mjs" -import User from "../User/User.mjs" +import User from "../User/User.js" import { createHash } from "node:crypto" import Group from "../Group/Group.mjs" diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.js similarity index 99% rename from classes/Project/ProjectFactory.mjs rename to classes/Project/ProjectFactory.js index 9785817c..d893d1bf 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.js @@ -1,6 +1,6 @@ -import Project from "./Project.mjs" +import Project from "./Project.js" import Group from "../Group/Group.mjs" -import User from "../User/User.mjs" +import User from "../User/User.js" import Layer from "../Layer/Layer.mjs" import dbDriver from "../../database/driver.mjs" import fs from "fs" diff --git a/classes/Project/__tests__/Project.test.mjs b/classes/Project/__tests__/Project.test.js similarity index 95% rename from classes/Project/__tests__/Project.test.mjs rename to classes/Project/__tests__/Project.test.js index 2abfc599..b430f88d 100644 --- a/classes/Project/__tests__/Project.test.mjs +++ b/classes/Project/__tests__/Project.test.js @@ -1,8 +1,8 @@ import { validateProjectPayload } from "../../../utilities/validatePayload.mjs" -import Project from "../Project.mjs"; +import Project from "../Project.js"; import dbDriver from "../../../database/driver.mjs"; import { sendMail } from "../../../utilities/mailer/index.mjs"; -import User from "../../User/User.mjs"; +import User from "../../User/User.js"; import Group from "../../Group/Group.mjs"; import { jest } from "@jest/globals"; diff --git a/classes/Project/__tests__/exists_unit.test.mjs b/classes/Project/__tests__/exists_unit.test.js similarity index 93% rename from classes/Project/__tests__/exists_unit.test.mjs rename to classes/Project/__tests__/exists_unit.test.js index a55b6324..63151de7 100644 --- a/classes/Project/__tests__/exists_unit.test.mjs +++ b/classes/Project/__tests__/exists_unit.test.js @@ -1,5 +1,5 @@ -import Project from "../Project.mjs" -import ProjectFactory from "../ProjectFactory.mjs" +import Project from "../Project.js" +import ProjectFactory from "../ProjectFactory.js" describe("ProjectFactory Class #importTests", () => { it("should have a constructor", () => { diff --git a/classes/User/User.mjs b/classes/User/User.js similarity index 98% rename from classes/User/User.mjs rename to classes/User/User.js index d952fc26..125ecd7a 100644 --- a/classes/User/User.mjs +++ b/classes/User/User.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") export default class User { diff --git a/classes/User/__tests__/exists.test.mjs b/classes/User/__tests__/exists.test.js similarity index 94% rename from classes/User/__tests__/exists.test.mjs rename to classes/User/__tests__/exists.test.js index b2070a78..ded76cf5 100644 --- a/classes/User/__tests__/exists.test.mjs +++ b/classes/User/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import User from "../User.mjs" +import User from "../User.js" const user = new User() diff --git a/classes/User/__tests__/unit.test.mjs b/classes/User/__tests__/unit.test.js similarity index 99% rename from classes/User/__tests__/unit.test.mjs rename to classes/User/__tests__/unit.test.js index 62af8274..a9ebd9c3 100644 --- a/classes/User/__tests__/unit.test.mjs +++ b/classes/User/__tests__/unit.test.js @@ -1,7 +1,7 @@ import {expect, jest} from "@jest/globals" import request from "supertest" import express from "express" -import User from "../User.mjs" +import User from "../User.js" import privateProfileRouter from "../../../userProfile/privateProfile.mjs" diff --git a/database/__tests__/unit.test.mjs b/database/__tests__/unit.test.js similarity index 98% rename from database/__tests__/unit.test.mjs rename to database/__tests__/unit.test.js index 249e4d25..6b4f85a1 100644 --- a/database/__tests__/unit.test.mjs +++ b/database/__tests__/unit.test.js @@ -6,7 +6,7 @@ * https://github.com/thehabes */ -import DatabaseDriver from "../driver.mjs" +import DatabaseDriver from "../driver.js" const TIME_OUT = process.env.DB_TEST_TIMEOUT ?? 6500 describe("Driver CRUD and query is registered. #driver_unit #db", () => { diff --git a/database/driver.mjs b/database/driver.js similarity index 98% rename from database/driver.mjs rename to database/driver.js index 6096ae9f..a98810f6 100644 --- a/database/driver.mjs +++ b/database/driver.js @@ -10,9 +10,9 @@ * */ -import TinyController from "./tiny/controller.mjs" -import MariaController from "./maria/controller.mjs" -import MongoController from "./mongo/controller.mjs" +import TinyController from "./tiny/controller.js" +import MariaController from "./maria/controller.js" +import MongoController from "./mongo/controller.js" class dbDriver { diff --git a/database/maria/__tests__/unit.test.mjs b/database/maria/__tests__/unit.test.js similarity index 100% rename from database/maria/__tests__/unit.test.mjs rename to database/maria/__tests__/unit.test.js diff --git a/database/maria/controller.mjs b/database/maria/controller.js similarity index 100% rename from database/maria/controller.mjs rename to database/maria/controller.js diff --git a/database/mongo/__tests__/unit.test.mjs b/database/mongo/__tests__/unit.test.js similarity index 99% rename from database/mongo/__tests__/unit.test.mjs rename to database/mongo/__tests__/unit.test.js index 10f8ada8..a3d3f0ef 100644 --- a/database/mongo/__tests__/unit.test.mjs +++ b/database/mongo/__tests__/unit.test.js @@ -5,7 +5,7 @@ * https://github.com/thehabes */ -import DatabaseController from "../controller.mjs" +import DatabaseController from "../controller.js" const database = new DatabaseController() const TIME_OUT = process.env.DB_TEST_TIMEOUT ?? 6500 diff --git a/database/mongo/controller.mjs b/database/mongo/controller.js similarity index 100% rename from database/mongo/controller.mjs rename to database/mongo/controller.js diff --git a/database/tiny/__tests__/unit.test.mjs b/database/tiny/__tests__/unit.test.js similarity index 100% rename from database/tiny/__tests__/unit.test.mjs rename to database/tiny/__tests__/unit.test.js diff --git a/database/tiny/controller.mjs b/database/tiny/controller.js similarity index 100% rename from database/tiny/controller.mjs rename to database/tiny/controller.js diff --git a/index.mjs b/index.js similarity index 100% rename from index.mjs rename to index.js diff --git a/jest.config.mjs b/jest.config.js similarity index 100% rename from jest.config.mjs rename to jest.config.js diff --git a/layer/index.mjs b/layer/index.js similarity index 100% rename from layer/index.mjs rename to layer/index.js diff --git a/line/__tests__/end_to_end_unit.test.mjs b/line/__tests__/end_to_end_unit.test.js similarity index 100% rename from line/__tests__/end_to_end_unit.test.mjs rename to line/__tests__/end_to_end_unit.test.js diff --git a/line/__tests__/exists_unit.test.mjs b/line/__tests__/exists_unit.test.js similarity index 100% rename from line/__tests__/exists_unit.test.mjs rename to line/__tests__/exists_unit.test.js diff --git a/line/__tests__/functionality_unit.test.mjs b/line/__tests__/functionality_unit.test.js similarity index 100% rename from line/__tests__/functionality_unit.test.mjs rename to line/__tests__/functionality_unit.test.js diff --git a/line/index.mjs b/line/index.js similarity index 100% rename from line/index.mjs rename to line/index.js diff --git a/line/line.mjs b/line/line.js similarity index 100% rename from line/line.mjs rename to line/line.js diff --git a/manifest/__tests__/end_to_end_unit.test.mjs b/manifest/__tests__/end_to_end_unit.test.js similarity index 100% rename from manifest/__tests__/end_to_end_unit.test.mjs rename to manifest/__tests__/end_to_end_unit.test.js diff --git a/manifest/__tests__/exists_unit.test.mjs b/manifest/__tests__/exists_unit.test.js similarity index 100% rename from manifest/__tests__/exists_unit.test.mjs rename to manifest/__tests__/exists_unit.test.js diff --git a/manifest/__tests__/functionality_unit.test.mjs b/manifest/__tests__/functionality_unit.test.js similarity index 100% rename from manifest/__tests__/functionality_unit.test.mjs rename to manifest/__tests__/functionality_unit.test.js diff --git a/manifest/index.mjs b/manifest/index.js similarity index 100% rename from manifest/index.mjs rename to manifest/index.js diff --git a/manifest/manifest.mjs b/manifest/manifest.js similarity index 100% rename from manifest/manifest.mjs rename to manifest/manifest.js diff --git a/page/__tests__/end_to_end_unit.test.mjs b/page/__tests__/end_to_end_unit.test.js similarity index 100% rename from page/__tests__/end_to_end_unit.test.mjs rename to page/__tests__/end_to_end_unit.test.js diff --git a/page/index.mjs b/page/index.js similarity index 100% rename from page/index.mjs rename to page/index.js diff --git a/project/__tests__/end_to_end_unit.test.mjs b/project/__tests__/end_to_end_unit.test.js similarity index 99% rename from project/__tests__/end_to_end_unit.test.mjs rename to project/__tests__/end_to_end_unit.test.js index db041bba..4f0d2a48 100644 --- a/project/__tests__/end_to_end_unit.test.mjs +++ b/project/__tests__/end_to_end_unit.test.js @@ -1,7 +1,7 @@ import projectRouter from "../index.mjs" import express from "express" import request from "supertest" -import app from "../../app.mjs" +import app from "../../app.js" import {jest} from "@jest/globals" import ProjectFactory from "../../classes/Project/ProjectFactory.mjs" import Project from "../../classes/Project/Project.mjs" diff --git a/project/__tests__/exists_unit.test.mjs b/project/__tests__/exists_unit.test.js similarity index 100% rename from project/__tests__/exists_unit.test.mjs rename to project/__tests__/exists_unit.test.js diff --git a/project/groups/checkPermissions.mjs b/project/groups/checkPermissions.js similarity index 100% rename from project/groups/checkPermissions.mjs rename to project/groups/checkPermissions.js diff --git a/project/groups/permissions.mjs b/project/groups/permissions.js similarity index 100% rename from project/groups/permissions.mjs rename to project/groups/permissions.js diff --git a/project/groups/permissions_parameters.mjs b/project/groups/permissions_parameters.js similarity index 100% rename from project/groups/permissions_parameters.mjs rename to project/groups/permissions_parameters.js diff --git a/project/groups/roles.mjs b/project/groups/roles.js similarity index 100% rename from project/groups/roles.mjs rename to project/groups/roles.js diff --git a/project/index.mjs b/project/index.js similarity index 97% rename from project/index.mjs rename to project/index.js index df48126d..351433cd 100644 --- a/project/index.mjs +++ b/project/index.js @@ -1,21 +1,21 @@ import express from "express" -import { validateID, respondWithError } from "../utilities/shared.mjs" +import { validateID, respondWithError } from "../utilities/shared.js" import cors from "cors" import common_cors from "../utilities/common_cors.json" with {type: "json"} -import auth0Middleware from "../auth/index.mjs" -import ProjectFactory from "../classes/Project/ProjectFactory.mjs" -import validateURL from "../utilities/validateURL.mjs" -import Project from "../classes/Project/Project.mjs" -import Layer from "../classes/Layer/Layer.mjs" -import Page from "../classes/Page/Page.mjs" -import { isValidEmail } from "../utilities/validateEmail.mjs" -import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.mjs" -import Group from "../classes/Group/Group.mjs" -import scrubDefaultRoles from "../utilities/isDefaultRole.mjs" +import auth0Middleware from "../auth/index.js" +import ProjectFactory from "../classes/Project/ProjectFactory.js" +import validateURL from "../utilities/validateURL.js" +import Project from "../classes/Project/Project.js" +import Layer from "../classes/Layer/Layer.js" +import Page from "../classes/Page/Page.js" +import { isValidEmail } from "../utilities/validateEmail.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" +import Group from "../classes/Group/Group.js" +import scrubDefaultRoles from "../utilities/isDefaultRole.js" import Hotkeys from "../classes/HotKeys/Hotkeys.js" import path from "path" import fs from "fs" -import layerRouter from "../layer/index.mjs" +import layerRouter from "../layer/index.js" import cookieParser from "cookie-parser" let router = express.Router() @@ -383,7 +383,8 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M return respondWithError(res, 403, "You do not have permission to remove roles from members.") } - const group = new Group(projectObj.data.group) + const groupId = projectObj.data.group + const group = new Group(groupId) await group.removeMemberRoles(collaboratorId, roles) res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) @@ -516,6 +517,7 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) if (!user) { return respondWithError(res, 401, "Unauthenticated request") } + if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { rolesToRemove = Object.keys(rolesToRemove) } @@ -858,6 +860,9 @@ router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res if (!newOwnerId) { return respondWithError(res, 400, "Provide the ID of the new owner.") } + if (user._id === newOwnerId) { + return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") + } try { const projectObj = await new Project(projectId) @@ -975,11 +980,9 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { rolesToRemove = Object.keys(rolesToRemove) } - if (typeof rolesToRemove === 'string') { rolesToRemove = rolesToRemove.split(' ') } - if (!rolesToRemove.length) { return respondWithError(res, 400, "Roles to remove must be provided as an array of strings or a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") } @@ -987,7 +990,9 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) try { // Ensure no default roles are being removed rolesToRemove = scrubDefaultRoles(rolesToRemove) - if (!rolesToRemove) return respondWithError(res, 400, `No custom roles provided.`) + if (!rolesToRemove) { + return respondWithError(res, 400, `No custom roles provided.`) + } const project = await new Project(projectId) const accessInfo = await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.ROLE) diff --git a/userProfile/__tests__/end_to_end_unit.test.mjs b/userProfile/__tests__/end_to_end_unit.test.js similarity index 94% rename from userProfile/__tests__/end_to_end_unit.test.mjs rename to userProfile/__tests__/end_to_end_unit.test.js index 3f0a5183..da2d028b 100644 --- a/userProfile/__tests__/end_to_end_unit.test.mjs +++ b/userProfile/__tests__/end_to_end_unit.test.js @@ -1,10 +1,10 @@ -import userProfileRouter from "../index.mjs" -import privateUserRouter from "../privateProfile.mjs" -import mainApp from "../../app.mjs" +import userProfileRouter from "../index.js" +import privateUserRouter from "../privateProfile.js" +import mainApp from "../../app.js" import express from "express" import request from "supertest" -import app from '../../app.mjs'; -import User from "../../classes/User/User.mjs" +import app from '../../app.js'; +import User from "../../classes/User/User.js" import {jest} from "@jest/globals" diff --git a/userProfile/__tests__/exists_unit.test.mjs b/userProfile/__tests__/exists_unit.test.js similarity index 92% rename from userProfile/__tests__/exists_unit.test.mjs rename to userProfile/__tests__/exists_unit.test.js index dba783c7..e9b2e276 100644 --- a/userProfile/__tests__/exists_unit.test.mjs +++ b/userProfile/__tests__/exists_unit.test.js @@ -1,4 +1,4 @@ -import app from '../../app.mjs' +import app from '../../app.js' describe('userProfile endpoint availability unit test (via a check on the app routes). #exists_unit', () => { it('responds to /user/id', () => { diff --git a/userProfile/__tests__/functionality_unit.test.mjs b/userProfile/__tests__/functionality_unit.test.js similarity index 86% rename from userProfile/__tests__/functionality_unit.test.mjs rename to userProfile/__tests__/functionality_unit.test.js index 7c310f2a..16f47f5e 100644 --- a/userProfile/__tests__/functionality_unit.test.mjs +++ b/userProfile/__tests__/functionality_unit.test.js @@ -1,4 +1,4 @@ - import {validateID} from '../../utilities/shared.mjs' +import {validateID} from '../../utilities/shared.js' // These test the pieces of functionality in the route that make it work. describe('Testing /user/:id helper functions) #testThis', () => { @@ -11,4 +11,4 @@ describe('Testing /user/:id helper functions) #testThis', () => { it("returns true for valid id",()=>{ expect(validateID(123)).toBe(true) }) -}) \ No newline at end of file +}) diff --git a/userProfile/index.mjs b/userProfile/index.js similarity index 95% rename from userProfile/index.mjs rename to userProfile/index.js index 4828b34e..d9d4c641 100644 --- a/userProfile/index.mjs +++ b/userProfile/index.js @@ -1,8 +1,8 @@ import express from "express" -import { respondWithError, validateID } from "../utilities/shared.mjs" +import { respondWithError, validateID } from "../utilities/shared.js" import cors from "cors" import common_cors from "../utilities/common_cors.json" with {type: "json"} -import User from "../classes/User/User.mjs" +import User from "../classes/User/User.js" let router = express.Router() router.use(cors(common_cors)) diff --git a/userProfile/privateProfile.mjs b/userProfile/privateProfile.js similarity index 94% rename from userProfile/privateProfile.mjs rename to userProfile/privateProfile.js index 0503fbc9..9dc66c86 100644 --- a/userProfile/privateProfile.mjs +++ b/userProfile/privateProfile.js @@ -1,9 +1,9 @@ import express from "express" -import {respondWithError, respondWithJSON} from "../utilities/shared.mjs" -import User from "../classes/User/User.mjs" +import {respondWithError, respondWithJSON} from "../utilities/shared.js" +import User from "../classes/User/User.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} import cors from "cors" -import auth0Middleware from "../auth/index.mjs" +import auth0Middleware from "../auth/index.js" const router = express.Router() router.use( diff --git a/utilities/__tests__/isDefaultRole.test.mjs b/utilities/__tests__/isDefaultRole.test.js similarity index 92% rename from utilities/__tests__/isDefaultRole.test.mjs rename to utilities/__tests__/isDefaultRole.test.js index 98304d27..cb4023d9 100644 --- a/utilities/__tests__/isDefaultRole.test.mjs +++ b/utilities/__tests__/isDefaultRole.test.js @@ -1,5 +1,5 @@ -import scrubDefaultRoles from '../isDefaultRole.mjs' -import Group from '../../classes/Group/Group.mjs' +import scrubDefaultRoles from '../isDefaultRole.js' +import Group from '../../classes/Group/Group.js' describe('scrubDefaultRoles function #customRole_unit', () => { beforeAll(() => { diff --git a/utilities/getHash.mjs b/utilities/getHash.js similarity index 100% rename from utilities/getHash.mjs rename to utilities/getHash.js diff --git a/utilities/isDefaultRole.mjs b/utilities/isDefaultRole.js similarity index 93% rename from utilities/isDefaultRole.mjs rename to utilities/isDefaultRole.js index ed1fc151..65f1fda8 100644 --- a/utilities/isDefaultRole.mjs +++ b/utilities/isDefaultRole.js @@ -1,4 +1,4 @@ -import Group from "../classes/Group/Group.mjs" +import Group from "../classes/Group/Group.js" export default function scrubDefaultRoles(roleName) { diff --git a/utilities/mailer/index.mjs b/utilities/mailer/index.js similarity index 100% rename from utilities/mailer/index.mjs rename to utilities/mailer/index.js diff --git a/utilities/removeProperties.mjs b/utilities/removeProperties.js similarity index 100% rename from utilities/removeProperties.mjs rename to utilities/removeProperties.js diff --git a/utilities/shared.mjs b/utilities/shared.js similarity index 95% rename from utilities/shared.mjs rename to utilities/shared.js index fec3d7eb..2c261e0c 100644 --- a/utilities/shared.mjs +++ b/utilities/shared.js @@ -1,4 +1,4 @@ -import DatabaseController from "../database/mongo/controller.mjs" +import DatabaseController from "../database/mongo/controller.js" /** * Check if the supplied input is valid JSON or not. @@ -48,4 +48,4 @@ export function respondWithJSON(res, status, json){ res.set("Content-Type", "application/json; charset=utf-8") res.status(status) res.json(json) -} \ No newline at end of file +} diff --git a/utilities/token.mjs b/utilities/token.js similarity index 94% rename from utilities/token.mjs rename to utilities/token.js index 49fa7bf7..34aa2ee4 100644 --- a/utilities/token.mjs +++ b/utilities/token.js @@ -1,4 +1,4 @@ -import { respondWithError } from "./shared.mjs" +import { respondWithError } from "./shared.js" export function extractToken(tokenString) { if (!tokenString) return null diff --git a/utilities/validateEmail.mjs b/utilities/validateEmail.js similarity index 100% rename from utilities/validateEmail.mjs rename to utilities/validateEmail.js diff --git a/utilities/validatePayload.mjs b/utilities/validatePayload.js similarity index 100% rename from utilities/validatePayload.mjs rename to utilities/validatePayload.js diff --git a/utilities/validateURL.mjs b/utilities/validateURL.js similarity index 100% rename from utilities/validateURL.mjs rename to utilities/validateURL.js diff --git a/utilities/vault.mjs b/utilities/vault.js similarity index 100% rename from utilities/vault.mjs rename to utilities/vault.js From 20ce23cb2df4f98aae037d486fe10f5a9a334df9 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Tue, 29 Apr 2025 15:58:54 -0500 Subject: [PATCH 058/262] Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel --- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- ...o_end.test.mjs => full_end_to_end.test.js} | 4 +- app.mjs => app.js | 12 +- .../{auth_unit_test.mjs => auth_unit_test.js} | 2 +- auth/{index.mjs => index.js} | 8 +- bin/{tpen3_services.mjs => tpen3_services.js} | 2 +- classes/Group/{Group.mjs => Group.js} | 2 +- .../{Group.test.mjs => Group.test.js} | 6 +- classes/HotKeys/Hotkeys.js | 2 +- classes/Layer/{Layer.mjs => Layer.js} | 27 +- .../{exists.test.mjs => exists.test.js} | 2 +- classes/Line/{Line.mjs => Line.js} | 0 .../{exists.test.mjs => exists.test.js} | 2 +- classes/Manifest/Manifest.js | 34 +- classes/Manifest/__tests__/sample.js | 11 - .../Manifest.tst.js} | 0 classes/Page/{Page.mjs => Page.js} | 47 +- .../{exists.test.mjs => exists.test.js} | 2 +- classes/Project/{Project.mjs => Project.js} | 17 +- .../{ProjectFactory.mjs => ProjectFactory.js} | 16 +- .../{Project.test.mjs => Project.test.js} | 22 +- ...ists_unit.test.mjs => exists_unit.test.js} | 4 +- classes/User/{User.mjs => User.js} | 2 +- .../{exists.test.mjs => exists.test.js} | 2 +- .../__tests__/{unit.test.mjs => unit.test.js} | 12 +- .../__tests__/{unit.test.mjs => unit.test.js} | 2 +- database/{driver.mjs => driver.js} | 6 +- .../__tests__/{unit.test.mjs => unit.test.js} | 2 +- .../maria/{controller.mjs => controller.js} | 0 .../__tests__/{unit.test.mjs => unit.test.js} | 2 +- .../mongo/{controller.mjs => controller.js} | 0 .../__tests__/{unit.test.mjs => unit.test.js} | 2 +- .../tiny/{controller.mjs => controller.js} | 0 feedback/feedbackController.js | 2 +- feedback/feedbackRoutes.js | 2 +- index.mjs => index.js | 2 +- jest.config.mjs => jest.config.js | 21 +- layer/{index.mjs => index.js} | 4 +- ..._unit.test.mjs => end_to_end_unit.test.js} | 2 +- ...ists_unit.test.mjs => exists_unit.test.js} | 4 +- ...it.test.mjs => functionality_unit.test.js} | 4 +- line/{index.mjs => index.js} | 4 +- line/{line.mjs => line.js} | 2 +- ..._unit.test.mjs => end_to_end_unit.test.js} | 4 +- ...ists_unit.test.mjs => exists_unit.test.js} | 4 +- ...it.test.mjs => functionality_unit.test.js} | 8 +- manifest/{index.mjs => index.js} | 6 +- manifest/{manifest.mjs => manifest.js} | 4 +- package-lock.json | 4684 +---------------- package.json | 7 +- ..._unit.test.mjs => end_to_end_unit.test.js} | 2 +- page/{index.mjs => index.js} | 2 +- ..._unit.test.mjs => end_to_end_unit.test.js} | 10 +- ...ists_unit.test.mjs => exists_unit.test.js} | 2 +- ...eckPermissions.mjs => checkPermissions.js} | 2 +- .../{permissions.mjs => permissions.js} | 2 +- ...rameters.mjs => permissions_parameters.js} | 0 project/groups/{roles.mjs => roles.js} | 0 project/{index.mjs => index.js} | 39 +- ..._unit.test.mjs => end_to_end_unit.test.js} | 10 +- ...ists_unit.test.mjs => exists_unit.test.js} | 2 +- ...it.test.mjs => functionality_unit.test.js} | 4 +- userProfile/{index.mjs => index.js} | 4 +- .../{privateProfile.mjs => privateProfile.js} | 6 +- ...ultRole.test.mjs => isDefaultRole.test.js} | 4 +- utilities/{getHash.mjs => getHash.js} | 0 .../{isDefaultRole.mjs => isDefaultRole.js} | 2 +- utilities/mailer/{index.mjs => index.js} | 0 ...moveProperties.mjs => removeProperties.js} | 0 utilities/{shared.mjs => shared.js} | 4 +- utilities/{token.mjs => token.js} | 2 +- .../{validateEmail.mjs => validateEmail.js} | 0 ...validatePayload.mjs => validatePayload.js} | 0 utilities/{validateURL.mjs => validateURL.js} | 0 utilities/{vault.mjs => vault.js} | 0 76 files changed, 474 insertions(+), 4643 deletions(-) rename __tests__/{full_end_to_end.test.mjs => full_end_to_end.test.js} (97%) rename app.mjs => app.js (86%) rename auth/__tests__/{auth_unit_test.mjs => auth_unit_test.js} (97%) rename auth/{index.mjs => index.js} (92%) rename bin/{tpen3_services.mjs => tpen3_services.js} (98%) rename classes/Group/{Group.mjs => Group.js} (99%) rename classes/Group/__tests__/{Group.test.mjs => Group.test.js} (95%) rename classes/Layer/{Layer.mjs => Layer.js} (87%) rename classes/Layer/__tests__/{exists.test.mjs => exists.test.js} (97%) rename classes/Line/{Line.mjs => Line.js} (100%) rename classes/Line/__tests__/{exists.test.mjs => exists.test.js} (97%) delete mode 100644 classes/Manifest/__tests__/sample.js rename classes/Manifest/{__tests__/Manifest.test.js => __tsts__/Manifest.tst.js} (100%) rename classes/Page/{Page.mjs => Page.js} (79%) rename classes/Page/__tests__/{exists.test.mjs => exists.test.js} (97%) rename classes/Project/{Project.mjs => Project.js} (95%) rename classes/Project/{ProjectFactory.mjs => ProjectFactory.js} (96%) rename classes/Project/__tests__/{Project.test.mjs => Project.test.js} (73%) rename classes/Project/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (93%) rename classes/User/{User.mjs => User.js} (98%) rename classes/User/__tests__/{exists.test.mjs => exists.test.js} (94%) rename classes/User/__tests__/{unit.test.mjs => unit.test.js} (96%) rename database/__tests__/{unit.test.mjs => unit.test.js} (98%) rename database/{driver.mjs => driver.js} (98%) rename database/maria/__tests__/{unit.test.mjs => unit.test.js} (87%) rename database/maria/{controller.mjs => controller.js} (100%) rename database/mongo/__tests__/{unit.test.mjs => unit.test.js} (99%) rename database/mongo/{controller.mjs => controller.js} (100%) rename database/tiny/__tests__/{unit.test.mjs => unit.test.js} (98%) rename database/tiny/{controller.mjs => controller.js} (100%) rename index.mjs => index.js (97%) rename jest.config.mjs => jest.config.js (95%) rename layer/{index.mjs => index.js} (95%) rename line/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (97%) rename line/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (92%) rename line/__tests__/{functionality_unit.test.mjs => functionality_unit.test.js} (97%) rename line/{index.mjs => index.js} (93%) rename line/{line.mjs => line.js} (98%) rename manifest/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (98%) rename manifest/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (94%) rename manifest/__tests__/{functionality_unit.test.mjs => functionality_unit.test.js} (91%) rename manifest/{index.mjs => index.js} (97%) rename manifest/{manifest.mjs => manifest.js} (95%) rename page/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (98%) rename page/{index.mjs => index.js} (97%) rename project/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (98%) rename project/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (97%) rename project/groups/{checkPermissions.mjs => checkPermissions.js} (98%) rename project/groups/{permissions.mjs => permissions.js} (93%) rename project/groups/{permissions_parameters.mjs => permissions_parameters.js} (100%) rename project/groups/{roles.mjs => roles.js} (100%) rename project/{index.mjs => index.js} (97%) rename userProfile/__tests__/{end_to_end_unit.test.mjs => end_to_end_unit.test.js} (94%) rename userProfile/__tests__/{exists_unit.test.mjs => exists_unit.test.js} (92%) rename userProfile/__tests__/{functionality_unit.test.mjs => functionality_unit.test.js} (86%) rename userProfile/{index.mjs => index.js} (95%) rename userProfile/{privateProfile.mjs => privateProfile.js} (94%) rename utilities/__tests__/{isDefaultRole.test.mjs => isDefaultRole.test.js} (92%) rename utilities/{getHash.mjs => getHash.js} (100%) rename utilities/{isDefaultRole.mjs => isDefaultRole.js} (93%) rename utilities/mailer/{index.mjs => index.js} (100%) rename utilities/{removeProperties.mjs => removeProperties.js} (100%) rename utilities/{shared.mjs => shared.js} (95%) rename utilities/{token.mjs => token.js} (94%) rename utilities/{validateEmail.mjs => validateEmail.js} (100%) rename utilities/{validatePayload.mjs => validatePayload.js} (100%) rename utilities/{validateURL.mjs => validateURL.js} (100%) rename utilities/{vault.mjs => vault.js} (100%) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index 0e3a149f..90acbaea 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -73,4 +73,4 @@ jobs: git checkout development git pull npm install - pm2 -s start -i max bin/tpen3_services.mjs + pm2 -s start -i max bin/tpen3_services.js diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 846e2249..c7b1480a 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -73,4 +73,4 @@ jobs: git checkout main git pull npm install - pm2 -s start -i max bin/tpen3_services.mjs + pm2 -s start -i max bin/tpen3_services.js diff --git a/__tests__/full_end_to_end.test.mjs b/__tests__/full_end_to_end.test.js similarity index 97% rename from __tests__/full_end_to_end.test.mjs rename to __tests__/full_end_to_end.test.js index 0e92932e..aacc1f05 100644 --- a/__tests__/full_end_to_end.test.mjs +++ b/__tests__/full_end_to_end.test.js @@ -1,6 +1,6 @@ // End to end tests that spin up and test it? -import app from '../app.mjs' +import app from '../app.js' import express from 'express' import request from 'supertest' @@ -39,4 +39,4 @@ describe('Endpoint tests. #e2e', () => { expect(true).toBe(true) }) -}) \ No newline at end of file +}) diff --git a/app.mjs b/app.js similarity index 86% rename from app.mjs rename to app.js index fba83345..21312e6b 100644 --- a/app.mjs +++ b/app.js @@ -19,12 +19,12 @@ dotenvExpand.expand(storedEnv) import logger from 'morgan' import cors from 'cors' -import indexRouter from './index.mjs' -import manifestRouter from './manifest/index.mjs' -import projectRouter from './project/index.mjs' -import lineRouter from './line/index.mjs' -import userProfileRouter from './userProfile/index.mjs' -import privateProfileRouter from './userProfile/privateProfile.mjs' +import indexRouter from './index.js' +import manifestRouter from './manifest/index.js' +import projectRouter from './project/index.js' +import lineRouter from './line/index.js' +import userProfileRouter from './userProfile/index.js' +import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' // Beta Feedback routes diff --git a/auth/__tests__/auth_unit_test.mjs b/auth/__tests__/auth_unit_test.js similarity index 97% rename from auth/__tests__/auth_unit_test.mjs rename to auth/__tests__/auth_unit_test.js index 258c6915..f66cfb6e 100644 --- a/auth/__tests__/auth_unit_test.mjs +++ b/auth/__tests__/auth_unit_test.js @@ -1,6 +1,6 @@ import express from "express" import request from "supertest" -import auth0Middleware from "../index.mjs" +import auth0Middleware from "../index.js" import { ObjectId } from "mongodb" process.env.AUDIENCE = "provide audience to test" diff --git a/auth/index.mjs b/auth/index.js similarity index 92% rename from auth/index.mjs rename to auth/index.js index a3ac6891..10b154ed 100644 --- a/auth/index.mjs +++ b/auth/index.js @@ -1,7 +1,7 @@ -import * as utils from "../utilities/shared.mjs" +import * as utils from "../utilities/shared.js" import { auth } from "express-oauth2-jwt-bearer" -import { extractToken, extractUser, isTokenExpired } from "../utilities/token.mjs" -import User from "../classes/User/User.mjs" +import { extractToken, extractUser, isTokenExpired } from "../utilities/token.js" +import User from "../classes/User/User.js" export function authenticateUser() { return (req, res, next) => { @@ -28,7 +28,7 @@ export function authenticateUser() { * This function verifies authorization tokens using Auth0 library. to protect a route using this function in a different component: 1. import the function in that component 2. apply to route in the following ways - a. to apply to all sub routes of a parent route, e.g project/history, project/:id, project/create apply the function on the base route in app.mjs in the following way; app.use("/project/*", auth0Middleware()) + a. to apply to all sub routes of a parent route, e.g project/history, project/:id, project/create apply the function on the base route in app.js in the following way; app.use("/project/*", auth0Middleware()) b. to protect an individual route; route.get("/project", auth0Middleware(), controller) c. to protect all routes in the app; app.use(auth0Middleware()) * @returns authenticated user or 401 diff --git a/bin/tpen3_services.mjs b/bin/tpen3_services.js similarity index 98% rename from bin/tpen3_services.mjs rename to bin/tpen3_services.js index 75a5f078..2fc15f44 100644 --- a/bin/tpen3_services.mjs +++ b/bin/tpen3_services.js @@ -3,7 +3,7 @@ /** * Module dependencies. */ -import app from '../app.mjs' +import app from '../app.js' import debug from 'debug' debug('tpen3_services:server') import http from 'http' diff --git a/classes/Group/Group.mjs b/classes/Group/Group.js similarity index 99% rename from classes/Group/Group.mjs rename to classes/Group/Group.js index 3146029b..25ea6934 100644 --- a/classes/Group/Group.mjs +++ b/classes/Group/Group.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") export default class Group { diff --git a/classes/Group/__tests__/Group.test.mjs b/classes/Group/__tests__/Group.test.js similarity index 95% rename from classes/Group/__tests__/Group.test.mjs rename to classes/Group/__tests__/Group.test.js index 1f1ce009..bc63282c 100644 --- a/classes/Group/__tests__/Group.test.mjs +++ b/classes/Group/__tests__/Group.test.js @@ -1,8 +1,8 @@ -import Group from "../Group.mjs" -import dbDriver from "../../../database/driver.mjs" +import Group from "../Group.js" +import dbDriver from "../../../database/driver.js" import { expect, jest } from "@jest/globals" -jest.mock("../../../database/driver.mjs") +jest.mock("../../../database/driver.js") describe.skip("Group Class", () => { let group diff --git a/classes/HotKeys/Hotkeys.js b/classes/HotKeys/Hotkeys.js index c52e825a..a87bd10b 100644 --- a/classes/HotKeys/Hotkeys.js +++ b/classes/HotKeys/Hotkeys.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") diff --git a/classes/Layer/Layer.mjs b/classes/Layer/Layer.js similarity index 87% rename from classes/Layer/Layer.mjs rename to classes/Layer/Layer.js index eec07b86..d82cb479 100644 --- a/classes/Layer/Layer.mjs +++ b/classes/Layer/Layer.js @@ -1,9 +1,9 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") const databaseTiny = new dbDriver("tiny") -import Page from "../Page/Page.mjs" +import Page from "../Page/Page.js" export default class Layer { #tinyAction = 'create' @@ -34,12 +34,11 @@ export default class Layer { return this } - static build(projectId = database.reserveId(), label, canvases, projectLabel = "Default") { - if (!projectId) { - throw new Error("Project ID is required to create a Layer instance.") - } - this.projectId = projectId - this.label = label ?? `${projectLabel} - Layer ${Date.now()}` + static build(projectId, label, canvases, projectLabel = "Default") { + let thisLayer = {} + projectId ??= database.reserveId() + thisLayer.projectId = projectId + thisLayer.label = label ?? `${projectLabel} - Layer ${Date.now()}` if (!Array.isArray(canvases)) { if (!canvases) { @@ -47,15 +46,15 @@ export default class Layer { } canvases = [canvases] } - - this.id = `${process.env.SERVERURL}layer/${databaseTiny.reserveId()}` - const pages = canvases.map(c => Page.build(id, c)) + thisLayer.id = `${process.env.SERVERURL}layer/${databaseTiny.reserveId()}` + const pages = canvases.map(c => Page.build(thisLayer.id, c)) pages.forEach((page, index) => { if (index > 0) page.prev = pages[index - 1].id if (index < pages.length - 1) page.next = pages[index + 1].id }) - return this + const newLayer = new Layer(projectId, { id: thisLayer.id, label: thisLayer.label, pages }) + return newLayer } #setRerumId() { @@ -89,6 +88,10 @@ export default class Layer { return this.#updateCollectionForProject() } + asProjectLayer() { + return this.#updateCollectionForProject() + } + #updateCollectionForProject() { // Layer in local MongoDB is in the Project.layers Array and looks like: // { diff --git a/classes/Layer/__tests__/exists.test.mjs b/classes/Layer/__tests__/exists.test.js similarity index 97% rename from classes/Layer/__tests__/exists.test.mjs rename to classes/Layer/__tests__/exists.test.js index d93dfb21..efe92f8b 100644 --- a/classes/Layer/__tests__/exists.test.mjs +++ b/classes/Layer/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import Layer from "../Layer.mjs" +import Layer from "../Layer.js" describe('Layer Class looks how we expect it to. #Layer_exists_unit', () => { it('Imports Layer', () => { diff --git a/classes/Line/Line.mjs b/classes/Line/Line.js similarity index 100% rename from classes/Line/Line.mjs rename to classes/Line/Line.js diff --git a/classes/Line/__tests__/exists.test.mjs b/classes/Line/__tests__/exists.test.js similarity index 97% rename from classes/Line/__tests__/exists.test.mjs rename to classes/Line/__tests__/exists.test.js index f963c80d..52da866e 100644 --- a/classes/Line/__tests__/exists.test.mjs +++ b/classes/Line/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import { Line } from "../Line.mjs" +import { Line } from "../Line.js" describe('Line Class looks how we expect it to. #Line_exists_unit', () => { it('Imports Line', () => { diff --git a/classes/Manifest/Manifest.js b/classes/Manifest/Manifest.js index 8d617865..113773b5 100644 --- a/classes/Manifest/Manifest.js +++ b/classes/Manifest/Manifest.js @@ -1,4 +1,4 @@ -import vault from "../../utilities/vault.mjs" +import vault from "../../utilities/vault.js" class Manifest { @@ -40,22 +40,24 @@ class Manifest { this.manifest = manifestOrUri } - load = async () => vault.loadManifest(this.uri).then(manifest => { - // load canvases - manifest.items = vault.get(manifest.items) - manifest.items = manifest.items.map(item => { - // Load canvas content - if (item.items) { - item.items = vault.get(item.items) - } - // Load Canvas AnnotationPages - if (item.annotations) { - item.annotations = vault.get(item.annotations) - } - return item + async load() { + return vault.loadManifest(this.uri).then(manifest => { + // load canvases + manifest.items = vault.get(manifest.items) + manifest.items = manifest.items.map(item => { + // Load canvas content + if (item.items) { + item.items = vault.get(item.items) + } + // Load Canvas AnnotationPages + if (item.annotations) { + item.annotations = vault.get(item.annotations) + } + return item + }) + return manifest }) - return manifest - }) + } } export default Manifest diff --git a/classes/Manifest/__tests__/sample.js b/classes/Manifest/__tests__/sample.js deleted file mode 100644 index 58032de5..00000000 --- a/classes/Manifest/__tests__/sample.js +++ /dev/null @@ -1,11 +0,0 @@ -import Manifest from '../Manifest.js' - -// Examples for a v3 and v2 Manifest on the way in from a third party source -// let m = new Manifest('https://tpen-project-examples.habesoftware.app/transcription-project/manifest.json') -// let m = new Manifest('https://tpen-project-examples.habesoftware.app/transcription-project-v2/manifest.json') - -let m = new Manifest('https://tpen-project-examples.habesoftware.app/transcription-project-v2/manifest.json') -m.load().then(manifest => { - // manifest is now the loaded and regularized Manifest JSON. - console.log(manifest) -}) diff --git a/classes/Manifest/__tests__/Manifest.test.js b/classes/Manifest/__tsts__/Manifest.tst.js similarity index 100% rename from classes/Manifest/__tests__/Manifest.test.js rename to classes/Manifest/__tsts__/Manifest.tst.js diff --git a/classes/Page/Page.mjs b/classes/Page/Page.js similarity index 79% rename from classes/Page/Page.mjs rename to classes/Page/Page.js index c806cc46..b2c8f3c4 100644 --- a/classes/Page/Page.mjs +++ b/classes/Page/Page.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const databaseTiny = new dbDriver("tiny") @@ -23,11 +23,12 @@ export default class Page { * @seeAlso {@link Page.build} */ constructor(layerId, { id, label, target }) { - if (!id || !label || !target) { + console.log("Page constructor", layerId, id, label, target) + if (!id || !target) { throw new Error("Page data is malformed.") } Object.assign(this, { id, label, target, partOf: layerId }) - if(this.id.startsWith(process.env.RERUMIDPREFIX)) { + if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } return this @@ -44,18 +45,20 @@ export default class Page { const id = lines.length ? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}` : `${process.env.SERVERURL}layer/${layerId.split("/").pop()}/page/${databaseTiny.reserveId()}` - this.data = { - "@context": "http://www.w3.org/ns/anno.jsonld", - id, - type: "AnnotationPage", - label: canvas.label, - target: canvas.id, - partOf: layerId, - items: lines, - prev, - next + const page = { + data: { + "@context": "http://www.w3.org/ns/anno.jsonld", + id, + type: "AnnotationPage", + label: canvas.label, + target: canvas.id, + partOf: layerId, + items: lines, + prev, + next + } } - return this + return new Page(layerId, page.data) } async #savePageToRerum() { @@ -72,10 +75,10 @@ export default class Page { } if (this.#tinyAction === 'create') { await databaseTiny.save(pageAsAnnotationPage) - .catch(err => { - console.error(err,pageAsAnnotationPage) - throw new Error(`Failed to save Page to RERUM: ${err.message}`) - }) + .catch(err => { + console.error(err, pageAsAnnotationPage) + throw new Error(`Failed to save Page to RERUM: ${err.message}`) + }) this.#tinyAction = 'update' return this } @@ -100,6 +103,10 @@ export default class Page { return this.#updatePageForProject() } + asProjectPage() { + return this.#updatePageForProject() + } + async #updatePageForProject() { // Page in local MongoDB is in the Project.layers.pages Array and looks like: // { @@ -115,10 +122,10 @@ export default class Page { } async delete() { - if(this.#tinyAction === 'update') { + if (this.#tinyAction === 'update') { // associated Annotations in RERUM will be left intact await databaseTiny.remove(this.id) - .catch(err => false) + .catch(err => false) } return true } diff --git a/classes/Page/__tests__/exists.test.mjs b/classes/Page/__tests__/exists.test.js similarity index 97% rename from classes/Page/__tests__/exists.test.mjs rename to classes/Page/__tests__/exists.test.js index 8fc5a46f..7ece7446 100644 --- a/classes/Page/__tests__/exists.test.mjs +++ b/classes/Page/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import Page from "../Page.mjs" +import Page from "../Page.js" describe('Page Class looks how we expect it to. #Page_exists_unit', () => { it('Imports Page', () => { diff --git a/classes/Project/Project.mjs b/classes/Project/Project.js similarity index 95% rename from classes/Project/Project.mjs rename to classes/Project/Project.js index ed0d38d8..2d040a01 100644 --- a/classes/Project/Project.mjs +++ b/classes/Project/Project.js @@ -1,9 +1,9 @@ -import dbDriver from "../../database/driver.mjs" -import { sendMail } from "../../utilities/mailer/index.mjs" -import { validateProjectPayload } from "../../utilities/validatePayload.mjs" -import User from "../User/User.mjs" +import dbDriver from "../../database/driver.js" +import { sendMail } from "../../utilities/mailer/index.js" +import { validateProjectPayload } from "../../utilities/validatePayload.js" +import User from "../User/User.js" import { createHash } from "node:crypto" -import Group from "../Group/Group.mjs" +import Group from "../Group/Group.js" const database = new dbDriver("mongo") @@ -20,11 +20,12 @@ export default class Project { async create(payload) { // validation checks for all the required elements without which a project cannot be created. modify validateProjectPayload function to include more elements as they become available (layers,... ) const validation = validateProjectPayload(payload) - + if (!validation.isValid) { throw { status: 400, message: validation.errors } } - + + console.log("Creating project...", payload.layers) try { return database.save(payload, "projects") } catch (err) { @@ -154,7 +155,7 @@ export default class Project { } } -/** + /** * Asynchronously updates the metadata of the current object and persists the changes. * * @param {Object} newMetadata - An object containing the new metadata properties to be assigned. diff --git a/classes/Project/ProjectFactory.mjs b/classes/Project/ProjectFactory.js similarity index 96% rename from classes/Project/ProjectFactory.mjs rename to classes/Project/ProjectFactory.js index 9785817c..1792f633 100644 --- a/classes/Project/ProjectFactory.mjs +++ b/classes/Project/ProjectFactory.js @@ -1,11 +1,11 @@ -import Project from "./Project.mjs" -import Group from "../Group/Group.mjs" -import User from "../User/User.mjs" -import Layer from "../Layer/Layer.mjs" -import dbDriver from "../../database/driver.mjs" +import Project from "./Project.js" +import Group from "../Group/Group.js" +import User from "../User/User.js" +import Layer from "../Layer/Layer.js" +import dbDriver from "../../database/driver.js" import fs from "fs" import path from "path" -import vault from "../../utilities/vault.mjs" +import vault from "../../utilities/vault.js" const database = new dbDriver("mongo") @@ -31,14 +31,14 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now const metadata = manifest.metadata ?? [] - const layer = Layer.build( null, `First Layer - ${label}`, manifest.items ) + const layer = Layer.build( database.reserveId(), `First Layer - ${label}`, manifest.items ) // required properties: id, label, metadata, manifest, layers return { label, metadata, manifest: [ manifest.id ], - layers: [ layer ] + layers: [ layer.asProjectLayer() ] } } diff --git a/classes/Project/__tests__/Project.test.mjs b/classes/Project/__tests__/Project.test.js similarity index 73% rename from classes/Project/__tests__/Project.test.mjs rename to classes/Project/__tests__/Project.test.js index 2abfc599..04d282bf 100644 --- a/classes/Project/__tests__/Project.test.mjs +++ b/classes/Project/__tests__/Project.test.js @@ -1,24 +1,24 @@ -import { validateProjectPayload } from "../../../utilities/validatePayload.mjs" -import Project from "../Project.mjs"; -import dbDriver from "../../../database/driver.mjs"; -import { sendMail } from "../../../utilities/mailer/index.mjs"; -import User from "../../User/User.mjs"; -import Group from "../../Group/Group.mjs"; +import { validateProjectPayload } from "../../../utilities/validatePayload.js" +import Project from "../Project.js"; +import dbDriver from "../../../database/driver.js" +import { sendMail } from "../../../utilities/mailer/index.js" +import User from "../../User/User.js"; +import Group from "../../Group/Group.js" import { jest } from "@jest/globals"; -jest.mock("../../../database/driver.mjs", () => { +jest.mock("../../../database/driver.js", () => { return { save: jest.fn(), remove: jest.fn().mockResolvedValue({ _id: "deleted" }), }; }); -jest.mock("../../../utilities/mailer/index.mjs"); -jest.mock("../../../utilities/validatePayload.mjs", () => { +jest.mock("../../../utilities/mailer/index.js"); +jest.mock("../../../utilities/validatePayload.js", () => { return { validateProjectPayload: jest.fn(), }; }); -jest.mock("../../User/User.mjs", () => { +jest.mock("../../User/User.js", () => { return { User: jest.fn().mockImplementation(() => { return { @@ -28,7 +28,7 @@ jest.mock("../../User/User.mjs", () => { }), }; }); -jest.mock("../../Group/Group.mjs", () => { +jest.mock("../../Group/Group.js", () => { return jest.fn().mockImplementation(() => { return { addMember: jest.fn(), diff --git a/classes/Project/__tests__/exists_unit.test.mjs b/classes/Project/__tests__/exists_unit.test.js similarity index 93% rename from classes/Project/__tests__/exists_unit.test.mjs rename to classes/Project/__tests__/exists_unit.test.js index a55b6324..63151de7 100644 --- a/classes/Project/__tests__/exists_unit.test.mjs +++ b/classes/Project/__tests__/exists_unit.test.js @@ -1,5 +1,5 @@ -import Project from "../Project.mjs" -import ProjectFactory from "../ProjectFactory.mjs" +import Project from "../Project.js" +import ProjectFactory from "../ProjectFactory.js" describe("ProjectFactory Class #importTests", () => { it("should have a constructor", () => { diff --git a/classes/User/User.mjs b/classes/User/User.js similarity index 98% rename from classes/User/User.mjs rename to classes/User/User.js index d952fc26..125ecd7a 100644 --- a/classes/User/User.mjs +++ b/classes/User/User.js @@ -1,4 +1,4 @@ -import dbDriver from "../../database/driver.mjs" +import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") export default class User { diff --git a/classes/User/__tests__/exists.test.mjs b/classes/User/__tests__/exists.test.js similarity index 94% rename from classes/User/__tests__/exists.test.mjs rename to classes/User/__tests__/exists.test.js index b2070a78..ded76cf5 100644 --- a/classes/User/__tests__/exists.test.mjs +++ b/classes/User/__tests__/exists.test.js @@ -1,4 +1,4 @@ -import User from "../User.mjs" +import User from "../User.js" const user = new User() diff --git a/classes/User/__tests__/unit.test.mjs b/classes/User/__tests__/unit.test.js similarity index 96% rename from classes/User/__tests__/unit.test.mjs rename to classes/User/__tests__/unit.test.js index 62af8274..3a527bd4 100644 --- a/classes/User/__tests__/unit.test.mjs +++ b/classes/User/__tests__/unit.test.js @@ -1,15 +1,13 @@ import {expect, jest} from "@jest/globals" import request from "supertest" import express from "express" -import User from "../User.mjs" +import User from "../User.js" -import privateProfileRouter from "../../../userProfile/privateProfile.mjs" - -import mainApp from "../../../app.mjs" +import privateProfileRouter from "../../../userProfile/privateProfile.js" +import mainApp from "../../../app.js" - -jest.mock("../User.mjs") -jest.mock("../../../auth/index.mjs") +jest.mock("../User.js") +jest.mock("../../../auth/index.js") const app = express() diff --git a/database/__tests__/unit.test.mjs b/database/__tests__/unit.test.js similarity index 98% rename from database/__tests__/unit.test.mjs rename to database/__tests__/unit.test.js index 249e4d25..6b4f85a1 100644 --- a/database/__tests__/unit.test.mjs +++ b/database/__tests__/unit.test.js @@ -6,7 +6,7 @@ * https://github.com/thehabes */ -import DatabaseDriver from "../driver.mjs" +import DatabaseDriver from "../driver.js" const TIME_OUT = process.env.DB_TEST_TIMEOUT ?? 6500 describe("Driver CRUD and query is registered. #driver_unit #db", () => { diff --git a/database/driver.mjs b/database/driver.js similarity index 98% rename from database/driver.mjs rename to database/driver.js index 6096ae9f..a98810f6 100644 --- a/database/driver.mjs +++ b/database/driver.js @@ -10,9 +10,9 @@ * */ -import TinyController from "./tiny/controller.mjs" -import MariaController from "./maria/controller.mjs" -import MongoController from "./mongo/controller.mjs" +import TinyController from "./tiny/controller.js" +import MariaController from "./maria/controller.js" +import MongoController from "./mongo/controller.js" class dbDriver { diff --git a/database/maria/__tests__/unit.test.mjs b/database/maria/__tests__/unit.test.js similarity index 87% rename from database/maria/__tests__/unit.test.mjs rename to database/maria/__tests__/unit.test.js index d4012f3f..d194b678 100644 --- a/database/maria/__tests__/unit.test.mjs +++ b/database/maria/__tests__/unit.test.js @@ -4,7 +4,7 @@ * @author Bryan Haberberger * https://github.com/thehabes */ -import DatabaseController from '../controller.mjs' +import DatabaseController from '../controller.js' const database = new DatabaseController() describe('A MARIADB stub test that is always true. #maria_unit #db',()=>{ diff --git a/database/maria/controller.mjs b/database/maria/controller.js similarity index 100% rename from database/maria/controller.mjs rename to database/maria/controller.js diff --git a/database/mongo/__tests__/unit.test.mjs b/database/mongo/__tests__/unit.test.js similarity index 99% rename from database/mongo/__tests__/unit.test.mjs rename to database/mongo/__tests__/unit.test.js index 10f8ada8..a3d3f0ef 100644 --- a/database/mongo/__tests__/unit.test.mjs +++ b/database/mongo/__tests__/unit.test.js @@ -5,7 +5,7 @@ * https://github.com/thehabes */ -import DatabaseController from "../controller.mjs" +import DatabaseController from "../controller.js" const database = new DatabaseController() const TIME_OUT = process.env.DB_TEST_TIMEOUT ?? 6500 diff --git a/database/mongo/controller.mjs b/database/mongo/controller.js similarity index 100% rename from database/mongo/controller.mjs rename to database/mongo/controller.js diff --git a/database/tiny/__tests__/unit.test.mjs b/database/tiny/__tests__/unit.test.js similarity index 98% rename from database/tiny/__tests__/unit.test.mjs rename to database/tiny/__tests__/unit.test.js index 5d9a9919..b343bc6a 100644 --- a/database/tiny/__tests__/unit.test.mjs +++ b/database/tiny/__tests__/unit.test.js @@ -5,7 +5,7 @@ * https://github.com/thehabes */ -import DatabaseController from "../controller.mjs" +import DatabaseController from "../controller.js" const database = new DatabaseController() const TIME_OUT = process.env.DB_TEST_TIMEOUT ?? 6500 diff --git a/database/tiny/controller.mjs b/database/tiny/controller.js similarity index 100% rename from database/tiny/controller.mjs rename to database/tiny/controller.js diff --git a/feedback/feedbackController.js b/feedback/feedbackController.js index cfed7ea2..bff804af 100644 --- a/feedback/feedbackController.js +++ b/feedback/feedbackController.js @@ -1,5 +1,5 @@ import { createGitHubIssue } from './githubService.js' -import { respondWithError } from "../utilities/shared.mjs" +import { respondWithError } from "../utilities/shared.js" /** * diff --git a/feedback/feedbackRoutes.js b/feedback/feedbackRoutes.js index e68d94e7..82e23f2c 100644 --- a/feedback/feedbackRoutes.js +++ b/feedback/feedbackRoutes.js @@ -1,5 +1,5 @@ import express from 'express' -import auth0Middleware from "../auth/index.mjs" +import auth0Middleware from "../auth/index.js" import cors from 'cors' import { submitFeedback, submitBug } from './feedbackController.js' import common_cors from '../utilities/common_cors.json' with {type: 'json'} diff --git a/index.mjs b/index.js similarity index 97% rename from index.mjs rename to index.js index ad3aac6d..e0beb88b 100644 --- a/index.mjs +++ b/index.js @@ -7,7 +7,7 @@ * */ import express from 'express' -import * as utils from './utilities/shared.mjs' +import * as utils from './utilities/shared.js' let router = express.Router() diff --git a/jest.config.mjs b/jest.config.js similarity index 95% rename from jest.config.mjs rename to jest.config.js index 0b7b6a32..0890e33e 100644 --- a/jest.config.mjs +++ b/jest.config.js @@ -29,14 +29,14 @@ let config = { }, // Indicates whether the coverage information should be collected while executing the test - collectCoverage: true, + // collectCoverage: true, // An array of glob patterns indicating a set of files for which coverage information should be collected collectCoverageFrom: [ //"**/*.js", - "**/manifest/index.mjs", - "**/app.mjs", - "**/index.mjs" + // "**/manifest/index.js", + // "**/app.js", + // "**/index.js" ], // Indicates which provider should be used to instrument code for coverage @@ -58,7 +58,7 @@ let config = { // The root directory that Jest should scan for tests and modules within rootDir: "./", - testMatch: [ "**/__tests__/**/*.m[jt]s?(x)", "**/?(*.)+(spec|test).m[jt]s?(x)" ], + testMatch: [ "**/__tests__/**/*.js", "**/?(*.)+(spec|test).js" ], // The directory where Jest should output its coverage files. Default is /coverage/. See /coverage/index.html. // coverageDirectory: undefined, @@ -100,12 +100,7 @@ let config = { // An array of file extensions your modules use moduleFileExtensions: [ "js", - "mjs", - "jsx", - "ts", - "tsx", - "json", - "node" + "json" ], // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module @@ -197,9 +192,7 @@ let config = { // timers: "real", // A map from regular expressions to paths to transformers - // transform: { - // "^.+\\.m?jsx?$": "babel-jest" - // }, + transform: {}, // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation // transformIgnorePatterns: [ diff --git a/layer/index.mjs b/layer/index.js similarity index 95% rename from layer/index.mjs rename to layer/index.js index 5df3c68c..4804b49c 100644 --- a/layer/index.mjs +++ b/layer/index.js @@ -1,6 +1,6 @@ import express from 'express' -import * as utils from '../utilities/shared.mjs' -import pageRouter from '../page/index.mjs' +import * as utils from '../utilities/shared.js' +import pageRouter from '../page/index.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} diff --git a/line/__tests__/end_to_end_unit.test.mjs b/line/__tests__/end_to_end_unit.test.js similarity index 97% rename from line/__tests__/end_to_end_unit.test.mjs rename to line/__tests__/end_to_end_unit.test.js index 70278cfd..6d0880be 100644 --- a/line/__tests__/end_to_end_unit.test.mjs +++ b/line/__tests__/end_to_end_unit.test.js @@ -1,4 +1,4 @@ -import lineRouter from '../index.mjs' +import lineRouter from '../index.js' import express from 'express' import request from 'supertest' diff --git a/line/__tests__/exists_unit.test.mjs b/line/__tests__/exists_unit.test.js similarity index 92% rename from line/__tests__/exists_unit.test.mjs rename to line/__tests__/exists_unit.test.js index c069cccc..238b4e0a 100644 --- a/line/__tests__/exists_unit.test.mjs +++ b/line/__tests__/exists_unit.test.js @@ -1,4 +1,4 @@ -import app from '../../app.mjs' +import app from '../../app.js' describe('Line endpoint availability unit test (via a check on the app routes). #exists_unit', () => { it('responds to /line/id', () => { @@ -12,4 +12,4 @@ describe('Line endpoint availability unit test (via a check on the app routes). } expect(exists).toBe(true) }) -}) \ No newline at end of file +}) diff --git a/line/__tests__/functionality_unit.test.mjs b/line/__tests__/functionality_unit.test.js similarity index 97% rename from line/__tests__/functionality_unit.test.mjs rename to line/__tests__/functionality_unit.test.js index 35ef5ebe..81d2b901 100644 --- a/line/__tests__/functionality_unit.test.mjs +++ b/line/__tests__/functionality_unit.test.js @@ -1,5 +1,5 @@ -import { findLineById } from '../line.mjs' -import { validateID } from '../../utilities/shared.mjs' +import { findLineById } from '../line.js' +import { validateID } from '../../utilities/shared.js' describe('Line endpoint functionality unit test', () => { describe('findLineById function', () => { diff --git a/line/index.mjs b/line/index.js similarity index 93% rename from line/index.mjs rename to line/index.js index 45e23912..74166c7e 100644 --- a/line/index.mjs +++ b/line/index.js @@ -1,7 +1,7 @@ import express from 'express' -import * as utils from '../utilities/shared.mjs' +import * as utils from '../utilities/shared.js' import cors from 'cors' -import { findLineById } from './line.mjs' +import { findLineById } from './line.js' import common_cors from '../utilities/common_cors.json' with {type: 'json'} const router = express.Router() diff --git a/line/line.mjs b/line/line.js similarity index 98% rename from line/line.mjs rename to line/line.js index 76f5d142..02184e47 100644 --- a/line/line.mjs +++ b/line/line.js @@ -1,4 +1,4 @@ -import * as utils from '../utilities/shared.mjs' +import * as utils from '../utilities/shared.js' export async function findLineById(id = null, options = {}) { if (id === null || id === undefined || !utils.validateID(id)) { diff --git a/manifest/__tests__/end_to_end_unit.test.mjs b/manifest/__tests__/end_to_end_unit.test.js similarity index 98% rename from manifest/__tests__/end_to_end_unit.test.mjs rename to manifest/__tests__/end_to_end_unit.test.js index 6e1553d5..595f922d 100644 --- a/manifest/__tests__/end_to_end_unit.test.mjs +++ b/manifest/__tests__/end_to_end_unit.test.js @@ -7,7 +7,7 @@ * * */ -import manifestRouter from '../index.mjs' +import manifestRouter from '../index.js' import express from 'express' import request from 'supertest' @@ -72,4 +72,4 @@ describe('Manifest endpoint end to end unit test (spinning up the endpoint and u // TODO routes which use the CRUD capabilities of the /manifest endpoint, such as /manifest/create -}) \ No newline at end of file +}) diff --git a/manifest/__tests__/exists_unit.test.mjs b/manifest/__tests__/exists_unit.test.js similarity index 94% rename from manifest/__tests__/exists_unit.test.mjs rename to manifest/__tests__/exists_unit.test.js index d479bb1d..af5e7139 100644 --- a/manifest/__tests__/exists_unit.test.mjs +++ b/manifest/__tests__/exists_unit.test.js @@ -7,7 +7,7 @@ * */ //need to import app to check for the route -import app from '../../app.mjs' +import app from '../../app.js' describe('Manifest endpoint availability unit test (via a check on the app routes). #exists_unit', () => { it('/manifest route is registered', () => { @@ -21,4 +21,4 @@ describe('Manifest endpoint availability unit test (via a check on the app route } expect(exists).toBe(true) }) -}) \ No newline at end of file +}) diff --git a/manifest/__tests__/functionality_unit.test.mjs b/manifest/__tests__/functionality_unit.test.js similarity index 91% rename from manifest/__tests__/functionality_unit.test.mjs rename to manifest/__tests__/functionality_unit.test.js index 817ed1e4..6d979d45 100644 --- a/manifest/__tests__/functionality_unit.test.mjs +++ b/manifest/__tests__/functionality_unit.test.js @@ -7,12 +7,12 @@ * * */ -import * as logic from "../manifest.mjs" +import * as logic from "../manifest.js" import { jest } from "@jest/globals" // Mock the saveManifest function -jest.mock('../manifest.mjs', () => ({ - ...jest.requireActual('../manifest.mjs'), +jest.mock('../manifest.js', () => ({ + ...jest.requireActual('../manifest.js'), saveManifest: jest.fn().mockResolvedValue({ "@id": "mocked_id" }), updateManifest: jest.fn().mockResolvedValue({ "@id": "updated_mocked_id" }) })); @@ -37,4 +37,4 @@ describe.skip('Manifest endpoint functionality unit test (just testing helper fu it('Deletes the Manifest Stub', async () => { expect(true).toBe(true) }) -}) +}) diff --git a/manifest/index.mjs b/manifest/index.js similarity index 97% rename from manifest/index.mjs rename to manifest/index.js index 042b31a2..db133b2e 100644 --- a/manifest/index.mjs +++ b/manifest/index.js @@ -7,8 +7,8 @@ * */ import express from 'express' -import * as logic from './manifest.mjs' -import * as utils from '../utilities/shared.mjs' +import * as logic from './manifest.js' +import * as utils from '../utilities/shared.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} @@ -136,4 +136,4 @@ router.route('/') utils.respondWithError(res, 404, 'Not found') }) -export default router \ No newline at end of file +export default router diff --git a/manifest/manifest.mjs b/manifest/manifest.js similarity index 95% rename from manifest/manifest.mjs rename to manifest/manifest.js index 28efa663..5ab867c9 100644 --- a/manifest/manifest.mjs +++ b/manifest/manifest.js @@ -5,8 +5,8 @@ * https://github.com/thehabes * * */ -import DatabaseDriver from "../database/driver.mjs" -import * as utils from "../utilities/shared.mjs" +import DatabaseDriver from "../database/driver.js" +import * as utils from "../utilities/shared.js" // This module will use the TinyPEN API (RERUM Mongo DB) const database = new DatabaseDriver("tiny") diff --git a/package-lock.json b/package-lock.json index c3f867ed..681736ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,9 @@ "name": "tpen3-services", "version": "0.0.0", "license": "CC-BY", - "dependencies": { + "dependencies": { "@iiif/helpers": "^1.3.1", + "@mongodb-js/saslprep": "^1.2.2", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.0", @@ -26,8 +27,8 @@ "marked": "^15.0.7", "mongodb": "^6.12.0", "morgan": "^1.10.0", - "nodemailer": "^6.9.16", - "tpen3-services": "file:" + "nodemailer": "^6.9.16" + } }, "devDependencies": { "@jest-mock/express": "^2.1.0", @@ -39,7 +40,7 @@ "supertest": "^7.0.0" }, "engines": { - "node": ">=22.15.0" + "node": ">=22.14.0" } }, "node_modules/@ampproject/remapping": { @@ -56,12 +57,12 @@ } }, "node_modules/@asamuzakjp/css-color": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", - "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.5.tgz", + "integrity": "sha512-w7AmVyTTiU41fNLsFDf+gA2Dwtbx2EJtn2pbJNAGSRAg50loXy1uLXA3hEpD8+eydcomTurw09tq5/AyceCaGg==", "dependencies": { - "@csstools/css-calc": "^2.1.2", - "@csstools/css-color-parser": "^3.0.8", + "@csstools/css-calc": "^2.1.3", + "@csstools/css-color-parser": "^3.0.9", "@csstools/css-parser-algorithms": "^3.0.4", "@csstools/css-tokenizer": "^3.0.3", "lru-cache": "^10.4.3" @@ -559,9 +560,9 @@ } }, "node_modules/@csstools/css-calc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", - "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.3.tgz", + "integrity": "sha512-XBG3talrhid44BY1x3MHzUx/aTG8+x/Zi57M4aTKK9RFB4aLlF3TTSzfzn8nWVHWL3FgAXAxmupmDd6VWww+pw==", "funding": [ { "type": "github", @@ -581,9 +582,9 @@ } }, "node_modules/@csstools/css-color-parser": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", - "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.9.tgz", + "integrity": "sha512-wILs5Zk7BU86UArYBJTPy/FMPPKVKHMj1ycCEyf3VUptol0JNRLFU/BZsJ4aiIHJEbSLiizzRrw8Pc1uAEDrXw==", "funding": [ { "type": "github", @@ -596,7 +597,7 @@ ], "dependencies": { "@csstools/color-helpers": "^5.0.2", - "@csstools/css-calc": "^2.1.2" + "@csstools/css-calc": "^2.1.3" }, "engines": { "node": ">=18" @@ -670,9 +671,9 @@ } }, "node_modules/@iiif/parser": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", - "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.8.tgz", + "integrity": "sha512-87ifvY3Pq6dzSbHKrCr6/aIiZZDeaozIFz+EAYWYGxmpxn213t3kISCrSCC/XJ03jdXW7mQgPUEPcmztX5uh1A==", "peer": true, "dependencies": { "@iiif/presentation-2": "^1.0.4", @@ -1071,13 +1072,34 @@ } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.1.tgz", - "integrity": "sha512-1NCa8GsZ+OFLTw5KkKQS22wLS+Rs+y02sgkhr99Pm4OSXtSDHCJyq0uscPF0qA86ipGYH4PwtC2+a8Y4RKkCcg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz", + "integrity": "sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==", "dependencies": { "sparse-bitfield": "^3.0.3" } }, + "node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@paralleldrive/cuid2": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz", + "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==", + "dev": true, + "dependencies": { + "@noble/hashes": "^1.1.5" + } + }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -1142,9 +1164,9 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", "dev": true, "dependencies": { "@babel/types": "^7.0.0" @@ -1263,11 +1285,11 @@ "dev": true }, "node_modules/@types/node": { - "version": "22.13.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz", - "integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==", + "version": "22.15.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz", + "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==", "dependencies": { - "undici-types": "~6.20.0" + "undici-types": "~6.21.0" } }, "node_modules/@types/qs": { @@ -1444,7 +1466,8 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true }, "node_modules/babel-jest": { "version": "29.7.0", @@ -1757,9 +1780,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "version": "1.0.30001715", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", + "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", "dev": true, "funding": [ { @@ -1898,6 +1921,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -2024,11 +2048,11 @@ } }, "node_modules/cssstyle": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", - "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.1.tgz", + "integrity": "sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==", "dependencies": { - "@asamuzakjp/css-color": "^3.1.1", + "@asamuzakjp/css-color": "^3.1.2", "rrweb-cssom": "^0.8.0" }, "engines": { @@ -2095,6 +2119,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, "engines": { "node": ">=0.4.0" } @@ -2162,17 +2187,17 @@ } }, "node_modules/dompurify": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", - "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz", + "integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==", "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "node_modules/dotenv": { - "version": "16.4.7", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", - "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", + "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", "engines": { "node": ">=12" }, @@ -2181,9 +2206,9 @@ } }, "node_modules/dotenv-expand": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", - "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.2.tgz", + "integrity": "sha512-lXpXz2ZE1cea1gL4sz2Ipj8y4PiVjytYr3Ij0SWoms1PGxIv7m2CRKuRuCRtHdVuvM/hNJPMxt5PbhboNC4dPQ==", "dependencies": { "dotenv": "^16.4.5" }, @@ -2213,9 +2238,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.5.129", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", - "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", + "version": "1.5.144", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.144.tgz", + "integrity": "sha512-eJIaMRKeAzxfBSxtjYnoIAw/tdD6VIH6tHBZepZnAbE3Gyqqs5mGN87DvcldPUbVkIljTK8pY0CMcUljP64lfQ==", "dev": true }, "node_modules/emittery": { @@ -2245,9 +2270,9 @@ } }, "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz", + "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==", "engines": { "node": ">=0.12" }, @@ -2295,6 +2320,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", @@ -2568,6 +2594,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -2579,15 +2606,18 @@ } }, "node_modules/formidable": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", - "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz", + "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==", "dev": true, "dependencies": { + "@paralleldrive/cuid2": "^2.2.2", "dezalgo": "^1.0.4", - "hexoid": "^2.0.0", "once": "^1.4.0" }, + "engines": { + "node": ">=14.0.0" + }, "funding": { "url": "https://ko-fi.com/tunnckoCore/commissions" } @@ -2614,6 +2644,20 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -2779,6 +2823,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, "dependencies": { "has-symbols": "^1.0.3" }, @@ -2800,15 +2845,6 @@ "node": ">= 0.4" } }, - "node_modules/hexoid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", - "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/html-encoding-sniffer": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", @@ -3739,14 +3775,13 @@ } }, "node_modules/jsdom": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", - "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz", + "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", "dependencies": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", - "decimal.js": "^10.4.3", - "form-data": "^4.0.1", + "decimal.js": "^10.5.0", "html-encoding-sniffer": "^4.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.6", @@ -3756,12 +3791,12 @@ "rrweb-cssom": "^0.8.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^5.0.0", + "tough-cookie": "^5.1.1", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.0", + "whatwg-url": "^14.1.1", "ws": "^8.18.0", "xml-name-validator": "^5.0.0" }, @@ -3922,9 +3957,9 @@ } }, "node_modules/mariadb": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", - "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.2.tgz", + "integrity": "sha512-B17vhYRHDMQ1XXvhSWsvKJbpw3Q8B6py93ThBEXZXSgxIbqnKqoHK1RzoPLbIxoEzWN3jA86ZaMMc3IG6L5wsw==", "dependencies": { "@types/geojson": "^7946.0.14", "@types/node": "^22.5.4", @@ -3958,9 +3993,9 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" }, "node_modules/marked": { - "version": "15.0.7", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", - "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==", + "version": "15.0.11", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.11.tgz", + "integrity": "sha512-1BEXAU2euRCG3xwgLVT1y0xbJEld1XOrmRJpUwRCcy7rxhSCwMrmEu9LXoPhHSCJG41V7YcQ2mjKRr5BA3ITIA==", "bin": { "marked": "bin/marked.js" }, @@ -4076,9 +4111,9 @@ } }, "node_modules/mongodb": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", - "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.16.0.tgz", + "integrity": "sha512-D1PNcdT0y4Grhou5Zi/qgipZOYeWrhLEpk33n3nm6LGtz61jvO88WlrWCK/bigMjpnOdAUKKQwsGIl0NtWMyYw==", "dependencies": { "@mongodb-js/saslprep": "^1.1.9", "bson": "^6.10.3", @@ -4269,17 +4304,17 @@ "dev": true }, "node_modules/nodemailer": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz", - "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz", + "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==", "engines": { "node": ">=6.0.0" } }, "node_modules/nodemon": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", - "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", + "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", "dev": true, "dependencies": { "chokidar": "^3.5.2", @@ -4501,11 +4536,11 @@ "optional": true }, "node_modules/parse5": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", - "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", "dependencies": { - "entities": "^4.5.0" + "entities": "^6.0.0" }, "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" @@ -5280,20 +5315,20 @@ } }, "node_modules/tldts": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", - "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", + "version": "6.1.86", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz", + "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==", "dependencies": { - "tldts-core": "^6.1.85" + "tldts-core": "^6.1.86" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", - "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==" + "version": "6.1.86", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz", + "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==" }, "node_modules/tmpl": { "version": "1.0.5", @@ -5341,14 +5376,10 @@ "node": ">=16" } }, - "node_modules/tpen3-services": { - "resolved": "", - "link": true - }, "node_modules/tr46": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", - "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", + "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", "dependencies": { "punycode": "^2.3.1" }, @@ -5396,9 +5427,9 @@ "dev": true }, "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==" }, "node_modules/unfetch": { "version": "4.2.0", @@ -5694,12 +5725,12 @@ } }, "@asamuzakjp/css-color": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", - "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.5.tgz", + "integrity": "sha512-w7AmVyTTiU41fNLsFDf+gA2Dwtbx2EJtn2pbJNAGSRAg50loXy1uLXA3hEpD8+eydcomTurw09tq5/AyceCaGg==", "requires": { - "@csstools/css-calc": "^2.1.2", - "@csstools/css-color-parser": "^3.0.8", + "@csstools/css-calc": "^2.1.3", + "@csstools/css-color-parser": "^3.0.9", "@csstools/css-parser-algorithms": "^3.0.4", "@csstools/css-tokenizer": "^3.0.3", "lru-cache": "^10.4.3" @@ -6053,18 +6084,18 @@ "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==" }, "@csstools/css-calc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", - "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.3.tgz", + "integrity": "sha512-XBG3talrhid44BY1x3MHzUx/aTG8+x/Zi57M4aTKK9RFB4aLlF3TTSzfzn8nWVHWL3FgAXAxmupmDd6VWww+pw==", "requires": {} }, "@csstools/css-color-parser": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", - "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.9.tgz", + "integrity": "sha512-wILs5Zk7BU86UArYBJTPy/FMPPKVKHMj1ycCEyf3VUptol0JNRLFU/BZsJ4aiIHJEbSLiizzRrw8Pc1uAEDrXw==", "requires": { "@csstools/color-helpers": "^5.0.2", - "@csstools/css-calc": "^2.1.2" + "@csstools/css-calc": "^2.1.3" } }, "@csstools/css-parser-algorithms": { @@ -6098,9 +6129,9 @@ } }, "@iiif/parser": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", - "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.8.tgz", + "integrity": "sha512-87ifvY3Pq6dzSbHKrCr6/aIiZZDeaozIFz+EAYWYGxmpxn213t3kISCrSCC/XJ03jdXW7mQgPUEPcmztX5uh1A==", "peer": true, "requires": { "@iiif/presentation-2": "^1.0.4", @@ -6424,13 +6455,28 @@ } }, "@mongodb-js/saslprep": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.1.tgz", - "integrity": "sha512-1NCa8GsZ+OFLTw5KkKQS22wLS+Rs+y02sgkhr99Pm4OSXtSDHCJyq0uscPF0qA86ipGYH4PwtC2+a8Y4RKkCcg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz", + "integrity": "sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==", "requires": { "sparse-bitfield": "^3.0.3" } }, + "@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true + }, + "@paralleldrive/cuid2": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz", + "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==", + "dev": true, + "requires": { + "@noble/hashes": "^1.1.5" + } + }, "@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -6494,9 +6540,9 @@ } }, "@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", "dev": true, "requires": { "@babel/types": "^7.0.0" @@ -6615,11 +6661,11 @@ "dev": true }, "@types/node": { - "version": "22.13.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz", - "integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==", + "version": "22.15.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz", + "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==", "requires": { - "undici-types": "~6.20.0" + "undici-types": "~6.21.0" } }, "@types/qs": { @@ -6772,7 +6818,8 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true }, "babel-jest": { "version": "29.7.0", @@ -7010,9 +7057,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "version": "1.0.30001715", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", + "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", "dev": true }, "chalk": { @@ -7101,6 +7148,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -7197,11 +7245,11 @@ } }, "cssstyle": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", - "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.1.tgz", + "integrity": "sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==", "requires": { - "@asamuzakjp/css-color": "^3.1.1", + "@asamuzakjp/css-color": "^3.1.2", "rrweb-cssom": "^0.8.0" } }, @@ -7243,7 +7291,8 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true }, "denque": { "version": "2.1.0", @@ -7289,22 +7338,22 @@ "dev": true }, "dompurify": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", - "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz", + "integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==", "requires": { "@types/trusted-types": "^2.0.7" } }, "dotenv": { - "version": "16.4.7", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", - "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==" + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", + "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==" }, "dotenv-expand": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", - "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.2.tgz", + "integrity": "sha512-lXpXz2ZE1cea1gL4sz2Ipj8y4PiVjytYr3Ij0SWoms1PGxIv7m2CRKuRuCRtHdVuvM/hNJPMxt5PbhboNC4dPQ==", "requires": { "dotenv": "^16.4.5" } @@ -7325,9 +7374,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.5.129", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", - "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", + "version": "1.5.144", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.144.tgz", + "integrity": "sha512-eJIaMRKeAzxfBSxtjYnoIAw/tdD6VIH6tHBZepZnAbE3Gyqqs5mGN87DvcldPUbVkIljTK8pY0CMcUljP64lfQ==", "dev": true }, "emittery": { @@ -7348,9 +7397,9 @@ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz", + "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==" }, "error-ex": { "version": "1.3.2", @@ -7383,6 +7432,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, "requires": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", @@ -7609,6 +7659,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -7617,13 +7668,13 @@ } }, "formidable": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", - "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz", + "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==", "dev": true, "requires": { + "@paralleldrive/cuid2": "^2.2.2", "dezalgo": "^1.0.4", - "hexoid": "^2.0.0", "once": "^1.4.0" } }, @@ -7643,6 +7694,13 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "optional": true + }, "function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -7753,6 +7811,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, "requires": { "has-symbols": "^1.0.3" } @@ -7765,12 +7824,6 @@ "function-bind": "^1.1.2" } }, - "hexoid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", - "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", - "dev": true - }, "html-encoding-sniffer": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", @@ -8479,14 +8532,13 @@ } }, "jsdom": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", - "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz", + "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", "requires": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", - "decimal.js": "^10.4.3", - "form-data": "^4.0.1", + "decimal.js": "^10.5.0", "html-encoding-sniffer": "^4.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.6", @@ -8496,12 +8548,12 @@ "rrweb-cssom": "^0.8.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^5.0.0", + "tough-cookie": "^5.1.1", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.0", + "whatwg-url": "^14.1.1", "ws": "^8.18.0", "xml-name-validator": "^5.0.0" } @@ -8615,9 +8667,9 @@ } }, "mariadb": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", - "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.2.tgz", + "integrity": "sha512-B17vhYRHDMQ1XXvhSWsvKJbpw3Q8B6py93ThBEXZXSgxIbqnKqoHK1RzoPLbIxoEzWN3jA86ZaMMc3IG6L5wsw==", "requires": { "@types/geojson": "^7946.0.14", "@types/node": "^22.5.4", @@ -8647,9 +8699,9 @@ } }, "marked": { - "version": "15.0.7", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", - "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==" + "version": "15.0.11", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.11.tgz", + "integrity": "sha512-1BEXAU2euRCG3xwgLVT1y0xbJEld1XOrmRJpUwRCcy7rxhSCwMrmEu9LXoPhHSCJG41V7YcQ2mjKRr5BA3ITIA==" }, "math-intrinsics": { "version": "1.1.0", @@ -8726,9 +8778,9 @@ } }, "mongodb": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", - "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.16.0.tgz", + "integrity": "sha512-D1PNcdT0y4Grhou5Zi/qgipZOYeWrhLEpk33n3nm6LGtz61jvO88WlrWCK/bigMjpnOdAUKKQwsGIl0NtWMyYw==", "requires": { "@mongodb-js/saslprep": "^1.1.9", "bson": "^6.10.3", @@ -8867,14 +8919,14 @@ "dev": true }, "nodemailer": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz", - "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==" + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz", + "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==" }, "nodemon": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", - "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", + "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", "dev": true, "requires": { "chokidar": "^3.5.2", @@ -9027,11 +9079,11 @@ "optional": true }, "parse5": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", - "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", "requires": { - "entities": "^4.5.0" + "entities": "^6.0.0" } }, "parseurl": { @@ -9598,17 +9650,17 @@ } }, "tldts": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", - "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", + "version": "6.1.86", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz", + "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==", "requires": { - "tldts-core": "^6.1.85" + "tldts-core": "^6.1.86" } }, "tldts-core": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", - "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==" + "version": "6.1.86", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz", + "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==" }, "tmpl": { "version": "1.0.5", @@ -9644,4230 +9696,10 @@ "tldts": "^6.1.32" } }, - "tpen3-services": { - "version": "file:", - "requires": { - "@iiif/helpers": "^1.3.1", - "@jest-mock/express": "^2.1.0", - "cookie-parser": "^1.4.7", - "cors": "^2.8.5", - "debug": "^4.4.0", - "dompurify": "^3.2.4", - "dotenv": "^16.4.7", - "dotenv-expand": "^12.0.1", - "express": "^4.21.2", - "express-oauth2-jwt-bearer": "^1.6.0", - "express-urlrewrite": "^2.0.3", - "http-errors": "^2.0.0", - "jest": "^29.7.0", - "jest-cli": "^29.7.0", - "jest-esm-transformer": "^1.0.0", - "jsdom": "^26.0.0", - "manifesto.js": "^4.2.21", - "mariadb": "^3.4.0", - "marked": "^15.0.7", - "mongodb": "^6.12.0", - "morgan": "^1.10.0", - "nodemailer": "^6.9.16", - "nodemon": "^3.1.9", - "sinon": "^19.0.2", - "supertest": "^7.0.0", - "tpen3-services": "file:" - }, - "dependencies": { - "@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "@asamuzakjp/css-color": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", - "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", - "requires": { - "@csstools/css-calc": "^2.1.2", - "@csstools/css-color-parser": "^3.0.8", - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3", - "lru-cache": "^10.4.3" - }, - "dependencies": { - "lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" - } - } - }, - "@babel/code-frame": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", - "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.25.9", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - } - }, - "@babel/compat-data": { - "version": "7.26.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", - "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", - "dev": true - }, - "@babel/core": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", - "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.10", - "@babel/helper-compilation-targets": "^7.26.5", - "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.10", - "@babel/parser": "^7.26.10", - "@babel/template": "^7.26.9", - "@babel/traverse": "^7.26.10", - "@babel/types": "^7.26.10", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - } - }, - "@babel/generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz", - "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==", - "dev": true, - "requires": { - "@babel/parser": "^7.27.0", - "@babel/types": "^7.27.0", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^3.0.2" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz", - "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.26.8", - "@babel/helper-validator-option": "^7.25.9", - "browserslist": "^4.24.0", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - } - }, - "@babel/helper-module-imports": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", - "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", - "dev": true, - "requires": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" - } - }, - "@babel/helper-module-transforms": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", - "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9", - "@babel/traverse": "^7.25.9" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", - "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", - "dev": true - }, - "@babel/helper-string-parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", - "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", - "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", - "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", - "dev": true - }, - "@babel/helpers": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz", - "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==", - "dev": true, - "requires": { - "@babel/template": "^7.27.0", - "@babel/types": "^7.27.0" - } - }, - "@babel/parser": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", - "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", - "dev": true, - "requires": { - "@babel/types": "^7.27.0" - } - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-import-attributes": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", - "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-jsx": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", - "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", - "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", - "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.26.0", - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/template": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", - "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.26.2", - "@babel/parser": "^7.27.0", - "@babel/types": "^7.27.0" - } - }, - "@babel/traverse": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz", - "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.27.0", - "@babel/parser": "^7.27.0", - "@babel/template": "^7.27.0", - "@babel/types": "^7.27.0", - "debug": "^4.3.1", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", - "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" - } - }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "@csstools/color-helpers": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz", - "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==" - }, - "@csstools/css-calc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", - "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", - "requires": {} - }, - "@csstools/css-color-parser": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", - "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", - "requires": { - "@csstools/color-helpers": "^5.0.2", - "@csstools/css-calc": "^2.1.2" - } - }, - "@csstools/css-parser-algorithms": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", - "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", - "requires": {} - }, - "@csstools/css-tokenizer": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", - "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==" - }, - "@edsilv/http-status-codes": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", - "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==" - }, - "@iiif/helpers": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", - "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", - "requires": { - "@iiif/presentation-2": "1.0.4", - "@iiif/presentation-3": "2.2.3", - "@iiif/presentation-3-normalized": "0.9.7", - "@types/geojson": "7946.0.13", - "abs-svg-path": "^0.1.1", - "parse-svg-path": "^0.1.2", - "svg-arc-to-cubic-bezier": "^3.2.0" - } - }, - "@iiif/parser": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", - "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", - "peer": true, - "requires": { - "@iiif/presentation-2": "^1.0.4", - "@iiif/presentation-3": "^2.2.2", - "@iiif/presentation-3-normalized": "^0.9.7", - "@types/geojson": "^7946.0.10" - } - }, - "@iiif/presentation-2": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@iiif/presentation-2/-/presentation-2-1.0.4.tgz", - "integrity": "sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==", - "requires": {} - }, - "@iiif/presentation-3": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", - "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", - "requires": { - "@types/geojson": "^7946.0.10" - } - }, - "@iiif/presentation-3-normalized": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz", - "integrity": "sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==", - "requires": { - "@iiif/presentation-3": "^2.0.5" - } - }, - "@iiif/vocabulary": { - "version": "1.0.26", - "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", - "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==" - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest-mock/express": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@jest-mock/express/-/express-2.1.0.tgz", - "integrity": "sha512-wwij1960SVxJL+v5Eqw3Akn3S5TLfCtHnFqs2K9Zto7RLU5I/7YhOsYDZQfNcnGyiBdisDz5iT21SRO1CVfvKA==", - "dev": true, - "requires": { - "@types/express": "^4.17.21" - } - }, - "@jest/console": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", - "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0" - } - }, - "@jest/core": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", - "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/reporters": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^29.7.0", - "jest-config": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-resolve-dependencies": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "@jest/environment": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", - "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", - "dev": true, - "requires": { - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0" - } - }, - "@jest/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", - "dev": true, - "requires": { - "expect": "^29.7.0", - "jest-snapshot": "^29.7.0" - } - }, - "@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", - "dev": true, - "requires": { - "jest-get-type": "^29.6.3" - } - }, - "@jest/fake-timers": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", - "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@sinonjs/fake-timers": "^10.0.2", - "@types/node": "*", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "@jest/globals": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", - "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/types": "^29.6.3", - "jest-mock": "^29.7.0" - } - }, - "@jest/reporters": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", - "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^6.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "v8-to-istanbul": "^9.0.1" - } - }, - "@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "requires": { - "@sinclair/typebox": "^0.27.8" - } - }, - "@jest/source-map": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", - "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.18", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - } - }, - "@jest/test-result": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", - "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", - "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", - "dev": true, - "requires": { - "@jest/test-result": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "slash": "^3.0.0" - } - }, - "@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - } - }, - "@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "requires": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - } - }, - "@jridgewell/gen-mapping": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", - "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true - }, - "@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true - }, - "@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "@mongodb-js/saslprep": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.1.tgz", - "integrity": "sha512-1NCa8GsZ+OFLTw5KkKQS22wLS+Rs+y02sgkhr99Pm4OSXtSDHCJyq0uscPF0qA86ipGYH4PwtC2+a8Y4RKkCcg==", - "requires": { - "sparse-bitfield": "^3.0.3" - } - }, - "@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true - }, - "@sinonjs/commons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", - "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.0" - } - }, - "@sinonjs/samsam": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", - "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1", - "lodash.get": "^4.4.2", - "type-detect": "^4.1.0" - }, - "dependencies": { - "type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", - "dev": true - } - } - }, - "@sinonjs/text-encoding": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", - "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", - "dev": true - }, - "@types/babel__core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", - "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", - "dev": true, - "requires": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", - "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz", - "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==", - "dev": true, - "requires": { - "@babel/types": "^7.20.7" - } - }, - "@types/body-parser": { - "version": "1.19.5", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", - "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", - "dev": true, - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/connect": { - "version": "3.4.38", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", - "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/express": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", - "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", - "dev": true, - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.33", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.19.6", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", - "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*", - "@types/send": "*" - } - }, - "@types/geojson": { - "version": "7946.0.13", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", - "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" - }, - "@types/graceful-fs": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", - "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/http-errors": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", - "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", - "dev": true - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", - "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", - "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/mime": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", - "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", - "dev": true - }, - "@types/node": { - "version": "22.13.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.17.tgz", - "integrity": "sha512-nAJuQXoyPj04uLgu+obZcSmsfOenUg6DxPKogeUy6yNCFwWaj5sBF8/G/pNo8EtBJjAfSVgfIlugR/BCOleO+g==", - "requires": { - "undici-types": "~6.20.0" - } - }, - "@types/qs": { - "version": "6.9.18", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", - "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", - "dev": true - }, - "@types/range-parser": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", - "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", - "dev": true - }, - "@types/send": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", - "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", - "dev": true, - "requires": { - "@types/mime": "^1", - "@types/node": "*" - } - }, - "@types/serve-static": { - "version": "1.15.7", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", - "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", - "dev": true, - "requires": { - "@types/http-errors": "*", - "@types/node": "*", - "@types/send": "*" - } - }, - "@types/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true - }, - "@types/trusted-types": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "optional": true - }, - "@types/webidl-conversions": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" - }, - "@types/whatwg-url": { - "version": "11.0.5", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", - "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", - "requires": { - "@types/webidl-conversions": "*" - } - }, - "@types/yargs": { - "version": "17.0.33", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", - "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true - }, - "abs-svg-path": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", - "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==", - "optional": true - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "agent-base": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", - "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==" - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" - }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "requires": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "dependencies": { - "istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - } - } - } - }, - "babel-plugin-jest-hoist": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", - "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", - "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5" - } - }, - "babel-preset-jest": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", - "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "requires": { - "safe-buffer": "5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true - }, - "body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "requires": { - "fill-range": "^7.1.1" - } - }, - "browserslist": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", - "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001688", - "electron-to-chromium": "^1.5.73", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.1" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "bson": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", - "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==" - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" - }, - "call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "requires": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - } - }, - "call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true - }, - "cjs-module-lexer": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", - "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", - "dev": true - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "component-emitter": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", - "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "requires": { - "safe-buffer": "5.2.1" - } - }, - "content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" - }, - "convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true - }, - "cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==" - }, - "cookie-parser": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", - "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", - "requires": { - "cookie": "0.7.2", - "cookie-signature": "1.0.6" - } - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" - }, - "cookiejar": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", - "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", - "dev": true - }, - "cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "requires": { - "object-assign": "^4", - "vary": "^1" - } - }, - "create-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", - "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "prompts": "^2.0.1" - } - }, - "cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "cssstyle": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", - "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", - "requires": { - "@asamuzakjp/css-color": "^3.1.1", - "rrweb-cssom": "^0.8.0" - } - }, - "data-urls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", - "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", - "requires": { - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.0.0" - } - }, - "debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "requires": { - "ms": "^2.1.3" - } - }, - "decimal.js": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", - "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==" - }, - "dedent": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", - "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", - "dev": true, - "requires": {} - }, - "deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" - }, - "denque": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", - "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "dezalgo": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", - "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", - "dev": true, - "requires": { - "asap": "^2.0.0", - "wrappy": "1" - } - }, - "diff": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", - "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", - "dev": true - }, - "diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true - }, - "dompurify": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", - "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", - "requires": { - "@types/trusted-types": "^2.0.7" - } - }, - "dotenv": { - "version": "16.4.7", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", - "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==" - }, - "dotenv-expand": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", - "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", - "requires": { - "dotenv": "^16.4.5" - } - }, - "dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "requires": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" - }, - "electron-to-chromium": { - "version": "1.5.129", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", - "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", - "dev": true - }, - "emittery": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", - "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" - }, - "entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" - }, - "es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" - }, - "es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "requires": { - "es-errors": "^1.3.0" - } - }, - "es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "requires": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - } - }, - "escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", - "dev": true, - "requires": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", - "proxy-addr": "~2.0.7", - "qs": "6.13.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "express-oauth2-jwt-bearer": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", - "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", - "requires": { - "jose": "^4.15.5" - } - }, - "express-urlrewrite": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-2.0.3.tgz", - "integrity": "sha512-NjsmtYZ1Lpie+XR7VIrvI6aeAmRQDf9cHyGjdIxlE9sc+NhTx3z6fJ0wfxV4rS7AY9ncCK7JDge+VX3e+DQ9Mg==", - "requires": { - "debug": "^4.3.4", - "path-to-regexp": "^6.3.0" - }, - "dependencies": { - "path-to-regexp": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==" - } - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", - "dev": true - }, - "fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", - "requires": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "mime-types": "^2.1.12" - } - }, - "formidable": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", - "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", - "dev": true, - "requires": { - "dezalgo": "^1.0.4", - "hexoid": "^2.0.0", - "once": "^1.4.0" - } - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - } - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "requires": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" - }, - "graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" - }, - "has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "requires": { - "has-symbols": "^1.0.3" - } - }, - "hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "requires": { - "function-bind": "^1.1.2" - } - }, - "hexoid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", - "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", - "dev": true - }, - "html-encoding-sniffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", - "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", - "requires": { - "whatwg-encoding": "^3.1.1" - } - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "requires": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - } - }, - "https-proxy-agent": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "requires": { - "agent-base": "^7.1.2", - "debug": "4" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true - }, - "import-local": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", - "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, - "requires": { - "hasown": "^2.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "isomorphic-unfetch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", - "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", - "requires": { - "node-fetch": "^2.6.1", - "unfetch": "^4.2.0" - } - }, - "istanbul-lib-coverage": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", - "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", - "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", - "dev": true, - "requires": { - "@babel/core": "^7.23.9", - "@babel/parser": "^7.23.9", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^7.5.4" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^4.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - } - }, - "istanbul-reports": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", - "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", - "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", - "dev": true, - "requires": { - "@jest/core": "^29.7.0", - "@jest/types": "^29.6.3", - "import-local": "^3.0.2", - "jest-cli": "^29.7.0" - } - }, - "jest-changed-files": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", - "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", - "dev": true, - "requires": { - "execa": "^5.0.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0" - } - }, - "jest-circus": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", - "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^1.0.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^29.7.0", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0", - "pretty-format": "^29.7.0", - "pure-rand": "^6.0.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - } - }, - "jest-cli": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", - "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", - "dev": true, - "requires": { - "@jest/core": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "create-jest": "^29.7.0", - "exit": "^0.1.2", - "import-local": "^3.0.2", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "yargs": "^17.3.1" - } - }, - "jest-config": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", - "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-jest": "^29.7.0", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - } - }, - "jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-docblock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", - "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", - "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "jest-util": "^29.7.0", - "pretty-format": "^29.7.0" - } - }, - "jest-environment-node": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", - "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "jest-esm-transformer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz", - "integrity": "sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==", - "dev": true, - "requires": { - "@babel/core": "^7.4.4", - "@babel/plugin-transform-modules-commonjs": "^7.4.4" - } - }, - "jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "dev": true - }, - "jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - } - }, - "jest-leak-detector": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", - "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", - "dev": true, - "requires": { - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - } - }, - "jest-mock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", - "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-util": "^29.7.0" - } - }, - "jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "requires": {} - }, - "jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true - }, - "jest-resolve": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", - "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "resolve": "^1.20.0", - "resolve.exports": "^2.0.0", - "slash": "^3.0.0" - } - }, - "jest-resolve-dependencies": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", - "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", - "dev": true, - "requires": { - "jest-regex-util": "^29.6.3", - "jest-snapshot": "^29.7.0" - } - }, - "jest-runner": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", - "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/environment": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "graceful-fs": "^4.2.9", - "jest-docblock": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-leak-detector": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-resolve": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-util": "^29.7.0", - "jest-watcher": "^29.7.0", - "jest-worker": "^29.7.0", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - } - }, - "jest-runtime": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", - "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/globals": "^29.7.0", - "@jest/source-map": "^29.6.3", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - } - }, - "jest-snapshot": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", - "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-jsx": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "natural-compare": "^1.4.0", - "pretty-format": "^29.7.0", - "semver": "^7.5.3" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - } - }, - "jest-validate": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", - "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "leven": "^3.1.0", - "pretty-format": "^29.7.0" - }, - "dependencies": { - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - } - } - }, - "jest-watcher": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", - "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", - "dev": true, - "requires": { - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "jest-util": "^29.7.0", - "string-length": "^4.0.1" - } - }, - "jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "requires": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jose": { - "version": "4.15.9", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", - "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==" - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsdom": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", - "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", - "requires": { - "cssstyle": "^4.2.1", - "data-urls": "^5.0.0", - "decimal.js": "^10.4.3", - "form-data": "^4.0.1", - "html-encoding-sniffer": "^4.0.0", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.6", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.16", - "parse5": "^7.2.1", - "rrweb-cssom": "^0.8.0", - "saxes": "^6.0.0", - "symbol-tree": "^3.2.4", - "tough-cookie": "^5.0.0", - "w3c-xmlserializer": "^5.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^3.1.1", - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.0", - "ws": "^8.18.0", - "xml-name-validator": "^5.0.0" - } - }, - "jsesc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", - "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - }, - "just-extend": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", - "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "dev": true - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "make-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", - "dev": true, - "requires": { - "semver": "^7.5.3" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "requires": { - "tmpl": "1.0.5" - } - }, - "manifesto.js": { - "version": "4.2.21", - "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz", - "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==", - "requires": { - "@edsilv/http-status-codes": "^1.0.3", - "@iiif/vocabulary": "^1.0.26", - "isomorphic-unfetch": "^3.0.0", - "lodash": "^4.17.21" - } - }, - "mariadb": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", - "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", - "requires": { - "@types/geojson": "^7946.0.14", - "@types/node": "^22.5.4", - "denque": "^2.1.0", - "iconv-lite": "^0.6.3", - "lru-cache": "^10.3.0" - }, - "dependencies": { - "@types/geojson": { - "version": "7946.0.16", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", - "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==" - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" - } - } - }, - "marked": { - "version": "15.0.7", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", - "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==" - }, - "math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" - }, - "memory-pager": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" - }, - "merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" - }, - "micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "requires": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "mongodb": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", - "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", - "requires": { - "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.3", - "mongodb-connection-string-url": "^3.0.0" - } - }, - "mongodb-connection-string-url": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", - "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", - "requires": { - "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^14.1.0 || ^13.0.0" - } - }, - "morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "requires": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", - "on-finished": "~2.3.0", - "on-headers": "~1.0.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "requires": { - "ee-first": "1.1.1" - } - } - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" - }, - "nise": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", - "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.1", - "@sinonjs/text-encoding": "^0.7.3", - "just-extend": "^6.2.0", - "path-to-regexp": "^8.1.0" - }, - "dependencies": { - "@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1" - } - }, - "path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", - "dev": true - } - } - }, - "node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "requires": { - "whatwg-url": "^5.0.0" - }, - "dependencies": { - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - } - } - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true - }, - "nodemailer": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz", - "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==" - }, - "nodemon": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", - "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", - "dev": true, - "requires": { - "chokidar": "^3.5.2", - "debug": "^4", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^7.5.3", - "simple-update-notifier": "^2.0.0", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "nwsapi": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", - "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" - }, - "object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - }, - "dependencies": { - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - } - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parse-svg-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", - "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", - "optional": true - }, - "parse5": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", - "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", - "requires": { - "entities": "^4.5.0" - } - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" - }, - "picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pirates": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", - "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "requires": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - } - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, - "pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true - }, - "punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" - }, - "pure-rand": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", - "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", - "dev": true - }, - "qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "requires": { - "side-channel": "^1.0.6" - } - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" - }, - "raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, - "react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", - "dev": true, - "requires": { - "is-core-module": "^2.16.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "resolve.exports": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", - "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", - "dev": true - }, - "rrweb-cssom": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", - "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==" - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "saxes": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", - "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", - "requires": { - "xmlchars": "^2.2.0" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - }, - "send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" - } - } - }, - "serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", - "requires": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" - } - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - } - }, - "side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - } - }, - "side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - } - }, - "side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "simple-update-notifier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", - "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", - "dev": true, - "requires": { - "semver": "^7.5.3" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "sinon": { - "version": "19.0.5", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", - "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.5", - "@sinonjs/samsam": "^8.0.1", - "diff": "^7.0.0", - "nise": "^6.1.1", - "supports-color": "^7.2.0" - }, - "dependencies": { - "@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1" - } - } - } - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "sparse-bitfield": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", - "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", - "requires": { - "memory-pager": "^1.0.2" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" - }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "superagent": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", - "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", - "dev": true, - "requires": { - "component-emitter": "^1.3.0", - "cookiejar": "^2.1.4", - "debug": "^4.3.4", - "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.0", - "formidable": "^3.5.1", - "methods": "^1.1.2", - "mime": "2.6.0", - "qs": "^6.11.0" - }, - "dependencies": { - "mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true - } - } - }, - "supertest": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz", - "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==", - "dev": true, - "requires": { - "methods": "^1.1.2", - "superagent": "^9.0.1" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "svg-arc-to-cubic-bezier": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", - "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==", - "optional": true - }, - "symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } - }, - "tldts": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", - "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", - "requires": { - "tldts-core": "^6.1.85" - } - }, - "tldts-core": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", - "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==" - }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" - }, - "touch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", - "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", - "dev": true - }, - "tough-cookie": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", - "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==", - "requires": { - "tldts": "^6.1.32" - } - }, - "tr46": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", - "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", - "requires": { - "punycode": "^2.3.1" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true - }, - "undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" - }, - "unfetch": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", - "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" - }, - "update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", - "dev": true, - "requires": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" - } - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" - }, - "v8-to-istanbul": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", - "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^2.0.0" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" - }, - "w3c-xmlserializer": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", - "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", - "requires": { - "xml-name-validator": "^5.0.0" - } - }, - "walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "requires": { - "makeerror": "1.0.12" - } - }, - "webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" - }, - "whatwg-encoding": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", - "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", - "requires": { - "iconv-lite": "0.6.3" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "whatwg-mimetype": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", - "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" - }, - "whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", - "requires": { - "tr46": "^5.1.0", - "webidl-conversions": "^7.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - } - }, - "ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", - "requires": {} - }, - "xml-name-validator": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", - "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==" - }, - "xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - } - }, - "yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - } - } - }, "tr46": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", - "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", + "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", "requires": { "punycode": "^2.3.1" } @@ -13900,9 +9732,9 @@ "dev": true }, "undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==" }, "unfetch": { "version": "4.2.0", diff --git a/package.json b/package.json index aae510b7..2fcda184 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "author": "Research Computing Group (https://slu.edu)", "repository": "github:CenterForDigitalHumanities/rerum_server_nodejs", "scripts": { - "start": "node ./bin/tpen3_services.mjs", - "dev": "nodemon ./bin/tpen3_services.mjs", + "start": "node ./bin/tpen3_services.js", + "dev": "nodemon ./bin/tpen3_services.js", "allTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js", "unitTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", "E2Etests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t e2e ", @@ -34,6 +34,7 @@ }, "dependencies": { "@iiif/helpers": "^1.3.1", + "@mongodb-js/saslprep": "^1.2.2", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.0", @@ -63,6 +64,6 @@ "supertest": "^7.0.0" }, "engines": { - "node": ">=22.15.0" + "node": ">=22.14.0" } } diff --git a/page/__tests__/end_to_end_unit.test.mjs b/page/__tests__/end_to_end_unit.test.js similarity index 98% rename from page/__tests__/end_to_end_unit.test.mjs rename to page/__tests__/end_to_end_unit.test.js index 425d64fc..d0a679b1 100644 --- a/page/__tests__/end_to_end_unit.test.mjs +++ b/page/__tests__/end_to_end_unit.test.js @@ -1,4 +1,4 @@ -import pageRouter from '../index.mjs' +import pageRouter from '../index.js' import express from 'express' import request from 'supertest' diff --git a/page/index.mjs b/page/index.js similarity index 97% rename from page/index.mjs rename to page/index.js index 6a9f46f6..c9489669 100644 --- a/page/index.mjs +++ b/page/index.js @@ -1,5 +1,5 @@ import express from 'express' -import * as utils from '../utilities/shared.mjs' +import * as utils from '../utilities/shared.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} diff --git a/project/__tests__/end_to_end_unit.test.mjs b/project/__tests__/end_to_end_unit.test.js similarity index 98% rename from project/__tests__/end_to_end_unit.test.mjs rename to project/__tests__/end_to_end_unit.test.js index db041bba..f9e6ce35 100644 --- a/project/__tests__/end_to_end_unit.test.mjs +++ b/project/__tests__/end_to_end_unit.test.js @@ -1,11 +1,11 @@ -import projectRouter from "../index.mjs" +import projectRouter from "../index.js" import express from "express" import request from "supertest" -import app from "../../app.mjs" +import app from "../../app.js" import {jest} from "@jest/globals" -import ProjectFactory from "../../classes/Project/ProjectFactory.mjs" -import Project from "../../classes/Project/Project.mjs" -import DatabaseController from "../../database/mongo/controller.mjs" +import ProjectFactory from "../../classes/Project/ProjectFactory.js" +import Project from "../../classes/Project/Project.js" +import DatabaseController from "../../database/mongo/controller.js" const routeTester = new express() let token = process.env.TEST_TOKEN diff --git a/project/__tests__/exists_unit.test.mjs b/project/__tests__/exists_unit.test.js similarity index 97% rename from project/__tests__/exists_unit.test.mjs rename to project/__tests__/exists_unit.test.js index 8b38821e..34ab849a 100644 --- a/project/__tests__/exists_unit.test.mjs +++ b/project/__tests__/exists_unit.test.js @@ -1,4 +1,4 @@ -import projectRouter from '../index.mjs' +import projectRouter from '../index.js' import { jest } from '@jest/globals' import assert from 'node:assert' diff --git a/project/groups/checkPermissions.mjs b/project/groups/checkPermissions.js similarity index 98% rename from project/groups/checkPermissions.mjs rename to project/groups/checkPermissions.js index c09b9d8e..a23d18f4 100644 --- a/project/groups/checkPermissions.mjs +++ b/project/groups/checkPermissions.js @@ -1,5 +1,5 @@ import Permissions from "./permissions.js" -import { ACTIONS, ENTITIES, SCOPES } from "./permissions_parameters.mjs" +import { ACTIONS, ENTITIES, SCOPES } from "./permissions_parameters.js" const hasPermission = (role, action, scope, entity) => { const rolePermissions = Permissions[role] diff --git a/project/groups/permissions.mjs b/project/groups/permissions.js similarity index 93% rename from project/groups/permissions.mjs rename to project/groups/permissions.js index 92be42b6..58926ff2 100644 --- a/project/groups/permissions.mjs +++ b/project/groups/permissions.js @@ -1,4 +1,4 @@ -import Roles from "./roles.mjs" +import Roles from "./roles.js" const Permissions = { [Roles.OWNER]: ["*_*_*"], diff --git a/project/groups/permissions_parameters.mjs b/project/groups/permissions_parameters.js similarity index 100% rename from project/groups/permissions_parameters.mjs rename to project/groups/permissions_parameters.js diff --git a/project/groups/roles.mjs b/project/groups/roles.js similarity index 100% rename from project/groups/roles.mjs rename to project/groups/roles.js diff --git a/project/index.mjs b/project/index.js similarity index 97% rename from project/index.mjs rename to project/index.js index df48126d..d4478576 100644 --- a/project/index.mjs +++ b/project/index.js @@ -1,21 +1,21 @@ import express from "express" -import { validateID, respondWithError } from "../utilities/shared.mjs" +import { validateID, respondWithError } from "../utilities/shared.js" import cors from "cors" import common_cors from "../utilities/common_cors.json" with {type: "json"} -import auth0Middleware from "../auth/index.mjs" -import ProjectFactory from "../classes/Project/ProjectFactory.mjs" -import validateURL from "../utilities/validateURL.mjs" -import Project from "../classes/Project/Project.mjs" -import Layer from "../classes/Layer/Layer.mjs" -import Page from "../classes/Page/Page.mjs" -import { isValidEmail } from "../utilities/validateEmail.mjs" -import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.mjs" -import Group from "../classes/Group/Group.mjs" -import scrubDefaultRoles from "../utilities/isDefaultRole.mjs" +import auth0Middleware from "../auth/index.js" +import ProjectFactory from "../classes/Project/ProjectFactory.js" +import validateURL from "../utilities/validateURL.js" +import Project from "../classes/Project/Project.js" +import Layer from "../classes/Layer/Layer.js" +import Page from "../classes/Page/Page.js" +import { isValidEmail } from "../utilities/validateEmail.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" +import Group from "../classes/Group/Group.js" +import scrubDefaultRoles from "../utilities/isDefaultRole.js" import Hotkeys from "../classes/HotKeys/Hotkeys.js" import path from "path" import fs from "fs" -import layerRouter from "../layer/index.mjs" +import layerRouter from "../layer/index.js" import cookieParser from "cookie-parser" let router = express.Router() @@ -120,7 +120,7 @@ router try { const response = await fetch( - "https://dev.t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", + "https://t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", { method: "GET", headers: { @@ -383,7 +383,8 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M return respondWithError(res, 403, "You do not have permission to remove roles from members.") } - const group = new Group(projectObj.data.group) + const groupId = projectObj.data.group + const group = new Group(groupId) await group.removeMemberRoles(collaboratorId, roles) res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) @@ -516,6 +517,7 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) if (!user) { return respondWithError(res, 401, "Unauthenticated request") } + if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { rolesToRemove = Object.keys(rolesToRemove) } @@ -858,6 +860,9 @@ router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res if (!newOwnerId) { return respondWithError(res, 400, "Provide the ID of the new owner.") } + if (user._id === newOwnerId) { + return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") + } try { const projectObj = await new Project(projectId) @@ -975,11 +980,9 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { rolesToRemove = Object.keys(rolesToRemove) } - if (typeof rolesToRemove === 'string') { rolesToRemove = rolesToRemove.split(' ') } - if (!rolesToRemove.length) { return respondWithError(res, 400, "Roles to remove must be provided as an array of strings or a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") } @@ -987,7 +990,9 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) try { // Ensure no default roles are being removed rolesToRemove = scrubDefaultRoles(rolesToRemove) - if (!rolesToRemove) return respondWithError(res, 400, `No custom roles provided.`) + if (!rolesToRemove) { + return respondWithError(res, 400, `No custom roles provided.`) + } const project = await new Project(projectId) const accessInfo = await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.ROLE) diff --git a/userProfile/__tests__/end_to_end_unit.test.mjs b/userProfile/__tests__/end_to_end_unit.test.js similarity index 94% rename from userProfile/__tests__/end_to_end_unit.test.mjs rename to userProfile/__tests__/end_to_end_unit.test.js index 3f0a5183..da2d028b 100644 --- a/userProfile/__tests__/end_to_end_unit.test.mjs +++ b/userProfile/__tests__/end_to_end_unit.test.js @@ -1,10 +1,10 @@ -import userProfileRouter from "../index.mjs" -import privateUserRouter from "../privateProfile.mjs" -import mainApp from "../../app.mjs" +import userProfileRouter from "../index.js" +import privateUserRouter from "../privateProfile.js" +import mainApp from "../../app.js" import express from "express" import request from "supertest" -import app from '../../app.mjs'; -import User from "../../classes/User/User.mjs" +import app from '../../app.js'; +import User from "../../classes/User/User.js" import {jest} from "@jest/globals" diff --git a/userProfile/__tests__/exists_unit.test.mjs b/userProfile/__tests__/exists_unit.test.js similarity index 92% rename from userProfile/__tests__/exists_unit.test.mjs rename to userProfile/__tests__/exists_unit.test.js index dba783c7..e9b2e276 100644 --- a/userProfile/__tests__/exists_unit.test.mjs +++ b/userProfile/__tests__/exists_unit.test.js @@ -1,4 +1,4 @@ -import app from '../../app.mjs' +import app from '../../app.js' describe('userProfile endpoint availability unit test (via a check on the app routes). #exists_unit', () => { it('responds to /user/id', () => { diff --git a/userProfile/__tests__/functionality_unit.test.mjs b/userProfile/__tests__/functionality_unit.test.js similarity index 86% rename from userProfile/__tests__/functionality_unit.test.mjs rename to userProfile/__tests__/functionality_unit.test.js index 7c310f2a..16f47f5e 100644 --- a/userProfile/__tests__/functionality_unit.test.mjs +++ b/userProfile/__tests__/functionality_unit.test.js @@ -1,4 +1,4 @@ - import {validateID} from '../../utilities/shared.mjs' +import {validateID} from '../../utilities/shared.js' // These test the pieces of functionality in the route that make it work. describe('Testing /user/:id helper functions) #testThis', () => { @@ -11,4 +11,4 @@ describe('Testing /user/:id helper functions) #testThis', () => { it("returns true for valid id",()=>{ expect(validateID(123)).toBe(true) }) -}) \ No newline at end of file +}) diff --git a/userProfile/index.mjs b/userProfile/index.js similarity index 95% rename from userProfile/index.mjs rename to userProfile/index.js index 4828b34e..d9d4c641 100644 --- a/userProfile/index.mjs +++ b/userProfile/index.js @@ -1,8 +1,8 @@ import express from "express" -import { respondWithError, validateID } from "../utilities/shared.mjs" +import { respondWithError, validateID } from "../utilities/shared.js" import cors from "cors" import common_cors from "../utilities/common_cors.json" with {type: "json"} -import User from "../classes/User/User.mjs" +import User from "../classes/User/User.js" let router = express.Router() router.use(cors(common_cors)) diff --git a/userProfile/privateProfile.mjs b/userProfile/privateProfile.js similarity index 94% rename from userProfile/privateProfile.mjs rename to userProfile/privateProfile.js index 0503fbc9..9dc66c86 100644 --- a/userProfile/privateProfile.mjs +++ b/userProfile/privateProfile.js @@ -1,9 +1,9 @@ import express from "express" -import {respondWithError, respondWithJSON} from "../utilities/shared.mjs" -import User from "../classes/User/User.mjs" +import {respondWithError, respondWithJSON} from "../utilities/shared.js" +import User from "../classes/User/User.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} import cors from "cors" -import auth0Middleware from "../auth/index.mjs" +import auth0Middleware from "../auth/index.js" const router = express.Router() router.use( diff --git a/utilities/__tests__/isDefaultRole.test.mjs b/utilities/__tests__/isDefaultRole.test.js similarity index 92% rename from utilities/__tests__/isDefaultRole.test.mjs rename to utilities/__tests__/isDefaultRole.test.js index 98304d27..cb4023d9 100644 --- a/utilities/__tests__/isDefaultRole.test.mjs +++ b/utilities/__tests__/isDefaultRole.test.js @@ -1,5 +1,5 @@ -import scrubDefaultRoles from '../isDefaultRole.mjs' -import Group from '../../classes/Group/Group.mjs' +import scrubDefaultRoles from '../isDefaultRole.js' +import Group from '../../classes/Group/Group.js' describe('scrubDefaultRoles function #customRole_unit', () => { beforeAll(() => { diff --git a/utilities/getHash.mjs b/utilities/getHash.js similarity index 100% rename from utilities/getHash.mjs rename to utilities/getHash.js diff --git a/utilities/isDefaultRole.mjs b/utilities/isDefaultRole.js similarity index 93% rename from utilities/isDefaultRole.mjs rename to utilities/isDefaultRole.js index ed1fc151..65f1fda8 100644 --- a/utilities/isDefaultRole.mjs +++ b/utilities/isDefaultRole.js @@ -1,4 +1,4 @@ -import Group from "../classes/Group/Group.mjs" +import Group from "../classes/Group/Group.js" export default function scrubDefaultRoles(roleName) { diff --git a/utilities/mailer/index.mjs b/utilities/mailer/index.js similarity index 100% rename from utilities/mailer/index.mjs rename to utilities/mailer/index.js diff --git a/utilities/removeProperties.mjs b/utilities/removeProperties.js similarity index 100% rename from utilities/removeProperties.mjs rename to utilities/removeProperties.js diff --git a/utilities/shared.mjs b/utilities/shared.js similarity index 95% rename from utilities/shared.mjs rename to utilities/shared.js index fec3d7eb..2c261e0c 100644 --- a/utilities/shared.mjs +++ b/utilities/shared.js @@ -1,4 +1,4 @@ -import DatabaseController from "../database/mongo/controller.mjs" +import DatabaseController from "../database/mongo/controller.js" /** * Check if the supplied input is valid JSON or not. @@ -48,4 +48,4 @@ export function respondWithJSON(res, status, json){ res.set("Content-Type", "application/json; charset=utf-8") res.status(status) res.json(json) -} \ No newline at end of file +} diff --git a/utilities/token.mjs b/utilities/token.js similarity index 94% rename from utilities/token.mjs rename to utilities/token.js index 49fa7bf7..34aa2ee4 100644 --- a/utilities/token.mjs +++ b/utilities/token.js @@ -1,4 +1,4 @@ -import { respondWithError } from "./shared.mjs" +import { respondWithError } from "./shared.js" export function extractToken(tokenString) { if (!tokenString) return null diff --git a/utilities/validateEmail.mjs b/utilities/validateEmail.js similarity index 100% rename from utilities/validateEmail.mjs rename to utilities/validateEmail.js diff --git a/utilities/validatePayload.mjs b/utilities/validatePayload.js similarity index 100% rename from utilities/validatePayload.mjs rename to utilities/validatePayload.js diff --git a/utilities/validateURL.mjs b/utilities/validateURL.js similarity index 100% rename from utilities/validateURL.mjs rename to utilities/validateURL.js diff --git a/utilities/vault.mjs b/utilities/vault.js similarity index 100% rename from utilities/vault.mjs rename to utilities/vault.js From b5f46f807754b521adab90026d49560842717edf Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Tue, 29 Apr 2025 16:33:53 -0500 Subject: [PATCH 059/262] Update package-lock.json --- package-lock.json | 5309 +++++++-------------------------------------- 1 file changed, 770 insertions(+), 4539 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c5e7644..ae173b23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,14 @@ { "name": "tpen3-services", "version": "0.0.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tpen3-services", "version": "0.0.0", "license": "CC-BY", - "dependencies": { + "dependencies": { "@iiif/helpers": "^1.3.1", "@mongodb-js/saslprep": "^1.2.2", "cookie-parser": "^1.4.7", @@ -28,7 +28,6 @@ "mongodb": "^6.12.0", "morgan": "^1.10.0", "nodemailer": "^6.9.16" - } }, "devDependencies": { "@jest-mock/express": "^2.1.0", @@ -48,6 +47,7 @@ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" @@ -57,12 +57,13 @@ } }, "node_modules/@asamuzakjp/css-color": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.5.tgz", - "integrity": "sha512-w7AmVyTTiU41fNLsFDf+gA2Dwtbx2EJtn2pbJNAGSRAg50loXy1uLXA3hEpD8+eydcomTurw09tq5/AyceCaGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", + "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", + "license": "MIT", "dependencies": { - "@csstools/css-calc": "^2.1.3", - "@csstools/css-color-parser": "^3.0.9", + "@csstools/css-calc": "^2.1.2", + "@csstools/css-color-parser": "^3.0.8", "@csstools/css-parser-algorithms": "^3.0.4", "@csstools/css-tokenizer": "^3.0.3", "lru-cache": "^10.4.3" @@ -79,6 +80,7 @@ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", "js-tokens": "^4.0.0", @@ -89,30 +91,32 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", - "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz", + "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", - "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.10", - "@babel/helper-compilation-targets": "^7.26.5", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.10", - "@babel/parser": "^7.26.10", - "@babel/template": "^7.26.9", - "@babel/traverse": "^7.26.10", - "@babel/types": "^7.26.10", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -128,13 +132,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz", - "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", + "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/parser": "^7.27.0", - "@babel/types": "^7.27.0", + "@babel/parser": "^7.26.5", + "@babel/types": "^7.26.5", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -144,12 +149,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz", - "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.26.8", + "@babel/compat-data": "^7.26.5", "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", @@ -164,6 +170,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/traverse": "^7.25.9", "@babel/types": "^7.25.9" @@ -177,6 +184,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9", @@ -194,6 +202,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -203,6 +212,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -212,6 +222,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -221,6 +232,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -260,6 +272,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -272,6 +285,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -284,6 +298,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -296,6 +311,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -311,6 +327,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" }, @@ -326,6 +343,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -338,6 +356,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -350,6 +369,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" }, @@ -365,6 +385,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -377,6 +398,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -389,6 +411,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -401,6 +424,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -413,6 +437,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -425,6 +450,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -437,6 +463,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -452,6 +479,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -467,6 +495,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" }, @@ -482,6 +511,7 @@ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.26.0", "@babel/helper-plugin-utils": "^7.25.9" @@ -509,16 +539,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz", - "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz", + "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.27.0", - "@babel/parser": "^7.27.0", - "@babel/template": "^7.27.0", - "@babel/types": "^7.27.0", + "@babel/generator": "^7.26.5", + "@babel/parser": "^7.26.5", + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.5", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -544,7 +575,8 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@csstools/color-helpers": { "version": "5.0.2", @@ -566,9 +598,9 @@ } }, "node_modules/@csstools/css-calc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.3.tgz", - "integrity": "sha512-XBG3talrhid44BY1x3MHzUx/aTG8+x/Zi57M4aTKK9RFB4aLlF3TTSzfzn8nWVHWL3FgAXAxmupmDd6VWww+pw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", + "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", "funding": [ { "type": "github", @@ -589,9 +621,9 @@ } }, "node_modules/@csstools/css-color-parser": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.9.tgz", - "integrity": "sha512-wILs5Zk7BU86UArYBJTPy/FMPPKVKHMj1ycCEyf3VUptol0JNRLFU/BZsJ4aiIHJEbSLiizzRrw8Pc1uAEDrXw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", + "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", "funding": [ { "type": "github", @@ -605,7 +637,7 @@ "license": "MIT", "dependencies": { "@csstools/color-helpers": "^5.0.2", - "@csstools/css-calc": "^2.1.3" + "@csstools/css-calc": "^2.1.2" }, "engines": { "node": ">=18" @@ -659,12 +691,14 @@ "node_modules/@edsilv/http-status-codes": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", - "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==" + "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==", + "license": "MIT" }, "node_modules/@iiif/helpers": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", + "license": "MIT", "dependencies": { "@iiif/presentation-2": "1.0.4", "@iiif/presentation-3": "2.2.3", @@ -680,10 +714,17 @@ "@iiif/parser": "^2.1.7" } }, + "node_modules/@iiif/helpers/node_modules/@types/geojson": { + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", + "license": "MIT" + }, "node_modules/@iiif/parser": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.8.tgz", - "integrity": "sha512-87ifvY3Pq6dzSbHKrCr6/aIiZZDeaozIFz+EAYWYGxmpxn213t3kISCrSCC/XJ03jdXW7mQgPUEPcmztX5uh1A==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", + "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", + "license": "MIT", "peer": true, "dependencies": { "@iiif/presentation-2": "^1.0.4", @@ -696,6 +737,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@iiif/presentation-2/-/presentation-2-1.0.4.tgz", "integrity": "sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==", + "license": "MIT", "peerDependencies": { "@iiif/presentation-3": "*" } @@ -704,6 +746,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", + "license": "MIT", "dependencies": { "@types/geojson": "^7946.0.10" } @@ -712,6 +755,7 @@ "version": "0.9.7", "resolved": "https://registry.npmjs.org/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz", "integrity": "sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==", + "license": "MIT", "dependencies": { "@iiif/presentation-3": "^2.0.5" } @@ -719,13 +763,15 @@ "node_modules/@iiif/vocabulary": { "version": "1.0.26", "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", - "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==" + "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==", + "license": "MIT" }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, + "license": "ISC", "dependencies": { "camelcase": "^5.3.1", "find-up": "^4.1.0", @@ -742,6 +788,7 @@ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -751,6 +798,7 @@ "resolved": "https://registry.npmjs.org/@jest-mock/express/-/express-2.1.0.tgz", "integrity": "sha512-wwij1960SVxJL+v5Eqw3Akn3S5TLfCtHnFqs2K9Zto7RLU5I/7YhOsYDZQfNcnGyiBdisDz5iT21SRO1CVfvKA==", "dev": true, + "license": "MIT", "dependencies": { "@types/express": "^4.17.21" } @@ -760,6 +808,7 @@ "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -777,6 +826,7 @@ "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/reporters": "^29.7.0", @@ -824,6 +874,7 @@ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/fake-timers": "^29.7.0", "@jest/types": "^29.6.3", @@ -839,6 +890,7 @@ "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, + "license": "MIT", "dependencies": { "expect": "^29.7.0", "jest-snapshot": "^29.7.0" @@ -852,6 +904,7 @@ "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, + "license": "MIT", "dependencies": { "jest-get-type": "^29.6.3" }, @@ -864,6 +917,7 @@ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@sinonjs/fake-timers": "^10.0.2", @@ -881,6 +935,7 @@ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/expect": "^29.7.0", @@ -896,6 +951,7 @@ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, + "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^29.7.0", @@ -939,6 +995,7 @@ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, + "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -951,6 +1008,7 @@ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", @@ -965,6 +1023,7 @@ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/types": "^29.6.3", @@ -980,6 +1039,7 @@ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", @@ -995,6 +1055,7 @@ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@jest/types": "^29.6.3", @@ -1021,6 +1082,7 @@ "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", @@ -1038,6 +1100,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -1052,6 +1115,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -1061,6 +1125,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -1069,13 +1134,15 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -1085,6 +1152,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz", "integrity": "sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==", + "license": "MIT", "dependencies": { "sparse-bitfield": "^3.0.3" } @@ -1107,6 +1175,7 @@ "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz", "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==", "dev": true, + "license": "MIT", "dependencies": { "@noble/hashes": "^1.1.5" } @@ -1115,13 +1184,15 @@ "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } @@ -1131,6 +1202,7 @@ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.0" } @@ -1169,6 +1241,7 @@ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -1178,10 +1251,11 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", - "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.0.0" } @@ -1191,16 +1265,18 @@ "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", "dev": true, + "license": "MIT", "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__traverse": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz", - "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.20.7" } @@ -1210,6 +1286,7 @@ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, + "license": "MIT", "dependencies": { "@types/connect": "*", "@types/node": "*" @@ -1220,6 +1297,7 @@ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -1229,6 +1307,7 @@ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.33", @@ -1241,6 +1320,7 @@ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -1249,15 +1329,17 @@ } }, "node_modules/@types/geojson": { - "version": "7946.0.13", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", - "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" + "version": "7946.0.15", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz", + "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==", + "license": "MIT" }, "node_modules/@types/graceful-fs": { "version": "4.1.9", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } @@ -1266,19 +1348,22 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" } @@ -1288,6 +1373,7 @@ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } @@ -1296,33 +1382,38 @@ "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/node": { - "version": "22.15.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz", - "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==", + "version": "22.10.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz", + "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==", + "license": "MIT", "dependencies": { - "undici-types": "~6.21.0" + "undici-types": "~6.20.0" } }, "node_modules/@types/qs": { "version": "6.9.18", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/range-parser": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mime": "^1", "@types/node": "*" @@ -1333,6 +1424,7 @@ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", "dev": true, + "license": "MIT", "dependencies": { "@types/http-errors": "*", "@types/node": "*", @@ -1343,7 +1435,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/trusted-types": { "version": "2.0.7", @@ -1355,12 +1448,14 @@ "node_modules/@types/webidl-conversions": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==", + "license": "MIT" }, "node_modules/@types/whatwg-url": { "version": "11.0.5", "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", + "license": "MIT", "dependencies": { "@types/webidl-conversions": "*" } @@ -1370,6 +1465,7 @@ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", "dev": true, + "license": "MIT", "dependencies": { "@types/yargs-parser": "*" } @@ -1378,18 +1474,21 @@ "version": "21.0.3", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/abs-svg-path": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==", + "license": "MIT", "optional": true }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -1412,6 +1511,7 @@ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -1427,6 +1527,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -1436,6 +1537,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -1451,6 +1553,7 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -1464,6 +1567,7 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, + "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } @@ -1471,25 +1575,28 @@ "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "license": "MIT" }, "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "license": "MIT" }, "node_modules/babel-jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", @@ -1511,6 +1618,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", "@istanbuljs/load-nyc-config": "^1.0.0", @@ -1527,6 +1635,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", @@ -1543,6 +1652,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.3.3", "@babel/types": "^7.3.3", @@ -1558,6 +1668,7 @@ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", @@ -1584,6 +1695,7 @@ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, + "license": "MIT", "dependencies": { "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" @@ -1599,12 +1711,14 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/basic-auth": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "license": "MIT", "dependencies": { "safe-buffer": "5.1.2" }, @@ -1615,13 +1729,15 @@ "node_modules/basic-auth/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -1633,6 +1749,7 @@ "version": "1.20.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -1656,6 +1773,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -1663,13 +1781,15 @@ "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1680,6 +1800,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -1706,6 +1827,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", @@ -1724,14 +1846,16 @@ "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" } }, "node_modules/bson": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", - "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.1.tgz", + "integrity": "sha512-P92xmHDQjSKPLHqFxefqMxASNq/aWJMEZugpCjf+AF/pgcUpMMQCg7t7+ewko0/u8AapvF3luf/FoehddEK+sA==", + "license": "Apache-2.0", "engines": { "node": ">=16.20.1" } @@ -1740,20 +1864,23 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -1763,12 +1890,13 @@ } }, "node_modules/call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -1782,6 +1910,7 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -1791,14 +1920,15 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001715", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", - "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", + "version": "1.0.30001692", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", + "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==", "dev": true, "funding": [ { @@ -1813,13 +1943,15 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1836,6 +1968,7 @@ "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } @@ -1845,6 +1978,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -1875,21 +2009,24 @@ "url": "https://github.com/sponsors/sibiraj-s" } ], + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/cjs-module-lexer": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", - "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", - "dev": true + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz", + "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==", + "dev": true, + "license": "MIT" }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -1904,6 +2041,7 @@ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true, + "license": "MIT", "engines": { "iojs": ">= 1.0.0", "node": ">= 0.12.0" @@ -1913,13 +2051,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -1931,13 +2071,14 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -1950,6 +2091,7 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -1958,12 +2100,14 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -1975,6 +2119,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1983,12 +2128,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cookie": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1997,6 +2144,7 @@ "version": "1.4.7", "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", + "license": "MIT", "dependencies": { "cookie": "0.7.2", "cookie-signature": "1.0.6" @@ -2008,18 +2156,21 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "license": "MIT" }, "node_modules/cookiejar": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "license": "MIT", "dependencies": { "object-assign": "^4", "vary": "^1" @@ -2033,6 +2184,7 @@ "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "chalk": "^4.0.0", @@ -2054,6 +2206,7 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -2064,11 +2217,12 @@ } }, "node_modules/cssstyle": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.1.tgz", - "integrity": "sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", + "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", + "license": "MIT", "dependencies": { - "@asamuzakjp/css-color": "^3.1.2", + "@asamuzakjp/css-color": "^3.1.1", "rrweb-cssom": "^0.8.0" }, "engines": { @@ -2088,10 +2242,36 @@ "node": ">=18" } }, + "node_modules/data-urls/node_modules/tr46": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", + "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/data-urls/node_modules/whatwg-url": { + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "license": "MIT", + "dependencies": { + "tr46": "^5.1.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/debug": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -2115,6 +2295,7 @@ "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", "dev": true, + "license": "MIT", "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, @@ -2129,6 +2310,7 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2137,7 +2319,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -2146,6 +2328,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "license": "Apache-2.0", "engines": { "node": ">=0.10" } @@ -2154,6 +2337,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -2162,6 +2346,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -2172,6 +2357,7 @@ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2181,6 +2367,7 @@ "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", "dev": true, + "license": "ISC", "dependencies": { "asap": "^2.0.0", "wrappy": "1" @@ -2201,22 +2388,25 @@ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/dompurify": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz", - "integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "node_modules/dotenv": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", - "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -2225,9 +2415,10 @@ } }, "node_modules/dotenv-expand": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.2.tgz", - "integrity": "sha512-lXpXz2ZE1cea1gL4sz2Ipj8y4PiVjytYr3Ij0SWoms1PGxIv7m2CRKuRuCRtHdVuvM/hNJPMxt5PbhboNC4dPQ==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", + "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", + "license": "BSD-2-Clause", "dependencies": { "dotenv": "^16.4.5" }, @@ -2242,6 +2433,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -2254,19 +2446,22 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.144", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.144.tgz", - "integrity": "sha512-eJIaMRKeAzxfBSxtjYnoIAw/tdD6VIH6tHBZepZnAbE3Gyqqs5mGN87DvcldPUbVkIljTK8pY0CMcUljP64lfQ==", - "dev": true + "version": "1.5.82", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.82.tgz", + "integrity": "sha512-Zq16uk1hfQhyGx5GpwPAYDwddJuSGhtRhgOA2mCxANYaDT79nAeGnaXogMGng4KqLaJUVnOnuL0+TDop9nLOiA==", + "dev": true, + "license": "ISC" }, "node_modules/emittery": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -2278,20 +2473,23 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/entities": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz", - "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -2304,6 +2502,7 @@ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } @@ -2312,6 +2511,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -2320,14 +2520,16 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.0.tgz", + "integrity": "sha512-Ujz8Al/KfOVR7fkaghAB1WvnLsdYxHDWmfoi2vlA2jZWRg31XhIC1a4B+/I24muD8iSbHxJ1JkrfqmWb65P/Mw==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -2335,26 +2537,12 @@ "node": ">= 0.4" } }, - "node_modules/es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "dev": true, - "dependencies": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2362,13 +2550,15 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" }, "node_modules/escape-string-regexp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2378,6 +2568,7 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, + "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -2390,6 +2581,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2399,6 +2591,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -2431,6 +2624,7 @@ "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/expect-utils": "^29.7.0", "jest-get-type": "^29.6.3", @@ -2446,6 +2640,7 @@ "version": "4.21.2", "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -2488,20 +2683,22 @@ } }, "node_modules/express-oauth2-jwt-bearer": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", - "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.0.tgz", + "integrity": "sha512-HXnez7vocYlOqlfF3ozPcf/WE3zxT7zfUNfeg5FHJnvNwhBYlNXiPOvuCtBalis8xcigvwtInzEKhBuH87+9ug==", + "license": "MIT", "dependencies": { - "jose": "^4.15.5" + "jose": "^4.13.1" }, "engines": { - "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0 || ^22.1.0" + "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0" } }, "node_modules/express-urlrewrite": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-2.0.3.tgz", "integrity": "sha512-NjsmtYZ1Lpie+XR7VIrvI6aeAmRQDf9cHyGjdIxlE9sc+NhTx3z6fJ0wfxV4rS7AY9ncCK7JDge+VX3e+DQ9Mg==", + "license": "MIT", "dependencies": { "debug": "^4.3.4", "path-to-regexp": "^6.3.0" @@ -2510,12 +2707,14 @@ "node_modules/express-urlrewrite/node_modules/path-to-regexp": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==" + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", + "license": "MIT" }, "node_modules/express/node_modules/cookie": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2524,6 +2723,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2531,25 +2731,29 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-safe-stringify": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fb-watchman": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" } @@ -2559,6 +2763,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -2570,6 +2775,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", @@ -2587,6 +2793,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2594,13 +2801,15 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -2610,14 +2819,13 @@ } }, "node_modules/form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "dev": true, + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", "mime-types": "^2.1.12" }, "engines": { @@ -2629,6 +2837,7 @@ "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz", "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==", "dev": true, + "license": "MIT", "dependencies": { "@paralleldrive/cuid2": "^2.2.2", "dezalgo": "^1.0.4", @@ -2645,6 +2854,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2653,6 +2863,7 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2661,26 +2872,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } + "license": "ISC" }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2690,6 +2889,7 @@ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -2699,21 +2899,23 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } }, "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.2", + "call-bind-apply-helpers": "^1.0.1", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", + "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", - "get-proto": "^1.0.1", + "get-proto": "^1.0.0", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -2731,6 +2933,7 @@ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.0.0" } @@ -2739,6 +2942,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -2752,6 +2956,7 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -2765,6 +2970,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2785,6 +2991,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -2797,6 +3004,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -2805,6 +3013,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2816,13 +3025,15 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2831,21 +3042,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.3" - }, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2857,6 +3054,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -2880,12 +3078,14 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -2928,6 +3128,7 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=10.17.0" } @@ -2936,6 +3137,7 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -2947,13 +3149,15 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/import-local": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", "dev": true, + "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" @@ -2973,6 +3177,7 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -2983,6 +3188,7 @@ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -2991,12 +3197,14 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -3005,13 +3213,15 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -3024,6 +3234,7 @@ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, + "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -3039,6 +3250,7 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3048,6 +3260,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -3057,6 +3270,7 @@ "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -3066,6 +3280,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -3078,6 +3293,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -3093,6 +3309,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -3104,12 +3321,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/isomorphic-unfetch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", + "license": "MIT", "dependencies": { "node-fetch": "^2.6.1", "unfetch": "^4.2.0" @@ -3120,6 +3339,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=8" } @@ -3129,6 +3349,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.23.9", "@babel/parser": "^7.23.9", @@ -3141,10 +3362,11 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -3157,6 +3379,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", @@ -3171,6 +3394,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0", @@ -3185,6 +3409,7 @@ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -3198,6 +3423,7 @@ "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -3224,6 +3450,7 @@ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, + "license": "MIT", "dependencies": { "execa": "^5.0.0", "jest-util": "^29.7.0", @@ -3238,6 +3465,7 @@ "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/expect": "^29.7.0", @@ -3269,6 +3497,7 @@ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, + "license": "MIT", "dependencies": { "@jest/core": "^29.7.0", "@jest/test-result": "^29.7.0", @@ -3302,6 +3531,7 @@ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@jest/test-sequencer": "^29.7.0", @@ -3347,6 +3577,7 @@ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", @@ -3362,6 +3593,7 @@ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, + "license": "MIT", "dependencies": { "detect-newline": "^3.0.0" }, @@ -3374,6 +3606,7 @@ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "chalk": "^4.0.0", @@ -3390,6 +3623,7 @@ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/fake-timers": "^29.7.0", @@ -3407,6 +3641,7 @@ "resolved": "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz", "integrity": "sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==", "dev": true, + "license": "ISC", "dependencies": { "@babel/core": "^7.4.4", "@babel/plugin-transform-modules-commonjs": "^7.4.4" @@ -3417,6 +3652,7 @@ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -3426,6 +3662,7 @@ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", @@ -3451,6 +3688,7 @@ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, + "license": "MIT", "dependencies": { "jest-get-type": "^29.6.3", "pretty-format": "^29.7.0" @@ -3464,6 +3702,7 @@ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "jest-diff": "^29.7.0", @@ -3479,6 +3718,7 @@ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.12.13", "@jest/types": "^29.6.3", @@ -3499,6 +3739,7 @@ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -3513,6 +3754,7 @@ "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" }, @@ -3530,6 +3772,7 @@ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -3539,6 +3782,7 @@ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", @@ -3559,6 +3803,7 @@ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, + "license": "MIT", "dependencies": { "jest-regex-util": "^29.6.3", "jest-snapshot": "^29.7.0" @@ -3572,6 +3817,7 @@ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/console": "^29.7.0", "@jest/environment": "^29.7.0", @@ -3604,6 +3850,7 @@ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/environment": "^29.7.0", "@jest/fake-timers": "^29.7.0", @@ -3637,6 +3884,7 @@ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", @@ -3664,10 +3912,11 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -3680,6 +3929,7 @@ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -3697,6 +3947,7 @@ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^29.6.3", "camelcase": "^6.2.0", @@ -3714,6 +3965,7 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -3726,6 +3978,7 @@ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, + "license": "MIT", "dependencies": { "@jest/test-result": "^29.7.0", "@jest/types": "^29.6.3", @@ -3745,6 +3998,7 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "jest-util": "^29.7.0", @@ -3760,6 +4014,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -3774,6 +4029,7 @@ "version": "4.15.9", "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/panva" } @@ -3782,13 +4038,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -3798,13 +4056,15 @@ } }, "node_modules/jsdom": { - "version": "26.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz", - "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", + "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "license": "MIT", "dependencies": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", - "decimal.js": "^10.5.0", + "decimal.js": "^10.4.3", + "form-data": "^4.0.1", "html-encoding-sniffer": "^4.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.6", @@ -3814,12 +4074,12 @@ "rrweb-cssom": "^0.8.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^5.1.1", + "tough-cookie": "^5.0.0", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.1", + "whatwg-url": "^14.1.0", "ws": "^8.18.0", "xml-name-validator": "^5.0.0" }, @@ -3835,11 +4095,37 @@ } } }, + "node_modules/jsdom/node_modules/tr46": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", + "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/jsdom/node_modules/whatwg-url": { + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "license": "MIT", + "dependencies": { + "tr46": "^5.1.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -3851,13 +4137,15 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -3877,6 +4165,7 @@ "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -3886,6 +4175,7 @@ "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -3894,13 +4184,15 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -3911,7 +4203,8 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" }, "node_modules/lodash.get": { "version": "4.4.2", @@ -3926,6 +4219,7 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^3.0.2" } @@ -3935,6 +4229,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -3946,10 +4241,11 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -3962,6 +4258,7 @@ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "tmpl": "1.0.5" } @@ -3970,6 +4267,7 @@ "version": "4.2.21", "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz", "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==", + "license": "MIT", "dependencies": { "@edsilv/http-status-codes": "^1.0.3", "@iiif/vocabulary": "^1.0.26", @@ -3982,9 +4280,10 @@ } }, "node_modules/mariadb": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.2.tgz", - "integrity": "sha512-B17vhYRHDMQ1XXvhSWsvKJbpw3Q8B6py93ThBEXZXSgxIbqnKqoHK1RzoPLbIxoEzWN3jA86ZaMMc3IG6L5wsw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", + "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", + "license": "LGPL-2.1-or-later", "dependencies": { "@types/geojson": "^7946.0.14", "@types/node": "^22.5.4", @@ -3996,15 +4295,11 @@ "node": ">= 14" } }, - "node_modules/mariadb/node_modules/@types/geojson": { - "version": "7946.0.16", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", - "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==" - }, "node_modules/mariadb/node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -4015,12 +4310,14 @@ "node_modules/mariadb/node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" }, "node_modules/marked": { - "version": "15.0.11", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.11.tgz", - "integrity": "sha512-1BEXAU2euRCG3xwgLVT1y0xbJEld1XOrmRJpUwRCcy7rxhSCwMrmEu9LXoPhHSCJG41V7YcQ2mjKRr5BA3ITIA==", + "version": "15.0.7", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", + "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==", + "license": "MIT", "bin": { "marked": "bin/marked.js" }, @@ -4032,6 +4329,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -4040,6 +4338,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4047,12 +4346,14 @@ "node_modules/memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "license": "MIT" }, "node_modules/merge-descriptors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -4061,12 +4362,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4076,6 +4379,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -4088,6 +4392,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -4099,6 +4404,7 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4107,6 +4413,7 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -4119,6 +4426,7 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -4128,6 +4436,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4136,12 +4445,13 @@ } }, "node_modules/mongodb": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.16.0.tgz", - "integrity": "sha512-D1PNcdT0y4Grhou5Zi/qgipZOYeWrhLEpk33n3nm6LGtz61jvO88WlrWCK/bigMjpnOdAUKKQwsGIl0NtWMyYw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.12.0.tgz", + "integrity": "sha512-RM7AHlvYfS7jv7+BXund/kR64DryVI+cHbVAy9P61fnb1RcWZqOW1/Wj2YhqMCx+MuYhqTRGv7AwHBzmsCKBfA==", + "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.3", + "bson": "^6.10.1", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -4181,18 +4491,20 @@ } }, "node_modules/mongodb-connection-string-url": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", - "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", + "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg==", + "license": "Apache-2.0", "dependencies": { "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^14.1.0 || ^13.0.0" + "whatwg-url": "^13.0.0" } }, "node_modules/morgan": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "license": "MIT", "dependencies": { "basic-auth": "~2.0.1", "debug": "2.6.9", @@ -4208,6 +4520,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -4215,12 +4528,14 @@ "node_modules/morgan/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/morgan/node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -4231,18 +4546,21 @@ "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4285,6 +4603,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -4303,17 +4622,20 @@ "node_modules/node-fetch/node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" }, "node_modules/node-fetch/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" }, "node_modules/node-fetch/node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -4323,27 +4645,31 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-releases": { "version": "2.0.19", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nodemailer": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz", - "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==", + "version": "6.9.16", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz", + "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==", + "license": "MIT-0", "engines": { "node": ">=6.0.0" } }, "node_modules/nodemon": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", - "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", + "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": "^3.5.2", "debug": "^4", @@ -4372,15 +4698,17 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/nodemon/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -4393,6 +4721,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -4405,6 +4734,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4414,6 +4744,7 @@ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.0.0" }, @@ -4431,14 +4762,16 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4450,6 +4783,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -4461,6 +4795,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4470,6 +4805,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -4479,6 +4815,7 @@ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, + "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -4494,6 +4831,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -4509,6 +4847,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -4521,6 +4860,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -4536,6 +4876,7 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -4545,6 +4886,7 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -4562,14 +4904,16 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", + "license": "MIT", "optional": true }, "node_modules/parse5": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", - "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "license": "MIT", "dependencies": { - "entities": "^6.0.0" + "entities": "^4.5.0" }, "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" @@ -4579,6 +4923,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4588,6 +4933,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4597,6 +4943,7 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4606,6 +4953,7 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4614,24 +4962,28 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-to-regexp": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "license": "MIT" }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -4640,10 +4992,11 @@ } }, "node_modules/pirates": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", - "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } @@ -4653,6 +5006,7 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^4.0.0" }, @@ -4665,6 +5019,7 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -4679,6 +5034,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -4691,6 +5047,7 @@ "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", "dev": true, + "license": "MIT", "dependencies": { "kleur": "^3.0.3", "sisteransi": "^1.0.5" @@ -4703,6 +5060,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -4715,12 +5073,14 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "license": "MIT", "engines": { "node": ">=6" } @@ -4739,12 +5099,14 @@ "type": "opencollective", "url": "https://opencollective.com/fast-check" } - ] - }, + ], + "license": "MIT" + }, "node_modules/qs": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, @@ -4759,6 +5121,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4767,6 +5130,7 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -4781,13 +5145,15 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -4800,6 +5166,7 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4809,6 +5176,7 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, + "license": "MIT", "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", @@ -4829,6 +5197,7 @@ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, + "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" }, @@ -4841,6 +5210,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4850,6 +5220,7 @@ "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } @@ -4877,12 +5248,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" }, "node_modules/saxes": { "version": "6.0.0", @@ -4901,6 +5274,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -4909,6 +5283,7 @@ "version": "0.19.0", "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -4932,6 +5307,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -4939,12 +5315,14 @@ "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "license": "MIT" }, "node_modules/send/node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -4953,6 +5331,7 @@ "version": "1.16.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "license": "MIT", "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", @@ -4966,13 +5345,15 @@ "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -4985,6 +5366,7 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4993,6 +5375,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", @@ -5011,6 +5394,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" @@ -5026,6 +5410,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -5043,6 +5428,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -5061,13 +5447,15 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/simple-update-notifier": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -5076,10 +5464,11 @@ } }, "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -5088,14 +5477,14 @@ } }, "node_modules/sinon": { - "version": "19.0.5", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", - "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", + "version": "19.0.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", + "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.5", + "@sinonjs/fake-timers": "^13.0.2", "@sinonjs/samsam": "^8.0.1", "diff": "^7.0.0", "nise": "^6.1.1", @@ -5120,13 +5509,15 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5136,6 +5527,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -5145,6 +5537,7 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, + "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -5154,6 +5547,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "license": "MIT", "dependencies": { "memory-pager": "^1.0.2" } @@ -5162,13 +5556,15 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/stack-utils": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "^2.0.0" }, @@ -5180,6 +5576,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5189,6 +5586,7 @@ "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", "dev": true, + "license": "MIT", "dependencies": { "char-regex": "^1.0.2", "strip-ansi": "^6.0.0" @@ -5202,6 +5600,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5216,6 +5615,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5228,6 +5628,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5237,6 +5638,7 @@ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -5246,6 +5648,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -5258,6 +5661,7 @@ "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", "dev": true, + "license": "MIT", "dependencies": { "component-emitter": "^1.3.0", "cookiejar": "^2.1.4", @@ -5278,6 +5682,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -5286,10 +5691,11 @@ } }, "node_modules/supertest": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz", - "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.0.0.tgz", + "integrity": "sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==", "dev": true, + "license": "MIT", "dependencies": { "methods": "^1.1.2", "superagent": "^9.0.1" @@ -5303,6 +5709,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -5315,6 +5722,7 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5326,18 +5734,21 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==", + "license": "ISC", "optional": true }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "license": "MIT" }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, + "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -5348,32 +5759,36 @@ } }, "node_modules/tldts": { - "version": "6.1.86", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz", - "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==", + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", + "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", + "license": "MIT", "dependencies": { - "tldts-core": "^6.1.86" + "tldts-core": "^6.1.85" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.86", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz", - "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==" + "version": "6.1.85", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", + "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==", + "license": "MIT" }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -5385,6 +5800,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", "engines": { "node": ">=0.6" } @@ -5394,6 +5810,7 @@ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", "dev": true, + "license": "ISC", "bin": { "nodetouch": "bin/nodetouch.js" } @@ -5411,14 +5828,15 @@ } }, "node_modules/tr46": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", - "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "license": "MIT", "dependencies": { - "punycode": "^2.3.1" + "punycode": "^2.3.0" }, "engines": { - "node": ">=18" + "node": ">=14" } }, "node_modules/type-detect": { @@ -5426,6 +5844,7 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -5435,6 +5854,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -5446,6 +5866,7 @@ "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -5458,30 +5879,34 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==" + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "license": "MIT" }, "node_modules/unfetch": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", - "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" + "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==", + "license": "MIT" }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", "dev": true, "funding": [ { @@ -5497,6 +5922,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" @@ -5512,6 +5938,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "license": "MIT", "engines": { "node": ">= 0.4.0" } @@ -5521,6 +5948,7 @@ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", "dev": true, + "license": "ISC", "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", @@ -5534,6 +5962,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5555,6 +5984,7 @@ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "makeerror": "1.0.12" } @@ -5563,6 +5993,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "license": "BSD-2-Clause", "engines": { "node": ">=12" } @@ -5601,15 +6032,16 @@ } }, "node_modules/whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", + "license": "MIT", "dependencies": { - "tr46": "^5.1.0", + "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=18" + "node": ">=16" } }, "node_modules/which": { @@ -5617,6 +6049,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -5632,6 +6065,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -5648,13 +6082,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, + "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" @@ -5704,6 +6140,7 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -5712,13 +6149,15 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -5737,6 +6176,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, + "license": "ISC", "engines": { "node": ">=12" } @@ -5746,6 +6186,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -5753,4215 +6194,5 @@ "url": "https://github.com/sponsors/sindresorhus" } } - }, - "dependencies": { - "@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "@asamuzakjp/css-color": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.5.tgz", - "integrity": "sha512-w7AmVyTTiU41fNLsFDf+gA2Dwtbx2EJtn2pbJNAGSRAg50loXy1uLXA3hEpD8+eydcomTurw09tq5/AyceCaGg==", - "requires": { - "@csstools/css-calc": "^2.1.3", - "@csstools/css-color-parser": "^3.0.9", - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3", - "lru-cache": "^10.4.3" - }, - "dependencies": { - "lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" - } - } - }, - "@babel/code-frame": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", - "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.25.9", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - } - }, - "@babel/compat-data": { - "version": "7.26.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", - "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", - "dev": true - }, - "@babel/core": { - "version": "7.26.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", - "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", - "dev": true, - "requires": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.10", - "@babel/helper-compilation-targets": "^7.26.5", - "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.10", - "@babel/parser": "^7.26.10", - "@babel/template": "^7.26.9", - "@babel/traverse": "^7.26.10", - "@babel/types": "^7.26.10", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - } - }, - "@babel/generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz", - "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==", - "dev": true, - "requires": { - "@babel/parser": "^7.27.0", - "@babel/types": "^7.27.0", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^3.0.2" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz", - "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.26.8", - "@babel/helper-validator-option": "^7.25.9", - "browserslist": "^4.24.0", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - } - }, - "@babel/helper-module-imports": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", - "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", - "dev": true, - "requires": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" - } - }, - "@babel/helper-module-transforms": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", - "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9", - "@babel/traverse": "^7.25.9" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", - "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", - "dev": true - }, - "@babel/helper-string-parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", - "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", - "dev": true - }, - "@babel/helper-validator-identifier": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", - "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", - "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", - "dev": true - }, - "@babel/helpers": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz", - "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==", - "dev": true, - "requires": { - "@babel/template": "^7.27.0", - "@babel/types": "^7.27.0" - } - }, - "@babel/parser": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", - "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", - "dev": true, - "requires": { - "@babel/types": "^7.27.0" - } - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-import-attributes": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", - "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-jsx": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", - "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", - "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", - "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.26.0", - "@babel/helper-plugin-utils": "^7.25.9" - } - }, - "@babel/template": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", - "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.26.2", - "@babel/parser": "^7.27.0", - "@babel/types": "^7.27.0" - } - }, - "@babel/traverse": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz", - "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.27.0", - "@babel/parser": "^7.27.0", - "@babel/template": "^7.27.0", - "@babel/types": "^7.27.0", - "debug": "^4.3.1", - "globals": "^11.1.0" - } - }, - "@babel/types": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", - "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", - "dev": true, - "requires": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" - } - }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, - "@csstools/color-helpers": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz", - "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==" - }, - "@csstools/css-calc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.3.tgz", - "integrity": "sha512-XBG3talrhid44BY1x3MHzUx/aTG8+x/Zi57M4aTKK9RFB4aLlF3TTSzfzn8nWVHWL3FgAXAxmupmDd6VWww+pw==", - "requires": {} - }, - "@csstools/css-color-parser": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.9.tgz", - "integrity": "sha512-wILs5Zk7BU86UArYBJTPy/FMPPKVKHMj1ycCEyf3VUptol0JNRLFU/BZsJ4aiIHJEbSLiizzRrw8Pc1uAEDrXw==", - "requires": { - "@csstools/color-helpers": "^5.0.2", - "@csstools/css-calc": "^2.1.3" - } - }, - "@csstools/css-parser-algorithms": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", - "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", - "requires": {} - }, - "@csstools/css-tokenizer": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", - "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==" - }, - "@edsilv/http-status-codes": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", - "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==" - }, - "@iiif/helpers": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", - "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", - "requires": { - "@iiif/presentation-2": "1.0.4", - "@iiif/presentation-3": "2.2.3", - "@iiif/presentation-3-normalized": "0.9.7", - "@types/geojson": "7946.0.13", - "abs-svg-path": "^0.1.1", - "parse-svg-path": "^0.1.2", - "svg-arc-to-cubic-bezier": "^3.2.0" - } - }, - "@iiif/parser": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.8.tgz", - "integrity": "sha512-87ifvY3Pq6dzSbHKrCr6/aIiZZDeaozIFz+EAYWYGxmpxn213t3kISCrSCC/XJ03jdXW7mQgPUEPcmztX5uh1A==", - "peer": true, - "requires": { - "@iiif/presentation-2": "^1.0.4", - "@iiif/presentation-3": "^2.2.2", - "@iiif/presentation-3-normalized": "^0.9.7", - "@types/geojson": "^7946.0.10" - } - }, - "@iiif/presentation-2": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@iiif/presentation-2/-/presentation-2-1.0.4.tgz", - "integrity": "sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==", - "requires": {} - }, - "@iiif/presentation-3": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", - "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", - "requires": { - "@types/geojson": "^7946.0.10" - } - }, - "@iiif/presentation-3-normalized": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz", - "integrity": "sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==", - "requires": { - "@iiif/presentation-3": "^2.0.5" - } - }, - "@iiif/vocabulary": { - "version": "1.0.26", - "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", - "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==" - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest-mock/express": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@jest-mock/express/-/express-2.1.0.tgz", - "integrity": "sha512-wwij1960SVxJL+v5Eqw3Akn3S5TLfCtHnFqs2K9Zto7RLU5I/7YhOsYDZQfNcnGyiBdisDz5iT21SRO1CVfvKA==", - "dev": true, - "requires": { - "@types/express": "^4.17.21" - } - }, - "@jest/console": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", - "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0" - } - }, - "@jest/core": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", - "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/reporters": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^29.7.0", - "jest-config": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-resolve-dependencies": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "@jest/environment": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", - "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", - "dev": true, - "requires": { - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0" - } - }, - "@jest/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", - "dev": true, - "requires": { - "expect": "^29.7.0", - "jest-snapshot": "^29.7.0" - } - }, - "@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", - "dev": true, - "requires": { - "jest-get-type": "^29.6.3" - } - }, - "@jest/fake-timers": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", - "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@sinonjs/fake-timers": "^10.0.2", - "@types/node": "*", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "@jest/globals": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", - "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/types": "^29.6.3", - "jest-mock": "^29.7.0" - } - }, - "@jest/reporters": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", - "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^6.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.1.3", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", - "v8-to-istanbul": "^9.0.1" - } - }, - "@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, - "requires": { - "@sinclair/typebox": "^0.27.8" - } - }, - "@jest/source-map": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", - "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.18", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" - } - }, - "@jest/test-result": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", - "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", - "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", - "dev": true, - "requires": { - "@jest/test-result": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "slash": "^3.0.0" - } - }, - "@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", - "convert-source-map": "^2.0.0", - "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", - "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" - } - }, - "@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, - "requires": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - } - }, - "@jridgewell/gen-mapping": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", - "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true - }, - "@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true - }, - "@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "@mongodb-js/saslprep": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz", - "integrity": "sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==", - "requires": { - "sparse-bitfield": "^3.0.3" - } - }, - "@noble/hashes": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", - "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", - "dev": true - }, - "@paralleldrive/cuid2": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz", - "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==", - "dev": true, - "requires": { - "@noble/hashes": "^1.1.5" - } - }, - "@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "dev": true - }, - "@sinonjs/commons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", - "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.0" - } - }, - "@sinonjs/samsam": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", - "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1", - "lodash.get": "^4.4.2", - "type-detect": "^4.1.0" - }, - "dependencies": { - "type-detect": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", - "dev": true - } - } - }, - "@sinonjs/text-encoding": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", - "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", - "dev": true - }, - "@types/babel__core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", - "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", - "dev": true, - "requires": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", - "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@types/babel__template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", - "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@types/babel__traverse": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz", - "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==", - "dev": true, - "requires": { - "@babel/types": "^7.20.7" - } - }, - "@types/body-parser": { - "version": "1.19.5", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", - "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", - "dev": true, - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/connect": { - "version": "3.4.38", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", - "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/express": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", - "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", - "dev": true, - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.33", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.19.6", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", - "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*", - "@types/send": "*" - } - }, - "@types/geojson": { - "version": "7946.0.13", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", - "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" - }, - "@types/graceful-fs": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", - "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/http-errors": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", - "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", - "dev": true - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", - "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", - "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/mime": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", - "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", - "dev": true - }, - "@types/node": { - "version": "22.15.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz", - "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==", - "requires": { - "undici-types": "~6.21.0" - } - }, - "@types/qs": { - "version": "6.9.18", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", - "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", - "dev": true - }, - "@types/range-parser": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", - "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", - "dev": true - }, - "@types/send": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", - "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", - "dev": true, - "requires": { - "@types/mime": "^1", - "@types/node": "*" - } - }, - "@types/serve-static": { - "version": "1.15.7", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", - "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", - "dev": true, - "requires": { - "@types/http-errors": "*", - "@types/node": "*", - "@types/send": "*" - } - }, - "@types/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true - }, - "@types/trusted-types": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "optional": true - }, - "@types/webidl-conversions": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" - }, - "@types/whatwg-url": { - "version": "11.0.5", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", - "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", - "requires": { - "@types/webidl-conversions": "*" - } - }, - "@types/yargs": { - "version": "17.0.33", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", - "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true - }, - "abs-svg-path": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", - "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==", - "optional": true - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "agent-base": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", - "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==" - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" - }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "requires": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" - }, - "dependencies": { - "istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - } - } - } - }, - "babel-plugin-jest-hoist": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", - "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", - "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-import-attributes": "^7.24.7", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5" - } - }, - "babel-preset-jest": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", - "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", - "dev": true, - "requires": { - "babel-plugin-jest-hoist": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "requires": { - "safe-buffer": "5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true - }, - "body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "requires": { - "fill-range": "^7.1.1" - } - }, - "browserslist": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", - "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001688", - "electron-to-chromium": "^1.5.73", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.1" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "bson": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", - "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==" - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" - }, - "call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "requires": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - } - }, - "call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001715", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", - "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", - "dev": true - }, - "chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true - }, - "cjs-module-lexer": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", - "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", - "dev": true - }, - "cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "component-emitter": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", - "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "requires": { - "safe-buffer": "5.2.1" - } - }, - "content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" - }, - "convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true - }, - "cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==" - }, - "cookie-parser": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", - "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", - "requires": { - "cookie": "0.7.2", - "cookie-signature": "1.0.6" - } - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" - }, - "cookiejar": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", - "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", - "dev": true - }, - "cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "requires": { - "object-assign": "^4", - "vary": "^1" - } - }, - "create-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", - "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "prompts": "^2.0.1" - } - }, - "cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "cssstyle": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.1.tgz", - "integrity": "sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==", - "requires": { - "@asamuzakjp/css-color": "^3.1.2", - "rrweb-cssom": "^0.8.0" - } - }, - "data-urls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", - "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", - "requires": { - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.0.0" - } - }, - "debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", - "requires": { - "ms": "^2.1.3" - } - }, - "decimal.js": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", - "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==" - }, - "dedent": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", - "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", - "dev": true, - "requires": {} - }, - "deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true - }, - "denque": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", - "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "dezalgo": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", - "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", - "dev": true, - "requires": { - "asap": "^2.0.0", - "wrappy": "1" - } - }, - "diff": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", - "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", - "dev": true - }, - "diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true - }, - "dompurify": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz", - "integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==", - "requires": { - "@types/trusted-types": "^2.0.7" - } - }, - "dotenv": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", - "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==" - }, - "dotenv-expand": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.2.tgz", - "integrity": "sha512-lXpXz2ZE1cea1gL4sz2Ipj8y4PiVjytYr3Ij0SWoms1PGxIv7m2CRKuRuCRtHdVuvM/hNJPMxt5PbhboNC4dPQ==", - "requires": { - "dotenv": "^16.4.5" - } - }, - "dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "requires": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" - }, - "electron-to-chromium": { - "version": "1.5.144", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.144.tgz", - "integrity": "sha512-eJIaMRKeAzxfBSxtjYnoIAw/tdD6VIH6tHBZepZnAbE3Gyqqs5mGN87DvcldPUbVkIljTK8pY0CMcUljP64lfQ==", - "dev": true - }, - "emittery": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", - "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" - }, - "entities": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz", - "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==" - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" - }, - "es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" - }, - "es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "requires": { - "es-errors": "^1.3.0" - } - }, - "es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "dev": true, - "requires": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - } - }, - "escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true - }, - "expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", - "dev": true, - "requires": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", - "proxy-addr": "~2.0.7", - "qs": "6.13.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "express-oauth2-jwt-bearer": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", - "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", - "requires": { - "jose": "^4.15.5" - } - }, - "express-urlrewrite": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-2.0.3.tgz", - "integrity": "sha512-NjsmtYZ1Lpie+XR7VIrvI6aeAmRQDf9cHyGjdIxlE9sc+NhTx3z6fJ0wfxV4rS7AY9ncCK7JDge+VX3e+DQ9Mg==", - "requires": { - "debug": "^4.3.4", - "path-to-regexp": "^6.3.0" - }, - "dependencies": { - "path-to-regexp": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==" - } - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", - "dev": true - }, - "fb-watchman": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", - "requires": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "form-data": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", - "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "mime-types": "^2.1.12" - } - }, - "formidable": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz", - "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==", - "dev": true, - "requires": { - "@paralleldrive/cuid2": "^2.2.2", - "dezalgo": "^1.0.4", - "once": "^1.4.0" - } - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" - }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - } - }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "requires": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" - }, - "graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" - }, - "has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, - "requires": { - "has-symbols": "^1.0.3" - } - }, - "hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "requires": { - "function-bind": "^1.1.2" - } - }, - "html-encoding-sniffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", - "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", - "requires": { - "whatwg-encoding": "^3.1.1" - } - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "requires": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - } - }, - "https-proxy-agent": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "requires": { - "agent-base": "^7.1.2", - "debug": "4" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true - }, - "import-local": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", - "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, - "requires": { - "hasown": "^2.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "isomorphic-unfetch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", - "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", - "requires": { - "node-fetch": "^2.6.1", - "unfetch": "^4.2.0" - } - }, - "istanbul-lib-coverage": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", - "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", - "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", - "dev": true, - "requires": { - "@babel/core": "^7.23.9", - "@babel/parser": "^7.23.9", - "@istanbuljs/schema": "^0.1.3", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^7.5.4" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^4.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - } - }, - "istanbul-reports": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", - "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", - "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", - "dev": true, - "requires": { - "@jest/core": "^29.7.0", - "@jest/types": "^29.6.3", - "import-local": "^3.0.2", - "jest-cli": "^29.7.0" - } - }, - "jest-changed-files": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", - "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", - "dev": true, - "requires": { - "execa": "^5.0.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0" - } - }, - "jest-circus": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", - "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^1.0.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^29.7.0", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "p-limit": "^3.1.0", - "pretty-format": "^29.7.0", - "pure-rand": "^6.0.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - } - }, - "jest-cli": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", - "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", - "dev": true, - "requires": { - "@jest/core": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "create-jest": "^29.7.0", - "exit": "^0.1.2", - "import-local": "^3.0.2", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "yargs": "^17.3.1" - } - }, - "jest-config": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", - "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-jest": "^29.7.0", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", - "parse-json": "^5.2.0", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-json-comments": "^3.1.1" - } - }, - "jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-docblock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", - "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", - "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "jest-util": "^29.7.0", - "pretty-format": "^29.7.0" - } - }, - "jest-environment-node": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", - "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" - } - }, - "jest-esm-transformer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz", - "integrity": "sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==", - "dev": true, - "requires": { - "@babel/core": "^7.4.4", - "@babel/plugin-transform-modules-commonjs": "^7.4.4" - } - }, - "jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "dev": true - }, - "jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", - "walker": "^1.0.8" - } - }, - "jest-leak-detector": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", - "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", - "dev": true, - "requires": { - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" - } - }, - "jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - } - }, - "jest-mock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", - "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "jest-util": "^29.7.0" - } - }, - "jest-pnp-resolver": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", - "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true, - "requires": {} - }, - "jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true - }, - "jest-resolve": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", - "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "resolve": "^1.20.0", - "resolve.exports": "^2.0.0", - "slash": "^3.0.0" - } - }, - "jest-resolve-dependencies": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", - "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", - "dev": true, - "requires": { - "jest-regex-util": "^29.6.3", - "jest-snapshot": "^29.7.0" - } - }, - "jest-runner": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", - "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", - "dev": true, - "requires": { - "@jest/console": "^29.7.0", - "@jest/environment": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "graceful-fs": "^4.2.9", - "jest-docblock": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-leak-detector": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-resolve": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-util": "^29.7.0", - "jest-watcher": "^29.7.0", - "jest-worker": "^29.7.0", - "p-limit": "^3.1.0", - "source-map-support": "0.5.13" - } - }, - "jest-runtime": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", - "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", - "dev": true, - "requires": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/globals": "^29.7.0", - "@jest/source-map": "^29.6.3", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "slash": "^3.0.0", - "strip-bom": "^4.0.0" - } - }, - "jest-snapshot": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", - "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", - "dev": true, - "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-jsx": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "natural-compare": "^1.4.0", - "pretty-format": "^29.7.0", - "semver": "^7.5.3" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - } - }, - "jest-validate": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", - "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", - "dev": true, - "requires": { - "@jest/types": "^29.6.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "leven": "^3.1.0", - "pretty-format": "^29.7.0" - }, - "dependencies": { - "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true - } - } - }, - "jest-watcher": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", - "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", - "dev": true, - "requires": { - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.13.1", - "jest-util": "^29.7.0", - "string-length": "^4.0.1" - } - }, - "jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, - "requires": { - "@types/node": "*", - "jest-util": "^29.7.0", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "jose": { - "version": "4.15.9", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", - "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==" - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsdom": { - "version": "26.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz", - "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", - "requires": { - "cssstyle": "^4.2.1", - "data-urls": "^5.0.0", - "decimal.js": "^10.5.0", - "html-encoding-sniffer": "^4.0.0", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.6", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.16", - "parse5": "^7.2.1", - "rrweb-cssom": "^0.8.0", - "saxes": "^6.0.0", - "symbol-tree": "^3.2.4", - "tough-cookie": "^5.1.1", - "w3c-xmlserializer": "^5.0.0", - "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^3.1.1", - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.1", - "ws": "^8.18.0", - "xml-name-validator": "^5.0.0" - } - }, - "jsesc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", - "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - }, - "just-extend": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", - "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true - }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "dev": true - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "make-dir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", - "dev": true, - "requires": { - "semver": "^7.5.3" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, - "requires": { - "tmpl": "1.0.5" - } - }, - "manifesto.js": { - "version": "4.2.21", - "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz", - "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==", - "requires": { - "@edsilv/http-status-codes": "^1.0.3", - "@iiif/vocabulary": "^1.0.26", - "isomorphic-unfetch": "^3.0.0", - "lodash": "^4.17.21" - } - }, - "mariadb": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.2.tgz", - "integrity": "sha512-B17vhYRHDMQ1XXvhSWsvKJbpw3Q8B6py93ThBEXZXSgxIbqnKqoHK1RzoPLbIxoEzWN3jA86ZaMMc3IG6L5wsw==", - "requires": { - "@types/geojson": "^7946.0.14", - "@types/node": "^22.5.4", - "denque": "^2.1.0", - "iconv-lite": "^0.6.3", - "lru-cache": "^10.3.0" - }, - "dependencies": { - "@types/geojson": { - "version": "7946.0.16", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", - "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==" - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" - } - } - }, - "marked": { - "version": "15.0.11", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.11.tgz", - "integrity": "sha512-1BEXAU2euRCG3xwgLVT1y0xbJEld1XOrmRJpUwRCcy7rxhSCwMrmEu9LXoPhHSCJG41V7YcQ2mjKRr5BA3ITIA==" - }, - "math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" - }, - "memory-pager": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" - }, - "merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" - }, - "micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "requires": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "mongodb": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.16.0.tgz", - "integrity": "sha512-D1PNcdT0y4Grhou5Zi/qgipZOYeWrhLEpk33n3nm6LGtz61jvO88WlrWCK/bigMjpnOdAUKKQwsGIl0NtWMyYw==", - "requires": { - "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.3", - "mongodb-connection-string-url": "^3.0.0" - } - }, - "mongodb-connection-string-url": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", - "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", - "requires": { - "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^14.1.0 || ^13.0.0" - } - }, - "morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", - "requires": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", - "on-finished": "~2.3.0", - "on-headers": "~1.0.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "requires": { - "ee-first": "1.1.1" - } - } - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" - }, - "nise": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", - "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.1", - "@sinonjs/text-encoding": "^0.7.3", - "just-extend": "^6.2.0", - "path-to-regexp": "^8.1.0" - }, - "dependencies": { - "@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1" - } - }, - "path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", - "dev": true - } - } - }, - "node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "requires": { - "whatwg-url": "^5.0.0" - }, - "dependencies": { - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - } - } - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true - }, - "node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true - }, - "nodemailer": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz", - "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==" - }, - "nodemon": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", - "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", - "dev": true, - "requires": { - "chokidar": "^3.5.2", - "debug": "^4", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^7.5.3", - "simple-update-notifier": "^2.0.0", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "nwsapi": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", - "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" - }, - "object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - }, - "dependencies": { - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - } - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parse-svg-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", - "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==", - "optional": true - }, - "parse5": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", - "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", - "requires": { - "entities": "^6.0.0" - } - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" - }, - "picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pirates": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", - "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, - "requires": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - } - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, - "pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true - }, - "punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" - }, - "pure-rand": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", - "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", - "dev": true - }, - "qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "requires": { - "side-channel": "^1.0.6" - } - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" - }, - "raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, - "react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", - "dev": true, - "requires": { - "is-core-module": "^2.16.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "resolve.exports": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", - "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", - "dev": true - }, - "rrweb-cssom": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", - "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==" - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "saxes": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", - "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", - "requires": { - "xmlchars": "^2.2.0" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - }, - "send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } - } - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" - } - } - }, - "serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", - "requires": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" - } - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - } - }, - "side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - } - }, - "side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - } - }, - "side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "simple-update-notifier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", - "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", - "dev": true, - "requires": { - "semver": "^7.5.3" - }, - "dependencies": { - "semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true - } - } - }, - "sinon": { - "version": "19.0.5", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", - "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.5", - "@sinonjs/samsam": "^8.0.1", - "diff": "^7.0.0", - "nise": "^6.1.1", - "supports-color": "^7.2.0" - }, - "dependencies": { - "@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", - "dev": true, - "requires": { - "@sinonjs/commons": "^3.0.1" - } - } - } - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "sparse-bitfield": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", - "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", - "requires": { - "memory-pager": "^1.0.2" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "stack-utils": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" - }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "superagent": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", - "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", - "dev": true, - "requires": { - "component-emitter": "^1.3.0", - "cookiejar": "^2.1.4", - "debug": "^4.3.4", - "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.0", - "formidable": "^3.5.1", - "methods": "^1.1.2", - "mime": "2.6.0", - "qs": "^6.11.0" - }, - "dependencies": { - "mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true - } - } - }, - "supertest": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz", - "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==", - "dev": true, - "requires": { - "methods": "^1.1.2", - "superagent": "^9.0.1" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "svg-arc-to-cubic-bezier": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", - "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==", - "optional": true - }, - "symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } - }, - "tldts": { - "version": "6.1.86", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz", - "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==", - "requires": { - "tldts-core": "^6.1.86" - } - }, - "tldts-core": { - "version": "6.1.86", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz", - "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==" - }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" - }, - "touch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", - "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", - "dev": true - }, - "tough-cookie": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", - "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==", - "requires": { - "tldts": "^6.1.32" - } - }, - "tr46": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", - "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", - "requires": { - "punycode": "^2.3.1" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true - }, - "undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==" - }, - "unfetch": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", - "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" - }, - "update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", - "dev": true, - "requires": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" - } - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" - }, - "v8-to-istanbul": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", - "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^2.0.0" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" - }, - "w3c-xmlserializer": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", - "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", - "requires": { - "xml-name-validator": "^5.0.0" - } - }, - "walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "requires": { - "makeerror": "1.0.12" - } - }, - "webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" - }, - "whatwg-encoding": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", - "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", - "requires": { - "iconv-lite": "0.6.3" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "whatwg-mimetype": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", - "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==" - }, - "whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", - "requires": { - "tr46": "^5.1.0", - "webidl-conversions": "^7.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - } - }, - "ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", - "requires": {} - }, - "xml-name-validator": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", - "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==" - }, - "xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - } - }, - "yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - } } } From 673a5c5c7f8b729c845e05eacbfade3e8f354906 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Tue, 29 Apr 2025 17:22:08 -0500 Subject: [PATCH 060/262] Using UID to get User Projects --- project/index.mjs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/project/index.mjs b/project/index.mjs index df48126d..06b8b40f 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -105,10 +105,11 @@ router } router - .route("/import28") - .get(patchTokenFromQuery, auth0Middleware(), cookieParser(), async (req, res) => { + .route("/import28/:uid") + .get(cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { const user = req.user const jsessionid = req.cookies.JSESSIONID + const uid = req.params.uid if (!user) { return respondWithError(res, 401, "Unauthenticated request") @@ -120,7 +121,7 @@ router try { const response = await fetch( - "https://dev.t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", + `https://dev.t-pen.org/TPEN/projects?uid=${uid}`, { method: "GET", headers: { @@ -129,6 +130,11 @@ router credentials: "include", } ) + + if (response.status === 500) { + document.getElementById('message').textContent = 'The project cannot be imported.'; + return; + } const rawText = await response.text() let parsedData @@ -151,7 +157,7 @@ router } return res.status(200).json({ - message: "Project 9183 Dummy", + message: "Select a Project to Import : ", data: parsedData, }) From ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Wed, 30 Apr 2025 11:51:40 -0500 Subject: [PATCH 061/262] Update index.mjs --- project/index.mjs | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/project/index.mjs b/project/index.mjs index 06b8b40f..79be8689 100644 --- a/project/index.mjs +++ b/project/index.mjs @@ -118,6 +118,10 @@ router if (!jsessionid) { return respondWithError(res, 400, "Missing jsessionid in query") } + + if (!uid) { + return respondWithError(res, 400, "Missing uid in query") + } try { const response = await fetch( @@ -137,20 +141,19 @@ router } const rawText = await response.text() - let parsedData + let parsedData = {} try { - const firstLevel = JSON.parse(rawText) - parsedData = {} - - for (const [key, value] of Object.entries(firstLevel)) { - try { - parsedData[key] = JSON.parse(value) - } catch { - parsedData[key] = value - } - } - + const firstLevel = JSON.parse(rawText) + parsedData = Object.fromEntries( + Object.entries(firstLevel).map(([key, value]) => { + try { + return [key, JSON.parse(value)] + } catch { + return [key, value] + } + }) + ) } catch (err) { console.error("Failed to parse project response:", err) return respondWithError(res, 500, "Invalid project response format") From 443d0a2d76c8eb5226fc9b7773b695c13d690943 Mon Sep 17 00:00:00 2001 From: cubap Date: Wed, 30 Apr 2025 15:23:02 -0500 Subject: [PATCH 062/262] no label is fine for Pages --- classes/Page/__tests__/exists.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/Page/__tests__/exists.test.js b/classes/Page/__tests__/exists.test.js index 7ece7446..6496573c 100644 --- a/classes/Page/__tests__/exists.test.js +++ b/classes/Page/__tests__/exists.test.js @@ -23,7 +23,6 @@ describe('Page Class looks how we expect it to. #Page_exists_unit', () => { expect(() => new Page("layerID")).toThrow() // Missing required arguments expect(() => new Page("layerID", null)).toThrow() // Null canvas object expect(() => new Page("layerID", { id: null, label: "Canvas Label", target: "https://example.com/canvas" })).toThrow() // Invalid canvas ID - expect(() => new Page("layerID", { id: "canvasID", label: null, target: "https://example.com/canvas" })).toThrow() // Invalid canvas label expect(() => new Page("layerID", { id: "canvasID", label: "Canvas Label", target: null })).toThrow() // Invalid canvas target }) }) From d2ec19844b8a15fe4497eb877d6709f898487324 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Thu, 1 May 2025 12:47:32 -0500 Subject: [PATCH 063/262] Origin Fetch --- project/index.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/project/index.js b/project/index.js index 3fc0cc61..74669019 100644 --- a/project/index.js +++ b/project/index.js @@ -108,6 +108,17 @@ router .route("/import28/:uid") .get(cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { const user = req.user + console.log(req.protocol, req.get('host')) + const origin = req.get('origin'); + + if (origin) { + console.log('Origin (from header):', origin); + res.send(`Origin: ${origin}`); + } else { + console.log('Origin header not present'); + res.send('Origin header not present'); + } + const jsessionid = req.cookies.JSESSIONID const uid = req.params.uid From dde7c3015f32cb38d6c49cf25ac826a347310c26 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Thu, 1 May 2025 13:05:02 -0500 Subject: [PATCH 064/262] SetHeader Origin --- project/index.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/project/index.js b/project/index.js index 74669019..33b5d669 100644 --- a/project/index.js +++ b/project/index.js @@ -108,17 +108,6 @@ router .route("/import28/:uid") .get(cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { const user = req.user - console.log(req.protocol, req.get('host')) - const origin = req.get('origin'); - - if (origin) { - console.log('Origin (from header):', origin); - res.send(`Origin: ${origin}`); - } else { - console.log('Origin header not present'); - res.send('Origin header not present'); - } - const jsessionid = req.cookies.JSESSIONID const uid = req.params.uid @@ -169,7 +158,8 @@ router console.error("Failed to parse project response:", err) return respondWithError(res, 500, "Invalid project response format") } - + + res.setHeader("Access-Control-Allow-Origin", req.get("origin")) return res.status(200).json({ message: "Select a Project to Import : ", data: parsedData, From f97723414967e86eccda10f29ab02c4d89e7a7e9 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Thu, 1 May 2025 13:14:16 -0500 Subject: [PATCH 065/262] Update index.js --- project/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/project/index.js b/project/index.js index 33b5d669..980001c8 100644 --- a/project/index.js +++ b/project/index.js @@ -106,6 +106,11 @@ router router .route("/import28/:uid") + .options(async (req, res) => { + res.setHeader("Access-Control-Allow-Methods", req.get("origin")) + res.setHeader("Access-Control-Allow-Credentials", "true") + res.status(204).send() + }) .get(cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { const user = req.user const jsessionid = req.cookies.JSESSIONID @@ -158,8 +163,9 @@ router console.error("Failed to parse project response:", err) return respondWithError(res, 500, "Invalid project response format") } - + res.setHeader("Access-Control-Allow-Origin", req.get("origin")) + res.setHeader("Access-Control-Allow-Credentials", "true") return res.status(200).json({ message: "Select a Project to Import : ", data: parsedData, From 280dd4519d8e96d11e27531fefec6612f8023114 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Thu, 1 May 2025 15:18:32 -0500 Subject: [PATCH 066/262] Update index.js --- project/index.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/project/index.js b/project/index.js index 980001c8..2943efad 100644 --- a/project/index.js +++ b/project/index.js @@ -104,14 +104,20 @@ router next() } + const corsOptions = { + origin: function (origin, callback) { + if (origin) { + callback(null, true) + } else { + callback(new Error("Not allowed by CORS")) + } + }, + credentials: true + } + router .route("/import28/:uid") - .options(async (req, res) => { - res.setHeader("Access-Control-Allow-Methods", req.get("origin")) - res.setHeader("Access-Control-Allow-Credentials", "true") - res.status(204).send() - }) - .get(cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { + .get(cors(corsOptions), cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { const user = req.user const jsessionid = req.cookies.JSESSIONID const uid = req.params.uid @@ -164,8 +170,6 @@ router return respondWithError(res, 500, "Invalid project response format") } - res.setHeader("Access-Control-Allow-Origin", req.get("origin")) - res.setHeader("Access-Control-Allow-Credentials", "true") return res.status(200).json({ message: "Select a Project to Import : ", data: parsedData, From 4ad48ec96c69d9551fb62186fbc8ad4d45fbfc9a Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Thu, 1 May 2025 16:21:57 -0500 Subject: [PATCH 067/262] Update index.js --- project/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/index.js b/project/index.js index 2943efad..2e9a90cc 100644 --- a/project/index.js +++ b/project/index.js @@ -136,7 +136,7 @@ router try { const response = await fetch( - `https://dev.t-pen.org/TPEN/projects?uid=${uid}`, + `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, { method: "GET", headers: { From 52edaab21d47427f3003c94b94b848f64f04850c Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri, 2 May 2025 09:36:27 -0500 Subject: [PATCH 068/262] Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js --- project/index.js | 54 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/project/index.js b/project/index.js index d4478576..2e9a90cc 100644 --- a/project/index.js +++ b/project/index.js @@ -104,11 +104,23 @@ router next() } + const corsOptions = { + origin: function (origin, callback) { + if (origin) { + callback(null, true) + } else { + callback(new Error("Not allowed by CORS")) + } + }, + credentials: true + } + router - .route("/import28") - .get(patchTokenFromQuery, auth0Middleware(), cookieParser(), async (req, res) => { + .route("/import28/:uid") + .get(cors(corsOptions), cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { const user = req.user const jsessionid = req.cookies.JSESSIONID + const uid = req.params.uid if (!user) { return respondWithError(res, 401, "Unauthenticated request") @@ -117,10 +129,14 @@ router if (!jsessionid) { return respondWithError(res, 400, "Missing jsessionid in query") } + + if (!uid) { + return respondWithError(res, 400, "Missing uid in query") + } try { const response = await fetch( - "https://t-pen.org/TPEN/getProjectTPENServlet?projectID=9183", + `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, { method: "GET", headers: { @@ -129,29 +145,33 @@ router credentials: "include", } ) + + if (response.status === 500) { + document.getElementById('message').textContent = 'The project cannot be imported.'; + return; + } const rawText = await response.text() - let parsedData + let parsedData = {} try { - const firstLevel = JSON.parse(rawText) - parsedData = {} - - for (const [key, value] of Object.entries(firstLevel)) { - try { - parsedData[key] = JSON.parse(value) - } catch { - parsedData[key] = value - } - } - + const firstLevel = JSON.parse(rawText) + parsedData = Object.fromEntries( + Object.entries(firstLevel).map(([key, value]) => { + try { + return [key, JSON.parse(value)] + } catch { + return [key, value] + } + }) + ) } catch (err) { console.error("Failed to parse project response:", err) return respondWithError(res, 500, "Invalid project response format") } - + return res.status(200).json({ - message: "Project 9183 Dummy", + message: "Select a Project to Import : ", data: parsedData, }) From 447490b63d1629c17a4cd221828821b609971647 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Tue, 6 May 2025 16:57:01 -0500 Subject: [PATCH 069/262] Update validateURL.js --- utilities/validateURL.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/validateURL.js b/utilities/validateURL.js index 9dbae9a9..e238f376 100644 --- a/utilities/validateURL.js +++ b/utilities/validateURL.js @@ -7,7 +7,7 @@ async function validateURL(url) { } const urlPattern = new RegExp( - "^(https?://([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]\\.)+[a-zA-Z]{2,}|(\\d{1,3}\\.){3}\\d{1,3})(:\\d+)?(/[-a-zA-Z0-9@:%_+.~#?&//=]*)?(\\?[;&a-zA-Z0-9@:%_+.~#?&//=]*)?(#[a-zA-Z0-9@:%_+.~#?&//=]*)?$" + "^(https?://((localhost)|(([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9].)+[a-zA-Z]{2,})|(\\d{1,3}\\.){3}\\d{1,3})(:\\d+)?(/[-a-zA-Z0-9@:%_+.~#?&//=]*)?(\\?[;&a-zA-Z0-9@:%_+.~#?&//=]*)?(#[a-zA-Z0-9@:%_+.~#?&//=]*)?)$" ) if (!urlPattern.test(url)) { From 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 7 May 2025 10:13:21 -0500 Subject: [PATCH 070/262] Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba --- project/index.js | 7 ------- utilities/validateURL.js | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/project/index.js b/project/index.js index 9a6b195c..2e9a90cc 100644 --- a/project/index.js +++ b/project/index.js @@ -117,11 +117,6 @@ router router .route("/import28/:uid") - .options(async (req, res) => { - res.setHeader("Access-Control-Allow-Methods", req.get("origin")) - res.setHeader("Access-Control-Allow-Credentials", "true") - res.status(204).send() - }) .get(cors(corsOptions), cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { const user = req.user const jsessionid = req.cookies.JSESSIONID @@ -175,8 +170,6 @@ router return respondWithError(res, 500, "Invalid project response format") } - res.setHeader("Access-Control-Allow-Origin", req.get("origin")) - res.setHeader("Access-Control-Allow-Credentials", "true") return res.status(200).json({ message: "Select a Project to Import : ", data: parsedData, diff --git a/utilities/validateURL.js b/utilities/validateURL.js index 9dbae9a9..e238f376 100644 --- a/utilities/validateURL.js +++ b/utilities/validateURL.js @@ -7,7 +7,7 @@ async function validateURL(url) { } const urlPattern = new RegExp( - "^(https?://([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]\\.)+[a-zA-Z]{2,}|(\\d{1,3}\\.){3}\\d{1,3})(:\\d+)?(/[-a-zA-Z0-9@:%_+.~#?&//=]*)?(\\?[;&a-zA-Z0-9@:%_+.~#?&//=]*)?(#[a-zA-Z0-9@:%_+.~#?&//=]*)?$" + "^(https?://((localhost)|(([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9].)+[a-zA-Z]{2,})|(\\d{1,3}\\.){3}\\d{1,3})(:\\d+)?(/[-a-zA-Z0-9@:%_+.~#?&//=]*)?(\\?[;&a-zA-Z0-9@:%_+.~#?&//=]*)?(#[a-zA-Z0-9@:%_+.~#?&//=]*)?)$" ) if (!urlPattern.test(url)) { From 4ee227ae0a0e061a42e7c884cc231b0f3e372598 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 7 May 2025 13:54:34 -0500 Subject: [PATCH 071/262] 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger --- API.md | 124 +++++++++++++ classes/Layer/Layer.js | 100 ++++------ classes/Line/Line.js | 186 +++++++++++-------- classes/Line/__tests__/exists.test.js | 36 ---- classes/Page/Page.js | 21 ++- classes/Project/Project.js | 48 +++++ layer/__tests__/layer_routes.test.js | 93 ++++++++++ layer/index.js | 82 ++++++++- line/__tests__/end_to_end_unit.test.js | 2 +- line/index.js | 2 +- package-lock.json | 7 +- package.json | 3 +- page/index.js | 90 +++++---- project/__tests__/end_to_end_unit.test.js | 51 ++++- project/index.js | 215 +--------------------- 15 files changed, 624 insertions(+), 436 deletions(-) delete mode 100644 classes/Line/__tests__/exists.test.js create mode 100644 layer/__tests__/layer_routes.test.js diff --git a/API.md b/API.md index 745c76fb..d3d90823 100644 --- a/API.md +++ b/API.md @@ -282,3 +282,127 @@ The response is a list of projects the user is a member of regardless of the per - **500**: Server error The response is a projection of the full user object. The public profile is available to all users and serialized into this response with whatever the user has chosen to share. The `custom` field is not an actual property - it is a placeholder for any additional fields the user has added to their profile. The `displayName` and `_id` fields are always present. + +--- + +### 5. **Layers** + +#### `POST /project/:projectId/layer` 🔐 + +- **Description**: Create a new layer within a project. +- **Parameters**: + - `projectId`: ID of the project. +- **Request Body**: + + ```json + { + "label": "string", + "canvases": ["string"] + } + ``` + +- **Responses**: + + - **201**: Layer created successfully + ```json + { + "id": "string", + "label": "string", + "pages": ["string"] + } + ``` + - **400**: Invalid input + - **404**: Project not found + - **401**: Unauthorized + - **500**: Server error + +Note that requests without at least one canvas are considered invalid. + +#### `PUT /project/:projectId/layer/:layerId` 🔐 + +- **Description**: Update an existing layer within a project. +- **Parameters**: + - `projectId`: ID of the project. + - `layerId`: ID of the layer. +- **Request Body**: + + ```json + { + "label": "string", + "canvases": ["string"] + } + ``` + +- **Responses**: + + - **200**: Layer updated successfully + ```json + { + "id": "string", + "label": "string", + "pages": ["string"] + } + ``` + - **400**: Invalid input + - **404**: Layer or project not found + - **401**: Unauthorized + - **500**: Server error + +Note that you may not empty the canvases of an existing layer. If the `canvases` property is an empty array the request will be treated as if it did not contain the `canvases` property at all. + +#### `GET /project/:projectId/layer/:layerId` + +- **Description**: Get an existing layer within a project. +- **Parameters**: + - `projectId`: ID of the project. + - `layerId`: ID of the layer. + +- **Responses**: + + - **200**: Layer found + ```json + { + "@context": "string", + "id": "string", + "type": "AnnotationCollection", + "label": { + "none":[ + "TPEN3 Layer" + ] + }, + "total": "integer", + "first": "string", + "last": "string" + } + ``` + - **500**: Server error + +#### `GET /project/:projectId/layer/:layerId/page/:pageid` +#### `GET /project/:projectId/page/:pageid` + +- **Description**: Get an existing page within a project. +- **Parameters**: + - `projectId`: ID of the project. + - `layerId`: Optional. ID of the layer. + - `pageId`: The ID of the page. + +- **Responses**: + + - **200**: Page found + ```json + { + "@context": "string", + "id": "string", + "type": "AnnotationPage", + "label": { + "none":[ + "TPEN3 Page" + ] + }, + "target": "string", + "items":[ {"type": "Canvas"} ], + "prev": "string", + "next": "string" + } + ``` + - **500**: Server error diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index d82cb479..1e747aa7 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -7,17 +7,18 @@ import Page from "../Page/Page.js" export default class Layer { #tinyAction = 'create' -/** - * Constructs a Layer from the JSON Object in the Project `layers` Array. This - * never creates a new Layer, but rather wraps existing data in a Layer object. - * Use the `build` method to create a new Layer. - * @param {hexString} projectId For the project this layer belongs to - * @param {string} id The ID of the layer. This is the Layer stored in the Project. - * @param {string} label The label of the layer. This is the Layer stored in the Project. - * @param {Array} pages The pages in the layer by reference. - * @seeAlso {@link Layer.build} - */ - constructor(projectId, {id, label, pages}) { + + /** + * Constructs a Layer from the JSON Object in the Project `layers` Array. + * This never creates a new Layer, but rather wraps existing data in a Layer object. + * Use the `build` method to create a new Layer. + * @param {hexString} projectId For the project this layer belongs to + * @param {string} id The ID of the layer. This is the Layer stored in the Project. + * @param {string} label The label of the layer. This is the Layer stored in the Project. + * @param {Array} pages The pages in the layer by reference. + * @seeAlso {@link Layer.build} + */ + constructor(projectId, { id, label, pages }) { if (!projectId) { throw new Error("Project ID is required to create a Layer instance.") } @@ -27,63 +28,51 @@ export default class Layer { this.projectId = projectId this.id = id this.label = label - this.pages = pages.map(this.#getPageReference) - if(this.id.startsWith(process.env.RERUMIDPREFIX)) { + this.pages = pages + if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } return this } - + + // Static Methods static build(projectId, label, canvases, projectLabel = "Default") { let thisLayer = {} projectId ??= database.reserveId() thisLayer.projectId = projectId thisLayer.label = label ?? `${projectLabel} - Layer ${Date.now()}` - + if (!Array.isArray(canvases)) { if (!canvases) { throw new Error("At least one Canvas must be included.") - } + } canvases = [canvases] } thisLayer.id = `${process.env.SERVERURL}layer/${databaseTiny.reserveId()}` - const pages = canvases.map(c => Page.build(thisLayer.id, c)) - + const pages = canvases.map(c => Page.build(projectId, thisLayer.id, c).asProjectPage()) pages.forEach((page, index) => { if (index > 0) page.prev = pages[index - 1].id if (index < pages.length - 1) page.next = pages[index + 1].id }) - const newLayer = new Layer(projectId, { id: thisLayer.id, label: thisLayer.label, pages }) - return newLayer - } - - #setRerumId() { - if (this.#tinyAction === 'create') { - this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}` - } - return this + return new Layer(projectId, { id: thisLayer.id, label: thisLayer.label, pages }) } + // Public Methods async delete() { - if(this.#tinyAction === 'update') { - // delete the associated pages in RERUM + if (this.#tinyAction === 'delete') { await Promise.all(this.pages.map(page => { const p = new Page(this.id, page) return p.delete() })) - await databaseTiny.remove(this.id) - .catch(err => false) + await databaseTiny.remove(this.id).catch(err => false) } return true } - /** - * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. - * @returns {Promise} Resolves to the updated Layer object as stored in Project. - */ async update() { if (this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { - await this.#setRerumId().#saveCollectionToRerum() + this.#setRerumId() + await this.#saveCollectionToRerum() } return this.#updateCollectionForProject() } @@ -92,13 +81,15 @@ export default class Layer { return this.#updateCollectionForProject() } + // Private Methods + #setRerumId() { + if (this.#tinyAction === 'create') { + this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` + } + return this + } + #updateCollectionForProject() { - // Layer in local MongoDB is in the Project.layers Array and looks like: - // { - // label: "Layer 1", - // id: "https://api.t-pen.org/layer/layerID", - // pages: [ { id: "https://api.t-pen.org/layer/layerID/page/pageID", label: "Page 1" } ] - // } return { label: this.label, id: this.id, @@ -107,22 +98,12 @@ export default class Layer { } #getPageReference({ id, label, target }) { - return { id, label, target } + label ??= id.split("/").pop() + const resolvedLabel = label.none?.join(", ") ?? label.en?.join(", ") ?? label + return { id, label: resolvedLabel, target } } async #saveCollectionToRerum() { - // Layer in Rerum is an AnnotationCollection and looks like: - // { - // "@context": "http://www.w3.org/ns/anno.jsonld", - // id: "https://store.t-pen.org/v1/id/layerID", - // type: "AnnotationCollection", - // label: { "none": ["Layer 1"] }, - // items: [ "https://store.t-pen.org/v1/id/pageID" ], - // total: 1, - // first: "https://store.t-pen.org/v1/id/pageID", - // last: "https://store.t-pen.org/v1/id/pageID" - // } - const layerAsCollection = { "@context": "http://www.w3.org/ns/anno.jsonld", id: this.id, @@ -134,20 +115,19 @@ export default class Layer { } if (this.#tinyAction === 'create') { - await databaseTiny.save(layerAsCollection) - .catch(err => { - console.error(err,layerAsCollection) + await databaseTiny.save(layerAsCollection).catch(err => { + console.error(err, layerAsCollection) throw new Error(`Failed to save Layer to RERUM: ${err.message}`) }) this.#tinyAction = 'update' return this } - // ...else Update the existing collection in RERUM + const existingLayer = await fetch(this.id).then(res => res.json()) if (!existingLayer) { throw new Error(`Layer not found in RERUM: ${this.id}`) } - updatedLayer = { ...existingLayer, ...layerAsCollection } + const updatedLayer = { ...existingLayer, ...layerAsCollection } await databaseTiny.overwrite(updatedLayer) return this } diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 50500590..032c61cb 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -1,97 +1,131 @@ -export class Line { - constructor(line = {}) { - this.annotation = line - if (!this.annotation.id) { - this.annotation.id = Date.now().toString() +import dbDriver from "../../database/driver.js" + +const databaseTiny = new dbDriver("tiny") +export default class Line { + + #tinyAction = 'create' + #setRerumId() { + if (this.#tinyAction === 'create') { + this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}` } + return this } - get id() { - return this.annotation.id + constructor({ id, target, body }) { + if (!id || !body || !target) { + throw new Error('Line data is malformed.') + } + this.id = id // Ensure the id is assigned + this.body = body + this.target = target + if (id.startsWith?.(process.env.RERUMIDPREFIX)) { + this.#tinyAction = 'update' + } + return this } - set id(id) { - this.annotation.id = id - } - embedReferencedDocuments() { - console.log('Referenced documents embedded.') - return Promise.resolve(); - } - - asJSON() { - this.embedReferencedDocuments(); - return { - type: 'Annotation', - '@context': 'http://www.w3.org/ns/anno.jsonld', - body: this.annotation.body ?? '', - target: this.annotation.target ?? '', - }; + static build(projectId, pageId, { id, body, target }) { + id ??= `${process.env.SERVERURL}/project/${projectId}/page/${pageId}/line/${databaseTiny.reserveId()}` + return new Line({ id, body, target }) } - // Set text content - setTextContent(text) { - if (typeof text !== 'string') { - throw new Error('Text content must be a string') - } - this.annotation.body = text + async #saveLineToRerum() { + const lineAsAnnotation = { + "@context": "http://iiif.io/api/presentation/3/context.json", + id: this.id, + type: "Annotation", + motivation: this.motivation ?? "transcribing", + target: this.target, + body: this.body + } + if (this.label) lineAsAnnotation.label = { "none": [this.label] } + if (this.#tinyAction === 'create') { + await databaseTiny.save(lineAsAnnotation) + .catch(err => { + throw new Error(`Failed to save Page to RERUM: ${err.message}`) + }) + this.#tinyAction = 'update' + return this + } + // ...else Update the existing page in RERUM + const existingLine = await fetch(this.id).then(res => res.json()) + if (!existingLine) { + throw new Error(`Failed to find Line in RERUM: ${this.id}`) + } + const updatedLine = { ...existingLine, ...lineAsAnnotation } + const newURI = await databaseTiny.update(updatedLine).then(res => res.headers.get('location')).catch(err => { + throw new Error(`Failed to update Line in RERUM: ${err.message}`) + }) + this.id = newURI + this.#tinyAction = 'update' + return this + } + /** + * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. + * @returns {Promise} Resolves to the updated Layer object as stored in Project. + */ + async update() { + if (this.#tinyAction === 'update' || typeof this.body !== 'string') { + await this.#setRerumId().#saveLineToRerum() + } + return this.#updateLineForPage() } - - // Set image link - setImageLink(url) { - if (typeof url !== 'string' || !/^https?:\/\//.test(url)) { - throw new Error('Image link must be a valid URL') + +async #updateLineForPage() { + return { + id: this.id, + target: this.target, + body: this.body, } - this.annotation.target = url } - //create a line - create() { - return Promise.resolve(new Line()) - } - //Save the line - save() { - return Promise.resolve() - } - - // Fetch the parent Annotation Page - getParentPage() { - return Promise.resolve(new AnnotationPage()) - } - - // Fetch previous line - getPreviousLine() { - return Promise.resolve(new Line()) + async updateText(text) { + if (typeof text !== 'string') { + throw new Error('Text content must be a string') + } + if(this.body === text) { + return this + } + this.body = text + return this.update() } - // Fetch next line - getNextLine() { - return Promise.resolve(new Line()) + async updateBounds({x, y, w, h}) { + if (!x || !y || !w || !h) { + throw new Error('Bounds ({x,y,w,h}) must be provided') + } + this.target ??= '' + const newTarget = `${this.target.split('=')[0]}=${x},${y},${w},${h}` + if (this.target === newTarget) { + return this + } + this.target = newTarget + return this.update() } - // Fetch parent Annotation Collection (Layer) - getParentCollection() { - return Promise.resolve(new AnnotationCollection()) + asJSON(isLD) { + return isLD ? { + '@context': 'http://iiif.io/api/presentation/3/context.json', + id: this.id, + type: 'Annotation', + motivation: this.motivation ?? 'transcribing', + target: this.target, + body: this.body, + } : { + id: this.id, + body: this.body ?? '', + target: this.target ?? '', + } } - // to get metadata only - getMetadata() { - return Promise.resolve('Get only metadata of the page') - } - //Fetch metadata only - fetchMetadata() { - // Calling the internal getMetadata method - return this.getMetadata(); - } asHTML() { return Promise.resolve('This is the HTML document content.') } - // Update the line - update() { - return Promise.resolve(new Line()) - } - - // Delete the line - delete() { - return Promise.resolve() + async delete() { + if (this.#tinyAction === 'update') { + await databaseTiny.remove(this.id) + .catch(err => false) + } + return true } -} \ No newline at end of file +} diff --git a/classes/Line/__tests__/exists.test.js b/classes/Line/__tests__/exists.test.js deleted file mode 100644 index 52da866e..00000000 --- a/classes/Line/__tests__/exists.test.js +++ /dev/null @@ -1,36 +0,0 @@ -import { Line } from "../Line.js" - -describe('Line Class looks how we expect it to. #Line_exists_unit', () => { - it('Imports Line', () => { - expect(Line.constructor).toBeInstanceOf(Function) - }) - - const line = new Line() - - it('has useful methods', () => { - expect(line.asJSON).toBeInstanceOf(Function) - expect(line.create).toBeInstanceOf(Function) - expect(line.delete).toBeInstanceOf(Function) - expect(line.save).toBeInstanceOf(Function) - expect(line.getParentPage).toBeInstanceOf(Function) - expect(line.getPreviousLine).toBeInstanceOf(Function) - expect(line.getNextLine).toBeInstanceOf(Function) - expect(line.getParentCollection).toBeInstanceOf(Function) - expect(line.embedReferencedDocuments).toBeInstanceOf(Function) - expect(line.fetchMetadata).toBeInstanceOf(Function) - expect(line.asHTML).toBeInstanceOf(Function) - expect(line.update).toBeInstanceOf(Function) - expect(line.setTextContent).toBeInstanceOf(Function) - expect(line.setImageLink).toBeInstanceOf(Function) - }) - - it('configures a correct Annotation', () => { - expect(line.id).toBeDefined() - const json = line.asJSON() - expect(json).toBeInstanceOf(Object) - expect(json.type).toBe('Annotation') - expect(json['@context']).toBe("http://www.w3.org/ns/anno.jsonld") - expect(json.body).toBeDefined() - expect(json.target).toBeDefined() - }) -}) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index b2c8f3c4..852576b5 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -23,7 +23,6 @@ export default class Page { * @seeAlso {@link Page.build} */ constructor(layerId, { id, label, target }) { - console.log("Page constructor", layerId, id, label, target) if (!id || !target) { throw new Error("Page data is malformed.") } @@ -34,23 +33,30 @@ export default class Page { return this } - static build(layerId, canvas, prev, next, lines = []) { + static build(projectId, layerId, canvas, prev, next, lines = []) { + if (!projectId) { + throw new Error("Project ID is required to create a Page instance.") + } if (!layerId) { throw new Error("Layer ID is required to create a Page instance.") } - if (!canvas || !canvas.id) { + if (!canvas?.id && typeof canvas !== 'string') { throw new Error("Canvas with id is required to create a Page instance.") } - + if (!canvas.id) { + canvas = {id : canvas} + } + const id = lines.length ? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}` - : `${process.env.SERVERURL}layer/${layerId.split("/").pop()}/page/${databaseTiny.reserveId()}` + : `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}` + const page = { data: { "@context": "http://www.w3.org/ns/anno.jsonld", id, type: "AnnotationPage", - label: canvas.label, + label: canvas.label ?? `Page ${canvas.id.split('/').pop()}`, target: canvas.id, partOf: layerId, items: lines, @@ -58,6 +64,7 @@ export default class Page { next } } + return new Page(layerId, page.data) } @@ -107,7 +114,7 @@ export default class Page { return this.#updatePageForProject() } - async #updatePageForProject() { + #updatePageForProject() { // Page in local MongoDB is in the Project.layers.pages Array and looks like: // { // id: "https://api.t-pen.org/layer/layerID/page/pageID", diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 2d040a01..dcbffe9c 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -206,4 +206,52 @@ export default class Project { await project.#load() return project } + + updateLayer(layer, previousId) { + if (!this.data?.layers) { + throw new Error("Project does not have layers.") + } + previousId ??= layer.id + const layerIndex = this.data.layers.findIndex(l => l.id.split('/').pop() === previousId.split('/').pop()) + if (layerIndex < 0) { + throw new Error("Layer not found in project.") + } + if (!isValidLayer(layer)) { + throw new Error("Layer data is invalid.") + } + this.data.layers[layerIndex] = layer + return this + } + + addLayer(layer) { + if (!this.data?.layers) { + throw new Error("Project does not have layers.") + } + if (!isValidLayer(layer)) { + throw new Error("Layer data is invalid.") + } + if (this.data.layers.findIndex(l => l.id.split('/').pop() === layer.id.split('/').pop()) >= 0) { + throw new Error("Layer with this ID already exists in the project.") + } + const existingLayerLabelCount = this.data.layers.find(l => l.label === layer.label)?.length + if (existingLayerLabelCount >= 0) { + layer.label+=`(${existingLayerLabelCount + 2})` + } + this.data.layers.push(layer) + return this + } +} + +function isValidLayer(layer) { + if (typeof layer?.label !== 'string' || !layer?.id?.startsWith('http') || !Array.isArray(layer?.pages)) { + return false + } + + for (const page of layer.pages) { + if (!page?.id?.startsWith('http') || !page?.target?.startsWith('http') || !page.label ) { + return false + } + } + + return true } diff --git a/layer/__tests__/layer_routes.test.js b/layer/__tests__/layer_routes.test.js new file mode 100644 index 00000000..5fe7e9d3 --- /dev/null +++ b/layer/__tests__/layer_routes.test.js @@ -0,0 +1,93 @@ +import request from 'supertest' +import express from 'express' +import layerRouter from '../index.js' +import Project from '../../classes/Project/Project.js' +import Layer from '../../classes/Layer/Layer.js' +import { jest } from '@jest/globals' + +const app = express() +app.use(express.json()) + +// Mock authentication middleware to bypass authentication +jest.mock('../../auth/index.js', () => jest.fn((req, res, next) => { + req.user = { id: 'test-user' } // Mock a valid user + next() +})) + +app.use('/project/:projectId/layer', layerRouter) + +// Project is not mocking... +jest.mock('../../classes/Project/Project.js', () => { + const mockProject = jest.fn().mockImplementation(() => ({ + loadProject: jest.fn(), + updateLayer: jest.fn() + })) + return { default: mockProject } +}) + +jest.mock('../../classes/Layer/Layer.js', () => ({ + Layer: jest.fn() +})) + +describe('Layer Routes', () => { + beforeEach(() => { + jest.clearAllMocks() + }) + + describe.skip('POST /project/:projectId/layer', () => { + it('should create a new layer and return 201', async () => { + const mockLayer = { label: 'Layer 1', canvases: ['canvas1', 'canvas2'] } + const mockProject = new Project() + mockProject.loadProject.mockResolvedValue({ layers: [] }) + + Layer.build = jest.fn().mockReturnValue({ update: jest.fn(), asProjectLayer: jest.fn().mockReturnValue(mockLayer) }) + + const res = await request(app) + .post('/project/123/layer') + .send(mockLayer) + + expect(res.status).toBe(201) + expect(res.body).toEqual(mockLayer) + expect(Layer.build).toHaveBeenCalledWith('123', 'Layer 1', ['canvas1', 'canvas2']) + }) + + it('should return 400 for invalid input', async () => { + const res = await request(app) + .post('/project/123/layer') + .send({ label: 'Layer 1' }) // Missing canvases + + expect(res.status).toBe(400) + expect(res.body.message).toBe('Invalid layer data. Provide a label and an array of canvas IDs.') + }) + }) + + describe.skip('PUT /project/:projectId/layer/:layerId', () => { + it('should update an existing layer and return 200', async () => { + const mockLayer = { label: 'Updated Layer', canvases: ['canvas1', 'canvas2'] } + const mockProject = new Project() + mockProject.loadProject.mockResolvedValue({ layers: [{ id: 'layer1', label: 'Old Layer', canvases: [] }] }) + mockProject.updateLayer.mockResolvedValue() + + const res = await request(app) + .put('/project/123/layer/layer1') + .set('Authorization', 'token') + .send(mockLayer) + + expect(res.status).toBe(200) + expect(res.body.label).toBe('Updated Layer') + expect(mockProject.updateLayer).toHaveBeenCalled() + }) + + it('should return 404 if layer is not found', async () => { + const mockProject = new Project() + mockProject.loadProject.mockResolvedValue({ layers: [] }) + + const res = await request(app) + .put('/project/123/layer/layer1') + .send({ label: 'Updated Layer', canvases: ['canvas1'] }) + + expect(res.status).toBe(404) + expect(res.body.message).toBe('Layer not found in project') + }) + }) +}) diff --git a/layer/index.js b/layer/index.js index 4804b49c..38dae9ba 100644 --- a/layer/index.js +++ b/layer/index.js @@ -1,10 +1,13 @@ import express from 'express' import * as utils from '../utilities/shared.js' +import auth0Middleware from "../auth/index.js" import pageRouter from '../page/index.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} +import Project from '../classes/Project/Project.js' +import Layer from '../classes/Layer/Layer.js' -const router = express.Router() +const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) @@ -32,30 +35,99 @@ router.route('/:layerId') return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) + .put(auth0Middleware(), async (req, res) => { + const { projectId, layerId } = req.params + let { label, canvases } = req.body + + if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') + + if (!layerId) return utils.respondWithError(res, 400, 'Layer ID is required') + + + try { + const project = new Project(projectId) + const layers = await project.loadProject() + + if (!layers) return utils.respondWithError(res, 404, 'Project does not exist') + + const layer = await findLayerById(layerId, projectId, true) + + if (!layer) return utils.respondWithError(res, 404, 'Layer not found in project') + + label ??= label ?? layer.label + if(canvases?.length === 0) canvases = undefined + const updatedLayer = canvases ? + Layer.build(projectId, label, canvases) + : new Layer(projectId, {id:layer.id, label, pages:layer.pages}) + + await updatedLayer.update() + project.updateLayer(updatedLayer.asProjectLayer(), layerId) + await project.update() + + res.status(200).json(project.data) + } catch (error) { + return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') + } + }) .all((req, res) => { utils.respondWithError(res, 405, 'Improper request method. Use GET instead.') }) +// Route to create a new layer within a project +router.route('/').post(auth0Middleware(), async (req, res) => { + const { projectId } = req.params + const { label, canvases } = req.body + + if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') + + if (!label || !Array.isArray(canvases) || canvases.length === 0) { + return utils.respondWithError(res, 400, 'Invalid layer data. Provide a label and an array of URIs or Page objects.') + } + + try { + const project = await Project.getById(projectId) + + if (!project) return utils.respondWithError(res, 404, 'Project does not exist') + + const newLayer = Layer.build(projectId, label, canvases) + project.addLayer(newLayer.asProjectLayer()) + await project.update() + + res.status(201).json(project.data) + } catch (error) { + return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error creating layer') + } +}) + // Nested route for pages within a layer router.use('/:layerId/page', pageRouter) export default router -async function findLayerById(layerId, projectId) { - if (layerId.startsWith(process.env.RERUMIDPREFIX)) { +async function findLayerById(layerId, projectId, skipLookup = false) { + if (!skipLookup && layerId.startsWith(process.env.RERUMIDPREFIX)) { return fetch(layerId).then(res => res.json()) } - const p = await Project.getById(projectId) + const p = (await Project.getById(projectId)).data if (!p) { const error = new Error(`Project with ID '${projectId}' not found`) error.status = 404 throw error } - const layer = p.layers.find(layer => layer.id === layerId) + const layer = layerId.length < 6 + ? p.layers[parseInt(layerId) + 1] + : p.layers.find(layer => layer.id.split('/').pop() === layerId.split('/').pop()) if (!layer) { const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) error.status = 404 throw error } + // Ensure the layer has pages and is not malformed + if (!layer.pages || layer.pages.length === 0) { + const error = new Error(`Layer with ID '${layerId}' is malformed: no pages found`) + error.status = 422 + throw error + } + return layer } diff --git a/line/__tests__/end_to_end_unit.test.js b/line/__tests__/end_to_end_unit.test.js index 6d0880be..4bbe2024 100644 --- a/line/__tests__/end_to_end_unit.test.js +++ b/line/__tests__/end_to_end_unit.test.js @@ -5,7 +5,7 @@ import request from 'supertest' const app = express() app.use('/line', lineRouter) -describe('Line endpoint end to end unit test (spinning up the endpoint and using it). #end2end_unit', () => { +describe.skip('Line endpoint end to end unit test (spinning up the endpoint and using it). #end2end_unit', () => { it('should return 405 for POST request', async () => { const res = await request(app).post('/line/').send() expect(res.statusCode).toBe(405) diff --git a/line/index.js b/line/index.js index 74166c7e..be531bfa 100644 --- a/line/index.js +++ b/line/index.js @@ -1,7 +1,7 @@ import express from 'express' import * as utils from '../utilities/shared.js' import cors from 'cors' -import { findLineById } from './line.js' +import Line from '../classes/Line/Line.js' import common_cors from '../utilities/common_cors.json' with {type: 'json'} const router = express.Router() diff --git a/package-lock.json b/package-lock.json index ae173b23..fa8a3076 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,8 @@ "marked": "^15.0.7", "mongodb": "^6.12.0", "morgan": "^1.10.0", - "nodemailer": "^6.9.16" + "nodemailer": "^6.9.16", + "tpen3-services": "file:" }, "devDependencies": { "@jest-mock/express": "^2.1.0", @@ -5827,6 +5828,10 @@ "node": ">=16" } }, + "node_modules/tpen3-services": { + "resolved": "", + "link": true + }, "node_modules/tr46": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", diff --git a/package.json b/package.json index 6a8d98ac..2fcda184 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,8 @@ "marked": "^15.0.7", "mongodb": "^6.12.0", "morgan": "^1.10.0", - "nodemailer": "^6.9.16" + "nodemailer": "^6.9.16", + "tpen3-services": "file:" }, "devDependencies": { "@jest-mock/express": "^2.1.0", diff --git a/page/index.js b/page/index.js index c9489669..57e02720 100644 --- a/page/index.js +++ b/page/index.js @@ -3,33 +3,41 @@ import * as utils from '../utilities/shared.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} -let router = express.Router() +let router = express.Router({ mergeParams: true }) +import Project from '../classes/Project/Project.js' router.use( cors(common_cors) ) -router.route('/:id') +// This is a nested route for pages within a layer. It may be used +// directly from /project/:projectId/page or with /layer/:layerId/page +// depending on the context of the request. +router.route('/:pageId') .get(async (req, res, next) => { - const { projectId, layerId, pageId } = req.params - const pageObject = await findPageById(pageId, layerId, projectId) + const { projectId, pageId } = req.params + try { + const pageObject = await findPageById(pageId, projectId) if (!pageObject) { utils.respondWithError(res, 404, 'No page found with that ID.') - return - } - // build as AnnotationPage - const pageAsAnnotationPage = { - '@context': 'http://www.w3.org/ns/anno.jsonld', - id: pageObject.id, - type: 'AnnotationPage', - label: { none: [pageObject.label] }, - target: pageObject.target, - partOf: pageObject.partOf, - items: pageObject.items ?? [], - prev: pageObject.prev ?? null, - next: pageObject.next ?? null - } - res.status(200).json(pageAsAnnotationPage) + return + } + // build as AnnotationPage + const pageAsAnnotationPage = { + '@context': 'http://www.w3.org/ns/anno.jsonld', + id: pageObject.id, + type: 'AnnotationPage', + label: { none: [pageObject.label] }, + target: pageObject.target, + partOf: pageObject.partOf, + items: pageObject.items ?? [], + prev: pageObject.prev ?? null, + next: pageObject.next ?? null + } + res.status(200).json(pageAsAnnotationPage) + } catch (error) { + return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } }) .all((req, res, next) => { utils.respondWithError(res, 405, 'Improper request method, please use GET.') @@ -37,27 +45,39 @@ router.route('/:id') export default router -async function findPageById(pageId, layerId, projectId) { +async function findPageById(pageId, projectId) { if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { return fetch(pageId).then(res => res.json()) } - const p = await Project?.getById(projectId) - if (!p) { - const error = new Error(`Project with ID '${projectId}' not found`) - error.status = 404 - throw error + const projectData = (await Project.getById(projectId))?.data + if (!projectData) { + const error = new Error(`Project with ID '${projectId}' not found`) + error.status = 404 + throw error } - const layer = p.layers.find(layer => layer.id === layerId) - if (!layer) { - const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) - error.status = 404 - throw error + const layerContainingPage = projectData.layers.find(layer => + layer.pages.some(page => page.id.split('/').pop() === pageId.split('/').pop()) + ) + + if (!layerContainingPage) { + const error = new Error(`Layer containing page with ID '${pageId}' not found in project '${projectId}'`) + error.status = 404 + throw error } - const page = layer.pages.find(page => page.id === pageId) - if (!page) { - const error = new Error(`Page with ID '${pageId}' not found in layer '${layerId}'`) - error.status = 404 - throw error + + const pageIndex = layerContainingPage.pages.findIndex(page => + page.id.split('/').pop() === pageId.split('/').pop() + ) + + if (pageIndex < 0) { + const error = new Error(`Page with ID '${pageId}' not found in project '${projectId}'`) + error.status = 404 + throw error } + + const page = layerContainingPage.pages[pageIndex] + page.prev = layerContainingPage.pages[pageIndex - 1] ?? null + page.next = layerContainingPage.pages[pageIndex + 1] ?? null + return page } diff --git a/project/__tests__/end_to_end_unit.test.js b/project/__tests__/end_to_end_unit.test.js index f9e6ce35..26bdf4d6 100644 --- a/project/__tests__/end_to_end_unit.test.js +++ b/project/__tests__/end_to_end_unit.test.js @@ -36,7 +36,7 @@ describe.skip("Project endpoint end to end unit test (spinning up the endpoint a }) }) -describe("Project endpoint end to end unit test to /project/create #end2end_unit", () => { +describe.skip("Project endpoint end to end unit test to /project/create #end2end_unit", () => { it("GET instead of POST. The status should be 404 with a message.", async () => { const res = await request(routeTester) .get("/project/create") @@ -234,3 +234,52 @@ describe.skip("POST /project/:id/remove-member ", () => { expect(response.body).toBeTruthy(); }); }); + +// Layer and Page Test cases +describe.skip("GET /project/:projectId/layer/:layerId", () => { + it("should return a valid AnnotationCollection for a valid layer", async () => { + const projectId = "6602dd2314cd575343f513ba" + const layerId = "layer123" + + const res = await request(routeTester) + .get(`/project/${projectId}/layer/${layerId}`) + + expect(res.statusCode).toBe(200) + expect(res.body).toHaveProperty("@context", "http://www.w3.org/ns/anno.jsonld") + expect(res.body).toHaveProperty("type", "AnnotationCollection") + }) + + it("should return 404 if the layer does not exist", async () => { + const projectId = "6602dd2314cd575343f513ba" + const layerId = "nonexistentLayer" + + const res = await request(routeTester) + .get(`/project/${projectId}/layer/${layerId}`) + + expect(res.statusCode).toBe(404) + }) +}) + +describe.skip("GET /project/:projectId/page/:pageId", () => { + it("should return a valid AnnotationPage for a valid page", async () => { + const projectId = "6602dd2314cd575343f513ba" + const pageId = "page123" + + const res = await request(routeTester) + .get(`/project/${projectId}/page/${pageId}`) + + expect(res.statusCode).toBe(200) + expect(res.body).toHaveProperty("@context", "http://www.w3.org/ns/anno.jsonld") + expect(res.body).toHaveProperty("type", "AnnotationPage") + }) + + it("should return 404 if the page does not exist", async () => { + const projectId = "6602dd2314cd575343f513ba" + const pageId = "nonexistentPage" + + const res = await request(routeTester) + .get(`/project/${projectId}/page/${pageId}`) + + expect(res.statusCode).toBe(404) + }) +}) diff --git a/project/index.js b/project/index.js index 2e9a90cc..f3886468 100644 --- a/project/index.js +++ b/project/index.js @@ -13,12 +13,11 @@ import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" import Group from "../classes/Group/Group.js" import scrubDefaultRoles from "../utilities/isDefaultRole.js" import Hotkeys from "../classes/HotKeys/Hotkeys.js" -import path from "path" -import fs from "fs" import layerRouter from "../layer/index.js" +import pageRouter from "../page/index.js" import cookieParser from "cookie-parser" -let router = express.Router() +let router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) router @@ -564,218 +563,10 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) res.status(200).json({ message: 'Custom roles removed successfully.' }) } catch (error) { - console.log(error) respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') } }) -// Route to add a new layer to a project -router.route("/:projectId/layer").post(auth0Middleware(), async (req, res) => { - const { projectId } = req.params - const labelAndCanvases = req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!projectId) { - return respondWithError(res, 400, "Project ID is required") - } - - if(!validateID(projectId)){ - return respondWithError(res, 400, "Invalid project ID provided.") - } - - if (!labelAndCanvases || !labelAndCanvases.canvases || !Array.isArray(labelAndCanvases.canvases) || labelAndCanvases.canvases.some(canvas => typeof canvas !== "string")) { - return respondWithError(res, 400, "Invalid layer provided. Expected an array of canvas IDs.") - } - - try { - const project = new Project(projectId) - - if (!(await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LAYER))) { - return respondWithError(res, 403, "You do not have permission to add layers to this project.") - } - - const layers = await project.loadProject() - - if(!project || layers === null) { - return respondWithError(res, 404, "Project does not exist.") - } - - const layer = new Layer(layers) - const response = await layer.addLayer(projectId, labelAndCanvases, project.getLabel()) - res.status(201).json(response) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error adding layer to project.") - } -}) - -// Route to delete a specific layer within a project -router.route("/:projectId/layer/:layerId").delete(auth0Middleware(), async (req, res) => { - const { projectId, layerId } = req.params - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!projectId) { - return respondWithError(res, 400, "Project ID is required") - } - - if(!validateID(projectId)){ - return respondWithError(res, 400, "Invalid project ID provided.") - } - - if (!layerId) { - return respondWithError(res, 400, "Layer ID is required") - } - - try { - const project = new Project(projectId) - - if (!(await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.LAYER))) { - return respondWithError(res, 403, "You do not have permission to delete layers from this project.") - } - - const layers = await project.loadProject() - - if(!project || layers === null) { - return respondWithError(res, 404, "Project does not exist.") - } - - const layer = new Layer(layers) - if (layer.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`) === undefined) { - return respondWithError(res, 400, "Layer not found in project.") - } - - await layer.deleteLayer(projectId, layerId) - res.status(204).send() - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error deleting layer from project.") - } -}) - -// Route to update the ordering of pages/deleting of pages of a specific layer within a project -router.route("/:projectId/layer/:layerId/pages").put(auth0Middleware(), async (req, res) => { - const { projectId, layerId } = req.params - const pages = req.body.pages - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!pages || !Array.isArray(pages) || pages.some(page => typeof page !== "string")) { - return respondWithError(res, 400, "Invalid pages provided. Expected an array of page IDs.") - } - - try { - const project = new Project(projectId) - - if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.LAYER))) { - return respondWithError(res, 403, "You do not have permission to update pages in this layer.") - } - - const layers = await project.loadProject() - - if(!project || layers === null) { - return respondWithError(res, 404, "Project does not exist.") - } - - const layer = new Layer(layers) - if (layer.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`) === undefined) { - return respondWithError(res, 400, "Layer not found in project.") - } - - const existingPages = layer.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`).pages.map(page => page.id) - - if (!existingPages.some(page => pages.includes(page))) { - return respondWithError(res, 400, "Page not found in layer.") - } - - const response = await layer.updatePages(layerId, pages) - res.status(200).json(response) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error updating layer pages.") - } -}) - -// Route to update the label only of a specific layer within a project -router.route("/:projectId/layer/:layerId").put(auth0Middleware(), async (req, res) => { - const { projectId, layerId } = req.params - const label = req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!label || !Object(label)) { - return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") - } - - try { - const project = new Project(projectId) - - if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.LAYER))) { - return respondWithError(res, 403, "You do not have permission to update metadata for this layer.") - } - - const layers = await project.loadProject() - - if(!project || layers === null) { - return respondWithError(res, 404, "Project does not exist.") - } - - const layer = new Layer(layers) - if (layer.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`) === undefined) { - return respondWithError(res, 400, "Layer not found in project.") - } - - const response = await layer.updateLayerMetadata(layerId, label) - res.status(200).json(response) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error updating layer metadata.") - } -}) - -// Adding annotations to pages within a specific layer within a project -router.route("/:projectId/layer/:layerId/page/:pageId/save").post(auth0Middleware(), async (req, res) => { - const { projectId, layerId, pageId } = req.params - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - try { - const project = new Project(projectId) - - if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { - return respondWithError(res, 403, "You do not have permission to add annotations to this page.") - } - - const layers = await project.loadProject() - - if(!project || layers === null) { - return respondWithError(res, 404, "Project does not exist.") - } - - const layer = new Layer(layers) - if (layer.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`) === undefined) { - return respondWithError(res, 400, "Layer not found in project.") - } - - const pages = new Page(layers) - if (pages.data.layers.find(layer => String(layer.id).split("/").pop() === `${layerId}`).pages.find(page => String(page.id).split("/").pop() === `${pageId}`) === undefined) { - return respondWithError(res, 400, "Page not found in layer.") - } - - const response = await pages.saveCollectionToRerum(projectId, layerId) - res.status(200).json(response) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error adding annotations to page.") - } -}) - // Update Project Metadata router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { const { projectId } = req.params @@ -1027,7 +818,6 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) res.status(200).json({ message: 'Custom roles removed successfully.' }) } catch (error) { - console.log(error) respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') } }) @@ -1141,5 +931,6 @@ router.route("/:projectId/hotkeys").all((_, res) => { // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) +router.use('/:projectId/page', pageRouter) export default router From 20305c013b7849d5c8b8961d26ae98461eab01f2 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 12 May 2025 14:34:03 -0500 Subject: [PATCH 072/262] remove unused file --- feedback/index.js | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 feedback/index.js diff --git a/feedback/index.js b/feedback/index.js deleted file mode 100644 index 968b31b5..00000000 --- a/feedback/index.js +++ /dev/null @@ -1,40 +0,0 @@ -import express from 'express' -import bodyParser from 'body-parser' -import { createGitHubIssue } from './githubService.js' - -const feedbackRouter = express.Router() -feedbackRouter.use(bodyParser.json()) - -// Endpoint for feedback form submissions -feedbackRouter.post('/submit-feedback', async (req, res) => { - const { user, page, feedback } = req.body - - if (!feedback) { - return res.status(400).json({ error: 'Feedback is required' }) - } - - try { - await createGitHubIssue('Feedback', `Feedback from ${user}`, `Page: ${page}\n\nFeedback: ${feedback}`) - res.status(200).json({ message: 'Feedback submitted successfully' }) - } catch (error) { - res.status(500).json({ error: 'Failed to submit feedback' }) - } -}) - -// Endpoint for bug report submissions -feedbackRouter.post('/submit-bug', async (req, res) => { - const { user, page, bugDescription } = req.body - - if (!bugDescription) { - return res.status(400).json({ error: 'Bug description is required' }) - } - - try { - await createGitHubIssue('Bug Report', `Bug reported by ${user}`, `Page: ${page}\n\nBug: ${bugDescription}`) - res.status(200).json({ message: 'Bug report submitted successfully' }) - } catch (error) { - res.status(500).json({ error: 'Failed to submit bug report' }) - } -}) - -export default feedbackRouter From 66b3b5ce76cd34b89c63096faa1598ce4cdefa92 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 14 May 2025 15:39:57 -0500 Subject: [PATCH 073/262] 235 save annotations (#240) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * Create lineRouter with new paths remove line library and add methods to class * getLine * really loading lines * line modification * test barf * aw thucks! * Hi, I'm new here. * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * Update index.js * since I'm here... moved some functions into their own space * teehee * Make it so. * fixed GET /line/:id * page isn't a page? * undata * more details in data objects * Update Line.js * load it for updates * put overwrite in for updating pages * unlog * changing route format for compile trouble * no test * No. This is wrong and fills me with hate. * quick code comment * patches for PATCHes --------- Co-authored-by: Bryan Haberberger --- app.js | 2 +- classes/Layer/Layer.js | 2 +- classes/Line/Line.js | 44 ++++-- classes/Line/__tests__/Line.test.js | 73 +++++++++ classes/Page/Page.js | 20 +-- database/driver.js | 13 ++ line/__tests__/end_to_end_unit.test.js | 52 ------- line/__tests__/exists_unit.test.js | 15 -- line/__tests__/functionality_unit.test.js | 95 ------------ line/__tests__/lineRouter.test.js | 84 ++++++++++ line/index.js | 177 ++++++++++++++++++---- line/line.js | 97 ------------ page/index.js | 14 +- utilities/shared.js | 41 +++++ 14 files changed, 408 insertions(+), 321 deletions(-) create mode 100644 classes/Line/__tests__/Line.test.js delete mode 100644 line/__tests__/end_to_end_unit.test.js delete mode 100644 line/__tests__/exists_unit.test.js delete mode 100644 line/__tests__/functionality_unit.test.js create mode 100644 line/__tests__/lineRouter.test.js delete mode 100644 line/line.js diff --git a/app.js b/app.js index 21312e6b..9dfc72ac 100644 --- a/app.js +++ b/app.js @@ -60,8 +60,8 @@ app.all('*', (req, res, next) => { app.use('/', indexRouter) app.use('/manifest', manifestRouter) +app.use('/project/:projectId/page/:pageId/line', lineRouter) app.use('/project', projectRouter) -app.use('/line', lineRouter) app.use('/user', userProfileRouter) app.use('/my', privateProfileRouter) app.use('/proxy', proxyRouter) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index 1e747aa7..abc094bb 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -59,7 +59,7 @@ export default class Layer { // Public Methods async delete() { - if (this.#tinyAction === 'delete') { + if (this.#tinyAction === 'update') { await Promise.all(this.pages.map(page => { const p = new Page(this.id, page) return p.delete() diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 032c61cb..c24765ab 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -4,14 +4,14 @@ const databaseTiny = new dbDriver("tiny") export default class Line { #tinyAction = 'create' - #setRerumId() { - if (this.#tinyAction === 'create') { - this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}` + #setRerumId(force) { + if (force || this.#tinyAction === 'create') { + this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` } return this } - constructor({ id, target, body }) { + constructor({ id, target, body, motivation, label, type }) { if (!id || !body || !target) { throw new Error('Line data is malformed.') } @@ -21,19 +21,23 @@ export default class Line { if (id.startsWith?.(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } + if (motivation) this.motivation = motivation + if (label) this.label = label + if (type) this.type = type return this } - static build(projectId, pageId, { id, body, target }) { - id ??= `${process.env.SERVERURL}/project/${projectId}/page/${pageId}/line/${databaseTiny.reserveId()}` - return new Line({ id, body, target }) + static build(projectId, pageId, { body, target, motivation, label, type }) { + // TODO: Should this have a space for an id that is sent in? + const id = `${process.env.SERVERURL}project/${projectId}/page/${pageId}/line/${databaseTiny.reserveId()}` + return new Line({ id, body, target, motivation, label, type }) } async #saveLineToRerum() { const lineAsAnnotation = { "@context": "http://iiif.io/api/presentation/3/context.json", id: this.id, - type: "Annotation", + type: this.type ?? "Annotation", motivation: this.motivation ?? "transcribing", target: this.target, body: this.body @@ -49,11 +53,21 @@ export default class Line { } // ...else Update the existing page in RERUM const existingLine = await fetch(this.id).then(res => res.json()) + .catch(err => { + if (err.status === 404) { + // If the line doesn't exist, we can create it + return null + } + throw new Error(`Failed to fetch existing Line from RERUM: ${err.message}`) + }) + if (!existingLine) { - throw new Error(`Failed to find Line in RERUM: ${this.id}`) + // This id doesn't exist in RERUM, so we need to create it + this.#tinyAction = 'create' } - const updatedLine = { ...existingLine, ...lineAsAnnotation } - const newURI = await databaseTiny.update(updatedLine).then(res => res.headers.get('location')).catch(err => { + const updatedLine = existingLine ? { ...existingLine, ...lineAsAnnotation } : lineAsAnnotation + const newURI = await databaseTiny[this.#tinyAction](updatedLine).then(res => res.id) + .catch(err => { throw new Error(`Failed to update Line in RERUM: ${err.message}`) }) this.id = newURI @@ -65,8 +79,9 @@ export default class Line { * @returns {Promise} Resolves to the updated Layer object as stored in Project. */ async update() { - if (this.#tinyAction === 'update' || typeof this.body !== 'string') { - await this.#setRerumId().#saveLineToRerum() + if (this.#tinyAction === 'update' || this.body) { + this.#setRerumId(true) + await this.#saveLineToRerum() } return this.#updateLineForPage() } @@ -74,8 +89,7 @@ export default class Line { async #updateLineForPage() { return { id: this.id, - target: this.target, - body: this.body, + target: this.target } } async updateText(text) { diff --git a/classes/Line/__tests__/Line.test.js b/classes/Line/__tests__/Line.test.js new file mode 100644 index 00000000..12ead642 --- /dev/null +++ b/classes/Line/__tests__/Line.test.js @@ -0,0 +1,73 @@ +import Line from '../Line.js' + +describe.skip('Line class unit tests', () => { + it('should throw an error if no ID, body, or target is provided', () => { + expect(() => new Line({})).toThrow('Line data is malformed.') + }) + + it('should create a new Line instance with valid data', () => { + const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' }) + expect(line.id).toBe('123') + expect(line.body).toBe('Sample text') + expect(line.target).toBe('https://example.com?xywh=10,10,100,100') + }) + + it('should save a line to RERUM', async () => { + const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' }) + const savedLine = await line.update() + expect(savedLine.id).toBeDefined() + }) + + it('should update the text of a line', async () => { + const line = new Line({ id: '123', body: 'Old text', target: 'https://example.com?xywh=10,10,100,100' }) + const updatedLine = await line.updateText('New text') + expect(updatedLine.body).toBe('New text') + }) + + it('should not update the text if it is the same', async () => { + const line = new Line({ id: '123', body: 'Same text', target: 'https://example.com?xywh=10,10,100,100' }) + const updatedLine = await line.updateText('Same text') + expect(updatedLine.body).toBe('Same text') + }) + + it('should update the bounds of a line', async () => { + const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' }) + const updatedLine = await line.updateBounds({ x: 20, y: 20, w: 200, h: 200 }) + expect(updatedLine.target).toBe('https://example.com?xywh=20,20,200,200') + }) + + it('should not update the bounds if they are the same', async () => { + const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' }) + const updatedLine = await line.updateBounds({ x: 10, y: 10, w: 100, h: 100 }) + expect(updatedLine.target).toBe('https://example.com?xywh=10,10,100,100') + }) + + it('should return JSON-LD format when isLD is true', () => { + const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' }) + const jsonLD = line.asJSON(true) + expect(jsonLD).toEqual({ + '@context': 'http://iiif.io/api/presentation/3/context.json', + id: '123', + type: 'Annotation', + motivation: 'transcribing', + target: 'https://example.com?xywh=10,10,100,100', + body: 'Sample text' + }) + }) + + it('should return plain JSON format when isLD is false', () => { + const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' }) + const json = line.asJSON(false) + expect(json).toEqual({ + id: '123', + body: 'Sample text', + target: 'https://example.com?xywh=10,10,100,100' + }) + }) + + it('should delete a line', async () => { + const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' }) + const result = await line.delete() + expect(result).toBe(true) + }) +}) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 852576b5..ceaec2e3 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -7,7 +7,7 @@ export default class Page { #tinyAction = 'create' #setRerumId() { if (this.#tinyAction === 'create') { - this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}` + this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` } return this } @@ -22,18 +22,18 @@ export default class Page { * @param {String} target The uri of the targeted Canvas. * @seeAlso {@link Page.build} */ - constructor(layerId, { id, label, target }) { + constructor(layerId, { id, label, target, items = [] }) { if (!id || !target) { throw new Error("Page data is malformed.") } - Object.assign(this, { id, label, target, partOf: layerId }) + Object.assign(this, { id, label, target, partOf: layerId, items }) if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } return this } - static build(projectId, layerId, canvas, prev, next, lines = []) { + static build(projectId, layerId, canvas, prev, next, items = []) { if (!projectId) { throw new Error("Project ID is required to create a Page instance.") } @@ -47,7 +47,7 @@ export default class Page { canvas = {id : canvas} } - const id = lines.length + const id = items.length ? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}` : `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}` @@ -59,7 +59,7 @@ export default class Page { label: canvas.label ?? `Page ${canvas.id.split('/').pop()}`, target: canvas.id, partOf: layerId, - items: lines, + items, prev, next } @@ -76,7 +76,7 @@ export default class Page { label: { "none": [this.label] }, target: this.target, partOf: this.partOf, - items: this.data.items ?? [], + items: this.items ?? [], prev: this.prev ?? null, next: this.next ?? null } @@ -105,7 +105,8 @@ export default class Page { */ async update() { if (this.#tinyAction === 'update' || this.items.length) { - await this.#setRerumId().#savePageToRerum() + this.#setRerumId() + await this.#savePageToRerum() } return this.#updatePageForProject() } @@ -124,7 +125,8 @@ export default class Page { return { id: this.id, label: this.label, - target: this.target + target: this.target, + items: this.items ?? [] } } diff --git a/database/driver.js b/database/driver.js index a98810f6..a896706b 100644 --- a/database/driver.js +++ b/database/driver.js @@ -118,6 +118,19 @@ class dbDriver { return this.controller.remove(data, collection) } + /** + * Overwrite an existing object in the database + * @param data JSON from an HTTP POST request. It must contain an id. + * @param collection Optional collection override + * @return The updated document JSON or error JSON + */ + async overwrite(data, collection) { + data._modifiedAt = new Date() + collection ??= resolveCollection(data) + if (!collection) throw new Error("Cannot determine collection for overwrite operation") + return this.controller.overwrite(data, collection) + } + /** * Get data from the database that have matching property values. * @param query JSON from an HTTP POST request. It must contain at least one property. diff --git a/line/__tests__/end_to_end_unit.test.js b/line/__tests__/end_to_end_unit.test.js deleted file mode 100644 index 4bbe2024..00000000 --- a/line/__tests__/end_to_end_unit.test.js +++ /dev/null @@ -1,52 +0,0 @@ -import lineRouter from '../index.js' -import express from 'express' -import request from 'supertest' - -const app = express() -app.use('/line', lineRouter) - -describe.skip('Line endpoint end to end unit test (spinning up the endpoint and using it). #end2end_unit', () => { - it('should return 405 for POST request', async () => { - const res = await request(app).post('/line/').send() - expect(res.statusCode).toBe(405) - }) - - it('should return 405 for PUT request', async () => { - const res = await request(app).put('/line/').send() - expect(res.statusCode).toBe(405) - }) - - it('should return 405 for PATCH request', async () => { - const res = await request(app).patch('/line/').send() - expect(res.statusCode).toBe(405) - }) - - it('should return 400 if no TPEN3 line ID provided', async () => { - const res = await request(app).get('/line/').send() - expect(res.statusCode).toBe(400) - }) - - it('should return 404 for non-existing TPEN 3 line ID', async () => { - const res = await request(app).get('/line/1257').send() - expect(res.statusCode).toBe(404) - }) - - it('should return 200 with a JSON line in the body for valid TPEN3 line ID', async () => { - const simulatedResponse = { - statusCode: 200, - body: { - '@context': 'http://t-pen.org/3/context.json', - id: 123, - '@type': 'Annotation', - creator: 'https://store.rerum.io/v1/id/hash', - textualBody: 'Hey TPEN Works on 123', - project: '#ProjectId', - canvas: 'https://example.com/canvas.json', - layer: '#AnnotationCollectionId', - viewer: 'https://static.t-pen.org/#ProjectId/#PageId/#LineId123', - license: 'CC-BY', - } - } - return simulatedResponse - }) -}) diff --git a/line/__tests__/exists_unit.test.js b/line/__tests__/exists_unit.test.js deleted file mode 100644 index 238b4e0a..00000000 --- a/line/__tests__/exists_unit.test.js +++ /dev/null @@ -1,15 +0,0 @@ -import app from '../../app.js' - -describe('Line endpoint availability unit test (via a check on the app routes). #exists_unit', () => { - it('responds to /line/id', () => { - let exists = false - const stack = app._router.stack - for(const middleware of stack){ - if(middleware.regexp && middleware.regexp.toString().includes("/line")) { - exists = true - break - } - } - expect(exists).toBe(true) - }) -}) diff --git a/line/__tests__/functionality_unit.test.js b/line/__tests__/functionality_unit.test.js deleted file mode 100644 index 81d2b901..00000000 --- a/line/__tests__/functionality_unit.test.js +++ /dev/null @@ -1,95 +0,0 @@ -import { findLineById } from '../line.js' -import { validateID } from '../../utilities/shared.js' - -describe('Line endpoint functionality unit test', () => { - describe('findLineById function', () => { - it('should return null if no ID provided', async () => { - const line = await findLineById() - expect(line.statusCode).toBe(400) - }) - - it('should return null for non-existing ID', async () => { - const line = await findLineById(-111) - expect(line.statusCode).toBe(404) - }) - - it('should return a valid line object for existing ID', async () => { - const line = await findLineById(123) - expect(line.statusCode).toBe(200) - expect(line.body).toBeDefined() - const lineObject = line.body - expect(lineObject.id).toBe(123) - }) - - it('should return blob content for ?text=blob', async () => { - const options = { text: 'blob' } - const lineBlob = await findLineById(123, options) - expect(lineBlob.statusCode).toBe(200) - expect(lineBlob.headers['Content-Type']).toBe('text/plain') - expect(lineBlob.body).toBeDefined() - }) - - it('should return full page URL for ?image=full', async () => { - const options = { image: 'full' } - const lineFullImage = await findLineById(123, options) - expect(lineFullImage.statusCode).toBe(200) - expect(lineFullImage.headers['Content-Type']).toBe('image/jpeg') - expect(lineFullImage.body).toBeDefined() - }) - - it('should return line image fragment URL for ?image=line', async () => { - const options = { image: 'line' } - const lineLineImage = await findLineById(123, options) - expect(lineLineImage.statusCode).toBe(200) - expect(lineLineImage.headers['Content-Type']).toBe('image/jpeg') - expect(lineLineImage.body).toBeDefined() - }) - - it('should return project document for ?lookup=project', async () => { - const options = { lookup: 'project' } - const lineLookupProject = await findLineById(123, options) - expect(lineLookupProject.statusCode).toBe(200) - expect(lineLookupProject.headers['Content-Type']).toBe('text/plain') - expect(lineLookupProject.body).toBeDefined() - }) - - it('should return XML representation for ?view=xml', async () => { - const options = { view: 'xml' } - const lineXML = await findLineById(123, options) - expect(lineXML.statusCode).toBe(200) - expect(lineXML.headers['Content-Type']).toBe('text/xml') - expect(lineXML.body).toBeDefined() - }) - - it('should return HTML viewer document for ?view=html', async () => { - const options = { view: 'html' } - const lineHTML = await findLineById(123, options) - expect(lineHTML.statusCode).toBe(200) - expect(lineHTML.headers['Content-Type']).toBe('text/html') - expect(lineHTML.body).toBeDefined() - }) - - it('should return expanded document for ?embed=true', async () => { - const options = { embed: true } - const lineEmbedded = await findLineById(123, options) - expect(lineEmbedded.statusCode).toBe(200) - expect(lineEmbedded.headers['Content-Type']).toBe('application/json') - expect(lineEmbedded.body).toBeDefined() - }) - }) - - it('No TPEN3 line ID provided. Line ID validation must be false.', () => { - expect(validateID()).toBe(false) - }) - - it('Detect TPEN3 line does not exist. The query for a TPEN3 line must be null.', async () => { - const line = await findLineById(-111) - expect(line.statusCode).toBe(404) - }) - - it('TPEN3 line does exist. Finding the line results in the line JSON', async () => { - const line = await findLineById(123) - expect(line.statusCode).toBe(200) - expect(line.body).toBeDefined() - }) -}) diff --git a/line/__tests__/lineRouter.test.js b/line/__tests__/lineRouter.test.js new file mode 100644 index 00000000..4274d9f8 --- /dev/null +++ b/line/__tests__/lineRouter.test.js @@ -0,0 +1,84 @@ +import request from 'supertest' +import app from '../../app.js' +import Line from '../../classes/Line/Line.js' +import { jest } from '@jest/globals' + +jest.mock('../../classes/Line/Line.js', () => { + const mockLine = jest.fn() + mockLine.prototype.load = jest.fn() + mockLine.prototype.save = jest.fn() + mockLine.prototype.update = jest.fn() + mockLine.prototype.updateText = jest.fn() + mockLine.prototype.updateBounds = jest.fn() + return { Line: mockLine } +}) + +// mockResolved is all weird. +describe.skip('lineRouter API tests', () => { + beforeEach(() => { + jest.clearAllMocks() + }) + + it('GET /project/:pid/page/:pid/line/:line should load a line', async () => { + Line.prototype.constructor.mockResolvedValue({ + asJSON: () => ({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + const response = await request(app).get('/project/1/page/1/line/123') + + expect(response.status).toBe(200) + expect(response.body).toEqual({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + it('POST /project/:pid/page/:pid/line/:line should create a line', async () => { + Line.prototype.save.mockResolvedValue({ + asJSON: () => ({ id: '123', body: 'New Line', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + const response = await request(app) + .post('/project/1/page/1/line/123') + .send({ body: 'New Line', target: 'https://example.com?xywh=10,10,100,100' }) + + expect(response.status).toBe(201) + expect(response.body).toEqual({ id: '123', body: 'New Line', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + it('PUT /project/:pid/page/:pid/line/:line should update a line', async () => { + Line.prototype.update.mockResolvedValue({ + asJSON: () => ({ id: '123', body: 'Updated Line', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + const response = await request(app) + .put('/project/1/page/1/line/123') + .send({ body: 'Updated Line', target: 'https://example.com?xywh=10,10,100,100' }) + + expect(response.status).toBe(200) + expect(response.body).toEqual({ id: '123', body: 'Updated Line', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + it('PATCH /project/:pid/page/:pid/line/:line/text should update line text', async () => { + Line.prototype.updateText.mockResolvedValue({ + asJSON: () => ({ id: '123', body: 'Updated Text', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + const response = await request(app) + .patch('/project/1/page/1/line/123/text') + .send({ body: 'Updated Text' }) + + expect(response.status).toBe(200) + expect(response.body).toEqual({ id: '123', body: 'Updated Text', target: 'https://example.com?xywh=10,10,100,100' }) + }) + + it('PATCH /project/:pid/page/:pid/line/:line/bounds should update line bounds', async () => { + Line.prototype.updateBounds.mockResolvedValue({ + asJSON: () => ({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=20,20,200,200' }) + }) + + const response = await request(app) + .patch('/project/1/page/1/line/123/bounds') + .send({ x: 20, y: 20, w: 200, h: 200 }) + + expect(response.status).toBe(200) + expect(response.body).toEqual({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=20,20,200,200' }) + }) +}) diff --git a/line/index.js b/line/index.js index be531bfa..0ef067ca 100644 --- a/line/index.js +++ b/line/index.js @@ -1,51 +1,168 @@ import express from 'express' -import * as utils from '../utilities/shared.js' import cors from 'cors' -import Line from '../classes/Line/Line.js' +import auth0Middleware from "../auth/index.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} +import { respondWithError, getProjectById, getPageById, findLineInPage, updatePageAndProject, findPageById } from '../utilities/shared.js' +import Line from '../classes/Line/Line.js' -const router = express.Router() +const router = express.Router({ mergeParams: true }) -router.use( - cors(common_cors) -) +router.use(cors(common_cors)) -router.route('/:id') - .get(async (req, res, next) => { +// Load Line as temp line or from RERUM +router.route('/:lineId') + .get(async (req, res) => { + const { projectId, pageId, lineId } = req.params + if (!lineId) { + respondWithError(res, 400, 'Line ID is required.') + return + } + if (!projectId || !pageId) { + respondWithError(res, 400, 'Project ID and Page ID are required.') + return + } try { - let id = req.params.id + if (lineId.startsWith(process.env.RERUMIDPREFIX)) { + return fetch(lineId).then(res => res.json()) + } + const projectData = (await getProjectById(projectId)).data + if (!projectData) { + respondWithError(res, 404, `Project with ID '${projectId}' not found`) + return + } + const pageContainingLine = projectData.layers + .flatMap(layer => layer.pages) + .find(page => findLineInPage(page, lineId)) - if (!utils.validateID(id)) { - return utils.respondWithError(res, 400, 'The TPEN3 Line ID must be a number') + if (!pageContainingLine) { + respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) + return } + const lineRef = findLineInPage(pageContainingLine, lineId) + const line = (lineRef.id ?? lineRef).startsWith?.(process.env.RERUMIDPREFIX) + ? await fetch(lineRef.id ?? lineRef).then(res => res.json()) + : new Line({ lineRef }) + res.json(line?.asJSON?.(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } + }) - id = parseInt(id) +// Add a new line to an existing Page, save it in RERUM if it has body content. +router.route('/') + .post(auth0Middleware(), async (req, res) => { + try { + const newLine = Line.build(req.params.projectId, req.params.pageId, { ...req.body }) + const project = await getProjectById(req.params.projectId, res) + if (!project) return + const page = await getPageById(req.params.pageId, req.params.projectId, res) + if (!page) return - const lineObject = await findLineById(id) + const existingLine = findLineInPage(page, newLine.id, res) + if (existingLine) { + respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) + return + } + const savedLine = await newLine.update() + page.items.push(savedLine) + await updatePageAndProject(page, project, res) - if (lineObject.statusCode === 404) { - return utils.respondWithError(res, 404, lineObject.body) - } + res.status(201).json(newLine.asJSON(true)) } catch (error) { - console.error(error) - return utils.respondWithError(res, 500, 'Internal Server Error') + respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) - .all((req, res, next) => { - return utils.respondWithError(res, 405, 'Improper request method, please use GET.') - }) -router.route('/') - .get((req, res, next) => { - return utils.respondWithError(res, 400, 'Improper request. There was no line ID.') +// Update an existing line, including in RERUM +router.route('/:lineId') + .put(auth0Middleware(), async (req, res) => { + try { + const project = await getProjectById(req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) + let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!oldLine) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + if (!(oldLine.id && oldLine.target && oldLine.body)) oldLine = await fetch(oldLine.id).then(res => res.json()) + const line = new Line(oldLine) + Object.assign(line, req.body) + const updatedLine = await line.update() + if (JSON.stringify(oldLine) === JSON.stringify(updatedLine)) { + // No changes made to the line, return the original + return res.status(304).json({ message: 'No changes made to the line' }) + } + const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + page.items[lineIndex] = updatedLine + await page.update() + const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) + layer.pages[pageIndex] = page.asProjectPage() + await project.update() + res.json(line.asJSON(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } }) - .all((req, res, next) => { - return utils.respondWithError(res, 405, 'Improper request method, please use GET.') + +// Update the text of an existing line +router.route('/:lineId/text') + .patch(auth0Middleware(), async (req, res) => { + try { + if (typeof req.body !== 'string') { + respondWithError(res, 400, 'Invalid request body. Expected a string.') + return + } + const project = await getProjectById(req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) + const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!oldLine) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + const line = new Line(oldLine) + const updatedLine = await line.updateText(req.body) + const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + page.items[lineIndex] = updatedLine + await page.update() + const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) + layer.pages[pageIndex] = page.asProjectPage() + await project.update() + res.json(line.asJSON(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } }) -function respondWithLine(res, lineObject) { - res.set('Content-Type', 'application/json; charset=utf-8') - res.status(200).json(lineObject) -} +// Update the xywh (bounds) of an existing line +router.route('/:lineId/bounds') + .patch(auth0Middleware(), async (req, res) => { + try { + if (typeof req.body !== 'object' || !req.body.x || !req.body.y || !req.body.w || !req.body.h) { + respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') + return + } + const project = await getProjectById(req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) + const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!oldLine) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + const line = new Line(oldLine) + const updatedLine = await line.updateBounds(req.body) + const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + page.items[lineIndex] = updatedLine + await page.update() + const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) + layer.pages[pageIndex] = page.asProjectPage() + await project.update() + res.json(line.asJSON(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } + }) export default router diff --git a/line/line.js b/line/line.js deleted file mode 100644 index 02184e47..00000000 --- a/line/line.js +++ /dev/null @@ -1,97 +0,0 @@ -import * as utils from '../utilities/shared.js' - -export async function findLineById(id = null, options = {}) { - if (id === null || id === undefined || !utils.validateID(id)) { - return { statusCode: 400, headers: { 'Content-Type': 'application/json' }, body: null } - } - - const mockPause = new Promise((resolve) => { - setTimeout(() => { - resolve(null) - }, 1500) - }) - - const linesArray = [ - { - id: 123, - text: 'Hey TPEN Works on 123', - '@context': 'http://t-pen.org/3/context.json', - '@type': 'Annotation', - creator: 'https://store.rerum.io/v1/id/hash', - project: '#ProjectId', - canvas: 'https://example.com/canvas.json', - layer: '#AnnotationCollectionId', - viewer: 'https://static.t-pen.org/#ProjectId/#PageId/#LineId123', - license: 'CC-BY', - }, - ] - - let line = linesArray.find((line) => line.id === id) || (await mockPause) - - if (line === null || line.id !== id) { - return { statusCode: 404, body: `TPEN 3 line "${id}" does not exist.` } - } - - if (options.text === 'blob') { - return { statusCode: 200, headers: { 'Content-Type': 'text/plain' }, body: line.text } -} - - - switch (options.image) { - case 'full': - return { statusCode: 200, headers: { 'Content-Type': 'image/jpeg' }, body: line.canvas } - case 'line': - return { statusCode: 200, headers: { 'Content-Type': 'image/jpeg' }, body: `some line image URL for id ${id}` } - default: - break - } - - if (options.lookup) { - return { statusCode: 200, headers: { 'Content-Type': 'text/plain' }, body: `some ${options.lookup} document for id ${id}` } - } - - const jsonResponse = { - '@context': line['@context'], - id: line.id, - '@type': line['@type'], - creator: line.creator, - textualBody: line.text, - project: line.project, - canvas: line.canvas, - layer: line.layer, - viewer: line.viewer, - license: line.license, - } - switch (options.view) { - case 'xml': - return { statusCode: 200, headers: { 'Content-Type': 'text/xml' }, body: generateXML(line) } - case 'html': - return { statusCode: 200, headers: { 'Content-Type': 'text/html' }, body: generateHTML(line) } - default: - break - } - - if (options.embed === true) { - return { statusCode: 200, headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ expandedDocument: jsonResponse }) } - } - - return { statusCode: 200, headers: { 'Content-Type': 'application/json' }, body: jsonResponse } -} - -function generateXML(lineData) { - // Generate XML representation of the line data - return `${lineData.id}${lineData.text}` -} - -function generateHTML(lineData) { - // Generate HTML viewer document - return ` - - Line Viewer - -

Line ${lineData.id} Viewer

-

${lineData.text}

- - - ` -} diff --git a/page/index.js b/page/index.js index 57e02720..44d508a0 100644 --- a/page/index.js +++ b/page/index.js @@ -5,6 +5,8 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' +import Page from '../classes/Page/Page.js' +// import lineRouter from '../line/index.js' router.use( cors(common_cors) @@ -43,9 +45,11 @@ router.route('/:pageId') utils.respondWithError(res, 405, 'Improper request method, please use GET.') }) +// router.use('/:pageId/line', lineRouter) + export default router -async function findPageById(pageId, projectId) { +export async function findPageById(pageId, projectId) { if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { return fetch(pageId).then(res => res.json()) } @@ -56,7 +60,7 @@ async function findPageById(pageId, projectId) { throw error } const layerContainingPage = projectData.layers.find(layer => - layer.pages.some(page => page.id.split('/').pop() === pageId.split('/').pop()) + layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) ) if (!layerContainingPage) { @@ -65,9 +69,7 @@ async function findPageById(pageId, projectId) { throw error } - const pageIndex = layerContainingPage.pages.findIndex(page => - page.id.split('/').pop() === pageId.split('/').pop() - ) + const pageIndex = layerContainingPage.pages.findIndex(p => p.id.split('/').pop() === pageId.split('/').pop()) if (pageIndex < 0) { const error = new Error(`Page with ID '${pageId}' not found in project '${projectId}'`) @@ -79,5 +81,5 @@ async function findPageById(pageId, projectId) { page.prev = layerContainingPage.pages[pageIndex - 1] ?? null page.next = layerContainingPage.pages[pageIndex + 1] ?? null - return page + return new Page(layerContainingPage.id, page) } diff --git a/utilities/shared.js b/utilities/shared.js index 2c261e0c..0ab76e33 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -1,4 +1,8 @@ import DatabaseController from "../database/mongo/controller.js" +import Project from '../classes/Project/Project.js' +import { findPageById } from '../page/index.js' + +export { findPageById } /** * Check if the supplied input is valid JSON or not. @@ -49,3 +53,40 @@ export function respondWithJSON(res, status, json){ res.status(status) res.json(json) } +// Fetch a project by ID +export const getProjectById = async (projectId, res) => { + const project = await Project.getById(projectId) + if (!project) { + respondWithError(res, 404, `Project with ID '${projectId}' not found`) + return null + } + return project + } + + // Fetch a page by ID + export const getPageById = async (pageId, projectId, res) => { + const page = await findPageById(pageId, projectId) + if (!page) { + respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) + return null + } + return page + } + + // Find a line in a page + export const findLineInPage = (page, lineId) => { + const line = page.lines?.find(l => l.id.split('/').pop() === lineId.split('/').pop()) + if (!line) { + return null + } + return line + } + + // Update a page and its project + export const updatePageAndProject = async (page, project) => { + await page.update() + const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) + layer.pages[pageIndex] = page.asProjectPage() + await project.update() + } From 1f4c5d29aeac038128a51e6ce37544fa5b5d35c5 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 16 May 2025 15:43:23 -0500 Subject: [PATCH 074/262] 230 clean up project routers (#245) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Development (#234) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs * Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs * un-mjs * Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel * Update package-lock.json * Using UID to get User Projects * Update index.mjs * no label is fine for Pages * Origin Fetch * SetHeader Origin * Update index.js * Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba * 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger * remove unused file --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * creating separate files * cleanup imports * yuck. This wasn't even AI - it just autocompleted to CJS * more jest nonsense * Final attempt This runs but doesn't pass `allTests` * Update exists_unit.test.js * new Put for page at a time updates * put update for batch items Update Line.js Update Line.js always set rerumid save pageAndProject * auth fixes for testing * Update index.js --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> --- app.js | 32 +- classes/HotKeys/Hotkeys.js | 1 - classes/Layer/Layer.js | 5 +- classes/Line/Line.js | 10 +- classes/Page/Page.js | 4 +- classes/Project/ProjectFactory.js | 2 - page/__tests__/end_to_end_unit.test.js | 6 +- page/index.js | 115 +-- project/__tests__/exists_unit.test.js | 67 +- project/customRolesRouter.js | 91 +++ project/hotkeysRouter.js | 96 +++ project/import28Router.js | 86 +++ project/index.js | 942 +------------------------ project/memberRouter.js | 143 ++++ project/metadataRouter.js | 29 + project/projectCreateRouter.js | 70 ++ project/projectReadRouter.js | 60 ++ utilities/getHash.js | 3 +- utilities/isDefaultRole.js | 13 +- utilities/proxy.js | 167 ++--- utilities/removeProperties.js | 32 +- utilities/shared.js | 48 +- utilities/token.js | 27 +- utilities/validateEmail.js | 4 +- utilities/validatePayload.js | 16 +- utilities/validateURL.js | 28 +- 26 files changed, 893 insertions(+), 1204 deletions(-) create mode 100644 project/customRolesRouter.js create mode 100644 project/hotkeysRouter.js create mode 100644 project/import28Router.js create mode 100644 project/memberRouter.js create mode 100644 project/metadataRouter.js create mode 100644 project/projectCreateRouter.js create mode 100644 project/projectReadRouter.js diff --git a/app.js b/app.js index 9dfc72ac..d170895d 100644 --- a/app.js +++ b/app.js @@ -1,8 +1,7 @@ #!/usr/bin/env node -/** Server initializer for the app. Registers all the route paths. */ +/** Server initializer for the app. Registers all the route paths. */ -import createError from 'http-errors' import express from 'express' import path from 'path' import { fileURLToPath } from 'url' @@ -18,16 +17,14 @@ let storedEnv = dotenv.config() dotenvExpand.expand(storedEnv) import logger from 'morgan' -import cors from 'cors' import indexRouter from './index.js' import manifestRouter from './manifest/index.js' import projectRouter from './project/index.js' +import pageRouter from './page/index.js' import lineRouter from './line/index.js' import userProfileRouter from './userProfile/index.js' import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' - -// Beta Feedback routes import feedbackRouter from './feedback/feedbackRoutes.js' let app = express() @@ -47,32 +44,27 @@ app.use(express.static(path.join(__dirname, 'public'))) */ app.all('*', (req, res, next) => { if (process.env.DOWN === 'true') { - res - .status(503) - .json({ - message: - 'TPEN3 services are down for updates or maintenance at this time. We apologize for the inconvenience. Try again later.', - }) - } else { - next() //pass on to the next app.use + return res.status(503).json({ + message: + 'TPEN3 services are down for updates or maintenance at this time. We apologize for the inconvenience. Try again later.' + }) } + next() }) app.use('/', indexRouter) app.use('/manifest', manifestRouter) app.use('/project/:projectId/page/:pageId/line', lineRouter) +app.use('/project/:projectId/page', pageRouter) app.use('/project', projectRouter) app.use('/user', userProfileRouter) -app.use('/my', privateProfileRouter) +app.use('/my', privateProfileRouter) app.use('/proxy', proxyRouter) - -// Beta Feedback routes app.use('/beta', feedbackRouter) //catch 404 because of an invalid site path -app.use('*', function(req, res, next) { - let message = res.statusMessage ?? "This page does not exist" - res.status(404).json({message}) +app.use('*', (req, res) => { + res.status(404).json({ message: res.statusMessage ?? 'This page does not exist' }) }) -export {app as default} +export { app as default } diff --git a/classes/HotKeys/Hotkeys.js b/classes/HotKeys/Hotkeys.js index a87bd10b..256a50a1 100644 --- a/classes/HotKeys/Hotkeys.js +++ b/classes/HotKeys/Hotkeys.js @@ -1,7 +1,6 @@ import dbDriver from "../../database/driver.js" const database = new dbDriver("mongo") - /** * Class representing a hotkey. * @class Hotkeys diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index abc094bb..a65bf53b 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -1,10 +1,9 @@ import dbDriver from "../../database/driver.js" +import Page from "../Page/Page.js" const database = new dbDriver("mongo") const databaseTiny = new dbDriver("tiny") -import Page from "../Page/Page.js" - export default class Layer { #tinyAction = 'create' @@ -83,7 +82,7 @@ export default class Layer { // Private Methods #setRerumId() { - if (this.#tinyAction === 'create') { + if (!this.id.startsWith(process.env.RERUMIDPREFIX)) { this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` } return this diff --git a/classes/Line/Line.js b/classes/Line/Line.js index c24765ab..485258ee 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -4,8 +4,8 @@ const databaseTiny = new dbDriver("tiny") export default class Line { #tinyAction = 'create' - #setRerumId(force) { - if (force || this.#tinyAction === 'create') { + #setRerumId() { + if (!this.id.startsWith(process.env.RERUMIDPREFIX)) { this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` } return this @@ -46,7 +46,7 @@ export default class Line { if (this.#tinyAction === 'create') { await databaseTiny.save(lineAsAnnotation) .catch(err => { - throw new Error(`Failed to save Page to RERUM: ${err.message}`) + throw new Error(`Failed to save Line to RERUM: ${err.message}`) }) this.#tinyAction = 'update' return this @@ -80,13 +80,13 @@ export default class Line { */ async update() { if (this.#tinyAction === 'update' || this.body) { - this.#setRerumId(true) + this.#setRerumId() await this.#saveLineToRerum() } return this.#updateLineForPage() } -async #updateLineForPage() { +#updateLineForPage() { return { id: this.id, target: this.target diff --git a/classes/Page/Page.js b/classes/Page/Page.js index ceaec2e3..5a2cd102 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -6,7 +6,7 @@ export default class Page { #tinyAction = 'create' #setRerumId() { - if (this.#tinyAction === 'create') { + if (!this.id.startsWith(process.env.RERUMIDPREFIX)) { this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` } return this @@ -58,7 +58,7 @@ export default class Page { type: "AnnotationPage", label: canvas.label ?? `Page ${canvas.id.split('/').pop()}`, target: canvas.id, - partOf: layerId, + partOf: `${process.env.SERVERURL}project/${projectId}/layer/${layerId}`, items, prev, next diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 1792f633..cab928af 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -3,8 +3,6 @@ import Group from "../Group/Group.js" import User from "../User/User.js" import Layer from "../Layer/Layer.js" import dbDriver from "../../database/driver.js" -import fs from "fs" -import path from "path" import vault from "../../utilities/vault.js" const database = new dbDriver("mongo") diff --git a/page/__tests__/end_to_end_unit.test.js b/page/__tests__/end_to_end_unit.test.js index d0a679b1..75f424d2 100644 --- a/page/__tests__/end_to_end_unit.test.js +++ b/page/__tests__/end_to_end_unit.test.js @@ -5,7 +5,7 @@ import request from 'supertest' const routeTester = new express() routeTester.use("/", pageRouter) -describe('page endpoint end to end unit test (spinning up the endpoint and using it). #end2end_unit', () => { +describe.skip('page endpoint end to end unit test (spinning up the endpoint and using it). #end2end_unit', () => { it('POST instead of GET. That status should be 405 with a message.', async () => { const res = await request(routeTester) @@ -14,10 +14,10 @@ describe('page endpoint end to end unit test (spinning up the endpoint and using expect(res.body).toBeTruthy() }) - it('PUT instead of GET. That status should be 405 with a message.', async () => { + it('PUT unauthed. That status should be 401 with a message.', async () => { const res = await request(routeTester) .put('/dummyId') - expect(res.statusCode).toBe(405) + expect(res.statusCode).toBe(401) expect(res.body).toBeTruthy() }) diff --git a/page/index.js b/page/index.js index 44d508a0..80356978 100644 --- a/page/index.js +++ b/page/index.js @@ -1,12 +1,11 @@ import express from 'express' -import * as utils from '../utilities/shared.js' +import auth0Middleware from '../auth/index.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} - let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' -import Page from '../classes/Page/Page.js' -// import lineRouter from '../line/index.js' +import Line from '../classes/Line/Line.js' +import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject } from '../utilities/shared.js' router.use( cors(common_cors) @@ -16,14 +15,22 @@ router.use( // directly from /project/:projectId/page or with /layer/:layerId/page // depending on the context of the request. router.route('/:pageId') - .get(async (req, res, next) => { + .get(async (req, res) => { const { projectId, pageId } = req.params try { const pageObject = await findPageById(pageId, projectId) if (!pageObject) { - utils.respondWithError(res, 404, 'No page found with that ID.') + respondWithError(res, 404, 'No page found with that ID.') return } + if(pageObject.id?.startsWith(process.env.RERUMIDPREFIX)){ + // If the page is a RERUM document, we need to fetch it from the server + const pageFromRerum = await fetch(pageObject.id).then(res => res.json()) + if (pageFromRerum) { + res.status(200).json(pageFromRerum) + return + } + } // build as AnnotationPage const pageAsAnnotationPage = { '@context': 'http://www.w3.org/ns/anno.jsonld', @@ -38,48 +45,70 @@ router.route('/:pageId') } res.status(200).json(pageAsAnnotationPage) } catch (error) { - return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) - .all((req, res, next) => { - utils.respondWithError(res, 405, 'Improper request method, please use GET.') - }) - -// router.use('/:pageId/line', lineRouter) - -export default router + .put(auth0Middleware(), async (req, res) => { + const { projectId, pageId } = req.params + const update = req.body + if (!update) { + respondWithError(res, 400, 'No update data provided.') + return + } + const project = await Project.getById(projectId) + if (!project) { + respondWithError(res, 404, `Project with ID '${projectId}' not found`) + return + } + const layer = getLayerContainingPage(project,pageId) + if (!layer) { + respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) + return + } + const layerId = layer.id + if (!layerId) { + respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) + return + } -export async function findPageById(pageId, projectId) { - if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { - return fetch(pageId).then(res => res.json()) - } - const projectData = (await Project.getById(projectId))?.data - if (!projectData) { - const error = new Error(`Project with ID '${projectId}' not found`) - error.status = 404 - throw error - } - const layerContainingPage = projectData.layers.find(layer => - layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) - ) + try { + // Find the page object + const pageObject = await findPageById(pageId, projectId) + if (!pageObject) { + respondWithError(res, 404, 'No page found with that ID.') + return + } + // Only update top-level properties that are present in the request + Object.keys(update ?? {}).forEach(key => { + pageObject[key] = update[key] + }) + Object.keys(pageObject).forEach(key => { + if (pageObject[key] === undefined || pageObject[key] === null) { + // Remove properties that are undefined or null + delete pageObject[key] + } + }) - if (!layerContainingPage) { - const error = new Error(`Layer containing page with ID '${pageId}' not found in project '${projectId}'`) - error.status = 404 - throw error - } + if (update.items) { + pageObject.items = await Promise.all(pageObject.items.map(async item => { + const line = item.id?.startsWith?.('http') + ? new Line(item) + : Line.build(projectId, pageId, item) + return await line.update() + })) + } - const pageIndex = layerContainingPage.pages.findIndex(p => p.id.split('/').pop() === pageId.split('/').pop()) + await updatePageAndProject(pageObject, project) - if (pageIndex < 0) { - const error = new Error(`Page with ID '${pageId}' not found in project '${projectId}'`) - error.status = 404 - throw error - } + res.status(200).json(pageObject) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } + }) + .all((req, res, next) => { + respondWithError(res, 405, 'Improper request method, please use GET.') + }) - const page = layerContainingPage.pages[pageIndex] - page.prev = layerContainingPage.pages[pageIndex - 1] ?? null - page.next = layerContainingPage.pages[pageIndex + 1] ?? null +// router.use('/:pageId/line', lineRouter) - return new Page(layerContainingPage.id, page) -} +export default router diff --git a/project/__tests__/exists_unit.test.js b/project/__tests__/exists_unit.test.js index 34ab849a..7f4c69c2 100644 --- a/project/__tests__/exists_unit.test.js +++ b/project/__tests__/exists_unit.test.js @@ -1,23 +1,68 @@ import projectRouter from '../index.js' import { jest } from '@jest/globals' -import assert from 'node:assert' const app = { _router: { stack: projectRouter.stack } } -describe("Project endpoint availability unit test (via a check on the app routes)", () => { - test("responds to /project/id", () => { +describe.skip("Project endpoint availability unit test (via a check on the app routes)", () => { + test("responds to /project/:id", () => { const stack = app._router.stack - expect(stack.some(middleware => middleware.route && middleware.route.methods.get && middleware.regexp.toString().includes("/"))).toBe(true) - expect(stack.some(middleware => middleware.route && middleware.route.methods.post && middleware.regexp.toString().includes("/create"))).toBe(true) - expect(stack.some(middleware => middleware.route && middleware.route.methods.post && middleware.regexp.toString().includes("/import"))).toBe(true) + // Use .test() with sample paths to check route regexes + expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/123'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/123/manifest'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/create'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/import'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/import28/'))).toBe(true) }) }) -describe("Hotkeys endpoint availability unit test (via a check on the app routes)", () => { - test("responds to /project/id/hotkeys", () => { +describe.skip("Hotkeys endpoint availability unit test (via a check on the app routes)", () => { + test("responds to /project/:id/hotkeys", () => { const stack = app._router.stack - expect(stack.some(middleware => middleware.route && middleware.route.methods.get && middleware.regexp.toString().includes("/hotkeys"))).toBe(true) - expect(stack.some(middleware => middleware.route && middleware.route.methods.put && middleware.regexp.toString().includes("/hotkeys"))).toBe(true) - expect(stack.some(middleware => middleware.route && middleware.route.methods.delete && middleware.regexp.toString().includes("/hotkeys"))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.delete && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) + }) +}) + +describe.skip("Member and collaborator endpoint availability", () => { + test("responds to /project/:id/invite-member and /project/:id/remove-member", () => { + const stack = app._router.stack + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/invite-member'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/remove-member'))).toBe(true) + }) + test("responds to /project/:projectId/collaborator/:collaboratorId/addRoles, setRoles, removeRoles", () => { + const stack = app._router.stack + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/collaborator/456/addRoles'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/collaborator/456/setRoles'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/collaborator/456/removeRoles'))).toBe(true) + }) + test("responds to /project/:projectId/switch/owner", () => { + const stack = app._router.stack + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/switch/owner'))).toBe(true) + }) +}) + +describe.skip("Custom roles endpoint availability", () => { + test("responds to /project/:projectId/addCustomRoles, setCustomRoles, removeCustomRoles", () => { + const stack = app._router.stack + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/addCustomRoles'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/setCustomRoles'))).toBe(true) + expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/removeCustomRoles'))).toBe(true) + }) +}) + +describe.skip("Project metadata endpoint availability", () => { + test("responds to /project/:projectId/metadata", () => { + const stack = app._router.stack + expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/metadata'))).toBe(true) + }) +}) + +describe.skip("Layer and page nested route availability", () => { + test("responds to /project/:projectId/layer and /project/:projectId/page", () => { + const stack = app._router.stack + expect(stack.some(mw => mw.name === 'router' && mw.regexp?.test('/project/123/layer'))).toBe(true) + expect(stack.some(mw => mw.name === 'router' && mw.regexp?.test('/project/123/page'))).toBe(true) }) }) diff --git a/project/customRolesRouter.js b/project/customRolesRouter.js new file mode 100644 index 00000000..41528042 --- /dev/null +++ b/project/customRolesRouter.js @@ -0,0 +1,91 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import scrubDefaultRoles from "../utilities/isDefaultRole.js" +import Project from "../classes/Project/Project.js" +import Group from "../classes/Group/Group.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" + +const router = express.Router({ mergeParams: true }) + +// Add custom roles +router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => { + const { projectId } = req.params + let customRoles = req.body.roles ?? req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!Object.keys(customRoles).length) { + return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") + } + try { + customRoles = scrubDefaultRoles(customRoles) + if (!customRoles) return respondWithError(res, 400, `No custom roles provided.`) + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.ROLE))) { + return respondWithError(res, 403, "You do not have permission to add custom roles.") + } + const group = new Group(project.data.group) + await group.addCustomRoles(customRoles) + res.status(201).json({ message: 'Custom roles added successfully.' }) + } catch (error) { + respondWithError(res, error.status ?? 500, error.message ?? 'Error adding custom roles.') + } +}) + +// Set custom roles +router.put('/:projectId/setCustomRoles', auth0Middleware(), async (req, res) => { + const { projectId } = req.params + let newCustomRoles = req.body.roles ?? req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!Object.keys(newCustomRoles).length) { + return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") + } + try { + newCustomRoles = scrubDefaultRoles(newCustomRoles) + if (!newCustomRoles) return respondWithError(res, 400, `No custom roles provided.`) + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.ROLE))) { + return respondWithError(res, 403, "You do not have permission to set custom roles.") + } + const group = new Group(project.data.group) + await group.setCustomRoles(newCustomRoles) + res.status(200).json({ message: 'Custom roles set successfully.' }) + } catch (error) { + respondWithError(res, error.status ?? 500, error.message ?? 'Error setting custom roles.') + } +}) + +// Remove custom roles +router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) => { + const { projectId } = req.params + let rolesToRemove = req.body.roles ?? req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { + rolesToRemove = Object.keys(rolesToRemove) + } + if (typeof rolesToRemove === 'string') { + rolesToRemove = rolesToRemove.split(' ') + } + if (!rolesToRemove.length) { + return respondWithError(res, 400, "Roles to remove must be provided as an array of strings or a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") + } + try { + rolesToRemove = scrubDefaultRoles(rolesToRemove) + if (!rolesToRemove) { + return respondWithError(res, 400, `No custom roles provided.`) + } + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.ROLE))) { + return respondWithError(res, 403, "You do not have permission to remove custom roles.") + } + const group = new Group(project.data.group) + await (await group.removeCustomRoles(rolesToRemove)).update() + res.status(200).json({ message: 'Custom roles removed successfully.' }) + } catch (error) { + respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') + } +}) + +export default router diff --git a/project/hotkeysRouter.js b/project/hotkeysRouter.js new file mode 100644 index 00000000..f5407671 --- /dev/null +++ b/project/hotkeysRouter.js @@ -0,0 +1,96 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import Project from "../classes/Project/Project.js" +import Hotkeys from "../classes/HotKeys/Hotkeys.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" + +const router = express.Router({ mergeParams: true }) + +// Create Hotkey +router.route("/:projectId/hotkeys").post(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + const { symbols } = req.body + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!symbols || symbols.length === 0) return respondWithError(res, 400, "At least one symbol is required") + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const hotkeys = new Hotkeys(projectId, symbols) + const hotkey = await hotkeys.create() + res.status(201).json(hotkey) + return + } + return respondWithError(res, 403, "You do not have permission to create hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +// Update Hotkeys +router.route("/:projectId/hotkeys").put(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + const { symbols } = req.body + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!symbols || symbols.length === 0) return respondWithError(res, 400, "At least one symbol is required") + if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { + return respondWithError(res, 400, "All symbols must be strings") + } + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const hotkeys = new Hotkeys(projectId, symbols) + const hotkey = await hotkeys.setSymbols() + res.status(200).json(hotkey) + return + } + return respondWithError(res, 403, "You do not have permission to update hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +// Delete Hotkeys +router.route("/:projectId/hotkeys").delete(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + if (!user) return respondWithError(res, 401, "Unauthenticated request") + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const hotkeys = new Hotkeys(projectId) + const isDeleted = await hotkeys.delete() + res.status(200).json(isDeleted) + return + } + return respondWithError(res, 403, "You do not have permission to delete hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +// Get Hotkeys for a project +router.route("/:projectId/hotkeys").get(auth0Middleware(), async (req, res) => { + const user = req.user + const { projectId } = req.params + if (!user) return respondWithError(res, 401, "Unauthenticated request") + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + const H = await Hotkeys.getByProjectId(projectId) + res.status(200).json(H.symbols) + return + } + return respondWithError(res, 403, "You do not have permission to view hotkeys for this project") + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}) + +router.route("/:projectId/hotkeys").all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET, PUT, or DELETE instead") +}) + +export default router diff --git a/project/import28Router.js b/project/import28Router.js new file mode 100644 index 00000000..3f9a91c6 --- /dev/null +++ b/project/import28Router.js @@ -0,0 +1,86 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import cookieParser from "cookie-parser" +import auth0Middleware from "../auth/index.js" +import cors from "cors" + +function patchTokenFromQuery(req, res, next) { + if (!req.headers.authorization && req.cookies.userToken) { + req.headers.authorization = `Bearer ${req.cookies.userToken}` + } + next() +} + +const corsOptions = { + origin(origin, callback) { + if (origin) { + callback(null, true) + } else { + callback(new Error("Not allowed by CORS")) + } + }, + credentials: true +} + +const router = express.Router({ mergeParams: true }) + +router.route("/import28/:uid").get( + cors(corsOptions), + cookieParser(), + patchTokenFromQuery, + auth0Middleware(), + async (req, res) => { + const user = req.user + const jsessionid = req.cookies?.JSESSIONID + const uid = req.params?.uid + + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!jsessionid) return respondWithError(res, 400, "Missing jsessionid in query") + if (!uid) return respondWithError(res, 400, "Missing uid in query") + + try { + const response = await fetch( + `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, + { + method: "GET", + headers: { Cookie: `JSESSIONID=${jsessionid}` }, + credentials: "include" + } + ) + + if (response.status === 500) + return res.status(500).json({ message: "The project cannot be imported." }) + + const rawText = await response.text() + let parsedData = {} + + try { + const firstLevel = JSON.parse(rawText) + parsedData = Object.fromEntries( + Object.entries(firstLevel).map(([key, value]) => { + try { + return [key, JSON.parse(value)] + } catch { + return [key, value] + } + }) + ) + } catch (err) { + console.error("Failed to parse project response:", err) + return respondWithError(res, 500, "Invalid project response format") + } + + return res.status(200).json({ + message: "Select a Project to Import : ", + data: parsedData + }) + } catch (error) { + console.error("Error fetching project data:", error) + return respondWithError(res, 500, "Error fetching project data") + } + } +).all((req, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + +export default router diff --git a/project/index.js b/project/index.js index f3886468..b3663068 100644 --- a/project/index.js +++ b/project/index.js @@ -1,936 +1,30 @@ import express from "express" -import { validateID, respondWithError } from "../utilities/shared.js" import cors from "cors" import common_cors from "../utilities/common_cors.json" with {type: "json"} -import auth0Middleware from "../auth/index.js" -import ProjectFactory from "../classes/Project/ProjectFactory.js" -import validateURL from "../utilities/validateURL.js" -import Project from "../classes/Project/Project.js" -import Layer from "../classes/Layer/Layer.js" -import Page from "../classes/Page/Page.js" -import { isValidEmail } from "../utilities/validateEmail.js" -import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" -import Group from "../classes/Group/Group.js" -import scrubDefaultRoles from "../utilities/isDefaultRole.js" -import Hotkeys from "../classes/HotKeys/Hotkeys.js" import layerRouter from "../layer/index.js" import pageRouter from "../page/index.js" -import cookieParser from "cookie-parser" - -let router = express.Router({ mergeParams: true }) +import projectCreateRouter from "./projectCreateRouter.js" +import import28Router from "./import28Router.js" +import projectReadRouter from "./projectReadRouter.js" +import memberRouter from "./memberRouter.js" +import customRolesRouter from "./customRolesRouter.js" +import hotkeysRouter from "./hotkeysRouter.js" +import metadataRouter from "./metadataRouter.js" + +const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) -router - .route("/create") - .post(auth0Middleware(), async (req, res) => { - const user = req.user - - if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") - - const projectObj = new Project() - - let project = req.body - project = { ...project, creator: user?.agent } - - try { - const newProject = await projectObj.create(project) - - res.setHeader("Location", newProject?._id) - res.status(201).json(newProject) - } catch (error) { - respondWithError( - res, - - error.status ?? error.code ?? 500, - error.message ?? "Unknown server error" - ) - } - }) - .all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") - }) - -router - .route("/import") - .post(auth0Middleware(), async (req, res) => { - let { createFrom } = req.query - let user = req.user - createFrom = createFrom?.toLowerCase() - if (!createFrom) - return res.status(400).json({ - message: - "Query string 'createFrom' is required, specify manifest source as 'URL' or 'DOC' " - }) - - if (createFrom === "url") { - const manifestURL = req?.body?.url - - let checkURL = await validateURL(manifestURL) - - if (!checkURL.valid) - return res.status(checkURL.status).json({ - message: checkURL.message, - resolvedPayload: checkURL.resolvedPayload - }) - - try { - const result = await ProjectFactory.fromManifestURL( - manifestURL, - user._id - ) - res.status(201).json(result) - } catch (error) { - res.status(error.status ?? 500).json({ - status: error.status ?? 500, - message: error.message, - data: error.resolvedPayload - }) - } - } else { - res.status(400).json({ - message: `Import from ${createFrom} is not available. Create from URL instead` - }) - } - }) - .all((req, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") - }) - - function patchTokenFromQuery(req, res, next) { - if (!req.headers.authorization && req.cookies.userToken) { - req.headers.authorization = `Bearer ${req.cookies.userToken}` - } - next() - } - - const corsOptions = { - origin: function (origin, callback) { - if (origin) { - callback(null, true) - } else { - callback(new Error("Not allowed by CORS")) - } - }, - credentials: true - } - -router - .route("/import28/:uid") - .get(cors(corsOptions), cookieParser(), patchTokenFromQuery, auth0Middleware(), async (req, res) => { - const user = req.user - const jsessionid = req.cookies.JSESSIONID - const uid = req.params.uid - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!jsessionid) { - return respondWithError(res, 400, "Missing jsessionid in query") - } - - if (!uid) { - return respondWithError(res, 400, "Missing uid in query") - } - - try { - const response = await fetch( - `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, - { - method: "GET", - headers: { - Cookie: `JSESSIONID=${jsessionid}`, - }, - credentials: "include", - } - ) - - if (response.status === 500) { - document.getElementById('message').textContent = 'The project cannot be imported.'; - return; - } - - const rawText = await response.text() - let parsedData = {} - - try { - const firstLevel = JSON.parse(rawText) - parsedData = Object.fromEntries( - Object.entries(firstLevel).map(([key, value]) => { - try { - return [key, JSON.parse(value)] - } catch { - return [key, value] - } - }) - ) - } catch (err) { - console.error("Failed to parse project response:", err) - return respondWithError(res, 500, "Invalid project response format") - } - - return res.status(200).json({ - message: "Select a Project to Import : ", - data: parsedData, - }) - - } catch (error) { - console.error("Error fetching project data:", error) - return respondWithError(res, 500, "Error fetching project data") - } - }) - .all((req, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") - }) - -router - .route("/:id/manifest") - .get(auth0Middleware(), async (req, res) => { - const {id} = req.params - const user = req.user - - if (!id) { - return respondWithError(res, 400, "No TPEN3 ID provided") - } else if (!validateID(id)) { - return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") - } - - try { - const project = await ProjectFactory.loadAsUser(id, null) - const collaboratorIdList = [] - - Object.entries(project.collaborators).map(([id, data]) => { - collaboratorIdList.push(id) - }) - - if (!collaboratorIdList.includes(user._id)) { - return respondWithError(res, 403, "You do not have permission to export this project") - } - if (!await new Project(id).checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PROJECT)) { - return respondWithError(res, 403, "You do not have permission to export this project") - } - const manifest = await ProjectFactory.exportManifest(id) - await ProjectFactory.uploadFileToGitHub(manifest, `${id}`) - res.status(200).json(manifest) - } catch (error) { - return respondWithError( - res, - error.status || error.code || 500, - error.message ?? "An error occurred while fetching the project data." - ) - } - }) - .all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") - }) - -router - .route("/:id") - .get(auth0Middleware(), async (req, res) => { - const user = req.user - let id = req.params.id - - if (!id) { - return respondWithError(res, 400, "No TPEN3 ID provided") - } else if (!validateID(id)) { - return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") - } - - (async () => { - try { - const project = await ProjectFactory.loadAsUser(id, user._id) - if (!project) { - return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) - } - res.status(200).json(project) - } catch (error) { - return respondWithError( - res, - error.status || error.code || 500, - error.message ?? "An error occurred while fetching the project data." - ) - } - })() - }) - .all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") - }) - -router - .route("/:id/invite-member") - .post(auth0Middleware(), async (req, res) => { - const user = req.user - const { id: projectId } = req.params - const { email, roles } = req.body - // roles is set to ["CONTRIBUTOR"] if undefined within Project.sendInvite() > parseRoles() - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } else if (!email) { - return respondWithError( - res, - 400, - "Invitee's email is required" - ) - } else if (!isValidEmail(email)) { - return respondWithError(res, 400, "Invitee email is invalid") - } - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER)) { - const response = await project.sendInvite(email, roles) - res.status(200).json(response) - } else { - res - .status(403) - .send("You do not have permission to invite members to this project") - } - } catch (error) { - res.status(error.status || 500).send(error.message.toString()) - } - }) - -router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { - const user = req.user - const { id: projectId } = req.params - const { userId } = req.body - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - else if (!projectId) { - return respondWithError(res, 400, "Project ID is required") - } - else if (!userId) { - return respondWithError(res, 400, "User ID is required") - } - - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.MEMBER)) { - await project.removeMember(userId) - .then(() => res.sendStatus(204)) - } - else { - res - .status(403) - .send("You do not have permission to remove members from this project") - } - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error removing member from project.") - } -}) - -// Add New Role to Member -router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Middleware(), async (req, res) => { - const { projectId, collaboratorId } = req.params - const roles = req.body.roles ?? req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - if (!roles) { - return respondWithError(res, 400, "Provide role(s) to add") - } - try { - const projectObj = new Project(projectId) - - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER))) { - return respondWithError(res, 403, "You do not have permission to add roles to members.") - } - - const groupId = projectObj.data.group - const group = new Group(groupId) - await group.addMemberRoles(collaboratorId, roles) - await group.update() - - res.status(200).send(`Roles added to member ${collaboratorId}.`) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error adding roles to member.") - } -}) - -// Change a member's Role(s): Replace roles with new ones -router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middleware(), async (req, res) => { - const { projectId, collaboratorId } = req.params - const roles = req.body.roles ?? req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!roles) { - return respondWithError(res, 400, "Provide role(s) to update") - } - - - try { - const projectObj = new Project(projectId) - - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER))) { - return respondWithError(res, 403, "You do not have permission to update member roles.") - } - - const group = new Group(projectObj.data.group) - await group.setMemberRoles(collaboratorId, roles) - - res.status(200).send(`Roles [${roles}] updated for member ${collaboratorId}.`) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error updating member roles.") - } -}) - - -// Remove a Role from Member -router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0Middleware(), async (req, res) => { - const { projectId, collaboratorId } = req.params - const roles = req.body.roles ?? req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - if (!roles) { - return respondWithError(res, 400, "Provide role(s) to remove") - } - if (roles.includes("OWNER")) { - return respondWithError(res, 400, "The OWNER role cannot be removed.") - } - try { - const projectObj = new Project(projectId) - - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.MEMBER))) { - return respondWithError(res, 403, "You do not have permission to remove roles from members.") - } - - const groupId = projectObj.data.group - const group = new Group(groupId) - await group.removeMemberRoles(collaboratorId, roles) - - res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) - - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error removing roles from member.") - } -}) - - -// Switch project owner - -router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res) => { - const { projectId } = req.params - const { newOwnerId } = req.body - const user = req.user - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - if (!newOwnerId) { - return respondWithError(res, 400, "Provide the ID of the new owner.") - } - if (user._id === newOwnerId) { - return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") - } - - try { - const projectObj = new Project(projectId) - - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.ALL, SCOPES.ALL, ENTITIES.ALL))) { - return respondWithError(res, 403, "You do not have permission to transfer ownership.") - } - - const group = new Group(projectObj.data.group) - if (user._id === newOwnerId) { - return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") - } - - const currentRoles = await group.getMemberRoles(user._id) - // If user only has the OWNER role, we default them to CONTRIBUTOR before transferring ownership - Object.keys(currentRoles).length === 1 && await group.addMemberRoles(user._id, ["CONTRIBUTOR"]) - group.addMemberRoles(newOwnerId, ["OWNER"], true) - group.removeMemberRoles(user._id, ["OWNER"], true) - await group.update() - - res.status(200).json({ message: `Ownership successfully transferred to member ${newOwnerId}.` }) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error transferring ownership.") - } -}) - - -// Manage Custom Roles Endpoints - -// Add custom roles to a project -router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => { - const { projectId } = req.params - let customRoles = req.body.roles ?? req.body - const user = req.user - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!Object.keys(customRoles).length) { - return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") - } - - try { - // Make sure provided role is not a DEFAULT role - customRoles = scrubDefaultRoles(customRoles) - if (!customRoles) return respondWithError(res, 400, `No custom roles provided.`) - - const project = new Project(projectId) - if (!(await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.ROLE))) { - return respondWithError(res, 403, "You do not have permission to add custom roles.") - } - - const group = new Group(project.data.group) - await group.addCustomRoles(customRoles) - - res.status(201).json({ message: 'Custom roles added successfully.' }) - - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error adding custom roles.') - } -}) - - -router.put('/:projectId/setCustomRoles', auth0Middleware(), async (req, res) => { - const { projectId } = req.params - let newCustomRoles = req.body.roles ?? req.body - const user = req.user - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!Object.keys(newCustomRoles).length) { - return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") - } - - try { - // Ensure none of the provided roles are default roles - newCustomRoles = scrubDefaultRoles(newCustomRoles) - if (!newCustomRoles) return respondWithError(res, 400, `No custom roles provided.`) - - const project = new Project(projectId) - - if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.ROLE))) { - return respondWithError(res, 403, "You do not have permission to set custom roles.") - } - - const group = new Group(project.data.group) - await group.setCustomRoles(newCustomRoles) - - res.status(200).json({ message: 'Custom roles set successfully.' }) - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error setting custom roles.') - } -}) - - - -router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) => { - const { projectId } = req.params - let rolesToRemove = req.body.roles ?? req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { - rolesToRemove = Object.keys(rolesToRemove) - } - if (typeof rolesToRemove === 'string') { - rolesToRemove = rolesToRemove.split(' ') - } - if (!rolesToRemove.length) { - return respondWithError(res, 400, "Roles to remove must be provided as an array of strings or a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") - } - - try { - // Ensure no default roles are being removed - rolesToRemove = scrubDefaultRoles(rolesToRemove) - if (!rolesToRemove) { - return respondWithError(res, 400, `No custom roles provided.`) - } - const project = new Project(projectId) - if (!(await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.ROLE))) { - return respondWithError(res, 403, "You do not have permission to remove custom roles.") - } - - const group = new Group(project.data.group) - await (await group.removeCustomRoles(rolesToRemove)).update() - - res.status(200).json({ message: 'Custom roles removed successfully.' }) - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') - } -}) - -// Update Project Metadata -router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { - const { projectId } = req.params - const metadata = req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!metadata || !Array.isArray(metadata)) { - return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") - } - - try { - const projectObj = new Project(projectId) - - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.PROJECT))) { - return respondWithError(res, 403, "You do not have permission to update metadata for this project.") - } - - const response = await projectObj.updateMetadata(metadata) - res.status(200).json(response) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error updating project metadata.") - } -}) - - -// Change a member's Role(s): Replace roles with new ones -router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middleware(), async (req, res) => { - const { projectId, collaboratorId } = req.params - const roles = req.body.roles ?? req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!roles) { - return respondWithError(res, 400, "Provide role(s) to update") - } - - - try { - const projectObj = await new Project(projectId) - const accessInfo = await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER) - - if (!accessInfo.hasAccess) return respondWithError(res, 403, accessInfo.message) - - const groupId = projectObj.data.group - const group = new Group(groupId) - await group.setMemberRoles(collaboratorId, roles) - - res.status(200).send(`Roles [${roles}] updated for member ${collaboratorId}.`) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error updating member roles.") - } -}) - - -// Remove a Role from Member -router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0Middleware(), async (req, res) => { - const { projectId, collaboratorId } = req.params - const roles = req.body.roles ?? req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - if (!roles) { - return respondWithError(res, 400, "Provide role(s) to remove") - } - if (roles.includes("OWNER")) { - return respondWithError(res, 400, "The OWNER role cannot be removed.") - } - try { - const projectObj = await new Project(projectId) - const accessInfo = await projectObj.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.MEMBER) - - if (!accessInfo.hasAccess) return respondWithError(res, 403, accessInfo.message) - - const groupId = projectObj.data.group - const group = new Group(groupId) - await group.removeMemberRoles(collaboratorId, roles) - - res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) - - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error removing roles from member.") - } -}) - - -// Switch project owner - -router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res) => { - const { projectId } = req.params - const { newOwnerId } = req.body - const user = req.user - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - if (!newOwnerId) { - return respondWithError(res, 400, "Provide the ID of the new owner.") - } - if (user._id === newOwnerId) { - return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") - } - - try { - const projectObj = await new Project(projectId) - - const accessInfo = await projectObj.checkUserAccess(user._id, ACTIONS.ALL, SCOPES.ALL, ENTITIES.ALL) - if (!accessInfo.hasAccess) return respondWithError(res, 403, "Only the current owner can transfer ownership.") - - const groupId = projectObj.data.group - const group = new Group(groupId) - - if (user._id === newOwnerId) { - return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") - } - - const currentRoles = await group.getMemberRoles(user._id) - // If user only has the OWNER role, we default them to CONTRIBUTOR before transferring ownership - Object.keys(currentRoles).length === 1 && await group.addMemberRoles(user._id, ["CONTRIBUTOR"]) - await group.addMemberRoles(newOwnerId, ["OWNER"], true) - await group.removeMemberRoles(user._id, ["OWNER"], true) - - res.status(200).json({ message: `Ownership successfully transferred to member ${newOwnerId}.` }) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? "Error transferring ownership.") - } -}) - - -// Manage Custom Roles Endpoints - -// Add custom roles to a project -router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => { - const { projectId } = req.params - let customRoles = req.body.roles ?? req.body - const user = req.user - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!Object.keys(customRoles).length) { - return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") - } - - try { - // Make sure provided role is not a DEFAULT role - customRoles = scrubDefaultRoles(customRoles) - if (!customRoles) return respondWithError(res, 400, `No custom roles provided.`) - - - const project = await new Project(projectId) - const accessInfo = await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.ROLE) - - if (!accessInfo.hasAccess) { - return respondWithError(res, 403, accessInfo.message) - } - - const groupId = project.data.group - const group = new Group(groupId) - await group.addCustomRoles(customRoles) - - res.status(201).json({ message: 'Custom roles added successfully.' }) - - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error adding custom roles.') - } -}) - - -router.put('/:projectId/setCustomRoles', auth0Middleware(), async (req, res) => { - const { projectId } = req.params - let newCustomRoles = req.body.roles ?? req.body - const user = req.user - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (!Object.keys(newCustomRoles).length) { - return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") - } - - try { - // Ensure none of the provided roles are default roles - newCustomRoles = scrubDefaultRoles(newCustomRoles) - if (!newCustomRoles) return respondWithError(res, 400, `No custom roles provided.`) - - - const project = await new Project(projectId) - const accessInfo = await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.ROLE) - - if (!accessInfo.hasAccess) { - return respondWithError(res, 403, accessInfo.message) - } - - const groupId = project.data.group - const group = new Group(groupId) - await group.setCustomRoles(newCustomRoles) - - res.status(200).json({ message: 'Custom roles set successfully.' }) - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error setting custom roles.') - } -}) - - - -router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) => { - const { projectId } = req.params - let rolesToRemove = req.body.roles ?? req.body - const user = req.user - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { - rolesToRemove = Object.keys(rolesToRemove) - } - if (typeof rolesToRemove === 'string') { - rolesToRemove = rolesToRemove.split(' ') - } - if (!rolesToRemove.length) { - return respondWithError(res, 400, "Roles to remove must be provided as an array of strings or a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") - } - - try { - // Ensure no default roles are being removed - rolesToRemove = scrubDefaultRoles(rolesToRemove) - if (!rolesToRemove) { - return respondWithError(res, 400, `No custom roles provided.`) - } - - const project = await new Project(projectId) - const accessInfo = await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.ROLE) - - if (!accessInfo.hasAccess) { - return respondWithError(res, 403, accessInfo.message) - } - - const groupId = project.data.group - const group = new Group(groupId) - await group.removeCustomRoles(rolesToRemove) - - res.status(200).json({ message: 'Custom roles removed successfully.' }) - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') - } -}) - -// Create Hotkey -router.route("/:projectId/hotkeys").post(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - const { symbols } = req.body - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - if (!symbols || symbols.length === 0) { - return respondWithError(res, 400, "At least one symbol is required") - } - - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const hotkeys = new Hotkeys(projectId, symbols) - const hotkey = await hotkeys.create() - console.dir(hotkey) - res.status(201).json(hotkey) - return - } - return respondWithError(res, 403, "You do not have permission to create hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -// Update Hotkeys -router.route("/:projectId/hotkeys").put(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - const { symbols } = req.body - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - if (!symbols || symbols.length === 0) { - return respondWithError(res, 400, "At least one symbol is required") - } - if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { - return respondWithError(res, 400, "All symbols must be strings") - } - - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const hotkeys = new Hotkeys(projectId, symbols) - const hotkey = await hotkeys.setSymbols() - res.status(200).json(hotkey) - return - } - return respondWithError(res, 403, "You do not have permission to update hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -// Delete Hotkeys -router.route("/:projectId/hotkeys").delete(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const hotkeys = new Hotkeys(projectId) - const isDeleted = await hotkeys.delete() - res.status(200).json(isDeleted) - return - } - return respondWithError(res, 403, "You do not have permission to delete hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -// Get Hotkeys for a project -router.route("/:projectId/hotkeys").get(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - - if (!user) { - return respondWithError(res, 401, "Unauthenticated request") - } - - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const H = await Hotkeys.getByProjectId(projectId) - res.status(200).json(H.symbols) - return - } - return respondWithError(res, 403, "You do not have permission to view hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -router.route("/:projectId/hotkeys").all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET, PUT, or DELETE instead") -}) +// Use split routers +router.use(projectCreateRouter) +router.use(import28Router) +router.use(projectReadRouter) +router.use(memberRouter) +router.use(customRolesRouter) +router.use(hotkeysRouter) +router.use(metadataRouter) // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) -router.use('/:projectId/page', pageRouter) +// router.use('/:projectId/page', pageRouter) export default router diff --git a/project/memberRouter.js b/project/memberRouter.js new file mode 100644 index 00000000..c7f189c1 --- /dev/null +++ b/project/memberRouter.js @@ -0,0 +1,143 @@ +import express from "express" +import { isValidEmail } from "../utilities/validateEmail.js" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import Project from "../classes/Project/Project.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" +import Group from "../classes/Group/Group.js" + +const router = express.Router({ mergeParams: true }) + +// Invite member +router.route("/:id/invite-member").post(auth0Middleware(), async (req, res) => { + const user = req.user + const { id: projectId } = req.params + const { email, roles } = req.body + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!email) return respondWithError(res, 400, "Invitee's email is required") + if (!isValidEmail(email)) return respondWithError(res, 400, "Invitee email is invalid") + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER)) { + const response = await project.sendInvite(email, roles) + res.status(200).json(response) + } else { + res.status(403).send("You do not have permission to invite members to this project") + } + } catch (error) { + res.status(error.status || 500).send(error.message.toString()) + } +}) + +// Remove member +router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { + const user = req.user + const { id: projectId } = req.params + const { userId } = req.body + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!projectId) return respondWithError(res, 400, "Project ID is required") + if (!userId) return respondWithError(res, 400, "User ID is required") + try { + const project = new Project(projectId) + if (await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.MEMBER)) { + await project.removeMember(userId) + res.sendStatus(204) + } else { + res.status(403).send("You do not have permission to remove members from this project") + } + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error removing member from project.") + } +}) + +// Add, set, remove roles +router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Middleware(), async (req, res) => { + const { projectId, collaboratorId } = req.params + const roles = req.body.roles ?? req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!roles) return respondWithError(res, 400, "Provide role(s) to add") + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER))) { + return respondWithError(res, 403, "You do not have permission to add roles to members.") + } + const groupId = projectObj.data.group + const group = new Group(groupId) + await group.addMemberRoles(collaboratorId, roles) + await group.update() + res.status(200).send(`Roles added to member ${collaboratorId}.`) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error adding roles to member.") + } +}) + +router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middleware(), async (req, res) => { + const { projectId, collaboratorId } = req.params + const roles = req.body.roles ?? req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!roles) return respondWithError(res, 400, "Provide role(s) to update") + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER))) { + return respondWithError(res, 403, "You do not have permission to update member roles.") + } + const group = new Group(projectObj.data.group) + await group.setMemberRoles(collaboratorId, roles) + res.status(200).send(`Roles [${roles}] updated for member ${collaboratorId}.`) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error updating member roles.") + } +}) + +router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0Middleware(), async (req, res) => { + const { projectId, collaboratorId } = req.params + const roles = req.body.roles ?? req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!roles) return respondWithError(res, 400, "Provide role(s) to remove") + if (roles.includes("OWNER")) return respondWithError(res, 400, "The OWNER role cannot be removed.") + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.MEMBER))) { + return respondWithError(res, 403, "You do not have permission to remove roles from members.") + } + const groupId = projectObj.data.group + const group = new Group(groupId) + await group.removeMemberRoles(collaboratorId, roles) + res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error removing roles from member.") + } +}) + +// Switch project owner +router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res) => { + const { projectId } = req.params + const { newOwnerId } = req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!newOwnerId) return respondWithError(res, 400, "Provide the ID of the new owner.") + if (user._id === newOwnerId) return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.ALL, SCOPES.ALL, ENTITIES.ALL))) { + return respondWithError(res, 403, "You do not have permission to transfer ownership.") + } + const group = new Group(projectObj.data.group) + if (user._id === newOwnerId) { + return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") + } + const currentRoles = await group.getMemberRoles(user._id) + Object.keys(currentRoles).length === 1 && await group.addMemberRoles(user._id, ["CONTRIBUTOR"]) + await group.addMemberRoles(newOwnerId, ["OWNER"], true) + await group.removeMemberRoles(user._id, ["OWNER"], true) + await group.update() + res.status(200).json({ message: `Ownership successfully transferred to member ${newOwnerId}.` }) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error transferring ownership.") + } +}) + +export default router diff --git a/project/metadataRouter.js b/project/metadataRouter.js new file mode 100644 index 00000000..3a2bd5e7 --- /dev/null +++ b/project/metadataRouter.js @@ -0,0 +1,29 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import Project from "../classes/Project/Project.js" +import { ACTIONS, SCOPES, ENTITIES } from "./groups/permissions_parameters.js" + +const router = express.Router({ mergeParams: true }) + +router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { + const { projectId } = req.params + const metadata = req.body + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!metadata || !Array.isArray(metadata)) { + return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") + } + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to update metadata for this project.") + } + const response = await projectObj.updateMetadata(metadata) + res.status(200).json(response) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? "Error updating project metadata.") + } +}) + +export default router diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js new file mode 100644 index 00000000..0fcc3886 --- /dev/null +++ b/project/projectCreateRouter.js @@ -0,0 +1,70 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import ProjectFactory from "../classes/Project/ProjectFactory.js" +import validateURL from "../utilities/validateURL.js" +import Project from "../classes/Project/Project.js" + +const router = express.Router({ mergeParams: true }) + +router.route("/create").post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") + const projectObj = new Project() + let project = req.body + project = { ...project, creator: user?.agent } + try { + const newProject = await projectObj.create(project) + res.setHeader("Location", newProject?._id) + res.status(201).json(newProject) + } catch (error) { + respondWithError( + res, + error.status ?? error.code ?? 500, + error.message ?? "Unknown server error" + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + +router.route("/import").post(auth0Middleware(), async (req, res) => { + let { createFrom } = req.query + let user = req.user + createFrom = createFrom?.toLowerCase() + if (!createFrom) + return res.status(400).json({ + message: + "Query string 'createFrom' is required, specify manifest source as 'URL' or 'DOC' " + }) + if (createFrom === "url") { + const manifestURL = req?.body?.url + let checkURL = await validateURL(manifestURL) + if (!checkURL.valid) + return res.status(checkURL.status).json({ + message: checkURL.message, + resolvedPayload: checkURL.resolvedPayload + }) + try { + const result = await ProjectFactory.fromManifestURL( + manifestURL, + user._id + ) + res.status(201).json(result) + } catch (error) { + res.status(error.status ?? 500).json({ + status: error.status ?? 500, + message: error.message, + data: error.resolvedPayload + }) + } + } else { + res.status(400).json({ + message: `Import from ${createFrom} is not available. Create from URL instead` + }) + } +}).all((req, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + +export default router diff --git a/project/projectReadRouter.js b/project/projectReadRouter.js new file mode 100644 index 00000000..021a0fda --- /dev/null +++ b/project/projectReadRouter.js @@ -0,0 +1,60 @@ +import express from "express" +import { validateID, respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import ProjectFactory from "../classes/Project/ProjectFactory.js" +import Project from "../classes/Project/Project.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" + +const router = express.Router({ mergeParams: true }) + +router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { + const { id } = req.params + const user = req.user + if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") + if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") + try { + const project = await ProjectFactory.loadAsUser(id, null) + const collaboratorIdList = Object.keys(project.collaborators) + if (!collaboratorIdList.includes(user._id)) { + return respondWithError(res, 403, "You do not have permission to export this project") + } + if (!await new Project(id).checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PROJECT)) { + return respondWithError(res, 403, "You do not have permission to export this project") + } + const manifest = await ProjectFactory.exportManifest(id) + await ProjectFactory.uploadFileToGitHub(manifest, `${id}`) + res.status(200).json(manifest) + } catch (error) { + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "An error occurred while fetching the project data." + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + +router.route("/:id").get(auth0Middleware(), async (req, res) => { + const user = req.user + let id = req.params.id + if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") + if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") + try { + const project = await ProjectFactory.loadAsUser(id, user._id) + if (!project) { + return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) + } + res.status(200).json(project) + } catch (error) { + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "An error occurred while fetching the project data." + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + +export default router diff --git a/utilities/getHash.js b/utilities/getHash.js index 210519e9..28774be3 100644 --- a/utilities/getHash.js +++ b/utilities/getHash.js @@ -1,7 +1,6 @@ export default function getHash(agent) { if (agent) { return agent.split("id/").pop() - } else { - throw new Error("No agent provided") } + throw new Error("No agent provided") } diff --git a/utilities/isDefaultRole.js b/utilities/isDefaultRole.js index 65f1fda8..126b9fb3 100644 --- a/utilities/isDefaultRole.js +++ b/utilities/isDefaultRole.js @@ -1,26 +1,19 @@ import Group from "../classes/Group/Group.js" export default function scrubDefaultRoles(roleName) { - const defaultRoles = Object.keys(Group.defaultRoles) - if(Array.isArray(roleName)) { + if (Array.isArray(roleName)) { roleName = roleName.filter(roleString => { - if(typeof roleString !== "string") { - throw new Error("Expecting a RolesMap and not an Array.") - } + if (typeof roleString !== "string") throw new Error("Expecting a RolesMap and not an Array.") return !defaultRoles.includes(roleString) }) return roleName.length !== 0 ? roleName : false } - if (typeof roleName === "object") { for (const role of Object.keys(roleName)) { - if (defaultRoles.includes(role)) { - delete roleName[role] - } + if (defaultRoles.includes(role)) delete roleName[role] } return Object.keys(roleName).length !== 0 ? roleName : false } - return false } diff --git a/utilities/proxy.js b/utilities/proxy.js index f7994d17..7194db5d 100644 --- a/utilities/proxy.js +++ b/utilities/proxy.js @@ -4,134 +4,91 @@ import cors from 'cors' import common_cors from "../utilities/common_cors.json" with {type: "json"} const requireHeader = [ - 'origin', - 'x-requested-with' + 'origin', + 'x-requested-with' ] const excludedClientHeaders = new Set([ - 'host', - 'cookie' + 'host', + 'cookie' ]) const excludedServerHeaders = new Set([ - 'set-cookie', - 'connection' + 'set-cookie', + 'connection' ]) const sizeLimit = 2e8 // 200 MB const proxy = (req, res, next) => { - // Set CORS headers - res.header('Access-Control-Allow-Origin', '*') - - // Extract the target URL from the request path - // Handle both /proxy/http://example.com and /proxy/https://example.com - // Also handle the case with double slashes - let targetUrl = req.originalUrl.replace(/^\/+proxy\/+/, '') - - if (!targetUrl) { - res.status(400).send('No URL provided') - return + res.header('Access-Control-Allow-Origin', '*') + let targetUrl = req.originalUrl.replace(/^\/+proxy\/+/, '') + if (!targetUrl) return res.status(400).send('No URL provided') + const headers = {} + for (const header in req.headers) { + if (!excludedClientHeaders.has(header.toLowerCase())) { + headers[header] = req.headers[header] } - - // // Require Origin header - // if (!requireHeader.some(header => req.headers[header])) { - // res.status(403).send('Origin: header is required') - // return - // } - - // Forward client headers to server - const headers = {} - for (const header in req.headers) { - if (!excludedClientHeaders.has(header.toLowerCase())) { - headers[header] = req.headers[header] - } + } + const forwardedFor = req.headers['x-forwarded-for'] + headers['X-Forwarded-For'] = (forwardedFor ? forwardedFor + ',' : '') + req.connection.remoteAddress + try { + const parsedUrl = new URL(targetUrl) + if (parsedUrl.protocol === 'http:') { + parsedUrl.protocol = 'https:' + targetUrl = parsedUrl.toString() } - - const forwardedFor = req.headers['x-forwarded-for'] - headers['X-Forwarded-For'] = (forwardedFor ? forwardedFor + ',' : '') + req.connection.remoteAddress - - // Parse URL and upgrade to HTTPS if needed - try { - const parsedUrl = new URL(targetUrl) - - // Force HTTPS by changing the protocol if it's currently HTTP - if (parsedUrl.protocol === 'http:') { - parsedUrl.protocol = 'https:' - targetUrl = parsedUrl.toString() - } - } catch (e) { - res.status(400).send('Invalid URL') - return + } catch { + return res.status(400).send('Invalid URL') + } + let data = 0 + const proxyReq = https.request(targetUrl, { + method: 'GET', + headers + }, (proxyRes) => { + if (Number(proxyRes.headers['content-length']) > sizeLimit) { + res.status(413).send(`ERROR 413: Maximum allowed size is ${sizeLimit} bytes.`) + proxyReq.destroy() + return } - - let data = 0 // Track data size - - const proxyReq = https.request(targetUrl, { - method: 'GET', - headers - }, (proxyRes) => { - // Check content length - if it's larger than the size limit, end the request with a 413 error - if (Number(proxyRes.headers['content-length']) > sizeLimit) { - res.status(413).send(`ERROR 413: Maximum allowed size is ${sizeLimit} bytes.`) - proxyReq.destroy() - return - } - - res.statusCode = proxyRes.statusCode - - // If the page already supports cors, redirect to the URL directly - if (proxyRes.headers['access-control-allow-origin'] === '*') { - res.redirect(targetUrl) - proxyReq.destroy() - return - } - - // Include only desired headers - for (const header in proxyRes.headers) { - if (!excludedServerHeaders.has(header)) { - res.header(header, proxyRes.headers[header]) - } - } - - // Send headers before streaming the body - res.flushHeaders() - - // Handle the data stream - proxyRes.on('data', chunk => { - data += chunk.length - if (data > sizeLimit) { - proxyReq.destroy() - res.end() - return - } - res.write(chunk) - }) - - proxyRes.on('end', () => { - res.end() - }) + res.statusCode = proxyRes.statusCode + for (const header in proxyRes.headers) { + if (!excludedServerHeaders.has(header.toLowerCase())) { + res.setHeader(header, proxyRes.headers[header]) + } + } + proxyRes.on('data', chunk => { + data += chunk.length + if (data > sizeLimit) { + res.status(413).send(`ERROR 413: Maximum allowed size is ${sizeLimit} bytes.`) + proxyReq.destroy() + res.end() + return + } + res.write(chunk) }) - - proxyReq.on('error', err => { - res.status(500).send(`Proxy Error: ${err.message}`) + proxyRes.on('end', () => { + res.end() }) - - proxyReq.end() + }) + proxyReq.on('error', err => { + res.status(500).send(`Proxy Error: ${err.message}`) + }) + proxyReq.end() } function opts(req, res, next) { - res.header('Access-Control-Allow-Origin', '*') - res.header('Access-Control-Allow-Methods', 'GET') - res.header('Access-Control-Allow-Headers', req.header('Access-Control-Request-Headers')) - res.header('Access-Control-Max-Age', '86400') - res.sendStatus(200) + res.header('Access-Control-Allow-Origin', '*') + res.header('Access-Control-Allow-Methods', 'GET') + res.header('Access-Control-Allow-Headers', req.header('Access-Control-Request-Headers')) + res.header('Access-Control-Max-Age', '86400') + res.sendStatus(200) } const proxyRouter = express.Router() proxyRouter.use(cors(common_cors)) proxyRouter.route('/*') - .options(opts) - .get(proxy) + .options(opts) + .get(proxy) export default proxyRouter diff --git a/utilities/removeProperties.js b/utilities/removeProperties.js index 42aabb9b..6949ce78 100644 --- a/utilities/removeProperties.js +++ b/utilities/removeProperties.js @@ -1,36 +1,30 @@ - - /** * filters object * @param {*} obj the object to be filtered * @param {*} propertiesToRemove the properties to be removed, e.g profile, password, links; array of strings * @returns all properties of the except except one specified */ -export const removeProperties = (obj, ...propertiesToRemove)=>{ - if(!obj) return - const { ...modifiedObj } = obj - for (const property of propertiesToRemove) { - delete modifiedObj[property] - } - return modifiedObj - // publicUser.links = profile?.links //Assuming something in the profile object is public. Note that profile has to be sourced from the destructure as const {profile, ...modifiedObj } = obj -} - +export const removeProperties = (obj, ...propertiesToRemove) => { + if (!obj) return + const modifiedObj = Object.assign({}, obj) + for (const property of propertiesToRemove) { + delete modifiedObj[property] + } + return modifiedObj +} /** - * + * * @param {*} obj object to be filtered * @param {*} properties the only properties to return; array of strings * @returns object with selected properties */ -export const includeOnly = (obj, ...properties)=>{ - let filteredObj = {} - - for(const key in obj){ - if (properties.includes(key)){ +export const includeOnly = (obj, ...properties) => { + const filteredObj = {} + for (const key in obj) { + if (properties.includes(key)) { filteredObj[key] = obj[key] } } - return filteredObj } diff --git a/utilities/shared.js b/utilities/shared.js index 0ab76e33..acdff164 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -1,8 +1,6 @@ import DatabaseController from "../database/mongo/controller.js" import Project from '../classes/Project/Project.js' -import { findPageById } from '../page/index.js' - -export { findPageById } +import Page from '../classes/Page/Page.js' /** * Check if the supplied input is valid JSON or not. @@ -89,4 +87,48 @@ export const getProjectById = async (projectId, res) => { const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) layer.pages[pageIndex] = page.asProjectPage() await project.update() + return project } + + // Get a Layer that contains a PageId + export const getLayerContainingPage = (project, pageId) => { + return project.data.layers.find(layer => + layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) + ) + } + +// Find a page by ID (moved from page/index.js) +export async function findPageById(pageId, projectId) { + if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { + return fetch(pageId).then(res => res.json()) + } + const projectData = (await getProjectById(projectId))?.data + if (!projectData) { + const error = new Error(`Project with ID '${projectId}' not found`) + error.status = 404 + throw error + } + const layerContainingPage = projectData.layers.find(layer => + layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) + ) + + if (!layerContainingPage) { + const error = new Error(`Layer containing page with ID '${pageId}' not found in project '${projectId}'`) + error.status = 404 + throw error + } + + const pageIndex = layerContainingPage.pages.findIndex(p => p.id.split('/').pop() === pageId.split('/').pop()) + + if (pageIndex < 0) { + const error = new Error(`Page with ID '${pageId}' not found in project '${projectId}'`) + error.status = 404 + throw error + } + + const page = layerContainingPage.pages[pageIndex] + page.prev = layerContainingPage.pages[pageIndex - 1] ?? null + page.next = layerContainingPage.pages[pageIndex + 1] ?? null + + return new Page(layerContainingPage.id, page) +} diff --git a/utilities/token.js b/utilities/token.js index 34aa2ee4..fb05cb4f 100644 --- a/utilities/token.js +++ b/utilities/token.js @@ -2,40 +2,35 @@ import { respondWithError } from "./shared.js" export function extractToken(tokenString) { if (!tokenString) return null - try { return tokenString.includes("Bearer ") ? tokenString.trim().split("Bearer ")[1].trim() : tokenString } catch (error) { console.log(error) + return null } } export function isTokenExpired(token, res) { - // Returns true if token is expired and false otherwise try { return ( Date.now() >= - JSON.parse(Buffer.from(token.split(".")[1], "base64").toString()).exp * - 1000 + JSON.parse(Buffer.from(token.split(".")[1], "base64").toString()).exp * 1000 ) } catch (error) { respondWithError(res, 403, "invalid token") + return true } - - } export function extractUser(token) { - let userInfo = JSON.parse( - Buffer.from( - token.includes("Bearer") - ? token.split(" ")[1].split(".")[1] - : token.split(".")[1], - "base64" - ).toString() - ) - - return userInfo + try { + const payload = token.includes("Bearer") + ? token.split(" ")[1].split(".")[1] + : token.split(".")[1] + return JSON.parse(Buffer.from(payload, "base64").toString()) + } catch { + return null + } } diff --git a/utilities/validateEmail.js b/utilities/validateEmail.js index 53059495..3652f383 100644 --- a/utilities/validateEmail.js +++ b/utilities/validateEmail.js @@ -1,6 +1,4 @@ -const validEmail = new RegExp( - /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/ -) +const validEmail = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/ export function isValidEmail(email) { return validEmail.test(email) diff --git a/utilities/validatePayload.js b/utilities/validatePayload.js index d0c4f950..bbf7aa93 100644 --- a/utilities/validatePayload.js +++ b/utilities/validatePayload.js @@ -1,18 +1,12 @@ -export function validateProjectPayload(payload) { - if (!payload) return {isValid:false, errors:"Project cannot be created from an empty object"} - - // include other required parameters (layers, ...) as they become known. - const requiredElements = [ "metadata", "layers", "label", "manifest", "creator", "group"] - const missingElements = requiredElements.filter( - (element) => !payload.hasOwnProperty(element) - ) - +export function validateProjectPayload(payload) { + if (!payload) return { isValid: false, errors: "Project cannot be created from an empty object" } + const requiredElements = ["metadata", "layers", "label", "manifest", "creator", "group"] + const missingElements = requiredElements.filter(element => !payload.hasOwnProperty(element)) if (missingElements.length > 0) { return { isValid: false, errors: `Missing required elements: ${missingElements.join(", ")}` } } - - return {isValid: true, errors: null} + return { isValid: true, errors: null } } diff --git a/utilities/validateURL.js b/utilities/validateURL.js index e238f376..cd735c02 100644 --- a/utilities/validateURL.js +++ b/utilities/validateURL.js @@ -1,28 +1,16 @@ async function validateURL(url) { - if (!url) { - return {valid: false, message: "Manifest URL is required for import", status: 404} - } - if (!isNaN(url)) { - return {valid: false, message: "Input is a number, not a URL", status: 400} - } + if (!url) return { valid: false, message: "Manifest URL is required for import", status: 404 } + if (!isNaN(url)) return { valid: false, message: "Input is a number, not a URL", status: 400 } const urlPattern = new RegExp( "^(https?://((localhost)|(([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9].)+[a-zA-Z]{2,})|(\\d{1,3}\\.){3}\\d{1,3})(:\\d+)?(/[-a-zA-Z0-9@:%_+.~#?&//=]*)?(\\?[;&a-zA-Z0-9@:%_+.~#?&//=]*)?(#[a-zA-Z0-9@:%_+.~#?&//=]*)?)$" ) - - if (!urlPattern.test(url)) { - return {valid: false, message: "Invalid URL format", status: 400} - } + if (!urlPattern.test(url)) return { valid: false, message: "Invalid URL format", status: 400 } try { const response = await fetch(url) const contentType = response.headers.get("Content-Type") - - if ( - !contentType || - (!contentType.includes("application/json") && - !contentType.includes("application/ld+json")) - ) { + if (!contentType || (!contentType.includes("application/json") && !contentType.includes("application/ld+json"))) { return { valid: false, message: "URL does not point to valid JSON", @@ -31,9 +19,7 @@ async function validateURL(url) { } const data = await response.json() - let dataType = data["@type"] ?? data.type - if (dataType !== "sc:Manifest" && dataType !== "Manifest") { return { valid: false, @@ -43,9 +29,9 @@ async function validateURL(url) { } } - return {valid: true} - } catch (error) { - return {valid: false, message: "URL is not reachable", status: 500} + return { valid: true } + } catch { + return { valid: false, message: "URL is not reachable", status: 500 } } } From 13830eeaec62d2b7052626727a7bdbf49eacbbdb Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Mon, 19 May 2025 15:56:52 -0500 Subject: [PATCH 075/262] Adding Tools to Project (#244) * Adding Tools to Project * getTools() * remove getTools * addTools and UpdateTools * Update index.js * Update index.js * Update index.js * Add a guard * Tool guards * Guards * Comment Changes --------- Co-authored-by: Bryan Haberberger Co-authored-by: cubap --- classes/Project/Project.js | 55 ++++++++++++++++++++++ classes/Project/ProjectFactory.js | 78 ++++++++++++++++++++++++++++++- project/index.js | 66 ++++++++++++++++++++++++++ utilities/validateNameValue.js | 11 +++++ 4 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 utilities/validateNameValue.js diff --git a/classes/Project/Project.js b/classes/Project/Project.js index dcbffe9c..252f4511 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -1,6 +1,7 @@ import dbDriver from "../../database/driver.js" import { sendMail } from "../../utilities/mailer/index.js" import { validateProjectPayload } from "../../utilities/validatePayload.js" +import { isNotValidName, isNotValidValue } from "../../utilities/validateNameValue.js" import User from "../User/User.js" import { createHash } from "node:crypto" import Group from "../Group/Group.js" @@ -168,6 +169,60 @@ export default class Project { * * @throws {Error} Throws an error if the update operation fails. */ + + async updateTools(selectedValues) { + await this.#load() + // Guard invalid input + if (!Array.isArray(selectedValues)) return + // Guard existing data in corrupted state + if(!this.data?.tools) this.data.tools = [] + + this.data.tools = this.data.tools.map(tool => { + const match = selectedValues.find(t => { + if (isNotValidValue(t.value)) + throw new Error("Invalid value") + return t.value === tool.value}) + return { + ...tool, + state: match ? match.state : tool.state + } + }) + + return await this.update() + } + + async addTools(tools) { + + // Guard invalid input + if (!Array.isArray(tools)) return + + await this.#load() + // Guard existing data in corrupted state + if(!this.data?.tools) this.data.tools = [] + + for (let newTool of tools) { + const name = newTool.name.trim() + const value = newTool.value.trim() + const url = newTool.url.trim() + const state = newTool.state + + const containsCode = isNotValidName(name) || isNotValidValue(value) + if (containsCode) + throw new Error("Invalid name or value") + + const isDuplicate = this.data.tools.some( + tool => tool.name === name || tool.url === url + ) + + if (isDuplicate) { + continue + } + + this.data.tools.push({ name, value, url, state }) + } + return await this.update() + } + async updateMetadata(newMetadata) { this.data.metadata = newMetadata return await this.update() diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index cab928af..6841b7b4 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -19,6 +19,79 @@ export default class ProjectFactory { * @param {*} manifest : The manifest object to be processed * @returns object of project data */ + + static tools = [ + { + "name":"Page Tools", + "value":"page", + "state": false + }, + { + "name":"Inspect", + "value":"inspector", + "state": false + }, + { + "name":"Special Characters", + "value":"characters", + "state": false + }, + { + "name":"XML Tags", + "value":"xml", + "state": false + }, + { + "name":"View Full Page", + "value":"fullpage", + "state": false + }, + { + "name":"History Tool", + "value":"history", + "state": false + }, + { + "name":"Preview Tool", + "value":"preview", + "state": false + }, + { + "name":"Parsing Adjustment", + "value":"parsing", + "state": false + }, + { + "name":"Compare Pages", + "value":"compare", + "state": false + }, + { + "name": "Cappelli's Abbreviation", + "value": "cappelli", + "url": "https://centerfordigitalhumanities.github.io/cappelli/", + "state": false + }, + { + "name": "Enigma", + "value": "enigma", + "url": "https://ciham-digital.huma-num.fr/enigma/", + "state": false + }, + { + "name": "Latin Dictionary", + "value": "latin", + "url": "https://www.perseus.tufts.edu/hopper/resolveform?lang=latin", + "state": false + }, + { + "name": "Latin Vulgate", + "value": "vulgate", + "url": "https://vulsearch.sourceforge.net/cgi-bin/vulsearch", + "state": false + } + ] + static async DBObjectFromManifest(manifest) { if (!manifest) { throw { @@ -29,14 +102,15 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now const metadata = manifest.metadata ?? [] - const layer = Layer.build( database.reserveId(), `First Layer - ${label}`, manifest.items ) + const layer = Layer.build( database.reserveId(), `First Layer - ${label}`, manifest.items ) // required properties: id, label, metadata, manifest, layers return { label, metadata, manifest: [ manifest.id ], - layers: [ layer.asProjectLayer() ] + layers: [ layer.asProjectLayer() ], + tools: this.tools } } diff --git a/project/index.js b/project/index.js index b3663068..bd9a09f7 100644 --- a/project/index.js +++ b/project/index.js @@ -23,6 +23,72 @@ router.use(customRolesRouter) router.use(hotkeysRouter) router.use(metadataRouter) +// Adding tools to the Project +router.route("/:projectId/tools").post(async (req, res) => { + const { projectId } = req.params + const tools = req.body + + if (!projectId) { + return respondWithError(res, 400, "Project ID is required") + } + + if (!Array.isArray(tools)) { + tools = [tools] + } + + if (tools.every(tool => tool.name === "" || tool.value === "" || tool.url === "" || tool.state === undefined)) { + return respondWithError(res, 400, "All tools must have a name, value, URL, and state") + } + + if (!tools.every(tool => typeof tool.name === "string" && typeof tool.value === "string" && typeof tool.url === "string" && typeof tool.state === "boolean")) { + return respondWithError(res, 400, "All tools must have a valid name, value, URL, and state") + } + + if (!tools.every(tool => validateURL(tool.url))) { + return respondWithError(res, 400, "All tools must have a valid URL") + } + + try { + const project = new Project(projectId) + await project.addTools(tools) + res.status(201).json("Tools added successfully") + return + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}).put(async (req, res) => { + const { projectId } = req.params + const tools = req.body + + if (!projectId) { + return respondWithError(res, 400, "Project ID is required") + } + + if (!Array.isArray(tools) || tools.length === 0) { + return respondWithError(res, 400, "At least one tool is required") + } + + if (tools.every(tool => tool.value === "" || tool.state === undefined)) { + return respondWithError(res, 400, "All tools must have a value and state") + } + + if (!tools.every(tool => typeof tool.value === "string" && typeof tool.state === "boolean")) { + return respondWithError(res, 400, "All tools must have a valid value and state") + } + + try { + const project = new Project(projectId) + await project.updateTools(tools) + res.status(200).json("Tools updated successfully") + return + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use PUT instead") +}) + + // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) // router.use('/:projectId/page', pageRouter) diff --git a/utilities/validateNameValue.js b/utilities/validateNameValue.js new file mode 100644 index 00000000..e954399f --- /dev/null +++ b/utilities/validateNameValue.js @@ -0,0 +1,11 @@ +const noCode = new RegExp( + /[<>{}()[\];'"`]|script|on\w+=|javascript:/i +) + +export function isNotValidName(name) { + return noCode.test(name) +} + +export function isNotValidValue(value) { + return noCode.test(value) +} \ No newline at end of file From adf2e4f18990ab9b3d366018c7f7bb5e227ec2a8 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Tue, 20 May 2025 15:12:49 -0500 Subject: [PATCH 076/262] Adding endpoint to add multiple lines to a page --- line/index.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/line/index.js b/line/index.js index 0ef067ca..f6deb2c7 100644 --- a/line/index.js +++ b/line/index.js @@ -48,23 +48,29 @@ router.route('/:lineId') } }) -// Add a new line to an existing Page, save it in RERUM if it has body content. +// Add a new line/lines to an existing Page, save it in RERUM if it has body content. router.route('/') .post(auth0Middleware(), async (req, res) => { try { - const newLine = Line.build(req.params.projectId, req.params.pageId, { ...req.body }) const project = await getProjectById(req.params.projectId, res) if (!project) return const page = await getPageById(req.params.pageId, req.params.projectId, res) if (!page) return - - const existingLine = findLineInPage(page, newLine.id, res) - if (existingLine) { - respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) - return + + const inputLines = Array.isArray(req.body) ? req.body : [req.body] + + for (const lineData of inputLines) { + const newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }) + + const existingLine = findLineInPage(page, newLine.id, res) + if (existingLine) { + respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) + return + } + + const savedLine = await newLine.update() + page.items.push(savedLine) } - const savedLine = await newLine.update() - page.items.push(savedLine) await updatePageAndProject(page, project, res) res.status(201).json(newLine.asJSON(true)) From 8b1aad50ebd22d284b4ab8062ca961cf353edd3d Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Tue, 20 May 2025 16:19:56 -0500 Subject: [PATCH 077/262] Update index.js --- line/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/line/index.js b/line/index.js index f6deb2c7..77bc70b5 100644 --- a/line/index.js +++ b/line/index.js @@ -58,9 +58,10 @@ router.route('/') if (!page) return const inputLines = Array.isArray(req.body) ? req.body : [req.body] + let newLine for (const lineData of inputLines) { - const newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }) + newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }) const existingLine = findLineInPage(page, newLine.id, res) if (existingLine) { From 1957b73a610d100701cf7250752cc6bccb5f2cdf Mon Sep 17 00:00:00 2001 From: Onoja Victor <111019083+git-voo@users.noreply.github.com> Date: Tue, 20 May 2025 22:07:54 -0500 Subject: [PATCH 078/262] Add project metrics to /my/projects (#227) * Add project metrics to /my/profile * fix failing test * moving this for router use * Relocating lastModified functions - User gets a static to set pageId of last change - line router sends change trigger - shared utils gains functions that sort of static into Classes * Update index.js * tidy * organized naming * good to go * one save behind * Let's go * better detail in modified project:ID/page:ID * Update privateProfile.js --------- Co-authored-by: cubap --- classes/Page/Page.js | 13 +- classes/Project/ProjectFactory.js | 3 + classes/User/User.js | 14 +- line/index.js | 271 +++++++++++++++--------------- page/index.js | 54 +++--- project/index.js | 2 - userProfile/privateProfile.js | 40 ++++- utilities/shared.js | 125 +++++++++----- 8 files changed, 294 insertions(+), 228 deletions(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 5a2cd102..1b36b8c8 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -3,7 +3,6 @@ import dbDriver from "../../database/driver.js" const databaseTiny = new dbDriver("tiny") export default class Page { - #tinyAction = 'create' #setRerumId() { if (!this.id.startsWith(process.env.RERUMIDPREFIX)) { @@ -16,10 +15,10 @@ export default class Page { * Constructs a Page from the JSON Object in the Project `layers` Array reference. This * never creates a new Page, but rather wraps existing data in a Page object. * Use the `build` method to create a new Page. - * @param {hexString} projectId For the project this layer belongs to * @param {String} id The ID of the layer. This is the Layer stored in the Project. * @param {String} label The label of the layer. This is the Layer stored in the Project. * @param {String} target The uri of the targeted Canvas. + * @param {Array} items The array of Annotation objects. * @seeAlso {@link Page.build} */ constructor(layerId, { id, label, target, items = [] }) { @@ -100,9 +99,9 @@ export default class Page { } /** - * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. - * @returns {Promise} Resolves to the updated Layer object as stored in Project. - */ + * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. + * @returns {Promise} Resolves to the updated Layer object as stored in Project. + */ async update() { if (this.#tinyAction === 'update' || this.items.length) { this.#setRerumId() @@ -133,9 +132,9 @@ export default class Page { async delete() { if (this.#tinyAction === 'update') { // associated Annotations in RERUM will be left intact - await databaseTiny.remove(this.id) - .catch(err => false) + await databaseTiny.remove(this.id).catch(err => false) } return true } + } diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 6841b7b4..adb889a9 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -443,6 +443,9 @@ export default class ProjectFactory { license: 1, tools: 1, options: 1, + _createdAt:1, + _modifiedAt:1, + _lastModified:1 } } ] diff --git a/classes/User/User.js b/classes/User/User.js index 125ecd7a..da593b32 100644 --- a/classes/User/User.js +++ b/classes/User/User.js @@ -87,6 +87,15 @@ export default class User { return user.save() } + static async setLastModified(userId, lastModified) { + const user = await database.getById(userId, "users") + if (!user) { + throw new Error(`User with _id ${userId} not found`) + } + user._lastModified = lastModified + return database.update(user, "users") + } + async save() { // validate before save if (!this._id) { @@ -142,7 +151,10 @@ export default class User { _id: 1, // Project ID title: 1, // Project title label: 1, // Project label - roles: { $arrayElemAt: [`$groupInfo.members.${this._id}.roles`, 0] } // User roles within the group + roles: { $arrayElemAt: [`$groupInfo.members.${this._id}.roles`, 0] }, // User roles within the group + _lastModified: 1, // Last modified page + _createdAt: 1, // Creation date + _modifiedAt: 1 // Last modified date } } ]).toArray() diff --git a/line/index.js b/line/index.js index 0ef067ca..28d18a26 100644 --- a/line/index.js +++ b/line/index.js @@ -10,159 +10,156 @@ const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) // Load Line as temp line or from RERUM -router.route('/:lineId') - .get(async (req, res) => { - const { projectId, pageId, lineId } = req.params - if (!lineId) { - respondWithError(res, 400, 'Line ID is required.') - return +router.get('/:lineId', async (req, res) => { + const { projectId, pageId, lineId } = req.params + if (!lineId) { + respondWithError(res, 400, 'Line ID is required.') + return + } + if (!projectId || !pageId) { + respondWithError(res, 400, 'Project ID and Page ID are required.') + return + } + try { + if (lineId.startsWith(process.env.RERUMIDPREFIX)) { + return fetch(lineId).then(res => res.json()) } - if (!projectId || !pageId) { - respondWithError(res, 400, 'Project ID and Page ID are required.') + const projectData = (await getProjectById(projectId)).data + if (!projectData) { + respondWithError(res, 404, `Project with ID '${projectId}' not found`) return } - try { - if (lineId.startsWith(process.env.RERUMIDPREFIX)) { - return fetch(lineId).then(res => res.json()) - } - const projectData = (await getProjectById(projectId)).data - if (!projectData) { - respondWithError(res, 404, `Project with ID '${projectId}' not found`) - return - } - const pageContainingLine = projectData.layers - .flatMap(layer => layer.pages) - .find(page => findLineInPage(page, lineId)) + const pageContainingLine = projectData.layers + .flatMap(layer => layer.pages) + .find(page => findLineInPage(page, lineId)) - if (!pageContainingLine) { - respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) - return - } - const lineRef = findLineInPage(pageContainingLine, lineId) - const line = (lineRef.id ?? lineRef).startsWith?.(process.env.RERUMIDPREFIX) - ? await fetch(lineRef.id ?? lineRef).then(res => res.json()) - : new Line({ lineRef }) - res.json(line?.asJSON?.(true)) - } catch (error) { - res.status(error.status ?? 500).json({ error: error.message }) + if (!pageContainingLine) { + respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) + return } - }) + const lineRef = findLineInPage(pageContainingLine, lineId) + const line = (lineRef.id ?? lineRef).startsWith?.(process.env.RERUMIDPREFIX) + ? await fetch(lineRef.id ?? lineRef).then(res => res.json()) + : new Line({ lineRef }) + res.json(line?.asJSON?.(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } +}) -// Add a new line to an existing Page, save it in RERUM if it has body content. -router.route('/') - .post(auth0Middleware(), async (req, res) => { - try { - const newLine = Line.build(req.params.projectId, req.params.pageId, { ...req.body }) - const project = await getProjectById(req.params.projectId, res) - if (!project) return - const page = await getPageById(req.params.pageId, req.params.projectId, res) - if (!page) return +// Example: Refactored POST route +router.post('/', auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + try { + const newLine = Line.build(req.params.projectId,req.params.pageId,{ ...req.body }) + const project = await getProjectById(req.params.projectId, res) + if (!project) return + const page = await getPageById(req.params.pageId, req.params.projectId, res) + if (!page) return - const existingLine = findLineInPage(page, newLine.id, res) - if (existingLine) { - respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) - return - } - const savedLine = await newLine.update() - page.items.push(savedLine) - await updatePageAndProject(page, project, res) - - res.status(201).json(newLine.asJSON(true)) - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + const existingLine = findLineInPage(page, newLine.id, res) + if (existingLine) { + respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) + return } - }) + const savedLine = await newLine.update() + page.items.push(savedLine) + await updatePageAndProject(page, project, user._id) + + res.status(201).json(newLine.asJSON(true)) + } catch (error) { + respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } +}) // Update an existing line, including in RERUM -router.route('/:lineId') - .put(auth0Middleware(), async (req, res) => { - try { - const project = await getProjectById(req.params.projectId) - const page = await findPageById(req.params.pageId, req.params.projectId) - let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - if (!oldLine) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return - } - if (!(oldLine.id && oldLine.target && oldLine.body)) oldLine = await fetch(oldLine.id).then(res => res.json()) - const line = new Line(oldLine) - Object.assign(line, req.body) - const updatedLine = await line.update() - if (JSON.stringify(oldLine) === JSON.stringify(updatedLine)) { - // No changes made to the line, return the original - return res.status(304).json({ message: 'No changes made to the line' }) - } - const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() - res.json(line.asJSON(true)) - } catch (error) { - res.status(error.status ?? 500).json({ error: error.message }) +router.put('/:lineId', auth0Middleware(), async (req, res) => { + try { + const project = await getProjectById(req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) + let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!oldLine) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + if (!(oldLine.id && oldLine.target && oldLine.body)) oldLine = await fetch(oldLine.id).then(res => res.json()) + const line = new Line(oldLine) + Object.assign(line, req.body) + const updatedLine = await line.update() + if (JSON.stringify(oldLine) === JSON.stringify(updatedLine)) { + // No changes made to the line, return the original + return res.status(304).json({ message: 'No changes made to the line' }) } - }) + const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + page.items[lineIndex] = updatedLine + await page.update() + const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) + layer.pages[pageIndex] = page.asProjectPage() + await project.update() + res.json(line.asJSON(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } +}) // Update the text of an existing line -router.route('/:lineId/text') - .patch(auth0Middleware(), async (req, res) => { - try { - if (typeof req.body !== 'string') { - respondWithError(res, 400, 'Invalid request body. Expected a string.') - return - } - const project = await getProjectById(req.params.projectId) - const page = await findPageById(req.params.pageId, req.params.projectId) - const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - if (!oldLine) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return - } - const line = new Line(oldLine) - const updatedLine = await line.updateText(req.body) - const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() - res.json(line.asJSON(true)) - } catch (error) { - res.status(error.status ?? 500).json({ error: error.message }) +router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { + try { + if (typeof req.body !== 'string') { + respondWithError(res, 400, 'Invalid request body. Expected a string.') + return + } + const project = await getProjectById(req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) + const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!oldLine) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return } - }) + const line = new Line(oldLine) + const updatedLine = await line.updateText(req.body) + const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + page.items[lineIndex] = updatedLine + await page.update() + const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) + layer.pages[pageIndex] = page.asProjectPage() + await project.update() + res.json(line.asJSON(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } +}) // Update the xywh (bounds) of an existing line -router.route('/:lineId/bounds') - .patch(auth0Middleware(), async (req, res) => { - try { - if (typeof req.body !== 'object' || !req.body.x || !req.body.y || !req.body.w || !req.body.h) { - respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') - return - } - const project = await getProjectById(req.params.projectId) - const page = await findPageById(req.params.pageId, req.params.projectId) - const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - if (!oldLine) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return - } - const line = new Line(oldLine) - const updatedLine = await line.updateBounds(req.body) - const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() - res.json(line.asJSON(true)) - } catch (error) { - res.status(error.status ?? 500).json({ error: error.message }) +router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { + try { + if (typeof req.body !== 'object' || !req.body.x || !req.body.y || !req.body.w || !req.body.h) { + respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') + return + } + const project = await getProjectById(req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) + const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!oldLine) { + respondWithError(res, 404, `Line with ID '${req.params.line}' not found in page '${req.params.pageId}'`) + return } - }) + const line = new Line(oldLine) + const updatedLine = await line.updateBounds(req.body) + const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + page.items[lineIndex] = updatedLine + await page.update() + const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) + layer.pages[pageIndex] = page.asProjectPage() + await project.update() + res.json(line.asJSON(true)) + } catch (error) { + res.status(error.status ?? 500).json({ error: error.message }) + } +}) export default router diff --git a/page/index.js b/page/index.js index 80356978..d9e1a280 100644 --- a/page/index.js +++ b/page/index.js @@ -21,34 +21,36 @@ router.route('/:pageId') const pageObject = await findPageById(pageId, projectId) if (!pageObject) { respondWithError(res, 404, 'No page found with that ID.') - return - } - if(pageObject.id?.startsWith(process.env.RERUMIDPREFIX)){ - // If the page is a RERUM document, we need to fetch it from the server - const pageFromRerum = await fetch(pageObject.id).then(res => res.json()) - if (pageFromRerum) { - res.status(200).json(pageFromRerum) return } + if (pageObject.id?.startsWith(process.env.RERUMIDPREFIX)) { + // If the page is a RERUM document, we need to fetch it from the server + const pageFromRerum = await fetch(pageObject.id).then(res => res.json()) + if (pageFromRerum) { + res.status(200).json(pageFromRerum) + return + } + } + // build as AnnotationPage + const pageAsAnnotationPage = { + '@context': 'http://www.w3.org/ns/anno.jsonld', + id: pageObject.id, + type: 'AnnotationPage', + label: { none: [pageObject.label] }, + target: pageObject.target, + partOf: pageObject.partOf, + items: pageObject.items ?? [], + prev: pageObject.prev ?? null, + next: pageObject.next ?? null + } + res.status(200).json(pageAsAnnotationPage) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } - // build as AnnotationPage - const pageAsAnnotationPage = { - '@context': 'http://www.w3.org/ns/anno.jsonld', - id: pageObject.id, - type: 'AnnotationPage', - label: { none: [pageObject.label] }, - target: pageObject.target, - partOf: pageObject.partOf, - items: pageObject.items ?? [], - prev: pageObject.prev ?? null, - next: pageObject.next ?? null - } - res.status(200).json(pageAsAnnotationPage) - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') - } }) .put(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") const { projectId, pageId } = req.params const update = req.body if (!update) { @@ -60,7 +62,7 @@ router.route('/:pageId') respondWithError(res, 404, `Project with ID '${projectId}' not found`) return } - const layer = getLayerContainingPage(project,pageId) + const layer = getLayerContainingPage(project, pageId) if (!layer) { respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) return @@ -91,14 +93,14 @@ router.route('/:pageId') if (update.items) { pageObject.items = await Promise.all(pageObject.items.map(async item => { - const line = item.id?.startsWith?.('http') + const line = item.id?.startsWith?.('http') ? new Line(item) : Line.build(projectId, pageId, item) return await line.update() })) } - await updatePageAndProject(pageObject, project) + await updatePageAndProject(pageObject, project, user._id) res.status(200).json(pageObject) } catch (error) { diff --git a/project/index.js b/project/index.js index bd9a09f7..ebd1ec32 100644 --- a/project/index.js +++ b/project/index.js @@ -2,7 +2,6 @@ import express from "express" import cors from "cors" import common_cors from "../utilities/common_cors.json" with {type: "json"} import layerRouter from "../layer/index.js" -import pageRouter from "../page/index.js" import projectCreateRouter from "./projectCreateRouter.js" import import28Router from "./import28Router.js" import projectReadRouter from "./projectReadRouter.js" @@ -91,6 +90,5 @@ router.route("/:projectId/tools").post(async (req, res) => { // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) -// router.use('/:projectId/page', pageRouter) export default router diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index 9dc66c86..f9ef7744 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -15,8 +15,8 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { if (!user) return respondWithError(res, 401, "Unauthorized user") try { res.status(200).json(user) - } catch(error) { - respondWithError(res, error.status || error.code || 500, error.message?? "An error occurred while fetching the user data.") + } catch (error) { + respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") } }).put(auth0Middleware(), async (req, res) => { const user = req.user @@ -26,25 +26,47 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { const userProfile = await userObj.updateProfile(req.body) res.status(200).json(userProfile) } catch (error) { - respondWithError(res, error.status || error.code || 500, error.message?? "An error occurred while fetching the user data.") + respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") } -}).all((req, res)=> respondWithError(res, 405, "Improper request method. Use PUT instead")) +}).all((req, res) => respondWithError(res, 405, "Improper request method. Use PUT instead")) router.route("/projects").get(auth0Middleware(), async (req, res) => { const user = await req.user if (!user) return respondWithError(res, 401, "Unauthorized user") - try { + try { const userObj = await new User(user._id) const userProjects = await userObj.getProjects() + const validMetrics = userProjects.filter((proj) => proj._createdAt && proj._modifiedAt && proj._lastModified) + if (validMetrics.length === 0) { + return respondWithError(res, 404, "No valid projects found") + } + + // TODO: When the projects are all formatted correctly, we will not need this + + const newestProject = validMetrics.reduce((max, proj) => proj._createdAt > max._createdAt ? proj : max, {_createdAt: 0}) + const lastModifiedProject = validMetrics.reduce((max, proj) => proj._modifiedAt > max._modifiedAt ? proj : max, {_modifiedAt: 0}) + + const newest = `project:${newestProject._id}/page:${newestProject._lastModified}` + const lastModified = `project:${lastModifiedProject._id}/page:${lastModifiedProject._lastModified}` + + const userData = await userObj.getSelf() + const myRecent = userData._lastModified res.set("Content-Type", "application/json; charset=utf-8") - res.status(200).json(userProjects) + res.status(200).json({ + metrics: { + newest, + lastModified, + myRecent + }, + projects: userProjects + }) } catch (error) { - respondWithError(res, error?.status??500, error?.message??error.toString()) + respondWithError(res, error?.status ?? 500, error?.message ?? error.toString()) } -}).all((req, res)=> respondWithError(res, 405, "Improper request method. Use GET instead") +}).all((req, res) => respondWithError(res, 405, "Improper request method. Use GET instead") ) - + export default router diff --git a/utilities/shared.js b/utilities/shared.js index acdff164..ddad3f64 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -1,19 +1,19 @@ import DatabaseController from "../database/mongo/controller.js" import Project from '../classes/Project/Project.js' import Page from '../classes/Page/Page.js' - +import User from '../classes/User/User.js' /** * Check if the supplied input is valid JSON or not. * @param input A string or Object that should be JSON conformant. * @return boolean For whether or not the supplied input was JSON conformant. - */ -export function isValidJSON(input=""){ - if(input){ - try{ + */ +export function isValidJSON(input = "") { + if (input) { + try { const json = (typeof input === "string") ? JSON.parse(input) : JSON.parse(JSON.stringify(input)) return true - } - catch(no){} + } + catch (no) { } } return false } @@ -22,30 +22,30 @@ export function isValidJSON(input=""){ * Check if the supplied input is a valid integer TPEN Project ID * @param input A string which should be a valid Integer number * @return boolean For whether or not the supplied string was a valid Integer number - */ -export function validateID(id, type="mongo"){ - if(type == "mongo"){ + */ +export function validateID(id, type = "mongo") { + if (type == "mongo") { return new DatabaseController().isValidId(id) - }else{ - if(!isNaN(id)){ - try{ - id = parseInt(id) - return true + } else { + if (!isNaN(id)) { + try { + id = parseInt(id) + return true + } + catch (no) { } } - catch(no){} - } - return false + return false } - + } // Send a failure response with the proper code and message -export function respondWithError(res, status, message ){ - res.status(status).json({message}) +export function respondWithError(res, status, message) { + res.status(status).json({ message }) } // Send a successful response with the appropriate JSON -export function respondWithJSON(res, status, json){ +export function respondWithJSON(res, status, json) { const id = manifest["@id"] ?? manifest.id ?? null res.set("Content-Type", "application/json; charset=utf-8") res.status(status) @@ -55,48 +55,81 @@ export function respondWithJSON(res, status, json){ export const getProjectById = async (projectId, res) => { const project = await Project.getById(projectId) if (!project) { - respondWithError(res, 404, `Project with ID '${projectId}' not found`) - return null + respondWithError(res, 404, `Project with ID '${projectId}' not found`) + return null } return project - } - - // Fetch a page by ID - export const getPageById = async (pageId, projectId, res) => { +} + +// Fetch a page by ID +export const getPageById = async (pageId, projectId, res) => { const page = await findPageById(pageId, projectId) if (!page) { - respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) - return null + respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) + return null } return page - } - - // Find a line in a page - export const findLineInPage = (page, lineId) => { +} + +// Find a line in a page +export const findLineInPage = (page, lineId) => { const line = page.lines?.find(l => l.id.split('/').pop() === lineId.split('/').pop()) if (!line) { - return null + return null } return line - } - - // Update a page and its project - export const updatePageAndProject = async (page, project) => { +} + +// Update a page and its project +export const updatePageAndProject = async (page, project, userId) => { await page.update() const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) layer.pages[pageIndex] = page.asProjectPage() + await recordModification(project, page.id, userId) await project.update() - return project - } +} - // Get a Layer that contains a PageId - export const getLayerContainingPage = (project, pageId) => { - return project.data.layers.find(layer => - layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) - ) +// Log modifications for recent changes. We don't need to know much about it. +// We want to capture the id of the changed page and the user who made the change. +const recordModification = async (project, pageId, userId) => { + if (!project || !pageId) { + // silent failure of logging + console.error(`recordModification failed: projectId or pageId is missing. Submitted values - project: ${project}, page: ${page}, userId: ${userId}`) + return + } + + try { + // set _lastModified for the Project for "recent project" + project.data._lastModified = pageId.split("/").pop() + } catch (err) { + console.error("recordModification failed", err) + return } + if (!userId) { + // silent failure of logging + console.error(`recordModification failed: userId is missing. Submitted values - userId: ${userId}`) + return + } + + // set _lastModified for the User for "recent user" + try { + const lastModified = `project:${project._id}/page:${pageId.split("/").pop()}` + return User.setLastModified(userId, lastModified) + } catch (err) { + console.error("recordModification failed", err) + return + } +} + +// Get a Layer that contains a PageId +export const getLayerContainingPage = (project, pageId) => { + return project.data.layers.find(layer => + layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) + ) +} + // Find a page by ID (moved from page/index.js) export async function findPageById(pageId, projectId) { if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { From 5b220f3e4a07bd0dbe79063266d95399a95330d5 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Wed, 21 May 2025 10:52:09 -0500 Subject: [PATCH 079/262] Update index.js --- line/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/line/index.js b/line/index.js index 77bc70b5..5ae83827 100644 --- a/line/index.js +++ b/line/index.js @@ -51,6 +51,8 @@ router.route('/:lineId') // Add a new line/lines to an existing Page, save it in RERUM if it has body content. router.route('/') .post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") try { const project = await getProjectById(req.params.projectId, res) if (!project) return From 1e6df192daaaaa5143d643204ef08371683b9033 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 11:37:27 -0500 Subject: [PATCH 080/262] co-op --- project/import28Router.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/project/import28Router.js b/project/import28Router.js index 3f9a91c6..1757dc47 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -50,12 +50,10 @@ router.route("/import28/:uid").get( if (response.status === 500) return res.status(500).json({ message: "The project cannot be imported." }) - - const rawText = await response.text() - let parsedData = {} - + try { - const firstLevel = JSON.parse(rawText) + const firstLevel = await response.json().then(j => j).catch(err => {throw err}) + let parsedData = {} parsedData = Object.fromEntries( Object.entries(firstLevel).map(([key, value]) => { try { From c6b69d6fdd764bae00d7fd57a7d33655fdc9375a Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 11:42:58 -0500 Subject: [PATCH 081/262] co-op --- project/import28Router.js | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/project/import28Router.js b/project/import28Router.js index 1757dc47..f92db724 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -39,34 +39,25 @@ router.route("/import28/:uid").get( if (!uid) return respondWithError(res, 400, "Missing uid in query") try { - const response = await fetch( + const firstLevel = await fetch( `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, { method: "GET", headers: { Cookie: `JSESSIONID=${jsessionid}` }, credentials: "include" } - ) + ).then(resp => resp.json()).catch(err => {throw err}) - if (response.status === 500) - return res.status(500).json({ message: "The project cannot be imported." }) - - try { - const firstLevel = await response.json().then(j => j).catch(err => {throw err}) - let parsedData = {} - parsedData = Object.fromEntries( - Object.entries(firstLevel).map(([key, value]) => { - try { - return [key, JSON.parse(value)] - } catch { - return [key, value] - } - }) - ) - } catch (err) { - console.error("Failed to parse project response:", err) - return respondWithError(res, 500, "Invalid project response format") - } + let parsedData = {} + parsedData = Object.fromEntries( + Object.entries(firstLevel).map(([key, value]) => { + try { + return [key, JSON.parse(value)] + } catch { + return [key, value] + } + }) + ) return res.status(200).json({ message: "Select a Project to Import : ", From 2eba4aa90f52e29f5f2920bfec5572ddb9219c86 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 11:46:03 -0500 Subject: [PATCH 082/262] co-op --- project/import28Router.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project/import28Router.js b/project/import28Router.js index f92db724..a146d706 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -43,7 +43,10 @@ router.route("/import28/:uid").get( `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, { method: "GET", - headers: { Cookie: `JSESSIONID=${jsessionid}` }, + headers: { + "Content-Type": "application/json; charset=utf-8", + "Cookie": `JSESSIONID=${jsessionid}` + }, credentials: "include" } ).then(resp => resp.json()).catch(err => {throw err}) From b8f1e24e06179958ab161a01583ab9ebd8385d14 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 11:49:31 -0500 Subject: [PATCH 083/262] OK log time --- project/import28Router.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/project/import28Router.js b/project/import28Router.js index a146d706..444c749c 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -39,6 +39,8 @@ router.route("/import28/:uid").get( if (!uid) return respondWithError(res, 400, "Missing uid in query") try { + console.log(`FETCH ${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`) + console.log(`JSESSION ${jsessionid}`) const firstLevel = await fetch( `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, { @@ -49,7 +51,12 @@ router.route("/import28/:uid").get( }, credentials: "include" } - ).then(resp => resp.json()).catch(err => {throw err}) + ) + .then(resp => { + console.log(resp) + if(resp.ok) return resp.json() + }) + .catch(err => {throw err}) let parsedData = {} parsedData = Object.fromEntries( From ccd2ad8872a9b14fa44756c24bd15eb5b3879891 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:02:55 -0500 Subject: [PATCH 084/262] do 401 from TPEN2 the right way --- project/import28Router.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/project/import28Router.js b/project/import28Router.js index 444c749c..c54d7288 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -39,8 +39,6 @@ router.route("/import28/:uid").get( if (!uid) return respondWithError(res, 400, "Missing uid in query") try { - console.log(`FETCH ${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`) - console.log(`JSESSION ${jsessionid}`) const firstLevel = await fetch( `${process.env.TPEN28URL}/TPEN/projects?uid=${uid}`, { @@ -53,8 +51,10 @@ router.route("/import28/:uid").get( } ) .then(resp => { - console.log(resp) - if(resp.ok) return resp.json() + if(resp.status === 401) { + console.error("Got a 401") + } + return resp.json() }) .catch(err => {throw err}) @@ -74,7 +74,8 @@ router.route("/import28/:uid").get( data: parsedData }) } catch (error) { - console.error("Error fetching project data:", error) + console.error("Error fetching project data") + console.error(error) return respondWithError(res, 500, "Error fetching project data") } } From 1e103b6b048791f2537a15d9fe2c6f047490ecbe Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:04:23 -0500 Subject: [PATCH 085/262] do 401 from TPEN2 the right way --- project/import28Router.js | 1 + 1 file changed, 1 insertion(+) diff --git a/project/import28Router.js b/project/import28Router.js index c54d7288..e56b430f 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -53,6 +53,7 @@ router.route("/import28/:uid").get( .then(resp => { if(resp.status === 401) { console.error("Got a 401") + return respondWithError(res, 401, resp.statusText) } return resp.json() }) From b8fa84cac56b1bf6a295bfdacd29f771cc5e86b9 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:05:59 -0500 Subject: [PATCH 086/262] do 401 from TPEN2 the right way --- project/import28Router.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/project/import28Router.js b/project/import28Router.js index e56b430f..fed07756 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -51,10 +51,11 @@ router.route("/import28/:uid").get( } ) .then(resp => { - if(resp.status === 401) { - console.error("Got a 401") - return respondWithError(res, 401, resp.statusText) - } + if(!resp.ok) throw resp + // if(resp.status === 401) { + // console.error("Got a 401") + // throw resp + // } return resp.json() }) .catch(err => {throw err}) @@ -77,7 +78,7 @@ router.route("/import28/:uid").get( } catch (error) { console.error("Error fetching project data") console.error(error) - return respondWithError(res, 500, "Error fetching project data") + return respondWithError(res, error.status ?? 500, error.statusText ?? "Error fetching project data") } } ).all((req, res) => { From 7b735f53f21f010db1003e2df842b14334a5b133 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:07:21 -0500 Subject: [PATCH 087/262] do 401 from TPEN2 the right way --- project/import28Router.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/project/import28Router.js b/project/import28Router.js index fed07756..90ba4c22 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -52,10 +52,6 @@ router.route("/import28/:uid").get( ) .then(resp => { if(!resp.ok) throw resp - // if(resp.status === 401) { - // console.error("Got a 401") - // throw resp - // } return resp.json() }) .catch(err => {throw err}) @@ -76,8 +72,6 @@ router.route("/import28/:uid").get( data: parsedData }) } catch (error) { - console.error("Error fetching project data") - console.error(error) return respondWithError(res, error.status ?? 500, error.statusText ?? "Error fetching project data") } } From ebdcd1395dd22ebcc00e4c52e55c534abf919af4 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:13:03 -0500 Subject: [PATCH 088/262] gotta import the function --- project/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/project/index.js b/project/index.js index ebd1ec32..4523cb81 100644 --- a/project/index.js +++ b/project/index.js @@ -9,6 +9,7 @@ import memberRouter from "./memberRouter.js" import customRolesRouter from "./customRolesRouter.js" import hotkeysRouter from "./hotkeysRouter.js" import metadataRouter from "./metadataRouter.js" +import { respondWithError } from "../utilities/shared.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) From 272ca586f79ccdcf0de564b24fb2d1d25464d99d Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Wed, 21 May 2025 12:24:11 -0500 Subject: [PATCH 089/262] Update index.js --- line/index.js | 55 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/line/index.js b/line/index.js index 1c6d7bbd..24e0736f 100644 --- a/line/index.js +++ b/line/index.js @@ -48,37 +48,36 @@ router.get('/:lineId', async (req, res) => { }) // Add a new line/lines to an existing Page, save it in RERUM if it has body content. -router.route('/') - .post(auth0Middleware(), async (req, res) => { - const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") - try { - const project = await getProjectById(req.params.projectId, res) - if (!project) return - const page = await getPageById(req.params.pageId, req.params.projectId, res) - if (!page) return - - const inputLines = Array.isArray(req.body) ? req.body : [req.body] - let newLine - - for (const lineData of inputLines) { - newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }) - - const existingLine = findLineInPage(page, newLine.id, res) - if (existingLine) { - respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) - return - } - - const savedLine = await newLine.update() - page.items.push(savedLine) +router.post('/', auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + try { + const project = await getProjectById(req.params.projectId, res) + if (!project) return + const page = await getPageById(req.params.pageId, req.params.projectId, res) + if (!page) return + + const inputLines = Array.isArray(req.body) ? req.body : [req.body] + let newLine + + for (const lineData of inputLines) { + newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }) + + const existingLine = findLineInPage(page, newLine.id, res) + if (existingLine) { + respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) + return } - await updatePageAndProject(page, project, res) - res.status(201).json(newLine.asJSON(true)) - } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + const savedLine = await newLine.update() + page.items.push(savedLine) } + await updatePageAndProject(page, project, user._id) + + res.status(201).json(newLine.asJSON(true)) + } catch (error) { + respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } }) // Update an existing line, including in RERUM From 4e9bcafb94edc0d0ad0d8714951c07d569554df0 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:30:12 -0500 Subject: [PATCH 090/262] Need to import Project --- project/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/project/index.js b/project/index.js index 4523cb81..5bddc0a9 100644 --- a/project/index.js +++ b/project/index.js @@ -10,6 +10,7 @@ import customRolesRouter from "./customRolesRouter.js" import hotkeysRouter from "./hotkeysRouter.js" import metadataRouter from "./metadataRouter.js" import { respondWithError } from "../utilities/shared.js" +import Project from "../classes/Project.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) From 39c110f3dd02e89a087df1dcd6c717d40633a10a Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:32:50 -0500 Subject: [PATCH 091/262] Need to import Project --- project/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/index.js b/project/index.js index 5bddc0a9..2c46fda4 100644 --- a/project/index.js +++ b/project/index.js @@ -10,7 +10,7 @@ import customRolesRouter from "./customRolesRouter.js" import hotkeysRouter from "./hotkeysRouter.js" import metadataRouter from "./metadataRouter.js" import { respondWithError } from "../utilities/shared.js" -import Project from "../classes/Project.js" +import Project from "../classes/Project/Project.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) From 68da79dc43e679d902d24bb2d342ef462dbf02c4 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 21 May 2025 12:55:41 -0500 Subject: [PATCH 092/262] Good to go --- line/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/line/index.js b/line/index.js index 24e0736f..166deb04 100644 --- a/line/index.js +++ b/line/index.js @@ -59,7 +59,7 @@ router.post('/', auth0Middleware(), async (req, res) => { const inputLines = Array.isArray(req.body) ? req.body : [req.body] let newLine - + // This feels like a use case for /bulkCreate in RERUM. Make all these lines with one call. for (const lineData of inputLines) { newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }) From 07db20481d64c26cdffff518ec119495113b3148 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Wed, 21 May 2025 15:00:27 -0500 Subject: [PATCH 093/262] Separating files --- project/index.js | 69 +-------------------------------- project/projectToolsRouter.js | 72 +++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 67 deletions(-) create mode 100644 project/projectToolsRouter.js diff --git a/project/index.js b/project/index.js index 2c46fda4..6b5f6397 100644 --- a/project/index.js +++ b/project/index.js @@ -9,8 +9,7 @@ import memberRouter from "./memberRouter.js" import customRolesRouter from "./customRolesRouter.js" import hotkeysRouter from "./hotkeysRouter.js" import metadataRouter from "./metadataRouter.js" -import { respondWithError } from "../utilities/shared.js" -import Project from "../classes/Project/Project.js" +import projectToolsRouter from "./projectToolsRouter.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) @@ -23,71 +22,7 @@ router.use(memberRouter) router.use(customRolesRouter) router.use(hotkeysRouter) router.use(metadataRouter) - -// Adding tools to the Project -router.route("/:projectId/tools").post(async (req, res) => { - const { projectId } = req.params - const tools = req.body - - if (!projectId) { - return respondWithError(res, 400, "Project ID is required") - } - - if (!Array.isArray(tools)) { - tools = [tools] - } - - if (tools.every(tool => tool.name === "" || tool.value === "" || tool.url === "" || tool.state === undefined)) { - return respondWithError(res, 400, "All tools must have a name, value, URL, and state") - } - - if (!tools.every(tool => typeof tool.name === "string" && typeof tool.value === "string" && typeof tool.url === "string" && typeof tool.state === "boolean")) { - return respondWithError(res, 400, "All tools must have a valid name, value, URL, and state") - } - - if (!tools.every(tool => validateURL(tool.url))) { - return respondWithError(res, 400, "All tools must have a valid URL") - } - - try { - const project = new Project(projectId) - await project.addTools(tools) - res.status(201).json("Tools added successfully") - return - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}).put(async (req, res) => { - const { projectId } = req.params - const tools = req.body - - if (!projectId) { - return respondWithError(res, 400, "Project ID is required") - } - - if (!Array.isArray(tools) || tools.length === 0) { - return respondWithError(res, 400, "At least one tool is required") - } - - if (tools.every(tool => tool.value === "" || tool.state === undefined)) { - return respondWithError(res, 400, "All tools must have a value and state") - } - - if (!tools.every(tool => typeof tool.value === "string" && typeof tool.state === "boolean")) { - return respondWithError(res, 400, "All tools must have a valid value and state") - } - - try { - const project = new Project(projectId) - await project.updateTools(tools) - res.status(200).json("Tools updated successfully") - return - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use PUT instead") -}) +router.use(projectToolsRouter) // Nested route for layers within a project diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js new file mode 100644 index 00000000..c20b8520 --- /dev/null +++ b/project/projectToolsRouter.js @@ -0,0 +1,72 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import Project from "../classes/Project/Project.js" + +const router = express.Router({ mergeParams: true }) + +// Adding tools to the Project +router.route("/:projectId/tools").post(async (req, res) => { + const { projectId } = req.params + const tools = req.body + + if (!projectId) { + return respondWithError(res, 400, "Project ID is required") + } + + if (!Array.isArray(tools)) { + tools = [tools] + } + + if (tools.every(tool => tool.name === "" || tool.value === "" || tool.url === "" || tool.state === undefined)) { + return respondWithError(res, 400, "All tools must have a name, value, URL, and state") + } + + if (!tools.every(tool => typeof tool.name === "string" && typeof tool.value === "string" && typeof tool.url === "string" && typeof tool.state === "boolean")) { + return respondWithError(res, 400, "All tools must have a valid name, value, URL, and state") + } + + if (!tools.every(tool => validateURL(tool.url))) { + return respondWithError(res, 400, "All tools must have a valid URL") + } + + try { + const project = new Project(projectId) + await project.addTools(tools) + res.status(201).json("Tools added successfully") + return + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}).put(async (req, res) => { + const { projectId } = req.params + const tools = req.body + + if (!projectId) { + return respondWithError(res, 400, "Project ID is required") + } + + if (!Array.isArray(tools) || tools.length === 0) { + return respondWithError(res, 400, "At least one tool is required") + } + + if (tools.every(tool => tool.value === "" || tool.state === undefined)) { + return respondWithError(res, 400, "All tools must have a value and state") + } + + if (!tools.every(tool => typeof tool.value === "string" && typeof tool.state === "boolean")) { + return respondWithError(res, 400, "All tools must have a valid value and state") + } + + try { + const project = new Project(projectId) + await project.updateTools(tools) + res.status(200).json("Tools updated successfully") + return + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message.toString()) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use PUT instead") +}) + +export default router \ No newline at end of file From 629447ee0cf21c4efc03a6be35a56c912759e5dd Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 28 May 2025 15:06:50 -0500 Subject: [PATCH 094/262] add metarecords to new Projects (#254) --- classes/Project/Project.js | 5 ++++- classes/Project/ProjectFactory.js | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 252f4511..a23eaf57 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -25,7 +25,10 @@ export default class Project { if (!validation.isValid) { throw { status: 400, message: validation.errors } } - + + payload._createdAt ??= Date.now().toString().slice(-6) + payload._modifiedAt ??= -1 + payload._lastModified ??= payload.layers?.[0]?.pages?.[0]?.id ?? true console.log("Creating project...", payload.layers) try { return database.save(payload, "projects") diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index adb889a9..1c0d12ad 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -104,13 +104,18 @@ export default class ProjectFactory { const metadata = manifest.metadata ?? [] const layer = Layer.build( database.reserveId(), `First Layer - ${label}`, manifest.items ) + const firstPage = layer.pages[0]?.id ?? true + // required properties: id, label, metadata, manifest, layers return { label, metadata, manifest: [ manifest.id ], layers: [ layer.asProjectLayer() ], - tools: this.tools + tools: this.tools, + _createdAt: now, + _modifiedAt: -1, + _lastModified: firstPage, } } From 9ed31751cee6560242629ccce3e2b2e8954f426e Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 28 May 2025 16:30:03 -0500 Subject: [PATCH 095/262] 256 import creates bad ids (#257) * correct id for new Layers * set _id on imported project * Update Layer.js --- classes/Layer/Layer.js | 12 ++++++------ classes/Project/Project.js | 1 - classes/Project/ProjectFactory.js | 4 +++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index a65bf53b..a75f1d33 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -36,18 +36,18 @@ export default class Layer { // Static Methods static build(projectId, label, canvases, projectLabel = "Default") { - let thisLayer = {} - projectId ??= database.reserveId() - thisLayer.projectId = projectId - thisLayer.label = label ?? `${projectLabel} - Layer ${Date.now()}` - if (!Array.isArray(canvases)) { if (!canvases) { throw new Error("At least one Canvas must be included.") } canvases = [canvases] } - thisLayer.id = `${process.env.SERVERURL}layer/${databaseTiny.reserveId()}` + + const thisLayer = { + projectId, + label: label ?? `${projectLabel} - Layer ${Date.now()}`, + id: `${process.env.SERVERURL}project/${projectId.split('/').pop()}/layer/${databaseTiny.reserveId()}` + } const pages = canvases.map(c => Page.build(projectId, thisLayer.id, c).asProjectPage()) pages.forEach((page, index) => { if (index > 0) page.prev = pages[index - 1].id diff --git a/classes/Project/Project.js b/classes/Project/Project.js index a23eaf57..32d4eb28 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -29,7 +29,6 @@ export default class Project { payload._createdAt ??= Date.now().toString().slice(-6) payload._modifiedAt ??= -1 payload._lastModified ??= payload.layers?.[0]?.pages?.[0]?.id ?? true - console.log("Creating project...", payload.layers) try { return database.save(payload, "projects") } catch (err) { diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 1c0d12ad..ae29e771 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -99,15 +99,17 @@ export default class ProjectFactory { message: err.message ?? "No manifest found. Cannot process empty object" } } + const _id = database.reserveId() const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now const metadata = manifest.metadata ?? [] - const layer = Layer.build( database.reserveId(), `First Layer - ${label}`, manifest.items ) + const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items ) const firstPage = layer.pages[0]?.id ?? true // required properties: id, label, metadata, manifest, layers return { + _id, label, metadata, manifest: [ manifest.id ], From d9a6d7668250f53fc253a23e6f63adf5feb5478d Mon Sep 17 00:00:00 2001 From: cubap Date: Thu, 29 May 2025 13:33:31 -0500 Subject: [PATCH 096/262] always trim lastModified --- classes/Project/Project.js | 2 +- classes/Project/ProjectFactory.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 32d4eb28..b2c2cd64 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -28,7 +28,7 @@ export default class Project { payload._createdAt ??= Date.now().toString().slice(-6) payload._modifiedAt ??= -1 - payload._lastModified ??= payload.layers?.[0]?.pages?.[0]?.id ?? true + payload._lastModified ??= payload.layers?.[0]?.pages?.[0]?.id.split('/').pop() ?? true try { return database.save(payload, "projects") } catch (err) { diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index ae29e771..29e4c69b 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -105,7 +105,7 @@ export default class ProjectFactory { const metadata = manifest.metadata ?? [] const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items ) - const firstPage = layer.pages[0]?.id ?? true + const firstPage = layer.pages[0]?.id.split('/').pop() ?? true // required properties: id, label, metadata, manifest, layers return { From 0fd815ba8ab123cbaab7deee678dd26b383d5659 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 29 May 2025 15:01:22 -0500 Subject: [PATCH 097/262] hotifx invite code --- classes/Project/Project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index b2c2cd64..7458a112 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -141,7 +141,7 @@ export default class Project { await user.save() await this.inviteExistingTPENUser(user._id, roles) - return user.inviteCode + return inviteCode } async removeMember(userId) { From c4c2512637ce3308ab8d7e739c76c3e9fb12e3b9 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 11 Jun 2025 10:26:40 -0500 Subject: [PATCH 098/262] Email invite, upgrade temp user (#259) * Now we see it * Need to do the agent in the GH action * functioning demo * touches * touchup * links * links * unused * noted todo * Use env variables instead of hard coded links * Use env variables instead of hard coded links --- auth/index.js | 21 ++++++++++------ classes/Project/Project.js | 51 ++++++++++++++++++++++---------------- classes/User/User.js | 9 +++++++ index.js | 2 +- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/auth/index.js b/auth/index.js index 10b154ed..05f742af 100644 --- a/auth/index.js +++ b/auth/index.js @@ -55,11 +55,6 @@ function auth0Middleware() { const uid = agent.split("id/")[1] const user = new User(uid) user.getSelf().then(async (u) => { - if (u?.profile) { - req.user = u - next() - return - } user.data = { _id: uid, agent, @@ -67,9 +62,21 @@ function auth0Middleware() { email: payload.name, profile: { displayName: payload.nickname }, } - user.save() - req.user = user + if(!u || !u?.profile) { + user.save() + req.user = user + next() + return + } + if(u?.inviteCode || u._sub.includes("temp-")) { + user.update() + req.user = user + next() + return + } + req.user = u next() + return }) } catch (error) { next(error) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 7458a112..918ffbc1 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -63,18 +63,37 @@ export default class Project { const roles = this.parseRoles(rolesString) const projectTitle = this.data?.label ?? this.data?.title ?? 'TPEN Project' let message = `You have been invited to the TPEN project ${projectTitle}. - View project here.` + View project here.` if (user) { await this.inviteExistingTPENUser(user._id, roles) - } else { - const inviteCode = await this.inviteNewTPENUser(email, roles) - // We will replace this URL with the correct url - const url = `https://three.t-pen.org/login?invite-code=${inviteCode}` - message += `

Click the button below to get started with your project

- - or copy the following link into your web browser ${url}

` + } + else { + const inviteData = await this.inviteNewTPENUser(email, roles) + const returnTo = encodeURIComponent(`${process.env.TPENINTERFACES}project?projectID=${this.data._id}&inviteCode=${inviteData.tpenUserID}`) + // Signup starting at the TPEN3 public site + const signup = `${process.env.TPENTHREE}login + ?inviteCode=${inviteData.tpenUserID} + &returnTo=${returnTo} + ` + // TODO decline endpoint in TPEN Services + const decline = `${process.env.TPENINTERFACES}project/decline + ?inviteCode=${inviteData.tpenUserID} + &groupID=${inviteData.tpenGroupID} + ` + message += ` +

+ Click the button below to get started with your project

+ + or copy the following link into your web browser ${signup} +

+

+ This E-mail address may be visible to members of the project so that they know + about the potential of new members. You may decline this invitation which will keep + you out of the project and remove the visibility of this E-mail address from project details.
+ Click here to decline the invitation. +

+ ` } - await sendMail(email, `Invitation to ${projectTitle}`, message) return this } catch (error) { @@ -133,15 +152,14 @@ export default class Project { async inviteNewTPENUser(email, roles) { const user = new User() - const inviteCode = this.#generateInviteCode(user._id) + const inviteCode = user._id const agent = `https://store.rerum.io/v1/id/${user._id}` const profile = { displayName: email.split("@")[0] } const _sub = `temp-${user._id}` // This is a temporary sub for the user until they verify their email user.data = { email, _sub, profile, agent, inviteCode } await user.save() await this.inviteExistingTPENUser(user._id, roles) - - return inviteCode + return { "tpenUserID":user._id, "tpenGroupID":this.data.group } } async removeMember(userId) { @@ -238,15 +256,6 @@ export default class Project { return await database.save(this.data, process.env.TPENPROJECTS) } - #generateInviteCode(userId) { - const date = Date.now().toString() - const data = `${date}:${userId}` - - const hash = createHash("sha256") - hash.update(data) - return hash.digest("hex") - } - async #load() { return database.getById(this._id, "projects").then((resp) => { this.data = resp diff --git a/classes/User/User.js b/classes/User/User.js index da593b32..6b494e09 100644 --- a/classes/User/User.js +++ b/classes/User/User.js @@ -123,6 +123,15 @@ export default class User { */ async update(){ + if (!this._id) { + throw new Error("User must have an _id") + } + if (!this.data.email) { + throw new Error("User must have an email") + } + if (!this.data.profile?.displayName) { + throw new Error("User must have a profile with a displayName") + } return database.update(this.data, "users") } diff --git a/index.js b/index.js index e0beb88b..9de58d82 100644 --- a/index.js +++ b/index.js @@ -62,7 +62,7 @@ function makeCleanFileFromMarkdown(file) { - + API Documentation From 0c21de884b0bcd14abbd7ab6027e805abc004c02 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 11 Jun 2025 10:40:01 -0500 Subject: [PATCH 099/262] hotfix links in E-mail --- classes/Project/Project.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 918ffbc1..fdf1b6f0 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -71,15 +71,9 @@ export default class Project { const inviteData = await this.inviteNewTPENUser(email, roles) const returnTo = encodeURIComponent(`${process.env.TPENINTERFACES}project?projectID=${this.data._id}&inviteCode=${inviteData.tpenUserID}`) // Signup starting at the TPEN3 public site - const signup = `${process.env.TPENTHREE}login - ?inviteCode=${inviteData.tpenUserID} - &returnTo=${returnTo} - ` + const signup = `${process.env.TPENTHREE}login?inviteCode=${inviteData.tpenUserID}&returnTo=${returnTo}` // TODO decline endpoint in TPEN Services - const decline = `${process.env.TPENINTERFACES}project/decline - ?inviteCode=${inviteData.tpenUserID} - &groupID=${inviteData.tpenGroupID} - ` + const decline = `${process.env.TPENINTERFACES}project/decline?inviteCode=${inviteData.tpenUserID}&groupID=${inviteData.tpenGroupID}` message += `

Click the button below to get started with your project

From f0d7bc295eb2227206212230504358ddff6ec594 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 11 Jun 2025 10:53:36 -0500 Subject: [PATCH 100/262] hotfix links in E-mail --- classes/Project/Project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index fdf1b6f0..adfeac40 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -63,7 +63,7 @@ export default class Project { const roles = this.parseRoles(rolesString) const projectTitle = this.data?.label ?? this.data?.title ?? 'TPEN Project' let message = `You have been invited to the TPEN project ${projectTitle}. - View project here.` + View project here.` if (user) { await this.inviteExistingTPENUser(user._id, roles) } From 36ed128280e314bca63b631a9789c4984804e2ae Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 12 Jun 2025 16:06:07 -0500 Subject: [PATCH 101/262] Align User With Project After Invite (#263) * need to take one of those 'limitless' pills for this * touchup * renaming, documentation, cleanup, and better code integration * renaming, documentation, cleanup, and better code integration * renaming, documentation, cleanup, and better code integration * renaming, documentation, cleanup, and better code integration --- auth/index.js | 20 +++++------- classes/User/User.js | 5 +++ database/driver.js | 3 +- project/index.js | 3 +- project/memberUpgradeRouter.js | 57 ++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 project/memberUpgradeRouter.js diff --git a/auth/index.js b/auth/index.js index 05f742af..b30021e1 100644 --- a/auth/index.js +++ b/auth/index.js @@ -55,25 +55,19 @@ function auth0Middleware() { const uid = agent.split("id/")[1] const user = new User(uid) user.getSelf().then(async (u) => { - user.data = { - _id: uid, - agent, - _sub: payload.sub, - email: payload.name, - profile: { displayName: payload.nickname }, - } if(!u || !u?.profile) { + user.data = { + _id: uid, + agent, + _sub: payload.sub, + email: payload.name, + profile: { displayName: payload.nickname }, + } user.save() req.user = user next() return } - if(u?.inviteCode || u._sub.includes("temp-")) { - user.update() - req.user = user - next() - return - } req.user = u next() return diff --git a/classes/User/User.js b/classes/User/User.js index 6b494e09..45ade529 100644 --- a/classes/User/User.js +++ b/classes/User/User.js @@ -111,6 +111,11 @@ export default class User { return database.save({ _id: this._id, ...this.data }, "users") } + async delete() { + // delete user from database + return database.delete({ _id: this._id}, "users") + } + /** * this assumes that the project object includes the following properties { diff --git a/database/driver.js b/database/driver.js index a896706b..4973c412 100644 --- a/database/driver.js +++ b/database/driver.js @@ -115,7 +115,8 @@ class dbDriver { async delete(data, collection) { collection ??= resolveCollection(data) if (!collection) throw new Error("Cannot determine collection for delete operation") - return this.controller.remove(data, collection) + const id = data["@id"] ?? data.id ?? data._id ?? data + return this.controller.remove(id, collection) } /** diff --git a/project/index.js b/project/index.js index 6b5f6397..27f706bf 100644 --- a/project/index.js +++ b/project/index.js @@ -10,11 +10,13 @@ import customRolesRouter from "./customRolesRouter.js" import hotkeysRouter from "./hotkeysRouter.js" import metadataRouter from "./metadataRouter.js" import projectToolsRouter from "./projectToolsRouter.js" +import memberUpgradeRouter from "./memberUpgradeRouter.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) // Use split routers +router.use(memberUpgradeRouter) // Contains unauthenticated route! router.use(projectCreateRouter) router.use(import28Router) router.use(projectReadRouter) @@ -24,7 +26,6 @@ router.use(hotkeysRouter) router.use(metadataRouter) router.use(projectToolsRouter) - // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) diff --git a/project/memberUpgradeRouter.js b/project/memberUpgradeRouter.js new file mode 100644 index 00000000..7b93786e --- /dev/null +++ b/project/memberUpgradeRouter.js @@ -0,0 +1,57 @@ +import express from "express" +import { validateID, respondWithError } from "../utilities/shared.js" +import Project from "../classes/Project/Project.js" +import Group from "../classes/Group/Group.js" +import User from "../classes/User/User.js" + +const router = express.Router({ mergeParams: true }) + +/** + * Occurs when someone follows the magic link from the invite in their E-mail where + * the inviteCode does not match the Agent _id from their token on an authenticated route. + * Ex. A user follows their invite link and logs in with their existing GoG user in the Auth0 tenant. + * + * Remove the 'temporary' user entry in the Group members. + * By replacing it with the Agent _id from the token. + * Remove the 'temporary' user from the db. + * Downstream the existing Agent _id data will be saved as the 'upgraded' user in the TPEN3 db. + * + * @param projectId - The project which contains the temporary TPEN3 User as a member. + * @param collaboratorId - The temporary TPEN3 User wanting a new Agent that matches their inviteCode. + * @param agentId - The existing Agent _id to use for 'upgrading' the TPEN3 User instead of their collaboratorId. + */ +router.route("/:projectId/collaborator/:collaboratorId/agent/:agentId").get(async (req, res) => { + const { projectId, collaboratorId, agentId } = req.params + if (!projectId || !collaboratorId || !agentId) return respondWithError(res, 400, "Not all data was provided.") + try { + const tempUser = new User(collaboratorId) + const tempData = await tempUser.getSelf() + if(!tempData?.profile) return respondWithError(res, 404, "Temporary user does not exist") + if(!tempData?.inviteCode) return respondWithError(res, 400, "Temporary user provided is not a temporary user.") + const project = await new Project(projectId).loadProject() + if(!project) return respondWithError(res, 404, "Project does not exist.") + const group = new Group(project.group) + let tempRoles = await group.getMemberRoles(tempData._id) + if(!tempRoles) tempRoles = {"VIEWER":[]} + group.addMember(agentId, Object.keys(tempRoles)) + try { + group.removeMember(tempData._id) + } + catch (err) { + // keep going. + } + await group.update() + tempUser.delete() + res.status(200).send(`Temporary user '${collaboratorId}' upgraded to user '${agentId}'.`) + } catch (error) { + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "An error occurred." + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + +export default router From 7d68ee8f5a85eaf32887c307b6af45cff65d8f4b Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Mon, 16 Jun 2025 16:29:08 -0500 Subject: [PATCH 102/262] Create New Project from One Image --- classes/Project/ProjectFactory.js | 185 +++++++++++++++++++++++++++++- package-lock.json | 13 +++ package.json | 1 + project/projectCreateRouter.js | 22 ++++ 4 files changed, 217 insertions(+), 4 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 29e4c69b..065a98c1 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -4,6 +4,8 @@ import User from "../User/User.js" import Layer from "../Layer/Layer.js" import dbDriver from "../../database/driver.js" import vault from "../../utilities/vault.js" +import { imageSize } from 'image-size'; +import fetch from 'node-fetch'; const database = new dbDriver("mongo") @@ -150,6 +152,172 @@ export default class ProjectFactory { }) } + /** + * Creates a new manifest from given image url and project label. + * @param {string} imageUrl - URL of the image to be used in the project. + * @param {string} label - Label for the project. + * @returns {Object} - Returns the created project object. + */ + + static async getImageDimensions(imgUrl) { + try { + const response = await fetch(imgUrl) + if (!response.ok) { + throw new Error(`Failed to fetch image: ${response.status} ${response.statusText}`) + } + const buffer = await response.buffer() + const dimensions = imageSize(buffer) + return { width: dimensions.width, height: dimensions.height } + } catch (error) { + console.error('Error getting image dimensions:', error) + return null + } + } + + static async DBObjectFromImage(manifest) { + if (!manifest) { + throw { + status: 404, + message: err.message ?? "No manifest found. Cannot process empty object" + } + } + const _id = manifest.id.split('/').slice(-2, -1)[0] + const now = Date.now().toString().slice(-6) + const label = ProjectFactory.getLabelAsString(manifest.label) + const metadata = manifest.metadata ?? [] + const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items ) + + const firstPage = layer.pages[0]?.id.split('/').pop() ?? true + + return { + _id, + label, + metadata, + manifest: [ manifest.id ], + layers: [ layer.asProjectLayer() ], + tools: this.tools, + _createdAt: now, + _modifiedAt: -1, + _lastModified: firstPage, + } + } + + static async createManifestFromImage(imageURL, projectLabel, creator) { + if (!imageURL) { + throw { + status: 404, + message: "No image found. Cannot process further." + } + } + const _id = database.reserveId() + const now = Date.now().toString().slice(-6) + const label = projectLabel ?? now + const dimensions = await this.getImageDimensions(imageURL) + + const projectManifest = { + "@context": "http://iiif.io/api/presentation/3/context.json", + id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, + type: "Manifest", + label: { "none": [label] }, + items: [ + { + id: `${process.env.TPENSTATIC}/${_id}/canvas-1.json`, + type: "Canvas", + label: { "none": [`${label} Page 1`] }, + width: dimensions.width, + height: dimensions.height, + items: [ + { + id: `${process.env.TPENSTATIC}/${_id}/contentPage.json`, + type: "AnnotationPage", + items: [ + { + id: `${process.env.TPENSTATIC}/${_id}/content.json`, + type: "Annotation", + motivation: "painting", + body: { + id: imageURL, + type: "Image", + format: `image/${imageURL.split('.').pop()}`, + service: [ + { + id: `https://iiif.io/api/image/3.0/example/reference/15f769d62ca9a3a2deca390efed75d73-3_titlepage1`, + type: "ImageService3", + profile: "level1" + } + ], + width: dimensions.width, + height: dimensions.height + }, + target: `${process.env.TPENSTATIC}/${_id}/canvas-1.json` + } + ] + } + ] + } + ] + } + + const projectCanvas = { + "@context": "http://iiif.io/api/presentation/3/context.json", + id: `${process.env.TPENSTATIC}/${_id}/canvas-1.json`, + type: "Canvas", + label: { "none": [`${label} Page 1`] }, + width: dimensions.width, + height: dimensions.height, + items: [ + { + id: `${process.env.TPENSTATIC}/${_id}/contentPage.json`, + type: "AnnotationPage", + items: [ + { + id: `${process.env.TPENSTATIC}/${_id}/content.json`, + type: "Annotation", + motivation: "painting", + body: { + id: imageURL, + type: "Image", + format: `image/${imageURL.split('.').pop()}`, + service: [ + { + id: `https://iiif.io/api/image/3.0/example/reference/15f769d62ca9a3a2deca390efed75d73-3_titlepage1`, + type: "ImageService3", + profile: "level1" + } + ], + width: dimensions.width, + height: dimensions.height + }, + target: `${process.env.TPENSTATIC}/${_id}/canvas-1.json` + } + ] + } + ] + } + + await this.uploadFileToGitHub(projectManifest, _id) + await this.uploadFileToGitHub(projectCanvas, _id) + + return await ProjectFactory.DBObjectFromImage(projectManifest) + .then(async (project) => { + console.log("Creating project from image manifest", project) + const projectObj = new Project() + const group = await Group.createNewGroup(creator, + { + label: project.label ?? project.title ?? `Project ${new Date().toLocaleDateString()}`, + members: { [creator]: { roles: [] } } + }) + .then((group) => group._id) + return await projectObj.create({ ...project, creator, group }) + }) + .catch((err) => { + throw { + status: err.status ?? 500, + message: err.message ?? "Internal Server Error" + } + }) + } + /** * Convert the Project.data into an Object ready for consumption by a TPEN interface, * especially the GET /project/:id endpoint. @@ -321,7 +489,9 @@ export default class ProjectFactory { * - Uploads the file using the GitHub API, including the correct commit message and SHA for updates. */ static async uploadFileToGitHub(manifest, projectId) { - const manifestUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/contents/${projectId}/manifest.json` + const fileName = manifest.id.split('/').pop() || 'manifest.json' + const manifestUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/contents/${projectId}/${fileName}` + const fileUrl = `${process.env.TPENSTATIC}/${projectId}/${fileName}` const token = process.env.GITHUB_TOKEN try { @@ -339,7 +509,7 @@ export default class ProjectFactory { sha = fileData.sha } - await fetch(manifestUrl, { + const putResponse = await fetch(manifestUrl, { method: 'PUT', headers: { 'Authorization': `token ${token}`, @@ -347,15 +517,22 @@ export default class ProjectFactory { 'Content-Type': 'application/json', }, body: JSON.stringify({ - message: sha ? `Updated ${projectId}/manifest.json` : `Created ${projectId}/manifest.json`, + message: sha ? `Updated ${projectId}/${fileName}` : `Created ${projectId}/${fileName}`, content: Buffer.from(JSON.stringify(manifest)).toString('base64'), branch: process.env.BRANCH, ...(sha && { sha }), }) }) + if (!putResponse.ok) { + const errText = await putResponse.text() + throw new Error(`GitHub upload failed: ${putResponse.status} - ${errText}`) + } + + return await putResponse.json() + } catch (error) { - console.error(`Failed to upload ${projectId}/manifest.json:`, error) + console.error(`Failed to upload ${projectId}/${fileName}:`, error) } } diff --git a/package-lock.json b/package-lock.json index fa8a3076..1d34e9be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "express-oauth2-jwt-bearer": "^1.6.0", "express-urlrewrite": "^2.0.3", "http-errors": "^2.0.0", + "image-size": "^2.0.2", "jsdom": "^26.0.0", "manifesto.js": "^4.2.21", "mariadb": "^3.4.0", @@ -3153,6 +3154,18 @@ "dev": true, "license": "ISC" }, + "node_modules/image-size": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz", + "integrity": "sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==", + "license": "MIT", + "bin": { + "image-size": "bin/image-size.js" + }, + "engines": { + "node": ">=16.x" + } + }, "node_modules/import-local": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", diff --git a/package.json b/package.json index 2fcda184..ceb709d9 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "express-oauth2-jwt-bearer": "^1.6.0", "express-urlrewrite": "^2.0.3", "http-errors": "^2.0.0", + "image-size": "^2.0.2", "jsdom": "^26.0.0", "manifesto.js": "^4.2.21", "mariadb": "^3.4.0", diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 0fcc3886..7427f741 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -67,4 +67,26 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { respondWithError(res, 405, "Improper request method. Use POST instead") }) +router.route("/import-image").post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") + try { + const { imageUrl, projectLabel } = req.body + if (!imageUrl || !projectLabel) { + return respondWithError(res, 400, "Image URL and project label are required") + } + const project = await ProjectFactory.createManifestFromImage(imageUrl, projectLabel, user._id) + res.status(201).json(project) + } catch (error) { + respondWithError( + res, + error.status ?? error.code ?? 500, + error.message ?? "Unknown server error" + ) + } +} +).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + export default router From 0ad0888235bebf5a8d4d08b14d0ba9f81c8f77ed Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Mon, 16 Jun 2025 17:44:43 -0500 Subject: [PATCH 103/262] Update ProjectFactory.js --- classes/Project/ProjectFactory.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 065a98c1..4cbdaf22 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -489,9 +489,8 @@ export default class ProjectFactory { * - Uploads the file using the GitHub API, including the correct commit message and SHA for updates. */ static async uploadFileToGitHub(manifest, projectId) { - const fileName = manifest.id.split('/').pop() || 'manifest.json' + const fileName = manifest?.id?.split('/').pop() ?? 'manifest.json' const manifestUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/contents/${projectId}/${fileName}` - const fileUrl = `${process.env.TPENSTATIC}/${projectId}/${fileName}` const token = process.env.GITHUB_TOKEN try { From e52c8cc37cf75d73310631e08f526c5b5abf308f Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Tue, 17 Jun 2025 10:48:46 -0500 Subject: [PATCH 104/262] Removing services --- classes/Project/ProjectFactory.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 4cbdaf22..a0eea6f8 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -239,13 +239,6 @@ export default class ProjectFactory { id: imageURL, type: "Image", format: `image/${imageURL.split('.').pop()}`, - service: [ - { - id: `https://iiif.io/api/image/3.0/example/reference/15f769d62ca9a3a2deca390efed75d73-3_titlepage1`, - type: "ImageService3", - profile: "level1" - } - ], width: dimensions.width, height: dimensions.height }, @@ -278,13 +271,6 @@ export default class ProjectFactory { id: imageURL, type: "Image", format: `image/${imageURL.split('.').pop()}`, - service: [ - { - id: `https://iiif.io/api/image/3.0/example/reference/15f769d62ca9a3a2deca390efed75d73-3_titlepage1`, - type: "ImageService3", - profile: "level1" - } - ], width: dimensions.width, height: dimensions.height }, From 7227a9e4c8379178d6e6e7d84a626ed191e746bc Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Wed, 18 Jun 2025 11:58:56 -0500 Subject: [PATCH 105/262] Update ProjectFactory.js --- classes/Project/ProjectFactory.js | 73 ++++++++++++------------------- 1 file changed, 27 insertions(+), 46 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index a0eea6f8..0e6de63d 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -5,7 +5,6 @@ import Layer from "../Layer/Layer.js" import dbDriver from "../../database/driver.js" import vault from "../../utilities/vault.js" import { imageSize } from 'image-size'; -import fetch from 'node-fetch'; const database = new dbDriver("mongo") @@ -163,14 +162,21 @@ export default class ProjectFactory { try { const response = await fetch(imgUrl) if (!response.ok) { - throw new Error(`Failed to fetch image: ${response.status} ${response.statusText}`) + throw { + status: response.status, + message: `Failed to fetch image: ${response.statusText}` + } } - const buffer = await response.buffer() + const arrayBuffer = await response.arrayBuffer() + const buffer = Buffer.from(arrayBuffer) const dimensions = imageSize(buffer) - return { width: dimensions.width, height: dimensions.height } - } catch (error) { - console.error('Error getting image dimensions:', error) - return null + return { + width: dimensions.width, + height: dimensions.height + } + } catch (err) { + console.error("Error fetching image dimensions:", err.message) + return } } @@ -214,45 +220,7 @@ export default class ProjectFactory { const label = projectLabel ?? now const dimensions = await this.getImageDimensions(imageURL) - const projectManifest = { - "@context": "http://iiif.io/api/presentation/3/context.json", - id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, - type: "Manifest", - label: { "none": [label] }, - items: [ - { - id: `${process.env.TPENSTATIC}/${_id}/canvas-1.json`, - type: "Canvas", - label: { "none": [`${label} Page 1`] }, - width: dimensions.width, - height: dimensions.height, - items: [ - { - id: `${process.env.TPENSTATIC}/${_id}/contentPage.json`, - type: "AnnotationPage", - items: [ - { - id: `${process.env.TPENSTATIC}/${_id}/content.json`, - type: "Annotation", - motivation: "painting", - body: { - id: imageURL, - type: "Image", - format: `image/${imageURL.split('.').pop()}`, - width: dimensions.width, - height: dimensions.height - }, - target: `${process.env.TPENSTATIC}/${_id}/canvas-1.json` - } - ] - } - ] - } - ] - } - - const projectCanvas = { - "@context": "http://iiif.io/api/presentation/3/context.json", + const canvasLayout = { id: `${process.env.TPENSTATIC}/${_id}/canvas-1.json`, type: "Canvas", label: { "none": [`${label} Page 1`] }, @@ -281,6 +249,19 @@ export default class ProjectFactory { ] } + const projectManifest = { + "@context": "http://iiif.io/api/presentation/3/context.json", + id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, + type: "Manifest", + label: { "none": [label] }, + items: [ ...canvasLayout ] + } + + const projectCanvas = { + "@context": "http://iiif.io/api/presentation/3/context.json", + ...canvasLayout + } + await this.uploadFileToGitHub(projectManifest, _id) await this.uploadFileToGitHub(projectCanvas, _id) From b4f104db5dd2a1c9123977e7282ffda18f29b4cb Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Wed, 18 Jun 2025 12:04:41 -0500 Subject: [PATCH 106/262] Update ProjectFactory.js --- classes/Project/ProjectFactory.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 0e6de63d..2b8e934a 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -4,7 +4,7 @@ import User from "../User/User.js" import Layer from "../Layer/Layer.js" import dbDriver from "../../database/driver.js" import vault from "../../utilities/vault.js" -import { imageSize } from 'image-size'; +import imageSize from 'image-size'; const database = new dbDriver("mongo") @@ -254,7 +254,7 @@ export default class ProjectFactory { id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, type: "Manifest", label: { "none": [label] }, - items: [ ...canvasLayout ] + items: [ canvasLayout ] } const projectCanvas = { From 6e4d54b822bcb0428d0f79cc501e5f6ef6128fd8 Mon Sep 17 00:00:00 2001 From: Priyal Patel Date: Wed, 18 Jun 2025 12:23:03 -0500 Subject: [PATCH 107/262] MimeTypes --- classes/Project/ProjectFactory.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 2b8e934a..94e19bde 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -5,6 +5,7 @@ import Layer from "../Layer/Layer.js" import dbDriver from "../../database/driver.js" import vault from "../../utilities/vault.js" import imageSize from 'image-size'; +import mime from 'mime-types'; const database = new dbDriver("mongo") @@ -238,7 +239,7 @@ export default class ProjectFactory { body: { id: imageURL, type: "Image", - format: `image/${imageURL.split('.').pop()}`, + format: mime.lookup(imageURL) || "image/jpeg", width: dimensions.width, height: dimensions.height }, From b1dd2ba0cf787e99c6266ef446e2fe3c1af179eb Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 18 Jun 2025 13:48:19 -0500 Subject: [PATCH 108/262] cleanup --- classes/Project/ProjectFactory.js | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 94e19bde..c715235d 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -268,7 +268,6 @@ export default class ProjectFactory { return await ProjectFactory.DBObjectFromImage(projectManifest) .then(async (project) => { - console.log("Creating project from image manifest", project) const projectObj = new Project() const group = await Group.createNewGroup(creator, { From 33fde1e96047e8837a8fb766db3134e027017b3c Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 20 Jun 2025 13:24:43 -0400 Subject: [PATCH 109/262] Decline Project Invite - Service (#264) * Add the decline route and route logic * Unauthenticated /decline, Authenticated and Permission Checked /remove * phew a lot more to it than anticipated * changes from testing and thinking * All the way through with the right UX * All the way through with the right UX * All the way through with the right UX * cleanup * cleanup * cleanup --- classes/Project/Project.js | 45 +++++++++++++++++++++++++--- project/index.js | 2 ++ project/memberDeclineInviteRouter.js | 41 +++++++++++++++++++++++++ project/memberUpgradeRouter.js | 14 ++++----- 4 files changed, 91 insertions(+), 11 deletions(-) create mode 100644 project/memberDeclineInviteRouter.js diff --git a/classes/Project/Project.js b/classes/Project/Project.js index adfeac40..ac871bf1 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -65,6 +65,7 @@ export default class Project { let message = `You have been invited to the TPEN project ${projectTitle}. View project here.` if (user) { + // FIXME this does not have the functionality of an 'invite'. await this.inviteExistingTPENUser(user._id, roles) } else { @@ -72,8 +73,8 @@ export default class Project { const returnTo = encodeURIComponent(`${process.env.TPENINTERFACES}project?projectID=${this.data._id}&inviteCode=${inviteData.tpenUserID}`) // Signup starting at the TPEN3 public site const signup = `${process.env.TPENTHREE}login?inviteCode=${inviteData.tpenUserID}&returnTo=${returnTo}` - // TODO decline endpoint in TPEN Services - const decline = `${process.env.TPENINTERFACES}project/decline?inviteCode=${inviteData.tpenUserID}&groupID=${inviteData.tpenGroupID}` + // Decline endpoint in TPEN Services + const decline = `${process.env.TPENINTERFACES}project/decline?email=${encodeURIComponent(email)}&user=${inviteData.tpenUserID}&project=${this.data._id}&projectTitle=${encodeURIComponent(projectTitle)}` message += `

Click the button below to get started with your project

@@ -138,12 +139,19 @@ export default class Project { return roles } + /** + * Invite an existing TPEN3 User to the project. + * FIXME this does not have the functionality of an 'invite'. The User is added to the project. + * There is no step for them to accept or decline. + */ async inviteExistingTPENUser(userId, roles) { - const group = new Group(this.data.group) - await group.addMember(userId, roles) + await this.addMember(userId, roles) return this } + /** + * Add a new temporary user to the users collection and send the invite E-mail. + */ async inviteNewTPENUser(email, roles) { const user = new User() const inviteCode = user._id @@ -152,15 +160,44 @@ export default class Project { const _sub = `temp-${user._id}` // This is a temporary sub for the user until they verify their email user.data = { email, _sub, profile, agent, inviteCode } await user.save() + // FIXME this does not have the functionality of an 'invite'. await this.inviteExistingTPENUser(user._id, roles) return { "tpenUserID":user._id, "tpenGroupID":this.data.group } } + /** + * Add a member to the Project Group. + * + * @param userId The User/member _id to add to the Group. + */ + async addMember(userId, roles) { + try { + const group = new Group(this.data.group) + await group.addMember(userId, roles) + } catch (error) { + throw { + status: error.status || 500, + message: error.message || "An error occurred while adding the member." + } + } + + } + + /** + * Remove a member from the Project Group. + * If the member is an invitee (temporary) User, delete that User from the db. + * + * @param userId The User/member _id to remove from the Group and perhaps delete from the db. + */ async removeMember(userId) { try { const group = new Group(this.data.group) await group.removeMember(userId) await group.update() + // Don't leave orphaned invitees in the db. + const member = new User(userId) + const memberData = await member.getSelf() + if(memberData?.inviteCode) member.delete() return this } catch (error) { throw { diff --git a/project/index.js b/project/index.js index 27f706bf..defe5d5d 100644 --- a/project/index.js +++ b/project/index.js @@ -11,12 +11,14 @@ import hotkeysRouter from "./hotkeysRouter.js" import metadataRouter from "./metadataRouter.js" import projectToolsRouter from "./projectToolsRouter.js" import memberUpgradeRouter from "./memberUpgradeRouter.js" +import memberDeclineInviteRouter from "./memberDeclineInviteRouter.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) // Use split routers router.use(memberUpgradeRouter) // Contains unauthenticated route! +router.use(memberDeclineInviteRouter) // Contains unauthenticated route! router.use(projectCreateRouter) router.use(import28Router) router.use(projectReadRouter) diff --git a/project/memberDeclineInviteRouter.js b/project/memberDeclineInviteRouter.js new file mode 100644 index 00000000..0cae5f66 --- /dev/null +++ b/project/memberDeclineInviteRouter.js @@ -0,0 +1,41 @@ +import express from "express" +import { validateID, respondWithError } from "../utilities/shared.js" +import Project from "../classes/Project/Project.js" +import User from "../classes/User/User.js" + +const router = express.Router({ mergeParams: true }) + +/** + * A user is declining from the E-mail they recieved. It is unauthenticated. + * Their member entry should be removed from the Group. + * Their temporary user should be removed from the db. + * + * @param projectId - The project which contains the temporary TPEN3 User as a member. + * @param collaboratorId - The temporary TPEN3 User declining the invitation. + */ +router.route("/:projectId/collaborator/:collaboratorId/decline").get(async (req, res) => { + const { projectId, collaboratorId } = req.params + if (!projectId || !collaboratorId) return respondWithError(res, 400, "Not all data was provided.") + try { + const project = await new Project(projectId) + const projectData = await project.loadProject() + if (!projectData) return respondWithError(res, 404, "Project does not exist or the project id is invalid.") + const invitedUser = new User(collaboratorId) + const userData = await invitedUser.getSelf() + if (!userData?.profile) return respondWithError(res, 404, "This user has already declined or the user id is invalid.") + if (!userData?.inviteCode) return respondWithError(res, 400, "This user has already accepted the invitation.") + await project.removeMember(collaboratorId) + const name = userData.email ?? userData.profile.displayName ?? collaboratorId + res.status(200).send(`User '${name}' successfully declined the invitation.`) + } catch (error) { + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "There was an error declining the invitation." + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + +export default router diff --git a/project/memberUpgradeRouter.js b/project/memberUpgradeRouter.js index 7b93786e..74c1944b 100644 --- a/project/memberUpgradeRouter.js +++ b/project/memberUpgradeRouter.js @@ -28,20 +28,20 @@ router.route("/:projectId/collaborator/:collaboratorId/agent/:agentId").get(asyn const tempData = await tempUser.getSelf() if(!tempData?.profile) return respondWithError(res, 404, "Temporary user does not exist") if(!tempData?.inviteCode) return respondWithError(res, 400, "Temporary user provided is not a temporary user.") - const project = await new Project(projectId).loadProject() - if(!project) return respondWithError(res, 404, "Project does not exist.") - const group = new Group(project.group) + const project = new Project(projectId) + const projectData = await project.loadProject() + if(!projectData) return respondWithError(res, 404, "Project does not exist.") + const group = new Group(projectData.group) let tempRoles = await group.getMemberRoles(tempData._id) if(!tempRoles) tempRoles = {"VIEWER":[]} - group.addMember(agentId, Object.keys(tempRoles)) + await project.addMember(agentId, Object.keys(tempRoles)) try { - group.removeMember(tempData._id) + // This will also delete the temporary User from the users collection. + await project.removeMember(tempData._id) } catch (err) { // keep going. } - await group.update() - tempUser.delete() res.status(200).send(`Temporary user '${collaboratorId}' upgraded to user '${agentId}'.`) } catch (error) { return respondWithError( From 1a8a68458bc1da68101e19dc567cdafe9c2e2ad2 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 23 Jun 2025 13:33:20 -0400 Subject: [PATCH 110/262] support text/plain request bodies (#268) --- app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app.js b/app.js index d170895d..711b249f 100644 --- a/app.js +++ b/app.js @@ -32,6 +32,7 @@ let app = express() //Middleware to use app.use(logger('dev')) app.use(express.json()) +app.use(express.text()) app.use(express.urlencoded({ extended: true })) app.use(cookieParser()) From b80228c6393f67acdfcbc45820c37df8e8935b16 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Tue, 24 Jun 2025 16:55:45 -0500 Subject: [PATCH 111/262] Implement optimistic locking for page and line updates Adds optimistic locking to Layer and Page updates, propagates version conflict handling through the database controller, and introduces utility functions for consistent conflict response and retry logic. Updates line and page routes to use optimistic locking and handle version conflicts gracefully, improving data integrity in concurrent editing scenarios. --- classes/Layer/Layer.js | 18 +++++++- classes/Page/Page.js | 18 +++++++- database/tiny/controller.js | 57 ++++++++++++++++++++++++-- line/index.js | 82 +++++++++++++++++++++++++++++-------- page/index.js | 8 +++- utilities/shared.js | 51 +++++++++++++++++++++++ 6 files changed, 207 insertions(+), 27 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index a75f1d33..41a16c1f 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -127,7 +127,21 @@ export default class Layer { throw new Error(`Layer not found in RERUM: ${this.id}`) } const updatedLayer = { ...existingLayer, ...layerAsCollection } - await databaseTiny.overwrite(updatedLayer) - return this + + // Handle optimistic locking version if available + try { + await databaseTiny.overwrite(updatedLayer) + return this + } catch (err) { + if (err.status === 409) { + // Handle version conflict - re-throw with more context + const conflictError = new Error(`Layer update failed due to version conflict. The layer '${this.id}' was modified by another process.`) + conflictError.status = 409 + conflictError.currentVersion = err.currentVersion + conflictError.layerId = this.id + throw conflictError + } + throw err + } } } diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 1b36b8c8..45990296 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -94,8 +94,22 @@ export default class Page { throw new Error(`Failed to find Page in RERUM: ${this.id}`) } const updatedPage = { ...existingPage, ...pageAsAnnotationPage } - await databaseTiny.overwrite(updatedPage) - return this + + // Handle optimistic locking version if available + try { + await databaseTiny.overwrite(updatedPage) + return this + } catch (err) { + if (err.status === 409) { + // Handle version conflict - re-throw with more context + const conflictError = new Error(`Page update failed due to version conflict. The page '${this.id}' was modified by another process.`) + conflictError.status = 409 + conflictError.currentVersion = err.currentVersion + conflictError.pageId = this.id + throw conflictError + } + throw err + } } /** diff --git a/database/tiny/controller.js b/database/tiny/controller.js index d504ce20..98bc69ea 100644 --- a/database/tiny/controller.js +++ b/database/tiny/controller.js @@ -184,20 +184,44 @@ class DatabaseController { /** * Use the TinyPEN overwrite endpoint to overwrite the supplied JSON object. + * Implements optimistic locking using If-Overwritten-Version header. * TODO Pass forward the user bearer token from the Interfaced to TinyPEN? * @return the updated JSON or Error */ async overwrite(data) { err_out._dbaction = this.URLS.OVERWRITE + + const headers = { + 'Content-Type': 'application/json; charset=utf-8' + } + + // Add optimistic locking header if __rerum.isOverwritten exists + if (data.__rerum?.isOverwritten) { + headers['If-Overwritten-Version'] = data.__rerum.isOverwritten + } + return await fetch(this.URLS.OVERWRITE, { method: 'put', body: JSON.stringify(data), - headers: { - 'Content-Type': 'application/json; charset=utf-8' - } + headers }) .then(resp => { if (!resp.ok) { + if (resp.status === 409) { + // Handle optimistic locking conflict + return resp.json().then(errorData => { + const conflictError = new Error('Version conflict detected') + conflictError.status = 409 + conflictError.currentVersion = errorData.currentVersion + conflictError._dbaction = this.URLS.OVERWRITE + throw conflictError + }).catch(jsonErr => { + // If we can't parse the error response, use the original error + err_out.message = resp.statusText ?? `Version conflict - document was modified by another process` + err_out.status = 409 + throw err_out + }) + } err_out.message = resp.statusText ?? `TinyPEN Overwrite sent a bad response` err_out.status = resp.status ?? 500 throw err_out @@ -205,6 +229,11 @@ class DatabaseController { return resp.json() }) .catch(err => { + // Re-throw structured errors (like version conflicts) + if (err.status === 409) { + throw err + } + // Specifically account for unexpected fetch()y things. if(!err?.message) err.message = err.statusText ?? `TinyPEN Overwrite did not complete successfully` if(!err?.status) err.status = err.status ?? 500 @@ -249,4 +278,26 @@ class DatabaseController { } } +/** + * OPTIMISTIC LOCKING IMPLEMENTATION + * + * This controller implements optimistic locking for TinyPen overwrite operations: + * + * 1. When fetching existing documents, check for __rerum.isOverwritten property + * 2. Include this value as "If-Overwritten-Version" header when calling overwrite/update + * 3. TinyPen will return 409 conflict if versions don't match + * 4. Error response includes currentVersion for potential retry + * + * Usage pattern in classes: + * ```javascript + * try { + * await databaseTiny.overwrite(updatedDoc) + * } catch (err) { + * if (err.status === 409) { + * // Handle version conflict - retry with err.currentVersion if needed + * } + * } + * ``` + */ + export default DatabaseController diff --git a/line/index.js b/line/index.js index 166deb04..e9375628 100644 --- a/line/index.js +++ b/line/index.js @@ -2,7 +2,7 @@ import express from 'express' import cors from 'cors' import auth0Middleware from "../auth/index.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} -import { respondWithError, getProjectById, getPageById, findLineInPage, updatePageAndProject, findPageById } from '../utilities/shared.js' +import { respondWithError, getProjectById, getPageById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict } from '../utilities/shared.js' import Line from '../classes/Line/Line.js' const router = express.Router({ mergeParams: true }) @@ -72,10 +72,21 @@ router.post('/', auth0Middleware(), async (req, res) => { const savedLine = await newLine.update() page.items.push(savedLine) } - await updatePageAndProject(page, project, user._id) + await withOptimisticLocking(updatePageAndProject(page, project, user._id),(currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + return + } + currentVersion.items = [...(currentVersion.items ?? []), ...(page.items ?? [])] + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + }) res.status(201).json(newLine.asJSON(true)) } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + withOptimisticLocking respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) @@ -100,13 +111,25 @@ router.put('/:lineId', auth0Middleware(), async (req, res) => { } const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() + await withOptimisticLocking(updatePageAndProject(page, project, user._id),(currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + } + const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!newLineIndex === -1) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + currentVersion.items[newLineIndex] = updatedLine + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + }) res.json(line.asJSON(true)) } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + return handleVersionConflict(res, error) + } res.status(error.status ?? 500).json({ error: error.message }) } }) @@ -129,13 +152,25 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { const updatedLine = await line.updateText(req.body) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() + await withOptimisticLocking(updatePageAndProject(page, project, user._id),(currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + } + const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!newLineIndex === -1) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + currentVersion.items[newLineIndex] = updatedLine + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + }) res.json(line.asJSON(true)) } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + return handleVersionConflict(res, error) + } res.status(error.status ?? 500).json({ error: error.message }) } }) @@ -158,13 +193,24 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { const updatedLine = await line.updateBounds(req.body) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() + await withOptimisticLocking(updatePageAndProject(page, project, user._id),(currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + } + const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!newLineIndex === -1) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + currentVersion.items[newLineIndex] = updatedLine + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + }) res.json(line.asJSON(true)) - } catch (error) { + } catch (error) { // Handle version conflicts with optimistic locking + if (error.status === 409) { + return handleVersionConflict(res, error) + } res.status(error.status ?? 500).json({ error: error.message }) } }) diff --git a/page/index.js b/page/index.js index d9e1a280..2a2274be 100644 --- a/page/index.js +++ b/page/index.js @@ -5,7 +5,7 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' import Line from '../classes/Line/Line.js' -import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject } from '../utilities/shared.js' +import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict } from '../utilities/shared.js' router.use( cors(common_cors) @@ -103,7 +103,11 @@ router.route('/:pageId') await updatePageAndProject(pageObject, project, user._id) res.status(200).json(pageObject) - } catch (error) { + } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + return handleVersionConflict(res, error) + } return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) diff --git a/utilities/shared.js b/utilities/shared.js index ddad3f64..d4ca1464 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -165,3 +165,54 @@ export async function findPageById(pageId, projectId) { return new Page(layerContainingPage.id, page) } + +/** + * Handle version conflict errors from optimistic locking consistently + * @param {Response} res - Express response object + * @param {Error} error - The error object from the version conflict + * @returns {Response} JSON response with conflict details + */ +export const handleVersionConflict = (res, error) => { + return res.status(409).json({ + error: error.message, + currentVersion: error.currentVersion, + code: 'VERSION_CONFLICT', + details: 'The document was modified by another process.', + // Include additional context if available + ...(error.pageId && { pageId: error.pageId }), + ...(error.layerId && { layerId: error.layerId }), + ...(error.lineId && { lineId: error.lineId }) + }) +} + +/** + * Wrapper function to add optimistic locking retry logic to any async operation + * @param {Function} operation - The async operation to execute + * @param {number} maxRetries - Maximum number of retries (default: 1) + * @returns {Promise} The result of the operation or throws the final error + */ +export const withOptimisticLocking = async (operation, retryFn, maxRetries = 2) => { + let lastError + + for (let attempt = 0; attempt <= maxRetries; attempt++) { + try { + let currentVersion = lastError.currentVersion || null + return await attempt === 0 ? operation() : retryFn(currentVersion) + } catch (error) { + lastError = error + + // Only retry on version conflicts + if (error.status === 409 && attempt < maxRetries) { + // Could add backoff here if needed + console.warn(`Version conflict detected, retrying operation... Attempt ${attempt + 1}/${maxRetries}`) + await new Promise(resolve => setTimeout(resolve, 100 * (attempt + 1))) + continue + } + + // If it's not a version conflict or we've exhausted retries, throw + throw error + } + } + + throw lastError +} From 48a60f5769723e48afd84fad7897649fb176b003 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Thu, 26 Jun 2025 10:10:20 -0500 Subject: [PATCH 112/262] IIIF Image Service (#266) * IIIF Image Service * Update ProjectFactory.js * Update ProjectFactory.js --- classes/Project/ProjectFactory.js | 81 ++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index c715235d..93c0ae8e 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -216,6 +216,78 @@ export default class ProjectFactory { message: "No image found. Cannot process further." } } + + let isIIFImage = false + let IIIFServiceParts = imageURL.split('/').reverse() + let IIIFServiceJson = null + + function isValidIIIFRegion(region) { + return ( + region === "full" || + region === "square" || + /^pct:\d+(\.\d+)?,\d+(\.\d+)?,\d+(\.\d+)?,\d+(\.\d+)?$/.test(region) || + /^\d+,\d+,\d+,\d+$/.test(region) + ) + } + + function isValidIIIFSize(size) { + return ( + size === "full" || + size.startsWith("^full") || + /^\d+,$/.test(size) || + size.startsWith("^") && /^\d+,$/.test(size) || + /^,\d+$/.test(size) || + size.startsWith("^") && /^,\d+$/.test(size) || + size.startsWith("pct:") && /^\d+(\.\d+)?$/.test(size) || + size.startsWith("^pct:") && /^\d+(\.\d+)?$/.test(size) || + /^\d+,\d+$/.test(size) || + size.startsWith("^") && /^\d+,\d+$/.test(size) || + size.startsWith("!") && /^\d+,\d+$/.test(size) || + size.startsWith("^!") && /^\d+,\d+$/.test(size) + ) + } + + function isValidIIIFRotation(rotation) { + return ( + /^\d+(\.\d+)?$/.test(rotation) || + size.startsWith("!") && /^\d+(\.\d+)?$/.test(rotation) + ) + } + + function isValidIIIFQuality(quality) { + return ( + quality === "default" || + quality === "color" || + quality === "gray" || + quality === "bitonal" + ) + } + + let IIIFServiceURL = IIIFServiceParts.slice(4).reverse().join("/") + + if (isValidIIIFQuality(IIIFServiceParts[0].split(".")[0]) && isValidIIIFRotation(IIIFServiceParts[1]) && isValidIIIFSize(IIIFServiceParts[2]) && isValidIIIFRegion(IIIFServiceParts[3])) { + await fetch(`${IIIFServiceURL}/info.json`) + .then(response => { + if (!response.ok) { + throw new Error(`Failed to fetch IIIF info: ${response.statusText}`) + } + return response.json() + }) + .then(info => { + if (info?.protocol === "http://iiif.io/api/image") { + isIIFImage = true + IIIFServiceJson = info + } + }) + .catch(err => { + console.error("Error fetching IIIF info:", err.message) + throw { + status: 500, + message: "Failed to fetch IIIF info" + } + }) + } + const _id = database.reserveId() const now = Date.now().toString().slice(-6) const label = projectLabel ?? now @@ -241,7 +313,14 @@ export default class ProjectFactory { type: "Image", format: mime.lookup(imageURL) || "image/jpeg", width: dimensions.width, - height: dimensions.height + height: dimensions.height, + ...(isIIFImage && { + service: [{ + id: IIIFServiceURL, + type: IIIFServiceJson?.type, + profile: IIIFServiceJson?.profile, + }] + }) }, target: `${process.env.TPENSTATIC}/${_id}/canvas-1.json` } From d147ceaa895666d263d0d5c4e39282f84f687c32 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Tue, 1 Jul 2025 10:25:03 -0500 Subject: [PATCH 113/262] 270 multiple updates to a page in parallel discards data (#271) * expect text * complicating updateText * all sorts of variants * allow no body * Implement optimistic locking for page and line updates Adds optimistic locking to Layer and Page updates, propagates version conflict handling through the database controller, and introduces utility functions for consistent conflict response and retry logic. Updates line and page routes to use optimistic locking and handle version conflicts gracefully, improving data integrity in concurrent editing scenarios. * Update index.js * error is currentVersion * in route * stop double res * Update index.js * Allow new header in common cors --------- Co-authored-by: Bryan Haberberger --- classes/Layer/Layer.js | 14 ++++- classes/Line/Line.js | 54 ++++++++++++++--- classes/Page/Page.js | 14 ++++- database/tiny/controller.js | 57 +++++++++++++++++- line/index.js | 104 ++++++++++++++++++++++++++------ page/index.js | 10 +++- utilities/common_cors.json | 3 +- utilities/shared.js | 116 ++++++++++++++++++++++++++---------- 8 files changed, 303 insertions(+), 69 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index a75f1d33..5e744d37 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -1,4 +1,5 @@ import dbDriver from "../../database/driver.js" +import { handleVersionConflict } from "../../utilities/shared.js" import Page from "../Page/Page.js" const database = new dbDriver("mongo") @@ -127,7 +128,16 @@ export default class Layer { throw new Error(`Layer not found in RERUM: ${this.id}`) } const updatedLayer = { ...existingLayer, ...layerAsCollection } - await databaseTiny.overwrite(updatedLayer) - return this + + // Handle optimistic locking version if available + try { + await databaseTiny.overwrite(updatedLayer) + return this + } catch (err) { + if (err.status === 409) { + throw handleVersionConflict(null, err) + } + throw err + } } } diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 485258ee..f5526f6d 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -12,9 +12,8 @@ export default class Line { } constructor({ id, target, body, motivation, label, type }) { - if (!id || !body || !target) { + if (!id || !target) throw new Error('Line data is malformed.') - } this.id = id // Ensure the id is assigned this.body = body this.target = target @@ -92,15 +91,52 @@ export default class Line { target: this.target } } - async updateText(text) { - if (typeof text !== 'string') { - throw new Error('Text content must be a string') + /** + * Updates the textual content of the annotation body. + * + * Handles various body formats, including arrays of bodies and different textual body variants. + * Throws errors if the body format is unexpected or ambiguous. + * + * @async + * @param {string} text - The new text content to set. + * @param {Object} [options={}] - Optional parameters for updating the text. + * @param {string} [options.format="text/plain"] - The format of the text (e.g., "text/plain"). + * @param {string} [options.language] - The language of the text. + * @param {string} [options.creator] - The creator of the annotation (applied at the annotation level). + * @param {string} [options.generator] - The generator of the annotation (applied at the annotation level). + * @returns {Promise} The updated instance for chaining. + * @throws {Error} If the text is not a string, or if the body format is unexpected or ambiguous. + */ + async updateText(text, options = {}) { + if (typeof text !== 'string') throw new Error('Text content must be a string') + if (!this.body) this.body = "" // simple variant for no body + + const isVariantTextualBody = body => typeof (body?.chars ?? body?.['cnt:asChars'] ?? body?.value ?? body) === 'string' + + if (Array.isArray(this.body)) { + const textualBodies = this.body.filter(body => isVariantTextualBody(body)) + if (textualBodies.length !== 1) throw new Error(textualBodies.length > 1 ? 'Multiple textual bodies found. Cannot determine which one to update.' : 'No textual body found in the array to update.') + + const textualBody = textualBodies[0] + const currentValue = textualBody.value ?? textualBody.chars ?? textualBody['cnt:asChars'] ?? textualBody + if (currentValue === text) return this + Object.assign(textualBody, { type: 'TextualBody', value: text, format: options.format ?? "text/plain", language: options.language }) + // discard Annotation-level options if only one body entry is modified. + return this.update() } - if(this.body === text) { - return this + + if (isVariantTextualBody(this.body)) { + const currentValue = this.body.chars ?? this.body['cnt:asChars'] ?? this.body.value ?? this.body + if (currentValue === text) return this + this.body = { type: 'TextualBody', value: text, format: options.format ?? "text/plain", language: options.language } + // Apply options directly to the Annotation + if (options.creator) this.creator = options.creator + if (options.generator) this.generator = options.generator + // discarding unknown options + return this.update() } - this.body = text - return this.update() + + throw new Error('Unexpected body format. Cannot update text.') } async updateBounds({x, y, w, h}) { diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 1b36b8c8..5cffdc50 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -1,4 +1,5 @@ import dbDriver from "../../database/driver.js" +import { handleVersionConflict } from "../../utilities/shared.js" const databaseTiny = new dbDriver("tiny") @@ -94,8 +95,17 @@ export default class Page { throw new Error(`Failed to find Page in RERUM: ${this.id}`) } const updatedPage = { ...existingPage, ...pageAsAnnotationPage } - await databaseTiny.overwrite(updatedPage) - return this + + // Handle optimistic locking version if available + try { + await databaseTiny.overwrite(updatedPage) + return this + } catch (err) { + if (err.status === 409) { + throw handleVersionConflict(null, err) + } + throw err + } } /** diff --git a/database/tiny/controller.js b/database/tiny/controller.js index d504ce20..62537a5b 100644 --- a/database/tiny/controller.js +++ b/database/tiny/controller.js @@ -184,20 +184,44 @@ class DatabaseController { /** * Use the TinyPEN overwrite endpoint to overwrite the supplied JSON object. + * Implements optimistic locking using If-Overwritten-Version header. * TODO Pass forward the user bearer token from the Interfaced to TinyPEN? * @return the updated JSON or Error */ async overwrite(data) { err_out._dbaction = this.URLS.OVERWRITE + + const headers = { + 'Content-Type': 'application/json; charset=utf-8' + } + + // Add optimistic locking header if __rerum.isOverwritten exists + if (data.__rerum?.isOverwritten) { + headers['If-Overwritten-Version'] = data.__rerum.isOverwritten + } + return await fetch(this.URLS.OVERWRITE, { method: 'put', body: JSON.stringify(data), - headers: { - 'Content-Type': 'application/json; charset=utf-8' - } + headers }) .then(resp => { if (!resp.ok) { + if (resp.status === 409) { + // Handle optimistic locking conflict + return resp.json().then(errorData => { + const conflictError = new Error('Version conflict detected') + conflictError.status = 409 + conflictError.currentVersion = errorData + conflictError._dbaction = this.URLS.OVERWRITE + throw conflictError + }).catch(jsonErr => { + // If we can't parse the error response, use the original error + err_out.message = resp.statusText ?? `Version conflict - document was modified by another process` + err_out.status = 409 + throw err_out + }) + } err_out.message = resp.statusText ?? `TinyPEN Overwrite sent a bad response` err_out.status = resp.status ?? 500 throw err_out @@ -205,6 +229,11 @@ class DatabaseController { return resp.json() }) .catch(err => { + // Re-throw structured errors (like version conflicts) + if (err.status === 409) { + throw err + } + // Specifically account for unexpected fetch()y things. if(!err?.message) err.message = err.statusText ?? `TinyPEN Overwrite did not complete successfully` if(!err?.status) err.status = err.status ?? 500 @@ -249,4 +278,26 @@ class DatabaseController { } } +/** + * OPTIMISTIC LOCKING IMPLEMENTATION + * + * This controller implements optimistic locking for TinyPen overwrite operations: + * + * 1. When fetching existing documents, check for __rerum.isOverwritten property + * 2. Include this value as "If-Overwritten-Version" header when calling overwrite/update + * 3. TinyPen will return 409 conflict if versions don't match + * 4. Error response includes currentVersion for potential retry + * + * Usage pattern in classes: + * ```javascript + * try { + * await databaseTiny.overwrite(updatedDoc) + * } catch (err) { + * if (err.status === 409) { + * // Handle version conflict - retry with currentVersion if needed + * } + * } + * ``` + */ + export default DatabaseController diff --git a/line/index.js b/line/index.js index 166deb04..d1efd5dc 100644 --- a/line/index.js +++ b/line/index.js @@ -2,7 +2,7 @@ import express from 'express' import cors from 'cors' import auth0Middleware from "../auth/index.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} -import { respondWithError, getProjectById, getPageById, findLineInPage, updatePageAndProject, findPageById } from '../utilities/shared.js' +import { respondWithError, getProjectById, getPageById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' import Line from '../classes/Line/Line.js' const router = express.Router({ mergeParams: true }) @@ -72,16 +72,30 @@ router.post('/', auth0Middleware(), async (req, res) => { const savedLine = await newLine.update() page.items.push(savedLine) } - await updatePageAndProject(page, project, user._id) + await withOptimisticLocking(updatePageAndProject(page, project, user._id),(currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + return + } + currentVersion.items = [...(currentVersion.items ?? []), ...(page.items ?? [])] + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + }) res.status(201).json(newLine.asJSON(true)) } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + return handleVersionConflict(res, error) + } respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) // Update an existing line, including in RERUM router.put('/:lineId', auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") try { const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) @@ -100,19 +114,36 @@ router.put('/:lineId', auth0Middleware(), async (req, res) => { } const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() + await withOptimisticLocking( + () => updatePageAndProject(page, project, user._id), + (currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + } + const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!newLineIndex === -1) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + currentVersion.items[newLineIndex] = updatedLine + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + } + ) res.json(line.asJSON(true)) } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + return handleVersionConflict(res, error) + } res.status(error.status ?? 500).json({ error: error.message }) } }) // Update the text of an existing line router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") try { if (typeof req.body !== 'string') { respondWithError(res, 400, 'Invalid request body. Expected a string.') @@ -129,19 +160,41 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { const updatedLine = await line.updateText(req.body) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() + await withOptimisticLocking( + () => updatePageAndProject(page, project, user._id), + (currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + if(res.headersSent) return + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + return + } + const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!newLineIndex === -1) { + if(res.headersSent) return + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + currentVersion.items[newLineIndex] = updatedLine + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + } + ) + if(res.headersSent) return res.json(line.asJSON(true)) } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + handleVersionConflict(res, error) + return + } res.status(error.status ?? 500).json({ error: error.message }) } }) // Update the xywh (bounds) of an existing line router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") try { if (typeof req.body !== 'object' || !req.body.x || !req.body.y || !req.body.w || !req.body.h) { respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') @@ -158,13 +211,28 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { const updatedLine = await line.updateBounds(req.body) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === req.params.pageId.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === req.params.pageId.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await project.update() + await withOptimisticLocking( + () => updatePageAndProject(page, project, user._id), + (currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + return + } + const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!newLineIndex === -1) { + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) + return + } + currentVersion.items[newLineIndex] = updatedLine + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) + } + ) res.json(line.asJSON(true)) - } catch (error) { + } catch (error) { // Handle version conflicts with optimistic locking + if (error.status === 409) { + return handleVersionConflict(res, error) + } res.status(error.status ?? 500).json({ error: error.message }) } }) diff --git a/page/index.js b/page/index.js index d9e1a280..71f2a7b4 100644 --- a/page/index.js +++ b/page/index.js @@ -5,7 +5,7 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' import Line from '../classes/Line/Line.js' -import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject } from '../utilities/shared.js' +import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict } from '../utilities/shared.js' router.use( cors(common_cors) @@ -103,7 +103,13 @@ router.route('/:pageId') await updatePageAndProject(pageObject, project, user._id) res.status(200).json(pageObject) - } catch (error) { + } catch (error) { + // Handle version conflicts with optimistic locking + if (error.status === 409) { + if(res.headersSent) return + return handleVersionConflict(res, error) + } + if(res.headersSent) return return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) diff --git a/utilities/common_cors.json b/utilities/common_cors.json index f6f41b87..d0398c35 100644 --- a/utilities/common_cors.json +++ b/utilities/common_cors.json @@ -13,7 +13,8 @@ "Cache-Control", "Last-Modified", "Link", - "X-HTTP-Method-Override" + "X-HTTP-Method-Override", + "If-Overwritten-Version" ], "exposedHeaders": "*", "origin": "*", diff --git a/utilities/shared.js b/utilities/shared.js index ddad3f64..1ec8f7d0 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -132,36 +132,88 @@ export const getLayerContainingPage = (project, pageId) => { // Find a page by ID (moved from page/index.js) export async function findPageById(pageId, projectId) { - if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { - return fetch(pageId).then(res => res.json()) - } - const projectData = (await getProjectById(projectId))?.data - if (!projectData) { - const error = new Error(`Project with ID '${projectId}' not found`) - error.status = 404 - throw error - } - const layerContainingPage = projectData.layers.find(layer => - layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) - ) - - if (!layerContainingPage) { - const error = new Error(`Layer containing page with ID '${pageId}' not found in project '${projectId}'`) - error.status = 404 - throw error - } - - const pageIndex = layerContainingPage.pages.findIndex(p => p.id.split('/').pop() === pageId.split('/').pop()) - - if (pageIndex < 0) { - const error = new Error(`Page with ID '${pageId}' not found in project '${projectId}'`) - error.status = 404 - throw error - } - - const page = layerContainingPage.pages[pageIndex] - page.prev = layerContainingPage.pages[pageIndex - 1] ?? null - page.next = layerContainingPage.pages[pageIndex + 1] ?? null - - return new Page(layerContainingPage.id, page) + if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { + return fetch(pageId).then(res => res.json()) + } + const projectData = (await getProjectById(projectId))?.data + if (!projectData) { + const error = new Error(`Project with ID '${projectId}' not found`) + error.status = 404 + throw error + } + const layerContainingPage = projectData.layers.find(layer => + layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) + ) + + if (!layerContainingPage) { + const error = new Error(`Layer containing page with ID '${pageId}' not found in project '${projectId}'`) + error.status = 404 + throw error + } + + const pageIndex = layerContainingPage.pages.findIndex(p => p.id.split('/').pop() === pageId.split('/').pop()) + + if (pageIndex < 0) { + const error = new Error(`Page with ID '${pageId}' not found in project '${projectId}'`) + error.status = 404 + throw error + } + + const page = layerContainingPage.pages[pageIndex] + page.prev = layerContainingPage.pages[pageIndex - 1] ?? null + page.next = layerContainingPage.pages[pageIndex + 1] ?? null + + return new Page(layerContainingPage.id, page) +} + +/** + * Handle version conflict errors from optimistic locking consistently + * @param {Response} res - Express response object + * @param {Error} error - The error object from the version conflict + * @returns {Response} JSON response with conflict details + */ +export const handleVersionConflict = (res, error) => { + return res ? res.status(409).json({ + currentVersion: error, + code: 'VERSION_CONFLICT', + details: 'The document was modified by another process.' + }) : { + status: 409, + currentVersion: error, + code: 'VERSION_CONFLICT', + details: 'The document was modified by another process.' + } +} + +/** + * Wrapper function to add optimistic locking retry logic to any async operation + * @param {Function} operation - The async operation to execute + * @param {number} maxRetries - Maximum number of retries (default: 1) + * @returns {Promise} The result of the operation or throws the final error + */ +export const withOptimisticLocking = async (operation, retryFn, maxRetries = 2) => { + let lastError + + for (let attempt = 0; attempt <= maxRetries; attempt++) { + try { + let currentVersion = lastError?.currentVersion || null + console.log(currentVersion ? `Retrying operation due to error: ${currentVersion}` : 'Executing operation') + return await (attempt === 0 ? operation() : retryFn(currentVersion)) + } catch (error) { + lastError = error + + // Only retry on version conflicts + if (error.status === 409 && attempt < maxRetries) { + // Could add backoff here if needed + console.warn(`Version conflict detected, retrying operation... Attempt ${attempt + 1}/${maxRetries}`) + await new Promise(resolve => setTimeout(resolve, 100 * (attempt + 1))) + continue + } + + // If it's not a version conflict or we've exhausted retries, throw + throw error + } + } + + throw lastError } From 29d45c3f01c6d0745a720ce0ac69d59ef919d466 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 9 Jul 2025 11:54:40 -0500 Subject: [PATCH 114/262] Copy Project API (#272) * Copy Project API * Duplicating Annotations * Copy without annotation and copy with group api * Project Cutomization API * Hotkeys Guard and include items in DB * Changes for API, refactoring * Group Members Change * Creator as OWNER and add one layer if no layers * Update ProjectFactory.js * MongoDB ProjectObject * Update ProjectFactory.js * Update ProjectFactory.js * Update ProjectFactory.js * Fixing ProjectDB Object * Documentation around module concept --- classes/Project/ProjectFactory.js | 288 +++++++++++++++++++++++++++++- project/index.js | 2 + project/projectCopyRouter.js | 92 ++++++++++ 3 files changed, 380 insertions(+), 2 deletions(-) create mode 100644 project/projectCopyRouter.js diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 93c0ae8e..b060470a 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -2,10 +2,13 @@ import Project from "./Project.js" import Group from "../Group/Group.js" import User from "../User/User.js" import Layer from "../Layer/Layer.js" +import Line from "../Line/Line.js" +import Page from "../Page/Page.js" import dbDriver from "../../database/driver.js" import vault from "../../utilities/vault.js" -import imageSize from 'image-size'; -import mime from 'mime-types'; +import imageSize from 'image-size' +import mime from 'mime-types' +import Hotkeys from "../HotKeys/Hotkeys.js" const database = new dbDriver("mongo") @@ -181,6 +184,287 @@ export default class ProjectFactory { } } + static copiedProjectConfig(project, database, creator, modules = { 'Metadata': true, 'Tools': true }) { + return { + ...project, + _id: database.reserveId(), + label: `Copy of ${project.label}`, + metadata: modules['Metadata'] ? project.metadata : [], + manifest: project.manifest, + layers: [], + tools: modules['Tools'] ? project.tools : this.tools, + _createdAt: Date.now().toString().slice(-6), + _modifiedAt: -1 + } + } + + static async cloneHotkeys(projectId, copiedProjectId) { + const hotkeys = await Hotkeys.getByProjectId(projectId) + if (hotkeys) { + const copiedHotkeys = new Hotkeys(copiedProjectId, hotkeys.symbols) + await copiedHotkeys.create() + } + } + + static async cloneGroup(projectId, creator, modules = { 'Group Members': true }) { + const project = await ProjectFactory.loadAsUser(projectId, creator) + const members = Object.fromEntries( + Object.entries(project.collaborators).filter(([userId]) => { + if (modules['Group Members'] && Array.isArray(modules['Group Members'])) { + return modules['Group Members'].includes(userId) + } + return true + }).map(([userId, user]) => { + if (userId === creator) { + return [userId, { roles: ['OWNER', 'LEADER'] }] + } + if (user.roles.includes('OWNER') || user.roles.includes('LEADER')) { + return [userId, { roles: ['LEADER'] }] + } + return [userId, { roles: user.roles }] + }) + ) + + const customRoles = Object.fromEntries( + Object.entries(project.roles).filter(([role]) => !['OWNER', 'LEADER', 'VIEWER', 'CONTRIBUTOR'].includes(role)) + ) + + const copiedGroup = await Group.createNewGroup( + creator, + { + label: `Copy of ${project.label}`, + members: modules['Group Members'] ? members : { [creator]: { roles: [] } }, + customRoles: modules['Group Members'] ? customRoles : {} + } + ) + return copiedGroup + } + + static async cloneLayers(project, copiedProject, database, withAnnotations = true) { + for (const layer of project.layers) { + const newLayer = { + id: `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, + label: layer.label, + pages: [] + } + + const newPages = await this.clonePages(layer, copiedProject, database, withAnnotations) + newLayer.pages.push(...newPages) + copiedProject.layers.push(newLayer) + } + } + + static async clonePages(layer, copiedProject, database, withAnnotations) { + const newPages = await Promise.all(layer.pages.map(async (page) => { + if (withAnnotations) { + return await this.clonePagesWithAnnotations(layer, page, copiedProject, database) + } + return await this.clonePageWithoutAnnotations(page, copiedProject, database) + })) + return newPages + } + + static async clonePageWithoutAnnotations(page, copiedProject, database) { + return { + id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, + label: page.label, + target: page.target + } + } + + static async clonePagesWithAnnotations(layer, page, copiedProject, database) { + if(!page.id.startsWith(process.env.RERUMIDPREFIX)) { + return { + id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, + label: page.label, + target: page.target + } + } + else { + return await fetch(page.id) + .then(response => response.json()) + .then(async pageData => { + const newPage = new Page(layer.id, { + id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, + label: page.label, + target: page.target, + items: await Promise.all(pageData.items.map(async item => { + return await fetch(item.id) + .then(response => response.json()) + .then(async itemData => { + const newItem = new Line({ + id: `${process.env.SERVERURL}project/${copiedProject._id}/line/${database.reserveId()}`, + target: itemData.target, + body: itemData.body, + motivation: itemData.motivation, + label: itemData.label, + type: itemData.type + }) + return await newItem.update() + }) + })) + }) + return await newPage.update() + }) + } + } + + static async copyProject(projectId, creator) { + if (!projectId) { + throw { + status: 400, + message: "No project ID provided" + } + } + + const project = await new Project(projectId).loadProject() + if (!project) { + throw { + status: 404, + message: "Project not found" + } + } + + let copiedProject = this.copiedProjectConfig(project, database, creator) + await this.cloneLayers(project, copiedProject, database, true) + copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() + const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) + await this.cloneHotkeys(project._id, copiedProject._id) + return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") + } + + static async cloneWithoutAnnotations(projectId, creator) { + if (!projectId) { + throw { + status: 400, + message: "No project ID provided" + } + } + + const project = await new Project(projectId).loadProject() + if (!project) { + throw { + status: 404, + message: "Project not found" + } + } + + let copiedProject = this.copiedProjectConfig(project, database, creator) + await this.cloneLayers(project, copiedProject, database, false) + copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() + const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) + await this.cloneHotkeys(project._id, copiedProject._id) + return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") + } + + static async cloneWithGroup(projectId, creator) { + if (!projectId) { + throw { + status: 400, + message: "No project ID provided" + } + } + const project = await new Project(projectId).loadProject() + if (!project) { + throw { + status: 404, + message: "Project not found" + } + } + + let copiedProject = this.copiedProjectConfig(project, database, creator, { 'Metadata': false, 'Tools': false }) + await this.cloneLayers(project, copiedProject, database, true) + copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() + const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) + return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") + } + + static async cloneWithCustomizations(projectId, creator, modules) { + if (!projectId) { + throw { + status: 400, + message: "No project ID provided" + } + } + + // modules is an object with keys as module names and values as true/false + // e.g. { 'Metadata': true, 'Group Members': [member1, member2], 'Hotkeys': true, 'Tools': false, 'Layers': [{ 'layerId1': { withAnnotations: true } }, { 'layerId2': { withAnnotations: false } }] } + + if (!modules || typeof modules !== 'object') { + throw { + status: 400, + message: "Modules must be an object" + } + } + + const project = await new Project(projectId).loadProject() + if (!project) { + throw { + status: 404, + message: "Project not found" + } + } + + let copiedProject = this.copiedProjectConfig(project, database, creator, { 'Metadata': modules['Metadata'], 'Tools': modules['Tools'] }) + let result = {} + + if (modules['Layers'] && Array.isArray(modules['Layers']) && modules['Layers'].length > 0) { + for (const layer of project.layers) { + for (const newlayer of modules['Layers']) { + if (newlayer.hasOwnProperty(layer.id)) { + result[layer.id] = newlayer[layer.id].withAnnotations + break + } + else { + result[layer.id] = undefined + } + } + + if (result[layer.id] === undefined) { + continue + } + + const newLayer = { + id: `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, + label: layer.label, + pages: [] + } + + let newPages = [] + + if(result[layer.id]) { + newPages = await this.clonePages(layer, copiedProject, database, true) + newLayer.pages.push(...newPages) + copiedProject.layers.push(newLayer) + } + + if(!result[layer.id]) { + newPages = await this.clonePages(layer, copiedProject, database, false) + newLayer.pages.push(...newPages) + copiedProject.layers.push(newLayer) + } + } + } + else { + const newLayer = { + id: `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, + label: project.layers[0].label, + pages: [] + } + const newPages = await this.clonePages(project.layers[0], copiedProject, database, false) + newLayer.pages.push(...newPages) + copiedProject.layers.push(newLayer) + } + + modules['Group Members'].push(creator) + const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': modules['Group Members'] }) + if( modules['Hotkeys'] ) { + await this.cloneHotkeys(project._id, copiedProject._id) + } + copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() + return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") + } + static async DBObjectFromImage(manifest) { if (!manifest) { throw { diff --git a/project/index.js b/project/index.js index defe5d5d..1deeceb7 100644 --- a/project/index.js +++ b/project/index.js @@ -12,6 +12,7 @@ import metadataRouter from "./metadataRouter.js" import projectToolsRouter from "./projectToolsRouter.js" import memberUpgradeRouter from "./memberUpgradeRouter.js" import memberDeclineInviteRouter from "./memberDeclineInviteRouter.js" +import projectCopyRouter from "./projectCopyRouter.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) @@ -27,6 +28,7 @@ router.use(customRolesRouter) router.use(hotkeysRouter) router.use(metadataRouter) router.use(projectToolsRouter) +router.use(projectCopyRouter) // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) diff --git a/project/projectCopyRouter.js b/project/projectCopyRouter.js new file mode 100644 index 00000000..d89033f0 --- /dev/null +++ b/project/projectCopyRouter.js @@ -0,0 +1,92 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import ProjectFactory from "../classes/Project/ProjectFactory.js" + +const router = express.Router({ mergeParams: true }) + +router.route("/:projectId/copy").post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) { + return respondWithError(res, 401, "Unauthorized: User not authenticated") + } + try { + const { projectId } = req.params + const project = await ProjectFactory.copyProject(projectId, user._id) + res.status(201).json(project) + } catch (error) { + respondWithError( + res, + error.status ?? error.code ?? 500, + error.message ?? "Unknown server error" + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + +router.route("/:projectId/copy-without-annotations").post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) { + return respondWithError(res, 401, "Unauthorized: User not authenticated") + } + try { + const { projectId } = req.params + const project = await ProjectFactory.cloneWithoutAnnotations(projectId, user._id) + res.status(201).json(project) + } catch (error) { + respondWithError( + res, + error.status ?? error.code ?? 500, + error.message ?? "Unknown server error" + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + +router.route("/:projectId/copy-with-group").post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) { + return respondWithError(res, 401, "Unauthorized: User not authenticated") + } + try { + const { projectId } = req.params + const project = await ProjectFactory.cloneWithGroup(projectId, user._id) + res.status(201).json(project) + } catch (error) { + respondWithError( + res, + error.status ?? error.code ?? 500, + error.message ?? "Unknown server error" + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + +router.route("/:projectId/copy-with-customizations").post(auth0Middleware(), async (req, res) => { + const user = req.user + const { modules } = req.body + if (!user) { + return respondWithError(res, 401, "Unauthorized: User not authenticated") + } + if (!modules || typeof modules !== 'object') { + return respondWithError(res, 400, "Bad Request: 'modules' must be an object") + } + try { + const { projectId } = req.params + const project = await ProjectFactory.cloneWithCustomizations(projectId, user._id, modules) + res.status(201).json(project) + } catch (error) { + respondWithError( + res, + error.status ?? error.code ?? 500, + error.message ?? "Unknown server error" + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + +export default router From ba418c060e48721708978a4ee5cc21071941d96b Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 9 Jul 2025 14:19:00 -0500 Subject: [PATCH 115/262] Project label update API (#273) * Project label update API * picky * make this a patch request --------- Co-authored-by: Bryan Haberberger --- classes/Project/Project.js | 15 ++++++++++++--- project/projectCreateRouter.js | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index ac871bf1..d63e7f87 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -127,6 +127,16 @@ export default class Project { return this.data?.label ?? `No Label` } + async setLabel(label) { + if (typeof label !== "string" || label.trim() === "") { + throw new Error("Label must be a non-empty string") + } + if(!this?.data?.label) await this.#load() + if(this.data.label.trim() === label.trim()) return this.data + this.data.label = label.trim() + return await this.update() + } + getCombinedPermissions(roles) { return [...new Set(Object.keys(roles).map(r => roles[r]).flat())] } @@ -222,9 +232,9 @@ export default class Project { */ async updateTools(selectedValues) { - await this.#load() // Guard invalid input if (!Array.isArray(selectedValues)) return + if(!this?.data?.tools) await this.#load() // Guard existing data in corrupted state if(!this.data?.tools) this.data.tools = [] @@ -246,8 +256,7 @@ export default class Project { // Guard invalid input if (!Array.isArray(tools)) return - - await this.#load() + if(!this?.data?.tools) await this.#load() // Guard existing data in corrupted state if(!this.data?.tools) this.data.tools = [] diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 7427f741..a22790b2 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -89,4 +89,27 @@ router.route("/import-image").post(auth0Middleware(), async (req, res) => { respondWithError(res, 405, "Improper request method. Use POST instead") }) +router.route("/:projectId/label").patch(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") + const projectId = req.params.projectId + if (!projectId) return respondWithError(res, 400, "Project ID is required") + const { label } = req.body + if (!label) return respondWithError(res, 400, "Label is required") + try { + let project = new Project(projectId) + if (!project) return respondWithError(res, 404, "Project not found") + project = await project.setLabel(label) + res.status(200).json(project) + } catch (error) { + respondWithError( + res, + error.status ?? error.code ?? 500, + error.message ?? "Unknown server error" + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use PATCH instead") +}) + export default router From 3523fa7cf082570e4c24147034cce8cfc26b9fee Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Thu, 10 Jul 2025 13:39:43 -0500 Subject: [PATCH 116/262] Level 0 image fix for TPEN28 imported Projects (#274) * Level 0 image fix for TPEN28 imported Projects * Update ProjectFactory.js * .id --- classes/Project/ProjectFactory.js | 8 ++++---- project/projectCreateRouter.js | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index b060470a..712bf770 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -97,7 +97,7 @@ export default class ProjectFactory { } ] - static async DBObjectFromManifest(manifest) { + static async DBObjectFromManifest(manifest, importTPEN28 = false) { if (!manifest) { throw { status: 404, @@ -117,7 +117,7 @@ export default class ProjectFactory { _id, label, metadata, - manifest: [ manifest.id ], + manifest: importTPEN28 ? [ manifest.id.split('/manifest.json')[0] + '?version=3' ] : [ manifest.id ], layers: [ layer.asProjectLayer() ], tools: this.tools, _createdAt: now, @@ -131,10 +131,10 @@ export default class ProjectFactory { return label[defaultLanguage]?.join(", ") ?? label.none?.join(",") } - static async fromManifestURL(manifestId, creator) { + static async fromManifestURL(manifestId, creator, importTPEN28 = false) { return vault.loadManifest(manifestId) .then(async (manifest) => { - return await ProjectFactory.DBObjectFromManifest(manifest) + return await ProjectFactory.DBObjectFromManifest(manifest, importTPEN28) }) .then(async (project) => { const projectObj = new Project() diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index a22790b2..8ed70518 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -48,7 +48,8 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { try { const result = await ProjectFactory.fromManifestURL( manifestURL, - user._id + user._id, + true ) res.status(201).json(result) } catch (error) { From 1b6f74aa60099d38b091aa22ee3c7adf6cd6e0e7 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri, 18 Jul 2025 11:55:31 -0500 Subject: [PATCH 117/262] Adding Creator (#275) * Adding Creator * Export Changes * creator Null in constructor * Update Page.js * creator * creator on rerum * Prev and Next * asProjectLine() removed * Update Line.js * User as Creator * Removed extra code * Save to Rerum Canvas * creator as agent and removing export creator * Update Page.js * line user * Page user * projectCreateRouter user * Update index.js * Prev and next Id for get Page * Pages next and prev and partOf * Use env variable instead of hard coded RERUM id prefixes * oo i c. sorry. undo. * User Agent as creator * Add Layer to work * Adding creator to manifest * creator for image and temp layer * creator remove * Update ProjectFactory.js * Page creator * Update index.js * Page creator * Page creator findby * Update index.js * remove * getManifestItems --------- Co-authored-by: Bryan Haberberger --- classes/Layer/Layer.js | 21 +++-- classes/Line/Line.js | 9 +- classes/Page/Page.js | 23 +++-- classes/Project/ProjectFactory.js | 122 +++++++++++++++++---------- database/driver.js | 4 + layer/__tests__/layer_routes.test.js | 2 +- layer/index.js | 10 ++- line/index.js | 8 +- page/index.js | 64 +++++++++----- project/projectCreateRouter.js | 25 +++++- utilities/shared.js | 26 +++++- 11 files changed, 219 insertions(+), 95 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index 5e744d37..e20a3f41 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -1,8 +1,8 @@ import dbDriver from "../../database/driver.js" import { handleVersionConflict } from "../../utilities/shared.js" import Page from "../Page/Page.js" +import { fetchUserAgent } from "../../utilities/shared.js" -const database = new dbDriver("mongo") const databaseTiny = new dbDriver("tiny") export default class Layer { @@ -18,7 +18,7 @@ export default class Layer { * @param {Array} pages The pages in the layer by reference. * @seeAlso {@link Layer.build} */ - constructor(projectId, { id, label, pages }) { + constructor(projectId, { id, label, pages, creator = null }) { if (!projectId) { throw new Error("Project ID is required to create a Layer instance.") } @@ -28,6 +28,7 @@ export default class Layer { this.projectId = projectId this.id = id this.label = label + this.creator = creator this.pages = pages if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' @@ -36,7 +37,7 @@ export default class Layer { } // Static Methods - static build(projectId, label, canvases, projectLabel = "Default") { + static build(projectId, label, canvases, creator, projectLabel = "Default") { if (!Array.isArray(canvases)) { if (!canvases) { throw new Error("At least one Canvas must be included.") @@ -47,14 +48,17 @@ export default class Layer { const thisLayer = { projectId, label: label ?? `${projectLabel} - Layer ${Date.now()}`, + creator, id: `${process.env.SERVERURL}project/${projectId.split('/').pop()}/layer/${databaseTiny.reserveId()}` } const pages = canvases.map(c => Page.build(projectId, thisLayer.id, c).asProjectPage()) pages.forEach((page, index) => { if (index > 0) page.prev = pages[index - 1].id if (index < pages.length - 1) page.next = pages[index + 1].id + page.partOf = thisLayer.id + page.creator = thisLayer.creator }) - return new Layer(projectId, { id: thisLayer.id, label: thisLayer.label, pages }) + return new Layer(projectId, { id: thisLayer.id, label: thisLayer.label, pages, creator: thisLayer.creator }) } // Public Methods @@ -109,9 +113,16 @@ export default class Layer { id: this.id, type: "AnnotationCollection", label: { "none": [this.label] }, + creator: await fetchUserAgent(this.creator), total: this.pages.length, first: this.pages.at(0).id, - last: this.pages.at(-1).id + last: this.pages.at(-1).id, + items: this.pages.map(page => ({ + id: page.id, + type: "AnnotationPage", + label: { "none": [page.label] }, + target: page.target + })) } if (this.#tinyAction === 'create') { diff --git a/classes/Line/Line.js b/classes/Line/Line.js index f5526f6d..a011a910 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -1,4 +1,5 @@ import dbDriver from "../../database/driver.js" +import { fetchUserAgent } from "../../utilities/shared.js" const databaseTiny = new dbDriver("tiny") export default class Line { @@ -11,12 +12,13 @@ export default class Line { return this } - constructor({ id, target, body, motivation, label, type }) { + constructor({ id, target, body, motivation, label, type, creator = null }) { if (!id || !target) throw new Error('Line data is malformed.') this.id = id // Ensure the id is assigned this.body = body this.target = target + this.creator = creator if (id.startsWith?.(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } @@ -26,10 +28,10 @@ export default class Line { return this } - static build(projectId, pageId, { body, target, motivation, label, type }) { + static build(projectId, pageId, { body, target, motivation, label, type }, creator) { // TODO: Should this have a space for an id that is sent in? const id = `${process.env.SERVERURL}project/${projectId}/page/${pageId}/line/${databaseTiny.reserveId()}` - return new Line({ id, body, target, motivation, label, type }) + return new Line({ id, body, target, motivation, label, type, creator }) } async #saveLineToRerum() { @@ -39,6 +41,7 @@ export default class Line { type: this.type ?? "Annotation", motivation: this.motivation ?? "transcribing", target: this.target, + creator: await fetchUserAgent(this.creator.split('/').pop()), body: this.body } if (this.label) lineAsAnnotation.label = { "none": [this.label] } diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 5cffdc50..35ffb6de 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -1,5 +1,6 @@ import dbDriver from "../../database/driver.js" import { handleVersionConflict } from "../../utilities/shared.js" +import { fetchUserAgent } from "../../utilities/shared.js" const databaseTiny = new dbDriver("tiny") @@ -22,18 +23,18 @@ export default class Page { * @param {Array} items The array of Annotation objects. * @seeAlso {@link Page.build} */ - constructor(layerId, { id, label, target, items = [] }) { + constructor(layerId, { id, label, target, items = [], creator = null, partOf = null, prev = null, next = null }) { if (!id || !target) { throw new Error("Page data is malformed.") } - Object.assign(this, { id, label, target, partOf: layerId, items }) + Object.assign(this, { id, label, target, partOf: partOf ?? layerId, items, creator, prev, next }) if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } return this } - static build(projectId, layerId, canvas, prev, next, items = []) { + static build(projectId, layerId, canvas, creator, partOf, prev, next, items = []) { if (!projectId) { throw new Error("Project ID is required to create a Page instance.") } @@ -58,7 +59,8 @@ export default class Page { type: "AnnotationPage", label: canvas.label ?? `Page ${canvas.id.split('/').pop()}`, target: canvas.id, - partOf: `${process.env.SERVERURL}project/${projectId}/layer/${layerId}`, + creator: creator, + partOf: partOf ?? `${process.env.SERVERURL}project/${projectId}/layer/${layerId}`, items, prev, next @@ -74,11 +76,16 @@ export default class Page { id: this.id, type: "AnnotationPage", label: { "none": [this.label] }, - target: this.target, - partOf: this.partOf, items: this.items ?? [], - prev: this.prev ?? null, - next: this.next ?? null + ...this?.prev && { + prev: this.prev + }, + ...this?.next && { + next: this.next + }, + creator: await fetchUserAgent(this.creator), + target: this.target, + partOf: [{ id: this.partOf, type: "AnnotationCollection" }] } if (this.#tinyAction === 'create') { await databaseTiny.save(pageAsAnnotationPage) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 712bf770..dd911342 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -9,6 +9,7 @@ import vault from "../../utilities/vault.js" import imageSize from 'image-size' import mime from 'mime-types' import Hotkeys from "../HotKeys/Hotkeys.js" +import { fetchUserAgent } from "../../utilities/shared.js" const database = new dbDriver("mongo") @@ -97,7 +98,7 @@ export default class ProjectFactory { } ] - static async DBObjectFromManifest(manifest, importTPEN28 = false) { + static async DBObjectFromManifest(manifest, creator, importTPEN28 = false) { if (!manifest) { throw { status: 404, @@ -108,7 +109,7 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now const metadata = manifest.metadata ?? [] - const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items ) + const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items, creator ) const firstPage = layer.pages[0]?.id.split('/').pop() ?? true @@ -134,7 +135,7 @@ export default class ProjectFactory { static async fromManifestURL(manifestId, creator, importTPEN28 = false) { return vault.loadManifest(manifestId) .then(async (manifest) => { - return await ProjectFactory.DBObjectFromManifest(manifest, importTPEN28) + return await ProjectFactory.DBObjectFromManifest(manifest, creator, importTPEN28) }) .then(async (project) => { const projectObj = new Project() @@ -184,7 +185,7 @@ export default class ProjectFactory { } } - static copiedProjectConfig(project, database, creator, modules = { 'Metadata': true, 'Tools': true }) { + static copiedProjectConfig(project, database, modules = { 'Metadata': true, 'Tools': true }) { return { ...project, _id: database.reserveId(), @@ -240,24 +241,36 @@ export default class ProjectFactory { return copiedGroup } - static async cloneLayers(project, copiedProject, database, withAnnotations = true) { + static async cloneLayers(project, copiedProject, creator, database, withAnnotations = true) { for (const layer of project.layers) { - const newLayer = { + let newLayer = { id: `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, label: layer.label, pages: [] } - const newPages = await this.clonePages(layer, copiedProject, database, withAnnotations) + const newPages = await this.clonePages(layer, copiedProject, creator, database, withAnnotations) + for (const page of newPages) { + const updatedPage = new Page( + newLayer.id, + { id: page.id, label: page.label, target: page.target, + items: page.items, + creator: creator, + partOf: newLayer.id, + prev: newPages[newPages.indexOf(page) - 1]?.id, + next: newPages[newPages.indexOf(page) + 1]?.id + }) + await updatedPage.update() + } newLayer.pages.push(...newPages) copiedProject.layers.push(newLayer) } } - static async clonePages(layer, copiedProject, database, withAnnotations) { + static async clonePages(layer, copiedProject, creator, database, withAnnotations) { const newPages = await Promise.all(layer.pages.map(async (page) => { if (withAnnotations) { - return await this.clonePagesWithAnnotations(layer, page, copiedProject, database) + return await this.clonePagesWithAnnotations(layer, page, copiedProject, creator, database) } return await this.clonePageWithoutAnnotations(page, copiedProject, database) })) @@ -272,7 +285,7 @@ export default class ProjectFactory { } } - static async clonePagesWithAnnotations(layer, page, copiedProject, database) { + static async clonePagesWithAnnotations(layer, page, copiedProject, creator, database) { if(!page.id.startsWith(process.env.RERUMIDPREFIX)) { return { id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, @@ -284,21 +297,23 @@ export default class ProjectFactory { return await fetch(page.id) .then(response => response.json()) .then(async pageData => { - const newPage = new Page(layer.id, { + const newPage = new Page(layer.id,{ id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, label: page.label, target: page.target, + creator: creator, items: await Promise.all(pageData.items.map(async item => { return await fetch(item.id) .then(response => response.json()) .then(async itemData => { const newItem = new Line({ id: `${process.env.SERVERURL}project/${copiedProject._id}/line/${database.reserveId()}`, - target: itemData.target, - body: itemData.body, - motivation: itemData.motivation, + type: itemData.type, label: itemData.label, - type: itemData.type + motivation: itemData.motivation, + body: itemData.body, + target: itemData.target, + creator: creator }) return await newItem.update() }) @@ -325,8 +340,8 @@ export default class ProjectFactory { } } - let copiedProject = this.copiedProjectConfig(project, database, creator) - await this.cloneLayers(project, copiedProject, database, true) + let copiedProject = this.copiedProjectConfig(project, database) + await this.cloneLayers(project, copiedProject, creator, database, true) copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) await this.cloneHotkeys(project._id, copiedProject._id) @@ -349,8 +364,8 @@ export default class ProjectFactory { } } - let copiedProject = this.copiedProjectConfig(project, database, creator) - await this.cloneLayers(project, copiedProject, database, false) + let copiedProject = this.copiedProjectConfig(project, database) + await this.cloneLayers(project, copiedProject, creator, database, false) copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) await this.cloneHotkeys(project._id, copiedProject._id) @@ -372,8 +387,8 @@ export default class ProjectFactory { } } - let copiedProject = this.copiedProjectConfig(project, database, creator, { 'Metadata': false, 'Tools': false }) - await this.cloneLayers(project, copiedProject, database, true) + let copiedProject = this.copiedProjectConfig(project, database, { 'Metadata': false, 'Tools': false }) + await this.cloneLayers(project, copiedProject, creator, database, true) copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") @@ -405,7 +420,7 @@ export default class ProjectFactory { } } - let copiedProject = this.copiedProjectConfig(project, database, creator, { 'Metadata': modules['Metadata'], 'Tools': modules['Tools'] }) + let copiedProject = this.copiedProjectConfig(project, database, { 'Metadata': modules['Metadata'], 'Tools': modules['Tools'] }) let result = {} if (modules['Layers'] && Array.isArray(modules['Layers']) && modules['Layers'].length > 0) { @@ -465,7 +480,7 @@ export default class ProjectFactory { return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") } - static async DBObjectFromImage(manifest) { + static async DBObjectFromImage(manifest, creator) { if (!manifest) { throw { status: 404, @@ -476,7 +491,7 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) const metadata = manifest.metadata ?? [] - const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items ) + const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items, creator) const firstPage = layer.pages[0]?.id.split('/').pop() ?? true @@ -610,7 +625,8 @@ export default class ProjectFactory { } ] } - ] + ], + creator: await fetchUserAgent(creator), } const projectManifest = { @@ -618,7 +634,8 @@ export default class ProjectFactory { id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, type: "Manifest", label: { "none": [label] }, - items: [ canvasLayout ] + items: [ canvasLayout ], + creator: await fetchUserAgent(creator), } const projectCanvas = { @@ -629,7 +646,7 @@ export default class ProjectFactory { await this.uploadFileToGitHub(projectManifest, _id) await this.uploadFileToGitHub(projectCanvas, _id) - return await ProjectFactory.DBObjectFromImage(projectManifest) + return await ProjectFactory.DBObjectFromImage(projectManifest, creator) .then(async (project) => { const projectObj = new Project() const group = await Group.createNewGroup(creator, @@ -709,6 +726,7 @@ export default class ProjectFactory { } const project = await ProjectFactory.loadAsUser(projectId, null) + const manifestJson = await this.fetchJson(project.manifest[0]) const manifest = { "@context": "http://iiif.io/api/presentation/3/context.json", @@ -716,32 +734,44 @@ export default class ProjectFactory { type: "Manifest", label: { none: [project.label] }, metadata: project.metadata, - items: await this.getManifestItems(project), + items: await this.getManifestItems(project, manifestJson), + creator: await fetchUserAgent(project.creator) } return manifest } - static async getManifestItems(project) { + static async getManifestItems(project, manifestJson) { return Promise.all( - project.layers.map(async (layer) => { + manifestJson.items.map(async (canvas) => { try { - const canvasUrl = layer.pages[0].target - const canvasData = await this.fetchJson(canvasUrl) - if (!canvasData) return null - - const canvasItems = { - id: canvasData.id ?? canvasData["@id"], - type: canvasData.type, - label: canvasData.label, - width: canvasData.width, - height: canvasData.height, - items: canvasData.items, - annotations: await this.getAnnotations(canvasData), + let canvasItems = { + id: canvas.id, + type: canvas.type, + label: canvas.label, + width: canvas.width, + height: canvas.height, + items: canvas.items, + creator: await fetchUserAgent(project.creator), } + + const annotationPages = [] + await Promise.all(project.layers.map(layer => { + return layer.pages.forEach(page => { + if((page.target === canvas.id) && page.id.startsWith(process.env.RERUMIDPREFIX) ) { + const annotationPage = { + id: page.id, + type: "AnnotationPage" + } + annotationPages.push(annotationPage) + } + }) + }) + ) + annotationPages.length > 0 && (canvasItems.annotations = annotationPages) return canvasItems } catch (error) { console.error(`Error processing layer:`, error) - return null + return } }) ) @@ -760,6 +790,12 @@ export default class ProjectFactory { label: annotationData.label, items: await this.getLines(annotationData), partOf: annotationData.partOf, + ...(annotationData?.prev) && { + prev: annotationData.prev + }, + ...(annotationData?.next) && { + next: annotationData.next + }, creator: annotationData.creator, target: annotationData.target, } diff --git a/database/driver.js b/database/driver.js index 4973c412..8ab87072 100644 --- a/database/driver.js +++ b/database/driver.js @@ -210,6 +210,8 @@ function determineDataType(data, override) { if (data._sub) return "User" if (data.members) return "Group" if (data.group) return "Project" + if (data.total && data.first && data.last) return "Layer" + if (data.items && data.items[0] && data.items[0].items && data.items[0].items[0] && data.items[0].items[0].target) return "Canvas" if (data.target && data.items) return "Page" if (data.target && data.body) return "Line" return override ?? data["@type"] ?? data.type @@ -226,6 +228,8 @@ function discernCollectionFromType(type) { switch (type) { case "Project": + case "Canvas": + case "Layer": case "Page": case "Line": return process.env.TPENPROJECTS diff --git a/layer/__tests__/layer_routes.test.js b/layer/__tests__/layer_routes.test.js index 5fe7e9d3..5b304897 100644 --- a/layer/__tests__/layer_routes.test.js +++ b/layer/__tests__/layer_routes.test.js @@ -48,7 +48,7 @@ describe('Layer Routes', () => { expect(res.status).toBe(201) expect(res.body).toEqual(mockLayer) - expect(Layer.build).toHaveBeenCalledWith('123', 'Layer 1', ['canvas1', 'canvas2']) + expect(Layer.build).toHaveBeenCalledWith('123', 'Layer 1', ['canvas1', 'canvas2'], 'test-user') }) it('should return 400 for invalid input', async () => { diff --git a/layer/index.js b/layer/index.js index 38dae9ba..7bf8a406 100644 --- a/layer/index.js +++ b/layer/index.js @@ -6,6 +6,7 @@ import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' +import { fetchUserAgent } from '../utilities/shared.js' const router = express.Router({ mergeParams: true }) @@ -17,13 +18,14 @@ router.route('/:layerId') const { projectId, layerId } = req.params try { - const layer = await findLayerById(layerId, projectId) + const { layer, creator } = await findLayerById(layerId, projectId) // Make this internal Layer look more like a RERUM AnnotationCollection const layerAsCollection = { '@context': 'http://www.w3.org/ns/anno.jsonld', id: layer.id, type: 'AnnotationCollection', label: { none: [layer.label] }, + creator: await fetchUserAgent(creator), total: layer.pages.length, first: layer.pages.at(0).id, last: layer.pages.at(-1).id @@ -57,8 +59,8 @@ router.route('/:layerId') label ??= label ?? layer.label if(canvases?.length === 0) canvases = undefined const updatedLayer = canvases ? - Layer.build(projectId, label, canvases) - : new Layer(projectId, {id:layer.id, label, pages:layer.pages}) + Layer.build(projectId, label, canvases, req.agent.split('/').pop()) + : new Layer(projectId, {id:layer.id, label, pages:layer.pages, creator: req.agent.split('/').pop()}) await updatedLayer.update() project.updateLayer(updatedLayer.asProjectLayer(), layerId) @@ -129,5 +131,5 @@ async function findLayerById(layerId, projectId, skipLookup = false) { throw error } - return layer + return { layer, creator: p.creator } } diff --git a/line/index.js b/line/index.js index d1efd5dc..ae80fc48 100644 --- a/line/index.js +++ b/line/index.js @@ -61,7 +61,7 @@ router.post('/', auth0Middleware(), async (req, res) => { let newLine // This feels like a use case for /bulkCreate in RERUM. Make all these lines with one call. for (const lineData of inputLines) { - newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }) + newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }, user.agent.split('/').pop()) const existingLine = findLineInPage(page, newLine.id, res) if (existingLine) { @@ -98,7 +98,7 @@ router.put('/:lineId', auth0Middleware(), async (req, res) => { if (!user) return respondWithError(res, 401, "Unauthenticated request") try { const project = await getProjectById(req.params.projectId) - const page = await findPageById(req.params.pageId, req.params.projectId) + const { page, creator } = await findPageById(req.params.pageId, req.params.projectId) let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) @@ -150,7 +150,7 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { return } const project = await getProjectById(req.params.projectId) - const page = await findPageById(req.params.pageId, req.params.projectId) + const { page, creator } = await findPageById(req.params.pageId, req.params.projectId) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) @@ -201,7 +201,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return } const project = await getProjectById(req.params.projectId) - const page = await findPageById(req.params.pageId, req.params.projectId) + const { page, creator } = await findPageById(req.params.pageId, req.params.projectId) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { respondWithError(res, 404, `Line with ID '${req.params.line}' not found in page '${req.params.pageId}'`) diff --git a/page/index.js b/page/index.js index 71f2a7b4..5ef43aa4 100644 --- a/page/index.js +++ b/page/index.js @@ -5,7 +5,7 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' import Line from '../classes/Line/Line.js' -import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict } from '../utilities/shared.js' +import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict, fetchUserAgent } from '../utilities/shared.js' router.use( cors(common_cors) @@ -18,14 +18,14 @@ router.route('/:pageId') .get(async (req, res) => { const { projectId, pageId } = req.params try { - const pageObject = await findPageById(pageId, projectId) - if (!pageObject) { + const { page, creator } = await findPageById(pageId, projectId) + if (!page) { respondWithError(res, 404, 'No page found with that ID.') return } - if (pageObject.id?.startsWith(process.env.RERUMIDPREFIX)) { + if (page.id?.startsWith(process.env.RERUMIDPREFIX)) { // If the page is a RERUM document, we need to fetch it from the server - const pageFromRerum = await fetch(pageObject.id).then(res => res.json()) + const pageFromRerum = await fetch(page.id).then(res => res.json()) if (pageFromRerum) { res.status(200).json(pageFromRerum) return @@ -34,14 +34,19 @@ router.route('/:pageId') // build as AnnotationPage const pageAsAnnotationPage = { '@context': 'http://www.w3.org/ns/anno.jsonld', - id: pageObject.id, + id: page.id, type: 'AnnotationPage', - label: { none: [pageObject.label] }, - target: pageObject.target, - partOf: pageObject.partOf, - items: pageObject.items ?? [], - prev: pageObject.prev ?? null, - next: pageObject.next ?? null + label: { none: [page.label] }, + target: page.target, + partOf: page.partOf, + items: page.items ?? [], + ...page?.prev?.id && { + prev: page.prev.id + }, + ...page?.next?.id && { + next: page.next.id + }, + creator: await fetchUserAgent(creator), } res.status(200).json(pageAsAnnotationPage) } catch (error) { @@ -75,35 +80,48 @@ router.route('/:pageId') try { // Find the page object - const pageObject = await findPageById(pageId, projectId) - if (!pageObject) { + const { page, creator } = await findPageById(pageId, projectId) + page.creator = user.agent.split('/').pop() + page.partOf = layerId + if (page?.prev?.id) { + page.prev = page.prev.id + } else { + delete page.prev + } + + if (page?.next?.id) { + page.next = page.next.id + } else { + delete page.next + } + if (!page) { respondWithError(res, 404, 'No page found with that ID.') return } // Only update top-level properties that are present in the request Object.keys(update ?? {}).forEach(key => { - pageObject[key] = update[key] + page[key] = update[key] }) - Object.keys(pageObject).forEach(key => { - if (pageObject[key] === undefined || pageObject[key] === null) { + Object.keys(page).forEach(key => { + if (page[key] === undefined || page[key] === null) { // Remove properties that are undefined or null - delete pageObject[key] + delete page[key] } }) if (update.items) { - pageObject.items = await Promise.all(pageObject.items.map(async item => { + page.items = await Promise.all(page.items.map(async item => { const line = item.id?.startsWith?.('http') ? new Line(item) - : Line.build(projectId, pageId, item) + : Line.build(projectId, pageId, item, user.agent.split('/').pop()) return await line.update() })) } - await updatePageAndProject(pageObject, project, user._id) + await updatePageAndProject(page, project, user._id) - res.status(200).json(pageObject) - } catch (error) { + res.status(200).json(page) + } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { if(res.headersSent) return diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 8ed70518..dfdd82a7 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -48,7 +48,28 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { try { const result = await ProjectFactory.fromManifestURL( manifestURL, - user._id, + user.agent.split('/').pop(), + ) + res.status(201).json(result) + } catch (error) { + res.status(error.status ?? 500).json({ + status: error.status ?? 500, + message: error.message, + data: error.resolvedPayload + }) + } + } else if (createFrom === "tpen28url") { + const manifestURL = req?.body?.url + let checkURL = await validateURL(manifestURL) + if (!checkURL.valid) + return res.status(checkURL.status).json({ + message: checkURL.message, + resolvedPayload: checkURL.resolvedPayload + }) + try { + const result = await ProjectFactory.fromManifestURL( + manifestURL, + user.agent.split('/').pop(), true ) res.status(201).json(result) @@ -76,7 +97,7 @@ router.route("/import-image").post(auth0Middleware(), async (req, res) => { if (!imageUrl || !projectLabel) { return respondWithError(res, 400, "Image URL and project label are required") } - const project = await ProjectFactory.createManifestFromImage(imageUrl, projectLabel, user._id) + const project = await ProjectFactory.createManifestFromImage(imageUrl, projectLabel, user.agent.split('/').pop()) res.status(201).json(project) } catch (error) { respondWithError( diff --git a/utilities/shared.js b/utilities/shared.js index 1ec8f7d0..a1d97ecb 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -63,7 +63,7 @@ export const getProjectById = async (projectId, res) => { // Fetch a page by ID export const getPageById = async (pageId, projectId, res) => { - const page = await findPageById(pageId, projectId) + const { page, creator } = await findPageById(pageId, projectId) if (!page) { respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) return null @@ -163,7 +163,7 @@ export async function findPageById(pageId, projectId) { page.prev = layerContainingPage.pages[pageIndex - 1] ?? null page.next = layerContainingPage.pages[pageIndex + 1] ?? null - return new Page(layerContainingPage.id, page) + return { page: new Page(layerContainingPage.id, page), creator: projectData.creator } } /** @@ -217,3 +217,25 @@ export const withOptimisticLocking = async (operation, retryFn, maxRetries = 2) throw lastError } + +/** * Fetch the user agent for a given user ID + * @param {string} userId - The ID of the user to fetch the agent for + * @returns {Promise} The user agent string + * @throws {Error} If the user ID is not provided or the user cannot be found + */ + +export const fetchUserAgent = async (userId) => { + if (!userId) { + throw new Error('User ID is required to fetch user agent') + } + try { + let user = new User(userId) + user =await user.getSelf() + if (!user) { + throw new Error(`User with ID '${userId}' not found`) + } + return user.agent + } catch (error) { + throw new Error(`Error fetching user agent: ${error.message}`) + } +} From c98a41c5ad5f8f32cac07c1f787430de05c391bd Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 23 Jul 2025 09:15:33 -0500 Subject: [PATCH 118/262] Layer and Page Management Endpoints (#278) * Fixes for updating Layers and Pages * Prepare PR * remove console.log()s * remove console.log()s * polish * polish * optimize * touchups from testing --- classes/Layer/Layer.js | 4 +-- classes/Project/Project.js | 23 ++++++++-------- layer/index.js | 56 ++++++++++++++++---------------------- 3 files changed, 37 insertions(+), 46 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index e20a3f41..78293ff1 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -73,8 +73,8 @@ export default class Layer { return true } - async update() { - if (this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { + async update(saveFirst=false) { + if (saveFirst) { this.#setRerumId() await this.#saveCollectionToRerum() } diff --git a/classes/Project/Project.js b/classes/Project/Project.js index d63e7f87..b63ddb8c 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -131,8 +131,8 @@ export default class Project { if (typeof label !== "string" || label.trim() === "") { throw new Error("Label must be a non-empty string") } - if(!this?.data?.label) await this.#load() - if(this.data.label.trim() === label.trim()) return this.data + if (!this?.data?.label) await this.#load() + if (this.data.label.trim() === label.trim()) return this.data this.data.label = label.trim() return await this.update() } @@ -207,7 +207,7 @@ export default class Project { // Don't leave orphaned invitees in the db. const member = new User(userId) const memberData = await member.getSelf() - if(memberData?.inviteCode) member.delete() + if (memberData?.inviteCode) member.delete() return this } catch (error) { throw { @@ -234,9 +234,9 @@ export default class Project { async updateTools(selectedValues) { // Guard invalid input if (!Array.isArray(selectedValues)) return - if(!this?.data?.tools) await this.#load() + if (!this?.data?.tools) await this.#load() // Guard existing data in corrupted state - if(!this.data?.tools) this.data.tools = [] + if (!this.data?.tools) this.data.tools = [] this.data.tools = this.data.tools.map(tool => { const match = selectedValues.find(t => { @@ -256,9 +256,9 @@ export default class Project { // Guard invalid input if (!Array.isArray(tools)) return - if(!this?.data?.tools) await this.#load() + if (!this?.data?.tools) await this.#load() // Guard existing data in corrupted state - if(!this.data?.tools) this.data.tools = [] + if (!this.data?.tools) this.data.tools = [] for (let newTool of tools) { const name = newTool.name.trim() @@ -313,10 +313,9 @@ export default class Project { return project } - updateLayer(layer, previousId) { - if (!this.data?.layers) { - throw new Error("Project does not have layers.") - } + async updateLayer(layer, previousId) { + if (!this.data?.layers) await this.#load() + if (!this.data?.layers) throw new Error("Project does not have layers.") previousId ??= layer.id const layerIndex = this.data.layers.findIndex(l => l.id.split('/').pop() === previousId.split('/').pop()) if (layerIndex < 0) { @@ -354,7 +353,7 @@ function isValidLayer(layer) { } for (const page of layer.pages) { - if (!page?.id?.startsWith('http') || !page?.target?.startsWith('http') || !page.label ) { + if (!page?.id?.startsWith('http') || !page?.target?.startsWith('http') || !page.label) { return false } } diff --git a/layer/index.js b/layer/index.js index 7bf8a406..271949c1 100644 --- a/layer/index.js +++ b/layer/index.js @@ -6,7 +6,7 @@ import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' -import { fetchUserAgent } from '../utilities/shared.js' +import { fetchUserAgent, findPageById } from '../utilities/shared.js' const router = express.Router({ mergeParams: true }) @@ -16,9 +16,8 @@ router.use(cors(common_cors)) router.route('/:layerId') .get(async (req, res) => { const { projectId, layerId } = req.params - try { - const { layer, creator } = await findLayerById(layerId, projectId) + const layer = await findLayerById(layerId, projectId) // Make this internal Layer look more like a RERUM AnnotationCollection const layerAsCollection = { '@context': 'http://www.w3.org/ns/anno.jsonld', @@ -30,7 +29,6 @@ router.route('/:layerId') first: layer.pages.at(0).id, last: layer.pages.at(-1).id } - return res.status(200).json(layerAsCollection) } catch (error) { console.error(error) @@ -39,35 +37,34 @@ router.route('/:layerId') }) .put(auth0Middleware(), async (req, res) => { const { projectId, layerId } = req.params - let { label, canvases } = req.body - + let label = req.body?.label + const providedPages = req.body?.pages + const user = req.user if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') - if (!layerId) return utils.respondWithError(res, 400, 'Layer ID is required') - - try { const project = new Project(projectId) - const layers = await project.loadProject() - - if (!layers) return utils.respondWithError(res, 404, 'Project does not exist') - + if (!project?._id) return utils.respondWithError(res, 404, "Project '${projectId}' does not exist") const layer = await findLayerById(layerId, projectId, true) - - if (!layer) return utils.respondWithError(res, 404, 'Layer not found in project') - + if (!layer?.id) return utils.respondWithError(res, 404, "Layer '${layerId}' not found in project") label ??= label ?? layer.label - if(canvases?.length === 0) canvases = undefined - const updatedLayer = canvases ? - Layer.build(projectId, label, canvases, req.agent.split('/').pop()) - : new Layer(projectId, {id:layer.id, label, pages:layer.pages, creator: req.agent.split('/').pop()}) - - await updatedLayer.update() - project.updateLayer(updatedLayer.asProjectLayer(), layerId) + if (providedPages?.length === 0) providedPages = undefined + let pages = [] + if (providedPages && providedPages.length) { + const resolvedPages = await Promise.all(providedPages.map(p => findPageById(p.split("/").pop(), projectId) )) + pages = resolvedPages.map(p => p.page) + } + else{ + pages = layer.pages + } + const updatedLayer = new Layer(projectId, {id:layer.id, label, pages, creator: user.agent.split('/').pop()}) + const saveFirst = (providedPages !== undefined && !layer.id.startsWith(process.env.RERUMIDPREFIX)) + await updatedLayer.update(saveFirst) + await project.updateLayer(updatedLayer, layerId) await project.update() - res.status(200).json(project.data) } catch (error) { + console.error(error) return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') } }) @@ -79,24 +76,19 @@ router.route('/:layerId') router.route('/').post(auth0Middleware(), async (req, res) => { const { projectId } = req.params const { label, canvases } = req.body - if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') - if (!label || !Array.isArray(canvases) || canvases.length === 0) { return utils.respondWithError(res, 400, 'Invalid layer data. Provide a label and an array of URIs or Page objects.') } - try { const project = await Project.getById(projectId) - if (!project) return utils.respondWithError(res, 404, 'Project does not exist') - const newLayer = Layer.build(projectId, label, canvases) project.addLayer(newLayer.asProjectLayer()) await project.update() - res.status(201).json(project.data) } catch (error) { + console.error(error) return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error creating layer') } }) @@ -130,6 +122,6 @@ async function findLayerById(layerId, projectId, skipLookup = false) { error.status = 422 throw error } - - return { layer, creator: p.creator } + layer.creator = p.creator + return layer } From ab82078f1ef14222a7eea28e2fa2b6b77bddcce9 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 23 Jul 2025 09:20:17 -0500 Subject: [PATCH 119/262] Revert "Layer and Page Management Endpoints (#278)" (#283) This reverts commit c98a41c5ad5f8f32cac07c1f787430de05c391bd. --- classes/Layer/Layer.js | 4 +-- classes/Project/Project.js | 23 ++++++++-------- layer/index.js | 56 ++++++++++++++++++++++---------------- 3 files changed, 46 insertions(+), 37 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index 78293ff1..e20a3f41 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -73,8 +73,8 @@ export default class Layer { return true } - async update(saveFirst=false) { - if (saveFirst) { + async update() { + if (this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { this.#setRerumId() await this.#saveCollectionToRerum() } diff --git a/classes/Project/Project.js b/classes/Project/Project.js index b63ddb8c..d63e7f87 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -131,8 +131,8 @@ export default class Project { if (typeof label !== "string" || label.trim() === "") { throw new Error("Label must be a non-empty string") } - if (!this?.data?.label) await this.#load() - if (this.data.label.trim() === label.trim()) return this.data + if(!this?.data?.label) await this.#load() + if(this.data.label.trim() === label.trim()) return this.data this.data.label = label.trim() return await this.update() } @@ -207,7 +207,7 @@ export default class Project { // Don't leave orphaned invitees in the db. const member = new User(userId) const memberData = await member.getSelf() - if (memberData?.inviteCode) member.delete() + if(memberData?.inviteCode) member.delete() return this } catch (error) { throw { @@ -234,9 +234,9 @@ export default class Project { async updateTools(selectedValues) { // Guard invalid input if (!Array.isArray(selectedValues)) return - if (!this?.data?.tools) await this.#load() + if(!this?.data?.tools) await this.#load() // Guard existing data in corrupted state - if (!this.data?.tools) this.data.tools = [] + if(!this.data?.tools) this.data.tools = [] this.data.tools = this.data.tools.map(tool => { const match = selectedValues.find(t => { @@ -256,9 +256,9 @@ export default class Project { // Guard invalid input if (!Array.isArray(tools)) return - if (!this?.data?.tools) await this.#load() + if(!this?.data?.tools) await this.#load() // Guard existing data in corrupted state - if (!this.data?.tools) this.data.tools = [] + if(!this.data?.tools) this.data.tools = [] for (let newTool of tools) { const name = newTool.name.trim() @@ -313,9 +313,10 @@ export default class Project { return project } - async updateLayer(layer, previousId) { - if (!this.data?.layers) await this.#load() - if (!this.data?.layers) throw new Error("Project does not have layers.") + updateLayer(layer, previousId) { + if (!this.data?.layers) { + throw new Error("Project does not have layers.") + } previousId ??= layer.id const layerIndex = this.data.layers.findIndex(l => l.id.split('/').pop() === previousId.split('/').pop()) if (layerIndex < 0) { @@ -353,7 +354,7 @@ function isValidLayer(layer) { } for (const page of layer.pages) { - if (!page?.id?.startsWith('http') || !page?.target?.startsWith('http') || !page.label) { + if (!page?.id?.startsWith('http') || !page?.target?.startsWith('http') || !page.label ) { return false } } diff --git a/layer/index.js b/layer/index.js index 271949c1..7bf8a406 100644 --- a/layer/index.js +++ b/layer/index.js @@ -6,7 +6,7 @@ import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' -import { fetchUserAgent, findPageById } from '../utilities/shared.js' +import { fetchUserAgent } from '../utilities/shared.js' const router = express.Router({ mergeParams: true }) @@ -16,8 +16,9 @@ router.use(cors(common_cors)) router.route('/:layerId') .get(async (req, res) => { const { projectId, layerId } = req.params + try { - const layer = await findLayerById(layerId, projectId) + const { layer, creator } = await findLayerById(layerId, projectId) // Make this internal Layer look more like a RERUM AnnotationCollection const layerAsCollection = { '@context': 'http://www.w3.org/ns/anno.jsonld', @@ -29,6 +30,7 @@ router.route('/:layerId') first: layer.pages.at(0).id, last: layer.pages.at(-1).id } + return res.status(200).json(layerAsCollection) } catch (error) { console.error(error) @@ -37,34 +39,35 @@ router.route('/:layerId') }) .put(auth0Middleware(), async (req, res) => { const { projectId, layerId } = req.params - let label = req.body?.label - const providedPages = req.body?.pages - const user = req.user + let { label, canvases } = req.body + if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') + if (!layerId) return utils.respondWithError(res, 400, 'Layer ID is required') + + try { const project = new Project(projectId) - if (!project?._id) return utils.respondWithError(res, 404, "Project '${projectId}' does not exist") + const layers = await project.loadProject() + + if (!layers) return utils.respondWithError(res, 404, 'Project does not exist') + const layer = await findLayerById(layerId, projectId, true) - if (!layer?.id) return utils.respondWithError(res, 404, "Layer '${layerId}' not found in project") + + if (!layer) return utils.respondWithError(res, 404, 'Layer not found in project') + label ??= label ?? layer.label - if (providedPages?.length === 0) providedPages = undefined - let pages = [] - if (providedPages && providedPages.length) { - const resolvedPages = await Promise.all(providedPages.map(p => findPageById(p.split("/").pop(), projectId) )) - pages = resolvedPages.map(p => p.page) - } - else{ - pages = layer.pages - } - const updatedLayer = new Layer(projectId, {id:layer.id, label, pages, creator: user.agent.split('/').pop()}) - const saveFirst = (providedPages !== undefined && !layer.id.startsWith(process.env.RERUMIDPREFIX)) - await updatedLayer.update(saveFirst) - await project.updateLayer(updatedLayer, layerId) + if(canvases?.length === 0) canvases = undefined + const updatedLayer = canvases ? + Layer.build(projectId, label, canvases, req.agent.split('/').pop()) + : new Layer(projectId, {id:layer.id, label, pages:layer.pages, creator: req.agent.split('/').pop()}) + + await updatedLayer.update() + project.updateLayer(updatedLayer.asProjectLayer(), layerId) await project.update() + res.status(200).json(project.data) } catch (error) { - console.error(error) return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') } }) @@ -76,19 +79,24 @@ router.route('/:layerId') router.route('/').post(auth0Middleware(), async (req, res) => { const { projectId } = req.params const { label, canvases } = req.body + if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') + if (!label || !Array.isArray(canvases) || canvases.length === 0) { return utils.respondWithError(res, 400, 'Invalid layer data. Provide a label and an array of URIs or Page objects.') } + try { const project = await Project.getById(projectId) + if (!project) return utils.respondWithError(res, 404, 'Project does not exist') + const newLayer = Layer.build(projectId, label, canvases) project.addLayer(newLayer.asProjectLayer()) await project.update() + res.status(201).json(project.data) } catch (error) { - console.error(error) return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error creating layer') } }) @@ -122,6 +130,6 @@ async function findLayerById(layerId, projectId, skipLookup = false) { error.status = 422 throw error } - layer.creator = p.creator - return layer + + return { layer, creator: p.creator } } From 241b4afa02bf7021606ee9209baa91c411914495 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri, 25 Jul 2025 09:42:10 -0500 Subject: [PATCH 120/262] Project Export Message (#277) * Project Export Message * checkIfUrlExists Utility * status update * docs * deployment * Update ProjectFactory.js * Throughput errors * guarded clause --------- Co-authored-by: Bryan Haberberger --- classes/Project/ProjectFactory.js | 123 +++++++++++++++++++++++++++++- project/projectReadRouter.js | 24 ++++++ utilities/checkIfUrlExists.js | 8 ++ 3 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 utilities/checkIfUrlExists.js diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index dd911342..c4b1b68f 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -10,6 +10,7 @@ import imageSize from 'image-size' import mime from 'mime-types' import Hotkeys from "../HotKeys/Hotkeys.js" import { fetchUserAgent } from "../../utilities/shared.js" +import { checkIfUrlExists } from "../../utilities/checkIfUrlExists.js" const database = new dbDriver("mongo") @@ -767,7 +768,7 @@ export default class ProjectFactory { }) }) ) - annotationPages.length > 0 && (canvasItems.annotations = annotationPages) + annotationPages.length > 0 && (canvasItems.annotations = await this.getAnnotations({ annotations: annotationPages })) return canvasItems } catch (error) { console.error(`Error processing layer:`, error) @@ -901,6 +902,126 @@ export default class ProjectFactory { } } + /** + * Checks if the IIIF manifest has been exported and deployed to github for a specific project. + * + * @param {string} projectId - The ID of the project to check. + * @returns {Object} - Returns an object with status and message indicating the deployment status. + * + * This method checks if the manifest.json file for a given project ID exists in the GitHub repository, + * and if it has been successfully deployed. It retrieves the latest commit for the manifest file, + * checks if it has been deployed, and returns the status of the deployment. + * status: -1 A server or service error has occurred. + * status: 1 is No manifest found + * status: 2 is Manifest found, Recently Committed + * status: 3 is Manifest found but no recent commit + * status: 4 is Deployment successful + * status: 5 is Deployment in progress + * status: 6 is Deployment inactive + * status: 7 is Unknown deployment status + * status: 8 is No deployment found + */ + + static async checkManifestUploadAndDeployment(projectId) { + const filePath = `${projectId}/manifest.json` + const url = `${process.env.TPENSTATIC}/${projectId}/manifest.json` + const token = process.env.GITHUB_TOKEN + const headers = { + Authorization: `token ${token}`, + Accept: 'application/vnd.github.v3+json', + } + + const commitsUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/commits?path=${filePath}&per_page=1` + const commits = await fetch(commitsUrl, { headers }) + .then(async (resp) => { + if(resp.ok) return resp.json() + const errText = await resp.text() + return [{state: -1, "message": `${resp.status} - ${errText}`}] + }) + .catch(err => { + console.error(err) + return [{state: -1, "message": `TPEN Services Internal Server Error`}] + }) + + if(commits?.length && commits[0].state === -1) { + console.error(commits[0]) + return {status: -1, message: commits[0].message} + } + + if (!commits.length) { + return {status: 1} + } + const commitMessage = commits[0].commit?.message.split(' ') + + if (commitMessage[0] === 'Delete') { + return {status: 1} + } + + const latestSha = commits[0].sha + const deployments = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/deployments?sha=${latestSha}` + const deployment = await fetch(deployments, { headers }) + .then(async (resp) => { + if(resp.ok) return resp.json() + const errText = await resp.text() + return [{state: -1, "message": `${resp.status} - ${errText}`}] + }) + .catch(err => { + console.error(err) + return [{state: -1, "message": `TPEN Services Internal Server Error`}] + }) + + if(deployment?.length && deployment[0].state === -1) { + console.error(deployment[0]) + return {status: -1, message: deployment[0].message} + } + + if (deployment.length === 0) { + if (await checkIfUrlExists(url)){ + if(new Date(commits[0].commit?.committer?.date) > new Date(Date.now() - 2 * 60 * 1000)) { + return {status: 2} + } + else { + return {status: 3} + } + } + return {status: 8} + } + + const statusUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/deployments/${deployment[0].id}/statuses` + const statuses = await fetch(statusUrl, { headers }) + .then(async (resp) => { + if(resp.ok) return resp.json() + const errText = await resp.text() + return [{state: -1, "message": `${resp.status} - ${errText}`}] + }) + .catch(err => { + console.error(err) + return [{state: -1, "message": `TPEN Services Internal Server Error`}] + }) + + if (statuses?.length && statuses[0].state === -1) { + console.error(status[0]) + return {status: -1, message: stauses[0].message} + } + + if (!statuses.length) { + return {status: 7} + } + + const latestStatus = statuses[0] + const state = latestStatus.state + + if (state === 'success') { + return {status: 4} + } else if (['queued', 'in_progress', 'pending'].includes(state)) { + return {status: 5} + } else if (state === 'inactive') { + return {status: 6} + } else { + return {status: 7} + } + } + static async loadAsUser(project_id, user_id) { const pipeline = [ { $match: { _id: project_id } }, diff --git a/project/projectReadRouter.js b/project/projectReadRouter.js index 021a0fda..f52d58ec 100644 --- a/project/projectReadRouter.js +++ b/project/projectReadRouter.js @@ -35,6 +35,30 @@ router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { respondWithError(res, 405, "Improper request method. Use GET instead") }) +router.route("/:id/deploymentStatus").get(auth0Middleware(), async (req, res) => { + const { id } = req.params + if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") + if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") + try { + const { status } = await ProjectFactory.checkManifestUploadAndDeployment(id) + if (!status) { + return respondWithError(res, 404, `No deployment status found for project with ID '${id}'`) + } + if (status === -1) { + return respondWithError(res, 503, "Invalid deployment status.") + } + res.status(200).json(status) + } catch (error) { + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "An error occurred while checking the deployment status." + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + router.route("/:id").get(auth0Middleware(), async (req, res) => { const user = req.user let id = req.params.id diff --git a/utilities/checkIfUrlExists.js b/utilities/checkIfUrlExists.js new file mode 100644 index 00000000..bf2d6305 --- /dev/null +++ b/utilities/checkIfUrlExists.js @@ -0,0 +1,8 @@ +export async function checkIfUrlExists(url) { + try { + const response = await fetch(url, { method: 'HEAD' }) + return response.ok + } catch (error) { + return false + } +} \ No newline at end of file From 9445392356631558cdc0a519c0b0fe640d6d9979 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 29 Jul 2025 12:09:36 -0500 Subject: [PATCH 121/262] Layer and Page Management Endpoints (#284) * Fixes for updating Layers and Pages * Prepare PR * remove console.log()s * remove console.log()s * polish * polish * optimize * touchups from testing * Reconfigure things so Page() and Layer() make more sense together * cleaning * changes from testing * changes from testing * touchup the gets * ready pr * page content change detection * remove extra whitespace * page content change detection * page content change detection * already checked userId * already checked userId * Only update if the page has changed when rebuilding order * record page modition when page is reordered * it is a typo * Allow falsey prev and next in Page.update() * All those tendrils making sure a page will update its layer if it needs to * All those tendrils making sure a page will update its layer if it needs to * change for clarity * change for clarity * change for clarity * change for clarity * touch-ups from reading through it * updates from reading through and logs for tracing to make sure it all works * updates from reading through and logs for tracing to make sure it all works * continue refactor * Find temps by id * continue refactor * No items for AnnotationCollection * Use rerum ids for temps that will be upgraded * get rid of duplicate call * get rid of duplicate call * Handle layer temp id problem as well * polish * oops * update documentation --- classes/Layer/Layer.js | 24 +++-- classes/Line/Line.js | 2 +- classes/Page/Page.js | 32 +++---- classes/Project/Project.js | 23 +++-- layer/index.js | 106 +++++++++------------- line/index.js | 10 +-- page/index.js | 46 ++++------ utilities/shared.js | 177 ++++++++++++++++++++++++++++++++----- 8 files changed, 250 insertions(+), 170 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index e20a3f41..7c3d0255 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -73,16 +73,18 @@ export default class Layer { return true } - async update() { - if (this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { + // FIXME: This will save to RERUM even if there has been no content change + // The rerum variable below is true if the content has changed. + async update(rerum = false) { + if (rerum || this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { this.#setRerumId() await this.#saveCollectionToRerum() } - return this.#updateCollectionForProject() + return this.#formatCollectionForProject() } asProjectLayer() { - return this.#updateCollectionForProject() + return this.#formatCollectionForProject() } // Private Methods @@ -93,11 +95,11 @@ export default class Layer { return this } - #updateCollectionForProject() { + #formatCollectionForProject() { return { - label: this.label, id: this.id, - pages: this.pages.map(this.#getPageReference) + label: this.label, + pages: this.pages.map(p => new Page(this.id, p).asProjectPage()) } } @@ -116,13 +118,7 @@ export default class Layer { creator: await fetchUserAgent(this.creator), total: this.pages.length, first: this.pages.at(0).id, - last: this.pages.at(-1).id, - items: this.pages.map(page => ({ - id: page.id, - type: "AnnotationPage", - label: { "none": [page.label] }, - target: page.target - })) + last: this.pages.at(-1).id } if (this.#tinyAction === 'create') { diff --git a/classes/Line/Line.js b/classes/Line/Line.js index a011a910..0f3e537b 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -41,7 +41,7 @@ export default class Line { type: this.type ?? "Annotation", motivation: this.motivation ?? "transcribing", target: this.target, - creator: await fetchUserAgent(this.creator.split('/').pop()), + creator: await fetchUserAgent(this.creator), body: this.body } if (this.label) lineAsAnnotation.label = { "none": [this.label] } diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 35ffb6de..7e7ee696 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -1,6 +1,5 @@ import dbDriver from "../../database/driver.js" -import { handleVersionConflict } from "../../utilities/shared.js" -import { fetchUserAgent } from "../../utilities/shared.js" +import { handleVersionConflict, fetchUserAgent } from "../../utilities/shared.js" const databaseTiny = new dbDriver("tiny") @@ -71,18 +70,16 @@ export default class Page { } async #savePageToRerum() { + const prev = this.prev ?? null + const next = this.next ?? null const pageAsAnnotationPage = { "@context": "http://www.w3.org/ns/anno.jsonld", id: this.id, type: "AnnotationPage", label: { "none": [this.label] }, items: this.items ?? [], - ...this?.prev && { - prev: this.prev - }, - ...this?.next && { - next: this.next - }, + prev, + next, creator: await fetchUserAgent(this.creator), target: this.target, partOf: [{ id: this.partOf, type: "AnnotationCollection" }] @@ -117,27 +114,24 @@ export default class Page { /** * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. + * FIXME: This will save to RERUM even if there has been no content change + * The rerum variable below is true if the content has changed. + * * @returns {Promise} Resolves to the updated Layer object as stored in Project. */ - async update() { - if (this.#tinyAction === 'update' || this.items.length) { + async update(rerum = false) { + if (rerum || this.#tinyAction === 'update' || this.items?.length) { this.#setRerumId() await this.#savePageToRerum() } - return this.#updatePageForProject() + return this.#formatPageForProject() } asProjectPage() { - return this.#updatePageForProject() + return this.#formatPageForProject() } - #updatePageForProject() { - // Page in local MongoDB is in the Project.layers.pages Array and looks like: - // { - // id: "https://api.t-pen.org/layer/layerID/page/pageID", - // label: "Page 1", - // target: "https://canvas.uri" - // } + #formatPageForProject() { return { id: this.id, label: this.label, diff --git a/classes/Project/Project.js b/classes/Project/Project.js index d63e7f87..b63ddb8c 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -131,8 +131,8 @@ export default class Project { if (typeof label !== "string" || label.trim() === "") { throw new Error("Label must be a non-empty string") } - if(!this?.data?.label) await this.#load() - if(this.data.label.trim() === label.trim()) return this.data + if (!this?.data?.label) await this.#load() + if (this.data.label.trim() === label.trim()) return this.data this.data.label = label.trim() return await this.update() } @@ -207,7 +207,7 @@ export default class Project { // Don't leave orphaned invitees in the db. const member = new User(userId) const memberData = await member.getSelf() - if(memberData?.inviteCode) member.delete() + if (memberData?.inviteCode) member.delete() return this } catch (error) { throw { @@ -234,9 +234,9 @@ export default class Project { async updateTools(selectedValues) { // Guard invalid input if (!Array.isArray(selectedValues)) return - if(!this?.data?.tools) await this.#load() + if (!this?.data?.tools) await this.#load() // Guard existing data in corrupted state - if(!this.data?.tools) this.data.tools = [] + if (!this.data?.tools) this.data.tools = [] this.data.tools = this.data.tools.map(tool => { const match = selectedValues.find(t => { @@ -256,9 +256,9 @@ export default class Project { // Guard invalid input if (!Array.isArray(tools)) return - if(!this?.data?.tools) await this.#load() + if (!this?.data?.tools) await this.#load() // Guard existing data in corrupted state - if(!this.data?.tools) this.data.tools = [] + if (!this.data?.tools) this.data.tools = [] for (let newTool of tools) { const name = newTool.name.trim() @@ -313,10 +313,9 @@ export default class Project { return project } - updateLayer(layer, previousId) { - if (!this.data?.layers) { - throw new Error("Project does not have layers.") - } + async updateLayer(layer, previousId) { + if (!this.data?.layers) await this.#load() + if (!this.data?.layers) throw new Error("Project does not have layers.") previousId ??= layer.id const layerIndex = this.data.layers.findIndex(l => l.id.split('/').pop() === previousId.split('/').pop()) if (layerIndex < 0) { @@ -354,7 +353,7 @@ function isValidLayer(layer) { } for (const page of layer.pages) { - if (!page?.id?.startsWith('http') || !page?.target?.startsWith('http') || !page.label ) { + if (!page?.id?.startsWith('http') || !page?.target?.startsWith('http') || !page.label) { return false } } diff --git a/layer/index.js b/layer/index.js index 7bf8a406..cee04f5c 100644 --- a/layer/index.js +++ b/layer/index.js @@ -6,7 +6,7 @@ import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' -import { fetchUserAgent } from '../utilities/shared.js' +import { findPageById, findLayerById, updateLayerAndProject } from '../utilities/shared.js' const router = express.Router({ mergeParams: true }) @@ -16,21 +16,28 @@ router.use(cors(common_cors)) router.route('/:layerId') .get(async (req, res) => { const { projectId, layerId } = req.params - try { - const { layer, creator } = await findLayerById(layerId, projectId) + const layer = await findLayerById(layerId, projectId, true) + if (!layer) { + respondWithError(res, 404, 'No layer found with that ID.') + return + } + if (layer.id?.startsWith(process.env.RERUMIDPREFIX)) { + // If the page is a RERUM document, we need to fetch it from the server + res.status(200).json(layer) + return + } // Make this internal Layer look more like a RERUM AnnotationCollection const layerAsCollection = { '@context': 'http://www.w3.org/ns/anno.jsonld', id: layer.id, type: 'AnnotationCollection', label: { none: [layer.label] }, - creator: await fetchUserAgent(creator), total: layer.pages.length, first: layer.pages.at(0).id, last: layer.pages.at(-1).id } - + if (layer.creator) layerAsCollection.creator = layer.creator return res.status(200).json(layerAsCollection) } catch (error) { console.error(error) @@ -39,35 +46,39 @@ router.route('/:layerId') }) .put(auth0Middleware(), async (req, res) => { const { projectId, layerId } = req.params - let { label, canvases } = req.body - + let label = req.body?.label + const update = req.body + const providedPages = update?.pages + const user = req.user if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') - if (!layerId) return utils.respondWithError(res, 400, 'Layer ID is required') - - try { - const project = new Project(projectId) - const layers = await project.loadProject() - - if (!layers) return utils.respondWithError(res, 404, 'Project does not exist') - - const layer = await findLayerById(layerId, projectId, true) - - if (!layer) return utils.respondWithError(res, 404, 'Layer not found in project') - - label ??= label ?? layer.label - if(canvases?.length === 0) canvases = undefined - const updatedLayer = canvases ? - Layer.build(projectId, label, canvases, req.agent.split('/').pop()) - : new Layer(projectId, {id:layer.id, label, pages:layer.pages, creator: req.agent.split('/').pop()}) - - await updatedLayer.update() - project.updateLayer(updatedLayer.asProjectLayer(), layerId) - await project.update() - - res.status(200).json(project.data) + const project = await Project.getById(projectId) + if (!project?._id) return utils.respondWithError(res, 404, "Project '${projectId}' does not exist") + const layer = await findLayerById(layerId, projectId) + const originalPages = layer.pages ?? [] + if (!layer?.id) return utils.respondWithError(res, 404, "Layer '${layerId}' not found in project") + // Only update top-level properties that are present in the request + Object.keys(update ?? {}).forEach(key => { + layer[key] = update[key] + }) + Object.keys(layer).forEach(key => { + if (layer[key] === undefined || layer[key] === null) { + // Remove properties that are undefined or null. prev and next can be null + if (layer !== "first" && layer !== "last") delete layer[key] + else layer[key] = null + } + }) + if (providedPages?.length === 0) providedPages = undefined + let pages = [] + if (providedPages && providedPages.length) { + pages = await Promise.all(providedPages.map(p => findPageById(p.split("/").pop(), projectId) )) + layer.pages = pages + } + await updateLayerAndProject(layer, project, user._id, originalPages) + res.status(200).json(layer) } catch (error) { + console.error(error) return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') } }) @@ -79,24 +90,19 @@ router.route('/:layerId') router.route('/').post(auth0Middleware(), async (req, res) => { const { projectId } = req.params const { label, canvases } = req.body - if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') - if (!label || !Array.isArray(canvases) || canvases.length === 0) { return utils.respondWithError(res, 400, 'Invalid layer data. Provide a label and an array of URIs or Page objects.') } - try { const project = await Project.getById(projectId) - if (!project) return utils.respondWithError(res, 404, 'Project does not exist') - const newLayer = Layer.build(projectId, label, canvases) project.addLayer(newLayer.asProjectLayer()) await project.update() - res.status(201).json(project.data) } catch (error) { + console.error(error) return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error creating layer') } }) @@ -105,31 +111,3 @@ router.route('/').post(auth0Middleware(), async (req, res) => { router.use('/:layerId/page', pageRouter) export default router - -async function findLayerById(layerId, projectId, skipLookup = false) { - if (!skipLookup && layerId.startsWith(process.env.RERUMIDPREFIX)) { - return fetch(layerId).then(res => res.json()) - } - const p = (await Project.getById(projectId)).data - if (!p) { - const error = new Error(`Project with ID '${projectId}' not found`) - error.status = 404 - throw error - } - const layer = layerId.length < 6 - ? p.layers[parseInt(layerId) + 1] - : p.layers.find(layer => layer.id.split('/').pop() === layerId.split('/').pop()) - if (!layer) { - const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) - error.status = 404 - throw error - } - // Ensure the layer has pages and is not malformed - if (!layer.pages || layer.pages.length === 0) { - const error = new Error(`Layer with ID '${layerId}' is malformed: no pages found`) - error.status = 422 - throw error - } - - return { layer, creator: p.creator } -} diff --git a/line/index.js b/line/index.js index ae80fc48..9f0e39db 100644 --- a/line/index.js +++ b/line/index.js @@ -2,7 +2,7 @@ import express from 'express' import cors from 'cors' import auth0Middleware from "../auth/index.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} -import { respondWithError, getProjectById, getPageById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' +import { respondWithError, getProjectById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' import Line from '../classes/Line/Line.js' const router = express.Router({ mergeParams: true }) @@ -54,7 +54,7 @@ router.post('/', auth0Middleware(), async (req, res) => { try { const project = await getProjectById(req.params.projectId, res) if (!project) return - const page = await getPageById(req.params.pageId, req.params.projectId, res) + const page = await findPageById(req.params.pageId, req.params.projectId) if (!page) return const inputLines = Array.isArray(req.body) ? req.body : [req.body] @@ -98,7 +98,7 @@ router.put('/:lineId', auth0Middleware(), async (req, res) => { if (!user) return respondWithError(res, 401, "Unauthenticated request") try { const project = await getProjectById(req.params.projectId) - const { page, creator } = await findPageById(req.params.pageId, req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) @@ -150,7 +150,7 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { return } const project = await getProjectById(req.params.projectId) - const { page, creator } = await findPageById(req.params.pageId, req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) @@ -201,7 +201,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return } const project = await getProjectById(req.params.projectId) - const { page, creator } = await findPageById(req.params.pageId, req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { respondWithError(res, 404, `Line with ID '${req.params.line}' not found in page '${req.params.pageId}'`) diff --git a/page/index.js b/page/index.js index 5ef43aa4..91c610a9 100644 --- a/page/index.js +++ b/page/index.js @@ -5,7 +5,7 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' import Line from '../classes/Line/Line.js' -import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict, fetchUserAgent } from '../utilities/shared.js' +import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict } from '../utilities/shared.js' router.use( cors(common_cors) @@ -18,18 +18,15 @@ router.route('/:pageId') .get(async (req, res) => { const { projectId, pageId } = req.params try { - const { page, creator } = await findPageById(pageId, projectId) + const page = await findPageById(pageId, projectId, true) if (!page) { respondWithError(res, 404, 'No page found with that ID.') return } if (page.id?.startsWith(process.env.RERUMIDPREFIX)) { // If the page is a RERUM document, we need to fetch it from the server - const pageFromRerum = await fetch(page.id).then(res => res.json()) - if (pageFromRerum) { - res.status(200).json(pageFromRerum) - return - } + res.status(200).json(page) + return } // build as AnnotationPage const pageAsAnnotationPage = { @@ -40,13 +37,12 @@ router.route('/:pageId') target: page.target, partOf: page.partOf, items: page.items ?? [], - ...page?.prev?.id && { - prev: page.prev.id - }, - ...page?.next?.id && { - next: page.next.id + ...page?.prev && { + prev: page.prev }, - creator: await fetchUserAgent(creator), + ...page?.next && { + next: page.next + } } res.status(200).json(pageAsAnnotationPage) } catch (error) { @@ -80,20 +76,9 @@ router.route('/:pageId') try { // Find the page object - const { page, creator } = await findPageById(pageId, projectId) + const page = await findPageById(pageId, projectId) page.creator = user.agent.split('/').pop() page.partOf = layerId - if (page?.prev?.id) { - page.prev = page.prev.id - } else { - delete page.prev - } - - if (page?.next?.id) { - page.next = page.next.id - } else { - delete page.next - } if (!page) { respondWithError(res, 404, 'No page found with that ID.') return @@ -104,11 +89,12 @@ router.route('/:pageId') }) Object.keys(page).forEach(key => { if (page[key] === undefined || page[key] === null) { - // Remove properties that are undefined or null - delete page[key] + // Remove properties that are undefined or null. prev and next can be null + if (key !== "prev" && key !== "next") delete page[key] + else page[key] = null } }) - + const pageContentChanged = update && update.hasOwnProperty("items") if (update.items) { page.items = await Promise.all(page.items.map(async item => { const line = item.id?.startsWith?.('http') @@ -117,9 +103,7 @@ router.route('/:pageId') return await line.update() })) } - - await updatePageAndProject(page, project, user._id) - + await updatePageAndProject(page, project, user._id, pageContentChanged) res.status(200).json(page) } catch (error) { // Handle version conflicts with optimistic locking diff --git a/utilities/shared.js b/utilities/shared.js index a1d97ecb..72ee22f7 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -1,7 +1,9 @@ import DatabaseController from "../database/mongo/controller.js" import Project from '../classes/Project/Project.js' +import Layer from '../classes/Layer/Layer.js' import Page from '../classes/Page/Page.js' import User from '../classes/User/User.js' + /** * Check if the supplied input is valid JSON or not. * @param input A string or Object that should be JSON conformant. @@ -61,16 +63,6 @@ export const getProjectById = async (projectId, res) => { return project } -// Fetch a page by ID -export const getPageById = async (pageId, projectId, res) => { - const { page, creator } = await findPageById(pageId, projectId) - if (!page) { - respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) - return null - } - return page -} - // Find a line in a page export const findLineInPage = (page, lineId) => { const line = page.lines?.find(l => l.id.split('/').pop() === lineId.split('/').pop()) @@ -80,13 +72,100 @@ export const findLineInPage = (page, lineId) => { return line } -// Update a page and its project -export const updatePageAndProject = async (page, project, userId) => { - await page.update() - const layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) - const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) - layer.pages[pageIndex] = page.asProjectPage() - await recordModification(project, page.id, userId) +/** + * Pages have been reordered upstream. Their prev/next relationships are not right. + * Go through the Pages and update them if their prev/next has changed. + * Record the Page modification as a content change, and make sure it is attributed. + * + * @param project - A Project class object + * @param layer - A Layer class object with page changes applied to layer.pages + * @param userId - The userId hash that caused the reoder + */ +export const rebuildPageOrder = async (project, layer, userId) => { + if (!project) throw new Error(`Must know project to rebuild Page order`) + const pages = layer?.pages + if (!pages || !Array.isArray(pages)) throw new Error(`Cannot rebuild page order without an array of pages`) + if (!userId) throw new Error(`Must know user id`) + for await (const [index, page] of pages.entries()) { + const thisPageNext = index < pages.length - 1 ? pages[index + 1].id : null + const thisPagePrev = index > 0 ? pages[index - 1].id : null + const pageChanged = (page.next !== thisPageNext || page.prev !== thisPagePrev) + if (!pageChanged) continue + // A reordered page counts as a content change + if (!page.creator) page.creator = await fetchUserAgent(userId) + // We know these values will be upgraded to RERUM ids, so force it and make sure not to leave temp ids. + // FIXME: If there is an error upgrading the referenced page downstream, the rerum ID made here might not resolve. + if (page.next !== thisPageNext) page.next = thisPageNext ? process.env.RERUMIDPREFIX + thisPageNext.split("/").pop() : null + if (page.prev !== thisPagePrev) page.prev = thisPagePrev ? process.env.RERUMIDPREFIX + thisPagePrev.split("/").pop() : null + // It is possible the Layer is still temp. It will be upgraded, so partOf should be the upgraded RERUM ID + page.partOf = process.env.RERUMIDPREFIX + layer.id.split("/").pop() + await recordModification(project, page.id, userId) + await page.update(pageChanged) + } +} + +/** + * Update a Layer, its Pages, and the Project it belongs to. + * Content has changed if the organization of layer.pages has been altered. + * + * @param layer - A Layer class object with changes applied to it + * @param project - A Project class object that will need to update + * @param userId - The TPEN3 User hash id performing the action + * @param originalPages - An Array of Page _ids that represent the original upstream Layer.pages organization before any modifications. + */ +export const updateLayerAndProject = async (layer, project, userId, originalPages = null) => { + if (!project) throw new Error(`Must know project to update Layer`) + if (layer === null || layer === undefined) throw new Error("A Layer must be provided in order to update") + if (!userId) throw new Error(`Must know user id to update layer`) + if (originalPages === null || originalPages === undefined || !Array.isArray(originalPages)) originalPages = await findLayerById(layer.id, project._id, true)?.pages + let pagesChanged = false + const originalPageOrder = originalPages.map(p => p.id.split("/").pop()) + const providedPageOrder = layer.pages.map(p => p.id.split("/").pop()) + if(providedPageOrder.join() !== originalPageOrder.join()) { + // The Pages need updated so that they have the correct prev and next + pagesChanged = true + await rebuildPageOrder(project, layer, userId) + } + if (!layer.creator) layer.creator = await fetchUserAgent(userId) + const updatedLayer = await layer.update(pagesChanged) + const layerIndex = project.data.layers.findIndex(l => l.id.split("/").pop() === layer.id.split("/").pop()) + project.data.layers[layerIndex] = updatedLayer + await project.update() +} + +/** + * Update a Page and its Project as well as the Layer containing the Page if necessary. + * Content has changed if page.items have changed in any way. + * + * @param page - A Page class object with changes applied to it. + * @param project - A Project class object that will need to be updated. + * @param userId - The TPEN3 user hash id performing the action + * @param contentChanged - A boolean representing whether or not there were changes to page content. + */ +export const updatePageAndProject = async (page, project, userId, contentChanged = false) => { + if (!project) throw new Error(`Must know project to update Page`) + if (!page) throw new Error(`A Page must be provided to update`) + if (!userId) throw new Error(`Must know user id to update layer`) + const useragent = await fetchUserAgent(userId) + if (!page.creator) page.creator = useragent + let data_layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) + const layerIndex = project.data.layers.findIndex(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) + let layer + if (contentChanged) { + layer = await findLayerById(data_layer.id, project._id) + if (!layer) throw new Error("Cannot update Page. Its Layer was not found.") + if (!layer.creator) layer.creator = useragent + await recordModification(project, page.id, userId) + } + const updatedPage = await page.update(contentChanged) + const pageIndex = data_layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) + data_layer.pages[pageIndex] = page.asProjectPage() + if (contentChanged) { + // We don't strictly have to update the Layer if the content change was only text. + layer.pages[pageIndex] = updatedPage + data_layer = await layer.update(true) + } + project.data.layers[layerIndex] = data_layer await project.update() } @@ -131,9 +210,20 @@ export const getLayerContainingPage = (project, pageId) => { } // Find a page by ID (moved from page/index.js) -export async function findPageById(pageId, projectId) { - if (pageId?.startsWith(process.env.RERUMIDPREFIX)) { - return fetch(pageId).then(res => res.json()) +export async function findPageById(pageId, projectId, rerum) { + if (rerum) { + if (!pageId?.startsWith(process.env.RERUMIDPREFIX)) { + pageId = process.env.RERUMIDPREFIX + pageId.split("/").pop() + } + const rerum_obj = await fetch(pageId).then(res => { + if (res.ok) return res.json() + if (!res.ok) return {} + }) + .catch(err => { + console.error("Network error with rerum") + throw err + }) + if(rerum_obj?.id || rerum_obj["@id"]) return rerum_obj } const projectData = (await getProjectById(projectId))?.data if (!projectData) { @@ -160,10 +250,48 @@ export async function findPageById(pageId, projectId) { } const page = layerContainingPage.pages[pageIndex] - page.prev = layerContainingPage.pages[pageIndex - 1] ?? null - page.next = layerContainingPage.pages[pageIndex + 1] ?? null + page.prev = layerContainingPage.pages[pageIndex - 1]?.id ?? null + page.next = layerContainingPage.pages[pageIndex + 1]?.id ?? null - return { page: new Page(layerContainingPage.id, page), creator: projectData.creator } + return new Page(layerContainingPage.id, page) +} + +export async function findLayerById(layerId, projectId, rerum = false) { + if (rerum) { + if (!layerId?.startsWith(process.env.RERUMIDPREFIX)) { + layerId = process.env.RERUMIDPREFIX + layerId.split("/").pop() + } + const rerum_obj = await fetch(layerId).then(res => { + if (res.ok) return res.json() + if (!res.ok) return {} + }) + .catch(err => { + console.error("Network error with rerum") + throw err + }) + if(rerum_obj?.id || rerum_obj["@id"]) return rerum_obj + } + const p = await Project.getById(projectId) + if (!p) { + const error = new Error(`Project with ID '${projectId}' not found`) + error.status = 404 + throw error + } + const layer = layerId.length < 6 + ? p.data.layers[parseInt(layerId) + 1] + : p.data.layers.find(layer => layer.id.split('/').pop() === layerId.split('/').pop()) + if (!layer) { + const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) + error.status = 404 + throw error + } + // Ensure the layer has pages and is not malformed + if (!layer.pages || layer.pages.length === 0) { + const error = new Error(`Layer with ID '${layerId}' is malformed: no pages found`) + error.status = 422 + throw error + } + return new Layer(projectId, {"id":layer.id, "label":layer.label, "pages":layer.pages}) } /** @@ -228,9 +356,10 @@ export const fetchUserAgent = async (userId) => { if (!userId) { throw new Error('User ID is required to fetch user agent') } + if (typeof userId === "string" && userId.startsWith("http")) return userId try { let user = new User(userId) - user =await user.getSelf() + user = await user.getSelf() if (!user) { throw new Error(`User with ID '${userId}' not found`) } From b3376d1bbb3bf6071ab395ce39d8f721fc3383d5 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:53:16 -0500 Subject: [PATCH 122/262] Update Copy Project Layer Fix (#285) * Update Copy Project Layer Fix * update returned json when resolving temp id for page * let these be null, not undefined --------- Co-authored-by: Bryan Haberberger --- classes/Project/ProjectFactory.js | 44 ++++++++++++++++++++++++++----- page/index.js | 13 +++++---- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index c4b1b68f..1f6b7dfe 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -245,7 +245,7 @@ export default class ProjectFactory { static async cloneLayers(project, copiedProject, creator, database, withAnnotations = true) { for (const layer of project.layers) { let newLayer = { - id: `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, + id: layer.pages.map(page => Array.isArray(page.items) && page.items.length > 0).some(Boolean) ? `${process.env.RERUMIDPREFIX}${database.reserveId()}` : `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, label: layer.label, pages: [] } @@ -264,6 +264,14 @@ export default class ProjectFactory { await updatedPage.update() } newLayer.pages.push(...newPages) + if (newLayer.id.startsWith(process.env.RERUMIDPREFIX)) { + await new Layer(copiedProject._id, { + id: newLayer.id.split('/').pop(), + label: newLayer.label, + pages: newLayer.pages, + creator: creator + }).update(true) + } copiedProject.layers.push(newLayer) } } @@ -282,7 +290,8 @@ export default class ProjectFactory { return { id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, label: page.label, - target: page.target + target: page.target, + items: [] } } @@ -291,7 +300,8 @@ export default class ProjectFactory { return { id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, label: page.label, - target: page.target + target: page.target, + items: [] } } else { @@ -441,7 +451,7 @@ export default class ProjectFactory { } const newLayer = { - id: `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, + id: result[layer.id] && layer.pages.map(page => Array.isArray(page.items) && page.items.length > 0).some(Boolean) ? `${process.env.RERUMIDPREFIX}${database.reserveId()}` : `${process.env.SERVERURL}project/${copiedProject._id}/layer/${database.reserveId()}`, label: layer.label, pages: [] } @@ -449,13 +459,33 @@ export default class ProjectFactory { let newPages = [] if(result[layer.id]) { - newPages = await this.clonePages(layer, copiedProject, database, true) + newPages = await this.clonePages(layer, copiedProject, creator, database, true) + for (const page of newPages) { + const updatedPage = new Page( + newLayer.id, + { id: page.id, label: page.label, target: page.target, + items: page.items, + creator: creator, + partOf: newLayer.id, + prev: newPages[newPages.indexOf(page) - 1]?.id ?? null, + next: newPages[newPages.indexOf(page) + 1]?.id ?? null + }) + await updatedPage.update() + } newLayer.pages.push(...newPages) + if (newLayer.id.startsWith(process.env.RERUMIDPREFIX)) { + await new Layer(copiedProject._id, { + id: newLayer.id.split('/').pop(), + label: newLayer.label, + pages: newLayer.pages, + creator: creator + }).update(true) + } copiedProject.layers.push(newLayer) } if(!result[layer.id]) { - newPages = await this.clonePages(layer, copiedProject, database, false) + newPages = await this.clonePages(layer, copiedProject, creator, database, false) newLayer.pages.push(...newPages) copiedProject.layers.push(newLayer) } @@ -467,7 +497,7 @@ export default class ProjectFactory { label: project.layers[0].label, pages: [] } - const newPages = await this.clonePages(project.layers[0], copiedProject, database, false) + const newPages = await this.clonePages(project.layers[0], copiedProject, creator, database, false) newLayer.pages.push(...newPages) copiedProject.layers.push(newLayer) } diff --git a/page/index.js b/page/index.js index 91c610a9..c45cfc5e 100644 --- a/page/index.js +++ b/page/index.js @@ -35,14 +35,13 @@ router.route('/:pageId') type: 'AnnotationPage', label: { none: [page.label] }, target: page.target, - partOf: page.partOf, + partOf: [{ + id: page.partOf, + type: "AnnotationCollection" + }], items: page.items ?? [], - ...page?.prev && { - prev: page.prev - }, - ...page?.next && { - next: page.next - } + prev: page.prev ?? null, + next: page.next ?? null } res.status(200).json(pageAsAnnotationPage) } catch (error) { From 57d6365bcf118099c8fb68aaf7ad02cfcdf2eef9 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:02:25 -0500 Subject: [PATCH 123/262] Project export message (#286) * Project Export Message * checkIfUrlExists Utility * status update * docs * deployment * Update ProjectFactory.js * Throughput errors * guarded clause * Failure State --------- Co-authored-by: Bryan Haberberger --- classes/Project/ProjectFactory.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 1f6b7dfe..39634c5b 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -948,8 +948,9 @@ export default class ProjectFactory { * status: 4 is Deployment successful * status: 5 is Deployment in progress * status: 6 is Deployment inactive - * status: 7 is Unknown deployment status - * status: 8 is No deployment found + * status: 7 is Deployment status failed + * status: 8 is Unknown deployment status + * status: 9 is No deployment found */ static async checkManifestUploadAndDeployment(projectId) { @@ -1014,7 +1015,7 @@ export default class ProjectFactory { return {status: 3} } } - return {status: 8} + return {status: 9} } const statusUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/deployments/${deployment[0].id}/statuses` @@ -1030,12 +1031,12 @@ export default class ProjectFactory { }) if (statuses?.length && statuses[0].state === -1) { - console.error(status[0]) - return {status: -1, message: stauses[0].message} + console.error(statuses[0]) + return {status: -1, message: statuses[0].message} } if (!statuses.length) { - return {status: 7} + return {status: 8} } const latestStatus = statuses[0] @@ -1047,8 +1048,10 @@ export default class ProjectFactory { return {status: 5} } else if (state === 'inactive') { return {status: 6} - } else { + } else if (state === 'error') { return {status: 7} + } else { + return {status: 8} } } From 2d0b203506ad6bc1d06f7676baa94f88c5ab3ec3 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 30 Jul 2025 11:14:25 -0500 Subject: [PATCH 124/262] Page and Layer Label Hotfix (#287) * Page and Layer Label Hotfix * Update Page.js --- classes/Layer/Layer.js | 3 ++- classes/Page/Page.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index 7c3d0255..2e75c280 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -2,6 +2,7 @@ import dbDriver from "../../database/driver.js" import { handleVersionConflict } from "../../utilities/shared.js" import Page from "../Page/Page.js" import { fetchUserAgent } from "../../utilities/shared.js" +import ProjectFactory from "../Project/ProjectFactory.js" const databaseTiny = new dbDriver("tiny") @@ -47,7 +48,7 @@ export default class Layer { const thisLayer = { projectId, - label: label ?? `${projectLabel} - Layer ${Date.now()}`, + label: ProjectFactory.getLabelAsString(label) ?? `${projectLabel} - Layer ${Date.now()}`, creator, id: `${process.env.SERVERURL}project/${projectId.split('/').pop()}/layer/${databaseTiny.reserveId()}` } diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 7e7ee696..702a23b6 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -1,5 +1,6 @@ import dbDriver from "../../database/driver.js" import { handleVersionConflict, fetchUserAgent } from "../../utilities/shared.js" +import ProjectFactory from "../Project/ProjectFactory.js" const databaseTiny = new dbDriver("tiny") @@ -56,7 +57,7 @@ export default class Page { "@context": "http://www.w3.org/ns/anno.jsonld", id, type: "AnnotationPage", - label: canvas.label ?? `Page ${canvas.id.split('/').pop()}`, + label: ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${canvas.id.split('/').pop()}`, target: canvas.id, creator: creator, partOf: partOf ?? `${process.env.SERVERURL}project/${projectId}/layer/${layerId}`, From e145229de14133cdfdf3af7a5eb9dff2df4445fd Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 14:39:05 -0500 Subject: [PATCH 125/262] Pair Coding Hotfixes (#288) * ok * ok * logs * 'none' * labels * Page label * operation logs * withOptimisticLocking operation function * updatePageAndProject() 4 paramter contentChange * removing logs * undo --------- Co-authored-by: Priyal Patel --- classes/Page/Page.js | 2 +- classes/Project/ProjectFactory.js | 2 +- line/index.js | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 702a23b6..a971d7ac 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -57,7 +57,7 @@ export default class Page { "@context": "http://www.w3.org/ns/anno.jsonld", id, type: "AnnotationPage", - label: ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${canvas.id.split('/').pop()}`, + label: ProjectFactory.getLabelAsString(canvas.label ?? `Page ${canvas.id.split('/').pop()}`), target: canvas.id, creator: creator, partOf: partOf ?? `${process.env.SERVERURL}project/${projectId}/layer/${layerId}`, diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 39634c5b..ef09da62 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -129,7 +129,7 @@ export default class ProjectFactory { } static getLabelAsString(label) { - const defaultLanguage = typeof label === 'object' ? Object.keys(label)[0] : 'en' + const defaultLanguage = typeof label === 'object' ? Object.keys(label)[0] : 'none' return label[defaultLanguage]?.join(", ") ?? label.none?.join(",") } diff --git a/line/index.js b/line/index.js index 9f0e39db..c4c60ab1 100644 --- a/line/index.js +++ b/line/index.js @@ -72,12 +72,15 @@ router.post('/', auth0Middleware(), async (req, res) => { const savedLine = await newLine.update() page.items.push(savedLine) } - await withOptimisticLocking(updatePageAndProject(page, project, user._id),(currentVersion) => { - if(!currentVersion || currentVersion.type !== 'AnnotationPage') { - respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') - return - } - currentVersion.items = [...(currentVersion.items ?? []), ...(page.items ?? [])] + const ifNewContent = (page.items && page.items.length) + await withOptimisticLocking( + () => updatePageAndProject(page, project, user._id, ifNewContent), + (currentVersion) => { + if(!currentVersion || currentVersion.type !== 'AnnotationPage') { + respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + return + } + currentVersion.items = [...(currentVersion.items ?? []), ...(page.items ?? [])] Object.assign(page, currentVersion) return updatePageAndProject(page, project, user._id) }) @@ -115,7 +118,7 @@ router.put('/:lineId', auth0Middleware(), async (req, res) => { const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( - () => updatePageAndProject(page, project, user._id), + () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') @@ -161,7 +164,7 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( - () => updatePageAndProject(page, project, user._id), + () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { if(res.headersSent) return @@ -212,7 +215,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( - () => updatePageAndProject(page, project, user._id), + () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') From 6e25780a77198852a877863aa5f21c32a708e570 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 15:16:51 -0500 Subject: [PATCH 126/262] ugh --- classes/Page/Page.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index a971d7ac..e7df946b 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -51,7 +51,8 @@ export default class Page { const id = items.length ? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}` : `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}` - + console.log("building page. What is canvas?") + console.log(canvas) const page = { data: { "@context": "http://www.w3.org/ns/anno.jsonld", @@ -71,6 +72,8 @@ export default class Page { } async #savePageToRerum() { + console.log("saving page to RERUM. What is this?") + console.log(this) const prev = this.prev ?? null const next = this.next ?? null const pageAsAnnotationPage = { @@ -85,6 +88,8 @@ export default class Page { target: this.target, partOf: [{ id: this.partOf, type: "AnnotationCollection" }] } + console.log("What is the AnnotationPage?") + console.log(pageAsAnnotationPage) if (this.#tinyAction === 'create') { await databaseTiny.save(pageAsAnnotationPage) .catch(err => { From 1bccbcd12dc4b43cbcc6008f9e6d48cfc9fb7760 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 15:17:37 -0500 Subject: [PATCH 127/262] ugh --- classes/Project/ProjectFactory.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index ef09da62..e3721ccf 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -129,6 +129,8 @@ export default class ProjectFactory { } static getLabelAsString(label) { + console.log("get label as string. What is label?") + console.log(label) const defaultLanguage = typeof label === 'object' ? Object.keys(label)[0] : 'none' return label[defaultLanguage]?.join(", ") ?? label.none?.join(",") } From 546f1c40dd122e8144630d4a1156e605aa47e785 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 15:32:25 -0500 Subject: [PATCH 128/262] ugh --- classes/Page/Page.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index e7df946b..a009d8b2 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -24,6 +24,8 @@ export default class Page { * @seeAlso {@link Page.build} */ constructor(layerId, { id, label, target, items = [], creator = null, partOf = null, prev = null, next = null }) { + console.log("constructing new page with label") + console.log(label) if (!id || !target) { throw new Error("Page data is malformed.") } @@ -31,6 +33,8 @@ export default class Page { if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } + console.log("constructed page is") + console.log(this) return this } From 4e9617ecee8dd8f248e5da36babc3b69ab17738f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 15:40:27 -0500 Subject: [PATCH 129/262] ugh --- classes/Page/Page.js | 5 ++--- classes/Project/ProjectFactory.js | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index a009d8b2..39a29e50 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -71,13 +71,12 @@ export default class Page { next } } - + console.log("What is page data to construct with") + console.log(page.data) return new Page(layerId, page.data) } async #savePageToRerum() { - console.log("saving page to RERUM. What is this?") - console.log(this) const prev = this.prev ?? null const next = this.next ?? null const pageAsAnnotationPage = { diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index e3721ccf..5d809c91 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -106,6 +106,8 @@ export default class ProjectFactory { message: err.message ?? "No manifest found. Cannot process empty object" } } + console.log("DB Object from manifest has this manifest") + console.log(manifest) const _id = database.reserveId() const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now @@ -129,8 +131,6 @@ export default class ProjectFactory { } static getLabelAsString(label) { - console.log("get label as string. What is label?") - console.log(label) const defaultLanguage = typeof label === 'object' ? Object.keys(label)[0] : 'none' return label[defaultLanguage]?.join(", ") ?? label.none?.join(",") } From 95401597399d39b4e620192118879c80e118f114 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 15:47:36 -0500 Subject: [PATCH 130/262] ugh --- classes/Page/Page.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 39a29e50..1bb3a44e 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -57,6 +57,10 @@ export default class Page { : `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}` console.log("building page. What is canvas?") console.log(canvas) + + console.log("What will project factory say the label is") + console.log(ProjectFactory.getLabelAsString(canvas.label ?? `Page ${canvas.id.split('/').pop()}`)) + const page = { data: { "@context": "http://www.w3.org/ns/anno.jsonld", @@ -71,7 +75,7 @@ export default class Page { next } } - console.log("What is page data to construct with") + console.log("Does the page data have the label that ProjectFactory said it would?") console.log(page.data) return new Page(layerId, page.data) } From 6577fb65d29695e3ad166d121ccd3fc9b183782c Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 15:51:14 -0500 Subject: [PATCH 131/262] ugh --- classes/Page/Page.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 1bb3a44e..e395949e 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -59,14 +59,14 @@ export default class Page { console.log(canvas) console.log("What will project factory say the label is") - console.log(ProjectFactory.getLabelAsString(canvas.label ?? `Page ${canvas.id.split('/').pop()}`)) + console.log(ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${canvas.id.split('/').pop()}`) const page = { data: { "@context": "http://www.w3.org/ns/anno.jsonld", id, type: "AnnotationPage", - label: ProjectFactory.getLabelAsString(canvas.label ?? `Page ${canvas.id.split('/').pop()}`), + label: ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${canvas.id.split('/').pop()}`, target: canvas.id, creator: creator, partOf: partOf ?? `${process.env.SERVERURL}project/${projectId}/layer/${layerId}`, From 470bf0b1efb9078db73cef82a2949f2e7c248278 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 15:57:22 -0500 Subject: [PATCH 132/262] ugh --- classes/Page/Page.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index e395949e..72dc5606 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -57,16 +57,15 @@ export default class Page { : `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}` console.log("building page. What is canvas?") console.log(canvas) - + let canvasLabel = canvas.label ?? `Page ${canvas.id.split('/').pop()}` console.log("What will project factory say the label is") - console.log(ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${canvas.id.split('/').pop()}`) - + console.log(ProjectFactory.getLabelAsString(canvasLabel)) const page = { data: { "@context": "http://www.w3.org/ns/anno.jsonld", id, type: "AnnotationPage", - label: ProjectFactory.getLabelAsString(canvas.label) ?? `Page ${canvas.id.split('/').pop()}`, + label: ProjectFactory.getLabelAsString(canvasLabel), target: canvas.id, creator: creator, partOf: partOf ?? `${process.env.SERVERURL}project/${projectId}/layer/${layerId}`, From 7bde50219733f664a49258b8cd48d702698932cb Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 16:14:45 -0500 Subject: [PATCH 133/262] ugh --- classes/Page/Page.js | 6 ++---- classes/Project/ProjectFactory.js | 9 +++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 72dc5606..693fcb71 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -58,6 +58,8 @@ export default class Page { console.log("building page. What is canvas?") console.log(canvas) let canvasLabel = canvas.label ?? `Page ${canvas.id.split('/').pop()}` + console.log("This is the canvas label") + console.log(canvasLabel) console.log("What will project factory say the label is") console.log(ProjectFactory.getLabelAsString(canvasLabel)) const page = { @@ -74,8 +76,6 @@ export default class Page { next } } - console.log("Does the page data have the label that ProjectFactory said it would?") - console.log(page.data) return new Page(layerId, page.data) } @@ -94,8 +94,6 @@ export default class Page { target: this.target, partOf: [{ id: this.partOf, type: "AnnotationCollection" }] } - console.log("What is the AnnotationPage?") - console.log(pageAsAnnotationPage) if (this.#tinyAction === 'create') { await databaseTiny.save(pageAsAnnotationPage) .catch(err => { diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 5d809c91..a1445df1 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -131,8 +131,13 @@ export default class ProjectFactory { } static getLabelAsString(label) { - const defaultLanguage = typeof label === 'object' ? Object.keys(label)[0] : 'none' - return label[defaultLanguage]?.join(", ") ?? label.none?.join(",") + if (label === null || label === undefined) return "" + if (typeof label === "string") return label + if (typeof label !== "object") return "" + const lang = Object.keys(label).length ? Object.keys(label)[0] : null + if (!lang) return "" + if (!label[lang] || !Array.isArray(label[lang])) return "" + return label[lang].join(", ") } static async fromManifestURL(manifestId, creator, importTPEN28 = false) { From 0e0edd15720727c7264e39ee527a5817e82a9c8a Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 30 Jul 2025 16:21:23 -0500 Subject: [PATCH 134/262] remove logs from testing ugh --- classes/Page/Page.js | 10 ---------- classes/Project/ProjectFactory.js | 2 -- 2 files changed, 12 deletions(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 693fcb71..9187dba6 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -24,8 +24,6 @@ export default class Page { * @seeAlso {@link Page.build} */ constructor(layerId, { id, label, target, items = [], creator = null, partOf = null, prev = null, next = null }) { - console.log("constructing new page with label") - console.log(label) if (!id || !target) { throw new Error("Page data is malformed.") } @@ -33,8 +31,6 @@ export default class Page { if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } - console.log("constructed page is") - console.log(this) return this } @@ -55,13 +51,7 @@ export default class Page { const id = items.length ? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}` : `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}` - console.log("building page. What is canvas?") - console.log(canvas) let canvasLabel = canvas.label ?? `Page ${canvas.id.split('/').pop()}` - console.log("This is the canvas label") - console.log(canvasLabel) - console.log("What will project factory say the label is") - console.log(ProjectFactory.getLabelAsString(canvasLabel)) const page = { data: { "@context": "http://www.w3.org/ns/anno.jsonld", diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index a1445df1..171a79b9 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -106,8 +106,6 @@ export default class ProjectFactory { message: err.message ?? "No manifest found. Cannot process empty object" } } - console.log("DB Object from manifest has this manifest") - console.log(manifest) const _id = database.reserveId() const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now From 5d0c87966de1aaf6a67f4debc66c07ca8a01cb7a Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:49:51 -0500 Subject: [PATCH 135/262] Project Tools Fix (#290) * Project Tools Fix * no return here * Touch up for errors --------- Co-authored-by: Bryan Haberberger --- classes/Project/Project.js | 15 ++++++++++++++- project/projectToolsRouter.js | 28 +++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index b63ddb8c..8159464f 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -281,7 +281,20 @@ export default class Project { this.data.tools.push({ name, value, url, state }) } return await this.update() - } + } + + async removeTool(toolValue) { + if (!this?.data?.tools) await this.#load() + if (!this.data?.tools) throw new Error("Project does not have tools.") + + const toolIndex = this.data.tools.findIndex(tool => tool.value === toolValue) + if (toolIndex < 0) { + throw new Error("Tool not found in project.") + } + + this.data.tools.splice(toolIndex, 1) + return await this.update() + } async updateMetadata(newMetadata) { this.data.metadata = newMetadata diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index c20b8520..5ec699d4 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -1,6 +1,7 @@ import express from "express" import { respondWithError } from "../utilities/shared.js" import Project from "../classes/Project/Project.js" +import validateURL from "../utilities/validateURL.js" const router = express.Router({ mergeParams: true }) @@ -35,7 +36,8 @@ router.route("/:projectId/tools").post(async (req, res) => { res.status(201).json("Tools added successfully") return } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) + console.error(error) + respondWithError(res, error.status ?? error.code ?? 500, error.message ?? "Internal Server Error") } }).put(async (req, res) => { const { projectId } = req.params @@ -61,9 +63,29 @@ router.route("/:projectId/tools").post(async (req, res) => { const project = new Project(projectId) await project.updateTools(tools) res.status(200).json("Tools updated successfully") - return } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) + console.error(error) + respondWithError(res, error.status ?? error.code ?? 500, error.message ?? "Internal Server Error") + } +}).delete(async (req, res) => { + const { projectId } = req.params + const { tool } = req.body + + if (!projectId) { + return respondWithError(res, 400, "Project ID is required") + } + + if (!tool) { + return respondWithError(res, 400, "Tool information is required") + } + + try { + const project = new Project(projectId) + await project.removeTool(tool) + res.status(200).json("Tools removed successfully") + } catch (error) { + console.error(error) + respondWithError(res, error.status ?? error.code ?? 500, error.message ?? "Internal Server Error") } }).all((_, res) => { respondWithError(res, 405, "Improper request method. Use PUT instead") From b945e88aec362b1ab4879e5b3683c36d394db533 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 1 Aug 2025 11:52:20 -0500 Subject: [PATCH 136/262] ah forgot to commit touchups --- project/projectToolsRouter.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index 5ec699d4..18af4740 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -34,7 +34,6 @@ router.route("/:projectId/tools").post(async (req, res) => { const project = new Project(projectId) await project.addTools(tools) res.status(201).json("Tools added successfully") - return } catch (error) { console.error(error) respondWithError(res, error.status ?? error.code ?? 500, error.message ?? "Internal Server Error") @@ -91,4 +90,4 @@ router.route("/:projectId/tools").post(async (req, res) => { respondWithError(res, 405, "Improper request method. Use PUT instead") }) -export default router \ No newline at end of file +export default router From fedf0e27e1e2dabe677c880f70416c1d3216230e Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 5 Aug 2025 16:58:02 -0500 Subject: [PATCH 137/262] Leave Project Endpoint (#289) * If you love them let them go * polish --- project/index.js | 2 ++ project/memberLeaveRouter.js | 52 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 project/memberLeaveRouter.js diff --git a/project/index.js b/project/index.js index 1deeceb7..72768531 100644 --- a/project/index.js +++ b/project/index.js @@ -12,6 +12,7 @@ import metadataRouter from "./metadataRouter.js" import projectToolsRouter from "./projectToolsRouter.js" import memberUpgradeRouter from "./memberUpgradeRouter.js" import memberDeclineInviteRouter from "./memberDeclineInviteRouter.js" +import memberLeaveRouter from "./memberLeaveRouter.js" import projectCopyRouter from "./projectCopyRouter.js" const router = express.Router({ mergeParams: true }) @@ -20,6 +21,7 @@ router.use(cors(common_cors)) // Use split routers router.use(memberUpgradeRouter) // Contains unauthenticated route! router.use(memberDeclineInviteRouter) // Contains unauthenticated route! +router.use(memberLeaveRouter) router.use(projectCreateRouter) router.use(import28Router) router.use(projectReadRouter) diff --git a/project/memberLeaveRouter.js b/project/memberLeaveRouter.js new file mode 100644 index 00000000..501a0e7e --- /dev/null +++ b/project/memberLeaveRouter.js @@ -0,0 +1,52 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import Project from "../classes/Project/Project.js" +import Group from "../classes/Group/Group.js" + +const router = express.Router({ mergeParams: true }) + +/** + * A user is leaving the project. + * Their member entry should be removed from the Group. + * + * @param projectId - The project a user it attempting to leave + */ +router.route("/:projectId/leave").post(auth0Middleware(), async (req, res) => { + const user = req.user + const name = user.profile.displayName ?? user.email ?? user._id + const { projectId } = req.params + if (!projectId) return respondWithError(res, 400, "Not all data was provided.") + try { + const project = await new Project(projectId) + const projectData = await project.loadProject() + if (!projectData) return respondWithError(res, 404, "Project does not exist or the project id is invalid.") + const members = await new Group(projectData.group).getMembers() + let leaderCount = 0 + let memberIdList = [] + for (const key in members) { + memberIdList.push(key) + if (members[key].roles.includes("LEADER")) leaderCount++ + } + // Guarded members list conditions. + if (!memberIdList.includes(user._id)) + return respondWithError(res, 400, `User '${name}' already isn't a member of the project.`) + if (members[user._id].roles.includes("OWNER")) + return respondWithError(res, 403, "You are the owner. You must transfer ownership before you leave.") + if (members[user._id].roles.includes("LEADER") && leaderCount === 1) + return respondWithError(res, 403, "You are the last remaining leader. You must appoint another leader before you leave.") + await project.removeMember(user._id) + res.status(200).send(`User '${name}' successfully left the project.`) + } catch (error) { + console.error(error) + return respondWithError( + res, + error.status || error.code || 500, + error.message ?? "There was an error leaving the project." + ) + } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) + +export default router From 4e72e1208025de4999b1233a1424627e77dd3b66 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 7 Aug 2025 11:02:46 -0500 Subject: [PATCH 138/262] Creator on text and bounds (#294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Development (#234) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs * Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs * un-mjs * Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel * Update package-lock.json * Using UID to get User Projects * Update index.mjs * no label is fine for Pages * Origin Fetch * SetHeader Origin * Update index.js * Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba * 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger * remove unused file --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * cherrypicked * This spot in updateText too --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> --- classes/Line/Line.js | 9 ++++++++- line/index.js | 4 ++-- utilities/validateURL.js | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 0f3e537b..b96990f6 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -124,6 +124,9 @@ export default class Line { const currentValue = textualBody.value ?? textualBody.chars ?? textualBody['cnt:asChars'] ?? textualBody if (currentValue === text) return this Object.assign(textualBody, { type: 'TextualBody', value: text, format: options.format ?? "text/plain", language: options.language }) + // Apply options directly to the Annotation + if (options.creator) this.creator = options.creator + if (options.generator) this.generator = options.generator // discard Annotation-level options if only one body entry is modified. return this.update() } @@ -142,7 +145,7 @@ export default class Line { throw new Error('Unexpected body format. Cannot update text.') } - async updateBounds({x, y, w, h}) { + async updateBounds({x, y, w, h}, options = {}) { if (!x || !y || !w || !h) { throw new Error('Bounds ({x,y,w,h}) must be provided') } @@ -152,6 +155,10 @@ export default class Line { return this } this.target = newTarget + // Apply options directly to the Annotation. + if (options.creator) this.creator = options.creator + if (options.generator) this.generator = options.generator + // discarding unknown options return this.update() } diff --git a/line/index.js b/line/index.js index c4c60ab1..80bd8022 100644 --- a/line/index.js +++ b/line/index.js @@ -160,7 +160,7 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { return } const line = new Line(oldLine) - const updatedLine = await line.updateText(req.body) + const updatedLine = await line.updateText(req.body, { creator: user._id }) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( @@ -211,7 +211,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return } const line = new Line(oldLine) - const updatedLine = await line.updateBounds(req.body) + const updatedLine = await line.updateBounds(req.body, { creator: user._id }) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( diff --git a/utilities/validateURL.js b/utilities/validateURL.js index cd735c02..d57d5669 100644 --- a/utilities/validateURL.js +++ b/utilities/validateURL.js @@ -29,9 +29,9 @@ async function validateURL(url) { } } - return { valid: true } - } catch { - return { valid: false, message: "URL is not reachable", status: 500 } + return {valid: true} + } catch (_error) { + return {valid: false, message: "URL is not reachable", status: 500} } } From a6c28ca2b965de10d30c768f57f192285b981da0 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Mon, 11 Aug 2025 09:46:38 -0500 Subject: [PATCH 139/262] 276 upgrade temp ids referenced in rerum data (#296) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Development (#234) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs * Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs * un-mjs * Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel * Update package-lock.json * Using UID to get User Projects * Update index.mjs * no label is fine for Pages * Origin Fetch * SetHeader Origin * Update index.js * Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba * 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger * remove unused file --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * upgradeReferences on Page class * move to shared.js * merge goof --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> --- classes/Page/Page.js | 3 ++- utilities/shared.js | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 9187dba6..0db7472b 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -1,5 +1,5 @@ import dbDriver from "../../database/driver.js" -import { handleVersionConflict, fetchUserAgent } from "../../utilities/shared.js" +import { handleVersionConflict, fetchUserAgent, upgradeReferences } from "../../utilities/shared.js" import ProjectFactory from "../Project/ProjectFactory.js" const databaseTiny = new dbDriver("tiny") @@ -30,6 +30,7 @@ export default class Page { Object.assign(this, { id, label, target, partOf: partOf ?? layerId, items, creator, prev, next }) if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' + upgradeReferences(this, ['partOf']) } return this } diff --git a/utilities/shared.js b/utilities/shared.js index 72ee22f7..21c92a5d 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -368,3 +368,23 @@ export const fetchUserAgent = async (userId) => { throw new Error(`Error fetching user agent: ${error.message}`) } } + +/** + * Upgrade references in an object to use the RERUMIDPREFIX for specified keys. + * For each key, if the value is a string containing a "/", the prefix is replaced with process.env.RERUMIDPREFIX and the last segment. + * For the key 'pages', if it is an array, each page object with an 'id' will have its id upgraded similarly. + * + * @param {object} obj - The object whose references should be upgraded. + * @param {string[]} [keys=["partOf", "next", "prev", "target", "pages"]] - The keys to upgrade. Must be valid JS object keys. + * @returns {object} The upgraded object. + */ +export function upgradeReferences(obj, keys = []) { + if (!obj || typeof obj !== 'object') return obj + keys.filter(key => typeof key === 'string' && /^[a-zA-Z_$][\w$]*$/.test(key)).forEach(key => { + if (!obj[key]) return + const hexString = obj[key].split('/').pop() + if (!hexString) return + obj[key] = `${process.env.RERUMIDPREFIX}${hexString}` + }) + return obj +} From 85889cf2655de93266f71782c5d516e1c69c6217 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Tue, 19 Aug 2025 13:39:19 -0500 Subject: [PATCH 140/262] Set line creator if not already defined (#305) Adds logic to assign the line's creator property to the user's agent if it is undefined when processing items. This ensures that the creator information is consistently set for new or updated lines. --- package-lock.json | 58 ++++++++++++++++++++++++++++++++++++----------- page/index.js | 1 + 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d34e9be..a7f88b57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1787,9 +1787,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -2539,6 +2539,21 @@ "node": ">= 0.4" } }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -2821,13 +2836,15 @@ } }, "node_modules/form-data": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", - "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" }, "engines": { @@ -3052,6 +3069,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -4515,16 +4547,16 @@ } }, "node_modules/morgan": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", - "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", + "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==", "license": "MIT", "dependencies": { "basic-auth": "~2.0.1", "debug": "2.6.9", "depd": "~2.0.0", "on-finished": "~2.3.0", - "on-headers": "~1.0.2" + "on-headers": "~1.1.0" }, "engines": { "node": ">= 0.8.0" @@ -4806,9 +4838,9 @@ } }, "node_modules/on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", + "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", "license": "MIT", "engines": { "node": ">= 0.8" diff --git a/page/index.js b/page/index.js index c45cfc5e..6ba790de 100644 --- a/page/index.js +++ b/page/index.js @@ -99,6 +99,7 @@ router.route('/:pageId') const line = item.id?.startsWith?.('http') ? new Line(item) : Line.build(projectId, pageId, item, user.agent.split('/').pop()) + line.creator ??= user.agent.split('/').pop() return await line.update() })) } From 875b98d134367002d7f43e661cafa118ee47e106 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 20 Aug 2025 14:59:01 -0500 Subject: [PATCH 141/262] Project Update Roles (#291) * Project Update Roles * Custom Role API * Update Change * changing variable name * upda;te comment * Use the static value from Group.defaultRoles * Revert "Merge branch 'development' into project-roles-fix" This reverts commit 44129962469b290b27c2ef011075ee792ece526a, reversing changes made to 2f3d09aac1e3dcf6f511b9043f65ba3b5d0b2494. * Roles update --------- Co-authored-by: Bryan Haberberger --- classes/Group/Group.js | 37 +++++++++---------------- classes/Line/Line.js | 9 +------ classes/Page/Page.js | 3 +-- line/index.js | 4 +-- project/customRolesRouter.js | 49 ++++++++++++++++++++++----------- project/index.js | 2 -- project/memberLeaveRouter.js | 52 ------------------------------------ utilities/isDefaultRole.js | 9 +++++-- utilities/shared.js | 20 -------------- utilities/validateURL.js | 6 ++--- 10 files changed, 61 insertions(+), 130 deletions(-) delete mode 100644 project/memberLeaveRouter.js diff --git a/classes/Group/Group.js b/classes/Group/Group.js index 25ea6934..4fd3fa21 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -40,6 +40,13 @@ export default class Group { return Object.fromEntries(roles.map(role => [role, allRoles[role]])) } + async getCustomRoles() { + if (Object.keys(this.data.members).length === 0) { + await this.#loadFromDB() + } + return this.data.customRoles + } + getPermissions(role) { return Object.assign(Group.defaultRoles, this.data.customRoles)[role] ?? "x_x_x" } @@ -180,14 +187,14 @@ export default class Group { return true } - async setCustomRoles(roles) { + async updateCustomRoles(roles) { if (!Object.keys(this.data.members).length) { await this.#loadFromDB() } if (!this.isValidRolesMap(roles)) throw new Error("Invalid roles. Must be a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") this.data.customRoles = roles - this.update() + await this.update() } async addCustomRoles(roleMap) { @@ -197,34 +204,16 @@ export default class Group { if (!this.isValidRolesMap(roleMap)) throw new Error("Invalid roles. Must be a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") this.data.customRoles = { ...this.data.customRoles, ...roleMap } - this.update() + await this.update() } - async removeCustomRoles(roleMap) { + async removeCustomRoles(roleName) { if (!Object.keys(this.data.members).length) { await this.#loadFromDB() } - if (!Array.isArray(roleMap)) { - - if (this.isValidRolesMap(roleMap)) { - for (const role in roleMap) { - delete this.data.customRoles[role] - } - return this.update() - } - if (typeof roleMap !== "string") { - throw { - status: 400, - message: "Invalid roles. Must be an array of strings or a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings." - } - } - roleMap = roleMap.toUpperCase().split(" ") - - } - - roleMap.map(role => delete this.data.customRoles[role]) - return this.update() + delete this.data.customRoles[roleName] + await this.update() } async save() { diff --git a/classes/Line/Line.js b/classes/Line/Line.js index b96990f6..0f3e537b 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -124,9 +124,6 @@ export default class Line { const currentValue = textualBody.value ?? textualBody.chars ?? textualBody['cnt:asChars'] ?? textualBody if (currentValue === text) return this Object.assign(textualBody, { type: 'TextualBody', value: text, format: options.format ?? "text/plain", language: options.language }) - // Apply options directly to the Annotation - if (options.creator) this.creator = options.creator - if (options.generator) this.generator = options.generator // discard Annotation-level options if only one body entry is modified. return this.update() } @@ -145,7 +142,7 @@ export default class Line { throw new Error('Unexpected body format. Cannot update text.') } - async updateBounds({x, y, w, h}, options = {}) { + async updateBounds({x, y, w, h}) { if (!x || !y || !w || !h) { throw new Error('Bounds ({x,y,w,h}) must be provided') } @@ -155,10 +152,6 @@ export default class Line { return this } this.target = newTarget - // Apply options directly to the Annotation. - if (options.creator) this.creator = options.creator - if (options.generator) this.generator = options.generator - // discarding unknown options return this.update() } diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 0db7472b..9187dba6 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -1,5 +1,5 @@ import dbDriver from "../../database/driver.js" -import { handleVersionConflict, fetchUserAgent, upgradeReferences } from "../../utilities/shared.js" +import { handleVersionConflict, fetchUserAgent } from "../../utilities/shared.js" import ProjectFactory from "../Project/ProjectFactory.js" const databaseTiny = new dbDriver("tiny") @@ -30,7 +30,6 @@ export default class Page { Object.assign(this, { id, label, target, partOf: partOf ?? layerId, items, creator, prev, next }) if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' - upgradeReferences(this, ['partOf']) } return this } diff --git a/line/index.js b/line/index.js index 80bd8022..c4c60ab1 100644 --- a/line/index.js +++ b/line/index.js @@ -160,7 +160,7 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { return } const line = new Line(oldLine) - const updatedLine = await line.updateText(req.body, { creator: user._id }) + const updatedLine = await line.updateText(req.body) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( @@ -211,7 +211,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return } const line = new Line(oldLine) - const updatedLine = await line.updateBounds(req.body, { creator: user._id }) + const updatedLine = await line.updateBounds(req.body) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( diff --git a/project/customRolesRouter.js b/project/customRolesRouter.js index 41528042..e618fd7c 100644 --- a/project/customRolesRouter.js +++ b/project/customRolesRouter.js @@ -8,6 +8,31 @@ import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" const router = express.Router({ mergeParams: true }) +// Get custom roles from a Project's Group +router.get('/:projectId/customRoles', auth0Middleware(), async (req, res) => { + const { projectId } = req.params + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + try { + const project = new Project(projectId) + if (!project) { + return respondWithError(res, 404, "Project not found") + } + if (!(await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.GROUP))) { + return respondWithError(res, 403, "You do not have permission to access this group.") + } + if (!project.data.group) { + return respondWithError(res, 404, "Group not found for this project") + } + const group = new Group(project.data.group) + const customRoles = await group.getCustomRoles() + res.status(200).json(customRoles) + } catch (error) { + console.error(error) + respondWithError(res, error.status ?? 500, error.message ?? "Internal Server Error") + } +}) + // Add custom roles router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => { const { projectId } = req.params @@ -18,8 +43,7 @@ router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") } try { - customRoles = scrubDefaultRoles(customRoles) - if (!customRoles) return respondWithError(res, 400, `No custom roles provided.`) + if (!scrubDefaultRoles(customRoles)) return respondWithError(res, 400, `No custom roles provided.`) const project = new Project(projectId) if (!(await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.ROLE))) { return respondWithError(res, 403, "You do not have permission to add custom roles.") @@ -32,24 +56,23 @@ router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => } }) -// Set custom roles -router.put('/:projectId/setCustomRoles', auth0Middleware(), async (req, res) => { +// Update custom roles +router.put('/:projectId/updateCustomRoles', auth0Middleware(), async (req, res) => { const { projectId } = req.params - let newCustomRoles = req.body.roles ?? req.body + let roles = req.body.roles ?? req.body const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") - if (!Object.keys(newCustomRoles).length) { + if (!Object.keys(roles).length) { return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") } try { - newCustomRoles = scrubDefaultRoles(newCustomRoles) - if (!newCustomRoles) return respondWithError(res, 400, `No custom roles provided.`) + if (!scrubDefaultRoles(roles)) return respondWithError(res, 400, `No custom roles provided.`) const project = new Project(projectId) if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.ROLE))) { return respondWithError(res, 403, "You do not have permission to set custom roles.") } const group = new Group(project.data.group) - await group.setCustomRoles(newCustomRoles) + await group.updateCustomRoles(roles) res.status(200).json({ message: 'Custom roles set successfully.' }) } catch (error) { respondWithError(res, error.status ?? 500, error.message ?? 'Error setting custom roles.') @@ -57,7 +80,7 @@ router.put('/:projectId/setCustomRoles', auth0Middleware(), async (req, res) => }) // Remove custom roles -router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) => { +router.delete('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) => { const { projectId } = req.params let rolesToRemove = req.body.roles ?? req.body const user = req.user @@ -72,16 +95,12 @@ router.post('/:projectId/removeCustomRoles', auth0Middleware(), async (req, res) return respondWithError(res, 400, "Roles to remove must be provided as an array of strings or a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") } try { - rolesToRemove = scrubDefaultRoles(rolesToRemove) - if (!rolesToRemove) { - return respondWithError(res, 400, `No custom roles provided.`) - } const project = new Project(projectId) if (!(await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.ROLE))) { return respondWithError(res, 403, "You do not have permission to remove custom roles.") } const group = new Group(project.data.group) - await (await group.removeCustomRoles(rolesToRemove)).update() + await group.removeCustomRoles(rolesToRemove) res.status(200).json({ message: 'Custom roles removed successfully.' }) } catch (error) { respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') diff --git a/project/index.js b/project/index.js index 72768531..1deeceb7 100644 --- a/project/index.js +++ b/project/index.js @@ -12,7 +12,6 @@ import metadataRouter from "./metadataRouter.js" import projectToolsRouter from "./projectToolsRouter.js" import memberUpgradeRouter from "./memberUpgradeRouter.js" import memberDeclineInviteRouter from "./memberDeclineInviteRouter.js" -import memberLeaveRouter from "./memberLeaveRouter.js" import projectCopyRouter from "./projectCopyRouter.js" const router = express.Router({ mergeParams: true }) @@ -21,7 +20,6 @@ router.use(cors(common_cors)) // Use split routers router.use(memberUpgradeRouter) // Contains unauthenticated route! router.use(memberDeclineInviteRouter) // Contains unauthenticated route! -router.use(memberLeaveRouter) router.use(projectCreateRouter) router.use(import28Router) router.use(projectReadRouter) diff --git a/project/memberLeaveRouter.js b/project/memberLeaveRouter.js deleted file mode 100644 index 501a0e7e..00000000 --- a/project/memberLeaveRouter.js +++ /dev/null @@ -1,52 +0,0 @@ -import express from "express" -import { respondWithError } from "../utilities/shared.js" -import auth0Middleware from "../auth/index.js" -import Project from "../classes/Project/Project.js" -import Group from "../classes/Group/Group.js" - -const router = express.Router({ mergeParams: true }) - -/** - * A user is leaving the project. - * Their member entry should be removed from the Group. - * - * @param projectId - The project a user it attempting to leave - */ -router.route("/:projectId/leave").post(auth0Middleware(), async (req, res) => { - const user = req.user - const name = user.profile.displayName ?? user.email ?? user._id - const { projectId } = req.params - if (!projectId) return respondWithError(res, 400, "Not all data was provided.") - try { - const project = await new Project(projectId) - const projectData = await project.loadProject() - if (!projectData) return respondWithError(res, 404, "Project does not exist or the project id is invalid.") - const members = await new Group(projectData.group).getMembers() - let leaderCount = 0 - let memberIdList = [] - for (const key in members) { - memberIdList.push(key) - if (members[key].roles.includes("LEADER")) leaderCount++ - } - // Guarded members list conditions. - if (!memberIdList.includes(user._id)) - return respondWithError(res, 400, `User '${name}' already isn't a member of the project.`) - if (members[user._id].roles.includes("OWNER")) - return respondWithError(res, 403, "You are the owner. You must transfer ownership before you leave.") - if (members[user._id].roles.includes("LEADER") && leaderCount === 1) - return respondWithError(res, 403, "You are the last remaining leader. You must appoint another leader before you leave.") - await project.removeMember(user._id) - res.status(200).send(`User '${name}' successfully left the project.`) - } catch (error) { - console.error(error) - return respondWithError( - res, - error.status || error.code || 500, - error.message ?? "There was an error leaving the project." - ) - } -}).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") -}) - -export default router diff --git a/utilities/isDefaultRole.js b/utilities/isDefaultRole.js index 126b9fb3..96dbe5cb 100644 --- a/utilities/isDefaultRole.js +++ b/utilities/isDefaultRole.js @@ -1,7 +1,12 @@ -import Group from "../classes/Group/Group.js" +const internalRoles = { + OWNER: ["*_*_*"], + LEADER: ["UPDATE_*_PROJECT", "READ_*_PROJECT", "*_*_MEMBER", "*_*_ROLE", "*_*_PERMISSION", "*_*_LAYER", "*_*_PAGE"], + CONTRIBUTOR: ["READ_*_*", "UPDATE_TEXT_*", "UPDATE_ORDER_*", "UPDATE_SELECTOR_*", "CREATE_SELECTOR_*", "DELETE_*_LINE", "UPDATE_DESCRIPTION_LAYER", "CREATE_*_LAYER"], + VIEWER: ["READ_*_PROJECT", "READ_*_MEMBER", "READ_*_LAYER", "READ_*_PAGE", "READ_*_LINE"] +} export default function scrubDefaultRoles(roleName) { - const defaultRoles = Object.keys(Group.defaultRoles) + const defaultRoles = Object.keys(internalRoles) if (Array.isArray(roleName)) { roleName = roleName.filter(roleString => { if (typeof roleString !== "string") throw new Error("Expecting a RolesMap and not an Array.") diff --git a/utilities/shared.js b/utilities/shared.js index 21c92a5d..72ee22f7 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -368,23 +368,3 @@ export const fetchUserAgent = async (userId) => { throw new Error(`Error fetching user agent: ${error.message}`) } } - -/** - * Upgrade references in an object to use the RERUMIDPREFIX for specified keys. - * For each key, if the value is a string containing a "/", the prefix is replaced with process.env.RERUMIDPREFIX and the last segment. - * For the key 'pages', if it is an array, each page object with an 'id' will have its id upgraded similarly. - * - * @param {object} obj - The object whose references should be upgraded. - * @param {string[]} [keys=["partOf", "next", "prev", "target", "pages"]] - The keys to upgrade. Must be valid JS object keys. - * @returns {object} The upgraded object. - */ -export function upgradeReferences(obj, keys = []) { - if (!obj || typeof obj !== 'object') return obj - keys.filter(key => typeof key === 'string' && /^[a-zA-Z_$][\w$]*$/.test(key)).forEach(key => { - if (!obj[key]) return - const hexString = obj[key].split('/').pop() - if (!hexString) return - obj[key] = `${process.env.RERUMIDPREFIX}${hexString}` - }) - return obj -} diff --git a/utilities/validateURL.js b/utilities/validateURL.js index d57d5669..cd735c02 100644 --- a/utilities/validateURL.js +++ b/utilities/validateURL.js @@ -29,9 +29,9 @@ async function validateURL(url) { } } - return {valid: true} - } catch (_error) { - return {valid: false, message: "URL is not reachable", status: 500} + return { valid: true } + } catch { + return { valid: false, message: "URL is not reachable", status: 500 } } } From 70b220772fb84fda82460d60400e0ed99382c196 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:25:13 -0500 Subject: [PATCH 142/262] Project roles fix (#306) * Project Update Roles * Custom Role API * Update Change * changing variable name * upda;te comment * Use the static value from Group.defaultRoles * Revert "Merge branch 'development' into project-roles-fix" This reverts commit 44129962469b290b27c2ef011075ee792ece526a, reversing changes made to 2f3d09aac1e3dcf6f511b9043f65ba3b5d0b2494. * Roles update * isDefaultRole test file --------- Co-authored-by: Bryan Haberberger --- utilities/__tests__/isDefaultRole.test.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/utilities/__tests__/isDefaultRole.test.js b/utilities/__tests__/isDefaultRole.test.js index cb4023d9..f9b3861a 100644 --- a/utilities/__tests__/isDefaultRole.test.js +++ b/utilities/__tests__/isDefaultRole.test.js @@ -1,40 +1,31 @@ import scrubDefaultRoles from '../isDefaultRole.js' -import Group from '../../classes/Group/Group.js' describe('scrubDefaultRoles function #customRole_unit', () => { - beforeAll(() => { - Group.defaultRoles = { - admin: 'admin', - user: 'user', - guest: 'guest' - } - }) - it('should remove default roles from an array of role strings', () => { - const roles = ['admin', 'customRole'] + const roles = ['OWNER', 'customRole'] const result = scrubDefaultRoles(roles) expect(result).toEqual(['customRole']) }) it('should return false if all roles in the array are default roles', () => { - const roles = ['admin', 'user'] + const roles = ['OWNER', 'VIEWER'] const result = scrubDefaultRoles(roles) expect(result).toBe(false) }) it('should throw an error if the array contains non-string elements', () => { - const roles = ['admin', 123] + const roles = ['OWNER', 123] expect(() => scrubDefaultRoles(roles)).toThrow('Expecting a RolesMap and not an Array.') }) it('should remove default roles from an object of roles', () => { - const roles = { admin: 'admin', customRole: 'customRole' } + const roles = { OWNER: 'OWNER', customRole: 'customRole' } const result = scrubDefaultRoles(roles) expect(result).toEqual({ customRole: 'customRole' }) }) it('should return false if all roles in the object are default roles', () => { - const roles = { admin: 'admin', user: 'user' } + const roles = { OWNER: 'OWNER', VIEWER: 'VIEWER' } const result = scrubDefaultRoles(roles) expect(result).toBe(false) }) From d4aec32b5849b021bafec7774da144ef466e13e1 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:26:28 -0500 Subject: [PATCH 143/262] TPEN28 Fix (#300) * TPEN28 Fix * Update import28Router.js * service fix * function this * protocol * Update ProjectFactory.js * protocol * co-op fixing * change variables around page vs canvas * GET not POST --------- Co-authored-by: Bryan Haberberger --- classes/Project/ProjectFactory.js | 93 +++++++++++++++++++++++++++++++ project/import28Router.js | 73 ++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 171a79b9..1189cc6f 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -340,6 +340,99 @@ export default class ProjectFactory { } } + // We might add the Vault here to get the Manifest version 3 + static transformManifestUrl(url, protocol) { + const parsedUrl = new URL(url) + parsedUrl.protocol = protocol + if (parsedUrl.pathname.endsWith("/manifest.json")) { + parsedUrl.pathname = parsedUrl.pathname.replace(/\/manifest\.json$/, "") + } + parsedUrl.search = "?version=3" + return parsedUrl.toString() + } + + static async importTPEN28(projectTPEN28Data, projectTPEN3Data, userToken, protocol) { + if (!projectTPEN28Data || !projectTPEN3Data) { + throw { + status: 400, + message: "Invalid project data" + } + } + + const symbols = projectTPEN28Data.projectButtons.map(button => String.fromCharCode(button.key)) + if (symbols && symbols.length > 0) { + const copiedHotkeys = new Hotkeys(projectTPEN3Data._id, symbols) + await copiedHotkeys.create() + } + let projectTools = [] + try { + projectTools = [...projectTPEN28Data.userTool, ...projectTPEN28Data.projectTool] + } + catch (err) { + // Just in case the spread operator didn't end up making an array due to 'undefined' or something weird. + projectTools = [] + } + const toolList = projectTPEN3Data.tools.map((tool) => tool.value) + const selectedTools = toolList.map((tool) => ({ + value: tool, + state: projectTools.includes(tool), + })) + const project = new Project(projectTPEN3Data._id) + if (selectedTools && selectedTools.length > 0) { + await project.updateTools(selectedTools) + } + const allCanvases = projectTPEN3Data.layers[0].pages.map((page) => page.target) + const allPagesIds = projectTPEN3Data.layers[0].pages.map((page) =>page.id.replace(/project\/([a-f0-9]+)/, `project/${projectTPEN3Data._id}`)) + let manifestUrl = projectTPEN3Data.manifest[0] + manifestUrl = this.transformManifestUrl(manifestUrl, protocol) + const responseManifest = await fetch(manifestUrl) + if (!responseManifest.ok) { + throw new Error(`Failed to fetch: ${responseManifest.statusText}`) + } + + const manifestJson = await responseManifest.json() + const itemsByPage = {} + manifestJson.items.map((item, index) => { + const canvasId = item.id + if (allCanvases.includes(canvasId)) { + const annotations = item.annotations?.flatMap( + (annotation) => + annotation.items?.flatMap((innerItems) => ({ + body: { + type: innerItems.body?.type, + format: innerItems.body?.format, + value: innerItems.body?.value, + }, + motivation: innerItems.motivation, + target: innerItems.target, + type: innerItems.type, + })) || [] + ) || [] + itemsByPage[allPagesIds[index]] = annotations + } + }) + + for (const [endpoint, annotations] of Object.entries(itemsByPage)) { + try { + const response = await fetch(`${endpoint}/line`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${userToken}`, + }, + body: JSON.stringify(annotations), + }) + if (!response.ok) { + throw new Error(`Failed to import annotations: ${response.statusText}`) + } + } catch (error) { + console.error("Error importing annotations:", error) + } + } + + return projectTPEN3Data + } + static async copyProject(projectId, creator) { if (!projectId) { throw { diff --git a/project/import28Router.js b/project/import28Router.js index 90ba4c22..1576ed58 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -3,6 +3,8 @@ import { respondWithError } from "../utilities/shared.js" import cookieParser from "cookie-parser" import auth0Middleware from "../auth/index.js" import cors from "cors" +import validateURL from "../utilities/validateURL.js" +import ProjectFactory from "../classes/Project/ProjectFactory.js" function patchTokenFromQuery(req, res, next) { if (!req.headers.authorization && req.cookies.userToken) { @@ -79,4 +81,75 @@ router.route("/import28/:uid").get( respondWithError(res, 405, "Improper request method. Use GET instead") }) +router.route("/import28/selectedproject/:selectedProjectId").get( + cors(corsOptions), + cookieParser(), + patchTokenFromQuery, + auth0Middleware(), + async (req, res) => { + const user = req.user + const jsessionid = req.cookies?.JSESSIONID + const selectedProjectId = req.params?.selectedProjectId + + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!jsessionid) return respondWithError(res, 400, "Missing jsessionid in query") + if (!selectedProjectId) return respondWithError(res, 400, "Missing selectedProjectId in query") + + try { + const importResponse = await fetch( + `${process.env.TPEN28URL}/TPEN/getProjectTPENServlet?projectID=${selectedProjectId}`, + { + method: "GET", + headers: { + "Content-Type": "application/json; charset=utf-8", + "Cookie": `JSESSIONID=${jsessionid}` + }, + credentials: "include" + } + ) + .then(resp => { + if(!resp.ok) throw resp + return resp.json() + }) + .catch(err => {throw err}) + + let parsedData = {} + parsedData = Object.fromEntries( + Object.entries(importResponse).map(([key, value]) => { + try { + return [key, JSON.parse(value)] + } catch { + return [key, value] + } + }) + ) + + const manifestURL = `${process.env.TPEN28URL}/TPEN/manifest/${selectedProjectId}` + let checkURL = await validateURL(manifestURL) + let importData + if (!checkURL.valid) + return res.status(checkURL.status).json({message: checkURL.message, resolvedPayload: checkURL.resolvedPayload}) + try { + importData = await ProjectFactory.fromManifestURL(manifestURL, user.agent.split('/').pop(), true) + } catch (error) { + res.status(error.status ?? 500).json({ + status: error.status ?? 500, + message: error.message, + data: error.resolvedPayload + }) + } + + await ProjectFactory.importTPEN28(parsedData, importData, req.cookies.userToken, req.protocol) + res.status(201).json({ + message: "Project imported successfully", + project: { parsedData, importData } + }) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.statusText ?? "Error fetching project data") + } + } +).all((req, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + export default router From 73988d2faa52f48db5c868f660c75616cdc30727 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 21 Aug 2025 14:18:57 -0500 Subject: [PATCH 144/262] 295 contentchanged for layers and pages (#298) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Development (#234) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs * Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs * un-mjs * Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel * Update package-lock.json * Using UID to get User Projects * Update index.mjs * no label is fine for Pages * Origin Fetch * SetHeader Origin * Update index.js * Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba * 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger * remove unused file --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * upgradeReferences on Page class * move to shared.js * merge goof * check for content changed * Refactor page and layer update logic and improve validation Refactored updatePageAndProject to simplify logic and remove the contentChanged parameter. Improved validation for update requests in page/index.js and streamlined layer lookup. Added default type to Line update output. Minor formatting and consistency improvements in shared.js. * layers updated * comment only for notes * upgrade for new warnings * Refactor database access to use unified driver Replaces separate database controllers with a single dbDriver instance for 'tiny' operations. Updates all references to use the new databaseTiny object, simplifying and unifying database access throughout shared.js. * Are you there }? It's me, Margaret * pass flasey check * oops get rid of console.log * Set line creator if not already defined Adds logic to assign the line's creator property to the user's agent if it is undefined when processing items. This ensures that the creator information is consistently set for new or updated lines. * Update shared.js * fix for Bryan's test --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> --- classes/Layer/Layer.js | 6 +- classes/Line/Line.js | 1 + classes/Page/Page.js | 7 +- package-lock.json | 840 +++++++++++++++++++---------------------- page/index.js | 14 +- utilities/shared.js | 120 +++--- 6 files changed, 467 insertions(+), 521 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index 2e75c280..aa67f93a 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -74,10 +74,8 @@ export default class Layer { return true } - // FIXME: This will save to RERUM even if there has been no content change - // The rerum variable below is true if the content has changed. - async update(rerum = false) { - if (rerum || this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { + async update() { + if (this.#tinyAction === 'update' || this.pages.some(page => page.id.startsWith(process.env.RERUMIDPREFIX))) { this.#setRerumId() await this.#saveCollectionToRerum() } diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 0f3e537b..73ad8d97 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -91,6 +91,7 @@ export default class Line { #updateLineForPage() { return { id: this.id, + type: this.type ?? "Annotation", target: this.target } } diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 9187dba6..85bd1912 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -85,7 +85,7 @@ export default class Page { partOf: [{ id: this.partOf, type: "AnnotationCollection" }] } if (this.#tinyAction === 'create') { - await databaseTiny.save(pageAsAnnotationPage) + const saved = await databaseTiny.save(pageAsAnnotationPage) .catch(err => { console.error(err, pageAsAnnotationPage) throw new Error(`Failed to save Page to RERUM: ${err.message}`) @@ -119,8 +119,9 @@ export default class Page { * * @returns {Promise} Resolves to the updated Layer object as stored in Project. */ - async update(rerum = false) { - if (rerum || this.#tinyAction === 'update' || this.items?.length) { + async update() { + const hasContent = this.items?.length || this.items?.some?.(item => item && typeof item === 'object' && 'body' in item) + if (this.#tinyAction === 'update' || hasContent) { this.#setRerumId() await this.#savePageToRerum() } diff --git a/package-lock.json b/package-lock.json index a7f88b57..56b6c7b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,13 +59,13 @@ } }, "node_modules/@asamuzakjp/css-color": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz", - "integrity": "sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz", + "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==", "license": "MIT", "dependencies": { - "@csstools/css-calc": "^2.1.2", - "@csstools/css-color-parser": "^3.0.8", + "@csstools/css-calc": "^2.1.3", + "@csstools/css-color-parser": "^3.0.9", "@csstools/css-parser-algorithms": "^3.0.4", "@csstools/css-tokenizer": "^3.0.3", "lru-cache": "^10.4.3" @@ -78,24 +78,24 @@ "license": "ISC" }, "node_modules/@babel/code-frame": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", - "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.25.9", + "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "picocolors": "^1.1.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz", - "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz", + "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==", "dev": true, "license": "MIT", "engines": { @@ -103,22 +103,22 @@ } }, "node_modules/@babel/core": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", - "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz", + "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.0", - "@babel/generator": "^7.26.0", - "@babel/helper-compilation-targets": "^7.25.9", - "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.0", - "@babel/parser": "^7.26.0", - "@babel/template": "^7.25.9", - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.26.0", + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.0", + "@babel/helper-compilation-targets": "^7.27.2", + "@babel/helper-module-transforms": "^7.27.3", + "@babel/helpers": "^7.27.6", + "@babel/parser": "^7.28.0", + "@babel/template": "^7.27.2", + "@babel/traverse": "^7.28.0", + "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -134,16 +134,16 @@ } }, "node_modules/@babel/generator": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", - "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz", + "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.26.5", - "@babel/types": "^7.26.5", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", + "@babel/parser": "^7.28.0", + "@babel/types": "^7.28.0", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" }, "engines": { @@ -151,14 +151,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", - "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", + "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.26.5", - "@babel/helper-validator-option": "^7.25.9", + "@babel/compat-data": "^7.27.2", + "@babel/helper-validator-option": "^7.27.1", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -167,30 +167,40 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-globals": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", + "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-module-imports": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", - "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", + "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/traverse": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", - "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", + "version": "7.27.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz", + "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9", - "@babel/traverse": "^7.25.9" + "@babel/helper-module-imports": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1", + "@babel/traverse": "^7.27.3" }, "engines": { "node": ">=6.9.0" @@ -200,9 +210,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", - "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", + "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", "dev": true, "license": "MIT", "engines": { @@ -210,9 +220,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", - "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", "dev": true, "license": "MIT", "engines": { @@ -220,9 +230,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", - "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", + "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", "dev": true, "license": "MIT", "engines": { @@ -230,9 +240,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", - "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", + "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", "dev": true, "license": "MIT", "engines": { @@ -240,27 +250,27 @@ } }, "node_modules/@babel/helpers": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz", - "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==", + "version": "7.28.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.2.tgz", + "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.27.0", - "@babel/types": "^7.27.0" + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", - "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", + "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.27.0" + "@babel/types": "^7.28.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -325,13 +335,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", - "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", + "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -367,13 +377,13 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz", - "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", + "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -493,13 +503,13 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz", - "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", + "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -509,14 +519,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz", - "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz", + "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.26.0", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-module-transforms": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -526,48 +536,48 @@ } }, "node_modules/@babel/template": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", - "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", + "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.26.2", - "@babel/parser": "^7.27.0", - "@babel/types": "^7.27.0" + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz", - "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz", + "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.5", - "@babel/parser": "^7.26.5", - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.5", - "debug": "^4.3.1", - "globals": "^11.1.0" + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.0", + "@babel/helper-globals": "^7.28.0", + "@babel/parser": "^7.28.0", + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.0", + "debug": "^4.3.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/types": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", - "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", + "version": "7.28.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", + "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -600,9 +610,9 @@ } }, "node_modules/@csstools/css-calc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz", - "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz", + "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==", "funding": [ { "type": "github", @@ -618,14 +628,14 @@ "node": ">=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3" + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4" } }, "node_modules/@csstools/css-color-parser": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz", - "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz", + "integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==", "funding": [ { "type": "github", @@ -639,20 +649,20 @@ "license": "MIT", "dependencies": { "@csstools/color-helpers": "^5.0.2", - "@csstools/css-calc": "^2.1.2" + "@csstools/css-calc": "^2.1.4" }, "engines": { "node": ">=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3" + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4" } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz", - "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", + "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", "funding": [ { "type": "github", @@ -668,13 +678,13 @@ "node": ">=18" }, "peerDependencies": { - "@csstools/css-tokenizer": "^3.0.3" + "@csstools/css-tokenizer": "^3.0.4" } }, "node_modules/@csstools/css-tokenizer": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz", - "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz", + "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==", "funding": [ { "type": "github", @@ -697,9 +707,9 @@ "license": "MIT" }, "node_modules/@iiif/helpers": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.3.1.tgz", - "integrity": "sha512-zVqgvvrUhKVq8JR1Gz8VXp+dD3SDdleAg/yJfGJ7cFvqFXiNQRtgY1ZbKxUfj/5ej5w5pgD/UuFF+E2CjcbxwQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.4.0.tgz", + "integrity": "sha512-bUNJW7kJNl50wzpeFx3ctKl5F6TqzqDYqOg3ub6vzq/uNreFczbYYRkeSIrl8fCc5Zn7hhqpkbBnHMLLU8frJQ==", "license": "MIT", "dependencies": { "@iiif/presentation-2": "1.0.4", @@ -713,19 +723,13 @@ "svg-arc-to-cubic-bezier": "^3.2.0" }, "peerDependencies": { - "@iiif/parser": "^2.1.7" + "@iiif/parser": "^2.2.0" } }, - "node_modules/@iiif/helpers/node_modules/@types/geojson": { - "version": "7946.0.13", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", - "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", - "license": "MIT" - }, "node_modules/@iiif/parser": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.1.7.tgz", - "integrity": "sha512-a3NrHOdW6RbmUeBCFJ751FBBuzS251O7owbRjUHUvRRs9GoFwNIDk5slh9qP5FFHycIbuyWjyl1lIxbikxAq/g==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.2.1.tgz", + "integrity": "sha512-pHz4WR+1LXm9VglHmcPKthqOkDRB8YzbDkGJE82wgQyZyh8l0iXQcq9MysSqxK5GuKi8qBaOTTUdiFlb1r2ARA==", "license": "MIT", "peer": true, "dependencies": { @@ -763,9 +767,9 @@ } }, "node_modules/@iiif/vocabulary": { - "version": "1.0.26", - "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz", - "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==", + "version": "1.0.29", + "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.29.tgz", + "integrity": "sha512-mT3bySFvKvmWpjjuzLI2Bd6P+/R2TDF613ADfHy8FI4CNEURJzqCLg5t58eoAK2Ipdwpalvwmc89Xrr2sDHr+w==", "license": "MIT" }, "node_modules/@istanbuljs/load-nyc-config": { @@ -1098,18 +1102,14 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", - "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz", + "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { @@ -1122,27 +1122,17 @@ "node": ">=6.0.0" } }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz", + "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==", "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "version": "0.3.29", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz", + "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1151,9 +1141,9 @@ } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz", - "integrity": "sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz", + "integrity": "sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==", "license": "MIT", "dependencies": { "sparse-bitfield": "^3.0.3" @@ -1210,14 +1200,13 @@ } }, "node_modules/@sinonjs/samsam": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz", - "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.3.tgz", + "integrity": "sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", - "lodash.get": "^4.4.2", "type-detect": "^4.1.0" } }, @@ -1253,9 +1242,9 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", "dev": true, "license": "MIT", "dependencies": { @@ -1274,19 +1263,19 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", - "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", + "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.20.7" + "@babel/types": "^7.28.2" } }, "node_modules/@types/body-parser": { - "version": "1.19.5", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", - "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "version": "1.19.6", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", + "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", "dev": true, "license": "MIT", "dependencies": { @@ -1305,9 +1294,9 @@ } }, "node_modules/@types/express": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", - "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "version": "4.17.23", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz", + "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1331,9 +1320,9 @@ } }, "node_modules/@types/geojson": { - "version": "7946.0.15", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz", - "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==", + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", "license": "MIT" }, "node_modules/@types/graceful-fs": { @@ -1347,9 +1336,9 @@ } }, "node_modules/@types/http-errors": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", - "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", + "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", "dev": true, "license": "MIT" }, @@ -1388,18 +1377,18 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz", - "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==", + "version": "24.2.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz", + "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==", "license": "MIT", "dependencies": { - "undici-types": "~6.20.0" + "undici-types": "~7.10.0" } }, "node_modules/@types/qs": { - "version": "6.9.18", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz", - "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==", "dev": true, "license": "MIT" }, @@ -1411,9 +1400,9 @@ "license": "MIT" }, "node_modules/@types/send": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", - "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "version": "0.17.5", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz", + "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==", "dev": true, "license": "MIT", "dependencies": { @@ -1422,9 +1411,9 @@ } }, "node_modules/@types/serve-static": { - "version": "1.15.7", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", - "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz", + "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==", "dev": true, "license": "MIT", "dependencies": { @@ -1500,9 +1489,9 @@ } }, "node_modules/agent-base": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", - "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", "license": "MIT", "engines": { "node": ">= 14" @@ -1591,6 +1580,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true, "license": "MIT" }, "node_modules/babel-jest": { @@ -1666,9 +1656,9 @@ } }, "node_modules/babel-preset-current-node-syntax": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", - "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", + "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", "dev": true, "license": "MIT", "dependencies": { @@ -1689,7 +1679,7 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "@babel/core": "^7.0.0 || ^8.0.0-0" } }, "node_modules/babel-preset-jest": { @@ -1811,9 +1801,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", - "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "version": "4.25.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", + "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", "dev": true, "funding": [ { @@ -1831,10 +1821,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001688", - "electron-to-chromium": "^1.5.73", + "caniuse-lite": "^1.0.30001733", + "electron-to-chromium": "^1.5.199", "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.1" + "update-browserslist-db": "^1.1.3" }, "bin": { "browserslist": "cli.js" @@ -1854,9 +1844,9 @@ } }, "node_modules/bson": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.1.tgz", - "integrity": "sha512-P92xmHDQjSKPLHqFxefqMxASNq/aWJMEZugpCjf+AF/pgcUpMMQCg7t7+ewko0/u8AapvF3luf/FoehddEK+sA==", + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz", + "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==", "license": "Apache-2.0", "engines": { "node": ">=16.20.1" @@ -1879,9 +1869,9 @@ } }, "node_modules/call-bind-apply-helpers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", - "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -1892,13 +1882,13 @@ } }, "node_modules/call-bound": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", - "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "get-intrinsic": "^1.2.6" + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -1928,9 +1918,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001692", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", - "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==", + "version": "1.0.30001734", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001734.tgz", + "integrity": "sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==", "dev": true, "funding": [ { @@ -2017,9 +2007,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz", - "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", "dev": true, "license": "MIT" }, @@ -2080,6 +2070,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" @@ -2219,12 +2210,12 @@ } }, "node_modules/cssstyle": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz", - "integrity": "sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz", + "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==", "license": "MIT", "dependencies": { - "@asamuzakjp/css-color": "^3.1.1", + "@asamuzakjp/css-color": "^3.2.0", "rrweb-cssom": "^0.8.0" }, "engines": { @@ -2244,35 +2235,10 @@ "node": ">=18" } }, - "node_modules/data-urls/node_modules/tr46": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", - "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", - "license": "MIT", - "dependencies": { - "punycode": "^2.3.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/data-urls/node_modules/whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", - "license": "MIT", - "dependencies": { - "tr46": "^5.1.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", + "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2287,15 +2253,15 @@ } }, "node_modules/decimal.js": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", - "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", + "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", "license": "MIT" }, "node_modules/dedent": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", - "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", + "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", "dev": true, "license": "MIT", "peerDependencies": { @@ -2321,6 +2287,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.4.0" @@ -2396,18 +2363,18 @@ } }, "node_modules/dompurify": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", - "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz", + "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "node_modules/dotenv": { - "version": "16.4.7", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", - "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", + "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", "license": "BSD-2-Clause", "engines": { "node": ">=12" @@ -2417,9 +2384,9 @@ } }, "node_modules/dotenv-expand": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.1.tgz", - "integrity": "sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.2.tgz", + "integrity": "sha512-lXpXz2ZE1cea1gL4sz2Ipj8y4PiVjytYr3Ij0SWoms1PGxIv7m2CRKuRuCRtHdVuvM/hNJPMxt5PbhboNC4dPQ==", "license": "BSD-2-Clause", "dependencies": { "dotenv": "^16.4.5" @@ -2452,9 +2419,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.82", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.82.tgz", - "integrity": "sha512-Zq16uk1hfQhyGx5GpwPAYDwddJuSGhtRhgOA2mCxANYaDT79nAeGnaXogMGng4KqLaJUVnOnuL0+TDop9nLOiA==", + "version": "1.5.200", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.200.tgz", + "integrity": "sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w==", "dev": true, "license": "ISC" }, @@ -2488,9 +2455,9 @@ } }, "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", + "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -2528,9 +2495,9 @@ } }, "node_modules/es-object-atoms": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.0.tgz", - "integrity": "sha512-Ujz8Al/KfOVR7fkaghAB1WvnLsdYxHDWmfoi2vlA2jZWRg31XhIC1a4B+/I24muD8iSbHxJ1JkrfqmWb65P/Mw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -2700,15 +2667,15 @@ } }, "node_modules/express-oauth2-jwt-bearer": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.0.tgz", - "integrity": "sha512-HXnez7vocYlOqlfF3ozPcf/WE3zxT7zfUNfeg5FHJnvNwhBYlNXiPOvuCtBalis8xcigvwtInzEKhBuH87+9ug==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", + "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", "license": "MIT", "dependencies": { - "jose": "^4.13.1" + "jose": "^4.15.5" }, "engines": { - "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0" + "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0 || ^22.1.0" } }, "node_modules/express-urlrewrite": { @@ -2894,6 +2861,21 @@ "dev": true, "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -2924,17 +2906,17 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", + "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "get-proto": "^1.0.0", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -3018,16 +3000,6 @@ "node": ">= 6" } }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", @@ -3408,9 +3380,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -3958,9 +3930,9 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -4102,15 +4074,14 @@ } }, "node_modules/jsdom": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz", - "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz", + "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", "license": "MIT", "dependencies": { "cssstyle": "^4.2.1", "data-urls": "^5.0.0", - "decimal.js": "^10.4.3", - "form-data": "^4.0.1", + "decimal.js": "^10.5.0", "html-encoding-sniffer": "^4.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.6", @@ -4120,12 +4091,12 @@ "rrweb-cssom": "^0.8.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^5.0.0", + "tough-cookie": "^5.1.1", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.0", + "whatwg-url": "^14.1.1", "ws": "^8.18.0", "xml-name-validator": "^5.0.0" }, @@ -4141,31 +4112,6 @@ } } }, - "node_modules/jsdom/node_modules/tr46": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz", - "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==", - "license": "MIT", - "dependencies": { - "punycode": "^2.3.1" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/jsdom/node_modules/whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", - "license": "MIT", - "dependencies": { - "tr46": "^5.1.0", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", @@ -4252,14 +4198,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "license": "MIT" }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", - "dev": true, - "license": "MIT" - }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -4287,9 +4225,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -4310,13 +4248,13 @@ } }, "node_modules/manifesto.js": { - "version": "4.2.21", - "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz", - "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==", + "version": "4.2.22", + "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.22.tgz", + "integrity": "sha512-Rl7nKFzJ7kiotWCrFkqTnY6xfdGr7KtaHo+QovRXe4WGizoH1QaF6kHodNPIOsi2L5LCgX/RVoNqOryLKEuNrg==", "license": "MIT", "dependencies": { "@edsilv/http-status-codes": "^1.0.3", - "@iiif/vocabulary": "^1.0.26", + "@iiif/vocabulary": "^1.0.28", "isomorphic-unfetch": "^3.0.0", "lodash": "^4.17.21" }, @@ -4326,21 +4264,27 @@ } }, "node_modules/mariadb": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz", - "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==", + "version": "3.4.5", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.5.tgz", + "integrity": "sha512-gThTYkhIS5rRqkVr+Y0cIdzr+GRqJ9sA2Q34e0yzmyhMCwyApf3OKAC1jnF23aSlIOqJuyaUFUcj7O1qZslmmQ==", "license": "LGPL-2.1-or-later", "dependencies": { - "@types/geojson": "^7946.0.14", - "@types/node": "^22.5.4", + "@types/geojson": "^7946.0.16", + "@types/node": "^24.0.13", "denque": "^2.1.0", "iconv-lite": "^0.6.3", - "lru-cache": "^10.3.0" + "lru-cache": "^10.4.3" }, "engines": { "node": ">= 14" } }, + "node_modules/mariadb/node_modules/@types/geojson": { + "version": "7946.0.16", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", + "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==", + "license": "MIT" + }, "node_modules/mariadb/node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", @@ -4360,9 +4304,9 @@ "license": "ISC" }, "node_modules/marked": { - "version": "15.0.7", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz", - "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==", + "version": "15.0.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz", + "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==", "license": "MIT", "bin": { "marked": "bin/marked.js" @@ -4491,13 +4435,13 @@ } }, "node_modules/mongodb": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.12.0.tgz", - "integrity": "sha512-RM7AHlvYfS7jv7+BXund/kR64DryVI+cHbVAy9P61fnb1RcWZqOW1/Wj2YhqMCx+MuYhqTRGv7AwHBzmsCKBfA==", + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.18.0.tgz", + "integrity": "sha512-fO5ttN9VC8P0F5fqtQmclAkgXZxbIkYRTUi1j8JO6IYwvamkhtYDilJr35jOPELR49zqCJgXZWwCtW7B+TM8vQ==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.1", + "bson": "^6.10.4", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -4537,13 +4481,13 @@ } }, "node_modules/mongodb-connection-string-url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", - "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", + "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", "license": "Apache-2.0", "dependencies": { "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^13.0.0" + "whatwg-url": "^14.1.0 || ^13.0.0" } }, "node_modules/morgan": { @@ -4702,18 +4646,18 @@ "license": "MIT" }, "node_modules/nodemailer": { - "version": "6.9.16", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz", - "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz", + "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==", "license": "MIT-0", "engines": { "node": ">=6.0.0" } }, "node_modules/nodemon": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", - "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", + "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", "dev": true, "license": "MIT", "dependencies": { @@ -4750,9 +4694,9 @@ } }, "node_modules/nodemon/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -4799,9 +4743,9 @@ } }, "node_modules/nwsapi": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", - "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==", + "version": "2.2.21", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.21.tgz", + "integrity": "sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==", "license": "MIT" }, "node_modules/object-assign": { @@ -4814,9 +4758,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", - "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -4954,12 +4898,12 @@ "optional": true }, "node_modules/parse5": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", - "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", "license": "MIT", "dependencies": { - "entities": "^4.5.0" + "entities": "^6.0.0" }, "funding": { "url": "https://github.com/inikulin/parse5?sponsor=1" @@ -5038,9 +4982,9 @@ } }, "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", "dev": true, "license": "MIT", "engines": { @@ -5510,9 +5454,9 @@ } }, "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -5523,14 +5467,14 @@ } }, "node_modules/sinon": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", - "integrity": "sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g==", + "version": "19.0.5", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", + "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.2", + "@sinonjs/fake-timers": "^13.0.5", "@sinonjs/samsam": "^8.0.1", "diff": "^7.0.0", "nise": "^6.1.1", @@ -5703,21 +5647,21 @@ } }, "node_modules/superagent": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz", - "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.3.tgz", + "integrity": "sha512-y/hkYGeXAj7wUMjxRbB21g/l6aAEituGXM9Rwl4o20+SX3e8YOSV6BxFXl+dL3Uk0mjSL3kCbNkwURm8/gEDig==", "dev": true, "license": "MIT", "dependencies": { - "component-emitter": "^1.3.0", + "component-emitter": "^1.3.1", "cookiejar": "^2.1.4", - "debug": "^4.3.4", + "debug": "^4.3.7", "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.0", - "formidable": "^3.5.1", + "form-data": "^4.0.4", + "formidable": "^3.5.4", "methods": "^1.1.2", "mime": "2.6.0", - "qs": "^6.11.0" + "qs": "^6.11.2" }, "engines": { "node": ">=14.18.0" @@ -5737,14 +5681,14 @@ } }, "node_modules/supertest": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.0.0.tgz", - "integrity": "sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.4.tgz", + "integrity": "sha512-tjLPs7dVyqgItVFirHYqe2T+MfWc2VOBQ8QFKKbWTA3PU7liZR8zoSpAi/C1k1ilm9RsXIKYf197oap9wXGVYg==", "dev": true, "license": "MIT", "dependencies": { "methods": "^1.1.2", - "superagent": "^9.0.1" + "superagent": "^10.2.3" }, "engines": { "node": ">=14.18.0" @@ -5805,21 +5749,21 @@ } }, "node_modules/tldts": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz", - "integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==", + "version": "6.1.86", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz", + "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==", "license": "MIT", "dependencies": { - "tldts-core": "^6.1.85" + "tldts-core": "^6.1.86" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.85", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz", - "integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==", + "version": "6.1.86", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz", + "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==", "license": "MIT" }, "node_modules/tmpl": { @@ -5878,15 +5822,15 @@ "link": true }, "node_modules/tr46": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", - "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", + "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", "license": "MIT", "dependencies": { - "punycode": "^2.3.0" + "punycode": "^2.3.1" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/type-detect": { @@ -5933,9 +5877,9 @@ "license": "MIT" }, "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz", + "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==", "license": "MIT" }, "node_modules/unfetch": { @@ -5954,9 +5898,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", - "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", "dev": true, "funding": [ { @@ -6082,16 +6026,16 @@ } }, "node_modules/whatwg-url": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", - "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", "license": "MIT", "dependencies": { - "tr46": "^4.1.1", + "tr46": "^5.1.0", "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/which": { @@ -6150,9 +6094,9 @@ } }, "node_modules/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "version": "8.18.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", "license": "MIT", "engines": { "node": ">=10.0.0" diff --git a/page/index.js b/page/index.js index 6ba790de..42551dcc 100644 --- a/page/index.js +++ b/page/index.js @@ -53,7 +53,7 @@ router.route('/:pageId') if (!user) return respondWithError(res, 401, "Unauthenticated request") const { projectId, pageId } = req.params const update = req.body - if (!update) { + if (!update || typeof update !== 'object' || Object.keys(update).length === 0) { respondWithError(res, 400, 'No update data provided.') return } @@ -62,12 +62,7 @@ router.route('/:pageId') respondWithError(res, 404, `Project with ID '${projectId}' not found`) return } - const layer = getLayerContainingPage(project, pageId) - if (!layer) { - respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) - return - } - const layerId = layer.id + const layerId = getLayerContainingPage(project, pageId)?.id if (!layerId) { respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) return @@ -83,7 +78,7 @@ router.route('/:pageId') return } // Only update top-level properties that are present in the request - Object.keys(update ?? {}).forEach(key => { + Object.keys(update).forEach(key => { page[key] = update[key] }) Object.keys(page).forEach(key => { @@ -93,7 +88,6 @@ router.route('/:pageId') else page[key] = null } }) - const pageContentChanged = update && update.hasOwnProperty("items") if (update.items) { page.items = await Promise.all(page.items.map(async item => { const line = item.id?.startsWith?.('http') @@ -103,7 +97,7 @@ router.route('/:pageId') return await line.update() })) } - await updatePageAndProject(page, project, user._id, pageContentChanged) + await updatePageAndProject(page, project, user._id) res.status(200).json(page) } catch (error) { // Handle version conflicts with optimistic locking diff --git a/utilities/shared.js b/utilities/shared.js index 72ee22f7..5917462d 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -1,9 +1,11 @@ -import DatabaseController from "../database/mongo/controller.js" +import dbDriver from "../database/driver.js" import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' import Page from '../classes/Page/Page.js' import User from '../classes/User/User.js' +const databaseTiny = new dbDriver("tiny") + /** * Check if the supplied input is valid JSON or not. * @param input A string or Object that should be JSON conformant. @@ -27,7 +29,7 @@ export function isValidJSON(input = "") { */ export function validateID(id, type = "mongo") { if (type == "mongo") { - return new DatabaseController().isValidId(id) + return databaseTiny.isValidId(id) } else { if (!isNaN(id)) { try { @@ -106,29 +108,41 @@ export const rebuildPageOrder = async (project, layer, userId) => { /** * Update a Layer, its Pages, and the Project it belongs to. - * Content has changed if the organization of layer.pages has been altered. + * Upgrade a Layer only if it contains upgraded Pages. * * @param layer - A Layer class object with changes applied to it * @param project - A Project class object that will need to update * @param userId - The TPEN3 User hash id performing the action * @param originalPages - An Array of Page _ids that represent the original upstream Layer.pages organization before any modifications. */ -export const updateLayerAndProject = async (layer, project, userId, originalPages = null) => { +export const updateLayerAndProject = async (layer, project, userId) => { if (!project) throw new Error(`Must know project to update Layer`) if (layer === null || layer === undefined) throw new Error("A Layer must be provided in order to update") if (!userId) throw new Error(`Must know user id to update layer`) - if (originalPages === null || originalPages === undefined || !Array.isArray(originalPages)) originalPages = await findLayerById(layer.id, project._id, true)?.pages - let pagesChanged = false - const originalPageOrder = originalPages.map(p => p.id.split("/").pop()) - const providedPageOrder = layer.pages.map(p => p.id.split("/").pop()) - if(providedPageOrder.join() !== originalPageOrder.join()) { - // The Pages need updated so that they have the correct prev and next - pagesChanged = true - await rebuildPageOrder(project, layer, userId) - } if (!layer.creator) layer.creator = await fetchUserAgent(userId) - const updatedLayer = await layer.update(pagesChanged) const layerIndex = project.data.layers.findIndex(l => l.id.split("/").pop() === layer.id.split("/").pop()) + const updatedLayer = await layer.update() + if(project.data.layers[layerIndex]?.id !== updatedLayer.id) { + // update the references to the Layer in the Project + // Pages all have their partOf set to the Layer.id + const pageOverwrites = [] + updatedLayer.pages.forEach(async page => { + page.partOf[0].id = updatedLayer.id + if(page.id.startsWith(process.env.RERUMIDPREFIX)) { + // overwrite the Page in RERUM + const oldPage = await databaseTiny.find({_id: page.id.split("/").pop()}) + if(!oldPage) throw new Error(`Page with ID ${page.id} not found in RERUM`) + oldPage.partOf = [{ id: updatedLayer.id, type: "AnnotationCollection" }] + pageOverwrites.push(databaseTiny.overwrite(oldPage).catch(_err => { throw new Error(`Failed to overwrite page ${oldPage.id} in RERUM`) })) + } + // Note that if the page is not in RERUM and is removed from the Layer, it just disappears without + // tending to any of its Annotations. If it is in RERUM and removed from the Layer it is orphaned + // but retains its reference to the Annotation Collection in its partOf. + }) + await Promise.all(pageOverwrites).catch(err => { + console.error("Error overwriting pages in RERUM", err) + }) + } project.data.layers[layerIndex] = updatedLayer await project.update() } @@ -140,32 +154,26 @@ export const updateLayerAndProject = async (layer, project, userId, originalPage * @param page - A Page class object with changes applied to it. * @param project - A Project class object that will need to be updated. * @param userId - The TPEN3 user hash id performing the action - * @param contentChanged - A boolean representing whether or not there were changes to page content. */ -export const updatePageAndProject = async (page, project, userId, contentChanged = false) => { +export const updatePageAndProject = async (page, project, userId) => { if (!project) throw new Error(`Must know project to update Page`) if (!page) throw new Error(`A Page must be provided to update`) if (!userId) throw new Error(`Must know user id to update layer`) - const useragent = await fetchUserAgent(userId) - if (!page.creator) page.creator = useragent - let data_layer = project.data.layers.find(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) + page.creator ??= await fetchUserAgent(userId) + // .update() returns a Page prepped for saving to Project + const updatedPage = await page.update() const layerIndex = project.data.layers.findIndex(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) - let layer - if (contentChanged) { - layer = await findLayerById(data_layer.id, project._id) - if (!layer) throw new Error("Cannot update Page. Its Layer was not found.") - if (!layer.creator) layer.creator = useragent + if (layerIndex < 0 || layerIndex === undefined || layerIndex === null) throw new Error("Cannot update Page. Its Layer was not found.") + const layer = project.data.layers[layerIndex] + const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) + layer.pages[pageIndex] = updatedPage + if (updatedPage.id.startsWith(process.env.RERUMIDPREFIX)) { + // If Page id has changed, we need to update the Layer (and the Project) + const updatedLayer = new Layer(project._id, layer) + updatedLayer.creator ??= await fetchUserAgent(userId) + project.data.layers[layerIndex] = await updatedLayer.update() await recordModification(project, page.id, userId) } - const updatedPage = await page.update(contentChanged) - const pageIndex = data_layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) - data_layer.pages[pageIndex] = page.asProjectPage() - if (contentChanged) { - // We don't strictly have to update the Layer if the content change was only text. - layer.pages[pageIndex] = updatedPage - data_layer = await layer.update(true) - } - project.data.layers[layerIndex] = data_layer await project.update() } @@ -204,7 +212,7 @@ const recordModification = async (project, pageId, userId) => { // Get a Layer that contains a PageId export const getLayerContainingPage = (project, pageId) => { - return project.data.layers.find(layer => + return project.data?.layers.find(layer => layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) ) } @@ -219,11 +227,11 @@ export async function findPageById(pageId, projectId, rerum) { if (res.ok) return res.json() if (!res.ok) return {} }) - .catch(err => { - console.error("Network error with rerum") - throw err - }) - if(rerum_obj?.id || rerum_obj["@id"]) return rerum_obj + .catch(err => { + console.error("Network error with rerum") + throw err + }) + if (rerum_obj?.id || rerum_obj["@id"]) return rerum_obj } const projectData = (await getProjectById(projectId))?.data if (!projectData) { @@ -265,33 +273,33 @@ export async function findLayerById(layerId, projectId, rerum = false) { if (res.ok) return res.json() if (!res.ok) return {} }) - .catch(err => { - console.error("Network error with rerum") - throw err - }) - if(rerum_obj?.id || rerum_obj["@id"]) return rerum_obj + .catch(err => { + console.error("Network error with rerum") + throw err + }) + if (rerum_obj?.id || rerum_obj["@id"]) return rerum_obj } const p = await Project.getById(projectId) if (!p) { - const error = new Error(`Project with ID '${projectId}' not found`) - error.status = 404 - throw error + const error = new Error(`Project with ID '${projectId}' not found`) + error.status = 404 + throw error } const layer = layerId.length < 6 - ? p.data.layers[parseInt(layerId) + 1] - : p.data.layers.find(layer => layer.id.split('/').pop() === layerId.split('/').pop()) + ? p.data.layers[parseInt(layerId) + 1] + : p.data.layers.find(layer => layer.id.split('/').pop() === layerId.split('/').pop()) if (!layer) { - const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) - error.status = 404 - throw error + const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) + error.status = 404 + throw error } // Ensure the layer has pages and is not malformed if (!layer.pages || layer.pages.length === 0) { - const error = new Error(`Layer with ID '${layerId}' is malformed: no pages found`) - error.status = 422 - throw error + const error = new Error(`Layer with ID '${layerId}' is malformed: no pages found`) + error.status = 422 + throw error } - return new Layer(projectId, {"id":layer.id, "label":layer.label, "pages":layer.pages}) + return new Layer(projectId, { "id": layer.id, "label": layer.label, "pages": layer.pages }) } /** From 55f7cabc6f6b7461478a70b7db3158d2bb6c66e8 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 2 Sep 2025 09:43:16 -0500 Subject: [PATCH 145/262] TPEN28 Multiple Users Fix (#307) Co-authored-by: Bryan Haberberger --- project/import28Router.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/project/import28Router.js b/project/import28Router.js index 1576ed58..18f4f57c 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -69,6 +69,10 @@ router.route("/import28/:uid").get( }) ) + Object.keys(req.cookies).forEach((cookieName) => { + res.clearCookie(cookieName) + }) + return res.status(200).json({ message: "Select a Project to Import : ", data: parsedData From 58bff9a489dd9a6da89601385c9058f03c336e64 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 2 Sep 2025 09:57:36 -0500 Subject: [PATCH 146/262] public-profile (#299) * public-profile * API changed --- classes/User/User.js | 1 + userProfile/index.js | 42 ++++++++++------------------------- userProfile/privateProfile.js | 2 +- 3 files changed, 14 insertions(+), 31 deletions(-) diff --git a/classes/User/User.js b/classes/User/User.js index 45ade529..16cc9f1c 100644 --- a/classes/User/User.js +++ b/classes/User/User.js @@ -165,6 +165,7 @@ export default class User { _id: 1, // Project ID title: 1, // Project title label: 1, // Project label + collaborators: { $arrayElemAt: [`$groupInfo.members`, 0] }, // User collaborators within the group roles: { $arrayElemAt: [`$groupInfo.members.${this._id}.roles`, 0] }, // User roles within the group _lastModified: 1, // Last modified page _createdAt: 1, // Creation date diff --git a/userProfile/index.js b/userProfile/index.js index d9d4c641..380ede8d 100644 --- a/userProfile/index.js +++ b/userProfile/index.js @@ -1,5 +1,5 @@ import express from "express" -import { respondWithError, validateID } from "../utilities/shared.js" +import { respondWithError } from "../utilities/shared.js" import cors from "cors" import common_cors from "../utilities/common_cors.json" with {type: "json"} import User from "../classes/User/User.js" @@ -7,35 +7,17 @@ import User from "../classes/User/User.js" let router = express.Router() router.use(cors(common_cors)) -router.route("/:id?").get(async (req, res) => { - let { id } = req.params - // let id = "jkl" - if (!id) { - return respondWithError(res, 400, "No user ID provided") +router.route("/:id").get(async (req, res) => { + const userId = req.params.id + if (!userId) return respondWithError(res, 400, "User ID is required") + try { + const userObj = new User(userId) + const publicProfile = await userObj.getPublicInfo() + if (!publicProfile) return respondWithError(res, 404, "User not found") + res.status(200).json(publicProfile) + } catch (error) { + respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") } - - if (!validateID(id)) { - return respondWithError(res, 400, "The TPEN3 user ID is invalid") - } - - (async () => { - - try { - const userObj = new User(id) - const publicUserInfo = await userObj.getPublicInfo() - if (publicUserInfo) { - res.status(200).json(publicUserInfo) - } else { - return respondWithError(res, 404, `No TPEN3 user with ID '${id}' found`) - } - } catch (error) { - respondWithError( - res, - error.status || error.code || 500, - error.message ?? "An error occurred while fetching the user data." - ) - } - })() -}) +}).all((req, res) => respondWithError(res, 405, "Improper request method. Use GET instead")) export default router diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index f9ef7744..bd77e831 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -1,5 +1,5 @@ import express from "express" -import {respondWithError, respondWithJSON} from "../utilities/shared.js" +import {respondWithError} from "../utilities/shared.js" import User from "../classes/User/User.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} import cors from "cors" From e8ed4a886562b573a6ee0afafd5b9235883b363d Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 2 Sep 2025 10:42:57 -0500 Subject: [PATCH 147/262] Fix up error responses, and expectations for those responses in the tests. --- userProfile/__tests__/end_to_end_unit.test.js | 13 ++++++------- userProfile/index.js | 16 +++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/userProfile/__tests__/end_to_end_unit.test.js b/userProfile/__tests__/end_to_end_unit.test.js index da2d028b..ce3611a8 100644 --- a/userProfile/__tests__/end_to_end_unit.test.js +++ b/userProfile/__tests__/end_to_end_unit.test.js @@ -62,17 +62,17 @@ describe('userProfile endpoint end to end unit test (spinning up the endpoint an expect(res.body).toBeTruthy() }) - it('Call to /user with a TPEN3 user ID that does not exist. The status should be 400 with a message.', async () => { + it('Call to /user with a TPEN3 user ID that does not exist. The status should be 404 with a message.', async () => { const res = await request(routeTester) .get('/user/') - expect(res.statusCode).toBe(400) + expect(res.statusCode).toBe(404) expect(res.body).toBeTruthy() }) it('Call to /user with a TPEN3 user ID that is invalid', async () => { const res = await request(routeTester) .get('/user/kjl') - expect(res.statusCode).toBe(400) + expect(res.statusCode).toBe(404) expect(res.body).toBeTruthy() }) @@ -88,14 +88,13 @@ describe('userProfile endpoint end to end unit test (spinning up the endpoint an describe('GET /:id route #testThis', () => { it('should respond with status 400 if no user ID is provided', async () => { const response = await request(app).get('/user/') - expect(response.status).toBe(400) - expect(response.body.message).toBe('No user ID provided') + expect(response.status).toBe(404) }) it('should respond with status 400 if the provided user ID is invalid', async () => { const response = await request(app).get('/user/jkl') - expect(response.status).toBe(400) - expect(response.body.message).toBe('The TPEN3 user ID is invalid') + expect(response.status).toBe(404) + expect(response.body.message).toBe('User not found') }) diff --git a/userProfile/index.js b/userProfile/index.js index 380ede8d..bd47bd7b 100644 --- a/userProfile/index.js +++ b/userProfile/index.js @@ -8,16 +8,18 @@ let router = express.Router() router.use(cors(common_cors)) router.route("/:id").get(async (req, res) => { - const userId = req.params.id + const userId = req.params?.id if (!userId) return respondWithError(res, 400, "User ID is required") + const userObj = new User(userId) + let publicProfile try { - const userObj = new User(userId) - const publicProfile = await userObj.getPublicInfo() - if (!publicProfile) return respondWithError(res, 404, "User not found") - res.status(200).json(publicProfile) - } catch (error) { - respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") + publicProfile = await userObj.getPublicInfo() } + catch(err) { + return respondWithError(res, 404, "User not found") + } + if (!publicProfile) return respondWithError(res, 404, "User not found") + res.status(200).json(publicProfile) }).all((req, res) => respondWithError(res, 405, "Improper request method. Use GET instead")) export default router From ea315128fd481cc8ecb2129fdfa63d8c8a85c055 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 4 Sep 2025 13:57:55 -0400 Subject: [PATCH 148/262] /:lineid/text hotfix (#310) * Line needs to know creator to update text. generator is not set here. * Line needs to know creator to update text. generator is not set here. --- classes/Line/Line.js | 6 +----- line/index.js | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 73ad8d97..8bdb5dfd 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -114,7 +114,7 @@ export default class Line { async updateText(text, options = {}) { if (typeof text !== 'string') throw new Error('Text content must be a string') if (!this.body) this.body = "" // simple variant for no body - + this.creator = options.creator const isVariantTextualBody = body => typeof (body?.chars ?? body?.['cnt:asChars'] ?? body?.value ?? body) === 'string' if (Array.isArray(this.body)) { @@ -133,10 +133,6 @@ export default class Line { const currentValue = this.body.chars ?? this.body['cnt:asChars'] ?? this.body.value ?? this.body if (currentValue === text) return this this.body = { type: 'TextualBody', value: text, format: options.format ?? "text/plain", language: options.language } - // Apply options directly to the Annotation - if (options.creator) this.creator = options.creator - if (options.generator) this.generator = options.generator - // discarding unknown options return this.update() } diff --git a/line/index.js b/line/index.js index c4c60ab1..8163a437 100644 --- a/line/index.js +++ b/line/index.js @@ -160,7 +160,7 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { return } const line = new Line(oldLine) - const updatedLine = await line.updateText(req.body) + const updatedLine = await line.updateText(req.body, {"creator": user._id}) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine await withOptimisticLocking( From 836e9dfbb54bfb26fe21fc9c6c95e43eb6eba3e6 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 9 Sep 2025 10:55:59 -0500 Subject: [PATCH 149/262] Tpen28 Cookies Change (#311) * TPEN28 Multiple Users Fix * Update import28Router.js * Update import28Router.js --------- Co-authored-by: Bryan Haberberger --- project/import28Router.js | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/project/import28Router.js b/project/import28Router.js index 18f4f57c..aef62412 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -26,6 +26,37 @@ const corsOptions = { const router = express.Router({ mergeParams: true }) +router.route("/deletecookie").get( + cors(corsOptions), + cookieParser(), + patchTokenFromQuery, + auth0Middleware(), + async (req, res) => { + const isProdTPEN = req.hostname.includes("t-pen.org") + + const cookieOptions = { + path: "/", + sameSite: "Strict", + httpOnly: true, + domain: req.hostname + } + + if (isProdTPEN) { + cookieOptions.secure = true + cookieOptions.domain = "t-pen.org" + } + + if (req.cookies.userToken) { + res.clearCookie("userToken", cookieOptions) + } + + res.status(200).json({ message: "Cookies deleted successfully" }) + } +) +.all((req, res) => { + respondWithError(res, 405, "Improper request method. Use GET instead") +}) + router.route("/import28/:uid").get( cors(corsOptions), cookieParser(), From e3ffcddfa527cbcb13051db86a30475e4515aa08 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 11 Sep 2025 15:10:20 -0400 Subject: [PATCH 150/262] Protect PATCH /:projectId/label Endpoint (#308) * Putting some ideas together to play around * Putting some ideas together to play around * POC stuff * hmm something from Friday perhaps * improve ideas * This is all sus * Feeling good about these checks, start to prune out what we wouldn't need in this file for checking if strings are suspicious * hmmm * check label before loading project * Check JSON one level deep as well * clean this up a bit * clean this up a bit * rename stuff. add tests. * clean up, document, propose middleware solution as well as exported base logic that middleware uses for custom handling options. * dont need the id part here * Don't need these imports because we are using middleware now * Be less loggy during recursion * Simplify and log better * use 400 response code * oops get rid of this from testing * polish and open * polish and open * word in comment * word in comment * EOF char * word in comment * touch up * Better guard error for when label is falsey. Allow labels that are numbers by converting to string-number * ok fine undefined is actually an illegal json value so it won't get this far. * Check the 'just spaces' case to get the 400 in the route instead of letting the Class 500 * changes discussed at morning standup --- classes/Project/Project.js | 1 + project/projectCreateRouter.js | 11 +- utilities/__tests__/isSuspicious.test.js | 118 +++++++++++++++++ utilities/checkIfSuspicious.js | 155 +++++++++++++++++++++++ 4 files changed, 282 insertions(+), 3 deletions(-) create mode 100644 utilities/__tests__/isSuspicious.test.js create mode 100644 utilities/checkIfSuspicious.js diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 8159464f..dcd7fece 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -128,6 +128,7 @@ export default class Project { } async setLabel(label) { + if (typeof label === "number") label += "" if (typeof label !== "string" || label.trim() === "") { throw new Error("Label must be a non-empty string") } diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index dfdd82a7..1bb11ccf 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -4,6 +4,7 @@ import auth0Middleware from "../auth/index.js" import ProjectFactory from "../classes/Project/ProjectFactory.js" import validateURL from "../utilities/validateURL.js" import Project from "../classes/Project/Project.js" +import screenContentMiddleware from "../utilities/checkIfSuspicious.js" const router = express.Router({ mergeParams: true }) @@ -111,16 +112,20 @@ router.route("/import-image").post(auth0Middleware(), async (req, res) => { respondWithError(res, 405, "Improper request method. Use POST instead") }) -router.route("/:projectId/label").patch(auth0Middleware(), async (req, res) => { +/** + * Free typed strings may be malicious or rude. The key 'label' is not malicious but the value req.body.label could be. + */ +router.route("/:projectId/label").patch(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") const projectId = req.params.projectId if (!projectId) return respondWithError(res, 400, "Project ID is required") const { label } = req.body - if (!label) return respondWithError(res, 400, "Label is required") + if (typeof label !== "string" || !label?.trim()) return respondWithError(res, 400, "JSON with a 'label' property required in the request body. It cannot be null or blank and must be a string.") try { let project = new Project(projectId) - if (!project) return respondWithError(res, 404, "Project not found") + const loadedProject = await project.loadProject() + if (!loadedProject) return respondWithError(res, 404, "Project not found") project = await project.setLabel(label) res.status(200).json(project) } catch (error) { diff --git a/utilities/__tests__/isSuspicious.test.js b/utilities/__tests__/isSuspicious.test.js new file mode 100644 index 00000000..758bf48d --- /dev/null +++ b/utilities/__tests__/isSuspicious.test.js @@ -0,0 +1,118 @@ +import { isSuspiciousValueString, isSuspiciousJSON } from "../checkIfSuspicious.js" + +describe("Suspicious string library. #suspiciousStrings", () => { + const notations = [ + "<>", + "{}", + "()", + "[]", + "< >", + "{ }", + "( )", + "[ ]", + "=[", + "= [", + "==", + "===" + ] + + const declarations = [ + "", + "#!", + "javascript:" + ] + + const rhel = [ + "sudo ", + "service httpd", + "service mongod", + "service node", + "pm2 ", + "nvm ", + "systemctl", + "rm -", + "mv -", + "cp -", + "cd -", + "ls -", + "ssh ", + "sftp " + ] + + const functiony = [ + "if(", + "if (", + "for(", + "for (", + "forEach(", + "forEach (", + "while(", + "while (", + "do{", + "do {", + "fetch(", + "fetch (", + "function(", + "function (", + "eval(", + "eval (", + "get(", + "get (", + "set(", + "set (", + "new Function(", + "=>{", + "=> {", + "==", + "===" + ] + + const mongoy = [ + "db.anything" + ] + + const all = [...notations, ...declarations, ...rhel, ...functiony, ...mongoy] + const safeString = "This (string) is [safe] b/c no code! #sosafe. Have $1.00." + const safeJSON = { "value": "This (JSON) is [safe] b/c no code! #sosafe. Have $1.00." } + + it('returns suspicious warnings for all string values.', () => { + for (const value of all) { + if (!isSuspiciousValueString(value)) console.log(value) + expect(isSuspiciousValueString(value)).toBe(true) + } + }) + + it('returns suspicious warnings for all JSON values', () => { + for (const value of all) { + const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "none"] + for (const key of common_keys) { + const json1 = {} + json1[key] = value + const json2 = {} + const inner2 = {} + inner2[key] = value + json2[key] = inner2 + const json3 = { "label": { "none": value } } + expect(isSuspiciousJSON(json1)).toBe(true) + expect(isSuspiciousJSON(json2)).toBe(true) + expect(isSuspiciousJSON(json3)).toBe(true) + } + } + }) + + it('Does not return supicious warning for safe value string.', () => { + expect(isSuspiciousValueString(safeString)).toBe(false) + }) + + it('Does not return supicious warning for safe JSON.', () => { + expect(isSuspiciousJSON(safeJSON)).toBe(false) + }) + +}) diff --git a/utilities/checkIfSuspicious.js b/utilities/checkIfSuspicious.js new file mode 100644 index 00000000..d552fbc9 --- /dev/null +++ b/utilities/checkIfSuspicious.js @@ -0,0 +1,155 @@ +/** + * When clients make request they can provide anything in the body. Some things, like labels, + * we take into databases and expect it to render on HTML pages when it is returned to clients. + * + * JSON and Strings should not be code of any kind, whether they are db requests, script injection, or OS commands. + * This library contains middleware to use on routes as well as individual functions to use + * outside of the middleware chain for custom suspicious value handling. + */ + +import { isValidJSON, respondWithError } from "./shared.js" + +/** + * This middleware function scans request bodies for suspcious looking JSON or strings. + * Use it to protect individual routes. + 1. import contentScanMiddleware into the route file + 2. apply to route like route.patch("/label", contentScanMiddleware(), controller) + * + * @returns next() to move down the middleware chain or 422 + */ +function screenContentMiddleware() { + + function suspiciousBodyContent(req, res, next) { + const body = req?.body + if (!body) return next() + if (isValidJSON(body)) { + if (isSuspiciousJSON(body)) return respondWithError(res, 400, "Suspicious input will not be processed.") + } + else if (typeof body === "string" || typeof body === "number") { + if (isSuspiciousValueString(body+"")) return respondWithError(res, 400, "Suspicious input will not be processed.") + } + next() + } + + return suspiciousBodyContent +} + +export default screenContentMiddleware + +/** + * Go through relevant keys on a TPEN3 JSON object that may have a value + * set by direct user input. + */ +export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, depth = 0) { + // Guard against unnreasonably deep embedded JSON structures so we don't recurse for too long. + if (depth > 10) return true + if (Array.isArray(obj)) throw new Error("Do not supply the array. Use this on each item in the array.") + if (!isValidJSON(obj)) throw new Error("Object to check is not valid JSON") + // Helps gaurd bad logWarning param, to make sure the warning log happens as often as possible. + if (typeof logWarning !== "boolean") logWarning = true + // Keys we anticipate could have a value set by direct user input. Always check Annotation bodies. + // We don't need to check keys that TPEN Services will never process. + const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "none"] + const allKeys = [...common_keys, ...specific_keys] + const warnings = {} + const warn = {} + for (const key of allKeys) { + // Also check embedded JSON values recursively to a max depth of 10. + if (isValidJSON(obj[key]) && isSuspiciousJSON(obj[key], [], true, depth + 1)) { + // We don't need to log out notes, but we could like key: to show the trail + // if (logWarning) { + // warn[key] = "" + // console.warn(warn) + // } + warnings[key] = "" + } + else if (isSuspiciousValueString(getValueString(obj[key]))) { + if (logWarning) { + warn[key] = getValueString(obj[key]) + console.warn("Found suspicious value in JSON. This 'key: value' may be embedded below the top level JSON.") + console.warn(warn) + } + warnings[key] = getValueString(obj[key]) + // Break out once we find the first suspicious string value. + break + } + } + return Object.keys(warnings).length > 0 +} + +/** + * For some string do some reasonable checks to see if it may contain something that seems like code. + */ +export function isSuspiciousValueString(valString) { + // We can't process it, so technically it isn't suspicious + if (valString === null || valString === undefined || typeof valString !== "string") return false + return containsScript(valString) +} + +/** + * For some string do some reasonable checks to see if it may contain something that seems like a script. + * Mostly concerned with script injection. PHP, Javascript, Perl, JQuery, JSP, etc. + */ +function containsScript(str) { + // We can't process it, so technically it isn't suspicious + if (str === null || str === undefined || typeof str !== "string") return false + + // Common webby stuff + const commonWebPatterns = new RegExp( + /<>|{}|\(\)|\[\]|< >|{ }|\( \)|\[ \]|==|=\[|= \[||#!/ + ) + // Running in a RHEL VM, so some common RHEL stuff + const commonOSPatterns = new RegExp( + /sudo |service httpd|service mongod|service node|pm2 |nvm |systemctl|rm \-|mv \-|cp \-|cd \-|ls \-|ssh |sftp / + ) + // Common scripting language words + const ifPattern = new RegExp(/if\(|if \(/) + const forPattern = new RegExp(/for\(|for \(|forEach\(|forEach \(/) + const whilePattern = new RegExp(/while\(|while \(/) + const doPattern = new RegExp(/do{|do {/) + const fetchPattern = new RegExp(/fetch\(|fetch \(/) + const evalPattern = new RegExp(/eval\(|eval \(/) + const functionPattern = new RegExp(/new Function\(|new Function \(|function\(|function \(|=>{|=> {|\){|\) {|}\)|} \)/) + const setPattern = new RegExp(/set\(|set \(/) + const getPattern = new RegExp(/get\(|get \(/) + const setTimeoutPattern = new RegExp(/setTimeout\(|setTimeout \(/) + // anything .word( + const dotFnPattern = new RegExp(/\.\w+\(/) + // db.anything + const dbDotPattern = new RegExp(/db\.\w/) + return ( + commonWebPatterns.test(str) || + commonOSPatterns.test(str) || + dotFnPattern.test(str) || + dbDotPattern.test(str) || + ifPattern.test(str) || + forPattern.test(str) || + whilePattern.test(str) || + doPattern.test(str) || + fetchPattern.test(str) || + evalPattern.test(str) || + functionPattern.test(str) || + setPattern.test(str) || + getPattern.test(str) || + setTimeoutPattern.test(str) + ) +} + +/** + * Interpret a string value from the data passed in, if possible. + * return null if the data cannot be interpreted as stringy. + * + * @param data - an Array, JSON Object, number, string, null, or undefined + */ +function getValueString(data) { + if (data === null || data === undefined) return null + if (typeof data === "string") return data + if (typeof data === "number") return data + "" + if (Array.isArray(data)) { + // Only if the whole array is strings or numbers + if (data.find(l => typeof l !== "string" || typeof l !== "number")?.length) return null + return data.join() + } + // Always return null for JSON data. It's not stringy. + return null +} From bdd842099d93259f0079693345b50786d9b7928b Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 12 Sep 2025 15:38:15 -0400 Subject: [PATCH 151/262] Add protection to /project/metadata route (#316) * Get this ready for copilot * Add screenContentMiddleware to protect /project/metadata route - Import screenContentMiddleware from utilities/checkIfSuspicious.js - Add middleware to PUT /:projectId/metadata route after auth0Middleware - Remove TODO comment as protection is now implemented - Middleware will reject suspicious input with 400 error * undiff * Improvement to logic guard logs. Fix support for arrays of strings and numbers as a checkable value. * Improvement to logic guard logs. Fix support for arrays of strings and numbers as a checkable value. * Improvement to logic guard logs. Fix support for arrays of strings and numbers as a checkable value. * Update utilities/checkIfSuspicious.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * documentation, good to go * good spell check AI --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- project/metadataRouter.js | 4 ++++ utilities/checkIfSuspicious.js | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/project/metadataRouter.js b/project/metadataRouter.js index 3a2bd5e7..14257464 100644 --- a/project/metadataRouter.js +++ b/project/metadataRouter.js @@ -1,6 +1,7 @@ import express from "express" import { respondWithError } from "../utilities/shared.js" import auth0Middleware from "../auth/index.js" +import { isSuspiciousJSON } from "../utilities/checkIfSuspicious.js" import Project from "../classes/Project/Project.js" import { ACTIONS, SCOPES, ENTITIES } from "./groups/permissions_parameters.js" @@ -15,6 +16,9 @@ router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") } try { + for (const data of metadata) { + if (isSuspiciousJSON(data)) return respondWithError(res, 400, "Suspicious input will not be processed.") + } const projectObj = new Project(projectId) if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.PROJECT))) { return respondWithError(res, 403, "You do not have permission to update metadata for this project.") diff --git a/utilities/checkIfSuspicious.js b/utilities/checkIfSuspicious.js index d552fbc9..7f138e4b 100644 --- a/utilities/checkIfSuspicious.js +++ b/utilities/checkIfSuspicious.js @@ -41,11 +41,14 @@ export default screenContentMiddleware * set by direct user input. */ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, depth = 0) { - // Guard against unnreasonably deep embedded JSON structures so we don't recurse for too long. + // Guard against unreasonably deep embedded JSON structures so we don't recurse for too long. if (depth > 10) return true - if (Array.isArray(obj)) throw new Error("Do not supply the array. Use this on each item in the array.") - if (!isValidJSON(obj)) throw new Error("Object to check is not valid JSON") - // Helps gaurd bad logWarning param, to make sure the warning log happens as often as possible. + // Arrays are considered valid JSON Arrays. Bail out on Arrays, they are too complex to check. + // Simple arrays like {"none": ["while(true) return true"]} are handled elsewhere in the recursion. + if (Array.isArray(obj)) return false + // Bail out if the data provided is not JSON. It is invalid and not worth checking. + if (!isValidJSON(obj)) return false + // Helps guard bad logWarning param, to make sure the warning log happens as often as possible. if (typeof logWarning !== "boolean") logWarning = true // Keys we anticipate could have a value set by direct user input. Always check Annotation bodies. // We don't need to check keys that TPEN Services will never process. @@ -64,6 +67,7 @@ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, dep warnings[key] = "" } else if (isSuspiciousValueString(getValueString(obj[key]))) { + // Note this will check simple Array values like ["a value of a language map label"] if (logWarning) { warn[key] = getValueString(obj[key]) console.warn("Found suspicious value in JSON. This 'key: value' may be embedded below the top level JSON.") @@ -146,8 +150,9 @@ function getValueString(data) { if (typeof data === "string") return data if (typeof data === "number") return data + "" if (Array.isArray(data)) { - // Only if the whole array is strings or numbers - if (data.find(l => typeof l !== "string" || typeof l !== "number")?.length) return null + // We can use it as a value string if the whole array is strings or numbers. + // Otherwise it is too complex to be a value string and will be skipped. + if (data.filter(l => typeof l !== "string" && typeof l !== "number").length > 0) return null return data.join() } // Always return null for JSON data. It's not stringy. From 6785e41f6e625a3d9174c3505a22d1062dfdc7bf Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 15 Sep 2025 10:21:17 -0400 Subject: [PATCH 152/262] Protect POST /project/create with screenContentMiddleware to block suspicious input (utilities/checkIfSuspicious) (#319) --- project/projectCreateRouter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 1bb11ccf..89297e6d 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -8,7 +8,7 @@ import screenContentMiddleware from "../utilities/checkIfSuspicious.js" const router = express.Router({ mergeParams: true }) -router.route("/create").post(auth0Middleware(), async (req, res) => { +router.route("/create").post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") const projectObj = new Project() From b9ac9bf593e3c5e98a8934e8bea9c3a724a36c9b Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 16 Sep 2025 16:49:31 -0400 Subject: [PATCH 153/262] Protect /project/addRoles and /project/setRoles routes (#322) * project: protect addRoles and setRoles routes with screenContentMiddleware (checkIfSuspicious) * changes from testing * changes from testing --- project/memberRouter.js | 5 +++-- utilities/checkIfSuspicious.js | 24 +++++++++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/project/memberRouter.js b/project/memberRouter.js index c7f189c1..608c2937 100644 --- a/project/memberRouter.js +++ b/project/memberRouter.js @@ -5,6 +5,7 @@ import auth0Middleware from "../auth/index.js" import Project from "../classes/Project/Project.js" import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" import Group from "../classes/Group/Group.js" +import screenContentMiddleware from "../utilities/checkIfSuspicious.js" const router = express.Router({ mergeParams: true }) @@ -51,7 +52,7 @@ router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { }) // Add, set, remove roles -router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Middleware(), async (req, res) => { +router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId, collaboratorId } = req.params const roles = req.body.roles ?? req.body const user = req.user @@ -72,7 +73,7 @@ router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Midd } }) -router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middleware(), async (req, res) => { +router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId, collaboratorId } = req.params const roles = req.body.roles ?? req.body const user = req.user diff --git a/utilities/checkIfSuspicious.js b/utilities/checkIfSuspicious.js index 7f138e4b..bb65c4e5 100644 --- a/utilities/checkIfSuspicious.js +++ b/utilities/checkIfSuspicious.js @@ -22,11 +22,15 @@ function screenContentMiddleware() { function suspiciousBodyContent(req, res, next) { const body = req?.body if (!body) return next() - if (isValidJSON(body)) { + if (Array.isArray(body)) { + const simple = getValueString(body) + if (simple !== null && isSuspiciousValueString(simple, true)) return respondWithError(res, 400, "Suspicious input will not be processed.") + } + else if (isValidJSON(body)) { if (isSuspiciousJSON(body)) return respondWithError(res, 400, "Suspicious input will not be processed.") } else if (typeof body === "string" || typeof body === "number") { - if (isSuspiciousValueString(body+"")) return respondWithError(res, 400, "Suspicious input will not be processed.") + if (isSuspiciousValueString(body+"", true)) return respondWithError(res, 400, "Suspicious input will not be processed.") } next() } @@ -43,8 +47,7 @@ export default screenContentMiddleware export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, depth = 0) { // Guard against unreasonably deep embedded JSON structures so we don't recurse for too long. if (depth > 10) return true - // Arrays are considered valid JSON Arrays. Bail out on Arrays, they are too complex to check. - // Simple arrays like {"none": ["while(true) return true"]} are handled elsewhere in the recursion. + // Arrays are considered valid JSON. Simple ones are checkd upstream. Bail out on complex arrays here. if (Array.isArray(obj)) return false // Bail out if the data provided is not JSON. It is invalid and not worth checking. if (!isValidJSON(obj)) return false @@ -52,7 +55,7 @@ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, dep if (typeof logWarning !== "boolean") logWarning = true // Keys we anticipate could have a value set by direct user input. Always check Annotation bodies. // We don't need to check keys that TPEN Services will never process. - const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "none"] + const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "none", "roles"] const allKeys = [...common_keys, ...specific_keys] const warnings = {} const warn = {} @@ -84,10 +87,17 @@ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, dep /** * For some string do some reasonable checks to see if it may contain something that seems like code. */ -export function isSuspiciousValueString(valString) { +export function isSuspiciousValueString(valString, logWarning = false) { // We can't process it, so technically it isn't suspicious if (valString === null || valString === undefined || typeof valString !== "string") return false - return containsScript(valString) + // Helps guard bad logWarning param + if (typeof logWarning !== "boolean") logWarning = false + const sus = containsScript(valString) + if (sus && logWarning) { + console.warn("Suspicious content detected. See string below.") + console.warn(valString) + } + return sus } /** From 9f8d1f09380b0941decd1546a202b0265fc4d3a3 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 17 Sep 2025 10:34:13 -0500 Subject: [PATCH 154/262] Add comprehensive CONTRIBUTING.md guide for Node.js, Git, and local development (#302) * Initial plan * Add comprehensive CONTRIBUTING.md guide Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> * Fix license reference in CONTRIBUTING.md Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> * Remove MariaDB references from CONTRIBUTING.md as it's not used in the project Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> --- CONTRIBUTING.md | 260 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..23efc414 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,260 @@ +# Contributing to TPEN Services + +Thank you for your interest in contributing to TPEN Services! This guide will help you get started with the development environment and contribution process. + +## Prerequisites + +### Node.js and npm +- **Node.js version**: >= 22.14.0 (as specified in `package.json`) +- **npm**: Latest version (comes with Node.js) + +You can download Node.js from [nodejs.org](https://nodejs.org/) or use a version manager like [nvm](https://github.com/nvm-sh/nvm). + +To check your current versions: +```bash +node --version +npm --version +``` + +### Database Requirements +TPEN Services uses **MongoDB** for primary data storage. + +For local development, you'll need either: +- Local installation of MongoDB +- Docker container running MongoDB +- Access to a remote MongoDB instance (such as MongoDB Atlas) + +### Git +- Git should be installed and configured on your system +- Familiarity with Git workflows (branching, merging, pull requests) + +## Getting Started + +### 1. Fork and Clone the Repository + +1. Fork the repository on GitHub +2. Clone your fork locally: +```bash +git clone https://github.com/YOUR_USERNAME/TPEN-services.git +cd TPEN-services +``` + +3. Add the upstream repository as a remote: +```bash +git remote add upstream https://github.com/CenterForDigitalHumanities/TPEN-services.git +``` + +### 2. Install Dependencies + +Install all project dependencies: +```bash +npm install +``` + +**Note**: If you encounter engine compatibility warnings due to Node.js version requirements, consider upgrading Node.js or using a compatible version manager. + +### 3. Environment Configuration + +1. Copy the sample environment file: +```bash +cp sample.env .env +``` + +2. Edit `.env` to configure your local environment. Key settings include: + - **PORT**: Server port (default: 3001) + - **MONGODB**: MongoDB connection string + - **MONGODBNAME**: MongoDB database name + - **AUDIENCE**: Auth0 audience for JWT validation + - **DOMAIN**: Auth0 domain + +**Important**: Never commit your `.env` file to version control. It's included in `.gitignore` for security. + +### 4. Database Setup + +#### MongoDB +- Install MongoDB locally or use MongoDB Atlas (cloud) +- Update the `MONGODB` connection string in your `.env` file +- Ensure the database specified in `MONGODBNAME` exists + +**Note**: The project uses MongoDB as its primary database. While the codebase includes a MariaDB controller, it is not actively used and MongoDB is sufficient for development. + +### 5. Authentication Setup + +TPEN Services uses Auth0 for authentication. For development: +- Set up an Auth0 account and application +- Configure your `.env` file with the appropriate `AUDIENCE` and `DOMAIN` values +- Some features may require valid Auth0 configuration to function properly + +## Running the Project Locally + +### Development Server +Start the development server with hot reloading: +```bash +npm run dev +``` + +The server will start on the port specified in your `.env` file (default: 3001). + +### Production Mode +Run the server in production mode: +```bash +npm start +``` + +### Checking the Server +Once running, you can test the server: +```bash +curl http://localhost:3001 +``` + +## Testing + +TPEN Services uses Jest for testing with multiple test suites: + +### Run All Tests +```bash +npm run allTests +``` + +### Run Specific Test Suites +```bash +# Unit tests only +npm run unitTests + +# End-to-end tests +npm run E2Etests + +# Database tests +npm run dbTests + +# Authentication tests +npm run authTest + +# User class tests +npm run userClassTests + +# Import functionality tests +npm run importTests + +# Member invitation tests +npm run inviteMemberTests +``` + +### Test Requirements +- Some tests require database connections and will be skipped if databases are not available +- Authentication tests require proper Auth0 configuration +- Ensure your `.env` file is properly configured before running tests + +## Code Style and Best Practices + +### General Guidelines +- Use ES6+ modules (`import`/`export` syntax) +- Follow existing code style and patterns +- Write clear, descriptive commit messages +- Include tests for new functionality +- Update documentation when making changes + +### File Organization +- **Routes**: Organized in feature folders (`project/`, `manifest/`, `line/`, etc.) +- **Classes**: Located in `classes/` directory +- **Utilities**: Helper functions in `utilities/` directory +- **Tests**: Use `__tests__` directories or `.test.js` suffix + +### Error Handling +- Use appropriate HTTP status codes +- Provide meaningful error messages +- Follow the existing error handling patterns + +## Making Contributions + +### 1. Create a Feature Branch +```bash +git checkout -b feature/your-feature-name +``` + +### 2. Make Your Changes +- Write your code following the project's patterns +- Add or update tests as needed +- Ensure all tests pass +- Update documentation if necessary + +### 3. Test Your Changes +```bash +# Run relevant test suites +npm run unitTests +npm run E2Etests + +# Test the server manually +npm run dev +``` + +### 4. Commit Your Changes +```bash +git add . +git commit -m "feat: add new feature description" +``` + +Use conventional commit messages: +- `feat:` for new features +- `fix:` for bug fixes +- `docs:` for documentation changes +- `test:` for test additions/updates +- `refactor:` for code refactoring + +### 5. Push and Create Pull Request +```bash +git push origin feature/your-feature-name +``` + +Then create a pull request on GitHub with: +- Clear description of changes +- Reference to any related issues +- Screenshots or examples if applicable + +## Project Structure + +``` +TPEN-services/ +├── auth/ # Authentication middleware +├── bin/ # Server startup scripts +├── classes/ # Core business logic classes +├── database/ # Database controllers and utilities +├── project/ # Project management routes +├── manifest/ # IIIF manifest routes +├── line/ # Line/annotation routes +├── userProfile/ # User profile routes +├── utilities/ # Helper functions +├── __tests__/ # Global tests +├── app.js # Express app configuration +├── package.json # Dependencies and scripts +├── sample.env # Environment variables template +└── README.md # Basic project information +``` + +## API Documentation + +- Main API documentation is available in individual feature folders +- Example: `project/documentation.md` contains project API endpoints +- Follow existing documentation patterns when adding new endpoints + +## Getting Help + +- **Issues**: Check existing [GitHub issues](https://github.com/CenterForDigitalHumanities/TPEN-services/issues) or create a new one +- **Discussions**: Use GitHub discussions for questions and feature ideas +- **Documentation**: Refer to existing code and documentation for patterns + +## Additional Resources + +- [TPEN Project Homepage](https://t-pen.org/TPEN3) +- [Express.js Documentation](https://expressjs.com/) +- [MongoDB Documentation](https://docs.mongodb.com/) +- [Jest Testing Framework](https://jestjs.io/) +- [Auth0 Documentation](https://auth0.com/docs) + +## License + +By contributing to TPEN Services, you agree that your contributions will be licensed under the same license as the project (MIT License). + +--- + +Thank you for contributing to TPEN Services! Your contributions help make digital humanities tools more accessible and powerful. \ No newline at end of file From f451eb741d3b936b872491f5959820dd4df4827f Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 17 Sep 2025 10:43:54 -0500 Subject: [PATCH 155/262] Revise CONTRIBUTING.md for clarity and updates Updated contributing guidelines to clarify Auth0 usage and branch naming conventions. --- CONTRIBUTING.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 23efc414..407cfb0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,7 +64,7 @@ cp sample.env .env - **PORT**: Server port (default: 3001) - **MONGODB**: MongoDB connection string - **MONGODBNAME**: MongoDB database name - - **AUDIENCE**: Auth0 audience for JWT validation + - **AUDIENCE**: Auth0 audience for JWT validation ( or alternate authentication ) - **DOMAIN**: Auth0 domain **Important**: Never commit your `.env` file to version control. It's included in `.gitignore` for security. @@ -85,6 +85,8 @@ TPEN Services uses Auth0 for authentication. For development: - Configure your `.env` file with the appropriate `AUDIENCE` and `DOMAIN` values - Some features may require valid Auth0 configuration to function properly +> Auth0 is not required for development, but will always be used upstream. If you have an alternate solution, you only need to replace the `/auth` directory to ensure your own middleware is utilized. Contributions to the main project that alter these files will not be accepted. + ## Running the Project Locally ### Development Server @@ -142,7 +144,7 @@ npm run inviteMemberTests ### Test Requirements - Some tests require database connections and will be skipped if databases are not available -- Authentication tests require proper Auth0 configuration +- Authentication tests require proper Auth0 configuration ( currently skipped ) - Ensure your `.env` file is properly configured before running tests ## Code Style and Best Practices @@ -150,12 +152,16 @@ npm run inviteMemberTests ### General Guidelines - Use ES6+ modules (`import`/`export` syntax) - Follow existing code style and patterns + - Prefer switch statements, ternary operations, and guard clauses in place of complex if-else blocks + - Use terminal semicolons only when required by syntax as the leadign character of the problematic line + - Use nullish coalescing operators and optional chaining for clarity in place of expanded conditionals + - Use clear and English(ish) symbol names - Write clear, descriptive commit messages - Include tests for new functionality - Update documentation when making changes ### File Organization -- **Routes**: Organized in feature folders (`project/`, `manifest/`, `line/`, etc.) +- **API Routes**: Organized in feature folders (`project/`, `manifest/`, `line/`, etc.) - **Classes**: Located in `classes/` directory - **Utilities**: Helper functions in `utilities/` directory - **Tests**: Use `__tests__` directories or `.test.js` suffix @@ -167,9 +173,9 @@ npm run inviteMemberTests ## Making Contributions -### 1. Create a Feature Branch +### 1. Create a Branch ```bash -git checkout -b feature/your-feature-name +git checkout -b issue-#-your-feature/fix-name ``` ### 2. Make Your Changes @@ -203,7 +209,7 @@ Use conventional commit messages: ### 5. Push and Create Pull Request ```bash -git push origin feature/your-feature-name +git push origin issue-#-your-feature/fix-name ``` Then create a pull request on GitHub with: @@ -257,4 +263,4 @@ By contributing to TPEN Services, you agree that your contributions will be lice --- -Thank you for contributing to TPEN Services! Your contributions help make digital humanities tools more accessible and powerful. \ No newline at end of file +Thank you for contributing to TPEN Services! Your contributions help make digital humanities tools more accessible and powerful. From 2759f58be2149a71cc6b6096a9f6f811406e3318 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 17 Sep 2025 13:45:51 -0400 Subject: [PATCH 156/262] Protect /project/create Route (#320) * Protect POST /project/create with screenContentMiddleware to block suspicious input (utilities/checkIfSuspicious) * Have to do more special checks on project data objects within the route. * add space lint * Pages are one more layer deep * addressing comments from standup * Changes from testing. The deeper data check will not error out on malformed data, it will skip it. Malformed data checks are performed by Project.create() which will respond with 400. It uses /utilities/validatePayload.js which is not working. It does not check if the value of required keys are of the correct type. * FIXME documentation * FIXME documentation --- project/projectCreateRouter.js | 44 ++++++++++++++++++++++++++++++++-- utilities/validatePayload.js | 17 +++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 89297e6d..88c0b9de 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -5,20 +5,60 @@ import ProjectFactory from "../classes/Project/ProjectFactory.js" import validateURL from "../utilities/validateURL.js" import Project from "../classes/Project/Project.js" import screenContentMiddleware from "../utilities/checkIfSuspicious.js" +import { isSuspiciousJSON } from "../utilities/checkIfSuspicious.js" const router = express.Router({ mergeParams: true }) +/** + * Private function to check on metadata, tools, layers, and layer.pages data of a project. + * They may contain data generated by direct user input, such as labels. + * It may be malformed, but let that be caught downstream. + * + * @param project - The project data from the request body. + */ +function hasSuspiciousProjectData(project) { + // Expect that project.metadata is an Array of JSON objects. If not the project data malformed so skip it. + if (project.metadata && Array.isArray(project.metadata)) { + for (const metadataObj of project.metadata) { + if (isSuspiciousJSON(metadataObj, [], true, 1)) return true + } + } + // Expect that project.layers is an Array of JSON objects. If not the project data is malformed so skip it. + if (project.layers && Array.isArray(project.layers)) { + for (const layerObj of project.layers) { + if (isSuspiciousJSON(layerObj, [], true, 1)) return true + const pages = layerObj.pages + // Expect that layer.pages is an Array of JSON objects. If not the project data is malformed so skip it. + if (Array.isArray(pages)) { + for (const pageObj of pages) { + if (isSuspiciousJSON(pageObj, [], true, 2)) return true + } + } + } + } + // Expect that project.tools is an Array of JSON objects. If not the project data is malformed so skip it. + if (project.tools && Array.isArray(project.tools)) { + for (const toolObj of project.tools) { + if (isSuspiciousJSON(toolObj, [], true, 1)) return true + } + } + return false +} + router.route("/create").post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") - const projectObj = new Project() let project = req.body - project = { ...project, creator: user?.agent } try { + if (hasSuspiciousProjectData(project)) return respondWithError(res, 400, "Suspicious project data will not be processed.") + project = { ...project, creator: user?.agent } + const projectObj = new Project() const newProject = await projectObj.create(project) res.setHeader("Location", newProject?._id) res.status(201).json(newProject) } catch (error) { + console.log("Project creation error") + console.error(error) respondWithError( res, error.status ?? error.code ?? 500, diff --git a/utilities/validatePayload.js b/utilities/validatePayload.js index bbf7aa93..a1832a75 100644 --- a/utilities/validatePayload.js +++ b/utilities/validatePayload.js @@ -1,3 +1,20 @@ +/** + * Validate that the provided data payload is a valid Project object. + * + * FIXME this is not validating the value type of the required keys, only that the keys themselves are present. + * I can create bad projects with malformed data via the POST /project/create endpoint. + * Ex. this JSON will be validated even though it is severely malformed + { + "metadata": "metadata", + "label": "Some Label", + "layers": "layers", + "manifest": {"type":"Manifest"}, + "tools": "tools", + "group": true + } + * + * @param payload - The JSON request body from the /project/create route. + */ export function validateProjectPayload(payload) { if (!payload) return { isValid: false, errors: "Project cannot be created from an empty object" } const requiredElements = ["metadata", "layers", "label", "manifest", "creator", "group"] From 406b034cec9c1be9a76bdd8ce98de84003fb5c07 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 19 Sep 2025 08:55:18 -0500 Subject: [PATCH 157/262] Remove unused optimistic locking utilities Deleted the handleVersionConflict and withOptimisticLocking functions from shared.js as they are no longer used. This helps clean up the codebase and reduce maintenance overhead. --- utilities/shared.js | 51 --------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/utilities/shared.js b/utilities/shared.js index a756969d..022caa65 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -302,25 +302,6 @@ export async function findLayerById(layerId, projectId, rerum = false) { return new Layer(projectId, { "id": layer.id, "label": layer.label, "pages": layer.pages }) } -/** - * Handle version conflict errors from optimistic locking consistently - * @param {Response} res - Express response object - * @param {Error} error - The error object from the version conflict - * @returns {Response} JSON response with conflict details - */ -export const handleVersionConflict = (res, error) => { - return res ? res.status(409).json({ - currentVersion: error, - code: 'VERSION_CONFLICT', - details: 'The document was modified by another process.' - }) : { - status: 409, - currentVersion: error, - code: 'VERSION_CONFLICT', - details: 'The document was modified by another process.' - } -} - /** * Wrapper function to add optimistic locking retry logic to any async operation * @param {Function} operation - The async operation to execute @@ -395,35 +376,3 @@ export const handleVersionConflict = (res, error) => { ...(error.lineId && { lineId: error.lineId }) }) } - -/** - * Wrapper function to add optimistic locking retry logic to any async operation - * @param {Function} operation - The async operation to execute - * @param {number} maxRetries - Maximum number of retries (default: 1) - * @returns {Promise} The result of the operation or throws the final error - */ -export const withOptimisticLocking = async (operation, retryFn, maxRetries = 2) => { - let lastError - - for (let attempt = 0; attempt <= maxRetries; attempt++) { - try { - let currentVersion = lastError.currentVersion || null - return await attempt === 0 ? operation() : retryFn(currentVersion) - } catch (error) { - lastError = error - - // Only retry on version conflicts - if (error.status === 409 && attempt < maxRetries) { - // Could add backoff here if needed - console.warn(`Version conflict detected, retrying operation... Attempt ${attempt + 1}/${maxRetries}`) - await new Promise(resolve => setTimeout(resolve, 100 * (attempt + 1))) - continue - } - - // If it's not a version conflict or we've exhausted retries, throw - throw error - } - } - - throw lastError -} From 759867ffdf40e5a40202fcdd31e88ceba5389993 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 19 Sep 2025 09:01:53 -0500 Subject: [PATCH 158/262] Update utilities/shared.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- utilities/shared.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/shared.js b/utilities/shared.js index 022caa65..9e4dc78e 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -182,7 +182,7 @@ export const updatePageAndProject = async (page, project, userId) => { const recordModification = async (project, pageId, userId) => { if (!project || !pageId) { // silent failure of logging - console.error(`recordModification failed: projectId or pageId is missing. Submitted values - project: ${project}, page: ${page}, userId: ${userId}`) + console.error(`recordModification failed: projectId or pageId is missing. Submitted values - project: ${project}, pageId: ${pageId}, userId: ${userId}`) return } From 8d8ed01e2a6a2fc8f27e4cbb517e6bb269bcd862 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Fri, 19 Sep 2025 09:10:36 -0500 Subject: [PATCH 159/262] Update utilities/checkIfSuspicious.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- utilities/checkIfSuspicious.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/checkIfSuspicious.js b/utilities/checkIfSuspicious.js index bb65c4e5..aaecaaa5 100644 --- a/utilities/checkIfSuspicious.js +++ b/utilities/checkIfSuspicious.js @@ -10,7 +10,7 @@ import { isValidJSON, respondWithError } from "./shared.js" /** - * This middleware function scans request bodies for suspcious looking JSON or strings. + * This middleware function scans request bodies for suspicious looking JSON or strings. * Use it to protect individual routes. 1. import contentScanMiddleware into the route file 2. apply to route like route.patch("/label", contentScanMiddleware(), controller) From 7e73531816b2204c6bebba35c319c4721d718dd8 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 19 Sep 2025 13:53:20 -0400 Subject: [PATCH 160/262] Protect PUT /profile route (#331) * Since the route takes req.body wholesale, we have to loop the keys to check for suspicious stuff. THe middleware won't check all the keys. * Fix iteration over req.body in profile route Replaces array iteration with object key iteration in the /profile route to correctly validate all properties in req.body. This ensures suspicious data is properly detected and handled. --------- Co-authored-by: cubap --- userProfile/privateProfile.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index bd77e831..b7e43453 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -1,9 +1,10 @@ import express from "express" -import {respondWithError} from "../utilities/shared.js" +import { respondWithError, isValidJSON } from "../utilities/shared.js" import User from "../classes/User/User.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} import cors from "cors" import auth0Middleware from "../auth/index.js" +import { isSuspiciousJSON, isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" const router = express.Router() router.use( @@ -22,6 +23,12 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Unauthorized user") try { + if (req.body && !Array.isArray(req.body)) { + for (const key in req.body) { + if (isSuspiciousJSON(req.body[key]) || isSuspiciousValueString(req.body[key])) + return respondWithError(res, 400, "Suspicious profile data will not be processed.") + } + } const userObj = new User(user._id) const userProfile = await userObj.updateProfile(req.body) res.status(200).json(userProfile) From f48a8a1b202631ffa49921f897d663409c44a95b Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri, 19 Sep 2025 14:05:47 -0500 Subject: [PATCH 161/262] Default Tools and New Project with custom Tools (#328) * Default Tools * Create project with custom tools * Changes to comments * Guards for values * validate Tools * guards solve * url and enabled * check label dupe * web component add * tagname --- classes/Project/ProjectFactory.js | 85 +-------- classes/Tools/Tools.js | 275 ++++++++++++++++++++++++++++++ project/projectCreateRouter.js | 4 + project/projectToolsRouter.js | 156 +++++++++-------- 4 files changed, 375 insertions(+), 145 deletions(-) create mode 100644 classes/Tools/Tools.js diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 1189cc6f..909ca767 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -4,6 +4,7 @@ import User from "../User/User.js" import Layer from "../Layer/Layer.js" import Line from "../Line/Line.js" import Page from "../Page/Page.js" +import Tools from "../Tools/Tools.js" import dbDriver from "../../database/driver.js" import vault from "../../utilities/vault.js" import imageSize from 'image-size' @@ -27,79 +28,7 @@ export default class ProjectFactory { * @returns object of project data */ - static tools = [ - { - "name":"Page Tools", - "value":"page", - "state": false - }, - { - "name":"Inspect", - "value":"inspector", - "state": false - }, - { - "name":"Special Characters", - "value":"characters", - "state": false - }, - { - "name":"XML Tags", - "value":"xml", - "state": false - }, - { - "name":"View Full Page", - "value":"fullpage", - "state": false - }, - { - "name":"History Tool", - "value":"history", - "state": false - }, - { - "name":"Preview Tool", - "value":"preview", - "state": false - }, - { - "name":"Parsing Adjustment", - "value":"parsing", - "state": false - }, - { - "name":"Compare Pages", - "value":"compare", - "state": false - }, - { - "name": "Cappelli's Abbreviation", - "value": "cappelli", - "url": "https://centerfordigitalhumanities.github.io/cappelli/", - "state": false - }, - { - "name": "Enigma", - "value": "enigma", - "url": "https://ciham-digital.huma-num.fr/enigma/", - "state": false - }, - { - "name": "Latin Dictionary", - "value": "latin", - "url": "https://www.perseus.tufts.edu/hopper/resolveform?lang=latin", - "state": false - }, - { - "name": "Latin Vulgate", - "value": "vulgate", - "url": "https://vulsearch.sourceforge.net/cgi-bin/vulsearch", - "state": false - } - ] - - static async DBObjectFromManifest(manifest, creator, importTPEN28 = false) { + static async DBObjectFromManifest(manifest, creator, tools = [], importTPEN28 = false) { if (!manifest) { throw { status: 404, @@ -121,7 +50,7 @@ export default class ProjectFactory { metadata, manifest: importTPEN28 ? [ manifest.id.split('/manifest.json')[0] + '?version=3' ] : [ manifest.id ], layers: [ layer.asProjectLayer() ], - tools: this.tools, + tools: Tools.defaultTools.concat(tools), _createdAt: now, _modifiedAt: -1, _lastModified: firstPage, @@ -138,10 +67,10 @@ export default class ProjectFactory { return label[lang].join(", ") } - static async fromManifestURL(manifestId, creator, importTPEN28 = false) { + static async fromManifestURL(manifestId, creator, tools = [], importTPEN28 = false) { return vault.loadManifest(manifestId) .then(async (manifest) => { - return await ProjectFactory.DBObjectFromManifest(manifest, creator, importTPEN28) + return await ProjectFactory.DBObjectFromManifest(manifest, creator, tools, importTPEN28) }) .then(async (project) => { const projectObj = new Project() @@ -199,7 +128,7 @@ export default class ProjectFactory { metadata: modules['Metadata'] ? project.metadata : [], manifest: project.manifest, layers: [], - tools: modules['Tools'] ? project.tools : this.tools, + tools: modules['Tools'] ? project.tools : Tools.defaultTools, _createdAt: Date.now().toString().slice(-6), _modifiedAt: -1 } @@ -630,7 +559,7 @@ export default class ProjectFactory { metadata, manifest: [ manifest.id ], layers: [ layer.asProjectLayer() ], - tools: this.tools, + tools: Tools.defaultTools, _createdAt: now, _modifiedAt: -1, _lastModified: firstPage, diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js new file mode 100644 index 00000000..545af8eb --- /dev/null +++ b/classes/Tools/Tools.js @@ -0,0 +1,275 @@ +import dbDriver from "../../database/driver.js" +const database = new dbDriver("mongo") + +export default class Tools { + constructor(projectId) { + this._id = projectId + this.data = null + this.tools = null + } + + async #loadFromDB() { + this.data = await database.getById(this._id, process.env.TPENPROJECTS) + if (!this.data) { + throw new Error("Project not found") + } + this.tools = this.data.tools + return this + } + + async save() { + this.data.tools = this.tools + return database.save(this.data, process.env.TPENPROJECTS) + } + + async update() { + this.data.tools = this.tools + return database.update(this.data, process.env.TPENPROJECTS) + } + + async addIframeTool(label, toolName, url = "", location, enabled = true, tagname = "") { + if (!this.tools || !Array.isArray(this.tools)) { + await this.#loadFromDB() + } + const newTool = { + label, + toolName, + url, + location, + custom: { enabled }, + tagname + } + this.tools.push(newTool) + await this.update() + return newTool + } + + async removeTool(toolName) { + if (!this.tools || !Array.isArray(this.tools)) { + await this.#loadFromDB() + } + const toolIndex = this.tools.findIndex(t => t.toolName === toolName) + if (toolIndex === -1) { + throw new Error("Tool not found") + } + const removedTool = this.tools.splice(toolIndex, 1)[0] + await this.update() + return removedTool + } + + async toggleTool(toolName) { + if (!this.tools || !Array.isArray(this.tools)) { + await this.#loadFromDB() + } + const tool = this.tools.find(t => t.toolName === toolName) + if (!tool) { + throw new Error("Tool not found") + } + tool.custom.enabled = !tool.custom.enabled + await this.update() + return tool + } + + async checkIfToolExists(toolName) { + if (!this.tools || !Array.isArray(this.tools)) { + await this.#loadFromDB() + } + return this.tools.some(t => t.toolName === toolName) + } + + async checkIfToolLabelExists(label) { + if (!this.tools || !Array.isArray(this.tools)) { + await this.#loadFromDB() + } + return this.tools.some(t => t.label === label) + } + + async checkIfTagNameExists(tagname) { + if (!this.tools || !Array.isArray(this.tools)) { + await this.#loadFromDB() + } + return this.tools.some(t => t.tagname === tagname) + } + + async checkIfInDefaultTools(toolName) { + return Tools.defaultTools.some(t => t.toolName === toolName) + } + + async checkToolPattern(toolValue) { + const toolPattern = /^[a-z0-9]+(-[a-z0-9]+)*$/ + return toolPattern.test(toolValue) + } + + async getTagnameFromScript(url) { + try { + const text = await (await fetch(url)).text() + const match = text.match(/customElements\.define\s*\(\s*['"]([^'"]+)['"]/) + return match ? match[1] : null + } catch (e) { + console.error("Error fetching tagname:", e) + return null + } + } + + async validateURL(url) { + try { + new URL(url) + return true + } catch (e) { + return false + } + } + + async checkIfURLisJSScript(url) { + return url.endsWith(".js") || url.includes(".js?") + } + + async validateAllTools(tools) { + const validTools = [] + const toolPattern = /^[a-z0-9]+(-[a-z0-9]+)*$/ + for (const tool of tools) { + if (typeof tool !== "object" || tool === null) continue + let { label, toolName, url = "", location, enabled = true, tagname = "" } = tool + if (Tools.defaultTools.some(t => t.toolName === toolName)) continue + if (Tools.defaultTools.some(t => t.label === label)) continue + if (!toolPattern.test(toolName)) continue + if (typeof label !== "string") continue + if (typeof toolName !== "string" || !await this.checkToolPattern(toolName)) continue + if (url !== undefined && (typeof url !== "string" || (url !== "" && !await this.validateURL(url)))) continue + if (url !== undefined && url !== "") { + if(!await this.checkIfURLisJSScript(url)) { + if (tagname !== undefined && tagname !== "") { + tagname = "" + } + } + else { + tagname = await this.getTagnameFromScript(url) + if (Tools.defaultTools.some(t => t.tagname === tagname)) continue + if (!tagname || !toolPattern.test(tagname)) continue + } + } + if (!["dialog", "pane", "drawer", "linked", "sidebar"].includes(location)) continue + if (enabled !== undefined && typeof enabled !== "boolean") continue + validTools.push({ + label, + toolName, + url, + location, + custom: { enabled }, + tagname + }) + } + return validTools + } + + async validateToolArray(tool) { + if(typeof tool !== "object" || tool === null) { + throw { status: 400, message: "Each tool must be an object." } + } + const {label, toolName, url, location, enabled, tagname} = tool + if (typeof label !== "string") { + throw { status: 400, message: "label must be a string." } + } + if (typeof toolName !== "string" || !await this.checkToolPattern(toolName)) { + throw { status: 400, message: "toolName must be a string in 'lowercase-with-hyphens' format." } + } + if (url !== undefined && (typeof url !== "string" || (url !== "" && !await this.validateURL(url)))) { + throw { status: 400, message: "url must be a valid URL string." } + } + if (url !== undefined && url !== "" && !await this.checkIfURLisJSScript(url) && tagname !== "") { + throw { status: 400, message: "If url is not a JavaScript file, tagname must be empty." } + } + if (tagname !== undefined && tagname !== "" && !await this.checkIfTagNameExists(tagname)) { + throw { status: 400, message: "tagname must be unique and not already in use." } + } + if (["dialog", "pane", "drawer", "linked", "sidebar"].indexOf(location) === -1) { + throw { status: 400, message: "location must be either 'dialog', 'pane', 'drawer', 'linked', or 'sidebar'." } + } + if (enabled !== undefined && typeof enabled !== "boolean") { + throw { status: 400, message: "enabled must be a boolean." } + } + } + + static defaultTools = [ + { + "label": "Inspect", + "toolName": "inspect", + "custom": { "enabled": true }, + "url": "", + "location": "drawer", + "tagname": "" + }, + { + "label": "View Full Page", + "toolName": "view-fullpage", + "custom": { "enabled": true }, + "url": "", + "location": "pane", + "tagname": "" + }, + { + "label": "History Tool", + "toolName": "history", + "custom": { "enabled": true }, + "url": "", + "location": "pane", + "tagname": "" + }, + { + "label": "Preview Tool", + "toolName": "preview", + "custom": { "enabled": true }, + "url": "", + "location": "pane", + "tagname": "" + }, + { + "label": "Line Breaking", + "toolName": "line-breaking", + "custom": { "enabled": true }, + "url": "", + "location": "dialog", + "tagname": "" + }, + { + "label": "Compare Pages", + "toolName": "compare-pages", + "custom": { "enabled": true }, + "url": "", + "location": "pane", + "tagname": "" + }, + { + "label": "Cappelli's Abbreviation", + "toolName": "cappelli-abbreviation", + "custom": { "enabled": false }, + "url": "https://centerfordigitalhumanities.github.io/cappelli/", + "location": "pane", + "tagname": "" + }, + { + "label": "Enigma", + "toolName": "enigma", + "url": "https://ciham-digital.huma-num.fr/enigma/", + "custom": { "enabled": false }, + "location": "pane", + "tagname": "" + }, + { + "label": "Latin Dictionary", + "toolName": "latin-dictionary", + "url": "https://www.perseus.tufts.edu/hopper/resolveform?lang=latin", + "custom": { "enabled": false }, + "location": "pane", + "tagname": "" + }, + { + "label": "Latin Vulgate", + "toolName": "latin-vulgate", + "url": "https://vulsearch.sourceforge.net/cgi-bin/vulsearch", + "custom": { "enabled": false }, + "location": "pane", + "tagname": "" + } + ] +} diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 88c0b9de..c30bf705 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -6,6 +6,7 @@ import validateURL from "../utilities/validateURL.js" import Project from "../classes/Project/Project.js" import screenContentMiddleware from "../utilities/checkIfSuspicious.js" import { isSuspiciousJSON } from "../utilities/checkIfSuspicious.js" +import Tools from "../classes/Tools/Tools.js" const router = express.Router({ mergeParams: true }) @@ -80,6 +81,8 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { }) if (createFrom === "url") { const manifestURL = req?.body?.url + let tools = req?.body?.tools ?? [] + tools = await new Tools().validateAllTools(tools) let checkURL = await validateURL(manifestURL) if (!checkURL.valid) return res.status(checkURL.status).json({ @@ -90,6 +93,7 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { const result = await ProjectFactory.fromManifestURL( manifestURL, user.agent.split('/').pop(), + tools ) res.status(201).json(result) } catch (error) { diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index 18af4740..78035df9 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -1,93 +1,115 @@ import express from "express" import { respondWithError } from "../utilities/shared.js" -import Project from "../classes/Project/Project.js" import validateURL from "../utilities/validateURL.js" +import Tools from "../classes/Tools/Tools.js" const router = express.Router({ mergeParams: true }) -// Adding tools to the Project -router.route("/:projectId/tools").post(async (req, res) => { - const { projectId } = req.params - const tools = req.body - - if (!projectId) { - return respondWithError(res, 400, "Project ID is required") - } - - if (!Array.isArray(tools)) { - tools = [tools] +//Add Tool to Project +router.route("/:projectId/addTool").post(async (req, res) => { + const { label, toolName, url, location, enabled, tagname } = req?.body + if (!label || !toolName || !location) { + return respondWithError(res, 400, "label, toolName, and location are required fields.") } - - if (tools.every(tool => tool.name === "" || tool.value === "" || tool.url === "" || tool.state === undefined)) { - return respondWithError(res, 400, "All tools must have a name, value, URL, and state") - } - - if (!tools.every(tool => typeof tool.name === "string" && typeof tool.value === "string" && typeof tool.url === "string" && typeof tool.state === "boolean")) { - return respondWithError(res, 400, "All tools must have a valid name, value, URL, and state") - } - - if (!tools.every(tool => validateURL(tool.url))) { - return respondWithError(res, 400, "All tools must have a valid URL") - } - try { - const project = new Project(projectId) - await project.addTools(tools) - res.status(201).json("Tools added successfully") + const projectId = req.params.projectId + if (!projectId || !validateURL(projectId)) { + return respondWithError(res, 400, "A valid project ID is required.") + } + const tools = new Tools(projectId) + await tools.validateToolArray(req?.body) + if (await tools.checkIfToolExists(toolName)) { + return respondWithError(res, 400, "Tool with the same name already exists") + } + if (await tools.checkIfToolLabelExists(label)) { + return respondWithError(res, 400, "Tool with the same label already exists") + } + if (await tools.checkIfInDefaultTools(toolName)) { + return respondWithError(res, 400, "Default tools cannot be altered") + } + if (url !== undefined && url !== "" && await tools.checkIfURLisJSScript(url)) { + const fetchedTagname = await tools.getTagnameFromScript(url) + if (!fetchedTagname || !await tools.checkToolPattern(fetchedTagname)) { + throw { status: 400, message: "Could not extract a valid tagname from the provided JavaScript URL." } + } + tagname = fetchedTagname + } + if (tagname !== undefined && tagname !== "" && !await tools.checkIfTagNameExists(tagname)) { + tagname = "" + } + const addedTool = await tools.addIframeTool(label, toolName, url, location, enabled, tagname) + res.status(200).json(addedTool) } catch (error) { - console.error(error) - respondWithError(res, error.status ?? error.code ?? 500, error.message ?? "Internal Server Error") - } -}).put(async (req, res) => { - const { projectId } = req.params - const tools = req.body - - if (!projectId) { - return respondWithError(res, 400, "Project ID is required") - } - - if (!Array.isArray(tools) || tools.length === 0) { - return respondWithError(res, 400, "At least one tool is required") + console.error("Error adding tool:", error) + respondWithError(res, error.status || 500, error.message || "An error occurred while adding the tool.") } +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use POST instead") +}) - if (tools.every(tool => tool.value === "" || tool.state === undefined)) { - return respondWithError(res, 400, "All tools must have a value and state") +// Remove Tool from Project +router.route("/:projectId/removeTool").delete(async (req, res) => { + const { toolName } = req.body + if (!toolName) { + return respondWithError(res, 400, "toolName is a required field.") } - - if (!tools.every(tool => typeof tool.value === "string" && typeof tool.state === "boolean")) { - return respondWithError(res, 400, "All tools must have a valid value and state") + if (typeof toolName !== "string") { + return respondWithError(res, 400, "toolName must be a string.") } - try { - const project = new Project(projectId) - await project.updateTools(tools) - res.status(200).json("Tools updated successfully") + const projectId = req.params.projectId + if (!projectId || !validateURL(projectId)) { + return respondWithError(res, 400, "A valid project ID is required.") + } + const tools = new Tools(projectId) + if (!await tools.checkToolPattern(toolName)) { + return respondWithError(res, 400, "toolName must be in 'lowercase-with-hyphens' format.") + } + if (!await tools.checkIfToolExists(toolName)) { + return respondWithError(res, 404, "Tool not found") + } + if (await tools.checkIfInDefaultTools(toolName)) { + return respondWithError(res, 400, "Default tools cannot be removed") + } + const removedTool = await tools.removeTool(toolName) + res.status(200).json(removedTool) } catch (error) { - console.error(error) - respondWithError(res, error.status ?? error.code ?? 500, error.message ?? "Internal Server Error") + console.error("Error removing tool:", error) + respondWithError(res, error.status || 500, error.message || "An error occurred while removing the tool.") } -}).delete(async (req, res) => { - const { projectId } = req.params - const { tool } = req.body +}).all((_, res) => { + respondWithError(res, 405, "Improper request method. Use DELETE instead") +}) - if (!projectId) { - return respondWithError(res, 400, "Project ID is required") +// Toggle Tool State in Project +router.route("/:projectId/toggleTool").patch(async (req, res) => { + const { toolName } = req.body + if (!toolName) { + return respondWithError(res, 400, "toolName is a required field.") } - - if (!tool) { - return respondWithError(res, 400, "Tool information is required") + if (typeof toolName !== "string") { + return respondWithError(res, 400, "toolName must be a string.") } - try { - const project = new Project(projectId) - await project.removeTool(tool) - res.status(200).json("Tools removed successfully") + const projectId = req.params.projectId + if (!projectId || !validateURL(projectId)) { + return respondWithError(res, 400, "A valid project ID is required.") + } + const tools = new Tools(projectId) + if (!await tools.checkToolPattern(toolName)) { + return respondWithError(res, 400, "toolName must be in 'lowercase-with-hyphens' format.") + } + if (!await tools.checkIfToolExists(toolName)) { + return respondWithError(res, 404, "Tool not found") + } + const toggledTool = await tools.toggleTool(toolName) + res.status(200).json(toggledTool) } catch (error) { - console.error(error) - respondWithError(res, error.status ?? error.code ?? 500, error.message ?? "Internal Server Error") + console.error("Error toggling tool state:", error) + respondWithError(res, error.status || 500, error.message || "An error occurred while toggling the tool state.") } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use PUT instead") + respondWithError(res, 405, "Improper request method. Use PATCH instead") }) export default router From f1ba631f04f5cc70f7d33c8d5eec6f6c6f560640 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 23 Sep 2025 09:38:08 -0500 Subject: [PATCH 162/262] Changes to Tools endpoint (#346) --- classes/Tools/Tools.js | 112 ++++++++++++++++++++-------------- project/projectToolsRouter.js | 24 +++----- 2 files changed, 76 insertions(+), 60 deletions(-) diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index 545af8eb..025fdff3 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -27,7 +27,7 @@ export default class Tools { return database.update(this.data, process.env.TPENPROJECTS) } - async addIframeTool(label, toolName, url = "", location, enabled = true, tagname = "") { + async addIframeTool(label, toolName, url = "", location, enabled = true, tagName = "") { if (!this.tools || !Array.isArray(this.tools)) { await this.#loadFromDB() } @@ -36,8 +36,7 @@ export default class Tools { toolName, url, location, - custom: { enabled }, - tagname + custom: { enabled, tagName } } this.tools.push(newTool) await this.update() @@ -129,7 +128,8 @@ export default class Tools { const toolPattern = /^[a-z0-9]+(-[a-z0-9]+)*$/ for (const tool of tools) { if (typeof tool !== "object" || tool === null) continue - let { label, toolName, url = "", location, enabled = true, tagname = "" } = tool + let { label, toolName, url = "", location, custom } = tool + let { enabled = true, tagName = "" } = custom if (Tools.defaultTools.some(t => t.toolName === toolName)) continue if (Tools.defaultTools.some(t => t.label === label)) continue if (!toolPattern.test(toolName)) continue @@ -138,14 +138,14 @@ export default class Tools { if (url !== undefined && (typeof url !== "string" || (url !== "" && !await this.validateURL(url)))) continue if (url !== undefined && url !== "") { if(!await this.checkIfURLisJSScript(url)) { - if (tagname !== undefined && tagname !== "") { - tagname = "" + if (tagName !== undefined && tagName !== "") { + tagName = "" } } else { - tagname = await this.getTagnameFromScript(url) - if (Tools.defaultTools.some(t => t.tagname === tagname)) continue - if (!tagname || !toolPattern.test(tagname)) continue + tagName = await this.getTagnameFromScript(url) + if (Tools.defaultTools.some(t => t.tagName === tagName)) continue + if (!tagName || !toolPattern.test(tagName)) continue } } if (!["dialog", "pane", "drawer", "linked", "sidebar"].includes(location)) continue @@ -155,8 +155,7 @@ export default class Tools { toolName, url, location, - custom: { enabled }, - tagname + custom: { enabled, tagName } }) } return validTools @@ -166,7 +165,8 @@ export default class Tools { if(typeof tool !== "object" || tool === null) { throw { status: 400, message: "Each tool must be an object." } } - const {label, toolName, url, location, enabled, tagname} = tool + const { label, toolName, url, location, custom } = tool + let { enabled = true, tagName = "" } = custom if (typeof label !== "string") { throw { status: 400, message: "label must be a string." } } @@ -176,11 +176,11 @@ export default class Tools { if (url !== undefined && (typeof url !== "string" || (url !== "" && !await this.validateURL(url)))) { throw { status: 400, message: "url must be a valid URL string." } } - if (url !== undefined && url !== "" && !await this.checkIfURLisJSScript(url) && tagname !== "") { - throw { status: 400, message: "If url is not a JavaScript file, tagname must be empty." } + if (url !== undefined && url !== "" && !await this.checkIfURLisJSScript(url) && tagName !== "") { + throw { status: 400, message: "If url is not a JavaScript file, tagName must be empty." } } - if (tagname !== undefined && tagname !== "" && !await this.checkIfTagNameExists(tagname)) { - throw { status: 400, message: "tagname must be unique and not already in use." } + if (tagName !== undefined && tagName !== "" && !await this.checkIfTagNameExists(tagName)) { + throw { status: 400, message: "tagName must be unique and not already in use." } } if (["dialog", "pane", "drawer", "linked", "sidebar"].indexOf(location) === -1) { throw { status: 400, message: "location must be either 'dialog', 'pane', 'drawer', 'linked', or 'sidebar'." } @@ -194,82 +194,102 @@ export default class Tools { { "label": "Inspect", "toolName": "inspect", - "custom": { "enabled": true }, + "custom": { + "enabled": true, + "tagName": "" + }, "url": "", - "location": "drawer", - "tagname": "" + "location": "drawer" }, { "label": "View Full Page", "toolName": "view-fullpage", - "custom": { "enabled": true }, + "custom": { + "enabled": true, + "tagName": "" + }, "url": "", - "location": "pane", - "tagname": "" + "location": "pane" }, { "label": "History Tool", "toolName": "history", - "custom": { "enabled": true }, + "custom": { + "enabled": true, + "tagName": "" + }, "url": "", - "location": "pane", - "tagname": "" + "location": "pane" }, { "label": "Preview Tool", "toolName": "preview", - "custom": { "enabled": true }, + "custom": { + "enabled": true, + "tagName": "" + }, "url": "", - "location": "pane", - "tagname": "" + "location": "pane" }, { "label": "Line Breaking", "toolName": "line-breaking", - "custom": { "enabled": true }, + "custom": { + "enabled": true, + "tagName": "" + }, "url": "", - "location": "dialog", - "tagname": "" + "location": "dialog" }, { "label": "Compare Pages", "toolName": "compare-pages", - "custom": { "enabled": true }, + "custom": { + "enabled": true, + "tagName": "" + }, "url": "", - "location": "pane", - "tagname": "" + "location": "pane" }, { "label": "Cappelli's Abbreviation", "toolName": "cappelli-abbreviation", - "custom": { "enabled": false }, + "custom": { + "enabled": true, + "tagName": "" + }, "url": "https://centerfordigitalhumanities.github.io/cappelli/", - "location": "pane", - "tagname": "" + "location": "pane" }, { "label": "Enigma", "toolName": "enigma", "url": "https://ciham-digital.huma-num.fr/enigma/", - "custom": { "enabled": false }, - "location": "pane", - "tagname": "" + "custom": { + "enabled": true, + "tagName": "" + }, + "location": "pane" }, { "label": "Latin Dictionary", "toolName": "latin-dictionary", "url": "https://www.perseus.tufts.edu/hopper/resolveform?lang=latin", - "custom": { "enabled": false }, - "location": "pane", - "tagname": "" + "custom": { + "enabled": true, + "tagName": "" + }, + "location": "pane" }, { "label": "Latin Vulgate", "toolName": "latin-vulgate", "url": "https://vulsearch.sourceforge.net/cgi-bin/vulsearch", - "custom": { "enabled": false }, - "location": "pane", - "tagname": "" + "custom": { + "enabled": true, + "tagName": "" + }, + "location": "pane" } ] } diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index 78035df9..312f7c5f 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -6,8 +6,9 @@ import Tools from "../classes/Tools/Tools.js" const router = express.Router({ mergeParams: true }) //Add Tool to Project -router.route("/:projectId/addTool").post(async (req, res) => { - const { label, toolName, url, location, enabled, tagname } = req?.body +router.route("/:projectId/tool").post(async (req, res) => { + const { label, toolName, url, location, custom } = req?.body + let { enabled, tagName } = custom if (!label || !toolName || !location) { return respondWithError(res, 400, "label, toolName, and location are required fields.") } @@ -32,23 +33,18 @@ router.route("/:projectId/addTool").post(async (req, res) => { if (!fetchedTagname || !await tools.checkToolPattern(fetchedTagname)) { throw { status: 400, message: "Could not extract a valid tagname from the provided JavaScript URL." } } - tagname = fetchedTagname + tagName = fetchedTagname } - if (tagname !== undefined && tagname !== "" && !await tools.checkIfTagNameExists(tagname)) { - tagname = "" + if (tagName !== undefined && tagName !== "" && !await tools.checkIfTagNameExists(tagName)) { + tagName = "" } - const addedTool = await tools.addIframeTool(label, toolName, url, location, enabled, tagname) + const addedTool = await tools.addIframeTool(label, toolName, url, location, enabled, tagName) res.status(200).json(addedTool) } catch (error) { console.error("Error adding tool:", error) respondWithError(res, error.status || 500, error.message || "An error occurred while adding the tool.") } -}).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") -}) - -// Remove Tool from Project -router.route("/:projectId/removeTool").delete(async (req, res) => { +}).delete(async (req, res) => { const { toolName } = req.body if (!toolName) { return respondWithError(res, 400, "toolName is a required field.") @@ -78,11 +74,11 @@ router.route("/:projectId/removeTool").delete(async (req, res) => { respondWithError(res, error.status || 500, error.message || "An error occurred while removing the tool.") } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use DELETE instead") + respondWithError(res, 405, "Improper request method. Use POST to add a tool or DELETE to remove a tool.") }) // Toggle Tool State in Project -router.route("/:projectId/toggleTool").patch(async (req, res) => { +router.route("/:projectId/toggleTool").put(async (req, res) => { const { toolName } = req.body if (!toolName) { return respondWithError(res, 400, "toolName is a required field.") From 15384c2ddeda6058e09888aa9a1de81a0f4c6aaa Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 23 Sep 2025 10:42:19 -0400 Subject: [PATCH 163/262] Protect /project/import and /project/import-image routes (#326) * This makes some big decisions * I'm looking at you, language maps * o * touch ups from testing and documentation * remove old languageCodes * polish * polish * Since we check language maps, lets check metadata maps because they can have language maps. * Since we check language maps, lets check metadata maps because they can have language maps. * polish * Update utilities/checkIfSuspicious.js spellcheck Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update utilities/checkIfSuspicious.js spellcheck Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update utilities/checkIfSuspicious.js spellcheck Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * guard depth parameter too --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- project/metadataRouter.js | 7 +-- project/projectCreateRouter.js | 19 ++++--- utilities/checkIfSuspicious.js | 93 +++++++++++++++++++++++++++++++--- utilities/validateURL.js | 13 +++-- 4 files changed, 108 insertions(+), 24 deletions(-) diff --git a/project/metadataRouter.js b/project/metadataRouter.js index 14257464..12fcd19e 100644 --- a/project/metadataRouter.js +++ b/project/metadataRouter.js @@ -1,13 +1,13 @@ import express from "express" import { respondWithError } from "../utilities/shared.js" import auth0Middleware from "../auth/index.js" -import { isSuspiciousJSON } from "../utilities/checkIfSuspicious.js" +import screenContentMiddleware from "../utilities/checkIfSuspicious.js" import Project from "../classes/Project/Project.js" import { ACTIONS, SCOPES, ENTITIES } from "./groups/permissions_parameters.js" const router = express.Router({ mergeParams: true }) -router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => { +router.route("/:projectId/metadata").put(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId } = req.params const metadata = req.body const user = req.user @@ -16,9 +16,6 @@ router.route("/:projectId/metadata").put(auth0Middleware(), async (req, res) => return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") } try { - for (const data of metadata) { - if (isSuspiciousJSON(data)) return respondWithError(res, 400, "Suspicious input will not be processed.") - } const projectObj = new Project(projectId) if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.PROJECT))) { return respondWithError(res, 403, "You do not have permission to update metadata for this project.") diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index c30bf705..53151009 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -5,25 +5,19 @@ import ProjectFactory from "../classes/Project/ProjectFactory.js" import validateURL from "../utilities/validateURL.js" import Project from "../classes/Project/Project.js" import screenContentMiddleware from "../utilities/checkIfSuspicious.js" -import { isSuspiciousJSON } from "../utilities/checkIfSuspicious.js" +import { isSuspiciousJSON, isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" import Tools from "../classes/Tools/Tools.js" const router = express.Router({ mergeParams: true }) /** - * Private function to check on metadata, tools, layers, and layer.pages data of a project. + * Private function to check on tools, layers, and layer.pages data of a project. * They may contain data generated by direct user input, such as labels. * It may be malformed, but let that be caught downstream. * * @param project - The project data from the request body. */ function hasSuspiciousProjectData(project) { - // Expect that project.metadata is an Array of JSON objects. If not the project data malformed so skip it. - if (project.metadata && Array.isArray(project.metadata)) { - for (const metadataObj of project.metadata) { - if (isSuspiciousJSON(metadataObj, [], true, 1)) return true - } - } // Expect that project.layers is an Array of JSON objects. If not the project data is malformed so skip it. if (project.layers && Array.isArray(project.layers)) { for (const layerObj of project.layers) { @@ -90,6 +84,7 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { resolvedPayload: checkURL.resolvedPayload }) try { + if (isSuspiciousJSON(checkURL.resolvedPayload)) return respondWithError(res, 400, "Suspicious data will not be processed.") const result = await ProjectFactory.fromManifestURL( manifestURL, user.agent.split('/').pop(), @@ -97,6 +92,8 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { ) res.status(201).json(result) } catch (error) { + console.log("project import error") + console.error(error) res.status(error.status ?? 500).json({ status: error.status ?? 500, message: error.message, @@ -112,6 +109,7 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { resolvedPayload: checkURL.resolvedPayload }) try { + if (isSuspiciousJSON(checkURL.resolvedPayload)) return respondWithError(res, 400, "Suspicious data will not be processed.") const result = await ProjectFactory.fromManifestURL( manifestURL, user.agent.split('/').pop(), @@ -119,6 +117,8 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { ) res.status(201).json(result) } catch (error) { + console.log("TPEN 2.8 project import error") + console.error(error) res.status(error.status ?? 500).json({ status: error.status ?? 500, message: error.message, @@ -142,9 +142,12 @@ router.route("/import-image").post(auth0Middleware(), async (req, res) => { if (!imageUrl || !projectLabel) { return respondWithError(res, 400, "Image URL and project label are required") } + if (isSuspiciousValueString(projectLabel, true)) return respondWithError(res, 400, "Suspicious project label will not be processed.") const project = await ProjectFactory.createManifestFromImage(imageUrl, projectLabel, user.agent.split('/').pop()) res.status(201).json(project) } catch (error) { + console.log("Create project from image error") + console.error(error) respondWithError( res, error.status ?? error.code ?? 500, diff --git a/utilities/checkIfSuspicious.js b/utilities/checkIfSuspicious.js index aaecaaa5..17e6c040 100644 --- a/utilities/checkIfSuspicious.js +++ b/utilities/checkIfSuspicious.js @@ -41,7 +41,7 @@ function screenContentMiddleware() { export default screenContentMiddleware /** - * Go through relevant keys on a TPEN3 JSON object that may have a value + * Go through relevant keys on a JSON object that may have a key and/or value * set by direct user input. */ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, depth = 0) { @@ -53,15 +53,15 @@ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, dep if (!isValidJSON(obj)) return false // Helps guard bad logWarning param, to make sure the warning log happens as often as possible. if (typeof logWarning !== "boolean") logWarning = true - // Keys we anticipate could have a value set by direct user input. Always check Annotation bodies. - // We don't need to check keys that TPEN Services will never process. - const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "none", "roles"] - const allKeys = [...common_keys, ...specific_keys] + // Helps guard bad depth param + if (typeof depth !== "number") depth = 0 + const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "roles", "language", "description"] + const combined_keys = [...common_keys, ...specific_keys] const warnings = {} const warn = {} - for (const key of allKeys) { + for (const key of combined_keys) { // Also check embedded JSON values recursively to a max depth of 10. - if (isValidJSON(obj[key]) && isSuspiciousJSON(obj[key], [], true, depth + 1)) { + if (isValidJSON(obj[key]) && isSuspiciousJSON(obj[key], [], logWarning, depth + 1)) { // We don't need to log out notes, but we could like key: to show the trail // if (logWarning) { // warn[key] = "" @@ -70,7 +70,7 @@ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, dep warnings[key] = "" } else if (isSuspiciousValueString(getValueString(obj[key]))) { - // Note this will check simple Array values like ["a value of a language map label"] + // Note this will check simple joinable Array values like ["label 1", "label 2", 1234321] if (logWarning) { warn[key] = getValueString(obj[key]) console.warn("Found suspicious value in JSON. This 'key: value' may be embedded below the top level JSON.") @@ -81,6 +81,39 @@ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, dep break } } + // Check for possible language maps that were skipped over due to their complexity. + const language_map_keys = ["label", "value", "summary", "requiredStatement"] + for (const language_key of language_map_keys) { + if (isValidJSON(obj[language_key]) && isSuspiciousLanguageMap(obj[language_key], logWarning)) { + if (logWarning) { + // Don't need to see the whole language map value, the specific language is already logged. + warn[language_key] = "" + console.warn("Found suspicious value in JSON language map. This 'key: value' may be embedded below the top level JSON.") + console.warn(warn) + } + warnings[language_key] = "" + break + } + } + /** + * Specifically check the metadata key if it is an Array, since it can be a complex Array of JSON Objects we encounter often. + * Each object has 'label' and 'value' keys whose values can be strings or language maps. + */ + if (obj.metadata && Array.isArray(obj.metadata)) { + for (const metadataObj of obj.metadata) { + if (isSuspiciousJSON(metadataObj, [], logWarning, 1)) { + if (logWarning) { + // Don't need to see the whole metadata map value, the specific data is already logged + warn.metadata = "" + console.warn("Found suspicious value in JSON metadata array. The metadata may be embedded below the top level JSON.") + console.warn(warn) + } + warnings.metadata = "" + break + } + } + } + // Could collect all warnings and log them out here, but we break out on the first warning instead. return Object.keys(warnings).length > 0 } @@ -100,6 +133,50 @@ export function isSuspiciousValueString(valString, logWarning = false) { return sus } +/** + * Language maps are of a special complexity but need to be checked. + * They are a JSON object with an indeterminate amount of valid or invalid language code keys. + * Each key has a value that is supposed to be an Array of strings. + * We want to know if any "valid-looking" language code key has a suspicious value. + * Language code keys that clearly are not valid language codes should be ignored. + */ +export function isSuspiciousLanguageMap(languageMapObj, logWarning = false) { + // We can't process it, so technically it isn't suspicious + if (!isValidJSON(languageMapObj)) return false + // Helps guard bad logWarning param + if (typeof logWarning !== "boolean") logWarning = false + let sus = false + const warn = {} + for (const key in languageMapObj) { + if (isValidLanguageMapKey(key)) { + if (isSuspiciousValueString(getValueString(languageMapObj[key]))) { + sus = true + warn[key] = getValueString(languageMapObj[key]) + break + } + } + } + if (sus && logWarning) { + console.warn("Suspicious content detected. See language map entry below. This data may be embedded below the top level JSON.") + console.warn(warn) + } + return sus +} + +/** + * A valid JSON key from a valid JSON object that may be a language map language key. + * Determine if the key is a valid-looking language map key. + * Typical language codes are 2-3 characters, but extensions and subtagging make them longer. + * Limiting the max length to a total of 1 language code with 3 extensions. + * It must be 15 characters or less and only contain lowercase letters and '-'. + */ +function isValidLanguageMapKey(key) { + if (key.length > 15) return false + const chars = new RegExp(/^[a-z-]+$/) + if (!chars.test(key)) return false + return true +} + /** * For some string do some reasonable checks to see if it may contain something that seems like a script. * Mostly concerned with script injection. PHP, Javascript, Perl, JQuery, JSP, etc. diff --git a/utilities/validateURL.js b/utilities/validateURL.js index cd735c02..4dc454c9 100644 --- a/utilities/validateURL.js +++ b/utilities/validateURL.js @@ -1,3 +1,9 @@ +/* + * Ensure the input is a valid url, and try to resolve it for data. + * + * @param url - A string that is supposed to be a resolvable URL + */ + async function validateURL(url) { if (!url) return { valid: false, message: "Manifest URL is required for import", status: 404 } if (!isNaN(url)) return { valid: false, message: "Input is a number, not a URL", status: 400 } @@ -14,7 +20,8 @@ async function validateURL(url) { return { valid: false, message: "URL does not point to valid JSON", - status: 415 + status: 415, + resolvedPayload: null } } @@ -29,9 +36,9 @@ async function validateURL(url) { } } - return { valid: true } + return { valid: true, resolvedPayload: data } } catch { - return { valid: false, message: "URL is not reachable", status: 500 } + return { valid: false, resolvedPayload: null, message: "URL is not reachable", status: 500 } } } From 5f0bdb4373991b3b505b363a4e3a517cf50f70b1 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 23 Sep 2025 09:56:50 -0500 Subject: [PATCH 164/262] suspicious test fix --- utilities/__tests__/isSuspicious.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/__tests__/isSuspicious.test.js b/utilities/__tests__/isSuspicious.test.js index 758bf48d..f03c4454 100644 --- a/utilities/__tests__/isSuspicious.test.js +++ b/utilities/__tests__/isSuspicious.test.js @@ -75,7 +75,7 @@ describe("Suspicious string library. #suspiciousStrings", () => { ] const mongoy = [ - "db.anything" + "db.anything(" ] const all = [...notations, ...declarations, ...rhel, ...functiony, ...mongoy] @@ -91,7 +91,7 @@ describe("Suspicious string library. #suspiciousStrings", () => { it('returns suspicious warnings for all JSON values', () => { for (const value of all) { - const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "none"] + const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "roles", "language", "description"] for (const key of common_keys) { const json1 = {} json1[key] = value From 163aace59f267324622a62a8d2eeb3410972372b Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:07:03 -0500 Subject: [PATCH 165/262] Enhance /project/create request body validation to prevent malformed data including page, metadata, and tools structure validation (#327) * Initial plan * Enhanced validateProjectPayload function with comprehensive type and structure validation Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> * Final implementation: Updated Project.js comment and verified end-to-end functionality Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> * Simplify validation to return first error encountered instead of collecting all errors Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> * Enhance validation to include page structure validation within layers - Add comprehensive page validation for layer.pages arrays - Validate page objects have required id and target properties - Validate page id and target are non-empty strings - Validate optional page label and items properties when present - Add 7 new test cases covering page validation scenarios - Resolves issue where malformed page objects were passing validation Addresses @thehabes feedback about pages not being validated. Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Enhance metadata validation to enforce strict object structure - Validate each metadata item is an object (not string or other type) - Ensure metadata objects have only 'label' and 'value' properties - Validate label and value are non-empty strings - Reject metadata objects with extra properties - Add 6 comprehensive test cases covering all metadata validation scenarios Addresses @thehabes feedback about metadata structure validation. Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Add comprehensive tools validation to validateProjectPayload - Validate tools property when present must be an array - Validate each tool object has required properties: label, toolName, location, custom - Validate toolName follows lowercase-with-hyphens pattern - Validate location is one of: dialog, pane, drawer, linked, sidebar - Validate URL format when present and not empty - Validate custom object structure and properties - Add 10 comprehensive test cases covering all tools validation scenarios - Now correctly rejects @thehabes example with tools: "tools" Addresses @thehabes feedback about tools property validation. Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Remove package-lock.json changes introduced during npm install Revert package-lock.json to original state to avoid including dependency changes that were introduced during testing/development. Only code changes for validation should be included in the PR. Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> Co-authored-by: Patrick Cuba Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> Co-authored-by: Bryan Haberberger --- classes/Project/Project.js | 3 +- utilities/__tests__/validatePayload.test.js | 867 ++++++++++++++++++++ utilities/validatePayload.js | 240 +++++- 3 files changed, 1092 insertions(+), 18 deletions(-) create mode 100644 utilities/__tests__/validatePayload.test.js diff --git a/classes/Project/Project.js b/classes/Project/Project.js index dcd7fece..8e018317 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -19,7 +19,8 @@ export default class Project { */ async create(payload) { - // validation checks for all the required elements without which a project cannot be created. modify validateProjectPayload function to include more elements as they become available (layers,... ) + // Comprehensive validation checks for all the required elements and their data types. + // This prevents malformed projects with incorrect data types from being created. const validation = validateProjectPayload(payload) if (!validation.isValid) { diff --git a/utilities/__tests__/validatePayload.test.js b/utilities/__tests__/validatePayload.test.js new file mode 100644 index 00000000..aba9bb39 --- /dev/null +++ b/utilities/__tests__/validatePayload.test.js @@ -0,0 +1,867 @@ +import { validateProjectPayload } from '../validatePayload.js' +import { describe, test, expect } from '@jest/globals' + +describe('validateProjectPayload', () => { + describe('basic validation', () => { + test('should return invalid for null or undefined payload', () => { + expect(validateProjectPayload(null).isValid).toBe(false) + expect(validateProjectPayload(undefined).isValid).toBe(false) + expect(validateProjectPayload(null).errors).toBe("Project cannot be created from an empty object") + }) + + test('should return invalid for empty object', () => { + const result = validateProjectPayload({}) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("Missing required elements") + }) + + test('should return invalid for missing required fields', () => { + const payload = { + label: "Test Project" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("Missing required elements") + expect(result.errors).toContain("metadata") + expect(result.errors).toContain("layers") + expect(result.errors).toContain("manifest") + expect(result.errors).toContain("creator") + expect(result.errors).toContain("group") + }) + }) + + describe('label validation', () => { + test('should return invalid for non-string label', () => { + const payload = { + label: 123, + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("label must be a non-empty string") + }) + + test('should return invalid for empty string label', () => { + const payload = { + label: "", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("label must be a non-empty string") + }) + + test('should accept valid string label', () => { + const payload = { + label: "Valid Project Name", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + }) + + describe('metadata validation', () => { + test('should return invalid for non-array metadata', () => { + const payload = { + label: "Test Project", + metadata: "metadata", + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("metadata must be an array") + }) + + test('should accept empty array metadata', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + + test('should accept valid metadata array', () => { + const payload = { + label: "Test Project", + metadata: [ + { label: "Author", value: "John Doe" }, + { label: "Date", value: "2023" } + ], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + + test('should return invalid for metadata array containing non-objects', () => { + const payload = { + label: "Test Project", + metadata: ["metadata"], // Array of strings instead of objects + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("metadata item at index 0 must be an object") + }) + + test('should return invalid for metadata objects missing label property', () => { + const payload = { + label: "Test Project", + metadata: [ + { value: "John Doe" } // Missing label + ], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("metadata item must have label and value properties") + }) + + test('should return invalid for metadata objects missing value property', () => { + const payload = { + label: "Test Project", + metadata: [ + { label: "Author" } // Missing value + ], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("metadata item must have label and value properties") + }) + + test('should return invalid for metadata with empty label', () => { + const payload = { + label: "Test Project", + metadata: [ + { label: "", value: "John Doe" } + ], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("metadata item label must be a non-empty string") + }) + + test('should return invalid for metadata with empty value', () => { + const payload = { + label: "Test Project", + metadata: [ + { label: "Author", value: "" } + ], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("metadata item value must be a non-empty string") + }) + + test('should return invalid for metadata with extra properties', () => { + const payload = { + label: "Test Project", + metadata: [ + { label: "Author", value: "John Doe", extra: "should not be here" } + ], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("metadata item must only have label and value properties") + }) + }) + + describe('layers validation', () => { + test('should return invalid for non-array layers', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: "layers", + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("layers must be an array") + }) + + test('should accept empty array layers', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + + test('should validate layer objects in array', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + + test('should return invalid for malformed layer objects', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1" + // missing label and pages + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("layer must have id, label, and pages properties") + }) + + test('should return invalid for non-array layer pages', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: "not-an-array" + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("layer pages must be an array") + }) + + test('should return invalid for malformed page objects', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [ + { + "no": "page" // missing id and target + } + ] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("page must have id and target properties") + }) + + test('should return invalid for page with empty id', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [ + { + id: "", + target: "http://example.com/canvas1" + } + ] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("page id must be a non-empty string") + }) + + test('should return invalid for page with empty target', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [ + { + id: "http://example.com/page1", + target: "" + } + ] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("page target must be a non-empty string") + }) + + test('should return invalid for page with invalid label', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [ + { + id: "http://example.com/page1", + label: "", + target: "http://example.com/canvas1" + } + ] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("page label must be a non-empty string when present") + }) + + test('should return invalid for page with non-array items', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [ + { + id: "http://example.com/page1", + target: "http://example.com/canvas1", + items: "not-an-array" + } + ] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("page items must be an array when present") + }) + + test('should accept valid layer with properly structured pages', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [ + { + id: "http://example.com/page1", + label: "Page 1", + target: "http://example.com/canvas1", + items: [] + } + ] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + }) + + describe('manifest validation', () => { + test('should return invalid for non-array manifest', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: {"type":"Manifest"}, + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("manifest must be an array") + }) + + test('should return invalid for empty array manifest', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: [], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("manifest array cannot be empty") + }) + + test('should accept valid manifest array with URIs', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest1", "http://example.com/manifest2"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + + test('should return invalid for non-URI strings in manifest array', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["not-a-url"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("manifest array must contain valid URIs") + }) + }) + + describe('creator validation', () => { + test('should return invalid for non-string creator', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: 123, + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("creator must be a non-empty string") + }) + + test('should return invalid for empty string creator', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("creator must be a non-empty string") + }) + + test('should accept valid creator string', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + }) + + describe('group validation', () => { + test('should return invalid for non-string group', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: true + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("group must be a non-empty string") + }) + + test('should return invalid for empty string group', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("group must be a non-empty string") + }) + + test('should accept valid group string', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123def456" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + }) + + describe('tools validation', () => { + test('should accept valid payload without tools property', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + + test('should return invalid for non-array tools', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: "tools" // String instead of array + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tools must be an array when present") + }) + + test('should return invalid for tools array containing non-objects', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: ["not-an-object"] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tool at index 0 must be an object") + }) + + test('should return invalid for tool missing required properties', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: [ + { + label: "Test Tool" + // Missing toolName, location, custom + } + ] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tool must have label, toolName, location, and custom properties") + }) + + test('should return invalid for tool with invalid toolName pattern', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: [ + { + label: "Test Tool", + toolName: "InvalidToolName", // Should be lowercase with hyphens + location: "dialog", + custom: { enabled: true } + } + ] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tool toolName must be in lowercase-with-hyphens format") + }) + + test('should return invalid for tool with invalid location', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: [ + { + label: "Test Tool", + toolName: "test-tool", + location: "invalid-location", + custom: { enabled: true } + } + ] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tool location must be one of: dialog, pane, drawer, linked, sidebar") + }) + + test('should return invalid for tool with invalid URL', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: [ + { + label: "Test Tool", + toolName: "test-tool", + url: "not-a-valid-url", + location: "dialog", + custom: { enabled: true } + } + ] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tool url must be a valid URL when not empty") + }) + + test('should return invalid for tool with non-object custom', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: [ + { + label: "Test Tool", + toolName: "test-tool", + location: "dialog", + custom: "not-an-object" + } + ] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tool custom must be an object") + }) + + test('should return invalid for tool with invalid custom.enabled', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: [ + { + label: "Test Tool", + toolName: "test-tool", + location: "dialog", + custom: { enabled: "not-a-boolean" } + } + ] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toBe("tool custom.enabled must be a boolean when present") + }) + + test('should accept valid tools array', () => { + const payload = { + label: "Test Project", + metadata: [], + layers: [], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123", + tools: [ + { + label: "Test Tool", + toolName: "test-tool", + url: "https://example.com/tool.js", + location: "dialog", + custom: { + enabled: true, + tagName: "test-element" + } + }, + { + label: "Another Tool", + toolName: "another-tool", + url: "", + location: "pane", + custom: { + enabled: false, + tagName: "" + } + } + ] + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + }) + }) + + describe('complete validation scenarios', () => { + test('should return invalid for payload missing required elements', () => { + const payload = { + "metadata": "metadata", + "label": "Some Label", + "layers": "layers", + "manifest": {"type":"Manifest"}, + "tools": "tools", + "group": true + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + expect(result.errors).toContain("Missing required elements: creator") + }) + + test('should return invalid for the malformed example from the issue with all fields present', () => { + const payload = { + "metadata": "metadata", + "label": "Some Label", + "layers": "layers", + "manifest": {"type":"Manifest"}, + "creator": "user123", + "group": true + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(false) + // Since we now return the first error encountered, we only expect the first validation error + expect(result.errors).toBe("metadata must be an array") + }) + + test('should accept valid complete project payload', () => { + const payload = { + label: "Test Project", + metadata: [ + { label: "Author", value: "John Doe" }, + { label: "Date", value: "2023" } + ], + layers: [ + { + id: "http://example.com/layer1", + label: "Layer 1", + pages: [ + { + id: "http://example.com/page1", + label: "Page 1", + target: "http://example.com/canvas1" + } + ] + } + ], + manifest: ["http://example.com/manifest"], + creator: "http://example.com/user", + group: "abc123def456" + } + const result = validateProjectPayload(payload) + expect(result.isValid).toBe(true) + expect(result.errors).toBe(null) + }) + }) +}) \ No newline at end of file diff --git a/utilities/validatePayload.js b/utilities/validatePayload.js index a1832a75..a9f775a3 100644 --- a/utilities/validatePayload.js +++ b/utilities/validatePayload.js @@ -1,29 +1,235 @@ /** * Validate that the provided data payload is a valid Project object. - * - * FIXME this is not validating the value type of the required keys, only that the keys themselves are present. - * I can create bad projects with malformed data via the POST /project/create endpoint. - * Ex. this JSON will be validated even though it is severely malformed - { - "metadata": "metadata", - "label": "Some Label", - "layers": "layers", - "manifest": {"type":"Manifest"}, - "tools": "tools", - "group": true - } - * + * This function validates both the presence and the data types of required project properties. + * * @param payload - The JSON request body from the /project/create route. + * @returns {Object} - { isValid: boolean, errors: string|null } */ -export function validateProjectPayload(payload) { - if (!payload) return { isValid: false, errors: "Project cannot be created from an empty object" } +export function validateProjectPayload(payload) { + if (!payload) return {isValid: false, errors: "Project cannot be created from an empty object"} + const requiredElements = ["metadata", "layers", "label", "manifest", "creator", "group"] - const missingElements = requiredElements.filter(element => !payload.hasOwnProperty(element)) + const missingElements = requiredElements.filter( + (element) => !payload.hasOwnProperty(element) + ) + if (missingElements.length > 0) { return { isValid: false, errors: `Missing required elements: ${missingElements.join(", ")}` } } - return { isValid: true, errors: null } + + // Validate data types and structure of each required element + // Return immediately upon encountering the first validation error + + // Validate label - must be a non-empty string + if (typeof payload.label !== 'string' || payload.label.trim() === '') { + return { isValid: false, errors: 'label must be a non-empty string' } + } + + // Validate metadata - must be an array + if (!Array.isArray(payload.metadata)) { + return { isValid: false, errors: 'metadata must be an array' } + } + + // Validate each metadata object structure + for (let i = 0; i < payload.metadata.length; i++) { + const metadataItem = payload.metadata[i] + + // Each metadata item must be an object + if (typeof metadataItem !== 'object' || metadataItem === null) { + return { isValid: false, errors: `metadata item at index ${i} must be an object` } + } + + // Check for required properties: label and value + const metadataRequiredProps = ['label', 'value'] + const missingMetadataProps = metadataRequiredProps.filter(prop => !metadataItem.hasOwnProperty(prop)) + if (missingMetadataProps.length > 0) { + return { isValid: false, errors: 'metadata item must have label and value properties' } + } + + // Validate label and value are non-empty strings + if (typeof metadataItem.label !== 'string' || metadataItem.label.trim() === '') { + return { isValid: false, errors: 'metadata item label must be a non-empty string' } + } + + if (typeof metadataItem.value !== 'string' || metadataItem.value.trim() === '') { + return { isValid: false, errors: 'metadata item value must be a non-empty string' } + } + + // Ensure no extra properties beyond label and value + const allowedProps = ['label', 'value'] + const extraProps = Object.keys(metadataItem).filter(prop => !allowedProps.includes(prop)) + if (extraProps.length > 0) { + return { isValid: false, errors: 'metadata item must only have label and value properties' } + } + } + + // Validate layers - must be an array + if (!Array.isArray(payload.layers)) { + return { isValid: false, errors: 'layers must be an array' } + } + + // Validate each layer object has required properties + for (let i = 0; i < payload.layers.length; i++) { + const layer = payload.layers[i] + if (typeof layer !== 'object' || layer === null) { + return { isValid: false, errors: `layer at index ${i} must be an object` } + } + + const layerRequiredProps = ['id', 'label', 'pages'] + const missingLayerProps = layerRequiredProps.filter(prop => !layer.hasOwnProperty(prop)) + if (missingLayerProps.length > 0) { + return { isValid: false, errors: 'layer must have id, label, and pages properties' } + } + + // Validate that pages is an array + if (!Array.isArray(layer.pages)) { + return { isValid: false, errors: 'layer pages must be an array' } + } + + // Validate each page object within the layer + for (let j = 0; j < layer.pages.length; j++) { + const page = layer.pages[j] + if (typeof page !== 'object' || page === null) { + return { isValid: false, errors: `page at index ${j} in layer ${i} must be an object` } + } + + // Required properties for a page: id and target + const pageRequiredProps = ['id', 'target'] + const missingPageProps = pageRequiredProps.filter(prop => !page.hasOwnProperty(prop)) + if (missingPageProps.length > 0) { + return { isValid: false, errors: 'page must have id and target properties' } + } + + // Validate page id is a non-empty string + if (typeof page.id !== 'string' || page.id.trim() === '') { + return { isValid: false, errors: 'page id must be a non-empty string' } + } + + // Validate page target is a non-empty string (should be a canvas URI) + if (typeof page.target !== 'string' || page.target.trim() === '') { + return { isValid: false, errors: 'page target must be a non-empty string' } + } + + // Validate optional page label if present + if (page.hasOwnProperty('label') && (typeof page.label !== 'string' || page.label.trim() === '')) { + return { isValid: false, errors: 'page label must be a non-empty string when present' } + } + + // Validate optional page items if present + if (page.hasOwnProperty('items') && !Array.isArray(page.items)) { + return { isValid: false, errors: 'page items must be an array when present' } + } + } + } + + // Validate manifest - must be a non-empty array + if (!Array.isArray(payload.manifest)) { + return { isValid: false, errors: 'manifest must be an array' } + } + + if (payload.manifest.length === 0) { + return { isValid: false, errors: 'manifest array cannot be empty' } + } + + // Validate that manifest array contains valid URIs + for (const uri of payload.manifest) { + if (typeof uri !== 'string') { + return { isValid: false, errors: 'manifest array must contain valid URIs' } + } + try { + new URL(uri) + } catch { + return { isValid: false, errors: 'manifest array must contain valid URIs' } + } + } + + // Validate creator - must be a non-empty string + if (typeof payload.creator !== 'string' || payload.creator.trim() === '') { + return { isValid: false, errors: 'creator must be a non-empty string' } + } + + // Validate group - must be a non-empty string + if (typeof payload.group !== 'string' || payload.group.trim() === '') { + return { isValid: false, errors: 'group must be a non-empty string' } + } + + // Validate tools - must be an array of valid tool objects if present + if (payload.hasOwnProperty('tools')) { + if (!Array.isArray(payload.tools)) { + return { isValid: false, errors: 'tools must be an array when present' } + } + + // Validate each tool object structure + for (let i = 0; i < payload.tools.length; i++) { + const tool = payload.tools[i] + + // Each tool must be an object + if (typeof tool !== 'object' || tool === null) { + return { isValid: false, errors: `tool at index ${i} must be an object` } + } + + // Check for required properties: label, toolName, location, custom + const toolRequiredProps = ['label', 'toolName', 'location', 'custom'] + const missingToolProps = toolRequiredProps.filter(prop => !tool.hasOwnProperty(prop)) + if (missingToolProps.length > 0) { + return { isValid: false, errors: 'tool must have label, toolName, location, and custom properties' } + } + + // Validate tool properties + if (typeof tool.label !== 'string' || tool.label.trim() === '') { + return { isValid: false, errors: 'tool label must be a non-empty string' } + } + + if (typeof tool.toolName !== 'string' || tool.toolName.trim() === '') { + return { isValid: false, errors: 'tool toolName must be a non-empty string' } + } + + // Validate toolName pattern (lowercase with hyphens) + const toolNamePattern = /^[a-z0-9]+(-[a-z0-9]+)*$/ + if (!toolNamePattern.test(tool.toolName)) { + return { isValid: false, errors: 'tool toolName must be in lowercase-with-hyphens format' } + } + + // Validate url if present (optional) + if (tool.hasOwnProperty('url')) { + if (typeof tool.url !== 'string') { + return { isValid: false, errors: 'tool url must be a string when present' } + } + // If url is not empty, validate it's a valid URL + if (tool.url !== '') { + try { + new URL(tool.url) + } catch { + return { isValid: false, errors: 'tool url must be a valid URL when not empty' } + } + } + } + + // Validate location + const validLocations = ['dialog', 'pane', 'drawer', 'linked', 'sidebar'] + if (!validLocations.includes(tool.location)) { + return { isValid: false, errors: 'tool location must be one of: dialog, pane, drawer, linked, sidebar' } + } + + // Validate custom object + if (typeof tool.custom !== 'object' || tool.custom === null) { + return { isValid: false, errors: 'tool custom must be an object' } + } + + // Validate custom.enabled if present + if (tool.custom.hasOwnProperty('enabled') && typeof tool.custom.enabled !== 'boolean') { + return { isValid: false, errors: 'tool custom.enabled must be a boolean when present' } + } + + // Validate custom.tagName if present + if (tool.custom.hasOwnProperty('tagName') && (typeof tool.custom.tagName !== 'string')) { + return { isValid: false, errors: 'tool custom.tagName must be a string when present' } + } + } + } + + return {isValid: true, errors: null} } From 5594bb304f8e7094d25efb3eab527343b086b3ab Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 23 Sep 2025 11:58:37 -0500 Subject: [PATCH 166/262] newLineIndex === -1 logic --- line/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/line/index.js b/line/index.js index 8163a437..e619bc1d 100644 --- a/line/index.js +++ b/line/index.js @@ -124,7 +124,7 @@ router.put('/:lineId', auth0Middleware(), async (req, res) => { respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') } const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - if (!newLineIndex === -1) { + if (newLineIndex === -1) { respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) return } @@ -172,7 +172,7 @@ router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { return } const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - if (!newLineIndex === -1) { + if (newLineIndex === -1) { if(res.headersSent) return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) return @@ -222,7 +222,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return } const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - if (!newLineIndex === -1) { + if (newLineIndex === -1) { respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) return } From 9461e847341a7036f877bb743b09239e96a11081 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 23 Sep 2025 12:01:35 -0500 Subject: [PATCH 167/262] logical errors --- layer/index.js | 2 +- line/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layer/index.js b/layer/index.js index cee04f5c..466e1593 100644 --- a/layer/index.js +++ b/layer/index.js @@ -65,7 +65,7 @@ router.route('/:layerId') Object.keys(layer).forEach(key => { if (layer[key] === undefined || layer[key] === null) { // Remove properties that are undefined or null. prev and next can be null - if (layer !== "first" && layer !== "last") delete layer[key] + if (key !== "first" && key !== "last") delete layer[key] else layer[key] = null } }) diff --git a/line/index.js b/line/index.js index e619bc1d..0e928711 100644 --- a/line/index.js +++ b/line/index.js @@ -207,7 +207,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { const page = await findPageById(req.params.pageId, req.params.projectId) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { - respondWithError(res, 404, `Line with ID '${req.params.line}' not found in page '${req.params.pageId}'`) + respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) return } const line = new Line(oldLine) From b1daad0b37fb05a4711d381a9b3bbbaf7182b37c Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 29 Sep 2025 12:12:10 -0500 Subject: [PATCH 168/262] Add suspicious content protection to POST /layer route (#350) * Initial plan * Initial analysis: Identify layer route protection requirements Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Add screenContentMiddleware to POST /layer route for suspicious content protection Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Remove unwanted package-lock.json changes from initial commit Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Additional checks on expected complex structured layer data * Update layer/__tests__/layer_routes.test.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * no no we were skipping these for a reason * quick guards * cleanup * cleanup --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- layer/__tests__/layer_routes.test.js | 26 ++++++++++++++++++++++++ layer/index.js | 30 +++++++++++++++++++++++++++- project/projectCreateRouter.js | 2 ++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/layer/__tests__/layer_routes.test.js b/layer/__tests__/layer_routes.test.js index 5b304897..98bd686b 100644 --- a/layer/__tests__/layer_routes.test.js +++ b/layer/__tests__/layer_routes.test.js @@ -35,6 +35,32 @@ describe('Layer Routes', () => { }) describe.skip('POST /project/:projectId/layer', () => { + it('should reject suspicious content in request body', async () => { + const suspiciousLayer = { + label: '', + canvases: ['canvas1', 'canvas2'] + } + + const res = await request(app) + .post('/project/123/layer') + .send(suspiciousLayer) + + expect(res.status).toBe(400) + }) + + it('should reject suspicious content in canvases array', async () => { + const suspiciousLayer = { + label: 'Clean Label', + canvases: ['eval(malicious)', 'canvas2'] + } + + const res = await request(app) + .post('/project/123/layer') + .send(suspiciousLayer) + + expect(res.status).toBe(400) + }) + it('should create a new layer and return 201', async () => { const mockLayer = { label: 'Layer 1', canvases: ['canvas1', 'canvas2'] } const mockProject = new Project() diff --git a/layer/index.js b/layer/index.js index 466e1593..b026133d 100644 --- a/layer/index.js +++ b/layer/index.js @@ -1,6 +1,8 @@ import express from 'express' import * as utils from '../utilities/shared.js' import auth0Middleware from "../auth/index.js" +import screenContentMiddleware from "../utilities/checkIfSuspicious.js" +import { isSuspiciousJSON, isSuspiciousValueString} from "../utilities/checkIfSuspicious.js" import pageRouter from '../page/index.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} @@ -12,6 +14,31 @@ const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) +/** + * Private function to check on tools, layers, and layer.pages data of a project. + * They may contain data generated by direct user input, such as labels. + * It may be malformed, but let that be caught downstream. + * + * @param project - The project data from the request body. + */ +function hasSuspiciousLayerData(layer) { + // Guard against invalid layer param + if (!layer || typeof layer !== "object") return false + // Expect that layer.pages is an Array of JSON objects. If not the layer data is malformed so skip it. + if (layer.pages && Array.isArray(layer.pages)) { + for (const pageObj of layer.pages) { + if (isSuspiciousJSON(pageObj, [], true, 1)) return true + } + } + // Expect that layer.canvases is an Array of Strings (URIs). If not the layer data is malformed so skip it. + if (layer.canvases && Array.isArray(layer.canvases)) { + for (const canvasURI of layer.canvases) { + if (isSuspiciousValueString(canvasURI, [], true, 1)) return true + } + } + return false +} + // Route to get a layer by ID within a project router.route('/:layerId') .get(async (req, res) => { @@ -87,7 +114,7 @@ router.route('/:layerId') }) // Route to create a new layer within a project -router.route('/').post(auth0Middleware(), async (req, res) => { +router.route('/').post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId } = req.params const { label, canvases } = req.body if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') @@ -95,6 +122,7 @@ router.route('/').post(auth0Middleware(), async (req, res) => { return utils.respondWithError(res, 400, 'Invalid layer data. Provide a label and an array of URIs or Page objects.') } try { + if (hasSuspiciousLayerData(req.body)) return respondWithError(res, 400, "Suspicious layer data will not be processed.") const project = await Project.getById(projectId) if (!project) return utils.respondWithError(res, 404, 'Project does not exist') const newLayer = Layer.build(projectId, label, canvases) diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 53151009..c802d76c 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -18,6 +18,8 @@ const router = express.Router({ mergeParams: true }) * @param project - The project data from the request body. */ function hasSuspiciousProjectData(project) { + // Guard against invalid project param + if (!project || typeof project !== "object") return false // Expect that project.layers is an Array of JSON objects. If not the project data is malformed so skip it. if (project.layers && Array.isArray(project.layers)) { for (const layerObj of project.layers) { From 0b4b18b1770e6d1315764f9e898e4e1358248415 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 29 Sep 2025 12:57:24 -0500 Subject: [PATCH 169/262] Add suspicious content protection to PUT /layer/:layerId route (#351) * Initial plan * Initial plan Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Add screenContentMiddleware and hasSuspiciousLayerData protection to PUT /layer/:layerId route Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Revert accidental package-lock.json changes Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * improvement from manual testing * touchup for logs --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> Co-authored-by: Bryan Haberberger --- layer/__tests__/layer_routes.test.js | 29 ++++++++++++++++++++++++++++ layer/index.js | 15 +++++++------- userProfile/privateProfile.js | 2 +- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/layer/__tests__/layer_routes.test.js b/layer/__tests__/layer_routes.test.js index 98bd686b..031a73cc 100644 --- a/layer/__tests__/layer_routes.test.js +++ b/layer/__tests__/layer_routes.test.js @@ -88,6 +88,35 @@ describe('Layer Routes', () => { }) describe.skip('PUT /project/:projectId/layer/:layerId', () => { + it('should reject suspicious content in request body', async () => { + const suspiciousLayer = { + label: '', + canvases: ['canvas1', 'canvas2'] + } + + const res = await request(app) + .put('/project/123/layer/layer1') + .send(suspiciousLayer) + + expect(res.status).toBe(400) + }) + + it('should reject suspicious content in pages array', async () => { + const suspiciousLayer = { + label: 'Clean Label', + pages: [ + { id: 'page1', annotations: [] }, + { id: 'eval(malicious)', annotations: [] } + ] + } + + const res = await request(app) + .put('/project/123/layer/layer1') + .send(suspiciousLayer) + + expect(res.status).toBe(400) + }) + it('should update an existing layer and return 200', async () => { const mockLayer = { label: 'Updated Layer', canvases: ['canvas1', 'canvas2'] } const mockProject = new Project() diff --git a/layer/index.js b/layer/index.js index b026133d..6ddb5fcf 100644 --- a/layer/index.js +++ b/layer/index.js @@ -24,16 +24,16 @@ router.use(cors(common_cors)) function hasSuspiciousLayerData(layer) { // Guard against invalid layer param if (!layer || typeof layer !== "object") return false - // Expect that layer.pages is an Array of JSON objects. If not the layer data is malformed so skip it. + // Expect that layer.pages is an Array of JSON objects or strings (URIs / _ids) if (layer.pages && Array.isArray(layer.pages)) { - for (const pageObj of layer.pages) { - if (isSuspiciousJSON(pageObj, [], true, 1)) return true + for (const page of layer.pages) { + if (isSuspiciousJSON(page, [], true, 1) || isSuspiciousValueString(page, true)) return true } } - // Expect that layer.canvases is an Array of Strings (URIs). If not the layer data is malformed so skip it. + // Expect that layer.canvases is an Array of JSON objects or strings (URIs / _ids). if (layer.canvases && Array.isArray(layer.canvases)) { - for (const canvasURI of layer.canvases) { - if (isSuspiciousValueString(canvasURI, [], true, 1)) return true + for (const canvas of layer.canvases) { + if (isSuspiciousJSON(canvas, [], true, 1) || isSuspiciousValueString(canvas, true)) return true } } return false @@ -71,7 +71,7 @@ router.route('/:layerId') return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) - .put(auth0Middleware(), async (req, res) => { + .put(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId, layerId } = req.params let label = req.body?.label const update = req.body @@ -80,6 +80,7 @@ router.route('/:layerId') if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') if (!layerId) return utils.respondWithError(res, 400, 'Layer ID is required') try { + if (hasSuspiciousLayerData(req.body)) return utils.respondWithError(res, 400, "Suspicious layer data will not be processed.") const project = await Project.getById(projectId) if (!project?._id) return utils.respondWithError(res, 404, "Project '${projectId}' does not exist") const layer = await findLayerById(layerId, projectId) diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index b7e43453..2004d952 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -25,7 +25,7 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { try { if (req.body && !Array.isArray(req.body)) { for (const key in req.body) { - if (isSuspiciousJSON(req.body[key]) || isSuspiciousValueString(req.body[key])) + if (isSuspiciousJSON(req.body[key]) || isSuspiciousValueString(req.body[key], true)) return respondWithError(res, 400, "Suspicious profile data will not be processed.") } } From dc44bf47a111ae2c04e2807f9c0d02d7f8be4ad7 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 30 Sep 2025 10:32:44 -0500 Subject: [PATCH 170/262] tagName fix for Tools (#349) --- classes/Tools/Tools.js | 10 +++++----- project/projectToolsRouter.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index 025fdff3..bcb62945 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -83,11 +83,11 @@ export default class Tools { return this.tools.some(t => t.label === label) } - async checkIfTagNameExists(tagname) { + async checkIfTagNameExists(tagName) { if (!this.tools || !Array.isArray(this.tools)) { await this.#loadFromDB() } - return this.tools.some(t => t.tagname === tagname) + return this.tools.some(t => t.custom?.tagName === tagName) } async checkIfInDefaultTools(toolName) { @@ -99,13 +99,13 @@ export default class Tools { return toolPattern.test(toolValue) } - async getTagnameFromScript(url) { + async getTagNameFromScript(url) { try { const text = await (await fetch(url)).text() const match = text.match(/customElements\.define\s*\(\s*['"]([^'"]+)['"]/) return match ? match[1] : null } catch (e) { - console.error("Error fetching tagname:", e) + console.error("Error fetching tagName:", e) return null } } @@ -143,7 +143,7 @@ export default class Tools { } } else { - tagName = await this.getTagnameFromScript(url) + tagName = await this.getTagNameFromScript(url) if (Tools.defaultTools.some(t => t.tagName === tagName)) continue if (!tagName || !toolPattern.test(tagName)) continue } diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index 312f7c5f..5e93735e 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -29,11 +29,11 @@ router.route("/:projectId/tool").post(async (req, res) => { return respondWithError(res, 400, "Default tools cannot be altered") } if (url !== undefined && url !== "" && await tools.checkIfURLisJSScript(url)) { - const fetchedTagname = await tools.getTagnameFromScript(url) - if (!fetchedTagname || !await tools.checkToolPattern(fetchedTagname)) { - throw { status: 400, message: "Could not extract a valid tagname from the provided JavaScript URL." } + const fetchedTagName = await tools.getTagNameFromScript(url) + if (!fetchedTagName || !await tools.checkToolPattern(fetchedTagName)) { + throw { status: 400, message: "Could not extract a valid tagName from the provided JavaScript URL." } } - tagName = fetchedTagname + tagName = fetchedTagName } if (tagName !== undefined && tagName !== "" && !await tools.checkIfTagNameExists(tagName)) { tagName = "" From 2a7d1a0609915624bc4c5b8911dfbe943f5f3fc6 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 1 Oct 2025 12:13:17 -0400 Subject: [PATCH 171/262] Protect PUT /page/:pageid Route (#352) * Suspicious checks in route * some cleanup * add stubs for tests * add stubs for tests * add stubs for tests * Shared embedded check model * polish * Clean up respondWithError imports * Update layer/index.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update layer/index.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * shared hasSuspiciousX() checks * shared hasSuspiciousX(x) checks * removed unused imports * polish * Move project data check into shared location as well --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- layer/index.js | 58 ++++++---------------- page/__tests__/end_to_end_unit.test.js | 54 +++++++++++++++++++- page/index.js | 5 +- project/projectCreateRouter.js | 34 +------------ utilities/checkIfSuspicious.js | 69 ++++++++++++++++++++++++++ 5 files changed, 142 insertions(+), 78 deletions(-) diff --git a/layer/index.js b/layer/index.js index 6ddb5fcf..ea4ec587 100644 --- a/layer/index.js +++ b/layer/index.js @@ -1,44 +1,18 @@ import express from 'express' -import * as utils from '../utilities/shared.js' -import auth0Middleware from "../auth/index.js" -import screenContentMiddleware from "../utilities/checkIfSuspicious.js" -import { isSuspiciousJSON, isSuspiciousValueString} from "../utilities/checkIfSuspicious.js" +import auth0Middleware from '../auth/index.js' +import screenContentMiddleware from '../utilities/checkIfSuspicious.js' +import { hasSuspiciousLayerData } from '../utilities/checkIfSuspicious.js' import pageRouter from '../page/index.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' -import { findPageById, findLayerById, updateLayerAndProject } from '../utilities/shared.js' +import { findPageById, findLayerById, updateLayerAndProject, respondWithError } from '../utilities/shared.js' const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) -/** - * Private function to check on tools, layers, and layer.pages data of a project. - * They may contain data generated by direct user input, such as labels. - * It may be malformed, but let that be caught downstream. - * - * @param project - The project data from the request body. - */ -function hasSuspiciousLayerData(layer) { - // Guard against invalid layer param - if (!layer || typeof layer !== "object") return false - // Expect that layer.pages is an Array of JSON objects or strings (URIs / _ids) - if (layer.pages && Array.isArray(layer.pages)) { - for (const page of layer.pages) { - if (isSuspiciousJSON(page, [], true, 1) || isSuspiciousValueString(page, true)) return true - } - } - // Expect that layer.canvases is an Array of JSON objects or strings (URIs / _ids). - if (layer.canvases && Array.isArray(layer.canvases)) { - for (const canvas of layer.canvases) { - if (isSuspiciousJSON(canvas, [], true, 1) || isSuspiciousValueString(canvas, true)) return true - } - } - return false -} - // Route to get a layer by ID within a project router.route('/:layerId') .get(async (req, res) => { @@ -68,7 +42,7 @@ router.route('/:layerId') return res.status(200).json(layerAsCollection) } catch (error) { console.error(error) - return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) .put(auth0Middleware(), screenContentMiddleware(), async (req, res) => { @@ -77,15 +51,15 @@ router.route('/:layerId') const update = req.body const providedPages = update?.pages const user = req.user - if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') - if (!layerId) return utils.respondWithError(res, 400, 'Layer ID is required') + if (!projectId) return respondWithError(res, 400, 'Project ID is required') + if (!layerId) return respondWithError(res, 400, 'Layer ID is required') try { - if (hasSuspiciousLayerData(req.body)) return utils.respondWithError(res, 400, "Suspicious layer data will not be processed.") + if (hasSuspiciousLayerData(req.body)) return respondWithError(res, 400, "Suspicious layer data will not be processed.") const project = await Project.getById(projectId) - if (!project?._id) return utils.respondWithError(res, 404, "Project '${projectId}' does not exist") + if (!project?._id) return respondWithError(res, 404, `Project '${projectId}' does not exist`) const layer = await findLayerById(layerId, projectId) const originalPages = layer.pages ?? [] - if (!layer?.id) return utils.respondWithError(res, 404, "Layer '${layerId}' not found in project") + if (!layer?.id) return respondWithError(res, 404, `Layer '${layerId}' not found in project`) // Only update top-level properties that are present in the request Object.keys(update ?? {}).forEach(key => { layer[key] = update[key] @@ -107,32 +81,32 @@ router.route('/:layerId') res.status(200).json(layer) } catch (error) { console.error(error) - return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') + return respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') } }) .all((req, res) => { - utils.respondWithError(res, 405, 'Improper request method. Use GET instead.') + respondWithError(res, 405, 'Improper request method. Use GET instead.') }) // Route to create a new layer within a project router.route('/').post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId } = req.params const { label, canvases } = req.body - if (!projectId) return utils.respondWithError(res, 400, 'Project ID is required') + if (!projectId) return respondWithError(res, 400, 'Project ID is required') if (!label || !Array.isArray(canvases) || canvases.length === 0) { - return utils.respondWithError(res, 400, 'Invalid layer data. Provide a label and an array of URIs or Page objects.') + return respondWithError(res, 400, 'Invalid layer data. Provide a label and an array of URIs or Page objects.') } try { if (hasSuspiciousLayerData(req.body)) return respondWithError(res, 400, "Suspicious layer data will not be processed.") const project = await Project.getById(projectId) - if (!project) return utils.respondWithError(res, 404, 'Project does not exist') + if (!project) return respondWithError(res, 404, 'Project does not exist') const newLayer = Layer.build(projectId, label, canvases) project.addLayer(newLayer.asProjectLayer()) await project.update() res.status(201).json(project.data) } catch (error) { console.error(error) - return utils.respondWithError(res, error.status ?? 500, error.message ?? 'Error creating layer') + return respondWithError(res, error.status ?? 500, error.message ?? 'Error creating layer') } }) diff --git a/page/__tests__/end_to_end_unit.test.js b/page/__tests__/end_to_end_unit.test.js index 75f424d2..fd33eb0a 100644 --- a/page/__tests__/end_to_end_unit.test.js +++ b/page/__tests__/end_to_end_unit.test.js @@ -36,14 +36,14 @@ describe.skip('page endpoint end to end unit test (spinning up the endpoint and }) // These two cannot work without a corresponding project, so it will need to be rewritten - it.skip('Call to /page with a TPEN3 page ID that does not exist. The status should be 404 with a message.', async () => { + it('Call to /page with a TPEN3 page ID that does not exist. The status should be 404 with a message.', async () => { const res = await request(routeTester) .get('/0001') expect(res.statusCode).toBe(404) expect(res.body).toBeTruthy() }) - it.skip('Call to /page with a TPEN3 page ID that does exist. The status should be 200 with a JSON page in the body.', async () => { + it('Call to /page with a TPEN3 page ID that does exist. The status should be 200 with a JSON page in the body.', async () => { const res = await request(routeTester) .get('/123') let json = res.body @@ -55,4 +55,54 @@ describe.skip('page endpoint end to end unit test (spinning up the endpoint and } expect(json).not.toBe(null) }) + + it('should reject suspicious label in request body', async () => { + const suspiciousPage = + { + label: "while(true) return true", + items: [ + { + "type":"Annotation", + "body": { + "type": "TextualBody", + "value": "OK", + "format": "text/plain" + }, + "target": "https://example.org/canvas/1#xywh=100,100,100,100" + } + ], + "target": "https://example.org/canvas/1#xywh=100,100,100,100" + } + + const res = await request(app) + .put('/project/123/layer/layer1/page/page1') + .send(suspiciousPage) + + expect(res.status).toBe(400) + }) + + it('should reject suspicious content in items array', async () => { + const suspiciousPage = + { + label: "OK", + items: [ + { + "type":"Annotation", + "body": { + "type": "TextualBody", + "value": "while(true) return true", + "format": "text/plain" + }, + "target": "https://example.org/canvas/1#xywh=100,100,100,100" + } + ], + "target": "https://example.org/canvas/1" + } + const res = await request(app) + .put('/project/123/layer/layer1/page/page1') + .send(suspiciousPage) + + expect(res.status).toBe(400) + }) + }) diff --git a/page/index.js b/page/index.js index 42551dcc..f83ff5e0 100644 --- a/page/index.js +++ b/page/index.js @@ -1,5 +1,7 @@ import express from 'express' import auth0Middleware from '../auth/index.js' +import screenContentMiddleware from '../utilities/checkIfSuspicious.js' +import { hasSuspiciousPageData } from '../utilities/checkIfSuspicious.js' import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) @@ -48,7 +50,7 @@ router.route('/:pageId') return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) - .put(auth0Middleware(), async (req, res) => { + .put(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") const { projectId, pageId } = req.params @@ -69,6 +71,7 @@ router.route('/:pageId') } try { + if (hasSuspiciousPageData(req.body)) return respondWithError(res, 400, "Suspicious page data will not be processed.") // Find the page object const page = await findPageById(pageId, projectId) page.creator = user.agent.split('/').pop() diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index c802d76c..1ed7a16d 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -5,43 +5,11 @@ import ProjectFactory from "../classes/Project/ProjectFactory.js" import validateURL from "../utilities/validateURL.js" import Project from "../classes/Project/Project.js" import screenContentMiddleware from "../utilities/checkIfSuspicious.js" -import { isSuspiciousJSON, isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" +import { isSuspiciousJSON, isSuspiciousValueString, hasSuspiciousProjectData } from "../utilities/checkIfSuspicious.js" import Tools from "../classes/Tools/Tools.js" const router = express.Router({ mergeParams: true }) -/** - * Private function to check on tools, layers, and layer.pages data of a project. - * They may contain data generated by direct user input, such as labels. - * It may be malformed, but let that be caught downstream. - * - * @param project - The project data from the request body. - */ -function hasSuspiciousProjectData(project) { - // Guard against invalid project param - if (!project || typeof project !== "object") return false - // Expect that project.layers is an Array of JSON objects. If not the project data is malformed so skip it. - if (project.layers && Array.isArray(project.layers)) { - for (const layerObj of project.layers) { - if (isSuspiciousJSON(layerObj, [], true, 1)) return true - const pages = layerObj.pages - // Expect that layer.pages is an Array of JSON objects. If not the project data is malformed so skip it. - if (Array.isArray(pages)) { - for (const pageObj of pages) { - if (isSuspiciousJSON(pageObj, [], true, 2)) return true - } - } - } - } - // Expect that project.tools is an Array of JSON objects. If not the project data is malformed so skip it. - if (project.tools && Array.isArray(project.tools)) { - for (const toolObj of project.tools) { - if (isSuspiciousJSON(toolObj, [], true, 1)) return true - } - } - return false -} - router.route("/create").post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") diff --git a/utilities/checkIfSuspicious.js b/utilities/checkIfSuspicious.js index 17e6c040..9de9e1fb 100644 --- a/utilities/checkIfSuspicious.js +++ b/utilities/checkIfSuspicious.js @@ -163,6 +163,75 @@ export function isSuspiciousLanguageMap(languageMapObj, logWarning = false) { return sus } +/** + * A helper function to check on embedded items of page data + * They may contain data generated by direct user input, such as labels or textual bodies. + * It may be malformed, but let that be caught downstream. + * + * @param page - The page data from the request body. + */ +export function hasSuspiciousPageData(page) { + // Guard against invalid page param + if (!page || typeof page !== "object") return false + // Expect that page.items is an Array of JSON Annotation objects. + if (page.items && Array.isArray(page.items)) { + for (const anno of page.items) { + if (isSuspiciousJSON(anno, [], true, 1)) return true + } + } + return false +} + +/** + * A helper function to check on the embedded pages or canvases of layer data. + * They may contain data generated by direct user input, such as labels. + * It may be malformed, but let that be caught downstream. + * + * @param layer - The layer data from the request body. + */ +export function hasSuspiciousLayerData(layer) { + // Guard against invalid layer param + if (!layer || typeof layer !== "object") return false + // Expect that layer.pages is an Array of JSON objects or strings (URIs / _ids) + if (layer.pages && Array.isArray(layer.pages)) { + for (const page of layer.pages) { + if (isSuspiciousJSON(page, [], true, 1) || isSuspiciousValueString(page, true) || hasSuspiciousPageData(page)) return true + } + } + // Expect that layer.canvases is an Array of JSON objects or strings (URIs / _ids). + if (layer.canvases && Array.isArray(layer.canvases)) { + for (const canvas of layer.canvases) { + if (isSuspiciousJSON(canvas, [], true, 1) || isSuspiciousValueString(canvas, true)) return true + } + } + return false +} + +/** + * A helper function to check on embedded tools, layers, layer.pages, and layer.pages[n].items[i] of project data. + * They may contain data generated by direct user input, such as labels. + * It may be malformed, but let that be caught downstream. + * + * @param project - The project data from the request body. + */ +export function hasSuspiciousProjectData(project) { + // Guard against invalid project param + if (!project || typeof project !== "object") return false + // Expect that project.layers is an Array of JSON objects. If not the project data is malformed so skip it. + if (project.layers && Array.isArray(project.layers)) { + for (const layerObj of project.layers) { + if (isSuspiciousJSON(layerObj, [], true, 1) || hasSuspiciousLayerData(layerObj)) return true + } + } + // Expect that project.tools is an Array of JSON objects. If not the project data is malformed so skip it. + if (project.tools && Array.isArray(project.tools)) { + for (const toolObj of project.tools) { + if (isSuspiciousJSON(toolObj, [], true, 1)) return true + } + } + return false +} + /** * A valid JSON key from a valid JSON object that may be a language map language key. * Determine if the key is a valid-looking language map key. From 3461008ec66f13ab7ef924b8ad8c8cbd2a62ee07 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 1 Oct 2025 12:12:29 -0500 Subject: [PATCH 172/262] Add suspicious content protection to POST /line/ route (#353) * Initial plan * Initial plan for adding suspicious content check to POST /line/ route Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Add suspicious content protection to POST /line/ route Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * adjustments for tests * Minor adjustments * fix test error * fix test error * Revert package-lock.json changes Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * oo move this so it doesn't save lines * Update line/index.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * ah no undo check the whole anno, the body is checked in the recursion * polish * Add 'bodyValue' to common keys, since Web Annotation may use that key for TextualBody * Fair, screenContentMiddleware() duplicates the logic because we turn the body into an Array of 1 if it is an object. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- line/__tests__/lineRouter.test.js | 21 +++++++++++++++++++++ line/index.js | 10 +++++++--- utilities/checkIfSuspicious.js | 17 ++++++++++++++++- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/line/__tests__/lineRouter.test.js b/line/__tests__/lineRouter.test.js index 4274d9f8..afd64fc5 100644 --- a/line/__tests__/lineRouter.test.js +++ b/line/__tests__/lineRouter.test.js @@ -43,6 +43,27 @@ describe.skip('lineRouter API tests', () => { expect(response.body).toEqual({ id: '123', body: 'New Line', target: 'https://example.com?xywh=10,10,100,100' }) }) + it('should detect suspicious content in array of annotations', async () => { + const annotations = [ + { + id: 'anno-1', + body: {'value': 'This is fine'}, + target: 'canvas#xywh=0,0,100,100' + }, + { + id: 'anno-2', + body: {'value': ''}, + target: 'canvas#xywh=0,100,100,100' + } + ] + + const response = await request(app) + .post('/project/1/page/1/line/') + .send(annotations) + + expect(response.status).toBe(400) + }) + it('PUT /project/:pid/page/:pid/line/:line should update a line', async () => { Line.prototype.update.mockResolvedValue({ asJSON: () => ({ id: '123', body: 'Updated Line', target: 'https://example.com?xywh=10,10,100,100' }) diff --git a/line/index.js b/line/index.js index 0e928711..7373a40a 100644 --- a/line/index.js +++ b/line/index.js @@ -1,6 +1,7 @@ import express from 'express' import cors from 'cors' import auth0Middleware from "../auth/index.js" +import { isSuspiciousJSON } from '../utilities/checkIfSuspicious.js' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import { respondWithError, getProjectById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' import Line from '../classes/Line/Line.js' @@ -58,17 +59,21 @@ router.post('/', auth0Middleware(), async (req, res) => { if (!page) return const inputLines = Array.isArray(req.body) ? req.body : [req.body] + // Check each annotation for suspicious content. The body itself will be checked during the recursion. + for (const anno of inputLines) { + if (isSuspiciousJSON(anno, [], true, 1)) { + return respondWithError(res, 400, "Suspicious input will not be processed.") + } + } let newLine // This feels like a use case for /bulkCreate in RERUM. Make all these lines with one call. for (const lineData of inputLines) { newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }, user.agent.split('/').pop()) - const existingLine = findLineInPage(page, newLine.id, res) if (existingLine) { respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) return } - const savedLine = await newLine.update() page.items.push(savedLine) } @@ -84,7 +89,6 @@ router.post('/', auth0Middleware(), async (req, res) => { Object.assign(page, currentVersion) return updatePageAndProject(page, project, user._id) }) - res.status(201).json(newLine.asJSON(true)) } catch (error) { // Handle version conflicts with optimistic locking diff --git a/utilities/checkIfSuspicious.js b/utilities/checkIfSuspicious.js index 9de9e1fb..8c11cec3 100644 --- a/utilities/checkIfSuspicious.js +++ b/utilities/checkIfSuspicious.js @@ -55,7 +55,22 @@ export function isSuspiciousJSON(obj, specific_keys = [], logWarning = true, dep if (typeof logWarning !== "boolean") logWarning = true // Helps guard bad depth param if (typeof depth !== "number") depth = 0 - const common_keys = ["label", "name", "displayName", "email", "url", "value", "body", "target", "text", "textValue", "roles", "language", "description"] + const common_keys = [ + "label", + "name", + "displayName", + "email", + "url", + "value", + "body", + "target", + "text", + "textValue", + "bodyValue", + "roles", + "language", + "description" + ] const combined_keys = [...common_keys, ...specific_keys] const warnings = {} const warn = {} From 423769bb2b10f471a1e84c925a330a4a7bbdcede Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 1 Oct 2025 13:32:46 -0400 Subject: [PATCH 173/262] Protect PUT /line/:lineid Route (#354) * Claude's try * Claude's changes * Claude's changes * polish * Update line/__tests__/lineRouter.test.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- line/__tests__/lineRouter.test.js | 28 +++++++++++++++++++++------- line/index.js | 3 ++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/line/__tests__/lineRouter.test.js b/line/__tests__/lineRouter.test.js index afd64fc5..eaa628a8 100644 --- a/line/__tests__/lineRouter.test.js +++ b/line/__tests__/lineRouter.test.js @@ -19,7 +19,7 @@ describe.skip('lineRouter API tests', () => { jest.clearAllMocks() }) - it('GET /project/:pid/page/:pid/line/:line should load a line', async () => { + it('GET /project/:pid/page/:page/line/:line should load a line', async () => { Line.prototype.constructor.mockResolvedValue({ asJSON: () => ({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=10,10,100,100' }) }) @@ -30,20 +30,20 @@ describe.skip('lineRouter API tests', () => { expect(response.body).toEqual({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=10,10,100,100' }) }) - it('POST /project/:pid/page/:pid/line/:line should create a line', async () => { + it('POST /project/:pid/page/:pageid/line/ should create a line', async () => { Line.prototype.save.mockResolvedValue({ asJSON: () => ({ id: '123', body: 'New Line', target: 'https://example.com?xywh=10,10,100,100' }) }) const response = await request(app) - .post('/project/1/page/1/line/123') + .post('/project/1/page/1/line/') .send({ body: 'New Line', target: 'https://example.com?xywh=10,10,100,100' }) expect(response.status).toBe(201) expect(response.body).toEqual({ id: '123', body: 'New Line', target: 'https://example.com?xywh=10,10,100,100' }) }) - it('should detect suspicious content in array of annotations', async () => { + it('POST /project/:pid/page/:pageid/line/ should detect suspicious content', async () => { const annotations = [ { id: 'anno-1', @@ -64,7 +64,7 @@ describe.skip('lineRouter API tests', () => { expect(response.status).toBe(400) }) - it('PUT /project/:pid/page/:pid/line/:line should update a line', async () => { + it('PUT /project/:pid/page/:page/line/:line should update a line', async () => { Line.prototype.update.mockResolvedValue({ asJSON: () => ({ id: '123', body: 'Updated Line', target: 'https://example.com?xywh=10,10,100,100' }) }) @@ -77,7 +77,21 @@ describe.skip('lineRouter API tests', () => { expect(response.body).toEqual({ id: '123', body: 'Updated Line', target: 'https://example.com?xywh=10,10,100,100' }) }) - it('PATCH /project/:pid/page/:pid/line/:line/text should update line text', async () => { + it('PUT /project/:pid/page/:pageid/line/:line should reject suspicious content', async () => { + const suspiciousUpdate = { + id: 'anno-1', + body: { value: '' }, + target: 'canvas#xywh=0,0,100,100' + } + + const response = await request(app) + .put('/project/1/page/1/line/123') + .send(suspiciousUpdate) + + expect(response.status).toBe(400) + }) + + it('PATCH /project/:pid/page/:page/line/:line/text should update line text', async () => { Line.prototype.updateText.mockResolvedValue({ asJSON: () => ({ id: '123', body: 'Updated Text', target: 'https://example.com?xywh=10,10,100,100' }) }) @@ -90,7 +104,7 @@ describe.skip('lineRouter API tests', () => { expect(response.body).toEqual({ id: '123', body: 'Updated Text', target: 'https://example.com?xywh=10,10,100,100' }) }) - it('PATCH /project/:pid/page/:pid/line/:line/bounds should update line bounds', async () => { + it('PATCH /project/:pid/page/:page/line/:line/bounds should update line bounds', async () => { Line.prototype.updateBounds.mockResolvedValue({ asJSON: () => ({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=20,20,200,200' }) }) diff --git a/line/index.js b/line/index.js index 7373a40a..b30eb70f 100644 --- a/line/index.js +++ b/line/index.js @@ -1,6 +1,7 @@ import express from 'express' import cors from 'cors' import auth0Middleware from "../auth/index.js" +import screenContentMiddleware from '../utilities/checkIfSuspicious.js' import { isSuspiciousJSON } from '../utilities/checkIfSuspicious.js' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import { respondWithError, getProjectById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' @@ -100,7 +101,7 @@ router.post('/', auth0Middleware(), async (req, res) => { }) // Update an existing line, including in RERUM -router.put('/:lineId', auth0Middleware(), async (req, res) => { +router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") try { From c3c6c1178d186936d90b2df9abf1a3281e6da6a4 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 1 Oct 2025 13:46:05 -0400 Subject: [PATCH 174/262] This one is too easy to let AI do (#356) --- line/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/line/index.js b/line/index.js index b30eb70f..d5da6745 100644 --- a/line/index.js +++ b/line/index.js @@ -149,7 +149,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, }) // Update the text of an existing line -router.patch('/:lineId/text', auth0Middleware(), async (req, res) => { +router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") try { From 35dcea1a45bddea800dda458c6aa016643b73a7b Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 1 Oct 2025 13:15:39 -0500 Subject: [PATCH 175/262] Add suspicious input validation to feedback and bug report routes (#358) * Initial plan * Add suspicious input validation to feedback routes Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * oo forgot this test from the last pr * Remove tests * polish * Update line/__tests__/lineRouter.test.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- feedback/feedbackController.js | 14 +++++--------- line/__tests__/lineRouter.test.js | 10 ++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/feedback/feedbackController.js b/feedback/feedbackController.js index bff804af..4403a23a 100644 --- a/feedback/feedbackController.js +++ b/feedback/feedbackController.js @@ -1,5 +1,6 @@ import { createGitHubIssue } from './githubService.js' import { respondWithError } from "../utilities/shared.js" +import { isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" /** * @@ -11,10 +12,8 @@ import { respondWithError } from "../utilities/shared.js" export async function submitFeedback(req, res) { const user = req.user ? `${req.user.profile.displayName} (${req.user._id})` : 'Anonymous' const { page, feedback } = req.body - - if (!feedback) { - return res.status(204).send() - } + if (!feedback) return res.status(204).send() + if (isSuspiciousValueString(feedback)) return respondWithError(res, 400, "Suspicious input will not be processed.") try { await createGitHubIssue('Feedback', `Feedback from ${user}`, `Page: ${page}\n\nFeedback: ${sanitizeUserInput(feedback)}`) res.status(200).json({ message: 'Feedback submitted successfully' }) @@ -33,11 +32,8 @@ export async function submitFeedback(req, res) { export async function submitBug(req, res) { const user = req.user ? `${req.user.profile.displayName} (${req.user._id})` : 'Anonymous' const { page, bugDescription } = req.body - - if (!bugDescription) { - return res.status(204).send() - } - + if (!bugDescription) return res.status(204).send() + if (isSuspiciousValueString(bugDescription)) return respondWithError(res, 400, "Suspicious input will not be processed.") try { await createGitHubIssue('Bug Report', `Bug reported by ${user}`, `Page: ${page}\n\nBug: ${sanitizeUserInput(bugDescription)}`) res.status(200).json({ message: 'Bug report submitted successfully' }) diff --git a/line/__tests__/lineRouter.test.js b/line/__tests__/lineRouter.test.js index eaa628a8..1d33dd72 100644 --- a/line/__tests__/lineRouter.test.js +++ b/line/__tests__/lineRouter.test.js @@ -104,6 +104,16 @@ describe.skip('lineRouter API tests', () => { expect(response.body).toEqual({ id: '123', body: 'Updated Text', target: 'https://example.com?xywh=10,10,100,100' }) }) + it('PATCH /project/:pid/page/:page/line/:line/text should detect suspicious content', async () => { + const suspiciousPatch = 'while(true) return true' + + const response = await request(app) + .patch('/project/1/page/1/line/123') + .send(suspiciousPatch) + + expect(response.status).toBe(400) + }) + it('PATCH /project/:pid/page/:page/line/:line/bounds should update line bounds', async () => { Line.prototype.updateBounds.mockResolvedValue({ asJSON: () => ({ id: '123', body: 'Sample Line', target: 'https://example.com?xywh=20,20,200,200' }) From 38ad1476bdb74f3dc41cf9af44480087ac2dbb3f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 1 Oct 2025 13:34:48 -0500 Subject: [PATCH 176/262] Node 22.20.0 now --- .github/copilot-instructions.md | 2 +- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- .github/workflows/ci_dev.yaml | 2 +- .github/workflows/ci_prod.yaml | 2 +- .github/workflows/test_pushes.yaml | 2 +- CONTRIBUTING.md | 2 +- package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 33d8a745..51336fc5 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -20,7 +20,7 @@ Always reference these instructions first and fallback to search or bash command - Test basic functionality: `curl http://localhost:3001/` should return "TPEN3 SERVICES BABY!!!" ### Environment Requirements -- Node.js >= 22.14.0 (works with v20.19.4 but shows warnings) +- Node.js >= 22.20.0 - MongoDB (for database tests and full functionality) - MariaDB (for database tests and full functionality) - Copy `sample.env` to `.env` for basic functionality diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index 90acbaea..1ffe6256 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.12.0" + node-version: "^22.20.0" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index c7b1480a..9378dfb6 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.12.0" + node-version: "^22.20.0" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/ci_dev.yaml b/.github/workflows/ci_dev.yaml index c8c45aaf..422b90b1 100644 --- a/.github/workflows/ci_dev.yaml +++ b/.github/workflows/ci_dev.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.12.0" + node-version: "^22.20.0" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/ci_prod.yaml b/.github/workflows/ci_prod.yaml index f78714aa..003d8a50 100644 --- a/.github/workflows/ci_prod.yaml +++ b/.github/workflows/ci_prod.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.12.0" + node-version: "^22.20.0" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/test_pushes.yaml b/.github/workflows/test_pushes.yaml index f48b4199..e0a5881c 100644 --- a/.github/workflows/test_pushes.yaml +++ b/.github/workflows/test_pushes.yaml @@ -52,7 +52,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.12.0" + node-version: "^22.20.0" - name: Cache node modules uses: actions/cache@master env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 407cfb0c..4d646efe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ Thank you for your interest in contributing to TPEN Services! This guide will he ## Prerequisites ### Node.js and npm -- **Node.js version**: >= 22.14.0 (as specified in `package.json`) +- **Node.js version**: >= 22.20.0 (as specified in `package.json`) - **npm**: Latest version (comes with Node.js) You can download Node.js from [nodejs.org](https://nodejs.org/) or use a version manager like [nvm](https://github.com/nvm-sh/nvm). diff --git a/package.json b/package.json index ceb709d9..db815124 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,6 @@ "supertest": "^7.0.0" }, "engines": { - "node": ">=22.14.0" + "node": ">=22.20.0" } } From d89112b45926e877d9cec6e16cb330e343be3458 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Thu, 2 Oct 2025 09:33:14 -0500 Subject: [PATCH 177/262] Page Viewer URL Change (#357) --- classes/Tools/Tools.js | 4 ++-- project/projectToolsRouter.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index bcb62945..8d58b945 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -179,7 +179,7 @@ export default class Tools { if (url !== undefined && url !== "" && !await this.checkIfURLisJSScript(url) && tagName !== "") { throw { status: 400, message: "If url is not a JavaScript file, tagName must be empty." } } - if (tagName !== undefined && tagName !== "" && !await this.checkIfTagNameExists(tagName)) { + if (tagName !== undefined && tagName !== "" && await this.checkIfTagNameExists(tagName)) { throw { status: 400, message: "tagName must be unique and not already in use." } } if (["dialog", "pane", "drawer", "linked", "sidebar"].indexOf(location) === -1) { @@ -208,7 +208,7 @@ export default class Tools { "enabled": true, "tagName": "" }, - "url": "", + "url": "https://centerfordigitalhumanities.github.io/Page-Viewer/", "location": "pane" }, { diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index 5e93735e..d788c5fc 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -35,7 +35,7 @@ router.route("/:projectId/tool").post(async (req, res) => { } tagName = fetchedTagName } - if (tagName !== undefined && tagName !== "" && !await tools.checkIfTagNameExists(tagName)) { + if (tagName !== undefined && tagName !== "" && await tools.checkIfTagNameExists(tagName)) { tagName = "" } const addedTool = await tools.addIframeTool(label, toolName, url, location, enabled, tagName) From 8acffa92014d67ec9154a28e3d92a73986e2d880 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Thu, 2 Oct 2025 10:01:09 -0500 Subject: [PATCH 178/262] Metadata Fix (#360) * Metadata Fix * Update validatePayload.js * language map * space * Update metadata validation Pair coding --------- Co-authored-by: Bryan Haberberger --- utilities/validatePayload.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/utilities/validatePayload.js b/utilities/validatePayload.js index a9f775a3..8b14e517 100644 --- a/utilities/validatePayload.js +++ b/utilities/validatePayload.js @@ -50,13 +50,14 @@ export function validateProjectPayload(payload) { } // Validate label and value are non-empty strings - if (typeof metadataItem.label !== 'string' || metadataItem.label.trim() === '') { + if (typeof metadataItem.label?.none?.[0] === 'string' && metadataItem.label?.none?.[0].trim() === '') + return { isValid: false, errors: 'metadata item label must be a non-empty language map' } + + if (typeof metadataItem.label === 'string' && metadataItem.label.trim() === '') return { isValid: false, errors: 'metadata item label must be a non-empty string' } - } - - if (typeof metadataItem.value !== 'string' || metadataItem.value.trim() === '') { - return { isValid: false, errors: 'metadata item value must be a non-empty string' } - } + + if (typeof metadataItem.value?.none?.[0] !== 'string' || typeof metadataItem.value !== 'string') + return { isValid: false, errors: 'metadata item value cannot be processed' } // Ensure no extra properties beyond label and value const allowedProps = ['label', 'value'] From 91cfbfb977ba88728007ab52df1ce2711d685c6a Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 2 Oct 2025 10:25:52 -0500 Subject: [PATCH 179/262] hotfix test --- utilities/validatePayload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/validatePayload.js b/utilities/validatePayload.js index 8b14e517..090579d1 100644 --- a/utilities/validatePayload.js +++ b/utilities/validatePayload.js @@ -56,7 +56,7 @@ export function validateProjectPayload(payload) { if (typeof metadataItem.label === 'string' && metadataItem.label.trim() === '') return { isValid: false, errors: 'metadata item label must be a non-empty string' } - if (typeof metadataItem.value?.none?.[0] !== 'string' || typeof metadataItem.value !== 'string') + if (typeof metadataItem.value?.none?.[0] !== 'string' && typeof metadataItem.value !== 'string') return { isValid: false, errors: 'metadata item value cannot be processed' } // Ensure no extra properties beyond label and value From 70514cb97caffa3a7f3e930b74711e952d0b96ea Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Thu, 2 Oct 2025 10:42:25 -0500 Subject: [PATCH 180/262] metadata hotfix (#361) --- utilities/__tests__/validatePayload.test.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/utilities/__tests__/validatePayload.test.js b/utilities/__tests__/validatePayload.test.js index aba9bb39..dcfb40b4 100644 --- a/utilities/__tests__/validatePayload.test.js +++ b/utilities/__tests__/validatePayload.test.js @@ -176,23 +176,6 @@ describe('validateProjectPayload', () => { } const result = validateProjectPayload(payload) expect(result.isValid).toBe(false) - expect(result.errors).toBe("metadata item label must be a non-empty string") - }) - - test('should return invalid for metadata with empty value', () => { - const payload = { - label: "Test Project", - metadata: [ - { label: "Author", value: "" } - ], - layers: [], - manifest: ["http://example.com/manifest"], - creator: "http://example.com/user", - group: "abc123" - } - const result = validateProjectPayload(payload) - expect(result.isValid).toBe(false) - expect(result.errors).toBe("metadata item value must be a non-empty string") }) test('should return invalid for metadata with extra properties', () => { @@ -208,7 +191,6 @@ describe('validateProjectPayload', () => { } const result = validateProjectPayload(payload) expect(result.isValid).toBe(false) - expect(result.errors).toBe("metadata item must only have label and value properties") }) }) From 873bf4893587f12da3c266c2259605f4770070fa Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 2 Oct 2025 14:20:51 -0400 Subject: [PATCH 181/262] Remove /manifest directory and unregister manifest routes (#363) * Remove /manifest directory and unregister manifest routes (#362) * Initial plan * Initial plan for removing /manifest directory and routes Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Remove /manifest directory and unregister manifest routes Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * undiff * undiff --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --- .github/copilot-instructions.md | 4 +- app.js | 2 - manifest/__tests__/end_to_end_unit.test.js | 75 ---------- manifest/__tests__/exists_unit.test.js | 24 --- manifest/__tests__/functionality_unit.test.js | 40 ----- manifest/index.js | 139 ------------------ manifest/manifest.js | 65 -------- package-lock.json | 3 +- 8 files changed, 2 insertions(+), 350 deletions(-) delete mode 100644 manifest/__tests__/end_to_end_unit.test.js delete mode 100644 manifest/__tests__/exists_unit.test.js delete mode 100644 manifest/__tests__/functionality_unit.test.js delete mode 100644 manifest/index.js delete mode 100644 manifest/manifest.js diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 51336fc5..a197c1f0 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -75,7 +75,6 @@ Always reference these instructions first and fallback to search or bash command │ └── tiny/ # TinyPEN API controller ├── auth/ # Auth0 authentication ├── project/ # Project API routes -├── manifest/ # Manifest API routes ├── userProfile/ # User API routes ├── line/ # Line API routes ├── page/ # Page API routes @@ -89,7 +88,6 @@ Always reference these instructions first and fallback to search or bash command - `POST /project/import?createFrom=URL` -- Import project from IIIF manifest - `GET /user/:id` -- Get user profile (public) - `GET /my/profile` -- Get authenticated user profile -- `GET /manifest/:id` -- Get IIIF manifest - `GET /line/:id` -- Get text line annotation - `GET /page/:id` -- Get annotation page @@ -97,7 +95,7 @@ Always reference these instructions first and fallback to search or bash command - Uses Auth0 JWT bearer tokens - Protected endpoints require `Authorization: Bearer ` header - Environment variables AUDIENCE and DOMAIN must be configured for auth tests -- Public endpoints: `/`, `/user/:id`, `/manifest/:id` +- Public endpoints: `/`, `/user/:id` - Protected endpoints: `/project/*`, `/my/*`, most POST/PUT/DELETE operations ### Database Configuration diff --git a/app.js b/app.js index 711b249f..3732c022 100644 --- a/app.js +++ b/app.js @@ -18,7 +18,6 @@ dotenvExpand.expand(storedEnv) import logger from 'morgan' import indexRouter from './index.js' -import manifestRouter from './manifest/index.js' import projectRouter from './project/index.js' import pageRouter from './page/index.js' import lineRouter from './line/index.js' @@ -54,7 +53,6 @@ app.all('*', (req, res, next) => { }) app.use('/', indexRouter) -app.use('/manifest', manifestRouter) app.use('/project/:projectId/page/:pageId/line', lineRouter) app.use('/project/:projectId/page', pageRouter) app.use('/project', projectRouter) diff --git a/manifest/__tests__/end_to_end_unit.test.js b/manifest/__tests__/end_to_end_unit.test.js deleted file mode 100644 index 595f922d..00000000 --- a/manifest/__tests__/end_to_end_unit.test.js +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Activate the /manifest endpoint with Express. - * Perform endpoint calls that test the end to end functionality of the route. - * - * @author Bryan Haberberger - * https://github.com/thehabes - * - * */ - -import manifestRouter from '../index.js' -import express from 'express' -import request from 'supertest' - -const routeTester = new express() -routeTester.use("/manifest", manifestRouter) - -describe('Manifest endpoint end to end unit test (spinning up the endpoint and using it). #end2end_unit', () => { - it('/manifest endpoint end-to-end stub.', async () => { - const res = await request(routeTester) - expect(true).toBe(true) - }) - - // TODO: REWRITE these tests once we agree on CRUD patterns for Manifest stuff. - - // it('POST instead of GET. That status should be 404 with a message.', async () => { - // const res = await request(routeTester) - // .post('/manifest/') - // expect(res.statusCode).toBe(404) - // expect(res.body).toBeTruthy() - // }) - - // it('PUT instead of GET. That status should be 405 with a message.', async () => { - // const res = await request(routeTester) - // .put('/manifest/') - // expect(res.statusCode).toBe(405) - // expect(res.body).toBeTruthy() - // }) - - // it('PATCH instead of GET. That status should be 405 with a message.', async () => { - // const res = await request(routeTester) - // .patch('/manifest/') - // expect(res.statusCode).toBe(405) - // expect(res.body).toBeTruthy() - // }) - - // it('Call to /manifest without a TPEN3 project ID. The status should be 400 with a message.', async () => { - // const res = await request(routeTester) - // .get('/manifest/') - // expect(res.statusCode).toBe(400) - // expect(res.body).toBeTruthy() - // }) - - // it('Call to /manifest with a TPEN3 project ID that does not exist. The status should be 404 with a message.', async () => { - // const res = await request(routeTester) - // .get('/manifest/0001') - // expect(res.statusCode).toBe(404) - // expect(res.body).toBeTruthy() - // }) - - // it('Call to /manifest with a TPEN3 project ID that does exist. The status should be 200 with a JSON Manifest in the body.', async () => { - // const res = await request(routeTester) - // .get('/manifest/7085') - // let json = res.body - // try{ - // json = JSON.parse(JSON.stringify(json)) - // } - // catch(err){ - // json = null - // } - // expect(json).not.toBe(null) - // }) - - // TODO routes which use the CRUD capabilities of the /manifest endpoint, such as /manifest/create - -}) diff --git a/manifest/__tests__/exists_unit.test.js b/manifest/__tests__/exists_unit.test.js deleted file mode 100644 index af5e7139..00000000 --- a/manifest/__tests__/exists_unit.test.js +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Test to check if the /manifest endpoint is registered with the app. - * - * @author Bryan Haberberger - * https://github.com/thehabes - * - * */ - -//need to import app to check for the route -import app from '../../app.js' - -describe('Manifest endpoint availability unit test (via a check on the app routes). #exists_unit', () => { - it('/manifest route is registered', () => { - let exists = false - const stack = app._router.stack - for(const middleware of stack){ - if(middleware.regexp && middleware.regexp.toString().includes("/manifest")) { - exists = true - break - } - } - expect(exists).toBe(true) - }) -}) diff --git a/manifest/__tests__/functionality_unit.test.js b/manifest/__tests__/functionality_unit.test.js deleted file mode 100644 index 6d979d45..00000000 --- a/manifest/__tests__/functionality_unit.test.js +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Test the various pieces of logic contained within the /manifest endpoint. - * This should not spin up Express and should not perform end to end tests by calling the endpoint. - * - * @author Bryan Haberberger - * https://github.com/thehabes - * - * */ - -import * as logic from "../manifest.js" -import { jest } from "@jest/globals" - -// Mock the saveManifest function -jest.mock('../manifest.js', () => ({ - ...jest.requireActual('../manifest.js'), - saveManifest: jest.fn().mockResolvedValue({ "@id": "mocked_id" }), - updateManifest: jest.fn().mockResolvedValue({ "@id": "updated_mocked_id" }) -})); -let test_manifest = { "type": "Manifest", "label": {"en":["Test Manifest"]} } -let updated_manifest = {} - -describe.skip('Manifest endpoint functionality unit test (just testing helper functions). #functions_unit', () => { - it('Creates the Manifest', async () => { - test_manifest = await logic.saveManifest(test_manifest) - expect(test_manifest["@id"]).toBeTruthy() - }) - it('Updates the Manifest', async () => { - test_manifest.updated = true - updated_manifest = await logic.updateManifest(test_manifest) - expect(updated_manifest["@id"]).toBeTruthy() - expect(updated_manifest["@id"]).not.toBe(test_manifest["@id"]) - }) - it('Reads for the Manifest', async () => { - const found = await logic.queryForManifestsByDetails({"@id":updated_manifest["@id"]}) - expect(found.length).toBe(1) - }) - it('Deletes the Manifest Stub', async () => { - expect(true).toBe(true) - }) -}) diff --git a/manifest/index.js b/manifest/index.js deleted file mode 100644 index db133b2e..00000000 --- a/manifest/index.js +++ /dev/null @@ -1,139 +0,0 @@ -/** - * Route handler for the /manifest endpoint. - * - * @author Bryan Haberberger - * https://github.com/thehabes - * - * */ - -import express from 'express' -import * as logic from './manifest.js' -import * as utils from '../utilities/shared.js' -import cors from 'cors' -import common_cors from '../utilities/common_cors.json' with {type: 'json'} - -let router = express.Router() -router.use( - cors(common_cors) -) - - -/** - * Do a RESTful HTTP response for a success that happens in the routes below. - * @param res The Express response object - * @param code An HTTP response code integer - * @param data JSON data to send in the response body - * @param message A message to send in the response body - */ -function successfulResponse(res, code, data=null, message=null){ - let data_iri = null - if(data && !Array.isArray(data)) data_iri = data["@id"] ?? data.id - if(data_iri) res.location(data_iri) - res.status(code) - if(data) { - res.json(data) - } - else if(message) { - res.send(message) - } - else{ - res.send() - } -} - - -// Handle a post request which creates the Manifest through TinyPen and gives back the created object -router.route('/create') - .post(async (req, res, next) => { - const j = req.body - const logicResult = await logic.saveManifest(j) - if(logicResult["@id"]){ - successfulResponse(res, 201, logicResult) - } - else{ - utils.respondWithError(res, logicResult.status, logicResult.message) - } - }) - .all((req, res, next) => { - utils.respondWithError(res, 405, 'Improper request method, please use POST.') - }) - - -// Handle a put request which updates an existing Manifest through TinyPen and gives back the updated object -// Note this may just be an alias for /save -router.route('/update') - .put(async (req, res, next) => { - const j = req.body - const logicResult = await logic.updateManifest(j) - if(logicResult["@id"]){ - successfulResponse(res, 200, logicResult) - } - else{ - utils.respondWithError(res, logicResult.status, logicResult.message) - } - }) - .all((req, res, next) => { - utils.respondWithError(res, 405, 'Improper request method, please use PUT.') - }) - -// Handle a post request which queries for existing objects through TinyPen and gives back the matched objects -router.route('/query') - .post(async (req, res, next) => { - const j = req.body - const logicResult = await logic.queryForManifestsByDetails(j) - if(Array.isArray(logicResult)){ - successfulResponse(res, 200, logicResult) - } - else{ - utils.respondWithError(res, logicResult.status, logicResult.message) - } - }) - .all((req, res, next) => { - utils.respondWithError(res, 405, 'Improper request method, please use POST.') - }) - -// Handle a delete request which contains the ID of a Manifest to delete. -router.route('/delete/:id') - .delete(async (req, res, next) => { - let id = req.params.id - const logicResult = await logic.deleteManifest(id) - if(logicResult._dbaction){ - utils.respondWithError(res, logicResult.status, logicResult.message) - } - else{ - successfulResponse(res, 204, null, `${id} is marked as deleted`) - res.status(204) - } - }) - .all((req, res, next) => { - utils.respondWithError(res, 405, 'Improper request method, please use DELETE.') - }) - -// Expect a project id /{id} as part of the route, like /manifest/123 -router.route('/:id') - .get(async (req, res, next) => { - let id = req.params.id - if(!utils.validateID(id)){ - utils.respondWithError(res, 400, 'The TPEN3 project ID must be a number') - } - id = parseInt(id) - const manifestObj = await logic.findTheManifestByProjectID(id) - if(manifestObj){ - successfulResponse(res, 200, manifestObj) - } - else{ - utils.respondWithError(res, 404, `TPEN 3 project "${req.params.id}" does not exist.`) - } - }) - .all((req, res, next) => { - const id = req.params.id - utils.respondWithError(res, 405, `Improper request method to get a manifest by project ID '${id}'. please use GET.`) - }) - -// Handle lack of an action as part of the route. -router.route('/') - .all((req, res, next) => { - utils.respondWithError(res, 404, 'Not found') - }) - -export default router diff --git a/manifest/manifest.js b/manifest/manifest.js deleted file mode 100644 index 5ab867c9..00000000 --- a/manifest/manifest.js +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Logic for the /manifest endpoint. - * - * @author Bryan Haberberger - * https://github.com/thehabes - * - * */ -import DatabaseDriver from "../database/driver.js" -import * as utils from "../utilities/shared.js" - -// This module will use the TinyPEN API (RERUM Mongo DB) -const database = new DatabaseDriver("tiny") - -/** - * A full Manifest object without an ID to be created in RERUM - * @see https://store.rerum.io/v1/API.html#create - */ -export async function saveManifest(manifestJSON){ - return await database.save(manifestJSON) -} - -/** - * A full Manifest object with an ID. This assumes - * the object has changed and needs to be RERUM PUT updated. - * @see https://store.rerum.io/v1/API.html#update - */ -export async function updateManifest(manifestJSON){ - return await database.update(manifestJSON) -} - -/** - * The IRI of a Manifest in RERUM to RERUM delete. - * @see https://store.rerum.io/v1/API.html#delete - */ -export async function deleteManifest(manifestIRI){ - return await database.delete(manifestIRI) -} - -/** - * JSON properties to query for matches against. - * All objects matching these properties will be returned. - * @see https://store.rerum.io/v1/API.html#query - */ -export async function queryForManifestsByDetails(manifestDetails){ - return await database.find(manifestDetails) -} - -/** - * Go into the database to get the Project information for the id input. - * The Project will have a Manifest associated with it. - * Get that Manifest and return it. Return null if no manifest can be produced. - * - * @param id A string or number meant to be a number. - * @return manifest A JSON object that is a Manifest or null. - */ -export async function findTheManifestByProjectID(id=null){ - // A bad ID will not find a Project, therefore not a Manifest either. - if(!utils.validateID(id)) return null - return {"@context":"TODO", "@id": "https://store.rerum.io/v1/id/123test456manifest", "type":"Manifest", "label":{"en":["A Manifest Stub"]}, "tpenProject":id} - // Either a Manifest exists in RERUM that knows this project id - //return await queryForManifestByDetails({"tpenProject": id}) - // Or a Project in our database knows the manifest ID - //const proj = await new Project(id) - //return proj.getManifest() -} diff --git a/package-lock.json b/package-lock.json index 56b6c7b7..04a9ea88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "supertest": "^7.0.0" }, "engines": { - "node": ">=22.14.0" + "node": ">=22.20.0" } }, "node_modules/@ampproject/remapping": { @@ -2806,7 +2806,6 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", From 24aec942579069c84ae12d59529801da0b4d6826 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Oct 2025 15:00:39 -0500 Subject: [PATCH 182/262] Add web-friendly API documentation for TPEN services (#301) * Initial plan * Add web-friendly API documentation Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> * Initial analysis: identify changes needed for API documentation Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * Revert package-lock.json changes to original state Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --- public/API.html | 693 ++++++++++++++++++++++++++++++++++++++++++++++ public/index.html | 62 ++++- 2 files changed, 754 insertions(+), 1 deletion(-) create mode 100644 public/API.html diff --git a/public/API.html b/public/API.html new file mode 100644 index 00000000..2888bb8f --- /dev/null +++ b/public/API.html @@ -0,0 +1,693 @@ + + + + + + + TPEN Services API Documentation + + + +

TPEN Services API Documentation

+ +

This document provides an overview of the available routes in the TPEN Services API. These routes allow interaction with the application for various functionalities.

+ +
+

Base URL

+ +
+ +
+

Table of Contents

+ +
+ +

1. Authentication

+ +

Endpoints marked with 🔐 require authentication and expect a valid JWT token in the Authorization header. Use the public TPEN3 login to get one of these JWT tokens.

+ +

2. Project

+ +
+

POST/project/create 🔐

+

Description: Create a new project. This is a high-skill maneuver requiring a complete project object.

+ +

Request Body:

+ 
{
+    "label": "string",
+    "metadata": [ { Metadata } ],
+    "layers": [ { Layer } ],
+    "manifests": [ "URIs<Manifest>" ],
+    "creator": "URI<Agent>",
+    "group": "hexstring"
+}
+ +

Responses:

+
+ 201 + Project created successfully + 400 + Project creation failed, validation errors + 401 + Unauthorized + 500 + Server error +
+

Note: The Location header of a successful response contains the Project ID.

+
+ +
+

POST/import?createFrom="URL" 🔐

+

Description: Create a new project by importing a web resource.

+ +

Request Body:

+ 
{
+    "url": "URL<IIIF:Manifest>"
+}
+ +

Responses:

+
+ 201 + Project created successfully + 400 + Project creation failed, validation errors + 401 + Unauthorized + 500 + Server error +
+

Note: The Location header contains the Project ID. The project will be created with the label and metadata of the imported resource.

+
+ +
+

GET/project/:id 🔐

+

Description: Retrieve a project by ID.

+ +

Parameters:

+
    +
  • id: ID of the project
    • +
+ +

Responses:

+
+ 200 + Project found + 401 + Unauthorized + 403 + Forbidden + 404 + Project not found + 500 + Server error +
+ +

Success Response Example:

+ 
{
+    "id": "string",
+    "label": "string",
+    "metadata": [ { Metadata } ],
+    "creator": "URI<Agent>",
+    "layers": [ { Layer } ],
+    "manifests": [ "URIs<Manifest>" ],
+    "group": "hexstring",
+    "tools": [ "string" ],
+    "options": { OptionsMap }
+}
+

Note: The response is not a complete Project data object, but a projection designed for use in the client interface.

+
+ +

3. Collaborators

+

Manage the users and roles in a Project.

+ +
+

POST/project/:projectId/invite-member 🔐

+

Description: Invite a user to a project. If the user does not have a TPEN account, they will be sent an email invitation.

+ +

Parameters:

+
    +
  • projectId: ID of the project as a hexstring or the Project slug
    • +
+ +

Request Body:

+ 
{
+    "email": "string",
+    "roles": ["string"] | "string"
+}
+
    +
  • email: The email address of the user to invite
    • +
  • roles: The roles of the user in the project as an array or space-delimited string
    • +
+ +

Responses:

+
+ 200 + User invited successfully + 400 + User invitation failed, validation errors + 401 + Unauthorized + 403 + Forbidden + 500 + Server error +
+

Note: This API is not able to track the status of the invitation. Email addresses that fail to be delivered or are rejected by the recipient will not be reported.

+
+ +
+

POST/project/:projectId/remove-member 🔐

+

Description: Remove a user from a project group.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
+ +

Request Body:

+ 
{
+    "userID": "string"
+}
+ +

Responses:

+
+ 204 + User removed successfully + 401 + Unauthorized + 403 + Forbidden + 500 + Server error +
+

Note: This removes a user and their roles from the project. The user will no longer have access to the project, but their annotations will remain with full attribution.

+
+ +
+

PUT/project/:projectId/collaborator/:collaboratorId/setRoles 🔐

+

Description: Set the roles of a User in a project, replacing all currently defined roles.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
  • collaboratorId: ID of the collaborator
    • +
+ +

Request Body:

+ 
{
+    "roles": ["string"] | "string"
+}
+ +

Responses:

+
+ 200 + Roles set successfully + 400 + Roles setting failed, validation errors + 401 + Unauthorized + 403 + Forbidden + 500 + Server error +
+

Note: The User requesting this action must have permissions to set roles for the collaborator. The OWNER role cannot be set using this endpoint.

+
+ +
+

POST/project/:projectId/switch/owner 🔐

+

Description: Transfer ownership of a project to another user.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
+ +

Request Body:

+ 
{
+    "newOwnerId": "hexstring"
+}
+ +

Responses:

+
+ 200 + Ownership transferred successfully + 400 + Ownership transfer failed, validation errors + 401 + Unauthorized + 403 + Forbidden + 500 + Server error +
+

Note: The User requesting this action must be the current owner of the project. The OWNER role will be removed from the current owner and assigned to the new owner. The new owner must be a member of the project. If the current owner has no other roles, the CONTRIBUTOR role will be assigned to them.

+
+ +
+

POST/project/:projectId/setCustomRoles 🔐

+

Description: Set custom roles for a Project group. Custom roles must be provided as a JSON object with keys as roles and values as arrays of permissions or space-delimited strings.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
+ +

Request Body:

+ 
{
+    "roles": {
+        "roleName": ["permission1", "permission2"] | "space-delimited permissions"
+    }
+}
+ +

Responses:

+
+ 200 + Custom roles set successfully + 400 + Invalid request, validation errors + 401 + Unauthenticated request + 403 + Permission denied + 500 + Server error +
+

Note: The User requesting this action must have permissions to update roles. Default roles cannot be modified using this endpoint. Custom roles can be complicated and there is more detailed description of their use in the Cookbook.

+
+ +

4. Users

+

Private account modification, personal details, and public profile retrieval.

+ +
+

GET/my/profile 🔐

+

Description: Retrieve the profile of the authenticated user.

+ +

Responses:

+
+ 200 + Profile found + 401 + Unauthorized + 500 + Server error +
+ +

Success Response Example:

+ 
{
+    "_id": "hexstring",
+    "_sub": "string",
+    "agent": "URI<Agent>",
+    "email": "string",
+    "profile": {
+        "displayName": "string",
+        "custom": Any
+    },
+    "name": "string"
+}
+

Note: Users can always see and manipulate their own profile. The profile object is a projection of the full user object.

+
+ +
+

GET/my/projects 🔐

+

Description: Retrieve a list of projects the authenticated user is a member of.

+ +

Responses:

+
+ 200 + Projects found + 401 + Unauthorized + 500 + Server error +
+ +

Success Response Example:

+ 
[
+    {
+        "_id": "hexstring",
+        "label": "string",
+        "roles": ["string"]
+    }, ...
+]
+

Note: The response is a list of projects the user is a member of regardless of the permissions afforded to them in each project.

+
+ +
+

GET/user/:id

+

Description: Retrieve the public profile of a user.

+ +

Parameters:

+
    +
  • id: ID of the user
    • +
+ +

Responses:

+
+ 200 + Profile found + 404 + Profile not found + 500 + Server error +
+ +

Success Response Example:

+ 
{
+    "_id": "hexstring",
+    "displayName": "string",
+    "custom": Any
+}
+

Note: The response is a projection of the full user object. The public profile is available to all users and serialized into this response with whatever the user has chosen to share. The custom field is not an actual property - it is a placeholder for any additional fields the user has added to their profile. The displayName and _id fields are always present.

+
+ +

5. Layers

+ +
+

POST/project/:projectId/layer 🔐

+

Description: Create a new layer within a project.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
+ +

Request Body:

+ 
{
+    "label": "string",
+    "canvases": ["string"]
+}
+ +

Responses:

+
+ 201 + Layer created successfully + 400 + Invalid input + 401 + Unauthorized + 404 + Project not found + 500 + Server error +
+ +

Success Response Example:

+ 
{
+    "id": "string",
+    "label": "string",
+    "pages": ["string"]
+}
+

Note: Requests without at least one canvas are considered invalid.

+
+ +
+

PUT/project/:projectId/layer/:layerId 🔐

+

Description: Update an existing layer within a project.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
  • layerId: ID of the layer
    • +
+ +

Request Body:

+ 
{
+    "label": "string",
+    "canvases": ["string"]
+}
+ +

Responses:

+
+ 200 + Layer updated successfully + 400 + Invalid input + 401 + Unauthorized + 404 + Layer or project not found + 500 + Server error +
+ +

Success Response Example:

+ 
{
+    "id": "string",
+    "label": "string",
+    "pages": ["string"]
+}
+

Note: You may not empty the canvases of an existing layer. If the canvases property is an empty array the request will be treated as if it did not contain the canvases property at all.

+
+ +
+

GET/project/:projectId/layer/:layerId

+

Description: Get an existing layer within a project.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
  • layerId: ID of the layer
    • +
+ +

Responses:

+
+ 200 + Layer found + 500 + Server error +
+ +

Success Response Example:

+ 
{
+    "@context": "string",
+    "id": "string",
+    "type": "AnnotationCollection",
+    "label": {
+        "none":[
+            "TPEN3 Layer"
+        ]
+    },
+    "total": "integer",
+    "first": "string",
+    "last": "string"
+}
+
+ +
+

GET/project/:projectId/layer/:layerId/page/:pageid

+

GET/project/:projectId/page/:pageid

+

Description: Get an existing page within a project.

+ +

Parameters:

+
    +
  • projectId: ID of the project
    • +
  • layerId: Optional. ID of the layer
    • +
  • pageId: The ID of the page
    • +
+ +

Responses:

+
+ 200 + Page found + 500 + Server error +
+ +

Success Response Example:

+ 
{
+    "@context": "string",
+    "id": "string",
+    "type": "AnnotationPage",
+    "label": {
+        "none":[
+            "TPEN3 Page"
+        ]
+    },
+    "target": "string",
+    "items":[ {"type": "Canvas"} ],
+    "prev": "string",
+    "next": "string"
+}
+
+ +
+

TPEN Services API Documentation | Generated from API.md

+
+ + \ No newline at end of file diff --git a/public/index.html b/public/index.html index 58e37296..bf4e4f23 100644 --- a/public/index.html +++ b/public/index.html @@ -1,8 +1,68 @@ + TPEN Services + - 
TPEN3 SERVICES BABY!!!
+

TPEN3 Services

+

Welcome to the TPEN3 Services API. This provides backend services for the TPEN3 transcription platform.

+ +
+ 📚 API Documentation + 🌐 TPEN3 Application +
+ +

The API documentation provides comprehensive details about all available endpoints, authentication requirements, request/response formats, and examples.

\ No newline at end of file From c333b5f74dff250eca5a613749d1d51c04833e66 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 3 Oct 2025 16:10:05 -0400 Subject: [PATCH 183/262] NPM Package Updates for package.json (#359) * Update Packages * Express wildcard syntax update * rename function for jest * Refactor to cancel unnecessary test and touch up existing tests * change documentation here, since the behavior from the package changed * Update tool configurations and URLs Enabled custom tags and URLs for 'inspect' and 'history' tools, disabled 'line-breaking', 'compare-pages', 'enigma', and 'latin-vulgate' tools, and updated the Enigma tool URL. * Roll back express-oauth2-jwt-bearer and undo refactor * Roll back express-oauth2-jwt-bearer and undo refactor * undiff * cleanup from npm-check recommendations (#364) --------- Co-authored-by: cubap --- app.js | 4 +- auth/__tests__/auth_unit_test.js | 11 +- classes/HotKeys/__tests__/hotkeys.test.js | 8 +- classes/Tools/Tools.js | 18 +- classes/User/__tests__/unit.test.js | 23 +- package-lock.json | 3916 +++++++++-------- package.json | 44 +- project/__tests__/exists_unit.test.js | 78 +- userProfile/__tests__/end_to_end_unit.test.js | 26 +- userProfile/__tests__/exists_unit.test.js | 32 +- utilities/proxy.js | 2 +- 11 files changed, 2326 insertions(+), 1836 deletions(-) diff --git a/app.js b/app.js index 3732c022..b588562f 100644 --- a/app.js +++ b/app.js @@ -42,7 +42,7 @@ app.use(express.static(path.join(__dirname, 'public'))) * For any request that comes through to the app, check whether or not we are in maintenance mode. * If we are, then respond with a 503 and a message. Otherwise, continue on. */ -app.all('*', (req, res, next) => { +app.all('*_', (req, res, next) => { if (process.env.DOWN === 'true') { return res.status(503).json({ message: @@ -62,7 +62,7 @@ app.use('/proxy', proxyRouter) app.use('/beta', feedbackRouter) //catch 404 because of an invalid site path -app.use('*', (req, res) => { +app.use('*_', (req, res) => { res.status(404).json({ message: res.statusMessage ?? 'This page does not exist' }) }) diff --git a/auth/__tests__/auth_unit_test.js b/auth/__tests__/auth_unit_test.js index f66cfb6e..2801be63 100644 --- a/auth/__tests__/auth_unit_test.js +++ b/auth/__tests__/auth_unit_test.js @@ -13,20 +13,21 @@ const TIME_OUT = process.env.TEST_TIMEOUT ?? 5000 describe("auth0Middleware #auth_test", () => { it( - "should return 401 Unauthorized without valid token", + "should return 401 without Authorization Header", async () => { const res = await request(app).get("/protected-route") - expect(res.status).toBe(401) }, TIME_OUT ) it( - "No user should be found on req if token is invalid", + "should return 401 with invalid token from Authorization Header", async () => { - const res = await request(app).get("/protected-route") - expect(res.req.user).toBeUndefined() + const res = await request(app) + .get("/protected-route") + .set("Authorization", `Bearer 123123123123123123123123123`) + expect(res.status).toBe(401) }, TIME_OUT ) diff --git a/classes/HotKeys/__tests__/hotkeys.test.js b/classes/HotKeys/__tests__/hotkeys.test.js index 3e1a753d..9e661bc7 100644 --- a/classes/HotKeys/__tests__/hotkeys.test.js +++ b/classes/HotKeys/__tests__/hotkeys.test.js @@ -1,7 +1,7 @@ import Hotkeys from '../Hotkeys.js' test('Hotkeys constructor should throw an error if _id is not provided', () => { - expect(() => new Hotkeys()).toThrowError(new Error("_id is required")) + expect(() => new Hotkeys()).toThrow(new Error("_id is required")) }) test('Hotkeys constructor should initialize with _id and symbols', () => { @@ -19,7 +19,7 @@ test('assign should set symbols and return the instance', () => { test('assign should throw an error if symbols are not strings', () => { const hotkeys = new Hotkeys('123') - expect(() => hotkeys.assign([1, 2])).toThrowError(new Error("All symbols must be strings")) + expect(() => hotkeys.assign([1, 2])).toThrow(new Error("All symbols must be strings")) }) test('add should add a symbol if it does not exist and return the instance', () => { @@ -36,7 +36,7 @@ test('add should not add a symbol if it already exists', () => { test('add should throw an error if symbol is not a string', () => { const hotkeys = new Hotkeys('123') - expect(() => hotkeys.add(1)).toThrowError(new Error("Symbol must be a string")) + expect(() => hotkeys.add(1)).toThrow(new Error("Symbol must be a string")) }) test('remove should remove a symbol if it exists and return the instance', () => { @@ -47,5 +47,5 @@ test('remove should remove a symbol if it exists and return the instance', () => test('remove should throw an error if symbol is not a string', () => { const hotkeys = new Hotkeys('123') - expect(() => hotkeys.remove(1)).toThrowError(new Error("Symbol must be a string")) + expect(() => hotkeys.remove(1)).toThrow(new Error("Symbol must be a string")) }) diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index 8d58b945..db982633 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -196,9 +196,9 @@ export default class Tools { "toolName": "inspect", "custom": { "enabled": true, - "tagName": "" + "tagName": "tpen-magnifier-tool" }, - "url": "", + "url": "https://app.t-pen.org/components/magnifier-tool/index.js", "location": "drawer" }, { @@ -216,9 +216,9 @@ export default class Tools { "toolName": "history", "custom": { "enabled": true, - "tagName": "" + "tagName": "tpen-line-history" }, - "url": "", + "url": "https://app.t-pen.org/components/line-history/index.js", "location": "pane" }, { @@ -235,7 +235,7 @@ export default class Tools { "label": "Line Breaking", "toolName": "line-breaking", "custom": { - "enabled": true, + "enabled": false, "tagName": "" }, "url": "", @@ -245,7 +245,7 @@ export default class Tools { "label": "Compare Pages", "toolName": "compare-pages", "custom": { - "enabled": true, + "enabled": false, "tagName": "" }, "url": "", @@ -264,9 +264,9 @@ export default class Tools { { "label": "Enigma", "toolName": "enigma", - "url": "https://ciham-digital.huma-num.fr/enigma/", + "url": "https://http://enigma.huma-num.fr/", "custom": { - "enabled": true, + "enabled": false, "tagName": "" }, "location": "pane" @@ -286,7 +286,7 @@ export default class Tools { "toolName": "latin-vulgate", "url": "https://vulsearch.sourceforge.net/cgi-bin/vulsearch", "custom": { - "enabled": true, + "enabled": false, "tagName": "" }, "location": "pane" diff --git a/classes/User/__tests__/unit.test.js b/classes/User/__tests__/unit.test.js index 3a527bd4..d9893ffb 100644 --- a/classes/User/__tests__/unit.test.js +++ b/classes/User/__tests__/unit.test.js @@ -90,12 +90,21 @@ describe("GET /my/profile #user_class", () => { expect(response.body.userData).toEqual({name: "VOO"}) }) - it("should return 401 if user is not authenticated", async () => { + it("should return 401 if user is not authenticated (no authorization header)", async () => { const appWithoutAuth = express() appWithoutAuth.use("/my", privateProfileRouter) const response = await request(appWithoutAuth).get("/my/profile") expect(response.status).toBe(401) }) + + it("should return 401 if user is not authenticated (invalid authorization header)", async () => { + const appWithoutAuth = express() + appWithoutAuth.use("/my", privateProfileRouter) + const response = await request(appWithoutAuth) + .get("/my/profile") + .set("Authorization", `Bearer 123123123123123123123123123`) + expect(response.status).toBe(401) + }) }) describe("GET /my/projects #user_class", () => { @@ -129,11 +138,19 @@ describe("GET /my/projects #user_class", () => { } } }) - - it("should return 401 if user is not authenticated", async () => { + it("should return 401 if user is not authenticated (no authorization header)", async () => { const appWithoutAuth = express() appWithoutAuth.use("/my", privateProfileRouter) const response = await request(appWithoutAuth).get("/my/profile") expect(response.status).toBe(401) }) + + it("should return 401 if user is not authenticated (invalid authorization header)", async () => { + const appWithoutAuth = express() + appWithoutAuth.use("/my", privateProfileRouter) + const response = await request(appWithoutAuth) + .get("/my/profile") + .set("Authorization", `Bearer 123123123123123123123123123`) + expect(response.status).toBe(401) + }) }) diff --git a/package-lock.json b/package-lock.json index 04a9ea88..a260869f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,79 +9,91 @@ "version": "0.0.0", "license": "CC-BY", "dependencies": { - "@iiif/helpers": "^1.3.1", - "@mongodb-js/saslprep": "^1.2.2", + "@iiif/helpers": "^1.5.3", + "@jest/globals": "^30.2.0", "cookie-parser": "^1.4.7", "cors": "^2.8.5", - "debug": "^4.4.0", - "dompurify": "^3.2.4", - "dotenv": "^16.4.7", - "dotenv-expand": "^12.0.1", - "express": "^4.21.2", - "express-oauth2-jwt-bearer": "^1.6.0", - "express-urlrewrite": "^2.0.3", - "http-errors": "^2.0.0", + "debug": "^4.4.3", + "dompurify": "^3.2.7", + "dotenv": "^17.2.3", + "dotenv-expand": "^12.0.3", + "express": "^5.1.0", + "express-list-endpoints": "^7.1.1", + "express-oauth2-jwt-bearer": "~1.6.1", "image-size": "^2.0.2", - "jsdom": "^26.0.0", - "manifesto.js": "^4.2.21", - "mariadb": "^3.4.0", - "marked": "^15.0.7", - "mongodb": "^6.12.0", - "morgan": "^1.10.0", - "nodemailer": "^6.9.16", + "jsdom": "^27.0.0", + "mariadb": "^3.4.5", + "marked": "^16.3.0", + "mime-types": "^3.0.1", + "mongodb": "^6.20.0", + "morgan": "^1.10.1", + "nodemailer": "^7.0.6", "tpen3-services": "file:" }, "devDependencies": { - "@jest-mock/express": "^2.1.0", - "jest": "^29.7.0", - "jest-cli": "^29.7.0", - "jest-esm-transformer": "^1.0.0", - "nodemon": "^3.1.9", - "sinon": "^19.0.2", - "supertest": "^7.0.0" + "jest": "^30.2.0", + "nodemon": "^3.1.10", + "sinon": "^21.0.0", + "supertest": "^7.1.4" }, "engines": { "node": ">=22.20.0" } }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dev": true, - "license": "Apache-2.0", + "node_modules/@asamuzakjp/css-color": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.0.5.tgz", + "integrity": "sha512-lMrXidNhPGsDjytDy11Vwlb6OIGrT3CmLg3VWNFyWkLWtijKl7xjvForlh8vuj0SHGjgl4qZEQzUmYTeQA2JFQ==", + "license": "MIT", "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, + "@csstools/css-calc": "^2.1.4", + "@csstools/css-color-parser": "^3.1.0", + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4", + "lru-cache": "^11.2.1" + } + }, + "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": { + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", + "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", + "license": "ISC", "engines": { - "node": ">=6.0.0" + "node": "20 || >=22" } }, - "node_modules/@asamuzakjp/css-color": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz", - "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==", + "node_modules/@asamuzakjp/dom-selector": { + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.5.7.tgz", + "integrity": "sha512-cvdTPsi2qC1c22UppvuVmx/PDwuc6+QQkwt9OnwQD6Uotbh//tb2XDF0OoK2V0F4b8d02LIwNp3BieaDMAhIhA==", "license": "MIT", "dependencies": { - "@csstools/css-calc": "^2.1.3", - "@csstools/css-color-parser": "^3.0.9", - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3", - "lru-cache": "^10.4.3" + "@asamuzakjp/nwsapi": "^2.3.9", + "bidi-js": "^1.0.3", + "css-tree": "^3.1.0", + "is-potential-custom-element-name": "^1.0.1", + "lru-cache": "^11.2.2" } }, - "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "license": "ISC" + "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": { + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", + "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", + "license": "ISC", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@asamuzakjp/nwsapi": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz", + "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==", + "license": "MIT" }, "node_modules/@babel/code-frame": { "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", @@ -93,32 +105,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz", - "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==", - "dev": true, + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz", + "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz", - "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==", - "dev": true, + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz", + "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", "license": "MIT", "dependencies": { - "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.0", + "@babel/generator": "^7.28.3", "@babel/helper-compilation-targets": "^7.27.2", - "@babel/helper-module-transforms": "^7.27.3", - "@babel/helpers": "^7.27.6", - "@babel/parser": "^7.28.0", + "@babel/helper-module-transforms": "^7.28.3", + "@babel/helpers": "^7.28.4", + "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", - "@babel/traverse": "^7.28.0", - "@babel/types": "^7.28.0", + "@babel/traverse": "^7.28.4", + "@babel/types": "^7.28.4", + "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -134,14 +144,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz", - "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==", - "dev": true, + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", + "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.0", - "@babel/types": "^7.28.0", + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -154,7 +163,6 @@ "version": "7.27.2", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.27.2", @@ -171,7 +179,6 @@ "version": "7.28.0", "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -181,7 +188,6 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", - "dev": true, "license": "MIT", "dependencies": { "@babel/traverse": "^7.27.1", @@ -192,15 +198,14 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz", - "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==", - "dev": true, + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", + "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1", - "@babel/traverse": "^7.27.3" + "@babel/traverse": "^7.28.3" }, "engines": { "node": ">=6.9.0" @@ -213,7 +218,6 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -223,7 +227,6 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -233,7 +236,6 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -243,34 +245,31 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.2.tgz", - "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==", - "dev": true, + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz", + "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==", "license": "MIT", "dependencies": { "@babel/template": "^7.27.2", - "@babel/types": "^7.28.2" + "@babel/types": "^7.28.4" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", - "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", - "dev": true, + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", + "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", "license": "MIT", "dependencies": { - "@babel/types": "^7.28.0" + "@babel/types": "^7.28.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -283,7 +282,6 @@ "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -296,7 +294,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -309,7 +306,6 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" @@ -322,7 +318,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -338,7 +333,6 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" @@ -354,7 +348,6 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -367,7 +360,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -380,7 +372,6 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" @@ -396,7 +387,6 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -409,7 +399,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -422,7 +411,6 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -435,7 +423,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -448,7 +435,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -461,7 +447,6 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -474,7 +459,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -490,7 +474,6 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -506,26 +489,8 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz", - "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==", - "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.27.1", "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { @@ -539,7 +504,6 @@ "version": "7.27.2", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -551,18 +515,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz", - "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==", - "dev": true, + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz", + "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.0", + "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.0", + "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", - "@babel/types": "^7.28.0", + "@babel/types": "^7.28.4", "debug": "^4.3.1" }, "engines": { @@ -570,10 +533,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", - "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", - "dev": true, + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", + "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -591,9 +553,9 @@ "license": "MIT" }, "node_modules/@csstools/color-helpers": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz", - "integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz", + "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==", "funding": [ { "type": "github", @@ -633,9 +595,9 @@ } }, "node_modules/@csstools/css-color-parser": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz", - "integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz", + "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==", "funding": [ { "type": "github", @@ -648,7 +610,7 @@ ], "license": "MIT", "dependencies": { - "@csstools/color-helpers": "^5.0.2", + "@csstools/color-helpers": "^5.1.0", "@csstools/css-calc": "^2.1.4" }, "engines": { @@ -681,6 +643,28 @@ "@csstools/css-tokenizer": "^3.0.4" } }, + "node_modules/@csstools/css-syntax-patches-for-csstree": { + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.14.tgz", + "integrity": "sha512-zSlIxa20WvMojjpCSy8WrNpcZ61RqfTfX3XTaOeVlGJrt/8HF3YbzgFZa01yTbT4GWQLwfTcC3EB8i3XnB647Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT-0", + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, "node_modules/@csstools/css-tokenizer": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz", @@ -700,16 +684,44 @@ "node": ">=18" } }, - "node_modules/@edsilv/http-status-codes": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz", - "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==", - "license": "MIT" + "node_modules/@emnapi/core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz", + "integrity": "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.1.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz", + "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/wasi-threads": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz", + "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } }, "node_modules/@iiif/helpers": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.4.0.tgz", - "integrity": "sha512-bUNJW7kJNl50wzpeFx3ctKl5F6TqzqDYqOg3ub6vzq/uNreFczbYYRkeSIrl8fCc5Zn7hhqpkbBnHMLLU8frJQ==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.5.3.tgz", + "integrity": "sha512-Ofqr6KA5bu4htrXukMrw6Fn10dpVvCD8ksahpf/6EUfa1hjyaIBLB/8JL+5jK5ipO8TPqwMREEFbo/h4r5vY5w==", "license": "MIT", "dependencies": { "@iiif/presentation-2": "1.0.4", @@ -723,13 +735,13 @@ "svg-arc-to-cubic-bezier": "^3.2.0" }, "peerDependencies": { - "@iiif/parser": "^2.2.0" + "@iiif/parser": "^2.2.3" } }, "node_modules/@iiif/parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.2.1.tgz", - "integrity": "sha512-pHz4WR+1LXm9VglHmcPKthqOkDRB8YzbDkGJE82wgQyZyh8l0iXQcq9MysSqxK5GuKi8qBaOTTUdiFlb1r2ARA==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.2.4.tgz", + "integrity": "sha512-42izQ8jhS6vhjhWGxmK6b3kyQOlfjb/fh6mBLloDcvqgk+JS0BbsYsNtftQDvnmWqvliTQYnQ2XLxItvx6gGHQ==", "license": "MIT", "peer": true, "dependencies": { @@ -766,17 +778,28 @@ "@iiif/presentation-3": "^2.0.5" } }, - "node_modules/@iiif/vocabulary": { - "version": "1.0.29", - "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.29.tgz", - "integrity": "sha512-mT3bySFvKvmWpjjuzLI2Bd6P+/R2TDF613ADfHy8FI4CNEURJzqCLg5t58eoAK2Ipdwpalvwmc89Xrr2sDHr+w==", - "license": "MIT" + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, "license": "ISC", "dependencies": { "camelcase": "^5.3.1", @@ -793,78 +816,67 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/@jest-mock/express": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@jest-mock/express/-/express-2.1.0.tgz", - "integrity": "sha512-wwij1960SVxJL+v5Eqw3Akn3S5TLfCtHnFqs2K9Zto7RLU5I/7YhOsYDZQfNcnGyiBdisDz5iT21SRO1CVfvKA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/express": "^4.17.21" - } - }, "node_modules/@jest/console": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", - "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.2.0.tgz", + "integrity": "sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", + "@jest/types": "30.2.0", "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", + "chalk": "^4.1.2", + "jest-message-util": "30.2.0", + "jest-util": "30.2.0", "slash": "^3.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/core": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", - "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.2.0.tgz", + "integrity": "sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/console": "^29.7.0", - "@jest/reporters": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", + "@jest/console": "30.2.0", + "@jest/pattern": "30.0.1", + "@jest/reporters": "30.2.0", + "@jest/test-result": "30.2.0", + "@jest/transform": "30.2.0", + "@jest/types": "30.2.0", "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-changed-files": "^29.7.0", - "jest-config": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-resolve-dependencies": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" + "ansi-escapes": "^4.3.2", + "chalk": "^4.1.2", + "ci-info": "^4.2.0", + "exit-x": "^0.2.2", + "graceful-fs": "^4.2.11", + "jest-changed-files": "30.2.0", + "jest-config": "30.2.0", + "jest-haste-map": "30.2.0", + "jest-message-util": "30.2.0", + "jest-regex-util": "30.0.1", + "jest-resolve": "30.2.0", + "jest-resolve-dependencies": "30.2.0", + "jest-runner": "30.2.0", + "jest-runtime": "30.2.0", + "jest-snapshot": "30.2.0", + "jest-util": "30.2.0", + "jest-validate": "30.2.0", + "jest-watcher": "30.2.0", + "micromatch": "^4.0.8", + "pretty-format": "30.2.0", + "slash": "^3.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -875,117 +887,142 @@ } } }, + "node_modules/@jest/diff-sequences": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz", + "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==", + "license": "MIT", + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, "node_modules/@jest/environment": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", - "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.2.0.tgz", + "integrity": "sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==", "license": "MIT", "dependencies": { - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", + "@jest/fake-timers": "30.2.0", + "@jest/types": "30.2.0", "@types/node": "*", - "jest-mock": "^29.7.0" + "jest-mock": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.2.0.tgz", + "integrity": "sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==", "license": "MIT", "dependencies": { - "expect": "^29.7.0", - "jest-snapshot": "^29.7.0" + "expect": "30.2.0", + "jest-snapshot": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/expect-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", - "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.2.0.tgz", + "integrity": "sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==", "license": "MIT", "dependencies": { - "jest-get-type": "^29.6.3" + "@jest/get-type": "30.1.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", - "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.2.0.tgz", + "integrity": "sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==", "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", - "@sinonjs/fake-timers": "^10.0.2", + "@jest/types": "30.2.0", + "@sinonjs/fake-timers": "^13.0.0", "@types/node": "*", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" + "jest-message-util": "30.2.0", + "jest-mock": "30.2.0", + "jest-util": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/get-type": { + "version": "30.1.0", + "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz", + "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==", + "license": "MIT", + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/globals": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", - "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.2.0.tgz", + "integrity": "sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==", + "license": "MIT", + "dependencies": { + "@jest/environment": "30.2.0", + "@jest/expect": "30.2.0", + "@jest/types": "30.2.0", + "jest-mock": "30.2.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/pattern": { + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz", + "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==", "license": "MIT", "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/types": "^29.6.3", - "jest-mock": "^29.7.0" + "@types/node": "*", + "jest-regex-util": "30.0.1" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/reporters": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", - "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.2.0.tgz", + "integrity": "sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", + "@jest/console": "30.2.0", + "@jest/test-result": "30.2.0", + "@jest/transform": "30.2.0", + "@jest/types": "30.2.0", + "@jridgewell/trace-mapping": "^0.3.25", "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", + "chalk": "^4.1.2", + "collect-v8-coverage": "^1.0.2", + "exit-x": "^0.2.2", + "glob": "^10.3.10", + "graceful-fs": "^4.2.11", "istanbul-lib-coverage": "^3.0.0", "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", + "istanbul-lib-source-maps": "^5.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", + "jest-message-util": "30.2.0", + "jest-util": "30.2.0", + "jest-worker": "30.2.0", "slash": "^3.0.0", - "string-length": "^4.0.1", - "strip-ansi": "^6.0.0", + "string-length": "^4.0.2", "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -997,143 +1034,162 @@ } }, "node_modules/@jest/schemas": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", - "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "dev": true, + "version": "30.0.5", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz", + "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==", + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.34.0" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/@jest/snapshot-utils": { + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz", + "integrity": "sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==", "license": "MIT", "dependencies": { - "@sinclair/typebox": "^0.27.8" + "@jest/types": "30.2.0", + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "natural-compare": "^1.4.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/source-map": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", - "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz", + "integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.18", - "callsites": "^3.0.0", - "graceful-fs": "^4.2.9" + "@jridgewell/trace-mapping": "^0.3.25", + "callsites": "^3.1.0", + "graceful-fs": "^4.2.11" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/test-result": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", - "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.2.0.tgz", + "integrity": "sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==", "dev": true, "license": "MIT", "dependencies": { - "@jest/console": "^29.7.0", - "@jest/types": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" + "@jest/console": "30.2.0", + "@jest/types": "30.2.0", + "@types/istanbul-lib-coverage": "^2.0.6", + "collect-v8-coverage": "^1.0.2" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/test-sequencer": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", - "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz", + "integrity": "sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==", "dev": true, "license": "MIT", "dependencies": { - "@jest/test-result": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", + "@jest/test-result": "30.2.0", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.2.0", "slash": "^3.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/transform": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", - "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.2.0.tgz", + "integrity": "sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==", "license": "MIT", "dependencies": { - "@babel/core": "^7.11.6", - "@jest/types": "^29.6.3", - "@jridgewell/trace-mapping": "^0.3.18", - "babel-plugin-istanbul": "^6.1.1", - "chalk": "^4.0.0", + "@babel/core": "^7.27.4", + "@jest/types": "30.2.0", + "@jridgewell/trace-mapping": "^0.3.25", + "babel-plugin-istanbul": "^7.0.1", + "chalk": "^4.1.2", "convert-source-map": "^2.0.0", "fast-json-stable-stringify": "^2.1.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "micromatch": "^4.0.4", - "pirates": "^4.0.4", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.2.0", + "jest-regex-util": "30.0.1", + "jest-util": "30.2.0", + "micromatch": "^4.0.8", + "pirates": "^4.0.7", "slash": "^3.0.0", - "write-file-atomic": "^4.0.2" + "write-file-atomic": "^5.0.1" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/types": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", - "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.2.0.tgz", + "integrity": "sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==", "license": "MIT", "dependencies": { - "@jest/schemas": "^29.6.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", + "@jest/pattern": "30.0.1", + "@jest/schemas": "30.0.5", + "@types/istanbul-lib-coverage": "^2.0.6", + "@types/istanbul-reports": "^3.0.4", "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" + "@types/yargs": "^17.0.33", + "chalk": "^4.1.2" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz", - "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==", - "dev": true, + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" } }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz", - "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==", - "dev": true, + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.29", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz", - "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==", - "dev": true, + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -1141,14 +1197,27 @@ } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz", - "integrity": "sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.1.tgz", + "integrity": "sha512-6nZrq5kfAz0POWyhljnbWQQJQ5uT8oE2ddX303q1uY0tWsivWKgBDXBBvuFPwOqRRalXJuVO9EjOdVtuhLX0zg==", "license": "MIT", "dependencies": { "sparse-bitfield": "^3.0.3" } }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", + "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "^1.4.3", + "@emnapi/runtime": "^1.4.3", + "@tybys/wasm-util": "^0.10.0" + } + }, "node_modules/@noble/hashes": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", @@ -1172,31 +1241,51 @@ "@noble/hashes": "^1.1.5" } }, - "node_modules/@sinclair/typebox": { - "version": "0.27.8", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@pkgr/core": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz", + "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==", + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/pkgr" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.34.41", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz", + "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==", "license": "MIT" }, "node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" } }, "node_modules/@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.0" + "@sinonjs/commons": "^3.0.1" } }, "node_modules/@sinonjs/samsam": { @@ -1220,12 +1309,16 @@ "node": ">=4" } }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", - "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "node_modules/@tybys/wasm-util": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", + "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==", "dev": true, - "license": "(Unlicense OR Apache-2.0)" + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } }, "node_modules/@types/babel__core": { "version": "7.20.5", @@ -1272,88 +1365,22 @@ "@babel/types": "^7.28.2" } }, - "node_modules/@types/body-parser": { - "version": "1.19.6", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", - "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "node_modules/@types/connect": { - "version": "3.4.38", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", - "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/express": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz", - "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.33", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "node_modules/@types/express-serve-static-core": { - "version": "4.19.6", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz", - "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*", - "@types/send": "*" - } - }, "node_modules/@types/geojson": { "version": "7946.0.13", "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==", "license": "MIT" }, - "node_modules/@types/graceful-fs": { - "version": "4.1.9", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", - "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/http-errors": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", - "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true, "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", - "dev": true, "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" @@ -1363,70 +1390,24 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", - "dev": true, "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } }, - "node_modules/@types/mime": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", - "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/node": { - "version": "24.2.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz", - "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==", + "version": "24.6.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz", + "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==", "license": "MIT", "dependencies": { - "undici-types": "~7.10.0" + "undici-types": "~7.13.0" } }, - "node_modules/@types/qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/range-parser": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", - "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/send": { - "version": "0.17.5", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz", - "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/mime": "^1", - "@types/node": "*" - } - }, - "node_modules/@types/serve-static": { - "version": "1.15.8", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz", - "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/http-errors": "*", - "@types/node": "*", - "@types/send": "*" - } - }, - "node_modules/@types/stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", - "dev": true, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", "license": "MIT" }, "node_modules/@types/trusted-types": { @@ -1455,7 +1436,6 @@ "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", - "dev": true, "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -1465,9 +1445,283 @@ "version": "21.0.3", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true, "license": "MIT" }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "license": "ISC" + }, + "node_modules/@unrs/resolver-binding-android-arm-eabi": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz", + "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@unrs/resolver-binding-android-arm64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz", + "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@unrs/resolver-binding-darwin-arm64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz", + "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@unrs/resolver-binding-darwin-x64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz", + "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@unrs/resolver-binding-freebsd-x64": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz", + "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz", + "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz", + "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz", + "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-arm64-musl": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz", + "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz", + "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz", + "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-riscv64-musl": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz", + "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-s390x-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz", + "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-x64-gnu": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz", + "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-linux-x64-musl": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz", + "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@unrs/resolver-binding-wasm32-wasi": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz", + "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@napi-rs/wasm-runtime": "^0.2.11" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@unrs/resolver-binding-win32-arm64-msvc": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz", + "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@unrs/resolver-binding-win32-ia32-msvc": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz", + "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@unrs/resolver-binding-win32-x64-msvc": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz", + "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/abs-svg-path": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", @@ -1476,13 +1730,13 @@ "optional": true }, "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", "license": "MIT", "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" }, "engines": { "node": ">= 0.6" @@ -1514,20 +1768,22 @@ } }, "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -1543,7 +1799,6 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -1557,18 +1812,11 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "license": "MIT" - }, "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", @@ -1584,82 +1832,63 @@ "license": "MIT" }, "node_modules/babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.2.0.tgz", + "integrity": "sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", + "@jest/transform": "30.2.0", + "@types/babel__core": "^7.20.5", + "babel-plugin-istanbul": "^7.0.1", + "babel-preset-jest": "30.2.0", + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", "slash": "^3.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "peerDependencies": { - "@babel/core": "^7.8.0" + "@babel/core": "^7.11.0 || ^8.0.0-0" } }, "node_modules/babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz", + "integrity": "sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==", "license": "BSD-3-Clause", + "workspaces": [ + "test/babel-8" + ], "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-instrument": "^6.0.2", "test-exclude": "^6.0.0" }, "engines": { - "node": ">=8" - } - }, - "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" + "node": ">=12" } }, "node_modules/babel-plugin-jest-hoist": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", - "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz", + "integrity": "sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.1.14", - "@types/babel__traverse": "^7.0.6" + "@types/babel__core": "^7.20.5" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/babel-preset-current-node-syntax": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", @@ -1683,29 +1912,37 @@ } }, "node_modules/babel-preset-jest": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", - "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz", + "integrity": "sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==", "dev": true, "license": "MIT", "dependencies": { - "babel-plugin-jest-hoist": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0" + "babel-plugin-jest-hoist": "30.2.0", + "babel-preset-current-node-syntax": "^1.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "@babel/core": "^7.11.0 || ^8.0.0-beta.1" } }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, "license": "MIT" }, + "node_modules/baseline-browser-mapping": { + "version": "2.8.11", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.11.tgz", + "integrity": "sha512-i+sRXGhz4+QW8aACZ3+r1GAKMt0wlFpeA8M5rOQd0HEYw9zhDrlx9Wc8uQ0IdXakjJRthzglEwfB/yqIjO6iDg==", + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } + }, "node_modules/basic-auth": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", @@ -1724,6 +1961,15 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "license": "MIT" }, + "node_modules/bidi-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", + "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==", + "license": "MIT", + "dependencies": { + "require-from-string": "^2.0.2" + } + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -1738,60 +1984,39 @@ } }, "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", + "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.0", + "http-errors": "^2.0.0", + "iconv-lite": "^0.6.3", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.0", + "type-is": "^2.0.0" }, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" + "node": ">=18" } }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^1.0.0" } }, "node_modules/braces": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -1801,10 +2026,9 @@ } }, "node_modules/browserslist": { - "version": "4.25.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", - "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", - "dev": true, + "version": "4.26.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz", + "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==", "funding": [ { "type": "opencollective", @@ -1821,9 +2045,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001733", - "electron-to-chromium": "^1.5.199", - "node-releases": "^2.0.19", + "baseline-browser-mapping": "^2.8.9", + "caniuse-lite": "^1.0.30001746", + "electron-to-chromium": "^1.5.227", + "node-releases": "^2.0.21", "update-browserslist-db": "^1.1.3" }, "bin": { @@ -1837,7 +2062,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" @@ -1911,17 +2135,15 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001734", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001734.tgz", - "integrity": "sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==", - "dev": true, + "version": "1.0.30001747", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001747.tgz", + "integrity": "sha512-mzFa2DGIhuc5490Nd/G31xN1pnBnYMadtkyTjefPI7wzypqgCEpeWu9bJr0OnDsyKrW75zA9ZAt7pbQFmwLsQg==", "funding": [ { "type": "opencollective", @@ -1942,7 +2164,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -1991,10 +2212,9 @@ } }, "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", + "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", "funding": [ { "type": "github", @@ -2007,9 +2227,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", - "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz", + "integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==", "dev": true, "license": "MIT" }, @@ -2028,55 +2248,116 @@ "node": ">=12" } }, - "node_modules/co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", "engines": { - "iojs": ">= 1.0.0", - "node": ">= 0.12.0" + "node": ">=8" } }, - "node_modules/collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true, "license": "MIT" }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, "engines": { - "node": ">=7.0.0" + "node": ">=8" } }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", "dependencies": { - "delayed-stream": "~1.0.0" + "ansi-regex": "^5.0.1" }, "engines": { - "node": ">= 0.8" + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" } }, "node_modules/component-emitter": { @@ -2093,13 +2374,12 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, "license": "MIT" }, "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", + "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" @@ -2121,7 +2401,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, "license": "MIT" }, "node_modules/cookie": { @@ -2172,28 +2451,6 @@ "node": ">= 0.10" } }, - "node_modules/create-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", - "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.9", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "prompts": "^2.0.1" - }, - "bin": { - "create-jest": "bin/create-jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -2209,36 +2466,50 @@ "node": ">= 8" } }, + "node_modules/css-tree": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz", + "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==", + "license": "MIT", + "dependencies": { + "mdn-data": "2.12.2", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, "node_modules/cssstyle": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz", - "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.1.tgz", + "integrity": "sha512-g5PC9Aiph9eiczFpcgUhd9S4UUO3F+LHGRIi5NUMZ+4xtoIYbHNZwZnWA2JsFGe8OU8nl4WyaEFiZuGuxlutJQ==", "license": "MIT", "dependencies": { - "@asamuzakjp/css-color": "^3.2.0", - "rrweb-cssom": "^0.8.0" + "@asamuzakjp/css-color": "^4.0.3", + "@csstools/css-syntax-patches-for-csstree": "^1.0.14", + "css-tree": "^3.1.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/data-urls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", - "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz", + "integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==", "license": "MIT", "dependencies": { "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.0.0" + "whatwg-url": "^15.0.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2259,9 +2530,9 @@ "license": "MIT" }, "node_modules/dedent": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", - "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.0.tgz", + "integrity": "sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==", "dev": true, "license": "MIT", "peerDependencies": { @@ -2311,16 +2582,6 @@ "node": ">= 0.8" } }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "license": "MIT", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, "node_modules/detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", @@ -2352,29 +2613,19 @@ "node": ">=0.3.1" } }, - "node_modules/diff-sequences": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", - "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, "node_modules/dompurify": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz", - "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.7.tgz", + "integrity": "sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "node_modules/dotenv": { - "version": "16.6.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", - "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", + "version": "17.2.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", + "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", "license": "BSD-2-Clause", "engines": { "node": ">=12" @@ -2384,9 +2635,9 @@ } }, "node_modules/dotenv-expand": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.2.tgz", - "integrity": "sha512-lXpXz2ZE1cea1gL4sz2Ipj8y4PiVjytYr3Ij0SWoms1PGxIv7m2CRKuRuCRtHdVuvM/hNJPMxt5PbhboNC4dPQ==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.3.tgz", + "integrity": "sha512-uc47g4b+4k/M/SeaW1y4OApx+mtLWl92l5LMPP0GNXctZqELk+YGgOPIIC5elYmUH4OuoK3JLhuRUYegeySiFA==", "license": "BSD-2-Clause", "dependencies": { "dotenv": "^16.4.5" @@ -2398,6 +2649,18 @@ "url": "https://dotenvx.com" } }, + "node_modules/dotenv-expand/node_modules/dotenv": { + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", + "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2412,6 +2675,13 @@ "node": ">= 0.4" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -2419,10 +2689,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.200", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.200.tgz", - "integrity": "sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w==", - "dev": true, + "version": "1.5.230", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.230.tgz", + "integrity": "sha512-A6A6Fd3+gMdaed9wX83CvHYJb4UuapPD5X5SLq72VZJzxHSY0/LUweGXRWmQlh2ln7KV7iw7jnwXK7dlPoOnHQ==", "license": "ISC" }, "node_modules/emittery": { @@ -2439,9 +2708,9 @@ } }, "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true, "license": "MIT" }, @@ -2467,9 +2736,9 @@ } }, "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2510,6 +2779,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -2525,7 +2795,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -2541,7 +2810,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -2551,7 +2819,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", @@ -2594,78 +2861,91 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "node_modules/execa/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, + "license": "ISC" + }, + "node_modules/exit-x": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz", + "integrity": "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==", + "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } }, "node_modules/expect": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", - "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-30.2.0.tgz", + "integrity": "sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==", "license": "MIT", "dependencies": { - "@jest/expect-utils": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0" + "@jest/expect-utils": "30.2.0", + "@jest/get-type": "30.1.0", + "jest-matcher-utils": "30.2.0", + "jest-message-util": "30.2.0", + "jest-mock": "30.2.0", + "jest-util": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", - "license": "MIT", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", - "proxy-addr": "~2.0.7", - "qs": "6.13.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", + "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", + "license": "MIT", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.0", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" }, "engines": { - "node": ">= 0.10.0" + "node": ">= 18" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/express" } }, + "node_modules/express-list-endpoints": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/express-list-endpoints/-/express-list-endpoints-7.1.1.tgz", + "integrity": "sha512-SA6YHH1r6DrioJ4fFJNqiwu1FweGFqJZO9KBApMzwPosoSGPOX2AW0wiMepOXjojjEXDuP9whIvckomheErbJA==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/express-oauth2-jwt-bearer": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", @@ -2678,51 +2958,19 @@ "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0 || ^22.1.0" } }, - "node_modules/express-urlrewrite": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-2.0.3.tgz", - "integrity": "sha512-NjsmtYZ1Lpie+XR7VIrvI6aeAmRQDf9cHyGjdIxlE9sc+NhTx3z6fJ0wfxV4rS7AY9ncCK7JDge+VX3e+DQ9Mg==", - "license": "MIT", - "dependencies": { - "debug": "^4.3.4", - "path-to-regexp": "^6.3.0" - } - }, - "node_modules/express-urlrewrite/node_modules/path-to-regexp": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", - "license": "MIT" - }, - "node_modules/express/node_modules/cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "node_modules/express/node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", "license": "MIT", "engines": { - "node": ">= 0.6" - } - }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" + "node": ">=6.6.0" } }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, "license": "MIT" }, "node_modules/fast-safe-stringify": { @@ -2736,7 +2984,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", - "dev": true, "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" @@ -2746,7 +2993,6 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -2756,43 +3002,26 @@ } }, "node_modules/finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", + "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", "license": "MIT", "dependencies": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" }, "engines": { "node": ">= 0.8" } }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, "license": "MIT", "dependencies": { "locate-path": "^5.0.0", @@ -2802,10 +3031,29 @@ "node": ">=8" } }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/form-data": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "dev": true, + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -2817,6 +3065,29 @@ "node": ">= 6" } }, + "node_modules/form-data/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/form-data/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/formidable": { "version": "3.5.4", "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz", @@ -2845,26 +3116,24 @@ } }, "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -2888,7 +3157,6 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -2932,7 +3200,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=8.0.0" @@ -2965,22 +3232,21 @@ } }, "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" }, - "engines": { - "node": "*" + "bin": { + "glob": "dist/esm/bin.mjs" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3015,14 +3281,12 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, "license": "ISC" }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3044,6 +3308,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" @@ -3102,9 +3367,18 @@ "node": ">= 0.8" } }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "node_modules/http-errors/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "license": "MIT", "dependencies": { @@ -3139,12 +3413,12 @@ } }, "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" @@ -3193,7 +3467,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.19" @@ -3204,7 +3477,6 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, "license": "ISC", "dependencies": { "once": "^1.3.0", @@ -3246,22 +3518,6 @@ "node": ">=8" } }, - "node_modules/is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, - "license": "MIT", - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -3309,7 +3565,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -3321,6 +3576,12 @@ "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", "license": "MIT" }, + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "license": "MIT" + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -3341,21 +3602,10 @@ "dev": true, "license": "ISC" }, - "node_modules/isomorphic-unfetch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", - "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", - "license": "MIT", - "dependencies": { - "node-fetch": "^2.6.1", - "unfetch": "^4.2.0" - } - }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=8" @@ -3365,7 +3615,6 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.23.9", @@ -3382,7 +3631,6 @@ "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -3407,24 +3655,24 @@ } }, "node_modules/istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz", + "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==", "dev": true, "license": "BSD-3-Clause", "dependencies": { + "@jridgewell/trace-mapping": "^0.3.23", "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" + "istanbul-lib-coverage": "^3.0.0" }, "engines": { "node": ">=10" } }, "node_modules/istanbul-reports": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", - "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", + "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -3435,23 +3683,39 @@ "node": ">=8" } }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", - "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-30.2.0.tgz", + "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==", "dev": true, "license": "MIT", "dependencies": { - "@jest/core": "^29.7.0", - "@jest/types": "^29.6.3", - "import-local": "^3.0.2", - "jest-cli": "^29.7.0" + "@jest/core": "30.2.0", + "@jest/types": "30.2.0", + "import-local": "^3.2.0", + "jest-cli": "30.2.0" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3463,76 +3727,75 @@ } }, "node_modules/jest-changed-files": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", - "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.2.0.tgz", + "integrity": "sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==", "dev": true, "license": "MIT", "dependencies": { - "execa": "^5.0.0", - "jest-util": "^29.7.0", + "execa": "^5.1.1", + "jest-util": "30.2.0", "p-limit": "^3.1.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-circus": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", - "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.2.0.tgz", + "integrity": "sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/expect": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", + "@jest/environment": "30.2.0", + "@jest/expect": "30.2.0", + "@jest/test-result": "30.2.0", + "@jest/types": "30.2.0", "@types/node": "*", - "chalk": "^4.0.0", + "chalk": "^4.1.2", "co": "^4.6.0", - "dedent": "^1.0.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^29.7.0", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", + "dedent": "^1.6.0", + "is-generator-fn": "^2.1.0", + "jest-each": "30.2.0", + "jest-matcher-utils": "30.2.0", + "jest-message-util": "30.2.0", + "jest-runtime": "30.2.0", + "jest-snapshot": "30.2.0", + "jest-util": "30.2.0", "p-limit": "^3.1.0", - "pretty-format": "^29.7.0", - "pure-rand": "^6.0.0", + "pretty-format": "30.2.0", + "pure-rand": "^7.0.0", "slash": "^3.0.0", - "stack-utils": "^2.0.3" + "stack-utils": "^2.0.6" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-cli": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", - "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.2.0.tgz", + "integrity": "sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/core": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "create-jest": "^29.7.0", - "exit": "^0.1.2", - "import-local": "^3.0.2", - "jest-config": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "yargs": "^17.3.1" + "@jest/core": "30.2.0", + "@jest/test-result": "30.2.0", + "@jest/types": "30.2.0", + "chalk": "^4.1.2", + "exit-x": "^0.2.2", + "import-local": "^3.2.0", + "jest-config": "30.2.0", + "jest-util": "30.2.0", + "jest-validate": "30.2.0", + "yargs": "^17.7.2" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -3544,226 +3807,206 @@ } }, "node_modules/jest-config": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", - "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-jest": "^29.7.0", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-circus": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-runner": "^29.7.0", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.2.0.tgz", + "integrity": "sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.27.4", + "@jest/get-type": "30.1.0", + "@jest/pattern": "30.0.1", + "@jest/test-sequencer": "30.2.0", + "@jest/types": "30.2.0", + "babel-jest": "30.2.0", + "chalk": "^4.1.2", + "ci-info": "^4.2.0", + "deepmerge": "^4.3.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.11", + "jest-circus": "30.2.0", + "jest-docblock": "30.2.0", + "jest-environment-node": "30.2.0", + "jest-regex-util": "30.0.1", + "jest-resolve": "30.2.0", + "jest-runner": "30.2.0", + "jest-util": "30.2.0", + "jest-validate": "30.2.0", + "micromatch": "^4.0.8", "parse-json": "^5.2.0", - "pretty-format": "^29.7.0", + "pretty-format": "30.2.0", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "peerDependencies": { "@types/node": "*", + "esbuild-register": ">=3.4.0", "ts-node": ">=9.0.0" }, "peerDependenciesMeta": { "@types/node": { "optional": true }, + "esbuild-register": { + "optional": true + }, "ts-node": { "optional": true } } }, "node_modules/jest-diff": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", - "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.2.0.tgz", + "integrity": "sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==", "license": "MIT", "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^29.6.3", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" + "@jest/diff-sequences": "30.0.1", + "@jest/get-type": "30.1.0", + "chalk": "^4.1.2", + "pretty-format": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-docblock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", - "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.2.0.tgz", + "integrity": "sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==", "dev": true, "license": "MIT", "dependencies": { - "detect-newline": "^3.0.0" + "detect-newline": "^3.1.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-each": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", - "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.2.0.tgz", + "integrity": "sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", - "jest-util": "^29.7.0", - "pretty-format": "^29.7.0" + "@jest/get-type": "30.1.0", + "@jest/types": "30.2.0", + "chalk": "^4.1.2", + "jest-util": "30.2.0", + "pretty-format": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-environment-node": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", - "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.2.0.tgz", + "integrity": "sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/types": "^29.6.3", + "@jest/environment": "30.2.0", + "@jest/fake-timers": "30.2.0", + "@jest/types": "30.2.0", "@types/node": "*", - "jest-mock": "^29.7.0", - "jest-util": "^29.7.0" + "jest-mock": "30.2.0", + "jest-util": "30.2.0", + "jest-validate": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - } - }, - "node_modules/jest-esm-transformer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz", - "integrity": "sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==", - "dev": true, - "license": "ISC", - "dependencies": { - "@babel/core": "^7.4.4", - "@babel/plugin-transform-modules-commonjs": "^7.4.4" - } - }, - "node_modules/jest-get-type": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", - "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-haste-map": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", - "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.2.0.tgz", + "integrity": "sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==", "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", - "@types/graceful-fs": "^4.1.3", + "@jest/types": "30.2.0", "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.9", - "jest-regex-util": "^29.6.3", - "jest-util": "^29.7.0", - "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", + "anymatch": "^3.1.3", + "fb-watchman": "^2.0.2", + "graceful-fs": "^4.2.11", + "jest-regex-util": "30.0.1", + "jest-util": "30.2.0", + "jest-worker": "30.2.0", + "micromatch": "^4.0.8", "walker": "^1.0.8" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" }, "optionalDependencies": { - "fsevents": "^2.3.2" + "fsevents": "^2.3.3" } }, "node_modules/jest-leak-detector": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", - "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz", + "integrity": "sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==", "dev": true, "license": "MIT", "dependencies": { - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" + "@jest/get-type": "30.1.0", + "pretty-format": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", - "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz", + "integrity": "sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==", "license": "MIT", "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "pretty-format": "^29.7.0" + "@jest/get-type": "30.1.0", + "chalk": "^4.1.2", + "jest-diff": "30.2.0", + "pretty-format": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-message-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", - "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.2.0.tgz", + "integrity": "sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^29.7.0", + "@babel/code-frame": "^7.27.1", + "@jest/types": "30.2.0", + "@types/stack-utils": "^2.0.3", + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "micromatch": "^4.0.8", + "pretty-format": "30.2.0", "slash": "^3.0.0", - "stack-utils": "^2.0.3" + "stack-utils": "^2.0.6" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-mock": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", - "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.2.0.tgz", + "integrity": "sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==", "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", + "@jest/types": "30.2.0", "@types/node": "*", - "jest-util": "^29.7.0" + "jest-util": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-pnp-resolver": { @@ -3785,154 +4028,152 @@ } }, "node_modules/jest-regex-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", - "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", - "dev": true, + "version": "30.0.1", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz", + "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==", "license": "MIT", "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-resolve": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", - "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.2.0.tgz", + "integrity": "sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==", "dev": true, "license": "MIT", "dependencies": { - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^29.7.0", - "jest-validate": "^29.7.0", - "resolve": "^1.20.0", - "resolve.exports": "^2.0.0", - "slash": "^3.0.0" + "chalk": "^4.1.2", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.2.0", + "jest-pnp-resolver": "^1.2.3", + "jest-util": "30.2.0", + "jest-validate": "30.2.0", + "slash": "^3.0.0", + "unrs-resolver": "^1.7.11" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-resolve-dependencies": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", - "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz", + "integrity": "sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==", "dev": true, "license": "MIT", "dependencies": { - "jest-regex-util": "^29.6.3", - "jest-snapshot": "^29.7.0" + "jest-regex-util": "30.0.1", + "jest-snapshot": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-runner": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", - "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.2.0.tgz", + "integrity": "sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/console": "^29.7.0", - "@jest/environment": "^29.7.0", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", + "@jest/console": "30.2.0", + "@jest/environment": "30.2.0", + "@jest/test-result": "30.2.0", + "@jest/transform": "30.2.0", + "@jest/types": "30.2.0", "@types/node": "*", - "chalk": "^4.0.0", + "chalk": "^4.1.2", "emittery": "^0.13.1", - "graceful-fs": "^4.2.9", - "jest-docblock": "^29.7.0", - "jest-environment-node": "^29.7.0", - "jest-haste-map": "^29.7.0", - "jest-leak-detector": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-resolve": "^29.7.0", - "jest-runtime": "^29.7.0", - "jest-util": "^29.7.0", - "jest-watcher": "^29.7.0", - "jest-worker": "^29.7.0", + "exit-x": "^0.2.2", + "graceful-fs": "^4.2.11", + "jest-docblock": "30.2.0", + "jest-environment-node": "30.2.0", + "jest-haste-map": "30.2.0", + "jest-leak-detector": "30.2.0", + "jest-message-util": "30.2.0", + "jest-resolve": "30.2.0", + "jest-runtime": "30.2.0", + "jest-util": "30.2.0", + "jest-watcher": "30.2.0", + "jest-worker": "30.2.0", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-runtime": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", - "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.2.0.tgz", + "integrity": "sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "^29.7.0", - "@jest/fake-timers": "^29.7.0", - "@jest/globals": "^29.7.0", - "@jest/source-map": "^29.6.3", - "@jest/test-result": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", + "@jest/environment": "30.2.0", + "@jest/fake-timers": "30.2.0", + "@jest/globals": "30.2.0", + "@jest/source-map": "30.0.1", + "@jest/test-result": "30.2.0", + "@jest/transform": "30.2.0", + "@jest/types": "30.2.0", "@types/node": "*", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "glob": "^7.1.3", - "graceful-fs": "^4.2.9", - "jest-haste-map": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-mock": "^29.7.0", - "jest-regex-util": "^29.6.3", - "jest-resolve": "^29.7.0", - "jest-snapshot": "^29.7.0", - "jest-util": "^29.7.0", + "chalk": "^4.1.2", + "cjs-module-lexer": "^2.1.0", + "collect-v8-coverage": "^1.0.2", + "glob": "^10.3.10", + "graceful-fs": "^4.2.11", + "jest-haste-map": "30.2.0", + "jest-message-util": "30.2.0", + "jest-mock": "30.2.0", + "jest-regex-util": "30.0.1", + "jest-resolve": "30.2.0", + "jest-snapshot": "30.2.0", + "jest-util": "30.2.0", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-snapshot": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", - "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.7.2", - "@babel/plugin-syntax-jsx": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/types": "^7.3.3", - "@jest/expect-utils": "^29.7.0", - "@jest/transform": "^29.7.0", - "@jest/types": "^29.6.3", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^29.7.0", - "graceful-fs": "^4.2.9", - "jest-diff": "^29.7.0", - "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.7.0", - "jest-message-util": "^29.7.0", - "jest-util": "^29.7.0", - "natural-compare": "^1.4.0", - "pretty-format": "^29.7.0", - "semver": "^7.5.3" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.2.0.tgz", + "integrity": "sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==", + "license": "MIT", + "dependencies": { + "@babel/core": "^7.27.4", + "@babel/generator": "^7.27.5", + "@babel/plugin-syntax-jsx": "^7.27.1", + "@babel/plugin-syntax-typescript": "^7.27.1", + "@babel/types": "^7.27.3", + "@jest/expect-utils": "30.2.0", + "@jest/get-type": "30.1.0", + "@jest/snapshot-utils": "30.2.0", + "@jest/transform": "30.2.0", + "@jest/types": "30.2.0", + "babel-preset-current-node-syntax": "^1.2.0", + "chalk": "^4.1.2", + "expect": "30.2.0", + "graceful-fs": "^4.2.11", + "jest-diff": "30.2.0", + "jest-matcher-utils": "30.2.0", + "jest-message-util": "30.2.0", + "jest-util": "30.2.0", + "pretty-format": "30.2.0", + "semver": "^7.7.2", + "synckit": "^0.11.8" + }, + "engines": { + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-snapshot/node_modules/semver": { "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -3942,39 +4183,50 @@ } }, "node_modules/jest-util": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", - "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.2.0.tgz", + "integrity": "sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==", "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", + "@jest/types": "30.2.0", "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" + "chalk": "^4.1.2", + "ci-info": "^4.2.0", + "graceful-fs": "^4.2.11", + "picomatch": "^4.0.2" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" + } + }, + "node_modules/jest-util/node_modules/picomatch": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/jest-validate": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", - "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.2.0.tgz", + "integrity": "sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "^29.6.3", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^29.6.3", + "@jest/get-type": "30.1.0", + "@jest/types": "30.2.0", + "camelcase": "^6.3.0", + "chalk": "^4.1.2", "leven": "^3.1.0", - "pretty-format": "^29.7.0" + "pretty-format": "30.2.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-validate/node_modules/camelcase": { @@ -3991,46 +4243,45 @@ } }, "node_modules/jest-watcher": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", - "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.2.0.tgz", + "integrity": "sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==", "dev": true, "license": "MIT", "dependencies": { - "@jest/test-result": "^29.7.0", - "@jest/types": "^29.6.3", + "@jest/test-result": "30.2.0", + "@jest/types": "30.2.0", "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", + "ansi-escapes": "^4.3.2", + "chalk": "^4.1.2", "emittery": "^0.13.1", - "jest-util": "^29.7.0", - "string-length": "^4.0.1" + "jest-util": "30.2.0", + "string-length": "^4.0.2" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-worker": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", - "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.2.0.tgz", + "integrity": "sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==", "license": "MIT", "dependencies": { "@types/node": "*", - "jest-util": "^29.7.0", + "@ungap/structured-clone": "^1.3.0", + "jest-util": "30.2.0", "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" + "supports-color": "^8.1.1" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-worker/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -4055,14 +4306,12 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, "license": "MIT" }, "node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, "license": "MIT", "dependencies": { "argparse": "^1.0.7", @@ -4073,34 +4322,34 @@ } }, "node_modules/jsdom": { - "version": "26.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz", - "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==", + "version": "27.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.0.0.tgz", + "integrity": "sha512-lIHeR1qlIRrIN5VMccd8tI2Sgw6ieYXSVktcSHaNe3Z5nE/tcPQYQWOq00wxMvYOsz+73eAkNenVvmPC6bba9A==", "license": "MIT", "dependencies": { - "cssstyle": "^4.2.1", - "data-urls": "^5.0.0", + "@asamuzakjp/dom-selector": "^6.5.4", + "cssstyle": "^5.3.0", + "data-urls": "^6.0.0", "decimal.js": "^10.5.0", "html-encoding-sniffer": "^4.0.0", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.6", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.16", - "parse5": "^7.2.1", + "parse5": "^7.3.0", "rrweb-cssom": "^0.8.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^5.1.1", + "tough-cookie": "^6.0.0", "w3c-xmlserializer": "^5.0.0", - "webidl-conversions": "^7.0.0", + "webidl-conversions": "^8.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.1.1", - "ws": "^8.18.0", + "whatwg-url": "^15.0.0", + "ws": "^8.18.2", "xml-name-validator": "^5.0.0" }, "engines": { - "node": ">=18" + "node": ">=20" }, "peerDependencies": { "canvas": "^3.0.0" @@ -4115,7 +4364,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -4135,7 +4383,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -4144,23 +4391,6 @@ "node": ">=6" } }, - "node_modules/just-extend": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", - "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true, - "license": "MIT" - }, - "node_modules/kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -4182,7 +4412,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, "license": "MIT", "dependencies": { "p-locate": "^4.1.0" @@ -4191,17 +4420,10 @@ "node": ">=8" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT" - }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, "license": "ISC", "dependencies": { "yallist": "^3.0.2" @@ -4240,28 +4462,11 @@ "version": "1.0.12", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "tmpl": "1.0.5" } }, - "node_modules/manifesto.js": { - "version": "4.2.22", - "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.22.tgz", - "integrity": "sha512-Rl7nKFzJ7kiotWCrFkqTnY6xfdGr7KtaHo+QovRXe4WGizoH1QaF6kHodNPIOsi2L5LCgX/RVoNqOryLKEuNrg==", - "license": "MIT", - "dependencies": { - "@edsilv/http-status-codes": "^1.0.3", - "@iiif/vocabulary": "^1.0.28", - "isomorphic-unfetch": "^3.0.0", - "lodash": "^4.17.21" - }, - "engines": { - "node": ">=8.9.1", - "npm": ">=3.10.8" - } - }, "node_modules/mariadb": { "version": "3.4.5", "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.5.tgz", @@ -4284,18 +4489,6 @@ "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==", "license": "MIT" }, - "node_modules/mariadb/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/mariadb/node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", @@ -4303,15 +4496,15 @@ "license": "ISC" }, "node_modules/marked": { - "version": "15.0.12", - "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz", - "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==", + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-16.3.0.tgz", + "integrity": "sha512-K3UxuKu6l6bmA5FUwYho8CfJBlsUWAooKtdGgMcERSpF7gcBUrCGsLH7wDaaNOzwq18JzSUDyoEb/YsrqMac3w==", "license": "MIT", "bin": { "marked": "bin/marked.js" }, "engines": { - "node": ">= 18" + "node": ">= 20" } }, "node_modules/math-intrinsics": { @@ -4323,13 +4516,19 @@ "node": ">= 0.4" } }, + "node_modules/mdn-data": { + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz", + "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==", + "license": "CC0-1.0" + }, "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/memory-pager": { @@ -4339,10 +4538,13 @@ "license": "MIT" }, "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", "license": "MIT", + "engines": { + "node": ">=18" + }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -4351,13 +4553,13 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, "license": "MIT" }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -4367,7 +4569,6 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -4378,33 +4579,34 @@ } }, "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true, "license": "MIT", "bin": { "mime": "cli.js" }, "engines": { - "node": ">=4" + "node": ">=4.0.0" } }, "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", "license": "MIT", "dependencies": { - "mime-db": "1.52.0" + "mime-db": "^1.54.0" }, "engines": { "node": ">= 0.6" @@ -4421,27 +4623,40 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" } }, "node_modules/mongodb": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.18.0.tgz", - "integrity": "sha512-fO5ttN9VC8P0F5fqtQmclAkgXZxbIkYRTUi1j8JO6IYwvamkhtYDilJr35jOPELR49zqCJgXZWwCtW7B+TM8vQ==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.20.0.tgz", + "integrity": "sha512-Tl6MEIU3K4Rq3TSHd+sZQqRBoGlFsOgNrH5ltAcFBV62Re3Fd+FcaVf8uSEQFOJ51SDowDVttBTONMfoYWrWlQ==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/saslprep": "^1.1.9", + "@mongodb-js/saslprep": "^1.3.0", "bson": "^6.10.4", - "mongodb-connection-string-url": "^3.0.0" + "mongodb-connection-string-url": "^3.0.2" }, "engines": { "node": ">=16.20.1" @@ -4452,7 +4667,7 @@ "gcp-metadata": "^5.2.0", "kerberos": "^2.0.1", "mongodb-client-encryption": ">=6.0.0 <7", - "snappy": "^7.2.2", + "snappy": "^7.3.2", "socks": "^2.7.1" }, "peerDependenciesMeta": { @@ -4489,6 +4704,40 @@ "whatwg-url": "^14.1.0 || ^13.0.0" } }, + "node_modules/mongodb-connection-string-url/node_modules/tr46": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", + "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/mongodb-connection-string-url/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + } + }, + "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": { + "version": "14.2.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", + "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "license": "MIT", + "dependencies": { + "tr46": "^5.1.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/morgan": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", @@ -4538,126 +4787,82 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, + "node_modules/nanoid": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "peer": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/napi-postinstall": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz", + "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==", + "dev": true, + "license": "MIT", + "bin": { + "napi-postinstall": "lib/cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/napi-postinstall" + } + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, "license": "MIT" }, "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", "license": "MIT", "engines": { "node": ">= 0.6" } }, - "node_modules/nise": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz", - "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.1", - "@sinonjs/text-encoding": "^0.7.3", - "just-extend": "^6.2.0", - "path-to-regexp": "^8.1.0" - } + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "license": "MIT" }, - "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.1" - } + "node_modules/node-releases": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz", + "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", + "license": "MIT" }, - "node_modules/nise/node_modules/path-to-regexp": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz", - "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==", - "dev": true, - "license": "MIT", + "node_modules/nodemailer": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.6.tgz", + "integrity": "sha512-F44uVzgwo49xboqbFgBGkRaiMgtoBrBEWCVincJPK9+S9Adkzt/wXCLKbf7dxucmxfTI5gHGB+bEmdyzN6QKjw==", + "license": "MIT-0", "engines": { - "node": ">=16" + "node": ">=6.0.0" } }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true, - "license": "MIT" - }, - "node_modules/nodemailer": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz", - "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==", - "license": "MIT-0", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/nodemon": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", - "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", - "dev": true, + "node_modules/nodemon": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", + "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", + "dev": true, "license": "MIT", "dependencies": { "chokidar": "^3.5.2", @@ -4682,6 +4887,17 @@ "url": "https://opencollective.com/nodemon" } }, + "node_modules/nodemon/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/nodemon/node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -4692,6 +4908,19 @@ "node": ">=4" } }, + "node_modules/nodemon/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/nodemon/node_modules/semver": { "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", @@ -4722,7 +4951,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4741,12 +4969,6 @@ "node": ">=8" } }, - "node_modules/nwsapi": { - "version": "2.2.21", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.21.tgz", - "integrity": "sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==", - "license": "MIT" - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4793,7 +5015,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "license": "ISC", "dependencies": { "wrappy": "1" @@ -4835,7 +5056,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, "license": "MIT", "dependencies": { "p-limit": "^2.2.0" @@ -4848,7 +5068,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, "license": "MIT", "dependencies": { "p-try": "^2.0.0" @@ -4864,12 +5083,18 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -4921,7 +5146,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4931,7 +5155,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4947,31 +5170,50 @@ "node": ">=8" } }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, - "license": "MIT" + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" }, "node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", - "license": "MIT" + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", + "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -4984,7 +5226,6 @@ "version": "4.0.7", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", - "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -5003,26 +5244,53 @@ "node": ">=8" } }, + "node_modules/postcss": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, "node_modules/pretty-format": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", - "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "dev": true, + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz", + "integrity": "sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==", "license": "MIT", "dependencies": { - "@jest/schemas": "^29.6.3", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" + "@jest/schemas": "30.0.5", + "ansi-styles": "^5.2.0", + "react-is": "^18.3.1" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/pretty-format/node_modules/ansi-styles": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -5031,20 +5299,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -5075,9 +5329,9 @@ } }, "node_modules/pure-rand": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", - "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz", + "integrity": "sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==", "dev": true, "funding": [ { @@ -5092,12 +5346,12 @@ "license": "MIT" }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">=0.6" @@ -5116,25 +5370,40 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz", + "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", - "iconv-lite": "0.4.24", + "iconv-lite": "0.7.0", "unpipe": "1.0.0" }, "engines": { - "node": ">= 0.8" + "node": ">= 0.10" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true, "license": "MIT" }, "node_modules/readdirp": { @@ -5160,25 +5429,13 @@ "node": ">=0.10.0" } }, - "node_modules/resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", - "dev": true, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "license": "MIT", - "dependencies": { - "is-core-module": "^2.16.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=0.10.0" } }, "node_modules/resolve-cwd": { @@ -5198,20 +5455,25 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/resolve.exports": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", - "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", - "dev": true, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, "engines": { - "node": ">=10" + "node": ">= 18" } }, "node_modules/rrweb-cssom": { @@ -5262,73 +5524,46 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", "license": "MIT", "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" }, "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "license": "MIT", - "engines": { - "node": ">= 0.8" + "node": ">= 18" } }, "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", "license": "MIT", "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" } }, "node_modules/setprototypeof": { @@ -5433,11 +5668,16 @@ } }, "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/simple-update-notifier": { "version": "2.0.0", @@ -5466,9 +5706,9 @@ } }, "node_modules/sinon": { - "version": "19.0.5", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.5.tgz", - "integrity": "sha512-r15s9/s+ub/d4bxNXqIUmwp6imVSdTorIRaxoecYjqTVLZ8RuoXr/4EDGwIBo6Waxn7f2gnURX9zuhAfCwaF6Q==", + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.0.tgz", + "integrity": "sha512-TOgRcwFPbfGtpqvZw+hyqJDvqfapr1qUlOizROIk4bBLjlsjlB00Pg6wMFXNtJRpu+eCZuVOaLatG7M8105kAw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -5476,7 +5716,6 @@ "@sinonjs/fake-timers": "^13.0.5", "@sinonjs/samsam": "^8.0.1", "diff": "^7.0.0", - "nise": "^6.1.1", "supports-color": "^7.2.0" }, "funding": { @@ -5484,28 +5723,10 @@ "url": "https://opencollective.com/sinon" } }, - "node_modules/sinon/node_modules/@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.1" - } - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true, - "license": "MIT" - }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5521,6 +5742,15 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-support": { "version": "0.5.13", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", @@ -5545,14 +5775,12 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true, "license": "BSD-3-Clause" }, "node_modules/stack-utils": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", - "dev": true, "license": "MIT", "dependencies": { "escape-string-regexp": "^2.0.0" @@ -5562,9 +5790,9 @@ } }, "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -5584,22 +5812,17 @@ "node": ">=10" } }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "node_modules/string-length/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, "engines": { "node": ">=8" } }, - "node_modules/strip-ansi": { + "node_modules/string-length/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", @@ -5612,14 +5835,118 @@ "node": ">=8" } }, - "node_modules/strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" } }, "node_modules/strip-final-newline": { @@ -5666,19 +5993,6 @@ "node": ">=14.18.0" } }, - "node_modules/superagent/node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/supertest": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.4.tgz", @@ -5697,7 +6011,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -5706,19 +6019,6 @@ "node": ">=8" } }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/svg-arc-to-cubic-bezier": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", @@ -5732,11 +6032,25 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "license": "MIT" }, + "node_modules/synckit": { + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz", + "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==", + "license": "MIT", + "dependencies": { + "@pkgr/core": "^0.2.9" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/synckit" + } + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", @@ -5747,36 +6061,77 @@ "node": ">=8" } }, + "node_modules/test-exclude/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/test-exclude/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/test-exclude/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/tldts": { - "version": "6.1.86", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz", - "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==", + "version": "7.0.16", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.16.tgz", + "integrity": "sha512-5bdPHSwbKTeHmXrgecID4Ljff8rQjv7g8zKQPkCozRo2HWWni+p310FSn5ImI+9kWw9kK4lzOB5q/a6iv0IJsw==", "license": "MIT", "dependencies": { - "tldts-core": "^6.1.86" + "tldts-core": "^7.0.16" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.86", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz", - "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==", + "version": "7.0.16", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.16.tgz", + "integrity": "sha512-XHhPmHxphLi+LGbH0G/O7dmUH9V65OY20R7vH8gETHsp5AZCjBk9l8sqmRKLaGOxnETU7XNSDUPtewAy/K6jbA==", "license": "MIT" }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true, "license": "BSD-3-Clause" }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -5805,12 +6160,12 @@ } }, "node_modules/tough-cookie": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", - "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz", + "integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==", "license": "BSD-3-Clause", "dependencies": { - "tldts": "^6.1.32" + "tldts": "^7.0.5" }, "engines": { "node": ">=16" @@ -5821,22 +6176,29 @@ "link": true }, "node_modules/tr46": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", - "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz", + "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==", "license": "MIT", "dependencies": { "punycode": "^2.3.1" }, "engines": { - "node": ">=18" + "node": ">=20" } }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD", + "optional": true + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -5856,13 +6218,14 @@ } }, "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", "license": "MIT", "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" }, "engines": { "node": ">= 0.6" @@ -5876,15 +6239,9 @@ "license": "MIT" }, "node_modules/undici-types": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz", - "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==", - "license": "MIT" - }, - "node_modules/unfetch": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", - "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz", + "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==", "license": "MIT" }, "node_modules/unpipe": { @@ -5896,11 +6253,45 @@ "node": ">= 0.8" } }, + "node_modules/unrs-resolver": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz", + "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "napi-postinstall": "^0.3.0" + }, + "funding": { + "url": "https://opencollective.com/unrs-resolver" + }, + "optionalDependencies": { + "@unrs/resolver-binding-android-arm-eabi": "1.11.1", + "@unrs/resolver-binding-android-arm64": "1.11.1", + "@unrs/resolver-binding-darwin-arm64": "1.11.1", + "@unrs/resolver-binding-darwin-x64": "1.11.1", + "@unrs/resolver-binding-freebsd-x64": "1.11.1", + "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1", + "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1", + "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-arm64-musl": "1.11.1", + "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1", + "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1", + "@unrs/resolver-binding-linux-x64-gnu": "1.11.1", + "@unrs/resolver-binding-linux-x64-musl": "1.11.1", + "@unrs/resolver-binding-wasm32-wasi": "1.11.1", + "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1", + "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1", + "@unrs/resolver-binding-win32-x64-msvc": "1.11.1" + } + }, "node_modules/update-browserslist-db": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", - "dev": true, "funding": [ { "type": "opencollective", @@ -5927,15 +6318,6 @@ "browserslist": ">= 4.21.0" } }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "license": "MIT", - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/v8-to-istanbul": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", @@ -5976,19 +6358,18 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, "license": "Apache-2.0", "dependencies": { "makeerror": "1.0.12" } }, "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.0.tgz", + "integrity": "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==", "license": "BSD-2-Clause", "engines": { - "node": ">=12" + "node": ">=20" } }, "node_modules/whatwg-encoding": { @@ -6003,18 +6384,6 @@ "node": ">=18" } }, - "node_modules/whatwg-encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/whatwg-mimetype": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", @@ -6025,16 +6394,16 @@ } }, "node_modules/whatwg-url": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", - "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz", + "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==", "license": "MIT", "dependencies": { - "tr46": "^5.1.0", - "webidl-conversions": "^7.0.0" + "tr46": "^6.0.0", + "webidl-conversions": "^8.0.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/which": { @@ -6054,6 +6423,25 @@ } }, "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", @@ -6071,25 +6459,81 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, "license": "ISC" }, "node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", - "dev": true, + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" + "signal-exit": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/ws": { @@ -6142,7 +6586,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true, "license": "ISC" }, "node_modules/yargs": { @@ -6174,6 +6617,51 @@ "node": ">=12" } }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index db815124..1346a0cb 100644 --- a/package.json +++ b/package.json @@ -33,36 +33,32 @@ "inviteMemberTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " }, "dependencies": { - "@iiif/helpers": "^1.3.1", - "@mongodb-js/saslprep": "^1.2.2", + "@iiif/helpers": "^1.5.3", + "@jest/globals": "^30.2.0", "cookie-parser": "^1.4.7", "cors": "^2.8.5", - "debug": "^4.4.0", - "dompurify": "^3.2.4", - "dotenv": "^16.4.7", - "dotenv-expand": "^12.0.1", - "express": "^4.21.2", - "express-oauth2-jwt-bearer": "^1.6.0", - "express-urlrewrite": "^2.0.3", - "http-errors": "^2.0.0", + "debug": "^4.4.3", + "dompurify": "^3.2.7", + "dotenv": "^17.2.3", + "dotenv-expand": "^12.0.3", + "express": "^5.1.0", + "express-list-endpoints": "^7.1.1", + "express-oauth2-jwt-bearer": "~1.6.1", "image-size": "^2.0.2", - "jsdom": "^26.0.0", - "manifesto.js": "^4.2.21", - "mariadb": "^3.4.0", - "marked": "^15.0.7", - "mongodb": "^6.12.0", - "morgan": "^1.10.0", - "nodemailer": "^6.9.16", + "jsdom": "^27.0.0", + "mariadb": "^3.4.5", + "marked": "^16.3.0", + "mime-types": "^3.0.1", + "mongodb": "^6.20.0", + "morgan": "^1.10.1", + "nodemailer": "^7.0.6", "tpen3-services": "file:" }, "devDependencies": { - "@jest-mock/express": "^2.1.0", - "jest": "^29.7.0", - "jest-cli": "^29.7.0", - "jest-esm-transformer": "^1.0.0", - "nodemon": "^3.1.9", - "sinon": "^19.0.2", - "supertest": "^7.0.0" + "jest": "^30.2.0", + "nodemon": "^3.1.10", + "sinon": "^21.0.0", + "supertest": "^7.1.4" }, "engines": { "node": ">=22.20.0" diff --git a/project/__tests__/exists_unit.test.js b/project/__tests__/exists_unit.test.js index 7f4c69c2..93946e77 100644 --- a/project/__tests__/exists_unit.test.js +++ b/project/__tests__/exists_unit.test.js @@ -1,68 +1,18 @@ -import projectRouter from '../index.js' +import app from '../../app.js' import { jest } from '@jest/globals' +import expressListEndpoints from "express-list-endpoints" -const app = { _router: { stack: projectRouter.stack } } +// TODO check every /project endpoint. -describe.skip("Project endpoint availability unit test (via a check on the app routes)", () => { - test("responds to /project/:id", () => { - const stack = app._router.stack - // Use .test() with sample paths to check route regexes - expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/123'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/123/manifest'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/create'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/import'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/import28/'))).toBe(true) - }) -}) - -describe.skip("Hotkeys endpoint availability unit test (via a check on the app routes)", () => { - test("responds to /project/:id/hotkeys", () => { - const stack = app._router.stack - expect(stack.some(mw => mw.route?.methods?.get && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.delete && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/hotkeys'))).toBe(true) - }) -}) - -describe.skip("Member and collaborator endpoint availability", () => { - test("responds to /project/:id/invite-member and /project/:id/remove-member", () => { - const stack = app._router.stack - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/invite-member'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/remove-member'))).toBe(true) - }) - test("responds to /project/:projectId/collaborator/:collaboratorId/addRoles, setRoles, removeRoles", () => { - const stack = app._router.stack - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/collaborator/456/addRoles'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/collaborator/456/setRoles'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/collaborator/456/removeRoles'))).toBe(true) - }) - test("responds to /project/:projectId/switch/owner", () => { - const stack = app._router.stack - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/switch/owner'))).toBe(true) - }) -}) - -describe.skip("Custom roles endpoint availability", () => { - test("responds to /project/:projectId/addCustomRoles, setCustomRoles, removeCustomRoles", () => { - const stack = app._router.stack - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/addCustomRoles'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/setCustomRoles'))).toBe(true) - expect(stack.some(mw => mw.route?.methods?.post && mw.regexp?.test('/project/123/removeCustomRoles'))).toBe(true) - }) -}) - -describe.skip("Project metadata endpoint availability", () => { - test("responds to /project/:projectId/metadata", () => { - const stack = app._router.stack - expect(stack.some(mw => mw.route?.methods?.put && mw.regexp?.test('/project/123/metadata'))).toBe(true) - }) -}) - -describe.skip("Layer and page nested route availability", () => { - test("responds to /project/:projectId/layer and /project/:projectId/page", () => { - const stack = app._router.stack - expect(stack.some(mw => mw.name === 'router' && mw.regexp?.test('/project/123/layer'))).toBe(true) - expect(stack.some(mw => mw.name === 'router' && mw.regexp?.test('/project/123/page'))).toBe(true) - }) +// Example +it.skip('/project/:id is a registered endpoint', () => { + let exists = false + const stack = expressListEndpoints(app.router) + for(const middleware of stack){ + if(middleware.path && middleware.path.includes("/project/:id")) { + exists = true + break + } + } + expect(exists).toBe(true) }) diff --git a/userProfile/__tests__/end_to_end_unit.test.js b/userProfile/__tests__/end_to_end_unit.test.js index ce3611a8..e24b9aea 100644 --- a/userProfile/__tests__/end_to_end_unit.test.js +++ b/userProfile/__tests__/end_to_end_unit.test.js @@ -5,10 +5,8 @@ import express from "express" import request from "supertest" import app from '../../app.js'; import User from "../../classes/User/User.js" - import {jest} from "@jest/globals" - const routeTester = new express() const privateRoutesTester = new express() routeTester.use("/user", userProfileRouter) @@ -24,16 +22,32 @@ describe("Test private routes restfulness #user_class", () => { }) describe("Unauthourized GETs #user_class", () => { - it("/my/profile should return 401", async () => { + it("/my/project should return 401 if there is no Authorization header #user_class", async () => { + const response = await request(mainApp) + .get("/my/projects") + expect(response.status).toBe(401) + expect(response.body).toBeTruthy() + }) + + it("/my/project should return 401 if there is an invalid Authorization header #user_class", async () => { + const response = await request(mainApp) + .get("/my/projects") + .set("Authorization", `Bearer 123123123123123123123123123`) + expect(response.status).toBe(401) + expect(response.body).toBeTruthy() + }) + + it("/my/profile should return 401 if there is no Authorization header.", async () => { const response = await request(mainApp) .get("/my/profile") expect(response.status).toBe(401) expect(response.body).toBeTruthy() }) - it("/my/project should return 401 #user_class", async () => { + it("/my/profile should return 401 for an invalid Authorization header.", async () => { const response = await request(mainApp) - .get("/my/projects") + .get("/my/profile") + .set("Authorization", `Bearer 123123123123123123123123123`) expect(response.status).toBe(401) expect(response.body).toBeTruthy() }) @@ -69,7 +83,7 @@ describe('userProfile endpoint end to end unit test (spinning up the endpoint an expect(res.body).toBeTruthy() }) - it('Call to /user with a TPEN3 user ID that is invalid', async () => { + it('Call to /user with a TPEN3 user ID that is invalid', async () => { const res = await request(routeTester) .get('/user/kjl') expect(res.statusCode).toBe(404) diff --git a/userProfile/__tests__/exists_unit.test.js b/userProfile/__tests__/exists_unit.test.js index e9b2e276..a98dc31b 100644 --- a/userProfile/__tests__/exists_unit.test.js +++ b/userProfile/__tests__/exists_unit.test.js @@ -1,11 +1,35 @@ import app from '../../app.js' +import { jest } from '@jest/globals' +import expressListEndpoints from "express-list-endpoints" -describe('userProfile endpoint availability unit test (via a check on the app routes). #exists_unit', () => { - it('responds to /user/id', () => { +describe.skip('userProfile endpoint availability unit test (via a check on the app routes). #exists_unit', () => { + it('/user/:id is registered', () => { let exists = false - const stack = app._router.stack + const stack = expressListEndpoints(app.router) for(const middleware of stack){ - if(middleware.regexp && middleware.regexp.toString().includes("/user")) { + if(middleware.path && middleware.path.includes("/user/:id")) { + exists = true + break + } + } + expect(exists).toBe(true) + }) + it('/my/profile is a registered endpoint', () => { + let exists = false + const stack = expressListEndpoints(app.router) + for(const middleware of stack){ + if(middleware.path && middleware.path.includes("/my/profile")) { + exists = true + break + } + } + expect(exists).toBe(true) + }) + it('/my/projects is a registered endpoint', () => { + let exists = false + const stack = expressListEndpoints(app.router) + for(const middleware of stack){ + if(middleware.path && middleware.path.includes("/my/projects")) { exists = true break } diff --git a/utilities/proxy.js b/utilities/proxy.js index 7194db5d..75b006cb 100644 --- a/utilities/proxy.js +++ b/utilities/proxy.js @@ -87,7 +87,7 @@ function opts(req, res, next) { const proxyRouter = express.Router() proxyRouter.use(cors(common_cors)) -proxyRouter.route('/*') +proxyRouter.route('/*_') .options(opts) .get(proxy) From b1ba2a9d8f7cbd2e1872e2cf7fb4b749406d4c5d Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 3 Oct 2025 15:31:35 -0500 Subject: [PATCH 184/262] Update API.html styles for improved readability Adjusted background and text colors for code blocks, endpoints, and table of contents to enhance contrast and readability. Minor CSS cleanups and added missing newline at end of file. --- public/API.html | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/public/API.html b/public/API.html index 2888bb8f..3b2b4d40 100644 --- a/public/API.html +++ b/public/API.html @@ -25,7 +25,7 @@ border-left-color: #4a9eff; } code { - background-color: #2a2a2a; + background-color: #444; color: #e0e0e0; } pre { @@ -65,12 +65,9 @@ @media (prefers-color-scheme: dark) { h4 { color: #ff6b6b; } } - .endpoint { - background-color: #f8f9fa; - border-left: 4px solid #3498db; - padding: 15px; - margin: 20px 0; - border-radius: 4px; + .endpoint pre { + background-color: #ffffff; + border-color: #dee2e6; } .method { display: inline-block; @@ -94,7 +91,8 @@ margin-left: 10px; } code { - background-color: #f4f4f4; + background-color: #e9ecef; + color: #212529; padding: 2px 6px; border-radius: 3px; font-family: 'Courier New', monospace; @@ -110,11 +108,12 @@ font-size: 0.9em; } .toc { - background-color: #f8f9fa; + background-color: #e9ecef; border: 1px solid #dee2e6; border-radius: 5px; padding: 20px; margin: 20px 0; + color: #212529; } @media (prefers-color-scheme: dark) { .toc { @@ -690,4 +689,4 @@

GET/project/:projectId/page/:pageid

TPEN Services API Documentation | Generated from API.md

- \ No newline at end of file + From f2b52a44141f924f7a3afc86f913aac63bd9dae5 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 3 Oct 2025 15:57:43 -0500 Subject: [PATCH 185/262] fix line getter --- line/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/line/index.js b/line/index.js index d5da6745..426deee9 100644 --- a/line/index.js +++ b/line/index.js @@ -24,7 +24,11 @@ router.get('/:lineId', async (req, res) => { } try { if (lineId.startsWith(process.env.RERUMIDPREFIX)) { - return fetch(lineId).then(res => res.json()) + const resolved = await fetch(lineId) + .then(res => res.json()) + .catch(err => { return {} }) + if (resolved.id || resolved["@id"]) return res.json(resolved) + else return respondWithError(res, 500, `Communication error with RERUM. Could not get item '${lineId}'`) } const projectData = (await getProjectById(projectId)).data if (!projectData) { From 84783f1f4e9d7c0a0333094b0a16b5abd30833b3 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 3 Oct 2025 16:11:20 -0500 Subject: [PATCH 186/262] fix line getter --- line/index.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/line/index.js b/line/index.js index 426deee9..3d717b56 100644 --- a/line/index.js +++ b/line/index.js @@ -25,10 +25,17 @@ router.get('/:lineId', async (req, res) => { try { if (lineId.startsWith(process.env.RERUMIDPREFIX)) { const resolved = await fetch(lineId) - .then(res => res.json()) - .catch(err => { return {} }) + .then(resp => { + if (resp.ok) return resp.json() + else { + if (resp.status) return {"code": resp.status, "message": resp.statusText ?? `Communication error with RERUM. Could not get item '${lineId}'`} + else throw resp + } + }).catch(err => { + throw err + }) if (resolved.id || resolved["@id"]) return res.json(resolved) - else return respondWithError(res, 500, `Communication error with RERUM. Could not get item '${lineId}'`) + else return respondWithError(res, resolved.code, resolved.message) } const projectData = (await getProjectById(projectId)).data if (!projectData) { From f9344d18158e7861621f080d44b420bd59c341eb Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 3 Oct 2025 16:22:47 -0500 Subject: [PATCH 187/262] fix line getter --- line/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/line/index.js b/line/index.js index 3d717b56..0f0b9213 100644 --- a/line/index.js +++ b/line/index.js @@ -28,11 +28,10 @@ router.get('/:lineId', async (req, res) => { .then(resp => { if (resp.ok) return resp.json() else { - if (resp.status) return {"code": resp.status, "message": resp.statusText ?? `Communication error with RERUM. Could not get item '${lineId}'`} - else throw resp + return {"code": resp.status ?? 500, "message": resp.statusText ?? `Communication error with RERUM`} } }).catch(err => { - throw err + return {"code": 500, "message": `Communication error with RERUM`} }) if (resolved.id || resolved["@id"]) return res.json(resolved) else return respondWithError(res, resolved.code, resolved.message) From b6f4173f10fd585a62681846c66abea670b8dbc9 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 3 Oct 2025 16:25:32 -0500 Subject: [PATCH 188/262] Update project/projectToolsRouter.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- project/projectToolsRouter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index d788c5fc..6bf81ac0 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -105,7 +105,7 @@ router.route("/:projectId/toggleTool").put(async (req, res) => { respondWithError(res, error.status || 500, error.message || "An error occurred while toggling the tool state.") } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use PATCH instead") + respondWithError(res, 405, "Improper request method. Use PUT instead") }) export default router From d7ed12bc1bc2c198ea58a0fdcfe27506bbeb6336 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Mon, 6 Oct 2025 09:43:52 -0500 Subject: [PATCH 189/262] TPEN28 Tools Fix (#365) * TPEN28 Tools Fix * cookies --- classes/Project/Project.js | 11 +++++++---- classes/Project/ProjectFactory.js | 26 ++++++++++++++++++++++---- project/import28Router.js | 9 ++++----- project/projectCreateRouter.js | 3 +++ 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 8e018317..dc40d35e 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -242,12 +242,15 @@ export default class Project { this.data.tools = this.data.tools.map(tool => { const match = selectedValues.find(t => { - if (isNotValidValue(t.value)) - throw new Error("Invalid value") - return t.value === tool.value}) + if (isNotValidValue(t.toolName)) + throw new Error("Invalid toolName") + return t.toolName === tool.toolName}) return { ...tool, - state: match ? match.state : tool.state + custom: { + ...tool.custom, + enabled: match ? match.enabled : tool.custom.enabled + } } }) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 909ca767..b8f39e9e 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -295,16 +295,34 @@ export default class ProjectFactory { } let projectTools = [] try { - projectTools = [...projectTPEN28Data.userTool, ...projectTPEN28Data.projectTool] + projectTools = [...projectTPEN28Data.userTool, ...projectTPEN28Data.projectTool?.map(tool => tool.name)] } catch (err) { // Just in case the spread operator didn't end up making an array due to 'undefined' or something weird. projectTools = [] } - const toolList = projectTPEN3Data.tools.map((tool) => tool.value) + + const toolNameToSlug = { + page: "page", + inspector: "inspect", + characters: "characters", + xml: "xml", + fullpage: "view-fullpage", + history: "history", + preview: "preview", + parsing: "line-breaking", + compare: "compare-pages", + "Cappelli's Abbreviation": "cappelli-abbreviation", + Enigma: "enigma", + "Latin Dictionary": "latin-dictionary", + "Latin Vulgate": "latin-vulgate", + } + + const toolList = projectTPEN3Data.tools.map((tool) => tool.toolName) + const slugs = projectTools.map((tool) => toolNameToSlug[tool]) const selectedTools = toolList.map((tool) => ({ - value: tool, - state: projectTools.includes(tool), + toolName: tool, + enabled: slugs.includes(tool), })) const project = new Project(projectTPEN3Data._id) if (selectedTools && selectedTools.length > 0) { diff --git a/project/import28Router.js b/project/import28Router.js index aef62412..2445c754 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -5,6 +5,7 @@ import auth0Middleware from "../auth/index.js" import cors from "cors" import validateURL from "../utilities/validateURL.js" import ProjectFactory from "../classes/Project/ProjectFactory.js" +import Tools from "../classes/Tools/Tools.js" function patchTokenFromQuery(req, res, next) { if (!req.headers.authorization && req.cookies.userToken) { @@ -100,10 +101,6 @@ router.route("/import28/:uid").get( }) ) - Object.keys(req.cookies).forEach((cookieName) => { - res.clearCookie(cookieName) - }) - return res.status(200).json({ message: "Select a Project to Import : ", data: parsedData @@ -161,11 +158,13 @@ router.route("/import28/selectedproject/:selectedProjectId").get( const manifestURL = `${process.env.TPEN28URL}/TPEN/manifest/${selectedProjectId}` let checkURL = await validateURL(manifestURL) + let tools = req?.body?.tools ?? [] + tools = await new Tools().validateAllTools(tools) let importData if (!checkURL.valid) return res.status(checkURL.status).json({message: checkURL.message, resolvedPayload: checkURL.resolvedPayload}) try { - importData = await ProjectFactory.fromManifestURL(manifestURL, user.agent.split('/').pop(), true) + importData = await ProjectFactory.fromManifestURL(manifestURL, user.agent.split('/').pop(), tools, true) } catch (error) { res.status(error.status ?? 500).json({ status: error.status ?? 500, diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 1ed7a16d..da141266 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -72,6 +72,8 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { } } else if (createFrom === "tpen28url") { const manifestURL = req?.body?.url + let tools = req?.body?.tools ?? [] + tools = await new Tools().validateAllTools(tools) let checkURL = await validateURL(manifestURL) if (!checkURL.valid) return res.status(checkURL.status).json({ @@ -83,6 +85,7 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { const result = await ProjectFactory.fromManifestURL( manifestURL, user.agent.split('/').pop(), + tools, true ) res.status(201).json(result) From 13883540bdafc404803007c76fb7fef578f388fa Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:35:49 -0500 Subject: [PATCH 190/262] Preview Transcription Default Tool (#368) * Preview Transcription Default Tool * Compare Pages --- classes/Tools/Tools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index db982633..cd25ab32 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -228,7 +228,7 @@ export default class Tools { "enabled": true, "tagName": "" }, - "url": "", + "url": "https://centerfordigitalhumanities.github.io/Preview-Transcription/", "location": "pane" }, { @@ -248,7 +248,7 @@ export default class Tools { "enabled": false, "tagName": "" }, - "url": "", + "url": "https://centerfordigitalhumanities.github.io/Compare-Pages/", "location": "pane" }, { From 81c34844f4d7fadd116694006260c50211e3a778 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 8 Oct 2025 10:36:34 -0400 Subject: [PATCH 191/262] Add Tests to Check If Routes Exist (#367) * prepare for AI * Thanks Claude * cleanup * cleanup license file name * cleanup * cleanup * add method detection to tests * cleanup * cleanup --- LICENSE .md => LICENSE.md | 0 __tests__/mount.test.js | 352 ++++++++++++++++++++++ package-lock.json | 221 ++++++++++++-- package.json | 2 +- userProfile/__tests__/exists_unit.test.js | 39 --- 5 files changed, 542 insertions(+), 72 deletions(-) rename LICENSE .md => LICENSE.md (100%) create mode 100644 __tests__/mount.test.js delete mode 100644 userProfile/__tests__/exists_unit.test.js diff --git a/LICENSE .md b/LICENSE.md similarity index 100% rename from LICENSE .md rename to LICENSE.md diff --git a/__tests__/mount.test.js b/__tests__/mount.test.js new file mode 100644 index 00000000..f7fe2ae3 --- /dev/null +++ b/__tests__/mount.test.js @@ -0,0 +1,352 @@ +/** + * Express Route Detection + * + * This approach checks routes without making HTTP requests by + * directly inspecting the Express app's routing table. + */ + +import request from "supertest" +import { jest } from "@jest/globals" +import app from "../app.js" +import fs from "fs" + +/** + * Recursively extract all routes from Express 5 router layers + * @param {Object} layer - A router stack layer + * @param {string} prefix - The path prefix from parent routers + * @returns {Array} - Array of route objects with method and path + */ +function extractRoutes(layer, prefix = '') { + const routes = [] + + // If this layer has a route (actual endpoint) + if (layer.route) { + const methods = Object.keys(layer.route.methods) + const path = prefix + layer.route.path + methods.forEach(method => { + routes.push({ method: method.toLowerCase(), path }) + }) + } + + // If this layer is a nested router + if (layer.name === 'router' && layer.handle?.stack) { + // Try to extract the router's path prefix from matchers + let routerPath = '' + if (layer.matchers && layer.matchers[0]) { + // Test with various paths to detect the prefix + const testPaths = ['/test', '/a/b', '/x/y/z'] + for (const testPath of testPaths) { + const result = layer.matchers[0](testPath) + if (result && result.path) { + routerPath = result.path + break + } + } + } + + // Recursively extract routes from nested router + layer.handle.stack.forEach(nestedLayer => { + routes.push(...extractRoutes(nestedLayer, prefix + routerPath)) + }) + } + + return routes +} + +/** + * Get all registered routes from the Express app (cached) + * This is called once when the module loads to avoid repeated extraction + */ +const allRoutes = (() => { + const routes = [] + app.router.stack.forEach(layer => { + routes.push(...extractRoutes(layer)) + }) + return routes +})() + +/** + * Check if a route exists in the Express app + * @param {string} path - The route path to check (e.g., '/', '/api', '/:id', '/:projectId/hotkeys') + * @param {string} [method] - Optional HTTP method to check (e.g., 'get', 'post', 'put', 'delete', 'patch') + * @returns {boolean} - True if the route exists (and matches the method if specified) + */ +function routeExists(path, method = null) { + return allRoutes.some(route => { + // Normalize paths for comparison (handle trailing slashes) + const routePath = route.path.replace(/\/+$/, '') || '/' + const testPath = path.replace(/\/+$/, '') || '/' + + const pathMatches = routePath === testPath + + // If method is specified, check if it matches + if (method) return pathMatches && route.method === method.toLowerCase() + + return pathMatches + }) +} + +describe('Check to see that all expected route patterns exist. #exists_unit', () => { + + describe('Root and API routes', () => { + it('GET / -- root index route', () => { + expect(routeExists('/', 'get')).toBe(true) + }) + + it('GET /api -- API documentation route', () => { + expect(routeExists('/api', 'get')).toBe(true) + }) + }) + + describe('Private user routes (/my)', () => { + it('GET /my/profile -- authenticated or public user profile', () => { + expect(routeExists('/profile', 'get')).toBe(true) + }) + + it('PUT /my/profile -- update user profile', () => { + expect(routeExists('/profile', 'put')).toBe(true) + }) + + it('GET /my/projects -- user projects list', () => { + expect(routeExists('/projects', 'get')).toBe(true) + }) + }) + + describe('Project creation and import routes', () => { + it('POST /project/create -- create new project', () => { + expect(routeExists('/create', 'post')).toBe(true) + }) + + it('POST /project/import -- import from manifest URL', () => { + expect(routeExists('/import', 'post')).toBe(true) + }) + + it('POST /project/import-image -- import image', () => { + expect(routeExists('/import-image', 'post')).toBe(true) + }) + + it('GET /project/deletecookie -- TPEN 2.8 import cookie deletion', () => { + expect(routeExists('/deletecookie', 'get')).toBe(true) + }) + + it('GET /project/import28/:uid -- TPEN 2.8 import by user ID', () => { + expect(routeExists('/import28/:uid', 'get')).toBe(true) + }) + + it('GET /project/import28/selectedproject/:selectedProjectId -- TPEN 2.8 selected project import', () => { + expect(routeExists('/import28/selectedproject/:selectedProjectId', 'get')).toBe(true) + }) + }) + + describe('Project read and management routes', () => { + it('GET /project/:id -- get project by ID', () => { + expect(routeExists('/:id', 'get')).toBe(true) + }) + + it('GET /project/:id/manifest -- export project manifest', () => { + expect(routeExists('/:id/manifest', 'get')).toBe(true) + }) + + it('GET /project/:id/deploymentStatus -- check manifest deployment status', () => { + expect(routeExists('/:id/deploymentStatus', 'get')).toBe(true) + }) + + it('PATCH /project/:projectId/label -- update project label', () => { + expect(routeExists('/:projectId/label', 'patch')).toBe(true) + }) + + it('PUT /project/:projectId/metadata -- update project metadata', () => { + expect(routeExists('/:projectId/metadata', 'put')).toBe(true) + }) + }) + + describe('Project member management routes', () => { + it('POST /project/:id/invite-member -- invite project member', () => { + expect(routeExists('/:id/invite-member', 'post')).toBe(true) + }) + + it('POST /project/:id/remove-member -- remove project member', () => { + expect(routeExists('/:id/remove-member', 'post')).toBe(true) + }) + + it('POST /project/:projectId/collaborator/:collaboratorId/addRoles -- add roles to collaborator', () => { + expect(routeExists('/:projectId/collaborator/:collaboratorId/addRoles', 'post')).toBe(true) + }) + + it('PUT /project/:projectId/collaborator/:collaboratorId/setRoles -- set collaborator roles', () => { + expect(routeExists('/:projectId/collaborator/:collaboratorId/setRoles', 'put')).toBe(true) + }) + + it('POST /project/:projectId/collaborator/:collaboratorId/removeRoles -- remove collaborator roles', () => { + expect(routeExists('/:projectId/collaborator/:collaboratorId/removeRoles', 'post')).toBe(true) + }) + + it('POST /project/:projectId/switch/owner -- switch project owner', () => { + expect(routeExists('/:projectId/switch/owner', 'post')).toBe(true) + }) + + it('GET /project/:projectId/collaborator/:collaboratorId/agent/:agentId -- get collaborator agent info', () => { + expect(routeExists('/:projectId/collaborator/:collaboratorId/agent/:agentId', 'get')).toBe(true) + }) + + it('GET /project/:projectId/collaborator/:collaboratorId/decline -- decline project invitation', () => { + expect(routeExists('/:projectId/collaborator/:collaboratorId/decline', 'get')).toBe(true) + }) + }) + + describe('Project custom roles routes', () => { + it('GET /project/:projectId/customRoles -- get custom roles', () => { + expect(routeExists('/:projectId/customRoles', 'get')).toBe(true) + }) + + it('POST /project/:projectId/addCustomRoles -- add custom roles', () => { + expect(routeExists('/:projectId/addCustomRoles', 'post')).toBe(true) + }) + + it('PUT /project/:projectId/updateCustomRoles -- update custom roles', () => { + expect(routeExists('/:projectId/updateCustomRoles', 'put')).toBe(true) + }) + + it('DELETE /project/:projectId/removeCustomRoles -- remove custom roles', () => { + expect(routeExists('/:projectId/removeCustomRoles', 'delete')).toBe(true) + }) + }) + + describe('Project hotkeys routes', () => { + it('GET /project/:projectId/hotkeys -- get project hotkeys', () => { + expect(routeExists('/:projectId/hotkeys', 'get')).toBe(true) + }) + + it('POST /project/:projectId/hotkeys -- create project hotkeys', () => { + expect(routeExists('/:projectId/hotkeys', 'post')).toBe(true) + }) + + it('PUT /project/:projectId/hotkeys -- update project hotkeys', () => { + expect(routeExists('/:projectId/hotkeys', 'put')).toBe(true) + }) + + it('DELETE /project/:projectId/hotkeys -- delete project hotkeys', () => { + expect(routeExists('/:projectId/hotkeys', 'delete')).toBe(true) + }) + }) + + describe('Project tools routes', () => { + it('POST /project/:projectId/tool -- add tool to project', () => { + expect(routeExists('/:projectId/tool', 'post')).toBe(true) + }) + + it('DELETE /project/:projectId/tool -- remove tool from project', () => { + expect(routeExists('/:projectId/tool', 'delete')).toBe(true) + }) + + it('PUT /project/:projectId/toggleTool -- toggle tool state', () => { + expect(routeExists('/:projectId/toggleTool', 'put')).toBe(true) + }) + }) + + describe('Project copy routes', () => { + it('POST /project/:projectId/copy -- copy project', () => { + expect(routeExists('/:projectId/copy', 'post')).toBe(true) + }) + + it('POST /project/:projectId/copy-without-annotations -- copy project without annotations', () => { + expect(routeExists('/:projectId/copy-without-annotations', 'post')).toBe(true) + }) + + it('POST /project/:projectId/copy-with-group -- copy project with group', () => { + expect(routeExists('/:projectId/copy-with-group', 'post')).toBe(true) + }) + + it('POST /project/:projectId/copy-with-customizations -- copy project with customizations', () => { + expect(routeExists('/:projectId/copy-with-customizations', 'post')).toBe(true) + }) + }) + + describe('Layer routes (/project/:projectId/layer)', () => { + it('GET /project/:projectId/layer/:layerId -- get layer by ID', () => { + expect(routeExists('/:layerId', 'get')).toBe(true) + }) + + it('PUT /project/:projectId/layer/:layerId -- update layer', () => { + expect(routeExists('/:layerId', 'put')).toBe(true) + }) + + it('POST /project/:projectId/layer -- create new layer', () => { + expect(routeExists('/', 'post')).toBe(true) + }) + }) + + describe('Page routes (/project/:projectId/page)', () => { + it('GET /project/:projectId/page/:pageId -- get page by ID', () => { + expect(routeExists('/:pageId', 'get')).toBe(true) + }) + + it('PUT /project/:projectId/page/:pageId -- update page', () => { + expect(routeExists('/:pageId', 'put')).toBe(true) + }) + }) + + describe('Line routes (/project/:projectId/page/:pageId/line)', () => { + it('GET /project/:projectId/page/:pageId/line/:lineId -- get line by ID', () => { + expect(routeExists('/:lineId', 'get')).toBe(true) + }) + + it('POST /project/:projectId/page/:pageId/line -- create new line', () => { + expect(routeExists('/', 'post')).toBe(true) + }) + + it('PUT /project/:projectId/page/:pageId/line/:lineId -- update line', () => { + expect(routeExists('/:lineId', 'put')).toBe(true) + }) + + it('PATCH /project/:projectId/page/:pageId/line/:lineId/text -- update line text', () => { + expect(routeExists('/:lineId/text', 'patch')).toBe(true) + }) + + it('PATCH /project/:projectId/page/:pageId/line/:lineId/bounds -- update line bounds', () => { + expect(routeExists('/:lineId/bounds', 'patch')).toBe(true) + }) + }) + + describe('Proxy routes', () => { + it('GET /proxy/*_ -- proxy any GET request', () => { + expect(routeExists('/*_', 'get')).toBe(true) + }) + + it('OPTIONS /proxy/*_ -- proxy CORS preflight', () => { + expect(routeExists('/*_', 'options')).toBe(true) + }) + }) + + describe('Feedback routes (/beta)', () => { + it('POST /beta/feedback -- submit user feedback', () => { + expect(routeExists('/feedback', 'post')).toBe(true) + }) + + it('POST /beta/bug -- submit bug report', () => { + expect(routeExists('/bug', 'post')).toBe(true) + }) + }) +}) + +describe('Check to see that critical static files are present #exists_unit', () => { + it('/public folder files', () => { + const filePath = './public/' + expect(fs.existsSync(filePath+"index.html")).toBeTruthy() + expect(fs.existsSync(filePath+"API.html")).toBeTruthy() + }) +}) + + +describe('Check to see that critical repo files are present #exists_unit', () => { + it('root folder files', () => { + const filePath = './' // Replace with the actual file path + expect(fs.existsSync(filePath+"CODEOWNERS")).toBeTruthy() + expect(fs.existsSync(filePath+"CONTRIBUTING.md")).toBeTruthy() + expect(fs.existsSync(filePath+"README.md")).toBeTruthy() + expect(fs.existsSync(filePath+"API.md")).toBeTruthy() + expect(fs.existsSync(filePath+"LICENSE.md")).toBeTruthy() + expect(fs.existsSync(filePath+".gitignore")).toBeTruthy() + expect(fs.existsSync(filePath+"package.json")).toBeTruthy() + }) +}) diff --git a/package-lock.json b/package-lock.json index a260869f..04d12aae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "CC-BY", "dependencies": { "@iiif/helpers": "^1.5.3", - "@jest/globals": "^30.2.0", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.3", @@ -31,6 +30,7 @@ "tpen3-services": "file:" }, "devDependencies": { + "@jest/globals": "^30.2.0", "jest": "^30.2.0", "nodemon": "^3.1.10", "sinon": "^21.0.0", @@ -63,9 +63,9 @@ } }, "node_modules/@asamuzakjp/dom-selector": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.5.7.tgz", - "integrity": "sha512-cvdTPsi2qC1c22UppvuVmx/PDwuc6+QQkwt9OnwQD6Uotbh//tb2XDF0OoK2V0F4b8d02LIwNp3BieaDMAhIhA==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.6.1.tgz", + "integrity": "sha512-8QT9pokVe1fUt1C8IrJketaeFOdRfTOS96DL3EBjE8CRZm3eHnwMlQe2NPoOSEYPwJ5Q25uYoX1+m9044l3ysQ==", "license": "MIT", "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", @@ -94,6 +94,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", @@ -108,6 +109,7 @@ "version": "7.28.4", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz", "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -117,6 +119,7 @@ "version": "7.28.4", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz", "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -147,6 +150,7 @@ "version": "7.28.3", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", + "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.28.3", @@ -163,6 +167,7 @@ "version": "7.27.2", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", + "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.27.2", @@ -179,6 +184,7 @@ "version": "7.28.0", "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -188,6 +194,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", + "dev": true, "license": "MIT", "dependencies": { "@babel/traverse": "^7.27.1", @@ -201,6 +208,7 @@ "version": "7.28.3", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.27.1", @@ -218,6 +226,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -227,6 +236,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -236,6 +246,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -245,6 +256,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -254,6 +266,7 @@ "version": "7.28.4", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz", "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==", + "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.27.2", @@ -267,6 +280,7 @@ "version": "7.28.4", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", + "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.28.4" @@ -282,6 +296,7 @@ "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -294,6 +309,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -306,6 +322,7 @@ "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" @@ -318,6 +335,7 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -333,6 +351,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" @@ -348,6 +367,7 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -360,6 +380,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -372,6 +393,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" @@ -387,6 +409,7 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -399,6 +422,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -411,6 +435,7 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" @@ -423,6 +448,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -435,6 +461,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -447,6 +474,7 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" @@ -459,6 +487,7 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -474,6 +503,7 @@ "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -489,6 +519,7 @@ "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" @@ -504,6 +535,7 @@ "version": "7.27.2", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -518,6 +550,7 @@ "version": "7.28.4", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz", "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -536,6 +569,7 @@ "version": "7.28.4", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -800,6 +834,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, "license": "ISC", "dependencies": { "camelcase": "^5.3.1", @@ -816,6 +851,7 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -891,6 +927,7 @@ "version": "30.0.1", "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz", "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==", + "dev": true, "license": "MIT", "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -900,6 +937,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.2.0.tgz", "integrity": "sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==", + "dev": true, "license": "MIT", "dependencies": { "@jest/fake-timers": "30.2.0", @@ -915,6 +953,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.2.0.tgz", "integrity": "sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==", + "dev": true, "license": "MIT", "dependencies": { "expect": "30.2.0", @@ -928,6 +967,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.2.0.tgz", "integrity": "sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==", + "dev": true, "license": "MIT", "dependencies": { "@jest/get-type": "30.1.0" @@ -940,6 +980,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.2.0.tgz", "integrity": "sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==", + "dev": true, "license": "MIT", "dependencies": { "@jest/types": "30.2.0", @@ -957,6 +998,7 @@ "version": "30.1.0", "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz", "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==", + "dev": true, "license": "MIT", "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -966,6 +1008,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.2.0.tgz", "integrity": "sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==", + "dev": true, "license": "MIT", "dependencies": { "@jest/environment": "30.2.0", @@ -981,6 +1024,7 @@ "version": "30.0.1", "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz", "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -1037,6 +1081,7 @@ "version": "30.0.5", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz", "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==", + "dev": true, "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.34.0" @@ -1049,6 +1094,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz", "integrity": "sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==", + "dev": true, "license": "MIT", "dependencies": { "@jest/types": "30.2.0", @@ -1111,6 +1157,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.2.0.tgz", "integrity": "sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==", + "dev": true, "license": "MIT", "dependencies": { "@babel/core": "^7.27.4", @@ -1137,6 +1184,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.2.0.tgz", "integrity": "sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==", + "dev": true, "license": "MIT", "dependencies": { "@jest/pattern": "30.0.1", @@ -1155,6 +1203,7 @@ "version": "0.3.13", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -1165,6 +1214,7 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -1175,6 +1225,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -1184,12 +1235,14 @@ "version": "1.5.5", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -1256,6 +1309,7 @@ "version": "0.2.9", "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz", "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==", + "dev": true, "license": "MIT", "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" @@ -1268,12 +1322,14 @@ "version": "0.34.41", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz", "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==", + "dev": true, "license": "MIT" }, "node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "type-detect": "4.0.8" @@ -1283,6 +1339,7 @@ "version": "13.0.5", "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1" @@ -1375,12 +1432,14 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" @@ -1390,24 +1449,26 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } }, "node_modules/@types/node": { - "version": "24.6.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz", - "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==", + "version": "24.7.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.0.tgz", + "integrity": "sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==", "license": "MIT", "dependencies": { - "undici-types": "~7.13.0" + "undici-types": "~7.14.0" } }, "node_modules/@types/stack-utils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true, "license": "MIT" }, "node_modules/@types/trusted-types": { @@ -1436,6 +1497,7 @@ "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "dev": true, "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -1445,12 +1507,14 @@ "version": "21.0.3", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true, "license": "MIT" }, "node_modules/@ungap/structured-clone": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, "license": "ISC" }, "node_modules/@unrs/resolver-binding-android-arm-eabi": { @@ -1784,6 +1848,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -1799,6 +1864,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -1812,6 +1878,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" @@ -1857,6 +1924,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz", "integrity": "sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==", + "dev": true, "license": "BSD-3-Clause", "workspaces": [ "test/babel-8" @@ -1889,6 +1957,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz", "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==", + "dev": true, "license": "MIT", "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", @@ -1932,12 +2001,14 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.8.11", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.11.tgz", - "integrity": "sha512-i+sRXGhz4+QW8aACZ3+r1GAKMt0wlFpeA8M5rOQd0HEYw9zhDrlx9Wc8uQ0IdXakjJRthzglEwfB/yqIjO6iDg==", + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.12.tgz", + "integrity": "sha512-vAPMQdnyKCBtkmQA6FMCBvU9qFIppS3nzyXnEM+Lo2IAhG4Mpjv9cCxMudhgV3YdNNJv6TNqXy97dfRVL2LmaQ==", + "dev": true, "license": "Apache-2.0", "bin": { "baseline-browser-mapping": "dist/cli.js" @@ -2017,6 +2088,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -2029,6 +2101,7 @@ "version": "4.26.3", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz", "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==", + "dev": true, "funding": [ { "type": "opencollective", @@ -2062,6 +2135,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" @@ -2135,15 +2209,17 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001747", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001747.tgz", - "integrity": "sha512-mzFa2DGIhuc5490Nd/G31xN1pnBnYMadtkyTjefPI7wzypqgCEpeWu9bJr0OnDsyKrW75zA9ZAt7pbQFmwLsQg==", + "version": "1.0.30001748", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001748.tgz", + "integrity": "sha512-5P5UgAr0+aBmNiplks08JLw+AW/XG/SurlgZLgB1dDLfAw7EfRGxIwzPHxdSCGY/BTKDqIVyJL87cCN6s0ZR0w==", + "dev": true, "funding": [ { "type": "opencollective", @@ -2164,6 +2240,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -2212,9 +2289,10 @@ } }, "node_modules/ci-info": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", - "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz", + "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==", + "dev": true, "funding": [ { "type": "github", @@ -2333,6 +2411,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -2345,6 +2424,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, "license": "MIT" }, "node_modules/combined-stream": { @@ -2374,6 +2454,7 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, "license": "MIT" }, "node_modules/content-disposition": { @@ -2401,6 +2482,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, "license": "MIT" }, "node_modules/cookie": { @@ -2689,9 +2771,10 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.230", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.230.tgz", - "integrity": "sha512-A6A6Fd3+gMdaed9wX83CvHYJb4UuapPD5X5SLq72VZJzxHSY0/LUweGXRWmQlh2ln7KV7iw7jnwXK7dlPoOnHQ==", + "version": "1.5.231", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.231.tgz", + "integrity": "sha512-cyl6vqZGkEBnz/PmvFHn/u9G/hbo+FF2CNAOXriG87QOeLsUdifCZ9UbHNscE9wGdrC8XstNMli0CbQnZQ+fkA==", + "dev": true, "license": "ISC" }, "node_modules/emittery": { @@ -2795,6 +2878,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -2810,6 +2894,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -2819,6 +2904,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", @@ -2882,6 +2968,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/expect/-/expect-30.2.0.tgz", "integrity": "sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==", + "dev": true, "license": "MIT", "dependencies": { "@jest/expect-utils": "30.2.0", @@ -2971,6 +3058,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, "license": "MIT" }, "node_modules/fast-safe-stringify": { @@ -2984,6 +3072,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" @@ -2993,6 +3082,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -3022,6 +3112,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, "license": "MIT", "dependencies": { "locate-path": "^5.0.0", @@ -3128,12 +3219,14 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -3157,6 +3250,7 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -3200,6 +3294,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=8.0.0" @@ -3281,12 +3376,14 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, "license": "ISC" }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3467,6 +3564,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.8.19" @@ -3477,6 +3575,7 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, "license": "ISC", "dependencies": { "once": "^1.3.0", @@ -3565,6 +3664,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -3606,6 +3706,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=8" @@ -3615,6 +3716,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.23.9", @@ -3631,6 +3733,7 @@ "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -3862,6 +3965,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.2.0.tgz", "integrity": "sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==", + "dev": true, "license": "MIT", "dependencies": { "@jest/diff-sequences": "30.0.1", @@ -3926,6 +4030,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.2.0.tgz", "integrity": "sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==", + "dev": true, "license": "MIT", "dependencies": { "@jest/types": "30.2.0", @@ -3964,6 +4069,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz", "integrity": "sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==", + "dev": true, "license": "MIT", "dependencies": { "@jest/get-type": "30.1.0", @@ -3979,6 +4085,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.2.0.tgz", "integrity": "sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -3999,6 +4106,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.2.0.tgz", "integrity": "sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==", + "dev": true, "license": "MIT", "dependencies": { "@jest/types": "30.2.0", @@ -4031,6 +4139,7 @@ "version": "30.0.1", "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz", "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==", + "dev": true, "license": "MIT", "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -4142,6 +4251,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.2.0.tgz", "integrity": "sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==", + "dev": true, "license": "MIT", "dependencies": { "@babel/core": "^7.27.4", @@ -4174,6 +4284,7 @@ "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -4186,6 +4297,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.2.0.tgz", "integrity": "sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==", + "dev": true, "license": "MIT", "dependencies": { "@jest/types": "30.2.0", @@ -4203,6 +4315,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -4266,6 +4379,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.2.0.tgz", "integrity": "sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -4282,6 +4396,7 @@ "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -4306,12 +4421,14 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, "license": "MIT" }, "node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, "license": "MIT", "dependencies": { "argparse": "^1.0.7", @@ -4364,6 +4481,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -4383,6 +4501,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -4412,6 +4531,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, "license": "MIT", "dependencies": { "p-locate": "^4.1.0" @@ -4424,6 +4544,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, "license": "ISC", "dependencies": { "yallist": "^3.0.2" @@ -4462,6 +4583,7 @@ "version": "1.0.12", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "tmpl": "1.0.5" @@ -4553,6 +4675,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, "license": "MIT" }, "node_modules/methods": { @@ -4569,6 +4692,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -4807,9 +4931,9 @@ } }, "node_modules/napi-postinstall": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz", - "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz", + "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==", "dev": true, "license": "MIT", "bin": { @@ -4826,6 +4950,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, "license": "MIT" }, "node_modules/negotiator": { @@ -4841,18 +4966,20 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true, "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz", - "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", + "version": "2.0.23", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.23.tgz", + "integrity": "sha512-cCmFDMSm26S6tQSDpBCg/NR8NENrVPhAJSf+XbxBG4rPFaaonlEoE9wHQmun+cls499TQGSb7ZyPBRlzgKfpeg==", + "dev": true, "license": "MIT" }, "node_modules/nodemailer": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.6.tgz", - "integrity": "sha512-F44uVzgwo49xboqbFgBGkRaiMgtoBrBEWCVincJPK9+S9Adkzt/wXCLKbf7dxucmxfTI5gHGB+bEmdyzN6QKjw==", + "version": "7.0.7", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.7.tgz", + "integrity": "sha512-jGOaRznodf62TVzdyhKt/f1Q/c3kYynk8629sgJHpRzGZj01ezbgMMWJSAjHADcwTKxco3B68/R+KHJY2T5BaA==", "license": "MIT-0", "engines": { "node": ">=6.0.0" @@ -4951,6 +5078,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -5056,6 +5184,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, "license": "MIT", "dependencies": { "p-limit": "^2.2.0" @@ -5068,6 +5197,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, "license": "MIT", "dependencies": { "p-try": "^2.0.0" @@ -5083,6 +5213,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -5146,6 +5277,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5155,6 +5287,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -5214,6 +5347,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -5226,6 +5360,7 @@ "version": "4.0.7", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", + "dev": true, "license": "MIT", "engines": { "node": ">= 6" @@ -5277,6 +5412,7 @@ "version": "30.2.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz", "integrity": "sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==", + "dev": true, "license": "MIT", "dependencies": { "@jest/schemas": "30.0.5", @@ -5291,6 +5427,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -5404,6 +5541,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true, "license": "MIT" }, "node_modules/readdirp": { @@ -5455,6 +5593,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5524,6 +5663,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -5671,6 +5811,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, "license": "ISC", "engines": { "node": ">=14" @@ -5727,6 +5868,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -5775,12 +5917,14 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/stack-utils": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, "license": "MIT", "dependencies": { "escape-string-regexp": "^2.0.0" @@ -6011,6 +6155,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -6036,6 +6181,7 @@ "version": "0.11.11", "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz", "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==", + "dev": true, "license": "MIT", "dependencies": { "@pkgr/core": "^0.2.9" @@ -6051,6 +6197,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", @@ -6065,6 +6212,7 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -6076,6 +6224,7 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -6096,6 +6245,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -6126,12 +6276,14 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -6199,6 +6351,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -6239,9 +6392,9 @@ "license": "MIT" }, "node_modules/undici-types": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz", - "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==", + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", + "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", "license": "MIT" }, "node_modules/unpipe": { @@ -6292,6 +6445,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "dev": true, "funding": [ { "type": "opencollective", @@ -6358,6 +6512,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, "license": "Apache-2.0", "dependencies": { "makeerror": "1.0.12" @@ -6527,6 +6682,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "dev": true, "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", @@ -6586,6 +6742,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, "license": "ISC" }, "node_modules/yargs": { diff --git a/package.json b/package.json index 1346a0cb..aad6d5a8 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ }, "dependencies": { "@iiif/helpers": "^1.5.3", - "@jest/globals": "^30.2.0", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.3", @@ -56,6 +55,7 @@ }, "devDependencies": { "jest": "^30.2.0", + "@jest/globals": "^30.2.0", "nodemon": "^3.1.10", "sinon": "^21.0.0", "supertest": "^7.1.4" diff --git a/userProfile/__tests__/exists_unit.test.js b/userProfile/__tests__/exists_unit.test.js deleted file mode 100644 index a98dc31b..00000000 --- a/userProfile/__tests__/exists_unit.test.js +++ /dev/null @@ -1,39 +0,0 @@ -import app from '../../app.js' -import { jest } from '@jest/globals' -import expressListEndpoints from "express-list-endpoints" - -describe.skip('userProfile endpoint availability unit test (via a check on the app routes). #exists_unit', () => { - it('/user/:id is registered', () => { - let exists = false - const stack = expressListEndpoints(app.router) - for(const middleware of stack){ - if(middleware.path && middleware.path.includes("/user/:id")) { - exists = true - break - } - } - expect(exists).toBe(true) - }) - it('/my/profile is a registered endpoint', () => { - let exists = false - const stack = expressListEndpoints(app.router) - for(const middleware of stack){ - if(middleware.path && middleware.path.includes("/my/profile")) { - exists = true - break - } - } - expect(exists).toBe(true) - }) - it('/my/projects is a registered endpoint', () => { - let exists = false - const stack = expressListEndpoints(app.router) - for(const middleware of stack){ - if(middleware.path && middleware.path.includes("/my/projects")) { - exists = true - break - } - } - expect(exists).toBe(true) - }) -}) From 43db3a363e2d59814259a57d49e5546a6511d13f Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri, 10 Oct 2025 09:49:25 -0500 Subject: [PATCH 192/262] Line Break URL (#371) --- classes/Tools/Tools.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index cd25ab32..76fa8b36 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -235,17 +235,17 @@ export default class Tools { "label": "Line Breaking", "toolName": "line-breaking", "custom": { - "enabled": false, + "enabled": true, "tagName": "" }, - "url": "", + "url": "https://centerfordigitalhumanities.github.io/Line-Breaking/", "location": "dialog" }, { "label": "Compare Pages", "toolName": "compare-pages", "custom": { - "enabled": false, + "enabled": true, "tagName": "" }, "url": "https://centerfordigitalhumanities.github.io/Compare-Pages/", @@ -264,31 +264,31 @@ export default class Tools { { "label": "Enigma", "toolName": "enigma", - "url": "https://http://enigma.huma-num.fr/", "custom": { - "enabled": false, + "enabled": true, "tagName": "" }, + "url": "http://enigma.huma-num.fr/", "location": "pane" }, { "label": "Latin Dictionary", "toolName": "latin-dictionary", - "url": "https://www.perseus.tufts.edu/hopper/resolveform?lang=latin", "custom": { "enabled": true, "tagName": "" }, + "url": "https://www.perseus.tufts.edu/hopper/resolveform?lang=latin", "location": "pane" }, { "label": "Latin Vulgate", "toolName": "latin-vulgate", - "url": "https://vulsearch.sourceforge.net/cgi-bin/vulsearch", "custom": { - "enabled": false, + "enabled": true, "tagName": "" }, + "url": "https://vulsearch.sourceforge.net/cgi-bin/vulsearch", "location": "pane" } ] From a0ea62eeb38822c13e01f1a0dd12e2e4e45ede27 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 15 Oct 2025 08:58:51 -0500 Subject: [PATCH 193/262] 369 support namespaced project metadata (#370) * add support for project_metadata namespaces Introduces customMetadataRouter with GET, POST, and PUT endpoints for namespaced project_metadata, including deep upsert logic and origin-based namespace detection. Updates ProjectFactory to include project_metadata, adds tests for the new router, and modifies projectReadRouter to filter project_metadata by allowed namespaces based on request origin and query parameters. Integrates the new router into the main project router. * load the project before updating * Refactor ProjectFactory formatting and spacing * Improve local and missing origin detection in namespace logic Enhanced getNamespacesToInclude to check both host and origin headers for local addresses. If origin cannot be determined or parsed, defaults to wildcard for better backward compatibility and local testing support. * Refactor project_metadata to interfaces in router * hi * Update customMetadataRouter.js * Add suspicious JSON check to custom metadata routes Moved suspicious content screening from middleware to inline checks in POST and PUT /project/:id/custom routes. Now uses isSuspiciousJSON to wrap suspicious payloads, improving security and flexibility. * sus checks --------- Co-authored-by: Bryan Haberberger --- __tests__/mount.test.js | 14 + classes/Project/ProjectFactory.js | 293 +++++++++--------- .../__tests__/customMetadataRouter.test.js | 78 +++++ project/customMetadataRouter.js | 234 ++++++++++++++ project/index.js | 2 + project/projectReadRouter.js | 93 +++++- 6 files changed, 568 insertions(+), 146 deletions(-) create mode 100644 project/__tests__/customMetadataRouter.test.js create mode 100644 project/customMetadataRouter.js diff --git a/__tests__/mount.test.js b/__tests__/mount.test.js index f7fe2ae3..b0c5344c 100644 --- a/__tests__/mount.test.js +++ b/__tests__/mount.test.js @@ -230,6 +230,20 @@ describe('Check to see that all expected route patterns exist. #exists_unit', () }) }) + describe('Project custom metadata routes', () => { + it('GET /project/:id/custom -- get custom metadata namespaces', () => { + expect(routeExists('/:id/custom', 'get')).toBe(true) + }) + + it('POST /project/:id/custom -- create or replace namespace metadata', () => { + expect(routeExists('/:id/custom', 'post')).toBe(true) + }) + + it('PUT /project/:id/custom -- upsert namespace metadata', () => { + expect(routeExists('/:id/custom', 'put')).toBe(true) + }) + }) + describe('Project tools routes', () => { it('POST /project/:projectId/tool -- add tool to project', () => { expect(routeExists('/:projectId/tool', 'post')).toBe(true) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index b8f39e9e..fa79f6cf 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -39,7 +39,7 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) ?? now const metadata = manifest.metadata ?? [] - const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items, creator ) + const layer = Layer.build(_id, `First Layer - ${label}`, manifest.items, creator) const firstPage = layer.pages[0]?.id.split('/').pop() ?? true @@ -48,8 +48,8 @@ export default class ProjectFactory { _id, label, metadata, - manifest: importTPEN28 ? [ manifest.id.split('/manifest.json')[0] + '?version=3' ] : [ manifest.id ], - layers: [ layer.asProjectLayer() ], + manifest: importTPEN28 ? [manifest.id.split('/manifest.json')[0] + '?version=3'] : [manifest.id], + layers: [layer.asProjectLayer()], tools: Tools.defaultTools.concat(tools), _createdAt: now, _modifiedAt: -1, @@ -58,7 +58,7 @@ export default class ProjectFactory { } static getLabelAsString(label) { - if (label === null || label === undefined) return "" + if (label === null || label === undefined) return "" if (typeof label === "string") return label if (typeof label !== "object") return "" const lang = Object.keys(label).length ? Object.keys(label)[0] : null @@ -188,7 +188,8 @@ export default class ProjectFactory { for (const page of newPages) { const updatedPage = new Page( newLayer.id, - { id: page.id, label: page.label, target: page.target, + { + id: page.id, label: page.label, target: page.target, items: page.items, creator: creator, partOf: newLayer.id, @@ -230,7 +231,7 @@ export default class ProjectFactory { } static async clonePagesWithAnnotations(layer, page, copiedProject, creator, database) { - if(!page.id.startsWith(process.env.RERUMIDPREFIX)) { + if (!page.id.startsWith(process.env.RERUMIDPREFIX)) { return { id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, label: page.label, @@ -240,44 +241,44 @@ export default class ProjectFactory { } else { return await fetch(page.id) - .then(response => response.json()) - .then(async pageData => { - const newPage = new Page(layer.id,{ - id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, - label: page.label, - target: page.target, - creator: creator, - items: await Promise.all(pageData.items.map(async item => { - return await fetch(item.id) - .then(response => response.json()) - .then(async itemData => { - const newItem = new Line({ - id: `${process.env.SERVERURL}project/${copiedProject._id}/line/${database.reserveId()}`, - type: itemData.type, - label: itemData.label, - motivation: itemData.motivation, - body: itemData.body, - target: itemData.target, - creator: creator - }) - return await newItem.update() - }) - })) + .then(response => response.json()) + .then(async pageData => { + const newPage = new Page(layer.id, { + id: `${process.env.SERVERURL}project/${copiedProject._id}/page/${database.reserveId()}`, + label: page.label, + target: page.target, + creator: creator, + items: await Promise.all(pageData.items.map(async item => { + return await fetch(item.id) + .then(response => response.json()) + .then(async itemData => { + const newItem = new Line({ + id: `${process.env.SERVERURL}project/${copiedProject._id}/line/${database.reserveId()}`, + type: itemData.type, + label: itemData.label, + motivation: itemData.motivation, + body: itemData.body, + target: itemData.target, + creator: creator + }) + return await newItem.update() + }) + })) + }) + return await newPage.update() }) - return await newPage.update() - }) } } // We might add the Vault here to get the Manifest version 3 static transformManifestUrl(url, protocol) { - const parsedUrl = new URL(url) - parsedUrl.protocol = protocol - if (parsedUrl.pathname.endsWith("/manifest.json")) { - parsedUrl.pathname = parsedUrl.pathname.replace(/\/manifest\.json$/, "") - } - parsedUrl.search = "?version=3" - return parsedUrl.toString() + const parsedUrl = new URL(url) + parsedUrl.protocol = protocol + if (parsedUrl.pathname.endsWith("/manifest.json")) { + parsedUrl.pathname = parsedUrl.pathname.replace(/\/manifest\.json$/, "") + } + parsedUrl.search = "?version=3" + return parsedUrl.toString() } static async importTPEN28(projectTPEN28Data, projectTPEN3Data, userToken, protocol) { @@ -321,22 +322,22 @@ export default class ProjectFactory { const toolList = projectTPEN3Data.tools.map((tool) => tool.toolName) const slugs = projectTools.map((tool) => toolNameToSlug[tool]) const selectedTools = toolList.map((tool) => ({ - toolName: tool, - enabled: slugs.includes(tool), + toolName: tool, + enabled: slugs.includes(tool), })) const project = new Project(projectTPEN3Data._id) if (selectedTools && selectedTools.length > 0) { await project.updateTools(selectedTools) } const allCanvases = projectTPEN3Data.layers[0].pages.map((page) => page.target) - const allPagesIds = projectTPEN3Data.layers[0].pages.map((page) =>page.id.replace(/project\/([a-f0-9]+)/, `project/${projectTPEN3Data._id}`)) + const allPagesIds = projectTPEN3Data.layers[0].pages.map((page) => page.id.replace(/project\/([a-f0-9]+)/, `project/${projectTPEN3Data._id}`)) let manifestUrl = projectTPEN3Data.manifest[0] manifestUrl = this.transformManifestUrl(manifestUrl, protocol) const responseManifest = await fetch(manifestUrl) if (!responseManifest.ok) { - throw new Error(`Failed to fetch: ${responseManifest.statusText}`) + throw new Error(`Failed to fetch: ${responseManifest.statusText}`) } - + const manifestJson = await responseManifest.json() const itemsByPage = {} manifestJson.items.map((item, index) => { @@ -345,33 +346,33 @@ export default class ProjectFactory { const annotations = item.annotations?.flatMap( (annotation) => annotation.items?.flatMap((innerItems) => ({ - body: { - type: innerItems.body?.type, - format: innerItems.body?.format, - value: innerItems.body?.value, - }, - motivation: innerItems.motivation, - target: innerItems.target, - type: innerItems.type, + body: { + type: innerItems.body?.type, + format: innerItems.body?.format, + value: innerItems.body?.value, + }, + motivation: innerItems.motivation, + target: innerItems.target, + type: innerItems.type, })) || [] - ) || [] + ) || [] itemsByPage[allPagesIds[index]] = annotations } }) - + for (const [endpoint, annotations] of Object.entries(itemsByPage)) { - try { - const response = await fetch(`${endpoint}/line`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${userToken}`, - }, - body: JSON.stringify(annotations), - }) - if (!response.ok) { - throw new Error(`Failed to import annotations: ${response.statusText}`) - } + try { + const response = await fetch(`${endpoint}/line`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${userToken}`, + }, + body: JSON.stringify(annotations), + }) + if (!response.ok) { + throw new Error(`Failed to import annotations: ${response.statusText}`) + } } catch (error) { console.error("Error importing annotations:", error) } @@ -447,7 +448,7 @@ export default class ProjectFactory { await this.cloneLayers(project, copiedProject, creator, database, true) copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) - return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") + return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") } static async cloneWithCustomizations(projectId, creator, modules) { @@ -503,12 +504,13 @@ export default class ProjectFactory { let newPages = [] - if(result[layer.id]) { + if (result[layer.id]) { newPages = await this.clonePages(layer, copiedProject, creator, database, true) for (const page of newPages) { const updatedPage = new Page( newLayer.id, - { id: page.id, label: page.label, target: page.target, + { + id: page.id, label: page.label, target: page.target, items: page.items, creator: creator, partOf: newLayer.id, @@ -529,11 +531,11 @@ export default class ProjectFactory { copiedProject.layers.push(newLayer) } - if(!result[layer.id]) { + if (!result[layer.id]) { newPages = await this.clonePages(layer, copiedProject, creator, database, false) newLayer.pages.push(...newPages) copiedProject.layers.push(newLayer) - } + } } } else { @@ -549,13 +551,13 @@ export default class ProjectFactory { modules['Group Members'].push(creator) const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': modules['Group Members'] }) - if( modules['Hotkeys'] ) { + if (modules['Hotkeys']) { await this.cloneHotkeys(project._id, copiedProject._id) } copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") } - + static async DBObjectFromImage(manifest, creator) { if (!manifest) { throw { @@ -567,7 +569,7 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = ProjectFactory.getLabelAsString(manifest.label) const metadata = manifest.metadata ?? [] - const layer = Layer.build( _id, `First Layer - ${label}`, manifest.items, creator) + const layer = Layer.build(_id, `First Layer - ${label}`, manifest.items, creator) const firstPage = layer.pages[0]?.id.split('/').pop() ?? true @@ -575,8 +577,8 @@ export default class ProjectFactory { _id, label, metadata, - manifest: [ manifest.id ], - layers: [ layer.asProjectLayer() ], + manifest: [manifest.id], + layers: [layer.asProjectLayer()], tools: Tools.defaultTools, _createdAt: now, _modifiedAt: -1, @@ -600,7 +602,7 @@ export default class ProjectFactory { return ( region === "full" || region === "square" || - /^pct:\d+(\.\d+)?,\d+(\.\d+)?,\d+(\.\d+)?,\d+(\.\d+)?$/.test(region) || + /^pct:\d+(\.\d+)?,\d+(\.\d+)?,\d+(\.\d+)?,\d+(\.\d+)?$/.test(region) || /^\d+,\d+,\d+,\d+$/.test(region) ) } @@ -710,7 +712,7 @@ export default class ProjectFactory { id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, type: "Manifest", label: { "none": [label] }, - items: [ canvasLayout ], + items: [canvasLayout], creator: await fetchUserAgent(creator), } @@ -723,22 +725,22 @@ export default class ProjectFactory { await this.uploadFileToGitHub(projectCanvas, _id) return await ProjectFactory.DBObjectFromImage(projectManifest, creator) - .then(async (project) => { - const projectObj = new Project() - const group = await Group.createNewGroup(creator, - { - label: project.label ?? project.title ?? `Project ${new Date().toLocaleDateString()}`, - members: { [creator]: { roles: [] } } - }) - .then((group) => group._id) - return await projectObj.create({ ...project, creator, group }) - }) - .catch((err) => { - throw { - status: err.status ?? 500, - message: err.message ?? "Internal Server Error" - } - }) + .then(async (project) => { + const projectObj = new Project() + const group = await Group.createNewGroup(creator, + { + label: project.label ?? project.title ?? `Project ${new Date().toLocaleDateString()}`, + members: { [creator]: { roles: [] } } + }) + .then((group) => group._id) + return await projectObj.create({ ...project, creator, group }) + }) + .catch((err) => { + throw { + status: err.status ?? 500, + message: err.message ?? "Internal Server Error" + } + }) } /** @@ -832,22 +834,22 @@ export default class ProjectFactory { const annotationPages = [] await Promise.all(project.layers.map(layer => { - return layer.pages.forEach(page => { - if((page.target === canvas.id) && page.id.startsWith(process.env.RERUMIDPREFIX) ) { - const annotationPage = { - id: page.id, - type: "AnnotationPage" - } - annotationPages.push(annotationPage) + return layer.pages.forEach(page => { + if ((page.target === canvas.id) && page.id.startsWith(process.env.RERUMIDPREFIX)) { + const annotationPage = { + id: page.id, + type: "AnnotationPage" } - }) + annotationPages.push(annotationPage) + } }) + }) ) annotationPages.length > 0 && (canvasItems.annotations = await this.getAnnotations({ annotations: annotationPages })) return canvasItems } catch (error) { console.error(`Error processing layer:`, error) - return + return } }) ) @@ -958,19 +960,19 @@ export default class ProjectFactory { 'Content-Type': 'application/json', }, body: JSON.stringify({ - message: sha ? `Updated ${projectId}/${fileName}` : `Created ${projectId}/${fileName}`, - content: Buffer.from(JSON.stringify(manifest)).toString('base64'), - branch: process.env.BRANCH, - ...(sha && { sha }), + message: sha ? `Updated ${projectId}/${fileName}` : `Created ${projectId}/${fileName}`, + content: Buffer.from(JSON.stringify(manifest)).toString('base64'), + branch: process.env.BRANCH, + ...(sha && { sha }), }) - }) + }) - if (!putResponse.ok) { - const errText = await putResponse.text() - throw new Error(`GitHub upload failed: ${putResponse.status} - ${errText}`) - } + if (!putResponse.ok) { + const errText = await putResponse.text() + throw new Error(`GitHub upload failed: ${putResponse.status} - ${errText}`) + } - return await putResponse.json() + return await putResponse.json() } catch (error) { console.error(`Failed to upload ${projectId}/${fileName}:`, error) @@ -1010,93 +1012,93 @@ export default class ProjectFactory { const commitsUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/commits?path=${filePath}&per_page=1` const commits = await fetch(commitsUrl, { headers }) .then(async (resp) => { - if(resp.ok) return resp.json() - const errText = await resp.text() - return [{state: -1, "message": `${resp.status} - ${errText}`}] + if (resp.ok) return resp.json() + const errText = await resp.text() + return [{ state: -1, "message": `${resp.status} - ${errText}` }] }) .catch(err => { console.error(err) - return [{state: -1, "message": `TPEN Services Internal Server Error`}] + return [{ state: -1, "message": `TPEN Services Internal Server Error` }] }) - if(commits?.length && commits[0].state === -1) { + if (commits?.length && commits[0].state === -1) { console.error(commits[0]) - return {status: -1, message: commits[0].message} + return { status: -1, message: commits[0].message } } if (!commits.length) { - return {status: 1} + return { status: 1 } } const commitMessage = commits[0].commit?.message.split(' ') if (commitMessage[0] === 'Delete') { - return {status: 1} + return { status: 1 } } const latestSha = commits[0].sha const deployments = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/deployments?sha=${latestSha}` const deployment = await fetch(deployments, { headers }) .then(async (resp) => { - if(resp.ok) return resp.json() - const errText = await resp.text() - return [{state: -1, "message": `${resp.status} - ${errText}`}] + if (resp.ok) return resp.json() + const errText = await resp.text() + return [{ state: -1, "message": `${resp.status} - ${errText}` }] }) .catch(err => { console.error(err) - return [{state: -1, "message": `TPEN Services Internal Server Error`}] + return [{ state: -1, "message": `TPEN Services Internal Server Error` }] }) - if(deployment?.length && deployment[0].state === -1) { + if (deployment?.length && deployment[0].state === -1) { console.error(deployment[0]) - return {status: -1, message: deployment[0].message} + return { status: -1, message: deployment[0].message } } if (deployment.length === 0) { - if (await checkIfUrlExists(url)){ - if(new Date(commits[0].commit?.committer?.date) > new Date(Date.now() - 2 * 60 * 1000)) { - return {status: 2} + if (await checkIfUrlExists(url)) { + if (new Date(commits[0].commit?.committer?.date) > new Date(Date.now() - 2 * 60 * 1000)) { + return { status: 2 } } else { - return {status: 3} + return { status: 3 } } } - return {status: 9} + return { status: 9 } } const statusUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/deployments/${deployment[0].id}/statuses` const statuses = await fetch(statusUrl, { headers }) .then(async (resp) => { - if(resp.ok) return resp.json() - const errText = await resp.text() - return [{state: -1, "message": `${resp.status} - ${errText}`}] + if (resp.ok) return resp.json() + const errText = await resp.text() + return [{ state: -1, "message": `${resp.status} - ${errText}` }] }) .catch(err => { console.error(err) - return [{state: -1, "message": `TPEN Services Internal Server Error`}] + return [{ state: -1, "message": `TPEN Services Internal Server Error` }] }) if (statuses?.length && statuses[0].state === -1) { console.error(statuses[0]) - return {status: -1, message: statuses[0].message} + return { status: -1, message: statuses[0].message } } if (!statuses.length) { - return {status: 8} + return { status: 8 } } const latestStatus = statuses[0] const state = latestStatus.state if (state === 'success') { - return {status: 4} + return { status: 4 } } else if (['queued', 'in_progress', 'pending'].includes(state)) { - return {status: 5} + return { status: 5 } } else if (state === 'inactive') { - return {status: 6} + return { status: 6 } } else if (state === 'error') { - return {status: 7} + return { status: 7 } } else { - return {status: 8} + return { status: 8 } } } @@ -1187,13 +1189,14 @@ export default class ProjectFactory { roles: 1, layers: { $ifNull: ['$layers', []] }, metadata: { $ifNull: ['$metadata', []] }, + interfaces: { $ifNull: ['$interfaces', {}] }, manifest: 1, license: 1, tools: 1, options: 1, - _createdAt:1, - _modifiedAt:1, - _lastModified:1 + _createdAt: 1, + _modifiedAt: 1, + _lastModified: 1 } } ] diff --git a/project/__tests__/customMetadataRouter.test.js b/project/__tests__/customMetadataRouter.test.js new file mode 100644 index 00000000..5d8cf463 --- /dev/null +++ b/project/__tests__/customMetadataRouter.test.js @@ -0,0 +1,78 @@ +/** + * Custom Metadata Router Tests + * Tests for namespaced interfaces functionality + */ + +import { jest } from "@jest/globals" +import request from "supertest" +import app from "../../app.js" + +describe("Custom Metadata Router - Route Existence Tests #exists_unit", () => { + describe("GET /project/:id/custom", () => { + it("should have a GET endpoint to retrieve namespace keys", () => { + // This test is covered in mount.test.js + expect(true).toBe(true) + }) + }) + + describe("POST /project/:id/custom", () => { + it("should have a POST endpoint to create/replace namespace data", () => { + // This test is covered in mount.test.js + expect(true).toBe(true) + }) + }) + + describe("PUT /project/:id/custom", () => { + it("should have a PUT endpoint to upsert namespace data", () => { + // This test is covered in mount.test.js + expect(true).toBe(true) + }) + }) +}) + +describe("Custom Metadata Router - Namespace Detection #unit_test", () => { + describe("Origin detection", () => { + it("should detect localhost as wildcard", () => { + const testOrigins = [ + "http://localhost:3000", + "http://127.0.0.1:8080", + "http://0.0.0.0", + "http://[::1]:3000" + ] + + // These would be tested in integration tests with actual requests + expect(testOrigins.length).toBeGreaterThan(0) + }) + + it("should extract hostname from origin", () => { + const testOrigins = [ + { origin: "https://app.t-pen.org", expected: "app.t-pen.org" }, + { origin: "https://exampleapp.com:443", expected: "exampleapp.com" }, + { origin: "http://cnn.com", expected: "cnn.com" } + ] + + // These would be tested in integration tests + expect(testOrigins.length).toBeGreaterThan(0) + }) + }) +}) + +describe("Custom Metadata Router - Deep Upsert Logic #unit_test", () => { + describe("Type validation", () => { + it("should throw error on type mismatch", () => { + // Test cases for deepUpsert function + // These would be integration tests + expect(true).toBe(true) + }) + + it("should delete keys set to null", () => { + // Test null deletion logic + expect(true).toBe(true) + }) + + it("should recursively merge objects", () => { + // Test deep merge + expect(true).toBe(true) + }) + }) +}) diff --git a/project/customMetadataRouter.js b/project/customMetadataRouter.js new file mode 100644 index 00000000..a7d7214d --- /dev/null +++ b/project/customMetadataRouter.js @@ -0,0 +1,234 @@ +import express from "express" +import { respondWithError, validateID } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import Project from "../classes/Project/Project.js" +import dbDriver from "../database/driver.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" +import screenContentMiddleware, { isSuspiciousJSON, isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" + +const router = express.Router({ mergeParams: true }) +const database = new dbDriver("mongo") + +/** + * Helper function to determine the namespace from the request origin + * @param {Request} req - Express request object + * @returns {string} - The namespace key to use + */ +function getNamespaceFromOrigin(req) { + const origin = req.headers.origin || req.headers.referer || "" + + // Check for localhost or local network addresses + const isLocalhost = /^https?:\/\/(localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\]|10\.\d+\.\d+\.\d+|192\.168\.\d+\.\d+|172\.(1[6-9]|2[0-9]|3[0-1])\.\d+\.\d+)(:\d+)?/.test(origin) + + if (isLocalhost) { + return "*" + } + + // Extract hostname from origin + try { + const url = new URL(origin) + return url.hostname + } catch (e) { + return "*" + } +} + +/** + * Helper function to deep merge objects for PUT operations + * @param {Object} target - Target object to merge into + * @param {Object} source - Source object to merge from + * @returns {Object} - Merged object + * @throws {Error} - If types don't match for upsert + */ +function deepUpsert(target, source) { + const result = { ...target } + + for (const key in source) { + if (source[key] === null) { + // Delete the key if value is null + delete result[key] + continue + } + if (typeof source[key] === 'object' && !Array.isArray(source[key]) && source[key] !== null) { + // If both are objects, recursively merge + if (typeof target[key] === 'object' && !Array.isArray(target[key]) && target[key] !== null) { + result[key] = deepUpsert(target[key], source[key]) + continue + } + if (target[key] === undefined) { + // Key doesn't exist, so create it + result[key] = source[key] + continue + } + // Type mismatch + throw new Error(`Type mismatch for key '${key}': cannot replace ${typeof target[key]} with Object`) + } + // Primitive value or array + if (target[key] !== undefined && typeof target[key] !== typeof source[key]) { + throw new Error(`Type mismatch for key '${key}': cannot replace ${typeof target[key]} with ${typeof source[key]}`) + } + result[key] = source[key] + } + + return result +} + +// GET /project/:id/custom - Returns array of namespace keys +router.route("/:id/custom").get(async (req, res) => { + const { id } = req.params + + if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") + if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") + + try { + const project = new Project(id) + + // Fetch the project from database + const projectData = await database.findOne({ _id: id }, "projects") + + if (!projectData) { + return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) + } + + // Return array of namespace keys + const namespaces = projectData.interfaces ? Object.keys(projectData.interfaces) : [] + res.status(200).json(namespaces) + } catch (error) { + return respondWithError( + res, + error.status ?? 500, + error.message?.toString() ?? "An error occurred while fetching project metadata namespaces" + ) + } +}) + +// POST /project/:id/custom - Create or replace entire origin namespace +router.route("/:id/custom").post(auth0Middleware(), async (req, res) => { + const user = req.user + const { id } = req.params + const payload = req.body + + + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") + if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") + if (!payload || typeof payload !== "object" || Array.isArray(payload)) { + return respondWithError(res, 400, "Metadata payload must be a JSON object") + } + + try { + for (const key in payload) { + if (isSuspiciousJSON(payload[key], Object.keys(payload[key])) || isSuspiciousValueString(payload[key], true)) { + payload[key] = { $$unsafe: payload[key] } + } + } + const project = new Project(id) + + // Check if user has update access to the project options + if (!await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + return respondWithError(res, 403, "You do not have permission to update this project's metadata") + } + + // Get namespace from request origin + const namespace = getNamespaceFromOrigin(req) + + // Fetch the full project data + const projectData = await database.findOne({ _id: id }, "projects") + + if (!projectData) { + return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) + } + + // Initialize interfaces if it doesn't exist + projectData.interfaces ??= {} + + // Update the namespace with the new payload + projectData.interfaces[namespace] = payload + + // Update the full project document + await database.update(projectData, "projects") + + res.status(200).json({ namespace, data: payload }) + } catch (error) { + return respondWithError( + res, + error.status ?? 500, + error.message?.toString() ?? "An error occurred while updating project metadata" + ) + } +}) + +// PUT /project/:id/custom - Upsert values in origin namespace +router.route("/:id/custom").put(auth0Middleware(), async (req, res) => { + const user = req.user + const { id } = req.params + const payload = req.body + + if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") + if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") + if (!payload || typeof payload !== "object" || Array.isArray(payload)) { + return respondWithError(res, 400, "Metadata payload must be a JSON object") + } + + try { + + for (const key in payload) { + if (isSuspiciousJSON(payload[key], Object.keys(payload[key])) || isSuspiciousValueString(payload[key], true)) { + payload[key] = { $$unsafe: payload[key] } + } + } + const project = new Project(id) + + // Check if user has update access to the project options + if (!await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + return respondWithError(res, 403, "You do not have permission to update this project's metadata") + } + + // Get namespace from request origin + const namespace = getNamespaceFromOrigin(req) + + // Fetch the full project data + const projectData = await database.findOne({ _id: id }, "projects") + + if (!projectData) { + return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) + } + + // Initialize interfaces if it doesn't exist + if (!projectData.interfaces) { + projectData.interfaces = {} + } + + // Get current namespace data + const currentData = projectData.interfaces[namespace] || {} + + // Perform deep upsert + let mergedData + try { + mergedData = deepUpsert(currentData, payload) + } catch (error) { + return respondWithError(res, 400, error.message) + } + + // Update the namespace with merged data + projectData.interfaces[namespace] = mergedData + + // Update the full project document + await database.update(projectData, "projects") + + res.status(200).json({ namespace, data: mergedData }) + } catch (error) { + return respondWithError( + res, + error.status ?? 500, + error.message?.toString() ?? "An error occurred while updating project metadata" + ) + } +}) + +router.route("/:id/custom").all((_, res) => { + respondWithError(res, 405, "Improper request method. Use GET, POST, or PUT instead") +}) + +export default router diff --git a/project/index.js b/project/index.js index 1deeceb7..ce96cca7 100644 --- a/project/index.js +++ b/project/index.js @@ -13,6 +13,7 @@ import projectToolsRouter from "./projectToolsRouter.js" import memberUpgradeRouter from "./memberUpgradeRouter.js" import memberDeclineInviteRouter from "./memberDeclineInviteRouter.js" import projectCopyRouter from "./projectCopyRouter.js" +import customMetadataRouter from "./customMetadataRouter.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) @@ -29,6 +30,7 @@ router.use(hotkeysRouter) router.use(metadataRouter) router.use(projectToolsRouter) router.use(projectCopyRouter) +router.use(customMetadataRouter) // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) diff --git a/project/projectReadRouter.js b/project/projectReadRouter.js index f52d58ec..8227b62b 100644 --- a/project/projectReadRouter.js +++ b/project/projectReadRouter.js @@ -7,6 +7,92 @@ import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" const router = express.Router({ mergeParams: true }) +/** + * Helper function to determine which interfaces namespaces to include + * @param {Request} req - Express request object + * @returns {Array|string} - Array of namespaces to include, or "*" for all + */ +function getNamespacesToInclude(req) { + const origin = req.headers.origin || req.headers.referer || "" + const host = req.headers.host || req.hostname || "" + + // Check for localhost or local network addresses (wildcard) + const isLocalhost = /^https?:\/\/(localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\]|10\.\d+\.\d+\.\d+|192\.168\.\d+\.\d+|172\.(1[6-9]|2[0-9]|3[0-1])\.\d+\.\d+)(:\d+)?/.test(origin) || + /(localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\]|10\.\d+\.\d+\.\d+|192\.168\.\d+\.\d+|172\.(1[6-9]|2[0-9]|3[0-1])\.\d+\.\d+)(:\d+)?/.test(host) + + // Check for includes query parameter + const includesParam = req.query.includes + + // If includes=* or localhost, return all namespaces + if (includesParam === "*" || isLocalhost) { + return "*" + } + + // If includes parameter is provided, parse it + if (includesParam) { + // Handle both single value and array + const includesArray = Array.isArray(includesParam) ? includesParam : [includesParam] + return includesArray + } + + // Otherwise, return just the origin namespace if we can parse it + if (origin) { + try { + const url = new URL(origin) + return [url.hostname] + } catch (e) { + // Fall through to return wildcard + } + } + + // If we can't determine origin, default to wildcard for backward compatibility + // This ensures metadata is visible when testing locally or when origin headers are missing + return "*" +} + +/** + * Filter interfaces based on allowed namespaces + * @param {Object} project - Project object with interfaces + * @param {Array|string} namespaces - Namespaces to include ("*" for all) + * @returns {Object} - Project with filtered interfaces + */ +function filterProjectInterfaces(project, namespaces) { + if (!project || !project.interfaces) { + return project + } + + // If wildcard, return all interfaces + if (namespaces === "*") { + return project + } + + // If no namespaces specified, remove all interfaces + if (!namespaces || namespaces.length === 0) { + const { interfaces, ...projectWithoutInterfaces } = project + return projectWithoutInterfaces + } + + // Filter to only include specified namespaces + const filteredInterfaces = {} + for (const ns of namespaces) { + if (project.interfaces[ns] !== undefined) { + filteredInterfaces[ns] = project.interfaces[ns] + } + } + + // If no matching namespaces found, remove the field + if (Object.keys(filteredInterfaces).length === 0) { + const { interfaces, ...projectWithoutInterfaces } = project + return projectWithoutInterfaces + } + + return { + ...project, + interfaces: filteredInterfaces + } +} + + router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { const { id } = req.params const user = req.user @@ -69,7 +155,12 @@ router.route("/:id").get(auth0Middleware(), async (req, res) => { if (!project) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) } - res.status(200).json(project) + + // Filter interfaces based on origin and query parameters + const namespacesToInclude = getNamespacesToInclude(req) + const filteredProject = filterProjectInterfaces(project, namespacesToInclude) + + res.status(200).json(filteredProject) } catch (error) { return respondWithError( res, From 4e0b682ca73b2ff07305f824aaaca874074fa6ef Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Mon, 20 Oct 2025 09:53:10 -0500 Subject: [PATCH 194/262] Location Fix (#372) --- classes/Tools/Tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index 76fa8b36..e0cb749b 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -239,7 +239,7 @@ export default class Tools { "tagName": "" }, "url": "https://centerfordigitalhumanities.github.io/Line-Breaking/", - "location": "dialog" + "location": "pane" }, { "label": "Compare Pages", From 8f648292b757fdd7e6e3727d4754bdca27e8a15b Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Mon, 3 Nov 2025 09:29:56 -0600 Subject: [PATCH 195/262] Create Project with Multiple Images (#373) --- classes/Project/ProjectFactory.js | 211 +++++++++++++++++------------- project/projectCreateRouter.js | 11 +- 2 files changed, 127 insertions(+), 95 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index fa79f6cf..a38d5101 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -586,18 +586,14 @@ export default class ProjectFactory { } } - static async createManifestFromImage(imageURL, projectLabel, creator) { - if (!imageURL) { + static async createManifestFromImage(imageURLs, projectLabel, creator) { + if (!imageURLs || imageURLs.length === 0) { throw { status: 404, message: "No image found. Cannot process further." } } - let isIIFImage = false - let IIIFServiceParts = imageURL.split('/').reverse() - let IIIFServiceJson = null - function isValidIIIFRegion(region) { return ( region === "full" || @@ -627,7 +623,7 @@ export default class ProjectFactory { function isValidIIIFRotation(rotation) { return ( /^\d+(\.\d+)?$/.test(rotation) || - size.startsWith("!") && /^\d+(\.\d+)?$/.test(rotation) + rotation.startsWith("!") && /^\d+(\.\d+)?$/.test(rotation) ) } @@ -640,89 +636,97 @@ export default class ProjectFactory { ) } - let IIIFServiceURL = IIIFServiceParts.slice(4).reverse().join("/") - - if (isValidIIIFQuality(IIIFServiceParts[0].split(".")[0]) && isValidIIIFRotation(IIIFServiceParts[1]) && isValidIIIFSize(IIIFServiceParts[2]) && isValidIIIFRegion(IIIFServiceParts[3])) { - await fetch(`${IIIFServiceURL}/info.json`) - .then(response => { - if (!response.ok) { - throw new Error(`Failed to fetch IIIF info: ${response.statusText}`) - } - return response.json() - }) - .then(info => { - if (info?.protocol === "http://iiif.io/api/image") { - isIIFImage = true - IIIFServiceJson = info - } - }) - .catch(err => { - console.error("Error fetching IIIF info:", err.message) - throw { - status: 500, - message: "Failed to fetch IIIF info" - } - }) - } - - const _id = database.reserveId() const now = Date.now().toString().slice(-6) const label = projectLabel ?? now - const dimensions = await this.getImageDimensions(imageURL) - - const canvasLayout = { - id: `${process.env.TPENSTATIC}/${_id}/canvas-1.json`, - type: "Canvas", - label: { "none": [`${label} Page 1`] }, - width: dimensions.width, - height: dimensions.height, - items: [ - { - id: `${process.env.TPENSTATIC}/${_id}/contentPage.json`, - type: "AnnotationPage", - items: [ - { - id: `${process.env.TPENSTATIC}/${_id}/content.json`, - type: "Annotation", - motivation: "painting", - body: { - id: imageURL, - type: "Image", - format: mime.lookup(imageURL) || "image/jpeg", - width: dimensions.width, - height: dimensions.height, - ...(isIIFImage && { - service: [{ - id: IIIFServiceURL, - type: IIIFServiceJson?.type, - profile: IIIFServiceJson?.profile, - }] - }) - }, - target: `${process.env.TPENSTATIC}/${_id}/canvas-1.json` - } - ] - } - ], - creator: await fetchUserAgent(creator), - } - + const _id = database.reserveId() + const projectManifest = { "@context": "http://iiif.io/api/presentation/3/context.json", id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, type: "Manifest", label: { "none": [label] }, - items: [canvasLayout], + items: [], creator: await fetchUserAgent(creator), } - const projectCanvas = { - "@context": "http://iiif.io/api/presentation/3/context.json", - ...canvasLayout + for (let index = 0; index < imageURLs.length; index++) { + const imageURL = imageURLs[index] + let isIIFImage = false + let IIIFServiceParts = imageURL.split('/').reverse() + let IIIFServiceJson = null + let IIIFServiceURL = IIIFServiceParts.slice(4).reverse().join("/") + + if ( + isValidIIIFQuality(IIIFServiceParts[0].split(".")[0]) && + isValidIIIFRotation(IIIFServiceParts[1]) && + isValidIIIFSize(IIIFServiceParts[2]) && + isValidIIIFRegion(IIIFServiceParts[3]) + ) { + try { + const response = await fetch(`${IIIFServiceURL}/info.json`) + if (response.ok) { + const info = await response.json() + if (info?.protocol === "http://iiif.io/api/image") { + isIIFImage = true + IIIFServiceJson = info + } + } else { + console.warn(`Failed to fetch IIIF info for image ${index + 1}`) + } + } catch (err) { + console.error("Error fetching IIIF info:", err.message) + } + } + + const dimensions = await this.getImageDimensions(imageURL) + + const canvasLayout = { + id: `${process.env.TPENSTATIC}/${_id}/canvas-${index + 1}.json`, + type: "Canvas", + label: { "none": [`${label} Page ${index + 1}`] }, + width: dimensions.width, + height: dimensions.height, + items: [ + { + id: `${process.env.TPENSTATIC}/${_id}/contentPage.json`, + type: "AnnotationPage", + items: [ + { + id: `${process.env.TPENSTATIC}/${_id}/content.json`, + type: "Annotation", + motivation: "painting", + body: { + id: imageURL, + type: "Image", + format: mime.lookup(imageURL) || "image/jpeg", + width: dimensions.width, + height: dimensions.height, + ...(isIIFImage && { + service: [{ + id: IIIFServiceURL, + type: IIIFServiceJson?.type, + profile: IIIFServiceJson?.profile, + }] + }) + }, + target: `${process.env.TPENSTATIC}/${_id}/canvas-${index + 1}.json` + } + ] + } + ], + creator: await fetchUserAgent(creator), + } + + projectManifest.items.push(canvasLayout) + const projectCanvas = { + "@context": "http://iiif.io/api/presentation/3/context.json", + ...canvasLayout + } + + await this.uploadFileToGitHub(projectCanvas, _id) } await this.uploadFileToGitHub(projectManifest, _id) - await this.uploadFileToGitHub(projectCanvas, _id) return await ProjectFactory.DBObjectFromImage(projectManifest, creator) .then(async (project) => { @@ -937,22 +941,22 @@ export default class ProjectFactory { const manifestUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/contents/${projectId}/${fileName}` const token = process.env.GITHUB_TOKEN - try { - let sha = null - - const getResponse = await fetch(manifestUrl, { + async function getFileSha() { + const res = await fetch(manifestUrl, { headers: { 'Authorization': `token ${token}`, 'Accept': 'application/vnd.github.v3+json', }, }) - - if (getResponse.ok) { - const fileData = await getResponse.json() - sha = fileData.sha + if (res.ok) { + const data = await res.json() + return data.sha } + return null + } - const putResponse = await fetch(manifestUrl, { + async function uploadWithSha(sha = null) { + const res = await fetch(manifestUrl, { method: 'PUT', headers: { 'Authorization': `token ${token}`, @@ -961,19 +965,44 @@ export default class ProjectFactory { }, body: JSON.stringify({ message: sha ? `Updated ${projectId}/${fileName}` : `Created ${projectId}/${fileName}`, - content: Buffer.from(JSON.stringify(manifest)).toString('base64'), + content: Buffer.from(JSON.stringify(manifest, null, 2)).toString('base64'), branch: process.env.BRANCH, ...(sha && { sha }), }) }) + return res + } + + async function delay(ms) { + return new Promise(resolve => setTimeout(resolve, ms)) + } + + try { + let sha = await getFileSha() + let response + const maxRetries = 3 - if (!putResponse.ok) { - const errText = await putResponse.text() - throw new Error(`GitHub upload failed: ${putResponse.status} - ${errText}`) + for (let attempt = 1; attempt <= maxRetries; attempt++) { + response = await uploadWithSha(sha) + + if (response.ok) break + + if (response.status === 409) { + await delay(500 * attempt) + sha = await getFileSha() + continue + } + + const errText = await response.text() + throw new Error(`GitHub upload failed: ${response.status} - ${errText}`) } - return await putResponse.json() + if (!response.ok) { + const errText = await response.text() + throw new Error(`GitHub upload failed after ${maxRetries} attempts: ${errText}`) + } + return await response.json() } catch (error) { console.error(`Failed to upload ${projectId}/${fileName}:`, error) } diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index da141266..a37c3773 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -111,12 +111,15 @@ router.route("/import-image").post(auth0Middleware(), async (req, res) => { const user = req.user if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") try { - const { imageUrl, projectLabel } = req.body - if (!imageUrl || !projectLabel) { - return respondWithError(res, 400, "Image URL and project label are required") + const { imageUrls, projectLabel } = req.body + if (!imageUrls || !projectLabel) { + return respondWithError(res, 400, "Image URL/URLs and project label are required") + } + if (!Array.isArray(imageUrls) || imageUrls.length === 0) { + return respondWithError(res, 400, "Image URLs must be a non-empty array") } if (isSuspiciousValueString(projectLabel, true)) return respondWithError(res, 400, "Suspicious project label will not be processed.") - const project = await ProjectFactory.createManifestFromImage(imageUrl, projectLabel, user.agent.split('/').pop()) + const project = await ProjectFactory.createManifestFromImage(imageUrls, projectLabel, user.agent.split('/').pop()) res.status(201).json(project) } catch (error) { console.log("Create project from image error") From 38df33b8021a00f7f02c316a10fedc13fbefe26c Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 10 Nov 2025 11:37:04 -0600 Subject: [PATCH 196/262] claude on development --- .claude/CLAUDE.md | 229 ++++++++++++++++++++++++++++++++++ .claude/settings.json | 18 +++ .claude/statusline-command.sh | 51 ++++++++ 3 files changed, 298 insertions(+) create mode 100644 .claude/CLAUDE.md create mode 100644 .claude/settings.json create mode 100644 .claude/statusline-command.sh diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md new file mode 100644 index 00000000..af58c032 --- /dev/null +++ b/.claude/CLAUDE.md @@ -0,0 +1,229 @@ +# CLAUDE.md + +This file provides guidance to Ai Assistants when working with code in this repository. There is also a .github/copilot-instructions.md file. + +## Project Overview + +TPEN Services is a Node.js Express API service for TPEN3 (Transcription for Paleographical and Editorial Notation). This provides RESTful APIs for digital humanities, cultural heritage, annotation services, and IIIF manifest handling. The service supports multiple database backends (MongoDB, MariaDB) and uses Auth0 for authentication. + +Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here. + +## Working Effectively + +### Bootstrap, Build, and Test the Repository +- Copy environment configuration: `cp sample.env .env` +- Install dependencies: `npm install` -- takes up to 20 seconds. NEVER CANCEL. Set timeout to 60+ seconds. +- Run unit tests: `npm run unitTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. +- Run existence tests: `npm run existsTests` -- takes 7 seconds. NEVER CANCEL. Set timeout to 30+ seconds. +- Run all tests: `npm run allTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. + +### Run the Application +- ALWAYS run the bootstrapping steps first. +- Production server: `npm start` -- starts on port 3001 +- Development server: `npm run dev` -- starts with nodemon auto-reload on port 3001 +- Test basic functionality: `curl http://localhost:3001/` should return "TPEN3 SERVICES BABY!!!" + +### Environment Requirements +- Node.js >= 22.20.0 +- MongoDB (for database tests and full functionality) +- MariaDB (for database tests and full functionality) +- Copy `sample.env` to `.env` for basic functionality +- For full functionality, configure database connection strings in `.env` + +## Validation + +### Always Validate Core Functionality After Changes +- Start the application: `npm start` or `npm run dev` +- Test the root endpoint: `curl http://localhost:3001/` -- should return HTML with "TPEN3 SERVICES BABY!!!" +- Run unit tests that don't require databases: `npm run unitTests` -- many tests pass without database connections +- Run existence tests: `npm run existsTests` -- validates route registration and class imports +- ALWAYS wait for full test completion. Tests may appear to hang but will complete within 12 seconds. +- NOTE: Application may crash after serving initial requests due to database connection attempts - this is expected behavior without running MongoDB/MariaDB. + +### Test Categories Available +- `npm run unitTests` -- Core unit tests (some require databases) +- `npm run existsTests` -- Route and class existence validation (database-independent) +- `npm run functionsTests` -- Function-level tests +- `npm run E2Etests` -- End-to-end API tests +- `npm run dbTests` -- Database-specific tests (require running databases) +- `npm run authTest` -- Authentication tests (require Auth0 configuration) + +### Expected Test Behavior +- Tests requiring databases will timeout/fail without MongoDB/MariaDB running +- Auth tests fail without proper AUDIENCE and DOMAIN environment variables +- Core functionality tests (exists, basic units) should pass with minimal `.env` setup +- Database-independent tests complete in 6-15 seconds + +## Common Tasks + +### Repository Structure +``` +/home/runner/work/TPEN-services/TPEN-services/ +├── app.js # Express application setup +├── bin/tpen3_services.js # Server entry point +├── package.json # Dependencies and scripts +├── jest.config.js # Test configuration +├── sample.env # Environment template +├── API.md # API documentation +├── classes/ # Domain model classes +│ ├── Project/ # Project management +│ ├── User/ # User management +│ ├── Group/ # Group management +│ ├── Layer/ # Annotation layers +│ ├── Line/ # Text line handling +│ ├── Page/ # Page management +│ └── Manifest/ # IIIF manifest handling +├── database/ # Database drivers +│ ├── mongo/ # MongoDB controller +│ ├── maria/ # MariaDB controller +│ └── tiny/ # TinyPEN API controller +├── auth/ # Auth0 authentication +├── project/ # Project API routes +├── userProfile/ # User API routes +├── line/ # Line API routes +├── page/ # Page API routes +└── utilities/ # Helper functions +``` + +### Key API Endpoints +- `GET /` -- Service status (returns "TPEN3 SERVICES BABY!!!") +- `GET /project/:id` -- Get project by ID (requires authentication) +- `POST /project/create` -- Create new project (requires authentication) +- `POST /project/import?createFrom=URL` -- Import project from IIIF manifest +- `GET /user/:id` -- Get user profile (public) +- `GET /my/profile` -- Get authenticated user profile +- `GET /line/:id` -- Get text line annotation +- `GET /page/:id` -- Get annotation page + +### Authentication +- Uses Auth0 JWT bearer tokens +- Protected endpoints require `Authorization: Bearer ` header +- Environment variables AUDIENCE and DOMAIN must be configured for auth tests +- Public endpoints: `/`, `/user/:id` +- Protected endpoints: `/project/*`, `/my/*`, most POST/PUT/DELETE operations + +### Database Configuration +- MongoDB: Configure MONGODB and MONGODBNAME in `.env` +- MariaDB: Configure MARIADB, MARIADBNAME, MARIADBUSER, MARIADBPASSWORD in `.env` +- TinyPEN API: Configure TINYPEN in `.env` +- Default configurations in `sample.env` point to development services + +### Development Workflow +1. Always start with: `cp sample.env .env && npm install` +2. Make code changes +3. Test with: `npm run existsTests` (fast, database-independent) +4. For database changes: ensure MongoDB/MariaDB running, then `npm run dbTests` +5. For API changes: `npm run E2Etests` +6. Start dev server: `npm run dev` +7. Test manually: `curl http://localhost:3001/` and relevant endpoints + +### Debugging and Troubleshooting +- Application logs appear in console when running `npm start` or `npm run dev` +- Database connection errors indicate missing database services +- Auth errors indicate missing AUDIENCE/DOMAIN environment variables +- 404 errors on routes indicate route registration issues +- Check `app.js` for middleware and route registration +- Jest warnings about experimental VM modules are expected (ES module usage) + +### CI/CD Integration +- GitHub Actions workflows in `.github/workflows/` +- `test_pushes.yaml` runs unit tests on pushes +- `ci_dev.yaml` runs E2E tests on PRs to development +- Tests require environment secrets configured in GitHub repository settings + +### Performance Notes +- Application startup: 2-3 seconds +- npm install: ~1-20 seconds depending on cache (timeout: 60+ seconds) +- Unit tests: ~12 seconds (timeout: 30+ seconds) +- Existence tests: ~7 seconds (timeout: 30+ seconds) +- Database tests: variable depending on database response times + +### Critical Environment Variables +Required for basic functionality: +- `PORT` (default: 3001) +- `SERVERURL` (default: http://localhost:3001) + +Required for database functionality: +- `MONGODB` (MongoDB connection string) +- `MONGODBNAME` (MongoDB database name) +- `MARIADB` (MariaDB host) +- `MARIADBNAME`, `MARIADBUSER`, `MARIADBPASSWORD` (MariaDB credentials) + +Required for authentication: +- `AUDIENCE` (Auth0 audience) +- `DOMAIN` (Auth0 domain) + +Required for external services: +- `TINYPEN` (TinyPEN API base URL) +- `RERUMURL` (RERUM repository URL) + +### Manual Testing Scenarios +After making changes, always validate: +1. **Basic Service**: Start server with `npm start`, test with `curl http://localhost:3001/` - should return HTML containing "TPEN3 SERVICES BABY!!!" in the response body +2. **Route Registration**: `npm run existsTests` passes without errors +3. **Core Logic**: `npm run unitTests` passes tests that don't require databases (some MongoDB tests will timeout - this is expected) +4. **API Authentication**: Protected endpoints like `/my/profile` return 401 status code without valid tokens +5. **Application Behavior**: Server may crash after serving requests when MongoDB is not available - this is expected and indicates database connection attempts are working correctly + +### Complete Validation Workflow Example +```bash +# Basic setup +cp sample.env .env +npm install + +# Test core functionality without databases +npm run existsTests # Should pass completely +npm run unitTests # Should pass most tests, MongoDB tests will timeout + +# Test application serving +npm start & +sleep 3 +curl http://localhost:3001/ # Should return HTML with service name +curl -w "Status: %{http_code}\n" http://localhost:3001/my/profile # Should return 401 +kill %1 # Stop the background server +``` + +### Common File Locations +- Main application entry: `bin/tpen3_services.js` +- Express app setup: `app.js` +- Route definitions: `project/index.js`, `userProfile/index.js`, etc. +- Database controllers: `database/mongo/controller.js`, `database/maria/controller.js` +- Authentication middleware: `auth/index.js` +- Domain models: `classes/[Entity]/[Entity].js` +- Configuration: `sample.env` (template), `.env` (local config) + +### Dependencies and Versions +- Express.js for REST API framework +- MongoDB driver for document storage +- MariaDB driver for relational storage +- Auth0 libraries for JWT authentication +- Jest for testing framework +- Nodemon for development auto-reload +- IIIF libraries for manifest handling + +### External Resources +- [IIIF Presentation API](https://iiif.io/api/presentation/) +- [W3C Web Annotation](https://www.w3.org/TR/annotation-model/) +- [Web Components MDN](https://developer.mozilla.org/en-US/docs/Web/Web_Components) +- [Jest Documentation](https://jestjs.io/docs/getting-started) +- [TPEN3 Project Homepage](https://three.t-pen.org) +- [TPEN3 Services API](https://dev.api.t-pen.org) +- [TPEN3 Services GitHub](https://github.com/CenterForDigitalHumanities/TPEN-services) +- [TPEN3 Interfaces GitHub](https://github.com/CenterForDigitalHumanities/TPEN-interfaces) + +## Additional Developer Preferences for AI Assistants + +1. Do not automatically commit or push code. Developers prefer to do this themselves when the time is right. + - Make the code changes as requested. + - Explain what changed and why. + - Stop before committing. The developer will decide at what point to commit changes on their own. You do not need to keep track of it. +2. No auto compacting. We will compact ourselves if the context gets too big. +3. When creating documentation do not add Claude as an @author. +4. Preference using current libraries and native javascript/ExpressJS/Node capabilities instead of installing new npm packages to solve a problem. + - However, we understand that sometimes we need a package or a package is perfectly designed to solve our problem. Ask if we want to use them in these cases. +5. We like colors in our terminals! Be diverse and color text in the terminal for the different purposes of the text. (ex. errors red, success green, logs bold white, etc.) +6. We like to see logs from running code, so expose those logs in the terminal logs as much as possible. +7. Use JDoc style for code documentation. Cleanup, fix, or generate documentation for the code you work on as you encounter it. +8. We use `npm start` often to run the app locally. However, do not make code edits based on this assumption. Production and development load balance in the app with pm2, not by using `npm start` +9. NEVER CANCEL long-running commands. Application builds and tests are designed to complete within documented timeouts. Always wait for completion to ensure accurate validation of changes. +10. All work on issues for bugs, features, and enhancements will target the `development` branch. The `main` branch will only be targetted with hotfixes by admins or by PRs from the `development` branch. New work should branch from `development`. \ No newline at end of file diff --git a/.claude/settings.json b/.claude/settings.json new file mode 100644 index 00000000..9f1ee439 --- /dev/null +++ b/.claude/settings.json @@ -0,0 +1,18 @@ +{ + "statusLine": { + "type": "command", + "command": "bash /mnt/e/tpen3-services/.claude/statusline-command.sh" + }, + "env": { + "CLAUDE_CODE_MAX_OUTPUT_TOKENS": "500000", + "CLAUDE_CODE_DISABLE_TERMINAL_TITLE": "1", + "MAX_MCP_OUTPUT_TOKENS": "500000", + "DISABLE_ERROR_REPORTING": "0", + "DISABLE_NON_ESSENTIAL_MODEL_CALLS": "0", + "DISABLE_PROMPT_CACHING": "0", + "MAX_THINKING_TOKENS": "500000", + "BASH_MAX_TIMEOUT_MS": "3000000", + "OPENCODE_DISABLE_PRUNE": "true", + "OPENCODE_DISABLE_AUTOCOMPACT": "true" + } +} diff --git a/.claude/statusline-command.sh b/.claude/statusline-command.sh new file mode 100644 index 00000000..ed13514a --- /dev/null +++ b/.claude/statusline-command.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +# Read JSON input +input=$(cat) + +# Extract data from JSON +cwd=$(echo "$input" | jq -r '.workspace.current_dir') +cost=$(echo "$input" | jq -r '.cost.total_cost_usd // 0') +api_duration=$(echo "$input" | jq -r '.cost.total_api_duration_ms // 0') +total_duration=$(echo "$input" | jq -r '.cost.total_duration_ms // 0') +lines_added=$(echo "$input" | jq -r '.cost.total_lines_added // 0') +lines_removed=$(echo "$input" | jq -r '.cost.total_lines_removed // 0') +model_display=$(echo "$input" | jq -r '.model.display_name // "unknown"') + +# Calculate API duration in seconds +api_duration_sec=$(echo "scale=1; $api_duration / 1000" | bc -l 2>/dev/null || echo "0") + +# Get git branch if in a git repository +git_branch="" +if git -C "$cwd" rev-parse --git-dir > /dev/null 2>&1; then + branch=$(git -C "$cwd" -c core.fileMode=false branch --show-current 2>/dev/null) + if [ -n "$branch" ]; then + git_branch="($branch)" + fi +fi + +# Build the enhanced status line +# Format: (branch) model $cost | API: Xs | +L/-L + +# Cyan for git branch +if [ -n "$git_branch" ]; then + printf '\033[36m%s\033[0m ' "$git_branch" +fi + +# Magenta for model name +printf '\033[35m%s\033[0m ' "$model_display" + +# Bold yellow for cost (live updating token usage proxy) +printf '\033[1;33m$%.4f\033[0m' "$cost" + +# Green for API time (shows compute usage) +if [ "$api_duration" != "0" ]; then + printf ' \033[32m| API: %ss\033[0m' "$api_duration_sec" +fi + +# White for code changes (productivity) +if [ "$lines_added" != "0" ] || [ "$lines_removed" != "0" ]; then + printf ' \033[37m| +%s/-%s\033[0m' "$lines_added" "$lines_removed" +fi + +printf '\n' From 36be993946dc6fb8fd84d0a56c62c4f4ea4aaaab Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 10 Nov 2025 11:49:47 -0600 Subject: [PATCH 197/262] Add Claude Code GitHub Actions workflow --- .github/workflows/claude.yaml | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/claude.yaml diff --git a/.github/workflows/claude.yaml b/.github/workflows/claude.yaml new file mode 100644 index 00000000..88723afb --- /dev/null +++ b/.github/workflows/claude.yaml @@ -0,0 +1,38 @@ +name: Claude Code +on: + issues: + types: [opened] + issue_comment: + types: [created] + pull_request_review: + types: [submitted] + pull_request_review_comment: + types: [created] + +jobs: + claude: + if: | + (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) || + (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) || + (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) || + (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude'))) + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + issues: write + id-token: write + actions: read + steps: + - name: Checkout repository + uses: actions/checkout@v5 + with: + fetch-depth: 1 + + - name: Run Claude Code + id: claude + uses: anthropics/claude-code-action@v1 + with: + anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} + show_full_output: true + # trigger_phrase: "claude do the needful" From 8b7e5ba0e3003935e0c5721e3b2aafe97fd43d6f Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Mon, 10 Nov 2025 16:25:39 -0600 Subject: [PATCH 198/262] Go prd (#374) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Development (#255) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs * Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs * un-mjs * Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel * Update package-lock.json * Using UID to get User Projects * Update index.mjs * no label is fine for Pages * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Update validateURL.js * Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba * 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger * remove unused file * 235 save annotations (#240) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * Create lineRouter with new paths remove line library and add methods to class * getLine * really loading lines * line modification * test barf * aw thucks! * Hi, I'm new here. * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * Update index.js * since I'm here... moved some functions into their own space * teehee * Make it so. * fixed GET /line/:id * page isn't a page? * undata * more details in data objects * Update Line.js * load it for updates * put overwrite in for updating pages * unlog * changing route format for compile trouble * no test * No. This is wrong and fills me with hate. * quick code comment * patches for PATCHes --------- Co-authored-by: Bryan Haberberger * 230 clean up project routers (#245) * Development (#234) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs * Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs * un-mjs * Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel * Update package-lock.json * Using UID to get User Projects * Update index.mjs * no label is fine for Pages * Origin Fetch * SetHeader Origin * Update index.js * Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba * 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger * remove unused file --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * creating separate files * cleanup imports * yuck. This wasn't even AI - it just autocompleted to CJS * more jest nonsense * Final attempt This runs but doesn't pass `allTests` * Update exists_unit.test.js * new Put for page at a time updates * put update for batch items Update Line.js Update Line.js always set rerumid save pageAndProject * auth fixes for testing * Update index.js --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * Adding Tools to Project (#244) * Adding Tools to Project * getTools() * remove getTools * addTools and UpdateTools * Update index.js * Update index.js * Update index.js * Add a guard * Tool guards * Guards * Comment Changes --------- Co-authored-by: Bryan Haberberger Co-authored-by: cubap * Adding endpoint to add multiple lines to a page * Update index.js * Add project metrics to /my/projects (#227) * Add project metrics to /my/profile * fix failing test * moving this for router use * Relocating lastModified functions - User gets a static to set pageId of last change - line router sends change trigger - shared utils gains functions that sort of static into Classes * Update index.js * tidy * organized naming * good to go * one save behind * Let's go * better detail in modified project:ID/page:ID * Update privateProfile.js --------- Co-authored-by: cubap * Update index.js * co-op * co-op * co-op * OK log time * do 401 from TPEN2 the right way * do 401 from TPEN2 the right way * do 401 from TPEN2 the right way * do 401 from TPEN2 the right way * gotta import the function * Update index.js * Need to import Project * Need to import Project * Good to go * Separating files * add metarecords to new Projects (#254) * 256 import creates bad ids (#257) * correct id for new Layers * set _id on imported project * Update Layer.js * always trim lastModified * hotifx invite code * Email invite, upgrade temp user (#259) * Now we see it * Need to do the agent in the GH action * functioning demo * touches * touchup * links * links * unused * noted todo * Use env variables instead of hard coded links * Use env variables instead of hard coded links * hotfix links in E-mail * hotfix links in E-mail * Align User With Project After Invite (#263) * need to take one of those 'limitless' pills for this * touchup * renaming, documentation, cleanup, and better code integration * renaming, documentation, cleanup, and better code integration * renaming, documentation, cleanup, and better code integration * renaming, documentation, cleanup, and better code integration * Create New Project from One Image * Update ProjectFactory.js * Removing services * Update ProjectFactory.js * Update ProjectFactory.js * MimeTypes * cleanup * Decline Project Invite - Service (#264) * Add the decline route and route logic * Unauthenticated /decline, Authenticated and Permission Checked /remove * phew a lot more to it than anticipated * changes from testing and thinking * All the way through with the right UX * All the way through with the right UX * All the way through with the right UX * cleanup * cleanup * cleanup * support text/plain request bodies (#268) * Implement optimistic locking for page and line updates Adds optimistic locking to Layer and Page updates, propagates version conflict handling through the database controller, and introduces utility functions for consistent conflict response and retry logic. Updates line and page routes to use optimistic locking and handle version conflicts gracefully, improving data integrity in concurrent editing scenarios. * IIIF Image Service (#266) * IIIF Image Service * Update ProjectFactory.js * Update ProjectFactory.js * 270 multiple updates to a page in parallel discards data (#271) * expect text * complicating updateText * all sorts of variants * allow no body * Implement optimistic locking for page and line updates Adds optimistic locking to Layer and Page updates, propagates version conflict handling through the database controller, and introduces utility functions for consistent conflict response and retry logic. Updates line and page routes to use optimistic locking and handle version conflicts gracefully, improving data integrity in concurrent editing scenarios. * Update index.js * error is currentVersion * in route * stop double res * Update index.js * Allow new header in common cors --------- Co-authored-by: Bryan Haberberger * Copy Project API (#272) * Copy Project API * Duplicating Annotations * Copy without annotation and copy with group api * Project Cutomization API * Hotkeys Guard and include items in DB * Changes for API, refactoring * Group Members Change * Creator as OWNER and add one layer if no layers * Update ProjectFactory.js * MongoDB ProjectObject * Update ProjectFactory.js * Update ProjectFactory.js * Update ProjectFactory.js * Fixing ProjectDB Object * Documentation around module concept * Project label update API (#273) * Project label update API * picky * make this a patch request --------- Co-authored-by: Bryan Haberberger * Level 0 image fix for TPEN28 imported Projects (#274) * Level 0 image fix for TPEN28 imported Projects * Update ProjectFactory.js * .id * Adding Creator (#275) * Adding Creator * Export Changes * creator Null in constructor * Update Page.js * creator * creator on rerum * Prev and Next * asProjectLine() removed * Update Line.js * User as Creator * Removed extra code * Save to Rerum Canvas * creator as agent and removing export creator * Update Page.js * line user * Page user * projectCreateRouter user * Update index.js * Prev and next Id for get Page * Pages next and prev and partOf * Use env variable instead of hard coded RERUM id prefixes * oo i c. sorry. undo. * User Agent as creator * Add Layer to work * Adding creator to manifest * creator for image and temp layer * creator remove * Update ProjectFactory.js * Page creator * Update index.js * Page creator * Page creator findby * Update index.js * remove * getManifestItems --------- Co-authored-by: Bryan Haberberger * Layer and Page Management Endpoints (#278) * Fixes for updating Layers and Pages * Prepare PR * remove console.log()s * remove console.log()s * polish * polish * optimize * touchups from testing * Revert "Layer and Page Management Endpoints (#278)" (#283) This reverts commit c98a41c5ad5f8f32cac07c1f787430de05c391bd. * Project Export Message (#277) * Project Export Message * checkIfUrlExists Utility * status update * docs * deployment * Update ProjectFactory.js * Throughput errors * guarded clause --------- Co-authored-by: Bryan Haberberger * Layer and Page Management Endpoints (#284) * Fixes for updating Layers and Pages * Prepare PR * remove console.log()s * remove console.log()s * polish * polish * optimize * touchups from testing * Reconfigure things so Page() and Layer() make more sense together * cleaning * changes from testing * changes from testing * touchup the gets * ready pr * page content change detection * remove extra whitespace * page content change detection * page content change detection * already checked userId * already checked userId * Only update if the page has changed when rebuilding order * record page modition when page is reordered * it is a typo * Allow falsey prev and next in Page.update() * All those tendrils making sure a page will update its layer if it needs to * All those tendrils making sure a page will update its layer if it needs to * change for clarity * change for clarity * change for clarity * change for clarity * touch-ups from reading through it * updates from reading through and logs for tracing to make sure it all works * updates from reading through and logs for tracing to make sure it all works * continue refactor * Find temps by id * continue refactor * No items for AnnotationCollection * Use rerum ids for temps that will be upgraded * get rid of duplicate call * get rid of duplicate call * Handle layer temp id problem as well * polish * oops * update documentation * Update Copy Project Layer Fix (#285) * Update Copy Project Layer Fix * update returned json when resolving temp id for page * let these be null, not undefined --------- Co-authored-by: Bryan Haberberger * Project export message (#286) * Project Export Message * checkIfUrlExists Utility * status update * docs * deployment * Update ProjectFactory.js * Throughput errors * guarded clause * Failure State --------- Co-authored-by: Bryan Haberberger * Page and Layer Label Hotfix (#287) * Page and Layer Label Hotfix * Update Page.js * Pair Coding Hotfixes (#288) * ok * ok * logs * 'none' * labels * Page label * operation logs * withOptimisticLocking operation function * updatePageAndProject() 4 paramter contentChange * removing logs * undo --------- Co-authored-by: Priyal Patel * ugh * ugh * ugh * ugh * ugh * ugh * ugh * ugh * remove logs from testing ugh * Project Tools Fix (#290) * Project Tools Fix * no return here * Touch up for errors --------- Co-authored-by: Bryan Haberberger * ah forgot to commit touchups * Leave Project Endpoint (#289) * If you love them let them go * polish * Creator on text and bounds (#294) * Development (#234) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and existingName * Changes to comments * Update User.mjs * Save AnnotationCollection, Pages and Annotations to RERUM (#215) * saveCollection to RERUM * Adding Tinypen to Create RERUM Object * Update exists.test.mjs * Update exists.test.mjs * Update Page.mjs * Update cd_dev.yaml * stop if things are missing * adding verify on main * starting some adjustments * better the tests * headed home * multiple ways to extract the data * retest with suggestions * layer/page halos * percolating deletes * setting up routes --------- Co-authored-by: Patrick Cuba * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Import TPEN28 (#226) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Test restoration (#229) * Update cd_dev.yaml * stop if things are missing * adding verify on main * cleanup missing properties, changed method names * just this route * id shouldn't be optional here. out of date test files dropped * This should never break. What's up? * bad merge * Update exists_unit.test.mjs * test is ugly The page router needs a projectId as well to actually work * Update end_to_end_unit.test.mjs These two cannot work without a corresponding project, so it will need to be rewritten * nested in router now * Update exists.test.mjs * un-mjs * Refactor all .mjs files to .js and update imports. Closes #194 (#228) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Refactor all .mjs files to .js and update imports. Closes #194 * un-mjs * npm update * Hey I heard you like tests, so I put tests in your tests * mjs > js * no mjs, bad mjs * fine * habesroxx * how bout now * hide, Jest is coming * runner love * Update package-lock.json * jest no like to run * null != undefined * default not defaulting * fixes "id is not defined" shoulda wrote test for this * out of scope, out of effs --------- Co-authored-by: Priyal Patel * Update package-lock.json * Using UID to get User Projects * Update index.mjs * no label is fine for Pages * Origin Fetch * SetHeader Origin * Update index.js * Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js * Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba * 231 create overwrite layer (#239) * passing through the projectID * some tests * support page * path in Page class generator * no label is fine for Pages * updating layers * AI generated tests * Update API.md * oh auth. * how'd we miss this? * old tests * adjust for tests * default exports for tests * wrangling AI tests Jest mock is a nightmare. * just skip to move on * Update Layer.js * Update index.js * merged mess unwrap * dummy * Update Project.js * handle labels throughout * unerring * update layer organized * return changes * avoid hard crash * prevent crash on a page 404 * full id After I PUT a new label (this was successful) the "id" on the layer the db obj does not the the prefix and is just the hash. * you get it * vaildate all singular changes * greedier try-catch * Squashed commit of the following: commit 44b75cf175f43ef5b7736cf7f7f9754b1dcd7f36 Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed May 7 10:13:21 2025 -0500 Localhost URLS Validating (#242) * Update index.js * Update index.js * Update validateURL.js --------- Co-authored-by: Patrick Cuba commit 032ef458dd9c0602ca3c23b795a39f0de2dd7d7d Merge: f977234 52edaab Author: cubap Date: Mon May 5 10:40:24 2025 -0500 Merge branch 'development' into import-tpen28 commit 52edaab21d47427f3003c94b94b848f64f04850c Author: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Fri May 2 09:36:27 2025 -0500 Getting User Projects (#237) * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Update index.mjs * Using UID to get User Projects * Update index.mjs * Origin Fetch * SetHeader Origin * Update index.js * Update index.js * Update index.js commit f97723414967e86eccda10f29ab02c4d89e7a7e9 Author: Priyal Patel Date: Thu May 1 13:14:16 2025 -0500 Update index.js commit dde7c3015f32cb38d6c49cf25ac826a347310c26 Author: Priyal Patel Date: Thu May 1 13:05:02 2025 -0500 SetHeader Origin commit d2ec19844b8a15fe4497eb877d6709f898487324 Author: Priyal Patel Date: Thu May 1 12:47:32 2025 -0500 Origin Fetch commit 83fac3a3cf8bea72c5941b3e1cba7f95fe130d65 Merge: 6e79a8d 2e5bbbd Author: Priyal Patel Date: Thu May 1 09:31:12 2025 -0500 Merge branch 'development' into import-tpen28 commit 2e5bbbd0dd8d7690d9c7f6c33394fbac28d813dc Merge: 443d0a2 9f102fb Author: Patrick Cuba Date: Wed Apr 30 22:38:43 2025 -0500 Merge branch 'development' of https://github.com/CenterForDigitalHumanities/TPEN-services into development commit 443d0a2d76c8eb5226fc9b7773b695c13d690943 Author: cubap Date: Wed Apr 30 15:23:02 2025 -0500 no label is fine for Pages commit 6e79a8d24aa70c8844859c5c70c1eb1766303d9d Merge: ac0182f 9f102fb Author: Priyal Patel Date: Wed Apr 30 12:06:38 2025 -0500 Merge branch 'development' into import-tpen28 commit ac0182f62ae4ea53a32f4fb3d70baac41dc101ce Author: Priyal Patel Date: Wed Apr 30 11:51:40 2025 -0500 Update index.mjs commit 673a5c5c7f8b729c845e05eacbfade3e8f354906 Author: Priyal Patel Date: Tue Apr 29 17:22:08 2025 -0500 Using UID to get User Projects commit afe664e776954a4689ae174ee7a40f69c5c5d7a6 Author: Priyal Patel Date: Mon Apr 28 10:16:27 2025 -0500 Update index.mjs commit 6bf9c9a704df759f553a8f7fff86556108c4c0c2 Author: Priyal Patel Date: Fri Apr 25 14:56:11 2025 -0500 Update index.mjs commit 0906084f2ebeaa966caf86999c3c2bc85300a314 Author: Priyal Patel Date: Fri Apr 25 14:50:54 2025 -0500 Update index.mjs commit 5dd077e02ca0a4fddf9df52e959a519e7368769d Author: Priyal Patel Date: Fri Apr 25 14:33:53 2025 -0500 Update index.mjs commit e9971bc0bc892a9391f4918bffb45e65fddae550 Author: Priyal Patel Date: Fri Apr 25 12:18:30 2025 -0500 Update index.mjs * 422 if no pages are there. * Update index.js * Update index.js * API entries * typo --------- Co-authored-by: Bryan Haberberger * remove unused file --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * cherrypicked * This spot in updateText too --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> * 276 upgrade temp ids referenced in rerum data (#296) * Development (#234) * update metadata (#171) * update metadata * modify route name and db.update * update db.update dependent * cleanup --------- Co-authored-by: Bryan Haberberger * quickfix * cleanup * modify db.update to receive one param {data, collection} * nodiff * restore action(data, collection) structure * undiff * Changed Collections Parameter for Save() * Removing /:id put Call * Removing the Limit from express.json() * Removing the Limit from express.json() * getting started with Vault (#190) * getting started with Vault * newer Vault * tests * removing redundant code * proper tests passing * sample Vault * Bryan's refusal to .jsonld makes this not work as expected * loading resources This is incomplete by design. We need to ask Vault to add any resources we want resolved * expanding the Manifest a bit * touch up for merge * touch up for merge --------- Co-authored-by: Bryan Haberberger * Current Project IIIF manifest Creation (#187) * Current Project IIIF manifest Creation * Refactored the exportManifest() and endpoint name * Changed the exportManifest() function * TPEN ID error handled * endpoint to move the manifest.json to TPEN-Static-Dev * Changed @id to id * Getting all Ids * Console Clean up * Added env variables * Adding Imports * Adding Imports * Deleting Ids * Updating Logic Added * User not a member cannot change the manifest * Removing project2 * Adding comments to functions * add hotkeys service (#184) * add hotkeys service * hotkey endpoints * aggregate hotkeys during project retrieval * specify hotkey fields to include * cleanup * Update Hotkeys.js * Update ProjectFactory.mjs * Return hotkeys as an Array of Strings * aligning with Class changes * remove create, since .save is not acting correctly * cleanup and drop .post * tests restored no Jest here, just checking exists. * tests and sinon upgrade * no db tests directly * Update exists_unit.test.mjs * putting post back in... * adding create back with safety * adding upsert to accomodate bad errors * Update Hotkeys.js * uncatch to let errors through * expect the errors to come back * switch to jest tests --------- Co-authored-by: cubap * hotifx * hotfix for symbols. * delete enabled * Create API.md * collaborators and users * add markdown reader * package for markdown * Update API.md * Update API.md * touch * ah codes * proxy for internal use (#201) * Endpoint to save changes for the new layer (#199) * Adding endpoint to save changes from the layer * Adding New Layer * No Empty Label and no Annotations * Updated new Layer * Adding Items to partOf * Changing id convention * Removing updating layer * Annotation Change * Adding Delete Endpoint * not sure... This type of thing? * Label Change * Added Layer Class * Adding rerum ids to delete and add * Changing tests * Update exists.test.mjs * Changing LayerLabel * Changes AnnotationCollection Structure * Update Pages API * Updating partOf Ids in case of any change * Adding Layer Metadata Label Change * example results as a base for comments, delete these files before merge. * Adding AddLayer Commenting Rest of the APIs * Added DeleteLayer Back * Deleting json files * Updates to the comments * Making Project to Layer Changes * Renaming layerAnnotationCollection * Removing UpdateOne() changes * Removing UpdateOne() changes * Removing UpdateOne() changes * Error Handled for no ProjectID or LayerID * Clear Code * send() instead of json() --------- Co-authored-by: cubap Co-authored-by: Bryan Haberberger * Create sample.env * Update sample.env GitHub per @mepripri * Update CODEOWNERS * dev it and hotkeys * 188 epic middleware to upgrade imported manifests (#209) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * 139 factor out type type dependencies (#211) * determine data type by content * Removing type dependencies - Took controller and type out of controller - Added a function to detect the data types and assign the correct collection * matching tests to code move * align with main * Update driver.mjs (#217) * 188 epic middleware to upgrade imported manifests (#218) * bring in vault improve Project building from Manifest import * fixes #206 * add singleton vault as utility fix #208 * cleanup logs * rename redone * This is Vault now * test objects don't validate * hulk smash 👊🏽 * _sub is no longer missing on invitees * add temp sub to new user * Update cd_dev.yaml * Update cd_dev.yaml * stop if things are missing * adding verify on main * Removing fileSystem from Github API (#214) * Removing fileSystem from Github API * Update ProjectFactory.mjs --------- Co-authored-by: Bryan Haberberger * 220 services for bug reporting and feedback (#221) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * cicd (#222) * Update cd_dev.yaml * stop if things are missing * adding verify on main * Update ci_dev.yaml (#219) * Update ci_dev.yaml * Update cd_prod.yaml * Update ci_prod.yaml * 220 services for bug reporting and feedback (#224) * file dump init * services for feedback * /feedback/feedback is not a good route * Update cd_dev.yaml * stop if things are missing * adding verify on main * test results * added docs and ES6 conversion * what the Golden AI hell is adding imports from my docs? * explicitly adding CORS * API call to Update Profile (#223) * API call to Update Profile * existingEmail and e… * Refactor env config, remove dotenv, add smoke tests Replaces dotenv with Node.js native --env-file support and introduces a layered configuration using config.env, .env.development, and .env.production templates. Updates documentation and scripts to reflect new environment loading order, removes dotenv dependencies, and adds post-deployment smoke tests. Also updates CORS handling, workflow files, and corrects sample.env for consistency. * remove hotkeys * remove sample.env * Add configuration guide and update setup docs Added CONFIG.md with detailed environment and deployment configuration instructions. Updated CONTRIBUTING.md and README.md to reflect the new layered configuration approach, clarify use of config.env, .env templates, and provide improved setup steps for development and production environments. * Update .env.development * Update CONFIG.md * Remove dotenv usage from controllers and update port Eliminated dotenv imports and configuration from MariaDB, MongoDB, and TinyDB controllers to streamline environment variable management. Updated the default port in tpen3_services.js from 3001 to 3011. * hotkeys on import * cleaner env * Rename smoke test to .js and update workflow Renamed __tests__/smoke.test.mjs to __tests__/smoke.test.js and updated the GitHub Actions workflow to use the new filename. This ensures consistency in test file extensions and correct execution in the deployment pipeline. * Remove RERUMURL and READONLY from configs and workflows Eliminated the RERUMURL and READONLY environment variables from all environment files, documentation, and GitHub Actions workflows. Updated references to use only RERUMIDPREFIX for RERUM integration, simplifying configuration and reducing redundancy. * actions error troubleshooting * grr * AI takes a try * that's not the file * Update smoke.test.js * revert to SpicyPizza * claude files * Touchups from claude review * Touchups from claude review * expand cors options * Update CONFIG.md * do not run smoke test in allTests --------- Co-authored-by: Onoja Victor <111019083+git-voo@users.noreply.github.com> Co-authored-by: Bryan Haberberger Co-authored-by: Onoja Co-authored-by: mepripri Co-authored-by: Priyal Patel <52342511+mepripri@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --- .claude/CLAUDE.md | 20 +- .env.development | 73 +++++ .env.production | 95 +++++++ .github/copilot-instructions.md | 81 ++++-- .github/workflows/cd_dev.yaml | 19 +- .github/workflows/cd_prod.yaml | 17 +- .github/workflows/ci_dev.yaml | 4 +- .github/workflows/ci_prod.yaml | 4 +- .github/workflows/test_pushes.yaml | 4 +- .gitignore | 2 +- CONFIG.md | 216 +++++++++++++++ CONTRIBUTING.md | 45 ++- README.md | 101 ++++++- __tests__/mount.test.js | 20 +- __tests__/smoke.test.js | 95 +++++++ app.js | 31 ++- bin/tpen3_services.js | 4 +- classes/HotKeys/Hotkeys.js | 152 ---------- classes/HotKeys/__tests__/hotkeys.test.js | 51 ---- classes/Project/ProjectFactory.js | 323 ++++++---------------- classes/Tools/Tools.js | 2 +- config.env | 57 ++++ database/maria/controller.js | 2 - database/mongo/controller.js | 3 - database/tiny/controller.js | 2 - jest.all.config.js | 11 + package-lock.json | 104 +++---- package.json | 26 +- project/index.js | 2 - sample.env | 45 --- userProfile/__tests__/exists_unit.test.js | 39 +++ 31 files changed, 975 insertions(+), 675 deletions(-) create mode 100644 .env.development create mode 100644 .env.production create mode 100644 CONFIG.md create mode 100644 __tests__/smoke.test.js delete mode 100644 classes/HotKeys/Hotkeys.js delete mode 100644 classes/HotKeys/__tests__/hotkeys.test.js create mode 100644 config.env create mode 100644 jest.all.config.js delete mode 100644 sample.env create mode 100644 userProfile/__tests__/exists_unit.test.js diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md index af58c032..c7f7d28d 100644 --- a/.claude/CLAUDE.md +++ b/.claude/CLAUDE.md @@ -19,9 +19,9 @@ Always reference these instructions first and fallback to search or bash command ### Run the Application - ALWAYS run the bootstrapping steps first. -- Production server: `npm start` -- starts on port 3001 -- Development server: `npm run dev` -- starts with nodemon auto-reload on port 3001 -- Test basic functionality: `curl http://localhost:3001/` should return "TPEN3 SERVICES BABY!!!" +- Production server: `npm start` -- starts on port 3011 +- Development server: `npm run dev` -- starts with nodemon auto-reload on port 3011 +- Test basic functionality: `curl http://localhost:3011/` should return "TPEN3 SERVICES BABY!!!" ### Environment Requirements - Node.js >= 22.20.0 @@ -34,7 +34,7 @@ Always reference these instructions first and fallback to search or bash command ### Always Validate Core Functionality After Changes - Start the application: `npm start` or `npm run dev` -- Test the root endpoint: `curl http://localhost:3001/` -- should return HTML with "TPEN3 SERVICES BABY!!!" +- Test the root endpoint: `curl http://localhost:3011/` -- should return HTML with "TPEN3 SERVICES BABY!!!" - Run unit tests that don't require databases: `npm run unitTests` -- many tests pass without database connections - Run existence tests: `npm run existsTests` -- validates route registration and class imports - ALWAYS wait for full test completion. Tests may appear to hang but will complete within 12 seconds. @@ -115,7 +115,7 @@ Always reference these instructions first and fallback to search or bash command 4. For database changes: ensure MongoDB/MariaDB running, then `npm run dbTests` 5. For API changes: `npm run E2Etests` 6. Start dev server: `npm run dev` -7. Test manually: `curl http://localhost:3001/` and relevant endpoints +7. Test manually: `curl http://localhost:3011/` and relevant endpoints ### Debugging and Troubleshooting - Application logs appear in console when running `npm start` or `npm run dev` @@ -140,8 +140,8 @@ Always reference these instructions first and fallback to search or bash command ### Critical Environment Variables Required for basic functionality: -- `PORT` (default: 3001) -- `SERVERURL` (default: http://localhost:3001) +- `PORT` (default: 3011) +- `SERVERURL` (default: http://localhost:3011) Required for database functionality: - `MONGODB` (MongoDB connection string) @@ -159,7 +159,7 @@ Required for external services: ### Manual Testing Scenarios After making changes, always validate: -1. **Basic Service**: Start server with `npm start`, test with `curl http://localhost:3001/` - should return HTML containing "TPEN3 SERVICES BABY!!!" in the response body +1. **Basic Service**: Start server with `npm start`, test with `curl http://localhost:3011/` - should return HTML containing "TPEN3 SERVICES BABY!!!" in the response body 2. **Route Registration**: `npm run existsTests` passes without errors 3. **Core Logic**: `npm run unitTests` passes tests that don't require databases (some MongoDB tests will timeout - this is expected) 4. **API Authentication**: Protected endpoints like `/my/profile` return 401 status code without valid tokens @@ -178,8 +178,8 @@ npm run unitTests # Should pass most tests, MongoDB tests will timeout # Test application serving npm start & sleep 3 -curl http://localhost:3001/ # Should return HTML with service name -curl -w "Status: %{http_code}\n" http://localhost:3001/my/profile # Should return 401 +curl http://localhost:3011/ # Should return HTML with service name +curl -w "Status: %{http_code}\n" http://localhost:3011/my/profile # Should return 401 kill %1 # Stop the background server ``` diff --git a/.env.development b/.env.development new file mode 100644 index 00000000..89d2dbfa --- /dev/null +++ b/.env.development @@ -0,0 +1,73 @@ +# TPEN Services - Development Environment Template +# Copy this to .env for local development, then customize +# This file extends config.env with development-specific overrides + +# ============================================================================ +# ENVIRONMENT-SPECIFIC SETTINGS +# These values override config.env defaults +# ============================================================================ + +# Server Configuration +# For deployed dev environment +SERVERURL=https://dev.api.t-pen.org + +# For local development, uncomment: +# SERVERURL=http://localhost:3011 +# PORT=3011 + +# ============================================================================ +# DATABASE CONFIGURATION +# Override these for deployed development environment +# Local defaults from config.env work for Docker/local MongoDB/MariaDB +# ============================================================================ + +# Uncomment and set for deployed dev database: +# MONGODB=mongodb://dev-mongo-host:27017/ +# MONGODBNAME=testTpen +# MARIADB=dev-maria-host +# MARIADBNAME=testTpen +# MARIADBUSER=tpen_dev_user +# MARIADBPASSWORD=dev_password_here + +# ============================================================================ +# EXTERNAL SERVICES +# Development endpoints (already set in config.env but shown here for clarity) +# ============================================================================ + +RERUMIDPREFIX=https://devstore.rerum.io/v1/id/ +TINYPEN=https://dev.tiny.t-pen.org/ + +# TPEN Interfaces URL +TPENINTERFACES=http://localhost:4000/ +TPENINTERFACESNAMESPACE=* + +# ============================================================================ +# STATIC STORAGE (GitHub) +# ============================================================================ + +REPO_NAME=Static-Dev +TPENSTATIC=https://{organization}.github.io/Static-Dev/ + +# REQUIRED: Add your GitHub Personal Access Token +# Create at: https://github.com/settings/tokens +# Needs: repo scope for private repos, public_repo for public +GITHUB_TOKEN=your_github_token_here + +# ============================================================================ +# AUTHENTICATION (Auth0) +# ============================================================================ + +# REQUIRED: Set your Auth0 development tenant +AUDIENCE = bBugFMWHUo1OhnSZMpYUXxi3Y1UJI7Kl +DOMAIN = cubap.auth0.com + +# ============================================================================ +# EMAIL CONFIGURATION +# ============================================================================ + +# Uncomment and configure for development email testing: +# SMTP_HOST=smtp.mail.io +# SMTP_PORT=2525 +# TPEN_SUPPORT_EMAIL=dev-support@t-pen.org +# TPEN_EMAIL_CC=dev-admin@t-pen.org + diff --git a/.env.production b/.env.production new file mode 100644 index 00000000..84d5a436 --- /dev/null +++ b/.env.production @@ -0,0 +1,95 @@ +# TPEN Services - Production Environment Template +# DO NOT commit actual production secrets to this file +# This file extends config.env with production-specific overrides +# In production, set these via GitHub Secrets, environment variables, or secret management + +# ============================================================================ +# ENVIRONMENT-SPECIFIC SETTINGS +# ALL of these MUST be set for production deployments +# ============================================================================ + +# Server Configuration +SERVERURL=https://api.t-pen.org +PORT=3011 +DOWN=false + +# ============================================================================ +# DATABASE CONFIGURATION (REQUIRED) +# ============================================================================ + +# Production MongoDB +MONGODB=mongodb://prod-mongo-host:27017/ +MONGODBNAME=tpen + +# Production MariaDB +MARIADB=prod-maria-host +MARIADBNAME=tpen +MARIADBUSER=tpen_prod_user +MARIADBPASSWORD=REPLACE_WITH_SECRET + +# ============================================================================ +# EXTERNAL SERVICES +# ============================================================================ + +# Production RERUM Store +RERUMIDPREFIX=https://store.rerum.io/v1/id/ + +# Production TinyPEN +TINYPEN=https://tiny.t-pen.org/ + +# TPEN Interfaces URL +TPENINTERFACES=https://app.t-pen.org/ +TPENINTERFACESNAMESPACE=https://app.t-pen.org/ + +# ============================================================================ +# STATIC STORAGE (GitHub) (REQUIRED) +# ============================================================================ + +REPO_NAME=TPEN-static +TPENSTATIC=https://{organization}.github.io/static/ + +# CRITICAL: Use GitHub Secrets for this token in production +# Needs: repo scope +GITHUB_TOKEN=REPLACE_WITH_SECRET + +# ============================================================================ +# AUTHENTICATION (Auth0) (REQUIRED) +# ============================================================================ + +# Production Auth0 configuration +AUDIENCE=https://api.t-pen.org +DOMAIN=REPLACE_WITH_PROD_TENANT.auth0.com + +# ============================================================================ +# EMAIL CONFIGURATION (REQUIRED) +# ============================================================================ + +SMTP_HOST=smtp.production.com +SMTP_PORT=587 +TPEN_SUPPORT_EMAIL=support@t-pen.org +TPEN_EMAIL_CC=admin@t-pen.org + +# ============================================================================ +# PRODUCTION NOTES +# ============================================================================ +# +# CORS Policy: +# - API is open to all origins by default +# - No origin restrictions for public API access +# +# Secret Management: +# - Use GitHub Secrets for CI/CD deployments +# - Use environment variables in container/VM deployments +# - Never commit actual secrets to this file +# - Rotate secrets regularly +# +# Monitoring: +# - Enable logging and monitoring in production +# - Set up alerts for DOWN=true +# - Monitor database connections +# +# Security: +# - Use HTTPS for all endpoints +# - Regularly update dependencies +# - Consider rate limiting for production if needed + diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index a197c1f0..ec8ae3d3 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -7,30 +7,59 @@ Always reference these instructions first and fallback to search or bash command ## Working Effectively ### Bootstrap, Build, and Test the Repository -- Copy environment configuration: `cp sample.env .env` + +- Copy environment configuration: `cp .env.development .env` - Install dependencies: `npm install` -- takes up to 20 seconds. NEVER CANCEL. Set timeout to 60+ seconds. - Run unit tests: `npm run unitTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. - Run existence tests: `npm run existsTests` -- takes 7 seconds. NEVER CANCEL. Set timeout to 30+ seconds. - Run all tests: `npm run allTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. ### Run the Application + - ALWAYS run the bootstrapping steps first. -- Production server: `npm start` -- starts on port 3001 -- Development server: `npm run dev` -- starts with nodemon auto-reload on port 3001 -- Test basic functionality: `curl http://localhost:3001/` should return "TPEN3 SERVICES BABY!!!" +- Production server: `npm start` -- starts on port 3011 +- Development server: `npm run dev` -- starts with nodemon auto-reload on port 3011 +- Test basic functionality: `curl http://localhost:3011/` should return the TPEN3 Services index HTML (e.g. contains `

TPEN3 Services

`) ### Environment Requirements - Node.js >= 22.20.0 - MongoDB (for database tests and full functionality) - MariaDB (for database tests and full functionality) -- Copy `sample.env` to `.env` for basic functionality -- For full functionality, configure database connection strings in `.env` +- Copy `.env.development` to `.env` for basic functionality +- For full functionality, configure database connection strings, GITHUB_TOKEN, and Auth0 credentials in `.env` + +### Environment Configuration + +TPEN Services uses a layered configuration approach with Node.js's native `--env-file` flag: + +- `config.env` - Safe defaults (committed to repo, no secrets) + - Works out-of-the-box for local Docker/MongoDB/MariaDB + - Contains localhost database defaults + - Points to development external services +- `.env.development` - Development template (committed, example secrets) + - Copy this to `.env` for local development + - Contains placeholders for secrets +- `.env.production` - Production template (committed, example configuration) + - Copy this to `.env` for production deployments + - All secrets marked with REPLACE_WITH_SECRET +- `.env` - Your local configuration (gitignored) + - Created by copying a template + - Contains actual secrets and environment-specific values + - Overrides values from `config.env` + +Configuration loading order (via Node.js's native `--env-file` flag): + +1. `config.env` is loaded first (provides safe defaults) +2. `.env` is loaded second (overrides with environment-specific values) + +This allows developers to work immediately with sensible defaults while keeping secrets out of the repository. ## Validation ### Always Validate Core Functionality After Changes + - Start the application: `npm start` or `npm run dev` -- Test the root endpoint: `curl http://localhost:3001/` -- should return HTML with "TPEN3 SERVICES BABY!!!" +- Test the root endpoint: `curl http://localhost:3011/` -- should return HTML containing the TPEN3 Services index (heading + welcome text) - Run unit tests that don't require databases: `npm run unitTests` -- many tests pass without database connections - Run existence tests: `npm run existsTests` -- validates route registration and class imports - ALWAYS wait for full test completion. Tests may appear to hang but will complete within 12 seconds. @@ -59,7 +88,9 @@ Always reference these instructions first and fallback to search or bash command ├── bin/tpen3_services.js # Server entry point ├── package.json # Dependencies and scripts ├── jest.config.js # Test configuration -├── sample.env # Environment template +├── config.env # Safe defaults (committed) +├── .env.development # Development template +├── .env.production # Production template ├── API.md # API documentation ├── classes/ # Domain model classes │ ├── Project/ # Project management @@ -82,7 +113,7 @@ Always reference these instructions first and fallback to search or bash command ``` ### Key API Endpoints -- `GET /` -- Service status (returns "TPEN3 SERVICES BABY!!!") +- `GET /` -- Service status (returns the TPEN3 Services index HTML) - `GET /project/:id` -- Get project by ID (requires authentication) - `POST /project/create` -- Create new project (requires authentication) - `POST /project/import?createFrom=URL` -- Import project from IIIF manifest @@ -99,19 +130,21 @@ Always reference these instructions first and fallback to search or bash command - Protected endpoints: `/project/*`, `/my/*`, most POST/PUT/DELETE operations ### Database Configuration + - MongoDB: Configure MONGODB and MONGODBNAME in `.env` - MariaDB: Configure MARIADB, MARIADBNAME, MARIADBUSER, MARIADBPASSWORD in `.env` - TinyPEN API: Configure TINYPEN in `.env` -- Default configurations in `sample.env` point to development services +- Default configurations in `config.env` point to localhost development services ### Development Workflow -1. Always start with: `cp sample.env .env && npm install` + +1. Always start with: `cp .env.development .env && npm install` 2. Make code changes 3. Test with: `npm run existsTests` (fast, database-independent) 4. For database changes: ensure MongoDB/MariaDB running, then `npm run dbTests` 5. For API changes: `npm run E2Etests` 6. Start dev server: `npm run dev` -7. Test manually: `curl http://localhost:3001/` and relevant endpoints +7. Test manually: `curl http://localhost:3011/` and relevant endpoints ### Debugging and Troubleshooting - Application logs appear in console when running `npm start` or `npm run dev` @@ -136,35 +169,42 @@ Always reference these instructions first and fallback to search or bash command ### Critical Environment Variables Required for basic functionality: -- `PORT` (default: 3001) -- `SERVERURL` (default: http://localhost:3001) + +- `PORT` (default: 3011) +- `SERVERURL` (default: http://localhost:3011) Required for database functionality: + - `MONGODB` (MongoDB connection string) - `MONGODBNAME` (MongoDB database name) - `MARIADB` (MariaDB host) - `MARIADBNAME`, `MARIADBUSER`, `MARIADBPASSWORD` (MariaDB credentials) Required for authentication: + - `AUDIENCE` (Auth0 audience) - `DOMAIN` (Auth0 domain) Required for external services: + - `TINYPEN` (TinyPEN API base URL) -- `RERUMURL` (RERUM repository URL) +- `RERUMIDPREFIX` (RERUM ID prefix URL) ### Manual Testing Scenarios + After making changes, always validate: -1. **Basic Service**: Start server with `npm start`, test with `curl http://localhost:3001/` - should return HTML containing "TPEN3 SERVICES BABY!!!" in the response body + +1. **Basic Service**: Start server with `npm start`, test with `curl http://localhost:3011/` - should return HTML containing the TPEN3 Services index (e.g. the `

` heading) 2. **Route Registration**: `npm run existsTests` passes without errors 3. **Core Logic**: `npm run unitTests` passes tests that don't require databases (some MongoDB tests will timeout - this is expected) 4. **API Authentication**: Protected endpoints like `/my/profile` return 401 status code without valid tokens 5. **Application Behavior**: Server may crash after serving requests when MongoDB is not available - this is expected and indicates database connection attempts are working correctly ### Complete Validation Workflow Example + ```bash # Basic setup -cp sample.env .env +cp .env.development .env npm install # Test core functionality without databases @@ -174,19 +214,20 @@ npm run unitTests # Should pass most tests, MongoDB tests will timeout # Test application serving npm start & sleep 3 -curl http://localhost:3001/ # Should return HTML with service name -curl -w "Status: %{http_code}\n" http://localhost:3001/my/profile # Should return 401 +curl http://localhost:3011/ # Should return HTML with service name +curl -w "Status: %{http_code}\n" http://localhost:3011/my/profile # Should return 401 kill %1 # Stop the background server ``` ### Common File Locations + - Main application entry: `bin/tpen3_services.js` - Express app setup: `app.js` - Route definitions: `project/index.js`, `userProfile/index.js`, etc. - Database controllers: `database/mongo/controller.js`, `database/maria/controller.js` - Authentication middleware: `auth/index.js` - Domain models: `classes/[Entity]/[Entity].js` -- Configuration: `sample.env` (template), `.env` (local config) +- Configuration: `config.env` (safe defaults), `.env` (local config, gitignored), `.env.development` and `.env.production` (templates) ### Dependencies and Versions - Express.js for REST API framework diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index 1ffe6256..4d64f74e 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -5,13 +5,15 @@ on: jobs: test: runs-on: ubuntu-latest + environment: development steps: - uses: actions/checkout@master - name: Create .env from secrets uses: SpicyPizza/create-envfile@v2 with: + fail_on_empty: false + sort_keys: false envkey_DOWN: ${{ secrets.DOWN }} - envkey_READONLY: ${{ secrets.READONLY }} envkey_SERVERURL: ${{ secrets.SERVERURL }} envkey_MONGODBNAME: ${{ secrets.MONGODBNAME }} envkey_MONGODB: ${{ secrets.MONGODB }} @@ -20,9 +22,8 @@ jobs: envkey_TPENUSERS: ${{ secrets.TPENUSERS }} envkey_MARIADBNAME: ${{ secrets.MARIADBNAMEDEV }} envkey_MARIADB: ${{ secrets.MARIADB }} - envkey_MARIADBUSER: ${{ secrets.MARIADBUSERDEV}} + envkey_MARIADBUSER: ${{ secrets.MARIADBUSERDEV }} envkey_MARIADBPASSWORD: ${{ secrets.MARIADBPASSWORDDEV }} - envkey_RERUMURL: ${{ secrets.RERUMURL }} envkey_RERUMIDPREFIX: ${{ secrets.RERUMIDPREFIXDEV }} envkey_TINYPEN: ${{ secrets.TINYPENDEV }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} @@ -31,6 +32,11 @@ jobs: envkey_SMTP_HOST: ${{ secrets.SMTP_HOST }} envkey_SMTP_PORT: ${{ secrets.SMTP_PORT }} envkey_TPEN_EMAIL_CC: ${{ secrets.TPEN_EMAIL_CC }} + envkey_REPO_OWNER: ${{ secrets.REPO_OWNER }} + envkey_REPO_NAME: ${{ secrets.REPO_NAME }} + envkey_GITHUB_TOKEN: ${{ secrets.STATIC_REPO_TOKEN }} + envkey_BRANCH: ${{ secrets.BRANCH }} + envkey_TPENSTATIC: ${{ secrets.TPENSTATIC }} - name: Setup Node.js uses: actions/setup-node@master with: @@ -54,6 +60,7 @@ jobs: deploy: needs: - test + environment: development strategy: matrix: machines: @@ -74,3 +81,9 @@ jobs: git pull npm install pm2 -s start -i max bin/tpen3_services.js + - name: Wait for service to be ready + run: sleep 5 + - name: Run smoke tests + run: | + cd /srv/node/tpen-services/ + SMOKE_TEST_URL=https://dev.api.t-pen.org node __tests__/smoke.test.js diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 9378dfb6..0e1675c6 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -5,13 +5,15 @@ on: jobs: test: runs-on: ubuntu-latest + environment: production steps: - uses: actions/checkout@master - name: Create .env from secrets uses: SpicyPizza/create-envfile@v2 with: + fail_on_empty: false + sort_keys: false envkey_DOWN: ${{ secrets.DOWN }} - envkey_READONLY: ${{ secrets.READONLY }} envkey_SERVERURL: ${{ secrets.SERVERURL }} envkey_MONGODBNAME: ${{ secrets.MONGODBNAME }} envkey_MONGODB: ${{ secrets.MONGODB }} @@ -22,7 +24,6 @@ jobs: envkey_MARIADB: ${{ secrets.MARIADB }} envkey_MARIADBUSER: ${{ secrets.MARIADBUSER }} envkey_MARIADBPASSWORD: ${{ secrets.MARIADBPASSWORD }} - envkey_RERUMURL: ${{ secrets.RERUMURL }} envkey_RERUMIDPREFIX: ${{ secrets.RERUMIDPREFIX }} envkey_TINYPEN: ${{ secrets.TINYPEN }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} @@ -31,6 +32,11 @@ jobs: envkey_SMTP_HOST: ${{ secrets.SMTP_HOST }} envkey_SMTP_PORT: ${{ secrets.SMTP_PORT }} envkey_TPEN_EMAIL_CC: ${{ secrets.TPEN_EMAIL_CC }} + envkey_REPO_OWNER: ${{ secrets.REPO_OWNER }} + envkey_REPO_NAME: ${{ secrets.REPO_NAME }} + envkey_GITHUB_TOKEN: ${{ secrets.STATIC_REPO_TOKEN }} + envkey_BRANCH: ${{ secrets.BRANCH }} + envkey_TPENSTATIC: ${{ secrets.TPENSTATIC }} - name: Setup Node.js uses: actions/setup-node@master with: @@ -54,6 +60,7 @@ jobs: deploy: needs: - test + environment: production strategy: matrix: machines: @@ -74,3 +81,9 @@ jobs: git pull npm install pm2 -s start -i max bin/tpen3_services.js + - name: Wait for service to be ready + run: sleep 5 + - name: Run smoke tests + run: | + cd /srv/node/tpen-services/ + SMOKE_TEST_URL=https://api.t-pen.org node __tests__/smoke.test.js diff --git a/.github/workflows/ci_dev.yaml b/.github/workflows/ci_dev.yaml index 422b90b1..a3a8e358 100644 --- a/.github/workflows/ci_dev.yaml +++ b/.github/workflows/ci_dev.yaml @@ -10,8 +10,9 @@ jobs: - name: Create .env from secrets uses: SpicyPizza/create-envfile@v2 with: + fail_on_empty: false + sort_keys: false envkey_DOWN: ${{ secrets.DOWN }} - envkey_READONLY: ${{ secrets.READONLY }} envkey_SERVERURL: ${{ secrets.SERVERURL }} envkey_MONGODBNAME: ${{ secrets.MONGODBNAME }} envkey_MONGODB: ${{ secrets.MONGODB }} @@ -22,7 +23,6 @@ jobs: envkey_MARIADB: ${{ secrets.MARIADB }} envkey_MARIADBUSER: ${{ secrets.MARIADBUSERDEV }} envkey_MARIADBPASSWORD: ${{ secrets.MARIADBPASSWORDDEV }} - envkey_RERUMURL: ${{ secrets.RERUMURL }} envkey_RERUMIDPREFIX: ${{ secrets.RERUMIDPREFIXDEV }} envkey_TINYPEN: ${{ secrets.TINYPENDEV }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} diff --git a/.github/workflows/ci_prod.yaml b/.github/workflows/ci_prod.yaml index 003d8a50..aa86c6da 100644 --- a/.github/workflows/ci_prod.yaml +++ b/.github/workflows/ci_prod.yaml @@ -10,8 +10,9 @@ jobs: - name: Create .env from secrets uses: SpicyPizza/create-envfile@v2 with: + fail_on_empty: false + sort_keys: false envkey_DOWN: ${{ secrets.DOWN }} - envkey_READONLY: ${{ secrets.READONLY }} envkey_SERVERURL: ${{ secrets.SERVERURL }} envkey_MONGODBNAME: ${{ secrets.MONGODBNAME }} envkey_MONGODB: ${{ secrets.MONGODB }} @@ -22,7 +23,6 @@ jobs: envkey_MARIADB: ${{ secrets.MARIADB }} envkey_MARIADBUSER: ${{ secrets.MARIADBUSER }} envkey_MARIADBPASSWORD: ${{ secrets.MARIADBPASSWORD }} - envkey_RERUMURL: ${{ secrets.RERUMURL }} envkey_RERUMIDPREFIX: ${{ secrets.RERUMIDPREFIX }} envkey_TINYPEN: ${{ secrets.TINYPEN }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} diff --git a/.github/workflows/test_pushes.yaml b/.github/workflows/test_pushes.yaml index e0a5881c..858a7bde 100644 --- a/.github/workflows/test_pushes.yaml +++ b/.github/workflows/test_pushes.yaml @@ -32,8 +32,9 @@ jobs: - name: Create .env from secrets uses: SpicyPizza/create-envfile@v2 with: + fail_on_empty: false + sort_keys: false envkey_DOWN: ${{ secrets.DOWN }} - envkey_READONLY: ${{ secrets.READONLY }} envkey_SERVERURL: ${{ secrets.SERVERURL }} envkey_MONGODBNAME: ${{ secrets.MONGODBNAME }} envkey_MONGODB: ${{ secrets.MONGODB }} @@ -44,7 +45,6 @@ jobs: envkey_MARIADB: ${{ secrets.MARIADB }} envkey_MARIADBUSER: ${{ secrets.MARIADBUSERDEV }} envkey_MARIADBPASSWORD: ${{ secrets.MARIADBPASSWORDDEV }} - envkey_RERUMURL: ${{ secrets.RERUMURL }} envkey_RERUMIDPREFIX: ${{ secrets.RERUMIDPREFIXDEV }} envkey_TINYPEN: ${{ secrets.TINYPENDEV }} envkey_AUDIENCE: ${{ secrets.AUDIENCE }} diff --git a/.gitignore b/.gitignore index 98c7809f..f7a2e708 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,7 @@ web_modules/ # Yarn Integrity file .yarn-integrity -# dotenv environment variable files +# environment variable files .env .env.development.local .env.test.local diff --git a/CONFIG.md b/CONFIG.md new file mode 100644 index 00000000..8bb4a928 --- /dev/null +++ b/CONFIG.md @@ -0,0 +1,216 @@ +# TPEN Services Configuration Guide + +## Configuration Architecture + +TPEN Services uses a layered configuration approach to separate safe defaults from environment-specific secrets. Configuration is loaded using Node.js's native `--env-file` flag (Node.js 22+): + +1. **`config.env`** (committed) - Safe defaults for development +2. **`.env`** (gitignored) - Environment-specific overrides + +### Configuration Files + +- **`config.env`** - Default configuration + - Contains safe defaults that work for local development + - Can be committed to the repository (no secrets) + - Provides sensible defaults for MongoDB, MariaDB, and external services + - Loaded first by the application + +- **`.env.development`** - Development template + - Template for development environments + - Copy to `.env` for local development + - Contains placeholders for secrets (GITHUB_TOKEN, Auth0, etc.) + - Can be committed as documentation + +- **`.env.production`** - Production template + - Template for production deployments + - Shows required production configuration + - All secrets marked with `REPLACE_WITH_SECRET` + - Should never contain actual production secrets + +- **`.env`** - Local/deployment configuration + - Your actual configuration (gitignored) + - Created by copying a template + - Contains real secrets and environment-specific values + - Overrides values from `config.env` + +### Quick Start + +```bash +# For local development +cp .env.development .env + +# For production deployment +cp .env.production .env + +# Edit .env with your specific values +# Required: GITHUB_TOKEN, AUDIENCE, DOMAIN +# Optional: Database connections, SMTP, etc. +``` + +The application loads configuration via Node.js's native `--env-file` flag in this order: + +1. `config.env` - provides defaults +2. `.env` - overrides with environment-specific values + +### What Goes Where? + +**`config.env` (committed, safe defaults):** + +- Server ports and basic settings +- MongoDB/MariaDB localhost defaults +- Development service endpoints (devstore.rerum.io, etc.) +- Collection names +- Non-sensitive configuration + +**`.env` (gitignored, secrets):** + +- GitHub Personal Access Tokens +- Auth0 credentials +- Production database connection strings +- SMTP credentials +- Production service URLs +- API keys + +## Environment Variables Reference + +### Server Configuration + +- `PORT` - Server port (default: 3011) +- `SERVERURL` - Public URL for this service + - Dev: `https://dev.api.t-pen.org` + - Prod: `https://api.t-pen.org` +- `DOWN` - Maintenance mode flag (true/false) + +### Database Configuration + +**MongoDB:** + +- `MONGODB` - Connection string (e.g., `mongodb://localhost:27017`) +- `MONGODBNAME` - Database name + - Dev: `testTpen` + - Prod: `tpen` +- `TPENPROJECTS`, `TPENGROUPS`, `TPENUSERS` - Collection names + +**MariaDB:** (not actively used) + +- `MARIADB` - Host address +- `MARIADBNAME` - Database name +- `MARIADBUSER` - Username +- `MARIADBPASSWORD` - Password + +### External Services + +**RERUM Store:** + +- `RERUMIDPREFIX` - RERUM ID prefix + - Dev: `https://devstore.rerum.io/v1/id/` + - Prod: `https://store.rerum.io/v1/id/` + +**TinyPEN:** + +- `TINYPEN` - TinyPEN API base URL + - Dev: `https://dev.tiny.t-pen.org/` + - Prod: `https://tiny.t-pen.org/` + +**Static Storage (GitHub):** + +- `REPO_OWNER` - GitHub organization (e.g., `CenterForDigitalHumanities`) +- `REPO_NAME` - Repository name + - Dev: `TPEN-Static-Dev` + - Prod: `TPEN-static` +- `GITHUB_TOKEN` - Personal access token with repo write access +- `BRANCH` - Target branch (usually `main`) +- `TPENSTATIC` - Public URL for static files + +### Authentication (Auth0) + +- `AUDIENCE` - Auth0 API audience (should match SERVERURL) +- `DOMAIN` - Auth0 tenant domain + +### Email Configuration + +- `SMTP_HOST` - SMTP server hostname +- `SMTP_PORT` - SMTP server port +- `TPEN_SUPPORT_EMAIL` - Support email address +- `TPEN_EMAIL_CC` - CC email address for notifications + +## Development vs Production + +Key differences between environments: + +| Variable | Development | Production | +|----------|-------------|------------| +| SERVERURL | | | +| MONGODBNAME | testTpen | tpen | +| RERUMIDPREFIX | | | +| REPO_NAME | TPEN-Static-Dev | TPEN-static | + +## GitHub Secrets Configuration + +For CI/CD deployments, set these secrets in GitHub repository settings: + +**Development Environment:** + +- All variables from `.env.development` +- Especially: `MONGODB`, `MONGODBNAME`, `GITHUB_TOKEN`, `AUDIENCE`, `DOMAIN` + +**Production Environment:** + +- All variables from `.env.production` +- Especially: `MONGODB`, `MONGODBNAME`, `GITHUB_TOKEN`, `AUDIENCE`, `DOMAIN` +- Use separate Auth0 tenant for production +- Use production database credentials + +## API Access Policy + +TPEN Services provides a public API with an open CORS policy. The API is accessible from any origin without restrictions. This design decision supports: + +- Public access to cultural heritage data +- Integration from any web application or service +- Educational and research use cases +- Community-driven digital humanities projects + +No CORS configuration is required - all origins are permitted by default. + +### Validation + +After configuration, verify: + +```bash +# Start the service +npm start + +# Test the root endpoint +curl http://localhost:3011/ +# Should return HTML containing the TPEN3 Services index (e.g.

TPEN3 Services

) + +# Test from any origin - CORS is open by default +curl -H "Origin: https://app.t-pen.org" \ + -H "Access-Control-Request-Method: GET" \ + -X OPTIONS \ + http://localhost:3011/project +# Should return CORS headers allowing all origins + +# Test authentication requirement +curl http://localhost:3011/my/profile +# Should return 401 Unauthorized +``` +### Troubleshooting + +**API access from browser:** + +- CORS is open - all origins are allowed by default +- No CORS configuration needed +- The API is designed for public access + +**Database connection failures:** + +- Verify `MONGODB` connection string +- Confirm `MONGODBNAME` exists +- Check network access to database host + +**Auth0 errors:** + +- Verify `AUDIENCE` matches the API URL +- Confirm `DOMAIN` is correct Auth0 tenant +- Check token includes required scopes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d646efe..9df4b210 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,26 +55,41 @@ npm install ### 3. Environment Configuration -1. Copy the sample environment file: -```bash -cp sample.env .env -``` +TPEN Services uses a layered configuration approach: + +1. **Copy the development template:** + + ```bash + cp .env.development .env + ``` -2. Edit `.env` to configure your local environment. Key settings include: - - **PORT**: Server port (default: 3001) - - **MONGODB**: MongoDB connection string - - **MONGODBNAME**: MongoDB database name - - **AUDIENCE**: Auth0 audience for JWT validation ( or alternate authentication ) +2. **Edit `.env` to configure your local environment.** Key settings to update: + - **GITHUB_TOKEN**: Your GitHub Personal Access Token (required) + - **AUDIENCE**: Auth0 audience for JWT validation - **DOMAIN**: Auth0 domain + - **MONGODB**: MongoDB connection string (if different from localhost) + - **PORT**: Server port (default: 3011) + +3. **Configuration files explained:** + - `config.env` - Safe defaults (committed, no secrets) + - `.env.development` - Development template (committed) + - `.env.production` - Production template (committed) + - `.env` - Your local config (gitignored, created by you) + +The application loads `config.env` first for defaults, then `.env` for your overrides. **Important**: Never commit your `.env` file to version control. It's included in `.gitignore` for security. +See [CONFIG.md](./CONFIG.md) for complete configuration documentation. + ### 4. Database Setup #### MongoDB + - Install MongoDB locally or use MongoDB Atlas (cloud) -- Update the `MONGODB` connection string in your `.env` file -- Ensure the database specified in `MONGODBNAME` exists +- The default configuration (`config.env`) uses `mongodb://localhost:27017` +- Update `MONGODB` in your `.env` file if using a different connection +- Ensure the database specified in `MONGODBNAME` exists (default: `testTpen`) **Note**: The project uses MongoDB as its primary database. While the codebase includes a MariaDB controller, it is not actively used and MongoDB is sufficient for development. @@ -95,7 +110,7 @@ Start the development server with hot reloading: npm run dev ``` -The server will start on the port specified in your `.env` file (default: 3001). +The server will start on the port specified in your `.env` file (default:3011). ### Production Mode Run the server in production mode: @@ -106,7 +121,7 @@ npm start ### Checking the Server Once running, you can test the server: ```bash -curl http://localhost:3001 +curl http://localhost:3011 ``` ## Testing @@ -233,7 +248,9 @@ TPEN-services/ ├── __tests__/ # Global tests ├── app.js # Express app configuration ├── package.json # Dependencies and scripts -├── sample.env # Environment variables template +├── config.env # Safe defaults (committed) +├── .env.development # Development template +├── .env.production # Production template └── README.md # Basic project information ``` diff --git a/README.md b/README.md index 2947be90..12d43c6d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,101 @@ # TPEN Services -Services required by TPEN interfaces in order to interact with data. \ No newline at end of file + +Services required by TPEN interfaces in order to interact with data. + +**Open API**: TPEN Services provides a public API with an open CORS policy, accessible from any origin without restrictions. + +## Quick Start + +### Local Development + +1. **Install dependencies** + + ```bash + npm install + ``` + +2. **Configure environment** + + ```bash + # Copy the development template + cp .env.development .env + + # Edit .env with your specific values: + # - Add your GitHub token (GITHUB_TOKEN) + # - Set your Auth0 credentials (AUDIENCE, DOMAIN) + # - Adjust other settings as needed + ``` + +3. **Start the development server** + + ```bash + npm run dev + ``` + + The service will be available at `http://localhost:3011` + +### Configuration Files + +TPEN Services uses a layered configuration approach with Node.js's native `--env-file` flag: + +- **`config.env`** - Safe defaults, committed to repository + - Works out-of-the-box for local Docker/MongoDB/MariaDB + - Contains no secrets + - Provides sensible defaults for development + +- **`.env.development`** - Development environment template + - Copy this to `.env` for local development + - Contains placeholders for secrets + - Can be committed (no actual secrets) + +- **`.env.production`** - Production environment template + - Template for production deployments + - All secrets should be replaced with actual values + - Never commit actual production secrets + +- **`.env`** - Your local configuration (gitignored) + - Created by copying a template + - Contains your specific settings and secrets + - Overrides values from `config.env` + +Configuration is loaded via Node.js's native `--env-file` flag (Node.js 22+): + +1. `config.env` is loaded first (provides safe defaults) +2. `.env` is loaded second (overrides with environment-specific values) + +### Environment Variables + +Key variables you'll need to set in `.env`: + +- `GITHUB_TOKEN` - GitHub Personal Access Token for static storage +- `AUDIENCE` - Auth0 API audience +- `DOMAIN` - Auth0 tenant domain +- `MONGODB` - MongoDB connection string (if different from default) +- `MARIADB` - MariaDB host (if different from default) + +See [CONFIG.md](./CONFIG.md) for complete configuration documentation. + +## Testing + +```bash +# Run all tests +npm run allTests + +# Run specific test suites +npm run unitTests # Core unit tests +npm run existsTests # Route/class validation +npm run E2Etests # End-to-end API tests +npm run dbTests # Database tests +``` + +## Deployment + +For production deployments: + +1. Copy `.env.production` to `.env` +2. Replace all `REPLACE_WITH_SECRET` placeholders with actual secrets +3. Use GitHub Secrets or environment variables for sensitive values +4. Never commit production secrets to the repository + +See [CONFIG.md](./CONFIG.md) for detailed deployment instructions. + \ No newline at end of file diff --git a/__tests__/mount.test.js b/__tests__/mount.test.js index b0c5344c..d3cabe98 100644 --- a/__tests__/mount.test.js +++ b/__tests__/mount.test.js @@ -67,7 +67,7 @@ const allRoutes = (() => { /** * Check if a route exists in the Express app - * @param {string} path - The route path to check (e.g., '/', '/api', '/:id', '/:projectId/hotkeys') + * @param {string} path - The route path to check (e.g., '/', '/api', '/:id') * @param {string} [method] - Optional HTTP method to check (e.g., 'get', 'post', 'put', 'delete', 'patch') * @returns {boolean} - True if the route exists (and matches the method if specified) */ @@ -212,24 +212,6 @@ describe('Check to see that all expected route patterns exist. #exists_unit', () }) }) - describe('Project hotkeys routes', () => { - it('GET /project/:projectId/hotkeys -- get project hotkeys', () => { - expect(routeExists('/:projectId/hotkeys', 'get')).toBe(true) - }) - - it('POST /project/:projectId/hotkeys -- create project hotkeys', () => { - expect(routeExists('/:projectId/hotkeys', 'post')).toBe(true) - }) - - it('PUT /project/:projectId/hotkeys -- update project hotkeys', () => { - expect(routeExists('/:projectId/hotkeys', 'put')).toBe(true) - }) - - it('DELETE /project/:projectId/hotkeys -- delete project hotkeys', () => { - expect(routeExists('/:projectId/hotkeys', 'delete')).toBe(true) - }) - }) - describe('Project custom metadata routes', () => { it('GET /project/:id/custom -- get custom metadata namespaces', () => { expect(routeExists('/:id/custom', 'get')).toBe(true) diff --git a/__tests__/smoke.test.js b/__tests__/smoke.test.js new file mode 100644 index 00000000..ad6bdf9b --- /dev/null +++ b/__tests__/smoke.test.js @@ -0,0 +1,95 @@ +#!/usr/bin/env node + +/** + * Post-deployment smoke tests for TPEN Services + * Validates basic functionality after deployment + */ + +import https from 'https' +import http from 'http' + +const BASE_URL = process.env.SMOKE_TEST_URL || 'http://localhost:3011' +const isHttps = BASE_URL.startsWith('https') +const httpModule = isHttps ? https : http + +function request(path, options = {}) { + return new Promise((resolve, reject) => { + const url = new URL(path, BASE_URL) + const req = httpModule.request(url, { + method: options.method || 'GET', + headers: options.headers || {}, + ...options + }, (res) => { + let data = '' + res.on('data', chunk => data += chunk) + res.on('end', () => resolve({ status: res.statusCode, data, headers: res.headers })) + }) + req.on('error', reject) + if (options.timeout) { + req.setTimeout(options.timeout, () => { + req.destroy() + reject(new Error('Request timeout')) + }) + } + req.end() + }) +} + +async function runCheck(name, fn) { + try { + await fn() + return { name, ok: true } + } catch (err) { + return { name, ok: false, error: err.message || String(err) } + } +} + +// One Jest test that runs all smoke checks and asserts none failed +test('post-deployment smoke checks', async () => { + const checks = [] + + // Root endpoint returns expected content + checks.push(await runCheck('Root endpoint returns service index HTML', async () => { + const res = await request('/') + if (res.status !== 200) throw new Error(`Expected 200, got ${res.status}`) + const hasHeading = res.data.includes('

TPEN3 Services

') + const hasWelcome = res.data.toLowerCase().includes('welcome to') + if (!(hasHeading || hasWelcome)) throw new Error('Expected TPEN3 Services index HTML not found in response') + })) + + // Protected endpoint requires authentication + checks.push(await runCheck('Protected endpoint requires authentication', async () => { + const res = await request('/my/profile') + if (res.status !== 401) throw new Error(`Expected 401, got ${res.status}`) + })) + + // CORS headers present for allowed origin + checks.push(await runCheck('CORS headers present for allowed origins', async () => { + const res = await request('/', { + headers: { Origin: 'https://app.t-pen.org' } + }) + const corsHeader = res.headers['access-control-allow-origin'] + if (!corsHeader) throw new Error('CORS header not present') + })) + + // Invalid route returns 404 + checks.push(await runCheck('Invalid route returns 404', async () => { + const res = await request('/this-does-not-exist') + if (res.status !== 404) throw new Error(`Expected 404, got ${res.status}`) + })) + + // Service responds within 3 seconds + checks.push(await runCheck('Service responds within 3 seconds', async () => { + const start = Date.now() + await request('/', { timeout: 3000 }) + const duration = Date.now() - start + if (duration > 3000) throw new Error(`Response took ${duration}ms (> 3000ms)`) + })) + + const failed = checks.filter(c => !c.ok) + if (failed.length > 0) { + // Fail the Jest test and print details + const msg = failed.map(f => `${f.name}: ${f.error}`).join('\n') + throw new Error(`Smoke tests failed:\n${msg}`) + } +}, 30000) // set a longer timeout for the whole test if needed diff --git a/app.js b/app.js index b588562f..36e127f7 100644 --- a/app.js +++ b/app.js @@ -10,11 +10,7 @@ const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) import cookieParser from 'cookie-parser' -import dotenv from 'dotenv' -import dotenvExpand from 'dotenv-expand' - -let storedEnv = dotenv.config() -dotenvExpand.expand(storedEnv) +import cors from 'cors' import logger from 'morgan' import indexRouter from './index.js' @@ -28,7 +24,32 @@ import feedbackRouter from './feedback/feedbackRoutes.js' let app = express() +// CORS configuration - Open to all origins +const corsOptions = { + origin: true, // Allow all origins + credentials: true, + optionsSuccessStatus: 200, + methods : "GET,OPTIONS,HEAD,PUT,PATCH,DELETE,POST", + allowedHeaders : [ + 'Content-Type', + 'Content-Length', + 'Allow', + 'Authorization', + 'Location', + 'Connection', + 'Keep-Alive', + 'Date', + 'Cache-Control', + 'Last-Modified', + 'Link', + 'Origin', + 'Referrer', + 'User-Agent' + ] +} + //Middleware to use +app.use(cors(corsOptions)) app.use(logger('dev')) app.use(express.json()) app.use(express.text()) diff --git a/bin/tpen3_services.js b/bin/tpen3_services.js index 2fc15f44..bbf1daf3 100644 --- a/bin/tpen3_services.js +++ b/bin/tpen3_services.js @@ -7,13 +7,11 @@ import app from '../app.js' import debug from 'debug' debug('tpen3_services:server') import http from 'http' -import dotenv from 'dotenv' -dotenv.config() /** * Get port from environment and store in Express. */ -const port = normalizePort(process.env.PORT ?? '3001') +const port = normalizePort(process.env.PORT ?? '3011') app.set('port', port) /** diff --git a/classes/HotKeys/Hotkeys.js b/classes/HotKeys/Hotkeys.js deleted file mode 100644 index 256a50a1..00000000 --- a/classes/HotKeys/Hotkeys.js +++ /dev/null @@ -1,152 +0,0 @@ -import dbDriver from "../../database/driver.js" -const database = new dbDriver("mongo") - -/** - * Class representing a hotkey. - * @class Hotkeys - * @param {String} _id - The ID of the hotkey matches the id of the Project it belongs to. - */ -export default class Hotkeys { - constructor(_id, symbols = []) { - if (!_id) { - throw { status: 400, message: "_id is required" } - } - this._id = _id - this.data = { _id, symbols } - } - - assign(symbols) { - if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { - throw { status: 400, message: "All symbols must be strings" } - } - if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { - throw { status: 400, message: "All symbols must be strings" } - } - this.data.symbols = symbols - return this - } - - add(symbol) { - if (typeof symbol !== 'string') { - throw { status: 400, message: "Symbol must be a string" } - } - if (!this.data.symbols.includes(symbol)) { - this.data.symbols.push(symbol) - } - return this - } - - remove(symbol) { - if (typeof symbol !== 'string') { - throw { status: 400, message: "Symbol must be a string" } - } - this.data.symbols = this.data.symbols.filter(s => s !== symbol) - return this - } - - /** - * Load hotkey data from the database. - */ - async #loadFromDB() { - this.data = await database.getById(this._id, process.env.TPENHOTKEYS) - return this - } - - /** - * Fetch all hotkeys for a project. - * @param {String} _id - The ID of the project. - * @returns {Array} - Array of hotkey objects. - */ - static async getByProjectId(_id) { - if (!_id) { - throw { status: 400, message: "projectId is required" } - } - - return database.findOne({ _id }, process.env.TPENHOTKEYS) - } - - /** - * Create a new hotkey. - * @param {String} projectId - The ID of the project this hotkey belongs to. - * @param {Array} symbols - Ordered list of UTF-8 symbols (e.g., ["♠","❤","ϡ"]). - * @returns {Object} - The created hotkey. - */ - async create() { - if (!this.data._id || (this.data.symbols?.length < 1)) { - throw { status: 400, message: "Cannot create a detached or empty set of hotkeys." } - } - try { - await database.save(this.data, process.env.TPENHOTKEYS) - } catch (err) { - // possible collision with existing hotkey or other error - throw { - status: err.status ?? 500, - message: err.message ?? "An error occurred while creating the hotkey" - } - } - return this.data - } - - /** - * Sets hotkey symbols. - * @returns {Object} - The updated hotkey. - */ - async upsert() { - if (!this.data._id || (this.data.symbols?.length < 1)) { - throw { status: 400, message: "Cannot create a detached or empty set of hotkeys. Consider DELETE." } - } - try { - // until upsert is in the driver - const action = await database.findOne({ _id: this.data._id }, process.env.TPENHOTKEYS) ? 'update' : 'save' - await database[action](this.data, process.env.TPENHOTKEYS) - } catch (err) { - // server or driver/mongo error - throw { - status: err.status ?? 500, - message: err.message ?? "An error occurred while updating the hotkey" - } - } - return this.data - } - - /** - * Sets hotkey symbols. - * @returns {Object} - The updated hotkey. - */ - async setSymbols() { - if (!this.data._id || (this.data.symbols?.length < 1)) { - throw { status: 400, message: "Cannot create a detached or empty set of hotkeys. Consider DELETE." } - } - try { - await database.update(this.data, process.env.TPENHOTKEYS) - } catch (err) { - // server or driver/mongo error - throw { - status: err.status ?? 500, - message: err.message ?? "An error occurred while updating the hotkey" - } - } - return this.data - } - - /** - * Delete a hotkey. - * @returns {Boolean} Succeeded. - */ - async delete() { - if (!this.data._id) { - throw { status: 400, message: "Id is required" } - } - - try { - await database.delete(this.data._id, process.env.TPENHOTKEYS) - } catch (err) { - // server or driver/mongo error - throw { - status: err.status ?? 500, - message: err.message ?? "An error occurred while deleting the hotkey" - } - } - return true - } -} diff --git a/classes/HotKeys/__tests__/hotkeys.test.js b/classes/HotKeys/__tests__/hotkeys.test.js deleted file mode 100644 index 9e661bc7..00000000 --- a/classes/HotKeys/__tests__/hotkeys.test.js +++ /dev/null @@ -1,51 +0,0 @@ -import Hotkeys from '../Hotkeys.js' - -test('Hotkeys constructor should throw an error if _id is not provided', () => { - expect(() => new Hotkeys()).toThrow(new Error("_id is required")) -}) - -test('Hotkeys constructor should initialize with _id and symbols', () => { - const hotkeys = new Hotkeys('123', ['a', 'b']) - expect(hotkeys._id).toBe('123') - expect(hotkeys.data._id).toBe('123') - expect(hotkeys.data.symbols).toEqual(['a', 'b']) -}) - -test('assign should set symbols and return the instance', () => { - const hotkeys = new Hotkeys('123') - hotkeys.assign(['a', 'b']) - expect(hotkeys.data.symbols).toEqual(['a', 'b']) -}) - -test('assign should throw an error if symbols are not strings', () => { - const hotkeys = new Hotkeys('123') - expect(() => hotkeys.assign([1, 2])).toThrow(new Error("All symbols must be strings")) -}) - -test('add should add a symbol if it does not exist and return the instance', () => { - const hotkeys = new Hotkeys('123', ['a']) - hotkeys.add('b') - expect(hotkeys.data.symbols).toEqual(['a', 'b']) -}) - -test('add should not add a symbol if it already exists', () => { - const hotkeys = new Hotkeys('123', ['a']) - hotkeys.add('a') - expect(hotkeys.data.symbols).toEqual(['a']) -}) - -test('add should throw an error if symbol is not a string', () => { - const hotkeys = new Hotkeys('123') - expect(() => hotkeys.add(1)).toThrow(new Error("Symbol must be a string")) -}) - -test('remove should remove a symbol if it exists and return the instance', () => { - const hotkeys = new Hotkeys('123', ['a', 'b']) - hotkeys.remove('a') - expect(hotkeys.data.symbols).toEqual(['b']) -}) - -test('remove should throw an error if symbol is not a string', () => { - const hotkeys = new Hotkeys('123') - expect(() => hotkeys.remove(1)).toThrow(new Error("Symbol must be a string")) -}) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index a38d5101..aabea501 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -9,7 +9,6 @@ import dbDriver from "../../database/driver.js" import vault from "../../utilities/vault.js" import imageSize from 'image-size' import mime from 'mime-types' -import Hotkeys from "../HotKeys/Hotkeys.js" import { fetchUserAgent } from "../../utilities/shared.js" import { checkIfUrlExists } from "../../utilities/checkIfUrlExists.js" @@ -32,7 +31,7 @@ export default class ProjectFactory { if (!manifest) { throw { status: 404, - message: err.message ?? "No manifest found. Cannot process empty object" + message: "No manifest found. Cannot process empty object" } } const _id = database.reserveId() @@ -92,9 +91,9 @@ export default class ProjectFactory { } /** - * Creates a new manifest from given image url and project label. - * @param {string} imageUrl - URL of the image to be used in the project. - * @param {string} label - Label for the project. + * Creates a new manifest from given image url(s) and project label. + * @param {string|string[]} imageInput - URL or array of URLs of images to be used. + * @param {string} projectLabel - Label for the project. * @returns {Object} - Returns the created project object. */ @@ -134,13 +133,6 @@ export default class ProjectFactory { } } - static async cloneHotkeys(projectId, copiedProjectId) { - const hotkeys = await Hotkeys.getByProjectId(projectId) - if (hotkeys) { - const copiedHotkeys = new Hotkeys(copiedProjectId, hotkeys.symbols) - await copiedHotkeys.create() - } - } static async cloneGroup(projectId, creator, modules = { 'Group Members': true }) { const project = await ProjectFactory.loadAsUser(projectId, creator) @@ -291,8 +283,13 @@ export default class ProjectFactory { const symbols = projectTPEN28Data.projectButtons.map(button => String.fromCharCode(button.key)) if (symbols && symbols.length > 0) { - const copiedHotkeys = new Hotkeys(projectTPEN3Data._id, symbols) - await copiedHotkeys.create() + const project = new Project(projectTPEN3Data._id) + project.data = projectTPEN3Data + project.data.interfaces ??= {} + const namespace = process.env.TPENINTERFACESNAMESPACE ?? "https://app.t-pen.org/" + project.data.interfaces[namespace] ??= {} + project.data.interfaces[namespace].quicktype = symbols + await project.update() } let projectTools = [] try { @@ -337,7 +334,6 @@ export default class ProjectFactory { if (!responseManifest.ok) { throw new Error(`Failed to fetch: ${responseManifest.statusText}`) } - const manifestJson = await responseManifest.json() const itemsByPage = {} manifestJson.items.map((item, index) => { @@ -359,20 +355,20 @@ export default class ProjectFactory { itemsByPage[allPagesIds[index]] = annotations } }) - + for (const [endpoint, annotations] of Object.entries(itemsByPage)) { - try { - const response = await fetch(`${endpoint}/line`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${userToken}`, - }, - body: JSON.stringify(annotations), - }) - if (!response.ok) { - throw new Error(`Failed to import annotations: ${response.statusText}`) - } + try { + const response = await fetch(`${endpoint}/line`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${userToken}`, + }, + body: JSON.stringify(annotations), + }) + if (!response.ok) { + throw new Error(`Failed to import annotations: ${response.statusText}`) + } } catch (error) { console.error("Error importing annotations:", error) } @@ -401,7 +397,6 @@ export default class ProjectFactory { await this.cloneLayers(project, copiedProject, creator, database, true) copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) - await this.cloneHotkeys(project._id, copiedProject._id) return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") } @@ -425,7 +420,6 @@ export default class ProjectFactory { await this.cloneLayers(project, copiedProject, creator, database, false) copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': true }) - await this.cloneHotkeys(project._id, copiedProject._id) return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") } @@ -460,7 +454,7 @@ export default class ProjectFactory { } // modules is an object with keys as module names and values as true/false - // e.g. { 'Metadata': true, 'Group Members': [member1, member2], 'Hotkeys': true, 'Tools': false, 'Layers': [{ 'layerId1': { withAnnotations: true } }, { 'layerId2': { withAnnotations: false } }] } + // e.g. { 'Metadata': true, 'Group Members': [member1, member2], 'Tools': false, 'Layers': [{ 'layerId1': { withAnnotations: true } }, { 'layerId2': { withAnnotations: false } }] } if (!modules || typeof modules !== 'object') { throw { @@ -551,18 +545,15 @@ export default class ProjectFactory { modules['Group Members'].push(creator) const copiedGroup = await this.cloneGroup(project._id, creator, { 'Group Members': modules['Group Members'] }) - if (modules['Hotkeys']) { - await this.cloneHotkeys(project._id, copiedProject._id) - } copiedProject._lastModified = copiedProject.layers[0]?.pages[0]?.id.split('/').pop() return database.save({ ...copiedProject, creator, group: copiedGroup._id }, "projects") } - + static async DBObjectFromImage(manifest, creator) { if (!manifest) { throw { status: 404, - message: err.message ?? "No manifest found. Cannot process empty object" + message: "No manifest found. Cannot process empty object" } } const _id = manifest.id.split('/').slice(-2, -1)[0] @@ -586,8 +577,9 @@ export default class ProjectFactory { } } - static async createManifestFromImage(imageURLs, projectLabel, creator) { - if (!imageURLs || imageURLs.length === 0) { + static async createManifestFromImage(imageInput, projectLabel, creator) { + const imageURLs = Array.isArray(imageInput) ? imageInput : [imageInput] + if (!imageURLs.length) { throw { status: 404, message: "No image found. Cannot process further." @@ -639,7 +631,6 @@ export default class ProjectFactory { const now = Date.now().toString().slice(-6) const label = projectLabel ?? now const _id = database.reserveId() - const projectManifest = { "@context": "http://iiif.io/api/presentation/3/context.json", id: `${process.env.TPENSTATIC}/${_id}/manifest.json`, @@ -652,99 +643,42 @@ export default class ProjectFactory { for (let index = 0; index < imageURLs.length; index++) { const imageURL = imageURLs[index] let isIIFImage = false - let IIIFServiceParts = imageURL.split('/').reverse() + const IIIFServiceParts = imageURL.split('/').reverse() let IIIFServiceJson = null - let IIIFServiceURL = IIIFServiceParts.slice(4).reverse().join("/") - - if ( - isValidIIIFQuality(IIIFServiceParts[0].split(".")[0]) && - isValidIIIFRotation(IIIFServiceParts[1]) && - isValidIIIFSize(IIIFServiceParts[2]) && - isValidIIIFRegion(IIIFServiceParts[3]) - ) { + const IIIFServiceURL = IIIFServiceParts.slice(4).reverse().join("/") + if (isValidIIIFQuality(IIIFServiceParts[0].split(".")[0]) && isValidIIIFRotation(IIIFServiceParts[1]) && isValidIIIFSize(IIIFServiceParts[2]) && isValidIIIFRegion(IIIFServiceParts[3])) { try { const response = await fetch(`${IIIFServiceURL}/info.json`) if (response.ok) { const info = await response.json() - if (info?.protocol === "http://iiif.io/api/image") { - isIIFImage = true - IIIFServiceJson = info - } - } else { - console.warn(`Failed to fetch IIIF info for image ${index + 1}`) + if (info?.protocol === "http://iiif.io/api/image") { isIIFImage = true; IIIFServiceJson = info } } - } catch (err) { - console.error("Error fetching IIIF info:", err.message) - } + } catch (err) { console.warn("IIIF info fetch issue:", err.message) } } - const dimensions = await this.getImageDimensions(imageURL) - const canvasLayout = { id: `${process.env.TPENSTATIC}/${_id}/canvas-${index + 1}.json`, type: "Canvas", - label: { "none": [`${label} Page ${index + 1}`] }, - width: dimensions.width, - height: dimensions.height, + label: { none: [`${label} Page ${index + 1}`] }, + width: dimensions?.width, + height: dimensions?.height, items: [ - { - id: `${process.env.TPENSTATIC}/${_id}/contentPage.json`, - type: "AnnotationPage", - items: [ - { - id: `${process.env.TPENSTATIC}/${_id}/content.json`, - type: "Annotation", - motivation: "painting", - body: { - id: imageURL, - type: "Image", - format: mime.lookup(imageURL) || "image/jpeg", - width: dimensions.width, - height: dimensions.height, - ...(isIIFImage && { - service: [{ - id: IIIFServiceURL, - type: IIIFServiceJson?.type, - profile: IIIFServiceJson?.profile, - }] - }) - }, - target: `${process.env.TPENSTATIC}/${_id}/canvas-${index + 1}.json` - } - ] - } + { id: `${process.env.TPENSTATIC}/${_id}/contentPage.json`, type: "AnnotationPage", items: [ { id: `${process.env.TPENSTATIC}/${_id}/content.json`, type: "Annotation", motivation: "painting", body: { id: imageURL, type: "Image", format: mime.lookup(imageURL) || "image/jpeg", width: dimensions?.width, height: dimensions?.height, ...(isIIFImage && { service: [{ id: IIIFServiceURL, type: IIIFServiceJson?.type, profile: IIIFServiceJson?.profile }] }) }, target: `${process.env.TPENSTATIC}/${_id}/canvas-${index + 1}.json` } ] } ], creator: await fetchUserAgent(creator), } - projectManifest.items.push(canvasLayout) - const projectCanvas = { - "@context": "http://iiif.io/api/presentation/3/context.json", - ...canvasLayout - } - + const projectCanvas = { "@context": "http://iiif.io/api/presentation/3/context.json", ...canvasLayout } await this.uploadFileToGitHub(projectCanvas, _id) } - await this.uploadFileToGitHub(projectManifest, _id) - return await ProjectFactory.DBObjectFromImage(projectManifest, creator) - .then(async (project) => { + .then(async project => { const projectObj = new Project() - const group = await Group.createNewGroup(creator, - { - label: project.label ?? project.title ?? `Project ${new Date().toLocaleDateString()}`, - members: { [creator]: { roles: [] } } - }) - .then((group) => group._id) + const group = await Group.createNewGroup(creator, { label: project.label ?? project.title ?? `Project ${new Date().toLocaleDateString()}`, members: { [creator]: { roles: [] } } }).then(g => g._id) return await projectObj.create({ ...project, creator, group }) }) - .catch((err) => { - throw { - status: err.status ?? 500, - message: err.message ?? "Internal Server Error" - } - }) + .catch(err => { throw { status: err.status ?? 500, message: err.message ?? "Internal Server Error" } }) } /** @@ -837,19 +771,16 @@ export default class ProjectFactory { } const annotationPages = [] - await Promise.all(project.layers.map(layer => { - return layer.pages.forEach(page => { - if ((page.target === canvas.id) && page.id.startsWith(process.env.RERUMIDPREFIX)) { - const annotationPage = { - id: page.id, - type: "AnnotationPage" - } - annotationPages.push(annotationPage) + project.layers.forEach(layer => { + layer.pages.forEach(page => { + if (page.target === canvas.id && page.id.startsWith(process.env.RERUMIDPREFIX)) { + annotationPages.push({ id: page.id, type: "AnnotationPage" }) } }) }) - ) - annotationPages.length > 0 && (canvasItems.annotations = await this.getAnnotations({ annotations: annotationPages })) + if (annotationPages.length) { + canvasItems.annotations = await this.getAnnotations({ annotations: annotationPages }) + } return canvasItems } catch (error) { console.error(`Error processing layer:`, error) @@ -942,27 +873,14 @@ export default class ProjectFactory { const token = process.env.GITHUB_TOKEN async function getFileSha() { - const res = await fetch(manifestUrl, { - headers: { - 'Authorization': `token ${token}`, - 'Accept': 'application/vnd.github.v3+json', - }, - }) - if (res.ok) { - const data = await res.json() - return data.sha - } + const res = await fetch(manifestUrl, { headers: { 'Authorization': `token ${token}`, 'Accept': 'application/vnd.github.v3+json' } }) + if (res.ok) return (await res.json()).sha return null } - async function uploadWithSha(sha = null) { - const res = await fetch(manifestUrl, { + return await fetch(manifestUrl, { method: 'PUT', - headers: { - 'Authorization': `token ${token}`, - 'Accept': 'application/vnd.github.v3+json', - 'Content-Type': 'application/json', - }, + headers: { 'Authorization': `token ${token}`, 'Accept': 'application/vnd.github.v3+json', 'Content-Type': 'application/json' }, body: JSON.stringify({ message: sha ? `Updated ${projectId}/${fileName}` : `Created ${projectId}/${fileName}`, content: Buffer.from(JSON.stringify(manifest, null, 2)).toString('base64'), @@ -970,42 +888,26 @@ export default class ProjectFactory { ...(sha && { sha }), }) }) - return res - } - - async function delay(ms) { - return new Promise(resolve => setTimeout(resolve, ms)) } + async function delay(ms) { return new Promise(resolve => setTimeout(resolve, ms)) } try { let sha = await getFileSha() let response const maxRetries = 3 - for (let attempt = 1; attempt <= maxRetries; attempt++) { response = await uploadWithSha(sha) - if (response.ok) break - - if (response.status === 409) { - await delay(500 * attempt) - sha = await getFileSha() - continue - } - + if (response.status === 409) { await delay(500 * attempt); sha = await getFileSha(); continue } const errText = await response.text() throw new Error(`GitHub upload failed: ${response.status} - ${errText}`) } - if (!response.ok) { const errText = await response.text() throw new Error(`GitHub upload failed after ${maxRetries} attempts: ${errText}`) } - return await response.json() - } catch (error) { - console.error(`Failed to upload ${projectId}/${fileName}:`, error) - } + } catch (error) { console.error(`Failed to upload ${projectId}/${fileName}:`, error) } } /** @@ -1040,95 +942,37 @@ export default class ProjectFactory { const commitsUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/commits?path=${filePath}&per_page=1` const commits = await fetch(commitsUrl, { headers }) - .then(async (resp) => { - if (resp.ok) return resp.json() - const errText = await resp.text() - return [{ state: -1, "message": `${resp.status} - ${errText}` }] - }) - .catch(err => { - console.error(err) - return [{ state: -1, "message": `TPEN Services Internal Server Error` }] - }) - - if (commits?.length && commits[0].state === -1) { - console.error(commits[0]) - return { status: -1, message: commits[0].message } - } - - if (!commits.length) { - return { status: 1 } - } + .then(async resp => resp.ok ? resp.json() : [{ state: -1, message: `${resp.status} - ${await resp.text()}` }]) + .catch(() => [{ state: -1, message: 'TPEN Services Internal Server Error' }]) + if (commits?.length && commits[0].state === -1) return { status: -1, message: commits[0].message } + if (!commits.length) return { status: 1 } const commitMessage = commits[0].commit?.message.split(' ') - if (commitMessage[0] === 'Delete') { - return { status: 1 } - } + if (commitMessage[0] === 'Delete') return { status: 1 } const latestSha = commits[0].sha const deployments = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/deployments?sha=${latestSha}` const deployment = await fetch(deployments, { headers }) - .then(async (resp) => { - if (resp.ok) return resp.json() - const errText = await resp.text() - return [{ state: -1, "message": `${resp.status} - ${errText}` }] - }) - .catch(err => { - console.error(err) - return [{ state: -1, "message": `TPEN Services Internal Server Error` }] - }) - - if (deployment?.length && deployment[0].state === -1) { - console.error(deployment[0]) - return { status: -1, message: deployment[0].message } - } - - if (deployment.length === 0) { - if (await checkIfUrlExists(url)) { - if (new Date(commits[0].commit?.committer?.date) > new Date(Date.now() - 2 * 60 * 1000)) { - return { status: 2 } - } - else { - return { status: 3 } - } - } + .then(async resp => resp.ok ? resp.json() : [{ state: -1, message: `${resp.status} - ${await resp.text()}` }]) + .catch(() => [{ state: -1, message: 'TPEN Services Internal Server Error' }]) + if (deployment?.length && deployment[0].state === -1) return { status: -1, message: deployment[0].message } + if (!deployment.length) { + if (await checkIfUrlExists(url)) return new Date(commits[0].commit?.committer?.date) > new Date(Date.now() - 2 * 60 * 1000) ? { status: 2 } : { status: 3 } return { status: 9 } } const statusUrl = `https://api.github.com/repos/${process.env.REPO_OWNER}/${process.env.REPO_NAME}/deployments/${deployment[0].id}/statuses` const statuses = await fetch(statusUrl, { headers }) - .then(async (resp) => { - if (resp.ok) return resp.json() - const errText = await resp.text() - return [{ state: -1, "message": `${resp.status} - ${errText}` }] - }) - .catch(err => { - console.error(err) - return [{ state: -1, "message": `TPEN Services Internal Server Error` }] - }) - - if (statuses?.length && statuses[0].state === -1) { - console.error(statuses[0]) - return { status: -1, message: statuses[0].message } - } - - if (!statuses.length) { - return { status: 8 } - } - - const latestStatus = statuses[0] - const state = latestStatus.state - - if (state === 'success') { - return { status: 4 } - } else if (['queued', 'in_progress', 'pending'].includes(state)) { - return { status: 5 } - } else if (state === 'inactive') { - return { status: 6 } - } else if (state === 'error') { - return { status: 7 } - } else { - return { status: 8 } - } + .then(async resp => resp.ok ? resp.json() : [{ state: -1, message: `${resp.status} - ${await resp.text()}` }]) + .catch(() => [{ state: -1, message: 'TPEN Services Internal Server Error' }]) + if (statuses?.length && statuses[0].state === -1) return { status: -1, message: statuses[0].message } + if (!statuses.length) return { status: 8 } + const state = statuses[0].state + if (state === 'success') return { status: 4 } + if (['queued', 'in_progress', 'pending'].includes(state)) return { status: 5 } + if (state === 'inactive') return { status: 6 } + if (state === 'error') return { status: 7 } + return { status: 8 } } static async loadAsUser(project_id, user_id) { @@ -1195,19 +1039,6 @@ export default class ProjectFactory { } }, - { - $lookup: { - from: "hotkeys", - localField: "_id", - foreignField: "_id", - as: "hotkeys" - }, - }, - { - $set: { - "options.hotkeys": { $arrayElemAt: ["$hotkeys.symbols", 0] } - } - }, { $project: { _id: 1, diff --git a/classes/Tools/Tools.js b/classes/Tools/Tools.js index e0cb749b..a1d935bc 100644 --- a/classes/Tools/Tools.js +++ b/classes/Tools/Tools.js @@ -268,7 +268,7 @@ export default class Tools { "enabled": true, "tagName": "" }, - "url": "http://enigma.huma-num.fr/", + "url": "https://enigma.huma-num.fr/", "location": "pane" }, { diff --git a/config.env b/config.env new file mode 100644 index 00000000..86f3b50f --- /dev/null +++ b/config.env @@ -0,0 +1,57 @@ +# TPEN Services - Default Configuration +# These are safe defaults that can be committed to the repository. +# They work for local development and should not contain secrets. +# +# To use this: +# 1. Copy .env.development to .env for development +# 2. Copy .env.production to .env for production +# 3. Edit .env with environment-specific values +# +# Configuration is loaded via Node.js's native --env-file flag (Node.js 22+): +# 1. config.env is loaded first (this file) +# 2. .env is loaded second (overrides these defaults) + +# Server Configuration +PORT=3011 +DOWN=false + +# Data Collections (MongoDB collection names) +TPENPROJECTS=projects +TPENGROUPS=groups +TPENUSERS=users + +# Local Development Database Defaults +# These work out-of-the-box for local Docker/MongoDB/MariaDB +MONGODB=mongodb://localhost:27017 +MONGODBNAME=testTpen +MARIADB=localhost +MARIADBNAME=testTpen +MARIADBUSER=tpen_user +MARIADBPASSWORD=tpen_password + +# Development External Services +# Safe defaults pointing to development services +RERUMIDPREFIX=https://devstore.rerum.io/v1/id/ +TINYPEN=https://tinydev.rerum.io/ + +# GitHub Static Storage Defaults +REPO_OWNER=CenterForDigitalHumanities +REPO_NAME=TPEN-Static-Dev +BRANCH=main + +# Email Configuration Placeholders +SMTP_HOST=smtp.example.com +SMTP_PORT=25 +TPEN_SUPPORT_EMAIL=support@example.com +TPEN_EMAIL_CC=admin@example.com + +# Server URL (will be overridden in .env for deployments) +SERVERURL=http://localhost:3011 + +# TPEN Interfaces Namespace +# Wildcard "*" for development, specific URL for production +TPENINTERFACESNAMESPACE=* + +# Testing Configuration +TEST_TIMEOUT=5500 +DB_TEST_TIMEOUT=5500 diff --git a/database/maria/controller.js b/database/maria/controller.js index f08ce8a9..977589be 100644 --- a/database/maria/controller.js +++ b/database/maria/controller.js @@ -7,8 +7,6 @@ */ import mariadb from 'mariadb' -import dotenv from 'dotenv' -let storedEnv = dotenv.config() class DatabaseController { constructor(connect=false) { diff --git a/database/mongo/controller.js b/database/mongo/controller.js index 5b863cd8..5abe1e7a 100644 --- a/database/mongo/controller.js +++ b/database/mongo/controller.js @@ -7,9 +7,6 @@ */ import {MongoClient, ObjectId} from "mongodb" -import dotenv from "dotenv" - -let storedEnv = dotenv.config() let err_out = Object.assign(new Error(), { status: 123, message: "N/A", diff --git a/database/tiny/controller.js b/database/tiny/controller.js index 62537a5b..842e1f0c 100644 --- a/database/tiny/controller.js +++ b/database/tiny/controller.js @@ -6,9 +6,7 @@ * https://github.com/thehabes */ -import dotenv from 'dotenv' import { ObjectId } from 'mongodb' -let storedEnv = dotenv.config() let err_out = Object.assign(new Error(), {"status":123, "message":"N/A", "_dbaction":"N/A"}) class DatabaseController { diff --git a/jest.all.config.js b/jest.all.config.js new file mode 100644 index 00000000..3cb050af --- /dev/null +++ b/jest.all.config.js @@ -0,0 +1,11 @@ +import base from './jest.config.js' + +const config = { + ...base, + testPathIgnorePatterns: [ + ...(base.testPathIgnorePatterns || []), + '/__tests__/smoke.test.js' + ] +} + +export { config as default } diff --git a/package-lock.json b/package-lock.json index 04d12aae..3513a085 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,8 +14,6 @@ "cors": "^2.8.5", "debug": "^4.4.3", "dompurify": "^3.2.7", - "dotenv": "^17.2.3", - "dotenv-expand": "^12.0.3", "express": "^5.1.0", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "~1.6.1", @@ -63,9 +61,9 @@ } }, "node_modules/@asamuzakjp/dom-selector": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.6.1.tgz", - "integrity": "sha512-8QT9pokVe1fUt1C8IrJketaeFOdRfTOS96DL3EBjE8CRZm3eHnwMlQe2NPoOSEYPwJ5Q25uYoX1+m9044l3ysQ==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.5.7.tgz", + "integrity": "sha512-cvdTPsi2qC1c22UppvuVmx/PDwuc6+QQkwt9OnwQD6Uotbh//tb2XDF0OoK2V0F4b8d02LIwNp3BieaDMAhIhA==", "license": "MIT", "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", @@ -1456,12 +1454,12 @@ } }, "node_modules/@types/node": { - "version": "24.7.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.0.tgz", - "integrity": "sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==", + "version": "24.6.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz", + "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==", "license": "MIT", "dependencies": { - "undici-types": "~7.14.0" + "undici-types": "~7.13.0" } }, "node_modules/@types/stack-utils": { @@ -2005,9 +2003,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.12.tgz", - "integrity": "sha512-vAPMQdnyKCBtkmQA6FMCBvU9qFIppS3nzyXnEM+Lo2IAhG4Mpjv9cCxMudhgV3YdNNJv6TNqXy97dfRVL2LmaQ==", + "version": "2.8.11", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.11.tgz", + "integrity": "sha512-i+sRXGhz4+QW8aACZ3+r1GAKMt0wlFpeA8M5rOQd0HEYw9zhDrlx9Wc8uQ0IdXakjJRthzglEwfB/yqIjO6iDg==", "dev": true, "license": "Apache-2.0", "bin": { @@ -2216,9 +2214,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001748", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001748.tgz", - "integrity": "sha512-5P5UgAr0+aBmNiplks08JLw+AW/XG/SurlgZLgB1dDLfAw7EfRGxIwzPHxdSCGY/BTKDqIVyJL87cCN6s0ZR0w==", + "version": "1.0.30001747", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001747.tgz", + "integrity": "sha512-mzFa2DGIhuc5490Nd/G31xN1pnBnYMadtkyTjefPI7wzypqgCEpeWu9bJr0OnDsyKrW75zA9ZAt7pbQFmwLsQg==", "dev": true, "funding": [ { @@ -2289,9 +2287,9 @@ } }, "node_modules/ci-info": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz", - "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", + "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", "dev": true, "funding": [ { @@ -2704,45 +2702,6 @@ "@types/trusted-types": "^2.0.7" } }, - "node_modules/dotenv": { - "version": "17.2.3", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", - "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, - "node_modules/dotenv-expand": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-12.0.3.tgz", - "integrity": "sha512-uc47g4b+4k/M/SeaW1y4OApx+mtLWl92l5LMPP0GNXctZqELk+YGgOPIIC5elYmUH4OuoK3JLhuRUYegeySiFA==", - "license": "BSD-2-Clause", - "dependencies": { - "dotenv": "^16.4.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, - "node_modules/dotenv-expand/node_modules/dotenv": { - "version": "16.6.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", - "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2771,9 +2730,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.231", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.231.tgz", - "integrity": "sha512-cyl6vqZGkEBnz/PmvFHn/u9G/hbo+FF2CNAOXriG87QOeLsUdifCZ9UbHNscE9wGdrC8XstNMli0CbQnZQ+fkA==", + "version": "1.5.230", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.230.tgz", + "integrity": "sha512-A6A6Fd3+gMdaed9wX83CvHYJb4UuapPD5X5SLq72VZJzxHSY0/LUweGXRWmQlh2ln7KV7iw7jnwXK7dlPoOnHQ==", "dev": true, "license": "ISC" }, @@ -4931,9 +4890,9 @@ } }, "node_modules/napi-postinstall": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz", - "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz", + "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==", "dev": true, "license": "MIT", "bin": { @@ -4970,17 +4929,16 @@ "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.23", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.23.tgz", - "integrity": "sha512-cCmFDMSm26S6tQSDpBCg/NR8NENrVPhAJSf+XbxBG4rPFaaonlEoE9wHQmun+cls499TQGSb7ZyPBRlzgKfpeg==", + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz", + "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", "dev": true, "license": "MIT" }, "node_modules/nodemailer": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.7.tgz", - "integrity": "sha512-jGOaRznodf62TVzdyhKt/f1Q/c3kYynk8629sgJHpRzGZj01ezbgMMWJSAjHADcwTKxco3B68/R+KHJY2T5BaA==", - "license": "MIT-0", + "version": "7.0.10", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.10.tgz", + "integrity": "sha512-Us/Se1WtT0ylXgNFfyFSx4LElllVLJXQjWi2Xz17xWw7amDKO2MLtFnVp1WACy7GkVGs+oBlRopVNUzlrGSw1w==", "engines": { "node": ">=6.0.0" } @@ -6392,9 +6350,9 @@ "license": "MIT" }, "node_modules/undici-types": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", - "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz", + "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==", "license": "MIT" }, "node_modules/unpipe": { diff --git a/package.json b/package.json index aad6d5a8..6afacbde 100644 --- a/package.json +++ b/package.json @@ -19,18 +19,18 @@ "author": "Research Computing Group (https://slu.edu)", "repository": "github:CenterForDigitalHumanities/rerum_server_nodejs", "scripts": { - "start": "node ./bin/tpen3_services.js", - "dev": "nodemon ./bin/tpen3_services.js", - "allTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js", - "unitTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", - "E2Etests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t e2e ", - "existsTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t exists_unit ", - "functionsTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t functions_unit ", - "dbTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t db ", - "authTest": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t auth_test ", - "userClassTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t user_class ", - "importTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t importTests ", - "inviteMemberTests": "node --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " + "start": "node --env-file=config.env --env-file=.env ./bin/tpen3_services.js", + "dev": "nodemon --env-file=config.env --env-file=.env ./bin/tpen3_services.js", + "allTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.all.config.js", + "unitTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", + "E2Etests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t e2e ", + "existsTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t exists_unit ", + "functionsTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t functions_unit ", + "dbTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t db ", + "authTest": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t auth_test ", + "userClassTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t user_class ", + "importTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t importTests ", + "inviteMemberTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " }, "dependencies": { "@iiif/helpers": "^1.5.3", @@ -38,8 +38,6 @@ "cors": "^2.8.5", "debug": "^4.4.3", "dompurify": "^3.2.7", - "dotenv": "^17.2.3", - "dotenv-expand": "^12.0.3", "express": "^5.1.0", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "~1.6.1", diff --git a/project/index.js b/project/index.js index ce96cca7..eb5eb760 100644 --- a/project/index.js +++ b/project/index.js @@ -7,7 +7,6 @@ import import28Router from "./import28Router.js" import projectReadRouter from "./projectReadRouter.js" import memberRouter from "./memberRouter.js" import customRolesRouter from "./customRolesRouter.js" -import hotkeysRouter from "./hotkeysRouter.js" import metadataRouter from "./metadataRouter.js" import projectToolsRouter from "./projectToolsRouter.js" import memberUpgradeRouter from "./memberUpgradeRouter.js" @@ -26,7 +25,6 @@ router.use(import28Router) router.use(projectReadRouter) router.use(memberRouter) router.use(customRolesRouter) -router.use(hotkeysRouter) router.use(metadataRouter) router.use(projectToolsRouter) router.use(projectCopyRouter) diff --git a/sample.env b/sample.env deleted file mode 100644 index 8bcf7409..00000000 --- a/sample.env +++ /dev/null @@ -1,45 +0,0 @@ -# Server Configuration -PORT=3001 -DOWN=false -READONLY=false -SERVERURL=http://localhost:3001 - -# Data Collections -TPENPROJECTS=projects -TPENGROUPS=groups -TPENUSERS=users -TPENHOTKEYS=hotkeys - -# Database Connection - MongoDB -MONGODB=mongodb://localhost:27017 -MONGODBNAME=tpen3 - -# Database Connection - MariaDB -MARIADB=localhost -MARIADBNAME=tpen3 -MARIADBUSER=tpen_user -MARIADBPASSWORD=tpen_password - -# RERUM Configuration -RERUMURL=https:/dev/store.rerum.io/v1 -RERUMIDPREFIX=https://devstore.rerum.io/v1/id/ - -# TinyPEN API -TINYPEN=http://dev.tiny.t-pen.org/ - -# Email Configuration -SMTP_HOST=smtp.example.com -SMTP_PORT=25 -TPEN_SUPPORT_EMAIL=support@example.com -TPEN_EMAIL_CC=admin@example.com - -# Authentication -AUDIENCE=https://tpen.example.com/api -DOMAIN=auth.example.com - -# GitHub Integration -REPO_OWNER=GitHubOrganization -REPO_NAME=OurProjects -GITHUB_TOKEN=github_pat_example_token -BRANCH = main -TPENSTATIC = https://dev.static.t-pen.org/ diff --git a/userProfile/__tests__/exists_unit.test.js b/userProfile/__tests__/exists_unit.test.js new file mode 100644 index 00000000..a98dc31b --- /dev/null +++ b/userProfile/__tests__/exists_unit.test.js @@ -0,0 +1,39 @@ +import app from '../../app.js' +import { jest } from '@jest/globals' +import expressListEndpoints from "express-list-endpoints" + +describe.skip('userProfile endpoint availability unit test (via a check on the app routes). #exists_unit', () => { + it('/user/:id is registered', () => { + let exists = false + const stack = expressListEndpoints(app.router) + for(const middleware of stack){ + if(middleware.path && middleware.path.includes("/user/:id")) { + exists = true + break + } + } + expect(exists).toBe(true) + }) + it('/my/profile is a registered endpoint', () => { + let exists = false + const stack = expressListEndpoints(app.router) + for(const middleware of stack){ + if(middleware.path && middleware.path.includes("/my/profile")) { + exists = true + break + } + } + expect(exists).toBe(true) + }) + it('/my/projects is a registered endpoint', () => { + let exists = false + const stack = expressListEndpoints(app.router) + for(const middleware of stack){ + if(middleware.path && middleware.path.includes("/my/projects")) { + exists = true + break + } + } + expect(exists).toBe(true) + }) +}) From 3071a960f31e660d04ea6a05e90b766a2c3bfe17 Mon Sep 17 00:00:00 2001 From: cubap Date: Mon, 10 Nov 2025 16:55:56 -0600 Subject: [PATCH 199/262] deduped --- classes/Project/ProjectFactory.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 2dae1689..9e6b9213 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -781,21 +781,6 @@ export default class ProjectFactory { if (annotationPages.length) { canvasItems.annotations = await this.getAnnotations({ annotations: annotationPages }) } - - const annotationPages = [] - await Promise.all(project.layers.map(layer => { - return layer.pages.forEach(page => { - if((page.target === canvas.id) && page.id.startsWith(process.env.RERUMIDPREFIX) ) { - const annotationPage = { - id: page.id, - type: "AnnotationPage" - } - annotationPages.push(annotationPage) - } - }) - }) - ) - annotationPages.length > 0 && (canvasItems.annotations = await this.getAnnotations({ annotations: annotationPages })) return canvasItems } catch (error) { console.error(`Error processing layer:`, error) From e4e480bbba8dcc804786cfd4f5d2dee5a01ca1ab Mon Sep 17 00:00:00 2001 From: cubap Date: Mon, 10 Nov 2025 16:59:47 -0600 Subject: [PATCH 200/262] how we feeling? --- __tests__/smoke.test.js | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/__tests__/smoke.test.js b/__tests__/smoke.test.js index ad6bdf9b..4f63d730 100644 --- a/__tests__/smoke.test.js +++ b/__tests__/smoke.test.js @@ -44,8 +44,8 @@ async function runCheck(name, fn) { } } -// One Jest test that runs all smoke checks and asserts none failed -test('post-deployment smoke checks', async () => { +// Main smoke check function that can run standalone or in Jest +async function runSmokeChecks() { const checks = [] // Root endpoint returns expected content @@ -88,8 +88,32 @@ test('post-deployment smoke checks', async () => { const failed = checks.filter(c => !c.ok) if (failed.length > 0) { - // Fail the Jest test and print details const msg = failed.map(f => `${f.name}: ${f.error}`).join('\n') throw new Error(`Smoke tests failed:\n${msg}`) } -}, 30000) // set a longer timeout for the whole test if needed + + return { total: checks.length, passed: checks.length - failed.length, failed: failed.length } +} + +// If running standalone (node script), execute and exit with appropriate code +// Check if this file is being run directly (not imported by Jest) +const isRunningStandalone = import.meta.url.endsWith(process.argv[1].replace(/\\/g, '/')) +if (isRunningStandalone || (typeof test === 'undefined' && process.argv[1]?.includes('smoke.test.js'))) { + console.log('Running smoke tests...') + runSmokeChecks() + .then(result => { + console.log(`✓ All ${result.total} smoke checks passed`) + process.exit(0) + }) + .catch(err => { + console.error('✗ Smoke tests failed:', err.message) + process.exit(1) + }) +} + +// If running in Jest, wrap in a test +if (typeof test !== 'undefined') { + test('post-deployment smoke checks', async () => { + await runSmokeChecks() + }, 30000) // set a longer timeout for the whole test if needed +} From 5e88be00125db8ade28d725c9ebf501878410bb3 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 10 Nov 2025 17:14:02 -0600 Subject: [PATCH 201/262] Links into RERUM APIs and code and the TPEN3 home page. --- .claude/CLAUDE.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md index c7f7d28d..0b37956e 100644 --- a/.claude/CLAUDE.md +++ b/.claude/CLAUDE.md @@ -1,6 +1,6 @@ # CLAUDE.md -This file provides guidance to Ai Assistants when working with code in this repository. There is also a .github/copilot-instructions.md file. +This file provides guidance to AI Assistants when working with code in this repository. There is also a .github/copilot-instructions.md file. ## Project Overview @@ -210,6 +210,9 @@ kill %1 # Stop the background server - [TPEN3 Services API](https://dev.api.t-pen.org) - [TPEN3 Services GitHub](https://github.com/CenterForDigitalHumanities/TPEN-services) - [TPEN3 Interfaces GitHub](https://github.com/CenterForDigitalHumanities/TPEN-interfaces) +- [RERUM API Docs](https://store.rerum.io/v1/API.html) +- [RERUM API GitHub](https://github.com/CenterForDigitalHumanities/rerum_server_nodejs/) +- [TPEN3 Homepage](https://three.t-pen.org) ## Additional Developer Preferences for AI Assistants @@ -218,7 +221,7 @@ kill %1 # Stop the background server - Explain what changed and why. - Stop before committing. The developer will decide at what point to commit changes on their own. You do not need to keep track of it. 2. No auto compacting. We will compact ourselves if the context gets too big. -3. When creating documentation do not add Claude as an @author. +3. When creating documentation do not add any AI as an @author. 4. Preference using current libraries and native javascript/ExpressJS/Node capabilities instead of installing new npm packages to solve a problem. - However, we understand that sometimes we need a package or a package is perfectly designed to solve our problem. Ask if we want to use them in these cases. 5. We like colors in our terminals! Be diverse and color text in the terminal for the different purposes of the text. (ex. errors red, success green, logs bold white, etc.) From 4fc333923ed8f637aa5ba6694e46d2f0dde2504b Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 09:48:15 -0600 Subject: [PATCH 202/262] Fix PM2 cluster mode environment variable loading (#379) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: - When running with `pm2 start` in cluster mode, Node.js 22's --env-file flag was not being passed - This caused all process.env variables to be undefined, breaking database connections and app configuration - The issue only occurred in PM2 deployments; npm start worked correctly Solution: - Created ecosystem.config.js to configure PM2 with proper node_args - Added --env-file=config.env --env-file=.env flags to node_args - Updated CI/CD workflows (cd_dev.yaml and cd_prod.yaml) to use ecosystem config - Configured separate development and production environments Changes: - NEW: ecosystem.config.js - PM2 configuration with cluster mode and env loading - UPDATED: .github/workflows/cd_dev.yaml - Use ecosystem config for development deployment - UPDATED: .github/workflows/cd_prod.yaml - Use ecosystem config for production deployment Testing: - Local: pm2 start ecosystem.config.js --env development - Verify env variables load: process.env values should be defined from config.env and .env 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude --- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- ecosystem.config.js | 43 ++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 ecosystem.config.js diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index 4d64f74e..96655203 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -80,7 +80,7 @@ jobs: git checkout development git pull npm install - pm2 -s start -i max bin/tpen3_services.js + pm2 start ecosystem.config.js --env development - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 0e1675c6..5754a613 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -80,7 +80,7 @@ jobs: git checkout main git pull npm install - pm2 -s start -i max bin/tpen3_services.js + pm2 start ecosystem.config.js --env production - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests diff --git a/ecosystem.config.js b/ecosystem.config.js new file mode 100644 index 00000000..a3df413a --- /dev/null +++ b/ecosystem.config.js @@ -0,0 +1,43 @@ +/** + * PM2 Ecosystem Configuration for TPEN Services + * + * This configuration ensures that Node.js 22's --env-file flag is properly + * passed when running in PM2 cluster mode, allowing config.env and .env + * to be loaded correctly. + * + * Usage: + * pm2 start ecosystem.config.js --env development + * pm2 start ecosystem.config.js --env production + */ + +module.exports = { + apps: [ + { + name: 'tpen3-services', + script: './bin/tpen3_services.js', + instances: 'max', + exec_mode: 'cluster', + node_args: '--env-file=config.env --env-file=.env', + env_development: { + NODE_ENV: 'development' + }, + env_production: { + NODE_ENV: 'production' + }, + // PM2 cluster mode settings + listen_timeout: 10000, + kill_timeout: 5000, + wait_ready: false, + max_memory_restart: '500M', + // Logging + error_file: './logs/pm2-error.log', + out_file: './logs/pm2-out.log', + log_date_format: 'YYYY-MM-DD HH:mm:ss Z', + merge_logs: true, + // Auto-restart settings + autorestart: true, + max_restarts: 10, + min_uptime: '10s' + } + ] +}; From 6ca1faa7c98de2d98bfd597846faedd121396729 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 09:53:36 -0600 Subject: [PATCH 203/262] ftw --- ecosystem.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecosystem.config.js b/ecosystem.config.js index a3df413a..4e3750da 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.js @@ -10,7 +10,7 @@ * pm2 start ecosystem.config.js --env production */ -module.exports = { +export default { apps: [ { name: 'tpen3-services', From a2d2940b4a5ffba1094c445eb2a92b6ff4890c0f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 09:57:40 -0600 Subject: [PATCH 204/262] The file --- ecosystem.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecosystem.config.js b/ecosystem.config.js index 4e3750da..d2bbed52 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.js @@ -6,11 +6,11 @@ * to be loaded correctly. * * Usage: - * pm2 start ecosystem.config.js --env development - * pm2 start ecosystem.config.js --env production + * pm2 start ecosystem.config.cjs --env development + * pm2 start ecosystem.config.cjs --env production */ -export default { +module.exports = { apps: [ { name: 'tpen3-services', From 6ad60f1e66d763f941c58ba12a9186a0182c614f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 09:59:04 -0600 Subject: [PATCH 205/262] cmon --- ecosystem.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecosystem.config.js b/ecosystem.config.js index d2bbed52..4e3750da 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.js @@ -6,11 +6,11 @@ * to be loaded correctly. * * Usage: - * pm2 start ecosystem.config.cjs --env development - * pm2 start ecosystem.config.cjs --env production + * pm2 start ecosystem.config.js --env development + * pm2 start ecosystem.config.js --env production */ -module.exports = { +export default { apps: [ { name: 'tpen3-services', From 2bd67577262dd4f5ded9da9e18ec38ef6b8027ab Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 10:21:57 -0600 Subject: [PATCH 206/262] redo with human --- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- ecosystem.config.js | 43 ---------------------------------- ecosystem.config.json | 29 +++++++++++++++++++++++ 4 files changed, 31 insertions(+), 45 deletions(-) delete mode 100644 ecosystem.config.js create mode 100644 ecosystem.config.json diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index 96655203..62943212 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -80,7 +80,7 @@ jobs: git checkout development git pull npm install - pm2 start ecosystem.config.js --env development + pm2 -s start -i max ecosystem.config.json --env development - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 5754a613..ae3b247a 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -80,7 +80,7 @@ jobs: git checkout main git pull npm install - pm2 start ecosystem.config.js --env production + pm2 -s start -i max ecosystem.config.json --env production - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests diff --git a/ecosystem.config.js b/ecosystem.config.js deleted file mode 100644 index 4e3750da..00000000 --- a/ecosystem.config.js +++ /dev/null @@ -1,43 +0,0 @@ -/** - * PM2 Ecosystem Configuration for TPEN Services - * - * This configuration ensures that Node.js 22's --env-file flag is properly - * passed when running in PM2 cluster mode, allowing config.env and .env - * to be loaded correctly. - * - * Usage: - * pm2 start ecosystem.config.js --env development - * pm2 start ecosystem.config.js --env production - */ - -export default { - apps: [ - { - name: 'tpen3-services', - script: './bin/tpen3_services.js', - instances: 'max', - exec_mode: 'cluster', - node_args: '--env-file=config.env --env-file=.env', - env_development: { - NODE_ENV: 'development' - }, - env_production: { - NODE_ENV: 'production' - }, - // PM2 cluster mode settings - listen_timeout: 10000, - kill_timeout: 5000, - wait_ready: false, - max_memory_restart: '500M', - // Logging - error_file: './logs/pm2-error.log', - out_file: './logs/pm2-out.log', - log_date_format: 'YYYY-MM-DD HH:mm:ss Z', - merge_logs: true, - // Auto-restart settings - autorestart: true, - max_restarts: 10, - min_uptime: '10s' - } - ] -}; diff --git a/ecosystem.config.json b/ecosystem.config.json new file mode 100644 index 00000000..056c12b6 --- /dev/null +++ b/ecosystem.config.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://json.schemastore.org/pm2-ecosystem.json", + "apps": [ + { + "name": "tpen3-services", + "script": "./bin/tpen3_services.js", + "instances": "max", + "exec_mode": "cluster", + "node_args": "--env-file=config.env --env-file=.env", + "env_development": { + "NODE_ENV": "development" + }, + "env_production": { + "NODE_ENV": "production" + }, + "listen_timeout": 10000, + "kill_timeout": 5000, + "wait_ready": false, + "max_memory_restart": "500M", + "error_file": "./logs/pm2-error.log", + "out_file": "./logs/pm2-out.log", + "log_date_format": "YYYY-MM-DD HH:mm:ss Z", + "merge_logs": true, + "autorestart": true, + "max_restarts": 10, + "min_uptime": "10s" + } + ] +} From ca5f25cc5e3840820067c8c9ab8c59c19bb4d90b Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 10:28:38 -0600 Subject: [PATCH 207/262] cleanup --- ecosystem.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecosystem.config.json b/ecosystem.config.json index 056c12b6..11582e55 100644 --- a/ecosystem.config.json +++ b/ecosystem.config.json @@ -2,7 +2,7 @@ "$schema": "https://json.schemastore.org/pm2-ecosystem.json", "apps": [ { - "name": "tpen3-services", + "name": "tpen3_services", "script": "./bin/tpen3_services.js", "instances": "max", "exec_mode": "cluster", From 037046924d20ff7043c6667be5be1590b940164c Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 10:42:42 -0600 Subject: [PATCH 208/262] cleanup --- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index 62943212..b16102f1 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -80,7 +80,7 @@ jobs: git checkout development git pull npm install - pm2 -s start -i max ecosystem.config.json --env development + pm2 start ecosystem.config.json --env development - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index ae3b247a..9f62a0b0 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -80,7 +80,7 @@ jobs: git checkout main git pull npm install - pm2 -s start -i max ecosystem.config.json --env production + pm2 start ecosystem.config.json --env production - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests From 5662474a603e829f4fa8a3efb20332334bbf9edc Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 13:38:01 -0600 Subject: [PATCH 209/262] Let's see how RHEL feels about this (#380) * Let's see how RHEL feels about this * ok now be good * cleanup --- .claude/CLAUDE.md | 16 ++++---- .github/copilot-instructions.md | 7 ++-- .gitignore | 1 - CONFIG.md | 9 +++-- README.md | 7 ++-- config.env | 7 ++-- ecosystem.config.json | 2 +- env-loader.js | 65 +++++++++++++++++++++++++++++++++ package-lock.json | 19 +++++++++- package.json | 27 +++++++------- 10 files changed, 124 insertions(+), 36 deletions(-) create mode 100644 env-loader.js diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md index 0b37956e..8d2b8fa1 100644 --- a/.claude/CLAUDE.md +++ b/.claude/CLAUDE.md @@ -11,7 +11,7 @@ Always reference these instructions first and fallback to search or bash command ## Working Effectively ### Bootstrap, Build, and Test the Repository -- Copy environment configuration: `cp sample.env .env` +- Copy environment configuration: `cp .env.development .env` - Install dependencies: `npm install` -- takes up to 20 seconds. NEVER CANCEL. Set timeout to 60+ seconds. - Run unit tests: `npm run unitTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. - Run existence tests: `npm run existsTests` -- takes 7 seconds. NEVER CANCEL. Set timeout to 30+ seconds. @@ -27,7 +27,7 @@ Always reference these instructions first and fallback to search or bash command - Node.js >= 22.20.0 - MongoDB (for database tests and full functionality) - MariaDB (for database tests and full functionality) -- Copy `sample.env` to `.env` for basic functionality +- Copy `.env.development` to `.env` for basic functionality - For full functionality, configure database connection strings in `.env` ## Validation @@ -63,7 +63,9 @@ Always reference these instructions first and fallback to search or bash command ├── bin/tpen3_services.js # Server entry point ├── package.json # Dependencies and scripts ├── jest.config.js # Test configuration -├── sample.env # Environment template +├── config.env # Safe defaults (committed) +├── .env.development # Development template +├── .env.production # Production template ├── API.md # API documentation ├── classes/ # Domain model classes │ ├── Project/ # Project management @@ -106,10 +108,10 @@ Always reference these instructions first and fallback to search or bash command - MongoDB: Configure MONGODB and MONGODBNAME in `.env` - MariaDB: Configure MARIADB, MARIADBNAME, MARIADBUSER, MARIADBPASSWORD in `.env` - TinyPEN API: Configure TINYPEN in `.env` -- Default configurations in `sample.env` point to development services +- Default configurations in `config.env` point to localhost development services ### Development Workflow -1. Always start with: `cp sample.env .env && npm install` +1. Always start with: `cp .env.development .env && npm install` 2. Make code changes 3. Test with: `npm run existsTests` (fast, database-independent) 4. For database changes: ensure MongoDB/MariaDB running, then `npm run dbTests` @@ -168,7 +170,7 @@ After making changes, always validate: ### Complete Validation Workflow Example ```bash # Basic setup -cp sample.env .env +cp .env.development .env npm install # Test core functionality without databases @@ -190,7 +192,7 @@ kill %1 # Stop the background server - Database controllers: `database/mongo/controller.js`, `database/maria/controller.js` - Authentication middleware: `auth/index.js` - Domain models: `classes/[Entity]/[Entity].js` -- Configuration: `sample.env` (template), `.env` (local config) +- Configuration: `config.env` (safe defaults), `.env.development` and `.env.production` (templates), `.env` (local config, gitignored) ### Dependencies and Versions - Express.js for REST API framework diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index ec8ae3d3..dadeca69 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -30,7 +30,7 @@ Always reference these instructions first and fallback to search or bash command ### Environment Configuration -TPEN Services uses a layered configuration approach with Node.js's native `--env-file` flag: +TPEN Services uses a layered configuration approach with `--import ./env-loader.js` using the dotenv package: - `config.env` - Safe defaults (committed to repo, no secrets) - Works out-of-the-box for local Docker/MongoDB/MariaDB @@ -47,10 +47,11 @@ TPEN Services uses a layered configuration approach with Node.js's native `--env - Contains actual secrets and environment-specific values - Overrides values from `config.env` -Configuration loading order (via Node.js's native `--env-file` flag): +Configuration loading order (via `--import ./env-loader.js` using the dotenv package): 1. `config.env` is loaded first (provides safe defaults) -2. `.env` is loaded second (overrides with environment-specific values) +2. `.env.{NODE_ENV}` is loaded second (environment-specific: .env.development, .env.production, .env.test) +3. `.env` is loaded last (local/server overrides - HIGHEST PRIORITY) This allows developers to work immediately with sensible defaults while keeping secrets out of the repository. diff --git a/.gitignore b/.gitignore index f7a2e708..9cc17f85 100644 --- a/.gitignore +++ b/.gitignore @@ -130,5 +130,4 @@ dist .pnp.* # TPEN-services additions -.env .vscode diff --git a/CONFIG.md b/CONFIG.md index 8bb4a928..6d6c2738 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -2,7 +2,7 @@ ## Configuration Architecture -TPEN Services uses a layered configuration approach to separate safe defaults from environment-specific secrets. Configuration is loaded using Node.js's native `--env-file` flag (Node.js 22+): +TPEN Services uses a layered configuration approach to separate safe defaults from environment-specific secrets. Configuration is loaded using `--import ./env-loader.js` with the dotenv package: 1. **`config.env`** (committed) - Safe defaults for development 2. **`.env`** (gitignored) - Environment-specific overrides @@ -47,10 +47,11 @@ cp .env.production .env # Optional: Database connections, SMTP, etc. ``` -The application loads configuration via Node.js's native `--env-file` flag in this order: +The application loads configuration via `--import ./env-loader.js` using the dotenv package in this order: -1. `config.env` - provides defaults -2. `.env` - overrides with environment-specific values +1. `config.env` - provides safe defaults +2. `.env.{NODE_ENV}` - environment-specific overrides (.env.development, .env.production, .env.test) +3. `.env` - local/server overrides (HIGHEST PRIORITY) ### What Goes Where? diff --git a/README.md b/README.md index 12d43c6d..48ef6d3d 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Services required by TPEN interfaces in order to interact with data. ### Configuration Files -TPEN Services uses a layered configuration approach with Node.js's native `--env-file` flag: +TPEN Services uses a layered configuration approach with `--import ./env-loader.js` using the dotenv package: - **`config.env`** - Safe defaults, committed to repository - Works out-of-the-box for local Docker/MongoDB/MariaDB @@ -58,10 +58,11 @@ TPEN Services uses a layered configuration approach with Node.js's native `--env - Contains your specific settings and secrets - Overrides values from `config.env` -Configuration is loaded via Node.js's native `--env-file` flag (Node.js 22+): +Configuration is loaded via `--import ./env-loader.js` using the dotenv package: 1. `config.env` is loaded first (provides safe defaults) -2. `.env` is loaded second (overrides with environment-specific values) +2. `.env.{NODE_ENV}` is loaded second (environment-specific: .env.development, .env.production, .env.test) +3. `.env` is loaded last (local/server overrides - HIGHEST PRIORITY) ### Environment Variables diff --git a/config.env b/config.env index 86f3b50f..4bb83fc9 100644 --- a/config.env +++ b/config.env @@ -7,9 +7,10 @@ # 2. Copy .env.production to .env for production # 3. Edit .env with environment-specific values # -# Configuration is loaded via Node.js's native --env-file flag (Node.js 22+): -# 1. config.env is loaded first (this file) -# 2. .env is loaded second (overrides these defaults) +# Configuration is loaded via env-loader.js using the dotenv package: +# 1. config.env is loaded first (this file - safe defaults) +# 2. .env.{NODE_ENV} is loaded second (environment-specific: .env.development, .env.production, .env.test) +# 3. .env is loaded last (local/server overrides - HIGHEST PRIORITY) # Server Configuration PORT=3011 diff --git a/ecosystem.config.json b/ecosystem.config.json index 11582e55..0e4d18c9 100644 --- a/ecosystem.config.json +++ b/ecosystem.config.json @@ -6,7 +6,7 @@ "script": "./bin/tpen3_services.js", "instances": "max", "exec_mode": "cluster", - "node_args": "--env-file=config.env --env-file=.env", + "node_args": "--import ./env-loader.js", "env_development": { "NODE_ENV": "development" }, diff --git a/env-loader.js b/env-loader.js new file mode 100644 index 00000000..bd95f118 --- /dev/null +++ b/env-loader.js @@ -0,0 +1,65 @@ +/** + * Environment Variable Loader + * + * Preloads environment variables before application starts. + * Uses --import flag to guarantee execution before any other imports. + * + * ENVIRONMENT VARIABLE LOADING PRIORITY (lowest to highest): + * 1. config.env - Safe defaults for all environments (committed) + * 2. .env.{NODE_ENV} - Environment-specific (.env.development, .env.production) (committed) + * 3. .env - Local/server secrets and overrides (gitignored) ← HIGHEST PRIORITY + * + * Each level overrides values from levels above it. + * + * FOR LOCAL DEVELOPMENT: + * - Create a .env file with your local database connections, API keys, etc. + * - .env is gitignored and will override ALL other environment files + * - Never commit .env - it contains your personal/local settings + * + * FOR SERVERS (Production/Development): + * - Server .env files contain production/staging database URLs and secrets + * - .env overrides committed .env.production or .env.development values + * - No need to rename existing .env files on servers + * + * FOR TESTING: + * - Tests run with NODE_ENV='test' by default + * - Your local .env overrides will apply to tests + * - Ensures tests use your local database connections + * + * COMMITTED FILES (in git): + * - config.env ✓ Safe defaults for all environments + * - .env.development ✓ Development environment settings + * - .env.production ✓ Production environment settings + * + * GITIGNORED FILES (local/server only): + * - .env ✗ Your personal/server secrets (HIGHEST PRIORITY) + * + * VIEWING OUTPUT LOGS: + * When running under PM2, env-loader.js output appears in PM2's system logs + * (~/.pm2/pm2.log), NOT in application logs (./logs/pm2-out.log), because + * this module executes BEFORE the application starts. + * + * To view env-loader output: + * - PM2 system logs: pm2 logs --lines 50 --nostream + * - Application logs: tail -f ./logs/pm2-out.log + */ + +import dotenv from 'dotenv' +import { existsSync } from 'fs' + +const env = process.env.NODE_ENV || 'development' + +// Load in priority order (later files override earlier ones) +const files = [ + './config.env', // 1. Base defaults (lowest priority) + `./.env.${env}`, // 2. Environment-specific (.env.development, .env.production, .env.test) + './.env' // 3. Local/server overrides (HIGHEST PRIORITY) +] + +files.forEach(file => { + if (existsSync(file)) { + dotenv.config({ path: file, override: true }) + } +}) + +console.log(`✓ Environment loaded: ${env}`) diff --git a/package-lock.json b/package-lock.json index 3513a085..a717668e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "cors": "^2.8.5", "debug": "^4.4.3", "dompurify": "^3.2.7", + "dotenv": "^17.2.3", "express": "^5.1.0", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "~1.6.1", @@ -119,6 +120,7 @@ "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", @@ -668,6 +670,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -712,6 +715,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -797,6 +801,7 @@ "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", "license": "MIT", + "peer": true, "dependencies": { "@types/geojson": "^7946.0.10" } @@ -2115,6 +2120,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.9", "caniuse-lite": "^1.0.30001746", @@ -2702,6 +2708,18 @@ "@types/trusted-types": "^2.0.7" } }, + "node_modules/dotenv": { + "version": "17.2.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", + "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -4881,7 +4899,6 @@ } ], "license": "MIT", - "peer": true, "bin": { "nanoid": "bin/nanoid.cjs" }, diff --git a/package.json b/package.json index 6afacbde..8d5c59ad 100644 --- a/package.json +++ b/package.json @@ -19,18 +19,18 @@ "author": "Research Computing Group (https://slu.edu)", "repository": "github:CenterForDigitalHumanities/rerum_server_nodejs", "scripts": { - "start": "node --env-file=config.env --env-file=.env ./bin/tpen3_services.js", - "dev": "nodemon --env-file=config.env --env-file=.env ./bin/tpen3_services.js", - "allTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.all.config.js", - "unitTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", - "E2Etests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t e2e ", - "existsTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t exists_unit ", - "functionsTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t functions_unit ", - "dbTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t db ", - "authTest": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t auth_test ", - "userClassTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t user_class ", - "importTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t importTests ", - "inviteMemberTests": "node --env-file=config.env --env-file=.env --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " + "start": "node --import ./env-loader.js ./bin/tpen3_services.js", + "dev": "nodemon --import ./env-loader.js ./bin/tpen3_services.js", + "allTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.all.config.js", + "unitTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", + "E2Etests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t e2e ", + "existsTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t exists_unit ", + "functionsTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t functions_unit ", + "dbTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t db ", + "authTest": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t auth_test ", + "userClassTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t user_class ", + "importTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t importTests ", + "inviteMemberTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " }, "dependencies": { "@iiif/helpers": "^1.5.3", @@ -38,6 +38,7 @@ "cors": "^2.8.5", "debug": "^4.4.3", "dompurify": "^3.2.7", + "dotenv": "^17.2.3", "express": "^5.1.0", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "~1.6.1", @@ -52,8 +53,8 @@ "tpen3-services": "file:" }, "devDependencies": { - "jest": "^30.2.0", "@jest/globals": "^30.2.0", + "jest": "^30.2.0", "nodemon": "^3.1.10", "sinon": "^21.0.0", "supertest": "^7.1.4" From 6f86b7f6d17a843c93df0c0ab01d5bdce374fe43 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 14:16:05 -0600 Subject: [PATCH 210/262] ah I see probably still need dotenv here in the app.js --- app.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app.js b/app.js index 36e127f7..d8036125 100644 --- a/app.js +++ b/app.js @@ -21,6 +21,8 @@ import userProfileRouter from './userProfile/index.js' import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' import feedbackRouter from './feedback/feedbackRoutes.js' +import dotenv from 'dotenv' +let storedEnv = dotenv.config() let app = express() From f50439b8ff350ca6f3b0b40941e712b1cb6c8ee9 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 14:21:42 -0600 Subject: [PATCH 211/262] get them .env vars back cmon --- app.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index d8036125..ff33138b 100644 --- a/app.js +++ b/app.js @@ -22,7 +22,9 @@ import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' import feedbackRouter from './feedback/feedbackRoutes.js' import dotenv from 'dotenv' -let storedEnv = dotenv.config() +import dotenvExpand from 'dotenv-expand' + +dotenvExpand.expand(dotenv.config()) let app = express() From fc37141d681f99fc141d5ae37c762815a6df8cf7 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 14:28:36 -0600 Subject: [PATCH 212/262] trying --- env-loader.js | 2 ++ jest.all.config.js | 18 +++++++++--------- package.json | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/env-loader.js b/env-loader.js index bd95f118..01e32315 100644 --- a/env-loader.js +++ b/env-loader.js @@ -58,6 +58,8 @@ const files = [ files.forEach(file => { if (existsSync(file)) { + console.log("Applying env") + console.log(file) dotenv.config({ path: file, override: true }) } }) diff --git a/jest.all.config.js b/jest.all.config.js index 3cb050af..3657aa96 100644 --- a/jest.all.config.js +++ b/jest.all.config.js @@ -1,11 +1,11 @@ -import base from './jest.config.js' +// import base from './jest.config.js' -const config = { - ...base, - testPathIgnorePatterns: [ - ...(base.testPathIgnorePatterns || []), - '/__tests__/smoke.test.js' - ] -} +// const config = { +// ...base, +// testPathIgnorePatterns: [ +// ...(base.testPathIgnorePatterns || []), +// '/__tests__/smoke.test.js' +// ] +// } -export { config as default } +// export { config as default } diff --git a/package.json b/package.json index 8d5c59ad..22cf715c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "scripts": { "start": "node --import ./env-loader.js ./bin/tpen3_services.js", "dev": "nodemon --import ./env-loader.js ./bin/tpen3_services.js", - "allTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.all.config.js", + "allTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js", "unitTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", "E2Etests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t e2e ", "existsTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t exists_unit ", From 37c865448a652ed1319dc4a3ed1a0aec55b01180 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 14:35:07 -0600 Subject: [PATCH 213/262] Ok then let's have you do it like before --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 22cf715c..9bfb3c85 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "author": "Research Computing Group (https://slu.edu)", "repository": "github:CenterForDigitalHumanities/rerum_server_nodejs", "scripts": { - "start": "node --import ./env-loader.js ./bin/tpen3_services.js", + "start_want": "node --import ./env-loader.js ./bin/tpen3_services.js", + "start" :"node ./bin/tpen3_services.js", "dev": "nodemon --import ./env-loader.js ./bin/tpen3_services.js", "allTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js", "unitTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", From c6324a03c83a8647a3d6c782fc1e0c0ae79fe579 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 14:45:00 -0600 Subject: [PATCH 214/262] Debug logs --- database/mongo/controller.js | 8 ++++++-- database/tiny/controller.js | 4 ++-- env-loader.js | 3 ++- package.json | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/database/mongo/controller.js b/database/mongo/controller.js index 5abe1e7a..f169d079 100644 --- a/database/mongo/controller.js +++ b/database/mongo/controller.js @@ -6,6 +6,9 @@ * https://github.com/thehabes */ +import dotenv from "dotenv" +let storedEnv = dotenv.config() + import {MongoClient, ObjectId} from "mongodb" let err_out = Object.assign(new Error(), { status: 123, @@ -28,6 +31,7 @@ class DatabaseController { * */ async connect() { try { + console.log(`Connect to mongodb client ${process.env.MONGODB}`) this.client = new MongoClient(process.env.MONGODB) this.db = this.client.db(process.env.MONGODBNAME) await this.client.connect() @@ -36,8 +40,8 @@ class DatabaseController { return } catch (err) { console.error("MongoDB Connection Failed") - console.error(process.env.MONGODB) - console.error(err) + // console.error(process.env.MONGODB) + // console.error(err) throw err } } diff --git a/database/tiny/controller.js b/database/tiny/controller.js index 842e1f0c..80a41d3a 100644 --- a/database/tiny/controller.js +++ b/database/tiny/controller.js @@ -19,8 +19,8 @@ class DatabaseController { this.URLS.OVERWRITE = process.env.TINYPEN+"overwrite" this.URLS.QUERY = process.env.TINYPEN+"query" this.URLS.DELETE = process.env.TINYPEN+"delete" - console.log("TINY API established") - console.log(this.URLS) + // console.log("TINY API established") + // console.log(this.URLS) } /** diff --git a/env-loader.js b/env-loader.js index 01e32315..0049a89a 100644 --- a/env-loader.js +++ b/env-loader.js @@ -55,7 +55,8 @@ const files = [ `./.env.${env}`, // 2. Environment-specific (.env.development, .env.production, .env.test) './.env' // 3. Local/server overrides (HIGHEST PRIORITY) ] - +console.log("loop files") +console.log("files") files.forEach(file => { if (existsSync(file)) { console.log("Applying env") diff --git a/package.json b/package.json index 9bfb3c85..6bad74bd 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "author": "Research Computing Group (https://slu.edu)", "repository": "github:CenterForDigitalHumanities/rerum_server_nodejs", "scripts": { - "start_want": "node --import ./env-loader.js ./bin/tpen3_services.js", - "start" :"node ./bin/tpen3_services.js", + "start": "node --import ./env-loader.js ./bin/tpen3_services.js", + "start_works" :"node ./bin/tpen3_services.js", "dev": "nodemon --import ./env-loader.js ./bin/tpen3_services.js", "allTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js", "unitTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", From e557882874f975ff3fee69e7b17872aac483d260 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 14:53:57 -0600 Subject: [PATCH 215/262] Verified I can get it to work the old way, so take steps towards the new way --- app.js | 6 +++--- env-loader.js | 18 +++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app.js b/app.js index ff33138b..9e277ff5 100644 --- a/app.js +++ b/app.js @@ -22,9 +22,9 @@ import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' import feedbackRouter from './feedback/feedbackRoutes.js' import dotenv from 'dotenv' -import dotenvExpand from 'dotenv-expand' - -dotenvExpand.expand(dotenv.config()) +// import dotenvExpand from 'dotenv-expand' +dotenv.config() +// dotenvExpand.expand(dotenv.config()) let app = express() diff --git a/env-loader.js b/env-loader.js index 0049a89a..07c0b384 100644 --- a/env-loader.js +++ b/env-loader.js @@ -46,21 +46,25 @@ import dotenv from 'dotenv' import { existsSync } from 'fs' +import { fileURLToPath } from 'url' +import { dirname, join } from 'path' + +// Get the directory where this file lives (absolute path) +const __filename = fileURLToPath(import.meta.url) +const __dirname = dirname(__filename) const env = process.env.NODE_ENV || 'development' // Load in priority order (later files override earlier ones) +// Using absolute paths to ensure they work in PM2 cluster mode on RHEL const files = [ - './config.env', // 1. Base defaults (lowest priority) - `./.env.${env}`, // 2. Environment-specific (.env.development, .env.production, .env.test) - './.env' // 3. Local/server overrides (HIGHEST PRIORITY) + join(__dirname, 'config.env'), // 1. Base defaults (lowest priority) + join(__dirname, `.env.${env}`), // 2. Environment-specific (.env.development, .env.production, .env.test) + join(__dirname, '.env') // 3. Local/server overrides (HIGHEST PRIORITY) ] -console.log("loop files") -console.log("files") + files.forEach(file => { if (existsSync(file)) { - console.log("Applying env") - console.log(file) dotenv.config({ path: file, override: true }) } }) From b7b3b2de9866bee1007375423e5530c6e99e4d4a Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 14:58:04 -0600 Subject: [PATCH 216/262] closer, logs are being weird though. --- ecosystem.config.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/ecosystem.config.json b/ecosystem.config.json index 0e4d18c9..7b1e2f54 100644 --- a/ecosystem.config.json +++ b/ecosystem.config.json @@ -17,8 +17,6 @@ "kill_timeout": 5000, "wait_ready": false, "max_memory_restart": "500M", - "error_file": "./logs/pm2-error.log", - "out_file": "./logs/pm2-out.log", "log_date_format": "YYYY-MM-DD HH:mm:ss Z", "merge_logs": true, "autorestart": true, From 9cd1bd188ba96ee25d4195208b716d668f15bb8b Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:07:50 -0600 Subject: [PATCH 217/262] paths maybe? --- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- app.js | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index b16102f1..b790a3ae 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -80,7 +80,7 @@ jobs: git checkout development git pull npm install - pm2 start ecosystem.config.json --env development + pm2 start ecosystem.config.json --env development --cwd . - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 9f62a0b0..be23df7a 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -80,7 +80,7 @@ jobs: git checkout main git pull npm install - pm2 start ecosystem.config.json --env production + pm2 start ecosystem.config.json --env production --cwd . - name: Wait for service to be ready run: sleep 5 - name: Run smoke tests diff --git a/app.js b/app.js index 9e277ff5..744abfce 100644 --- a/app.js +++ b/app.js @@ -22,9 +22,8 @@ import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' import feedbackRouter from './feedback/feedbackRoutes.js' import dotenv from 'dotenv' -// import dotenvExpand from 'dotenv-expand' -dotenv.config() -// dotenvExpand.expand(dotenv.config()) +import dotenvExpand from 'dotenv-expand' +dotenvExpand.expand(dotenv.config()) let app = express() From ae0e2da567c0b24a7b02fbc55d6efc2e4f09f3af Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:18:50 -0600 Subject: [PATCH 218/262] stick a fork in it --- ecosystem.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecosystem.config.json b/ecosystem.config.json index 7b1e2f54..512fef75 100644 --- a/ecosystem.config.json +++ b/ecosystem.config.json @@ -5,7 +5,7 @@ "name": "tpen3_services", "script": "./bin/tpen3_services.js", "instances": "max", - "exec_mode": "cluster", + "exec_mode": "fork", "node_args": "--import ./env-loader.js", "env_development": { "NODE_ENV": "development" From c559c374ebbecf2e77c93de27ddad696f8a9d185 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:20:31 -0600 Subject: [PATCH 219/262] stick a fork in it --- ecosystem.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecosystem.config.json b/ecosystem.config.json index 512fef75..6bc61ccc 100644 --- a/ecosystem.config.json +++ b/ecosystem.config.json @@ -4,7 +4,7 @@ { "name": "tpen3_services", "script": "./bin/tpen3_services.js", - "instances": "max", + "instances": "1", "exec_mode": "fork", "node_args": "--import ./env-loader.js", "env_development": { From 9767730162a8dc1dde7f7674654f5881cfc59f65 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:27:53 -0600 Subject: [PATCH 220/262] stick a fork in it --- app.js | 3 --- bin/tpen3_services.js | 3 +++ ecosystem.config.json | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app.js b/app.js index 744abfce..36e127f7 100644 --- a/app.js +++ b/app.js @@ -21,9 +21,6 @@ import userProfileRouter from './userProfile/index.js' import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' import feedbackRouter from './feedback/feedbackRoutes.js' -import dotenv from 'dotenv' -import dotenvExpand from 'dotenv-expand' -dotenvExpand.expand(dotenv.config()) let app = express() diff --git a/bin/tpen3_services.js b/bin/tpen3_services.js index bbf1daf3..82f5b427 100644 --- a/bin/tpen3_services.js +++ b/bin/tpen3_services.js @@ -1,5 +1,8 @@ #!/usr/bin/env node +// Load environment variables before anything else +import '../env-loader.js' + /** * Module dependencies. */ diff --git a/ecosystem.config.json b/ecosystem.config.json index 6bc61ccc..38483ea7 100644 --- a/ecosystem.config.json +++ b/ecosystem.config.json @@ -4,9 +4,8 @@ { "name": "tpen3_services", "script": "./bin/tpen3_services.js", - "instances": "1", - "exec_mode": "fork", - "node_args": "--import ./env-loader.js", + "instances": "max", + "exec_mode": "cluster", "env_development": { "NODE_ENV": "development" }, From 59e62a0180b9cb1e61af2bb11244e1a46cae812f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:30:18 -0600 Subject: [PATCH 221/262] I think it works! --- database/mongo/controller.js | 8 ++------ database/tiny/controller.js | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/database/mongo/controller.js b/database/mongo/controller.js index f169d079..5abe1e7a 100644 --- a/database/mongo/controller.js +++ b/database/mongo/controller.js @@ -6,9 +6,6 @@ * https://github.com/thehabes */ -import dotenv from "dotenv" -let storedEnv = dotenv.config() - import {MongoClient, ObjectId} from "mongodb" let err_out = Object.assign(new Error(), { status: 123, @@ -31,7 +28,6 @@ class DatabaseController { * */ async connect() { try { - console.log(`Connect to mongodb client ${process.env.MONGODB}`) this.client = new MongoClient(process.env.MONGODB) this.db = this.client.db(process.env.MONGODBNAME) await this.client.connect() @@ -40,8 +36,8 @@ class DatabaseController { return } catch (err) { console.error("MongoDB Connection Failed") - // console.error(process.env.MONGODB) - // console.error(err) + console.error(process.env.MONGODB) + console.error(err) throw err } } diff --git a/database/tiny/controller.js b/database/tiny/controller.js index 80a41d3a..842e1f0c 100644 --- a/database/tiny/controller.js +++ b/database/tiny/controller.js @@ -19,8 +19,8 @@ class DatabaseController { this.URLS.OVERWRITE = process.env.TINYPEN+"overwrite" this.URLS.QUERY = process.env.TINYPEN+"query" this.URLS.DELETE = process.env.TINYPEN+"delete" - // console.log("TINY API established") - // console.log(this.URLS) + console.log("TINY API established") + console.log(this.URLS) } /** From b160c8d647c723356a6e6f95533b6f47844a4798 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:37:59 -0600 Subject: [PATCH 222/262] Closer --- jest.all.config.js | 11 ----------- package.json | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 jest.all.config.js diff --git a/jest.all.config.js b/jest.all.config.js deleted file mode 100644 index 3657aa96..00000000 --- a/jest.all.config.js +++ /dev/null @@ -1,11 +0,0 @@ -// import base from './jest.config.js' - -// const config = { -// ...base, -// testPathIgnorePatterns: [ -// ...(base.testPathIgnorePatterns || []), -// '/__tests__/smoke.test.js' -// ] -// } - -// export { config as default } diff --git a/package.json b/package.json index 6bad74bd..779d1ffc 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,8 @@ "author": "Research Computing Group (https://slu.edu)", "repository": "github:CenterForDigitalHumanities/rerum_server_nodejs", "scripts": { - "start": "node --import ./env-loader.js ./bin/tpen3_services.js", - "start_works" :"node ./bin/tpen3_services.js", - "dev": "nodemon --import ./env-loader.js ./bin/tpen3_services.js", + "start": "node ./bin/tpen3_services.js", + "dev": "nodemon ./bin/tpen3_services.js", "allTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js", "unitTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t _unit", "E2Etests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t e2e ", From cdfdc180c8706796326e646dba0c750015fb0a0d Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:42:07 -0600 Subject: [PATCH 223/262] stop smoking --- jest.config.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jest.config.js b/jest.config.js index 0890e33e..71145347 100644 --- a/jest.config.js +++ b/jest.config.js @@ -172,9 +172,10 @@ let config = { // ], // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped - // testPathIgnorePatterns: [ - // "\\\\node_modules\\\\" - // ], + testPathIgnorePatterns: [ + "\\\\node_modules\\\\", + "__tests__/smoke.test.js" + ], // The regexp pattern or array of patterns that Jest uses to detect test files // testRegex: [], From 8563249d2bc41c8774dff4a89165e740ed0fa3ca Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:46:03 -0600 Subject: [PATCH 224/262] yaml supports if tpen3_services isn't already registered in pm2 --- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index b790a3ae..4b8477ea 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -75,7 +75,7 @@ jobs: touch /srv/node/logs/tpen3_services.txt fi cd /srv/node/tpen-services/ - pm2 stop tpen3_services + pm2 delete tpen3_services || true git stash git checkout development git pull diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index be23df7a..d4dabf62 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -75,7 +75,7 @@ jobs: touch /srv/node/logs/tpen3_services.txt fi cd /srv/node/tpen-services/ - pm2 stop tpen3_services + pm2 delete tpen3_services || true git stash git checkout main git pull From da30f02ca8d41c64e0fdaf59e4f278cf0980a422 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:58:45 -0600 Subject: [PATCH 225/262] Update env-loader.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- env-loader.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/env-loader.js b/env-loader.js index 07c0b384..4b3dd519 100644 --- a/env-loader.js +++ b/env-loader.js @@ -66,6 +66,9 @@ const files = [ files.forEach(file => { if (existsSync(file)) { dotenv.config({ path: file, override: true }) + console.log(`✓ Loaded environment file: ${file}`) + } else { + console.log(`✗ Missing environment file: ${file}`) } }) From c9d2e1a74b7c570faf3be69b7dc0a3da832e904b Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 11 Nov 2025 15:59:30 -0600 Subject: [PATCH 226/262] Update __tests__/mount.test.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- __tests__/mount.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/__tests__/mount.test.js b/__tests__/mount.test.js index d3cabe98..2a60668d 100644 --- a/__tests__/mount.test.js +++ b/__tests__/mount.test.js @@ -5,7 +5,6 @@ * directly inspecting the Express app's routing table. */ -import request from "supertest" import { jest } from "@jest/globals" import app from "../app.js" import fs from "fs" From a559eb7493049bb0794626ac6309acb82ae6570e Mon Sep 17 00:00:00 2001 From: cubap Date: Wed, 12 Nov 2025 09:06:46 -0600 Subject: [PATCH 227/262] Update Group.js --- classes/Group/Group.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/classes/Group/Group.js b/classes/Group/Group.js index 4fd3fa21..227fee77 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -90,7 +90,7 @@ export default class Group { roles = roles.split(" ") } - washRoles(roles) + roles = washRoles(roles) this.data.members[memberId].roles = roles await this.update() } @@ -120,7 +120,7 @@ export default class Group { } roles = roles.split(" ") } - washRoles(roles, allowOwner) + roles = washRoles(roles, allowOwner) this.data.members[memberId].roles = [...new Set([...this.data.members[memberId].roles, ...roles])] } @@ -148,7 +148,7 @@ export default class Group { } roles = roles.split(" ") } - washRoles(roles, allowOwner) + roles = washRoles(roles, allowOwner) const currentRoles = this.data.members[memberId].roles if (currentRoles.length <= 1 && roles.includes(currentRoles[0])) { throw { @@ -281,12 +281,13 @@ function washRoles(roles, allowOwner = false) { message: "Invalid role:" + role } } - role.toUpperCase() + role = role.toUpperCase() if (!allowOwner && role === "OWNER") { throw { status: 400, message: "Cannot assign OWNER role" } } + return role }) } From 2bd64a0f29e5e8b11b6b2b28306c934b05ac644f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 12 Nov 2025 10:03:49 -0600 Subject: [PATCH 228/262] Cleanup (#381) * cleanup * Another pass --- auth/index.js | 22 ------- classes/Group/Group.js | 6 +- classes/Layer/Layer.js | 6 -- classes/Project/Project.js | 3 +- classes/User/User.js | 11 ---- database/tiny/controller.js | 2 +- index.js | 6 +- layer/index.js | 3 +- project/hotkeysRouter.js | 96 ---------------------------- project/memberDeclineInviteRouter.js | 2 +- userProfile/privateProfile.js | 2 +- utilities/getHash.js | 6 -- utilities/removeProperties.js | 30 --------- utilities/shared.js | 42 +----------- 14 files changed, 12 insertions(+), 225 deletions(-) delete mode 100644 project/hotkeysRouter.js delete mode 100644 utilities/getHash.js delete mode 100644 utilities/removeProperties.js diff --git a/auth/index.js b/auth/index.js index b30021e1..702684f4 100644 --- a/auth/index.js +++ b/auth/index.js @@ -1,29 +1,7 @@ -import * as utils from "../utilities/shared.js" import { auth } from "express-oauth2-jwt-bearer" import { extractToken, extractUser, isTokenExpired } from "../utilities/token.js" import User from "../classes/User/User.js" -export function authenticateUser() { - return (req, res, next) => { - let token = extractToken(req.headers.authorization) - if (token) { - if (!isTokenExpired(token, res)) { - let decodedUser = extractUser(token) - if (decodedUser) { - //this block can be modified to check for specific elements (e.g roles, app, permissions...) in the decoded user before passing on. - req.user = decodedUser - next() - } else { - utils.respondWithError(res, 401, "Invalid token") - } - } else { - return utils.respondWithError(res, 401, "Token is expired") - } - } else { - utils.respondWithError(res, 404, "No authorization token found") - } - } -} /** * This function verifies authorization tokens using Auth0 library. to protect a route using this function in a different component: 1. import the function in that component diff --git a/classes/Group/Group.js b/classes/Group/Group.js index 227fee77..5098bfcc 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -281,13 +281,13 @@ function washRoles(roles, allowOwner = false) { message: "Invalid role:" + role } } - role = role.toUpperCase() - if (!allowOwner && role === "OWNER") { + const upperRole = role.toUpperCase() + if (!allowOwner && upperRole === "OWNER") { throw { status: 400, message: "Cannot assign OWNER role" } } - return role + return upperRole }) } diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index aa67f93a..13e869bb 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -102,12 +102,6 @@ export default class Layer { } } - #getPageReference({ id, label, target }) { - label ??= id.split("/").pop() - const resolvedLabel = label.none?.join(", ") ?? label.en?.join(", ") ?? label - return { id, label: resolvedLabel, target } - } - async #saveCollectionToRerum() { const layerAsCollection = { "@context": "http://www.w3.org/ns/anno.jsonld", diff --git a/classes/Project/Project.js b/classes/Project/Project.js index dc40d35e..43f9ce22 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -3,7 +3,6 @@ import { sendMail } from "../../utilities/mailer/index.js" import { validateProjectPayload } from "../../utilities/validatePayload.js" import { isNotValidName, isNotValidValue } from "../../utilities/validateNameValue.js" import User from "../User/User.js" -import { createHash } from "node:crypto" import Group from "../Group/Group.js" const database = new dbDriver("mongo") @@ -226,7 +225,7 @@ export default class Project { * @returns {Promise} - A promise that resolves to the updated object after the changes have been saved. * * @example - * const newMetadata = [{ label: 'Description'}{value: 'Updated description' }]; + * const newMetadata = [{ label: 'Description', value: 'Updated description' }]; * await instance.updateMetadata(newMetadata); * console.log(instance.data.metadata); // Outputs: { title: 'New Title', description: 'Updated description' } * diff --git a/classes/User/User.js b/classes/User/User.js index 16cc9f1c..5c076624 100644 --- a/classes/User/User.js +++ b/classes/User/User.js @@ -180,15 +180,4 @@ export default class User { return userProjects }) } - async addPublicInfo(data) { - // add or modify public info - if (!data) return - const previousUser = this.data - const publicProfile = { ...previousUser.profile, ...data } - const updatedUser = await database.update({ - ...previousUser, - profile: publicProfile - }, "User") - return updatedUser - } } diff --git a/database/tiny/controller.js b/database/tiny/controller.js index 842e1f0c..09c9313b 100644 --- a/database/tiny/controller.js +++ b/database/tiny/controller.js @@ -58,7 +58,7 @@ class DatabaseController { reserveId(seed) { try { - return ObjectId(seed).toHexString() + return new ObjectId(seed).toHexString() } catch (err) { return new ObjectId().toHexString() } diff --git a/index.js b/index.js index 9de58d82..efcb78bf 100644 --- a/index.js +++ b/index.js @@ -7,7 +7,7 @@ * */ import express from 'express' -import * as utils from './utilities/shared.js' +import { respondWithError } from './utilities/shared.js' let router = express.Router() @@ -34,7 +34,7 @@ router .get(function (_req,res) { fs.readFile('API.md', 'utf8', (err, data) => { if (err) { - utils.respondWithError(res, 500, 'Failed to read API.md') + respondWithError(res, 500, 'Failed to read API.md') return } res.format({ @@ -49,7 +49,7 @@ router respondWithHTML(res) }) .all((_req, res, next) => { - utils.respondWithError(res, 404, 'There is nothing for you here.') + respondWithError(res, 404, 'There is nothing for you here.') }) export { router as default } diff --git a/layer/index.js b/layer/index.js index ea4ec587..f2ba12c2 100644 --- a/layer/index.js +++ b/layer/index.js @@ -58,7 +58,6 @@ router.route('/:layerId') const project = await Project.getById(projectId) if (!project?._id) return respondWithError(res, 404, `Project '${projectId}' does not exist`) const layer = await findLayerById(layerId, projectId) - const originalPages = layer.pages ?? [] if (!layer?.id) return respondWithError(res, 404, `Layer '${layerId}' not found in project`) // Only update top-level properties that are present in the request Object.keys(update ?? {}).forEach(key => { @@ -77,7 +76,7 @@ router.route('/:layerId') pages = await Promise.all(providedPages.map(p => findPageById(p.split("/").pop(), projectId) )) layer.pages = pages } - await updateLayerAndProject(layer, project, user._id, originalPages) + await updateLayerAndProject(layer, project, user._id) res.status(200).json(layer) } catch (error) { console.error(error) diff --git a/project/hotkeysRouter.js b/project/hotkeysRouter.js deleted file mode 100644 index f5407671..00000000 --- a/project/hotkeysRouter.js +++ /dev/null @@ -1,96 +0,0 @@ -import express from "express" -import { respondWithError } from "../utilities/shared.js" -import auth0Middleware from "../auth/index.js" -import Project from "../classes/Project/Project.js" -import Hotkeys from "../classes/HotKeys/Hotkeys.js" -import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" - -const router = express.Router({ mergeParams: true }) - -// Create Hotkey -router.route("/:projectId/hotkeys").post(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - const { symbols } = req.body - if (!user) return respondWithError(res, 401, "Unauthenticated request") - if (!symbols || symbols.length === 0) return respondWithError(res, 400, "At least one symbol is required") - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const hotkeys = new Hotkeys(projectId, symbols) - const hotkey = await hotkeys.create() - res.status(201).json(hotkey) - return - } - return respondWithError(res, 403, "You do not have permission to create hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -// Update Hotkeys -router.route("/:projectId/hotkeys").put(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - const { symbols } = req.body - if (!user) return respondWithError(res, 401, "Unauthenticated request") - if (!symbols || symbols.length === 0) return respondWithError(res, 400, "At least one symbol is required") - if (!Array.isArray(symbols) || symbols.some(symbol => typeof symbol !== 'string')) { - return respondWithError(res, 400, "All symbols must be strings") - } - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const hotkeys = new Hotkeys(projectId, symbols) - const hotkey = await hotkeys.setSymbols() - res.status(200).json(hotkey) - return - } - return respondWithError(res, 403, "You do not have permission to update hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -// Delete Hotkeys -router.route("/:projectId/hotkeys").delete(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - if (!user) return respondWithError(res, 401, "Unauthenticated request") - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const hotkeys = new Hotkeys(projectId) - const isDeleted = await hotkeys.delete() - res.status(200).json(isDeleted) - return - } - return respondWithError(res, 403, "You do not have permission to delete hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -// Get Hotkeys for a project -router.route("/:projectId/hotkeys").get(auth0Middleware(), async (req, res) => { - const user = req.user - const { projectId } = req.params - if (!user) return respondWithError(res, 401, "Unauthenticated request") - try { - const project = new Project(projectId) - if (await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.OPTIONS, ENTITIES.PROJECT)) { - const H = await Hotkeys.getByProjectId(projectId) - res.status(200).json(H.symbols) - return - } - return respondWithError(res, 403, "You do not have permission to view hotkeys for this project") - } catch (error) { - return respondWithError(res, error.status ?? 500, error.message.toString()) - } -}) - -router.route("/:projectId/hotkeys").all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET, PUT, or DELETE instead") -}) - -export default router diff --git a/project/memberDeclineInviteRouter.js b/project/memberDeclineInviteRouter.js index 0cae5f66..57dc0ff8 100644 --- a/project/memberDeclineInviteRouter.js +++ b/project/memberDeclineInviteRouter.js @@ -1,5 +1,5 @@ import express from "express" -import { validateID, respondWithError } from "../utilities/shared.js" +import { respondWithError } from "../utilities/shared.js" import Project from "../classes/Project/Project.js" import User from "../classes/User/User.js" diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index 2004d952..9b3d508c 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -1,5 +1,5 @@ import express from "express" -import { respondWithError, isValidJSON } from "../utilities/shared.js" +import { respondWithError } from "../utilities/shared.js" import User from "../classes/User/User.js" import common_cors from '../utilities/common_cors.json' with {type: 'json'} import cors from "cors" diff --git a/utilities/getHash.js b/utilities/getHash.js deleted file mode 100644 index 28774be3..00000000 --- a/utilities/getHash.js +++ /dev/null @@ -1,6 +0,0 @@ -export default function getHash(agent) { - if (agent) { - return agent.split("id/").pop() - } - throw new Error("No agent provided") -} diff --git a/utilities/removeProperties.js b/utilities/removeProperties.js deleted file mode 100644 index 6949ce78..00000000 --- a/utilities/removeProperties.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * filters object - * @param {*} obj the object to be filtered - * @param {*} propertiesToRemove the properties to be removed, e.g profile, password, links; array of strings - * @returns all properties of the except except one specified - */ -export const removeProperties = (obj, ...propertiesToRemove) => { - if (!obj) return - const modifiedObj = Object.assign({}, obj) - for (const property of propertiesToRemove) { - delete modifiedObj[property] - } - return modifiedObj -} - -/** - * - * @param {*} obj object to be filtered - * @param {*} properties the only properties to return; array of strings - * @returns object with selected properties - */ -export const includeOnly = (obj, ...properties) => { - const filteredObj = {} - for (const key in obj) { - if (properties.includes(key)) { - filteredObj[key] = obj[key] - } - } - return filteredObj -} diff --git a/utilities/shared.js b/utilities/shared.js index 9e4dc78e..9558b6a0 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -48,13 +48,6 @@ export function respondWithError(res, status, message) { res.status(status).json({ message }) } -// Send a successful response with the appropriate JSON -export function respondWithJSON(res, status, json) { - const id = manifest["@id"] ?? manifest.id ?? null - res.set("Content-Type", "application/json; charset=utf-8") - res.status(status) - res.json(json) -} // Fetch a project by ID export const getProjectById = async (projectId, res) => { const project = await Project.getById(projectId) @@ -74,46 +67,13 @@ export const findLineInPage = (page, lineId) => { return line } -/** - * Pages have been reordered upstream. Their prev/next relationships are not right. - * Go through the Pages and update them if their prev/next has changed. - * Record the Page modification as a content change, and make sure it is attributed. - * - * @param project - A Project class object - * @param layer - A Layer class object with page changes applied to layer.pages - * @param userId - The userId hash that caused the reoder - */ -export const rebuildPageOrder = async (project, layer, userId) => { - if (!project) throw new Error(`Must know project to rebuild Page order`) - const pages = layer?.pages - if (!pages || !Array.isArray(pages)) throw new Error(`Cannot rebuild page order without an array of pages`) - if (!userId) throw new Error(`Must know user id`) - for await (const [index, page] of pages.entries()) { - const thisPageNext = index < pages.length - 1 ? pages[index + 1].id : null - const thisPagePrev = index > 0 ? pages[index - 1].id : null - const pageChanged = (page.next !== thisPageNext || page.prev !== thisPagePrev) - if (!pageChanged) continue - // A reordered page counts as a content change - if (!page.creator) page.creator = await fetchUserAgent(userId) - // We know these values will be upgraded to RERUM ids, so force it and make sure not to leave temp ids. - // FIXME: If there is an error upgrading the referenced page downstream, the rerum ID made here might not resolve. - if (page.next !== thisPageNext) page.next = thisPageNext ? process.env.RERUMIDPREFIX + thisPageNext.split("/").pop() : null - if (page.prev !== thisPagePrev) page.prev = thisPagePrev ? process.env.RERUMIDPREFIX + thisPagePrev.split("/").pop() : null - // It is possible the Layer is still temp. It will be upgraded, so partOf should be the upgraded RERUM ID - page.partOf = process.env.RERUMIDPREFIX + layer.id.split("/").pop() - await recordModification(project, page.id, userId) - await page.update(pageChanged) - } -} - /** * Update a Layer, its Pages, and the Project it belongs to. * Upgrade a Layer only if it contains upgraded Pages. - * + * * @param layer - A Layer class object with changes applied to it * @param project - A Project class object that will need to update * @param userId - The TPEN3 User hash id performing the action - * @param originalPages - An Array of Page _ids that represent the original upstream Layer.pages organization before any modifications. */ export const updateLayerAndProject = async (layer, project, userId) => { if (!project) throw new Error(`Must know project to update Layer`) From 699881c23ade26c9e829995e236659e94805711f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 25 Nov 2025 10:01:57 -0600 Subject: [PATCH 229/262] Signup - Login - Logout - Invite - Reject (#412) * issues * 204 here * upgrade _sub property when user in no longer temp --- auth/index.js | 12 ++++++++++-- classes/Group/Group.js | 6 ++++-- classes/User/User.js | 20 +++++++++++++++++++- project/memberRouter.js | 13 +++++-------- project/memberUpgradeRouter.js | 2 +- utilities/mailer/index.js | 17 +++++++++-------- 6 files changed, 48 insertions(+), 22 deletions(-) diff --git a/auth/index.js b/auth/index.js index 702684f4..30c46e90 100644 --- a/auth/index.js +++ b/auth/index.js @@ -1,5 +1,4 @@ import { auth } from "express-oauth2-jwt-bearer" -import { extractToken, extractUser, isTokenExpired } from "../utilities/token.js" import User from "../classes/User/User.js" /** @@ -17,7 +16,7 @@ function auth0Middleware() { issuerBaseURL: `https://${process.env.DOMAIN}/`, }) - // Extract user from the token and set req.user. req.user can be set to specific info from the payload, like sib, roles, etc. + // Extract user from the token and set req.user. req.user can be set to specific info from the payload, like sub, roles, etc. async function setUser(req, res, next) { const { payload } = req.auth @@ -46,6 +45,15 @@ function auth0Middleware() { next() return } + + // If user exists but has wrong _sub (e.g., from temp user), update it + if (u._sub !== payload.sub) { + u._sub = payload.sub + const userObj = new User(uid) + userObj.data = u + await userObj.update() + } + req.user = u next() return diff --git a/classes/Group/Group.js b/classes/Group/Group.js index 5098bfcc..a8db2cd6 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -36,7 +36,7 @@ export default class Group { throw err } const roles = this.data.members[memberId]?.roles - const allRoles = Object.assign(Group.defaultRoles, this.data.customRoles) + const allRoles = { ...Group.defaultRoles, ...this.data.customRoles } return Object.fromEntries(roles.map(role => [role, allRoles[role]])) } @@ -61,7 +61,7 @@ export default class Group { throw err } this.data.members[memberId] = { roles: [] } - this.setMemberRoles(memberId, roles) + await this.setMemberRoles(memberId, roles) } /** @@ -122,6 +122,7 @@ export default class Group { } roles = washRoles(roles, allowOwner) this.data.members[memberId].roles = [...new Set([...this.data.members[memberId].roles, ...roles])] + await this.update() } /** @@ -166,6 +167,7 @@ export default class Group { await this.#loadFromDB() } delete this.data.members[memberId] + await this.update() } getByRole(role) { diff --git a/classes/User/User.js b/classes/User/User.js index 5c076624..69652e3e 100644 --- a/classes/User/User.js +++ b/classes/User/User.js @@ -25,7 +25,10 @@ export default class User { } async getSelf() { - return await (this.data ?? this.#loadFromDB().then(u => u.data)) + if (!this.data) { + await this.#loadFromDB() + } + return this.data } async getPublicInfo() { @@ -107,6 +110,21 @@ export default class User { if (!this.data.profile?.displayName) { throw new Error("User must have a profile with a displayName") } + + // Check for duplicate email + try { + const existingUser = await this.getByEmail(this.data.email) + if (existingUser && existingUser._id !== this._id) { + throw new Error(`User with email ${this.data.email} already exists`) + } + } catch (err) { + // getByEmail throws if not found - that's ok, continue + // But re-throw if it's our duplicate error or other errors + if (err.message.includes("already exists") || (!err.message.includes("not found") && err.message !== "No email provided")) { + throw err + } + } + // save user to database return database.save({ _id: this._id, ...this.data }, "users") } diff --git a/project/memberRouter.js b/project/memberRouter.js index 608c2937..9eeb1e5b 100644 --- a/project/memberRouter.js +++ b/project/memberRouter.js @@ -59,7 +59,7 @@ router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Midd if (!user) return respondWithError(res, 401, "Unauthenticated request") if (!roles) return respondWithError(res, 400, "Provide role(s) to add") try { - const projectObj = new Project(projectId) + const projectObj = await Project.getById(projectId) if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER))) { return respondWithError(res, 403, "You do not have permission to add roles to members.") } @@ -80,7 +80,7 @@ router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middl if (!user) return respondWithError(res, 401, "Unauthenticated request") if (!roles) return respondWithError(res, 400, "Provide role(s) to update") try { - const projectObj = new Project(projectId) + const projectObj = await Project.getById(projectId) if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.MEMBER))) { return respondWithError(res, 403, "You do not have permission to update member roles.") } @@ -100,14 +100,14 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M if (!roles) return respondWithError(res, 400, "Provide role(s) to remove") if (roles.includes("OWNER")) return respondWithError(res, 400, "The OWNER role cannot be removed.") try { - const projectObj = new Project(projectId) + const projectObj = await Project.getById(projectId) if (!(await projectObj.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.MEMBER))) { return respondWithError(res, 403, "You do not have permission to remove roles from members.") } const groupId = projectObj.data.group const group = new Group(groupId) await group.removeMemberRoles(collaboratorId, roles) - res.status(204).send(`Roles [${roles}] removed from member ${collaboratorId}.`) + res.sendStatus(204) } catch (error) { return respondWithError(res, error.status ?? 500, error.message ?? "Error removing roles from member.") } @@ -122,14 +122,11 @@ router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res if (!newOwnerId) return respondWithError(res, 400, "Provide the ID of the new owner.") if (user._id === newOwnerId) return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") try { - const projectObj = new Project(projectId) + const projectObj = await Project.getById(projectId) if (!(await projectObj.checkUserAccess(user._id, ACTIONS.ALL, SCOPES.ALL, ENTITIES.ALL))) { return respondWithError(res, 403, "You do not have permission to transfer ownership.") } const group = new Group(projectObj.data.group) - if (user._id === newOwnerId) { - return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") - } const currentRoles = await group.getMemberRoles(user._id) Object.keys(currentRoles).length === 1 && await group.addMemberRoles(user._id, ["CONTRIBUTOR"]) await group.addMemberRoles(newOwnerId, ["OWNER"], true) diff --git a/project/memberUpgradeRouter.js b/project/memberUpgradeRouter.js index 74c1944b..a10d982f 100644 --- a/project/memberUpgradeRouter.js +++ b/project/memberUpgradeRouter.js @@ -1,5 +1,5 @@ import express from "express" -import { validateID, respondWithError } from "../utilities/shared.js" +import { respondWithError } from "../utilities/shared.js" import Project from "../classes/Project/Project.js" import Group from "../classes/Group/Group.js" import User from "../classes/User/User.js" diff --git a/utilities/mailer/index.js b/utilities/mailer/index.js index 074eaaaf..153bc66d 100644 --- a/utilities/mailer/index.js +++ b/utilities/mailer/index.js @@ -44,14 +44,14 @@ export const sendMail = async (email, subject, message) => { "TPEN_EMAIL_CC" ] - requiredEnvVars.forEach(varName => { + for (const varName of requiredEnvVars) { if (!process.env[varName]) { return { status: 500, message: `${varName} environment variable is not set.` } } - }) + } try { const transporter = nodemailer.createTransport({ @@ -59,13 +59,14 @@ export const sendMail = async (email, subject, message) => { port: process.env.SMTP_PORT, }) - transporter.verify((error, success) => { - if (error) { - console.log("Error in SMTP configuration: ", error) - return {status: 500, message: error.toString()} - } + // Verify SMTP connection before attempting to send + try { + await transporter.verify() console.log("Server is ready to take our messages") - }) + } catch (error) { + console.error("Error in SMTP configuration: ", error) + return {status: 500, message: `SMTP connection failed: ${error.message}`} + } const mailOptions = { from: process.env.TPEN_SUPPORT_EMAIL, From 57f319497b777de3df59fa9d8a654e6d42ca1f29 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 25 Nov 2025 10:03:36 -0600 Subject: [PATCH 230/262] /page/:pageid/resolved Endpoint (#397) * Go with minimax m2 * Another kind of line uri pattern * cleanup * polish * polish * polish * polish * Touch up so we don't resolve objects that are already resolved --- API.md | 62 ++++++++++++++++++++++++++++++++++++++++++++ page/index.js | 33 ++++++++++++++++++++++-- utilities/shared.js | 63 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 2 deletions(-) diff --git a/API.md b/API.md index d3d90823..1edace48 100644 --- a/API.md +++ b/API.md @@ -406,3 +406,65 @@ Note that you may not empty the canvases of an existing layer. If the `canvases } ``` - **500**: Server error + +#### `GET /project/:projectId/page/:pageid/resolved` + +- **Description**: Get a fully resolved page with complete annotation data from RERUM. This endpoint resolves all annotation references in the page's items array by fetching the full annotation objects from RERUM which will include the Annotation body. +- **Parameters**: + - `projectId`: ID of the project. + - `pageId`: The ID of the page. + +- **Responses**: + + - **200**: Page found with fully resolved annotations + ```json + { + "@context": "http://www.w3.org/ns/anno.jsonld", + "id": "string", + "type": "AnnotationPage", + "label": { + "none":[ + "TPEN3 Page" + ] + }, + "target": "string", + "items": [ + { + "@context": "http://iiif.io/api/presentation/3/context.json", + "id": "string", + "type": "Annotation", + "motivation": "transcribing", + "target": { + "source": "string", + "type": "SpecificResource", + "selector": { + "type": "FragmentSelector", + "value": "string" + } + }, + "creator": "string", + "body": { + "type": "TextualBody", + "value": "string", + "format": "text/plain" + }, + "_createdAt": "timestamp", + "_modifiedAt": "timestamp", + "__rerum": { + "@context": "http://store.rerum.io/v1/context.json", + "createdAt": "timestamp", + "isOverwritten": "string" + } + } + ], + "partOf": [{"type":"Collection"}], + "prev": "string", + "next": "string", + "_createdAt": "timestamp", + "_modifiedAt": "timestamp" + } + ``` + - **404**: Page not found + - **500**: Server error + +**Note**: This endpoint is useful when you need complete annotation data in a single request instead of making multiple API calls to fetch individual annotations from RERUM. The annotations are resolved in parallel for better performance. diff --git a/page/index.js b/page/index.js index f83ff5e0..bff3f9c4 100644 --- a/page/index.js +++ b/page/index.js @@ -7,7 +7,7 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' import Line from '../classes/Line/Line.js' -import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict } from '../utilities/shared.js' +import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict, resolveReferences } from '../utilities/shared.js' router.use( cors(common_cors) @@ -116,6 +116,35 @@ router.route('/:pageId') respondWithError(res, 405, 'Improper request method, please use GET.') }) -// router.use('/:pageId/line', lineRouter) +// Fully resolved page endpoint - returns page with fully populated annotation data +router.route('/:pageId/resolved') + .get(async (req, res) => { + const { projectId, pageId } = req.params + try { + const page = await findPageById(pageId, projectId, true) + if (!page) { + respondWithError(res, 404, 'No page found with that ID.') + return + } + if (page.id?.startsWith(process.env.RERUMIDPREFIX)) { + // RERUM pages already have fully resolved items + res.status(200).json(page) + return + } + // Resolve all annotation references in the items array + let resolvedPage = page + if (page.items && page.items.length > 0) { + // Resolve all annotations in the items array + const resolvedItems = await resolveReferences(page.items) + resolvedPage = { ...page, items: resolvedItems } + } + res.status(200).json(resolvedPage) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } + }) + .all((req, res) => { + respondWithError(res, 405, 'Improper request method, please use GET.') + }) export default router diff --git a/utilities/shared.js b/utilities/shared.js index 9558b6a0..228f71c9 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -336,3 +336,66 @@ export const handleVersionConflict = (res, error) => { ...(error.lineId && { lineId: error.lineId }) }) } + +/** + * Fetch a single annotation from RERUM by its ID + * @param {string} annotationId - The ID/URL of the annotation to fetch (supports both RERUM and TPEN3 formats) + * @returns {Promise} The full annotation object from RERUM + * @throws {Error} If the annotation cannot be fetched or parsed + */ +export const resolveReference = async (annotationId) => { + if (!annotationId || !annotationId.startsWith("http")) { + throw new Error('Proper Annotation URI is required') + } + try { + const response = await fetch(annotationId) + if (!response.ok) { + throw new Error(`Failed to fetch annotation from RERUM: ${response.statusText}`) + } + const annotation = await response.json() + return annotation + } catch (error) { + console.error(`Error fetching annotation: ${annotationId}`, error) + throw new Error(`Failed to fetch annotation from RERUM: ${error.message}`) + } +} + +/** + * Resolve all annotations in a page's items array by fetching their full data from RERUM + * @param {Array} items - Array of annotation items (can be IDs or partial objects) + * @returns {Promise} Array of fully resolved annotation objects + */ +export const resolveReferences = async (items) => { + if (!Array.isArray(items)) return [] + + // Process all items in parallel for better performance + const resolvedItems = await Promise.all( + items.map(async (item) => { + // If item is a string, it's an annotation ID - fetch from RERUM + if (typeof item === 'string') { + try { + return await resolveReference(item) + } catch (error) { + console.error(`Failed to resolve annotation ${item}:`, error) + // Return the ID string if fetching fails + return { id: item, error: error.message } + } + } + // If item is an object with an id, try to fetch the full annotation + if (item && typeof item === 'object' && item.id) { + try { + const fullAnnotation = await resolveReference(item.id) + // Merge with resolved annotation properties taking precedence over local + return { ...item, ...fullAnnotation } + } catch (error) { + console.error(`Failed to resolve annotation ${item.id}:`, error) + return item + } + } + // For any other format, return as-is + return item + }) + ) + + return resolvedItems +} From 42becae32abe26b6a4e7cde638c6ca7e54025f64 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 25 Nov 2025 11:26:53 -0600 Subject: [PATCH 231/262] Remove introduced this.update() calls in Group.js --- classes/Group/Group.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Group/Group.js b/classes/Group/Group.js index a8db2cd6..d99daa55 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -122,7 +122,8 @@ export default class Group { } roles = washRoles(roles, allowOwner) this.data.members[memberId].roles = [...new Set([...this.data.members[memberId].roles, ...roles])] - await this.update() + // If we need the group to update first (caused error) + // await this.update() } /** @@ -167,7 +168,8 @@ export default class Group { await this.#loadFromDB() } delete this.data.members[memberId] - await this.update() + // If we need the group to update first (caused error) + // await this.update() } getByRole(role) { From 3b0fc91b2041035b134419ca98619b4b1ac9adb0 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 26 Nov 2025 10:25:15 -0600 Subject: [PATCH 232/262] Invite and Reject Flows (#417) * invite flow * upgrades and rejections when temp user was invited to multiple projects before doing either. * upgrades and rejections when temp user was invited to multiple projects before doing either. * cleanup * copilot suggestion * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- auth/index.js | 58 ++++++++++++++++++++++++++++++-------- classes/Group/Group.js | 41 +++++++++++++++++++++++++++ classes/Project/Project.js | 49 ++++++++++++++++++++++++-------- classes/User/User.js | 27 ++++++++++++++++++ 4 files changed, 153 insertions(+), 22 deletions(-) diff --git a/auth/index.js b/auth/index.js index 30c46e90..6e7572de 100644 --- a/auth/index.js +++ b/auth/index.js @@ -1,6 +1,5 @@ import { auth } from "express-oauth2-jwt-bearer" import User from "../classes/User/User.js" - /** * This function verifies authorization tokens using Auth0 library. to protect a route using this function in a different component: 1. import the function in that component @@ -33,27 +32,64 @@ function auth0Middleware() { const user = new User(uid) user.getSelf().then(async (u) => { if(!u || !u?.profile) { - user.data = { - _id: uid, - agent, - _sub: payload.sub, - email: payload.name, - profile: { displayName: payload.nickname }, + const email = payload.name + + // Check if a temporary user exists with this email + let existingUser = null + try { + existingUser = await user.getByEmail(email) + } catch (err) { + // No user found - that's fine, continue + } + + if (existingUser && existingUser.inviteCode) { + // Found a temporary user - merge their memberships into this new user + user.data = { + _id: uid, + agent, + _sub: payload.sub, + email: email, + profile: { displayName: payload.nickname }, + } + await user.save() + await user.mergeFromTemporaryUser(existingUser) + req.user = user + next() + return + } else if (existingUser) { + // Non-temporary user with same email - this is a conflict + const err = new Error(`User with email ${email} already exists. Please contact TPEN3 administrators for assistance.`) + err.status = 409 + next(err) + return + } else { + // No existing user - create new + user.data = { + _id: uid, + agent, + _sub: payload.sub, + email: email, + profile: { displayName: payload.nickname }, + } + await user.save() + req.user = user + next() + return } - user.save() - req.user = user - next() - return } // If user exists but has wrong _sub (e.g., from temp user), update it if (u._sub !== payload.sub) { u._sub = payload.sub + // Remove inviteCode if present - this user is now fully authenticated + delete u.inviteCode const userObj = new User(uid) userObj.data = u await userObj.update() } + // Ensure no inviteCode on authenticated user (belt and suspenders) + delete u.inviteCode req.user = u next() return diff --git a/classes/Group/Group.js b/classes/Group/Group.js index d99daa55..2d927433 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -172,6 +172,35 @@ export default class Group { // await this.update() } + /** + * Transfer membership from one user to another. + * Copies all roles from sourceMemberId to targetMemberId and removes sourceMemberId. + * If targetMemberId already exists, roles are merged (union). + * @param {String} sourceMemberId - The member being replaced (e.g., temp user) + * @param {String} targetMemberId - The member receiving the membership (e.g., real user) + */ + async transferMembership(sourceMemberId, targetMemberId) { + if (!Object.keys(this.data.members).length) { + await this.#loadFromDB() + } + + const sourceRoles = this.data.members[sourceMemberId]?.roles || [] + if (!sourceRoles.length) return + + if (this.data.members[targetMemberId]) { + // Merge roles if target already exists + this.data.members[targetMemberId].roles = [ + ...new Set([...this.data.members[targetMemberId].roles, ...sourceRoles]) + ] + } else { + // Add target with source's roles + this.data.members[targetMemberId] = { roles: [...sourceRoles] } + } + + delete this.data.members[sourceMemberId] + await this.update() + } + getByRole(role) { return this.data.members && Object.keys(this.data.members).filter(memberId => this.data.members[memberId].roles.includes(role)) } @@ -269,6 +298,18 @@ export default class Group { return await newGroup.save() } + /** + * Find all groups containing a specific member. + * @param {String} memberId - The _id of the member to search for + * @returns {Promise} - Array of group documents containing this member + */ + static async getGroupsByMember(memberId) { + return database.find( + { [`members.${memberId}`]: { $exists: true } }, + process.env.TPENGROUPS + ) + } + static defaultRoles = { OWNER: ["*_*_*"], LEADER: ["UPDATE_*_PROJECT", "READ_*_PROJECT", "*_*_MEMBER", "*_*_ROLE", "*_*_PERMISSION", "*_*_LAYER", "*_*_PAGE"], diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 43f9ce22..99ba2be9 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -62,13 +62,17 @@ export default class Project { let user = await userObj.getByEmail(email) const roles = this.parseRoles(rolesString) const projectTitle = this.data?.label ?? this.data?.title ?? 'TPEN Project' - let message = `You have been invited to the TPEN project ${projectTitle}. + let message = `You have been invited to the TPEN project ${projectTitle}. View project here.` - if (user) { + + if (user && !user.inviteCode) { + // Existing registered TPEN3 user (not a temp user) // FIXME this does not have the functionality of an 'invite'. await this.inviteExistingTPENUser(user._id, roles) - } + } else { + // Either no user exists, or user is a temp user (has inviteCode) + // In both cases, we need to send invite email with accept/reject links const inviteData = await this.inviteNewTPENUser(email, roles) const returnTo = encodeURIComponent(`${process.env.TPENINTERFACES}project?projectID=${this.data._id}&inviteCode=${inviteData.tpenUserID}`) // Signup starting at the TPEN3 public site @@ -77,9 +81,9 @@ export default class Project { const decline = `${process.env.TPENINTERFACES}project/decline?email=${encodeURIComponent(email)}&user=${inviteData.tpenUserID}&project=${this.data._id}&projectTitle=${encodeURIComponent(projectTitle)}` message += `

- Click the button below to get started with your project

+ Click the button below to get started with your project

- or copy the following link into your web browser ${signup} + or copy the following link into your web browser ${signup}

This E-mail address may be visible to members of the project so that they know @@ -161,9 +165,27 @@ export default class Project { } /** - * Add a new temporary user to the users collection and send the invite E-mail. - */ + * Add a new temporary user to the users collection and send the invite E-mail. + * If a temp user with this email already exists (invited to another project), reuse it. + * This allows users invited to multiple projects to use any invite link to complete signup. + */ async inviteNewTPENUser(email, roles) { + // Check if a temp user already exists with this email + const existingUserLookup = new User() + let tempUser = null + try { + tempUser = await existingUserLookup.getByEmail(email) + } catch (err) { + // No user found - that's fine, we'll create one + } + + if (tempUser && tempUser.inviteCode) { + // Reuse existing temp user - just add to this project's group + await this.inviteExistingTPENUser(tempUser._id, roles) + return { "tpenUserID": tempUser._id, "tpenGroupID": this.data.group } + } + + // Create new temp user const user = new User() const inviteCode = user._id const agent = `https://store.rerum.io/v1/id/${user._id}` @@ -173,7 +195,7 @@ export default class Project { await user.save() // FIXME this does not have the functionality of an 'invite'. await this.inviteExistingTPENUser(user._id, roles) - return { "tpenUserID":user._id, "tpenGroupID":this.data.group } + return { "tpenUserID": user._id, "tpenGroupID": this.data.group } } /** @@ -196,7 +218,7 @@ export default class Project { /** * Remove a member from the Project Group. - * If the member is an invitee (temporary) User, delete that User from the db. + * If the member is an invitee (temporary) User with no remaining group memberships, delete that User from the db. * * @param userId The User/member _id to remove from the Group and perhaps delete from the db. */ @@ -205,10 +227,15 @@ export default class Project { const group = new Group(this.data.group) await group.removeMember(userId) await group.update() - // Don't leave orphaned invitees in the db. + // Don't leave orphaned invitees in the db, but only delete if they have no remaining memberships const member = new User(userId) const memberData = await member.getSelf() - if (memberData?.inviteCode) member.delete() + if (memberData?.inviteCode) { + const remainingGroups = await Group.getGroupsByMember(userId) + if (remainingGroups.length === 0) { + await member.delete() + } + } return this } catch (error) { throw { diff --git a/classes/User/User.js b/classes/User/User.js index 69652e3e..a1311956 100644 --- a/classes/User/User.js +++ b/classes/User/User.js @@ -1,4 +1,5 @@ import dbDriver from "../../database/driver.js" +import Group from "../Group/Group.js" const database = new dbDriver("mongo") export default class User { @@ -61,6 +62,32 @@ export default class User { }) } + /** + * Merge a temporary user's group memberships into this user and delete the temp user. + * Used when a user signs up independently after being invited to projects. + * @param {Object} tempUserData - The temporary user's data (must have inviteCode field) + * @throws {Error} If tempUserData does not have an inviteCode (not a temporary user) + */ + async mergeFromTemporaryUser(tempUserData) { + if (!tempUserData?.inviteCode) { + throw new Error("Cannot merge: provided user is not a temporary user") + } + + // Find all groups containing the temp user + const groups = await Group.getGroupsByMember(tempUserData._id) + + // Transfer membership in each group + for (const groupData of groups) { + const group = new Group(groupData._id) + group.data = groupData + await group.transferMembership(tempUserData._id, this._id) + } + + // Delete the temporary user + const tempUser = new User(tempUserData._id) + await tempUser.delete() + } + static async create(data) { // POST requests if (!data) { From ea44f0a1fa36cbf13904d581ff1286923f944dfc Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 26 Nov 2025 12:47:00 -0600 Subject: [PATCH 233/262] Only Update Lines (Annotations) That Have Changed (#419) * opus 4.5 unattended nice * cleanup * consolodate tests * polish * A deeper equality check for comparing JSON objects * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- classes/Line/Line.js | 9 ++- utilities/__tests__/shared.test.js | 108 +++++++++++++++++++++++++++++ utilities/shared.js | 48 +++++++++++++ 3 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 utilities/__tests__/shared.test.js diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 8bdb5dfd..8e56fe01 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -1,5 +1,5 @@ import dbDriver from "../../database/driver.js" -import { fetchUserAgent } from "../../utilities/shared.js" +import { fetchUserAgent, hasAnnotationChanges } from "../../utilities/shared.js" const databaseTiny = new dbDriver("tiny") export default class Line { @@ -67,6 +67,13 @@ export default class Line { // This id doesn't exist in RERUM, so we need to create it this.#tinyAction = 'create' } + + // Skip RERUM update if no content changes detected + // Uses hasAnnotationChanges from shared.js instead of a private Class method for testability. + if (existingLine && !hasAnnotationChanges(existingLine, lineAsAnnotation)) { + return this // Return without versioning + } + const updatedLine = existingLine ? { ...existingLine, ...lineAsAnnotation } : lineAsAnnotation const newURI = await databaseTiny[this.#tinyAction](updatedLine).then(res => res.id) .catch(err => { diff --git a/utilities/__tests__/shared.test.js b/utilities/__tests__/shared.test.js new file mode 100644 index 00000000..375804c2 --- /dev/null +++ b/utilities/__tests__/shared.test.js @@ -0,0 +1,108 @@ +import { hasAnnotationChanges } from "../shared.js" + +describe("hasAnnotationChanges - Annotation change detection utility. #shared_unit", () => { + + describe("Body changes", () => { + it('returns true when body changes (string)', () => { + const existing = { body: 'old text', target: 'canvas#xywh=0,0,100,100' } + const incoming = { body: 'new text', target: 'canvas#xywh=0,0,100,100' } + expect(hasAnnotationChanges(existing, incoming)).toBe(true) + }) + + it('returns true when body changes (TextualBody object)', () => { + const existing = { body: { type: 'TextualBody', value: 'old' }, target: 'canvas' } + const incoming = { body: { type: 'TextualBody', value: 'new' }, target: 'canvas' } + expect(hasAnnotationChanges(existing, incoming)).toBe(true) + }) + + it('returns true when body type changes (string to object)', () => { + const existing = { body: 'old text', target: 'canvas' } + const incoming = { body: { type: 'TextualBody', value: 'old text' }, target: 'canvas' } + expect(hasAnnotationChanges(existing, incoming)).toBe(true) + }) + + it('returns true when body changes (array format)', () => { + const existing = { body: [{ type: 'TextualBody', value: 'old' }], target: 'canvas' } + const incoming = { body: [{ type: 'TextualBody', value: 'new' }], target: 'canvas' } + expect(hasAnnotationChanges(existing, incoming)).toBe(true) + }) + }) + + describe("Target changes", () => { + it('returns true when target changes (string)', () => { + const existing = { body: 'text', target: 'canvas#xywh=0,0,100,100' } + const incoming = { body: 'text', target: 'canvas#xywh=50,50,200,200' } + expect(hasAnnotationChanges(existing, incoming)).toBe(true) + }) + + it('returns true when target changes (SpecificResource object)', () => { + const existing = { + body: 'text', + target: { source: 'canvas', selector: { type: 'FragmentSelector', value: 'xywh=0,0,100,100' } } + } + const incoming = { + body: 'text', + target: { source: 'canvas', selector: { type: 'FragmentSelector', value: 'xywh=10,10,200,200' } } + } + expect(hasAnnotationChanges(existing, incoming)).toBe(true) + }) + }) + + describe("No changes detected", () => { + it('returns false when body and target are identical (strings)', () => { + const existing = { body: 'text', target: 'canvas#xywh=0,0,100,100' } + const incoming = { body: 'text', target: 'canvas#xywh=0,0,100,100' } + expect(hasAnnotationChanges(existing, incoming)).toBe(false) + }) + + it('returns false when body and target are identical (objects)', () => { + const existing = { + body: { type: 'TextualBody', value: 'text', format: 'text/plain' }, + target: { source: 'canvas', selector: { type: 'FragmentSelector', value: 'xywh=0,0,100,100' } } + } + const incoming = { + body: { type: 'TextualBody', value: 'text', format: 'text/plain' }, + target: { source: 'canvas', selector: { type: 'FragmentSelector', value: 'xywh=0,0,100,100' } } + } + expect(hasAnnotationChanges(existing, incoming)).toBe(false) + }) + + it('returns false when only non-content fields differ', () => { + const existing = { id: 'old-id', body: 'text', target: 'canvas', motivation: 'transcribing', creator: 'userA', '@context': 'http://iiif.io/api/presentation/3/context.json' } + const incoming = { id: 'new-id', body: 'text', target: 'canvas', motivation: 'commenting', creator: 'userB', '@context': 'http://www.w3.org/ns/anno.jsonld' } + expect(hasAnnotationChanges(existing, incoming)).toBe(false) + }) + + it('returns false when body and target objects have same content but different property order', () => { + const existing = { + body: { type: 'TextualBody', value: 'text', format: 'text/plain' }, + target: { source: 'canvas', selector: { type: 'FragmentSelector', value: 'xywh=0,0,100,100' } } + } + const incoming = { + body: { format: 'text/plain', value: 'text', type: 'TextualBody' }, + target: { selector: { value: 'xywh=0,0,100,100', type: 'FragmentSelector' }, source: 'canvas' } + } + expect(hasAnnotationChanges(existing, incoming)).toBe(false) + }) + }) + + describe("Edge cases", () => { + it('handles null body gracefully', () => { + const existing = { body: null, target: 'canvas' } + const incoming = { body: null, target: 'canvas' } + expect(hasAnnotationChanges(existing, incoming)).toBe(false) + }) + + it('returns true when body changes from null to value', () => { + const existing = { body: null, target: 'canvas' } + const incoming = { body: 'new text', target: 'canvas' } + expect(hasAnnotationChanges(existing, incoming)).toBe(true) + }) + + it('ignores extra RERUM metadata fields', () => { + const existing = { body: 'text', target: 'canvas', __rerum: { isOverwritten: 'some-date' } } + const incoming = { body: 'text', target: 'canvas' } + expect(hasAnnotationChanges(existing, incoming)).toBe(false) + }) + }) +}) diff --git a/utilities/shared.js b/utilities/shared.js index 228f71c9..d5bb4655 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -399,3 +399,51 @@ export const resolveReferences = async (items) => { return resolvedItems } + +/** + * Deep equality comparison that is order-insensitive for object properties. + * Arrays are compared in order, but object key order does not matter. + * + * @param {*} a - First value to compare + * @param {*} b - Second value to compare + * @returns {boolean} True if values are deeply equal + */ +const deepEqual = (a, b) => { + if (a === b) return true + if (a == null || b == null) return a === b + if (typeof a !== typeof b) return false + + if (Array.isArray(a)) { + if (!Array.isArray(b) || a.length !== b.length) return false + return a.every((val, i) => deepEqual(val, b[i])) + } + + if (typeof a === 'object') { + const keysA = Object.keys(a) + const keysB = Object.keys(b) + if (keysA.length !== keysB.length) return false + return keysA.every(key => Object.hasOwn(b, key) && deepEqual(a[key], b[key])) + } + + return false +} + +/** + * Compare two annotations to detect meaningful content changes. + * Only compares body and target - other fields (id, creator, motivation, etc.) + * are not considered content changes. + * + * Uses order-insensitive deep comparison since both body and target can be + * complex objects and property order should not affect equality. + * + * NOTE: This function is intentionally placed in shared.js rather than as a + * private method in Line.js to enable unit testing without mocking. + * + * @param {Object} existing - The existing annotation + * @param {Object} compare - The incoming annotation to compare + * @returns {boolean} True if there are meaningful changes, false otherwise + */ +export const hasAnnotationChanges = (existing, compare) => { + return !deepEqual(existing?.body, compare?.body) || + !deepEqual(existing?.target, compare?.target) +} From 10a197024485801b4d2564ff47ce5eb6a5e910c9 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 26 Nov 2025 14:21:21 -0600 Subject: [PATCH 234/262] dang this needs to go to development as a hotfix (#420) --- auth/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/index.js b/auth/index.js index 6e7572de..a3b0e21f 100644 --- a/auth/index.js +++ b/auth/index.js @@ -51,8 +51,8 @@ function auth0Middleware() { email: email, profile: { displayName: payload.nickname }, } - await user.save() await user.mergeFromTemporaryUser(existingUser) + await user.save() req.user = user next() return From 81fb9b5e66d313c6dd25baaf227aebc4be753716 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 1 Dec 2025 14:40:47 -0600 Subject: [PATCH 235/262] Let Members Leave Projects (#421) * dang this needs to go to development as a hotfix * Let a logged in user leave a project they are a part of (same business rules apply as for removing a user) * refactor a bit. Send users an email when they are removed from a project by admins, or when they leave a group voluntarily * cleanup * polish * Apply suggestion from @Copilot whitespace in email Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Move stuff around based on review. Allow removal of the only leader. * unused * rename for separation of actions * changes from testing * Move stuff around * changes from testing * indentation * id instead of projectid for consistency * id instead of projectid for consistency * id instead of projectid for consistency * id instead of projectid for consistency --------- Co-authored-by: Patrick Cuba Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- __tests__/mount.test.js | 4 +++ classes/Group/Group.js | 32 +++++++++++++++++++-- classes/Project/Project.js | 56 ++++++++++++++++++++++++++++-------- project/index.js | 2 ++ project/memberLeaveRouter.js | 41 ++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 14 deletions(-) create mode 100644 project/memberLeaveRouter.js diff --git a/__tests__/mount.test.js b/__tests__/mount.test.js index 2a60668d..cb09662b 100644 --- a/__tests__/mount.test.js +++ b/__tests__/mount.test.js @@ -191,6 +191,10 @@ describe('Check to see that all expected route patterns exist. #exists_unit', () it('GET /project/:projectId/collaborator/:collaboratorId/decline -- decline project invitation', () => { expect(routeExists('/:projectId/collaborator/:collaboratorId/decline', 'get')).toBe(true) }) + + it('POST /project/:projectId/leave -- member leave project', () => { + expect(routeExists('/:projectId/leave', 'post')).toBe(true) + }) }) describe('Project custom roles routes', () => { diff --git a/classes/Group/Group.js b/classes/Group/Group.js index 2d927433..9c7a3b36 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -163,12 +163,40 @@ export default class Group { await this.update() } - async removeMember(memberId) { + /** + * Remove a member from a Group. + * A member can be removed by an admin or by themselves. + * Validations: + * - User must be a member of the project + * - Cannot remove the only OWNER (must transfer ownership first) + * + * @param {string} memberId The User/member _id to remove from the Group and perhaps delete from the db. + * @param {boolean} voluntary Whether the user is leaving voluntarily (true) or being removed by admin (false). + */ + async removeMember(memberId, voluntary = false) { if (!Object.keys(this.data.members).length) { await this.#loadFromDB() } + const member = this.data.members[memberId] + if (!member) { + throw { + status: 400, + message: "User is not a member of this group" + } + } + const userRoles = member.roles + // Prevent removing the only OWNER + if (userRoles.includes("OWNER")) { + const owners = this.getByRole("OWNER") + if (owners.length === 1) { + throw { + status: 403, + message: "Cannot remove: This user is the only owner. Transfer ownership first." + } + } + } delete this.data.members[memberId] - // If we need the group to update first (caused error) + // If we need the Group to update in the db in addition to the Class data. // await this.update() } diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 99ba2be9..c79db93a 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -217,24 +217,56 @@ export default class Project { } /** - * Remove a member from the Project Group. - * If the member is an invitee (temporary) User with no remaining group memberships, delete that User from the db. + * Remove a member from the Project Group + * Sends a confirmation email to the removed member (non-blocking). + * The member may be leaving voluntarily themselves or is being removed by a project admin. + * If the user is an orphaned temp user after they are removed from the project, delete the user. * - * @param userId The User/member _id to remove from the Group and perhaps delete from the db. + * @param {string} userId The User/member _id to remove from the Group and perhaps delete from the db. + * @param {boolean} voluntary Whether the user is leaving voluntarily (true) or being removed by admin (false). */ - async removeMember(userId) { + async removeMember(userId, voluntary = false) { try { + if (!this.data?.group) { + await this.loadProject() + } const group = new Group(this.data.group) - await group.removeMember(userId) + const user = new User(userId) + const userData = await user.getSelf() + await group.removeMember(userId, voluntary) await group.update() - // Don't leave orphaned invitees in the db, but only delete if they have no remaining memberships - const member = new User(userId) - const memberData = await member.getSelf() - if (memberData?.inviteCode) { - const remainingGroups = await Group.getGroupsByMember(userId) - if (remainingGroups.length === 0) { - await member.delete() + const projectTitle = this.data?.label ?? this.data?.title ?? 'TPEN Project' + try { + // Send confirmation email (non-blocking) + + if (userData?.email) { + const subject = voluntary + ? `You left ${projectTitle}` + : `Removed from ${projectTitle}` + + const message = voluntary + ? `

You have successfully left the project ${projectTitle}.

+

Your contributions to the project remain attributed to you, but you may no longer have access to some TPEN3 data. *Access to RERUM data is not affected.

+

If you wish to rejoin, please contact a project administrator.

` + : `

You have been removed from the project ${projectTitle} by a project administrator.

+

Your contributions to the project remain attributed to you, but you no longer have access to some TPEN3 data. *Access to RERUM data is not affected.

+

If you believe this was done in error, please contact a project administrator.

` + + await sendMail(userData.email, subject, message) + } + } catch (emailError) { + console.error("Failed to send removal confirmation email:", emailError) + } + try { + // Don't leave orphaned invitees in the db, delete if they have no remaining memberships (non-blocking) + if (userData.inviteCode) { + const remainingGroups = await Group.getGroupsByMember(userId) + if (remainingGroups.length === 0) { + await user.delete() + } } + } catch (cleanupError) { + console.error("Failed to remove orphaned temp user:", cleanupError) } return this } catch (error) { diff --git a/project/index.js b/project/index.js index eb5eb760..b5aecee9 100644 --- a/project/index.js +++ b/project/index.js @@ -13,6 +13,7 @@ import memberUpgradeRouter from "./memberUpgradeRouter.js" import memberDeclineInviteRouter from "./memberDeclineInviteRouter.js" import projectCopyRouter from "./projectCopyRouter.js" import customMetadataRouter from "./customMetadataRouter.js" +import memberLeaveRouter from "./memberLeaveRouter.js" const router = express.Router({ mergeParams: true }) router.use(cors(common_cors)) @@ -29,6 +30,7 @@ router.use(metadataRouter) router.use(projectToolsRouter) router.use(projectCopyRouter) router.use(customMetadataRouter) +router.use(memberLeaveRouter) // Nested route for layers within a project router.use('/:projectId/layer', layerRouter) diff --git a/project/memberLeaveRouter.js b/project/memberLeaveRouter.js new file mode 100644 index 00000000..7707e1a5 --- /dev/null +++ b/project/memberLeaveRouter.js @@ -0,0 +1,41 @@ +import express from "express" +import { respondWithError } from "../utilities/shared.js" +import auth0Middleware from "../auth/index.js" +import Project from "../classes/Project/Project.js" + +const router = express.Router({ mergeParams: true }) + +/** + * Allows an authenticated member to voluntarily leave a project. + * + * @route POST /project/:id/leave + * @param {string} id - The project the user wants to leave + * @returns {Object} Success message with project id + */ +router.route("/:id/leave").post(auth0Middleware(), async (req, res) => { + const { id: projectId } = req.params + const user = req.user + + if (!user) return respondWithError(res, 401, "Authentication required") + if (!projectId) return respondWithError(res, 400, "Project ID is required") + + try { + const project = await Project.getById(projectId) + if (!project?.data) { + return respondWithError(res, 404, "Project not found") + } + + await project.removeMember(user._id, true) + + res.status(200).json({ + message: "Successfully left the project", + projectId: projectId + }) + + } catch (error) { + return respondWithError(res, error.status ?? 500, + error.message ?? "Error leaving project") + } +}) + +export default router From f96b9305c0b6e073e88c3958ca768a27d7032900 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Tue, 2 Dec 2025 10:01:13 -0600 Subject: [PATCH 236/262] Create a New Column (#396) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create a New Column * Delete classes/Column/__tests__/Column.test.js This was all skipped, so let's just avoid it * Implement code review recommendations for Column feature This commit addresses all the critical and recommended improvements from the code review: - Added TPENCOLUMNS environment variable to config.env - Fixed variable scope errors in checkAndCreateUnorderedColumn function - Added null safety checks for page.columns in line/index.js (lines 135, 184, 238) - Added comprehensive error handling to all Column class methods - Added JSDoc documentation for Column class and helper functions - Added input validation to createNewColumn method - Refactored checkAndCreateUnorderedColumn into smaller, more maintainable helper functions: - getRemainingAnnotations() - createUnorderedColumn() - deleteUnorderedColumn() - updateUnorderedColumn() - Updated CLAUDE.md and copilot-instructions.md with TPENCOLUMNS documentation These changes improve code reliability, maintainability, and documentation quality. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Patrick Cuba * Merge and Extend endpoints * Prev and Next addition, sus check * dup labels * headers issue resolved * code cleanup * existingUnorderedColumn guard * true * suggested changes * Self review * No comments * whitespace check * remove UnorderedColumn totally * PrevNext Fix * docs * fixes * 400 projectID pageId * space * label col fix * delete column if empty * cols in index * variable name change * line fix * column guards --------- Co-authored-by: Patrick Cuba Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Patrick Cuba Co-authored-by: Bryan Haberberger --- .claude/CLAUDE.md | 7 + .github/copilot-instructions.md | 8 + classes/Column/Column.js | 143 +++++++++++++++++ config.env | 1 + line/index.js | 76 +++++++++ page/index.js | 264 +++++++++++++++++++++++++++++++- 6 files changed, 497 insertions(+), 2 deletions(-) create mode 100644 classes/Column/Column.js diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md index 8d2b8fa1..a0d9d786 100644 --- a/.claude/CLAUDE.md +++ b/.claude/CLAUDE.md @@ -109,6 +109,7 @@ Always reference these instructions first and fallback to search or bash command - MariaDB: Configure MARIADB, MARIADBNAME, MARIADBUSER, MARIADBPASSWORD in `.env` - TinyPEN API: Configure TINYPEN in `.env` - Default configurations in `config.env` point to localhost development services +- MongoDB Collections: TPENPROJECTS, TPENGROUPS, TPENUSERS, TPENCOLUMNS (configured in `config.env`) ### Development Workflow 1. Always start with: `cp .env.development .env && npm install` @@ -151,6 +152,12 @@ Required for database functionality: - `MARIADB` (MariaDB host) - `MARIADBNAME`, `MARIADBUSER`, `MARIADBPASSWORD` (MariaDB credentials) +MongoDB collection names (configured in `config.env`): +- `TPENPROJECTS` (default: projects) - Project documents collection +- `TPENGROUPS` (default: groups) - User groups collection +- `TPENUSERS` (default: users) - User profiles collection +- `TPENCOLUMNS` (default: columns) - Column annotations collection + Required for authentication: - `AUDIENCE` (Auth0 audience) - `DOMAIN` (Auth0 domain) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index dadeca69..5a452cab 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -136,6 +136,7 @@ This allows developers to work immediately with sensible defaults while keeping - MariaDB: Configure MARIADB, MARIADBNAME, MARIADBUSER, MARIADBPASSWORD in `.env` - TinyPEN API: Configure TINYPEN in `.env` - Default configurations in `config.env` point to localhost development services +- MongoDB Collections: TPENPROJECTS, TPENGROUPS, TPENUSERS, TPENCOLUMNS (configured in `config.env`) ### Development Workflow @@ -181,6 +182,13 @@ Required for database functionality: - `MARIADB` (MariaDB host) - `MARIADBNAME`, `MARIADBUSER`, `MARIADBPASSWORD` (MariaDB credentials) +MongoDB collection names (configured in `config.env`): + +- `TPENPROJECTS` (default: projects) - Project documents collection +- `TPENGROUPS` (default: groups) - User groups collection +- `TPENUSERS` (default: users) - User profiles collection +- `TPENCOLUMNS` (default: columns) - Column annotations collection + Required for authentication: - `AUDIENCE` (Auth0 audience) diff --git a/classes/Column/Column.js b/classes/Column/Column.js new file mode 100644 index 00000000..5a106a7b --- /dev/null +++ b/classes/Column/Column.js @@ -0,0 +1,143 @@ +import dbDriver from "../../database/driver.js" +const database = new dbDriver("mongo") + +/** + * Represents a Column entity that organizes line annotations within a page. + * Columns provide a way to structure transcription content into logical groupings. + * + * @class Column + */ +export default class Column { + /** + * Creates a new Column instance. + * + * @param {string} [_id=database.reserveId()] - The unique identifier for this column + */ + constructor(_id = database.reserveId()) { + this._id = _id + this.data = null + } + + /** + * Gets the column data from the database if not already loaded. + * + * @returns {Promise} The column data object + * @throws {Error} If the column cannot be loaded from the database + */ + async getColumnData() { + if(!this.data) { + await this.#loadFromDB() + } + return this.data + } + + /** + * Loads the column data from the database. + * + * @private + * @returns {Promise} This Column instance with loaded data + * @throws {Error} If the database operation fails + */ + async #loadFromDB() { + try { + this.data = await database.getById(this._id, process.env.TPENCOLUMNS) + if (!this.data) { + throw new Error(`Column with ID '${this._id}' not found`) + } + return this + } catch (error) { + throw new Error(`Failed to load column from database: ${error.message}`) + } + } + + /** + * Saves the column data to the database. + * + * @returns {Promise} The saved column record + * @throws {Error} If the save operation fails or data is missing + */ + async save() { + try { + if (!this.data) { + throw new Error('Cannot save column: data is null or undefined') + } + return await database.save(this.data, process.env.TPENCOLUMNS) + } catch (error) { + throw new Error(`Failed to save column: ${error.message}`) + } + } + + /** + * Updates the column data in the database. + * + * @returns {Promise} The updated column record + * @throws {Error} If the update operation fails or data is missing + */ + async update() { + try { + if (!this.data) { + throw new Error('Cannot update column: data is null or undefined') + } + return await database.update(this.data, process.env.TPENCOLUMNS) + } catch (error) { + throw new Error(`Failed to update column: ${error.message}`) + } + } + + /** + * Deletes the column from the database. + * + * @returns {Promise} The result of the delete operation + * @throws {Error} If the delete operation fails + */ + async delete() { + try { + return await database.delete(this._id, process.env.TPENCOLUMNS) + } catch (error) { + throw new Error(`Failed to delete column: ${error.message}`) + } + } + + /** + * Creates a new column with the specified properties and saves it to the database. + * + * @static + * @param {string} pageId - The ID of the page this column belongs to + * @param {string} projectId - The ID of the project this column belongs to + * @param {string} label - The label/name for this column + * @param {string[]} [annotations=[]] - Array of annotation IDs in this column + * @returns {Promise} The saved column record + * @throws {Error} If validation fails or the save operation fails + */ + static async createNewColumn(pageId, projectId, label, annotations=[]) { + try { + // Input validation + if (!pageId || typeof pageId !== 'string') { + throw new Error('pageId must be a non-empty string') + } + if (!projectId || typeof projectId !== 'string') { + throw new Error('projectId must be a non-empty string') + } + if (!label || typeof label !== 'string' || label.trim().length === 0) { + throw new Error('label must be a non-empty string') + } + if (!Array.isArray(annotations)) { + throw new Error('annotations must be an array') + } + + let newColumn = new Column() + newColumn.data = { + _id: newColumn._id, + label: label, + onPage: pageId, + inProject: projectId, + next: null, + prev: null, + lines: annotations + } + return await newColumn.save() + } catch (error) { + throw new Error(`Failed to create new column: ${error.message}`) + } + } +} diff --git a/config.env b/config.env index 4bb83fc9..1bb3ac5a 100644 --- a/config.env +++ b/config.env @@ -20,6 +20,7 @@ DOWN=false TPENPROJECTS=projects TPENGROUPS=groups TPENUSERS=users +TPENCOLUMNS=columns # Local Development Database Defaults # These work out-of-the-box for local Docker/MongoDB/MariaDB diff --git a/line/index.js b/line/index.js index 0f0b9213..778da1b5 100644 --- a/line/index.js +++ b/line/index.js @@ -6,6 +6,7 @@ import { isSuspiciousJSON } from '../utilities/checkIfSuspicious.js' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import { respondWithError, getProjectById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' import Line from '../classes/Line/Line.js' +import Column from '../classes/Column/Column.js' const router = express.Router({ mergeParams: true }) @@ -132,6 +133,27 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, } const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine + + const pageId = req.params.pageId.split('/').pop() + const pageProject = project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId) + const oldLineInColumn = pageProject?.columns?.find(col => col.lines.includes(oldLine.id)) + const saveWholeColumns = pageProject?.columns + if (oldLineInColumn) { + const column = new Column(oldLineInColumn.id) + const columnData = await column.getColumnData() + const lineIndexInColumn = columnData.lines.indexOf(oldLine.id) + if (lineIndexInColumn !== -1) { + columnData.lines[lineIndexInColumn] = updatedLine.id + column.data = columnData + await column.update() + } + const columnInPageIndex = saveWholeColumns.findIndex(col => col.lines.includes(oldLine.id)) + if (columnInPageIndex !== -1) { + saveWholeColumns[columnInPageIndex].lines = saveWholeColumns[columnInPageIndex].lines.map(lineId => + lineId === oldLine.id ? updatedLine.id : lineId + ) + } + } await withOptimisticLocking( () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { @@ -148,6 +170,10 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, return updatePageAndProject(page, project, user._id) } ) + if(saveWholeColumns) { + project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns + await project.update() + } res.json(line.asJSON(true)) } catch (error) { // Handle version conflicts with optimistic locking @@ -178,6 +204,27 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn const updatedLine = await line.updateText(req.body, {"creator": user._id}) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine + + const pageId = req.params.pageId.split('/').pop() + const pageProject = project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId) + const oldLineInColumn = pageProject?.columns?.find(col => col.lines.includes(oldLine.id)) + const saveWholeColumns = pageProject?.columns + if (oldLineInColumn) { + const column = new Column(oldLineInColumn.id) + const columnData = await column.getColumnData() + const lineIndexInColumn = columnData.lines.indexOf(oldLine.id) + if (lineIndexInColumn !== -1) { + columnData.lines[lineIndexInColumn] = updatedLine.id + column.data = columnData + await column.update() + } + const columnInPageIndex = saveWholeColumns.findIndex(col => col.lines.includes(oldLine.id)) + if (columnInPageIndex !== -1) { + saveWholeColumns[columnInPageIndex].lines = saveWholeColumns[columnInPageIndex].lines.map(lineId => + lineId === oldLine.id ? updatedLine.id : lineId + ) + } + } await withOptimisticLocking( () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { @@ -198,6 +245,10 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn } ) if(res.headersSent) return + if(saveWholeColumns) { + project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns + await project.update() + } res.json(line.asJSON(true)) } catch (error) { // Handle version conflicts with optimistic locking @@ -229,6 +280,27 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { const updatedLine = await line.updateBounds(req.body) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine + + const pageId = req.params.pageId.split('/').pop() + const pageProject = project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId) + const oldLineInColumn = pageProject?.columns?.find(col => col.lines.includes(oldLine.id)) + const saveWholeColumns = pageProject?.columns + if (oldLineInColumn) { + const column = new Column(oldLineInColumn.id) + const columnData = await column.getColumnData() + const lineIndexInColumn = columnData.lines.indexOf(oldLine.id) + if (lineIndexInColumn !== -1) { + columnData.lines[lineIndexInColumn] = updatedLine.id + column.data = columnData + await column.update() + } + const columnInPageIndex = saveWholeColumns.findIndex(col => col.lines.includes(oldLine.id)) + if (columnInPageIndex !== -1) { + saveWholeColumns[columnInPageIndex].lines = saveWholeColumns[columnInPageIndex].lines.map(lineId => + lineId === oldLine.id ? updatedLine.id : lineId + ) + } + } await withOptimisticLocking( () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { @@ -246,6 +318,10 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return updatePageAndProject(page, project, user._id) } ) + if(saveWholeColumns) { + project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns + await project.update() + } res.json(line.asJSON(true)) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { diff --git a/page/index.js b/page/index.js index bff3f9c4..6cc1a3ef 100644 --- a/page/index.js +++ b/page/index.js @@ -7,7 +7,9 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' import Line from '../classes/Line/Line.js' +import Column from '../classes/Column/Column.js' import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict, resolveReferences } from '../utilities/shared.js' +import { isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" router.use( cors(common_cors) @@ -113,9 +115,267 @@ router.route('/:pageId') } }) .all((req, res, next) => { - respondWithError(res, 405, 'Improper request method, please use GET.') + respondWithError(res, 405, 'Improper request method. Supported: GET, PUT.') + }) + + /** + * Updates the prev and next pointers for all columns in the given page. + * + * @param {Object} page - The page object containing columns + * @returns {Promise} + */ + async function updatePrevAndNextColumns(page) { + if (!page.columns || page.columns.length === 0) return + const allColumnIds = page.columns.map(column => column.id) + for (let i = 0; i < page.columns.length; i++) { + const column = page.columns[i] + const columnDB = new Column(column.id) + const columnData = await columnDB.getColumnData() + columnData.prev = i > 0 ? allColumnIds[i - 1] : null + columnData.next = i < page.columns.length - 1 ? allColumnIds[i + 1] : null + columnDB.data = columnData + await columnDB.update() + } + } + +router.route('/:pageId/column') + .post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + + const { projectId, pageId } = req.params + if (!projectId) return respondWithError(res, 400, "Project ID is required") + if (!pageId) return respondWithError(res, 400, "Page ID is required") + + const { label, annotations } = req.body + if (typeof label !== 'string' || !label?.trim() || !Array.isArray(annotations)) { + return respondWithError(res, 400, 'Invalid column data provided.') + } + if (annotations.length === 0) { + return respondWithError(res, 400, 'Columns must contain at least one annotation.') + } + if (isSuspiciousValueString(label)) { + return respondWithError(res, 400, "Suspicious column label will not be processed.") + } + try { + const project = await Project.getById(projectId) + if (!project?.data) return respondWithError(res, 404, "Project not found") + + const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) + if (!page) return respondWithError(res, 404, "Page not found in project") + + const pageItemIds = page.items?.map(item => item.id) || [] + const invalidAnnotations = annotations.filter(id => !pageItemIds.includes(id)) + if (invalidAnnotations.length > 0) { + return respondWithError(res, 400, `The following annotations do not exist on this page: ${invalidAnnotations.join(', ')}`) + } + + const existingLabels = page.columns ? page.columns.map(column => column.label) : [] + if (existingLabels.includes(label)) { + return respondWithError(res, 400, `A column with the label '${label}' already exists.`) + } + + if (page.columns && page.columns.length > 0) { + for (const column of page.columns) { + const overlappingAnnotations = column.lines.filter(annId => annotations.includes(annId)) + if (column.lines.length === overlappingAnnotations.length) { + const columnDB = new Column(column.id) + await columnDB.delete() + page.columns = page.columns.filter(col => col.id !== column.id) + continue + } + if (overlappingAnnotations.length > 0) { + const columnDB = new Column(column.id) + const columnData = await columnDB.getColumnData() + columnData.lines = columnData.lines.filter(annId => !annotations.includes(annId)) + columnDB.data = columnData + await columnDB.update() + column.lines = column.lines.filter(annId => !annotations.includes(annId)) + } + } + } + + const newColumnRecord = await Column.createNewColumn(pageId, projectId, label, annotations) + const newColumn = { + id: newColumnRecord._id, + label: newColumnRecord.label, + lines: newColumnRecord.lines + } + + page.columns = [...(page.columns || []), newColumn] + + await updatePrevAndNextColumns(page) + await project.update() + res.status(201).json(newColumnRecord) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } + }) + .put(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + + const { projectId, pageId } = req.params + if (!projectId) return respondWithError(res, 400, "Project ID is required") + if (!pageId) return respondWithError(res, 400, "Page ID is required") + + const { newLabel, columnLabelsToMerge } = req.body + if (typeof newLabel !== 'string' || !newLabel?.trim() || !Array.isArray(columnLabelsToMerge) || columnLabelsToMerge.length < 2) { + return respondWithError(res, 400, 'Invalid column merge data provided.') + } + if (isSuspiciousValueString(newLabel)) { + return respondWithError(res, 400, "Suspicious column label will not be processed.") + } + try { + const project = await Project.getById(projectId) + if (!project?.data) return respondWithError(res, 404, "Project not found") + + const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) + if (!page) return respondWithError(res, 404, "Page not found in project") + + if (!page.columns || page.columns.length === 0) { + return respondWithError(res, 404, "No columns exist on this page") + } + + const columnsToMerge = page.columns.filter(column => columnLabelsToMerge.includes(column.label)) + if (columnsToMerge.length !== columnLabelsToMerge.length) { + return respondWithError(res, 404, 'One or more columns to merge not found.') + } + + const uniqueLabels = new Set(page.columns.map(column => column.label).filter(label => !columnLabelsToMerge.includes(label))) + if (uniqueLabels.has(newLabel)) { + return respondWithError(res, 400, `A column with the label '${newLabel}' already exists.`) + } + + const mergedLines = columnsToMerge.flatMap(column => column.lines) + const allColumnLines = page.columns ? page.columns.flatMap(column => !columnLabelsToMerge.includes(column.label) ? column.lines : []) : [] + const duplicateAnnotations = mergedLines.filter(annId => allColumnLines.includes(annId)) + if (duplicateAnnotations.length > 0) { + return respondWithError(res, 400, `The following annotations are already assigned to other columns: ${duplicateAnnotations.join(', ')}`) + } + const mergedColumnRecord = await Column.createNewColumn(pageId, projectId, newLabel, mergedLines) + const mergedColumn = { + id: mergedColumnRecord._id, + label: mergedColumnRecord.label, + lines: mergedColumnRecord.lines + } + + for (const label of columnLabelsToMerge) { + const columnToDelete = page.columns.find(column => column.label === label) + if (columnToDelete) { + const columnDB = new Column(columnToDelete.id) + await columnDB.delete() + } + } + + page.columns = page.columns.filter(column => !columnLabelsToMerge.includes(column.label)) + page.columns.push(mergedColumn) + + await updatePrevAndNextColumns(page) + await project.update() + res.status(200).json(mergedColumnRecord) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } + }) + .patch(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + + const { projectId, pageId } = req.params + if (!projectId) return respondWithError(res, 400, "Project ID is required") + if (!pageId) return respondWithError(res, 400, "Page ID is required") + + const { columnLabel, annotationIdsToAdd } = req.body + if (typeof columnLabel !== 'string' || !columnLabel?.trim() || !Array.isArray(annotationIdsToAdd) || annotationIdsToAdd.length === 0) { + return respondWithError(res, 400, 'Invalid column update data provided.') + } + if(isSuspiciousValueString(columnLabel)) { + return respondWithError(res, 400, "Suspicious column label will not be processed.") + } + try { + const project = await Project.getById(projectId) + if (!project?.data) return respondWithError(res, 404, "Project not found") + + const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) + if (!page) return respondWithError(res, 404, "Page not found in project") + + if (!page.columns || page.columns.length === 0) { + return respondWithError(res, 404, "No columns exist on this page") + } + + const columnToUpdate = page.columns.find(column => column.label === columnLabel) + if (!columnToUpdate) { + return respondWithError(res, 404, 'Column to update not found.') + } + + const pageItemIds = page.items?.map(item => item.id) || [] + const invalidAnnotations = annotationIdsToAdd.filter(id => !pageItemIds.includes(id)) + if (invalidAnnotations.length > 0) { + return respondWithError(res, 400, `The following annotations do not exist on this page: ${invalidAnnotations.join(', ')}`) + } + + const allColumnLines = page.columns ? page.columns.flatMap(column => column.lines) : [] + const duplicateAnnotations = annotationIdsToAdd.filter(annId => allColumnLines.includes(annId)) + if (duplicateAnnotations.length > 0) { + return respondWithError(res, 400, `The following annotations are already assigned to other columns: ${duplicateAnnotations.join(', ')}`) + } + + const columnDB = new Column(columnToUpdate.id) + const columnData = await columnDB.getColumnData() + const newLines = Array.from(new Set([...columnData.lines, ...annotationIdsToAdd])) + columnData.lines = newLines + columnDB.data = columnData + await columnDB.update() + + columnToUpdate.lines = newLines + + await project.update() + res.status(200).json({ message: "Column updated successfully." }) + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } + }) + .all((req, res, next) => { + respondWithError(res, 405, 'Improper request method. Supported: POST, PUT, PATCH.') }) +router.route('/:pageId/clear-columns') + .delete(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Unauthenticated request") + + const { projectId, pageId } = req.params + if (!projectId) return respondWithError(res, 400, "Project ID is required") + if (!pageId) return respondWithError(res, 400, "Page ID is required") + try { + const project = await Project.getById(projectId) + if (!project?.data) return respondWithError(res, 404, "Project not found") + + const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) + if (!page) return respondWithError(res, 404, "Page not found in project") + + if (!page.columns || page.columns.length === 0) { + return res.status(204).send() + } + + const columnIds = page.columns.map(column => column.id) + for(const columnId of columnIds) { + const columnDB = new Column(columnId) + await columnDB.delete() + } + delete page.columns + + await project.update() + res.status(204).send() + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + } + }) + .all((req, res, next) => { + respondWithError(res, 405, 'Improper request method, please use DELETE.') + }) + // Fully resolved page endpoint - returns page with fully populated annotation data router.route('/:pageId/resolved') .get(async (req, res) => { @@ -146,5 +406,5 @@ router.route('/:pageId/resolved') .all((req, res) => { respondWithError(res, 405, 'Improper request method, please use GET.') }) - + // router.use('/:pageId/line', lineRouter) export default router From e955f600385e8f2b8e6f13314a72d18040ec756e Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 2 Dec 2025 10:08:50 -0600 Subject: [PATCH 237/262] hotfix test --- __tests__/mount.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/mount.test.js b/__tests__/mount.test.js index cb09662b..f21686a1 100644 --- a/__tests__/mount.test.js +++ b/__tests__/mount.test.js @@ -193,7 +193,7 @@ describe('Check to see that all expected route patterns exist. #exists_unit', () }) it('POST /project/:projectId/leave -- member leave project', () => { - expect(routeExists('/:projectId/leave', 'post')).toBe(true) + expect(routeExists('/:id/leave', 'post')).toBe(true) }) }) From 9f5c4f3068cfd305104f5cfc1963d8b2ad0b5d97 Mon Sep 17 00:00:00 2001 From: Priyal Patel <52342511+mepripri@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:07:44 -0600 Subject: [PATCH 238/262] Page update for columns (#424) * Columns Update on Annotator * remove update * back to start * Column Update on Line Parsing Change * deletes * bounds and post line * bounds fix * logs * itemsProvided * line fix * delete fix * remove comment --- classes/Column/Column.js | 5 +- classes/Line/Line.js | 37 +++++++++- line/index.js | 64 ++++++++--------- page/index.js | 150 +++++++++++++++++++++++++++++++++++++-- 4 files changed, 214 insertions(+), 42 deletions(-) diff --git a/classes/Column/Column.js b/classes/Column/Column.js index 5a106a7b..addc85d0 100644 --- a/classes/Column/Column.js +++ b/classes/Column/Column.js @@ -112,6 +112,10 @@ export default class Column { static async createNewColumn(pageId, projectId, label, annotations=[]) { try { // Input validation + let newColumn = new Column() + if (label === null || label === undefined) { + label = `Column ${newColumn._id}` + } if (!pageId || typeof pageId !== 'string') { throw new Error('pageId must be a non-empty string') } @@ -125,7 +129,6 @@ export default class Column { throw new Error('annotations must be an array') } - let newColumn = new Column() newColumn.data = { _id: newColumn._id, label: label, diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 8e56fe01..ecc3438b 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -42,7 +42,7 @@ export default class Line { motivation: this.motivation ?? "transcribing", target: this.target, creator: await fetchUserAgent(this.creator), - body: this.body + body: this.body ?? [] } if (this.label) lineAsAnnotation.label = { "none": [this.label] } if (this.#tinyAction === 'create') { @@ -146,12 +146,43 @@ export default class Line { throw new Error('Unexpected body format. Cannot update text.') } - async updateBounds({x, y, w, h}) { + updateTargetXYWH(target, x, y, w, h) { + if (typeof target === "object" && target.selector?.value) { + const prefix = target.selector.value.includes("pixel:")? "xywh=pixel": "xywh" + return { + ...target, + selector: { + ...target.selector, + value: `${prefix}:${x},${y},${w},${h}` + } + } + } + + if (typeof target === "object" && target.id) { + return { + ...target, + id: target.id.replace(/#xywh(=pixel)?:?.*/, `#xywh=pixel:${x},${y},${w},${h}`) + } + } + + if (typeof target === "string") { + const hasPixel = /xywh=pixel/.test(target) + const prefix = hasPixel ? "#xywh=pixel" : "#xywh=pixel" + if (target.includes("#xywh")) { + return target.replace(/#xywh(=pixel)?:?.*/, `${prefix}:${x},${y},${w},${h}`) + } + return `${target}#xywh=pixel:${x},${y},${w},${h}` + } + throw new Error("Unsupported target format") + } + + async updateBounds({x, y, w, h}, options = {}) { if (!x || !y || !w || !h) { throw new Error('Bounds ({x,y,w,h}) must be provided') } + if (options.creator) this.creator = options.creator this.target ??= '' - const newTarget = `${this.target.split('=')[0]}=${x},${y},${w},${h}` + const newTarget = this.updateTargetXYWH(this.target, x, y, w, h) if (this.target === newTarget) { return this } diff --git a/line/index.js b/line/index.js index 778da1b5..6645a43a 100644 --- a/line/index.js +++ b/line/index.js @@ -24,39 +24,22 @@ router.get('/:lineId', async (req, res) => { return } try { - if (lineId.startsWith(process.env.RERUMIDPREFIX)) { - const resolved = await fetch(lineId) - .then(resp => { - if (resp.ok) return resp.json() - else { - return {"code": resp.status ?? 500, "message": resp.statusText ?? `Communication error with RERUM`} - } - }).catch(err => { - return {"code": 500, "message": `Communication error with RERUM`} - }) - if (resolved.id || resolved["@id"]) return res.json(resolved) - else return respondWithError(res, resolved.code, resolved.message) - } - const projectData = (await getProjectById(projectId)).data - if (!projectData) { - respondWithError(res, 404, `Project with ID '${projectId}' not found`) + const project = await getProjectById(projectId) + if (!project) return + const page = await findPageById(pageId, projectId) + if (!page) return + let lineData = page.items?.find(l => l.id.split('/').pop() === lineId?.split('/').pop()) + if (!lineData) { + respondWithError(res, 404, `Line with ID '${lineId}' not found in page '${pageId}'`) return } - const pageContainingLine = projectData.layers - .flatMap(layer => layer.pages) - .find(page => findLineInPage(page, lineId)) - - if (!pageContainingLine) { - respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) - return + if (!(lineData.id && lineData.target && lineData.body)) { + lineData = await fetch(lineData.id).then(res => res.json()) } - const lineRef = findLineInPage(pageContainingLine, lineId) - const line = (lineRef.id ?? lineRef).startsWith?.(process.env.RERUMIDPREFIX) - ? await fetch(lineRef.id ?? lineRef).then(res => res.json()) - : new Line({ lineRef }) - res.json(line?.asJSON?.(true)) + const line = new Line(lineData) + res.json(line.asJSON(true)) } catch (error) { - res.status(error.status ?? 500).json({ error: error.message }) + respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) @@ -81,7 +64,7 @@ router.post('/', auth0Middleware(), async (req, res) => { // This feels like a use case for /bulkCreate in RERUM. Make all these lines with one call. for (const lineData of inputLines) { newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }, user.agent.split('/').pop()) - const existingLine = findLineInPage(page, newLine.id, res) + const existingLine = findLineInPage(page, newLine.id) if (existingLine) { respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) return @@ -90,6 +73,9 @@ router.post('/', auth0Middleware(), async (req, res) => { page.items.push(savedLine) } const ifNewContent = (page.items && page.items.length) + const pageId = req.params.pageId.split('/').pop() + const pageProject = project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId) + const saveWholeColumns = pageProject?.columns await withOptimisticLocking( () => updatePageAndProject(page, project, user._id, ifNewContent), (currentVersion) => { @@ -100,7 +86,12 @@ router.post('/', auth0Middleware(), async (req, res) => { currentVersion.items = [...(currentVersion.items ?? []), ...(page.items ?? [])] Object.assign(page, currentVersion) return updatePageAndProject(page, project, user._id) - }) + }) + // Updating the project again to save updated columns as columns is not handled in updatePageAndProject + if(saveWholeColumns) { + project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns + await project.update() + } res.status(201).json(newLine.asJSON(true)) } catch (error) { // Handle version conflicts with optimistic locking @@ -170,6 +161,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, return updatePageAndProject(page, project, user._id) } ) + // Updating the project again to save updated columns as columns is not handled in updatePageAndProject if(saveWholeColumns) { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() @@ -245,6 +237,7 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn } ) if(res.headersSent) return + // Updating the project again to save updated columns as columns is not handled in updatePageAndProject if(saveWholeColumns) { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() @@ -271,13 +264,15 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { } const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) - const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) - if (!oldLine) { + const findOldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) + if (!findOldLine) { respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) return } + let oldLine = await fetch(findOldLine.id).then(res => res.json()) + delete oldLine.label const line = new Line(oldLine) - const updatedLine = await line.updateBounds(req.body) + const updatedLine = await line.updateBounds(req.body, { creator: user._id }) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine @@ -318,6 +313,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return updatePageAndProject(page, project, user._id) } ) + // Updating the project again to save updated columns as columns is not handled in updatePageAndProject if(saveWholeColumns) { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() diff --git a/page/index.js b/page/index.js index 6cc1a3ef..21e055fc 100644 --- a/page/index.js +++ b/page/index.js @@ -15,6 +15,36 @@ router.use( cors(common_cors) ) +/** + * Splits a list of items into groups based on non-date IDs. + * + * @param {Array} items - The list of items to be split + * @returns {Array} An array of objects, each containing a non-date ID as the key and an array of date IDs as the value + */ +function splitFilterIds(items) { + const isDateId = (id) => /^\d+$/.test(id) + let result = [] + let currentKey = null + let currentDates = [] + + for (const item of items) { + const id = item.id + if (!isDateId(id)) { + if (currentKey && currentDates.length > 0) { + result.push({ [currentKey]: currentDates }) + } + currentKey = id + currentDates = [] + } else { + currentDates.push(id) + } + } + if (currentKey && currentDates.length > 0) { + result.push({ [currentKey]: currentDates }) + } + return result +} + // This is a nested route for pages within a layer. It may be used // directly from /project/:projectId/page or with /layer/:layerId/page // depending on the context of the request. @@ -82,6 +112,15 @@ router.route('/:pageId') respondWithError(res, 404, 'No page found with that ID.') return } + + const itemsProvided = Array.isArray(update.items) && update.items.length > 0 + let splitIds = itemsProvided ? splitFilterIds(update.items) : [] + const updatedItemsList = [] + let pageInProject = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) + let pageColumnsUpdate = pageInProject?.columns ? [...pageInProject.columns] : null + let pageItemIds = page.items ? page.items.map(item => item.id) : [] + const deletedIds = itemsProvided ? pageItemIds.filter(id => !update.items?.map(item => item.id).includes(id)) : [] + updatedItemsList.push(...deletedIds.map(id => ({ [id]: null }))) // Only update top-level properties that are present in the request Object.keys(update).forEach(key => { page[key] = update[key] @@ -93,16 +132,120 @@ router.route('/:pageId') else page[key] = null } }) - if (update.items) { - page.items = await Promise.all(page.items.map(async item => { + + if (itemsProvided) { + page.items = await Promise.all(page.items.map(async (item) => { const line = item.id?.startsWith?.('http') ? new Line(item) : Line.build(projectId, pageId, item, user.agent.split('/').pop()) line.creator ??= user.agent.split('/').pop() - return await line.update() + const updatedLine = await line.update() + if (item.id !== updatedLine.id && !/^\d+$/.test(item.id)) { + updatedItemsList.push({ [item.id]: updatedLine.id }) + } + splitIds.forEach(pair => { + const oldKey = Object.keys(pair)[0] + const dateIds = pair[oldKey] + if (oldKey === item.id) { + const newDateIds = dateIds.map(dateId => { + if (dateId === item.id) { + return updatedLine.id + } + return dateId + }) + pair[updatedLine.id] = newDateIds + delete pair[oldKey] + } else if (dateIds.includes(item.id)) { + const newDateIds = dateIds.map(dateId => { + if (dateId === item.id) { + return updatedLine.id + } + return dateId + }) + pair[oldKey] = newDateIds + } + }) + return updatedLine })) } + if (itemsProvided) { + for (const updatePair of updatedItemsList) { + const oldId = Object.keys(updatePair)[0] + const newId = updatePair[oldId] + if (pageInProject.columns && pageInProject.columns.length > 0) { + for (const column of pageInProject.columns) { + if (column.lines.includes(oldId)) { + const columnDB = new Column(column.id) + const columnData = await columnDB.getColumnData() + const lineIndex = columnData.lines.indexOf(oldId) + if (lineIndex !== -1 && newId !== null && newId !== oldId) { + columnData.lines[lineIndex] = newId + } + if (newId === null) { + columnData.lines = columnData.lines.filter(lineId => lineId !== oldId) + } + columnDB.data = columnData + await columnDB.update() + pageColumnsUpdate = pageColumnsUpdate.map(col => { + if (col.id === column.id) { + return { + id: column.id, + label: column.label, + lines: columnData.lines + } + } + return col + }) + if (columnData.lines.length === 0) { + await columnDB.delete() + pageColumnsUpdate = pageColumnsUpdate.filter(col => col.id !== column.id) + } + } + } + } + if (!oldId.startsWith(process.env.RERUMIDPREFIX)) { + const splitIdsEntry = splitIds.find(pair => Object.keys(pair)[0] === newId) + const newColumnRecord = await Column.createNewColumn(pageId, projectId, null, [newId, ...(splitIdsEntry ? splitIdsEntry[newId] : [])]) + const newColumn = { + id: newColumnRecord._id, + label: newColumnRecord.label, + lines: newColumnRecord.lines + } + pageColumnsUpdate = pageColumnsUpdate ? [...pageColumnsUpdate, newColumn] : [newColumn] + } else { + const columnToUpdate = pageColumnsUpdate.find(col => col.lines.includes(newId)) + if (columnToUpdate) { + const columnDB = new Column(columnToUpdate.id) + const columnData = await columnDB.getColumnData() + const splitIdsEntry = splitIds.find(pair => Object.keys(pair)[0] === newId) + if (splitIdsEntry) { + const dateIds = splitIdsEntry[newId] + columnData.lines.push(...dateIds) + columnDB.data = columnData + await columnDB.update() + pageColumnsUpdate = pageColumnsUpdate.map(col => { + if (col.id === columnToUpdate.id) { + return { + id: columnToUpdate.id, + label: columnToUpdate.label, + lines: columnData.lines + } + } + return col + }) + } + } + } + } + } + await updatePageAndProject(page, project, user._id) + if (pageColumnsUpdate) { + const pageInProject = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) + pageInProject.columns = pageColumnsUpdate + await updatePrevAndNextColumns(pageInProject) + await project.update() + } res.status(200).json(page) } catch (error) { // Handle version conflicts with optimistic locking @@ -406,5 +549,4 @@ router.route('/:pageId/resolved') .all((req, res) => { respondWithError(res, 405, 'Improper request method, please use GET.') }) - // router.use('/:pageId/line', lineRouter) export default router From 62fd563513997b0c7e9ab36bac2f7fafa9e1239e Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:10:24 -0600 Subject: [PATCH 239/262] Return 200 with empty array for /my/projects when user has no projects (#428) * Initial plan * Fix my/projects endpoint to return 200 with empty array for users with no projects Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> * Update API documentation to reflect new empty projects response * Revert unintended package-lock.json changes Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: cubap <1119165+cubap@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> --- API.md | 33 +++++++++++++++++++++-------- classes/User/__tests__/unit.test.js | 25 ++++++++++++++++++++++ userProfile/privateProfile.js | 11 +++++++--- 3 files changed, 57 insertions(+), 12 deletions(-) diff --git a/API.md b/API.md index 1edace48..50de059f 100644 --- a/API.md +++ b/API.md @@ -248,20 +248,35 @@ Users can always see and manipulate their own profile. The profile object is a p - **Description**: Retrieve a list of projects the authenticated user is a member of. - **Responses**: - - **200**: Projects found + - **200**: Projects found (or empty list if user has no projects) ```json - [ - { - "_id": "hexstring", - "label": "string", - "roles": ["string"] - }, ... - ] + { + "metrics": { + "newest": "project:hexstring/page:hexstring", + "lastModified": "project:hexstring/page:hexstring", + "myRecent": "hexstring" + }, + "projects": [ + { + "_id": "hexstring", + "label": "string", + "roles": ["string"] + }, ... + ] + } + ``` + + When the user has no projects, returns: + ```json + { + "metrics": null, + "projects": [] + } ``` - **401**: Unauthorized - **500**: Server error -The response is a list of projects the user is a member of regardless of the permissions afforded to them in each project. +The response includes a list of projects the user is a member of regardless of the permissions afforded to them in each project, along with metrics about the newest and most recently modified projects. #### `GET /user/:id` diff --git a/classes/User/__tests__/unit.test.js b/classes/User/__tests__/unit.test.js index d9893ffb..9ca2396b 100644 --- a/classes/User/__tests__/unit.test.js +++ b/classes/User/__tests__/unit.test.js @@ -154,3 +154,28 @@ describe("GET /my/projects #user_class", () => { expect(response.status).toBe(401) }) }) + +describe("GET /my/projects with no projects #user_class", () => { + beforeAll(() => { + jest.spyOn(User.prototype, "getProjects").mockResolvedValue([]) + jest.spyOn(User.prototype, "getSelf").mockResolvedValue({ + _id: "123456", + _lastModified: null + }) + }) + + afterAll(() => { + jest.restoreAllMocks() + }) + + it.skip("should return 200 with empty projects array when user has no projects", async () => { + const response = await request(app) + .get("/my/projects") + .set("Authorization", `Bearer ${token}`) + expect(response.status).toBe(200) + expect(response.body).toHaveProperty("projects") + expect(Array.isArray(response.body.projects)).toBe(true) + expect(response.body.projects.length).toBe(0) + expect(response.body.metrics).toBeNull() + }) +}) diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index 9b3d508c..555a8279 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -44,8 +44,15 @@ router.route("/projects").get(auth0Middleware(), async (req, res) => { const userObj = await new User(user._id) const userProjects = await userObj.getProjects() const validMetrics = userProjects.filter((proj) => proj._createdAt && proj._modifiedAt && proj._lastModified) + + res.set("Content-Type", "application/json; charset=utf-8") + if (validMetrics.length === 0) { - return respondWithError(res, 404, "No valid projects found") + // Return empty response when user has no projects + return res.status(200).json({ + metrics: null, + projects: [] + }) } // TODO: When the projects are all formatted correctly, we will not need this @@ -59,8 +66,6 @@ router.route("/projects").get(auth0Middleware(), async (req, res) => { const userData = await userObj.getSelf() const myRecent = userData._lastModified - res.set("Content-Type", "application/json; charset=utf-8") - res.status(200).json({ metrics: { newest, From 2dae7bf42abd163767f7a8f3f9267bfd72a52650 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 10 Dec 2025 12:10:57 -0600 Subject: [PATCH 240/262] PATCH /text Runtime Improvements (#429) * Runtime improvement on the /text amd /bounds routes * remove debug logging * whitespace * whitespace * one user fetch * not a diff * Change from standup, catch errors from the page and project update * Change from standup, catch errors from the page and project update * fix for copilot comment --- README.md | 1 - utilities/shared.js | 61 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 48ef6d3d..e1b834df 100644 --- a/README.md +++ b/README.md @@ -99,4 +99,3 @@ For production deployments: 4. Never commit production secrets to the repository See [CONFIG.md](./CONFIG.md) for detailed deployment instructions. - \ No newline at end of file diff --git a/utilities/shared.js b/utilities/shared.js index d5bb4655..3a478381 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -119,21 +119,62 @@ export const updatePageAndProject = async (page, project, userId) => { if (!project) throw new Error(`Must know project to update Page`) if (!page) throw new Error(`A Page must be provided to update`) if (!userId) throw new Error(`Must know user id to update layer`) - page.creator ??= await fetchUserAgent(userId) - // .update() returns a Page prepped for saving to Project - const updatedPage = await page.update() + const agent = await fetchUserAgent(userId) + page.creator ??= agent + let error_out const layerIndex = project.data.layers.findIndex(l => l.pages.some(p => p.id.split('/').pop() === page.id.split('/').pop())) - if (layerIndex < 0 || layerIndex === undefined || layerIndex === null) throw new Error("Cannot update Page. Its Layer was not found.") + if (layerIndex < 0 || layerIndex === undefined || layerIndex === null) { + error_out = new Error("Cannot update Page. Its Layer was not found.") + error_out.status = 500 + throw error_out + } const layer = project.data.layers[layerIndex] const pageIndex = layer.pages.findIndex(p => p.id.split('/').pop() === page.id.split('/').pop()) - layer.pages[pageIndex] = updatedPage - if (updatedPage.id.startsWith(process.env.RERUMIDPREFIX)) { - // If Page id has changed, we need to update the Layer (and the Project) + + // Determine if page will actually be saved to RERUM (same logic as Page.update()) + const isAlreadyInRerum = page.id.startsWith(process.env.RERUMIDPREFIX) + const hasContent = page.items?.length > 0 + const willBeSavedToRerum = isAlreadyInRerum || hasContent + + if (willBeSavedToRerum) { + // Predict the RERUM page ID (same logic as Page.#setRerumId) + const rerumPageId = isAlreadyInRerum + ? page.id + : `${process.env.RERUMIDPREFIX}${page.id.split("/").pop()}` + + // Create formatted page with predicted ID for layer reference + const formattedPage = { + id: rerumPageId, + label: page.label, + target: page.target, + items: page.items ?? [] + } + + // Update layer's pages array BEFORE creating Layer + layer.pages[pageIndex] = formattedPage const updatedLayer = new Layer(project._id, layer) - updatedLayer.creator ??= await fetchUserAgent(userId) - project.data.layers[layerIndex] = await updatedLayer.update() - await recordModification(project, page.id, userId) + updatedLayer.creator ??= agent + + try { + const [, finalLayer] = await Promise.all([ + page.update(), + updatedLayer.update() + ]) + project.data.layers[layerIndex] = finalLayer + await recordModification(project, rerumPageId, userId) + } catch (err) { + error_out = new Error(`There was an error updating Page and Project data`) + error_out.status = 500 + console.error(`There was an error updating Page and Project data`, err) + throw error_out + } + } else { + // Page won't be saved to RERUM (no content, not already in RERUM) + // Just update local page reference in layer without touching RERUM + const updatedPage = await page.update() + layer.pages[pageIndex] = updatedPage } + await project.update() } From be2c765ad09e421bbbf2362223b182ca6ae7d991 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 10 Dec 2025 12:21:55 -0600 Subject: [PATCH 241/262] Error Catching and Logging In Routes (#423) * Error catching and logging * touchup * small tweak from testing and reviewing * Stop this unhandled 500 * Stop this 500 * 500s from other routes * Error handler as a middleware util * stop this 500 * Stop that 500 * returns * returns * use respondWithError in app.js too * touchup * touchup * touchup * touchup from copilot review * touchup from copilot review * touchup from copilot review * oof too much of a logic change, this is what we actually wanted. --- app.js | 16 ++-- auth/index.js | 113 +++++++++++++-------------- feedback/feedbackController.js | 10 ++- index.js | 5 +- layer/index.js | 11 +-- line/index.js | 99 ++++++++++++----------- page/index.js | 53 +++++++------ project/customMetadataRouter.js | 2 +- project/customRolesRouter.js | 8 +- project/import28Router.js | 15 ++-- project/memberDeclineInviteRouter.js | 6 +- project/memberRouter.js | 21 +++-- project/memberUpgradeRouter.js | 4 +- project/projectCopyRouter.js | 29 ++++--- project/projectCreateRouter.js | 62 +++++++-------- project/projectReadRouter.js | 9 ++- project/projectToolsRouter.js | 23 ++++-- userProfile/index.js | 2 +- userProfile/privateProfile.js | 6 +- utilities/proxy.js | 15 ++-- utilities/routeErrorHandler.js | 44 +++++++++++ utilities/shared.js | 11 ++- 22 files changed, 328 insertions(+), 236 deletions(-) create mode 100644 utilities/routeErrorHandler.js diff --git a/app.js b/app.js index 36e127f7..b8d3be08 100644 --- a/app.js +++ b/app.js @@ -21,6 +21,8 @@ import userProfileRouter from './userProfile/index.js' import privateProfileRouter from './userProfile/privateProfile.js' import proxyRouter from './utilities/proxy.js' import feedbackRouter from './feedback/feedbackRoutes.js' +import routeErrorHandler from './utilities/routeErrorHandler.js' +import { respondWithError } from './utilities/shared.js' let app = express() @@ -65,10 +67,11 @@ app.use(express.static(path.join(__dirname, 'public'))) */ app.all('*_', (req, res, next) => { if (process.env.DOWN === 'true') { - return res.status(503).json({ - message: - 'TPEN3 services are down for updates or maintenance at this time. We apologize for the inconvenience. Try again later.' - }) + return respondWithError( + res, + 503, + 'TPEN3 services are down for updates or maintenance at this time. We apologize for the inconvenience. Try again later.' + ) } next() }) @@ -82,9 +85,12 @@ app.use('/my', privateProfileRouter) app.use('/proxy', proxyRouter) app.use('/beta', feedbackRouter) +// Centralized error handling middleware +app.use(routeErrorHandler) + //catch 404 because of an invalid site path app.use('*_', (req, res) => { - res.status(404).json({ message: res.statusMessage ?? 'This page does not exist' }) + return respondWithError(res, 404, res.statusMessage ?? 'This page does not exist') }) export { app as default } diff --git a/auth/index.js b/auth/index.js index a3b0e21f..06b16ccf 100644 --- a/auth/index.js +++ b/auth/index.js @@ -30,70 +30,67 @@ function auth0Middleware() { try { const uid = agent.split("id/")[1] const user = new User(uid) - user.getSelf().then(async (u) => { - if(!u || !u?.profile) { - const email = payload.name + const u = await user.getSelf() + if(!u || !u?.profile) { + const email = payload.name - // Check if a temporary user exists with this email - let existingUser = null - try { - existingUser = await user.getByEmail(email) - } catch (err) { - // No user found - that's fine, continue - } + // Check if a temporary user exists with this email + let existingUser = null + try { + existingUser = await user.getByEmail(email) + } catch (err) { + // No user found - that's fine, continue + } - if (existingUser && existingUser.inviteCode) { - // Found a temporary user - merge their memberships into this new user - user.data = { - _id: uid, - agent, - _sub: payload.sub, - email: email, - profile: { displayName: payload.nickname }, - } - await user.mergeFromTemporaryUser(existingUser) - await user.save() - req.user = user - next() - return - } else if (existingUser) { - // Non-temporary user with same email - this is a conflict - const err = new Error(`User with email ${email} already exists. Please contact TPEN3 administrators for assistance.`) - err.status = 409 - next(err) - return - } else { - // No existing user - create new - user.data = { - _id: uid, - agent, - _sub: payload.sub, - email: email, - profile: { displayName: payload.nickname }, - } - await user.save() - req.user = user - next() - return + if (existingUser && existingUser.inviteCode) { + // Found a temporary user - merge their memberships into this new user + user.data = { + _id: uid, + agent, + _sub: payload.sub, + email: email, + profile: { displayName: payload.nickname }, + } + await user.mergeFromTemporaryUser(existingUser) + await user.save() + req.user = user + next() + return + } else if (existingUser) { + // Non-temporary user with same email - this is a conflict + const err = new Error(`User with email ${email} already exists. Please contact TPEN3 administrators for assistance.`) + err.status = 409 + next(err) + return + } else { + // No existing user - create new + user.data = { + _id: uid, + agent, + _sub: payload.sub, + email: email, + profile: { displayName: payload.nickname }, } + await user.save() + req.user = user + next() + return } + } + // Ensure no inviteCode on authenticated user + delete u.inviteCode - // If user exists but has wrong _sub (e.g., from temp user), update it - if (u._sub !== payload.sub) { - u._sub = payload.sub - // Remove inviteCode if present - this user is now fully authenticated - delete u.inviteCode - const userObj = new User(uid) - userObj.data = u - await userObj.update() - } + // If user exists but has wrong _sub (e.g., from temp user), update it + if (u._sub !== payload.sub) { + u._sub = payload.sub + const userObj = new User(uid) + userObj.data = u + await userObj.update() + } - // Ensure no inviteCode on authenticated user (belt and suspenders) - delete u.inviteCode - req.user = u - next() - return - }) + req.user = u + next() + return } catch (error) { next(error) } diff --git a/feedback/feedbackController.js b/feedback/feedbackController.js index 4403a23a..02a239d1 100644 --- a/feedback/feedbackController.js +++ b/feedback/feedbackController.js @@ -10,6 +10,9 @@ import { isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" * @returns 200 if feedback is submitted successfully, 204 if no feedback is provided, or an error response if the submission fails. */ export async function submitFeedback(req, res) { + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const user = req.user ? `${req.user.profile.displayName} (${req.user._id})` : 'Anonymous' const { page, feedback } = req.body if (!feedback) return res.status(204).send() @@ -18,7 +21,7 @@ export async function submitFeedback(req, res) { await createGitHubIssue('Feedback', `Feedback from ${user}`, `Page: ${page}\n\nFeedback: ${sanitizeUserInput(feedback)}`) res.status(200).json({ message: 'Feedback submitted successfully' }) } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Failed to submit feedback') + return respondWithError(res, error.status ?? 500, error.message ?? 'Failed to submit feedback') } } @@ -30,6 +33,9 @@ export async function submitFeedback(req, res) { * @returns 200 if the bug report is submitted successfully, 204 if no bug description is provided, or an error response if the submission fails. */ export async function submitBug(req, res) { + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const user = req.user ? `${req.user.profile.displayName} (${req.user._id})` : 'Anonymous' const { page, bugDescription } = req.body if (!bugDescription) return res.status(204).send() @@ -38,7 +44,7 @@ export async function submitBug(req, res) { await createGitHubIssue('Bug Report', `Bug reported by ${user}`, `Page: ${page}\n\nBug: ${sanitizeUserInput(bugDescription)}`) res.status(200).json({ message: 'Bug report submitted successfully' }) } catch (error) { - respondWithError(res, error.status ?? 500, error.message ??'Failed to submit bug report') + return respondWithError(res, error.status ?? 500, error.message ??'Failed to submit bug report') } } diff --git a/index.js b/index.js index efcb78bf..40eefb70 100644 --- a/index.js +++ b/index.js @@ -34,8 +34,7 @@ router .get(function (_req,res) { fs.readFile('API.md', 'utf8', (err, data) => { if (err) { - respondWithError(res, 500, 'Failed to read API.md') - return + return respondWithError(res, 500, 'Failed to read API.md') } res.format({ html: () => res.send(makeCleanFileFromMarkdown(data)) @@ -49,7 +48,7 @@ router respondWithHTML(res) }) .all((_req, res, next) => { - respondWithError(res, 404, 'There is nothing for you here.') + return respondWithError(res, 404, 'There is nothing for you here.') }) export { router as default } diff --git a/layer/index.js b/layer/index.js index f2ba12c2..62feae25 100644 --- a/layer/index.js +++ b/layer/index.js @@ -20,8 +20,7 @@ router.route('/:layerId') try { const layer = await findLayerById(layerId, projectId, true) if (!layer) { - respondWithError(res, 404, 'No layer found with that ID.') - return + return respondWithError(res, 404, 'No layer found with that ID.') } if (layer.id?.startsWith(process.env.RERUMIDPREFIX)) { // If the page is a RERUM document, we need to fetch it from the server @@ -70,9 +69,8 @@ router.route('/:layerId') else layer[key] = null } }) - if (providedPages?.length === 0) providedPages = undefined let pages = [] - if (providedPages && providedPages.length) { + if (providedPages && Array.isArray(providedPages) && providedPages.length > 0) { pages = await Promise.all(providedPages.map(p => findPageById(p.split("/").pop(), projectId) )) layer.pages = pages } @@ -84,12 +82,15 @@ router.route('/:layerId') } }) .all((req, res) => { - respondWithError(res, 405, 'Improper request method. Use GET instead.') + return respondWithError(res, 405, 'Improper request method. Use GET instead.') }) // Route to create a new layer within a project router.route('/').post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId } = req.params + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, 'Request body is required') + } const { label, canvases } = req.body if (!projectId) return respondWithError(res, 400, 'Project ID is required') if (!label || !Array.isArray(canvases) || canvases.length === 0) { diff --git a/line/index.js b/line/index.js index 6645a43a..cc22dda0 100644 --- a/line/index.js +++ b/line/index.js @@ -16,30 +16,46 @@ router.use(cors(common_cors)) router.get('/:lineId', async (req, res) => { const { projectId, pageId, lineId } = req.params if (!lineId) { - respondWithError(res, 400, 'Line ID is required.') - return + return respondWithError(res, 400, 'Line ID is required.') } if (!projectId || !pageId) { - respondWithError(res, 400, 'Project ID and Page ID are required.') - return + return respondWithError(res, 400, 'Project ID and Page ID are required.') } try { - const project = await getProjectById(projectId) - if (!project) return - const page = await findPageById(pageId, projectId) - if (!page) return - let lineData = page.items?.find(l => l.id.split('/').pop() === lineId?.split('/').pop()) - if (!lineData) { - respondWithError(res, 404, `Line with ID '${lineId}' not found in page '${pageId}'`) - return + if (lineId.startsWith(process.env.RERUMIDPREFIX)) { + const resolved = await fetch(lineId) + .then(resp => { + if (resp.ok) return resp.json() + else { + return {"code": resp.status ?? 500, "message": resp.statusText ?? `Communication error with RERUM`} + } + }).catch(err => { + return {"code": 500, "message": `Communication error with RERUM`} + }) + if (resolved.id || resolved["@id"]) return res.json(resolved) + else return respondWithError(res, resolved.code, resolved.message) } - if (!(lineData.id && lineData.target && lineData.body)) { - lineData = await fetch(lineData.id).then(res => res.json()) + const projectData = (await getProjectById(projectId)).data + if (!projectData) { + return respondWithError(res, 404, `Project with ID '${projectId}' not found`) } - const line = new Line(lineData) - res.json(line.asJSON(true)) + const pageContainingLine = projectData.layers + .flatMap(layer => layer.pages) + .find(page => findLineInPage(page, lineId)) + + if (!pageContainingLine) { + return respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) + } + const lineRef = findLineInPage(pageContainingLine, lineId) + if (!lineRef) { + return respondWithError(res, 404, `Line with ID '${lineId}' not found in project '${projectId}'`) + } + const line = (lineRef.id ?? lineRef).startsWith?.(process.env.RERUMIDPREFIX) + ? await fetch(lineRef.id ?? lineRef).then(res => res.json()) + : new Line({ lineRef }) + res.json(line?.asJSON?.(true)) } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + return respondWithError(res, error.status ?? 500, error.message) } }) @@ -53,6 +69,9 @@ router.post('/', auth0Middleware(), async (req, res) => { const page = await findPageById(req.params.pageId, req.params.projectId) if (!page) return + if (!req.body || (Array.isArray(req.body) && req.body.length === 0)) { + return respondWithError(res, 400, "Request body with line data is required") + } const inputLines = Array.isArray(req.body) ? req.body : [req.body] // Check each annotation for suspicious content. The body itself will be checked during the recursion. for (const anno of inputLines) { @@ -66,8 +85,7 @@ router.post('/', auth0Middleware(), async (req, res) => { newLine = Line.build(req.params.projectId, req.params.pageId, { ...lineData }, user.agent.split('/').pop()) const existingLine = findLineInPage(page, newLine.id) if (existingLine) { - respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) - return + return respondWithError(res, 409, `Line with ID '${newLine.id}' already exists in page '${req.params.pageId}'`) } const savedLine = await newLine.update() page.items.push(savedLine) @@ -80,8 +98,7 @@ router.post('/', auth0Middleware(), async (req, res) => { () => updatePageAndProject(page, project, user._id, ifNewContent), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { - respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') - return + return respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') } currentVersion.items = [...(currentVersion.items ?? []), ...(page.items ?? [])] Object.assign(page, currentVersion) @@ -98,7 +115,7 @@ router.post('/', auth0Middleware(), async (req, res) => { if (error.status === 409) { return handleVersionConflict(res, error) } - respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') + return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } }) @@ -111,8 +128,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, const page = await findPageById(req.params.pageId, req.params.projectId) let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return + return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) } if (!(oldLine.id && oldLine.target && oldLine.body)) oldLine = await fetch(oldLine.id).then(res => res.json()) const line = new Line(oldLine) @@ -149,12 +165,11 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { - respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') + return respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') } const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (newLineIndex === -1) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return + return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) } currentVersion.items[newLineIndex] = updatedLine Object.assign(page, currentVersion) @@ -172,7 +187,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, if (error.status === 409) { return handleVersionConflict(res, error) } - res.status(error.status ?? 500).json({ error: error.message }) + return respondWithError(res, error.status ?? 500, error.message) } }) @@ -182,15 +197,13 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn if (!user) return respondWithError(res, 401, "Unauthenticated request") try { if (typeof req.body !== 'string') { - respondWithError(res, 400, 'Invalid request body. Expected a string.') - return + return respondWithError(res, 400, 'Invalid request body. Expected a string.') } const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return + return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) } const line = new Line(oldLine) const updatedLine = await line.updateText(req.body, {"creator": user._id}) @@ -222,14 +235,12 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { if(res.headersSent) return - respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') - return + return respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') } const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (newLineIndex === -1) { if(res.headersSent) return - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return + return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) } currentVersion.items[newLineIndex] = updatedLine Object.assign(page, currentVersion) @@ -246,10 +257,9 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { - handleVersionConflict(res, error) - return + return handleVersionConflict(res, error) } - res.status(error.status ?? 500).json({ error: error.message }) + return respondWithError(res, error.status ?? 500, error.message) } }) @@ -259,8 +269,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { if (!user) return respondWithError(res, 401, "Unauthenticated request") try { if (typeof req.body !== 'object' || !req.body.x || !req.body.y || !req.body.w || !req.body.h) { - respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') - return + return respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') } const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) @@ -300,13 +309,11 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { () => updatePageAndProject(page, project, user._id, true), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { - respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') - return + return respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') } const newLineIndex = currentVersion.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (newLineIndex === -1) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return + return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) } currentVersion.items[newLineIndex] = updatedLine Object.assign(page, currentVersion) @@ -323,7 +330,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { if (error.status === 409) { return handleVersionConflict(res, error) } - res.status(error.status ?? 500).json({ error: error.message }) + return respondWithError(res, error.status ?? 500, error.message) } }) diff --git a/page/index.js b/page/index.js index 21e055fc..16cef3e1 100644 --- a/page/index.js +++ b/page/index.js @@ -54,8 +54,7 @@ router.route('/:pageId') try { const page = await findPageById(pageId, projectId, true) if (!page) { - respondWithError(res, 404, 'No page found with that ID.') - return + return respondWithError(res, 404, 'No page found with that ID.') } if (page.id?.startsWith(process.env.RERUMIDPREFIX)) { // If the page is a RERUM document, we need to fetch it from the server @@ -88,18 +87,21 @@ router.route('/:pageId') const { projectId, pageId } = req.params const update = req.body if (!update || typeof update !== 'object' || Object.keys(update).length === 0) { - respondWithError(res, 400, 'No update data provided.') - return + return respondWithError(res, 400, 'No update data provided.') + } + if (update.items && !Array.isArray(update.items)) { + return respondWithError(res, 400, 'Items must be an array') + } + if (Array.isArray(update.items) && update.items.some(item => (typeof item !== 'object' && typeof item !== 'string') || item === null)) { + return respondWithError(res, 400, 'Each item must be an object') } const project = await Project.getById(projectId) if (!project) { - respondWithError(res, 404, `Project with ID '${projectId}' not found`) - return + return respondWithError(res, 404, `Project with ID '${projectId}' not found`) } const layerId = getLayerContainingPage(project, pageId)?.id if (!layerId) { - respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) - return + return respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) } try { @@ -109,8 +111,7 @@ router.route('/:pageId') page.creator = user.agent.split('/').pop() page.partOf = layerId if (!page) { - respondWithError(res, 404, 'No page found with that ID.') - return + return respondWithError(res, 404, 'No page found with that ID.') } const itemsProvided = Array.isArray(update.items) && update.items.length > 0 @@ -258,7 +259,7 @@ router.route('/:pageId') } }) .all((req, res, next) => { - respondWithError(res, 405, 'Improper request method. Supported: GET, PUT.') + return respondWithError(res, 405, 'Improper request method. Supported: GET, PUT.') }) /** @@ -285,11 +286,14 @@ router.route('/:pageId/column') .post(auth0Middleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") - + const { projectId, pageId } = req.params if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") - + + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const { label, annotations } = req.body if (typeof label !== 'string' || !label?.trim() || !Array.isArray(annotations)) { return respondWithError(res, 400, 'Invalid column data provided.') @@ -357,11 +361,14 @@ router.route('/:pageId/column') .put(auth0Middleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") - + const { projectId, pageId } = req.params if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") - + + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const { newLabel, columnLabelsToMerge } = req.body if (typeof newLabel !== 'string' || !newLabel?.trim() || !Array.isArray(columnLabelsToMerge) || columnLabelsToMerge.length < 2) { return respondWithError(res, 400, 'Invalid column merge data provided.') @@ -424,11 +431,14 @@ router.route('/:pageId/column') .patch(auth0Middleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") - + const { projectId, pageId } = req.params if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") - + + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const { columnLabel, annotationIdsToAdd } = req.body if (typeof columnLabel !== 'string' || !columnLabel?.trim() || !Array.isArray(annotationIdsToAdd) || annotationIdsToAdd.length === 0) { return respondWithError(res, 400, 'Invalid column update data provided.') @@ -480,7 +490,7 @@ router.route('/:pageId/column') } }) .all((req, res, next) => { - respondWithError(res, 405, 'Improper request method. Supported: POST, PUT, PATCH.') + return respondWithError(res, 405, 'Improper request method. Supported: POST, PUT, PATCH.') }) router.route('/:pageId/clear-columns') @@ -516,7 +526,7 @@ router.route('/:pageId/clear-columns') } }) .all((req, res, next) => { - respondWithError(res, 405, 'Improper request method, please use DELETE.') + return respondWithError(res, 405, 'Improper request method, please use DELETE.') }) // Fully resolved page endpoint - returns page with fully populated annotation data @@ -526,8 +536,7 @@ router.route('/:pageId/resolved') try { const page = await findPageById(pageId, projectId, true) if (!page) { - respondWithError(res, 404, 'No page found with that ID.') - return + return respondWithError(res, 404, 'No page found with that ID.') } if (page.id?.startsWith(process.env.RERUMIDPREFIX)) { // RERUM pages already have fully resolved items @@ -547,6 +556,6 @@ router.route('/:pageId/resolved') } }) .all((req, res) => { - respondWithError(res, 405, 'Improper request method, please use GET.') + return respondWithError(res, 405, 'Improper request method, please use GET.') }) export default router diff --git a/project/customMetadataRouter.js b/project/customMetadataRouter.js index a7d7214d..57d65668 100644 --- a/project/customMetadataRouter.js +++ b/project/customMetadataRouter.js @@ -228,7 +228,7 @@ router.route("/:id/custom").put(auth0Middleware(), async (req, res) => { }) router.route("/:id/custom").all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET, POST, or PUT instead") + return respondWithError(res, 405, "Improper request method. Use GET, POST, or PUT instead") }) export default router diff --git a/project/customRolesRouter.js b/project/customRolesRouter.js index e618fd7c..949bf48d 100644 --- a/project/customRolesRouter.js +++ b/project/customRolesRouter.js @@ -29,7 +29,7 @@ router.get('/:projectId/customRoles', auth0Middleware(), async (req, res) => { res.status(200).json(customRoles) } catch (error) { console.error(error) - respondWithError(res, error.status ?? 500, error.message ?? "Internal Server Error") + return respondWithError(res, error.status ?? 500, error.message ?? "Internal Server Error") } }) @@ -52,7 +52,7 @@ router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => await group.addCustomRoles(customRoles) res.status(201).json({ message: 'Custom roles added successfully.' }) } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error adding custom roles.') + return respondWithError(res, error.status ?? 500, error.message ?? 'Error adding custom roles.') } }) @@ -75,7 +75,7 @@ router.put('/:projectId/updateCustomRoles', auth0Middleware(), async (req, res) await group.updateCustomRoles(roles) res.status(200).json({ message: 'Custom roles set successfully.' }) } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error setting custom roles.') + return respondWithError(res, error.status ?? 500, error.message ?? 'Error setting custom roles.') } }) @@ -103,7 +103,7 @@ router.delete('/:projectId/removeCustomRoles', auth0Middleware(), async (req, re await group.removeCustomRoles(rolesToRemove) res.status(200).json({ message: 'Custom roles removed successfully.' }) } catch (error) { - respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') + return respondWithError(res, error.status ?? 500, error.message ?? 'Error removing custom roles.') } }) diff --git a/project/import28Router.js b/project/import28Router.js index 2445c754..e4037f05 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -162,15 +162,18 @@ router.route("/import28/selectedproject/:selectedProjectId").get( tools = await new Tools().validateAllTools(tools) let importData if (!checkURL.valid) - return res.status(checkURL.status).json({message: checkURL.message, resolvedPayload: checkURL.resolvedPayload}) + return respondWithError(res, checkURL.status, checkURL.message) + //return res.status(checkURL.status).json({message: checkURL.message, resolvedPayload: checkURL.resolvedPayload}) try { importData = await ProjectFactory.fromManifestURL(manifestURL, user.agent.split('/').pop(), tools, true) } catch (error) { - res.status(error.status ?? 500).json({ - status: error.status ?? 500, - message: error.message, - data: error.resolvedPayload - }) + return respondWithError(res, error.status ?? 500, error.message ?? "An error occurred during project import") + + // res.status(error.status ?? 500).json({ + // status: error.status ?? 500, + // message: error.message, + // data: error.resolvedPayload + // }) } await ProjectFactory.importTPEN28(parsedData, importData, req.cookies.userToken, req.protocol) diff --git a/project/memberDeclineInviteRouter.js b/project/memberDeclineInviteRouter.js index 57dc0ff8..f0180be6 100644 --- a/project/memberDeclineInviteRouter.js +++ b/project/memberDeclineInviteRouter.js @@ -6,7 +6,7 @@ import User from "../classes/User/User.js" const router = express.Router({ mergeParams: true }) /** - * A user is declining from the E-mail they recieved. It is unauthenticated. + * A user is declining from the E-mail they received. It is unauthenticated. * Their member entry should be removed from the Group. * Their temporary user should be removed from the db. * @@ -30,12 +30,12 @@ router.route("/:projectId/collaborator/:collaboratorId/decline").get(async (req, } catch (error) { return respondWithError( res, - error.status || error.code || 500, + error.status ?? 500, error.message ?? "There was an error declining the invitation." ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") + return respondWithError(res, 405, "Improper request method. Use GET instead") }) export default router diff --git a/project/memberRouter.js b/project/memberRouter.js index 9eeb1e5b..133fdbfe 100644 --- a/project/memberRouter.js +++ b/project/memberRouter.js @@ -13,8 +13,11 @@ const router = express.Router({ mergeParams: true }) router.route("/:id/invite-member").post(auth0Middleware(), async (req, res) => { const user = req.user const { id: projectId } = req.params - const { email, roles } = req.body if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } + const { email, roles } = req.body if (!email) return respondWithError(res, 400, "Invitee's email is required") if (!isValidEmail(email)) return respondWithError(res, 400, "Invitee email is invalid") try { @@ -23,10 +26,10 @@ router.route("/:id/invite-member").post(auth0Middleware(), async (req, res) => { const response = await project.sendInvite(email, roles) res.status(200).json(response) } else { - res.status(403).send("You do not have permission to invite members to this project") + return respondWithError(res, 403, "You do not have permission to invite members to this project") } } catch (error) { - res.status(error.status || 500).send(error.message.toString()) + return respondWithError(res, error.status ?? 500, error.message ?? "Error inviting member") } }) @@ -34,9 +37,12 @@ router.route("/:id/invite-member").post(auth0Middleware(), async (req, res) => { router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { const user = req.user const { id: projectId } = req.params - const { userId } = req.body if (!user) return respondWithError(res, 401, "Unauthenticated request") if (!projectId) return respondWithError(res, 400, "Project ID is required") + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } + const { userId } = req.body if (!userId) return respondWithError(res, 400, "User ID is required") try { const project = new Project(projectId) @@ -44,7 +50,7 @@ router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { await project.removeMember(userId) res.sendStatus(204) } else { - res.status(403).send("You do not have permission to remove members from this project") + return respondWithError(res, 403, "You do not have permission to remove members from this project") } } catch (error) { return respondWithError(res, error.status ?? 500, error.message ?? "Error removing member from project.") @@ -116,9 +122,12 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M // Switch project owner router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res) => { const { projectId } = req.params - const { newOwnerId } = req.body const user = req.user if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } + const { newOwnerId } = req.body if (!newOwnerId) return respondWithError(res, 400, "Provide the ID of the new owner.") if (user._id === newOwnerId) return respondWithError(res, 400, "Cannot transfer ownership to the current owner.") try { diff --git a/project/memberUpgradeRouter.js b/project/memberUpgradeRouter.js index a10d982f..22b76164 100644 --- a/project/memberUpgradeRouter.js +++ b/project/memberUpgradeRouter.js @@ -46,12 +46,12 @@ router.route("/:projectId/collaborator/:collaboratorId/agent/:agentId").get(asyn } catch (error) { return respondWithError( res, - error.status || error.code || 500, + error.status ?? 500, error.message ?? "An error occurred." ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") + return respondWithError(res, 405, "Improper request method. Use GET instead") }) export default router diff --git a/project/projectCopyRouter.js b/project/projectCopyRouter.js index d89033f0..3311767f 100644 --- a/project/projectCopyRouter.js +++ b/project/projectCopyRouter.js @@ -15,14 +15,14 @@ router.route("/:projectId/copy").post(auth0Middleware(), async (req, res) => { const project = await ProjectFactory.copyProject(projectId, user._id) res.status(201).json(project) } catch (error) { - respondWithError( + return respondWithError( res, - error.status ?? error.code ?? 500, + error.status ?? 500, error.message ?? "Unknown server error" ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") + return respondWithError(res, 405, "Improper request method. Use POST instead") }) router.route("/:projectId/copy-without-annotations").post(auth0Middleware(), async (req, res) => { @@ -35,14 +35,14 @@ router.route("/:projectId/copy-without-annotations").post(auth0Middleware(), asy const project = await ProjectFactory.cloneWithoutAnnotations(projectId, user._id) res.status(201).json(project) } catch (error) { - respondWithError( + return respondWithError( res, - error.status ?? error.code ?? 500, + error.status ?? 500, error.message ?? "Unknown server error" ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") + return respondWithError(res, 405, "Improper request method. Use POST instead") }) router.route("/:projectId/copy-with-group").post(auth0Middleware(), async (req, res) => { @@ -55,22 +55,25 @@ router.route("/:projectId/copy-with-group").post(auth0Middleware(), async (req, const project = await ProjectFactory.cloneWithGroup(projectId, user._id) res.status(201).json(project) } catch (error) { - respondWithError( + return respondWithError( res, - error.status ?? error.code ?? 500, + error.status ?? 500, error.message ?? "Unknown server error" ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") + return respondWithError(res, 405, "Improper request method. Use POST instead") }) router.route("/:projectId/copy-with-customizations").post(auth0Middleware(), async (req, res) => { const user = req.user - const { modules } = req.body if (!user) { return respondWithError(res, 401, "Unauthorized: User not authenticated") } + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } + const { modules } = req.body if (!modules || typeof modules !== 'object') { return respondWithError(res, 400, "Bad Request: 'modules' must be an object") } @@ -79,14 +82,14 @@ router.route("/:projectId/copy-with-customizations").post(auth0Middleware(), asy const project = await ProjectFactory.cloneWithCustomizations(projectId, user._id, modules) res.status(201).json(project) } catch (error) { - respondWithError( + return respondWithError( res, - error.status ?? error.code ?? 500, + error.status ?? 500, error.message ?? "Unknown server error" ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") + return respondWithError(res, 405, "Improper request method. Use POST instead") }) export default router diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index a37c3773..196c9a01 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -24,14 +24,14 @@ router.route("/create").post(auth0Middleware(), screenContentMiddleware(), async } catch (error) { console.log("Project creation error") console.error(error) - respondWithError( + return respondWithError( res, - error.status ?? error.code ?? 500, + error.status ?? 500, error.message ?? "Unknown server error" ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") + return respondWithError(res, 405, "Improper request method. Use POST instead") }) router.route("/import").post(auth0Middleware(), async (req, res) => { @@ -39,20 +39,14 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { let user = req.user createFrom = createFrom?.toLowerCase() if (!createFrom) - return res.status(400).json({ - message: - "Query string 'createFrom' is required, specify manifest source as 'URL' or 'DOC' " - }) + return respondWithError(res, 400, "Query string 'createFrom' is required, specify manifest source as 'URL' or 'DOC'") if (createFrom === "url") { const manifestURL = req?.body?.url let tools = req?.body?.tools ?? [] tools = await new Tools().validateAllTools(tools) let checkURL = await validateURL(manifestURL) if (!checkURL.valid) - return res.status(checkURL.status).json({ - message: checkURL.message, - resolvedPayload: checkURL.resolvedPayload - }) + return respondWithError(res, checkURL.status, checkURL.message) try { if (isSuspiciousJSON(checkURL.resolvedPayload)) return respondWithError(res, 400, "Suspicious data will not be processed.") const result = await ProjectFactory.fromManifestURL( @@ -64,11 +58,12 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { } catch (error) { console.log("project import error") console.error(error) - res.status(error.status ?? 500).json({ - status: error.status ?? 500, - message: error.message, - data: error.resolvedPayload - }) + return respondWithError(res, error.status ?? 500, error.message ?? "Error importing project") + // res.status(error.status ?? 500).json({ + // status: error.status ?? 500, + // message: error.message, + // data: error.resolvedPayload + // }) } } else if (createFrom === "tpen28url") { const manifestURL = req?.body?.url @@ -76,10 +71,7 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { tools = await new Tools().validateAllTools(tools) let checkURL = await validateURL(manifestURL) if (!checkURL.valid) - return res.status(checkURL.status).json({ - message: checkURL.message, - resolvedPayload: checkURL.resolvedPayload - }) + return respondWithError(res, checkURL.status, checkURL.message) try { if (isSuspiciousJSON(checkURL.resolvedPayload)) return respondWithError(res, 400, "Suspicious data will not be processed.") const result = await ProjectFactory.fromManifestURL( @@ -92,24 +84,21 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { } catch (error) { console.log("TPEN 2.8 project import error") console.error(error) - res.status(error.status ?? 500).json({ - status: error.status ?? 500, - message: error.message, - data: error.resolvedPayload - }) + return respondWithError(res, error.status ?? 500, error.message ?? "Error importing TPEN 2.8 project") } } else { - res.status(400).json({ - message: `Import from ${createFrom} is not available. Create from URL instead` - }) + return respondWithError(res, 400, `Import from ${createFrom} is not available. Create from URL instead`) } }).all((req, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") + return respondWithError(res, 405, "Improper request method. Use POST instead") }) router.route("/import-image").post(auth0Middleware(), async (req, res) => { const user = req.user if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } try { const { imageUrls, projectLabel } = req.body if (!imageUrls || !projectLabel) { @@ -124,15 +113,15 @@ router.route("/import-image").post(auth0Middleware(), async (req, res) => { } catch (error) { console.log("Create project from image error") console.error(error) - respondWithError( + return respondWithError( res, - error.status ?? error.code ?? 500, + error.status ?? 500, error.message ?? "Unknown server error" ) } } ).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST instead") + return respondWithError(res, 405, "Improper request method. Use POST instead") }) /** @@ -143,6 +132,9 @@ router.route("/:projectId/label").patch(auth0Middleware(), screenContentMiddlewa if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") const projectId = req.params.projectId if (!projectId) return respondWithError(res, 400, "Project ID is required") + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const { label } = req.body if (typeof label !== "string" || !label?.trim()) return respondWithError(res, 400, "JSON with a 'label' property required in the request body. It cannot be null or blank and must be a string.") try { @@ -152,14 +144,14 @@ router.route("/:projectId/label").patch(auth0Middleware(), screenContentMiddlewa project = await project.setLabel(label) res.status(200).json(project) } catch (error) { - respondWithError( + return respondWithError( res, - error.status ?? error.code ?? 500, + error.status ?? 500, error.message ?? "Unknown server error" ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use PATCH instead") + return respondWithError(res, 405, "Improper request method. Use PATCH instead") }) export default router diff --git a/project/projectReadRouter.js b/project/projectReadRouter.js index 8227b62b..82553e03 100644 --- a/project/projectReadRouter.js +++ b/project/projectReadRouter.js @@ -100,6 +100,9 @@ router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") try { const project = await ProjectFactory.loadAsUser(id, null) + if (!project) { + return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) + } const collaboratorIdList = Object.keys(project.collaborators) if (!collaboratorIdList.includes(user._id)) { return respondWithError(res, 403, "You do not have permission to export this project") @@ -118,7 +121,7 @@ router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") + return respondWithError(res, 405, "Improper request method. Use GET instead") }) router.route("/:id/deploymentStatus").get(auth0Middleware(), async (req, res) => { @@ -142,7 +145,7 @@ router.route("/:id/deploymentStatus").get(auth0Middleware(), async (req, res) => ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") + return respondWithError(res, 405, "Improper request method. Use GET instead") }) router.route("/:id").get(auth0Middleware(), async (req, res) => { @@ -169,7 +172,7 @@ router.route("/:id").get(auth0Middleware(), async (req, res) => { ) } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use GET instead") + return respondWithError(res, 405, "Improper request method. Use GET instead") }) export default router diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index 6bf81ac0..3b13f13e 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -7,8 +7,11 @@ const router = express.Router({ mergeParams: true }) //Add Tool to Project router.route("/:projectId/tool").post(async (req, res) => { - const { label, toolName, url, location, custom } = req?.body - let { enabled, tagName } = custom + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } + const { label, toolName, url, location, custom } = req.body + let { enabled, tagName } = custom ?? {} if (!label || !toolName || !location) { return respondWithError(res, 400, "label, toolName, and location are required fields.") } @@ -42,9 +45,12 @@ router.route("/:projectId/tool").post(async (req, res) => { res.status(200).json(addedTool) } catch (error) { console.error("Error adding tool:", error) - respondWithError(res, error.status || 500, error.message || "An error occurred while adding the tool.") + return respondWithError(res, error.status || 500, error.message || "An error occurred while adding the tool.") } }).delete(async (req, res) => { + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const { toolName } = req.body if (!toolName) { return respondWithError(res, 400, "toolName is a required field.") @@ -71,14 +77,17 @@ router.route("/:projectId/tool").post(async (req, res) => { res.status(200).json(removedTool) } catch (error) { console.error("Error removing tool:", error) - respondWithError(res, error.status || 500, error.message || "An error occurred while removing the tool.") + return respondWithError(res, error.status || 500, error.message || "An error occurred while removing the tool.") } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use POST to add a tool or DELETE to remove a tool.") + return respondWithError(res, 405, "Improper request method. Use POST to add a tool or DELETE to remove a tool.") }) // Toggle Tool State in Project router.route("/:projectId/toggleTool").put(async (req, res) => { + if (!req.body || typeof req.body !== 'object') { + return respondWithError(res, 400, "Request body is required") + } const { toolName } = req.body if (!toolName) { return respondWithError(res, 400, "toolName is a required field.") @@ -102,10 +111,10 @@ router.route("/:projectId/toggleTool").put(async (req, res) => { res.status(200).json(toggledTool) } catch (error) { console.error("Error toggling tool state:", error) - respondWithError(res, error.status || 500, error.message || "An error occurred while toggling the tool state.") + return respondWithError(res, error.status || 500, error.message || "An error occurred while toggling the tool state.") } }).all((_, res) => { - respondWithError(res, 405, "Improper request method. Use PUT instead") + return respondWithError(res, 405, "Improper request method. Use PUT instead") }) export default router diff --git a/userProfile/index.js b/userProfile/index.js index bd47bd7b..ab8ecb9c 100644 --- a/userProfile/index.js +++ b/userProfile/index.js @@ -20,6 +20,6 @@ router.route("/:id").get(async (req, res) => { } if (!publicProfile) return respondWithError(res, 404, "User not found") res.status(200).json(publicProfile) -}).all((req, res) => respondWithError(res, 405, "Improper request method. Use GET instead")) +}).all((req, res) => { return respondWithError(res, 405, "Improper request method. Use GET instead") }) export default router diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index 555a8279..ec243365 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -17,7 +17,7 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { try { res.status(200).json(user) } catch (error) { - respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") + return respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") } }).put(auth0Middleware(), async (req, res) => { const user = req.user @@ -33,7 +33,7 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { const userProfile = await userObj.updateProfile(req.body) res.status(200).json(userProfile) } catch (error) { - respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") + return respondWithError(res, error.status || error.code || 500, error.message ?? "An error occurred while fetching the user data.") } }).all((req, res) => respondWithError(res, 405, "Improper request method. Use PUT instead")) @@ -75,7 +75,7 @@ router.route("/projects").get(auth0Middleware(), async (req, res) => { projects: userProjects }) } catch (error) { - respondWithError(res, error?.status ?? 500, error?.message ?? error.toString()) + return respondWithError(res, error?.status ?? 500, error?.message ?? error.toString()) } }).all((req, res) => respondWithError(res, 405, "Improper request method. Use GET instead") ) diff --git a/utilities/proxy.js b/utilities/proxy.js index 75b006cb..2ffcfa7d 100644 --- a/utilities/proxy.js +++ b/utilities/proxy.js @@ -1,6 +1,7 @@ import https from 'node:https' import express from 'express' import cors from 'cors' +import { respondWithError } from './shared.js' import common_cors from "../utilities/common_cors.json" with {type: "json"} const requireHeader = [ @@ -23,7 +24,7 @@ const sizeLimit = 2e8 // 200 MB const proxy = (req, res, next) => { res.header('Access-Control-Allow-Origin', '*') let targetUrl = req.originalUrl.replace(/^\/+proxy\/+/, '') - if (!targetUrl) return res.status(400).send('No URL provided') + if (!targetUrl) return respondWithError(res, 400, 'No URL provided') const headers = {} for (const header in req.headers) { if (!excludedClientHeaders.has(header.toLowerCase())) { @@ -34,12 +35,16 @@ const proxy = (req, res, next) => { headers['X-Forwarded-For'] = (forwardedFor ? forwardedFor + ',' : '') + req.connection.remoteAddress try { const parsedUrl = new URL(targetUrl) + // Only allow http and https protocols + if (!['http:', 'https:'].includes(parsedUrl.protocol)) { + return respondWithError(res, 400, 'Only HTTP and HTTPS URLs are supported') + } if (parsedUrl.protocol === 'http:') { parsedUrl.protocol = 'https:' targetUrl = parsedUrl.toString() } } catch { - return res.status(400).send('Invalid URL') + return respondWithError(res, 400, 'Invalid URL') } let data = 0 const proxyReq = https.request(targetUrl, { @@ -47,7 +52,7 @@ const proxy = (req, res, next) => { headers }, (proxyRes) => { if (Number(proxyRes.headers['content-length']) > sizeLimit) { - res.status(413).send(`ERROR 413: Maximum allowed size is ${sizeLimit} bytes.`) + respondWithError(res, 413, `Maximum allowed size is ${sizeLimit} bytes`) proxyReq.destroy() return } @@ -60,7 +65,7 @@ const proxy = (req, res, next) => { proxyRes.on('data', chunk => { data += chunk.length if (data > sizeLimit) { - res.status(413).send(`ERROR 413: Maximum allowed size is ${sizeLimit} bytes.`) + respondWithError(res, 413, `Maximum allowed size is ${sizeLimit} bytes`) proxyReq.destroy() res.end() return @@ -72,7 +77,7 @@ const proxy = (req, res, next) => { }) }) proxyReq.on('error', err => { - res.status(500).send(`Proxy Error: ${err.message}`) + return respondWithError(res, 500, 'Proxy request failed') }) proxyReq.end() } diff --git a/utilities/routeErrorHandler.js b/utilities/routeErrorHandler.js new file mode 100644 index 00000000..be26b052 --- /dev/null +++ b/utilities/routeErrorHandler.js @@ -0,0 +1,44 @@ +/** + * Centralized error handling middleware for Express. + * Catches all thrown errors (auth, body-parser, unhandled exceptions). + * Note: Morgan already logs request info, so this focuses on error details. + * + * @param {Error} err - The error object + * @param {Request} req - Express request object + * @param {Response} res - Express response object + * @param {Function} next - Express next function + */ +const routeErrorHandler = (err, req, res, next) => { + const status = err.status || err.statusCode || 500 + const message = err.message || 'Internal Server Error' + + // ANSI color codes for pm2 logs visibility + const colors = { + red: '\x1b[31m', + yellow: '\x1b[33m', + cyan: '\x1b[36m', + reset: '\x1b[0m' + } + + // Color based on status code: red for 5xx, yellow for 4xx + const statusColor = status >= 500 ? colors.red : colors.yellow + + // Log error details (Morgan already logs the request) + console.error(`${statusColor}Error ${status}: ${message}${colors.reset}`) + + // Log stack trace for server errors only + if (status >= 500 && err.stack) { + console.error(`${colors.cyan}${err.stack}${colors.reset}`) + } + + if (res.headersSent) { + return next(err) + } + + // Return consistent JSON, hide internal details from clients + return res.status(status).json({ + message: status >= 500 ? 'Internal Server Error' : message + }) +} + +export default routeErrorHandler diff --git a/utilities/shared.js b/utilities/shared.js index 3a478381..6a36f9fc 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -45,15 +45,14 @@ export function validateID(id, type = "mongo") { // Send a failure response with the proper code and message export function respondWithError(res, status, message) { - res.status(status).json({ message }) + return res.status(status).json({ message }) } // Fetch a project by ID export const getProjectById = async (projectId, res) => { const project = await Project.getById(projectId) if (!project) { - respondWithError(res, 404, `Project with ID '${projectId}' not found`) - return null + return respondWithError(res, 404, `Project with ID '${projectId}' not found`) } return project } @@ -281,7 +280,7 @@ export async function findLayerById(layerId, projectId, rerum = false) { if (rerum_obj?.id || rerum_obj["@id"]) return rerum_obj } const p = await Project.getById(projectId) - if (!p) { + if (!p?.data) { const error = new Error(`Project with ID '${projectId}' not found`) error.status = 404 throw error @@ -367,9 +366,9 @@ export const fetchUserAgent = async (userId) => { */ export const handleVersionConflict = (res, error) => { return res.status(409).json({ - error: error.message, - currentVersion: error.currentVersion, + message: error.message, code: 'VERSION_CONFLICT', + currentVersion: error.currentVersion, details: 'The document was modified by another process.', // Include additional context if available ...(error.pageId && { pageId: error.pageId }), From a403889190f23123f2b9f26ee7a0a965719dad48 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 10 Dec 2025 12:58:47 -0600 Subject: [PATCH 242/262] hotifx merge stuff --- line/index.js | 22 +++------------------- utilities/shared.js | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/line/index.js b/line/index.js index cc22dda0..0750b7f5 100644 --- a/line/index.js +++ b/line/index.js @@ -15,26 +15,10 @@ router.use(cors(common_cors)) // Load Line as temp line or from RERUM router.get('/:lineId', async (req, res) => { const { projectId, pageId, lineId } = req.params - if (!lineId) { - return respondWithError(res, 400, 'Line ID is required.') - } - if (!projectId || !pageId) { - return respondWithError(res, 400, 'Project ID and Page ID are required.') + if (!(projectId && pageId && lineId)) { + return respondWithError(res, 400, 'Project ID, Page ID, and Line ID are required.') } try { - if (lineId.startsWith(process.env.RERUMIDPREFIX)) { - const resolved = await fetch(lineId) - .then(resp => { - if (resp.ok) return resp.json() - else { - return {"code": resp.status ?? 500, "message": resp.statusText ?? `Communication error with RERUM`} - } - }).catch(err => { - return {"code": 500, "message": `Communication error with RERUM`} - }) - if (resolved.id || resolved["@id"]) return res.json(resolved) - else return respondWithError(res, resolved.code, resolved.message) - } const projectData = (await getProjectById(projectId)).data if (!projectData) { return respondWithError(res, 404, `Project with ID '${projectId}' not found`) @@ -53,7 +37,7 @@ router.get('/:lineId', async (req, res) => { const line = (lineRef.id ?? lineRef).startsWith?.(process.env.RERUMIDPREFIX) ? await fetch(lineRef.id ?? lineRef).then(res => res.json()) : new Line({ lineRef }) - res.json(line?.asJSON?.(true)) + res.json(line?.asJSON?.(true) ?? line) } catch (error) { return respondWithError(res, error.status ?? 500, error.message) } diff --git a/utilities/shared.js b/utilities/shared.js index 6a36f9fc..198041ee 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -59,7 +59,7 @@ export const getProjectById = async (projectId, res) => { // Find a line in a page export const findLineInPage = (page, lineId) => { - const line = page.lines?.find(l => l.id.split('/').pop() === lineId.split('/').pop()) + const line = page.items?.find(l => l.id.split('/').pop() === lineId.split('/').pop()) if (!line) { return null } From 4139492054db1475a199712ef2e8fdb7afff72cf Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 10 Dec 2025 13:41:47 -0600 Subject: [PATCH 243/262] hotfix for column passing --- classes/Layer/Layer.js | 6 +++++- utilities/shared.js | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index 13e869bb..cd6acdf7 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -98,7 +98,11 @@ export default class Layer { return { id: this.id, label: this.label, - pages: this.pages.map(p => new Page(this.id, p).asProjectPage()) + pages: this.pages.map(p => { + const page = new Page(this.id, p).asProjectPage() + if (p.columns) page.columns = p.columns + return page + }) } } diff --git a/utilities/shared.js b/utilities/shared.js index 198041ee..b4d98d7e 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -146,7 +146,8 @@ export const updatePageAndProject = async (page, project, userId) => { id: rerumPageId, label: page.label, target: page.target, - items: page.items ?? [] + items: page.items ?? [], + columns: layer.pages[pageIndex].columns } // Update layer's pages array BEFORE creating Layer @@ -171,6 +172,7 @@ export const updatePageAndProject = async (page, project, userId) => { // Page won't be saved to RERUM (no content, not already in RERUM) // Just update local page reference in layer without touching RERUM const updatedPage = await page.update() + updatedPage.columns = layer.pages[pageIndex].columns layer.pages[pageIndex] = updatedPage } From 277841482d864661981b29df1fdd090396a50a47 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 12 Dec 2025 12:24:22 -0600 Subject: [PATCH 244/262] 'pixel' in fragment selector hotfix (#433) * 'pixel' in fragment selector hotfix * Changes from testing --- classes/Line/Line.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/classes/Line/Line.js b/classes/Line/Line.js index ecc3438b..bb029ad3 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -148,28 +148,31 @@ export default class Line { updateTargetXYWH(target, x, y, w, h) { if (typeof target === "object" && target.selector?.value) { - const prefix = target.selector.value.includes("pixel:")? "xywh=pixel": "xywh" + const hasPixel = target.selector.value.includes("pixel:") + const prefix = hasPixel ? "xywh=pixel:" : "xywh=" return { ...target, selector: { ...target.selector, - value: `${prefix}:${x},${y},${w},${h}` + value: `${prefix}${x},${y},${w},${h}` } } } if (typeof target === "object" && target.id) { + const hasPixel = /xywh=pixel/.test(target.id) + const prefix = hasPixel ? "#xywh=pixel:" : "#xywh=" return { ...target, - id: target.id.replace(/#xywh(=pixel)?:?.*/, `#xywh=pixel:${x},${y},${w},${h}`) + id: target.id.replace(/#xywh(=pixel)?:?.*/, `${prefix}${x},${y},${w},${h}`) } } if (typeof target === "string") { const hasPixel = /xywh=pixel/.test(target) - const prefix = hasPixel ? "#xywh=pixel" : "#xywh=pixel" + const prefix = hasPixel ? "#xywh=pixel:" : "#xywh=" if (target.includes("#xywh")) { - return target.replace(/#xywh(=pixel)?:?.*/, `${prefix}:${x},${y},${w},${h}`) + return target.replace(/#xywh(=pixel)?:?.*/, `${prefix}${x},${y},${w},${h}`) } return `${target}#xywh=pixel:${x},${y},${w},${h}` } From 7445f918168dfb2355de1c85ecc83e425e53da25 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 18 Dec 2025 15:31:42 -0600 Subject: [PATCH 245/262] TPEN Services npm Package Updates (#438) * Update packages, npm versions, and node versions * changes from testing * oh boy * undo localhost * undo localhost * the force * the force --- .github/workflows/cd_dev.yaml | 2 +- .github/workflows/cd_prod.yaml | 2 +- .github/workflows/ci_dev.yaml | 2 +- .github/workflows/ci_prod.yaml | 2 +- .github/workflows/test_pushes.yaml | 2 +- package-lock.json | 329 ++++++++---------- package.json | 21 +- .../__tests__/functionality_unit.test.js | 3 +- 8 files changed, 168 insertions(+), 195 deletions(-) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index 4b8477ea..c8b42fa9 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -40,7 +40,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.20.0" + node-version: "24" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index d4dabf62..7650f506 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -40,7 +40,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.20.0" + node-version: "24" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/ci_dev.yaml b/.github/workflows/ci_dev.yaml index a3a8e358..0ce4cf78 100644 --- a/.github/workflows/ci_dev.yaml +++ b/.github/workflows/ci_dev.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.20.0" + node-version: "24" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/ci_prod.yaml b/.github/workflows/ci_prod.yaml index aa86c6da..e1fe40d3 100644 --- a/.github/workflows/ci_prod.yaml +++ b/.github/workflows/ci_prod.yaml @@ -34,7 +34,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.20.0" + node-version: "24" - name: Cache node modules uses: actions/cache@master env: diff --git a/.github/workflows/test_pushes.yaml b/.github/workflows/test_pushes.yaml index 858a7bde..7e291fdf 100644 --- a/.github/workflows/test_pushes.yaml +++ b/.github/workflows/test_pushes.yaml @@ -52,7 +52,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@master with: - node-version: "^22.20.0" + node-version: "24" - name: Cache node modules uses: actions/cache@master env: diff --git a/package-lock.json b/package-lock.json index a717668e..ff1c256a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,76 +9,77 @@ "version": "0.0.0", "license": "CC-BY", "dependencies": { - "@iiif/helpers": "^1.5.3", + "@iiif/helpers": "^1.5.7", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.3", - "dompurify": "^3.2.7", + "dompurify": "^3.3.1", "dotenv": "^17.2.3", - "express": "^5.1.0", + "express": "^5.2.1", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "~1.6.1", "image-size": "^2.0.2", "jsdom": "^27.0.0", "mariadb": "^3.4.5", - "marked": "^16.3.0", - "mime-types": "^3.0.1", - "mongodb": "^6.20.0", + "marked": "^17.0.1", + "mime-types": "^3.0.2", + "mongodb": "^7.0.0", "morgan": "^1.10.1", - "nodemailer": "^7.0.6", + "nodemailer": "^7.0.11", "tpen3-services": "file:" }, "devDependencies": { "@jest/globals": "^30.2.0", "jest": "^30.2.0", - "nodemon": "^3.1.10", + "nodemon": "^3.1.11", "sinon": "^21.0.0", "supertest": "^7.1.4" }, "engines": { - "node": ">=22.20.0" + "node": ">=24.12.0", + "npm": ">=11.7.0" } }, "node_modules/@asamuzakjp/css-color": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.0.5.tgz", - "integrity": "sha512-lMrXidNhPGsDjytDy11Vwlb6OIGrT3CmLg3VWNFyWkLWtijKl7xjvForlh8vuj0SHGjgl4qZEQzUmYTeQA2JFQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.1.tgz", + "integrity": "sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ==", "license": "MIT", "dependencies": { "@csstools/css-calc": "^2.1.4", "@csstools/css-color-parser": "^3.1.0", "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4", - "lru-cache": "^11.2.1" + "lru-cache": "^11.2.4" } }, "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", - "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", - "license": "ISC", + "version": "11.2.4", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz", + "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==", + "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" } }, "node_modules/@asamuzakjp/dom-selector": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.5.7.tgz", - "integrity": "sha512-cvdTPsi2qC1c22UppvuVmx/PDwuc6+QQkwt9OnwQD6Uotbh//tb2XDF0OoK2V0F4b8d02LIwNp3BieaDMAhIhA==", + "version": "6.7.6", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.6.tgz", + "integrity": "sha512-hBaJER6A9MpdG3WgdlOolHmbOYvSk46y7IQN/1+iqiCuUu6iWdQrs9DGKF8ocqsEqWujWf/V7b7vaDgiUmIvUg==", "license": "MIT", "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", "bidi-js": "^1.0.3", "css-tree": "^3.1.0", "is-potential-custom-element-name": "^1.0.1", - "lru-cache": "^11.2.2" + "lru-cache": "^11.2.4" } }, "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", - "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", - "license": "ISC", + "version": "11.2.4", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz", + "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==", + "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" } @@ -120,7 +121,6 @@ "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", @@ -670,7 +670,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" }, @@ -679,9 +678,9 @@ } }, "node_modules/@csstools/css-syntax-patches-for-csstree": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.14.tgz", - "integrity": "sha512-zSlIxa20WvMojjpCSy8WrNpcZ61RqfTfX3XTaOeVlGJrt/8HF3YbzgFZa01yTbT4GWQLwfTcC3EB8i3XnB647Q==", + "version": "1.0.21", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.21.tgz", + "integrity": "sha512-plP8N8zKfEZ26figX4Nvajx8DuzfuRpLTqglQ5d0chfnt35Qt3X+m6ASZ+rG0D0kxe/upDVNwSIVJP5n4FuNfw==", "funding": [ { "type": "github", @@ -695,9 +694,6 @@ "license": "MIT-0", "engines": { "node": ">=18" - }, - "peerDependencies": { - "postcss": "^8.4" } }, "node_modules/@csstools/css-tokenizer": { @@ -715,7 +711,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" } @@ -755,9 +750,9 @@ } }, "node_modules/@iiif/helpers": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.5.3.tgz", - "integrity": "sha512-Ofqr6KA5bu4htrXukMrw6Fn10dpVvCD8ksahpf/6EUfa1hjyaIBLB/8JL+5jK5ipO8TPqwMREEFbo/h4r5vY5w==", + "version": "1.5.7", + "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.5.7.tgz", + "integrity": "sha512-a4vGvQs7LZmpYotAFPAQd7Ei14cnrxOfvh4WtwICQZFd6jBoJS0x8RHVSooSuLGgGoaa6WEImhuF3MjTFiEhfw==", "license": "MIT", "dependencies": { "@iiif/presentation-2": "1.0.4", @@ -771,13 +766,13 @@ "svg-arc-to-cubic-bezier": "^3.2.0" }, "peerDependencies": { - "@iiif/parser": "^2.2.3" + "@iiif/parser": "^2.2.8" } }, "node_modules/@iiif/parser": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.2.4.tgz", - "integrity": "sha512-42izQ8jhS6vhjhWGxmK6b3kyQOlfjb/fh6mBLloDcvqgk+JS0BbsYsNtftQDvnmWqvliTQYnQ2XLxItvx6gGHQ==", + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.2.8.tgz", + "integrity": "sha512-wZNPBvcdncXh+y434ASkmkr4hhHRj63E0L5hMJOJobAuBa0p5jf/o1kV0RXRngAZxJYQ49t68L3g2KE48yNx8w==", "license": "MIT", "peer": true, "dependencies": { @@ -801,7 +796,6 @@ "resolved": "https://registry.npmjs.org/@iiif/presentation-3/-/presentation-3-2.2.3.tgz", "integrity": "sha512-xCLbUr9euqegsrxGe65M2fWbv6gKpiUhHXCpOn+V+qtawkMbOSNWbYOISo2aLQdYVg4DGYD0g2bMzSCF33uNOQ==", "license": "MIT", - "peer": true, "dependencies": { "@types/geojson": "^7946.0.10" } @@ -1488,9 +1482,9 @@ "license": "MIT" }, "node_modules/@types/whatwg-url": { - "version": "11.0.5", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", - "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-N8WXpbE6Wgri7KUSvrmQcqrMllKZ9uxkYWMt+mCSGwNc0Hsw9VQTW7ApqI4XNrx6/SaM2QQJCzMPDEXE058s+Q==", "license": "MIT", "dependencies": { "@types/webidl-conversions": "*" @@ -2058,23 +2052,43 @@ } }, "node_modules/body-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", - "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz", + "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==", "license": "MIT", "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", - "debug": "^4.4.0", + "debug": "^4.4.3", "http-errors": "^2.0.0", - "iconv-lite": "^0.6.3", + "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.0", - "raw-body": "^3.0.0", - "type-is": "^2.0.0" + "raw-body": "^3.0.1", + "type-is": "^2.0.1" }, "engines": { "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/body-parser/node_modules/iconv-lite": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.1.tgz", + "integrity": "sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/brace-expansion": { @@ -2120,7 +2134,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.9", "caniuse-lite": "^1.0.30001746", @@ -2146,12 +2159,12 @@ } }, "node_modules/bson": { - "version": "6.10.4", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz", - "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-7.0.0.tgz", + "integrity": "sha512-Kwc6Wh4lQ5OmkqqKhYGKIuELXl+EPYSCObVE6bWsp1T/cGkOCBN0I8wF/T44BiuhHyNi1mmKVPXk60d41xZ7kw==", "license": "Apache-2.0", "engines": { - "node": ">=16.20.1" + "node": ">=20.19.0" } }, "node_modules/buffer-from": { @@ -2566,13 +2579,13 @@ } }, "node_modules/cssstyle": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.1.tgz", - "integrity": "sha512-g5PC9Aiph9eiczFpcgUhd9S4UUO3F+LHGRIi5NUMZ+4xtoIYbHNZwZnWA2JsFGe8OU8nl4WyaEFiZuGuxlutJQ==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.5.tgz", + "integrity": "sha512-GlsEptulso7Jg0VaOZ8BXQi3AkYM5BOJKEO/rjMidSCq70FkIC5y0eawrCXeYzxgt3OCf4Ls+eoxN+/05vN0Ag==", "license": "MIT", "dependencies": { - "@asamuzakjp/css-color": "^4.0.3", - "@csstools/css-syntax-patches-for-csstree": "^1.0.14", + "@asamuzakjp/css-color": "^4.1.1", + "@csstools/css-syntax-patches-for-csstree": "^1.0.21", "css-tree": "^3.1.0" }, "engines": { @@ -2700,9 +2713,9 @@ } }, "node_modules/dompurify": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.7.tgz", - "integrity": "sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz", + "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" @@ -2960,18 +2973,19 @@ } }, "node_modules/express": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", - "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", + "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", "license": "MIT", "dependencies": { "accepts": "^2.0.0", - "body-parser": "^2.2.0", + "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", + "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", @@ -3304,9 +3318,9 @@ } }, "node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", + "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", "dev": true, "license": "ISC", "dependencies": { @@ -3426,28 +3440,23 @@ "license": "MIT" }, "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", "license": "MIT", "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" }, "engines": { "node": ">= 0.8" - } - }, - "node_modules/http-errors/node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "license": "MIT", - "engines": { - "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/http-proxy-agent": { @@ -4402,9 +4411,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", + "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", "dev": true, "license": "MIT", "dependencies": { @@ -4595,9 +4604,9 @@ "license": "ISC" }, "node_modules/marked": { - "version": "16.3.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-16.3.0.tgz", - "integrity": "sha512-K3UxuKu6l6bmA5FUwYho8CfJBlsUWAooKtdGgMcERSpF7gcBUrCGsLH7wDaaNOzwq18JzSUDyoEb/YsrqMac3w==", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-17.0.1.tgz", + "integrity": "sha512-boeBdiS0ghpWcSwoNm/jJBwdpFaMnZWRzjA6SkUMYb40SVaN1x7mmfGKp0jvexGcx+7y2La5zRZsYFZI6Qpypg==", "license": "MIT", "bin": { "marked": "bin/marked.js" @@ -4702,15 +4711,19 @@ } }, "node_modules/mime-types": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", - "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", "license": "MIT", "dependencies": { "mime-db": "^1.54.0" }, "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/mimic-fn": { @@ -4750,26 +4763,26 @@ } }, "node_modules/mongodb": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.20.0.tgz", - "integrity": "sha512-Tl6MEIU3K4Rq3TSHd+sZQqRBoGlFsOgNrH5ltAcFBV62Re3Fd+FcaVf8uSEQFOJ51SDowDVttBTONMfoYWrWlQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-7.0.0.tgz", + "integrity": "sha512-vG/A5cQrvGGvZm2mTnCSz1LUcbOPl83hfB6bxULKQ8oFZauyox/2xbZOoGNl+64m8VBrETkdGCDBdOsCr3F3jg==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.3.0", - "bson": "^6.10.4", - "mongodb-connection-string-url": "^3.0.2" + "bson": "^7.0.0", + "mongodb-connection-string-url": "^7.0.0" }, "engines": { - "node": ">=16.20.1" + "node": ">=20.19.0" }, "peerDependencies": { - "@aws-sdk/credential-providers": "^3.188.0", - "@mongodb-js/zstd": "^1.1.0 || ^2.0.0", - "gcp-metadata": "^5.2.0", - "kerberos": "^2.0.1", - "mongodb-client-encryption": ">=6.0.0 <7", + "@aws-sdk/credential-providers": "^3.806.0", + "@mongodb-js/zstd": "^7.0.0", + "gcp-metadata": "^7.0.1", + "kerberos": "^7.0.0", + "mongodb-client-encryption": ">=7.0.0 <7.1.0", "snappy": "^7.3.2", - "socks": "^2.7.1" + "socks": "^2.8.6" }, "peerDependenciesMeta": { "@aws-sdk/credential-providers": { @@ -4796,13 +4809,16 @@ } }, "node_modules/mongodb-connection-string-url": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", - "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-7.0.0.tgz", + "integrity": "sha512-irhhjRVLE20hbkRl4zpAYLnDMM+zIZnp0IDB9akAFFUZp/3XdOfwwddc7y6cNvF2WCEtfTYRwYbIfYa2kVY0og==", "license": "Apache-2.0", "dependencies": { - "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^14.1.0 || ^13.0.0" + "@types/whatwg-url": "^13.0.0", + "whatwg-url": "^14.1.0" + }, + "engines": { + "node": ">=20.19.0" } }, "node_modules/mongodb-connection-string-url/node_modules/tr46": { @@ -4888,24 +4904,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, - "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/napi-postinstall": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz", @@ -4953,17 +4951,18 @@ "license": "MIT" }, "node_modules/nodemailer": { - "version": "7.0.10", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.10.tgz", - "integrity": "sha512-Us/Se1WtT0ylXgNFfyFSx4LElllVLJXQjWi2Xz17xWw7amDKO2MLtFnVp1WACy7GkVGs+oBlRopVNUzlrGSw1w==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.11.tgz", + "integrity": "sha512-gnXhNRE0FNhD7wPSCGhdNh46Hs6nm+uTyg+Kq0cZukNQiYdnCsoQjodNP9BQVG9XrcK/v6/MgpAPBUFyzh9pvw==", + "license": "MIT-0", "engines": { "node": ">=6.0.0" } }, "node_modules/nodemon": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", - "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz", + "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==", "dev": true, "license": "MIT", "dependencies": { @@ -5316,6 +5315,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, "license": "ISC" }, "node_modules/picomatch": { @@ -5354,35 +5354,6 @@ "node": ">=8" } }, - "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "peer": true, - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, "node_modules/pretty-format": { "version": "30.2.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz", @@ -5482,24 +5453,24 @@ } }, "node_modules/raw-body": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz", - "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", + "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.7.0", - "unpipe": "1.0.0" + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.7.0", + "unpipe": "~1.0.0" }, "engines": { "node": ">= 0.10" } }, "node_modules/raw-body/node_modules/iconv-lite": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", - "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.1.tgz", + "integrity": "sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==", "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" diff --git a/package.json b/package.json index 779d1ffc..0d4e426a 100644 --- a/package.json +++ b/package.json @@ -33,33 +33,34 @@ "inviteMemberTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " }, "dependencies": { - "@iiif/helpers": "^1.5.3", + "@iiif/helpers": "^1.5.7", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "debug": "^4.4.3", - "dompurify": "^3.2.7", + "dompurify": "^3.3.1", "dotenv": "^17.2.3", - "express": "^5.1.0", + "express": "^5.2.1", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "~1.6.1", "image-size": "^2.0.2", "jsdom": "^27.0.0", "mariadb": "^3.4.5", - "marked": "^16.3.0", - "mime-types": "^3.0.1", - "mongodb": "^6.20.0", + "marked": "^17.0.1", + "mime-types": "^3.0.2", + "mongodb": "^7.0.0", "morgan": "^1.10.1", - "nodemailer": "^7.0.6", + "nodemailer": "^7.0.11", "tpen3-services": "file:" }, "devDependencies": { "@jest/globals": "^30.2.0", "jest": "^30.2.0", - "nodemon": "^3.1.10", + "nodemon": "^3.1.11", "sinon": "^21.0.0", "supertest": "^7.1.4" }, "engines": { - "node": ">=22.20.0" - } + "node": ">=24.12.0", + "npm": ">=11.7.0" + } } diff --git a/userProfile/__tests__/functionality_unit.test.js b/userProfile/__tests__/functionality_unit.test.js index 16f47f5e..5805b09f 100644 --- a/userProfile/__tests__/functionality_unit.test.js +++ b/userProfile/__tests__/functionality_unit.test.js @@ -9,6 +9,7 @@ describe('Testing /user/:id helper functions) #testThis', () => { }) it("returns true for valid id",()=>{ - expect(validateID(123)).toBe(true) + // Use a valid 24-character hex string (MongoDB ObjectId format) + expect(validateID("507f1f77bcf86cd799439011")).toBe(true) }) }) From cec7a0aefd8862e8e835f2b0544262e87f2662e4 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 9 Jan 2026 10:34:10 -0600 Subject: [PATCH 246/262] Authentication (token 400 or 401) and Authorization (user permissions) Audit (#441) * First pass at auditing permission checks and adding them to the appropriate places * changes from review and testing * fix test * changes from testing and review * changes from copilot review --- __tests__/smoke.test.js | 4 +- auth/__tests__/auth_unit_test.js | 4 +- classes/User/__tests__/unit.test.js | 8 +-- layer/index.js | 12 +++++ line/index.js | 26 ++++++++-- page/index.js | 52 ++++++++++++++++--- project/customMetadataRouter.js | 13 +++-- project/customRolesRouter.js | 8 +-- project/import28Router.js | 4 +- project/memberLeaveRouter.js | 2 +- project/memberRouter.js | 12 ++--- project/metadataRouter.js | 2 +- project/projectCopyRouter.js | 26 ++++++++-- project/projectCreateRouter.js | 11 ++-- project/projectReadRouter.js | 30 +++++++---- project/projectToolsRouter.js | 27 ++++++++-- userProfile/__tests__/end_to_end_unit.test.js | 16 +++--- userProfile/privateProfile.js | 6 +-- 18 files changed, 196 insertions(+), 67 deletions(-) diff --git a/__tests__/smoke.test.js b/__tests__/smoke.test.js index 4f63d730..c43a3c0c 100644 --- a/__tests__/smoke.test.js +++ b/__tests__/smoke.test.js @@ -57,10 +57,10 @@ async function runSmokeChecks() { if (!(hasHeading || hasWelcome)) throw new Error('Expected TPEN3 Services index HTML not found in response') })) - // Protected endpoint requires authentication + // Protected endpoint requires authentication (400 when Authorization header is missing) checks.push(await runCheck('Protected endpoint requires authentication', async () => { const res = await request('/my/profile') - if (res.status !== 401) throw new Error(`Expected 401, got ${res.status}`) + if (res.status !== 400) throw new Error(`Expected 400, got ${res.status}`) })) // CORS headers present for allowed origin diff --git a/auth/__tests__/auth_unit_test.js b/auth/__tests__/auth_unit_test.js index 2801be63..863bd5a1 100644 --- a/auth/__tests__/auth_unit_test.js +++ b/auth/__tests__/auth_unit_test.js @@ -13,10 +13,10 @@ const TIME_OUT = process.env.TEST_TIMEOUT ?? 5000 describe("auth0Middleware #auth_test", () => { it( - "should return 401 without Authorization Header", + "should return 400 without Authorization Header", async () => { const res = await request(app).get("/protected-route") - expect(res.status).toBe(401) + expect(res.status).toBe(400) }, TIME_OUT ) diff --git a/classes/User/__tests__/unit.test.js b/classes/User/__tests__/unit.test.js index 9ca2396b..b96f7dd7 100644 --- a/classes/User/__tests__/unit.test.js +++ b/classes/User/__tests__/unit.test.js @@ -90,11 +90,11 @@ describe("GET /my/profile #user_class", () => { expect(response.body.userData).toEqual({name: "VOO"}) }) - it("should return 401 if user is not authenticated (no authorization header)", async () => { + it("should return 400 if user is not authenticated (no authorization header)", async () => { const appWithoutAuth = express() appWithoutAuth.use("/my", privateProfileRouter) const response = await request(appWithoutAuth).get("/my/profile") - expect(response.status).toBe(401) + expect(response.status).toBe(400) }) it("should return 401 if user is not authenticated (invalid authorization header)", async () => { @@ -138,11 +138,11 @@ describe("GET /my/projects #user_class", () => { } } }) - it("should return 401 if user is not authenticated (no authorization header)", async () => { + it("should return 400 if user is not authenticated (no authorization header)", async () => { const appWithoutAuth = express() appWithoutAuth.use("/my", privateProfileRouter) const response = await request(appWithoutAuth).get("/my/profile") - expect(response.status).toBe(401) + expect(response.status).toBe(400) }) it("should return 401 if user is not authenticated (invalid authorization header)", async () => { diff --git a/layer/index.js b/layer/index.js index 62feae25..d3cf07c1 100644 --- a/layer/index.js +++ b/layer/index.js @@ -8,6 +8,7 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' import { findPageById, findLayerById, updateLayerAndProject, respondWithError } from '../utilities/shared.js' +import { ACTIONS, ENTITIES, SCOPES } from '../project/groups/permissions_parameters.js' const router = express.Router({ mergeParams: true }) @@ -50,10 +51,15 @@ router.route('/:layerId') const update = req.body const providedPages = update?.pages const user = req.user + if (!user) return respondWithError(res, 401, 'Not authenticated. Please provide a valid, unexpired Bearer token') if (!projectId) return respondWithError(res, 400, 'Project ID is required') if (!layerId) return respondWithError(res, 400, 'Layer ID is required') try { if (hasSuspiciousLayerData(req.body)) return respondWithError(res, 400, "Suspicious layer data will not be processed.") + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.LAYER))) { + return respondWithError(res, 403, 'You do not have permission to update this layer') + } const project = await Project.getById(projectId) if (!project?._id) return respondWithError(res, 404, `Project '${projectId}' does not exist`) const layer = await findLayerById(layerId, projectId) @@ -88,6 +94,8 @@ router.route('/:layerId') // Route to create a new layer within a project router.route('/').post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId } = req.params + const user = req.user + if (!user) return respondWithError(res, 401, 'Not authenticated. Please provide a valid, unexpired Bearer token') if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, 'Request body is required') } @@ -98,6 +106,10 @@ router.route('/').post(auth0Middleware(), screenContentMiddleware(), async (req, } try { if (hasSuspiciousLayerData(req.body)) return respondWithError(res, 400, "Suspicious layer data will not be processed.") + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LAYER))) { + return respondWithError(res, 403, 'You do not have permission to create layers in this project') + } const project = await Project.getById(projectId) if (!project) return respondWithError(res, 404, 'Project does not exist') const newLayer = Layer.build(projectId, label, canvases) diff --git a/line/index.js b/line/index.js index 0750b7f5..8ef3a58a 100644 --- a/line/index.js +++ b/line/index.js @@ -7,6 +7,8 @@ import common_cors from '../utilities/common_cors.json' with {type: 'json'} import { respondWithError, getProjectById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' import Line from '../classes/Line/Line.js' import Column from '../classes/Column/Column.js' +import Project from '../classes/Project/Project.js' +import { ACTIONS, ENTITIES, SCOPES } from '../project/groups/permissions_parameters.js' const router = express.Router({ mergeParams: true }) @@ -46,8 +48,12 @@ router.get('/:lineId', async (req, res) => { // Add a new line/lines to an existing Page, save it in RERUM if it has body content. router.post('/', auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { + const projectObj = new Project(req.params.projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LINE))) { + return respondWithError(res, 403, 'You do not have permission to create lines in this project') + } const project = await getProjectById(req.params.projectId, res) if (!project) return const page = await findPageById(req.params.pageId, req.params.projectId) @@ -106,8 +112,12 @@ router.post('/', auth0Middleware(), async (req, res) => { // Update an existing line, including in RERUM router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { + const projectObj = new Project(req.params.projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.LINE))) { + return respondWithError(res, 403, 'You do not have permission to update lines in this project') + } const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) @@ -178,8 +188,12 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, // Update the text of an existing line router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { + const projectObj = new Project(req.params.projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.TEXT, ENTITIES.LINE))) { + return respondWithError(res, 403, 'You do not have permission to update line text in this project') + } if (typeof req.body !== 'string') { return respondWithError(res, 400, 'Invalid request body. Expected a string.') } @@ -250,8 +264,12 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn // Update the xywh (bounds) of an existing line router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { + const projectObj = new Project(req.params.projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.SELECTOR, ENTITIES.LINE))) { + return respondWithError(res, 403, 'You do not have permission to update line bounds in this project') + } if (typeof req.body !== 'object' || !req.body.x || !req.body.y || !req.body.w || !req.body.h) { return respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') } diff --git a/page/index.js b/page/index.js index 16cef3e1..0b835786 100644 --- a/page/index.js +++ b/page/index.js @@ -10,6 +10,7 @@ import Line from '../classes/Line/Line.js' import Column from '../classes/Column/Column.js' import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict, resolveReferences } from '../utilities/shared.js' import { isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" +import { ACTIONS, ENTITIES, SCOPES } from '../project/groups/permissions_parameters.js' router.use( cors(common_cors) @@ -83,7 +84,7 @@ router.route('/:pageId') }) .put(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") const { projectId, pageId } = req.params const update = req.body if (!update || typeof update !== 'object' || Object.keys(update).length === 0) { @@ -95,6 +96,14 @@ router.route('/:pageId') if (Array.isArray(update.items) && update.items.some(item => (typeof item !== 'object' && typeof item !== 'string') || item === null)) { return respondWithError(res, 400, 'Each item must be an object') } + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + return respondWithError(res, 403, 'You do not have permission to update this page') + } + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Error checking permissions') + } const project = await Project.getById(projectId) if (!project) { return respondWithError(res, 404, `Project with ID '${projectId}' not found`) @@ -285,12 +294,21 @@ router.route('/:pageId') router.route('/:pageId/column') .post(auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") const { projectId, pageId } = req.params if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + return respondWithError(res, 403, 'You do not have permission to update columns on this page') + } + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Error checking permissions') + } + if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -360,12 +378,21 @@ router.route('/:pageId/column') }) .put(auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") const { projectId, pageId } = req.params if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + return respondWithError(res, 403, 'You do not have permission to merge columns on this page') + } + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Error checking permissions') + } + if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -430,12 +457,21 @@ router.route('/:pageId/column') }) .patch(auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") const { projectId, pageId } = req.params if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") + try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + return respondWithError(res, 403, 'You do not have permission to update columns on this page') + } + } catch (error) { + return respondWithError(res, error.status ?? 500, error.message ?? 'Error checking permissions') + } + if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -496,12 +532,16 @@ router.route('/:pageId/column') router.route('/:pageId/clear-columns') .delete(auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") - + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") + const { projectId, pageId } = req.params if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") try { + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.PAGE))) { + return respondWithError(res, 403, 'You do not have permission to clear columns on this page') + } const project = await Project.getById(projectId) if (!project?.data) return respondWithError(res, 404, "Project not found") diff --git a/project/customMetadataRouter.js b/project/customMetadataRouter.js index 57d65668..d232d351 100644 --- a/project/customMetadataRouter.js +++ b/project/customMetadataRouter.js @@ -74,15 +74,22 @@ function deepUpsert(target, source) { } // GET /project/:id/custom - Returns array of namespace keys -router.route("/:id/custom").get(async (req, res) => { +router.route("/:id/custom").get(auth0Middleware(), async (req, res) => { + const user = req.user const { id } = req.params + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") try { const project = new Project(id) + // Check if user has read access to the project options + if (!await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.OPTIONS, ENTITIES.PROJECT)) { + return respondWithError(res, 403, "You do not have permission to read this project's metadata") + } + // Fetch the project from database const projectData = await database.findOne({ _id: id }, "projects") @@ -109,7 +116,7 @@ router.route("/:id/custom").post(auth0Middleware(), async (req, res) => { const payload = req.body - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") if (!payload || typeof payload !== "object" || Array.isArray(payload)) { @@ -164,7 +171,7 @@ router.route("/:id/custom").put(auth0Middleware(), async (req, res) => { const { id } = req.params const payload = req.body - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") if (!payload || typeof payload !== "object" || Array.isArray(payload)) { diff --git a/project/customRolesRouter.js b/project/customRolesRouter.js index 949bf48d..1e7fc206 100644 --- a/project/customRolesRouter.js +++ b/project/customRolesRouter.js @@ -12,7 +12,7 @@ const router = express.Router({ mergeParams: true }) router.get('/:projectId/customRoles', auth0Middleware(), async (req, res) => { const { projectId } = req.params const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { const project = new Project(projectId) if (!project) { @@ -38,7 +38,7 @@ router.post('/:projectId/addCustomRoles', auth0Middleware(), async (req, res) => const { projectId } = req.params let customRoles = req.body.roles ?? req.body const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!Object.keys(customRoles).length) { return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") } @@ -61,7 +61,7 @@ router.put('/:projectId/updateCustomRoles', auth0Middleware(), async (req, res) const { projectId } = req.params let roles = req.body.roles ?? req.body const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!Object.keys(roles).length) { return respondWithError(res, 400, "Custom roles must be provided as a JSON Object with keys as roles and values as arrays of permissions or space-delimited strings.") } @@ -84,7 +84,7 @@ router.delete('/:projectId/removeCustomRoles', auth0Middleware(), async (req, re const { projectId } = req.params let rolesToRemove = req.body.roles ?? req.body const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (typeof rolesToRemove === 'object' && !Array.isArray(rolesToRemove)) { rolesToRemove = Object.keys(rolesToRemove) } diff --git a/project/import28Router.js b/project/import28Router.js index e4037f05..054c6fb8 100644 --- a/project/import28Router.js +++ b/project/import28Router.js @@ -68,7 +68,7 @@ router.route("/import28/:uid").get( const jsessionid = req.cookies?.JSESSIONID const uid = req.params?.uid - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!jsessionid) return respondWithError(res, 400, "Missing jsessionid in query") if (!uid) return respondWithError(res, 400, "Missing uid in query") @@ -123,7 +123,7 @@ router.route("/import28/selectedproject/:selectedProjectId").get( const jsessionid = req.cookies?.JSESSIONID const selectedProjectId = req.params?.selectedProjectId - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!jsessionid) return respondWithError(res, 400, "Missing jsessionid in query") if (!selectedProjectId) return respondWithError(res, 400, "Missing selectedProjectId in query") diff --git a/project/memberLeaveRouter.js b/project/memberLeaveRouter.js index 7707e1a5..16a4642a 100644 --- a/project/memberLeaveRouter.js +++ b/project/memberLeaveRouter.js @@ -16,7 +16,7 @@ router.route("/:id/leave").post(auth0Middleware(), async (req, res) => { const { id: projectId } = req.params const user = req.user - if (!user) return respondWithError(res, 401, "Authentication required") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!projectId) return respondWithError(res, 400, "Project ID is required") try { diff --git a/project/memberRouter.js b/project/memberRouter.js index 133fdbfe..8be9ae65 100644 --- a/project/memberRouter.js +++ b/project/memberRouter.js @@ -13,7 +13,7 @@ const router = express.Router({ mergeParams: true }) router.route("/:id/invite-member").post(auth0Middleware(), async (req, res) => { const user = req.user const { id: projectId } = req.params - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -37,7 +37,7 @@ router.route("/:id/invite-member").post(auth0Middleware(), async (req, res) => { router.route("/:id/remove-member").post(auth0Middleware(), async (req, res) => { const user = req.user const { id: projectId } = req.params - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") @@ -62,7 +62,7 @@ router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Midd const { projectId, collaboratorId } = req.params const roles = req.body.roles ?? req.body const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!roles) return respondWithError(res, 400, "Provide role(s) to add") try { const projectObj = await Project.getById(projectId) @@ -83,7 +83,7 @@ router.route("/:projectId/collaborator/:collaboratorId/setRoles").put(auth0Middl const { projectId, collaboratorId } = req.params const roles = req.body.roles ?? req.body const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!roles) return respondWithError(res, 400, "Provide role(s) to update") try { const projectObj = await Project.getById(projectId) @@ -102,7 +102,7 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M const { projectId, collaboratorId } = req.params const roles = req.body.roles ?? req.body const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!roles) return respondWithError(res, 400, "Provide role(s) to remove") if (roles.includes("OWNER")) return respondWithError(res, 400, "The OWNER role cannot be removed.") try { @@ -123,7 +123,7 @@ router.route("/:projectId/collaborator/:collaboratorId/removeRoles").post(auth0M router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res) => { const { projectId } = req.params const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } diff --git a/project/metadataRouter.js b/project/metadataRouter.js index 12fcd19e..1c07f4c5 100644 --- a/project/metadataRouter.js +++ b/project/metadataRouter.js @@ -11,7 +11,7 @@ router.route("/:projectId/metadata").put(auth0Middleware(), screenContentMiddlew const { projectId } = req.params const metadata = req.body const user = req.user - if (!user) return respondWithError(res, 401, "Unauthenticated request") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!metadata || !Array.isArray(metadata)) { return respondWithError(res, 400, "Invalid metadata provided. Expected an array of objects with 'label' and 'value'.") } diff --git a/project/projectCopyRouter.js b/project/projectCopyRouter.js index 3311767f..cae1df18 100644 --- a/project/projectCopyRouter.js +++ b/project/projectCopyRouter.js @@ -2,16 +2,22 @@ import express from "express" import { respondWithError } from "../utilities/shared.js" import auth0Middleware from "../auth/index.js" import ProjectFactory from "../classes/Project/ProjectFactory.js" +import Project from "../classes/Project/Project.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" const router = express.Router({ mergeParams: true }) router.route("/:projectId/copy").post(auth0Middleware(), async (req, res) => { const user = req.user if (!user) { - return respondWithError(res, 401, "Unauthorized: User not authenticated") + return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") } try { const { projectId } = req.params + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to copy this project") + } const project = await ProjectFactory.copyProject(projectId, user._id) res.status(201).json(project) } catch (error) { @@ -28,10 +34,14 @@ router.route("/:projectId/copy").post(auth0Middleware(), async (req, res) => { router.route("/:projectId/copy-without-annotations").post(auth0Middleware(), async (req, res) => { const user = req.user if (!user) { - return respondWithError(res, 401, "Unauthorized: User not authenticated") + return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") } try { const { projectId } = req.params + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to copy this project") + } const project = await ProjectFactory.cloneWithoutAnnotations(projectId, user._id) res.status(201).json(project) } catch (error) { @@ -48,10 +58,14 @@ router.route("/:projectId/copy-without-annotations").post(auth0Middleware(), asy router.route("/:projectId/copy-with-group").post(auth0Middleware(), async (req, res) => { const user = req.user if (!user) { - return respondWithError(res, 401, "Unauthorized: User not authenticated") + return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") } try { const { projectId } = req.params + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to copy this project") + } const project = await ProjectFactory.cloneWithGroup(projectId, user._id) res.status(201).json(project) } catch (error) { @@ -68,7 +82,7 @@ router.route("/:projectId/copy-with-group").post(auth0Middleware(), async (req, router.route("/:projectId/copy-with-customizations").post(auth0Middleware(), async (req, res) => { const user = req.user if (!user) { - return respondWithError(res, 401, "Unauthorized: User not authenticated") + return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") } if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") @@ -79,6 +93,10 @@ router.route("/:projectId/copy-with-customizations").post(auth0Middleware(), asy } try { const { projectId } = req.params + const projectObj = new Project(projectId) + if (!(await projectObj.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to copy this project") + } const project = await ProjectFactory.cloneWithCustomizations(projectId, user._id, modules) res.status(201).json(project) } catch (error) { diff --git a/project/projectCreateRouter.js b/project/projectCreateRouter.js index 196c9a01..cb1c24b9 100644 --- a/project/projectCreateRouter.js +++ b/project/projectCreateRouter.js @@ -7,12 +7,13 @@ import Project from "../classes/Project/Project.js" import screenContentMiddleware from "../utilities/checkIfSuspicious.js" import { isSuspiciousJSON, isSuspiciousValueString, hasSuspiciousProjectData } from "../utilities/checkIfSuspicious.js" import Tools from "../classes/Tools/Tools.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" const router = express.Router({ mergeParams: true }) router.route("/create").post(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user - if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") + if (!user?.agent) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") let project = req.body try { if (hasSuspiciousProjectData(project)) return respondWithError(res, 400, "Suspicious project data will not be processed.") @@ -37,6 +38,7 @@ router.route("/create").post(auth0Middleware(), screenContentMiddleware(), async router.route("/import").post(auth0Middleware(), async (req, res) => { let { createFrom } = req.query let user = req.user + if (!user?.agent) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") createFrom = createFrom?.toLowerCase() if (!createFrom) return respondWithError(res, 400, "Query string 'createFrom' is required, specify manifest source as 'URL' or 'DOC'") @@ -95,7 +97,7 @@ router.route("/import").post(auth0Middleware(), async (req, res) => { router.route("/import-image").post(auth0Middleware(), async (req, res) => { const user = req.user - if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") + if (!user?.agent) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -129,7 +131,7 @@ router.route("/import-image").post(auth0Middleware(), async (req, res) => { */ router.route("/:projectId/label").patch(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const user = req.user - if (!user?.agent) return respondWithError(res, 401, "Unauthenticated user") + if (!user?.agent) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") const projectId = req.params.projectId if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!req.body || typeof req.body !== 'object') { @@ -139,6 +141,9 @@ router.route("/:projectId/label").patch(auth0Middleware(), screenContentMiddlewa if (typeof label !== "string" || !label?.trim()) return respondWithError(res, 400, "JSON with a 'label' property required in the request body. It cannot be null or blank and must be a string.") try { let project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.METADATA, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to update this project's label") + } const loadedProject = await project.loadProject() if (!loadedProject) return respondWithError(res, 404, "Project not found") project = await project.setLabel(label) diff --git a/project/projectReadRouter.js b/project/projectReadRouter.js index 82553e03..60cb9bf5 100644 --- a/project/projectReadRouter.js +++ b/project/projectReadRouter.js @@ -96,20 +96,17 @@ function filterProjectInterfaces(project, namespaces) { router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { const { id } = req.params const user = req.user + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") try { + if (!await new Project(id).checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PROJECT)) { + return respondWithError(res, 403, "You do not have permission to export this project") + } const project = await ProjectFactory.loadAsUser(id, null) if (!project) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) } - const collaboratorIdList = Object.keys(project.collaborators) - if (!collaboratorIdList.includes(user._id)) { - return respondWithError(res, 403, "You do not have permission to export this project") - } - if (!await new Project(id).checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PROJECT)) { - return respondWithError(res, 403, "You do not have permission to export this project") - } const manifest = await ProjectFactory.exportManifest(id) await ProjectFactory.uploadFileToGitHub(manifest, `${id}`) res.status(200).json(manifest) @@ -125,10 +122,16 @@ router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { }) router.route("/:id/deploymentStatus").get(auth0Middleware(), async (req, res) => { + const user = req.user const { id } = req.params + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") try { + const project = new Project(id) + if (!(await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to view this project's deployment status") + } const { status } = await ProjectFactory.checkManifestUploadAndDeployment(id) if (!status) { return respondWithError(res, 404, `No deployment status found for project with ID '${id}'`) @@ -150,18 +153,23 @@ router.route("/:id/deploymentStatus").get(auth0Middleware(), async (req, res) => router.route("/:id").get(auth0Middleware(), async (req, res) => { const user = req.user + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") let id = req.params.id if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") try { - const project = await ProjectFactory.loadAsUser(id, user._id) - if (!project) { + const project = new Project(id) + if (!(await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT))) { + return respondWithError(res, 403, "You do not have permission to view this project") + } + const projectData = await ProjectFactory.loadAsUser(id, user._id) + if (!projectData) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) } - + // Filter interfaces based on origin and query parameters const namespacesToInclude = getNamespacesToInclude(req) - const filteredProject = filterProjectInterfaces(project, namespacesToInclude) + const filteredProject = filterProjectInterfaces(projectData, namespacesToInclude) res.status(200).json(filteredProject) } catch (error) { diff --git a/project/projectToolsRouter.js b/project/projectToolsRouter.js index 3b13f13e..2eb9a027 100644 --- a/project/projectToolsRouter.js +++ b/project/projectToolsRouter.js @@ -2,11 +2,16 @@ import express from "express" import { respondWithError } from "../utilities/shared.js" import validateURL from "../utilities/validateURL.js" import Tools from "../classes/Tools/Tools.js" +import auth0Middleware from "../auth/index.js" +import Project from "../classes/Project/Project.js" +import { ACTIONS, ENTITIES, SCOPES } from "./groups/permissions_parameters.js" const router = express.Router({ mergeParams: true }) //Add Tool to Project -router.route("/:projectId/tool").post(async (req, res) => { +router.route("/:projectId/tool").post(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -20,6 +25,10 @@ router.route("/:projectId/tool").post(async (req, res) => { if (!projectId || !validateURL(projectId)) { return respondWithError(res, 400, "A valid project ID is required.") } + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.TOOLS))) { + return respondWithError(res, 403, "You do not have permission to add tools to this project") + } const tools = new Tools(projectId) await tools.validateToolArray(req?.body) if (await tools.checkIfToolExists(toolName)) { @@ -47,7 +56,9 @@ router.route("/:projectId/tool").post(async (req, res) => { console.error("Error adding tool:", error) return respondWithError(res, error.status || 500, error.message || "An error occurred while adding the tool.") } -}).delete(async (req, res) => { +}).delete(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -63,6 +74,10 @@ router.route("/:projectId/tool").post(async (req, res) => { if (!projectId || !validateURL(projectId)) { return respondWithError(res, 400, "A valid project ID is required.") } + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.TOOLS))) { + return respondWithError(res, 403, "You do not have permission to remove tools from this project") + } const tools = new Tools(projectId) if (!await tools.checkToolPattern(toolName)) { return respondWithError(res, 400, "toolName must be in 'lowercase-with-hyphens' format.") @@ -84,7 +99,9 @@ router.route("/:projectId/tool").post(async (req, res) => { }) // Toggle Tool State in Project -router.route("/:projectId/toggleTool").put(async (req, res) => { +router.route("/:projectId/toggleTool").put(auth0Middleware(), async (req, res) => { + const user = req.user + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") if (!req.body || typeof req.body !== 'object') { return respondWithError(res, 400, "Request body is required") } @@ -100,6 +117,10 @@ router.route("/:projectId/toggleTool").put(async (req, res) => { if (!projectId || !validateURL(projectId)) { return respondWithError(res, 400, "A valid project ID is required.") } + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.TOOLS))) { + return respondWithError(res, 403, "You do not have permission to toggle tools in this project") + } const tools = new Tools(projectId) if (!await tools.checkToolPattern(toolName)) { return respondWithError(res, 400, "toolName must be in 'lowercase-with-hyphens' format.") diff --git a/userProfile/__tests__/end_to_end_unit.test.js b/userProfile/__tests__/end_to_end_unit.test.js index e24b9aea..577de280 100644 --- a/userProfile/__tests__/end_to_end_unit.test.js +++ b/userProfile/__tests__/end_to_end_unit.test.js @@ -21,11 +21,11 @@ describe("Test private routes restfulness #user_class", () => { }) -describe("Unauthourized GETs #user_class", () => { - it("/my/project should return 401 if there is no Authorization header #user_class", async () => { +describe("Unauthorized GETs #user_class", () => { + it("/my/project should return 400 if there is no Authorization header #user_class", async () => { const response = await request(mainApp) - .get("/my/projects") - expect(response.status).toBe(401) + .get("/my/projects") + expect(response.status).toBe(400) expect(response.body).toBeTruthy() }) @@ -37,16 +37,16 @@ describe("Unauthourized GETs #user_class", () => { expect(response.body).toBeTruthy() }) - it("/my/profile should return 401 if there is no Authorization header.", async () => { + it("/my/profile should return 400 if there is no Authorization header.", async () => { const response = await request(mainApp) - .get("/my/profile") - expect(response.status).toBe(401) + .get("/my/profile") + expect(response.status).toBe(400) expect(response.body).toBeTruthy() }) it("/my/profile should return 401 for an invalid Authorization header.", async () => { const response = await request(mainApp) - .get("/my/profile") + .get("/my/profile") .set("Authorization", `Bearer 123123123123123123123123123`) expect(response.status).toBe(401) expect(response.body).toBeTruthy() diff --git a/userProfile/privateProfile.js b/userProfile/privateProfile.js index ec243365..cabe3acf 100644 --- a/userProfile/privateProfile.js +++ b/userProfile/privateProfile.js @@ -13,7 +13,7 @@ router.use( router.route("/profile").get(auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthorized user") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { res.status(200).json(user) } catch (error) { @@ -21,7 +21,7 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { } }).put(auth0Middleware(), async (req, res) => { const user = req.user - if (!user) return respondWithError(res, 401, "Unauthorized user") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { if (req.body && !Array.isArray(req.body)) { for (const key in req.body) { @@ -39,7 +39,7 @@ router.route("/profile").get(auth0Middleware(), async (req, res) => { router.route("/projects").get(auth0Middleware(), async (req, res) => { const user = await req.user - if (!user) return respondWithError(res, 401, "Unauthorized user") + if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { const userObj = await new User(user._id) const userProjects = await userObj.getProjects() From c2f669ee24537beacbc1bbe1023830fdbe49e373 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Fri, 9 Jan 2026 14:41:07 -0600 Subject: [PATCH 247/262] Align Packages (#444) * packages * darnit jsdom --- package-lock.json | 100 ++++++++++++++++++++++++++++------------------ package.json | 16 ++++---- 2 files changed, 69 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff1c256a..a405827c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,23 +17,23 @@ "dotenv": "^17.2.3", "express": "^5.2.1", "express-list-endpoints": "^7.1.1", - "express-oauth2-jwt-bearer": "~1.6.1", + "express-oauth2-jwt-bearer": "^1.7.2", "image-size": "^2.0.2", - "jsdom": "^27.0.0", + "jsdom": "27.0.0", "mariadb": "^3.4.5", "marked": "^17.0.1", "mime-types": "^3.0.2", "mongodb": "^7.0.0", "morgan": "^1.10.1", - "nodemailer": "^7.0.11", + "nodemailer": "^7.0.12", "tpen3-services": "file:" }, "devDependencies": { "@jest/globals": "^30.2.0", "jest": "^30.2.0", "nodemon": "^3.1.11", - "sinon": "^21.0.0", - "supertest": "^7.1.4" + "sinon": "^21.0.1", + "supertest": "^7.2.2" }, "engines": { "node": ">=24.12.0", @@ -1282,9 +1282,9 @@ } }, "node_modules/@paralleldrive/cuid2": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz", - "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.3.1.tgz", + "integrity": "sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==", "dev": true, "license": "MIT", "dependencies": { @@ -2703,9 +2703,9 @@ } }, "node_modules/diff": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", - "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.2.tgz", + "integrity": "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -3025,15 +3025,15 @@ } }, "node_modules/express-oauth2-jwt-bearer": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.6.1.tgz", - "integrity": "sha512-fhgIvVZ6iSR/jqyVHBcN9Df7VeBdVhg5d2yN6+HNrSEegmhbh9hFY+TvtvBmsv130fI06EW3Dgp9ApmYwArN6Q==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.7.2.tgz", + "integrity": "sha512-wuJj5RSEDYgALTCX0GSAoQDNIp+8yLyiOPKbe9ECaMmeHMZuCgsvRaqD9s0D72RjPnlGbuFU62YhXuv30/DFBw==", "license": "MIT", "dependencies": { "jose": "^4.15.5" }, "engines": { - "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0 || ^22.1.0" + "node": "^12.19.0 || ^14.15.0 || ^16.13.0 || ^18.12.0 || ^20.2.0 || ^22.1.0 || ^24.0.0" } }, "node_modules/express/node_modules/cookie-signature": { @@ -3131,9 +3131,9 @@ } }, "node_modules/form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", + "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", "dev": true, "license": "MIT", "dependencies": { @@ -4951,9 +4951,9 @@ "license": "MIT" }, "node_modules/nodemailer": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.11.tgz", - "integrity": "sha512-gnXhNRE0FNhD7wPSCGhdNh46Hs6nm+uTyg+Kq0cZukNQiYdnCsoQjodNP9BQVG9XrcK/v6/MgpAPBUFyzh9pvw==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.12.tgz", + "integrity": "sha512-H+rnK5bX2Pi/6ms3sN4/jRQvYSMltV6vqup/0SFOrxYYY/qoNvhXPlYq3e+Pm9RFJRwrMGbMIwi81M4dxpomhA==", "license": "MIT-0", "engines": { "node": ">=6.0.0" @@ -5429,9 +5429,9 @@ "license": "MIT" }, "node_modules/qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", + "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" @@ -5793,16 +5793,16 @@ } }, "node_modules/sinon": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.0.tgz", - "integrity": "sha512-TOgRcwFPbfGtpqvZw+hyqJDvqfapr1qUlOizROIk4bBLjlsjlB00Pg6wMFXNtJRpu+eCZuVOaLatG7M8105kAw==", + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.1.tgz", + "integrity": "sha512-Z0NVCW45W8Mg5oC/27/+fCqIHFnW8kpkFOq0j9XJIev4Ld0mKmERaZv5DMLAb9fGCevjKwaEeIQz5+MBXfZcDw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^13.0.5", - "@sinonjs/samsam": "^8.0.1", - "diff": "^7.0.0", + "@sinonjs/fake-timers": "^15.1.0", + "@sinonjs/samsam": "^8.0.3", + "diff": "^8.0.2", "supports-color": "^7.2.0" }, "funding": { @@ -5810,6 +5810,16 @@ "url": "https://opencollective.com/sinon" } }, + "node_modules/sinon/node_modules/@sinonjs/fake-timers": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.0.tgz", + "integrity": "sha512-cqfapCxwTGsrR80FEgOoPsTonoefMBY7dnUEbQ+GRcved0jvkJLzvX6F4WtN+HBqbPX/SiFsIRUp+IrCW/2I2w==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1" + } + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -6063,9 +6073,9 @@ } }, "node_modules/superagent": { - "version": "10.2.3", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.3.tgz", - "integrity": "sha512-y/hkYGeXAj7wUMjxRbB21g/l6aAEituGXM9Rwl4o20+SX3e8YOSV6BxFXl+dL3Uk0mjSL3kCbNkwURm8/gEDig==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.3.0.tgz", + "integrity": "sha512-B+4Ik7ROgVKrQsXTV0Jwp2u+PXYLSlqtDAhYnkkD+zn3yg8s/zjA2MeGayPoY/KICrbitwneDHrjSotxKL+0XQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6073,30 +6083,41 @@ "cookiejar": "^2.1.4", "debug": "^4.3.7", "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.4", + "form-data": "^4.0.5", "formidable": "^3.5.4", "methods": "^1.1.2", "mime": "2.6.0", - "qs": "^6.11.2" + "qs": "^6.14.1" }, "engines": { "node": ">=14.18.0" } }, "node_modules/supertest": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.4.tgz", - "integrity": "sha512-tjLPs7dVyqgItVFirHYqe2T+MfWc2VOBQ8QFKKbWTA3PU7liZR8zoSpAi/C1k1ilm9RsXIKYf197oap9wXGVYg==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.2.2.tgz", + "integrity": "sha512-oK8WG9diS3DlhdUkcFn4tkNIiIbBx9lI2ClF8K+b2/m8Eyv47LSawxUzZQSNKUrVb2KsqeTDCcjAAVPYaSLVTA==", "dev": true, "license": "MIT", "dependencies": { + "cookie-signature": "^1.2.2", "methods": "^1.1.2", - "superagent": "^10.2.3" + "superagent": "^10.3.0" }, "engines": { "node": ">=14.18.0" } }, + "node_modules/supertest/node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.6.0" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -6477,6 +6498,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation", "license": "MIT", "dependencies": { "iconv-lite": "0.6.3" diff --git a/package.json b/package.json index 0d4e426a..287caaf9 100644 --- a/package.json +++ b/package.json @@ -41,26 +41,26 @@ "dotenv": "^17.2.3", "express": "^5.2.1", "express-list-endpoints": "^7.1.1", - "express-oauth2-jwt-bearer": "~1.6.1", + "express-oauth2-jwt-bearer": "^1.7.2", "image-size": "^2.0.2", - "jsdom": "^27.0.0", + "jsdom": "27.0.0", "mariadb": "^3.4.5", "marked": "^17.0.1", "mime-types": "^3.0.2", "mongodb": "^7.0.0", "morgan": "^1.10.1", - "nodemailer": "^7.0.11", + "nodemailer": "^7.0.12", "tpen3-services": "file:" }, "devDependencies": { "@jest/globals": "^30.2.0", "jest": "^30.2.0", "nodemon": "^3.1.11", - "sinon": "^21.0.0", - "supertest": "^7.1.4" + "sinon": "^21.0.1", + "supertest": "^7.2.2" }, "engines": { - "node": ">=24.12.0", - "npm": ">=11.7.0" - } + "node": ">=24.12.0", + "npm": ">=11.7.0" + } } From ae3aea9e210bf23b8562cf2376c7c5bcd5c88f3f Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Wed, 18 Feb 2026 14:47:51 -0600 Subject: [PATCH 248/262] Personalized Name String in E-mails (#449) * Better attempt at using a personalized string for usernames in emails instead of the generic 'TPEN User' text. * Changes while reviewing * Changes while reviewing * Changes while reviewing --- .claude/settings.json | 18 ------------- .claude/statusline-command.sh | 51 ----------------------------------- classes/Project/Project.js | 6 +++-- utilities/mailer/index.js | 13 +++++++-- 4 files changed, 15 insertions(+), 73 deletions(-) delete mode 100644 .claude/settings.json delete mode 100644 .claude/statusline-command.sh diff --git a/.claude/settings.json b/.claude/settings.json deleted file mode 100644 index 9f1ee439..00000000 --- a/.claude/settings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "statusLine": { - "type": "command", - "command": "bash /mnt/e/tpen3-services/.claude/statusline-command.sh" - }, - "env": { - "CLAUDE_CODE_MAX_OUTPUT_TOKENS": "500000", - "CLAUDE_CODE_DISABLE_TERMINAL_TITLE": "1", - "MAX_MCP_OUTPUT_TOKENS": "500000", - "DISABLE_ERROR_REPORTING": "0", - "DISABLE_NON_ESSENTIAL_MODEL_CALLS": "0", - "DISABLE_PROMPT_CACHING": "0", - "MAX_THINKING_TOKENS": "500000", - "BASH_MAX_TIMEOUT_MS": "3000000", - "OPENCODE_DISABLE_PRUNE": "true", - "OPENCODE_DISABLE_AUTOCOMPACT": "true" - } -} diff --git a/.claude/statusline-command.sh b/.claude/statusline-command.sh deleted file mode 100644 index ed13514a..00000000 --- a/.claude/statusline-command.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -# Read JSON input -input=$(cat) - -# Extract data from JSON -cwd=$(echo "$input" | jq -r '.workspace.current_dir') -cost=$(echo "$input" | jq -r '.cost.total_cost_usd // 0') -api_duration=$(echo "$input" | jq -r '.cost.total_api_duration_ms // 0') -total_duration=$(echo "$input" | jq -r '.cost.total_duration_ms // 0') -lines_added=$(echo "$input" | jq -r '.cost.total_lines_added // 0') -lines_removed=$(echo "$input" | jq -r '.cost.total_lines_removed // 0') -model_display=$(echo "$input" | jq -r '.model.display_name // "unknown"') - -# Calculate API duration in seconds -api_duration_sec=$(echo "scale=1; $api_duration / 1000" | bc -l 2>/dev/null || echo "0") - -# Get git branch if in a git repository -git_branch="" -if git -C "$cwd" rev-parse --git-dir > /dev/null 2>&1; then - branch=$(git -C "$cwd" -c core.fileMode=false branch --show-current 2>/dev/null) - if [ -n "$branch" ]; then - git_branch="($branch)" - fi -fi - -# Build the enhanced status line -# Format: (branch) model $cost | API: Xs | +L/-L - -# Cyan for git branch -if [ -n "$git_branch" ]; then - printf '\033[36m%s\033[0m ' "$git_branch" -fi - -# Magenta for model name -printf '\033[35m%s\033[0m ' "$model_display" - -# Bold yellow for cost (live updating token usage proxy) -printf '\033[1;33m$%.4f\033[0m' "$cost" - -# Green for API time (shows compute usage) -if [ "$api_duration" != "0" ]; then - printf ' \033[32m| API: %ss\033[0m' "$api_duration_sec" -fi - -# White for code changes (productivity) -if [ "$lines_added" != "0" ] || [ "$lines_removed" != "0" ]; then - printf ' \033[37m| +%s/-%s\033[0m' "$lines_added" "$lines_removed" -fi - -printf '\n' diff --git a/classes/Project/Project.js b/classes/Project/Project.js index c79db93a..2eafcb23 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -93,7 +93,8 @@ export default class Project {

` } - await sendMail(email, `Invitation to ${projectTitle}`, message) + const recipientName = user?.profile?.displayName || email.split("@")[0] + await sendMail(email, `Invitation to ${projectTitle}`, message, recipientName) return this } catch (error) { throw error @@ -252,7 +253,8 @@ export default class Project {

Your contributions to the project remain attributed to you, but you no longer have access to some TPEN3 data. *Access to RERUM data is not affected.

If you believe this was done in error, please contact a project administrator.

` - await sendMail(userData.email, subject, message) + const recipientName = userData?.profile?.displayName || userData?.email?.split("@")[0] + await sendMail(userData.email, subject, message, recipientName) } } catch (emailError) { console.error("Failed to send removal confirmation email:", emailError) diff --git a/utilities/mailer/index.js b/utilities/mailer/index.js index 153bc66d..08a8e00e 100644 --- a/utilities/mailer/index.js +++ b/utilities/mailer/index.js @@ -6,7 +6,15 @@ import {fileURLToPath} from "url" const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) -export const sendMail = async (email, subject, message) => { +/** + * Send an email using the HTML template. + * @param {string} email - Recipient email address. + * @param {string} subject - Email subject line. + * @param {string} message - HTML message body content. + * @param {string} [userName] - Recipient display name for the greeting. + * @returns {Promise<{status: number, message: string}>} + */ +export const sendMail = async (email, subject, message, userName) => { if (!email || typeof email !== "string") { return { status: 400, @@ -32,7 +40,8 @@ export const sendMail = async (email, subject, message) => { const templatepath = path.join(__dirname, "template.html") let htmlTemplate = fs.readFileSync(templatepath, "utf-8") - htmlTemplate = htmlTemplate.replace("{{userName}}", "TPEN User") + const displayName = userName || email.split("@")[0] + htmlTemplate = htmlTemplate.replace("{{userName}}", displayName) htmlTemplate = htmlTemplate.replace("{{subject}}", subject) htmlTemplate = htmlTemplate.replace("{{messageBody}}", message) From 2b0c24a2a7e73f8c216bfa016e16bef8f94bb423 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Mon, 23 Feb 2026 11:15:30 -0600 Subject: [PATCH 249/262] Validate PATCH /line/:lineid/bounds requests (#452) * First pass at validating the xywh * changes while reviewing --- classes/Line/Line.js | 6 ++++-- line/index.js | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/classes/Line/Line.js b/classes/Line/Line.js index bb029ad3..65d76ac7 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -180,9 +180,11 @@ export default class Line { } async updateBounds({x, y, w, h}, options = {}) { - if (!x || !y || !w || !h) { - throw new Error('Bounds ({x,y,w,h}) must be provided') + const isValidBound = v => (Number.isInteger(v) && v >= 0) || (typeof v === 'string' && /^\d+$/.test(v)) + if (!isValidBound(x) || !isValidBound(y) || !isValidBound(w) || !isValidBound(h)) { + throw new Error('Bounds ({x,y,w,h}) must be non-negative integers') } + x = parseInt(x, 10); y = parseInt(y, 10); w = parseInt(w, 10); h = parseInt(h, 10) if (options.creator) this.creator = options.creator this.target ??= '' const newTarget = this.updateTargetXYWH(this.target, x, y, w, h) diff --git a/line/index.js b/line/index.js index 8ef3a58a..4c123f6d 100644 --- a/line/index.js +++ b/line/index.js @@ -270,9 +270,11 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.SELECTOR, ENTITIES.LINE))) { return respondWithError(res, 403, 'You do not have permission to update line bounds in this project') } - if (typeof req.body !== 'object' || !req.body.x || !req.body.y || !req.body.w || !req.body.h) { - return respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h properties.') + const isValidBound = v => (Number.isInteger(v) && v >= 0) || (typeof v === 'string' && /^\d+$/.test(v)) + if (!req.body || typeof req.body !== 'object' || Array.isArray(req.body) || !isValidBound(req.body.x) || !isValidBound(req.body.y) || !isValidBound(req.body.w) || !isValidBound(req.body.h)) { + return respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h as non-negative integers.') } + const bounds = { x: parseInt(req.body.x, 10), y: parseInt(req.body.y, 10), w: parseInt(req.body.w, 10), h: parseInt(req.body.h, 10) } const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) const findOldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) @@ -283,7 +285,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { let oldLine = await fetch(findOldLine.id).then(res => res.json()) delete oldLine.label const line = new Line(oldLine) - const updatedLine = await line.updateBounds(req.body, { creator: user._id }) + const updatedLine = await line.updateBounds(bounds, { creator: user._id }) const lineIndex = page.items.findIndex(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) page.items[lineIndex] = updatedLine From 1b406399237d03dab7a1f568f9e1859df3b432f3 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Tue, 24 Feb 2026 13:11:23 -0600 Subject: [PATCH 250/262] 407 update updates (#454) * caller choses whether to save after * Add shouldUpdate flag to Group role methods Introduce an optional shouldUpdate parameter to Group.setMemberRoles and Group.removeMemberRoles to control whether changes are immediately persisted. These methods now skip calling update() when shouldUpdate is false, allowing callers to batch multiple role mutations and perform a single update. Call sites updated: removed a redundant update in Project.removeMember flow and adjusted memberRouter to pass shouldUpdate=false for intermediate role changes, then call group.update() once after all changes. This reduces redundant DB writes and improves efficiency. --- classes/Group/Group.js | 38 +++++++++++++++++++++++++------------- classes/Project/Project.js | 1 - project/memberRouter.js | 7 +++---- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/classes/Group/Group.js b/classes/Group/Group.js index 9c7a3b36..2f491e63 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -68,8 +68,9 @@ export default class Group { * Replace all roles for a member with the provided roles. * @param {String} memberId _id of the member * @param {Array | String} roles [ROLE, ROLE, ...] or "ROLE ROLE ..." + * @param {boolean} shouldUpdate Persist changes when true */ - async setMemberRoles(memberId, roles) { + async setMemberRoles(memberId, roles, shouldUpdate = true) { if (!Object.keys(this.data.members).length) { await this.#loadFromDB() } @@ -92,15 +93,19 @@ export default class Group { roles = washRoles(roles) this.data.members[memberId].roles = roles - await this.update() + if (shouldUpdate) { + await this.update() + } } /** * Add if not in roles for a member with the provided roles. * @param {String} memberId _id of the member * @param {Array | String} roles [ROLE, ROLE, ...] or "ROLE ROLE ..." + * @param {boolean} allowOwner Allow assignment of OWNER role + * @param {boolean} shouldUpdate Persist changes when true */ - async addMemberRoles(memberId, roles, allowOwner = false) { + async addMemberRoles(memberId, roles, allowOwner = false, shouldUpdate = true) { if (!Object.keys(this.data.members).length) { await this.#loadFromDB() @@ -122,16 +127,19 @@ export default class Group { } roles = washRoles(roles, allowOwner) this.data.members[memberId].roles = [...new Set([...this.data.members[memberId].roles, ...roles])] - // If we need the group to update first (caused error) - // await this.update() + if (shouldUpdate) { + await this.update() + } } /** * Remove roles if found for a member. * @param {String} memberId _id of the member * @param {Array | String} roles [ROLE, ROLE, ...] or "ROLE ROLE ..." + * @param {boolean} allowOwner Allow removal of OWNER role + * @param {boolean} shouldUpdate Persist changes when true */ - async removeMemberRoles(memberId, roles, allowOwner = false) { + async removeMemberRoles(memberId, roles, allowOwner = false, shouldUpdate = true) { if (!Object.keys(this.data.members).length) { await this.#loadFromDB() } @@ -160,7 +168,9 @@ export default class Group { } this.data.members[memberId].roles = this.data.members[memberId].roles.filter(role => !roles.includes(role)) - await this.update() + if (shouldUpdate) { + await this.update() + } } /** @@ -172,8 +182,9 @@ export default class Group { * * @param {string} memberId The User/member _id to remove from the Group and perhaps delete from the db. * @param {boolean} voluntary Whether the user is leaving voluntarily (true) or being removed by admin (false). + * @param {boolean} shouldUpdate Persist changes when true */ - async removeMember(memberId, voluntary = false) { + async removeMember(memberId, voluntary = false, shouldUpdate = true) { if (!Object.keys(this.data.members).length) { await this.#loadFromDB() } @@ -196,8 +207,9 @@ export default class Group { } } delete this.data.members[memberId] - // If we need the Group to update in the db in addition to the Class data. - // await this.update() + if (shouldUpdate) { + await this.update() + } } /** @@ -309,11 +321,11 @@ export default class Group { } if (!this.getByRole("OWNER")?.length) { - await this.addMemberRoles(this.data.creator, "OWNER", true) + await this.addMemberRoles(this.data.creator, "OWNER", true, false) } if (!this.getByRole("LEADER")?.length) { - await this.addMemberRoles(this.data.creator, "LEADER") - } + await this.addMemberRoles(this.data.creator, "LEADER", false, false) + } } static async createNewGroup(creator, payload) { diff --git a/classes/Project/Project.js b/classes/Project/Project.js index 2eafcb23..6e6f6ed3 100644 --- a/classes/Project/Project.js +++ b/classes/Project/Project.js @@ -235,7 +235,6 @@ export default class Project { const user = new User(userId) const userData = await user.getSelf() await group.removeMember(userId, voluntary) - await group.update() const projectTitle = this.data?.label ?? this.data?.title ?? 'TPEN Project' try { // Send confirmation email (non-blocking) diff --git a/project/memberRouter.js b/project/memberRouter.js index 8be9ae65..1e21f581 100644 --- a/project/memberRouter.js +++ b/project/memberRouter.js @@ -72,7 +72,6 @@ router.route("/:projectId/collaborator/:collaboratorId/addRoles").post(auth0Midd const groupId = projectObj.data.group const group = new Group(groupId) await group.addMemberRoles(collaboratorId, roles) - await group.update() res.status(200).send(`Roles added to member ${collaboratorId}.`) } catch (error) { return respondWithError(res, error.status ?? 500, error.message ?? "Error adding roles to member.") @@ -137,9 +136,9 @@ router.route("/:projectId/switch/owner").post(auth0Middleware(), async (req, res } const group = new Group(projectObj.data.group) const currentRoles = await group.getMemberRoles(user._id) - Object.keys(currentRoles).length === 1 && await group.addMemberRoles(user._id, ["CONTRIBUTOR"]) - await group.addMemberRoles(newOwnerId, ["OWNER"], true) - await group.removeMemberRoles(user._id, ["OWNER"], true) + Object.keys(currentRoles).length === 1 && await group.addMemberRoles(user._id, ["CONTRIBUTOR"], false, false) + await group.addMemberRoles(newOwnerId, ["OWNER"], true, false) + await group.removeMemberRoles(user._id, ["OWNER"], true, false) await group.update() res.status(200).json({ message: `Ownership successfully transferred to member ${newOwnerId}.` }) } catch (error) { From 381eb371d5481273ccb254fdbfa8ded09c891353 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 26 Feb 2026 11:19:25 -0600 Subject: [PATCH 251/262] New GET /line/:lineid?text=blob Feature (#455) * Gave the agent pipeline a try * Changes while testing and reviewing * No tests * Lines section for API.html * Lines section for API.html * oo bail on this, it needs to be its own task * simplify * Say less in AI assistant files * Changes while reviewing * Changes while reviewing * Remove this section * clean this up a little * clean this up a little * Ah I see this was trying to help how it fails through, but we need these to throw their errors like usual. * Now it fails through how it is supposed to * Now it fails through how it is supposed to * white space lint stuff * How about a redo for reasons * clean up function documentation * changes while reviewing * touchup for function documentation * const * changes during review * changes during review * shape of the refactor * Gotta fix this now then * Gotta fix this now then * Remove the fallback conditionals, the Class will handle it * Remove imported Line function. It is no longer required here * changes from getting demo to run * changes from getting demo to run * Working demo * Changes during review * Changes during review * Gimme those sweet sweet rerum errors * Gimme those sweet sweet rerum errors * Changes during review * changes while testing * oops bad docs * Really take the body from RERUM even if falsey * Changes during standup * Touchups during final review step * Touchups during final review step * Touchups during final review step --- .claude/CLAUDE.md | 192 ++------------------------------ .github/copilot-instructions.md | 175 ++++------------------------- classes/Line/Line.js | 138 +++++++++++++++++++---- line/index.js | 27 +++-- 4 files changed, 164 insertions(+), 368 deletions(-) diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md index a0d9d786..ba498dce 100644 --- a/.claude/CLAUDE.md +++ b/.claude/CLAUDE.md @@ -6,209 +6,35 @@ This file provides guidance to AI Assistants when working with code in this repo TPEN Services is a Node.js Express API service for TPEN3 (Transcription for Paleographical and Editorial Notation). This provides RESTful APIs for digital humanities, cultural heritage, annotation services, and IIIF manifest handling. The service supports multiple database backends (MongoDB, MariaDB) and uses Auth0 for authentication. -Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here. - ## Working Effectively ### Bootstrap, Build, and Test the Repository -- Copy environment configuration: `cp .env.development .env` +- Environment configuration is in .env. Do not overwrite the existing .env file. If an .env file does not exist then copy environment configuration: `cp .env.development .env` - Install dependencies: `npm install` -- takes up to 20 seconds. NEVER CANCEL. Set timeout to 60+ seconds. -- Run unit tests: `npm run unitTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. -- Run existence tests: `npm run existsTests` -- takes 7 seconds. NEVER CANCEL. Set timeout to 30+ seconds. -- Run all tests: `npm run allTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. ### Run the Application - ALWAYS run the bootstrapping steps first. - Production server: `npm start` -- starts on port 3011 - Development server: `npm run dev` -- starts with nodemon auto-reload on port 3011 -- Test basic functionality: `curl http://localhost:3011/` should return "TPEN3 SERVICES BABY!!!" - -### Environment Requirements -- Node.js >= 22.20.0 -- MongoDB (for database tests and full functionality) -- MariaDB (for database tests and full functionality) -- Copy `.env.development` to `.env` for basic functionality -- For full functionality, configure database connection strings in `.env` +- Test basic functionality: `curl http://localhost:3011/API.html` should return the API page. ## Validation ### Always Validate Core Functionality After Changes -- Start the application: `npm start` or `npm run dev` -- Test the root endpoint: `curl http://localhost:3011/` -- should return HTML with "TPEN3 SERVICES BABY!!!" -- Run unit tests that don't require databases: `npm run unitTests` -- many tests pass without database connections -- Run existence tests: `npm run existsTests` -- validates route registration and class imports -- ALWAYS wait for full test completion. Tests may appear to hang but will complete within 12 seconds. -- NOTE: Application may crash after serving initial requests due to database connection attempts - this is expected behavior without running MongoDB/MariaDB. - -### Test Categories Available -- `npm run unitTests` -- Core unit tests (some require databases) -- `npm run existsTests` -- Route and class existence validation (database-independent) -- `npm run functionsTests` -- Function-level tests -- `npm run E2Etests` -- End-to-end API tests -- `npm run dbTests` -- Database-specific tests (require running databases) -- `npm run authTest` -- Authentication tests (require Auth0 configuration) +- Run `npm run allTests` once you have completed your task and need to verify correctness before continuing. +- ALWAYS wait for full test completion. Tests can take minutes. NEVER CANCEL. +- NOTE: Application may crash after serving initial requests due to database connection attempts - this is expected behavior without a connection to MongoDB. ### Expected Test Behavior - Tests requiring databases will timeout/fail without MongoDB/MariaDB running - Auth tests fail without proper AUDIENCE and DOMAIN environment variables - Core functionality tests (exists, basic units) should pass with minimal `.env` setup -- Database-independent tests complete in 6-15 seconds - -## Common Tasks - -### Repository Structure -``` -/home/runner/work/TPEN-services/TPEN-services/ -├── app.js # Express application setup -├── bin/tpen3_services.js # Server entry point -├── package.json # Dependencies and scripts -├── jest.config.js # Test configuration -├── config.env # Safe defaults (committed) -├── .env.development # Development template -├── .env.production # Production template -├── API.md # API documentation -├── classes/ # Domain model classes -│ ├── Project/ # Project management -│ ├── User/ # User management -│ ├── Group/ # Group management -│ ├── Layer/ # Annotation layers -│ ├── Line/ # Text line handling -│ ├── Page/ # Page management -│ └── Manifest/ # IIIF manifest handling -├── database/ # Database drivers -│ ├── mongo/ # MongoDB controller -│ ├── maria/ # MariaDB controller -│ └── tiny/ # TinyPEN API controller -├── auth/ # Auth0 authentication -├── project/ # Project API routes -├── userProfile/ # User API routes -├── line/ # Line API routes -├── page/ # Page API routes -└── utilities/ # Helper functions -``` - -### Key API Endpoints -- `GET /` -- Service status (returns "TPEN3 SERVICES BABY!!!") -- `GET /project/:id` -- Get project by ID (requires authentication) -- `POST /project/create` -- Create new project (requires authentication) -- `POST /project/import?createFrom=URL` -- Import project from IIIF manifest -- `GET /user/:id` -- Get user profile (public) -- `GET /my/profile` -- Get authenticated user profile -- `GET /line/:id` -- Get text line annotation -- `GET /page/:id` -- Get annotation page - -### Authentication -- Uses Auth0 JWT bearer tokens -- Protected endpoints require `Authorization: Bearer ` header -- Environment variables AUDIENCE and DOMAIN must be configured for auth tests -- Public endpoints: `/`, `/user/:id` -- Protected endpoints: `/project/*`, `/my/*`, most POST/PUT/DELETE operations - -### Database Configuration -- MongoDB: Configure MONGODB and MONGODBNAME in `.env` -- MariaDB: Configure MARIADB, MARIADBNAME, MARIADBUSER, MARIADBPASSWORD in `.env` -- TinyPEN API: Configure TINYPEN in `.env` -- Default configurations in `config.env` point to localhost development services -- MongoDB Collections: TPENPROJECTS, TPENGROUPS, TPENUSERS, TPENCOLUMNS (configured in `config.env`) ### Development Workflow -1. Always start with: `cp .env.development .env && npm install` +1. Ensure .env exists (if not: `cp .env.development .env`) and run `npm install` 2. Make code changes -3. Test with: `npm run existsTests` (fast, database-independent) -4. For database changes: ensure MongoDB/MariaDB running, then `npm run dbTests` -5. For API changes: `npm run E2Etests` -6. Start dev server: `npm run dev` -7. Test manually: `curl http://localhost:3011/` and relevant endpoints - -### Debugging and Troubleshooting -- Application logs appear in console when running `npm start` or `npm run dev` -- Database connection errors indicate missing database services -- Auth errors indicate missing AUDIENCE/DOMAIN environment variables -- 404 errors on routes indicate route registration issues -- Check `app.js` for middleware and route registration -- Jest warnings about experimental VM modules are expected (ES module usage) - -### CI/CD Integration -- GitHub Actions workflows in `.github/workflows/` -- `test_pushes.yaml` runs unit tests on pushes -- `ci_dev.yaml` runs E2E tests on PRs to development -- Tests require environment secrets configured in GitHub repository settings - -### Performance Notes -- Application startup: 2-3 seconds -- npm install: ~1-20 seconds depending on cache (timeout: 60+ seconds) -- Unit tests: ~12 seconds (timeout: 30+ seconds) -- Existence tests: ~7 seconds (timeout: 30+ seconds) -- Database tests: variable depending on database response times - -### Critical Environment Variables -Required for basic functionality: -- `PORT` (default: 3011) -- `SERVERURL` (default: http://localhost:3011) - -Required for database functionality: -- `MONGODB` (MongoDB connection string) -- `MONGODBNAME` (MongoDB database name) -- `MARIADB` (MariaDB host) -- `MARIADBNAME`, `MARIADBUSER`, `MARIADBPASSWORD` (MariaDB credentials) - -MongoDB collection names (configured in `config.env`): -- `TPENPROJECTS` (default: projects) - Project documents collection -- `TPENGROUPS` (default: groups) - User groups collection -- `TPENUSERS` (default: users) - User profiles collection -- `TPENCOLUMNS` (default: columns) - Column annotations collection - -Required for authentication: -- `AUDIENCE` (Auth0 audience) -- `DOMAIN` (Auth0 domain) - -Required for external services: -- `TINYPEN` (TinyPEN API base URL) -- `RERUMURL` (RERUM repository URL) - -### Manual Testing Scenarios -After making changes, always validate: -1. **Basic Service**: Start server with `npm start`, test with `curl http://localhost:3011/` - should return HTML containing "TPEN3 SERVICES BABY!!!" in the response body -2. **Route Registration**: `npm run existsTests` passes without errors -3. **Core Logic**: `npm run unitTests` passes tests that don't require databases (some MongoDB tests will timeout - this is expected) -4. **API Authentication**: Protected endpoints like `/my/profile` return 401 status code without valid tokens -5. **Application Behavior**: Server may crash after serving requests when MongoDB is not available - this is expected and indicates database connection attempts are working correctly - -### Complete Validation Workflow Example -```bash -# Basic setup -cp .env.development .env -npm install - -# Test core functionality without databases -npm run existsTests # Should pass completely -npm run unitTests # Should pass most tests, MongoDB tests will timeout - -# Test application serving -npm start & -sleep 3 -curl http://localhost:3011/ # Should return HTML with service name -curl -w "Status: %{http_code}\n" http://localhost:3011/my/profile # Should return 401 -kill %1 # Stop the background server -``` - -### Common File Locations -- Main application entry: `bin/tpen3_services.js` -- Express app setup: `app.js` -- Route definitions: `project/index.js`, `userProfile/index.js`, etc. -- Database controllers: `database/mongo/controller.js`, `database/maria/controller.js` -- Authentication middleware: `auth/index.js` -- Domain models: `classes/[Entity]/[Entity].js` -- Configuration: `config.env` (safe defaults), `.env.development` and `.env.production` (templates), `.env` (local config, gitignored) - -### Dependencies and Versions -- Express.js for REST API framework -- MongoDB driver for document storage -- MariaDB driver for relational storage -- Auth0 libraries for JWT authentication -- Jest for testing framework -- Nodemon for development auto-reload -- IIIF libraries for manifest handling +3. Once the task is complete and verification is needed: `npm run allTests` +4. Start app if manual testing is needed. ### External Resources - [IIIF Presentation API](https://iiif.io/api/presentation/) @@ -238,4 +64,4 @@ kill %1 # Stop the background server 7. Use JDoc style for code documentation. Cleanup, fix, or generate documentation for the code you work on as you encounter it. 8. We use `npm start` often to run the app locally. However, do not make code edits based on this assumption. Production and development load balance in the app with pm2, not by using `npm start` 9. NEVER CANCEL long-running commands. Application builds and tests are designed to complete within documented timeouts. Always wait for completion to ensure accurate validation of changes. -10. All work on issues for bugs, features, and enhancements will target the `development` branch. The `main` branch will only be targetted with hotfixes by admins or by PRs from the `development` branch. New work should branch from `development`. \ No newline at end of file +10. All work on issues for bugs, features, and enhancements will target the `development` branch. The `main` branch will only be targetted with hotfixes by admins or by PRs from the `development` branch. New work should branch from `development`. diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 5a452cab..f9baba29 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -1,32 +1,18 @@ -# TPEN Services +# copilot-instructions.md -TPEN Services is a Node.js Express API service for TPEN3 (Transcription for Paleographical and Editorial Notation). This provides RESTful APIs for digital humanities, cultural heritage, annotation services, and IIIF manifest handling. The service supports multiple database backends (MongoDB, MariaDB) and uses Auth0 for authentication. +This file provides guidance to GitHub Copilot and other AI Assistants when working with code in this repository. + +## TPEN Services -Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here. +## Project Overview + +TPEN Services is a Node.js Express API service for TPEN3 (Transcription for Paleographical and Editorial Notation). This provides RESTful APIs for digital humanities, cultural heritage, annotation services, and IIIF manifest handling. The service supports multiple database backends (MongoDB, MariaDB) and uses Auth0 for authentication. ## Working Effectively ### Bootstrap, Build, and Test the Repository - -- Copy environment configuration: `cp .env.development .env` +- Environment configuration is in .env. Copy environment configuration: `cp .env.development .env` - Install dependencies: `npm install` -- takes up to 20 seconds. NEVER CANCEL. Set timeout to 60+ seconds. -- Run unit tests: `npm run unitTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. -- Run existence tests: `npm run existsTests` -- takes 7 seconds. NEVER CANCEL. Set timeout to 30+ seconds. -- Run all tests: `npm run allTests` -- takes 12 seconds. NEVER CANCEL. Set timeout to 30+ seconds. - -### Run the Application - -- ALWAYS run the bootstrapping steps first. -- Production server: `npm start` -- starts on port 3011 -- Development server: `npm run dev` -- starts with nodemon auto-reload on port 3011 -- Test basic functionality: `curl http://localhost:3011/` should return the TPEN3 Services index HTML (e.g. contains `

TPEN3 Services

`) - -### Environment Requirements -- Node.js >= 22.20.0 -- MongoDB (for database tests and full functionality) -- MariaDB (for database tests and full functionality) -- Copy `.env.development` to `.env` for basic functionality -- For full functionality, configure database connection strings, GITHUB_TOKEN, and Auth0 credentials in `.env` ### Environment Configuration @@ -63,10 +49,12 @@ This allows developers to work immediately with sensible defaults while keeping - Test the root endpoint: `curl http://localhost:3011/` -- should return HTML containing the TPEN3 Services index (heading + welcome text) - Run unit tests that don't require databases: `npm run unitTests` -- many tests pass without database connections - Run existence tests: `npm run existsTests` -- validates route registration and class imports -- ALWAYS wait for full test completion. Tests may appear to hang but will complete within 12 seconds. +- Run all tests: `npm run allTests` -- Full test suite confirming full app functionality +- ALWAYS wait for full test completion. Tests may appear to hang but should complete within 2 minutes. - NOTE: Application may crash after serving initial requests due to database connection attempts - this is expected behavior without running MongoDB/MariaDB. ### Test Categories Available +- `npm run allTests` -- Full test suite which requires .env settings - `npm run unitTests` -- Core unit tests (some require databases) - `npm run existsTests` -- Route and class existence validation (database-independent) - `npm run functionsTests` -- Function-level tests @@ -82,94 +70,10 @@ This allows developers to work immediately with sensible defaults while keeping ## Common Tasks -### Repository Structure -``` -/home/runner/work/TPEN-services/TPEN-services/ -├── app.js # Express application setup -├── bin/tpen3_services.js # Server entry point -├── package.json # Dependencies and scripts -├── jest.config.js # Test configuration -├── config.env # Safe defaults (committed) -├── .env.development # Development template -├── .env.production # Production template -├── API.md # API documentation -├── classes/ # Domain model classes -│ ├── Project/ # Project management -│ ├── User/ # User management -│ ├── Group/ # Group management -│ ├── Layer/ # Annotation layers -│ ├── Line/ # Text line handling -│ ├── Page/ # Page management -│ └── Manifest/ # IIIF manifest handling -├── database/ # Database drivers -│ ├── mongo/ # MongoDB controller -│ ├── maria/ # MariaDB controller -│ └── tiny/ # TinyPEN API controller -├── auth/ # Auth0 authentication -├── project/ # Project API routes -├── userProfile/ # User API routes -├── line/ # Line API routes -├── page/ # Page API routes -└── utilities/ # Helper functions -``` - -### Key API Endpoints -- `GET /` -- Service status (returns the TPEN3 Services index HTML) -- `GET /project/:id` -- Get project by ID (requires authentication) -- `POST /project/create` -- Create new project (requires authentication) -- `POST /project/import?createFrom=URL` -- Import project from IIIF manifest -- `GET /user/:id` -- Get user profile (public) -- `GET /my/profile` -- Get authenticated user profile -- `GET /line/:id` -- Get text line annotation -- `GET /page/:id` -- Get annotation page - -### Authentication -- Uses Auth0 JWT bearer tokens -- Protected endpoints require `Authorization: Bearer ` header -- Environment variables AUDIENCE and DOMAIN must be configured for auth tests -- Public endpoints: `/`, `/user/:id` -- Protected endpoints: `/project/*`, `/my/*`, most POST/PUT/DELETE operations - ### Database Configuration -- MongoDB: Configure MONGODB and MONGODBNAME in `.env` -- MariaDB: Configure MARIADB, MARIADBNAME, MARIADBUSER, MARIADBPASSWORD in `.env` -- TinyPEN API: Configure TINYPEN in `.env` -- Default configurations in `config.env` point to localhost development services -- MongoDB Collections: TPENPROJECTS, TPENGROUPS, TPENUSERS, TPENCOLUMNS (configured in `config.env`) - -### Development Workflow +> See config.env -1. Always start with: `cp .env.development .env && npm install` -2. Make code changes -3. Test with: `npm run existsTests` (fast, database-independent) -4. For database changes: ensure MongoDB/MariaDB running, then `npm run dbTests` -5. For API changes: `npm run E2Etests` -6. Start dev server: `npm run dev` -7. Test manually: `curl http://localhost:3011/` and relevant endpoints - -### Debugging and Troubleshooting -- Application logs appear in console when running `npm start` or `npm run dev` -- Database connection errors indicate missing database services -- Auth errors indicate missing AUDIENCE/DOMAIN environment variables -- 404 errors on routes indicate route registration issues -- Check `app.js` for middleware and route registration -- Jest warnings about experimental VM modules are expected (ES module usage) - -### CI/CD Integration -- GitHub Actions workflows in `.github/workflows/` -- `test_pushes.yaml` runs unit tests on pushes -- `ci_dev.yaml` runs E2E tests on PRs to development -- Tests require environment secrets configured in GitHub repository settings - -### Performance Notes -- Application startup: 2-3 seconds -- npm install: ~1-20 seconds depending on cache (timeout: 60+ seconds) -- Unit tests: ~12 seconds (timeout: 30+ seconds) -- Existence tests: ~7 seconds (timeout: 30+ seconds) -- Database tests: variable depending on database response times - -### Critical Environment Variables Required for basic functionality: - `PORT` (default: 3011) @@ -199,53 +103,14 @@ Required for external services: - `TINYPEN` (TinyPEN API base URL) - `RERUMIDPREFIX` (RERUM ID prefix URL) -### Manual Testing Scenarios - -After making changes, always validate: - -1. **Basic Service**: Start server with `npm start`, test with `curl http://localhost:3011/` - should return HTML containing the TPEN3 Services index (e.g. the `

` heading) -2. **Route Registration**: `npm run existsTests` passes without errors -3. **Core Logic**: `npm run unitTests` passes tests that don't require databases (some MongoDB tests will timeout - this is expected) -4. **API Authentication**: Protected endpoints like `/my/profile` return 401 status code without valid tokens -5. **Application Behavior**: Server may crash after serving requests when MongoDB is not available - this is expected and indicates database connection attempts are working correctly - -### Complete Validation Workflow Example - -```bash -# Basic setup -cp .env.development .env -npm install - -# Test core functionality without databases -npm run existsTests # Should pass completely -npm run unitTests # Should pass most tests, MongoDB tests will timeout - -# Test application serving -npm start & -sleep 3 -curl http://localhost:3011/ # Should return HTML with service name -curl -w "Status: %{http_code}\n" http://localhost:3011/my/profile # Should return 401 -kill %1 # Stop the background server -``` - -### Common File Locations - -- Main application entry: `bin/tpen3_services.js` -- Express app setup: `app.js` -- Route definitions: `project/index.js`, `userProfile/index.js`, etc. -- Database controllers: `database/mongo/controller.js`, `database/maria/controller.js` -- Authentication middleware: `auth/index.js` -- Domain models: `classes/[Entity]/[Entity].js` -- Configuration: `config.env` (safe defaults), `.env` (local config, gitignored), `.env.development` and `.env.production` (templates) - -### Dependencies and Versions -- Express.js for REST API framework -- MongoDB driver for document storage -- MariaDB driver for relational storage -- Auth0 libraries for JWT authentication -- Jest for testing framework -- Nodemon for development auto-reload -- IIIF libraries for manifest handling +### Development Workflow + +1. Do not overwrite the existing .env file. If an .env file does not exist or is not populated then copy environment configuration: `cp .env.development .env` +2. Install dependencies with `npm install` +3. Make code changes +4. Test with: `npm run existsTests` (fast, database-independent) +5. For all other tests use `npm run allTests` +6. Test manually: `curl http://localhost:3011/` and relevant endpoints NEVER CANCEL long-running commands. Application builds and tests are designed to complete within documented timeouts. Always wait for completion to ensure accurate validation of changes. diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 65d76ac7..2ae13c23 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -1,7 +1,7 @@ import dbDriver from "../../database/driver.js" import { fetchUserAgent, hasAnnotationChanges } from "../../utilities/shared.js" - const databaseTiny = new dbDriver("tiny") + export default class Line { #tinyAction = 'create' @@ -83,25 +83,67 @@ export default class Line { this.#tinyAction = 'update' return this } - /** + + #updateLineForPage() { + return { + id: this.id, + type: this.type ?? "Annotation", + target: this.target + } + } + + /** + * Resolve the RERUM URI of the Line and sync Line properties with the Annotation properties. + * The RERUM data will take preferences and overwrite any properties that are already set. + * Only RERUM URIs are supported. + */ + async #loadAnnotationDataFromRerum() { + const rerumURI = this.id + if (rerumURI.startsWith?.(process.env.RERUMIDPREFIX)) { + const rawLineData = await fetch(rerumURI).then(async (resp) => { + if (resp.ok) return resp.json() + // The response from RERUM indicates a failure, likely with a specific code and textual body + let rerumErrorMessage = `${resp.status ?? 500}: ${rerumURI} - ` + try { + rerumErrorMessage += await resp.text() + } + catch (err) { + rerumErrorMessage = undefined + } + const err = new Error(rerumErrorMessage ?? `${resp.status ?? 500}: A RERUM error occurred for ${rerumURI}`) + err.status = 502 + throw err + }) + if (!(rawLineData.id || rawLineData["@id"])) { + // A 200 with garbled data, call it a fail + const err = new Error(`A RERUM error occurred for ${rerumURI}`) + err.status = 502 + throw err + } + // We don't have Class getters and setters for these properties... + if ('body' in rawLineData) this.body = rawLineData.body + if (rawLineData.target) this.target = rawLineData.target + if (rawLineData.creator) this.creator = rawLineData.creator + if (rawLineData.motivation) this.motivation = rawLineData.motivation + if (rawLineData.label) this.label = rawLineData.label + if (rawLineData.type) this.type = rawLineData.type + this.#tinyAction = 'update' + } + return this + } + + /** * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. * @returns {Promise} Resolves to the updated Layer object as stored in Project. */ - async update() { - if (this.#tinyAction === 'update' || this.body) { - this.#setRerumId() - await this.#saveLineToRerum() - } - return this.#updateLineForPage() -} - -#updateLineForPage() { - return { - id: this.id, - type: this.type ?? "Annotation", - target: this.target + async update() { + if (this.#tinyAction === 'update' || this.body) { + this.#setRerumId() + await this.#saveLineToRerum() + } + return this.#updateLineForPage() } -} + /** * Updates the textual content of the annotation body. * @@ -122,14 +164,13 @@ export default class Line { if (typeof text !== 'string') throw new Error('Text content must be a string') if (!this.body) this.body = "" // simple variant for no body this.creator = options.creator - const isVariantTextualBody = body => typeof (body?.chars ?? body?.['cnt:asChars'] ?? body?.value ?? body) === 'string' if (Array.isArray(this.body)) { const textualBodies = this.body.filter(body => isVariantTextualBody(body)) if (textualBodies.length !== 1) throw new Error(textualBodies.length > 1 ? 'Multiple textual bodies found. Cannot determine which one to update.' : 'No textual body found in the array to update.') const textualBody = textualBodies[0] - const currentValue = textualBody.value ?? textualBody.chars ?? textualBody['cnt:asChars'] ?? textualBody + const currentValue = extractTextValue(textualBody) if (currentValue === text) return this Object.assign(textualBody, { type: 'TextualBody', value: text, format: options.format ?? "text/plain", language: options.language }) // discard Annotation-level options if only one body entry is modified. @@ -137,7 +178,7 @@ export default class Line { } if (isVariantTextualBody(this.body)) { - const currentValue = this.body.chars ?? this.body['cnt:asChars'] ?? this.body.value ?? this.body + const currentValue = extractTextValue(this.body) if (currentValue === text) return this this.body = { type: 'TextualBody', value: text, format: options.format ?? "text/plain", language: options.language } return this.update() @@ -195,7 +236,8 @@ export default class Line { return this.update() } - asJSON(isLD) { + async asJSON(isLD) { + if (this.body === undefined) await this.#loadAnnotationDataFromRerum() return isLD ? { '@context': 'http://iiif.io/api/presentation/3/context.json', id: this.id, @@ -214,6 +256,16 @@ export default class Line { return Promise.resolve('This is the HTML document content.') } + /** + * Extract the plain text content from the Line body. + * + * @returns {string} The text content of the Line, or empty string if no textual body exists. + */ + async asTextBlob() { + if (this.body === undefined) await this.#loadAnnotationDataFromRerum() + return extractTextFromAnnotationBody(this.body) + } + async delete() { if (this.#tinyAction === 'update') { await databaseTiny.remove(this.id) @@ -222,3 +274,49 @@ export default class Line { return true } } + +/** + * Extract the text value from a textual body entry. + * Priority: value → cnt:asChars → chars → raw body. + * + * @param {string|Object} body - A textual body entry. + * @returns {string|*} The text string if a known text property exists, otherwise the raw body value. + */ +function extractTextValue(body) { + return body?.value ?? body?.['cnt:asChars'] ?? body?.chars ?? body +} + +/** + * Determine whether the given body entry is a textual body variant. + * Recognizes: plain string, object with `value`, `chars`, or `cnt:asChars` string property. + * + * @param {*} body - A single body entry (string, object, or other). + * @returns {boolean} True if the body is a textual body variant. + */ +function isVariantTextualBody(body) { + return typeof extractTextValue(body) === 'string' +} + +/** + * Extract the plain text content from raw Annotation body data + * Handles all W3C Web Annotation body format variants: + * - Plain string body + * - Object body with `value`, `chars`, or `cnt:asChars` property + * - Array of bodies (returns text from the first textual body found) + * - null/undefined/empty array bodies return empty string + * + * @param {*} body - A single body entry (string, object, array, or other). + * @returns {string} The text content of the annotation, or empty string if no textual body exists. + */ +function extractTextFromAnnotationBody(body) { + if (body === null || body === undefined) return '' + if (Array.isArray(body)) { + const textualBody = body.find(b => isVariantTextualBody(b)) + if (!textualBody) return '' + return extractTextValue(textualBody) + } + if (isVariantTextualBody(body)) { + return extractTextValue(body) + } + return '' +} diff --git a/line/index.js b/line/index.js index 4c123f6d..b59cfbf7 100644 --- a/line/index.js +++ b/line/index.js @@ -30,16 +30,19 @@ router.get('/:lineId', async (req, res) => { .find(page => findLineInPage(page, lineId)) if (!pageContainingLine) { - return respondWithError(res, 404, `Page with ID '${pageId}' not found in project '${projectId}'`) + return respondWithError(res, 404, `Line with ID '${lineId}' not found in Page '${pageId}'`) } const lineRef = findLineInPage(pageContainingLine, lineId) if (!lineRef) { - return respondWithError(res, 404, `Line with ID '${lineId}' not found in project '${projectId}'`) + return respondWithError(res, 404, `Line with ID '${lineId}' not found in Page '${pageId}'`) } - const line = (lineRef.id ?? lineRef).startsWith?.(process.env.RERUMIDPREFIX) - ? await fetch(lineRef.id ?? lineRef).then(res => res.json()) - : new Line({ lineRef }) - res.json(line?.asJSON?.(true) ?? line) + const line = new Line(lineRef) + if (req.query.text === 'blob') { + const textBlob = await line.asTextBlob() + return res.type('text/plain; charset=utf-8').send(textBlob) + } + const jsonObj = await line.asJSON(true) + res.json(jsonObj) } catch (error) { return respondWithError(res, error.status ?? 500, error.message) } @@ -99,7 +102,8 @@ router.post('/', auth0Middleware(), async (req, res) => { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - res.status(201).json(newLine.asJSON(true)) + const jsonObj = await newLine.asJSON(true) + res.status(201).json(jsonObj) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { @@ -175,7 +179,8 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - res.json(line.asJSON(true)) + const jsonObj = await line.asJSON(true) + res.json(jsonObj) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { @@ -251,7 +256,8 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - res.json(line.asJSON(true)) + const jsonObj = await line.asJSON(true) + res.json(jsonObj) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { @@ -329,7 +335,8 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - res.json(line.asJSON(true)) + const jsonObj = await line.asJSON(true) + res.json(jsonObj) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { return handleVersionConflict(res, error) From 06d4d450c4fb89ca0088e99253b46a3e36e9cd04 Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Thu, 26 Feb 2026 14:28:07 -0600 Subject: [PATCH 252/262] 407 do over (#458) * caller choses whether to save after * Add shouldUpdate flag to Group role methods Introduce an optional shouldUpdate parameter to Group.setMemberRoles and Group.removeMemberRoles to control whether changes are immediately persisted. These methods now skip calling update() when shouldUpdate is false, allowing callers to batch multiple role mutations and perform a single update. Call sites updated: removed a redundant update in Project.removeMember flow and adjusted memberRouter to pass shouldUpdate=false for intermediate role changes, then call group.update() once after all changes. This reduces redundant DB writes and improves efficiency. * auditfix * whitespace * No updated packages yet --------- Co-authored-by: Bryan Haberberger --- classes/Group/Group.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/Group/Group.js b/classes/Group/Group.js index 2f491e63..e32a18c6 100644 --- a/classes/Group/Group.js +++ b/classes/Group/Group.js @@ -191,8 +191,8 @@ export default class Group { const member = this.data.members[memberId] if (!member) { throw { - status: 400, - message: "User is not a member of this group" + status: 400, + message: "User is not a member of this group" } } const userRoles = member.roles @@ -324,8 +324,8 @@ export default class Group { await this.addMemberRoles(this.data.creator, "OWNER", true, false) } if (!this.getByRole("LEADER")?.length) { - await this.addMemberRoles(this.data.creator, "LEADER", false, false) - } + await this.addMemberRoles(this.data.creator, "LEADER", false, false) + } } static async createNewGroup(creator, payload) { From 2c7813fe87b13d8edc81a002c2b3afaa078212b1 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 5 Mar 2026 12:55:39 -0600 Subject: [PATCH 253/262] Page Routes With Page and Line Class Refactor (#461) * First pass at utilizing the Page and Line classes in the page routes * changes while reviewing * changes while reviewing * changes while reviewing * changes while reviewing * clean up and align error throughput * clean up and align error throughput * changes from testing * Really connect the wires after closer inspection * Really connect the wires after closer inspection * Really connect the wires after closer inspection * changes while revewing * changes while revewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes while testing and reviewing * Changes from standup * Changes from standup * Changes from standup * Changes during review * Changes during review --- classes/Line/Line.js | 102 +++++++++++++++--------- classes/Page/Page.js | 183 ++++++++++++++++++++++++++++++++++++++----- line/index.js | 23 +++--- page/index.js | 57 +++----------- utilities/shared.js | 87 +------------------- 5 files changed, 251 insertions(+), 201 deletions(-) diff --git a/classes/Line/Line.js b/classes/Line/Line.js index 2ae13c23..d0f853a5 100644 --- a/classes/Line/Line.js +++ b/classes/Line/Line.js @@ -5,6 +5,7 @@ const databaseTiny = new dbDriver("tiny") export default class Line { #tinyAction = 'create' + #hydrated = false #setRerumId() { if (!this.id.startsWith(process.env.RERUMIDPREFIX)) { this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` @@ -51,36 +52,48 @@ export default class Line { throw new Error(`Failed to save Line to RERUM: ${err.message}`) }) this.#tinyAction = 'update' + this.#hydrated = true return this } - // ...else Update the existing page in RERUM - const existingLine = await fetch(this.id).then(res => res.json()) - .catch(err => { - if (err.status === 404) { - // If the line doesn't exist, we can create it - return null + // ...else Update the existing line in RERUM + const existingLine = await fetch(this.id).then(async (resp) => { + if (resp.ok) return resp.json() + if (resp.status === 404) return null + let rerumErrorMessage + try { + rerumErrorMessage = `${resp.status ?? 500}: ${this.id} - ${await resp.text()}` + } catch (e) { + rerumErrorMessage = `500: ${this.id} - A RERUM error occurred` } - throw new Error(`Failed to fetch existing Line from RERUM: ${err.message}`) + const err = new Error(rerumErrorMessage) + err.status = 502 + throw err }) - - if (!existingLine) { + .catch(err => { + if (err.status === 502) throw err + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + }) + if (!(existingLine?.id || existingLine?.["@id"])) { // This id doesn't exist in RERUM, so we need to create it this.#tinyAction = 'create' } - // Skip RERUM update if no content changes detected // Uses hasAnnotationChanges from shared.js instead of a private Class method for testability. if (existingLine && !hasAnnotationChanges(existingLine, lineAsAnnotation)) { + this.#hydrated = true return this // Return without versioning } - + const action = this.#tinyAction === 'create' ? 'save' : this.#tinyAction const updatedLine = existingLine ? { ...existingLine, ...lineAsAnnotation } : lineAsAnnotation - const newURI = await databaseTiny[this.#tinyAction](updatedLine).then(res => res.id) + const newURI = await databaseTiny[action](updatedLine).then(res => res.id) .catch(err => { throw new Error(`Failed to update Line in RERUM: ${err.message}`) }) this.id = newURI this.#tinyAction = 'update' + this.#hydrated = true return this } @@ -98,36 +111,41 @@ export default class Line { * Only RERUM URIs are supported. */ async #loadAnnotationDataFromRerum() { - const rerumURI = this.id - if (rerumURI.startsWith?.(process.env.RERUMIDPREFIX)) { - const rawLineData = await fetch(rerumURI).then(async (resp) => { + if (this.id.startsWith?.(process.env.RERUMIDPREFIX)) { + const rawLineData = await fetch(this.id).then(async (resp) => { if (resp.ok) return resp.json() // The response from RERUM indicates a failure, likely with a specific code and textual body - let rerumErrorMessage = `${resp.status ?? 500}: ${rerumURI} - ` + let rerumErrorMessage try { - rerumErrorMessage += await resp.text() + rerumErrorMessage = `${resp.status ?? 500}: ${this.id} - ${await resp.text()}` + } catch (e) { + rerumErrorMessage = `500: ${this.id} - A RERUM error occurred` } - catch (err) { - rerumErrorMessage = undefined - } - const err = new Error(rerumErrorMessage ?? `${resp.status ?? 500}: A RERUM error occurred for ${rerumURI}`) + const err = new Error(rerumErrorMessage) err.status = 502 throw err }) + .catch(err => { + if (err.status === 502) throw err + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + }) if (!(rawLineData.id || rawLineData["@id"])) { // A 200 with garbled data, call it a fail - const err = new Error(`A RERUM error occurred for ${rerumURI}`) - err.status = 502 - throw err + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError } // We don't have Class getters and setters for these properties... if ('body' in rawLineData) this.body = rawLineData.body - if (rawLineData.target) this.target = rawLineData.target + if ('target' in rawLineData) this.target = rawLineData.target if (rawLineData.creator) this.creator = rawLineData.creator if (rawLineData.motivation) this.motivation = rawLineData.motivation if (rawLineData.label) this.label = rawLineData.label if (rawLineData.type) this.type = rawLineData.type this.#tinyAction = 'update' + this.#hydrated = true } return this } @@ -237,19 +255,27 @@ export default class Line { } async asJSON(isLD) { - if (this.body === undefined) await this.#loadAnnotationDataFromRerum() - return isLD ? { - '@context': 'http://iiif.io/api/presentation/3/context.json', - id: this.id, - type: 'Annotation', - motivation: this.motivation ?? 'transcribing', - target: this.target, - body: this.body, - } : { - id: this.id, - body: this.body ?? '', - target: this.target ?? '', + if (!this.#hydrated) await this.#loadAnnotationDataFromRerum() + let result + if (isLD) { + result = { + '@context': 'http://iiif.io/api/presentation/3/context.json', + id: this.id, + type: 'Annotation', + motivation: this.motivation ?? 'transcribing', + target: this.target, + body: this.body, + } + if (this.creator) result.creator = this.creator + } + else { + result = { + id: this.id, + body: this.body ?? '', + target: this.target ?? '', + } } + return result } asHTML() { @@ -262,7 +288,7 @@ export default class Line { * @returns {string} The text content of the Line, or empty string if no textual body exists. */ async asTextBlob() { - if (this.body === undefined) await this.#loadAnnotationDataFromRerum() + if (!this.#hydrated) await this.#loadAnnotationDataFromRerum() return extractTextFromAnnotationBody(this.body) } diff --git a/classes/Page/Page.js b/classes/Page/Page.js index 85bd1912..11a7f35e 100644 --- a/classes/Page/Page.js +++ b/classes/Page/Page.js @@ -1,11 +1,14 @@ import dbDriver from "../../database/driver.js" -import { handleVersionConflict, fetchUserAgent } from "../../utilities/shared.js" +import { fetchUserAgent } from "../../utilities/shared.js" import ProjectFactory from "../Project/ProjectFactory.js" +import Line from "../Line/Line.js" const databaseTiny = new dbDriver("tiny") export default class Page { #tinyAction = 'create' + #hydrated = false + #itemsResolved = false #setRerumId() { if (!this.id.startsWith(process.env.RERUMIDPREFIX)) { this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}` @@ -54,7 +57,7 @@ export default class Page { let canvasLabel = canvas.label ?? `Page ${canvas.id.split('/').pop()}` const page = { data: { - "@context": "http://www.w3.org/ns/anno.jsonld", + "@context": "http://iiif.io/api/presentation/3/context.json", id, type: "AnnotationPage", label: ProjectFactory.getLabelAsString(canvasLabel), @@ -69,15 +72,97 @@ export default class Page { return new Page(layerId, page.data) } + /** + * Resolve the RERUM URI of the Page and sync Page properties with the AnnotationPage properties. + * The RERUM data will take preferences and overwrite any properties that are already set. + * Only RERUM URIs are supported. + */ + async #loadAnnotationPageDataFromRerum() { + if (this.id.startsWith?.(process.env.RERUMIDPREFIX)) { + const rawPageData = await fetch(this.id).then(async (resp) => { + if (resp.ok) return resp.json() + // The response from RERUM indicates a failure, likely with a specific code and textual body + let rerumErrorMessage + try { + rerumErrorMessage = `${resp.status ?? 500}: ${this.id} - ${await resp.text()}` + } catch (e) { + rerumErrorMessage = `500: ${this.id} - A RERUM error occurred` + } + const err = new Error(rerumErrorMessage) + err.status = 502 + throw err + }) + .catch(err => { + if (err.status === 502) throw err + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + }) + if (!(rawPageData.id || rawPageData["@id"])) { + // A 200 with garbled data, call it a fail + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + } + this.#tinyAction = 'update' + this.id = rawPageData.id ?? rawPageData["@id"] ?? this.id + if ('target' in rawPageData) this.target = rawPageData.target + if ('items' in rawPageData && !this.#itemsResolved) this.items = rawPageData.items + if (rawPageData.creator) this.creator = rawPageData.creator + if (rawPageData.label) this.label = ProjectFactory.getLabelAsString(rawPageData.label) + if ('partOf' in rawPageData) this.partOf = Array.isArray(rawPageData.partOf) ? rawPageData.partOf[0]?.id ?? rawPageData.partOf[0] : rawPageData.partOf + if ('prev' in rawPageData) this.prev = rawPageData.prev + if ('next' in rawPageData) this.next = rawPageData.next + this.#hydrated = true + } + return this + } + + /** + * Resolve all annotations in this Page's items array by fetching their full data from RERUM. + * Once resolved, replaces this.items with the resolved data. + * + * @returns {Promise} Array of fully resolved annotation objects + */ + async #loadAnnotationPageItemsFromRerum() { + if (!Array.isArray(this.items)) return [] + // Process all items in parallel for better performance + const resolvedItems = await Promise.all( + this.items.map(async (item) => { + // If item is a string, it's an annotation ID - fetch from RERUM + let lineRef + // target is required by Line constructor but will be overwritten by RERUM data + // since #hydrated is false, Line.asJSON() always fetches from RERUM. + if (item?.id) { + lineRef = { ...item, target: item.target ?? "pending-resolution" } + } + else if (typeof item === "string") lineRef = { "id": item, "target":"pending-resolution" } + else return { id: item?.id ?? item, error: "Unrecognized Page item format" } + let line = await new Line(lineRef).asJSON(true).catch(err => { + return { id: lineRef.id, error: err.message } + }) + delete line["@context"] + return line + }) + ) + this.items = resolvedItems + this.#itemsResolved = true + return resolvedItems + } + async #savePageToRerum() { const prev = this.prev ?? null const next = this.next ?? null const pageAsAnnotationPage = { - "@context": "http://www.w3.org/ns/anno.jsonld", + "@context": "http://iiif.io/api/presentation/3/context.json", id: this.id, type: "AnnotationPage", label: { "none": [this.label] }, - items: this.items ?? [], + items: (this.items ?? []).map(item => + typeof item === 'object' && item.id + ? { id: item.id, type: item.type ?? 'Annotation' } + : item + ), prev, next, creator: await fetchUserAgent(this.creator), @@ -85,37 +170,47 @@ export default class Page { partOf: [{ id: this.partOf, type: "AnnotationCollection" }] } if (this.#tinyAction === 'create') { - const saved = await databaseTiny.save(pageAsAnnotationPage) + await databaseTiny.save(pageAsAnnotationPage) .catch(err => { console.error(err, pageAsAnnotationPage) throw new Error(`Failed to save Page to RERUM: ${err.message}`) }) this.#tinyAction = 'update' + this.#hydrated = true return this } // ...else Update the existing page in RERUM - const existingPage = await fetch(this.id).then(res => res.json()) - if (!existingPage) { - throw new Error(`Failed to find Page in RERUM: ${this.id}`) - } - const updatedPage = { ...existingPage, ...pageAsAnnotationPage } - - // Handle optimistic locking version if available - try { - await databaseTiny.overwrite(updatedPage) - return this - } catch (err) { - if (err.status === 409) { - throw handleVersionConflict(null, err) + const existingPage = await fetch(this.id).then(async (resp) => { + if (resp.ok) return resp.json() + let rerumErrorMessage + try { + rerumErrorMessage = `${resp.status ?? 500}: ${this.id} - ${await resp.text()}` + } catch (e) { + rerumErrorMessage = `500: ${this.id} - A RERUM error occurred` } + const err = new Error(rerumErrorMessage) + err.status = 502 throw err + }) + .catch(err => { + if (err.status === 502) throw err + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + }) + if (!(existingPage?.id || existingPage?.["@id"])) { + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError } + const updatedPage = { ...existingPage, ...pageAsAnnotationPage } + await databaseTiny.overwrite(updatedPage) + this.#hydrated = true + return this } /** * Check the Project for any RERUM documents and either upgrade a local version or overwrite the RERUM version. - * FIXME: This will save to RERUM even if there has been no content change - * The rerum variable below is true if the content has changed. * * @returns {Promise} Resolves to the updated Layer object as stored in Project. */ @@ -128,6 +223,14 @@ export default class Page { return this.#formatPageForProject() } + /** + * Resolve all item references in this Page by fetching full annotation data from RERUM. + * @returns {Promise} Array of fully resolved annotation objects. + */ + async resolvePageItems() { + return this.#loadAnnotationPageItemsFromRerum() + } + asProjectPage() { return this.#formatPageForProject() } @@ -141,6 +244,46 @@ export default class Page { } } + /** + * Returns a JSON representation of the Page as a W3C AnnotationPage. + * @param {boolean} isLD - If true, returns JSON-LD format with @context and type. If false, returns a simple object. + * @returns {Object} The Page as JSON. + */ + async asJSON(isLD) { + if (!this.#hydrated && this.id?.startsWith?.(process.env.RERUMIDPREFIX)) { + await this.#loadAnnotationPageDataFromRerum() + } + let result + if (isLD) { + result = { + '@context': 'http://iiif.io/api/presentation/3/context.json', + id: this.id, + type: 'AnnotationPage', + label: { "none": [this.label] }, + target: this.target, + partOf: Array.isArray(this.partOf) + ? this.partOf + : [{ id: this.partOf, type: "AnnotationCollection" }], + items: this.items ?? [], + prev: this.prev ?? null, + next: this.next ?? null + } + if (this.creator) result.creator = this.creator + } + else { + result = { + id: this.id, + label: this.label, + target: this.target, + items: this.items ?? [], + partOf: this.partOf, + prev: this.prev ?? null, + next: this.next ?? null + } + } + return result + } + async delete() { if (this.#tinyAction === 'update') { // associated Annotations in RERUM will be left intact diff --git a/line/index.js b/line/index.js index b59cfbf7..1e36a2e3 100644 --- a/line/index.js +++ b/line/index.js @@ -39,10 +39,10 @@ router.get('/:lineId', async (req, res) => { const line = new Line(lineRef) if (req.query.text === 'blob') { const textBlob = await line.asTextBlob() - return res.type('text/plain; charset=utf-8').send(textBlob) + return res.status(200).type('text/plain; charset=utf-8').send(textBlob) } - const jsonObj = await line.asJSON(true) - res.json(jsonObj) + const lineJson = await line.asJSON(true) + res.status(200).json(lineJson) } catch (error) { return respondWithError(res, error.status ?? 500, error.message) } @@ -60,7 +60,6 @@ router.post('/', auth0Middleware(), async (req, res) => { const project = await getProjectById(req.params.projectId, res) if (!project) return const page = await findPageById(req.params.pageId, req.params.projectId) - if (!page) return if (!req.body || (Array.isArray(req.body) && req.body.length === 0)) { return respondWithError(res, 400, "Request body with line data is required") @@ -102,8 +101,8 @@ router.post('/', auth0Middleware(), async (req, res) => { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - const jsonObj = await newLine.asJSON(true) - res.status(201).json(jsonObj) + const lineJson = await newLine.asJSON(true) + res.status(201).json(lineJson) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { @@ -179,8 +178,8 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - const jsonObj = await line.asJSON(true) - res.json(jsonObj) + const lineJson = await line.asJSON(true) + res.status(200).json(lineJson) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { @@ -256,8 +255,8 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - const jsonObj = await line.asJSON(true) - res.json(jsonObj) + const lineJson = await line.asJSON(true) + res.status(200).json(lineJson) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { @@ -335,8 +334,8 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns await project.update() } - const jsonObj = await line.asJSON(true) - res.json(jsonObj) + const lineJson = await line.asJSON(true) + res.status(200).json(lineJson) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { return handleVersionConflict(res, error) diff --git a/page/index.js b/page/index.js index 0b835786..5f6a3f9e 100644 --- a/page/index.js +++ b/page/index.js @@ -8,7 +8,7 @@ let router = express.Router({ mergeParams: true }) import Project from '../classes/Project/Project.js' import Line from '../classes/Line/Line.js' import Column from '../classes/Column/Column.js' -import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict, resolveReferences } from '../utilities/shared.js' +import { findPageById, respondWithError, getLayerContainingPage, updatePageAndProject, handleVersionConflict } from '../utilities/shared.js' import { isSuspiciousValueString } from "../utilities/checkIfSuspicious.js" import { ACTIONS, ENTITIES, SCOPES } from '../project/groups/permissions_parameters.js' @@ -53,31 +53,9 @@ router.route('/:pageId') .get(async (req, res) => { const { projectId, pageId } = req.params try { - const page = await findPageById(pageId, projectId, true) - if (!page) { - return respondWithError(res, 404, 'No page found with that ID.') - } - if (page.id?.startsWith(process.env.RERUMIDPREFIX)) { - // If the page is a RERUM document, we need to fetch it from the server - res.status(200).json(page) - return - } - // build as AnnotationPage - const pageAsAnnotationPage = { - '@context': 'http://www.w3.org/ns/anno.jsonld', - id: page.id, - type: 'AnnotationPage', - label: { none: [page.label] }, - target: page.target, - partOf: [{ - id: page.partOf, - type: "AnnotationCollection" - }], - items: page.items ?? [], - prev: page.prev ?? null, - next: page.next ?? null - } - res.status(200).json(pageAsAnnotationPage) + const page = await findPageById(pageId, projectId) + const pageJson = await page.asJSON(true) + res.status(200).json(pageJson) } catch (error) { return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } @@ -119,9 +97,6 @@ router.route('/:pageId') const page = await findPageById(pageId, projectId) page.creator = user.agent.split('/').pop() page.partOf = layerId - if (!page) { - return respondWithError(res, 404, 'No page found with that ID.') - } const itemsProvided = Array.isArray(update.items) && update.items.length > 0 let splitIds = itemsProvided ? splitFilterIds(update.items) : [] @@ -256,7 +231,8 @@ router.route('/:pageId') await updatePrevAndNextColumns(pageInProject) await project.update() } - res.status(200).json(page) + const pageJson = await page.asJSON(true) + res.status(200).json(pageJson) } catch (error) { // Handle version conflicts with optimistic locking if (error.status === 409) { @@ -574,23 +550,10 @@ router.route('/:pageId/resolved') .get(async (req, res) => { const { projectId, pageId } = req.params try { - const page = await findPageById(pageId, projectId, true) - if (!page) { - return respondWithError(res, 404, 'No page found with that ID.') - } - if (page.id?.startsWith(process.env.RERUMIDPREFIX)) { - // RERUM pages already have fully resolved items - res.status(200).json(page) - return - } - // Resolve all annotation references in the items array - let resolvedPage = page - if (page.items && page.items.length > 0) { - // Resolve all annotations in the items array - const resolvedItems = await resolveReferences(page.items) - resolvedPage = { ...page, items: resolvedItems } - } - res.status(200).json(resolvedPage) + const pageData = await findPageById(pageId, projectId) + await pageData.resolvePageItems() + const pageJson = await pageData.asJSON(true) + res.status(200).json(pageJson) } catch (error) { return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') } diff --git a/utilities/shared.js b/utilities/shared.js index b4d98d7e..70566f28 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -163,6 +163,7 @@ export const updatePageAndProject = async (page, project, userId) => { project.data.layers[layerIndex] = finalLayer await recordModification(project, rerumPageId, userId) } catch (err) { + if (err.status === 502 || err.status === 409) throw err error_out = new Error(`There was an error updating Page and Project data`) error_out.status = 500 console.error(`There was an error updating Page and Project data`, err) @@ -220,22 +221,8 @@ export const getLayerContainingPage = (project, pageId) => { } // Find a page by ID (moved from page/index.js) -export async function findPageById(pageId, projectId, rerum) { - if (rerum) { - if (!pageId?.startsWith(process.env.RERUMIDPREFIX)) { - pageId = process.env.RERUMIDPREFIX + pageId.split("/").pop() - } - const rerum_obj = await fetch(pageId).then(res => { - if (res.ok) return res.json() - if (!res.ok) return {} - }) - .catch(err => { - console.error("Network error with rerum") - throw err - }) - if (rerum_obj?.id || rerum_obj["@id"]) return rerum_obj - } - const projectData = (await getProjectById(projectId))?.data +export async function findPageById(pageId, projectId) { + const projectData = (await Project.getById(projectId))?.data if (!projectData) { const error = new Error(`Project with ID '${projectId}' not found`) error.status = 404 @@ -244,25 +231,20 @@ export async function findPageById(pageId, projectId, rerum) { const layerContainingPage = projectData.layers.find(layer => layer.pages.some(p => p.id.split('/').pop() === pageId.split('/').pop()) ) - if (!layerContainingPage) { const error = new Error(`Layer containing page with ID '${pageId}' not found in project '${projectId}'`) error.status = 404 throw error } - const pageIndex = layerContainingPage.pages.findIndex(p => p.id.split('/').pop() === pageId.split('/').pop()) - if (pageIndex < 0) { const error = new Error(`Page with ID '${pageId}' not found in project '${projectId}'`) error.status = 404 throw error } - const page = layerContainingPage.pages[pageIndex] page.prev = layerContainingPage.pages[pageIndex - 1]?.id ?? null page.next = layerContainingPage.pages[pageIndex + 1]?.id ?? null - return new Page(layerContainingPage.id, page) } @@ -379,69 +361,6 @@ export const handleVersionConflict = (res, error) => { }) } -/** - * Fetch a single annotation from RERUM by its ID - * @param {string} annotationId - The ID/URL of the annotation to fetch (supports both RERUM and TPEN3 formats) - * @returns {Promise} The full annotation object from RERUM - * @throws {Error} If the annotation cannot be fetched or parsed - */ -export const resolveReference = async (annotationId) => { - if (!annotationId || !annotationId.startsWith("http")) { - throw new Error('Proper Annotation URI is required') - } - try { - const response = await fetch(annotationId) - if (!response.ok) { - throw new Error(`Failed to fetch annotation from RERUM: ${response.statusText}`) - } - const annotation = await response.json() - return annotation - } catch (error) { - console.error(`Error fetching annotation: ${annotationId}`, error) - throw new Error(`Failed to fetch annotation from RERUM: ${error.message}`) - } -} - -/** - * Resolve all annotations in a page's items array by fetching their full data from RERUM - * @param {Array} items - Array of annotation items (can be IDs or partial objects) - * @returns {Promise} Array of fully resolved annotation objects - */ -export const resolveReferences = async (items) => { - if (!Array.isArray(items)) return [] - - // Process all items in parallel for better performance - const resolvedItems = await Promise.all( - items.map(async (item) => { - // If item is a string, it's an annotation ID - fetch from RERUM - if (typeof item === 'string') { - try { - return await resolveReference(item) - } catch (error) { - console.error(`Failed to resolve annotation ${item}:`, error) - // Return the ID string if fetching fails - return { id: item, error: error.message } - } - } - // If item is an object with an id, try to fetch the full annotation - if (item && typeof item === 'object' && item.id) { - try { - const fullAnnotation = await resolveReference(item.id) - // Merge with resolved annotation properties taking precedence over local - return { ...item, ...fullAnnotation } - } catch (error) { - console.error(`Failed to resolve annotation ${item.id}:`, error) - return item - } - } - // For any other format, return as-is - return item - }) - ) - - return resolvedItems -} - /** * Deep equality comparison that is order-insensitive for object properties. * Arrays are compared in order, but object key order does not matter. From a07b0d43d5b293c19452b7efe0100225befa0481 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Tue, 10 Mar 2026 11:03:50 -0500 Subject: [PATCH 254/262] Layer Routes With Layer, Page, and Line Class Refactor (#469) * First push at refactoring for the Layer * First push at refactoring for the Layer * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during readthrough and testing * Changes during review and testing * move this back * changes during testing and review * changes during testing and review * changes during testing and review * changes during testing and review * changes during testing and review * Changes from cubap review * Changes from cubap review * Make sure Layer references in the Pages are upgraded when Layer is upgraded --- classes/Layer/Layer.js | 128 +++++++++++++++++++++++++++++++++++------ layer/index.js | 58 +++++++------------ line/index.js | 65 +++++++++++---------- page/index.js | 37 +++++------- utilities/shared.js | 92 ++++++++++++++--------------- 5 files changed, 224 insertions(+), 156 deletions(-) diff --git a/classes/Layer/Layer.js b/classes/Layer/Layer.js index cd6acdf7..67ce979c 100644 --- a/classes/Layer/Layer.js +++ b/classes/Layer/Layer.js @@ -1,5 +1,4 @@ import dbDriver from "../../database/driver.js" -import { handleVersionConflict } from "../../utilities/shared.js" import Page from "../Page/Page.js" import { fetchUserAgent } from "../../utilities/shared.js" import ProjectFactory from "../Project/ProjectFactory.js" @@ -8,6 +7,7 @@ const databaseTiny = new dbDriver("tiny") export default class Layer { #tinyAction = 'create' + #hydrated = false /** * Constructs a Layer from the JSON Object in the Project `layers` Array. @@ -17,6 +17,7 @@ export default class Layer { * @param {string} id The ID of the layer. This is the Layer stored in the Project. * @param {string} label The label of the layer. This is the Layer stored in the Project. * @param {Array} pages The pages in the layer by reference. + * @param {string|null} [creator=null] The creator/agent URI for this layer. * @seeAlso {@link Layer.build} */ constructor(projectId, { id, label, pages, creator = null }) { @@ -31,6 +32,9 @@ export default class Layer { this.label = label this.creator = creator this.pages = pages + this.total = pages.length + this.first = pages.at(0)?.id + this.last = pages.at(-1)?.id if (this.id.startsWith(process.env.RERUMIDPREFIX)) { this.#tinyAction = 'update' } @@ -79,6 +83,10 @@ export default class Layer { this.#setRerumId() await this.#saveCollectionToRerum() } + this.total = this.pages.length + this.first = this.pages.at(0)?.id + this.last = this.pages.at(-1)?.id + this.#hydrated = true return this.#formatCollectionForProject() } @@ -86,6 +94,38 @@ export default class Layer { return this.#formatCollectionForProject() } + /** + * Returns a JSON representation of the Layer as a W3C AnnotationCollection. + * @param {boolean} isLD - If true, returns JSON-LD format with @context and type. If false, returns a simple object. + * @returns {Promise} The Layer as JSON. + */ + async asJSON(isLD) { + if (!this.#hydrated && this.id?.startsWith?.(process.env.RERUMIDPREFIX)) { + await this.#loadAnnotationCollectionDataFromRerum() + } + let result + if (isLD) { + result = { + '@context': 'http://iiif.io/api/presentation/3/context.json', + id: this.id, + type: 'AnnotationCollection', + label: { "none": [this.label] }, + total: this.pages.length, + first: this.pages.at(0)?.id, + last: this.pages.at(-1)?.id + } + if (this.creator) result.creator = this.creator + } + else { + result = { + id: this.id, + label: this.label, + pages: this.pages + } + } + return result + } + // Private Methods #setRerumId() { if (!this.id.startsWith(process.env.RERUMIDPREFIX)) { @@ -94,6 +134,45 @@ export default class Layer { return this } + /** + * Resolve the RERUM URI of the Layer and sync Layer properties with the AnnotationCollection properties. + * The RERUM data will take preference and overwrite any properties that are already set. + * Only RERUM URIs are supported. + */ + async #loadAnnotationCollectionDataFromRerum() { + if (this.id.startsWith?.(process.env.RERUMIDPREFIX)) { + const rawLayerData = await fetch(this.id).then(async (resp) => { + if (resp.ok) return resp.json() + let rerumErrorMessage + try { + rerumErrorMessage = `${resp.status ?? 500}: ${this.id} - ${await resp.text()}` + } catch (e) { + rerumErrorMessage = `500: ${this.id} - A RERUM error occurred` + } + const err = new Error(rerumErrorMessage) + err.status = 502 + throw err + }) + .catch(err => { + if (err.status === 502) throw err + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + }) + if (!(rawLayerData.id || rawLayerData["@id"])) { + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + } + this.#tinyAction = 'update' + this.id = rawLayerData.id ?? rawLayerData["@id"] ?? this.id + if (rawLayerData.label) this.label = ProjectFactory.getLabelAsString(rawLayerData.label) + if (rawLayerData.creator) this.creator = rawLayerData.creator + this.#hydrated = true + } + return this + } + #formatCollectionForProject() { return { id: this.id, @@ -108,40 +187,53 @@ export default class Layer { async #saveCollectionToRerum() { const layerAsCollection = { - "@context": "http://www.w3.org/ns/anno.jsonld", + "@context": "http://iiif.io/api/presentation/3/context.json", id: this.id, type: "AnnotationCollection", label: { "none": [this.label] }, creator: await fetchUserAgent(this.creator), total: this.pages.length, - first: this.pages.at(0).id, - last: this.pages.at(-1).id + first: this.pages.at(0)?.id, + last: this.pages.at(-1)?.id } if (this.#tinyAction === 'create') { - await databaseTiny.save(layerAsCollection).catch(err => { + await databaseTiny.save(layerAsCollection) + .catch(err => { console.error(err, layerAsCollection) throw new Error(`Failed to save Layer to RERUM: ${err.message}`) }) this.#tinyAction = 'update' + this.#hydrated = true return this } - const existingLayer = await fetch(this.id).then(res => res.json()) - if (!existingLayer) { - throw new Error(`Layer not found in RERUM: ${this.id}`) - } - const updatedLayer = { ...existingLayer, ...layerAsCollection } - - // Handle optimistic locking version if available - try { - await databaseTiny.overwrite(updatedLayer) - return this - } catch (err) { - if (err.status === 409) { - throw handleVersionConflict(null, err) + const existingLayer = await fetch(this.id).then(async (resp) => { + if (resp.ok) return resp.json() + let rerumErrorMessage + try { + rerumErrorMessage = `${resp.status ?? 500}: ${this.id} - ${await resp.text()}` + } catch (e) { + rerumErrorMessage = `500: ${this.id} - A RERUM error occurred` } + const err = new Error(rerumErrorMessage) + err.status = 502 throw err + }) + .catch(err => { + if (err.status === 502) throw err + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + }) + if (!(existingLayer?.id || existingLayer?.["@id"])) { + const genericRerumNetworkError = new Error(`500: ${this.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError } + const updatedLayer = { ...existingLayer, ...layerAsCollection } + await databaseTiny.overwrite(updatedLayer) + this.#hydrated = true + return this } } diff --git a/layer/index.js b/layer/index.js index d3cf07c1..f91b666a 100644 --- a/layer/index.js +++ b/layer/index.js @@ -7,7 +7,7 @@ import cors from 'cors' import common_cors from '../utilities/common_cors.json' with {type: 'json'} import Project from '../classes/Project/Project.js' import Layer from '../classes/Layer/Layer.js' -import { findPageById, findLayerById, updateLayerAndProject, respondWithError } from '../utilities/shared.js' +import { findPageById, findLayerById, updateLayerAndProject, respondWithError, handleVersionConflict } from '../utilities/shared.js' import { ACTIONS, ENTITIES, SCOPES } from '../project/groups/permissions_parameters.js' const router = express.Router({ mergeParams: true }) @@ -19,27 +19,9 @@ router.route('/:layerId') .get(async (req, res) => { const { projectId, layerId } = req.params try { - const layer = await findLayerById(layerId, projectId, true) - if (!layer) { - return respondWithError(res, 404, 'No layer found with that ID.') - } - if (layer.id?.startsWith(process.env.RERUMIDPREFIX)) { - // If the page is a RERUM document, we need to fetch it from the server - res.status(200).json(layer) - return - } - // Make this internal Layer look more like a RERUM AnnotationCollection - const layerAsCollection = { - '@context': 'http://www.w3.org/ns/anno.jsonld', - id: layer.id, - type: 'AnnotationCollection', - label: { none: [layer.label] }, - total: layer.pages.length, - first: layer.pages.at(0).id, - last: layer.pages.at(-1).id - } - if (layer.creator) layerAsCollection.creator = layer.creator - return res.status(200).json(layerAsCollection) + const layer = await findLayerById(layerId, projectId) + const layerJson = await layer.asJSON(true) + return res.status(200).json(layerJson) } catch (error) { console.error(error) return respondWithError(res, error.status ?? 500, error.message ?? 'Internal Server Error') @@ -47,7 +29,6 @@ router.route('/:layerId') }) .put(auth0Middleware(), screenContentMiddleware(), async (req, res) => { const { projectId, layerId } = req.params - let label = req.body?.label const update = req.body const providedPages = update?.pages const user = req.user @@ -56,21 +37,19 @@ router.route('/:layerId') if (!layerId) return respondWithError(res, 400, 'Layer ID is required') try { if (hasSuspiciousLayerData(req.body)) return respondWithError(res, 400, "Suspicious layer data will not be processed.") - const projectObj = new Project(projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.LAYER))) { + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.LAYER))) { return respondWithError(res, 403, 'You do not have permission to update this layer') } - const project = await Project.getById(projectId) - if (!project?._id) return respondWithError(res, 404, `Project '${projectId}' does not exist`) + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) const layer = await findLayerById(layerId, projectId) - if (!layer?.id) return respondWithError(res, 404, `Layer '${layerId}' not found in project`) // Only update top-level properties that are present in the request Object.keys(update ?? {}).forEach(key => { layer[key] = update[key] }) Object.keys(layer).forEach(key => { if (layer[key] === undefined || layer[key] === null) { - // Remove properties that are undefined or null. prev and next can be null + // Remove properties that are undefined or null. first and last can be null if (key !== "first" && key !== "last") delete layer[key] else layer[key] = null } @@ -81,14 +60,22 @@ router.route('/:layerId') layer.pages = pages } await updateLayerAndProject(layer, project, user._id) - res.status(200).json(layer) + const layerJson = await layer.asJSON(true) + res.status(200).json(layerJson) } catch (error) { console.error(error) - return respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') + // Handle version conflicts with optimistic locking + if (error.status === 409) { + if (res.headersSent) return + return handleVersionConflict(res, error) + } else { + if (res.headersSent) return + return respondWithError(res, error.status ?? 500, error.message ?? 'Error updating layer') + } } }) .all((req, res) => { - return respondWithError(res, 405, 'Improper request method. Use GET instead.') + return respondWithError(res, 405, 'Improper request method. Use GET or PUT.') }) // Route to create a new layer within a project @@ -106,12 +93,11 @@ router.route('/').post(auth0Middleware(), screenContentMiddleware(), async (req, } try { if (hasSuspiciousLayerData(req.body)) return respondWithError(res, 400, "Suspicious layer data will not be processed.") - const projectObj = new Project(projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LAYER))) { + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LAYER))) { return respondWithError(res, 403, 'You do not have permission to create layers in this project') } - const project = await Project.getById(projectId) - if (!project) return respondWithError(res, 404, 'Project does not exist') + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) const newLayer = Layer.build(projectId, label, canvases) project.addLayer(newLayer.asProjectLayer()) await project.update() diff --git a/line/index.js b/line/index.js index 1e36a2e3..43b1ff35 100644 --- a/line/index.js +++ b/line/index.js @@ -4,7 +4,7 @@ import auth0Middleware from "../auth/index.js" import screenContentMiddleware from '../utilities/checkIfSuspicious.js' import { isSuspiciousJSON } from '../utilities/checkIfSuspicious.js' import common_cors from '../utilities/common_cors.json' with {type: 'json'} -import { respondWithError, getProjectById, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' +import { respondWithError, findLineInPage, updatePageAndProject, findPageById, handleVersionConflict, withOptimisticLocking } from '../utilities/shared.js' import Line from '../classes/Line/Line.js' import Column from '../classes/Column/Column.js' import Project from '../classes/Project/Project.js' @@ -21,11 +21,9 @@ router.get('/:lineId', async (req, res) => { return respondWithError(res, 400, 'Project ID, Page ID, and Line ID are required.') } try { - const projectData = (await getProjectById(projectId)).data - if (!projectData) { - return respondWithError(res, 404, `Project with ID '${projectId}' not found`) - } - const pageContainingLine = projectData.layers + const project = await Project.getById(projectId) + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) + const pageContainingLine = project.data.layers .flatMap(layer => layer.pages) .find(page => findLineInPage(page, lineId)) @@ -53,12 +51,11 @@ router.post('/', auth0Middleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { - const projectObj = new Project(req.params.projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LINE))) { + const project = new Project(req.params.projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.CREATE, SCOPES.ALL, ENTITIES.LINE))) { return respondWithError(res, 403, 'You do not have permission to create lines in this project') } - const project = await getProjectById(req.params.projectId, res) - if (!project) return + if (!project?.data) return respondWithError(res, 404, `Project ${req.params.projectId} was not found`) const page = await findPageById(req.params.pageId, req.params.projectId) if (!req.body || (Array.isArray(req.body) && req.body.length === 0)) { @@ -82,20 +79,20 @@ router.post('/', auth0Middleware(), async (req, res) => { const savedLine = await newLine.update() page.items.push(savedLine) } - const ifNewContent = (page.items && page.items.length) const pageId = req.params.pageId.split('/').pop() const pageProject = project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId) const saveWholeColumns = pageProject?.columns await withOptimisticLocking( - () => updatePageAndProject(page, project, user._id, ifNewContent), + () => updatePageAndProject(page, project, user._id), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { return respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') } currentVersion.items = [...(currentVersion.items ?? []), ...(page.items ?? [])] - Object.assign(page, currentVersion) - return updatePageAndProject(page, project, user._id) + Object.assign(page, currentVersion) + return updatePageAndProject(page, project, user._id) }) + if (res.headersSent) return // Updating the project again to save updated columns as columns is not handled in updatePageAndProject if(saveWholeColumns) { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns @@ -104,6 +101,7 @@ router.post('/', auth0Middleware(), async (req, res) => { const lineJson = await newLine.asJSON(true) res.status(201).json(lineJson) } catch (error) { + if (res.headersSent) return // Handle version conflicts with optimistic locking if (error.status === 409) { return handleVersionConflict(res, error) @@ -117,17 +115,17 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, const user = req.user if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { - const projectObj = new Project(req.params.projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.LINE))) { + const project = new Project(req.params.projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.LINE))) { return respondWithError(res, 403, 'You do not have permission to update lines in this project') } - const project = await getProjectById(req.params.projectId) + if (!project?.data) return respondWithError(res, 404, `Project ${req.params.projectId} was not found`) const page = await findPageById(req.params.pageId, req.params.projectId) let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) } - if (!(oldLine.id && oldLine.target && oldLine.body)) oldLine = await fetch(oldLine.id).then(res => res.json()) + if (!(oldLine.id && oldLine.target && oldLine.body)) oldLine = await fetch(oldLine.id).then(resp => resp.json()) const line = new Line(oldLine) Object.assign(line, req.body) const updatedLine = await line.update() @@ -159,7 +157,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, } } await withOptimisticLocking( - () => updatePageAndProject(page, project, user._id, true), + () => updatePageAndProject(page, project, user._id), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { return respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') @@ -173,6 +171,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, return updatePageAndProject(page, project, user._id) } ) + if (res.headersSent) return // Updating the project again to save updated columns as columns is not handled in updatePageAndProject if(saveWholeColumns) { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns @@ -181,6 +180,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, const lineJson = await line.asJSON(true) res.status(200).json(lineJson) } catch (error) { + if (res.headersSent) return // Handle version conflicts with optimistic locking if (error.status === 409) { return handleVersionConflict(res, error) @@ -194,14 +194,14 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn const user = req.user if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { - const projectObj = new Project(req.params.projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.TEXT, ENTITIES.LINE))) { + const project = new Project(req.params.projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.TEXT, ENTITIES.LINE))) { return respondWithError(res, 403, 'You do not have permission to update line text in this project') } + if (!project?.data) return respondWithError(res, 404, `Project ${req.params.projectId} was not found`) if (typeof req.body !== 'string') { return respondWithError(res, 400, 'Invalid request body. Expected a string.') } - const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { @@ -233,7 +233,7 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn } } await withOptimisticLocking( - () => updatePageAndProject(page, project, user._id, true), + () => updatePageAndProject(page, project, user._id), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { if(res.headersSent) return @@ -258,6 +258,7 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn const lineJson = await line.asJSON(true) res.status(200).json(lineJson) } catch (error) { + if (res.headersSent) return // Handle version conflicts with optimistic locking if (error.status === 409) { return handleVersionConflict(res, error) @@ -271,23 +272,22 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { const user = req.user if (!user) return respondWithError(res, 401, "Not authenticated. Please provide a valid, unexpired Bearer token") try { - const projectObj = new Project(req.params.projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.SELECTOR, ENTITIES.LINE))) { + const project = new Project(req.params.projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.SELECTOR, ENTITIES.LINE))) { return respondWithError(res, 403, 'You do not have permission to update line bounds in this project') } + if (!project?.data) return respondWithError(res, 404, `Project ${req.params.projectId} was not found`) const isValidBound = v => (Number.isInteger(v) && v >= 0) || (typeof v === 'string' && /^\d+$/.test(v)) if (!req.body || typeof req.body !== 'object' || Array.isArray(req.body) || !isValidBound(req.body.x) || !isValidBound(req.body.y) || !isValidBound(req.body.w) || !isValidBound(req.body.h)) { return respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h as non-negative integers.') } const bounds = { x: parseInt(req.body.x, 10), y: parseInt(req.body.y, 10), w: parseInt(req.body.w, 10), h: parseInt(req.body.h, 10) } - const project = await getProjectById(req.params.projectId) const page = await findPageById(req.params.pageId, req.params.projectId) const findOldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!findOldLine) { - respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) - return + return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) } - let oldLine = await fetch(findOldLine.id).then(res => res.json()) + let oldLine = await fetch(findOldLine.id).then(resp => resp.json()) delete oldLine.label const line = new Line(oldLine) const updatedLine = await line.updateBounds(bounds, { creator: user._id }) @@ -315,7 +315,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { } } await withOptimisticLocking( - () => updatePageAndProject(page, project, user._id, true), + () => updatePageAndProject(page, project, user._id), (currentVersion) => { if(!currentVersion || currentVersion.type !== 'AnnotationPage') { return respondWithError(res, 409, 'Version conflict while updating the page. Please try again.') @@ -329,6 +329,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return updatePageAndProject(page, project, user._id) } ) + if (res.headersSent) return // Updating the project again to save updated columns as columns is not handled in updatePageAndProject if(saveWholeColumns) { project.data.layers.flatMap(layer => layer.pages).find(p => p.id.split('/').pop() === pageId).columns = saveWholeColumns @@ -336,7 +337,9 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { } const lineJson = await line.asJSON(true) res.status(200).json(lineJson) - } catch (error) { // Handle version conflicts with optimistic locking + } catch (error) { + if (res.headersSent) return + // Handle version conflicts with optimistic locking if (error.status === 409) { return handleVersionConflict(res, error) } diff --git a/page/index.js b/page/index.js index 5f6a3f9e..012e6de1 100644 --- a/page/index.js +++ b/page/index.js @@ -74,18 +74,15 @@ router.route('/:pageId') if (Array.isArray(update.items) && update.items.some(item => (typeof item !== 'object' && typeof item !== 'string') || item === null)) { return respondWithError(res, 400, 'Each item must be an object') } + const project = new Project(projectId) try { - const projectObj = new Project(projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { return respondWithError(res, 403, 'You do not have permission to update this page') } } catch (error) { return respondWithError(res, error.status ?? 500, error.message ?? 'Error checking permissions') } - const project = await Project.getById(projectId) - if (!project) { - return respondWithError(res, 404, `Project with ID '${projectId}' not found`) - } + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) const layerId = getLayerContainingPage(project, pageId)?.id if (!layerId) { return respondWithError(res, 404, `Layer containing page with ID '${pageId}' not found in project '${projectId}'`) @@ -276,9 +273,9 @@ router.route('/:pageId/column') if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") + const project = new Project(projectId) try { - const projectObj = new Project(projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { return respondWithError(res, 403, 'You do not have permission to update columns on this page') } } catch (error) { @@ -299,8 +296,7 @@ router.route('/:pageId/column') return respondWithError(res, 400, "Suspicious column label will not be processed.") } try { - const project = await Project.getById(projectId) - if (!project?.data) return respondWithError(res, 404, "Project not found") + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) if (!page) return respondWithError(res, 404, "Page not found in project") @@ -360,9 +356,9 @@ router.route('/:pageId/column') if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") + const project = new Project(projectId) try { - const projectObj = new Project(projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { return respondWithError(res, 403, 'You do not have permission to merge columns on this page') } } catch (error) { @@ -380,8 +376,7 @@ router.route('/:pageId/column') return respondWithError(res, 400, "Suspicious column label will not be processed.") } try { - const project = await Project.getById(projectId) - if (!project?.data) return respondWithError(res, 404, "Project not found") + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) if (!page) return respondWithError(res, 404, "Page not found in project") @@ -439,9 +434,9 @@ router.route('/:pageId/column') if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") + const project = new Project(projectId) try { - const projectObj = new Project(projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { + if (!(await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PAGE))) { return respondWithError(res, 403, 'You do not have permission to update columns on this page') } } catch (error) { @@ -459,8 +454,7 @@ router.route('/:pageId/column') return respondWithError(res, 400, "Suspicious column label will not be processed.") } try { - const project = await Project.getById(projectId) - if (!project?.data) return respondWithError(res, 404, "Project not found") + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) if (!page) return respondWithError(res, 404, "Page not found in project") @@ -514,12 +508,11 @@ router.route('/:pageId/clear-columns') if (!projectId) return respondWithError(res, 400, "Project ID is required") if (!pageId) return respondWithError(res, 400, "Page ID is required") try { - const projectObj = new Project(projectId) - if (!(await projectObj.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.PAGE))) { + const project = new Project(projectId) + if (!(await project.checkUserAccess(user._id, ACTIONS.DELETE, SCOPES.ALL, ENTITIES.PAGE))) { return respondWithError(res, 403, 'You do not have permission to clear columns on this page') } - const project = await Project.getById(projectId) - if (!project?.data) return respondWithError(res, 404, "Project not found") + if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) const page = project.data.layers.map(layer => layer.pages.find(p => p.id.split('/').pop() === pageId)).find(p => p) if (!page) return respondWithError(res, 404, "Page not found in project") diff --git a/utilities/shared.js b/utilities/shared.js index 70566f28..b3f1cd05 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -48,15 +48,6 @@ export function respondWithError(res, status, message) { return res.status(status).json({ message }) } -// Fetch a project by ID -export const getProjectById = async (projectId, res) => { - const project = await Project.getById(projectId) - if (!project) { - return respondWithError(res, 404, `Project with ID '${projectId}' not found`) - } - return project -} - // Find a line in a page export const findLineInPage = (page, lineId) => { const line = page.items?.find(l => l.id.split('/').pop() === lineId.split('/').pop()) @@ -80,30 +71,43 @@ export const updateLayerAndProject = async (layer, project, userId) => { if (!userId) throw new Error(`Must know user id to update layer`) if (!layer.creator) layer.creator = await fetchUserAgent(userId) const layerIndex = project.data.layers.findIndex(l => l.id.split("/").pop() === layer.id.split("/").pop()) - const updatedLayer = await layer.update() - if(project.data.layers[layerIndex]?.id !== updatedLayer.id) { - // update the references to the Layer in the Project - // Pages all have their partOf set to the Layer.id - const pageOverwrites = [] - updatedLayer.pages.forEach(async page => { - page.partOf[0].id = updatedLayer.id - if(page.id.startsWith(process.env.RERUMIDPREFIX)) { - // overwrite the Page in RERUM - const oldPage = await databaseTiny.find({_id: page.id.split("/").pop()}) - if(!oldPage) throw new Error(`Page with ID ${page.id} not found in RERUM`) - oldPage.partOf = [{ id: updatedLayer.id, type: "AnnotationCollection" }] - pageOverwrites.push(databaseTiny.overwrite(oldPage).catch(_err => { throw new Error(`Failed to overwrite page ${oldPage.id} in RERUM`) })) - } + if (layerIndex < 0) { + const err = new Error(`Layer not found in project`) + err.status = 404 + throw err + } + try { + const updatedLayer = await layer.update() + if(project.data.layers[layerIndex]?.id !== updatedLayer.id) { + // update the references to the Layer in the Project + // Pages all have their partOf set to the Layer.id + const pageOverwrites = updatedLayer.pages + .filter(page => page.id.startsWith(process.env.RERUMIDPREFIX)) + .map(async page => { + const oldPage = await databaseTiny.find({_id: page.id.split("/").pop()}) + if(!oldPage) throw new Error(`Page with ID ${page.id} not found in RERUM`) + oldPage.partOf = [{ id: updatedLayer.id, type: "AnnotationCollection" }] + return databaseTiny.overwrite(oldPage) + }) + // Also set partOf for all pages, RERUM or temp + updatedLayer.pages.forEach(page => { + if (page.partOf?.[0]) page.partOf[0].id = updatedLayer.id + }) // Note that if the page is not in RERUM and is removed from the Layer, it just disappears without // tending to any of its Annotations. If it is in RERUM and removed from the Layer it is orphaned // but retains its reference to the Annotation Collection in its partOf. - }) - await Promise.all(pageOverwrites).catch(err => { - console.error("Error overwriting pages in RERUM", err) - }) + await Promise.all(pageOverwrites) + } + project.data.layers[layerIndex] = updatedLayer + await project.update() + } + catch (err) { + if (err.status === 502 || err.status === 409) throw err + const error_out = new Error(err.message ?? `There was an error updating Layer and Page data`) + error_out.status = err.status ?? 500 + console.error(`There was an error updating Layer and Page data`, err) + throw error_out } - project.data.layers[layerIndex] = updatedLayer - await project.update() } /** @@ -155,6 +159,12 @@ export const updatePageAndProject = async (page, project, userId) => { const updatedLayer = new Layer(project._id, layer) updatedLayer.creator ??= agent + // Predict the layer's RERUM ID so the page references the upgraded layer + const isLayerAlreadyInRerum = layer.id.startsWith(process.env.RERUMIDPREFIX) + if (!isLayerAlreadyInRerum) { + page.partOf = `${process.env.RERUMIDPREFIX}${layer.id.split("/").pop()}` + } + try { const [, finalLayer] = await Promise.all([ page.update(), @@ -224,7 +234,7 @@ export const getLayerContainingPage = (project, pageId) => { export async function findPageById(pageId, projectId) { const projectData = (await Project.getById(projectId))?.data if (!projectData) { - const error = new Error(`Project with ID '${projectId}' not found`) + const error = new Error(`Project ${projectId} was not found`) error.status = 404 throw error } @@ -248,30 +258,14 @@ export async function findPageById(pageId, projectId) { return new Page(layerContainingPage.id, page) } -export async function findLayerById(layerId, projectId, rerum = false) { - if (rerum) { - if (!layerId?.startsWith(process.env.RERUMIDPREFIX)) { - layerId = process.env.RERUMIDPREFIX + layerId.split("/").pop() - } - const rerum_obj = await fetch(layerId).then(res => { - if (res.ok) return res.json() - if (!res.ok) return {} - }) - .catch(err => { - console.error("Network error with rerum") - throw err - }) - if (rerum_obj?.id || rerum_obj["@id"]) return rerum_obj - } +export async function findLayerById(layerId, projectId) { const p = await Project.getById(projectId) if (!p?.data) { - const error = new Error(`Project with ID '${projectId}' not found`) + const error = new Error(`Project ${projectId} was not found`) error.status = 404 throw error } - const layer = layerId.length < 6 - ? p.data.layers[parseInt(layerId) + 1] - : p.data.layers.find(layer => layer.id.split('/').pop() === layerId.split('/').pop()) + const layer = p.data.layers.find(l => l.id.split('/').pop() === layerId.split('/').pop()) if (!layer) { const error = new Error(`Layer with ID '${layerId}' not found in project '${projectId}'`) error.status = 404 From 86bb137bfbf3bfdbd8db5b44e602ad5d36116eb5 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 12 Mar 2026 09:30:02 -0500 Subject: [PATCH 255/262] NPM Package Updates (#472) * start with ALL and work backwards * reset * try iiif/helpers * try cors * try dompurify * try dotenv and jwt * try marked and mongo * try jest * nodemon and sinon * try maria, which seems like it breaks * try maria again with this minor refactor * try jsdom, which we are pretty sure breaks. * ah ok, no refactor for that, so we have to lock it in at 27 * try latest node and npm lts * ah I see! Let's try the version bundled with nvm * Now how about after telling the server it's ok to use the latest version instead of the bundled version in nvm. * mkay how about a new package-lock.json built around that? * Yeah I was afraid of that * jsdom is locked down now. refactor complete. * update nodemailer --- auth/__tests__/auth_unit_test.js | 4 +- classes/User/__tests__/unit.test.js | 8 +- database/maria/controller.js | 2 +- package-lock.json | 1783 +++++++++-------- package.json | 33 +- userProfile/__tests__/end_to_end_unit.test.js | 8 +- 6 files changed, 932 insertions(+), 906 deletions(-) diff --git a/auth/__tests__/auth_unit_test.js b/auth/__tests__/auth_unit_test.js index 863bd5a1..2801be63 100644 --- a/auth/__tests__/auth_unit_test.js +++ b/auth/__tests__/auth_unit_test.js @@ -13,10 +13,10 @@ const TIME_OUT = process.env.TEST_TIMEOUT ?? 5000 describe("auth0Middleware #auth_test", () => { it( - "should return 400 without Authorization Header", + "should return 401 without Authorization Header", async () => { const res = await request(app).get("/protected-route") - expect(res.status).toBe(400) + expect(res.status).toBe(401) }, TIME_OUT ) diff --git a/classes/User/__tests__/unit.test.js b/classes/User/__tests__/unit.test.js index b96f7dd7..9ca2396b 100644 --- a/classes/User/__tests__/unit.test.js +++ b/classes/User/__tests__/unit.test.js @@ -90,11 +90,11 @@ describe("GET /my/profile #user_class", () => { expect(response.body.userData).toEqual({name: "VOO"}) }) - it("should return 400 if user is not authenticated (no authorization header)", async () => { + it("should return 401 if user is not authenticated (no authorization header)", async () => { const appWithoutAuth = express() appWithoutAuth.use("/my", privateProfileRouter) const response = await request(appWithoutAuth).get("/my/profile") - expect(response.status).toBe(400) + expect(response.status).toBe(401) }) it("should return 401 if user is not authenticated (invalid authorization header)", async () => { @@ -138,11 +138,11 @@ describe("GET /my/projects #user_class", () => { } } }) - it("should return 400 if user is not authenticated (no authorization header)", async () => { + it("should return 401 if user is not authenticated (no authorization header)", async () => { const appWithoutAuth = express() appWithoutAuth.use("/my", privateProfileRouter) const response = await request(appWithoutAuth).get("/my/profile") - expect(response.status).toBe(400) + expect(response.status).toBe(401) }) it("should return 401 if user is not authenticated (invalid authorization header)", async () => { diff --git a/database/maria/controller.js b/database/maria/controller.js index 977589be..89e2e106 100644 --- a/database/maria/controller.js +++ b/database/maria/controller.js @@ -6,7 +6,7 @@ * https://github.com/thehabes */ -import mariadb from 'mariadb' +import * as mariadb from 'mariadb' class DatabaseController { constructor(connect=false) { diff --git a/package-lock.json b/package-lock.json index a405827c..f369b697 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,76 +9,54 @@ "version": "0.0.0", "license": "CC-BY", "dependencies": { - "@iiif/helpers": "^1.5.7", + "@iiif/helpers": "^1.5.8", "cookie-parser": "^1.4.7", - "cors": "^2.8.5", + "cors": "^2.8.6", "debug": "^4.4.3", - "dompurify": "^3.3.1", - "dotenv": "^17.2.3", + "dompurify": "^3.3.3", + "dotenv": "^17.3.1", "express": "^5.2.1", "express-list-endpoints": "^7.1.1", - "express-oauth2-jwt-bearer": "^1.7.2", + "express-oauth2-jwt-bearer": "^1.7.4", "image-size": "^2.0.2", "jsdom": "27.0.0", - "mariadb": "^3.4.5", - "marked": "^17.0.1", + "mariadb": "^3.5.2", + "marked": "^17.0.4", "mime-types": "^3.0.2", - "mongodb": "^7.0.0", + "mongodb": "^7.1.0", "morgan": "^1.10.1", - "nodemailer": "^7.0.12", + "nodemailer": "^8.0.2", "tpen3-services": "file:" }, "devDependencies": { - "@jest/globals": "^30.2.0", - "jest": "^30.2.0", - "nodemon": "^3.1.11", - "sinon": "^21.0.1", + "@jest/globals": "^30.3.0", + "jest": "^30.3.0", + "nodemon": "^3.1.14", + "sinon": "^21.0.2", "supertest": "^7.2.2" }, "engines": { - "node": ">=24.12.0", - "npm": ">=11.7.0" - } - }, - "node_modules/@asamuzakjp/css-color": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.1.tgz", - "integrity": "sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ==", - "license": "MIT", - "dependencies": { - "@csstools/css-calc": "^2.1.4", - "@csstools/css-color-parser": "^3.1.0", - "@csstools/css-parser-algorithms": "^3.0.5", - "@csstools/css-tokenizer": "^3.0.4", - "lru-cache": "^11.2.4" - } - }, - "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": { - "version": "11.2.4", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz", - "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==", - "license": "BlueOak-1.0.0", - "engines": { - "node": "20 || >=22" + "node": ">=24.14.0", + "npm": ">=11.0.0" } }, "node_modules/@asamuzakjp/dom-selector": { - "version": "6.7.6", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.6.tgz", - "integrity": "sha512-hBaJER6A9MpdG3WgdlOolHmbOYvSk46y7IQN/1+iqiCuUu6iWdQrs9DGKF8ocqsEqWujWf/V7b7vaDgiUmIvUg==", + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.8.1.tgz", + "integrity": "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ==", "license": "MIT", "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", "bidi-js": "^1.0.3", "css-tree": "^3.1.0", "is-potential-custom-element-name": "^1.0.1", - "lru-cache": "^11.2.4" + "lru-cache": "^11.2.6" } }, "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": { - "version": "11.2.4", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz", - "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==", + "version": "11.2.6", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", + "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" @@ -91,13 +69,13 @@ "license": "MIT" }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -106,9 +84,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz", - "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz", + "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==", "dev": true, "license": "MIT", "engines": { @@ -116,21 +94,21 @@ } }, "node_modules/@babel/core": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz", - "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", + "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.3", - "@babel/helper-compilation-targets": "^7.27.2", - "@babel/helper-module-transforms": "^7.28.3", - "@babel/helpers": "^7.28.4", - "@babel/parser": "^7.28.4", - "@babel/template": "^7.27.2", - "@babel/traverse": "^7.28.4", - "@babel/types": "^7.28.4", + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", + "@babel/helper-compilation-targets": "^7.28.6", + "@babel/helper-module-transforms": "^7.28.6", + "@babel/helpers": "^7.28.6", + "@babel/parser": "^7.29.0", + "@babel/template": "^7.28.6", + "@babel/traverse": "^7.29.0", + "@babel/types": "^7.29.0", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -147,14 +125,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", - "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", + "version": "7.29.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", + "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.3", - "@babel/types": "^7.28.2", + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -164,13 +142,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", - "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz", + "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.27.2", + "@babel/compat-data": "^7.28.6", "@babel/helper-validator-option": "^7.27.1", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", @@ -191,29 +169,29 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", - "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", + "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.27.1", - "@babel/types": "^7.27.1" + "@babel/traverse": "^7.28.6", + "@babel/types": "^7.28.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", - "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", + "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1", - "@babel/traverse": "^7.28.3" + "@babel/helper-module-imports": "^7.28.6", + "@babel/helper-validator-identifier": "^7.28.5", + "@babel/traverse": "^7.28.6" }, "engines": { "node": ">=6.9.0" @@ -223,9 +201,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", - "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz", + "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==", "dev": true, "license": "MIT", "engines": { @@ -243,9 +221,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", "dev": true, "license": "MIT", "engines": { @@ -263,27 +241,27 @@ } }, "node_modules/@babel/helpers": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz", - "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz", + "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.27.2", - "@babel/types": "^7.28.4" + "@babel/template": "^7.28.6", + "@babel/types": "^7.28.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", - "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz", + "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.28.4" + "@babel/types": "^7.29.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -348,13 +326,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", - "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz", + "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.28.6" }, "engines": { "node": ">=6.9.0" @@ -390,13 +368,13 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", - "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz", + "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.28.6" }, "engines": { "node": ">=6.9.0" @@ -516,13 +494,13 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", - "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz", + "integrity": "sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.28.6" }, "engines": { "node": ">=6.9.0" @@ -532,33 +510,33 @@ } }, "node_modules/@babel/template": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", - "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", + "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/parser": "^7.27.2", - "@babel/types": "^7.27.1" + "@babel/code-frame": "^7.28.6", + "@babel/parser": "^7.28.6", + "@babel/types": "^7.28.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz", - "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", + "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.3", + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.4", - "@babel/template": "^7.27.2", - "@babel/types": "^7.28.4", + "@babel/parser": "^7.29.0", + "@babel/template": "^7.28.6", + "@babel/types": "^7.29.0", "debug": "^4.3.1" }, "engines": { @@ -566,14 +544,14 @@ } }, "node_modules/@babel/types": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", - "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1" + "@babel/helper-validator-identifier": "^7.28.5" }, "engines": { "node": ">=6.9.0" @@ -586,120 +564,10 @@ "dev": true, "license": "MIT" }, - "node_modules/@csstools/color-helpers": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz", - "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT-0", - "engines": { - "node": ">=18" - } - }, - "node_modules/@csstools/css-calc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz", - "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT", - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.5", - "@csstools/css-tokenizer": "^3.0.4" - } - }, - "node_modules/@csstools/css-color-parser": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz", - "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT", - "dependencies": { - "@csstools/color-helpers": "^5.1.0", - "@csstools/css-calc": "^2.1.4" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.5", - "@csstools/css-tokenizer": "^3.0.4" - } - }, - "node_modules/@csstools/css-parser-algorithms": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", - "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT", - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@csstools/css-tokenizer": "^3.0.4" - } - }, "node_modules/@csstools/css-syntax-patches-for-csstree": { - "version": "1.0.21", - "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.21.tgz", - "integrity": "sha512-plP8N8zKfEZ26figX4Nvajx8DuzfuRpLTqglQ5d0chfnt35Qt3X+m6ASZ+rG0D0kxe/upDVNwSIVJP5n4FuNfw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT-0", - "engines": { - "node": ">=18" - } - }, - "node_modules/@csstools/css-tokenizer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz", - "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.0.tgz", + "integrity": "sha512-H4tuz2nhWgNKLt1inYpoVCfbJbMwX/lQKp3g69rrrIMIYlFD9+zTykOKhNR8uGrAmbS/kT9n6hTFkmDkxLgeTA==", "funding": [ { "type": "github", @@ -710,15 +578,12 @@ "url": "https://opencollective.com/csstools" } ], - "license": "MIT", - "engines": { - "node": ">=18" - } + "license": "MIT-0" }, "node_modules/@emnapi/core": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz", - "integrity": "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz", + "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==", "dev": true, "license": "MIT", "optional": true, @@ -728,9 +593,9 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz", - "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz", + "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==", "dev": true, "license": "MIT", "optional": true, @@ -750,9 +615,9 @@ } }, "node_modules/@iiif/helpers": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.5.7.tgz", - "integrity": "sha512-a4vGvQs7LZmpYotAFPAQd7Ei14cnrxOfvh4WtwICQZFd6jBoJS0x8RHVSooSuLGgGoaa6WEImhuF3MjTFiEhfw==", + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/@iiif/helpers/-/helpers-1.5.8.tgz", + "integrity": "sha512-jNLhsmz5LsK3FhBtC6cIEoUM057zVL8zF0a8aQPFM5i6U/tf3QPFiq2mmm3Lop1ORFIZlEJXvsCwk7d3GucB2w==", "license": "MIT", "dependencies": { "@iiif/presentation-2": "1.0.4", @@ -770,9 +635,9 @@ } }, "node_modules/@iiif/parser": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.2.8.tgz", - "integrity": "sha512-wZNPBvcdncXh+y434ASkmkr4hhHRj63E0L5hMJOJobAuBa0p5jf/o1kV0RXRngAZxJYQ49t68L3g2KE48yNx8w==", + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/@iiif/parser/-/parser-2.2.9.tgz", + "integrity": "sha512-HJVlnsz6mj56Qda9U7vhXEMxHFuFLeIDTcXqbPEDcuX1iefrWVsuDIY+DxyQO64vBnwme5NWOZbtbO73XNYB6A==", "license": "MIT", "peer": true, "dependencies": { @@ -855,17 +720,17 @@ } }, "node_modules/@jest/console": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.2.0.tgz", - "integrity": "sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.3.0.tgz", + "integrity": "sha512-PAwCvFJ4696XP2qZj+LAn1BWjZaJ6RjG6c7/lkMaUJnkyMS34ucuIsfqYvfskVNvUI27R/u4P1HMYFnlVXG/Ww==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "@types/node": "*", "chalk": "^4.1.2", - "jest-message-util": "30.2.0", - "jest-util": "30.2.0", + "jest-message-util": "30.3.0", + "jest-util": "30.3.0", "slash": "^3.0.0" }, "engines": { @@ -873,39 +738,38 @@ } }, "node_modules/@jest/core": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.2.0.tgz", - "integrity": "sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.3.0.tgz", + "integrity": "sha512-U5mVPsBxLSO6xYbf+tgkymLx+iAhvZX43/xI1+ej2ZOPnPdkdO1CzDmFKh2mZBn2s4XZixszHeQnzp1gm/DIxw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/console": "30.2.0", + "@jest/console": "30.3.0", "@jest/pattern": "30.0.1", - "@jest/reporters": "30.2.0", - "@jest/test-result": "30.2.0", - "@jest/transform": "30.2.0", - "@jest/types": "30.2.0", + "@jest/reporters": "30.3.0", + "@jest/test-result": "30.3.0", + "@jest/transform": "30.3.0", + "@jest/types": "30.3.0", "@types/node": "*", "ansi-escapes": "^4.3.2", "chalk": "^4.1.2", "ci-info": "^4.2.0", "exit-x": "^0.2.2", "graceful-fs": "^4.2.11", - "jest-changed-files": "30.2.0", - "jest-config": "30.2.0", - "jest-haste-map": "30.2.0", - "jest-message-util": "30.2.0", + "jest-changed-files": "30.3.0", + "jest-config": "30.3.0", + "jest-haste-map": "30.3.0", + "jest-message-util": "30.3.0", "jest-regex-util": "30.0.1", - "jest-resolve": "30.2.0", - "jest-resolve-dependencies": "30.2.0", - "jest-runner": "30.2.0", - "jest-runtime": "30.2.0", - "jest-snapshot": "30.2.0", - "jest-util": "30.2.0", - "jest-validate": "30.2.0", - "jest-watcher": "30.2.0", - "micromatch": "^4.0.8", - "pretty-format": "30.2.0", + "jest-resolve": "30.3.0", + "jest-resolve-dependencies": "30.3.0", + "jest-runner": "30.3.0", + "jest-runtime": "30.3.0", + "jest-snapshot": "30.3.0", + "jest-util": "30.3.0", + "jest-validate": "30.3.0", + "jest-watcher": "30.3.0", + "pretty-format": "30.3.0", "slash": "^3.0.0" }, "engines": { @@ -921,9 +785,9 @@ } }, "node_modules/@jest/diff-sequences": { - "version": "30.0.1", - "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz", - "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz", + "integrity": "sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==", "dev": true, "license": "MIT", "engines": { @@ -931,39 +795,39 @@ } }, "node_modules/@jest/environment": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.2.0.tgz", - "integrity": "sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.3.0.tgz", + "integrity": "sha512-SlLSF4Be735yQXyh2+mctBOzNDx5s5uLv88/j8Qn1wH679PDcwy67+YdADn8NJnGjzlXtN62asGH/T4vWOkfaw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/fake-timers": "30.2.0", - "@jest/types": "30.2.0", + "@jest/fake-timers": "30.3.0", + "@jest/types": "30.3.0", "@types/node": "*", - "jest-mock": "30.2.0" + "jest-mock": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/expect": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.2.0.tgz", - "integrity": "sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.3.0.tgz", + "integrity": "sha512-76Nlh4xJxk2D/9URCn3wFi98d2hb19uWE1idLsTt2ywhvdOldbw3S570hBgn25P4ICUZ/cBjybrBex2g17IDbg==", "dev": true, "license": "MIT", "dependencies": { - "expect": "30.2.0", - "jest-snapshot": "30.2.0" + "expect": "30.3.0", + "jest-snapshot": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/@jest/expect-utils": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.2.0.tgz", - "integrity": "sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.3.0.tgz", + "integrity": "sha512-j0+W5iQQ8hBh7tHZkTQv3q2Fh/M7Je72cIsYqC4OaktgtO7v1So9UTjp6uPBHIaB6beoF/RRsCgMJKvti0wADA==", "dev": true, "license": "MIT", "dependencies": { @@ -974,18 +838,18 @@ } }, "node_modules/@jest/fake-timers": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.2.0.tgz", - "integrity": "sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.3.0.tgz", + "integrity": "sha512-WUQDs8SOP9URStX1DzhD425CqbN/HxUYCTwVrT8sTVBfMvFqYt/s61EK5T05qnHu0po6RitXIvP9otZxYDzTGQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.2.0", - "@sinonjs/fake-timers": "^13.0.0", + "@jest/types": "30.3.0", + "@sinonjs/fake-timers": "^15.0.0", "@types/node": "*", - "jest-message-util": "30.2.0", - "jest-mock": "30.2.0", - "jest-util": "30.2.0" + "jest-message-util": "30.3.0", + "jest-mock": "30.3.0", + "jest-util": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -1002,16 +866,16 @@ } }, "node_modules/@jest/globals": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.2.0.tgz", - "integrity": "sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.3.0.tgz", + "integrity": "sha512-+owLCBBdfpgL3HU+BD5etr1SvbXpSitJK0is1kiYjJxAAJggYMRQz5hSdd5pq1sSggfxPbw2ld71pt4x5wwViA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "30.2.0", - "@jest/expect": "30.2.0", - "@jest/types": "30.2.0", - "jest-mock": "30.2.0" + "@jest/environment": "30.3.0", + "@jest/expect": "30.3.0", + "@jest/types": "30.3.0", + "jest-mock": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -1032,32 +896,32 @@ } }, "node_modules/@jest/reporters": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.2.0.tgz", - "integrity": "sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.3.0.tgz", + "integrity": "sha512-a09z89S+PkQnL055bVj8+pe2Caed2PBOaczHcXCykW5ngxX9EWx/1uAwncxc/HiU0oZqfwseMjyhxgRjS49qPw==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "30.2.0", - "@jest/test-result": "30.2.0", - "@jest/transform": "30.2.0", - "@jest/types": "30.2.0", + "@jest/console": "30.3.0", + "@jest/test-result": "30.3.0", + "@jest/transform": "30.3.0", + "@jest/types": "30.3.0", "@jridgewell/trace-mapping": "^0.3.25", "@types/node": "*", "chalk": "^4.1.2", "collect-v8-coverage": "^1.0.2", "exit-x": "^0.2.2", - "glob": "^10.3.10", + "glob": "^10.5.0", "graceful-fs": "^4.2.11", "istanbul-lib-coverage": "^3.0.0", "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^5.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "30.2.0", - "jest-util": "30.2.0", - "jest-worker": "30.2.0", + "jest-message-util": "30.3.0", + "jest-util": "30.3.0", + "jest-worker": "30.3.0", "slash": "^3.0.0", "string-length": "^4.0.2", "v8-to-istanbul": "^9.0.1" @@ -1088,13 +952,13 @@ } }, "node_modules/@jest/snapshot-utils": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz", - "integrity": "sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.3.0.tgz", + "integrity": "sha512-ORbRN9sf5PP82v3FXNSwmO1OTDR2vzR2YTaR+E3VkSBZ8zadQE6IqYdYEeFH1NIkeB2HIGdF02dapb6K0Mj05g==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "chalk": "^4.1.2", "graceful-fs": "^4.2.11", "natural-compare": "^1.4.0" @@ -1119,14 +983,14 @@ } }, "node_modules/@jest/test-result": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.2.0.tgz", - "integrity": "sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.3.0.tgz", + "integrity": "sha512-e/52nJGuD74AKTSe0P4y5wFRlaXP0qmrS17rqOMHeSwm278VyNyXE3gFO/4DTGF9w+65ra3lo3VKj0LBrzmgdQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/console": "30.2.0", - "@jest/types": "30.2.0", + "@jest/console": "30.3.0", + "@jest/types": "30.3.0", "@types/istanbul-lib-coverage": "^2.0.6", "collect-v8-coverage": "^1.0.2" }, @@ -1135,15 +999,15 @@ } }, "node_modules/@jest/test-sequencer": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz", - "integrity": "sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.3.0.tgz", + "integrity": "sha512-dgbWy9b8QDlQeRZcv7LNF+/jFiiYHTKho1xirauZ7kVwY7avjFF6uTT0RqlgudB5OuIPagFdVtfFMosjVbk1eA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/test-result": "30.2.0", + "@jest/test-result": "30.3.0", "graceful-fs": "^4.2.11", - "jest-haste-map": "30.2.0", + "jest-haste-map": "30.3.0", "slash": "^3.0.0" }, "engines": { @@ -1151,24 +1015,23 @@ } }, "node_modules/@jest/transform": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.2.0.tgz", - "integrity": "sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.3.0.tgz", + "integrity": "sha512-TLKY33fSLVd/lKB2YI1pH69ijyUblO/BQvCj566YvnwuzoTNr648iE0j22vRvVNk2HsPwByPxATg3MleS3gf5A==", "dev": true, "license": "MIT", "dependencies": { "@babel/core": "^7.27.4", - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "@jridgewell/trace-mapping": "^0.3.25", "babel-plugin-istanbul": "^7.0.1", "chalk": "^4.1.2", "convert-source-map": "^2.0.0", "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.11", - "jest-haste-map": "30.2.0", + "jest-haste-map": "30.3.0", "jest-regex-util": "30.0.1", - "jest-util": "30.2.0", - "micromatch": "^4.0.8", + "jest-util": "30.3.0", "pirates": "^4.0.7", "slash": "^3.0.0", "write-file-atomic": "^5.0.1" @@ -1178,9 +1041,9 @@ } }, "node_modules/@jest/types": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.2.0.tgz", - "integrity": "sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.3.0.tgz", + "integrity": "sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==", "dev": true, "license": "MIT", "dependencies": { @@ -1247,9 +1110,9 @@ } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.1.tgz", - "integrity": "sha512-6nZrq5kfAz0POWyhljnbWQQJQ5uT8oE2ddX303q1uY0tWsivWKgBDXBBvuFPwOqRRalXJuVO9EjOdVtuhLX0zg==", + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.6.tgz", + "integrity": "sha512-y+x3H1xBZd38n10NZF/rEBlvDOOMQ6LKUTHqr8R9VkJ+mmQOYtJFxIlkkK8fZrtOiL6VixbOBWMbZGBdal3Z1g==", "license": "MIT", "dependencies": { "sparse-bitfield": "^3.0.3" @@ -1316,9 +1179,9 @@ } }, "node_modules/@sinclair/typebox": { - "version": "0.34.41", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz", - "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==", + "version": "0.34.48", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz", + "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==", "dev": true, "license": "MIT" }, @@ -1333,9 +1196,9 @@ } }, "node_modules/@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.1.tgz", + "integrity": "sha512-cO5W33JgAPbOh07tvZjUOJ7oWhtaqGHiZw+11DPbyqh2kHTBc3eF/CjJDeQ4205RLQsX6rxCuYOroFQwl7JDRw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -1343,9 +1206,9 @@ } }, "node_modules/@sinonjs/samsam": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.3.tgz", - "integrity": "sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-9.0.2.tgz", + "integrity": "sha512-H/JSxa4GNKZuuU41E3b8Y3tbSEx8y4uq4UH1C56ONQac16HblReJomIvv3Ud7ANQHQmkeSowY49Ij972e/pGxQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -1453,12 +1316,12 @@ } }, "node_modules/@types/node": { - "version": "24.6.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz", - "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.4.0.tgz", + "integrity": "sha512-9wLpoeWuBlcbBpOY3XmzSTG3oscB6xjBEEtn+pYXTfhyXhIxC5FsBer2KTopBlvKEiW9l13po9fq+SJY/5lkhw==", "license": "MIT", "dependencies": { - "undici-types": "~7.13.0" + "undici-types": "~7.18.0" } }, "node_modules/@types/stack-utils": { @@ -1491,9 +1354,9 @@ } }, "node_modules/@types/yargs": { - "version": "17.0.33", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", - "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "version": "17.0.35", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz", + "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==", "dev": true, "license": "MIT", "dependencies": { @@ -1620,6 +1483,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1634,6 +1500,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1648,6 +1517,9 @@ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1662,6 +1534,9 @@ "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1676,6 +1551,9 @@ "riscv64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1690,6 +1568,9 @@ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1704,6 +1585,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1718,6 +1602,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1871,6 +1758,19 @@ "node": ">= 8" } }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -1896,16 +1796,16 @@ "license": "MIT" }, "node_modules/babel-jest": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.2.0.tgz", - "integrity": "sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.3.0.tgz", + "integrity": "sha512-gRpauEU2KRrCox5Z296aeVHR4jQ98BCnu0IO332D/xpHNOsIH/bgSRk9k6GbKIbBw8vFeN6ctuu6tV8WOyVfYQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/transform": "30.2.0", + "@jest/transform": "30.3.0", "@types/babel__core": "^7.20.5", "babel-plugin-istanbul": "^7.0.1", - "babel-preset-jest": "30.2.0", + "babel-preset-jest": "30.3.0", "chalk": "^4.1.2", "graceful-fs": "^4.2.11", "slash": "^3.0.0" @@ -1938,9 +1838,9 @@ } }, "node_modules/babel-plugin-jest-hoist": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz", - "integrity": "sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.3.0.tgz", + "integrity": "sha512-+TRkByhsws6sfPjVaitzadk1I0F5sPvOVUH5tyTSzhePpsGIVrdeunHSw/C36QeocS95OOk8lunc4rlu5Anwsg==", "dev": true, "license": "MIT", "dependencies": { @@ -1978,13 +1878,13 @@ } }, "node_modules/babel-preset-jest": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz", - "integrity": "sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.3.0.tgz", + "integrity": "sha512-6ZcUbWHC+dMz2vfzdNwi87Z1gQsLNK2uLuK1Q89R11xdvejcivlYYwDlEv0FHX3VwEXpbBQ9uufB/MUNpZGfhQ==", "dev": true, "license": "MIT", "dependencies": { - "babel-plugin-jest-hoist": "30.2.0", + "babel-plugin-jest-hoist": "30.3.0", "babel-preset-current-node-syntax": "^1.2.0" }, "engines": { @@ -2002,13 +1902,16 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.8.11", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.11.tgz", - "integrity": "sha512-i+sRXGhz4+QW8aACZ3+r1GAKMt0wlFpeA8M5rOQd0HEYw9zhDrlx9Wc8uQ0IdXakjJRthzglEwfB/yqIjO6iDg==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz", + "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==", "dev": true, "license": "Apache-2.0", "bin": { - "baseline-browser-mapping": "dist/cli.js" + "baseline-browser-mapping": "dist/cli.cjs" + }, + "engines": { + "node": ">=6.0.0" } }, "node_modules/basic-auth": { @@ -2023,12 +1926,6 @@ "node": ">= 0.8" } }, - "node_modules/basic-auth/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "license": "MIT" - }, "node_modules/bidi-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", @@ -2052,9 +1949,9 @@ } }, "node_modules/body-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz", - "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", + "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", "license": "MIT", "dependencies": { "bytes": "^3.1.2", @@ -2063,7 +1960,7 @@ "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", - "qs": "^6.14.0", + "qs": "^6.14.1", "raw-body": "^3.0.1", "type-is": "^2.0.1" }, @@ -2075,22 +1972,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/body-parser/node_modules/iconv-lite": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.1.tgz", - "integrity": "sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, "node_modules/brace-expansion": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", @@ -2115,9 +1996,9 @@ } }, "node_modules/browserslist": { - "version": "4.26.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz", - "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==", + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", + "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", "dev": true, "funding": [ { @@ -2135,11 +2016,11 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.8.9", - "caniuse-lite": "^1.0.30001746", - "electron-to-chromium": "^1.5.227", - "node-releases": "^2.0.21", - "update-browserslist-db": "^1.1.3" + "baseline-browser-mapping": "^2.9.0", + "caniuse-lite": "^1.0.30001759", + "electron-to-chromium": "^1.5.263", + "node-releases": "^2.0.27", + "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" @@ -2159,9 +2040,9 @@ } }, "node_modules/bson": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-7.0.0.tgz", - "integrity": "sha512-Kwc6Wh4lQ5OmkqqKhYGKIuELXl+EPYSCObVE6bWsp1T/cGkOCBN0I8wF/T44BiuhHyNi1mmKVPXk60d41xZ7kw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-7.2.0.tgz", + "integrity": "sha512-YCEo7KjMlbNlyHhz7zAZNDpIpQbd+wOEHJYezv0nMYTn4x31eIUM2yomNNubclAt63dObUzKHWsBLJ9QcZNSnQ==", "license": "Apache-2.0", "engines": { "node": ">=20.19.0" @@ -2233,9 +2114,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001747", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001747.tgz", - "integrity": "sha512-mzFa2DGIhuc5490Nd/G31xN1pnBnYMadtkyTjefPI7wzypqgCEpeWu9bJr0OnDsyKrW75zA9ZAt7pbQFmwLsQg==", + "version": "1.0.30001777", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001777.tgz", + "integrity": "sha512-tmN+fJxroPndC74efCdp12j+0rk0RHwV5Jwa1zWaFVyw2ZxAuPeG8ZgWC3Wz7uSjT3qMRQ5XHZ4COgQmsCMJAQ==", "dev": true, "funding": [ { @@ -2306,9 +2187,9 @@ } }, "node_modules/ci-info": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", - "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz", + "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==", "dev": true, "funding": [ { @@ -2322,9 +2203,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz", - "integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz", + "integrity": "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==", "dev": true, "license": "MIT" }, @@ -2418,9 +2299,9 @@ } }, "node_modules/collect-v8-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", - "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz", + "integrity": "sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==", "dev": true, "license": "MIT" }, @@ -2475,15 +2356,16 @@ "license": "MIT" }, "node_modules/content-disposition": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", - "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", + "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", "license": "MIT", - "dependencies": { - "safe-buffer": "5.2.1" - }, "engines": { - "node": ">= 0.6" + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/content-type": { @@ -2538,69 +2420,221 @@ "license": "MIT" }, "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "version": "2.8.6", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz", + "integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-tree": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz", + "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==", + "license": "MIT", + "dependencies": { + "mdn-data": "2.27.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, + "node_modules/cssstyle": { + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.7.tgz", + "integrity": "sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ==", + "license": "MIT", + "dependencies": { + "@asamuzakjp/css-color": "^4.1.1", + "@csstools/css-syntax-patches-for-csstree": "^1.0.21", + "css-tree": "^3.1.0", + "lru-cache": "^11.2.4" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/cssstyle/node_modules/@asamuzakjp/css-color": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz", + "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==", + "license": "MIT", + "dependencies": { + "@csstools/css-calc": "^2.1.3", + "@csstools/css-color-parser": "^3.0.9", + "@csstools/css-parser-algorithms": "^3.0.4", + "@csstools/css-tokenizer": "^3.0.3", + "lru-cache": "^10.4.3" + } + }, + "node_modules/cssstyle/node_modules/@asamuzakjp/css-color/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/cssstyle/node_modules/@csstools/color-helpers": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz", + "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT-0", + "engines": { + "node": ">=18" + } + }, + "node_modules/cssstyle/node_modules/@csstools/css-calc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz", + "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4" + } + }, + "node_modules/cssstyle/node_modules/@csstools/css-color-parser": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz", + "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], "license": "MIT", "dependencies": { - "object-assign": "^4", - "vary": "^1" + "@csstools/color-helpers": "^5.1.0", + "@csstools/css-calc": "^2.1.4" }, "engines": { - "node": ">= 0.10" + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^3.0.5", + "@csstools/css-tokenizer": "^3.0.4" } }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, + "node_modules/cssstyle/node_modules/@csstools/css-parser-algorithms": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", + "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, "engines": { - "node": ">= 8" + "node": ">=18" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^3.0.4" } }, - "node_modules/css-tree": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz", - "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==", + "node_modules/cssstyle/node_modules/@csstools/css-tokenizer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz", + "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], "license": "MIT", - "dependencies": { - "mdn-data": "2.12.2", - "source-map-js": "^1.0.1" - }, "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + "node": ">=18" } }, - "node_modules/cssstyle": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.5.tgz", - "integrity": "sha512-GlsEptulso7Jg0VaOZ8BXQi3AkYM5BOJKEO/rjMidSCq70FkIC5y0eawrCXeYzxgt3OCf4Ls+eoxN+/05vN0Ag==", + "node_modules/cssstyle/node_modules/lru-cache": { + "version": "11.2.6", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", + "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", + "license": "BlueOak-1.0.0", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/data-urls": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.1.tgz", + "integrity": "sha512-euIQENZg6x8mj3fO6o9+fOW8MimUI4PpD/fZBhJfeioZVy9TUpM4UY7KjQNVZFlqwJ0UdzRDzkycB997HEq1BQ==", "license": "MIT", "dependencies": { - "@asamuzakjp/css-color": "^4.1.1", - "@csstools/css-syntax-patches-for-csstree": "^1.0.21", - "css-tree": "^3.1.0" + "whatwg-mimetype": "^5.0.0", + "whatwg-url": "^15.1.0" }, "engines": { "node": ">=20" } }, - "node_modules/data-urls": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz", - "integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==", + "node_modules/data-urls/node_modules/whatwg-mimetype": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", + "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==", "license": "MIT", - "dependencies": { - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^15.0.0" - }, "engines": { "node": ">=20" } @@ -2629,9 +2663,9 @@ "license": "MIT" }, "node_modules/dedent": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.0.tgz", - "integrity": "sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz", + "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==", "dev": true, "license": "MIT", "peerDependencies": { @@ -2703,9 +2737,9 @@ } }, "node_modules/diff": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.2.tgz", - "integrity": "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.3.tgz", + "integrity": "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -2713,18 +2747,18 @@ } }, "node_modules/dompurify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz", - "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.3.tgz", + "integrity": "sha512-Oj6pzI2+RqBfFG+qOaOLbFXLQ90ARpcGG6UePL82bJLtdsa6CYJD7nmiU8MW9nQNOtCHV3lZ/Bzq1X0QYbBZCA==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" } }, "node_modules/dotenv": { - "version": "17.2.3", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", - "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz", + "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==", "license": "BSD-2-Clause", "engines": { "node": ">=12" @@ -2761,9 +2795,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.230", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.230.tgz", - "integrity": "sha512-A6A6Fd3+gMdaed9wX83CvHYJb4UuapPD5X5SLq72VZJzxHSY0/LUweGXRWmQlh2ln7KV7iw7jnwXK7dlPoOnHQ==", + "version": "1.5.307", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.307.tgz", + "integrity": "sha512-5z3uFKBWjiNR44nFcYdkcXjKMbg5KXNdciu7mhTPo9tB7NbqSNP2sSnGR+fqknZSCwKkBN+oxiiajWs4dT6ORg==", "dev": true, "license": "ISC" }, @@ -2955,18 +2989,18 @@ } }, "node_modules/expect": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-30.2.0.tgz", - "integrity": "sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-30.3.0.tgz", + "integrity": "sha512-1zQrciTiQfRdo7qJM1uG4navm8DayFa2TgCSRlzUyNkhcJ6XUZF3hjnpkyr3VhAqPH7i/9GkG7Tv5abz6fqz0Q==", "dev": true, "license": "MIT", "dependencies": { - "@jest/expect-utils": "30.2.0", + "@jest/expect-utils": "30.3.0", "@jest/get-type": "30.1.0", - "jest-matcher-utils": "30.2.0", - "jest-message-util": "30.2.0", - "jest-mock": "30.2.0", - "jest-util": "30.2.0" + "jest-matcher-utils": "30.3.0", + "jest-message-util": "30.3.0", + "jest-mock": "30.3.0", + "jest-util": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -3025,9 +3059,9 @@ } }, "node_modules/express-oauth2-jwt-bearer": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.7.2.tgz", - "integrity": "sha512-wuJj5RSEDYgALTCX0GSAoQDNIp+8yLyiOPKbe9ECaMmeHMZuCgsvRaqD9s0D72RjPnlGbuFU62YhXuv30/DFBw==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/express-oauth2-jwt-bearer/-/express-oauth2-jwt-bearer-1.7.4.tgz", + "integrity": "sha512-teO/eyvU8OkJXiP4cRuoJMrp31nNvjnL47MIkso0D/21AqUGv1O+VEiLisrDA8xjkaCBTufYnV1zepCOCLK4vg==", "license": "MIT", "dependencies": { "jose": "^4.15.5" @@ -3083,9 +3117,9 @@ } }, "node_modules/finalhandler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", - "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", + "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", "license": "MIT", "dependencies": { "debug": "^4.4.0", @@ -3096,7 +3130,11 @@ "statuses": "^2.0.1" }, "engines": { - "node": ">= 0.8" + "node": ">= 18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/find-up": { @@ -3321,6 +3359,7 @@ "version": "10.5.0", "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, "license": "ISC", "dependencies": { @@ -3496,15 +3535,19 @@ } }, "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/ignore-by-default": { @@ -3716,9 +3759,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -3789,16 +3832,16 @@ } }, "node_modules/jest": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-30.2.0.tgz", - "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-30.3.0.tgz", + "integrity": "sha512-AkXIIFcaazymvey2i/+F94XRnM6TsVLZDhBMLsd1Sf/W0wzsvvpjeyUrCZD6HGG4SDYPgDJDBKeiJTBb10WzMg==", "dev": true, "license": "MIT", "dependencies": { - "@jest/core": "30.2.0", - "@jest/types": "30.2.0", + "@jest/core": "30.3.0", + "@jest/types": "30.3.0", "import-local": "^3.2.0", - "jest-cli": "30.2.0" + "jest-cli": "30.3.0" }, "bin": { "jest": "bin/jest.js" @@ -3816,14 +3859,14 @@ } }, "node_modules/jest-changed-files": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.2.0.tgz", - "integrity": "sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.3.0.tgz", + "integrity": "sha512-B/7Cny6cV5At6M25EWDgf9S617lHivamL8vl6KEpJqkStauzcG4e+WPfDgMMF+H4FVH4A2PLRyvgDJan4441QA==", "dev": true, "license": "MIT", "dependencies": { "execa": "^5.1.1", - "jest-util": "30.2.0", + "jest-util": "30.3.0", "p-limit": "^3.1.0" }, "engines": { @@ -3831,29 +3874,29 @@ } }, "node_modules/jest-circus": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.2.0.tgz", - "integrity": "sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.3.0.tgz", + "integrity": "sha512-PyXq5szeSfR/4f1lYqCmmQjh0vqDkURUYi9N6whnHjlRz4IUQfMcXkGLeEoiJtxtyPqgUaUUfyQlApXWBSN1RA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "30.2.0", - "@jest/expect": "30.2.0", - "@jest/test-result": "30.2.0", - "@jest/types": "30.2.0", + "@jest/environment": "30.3.0", + "@jest/expect": "30.3.0", + "@jest/test-result": "30.3.0", + "@jest/types": "30.3.0", "@types/node": "*", "chalk": "^4.1.2", "co": "^4.6.0", "dedent": "^1.6.0", "is-generator-fn": "^2.1.0", - "jest-each": "30.2.0", - "jest-matcher-utils": "30.2.0", - "jest-message-util": "30.2.0", - "jest-runtime": "30.2.0", - "jest-snapshot": "30.2.0", - "jest-util": "30.2.0", + "jest-each": "30.3.0", + "jest-matcher-utils": "30.3.0", + "jest-message-util": "30.3.0", + "jest-runtime": "30.3.0", + "jest-snapshot": "30.3.0", + "jest-util": "30.3.0", "p-limit": "^3.1.0", - "pretty-format": "30.2.0", + "pretty-format": "30.3.0", "pure-rand": "^7.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.6" @@ -3863,21 +3906,21 @@ } }, "node_modules/jest-cli": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.2.0.tgz", - "integrity": "sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.3.0.tgz", + "integrity": "sha512-l6Tqx+j1fDXJEW5bqYykDQQ7mQg+9mhWXtnj+tQZrTWYHyHoi6Be8HPumDSA+UiX2/2buEgjA58iJzdj146uCw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/core": "30.2.0", - "@jest/test-result": "30.2.0", - "@jest/types": "30.2.0", + "@jest/core": "30.3.0", + "@jest/test-result": "30.3.0", + "@jest/types": "30.3.0", "chalk": "^4.1.2", "exit-x": "^0.2.2", "import-local": "^3.2.0", - "jest-config": "30.2.0", - "jest-util": "30.2.0", - "jest-validate": "30.2.0", + "jest-config": "30.3.0", + "jest-util": "30.3.0", + "jest-validate": "30.3.0", "yargs": "^17.7.2" }, "bin": { @@ -3896,34 +3939,33 @@ } }, "node_modules/jest-config": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.2.0.tgz", - "integrity": "sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.3.0.tgz", + "integrity": "sha512-WPMAkMAtNDY9P/oKObtsRG/6KTrhtgPJoBTmk20uDn4Uy6/3EJnnaZJre/FMT1KVRx8cve1r7/FlMIOfRVWL4w==", "dev": true, "license": "MIT", "dependencies": { "@babel/core": "^7.27.4", "@jest/get-type": "30.1.0", "@jest/pattern": "30.0.1", - "@jest/test-sequencer": "30.2.0", - "@jest/types": "30.2.0", - "babel-jest": "30.2.0", + "@jest/test-sequencer": "30.3.0", + "@jest/types": "30.3.0", + "babel-jest": "30.3.0", "chalk": "^4.1.2", "ci-info": "^4.2.0", "deepmerge": "^4.3.1", - "glob": "^10.3.10", + "glob": "^10.5.0", "graceful-fs": "^4.2.11", - "jest-circus": "30.2.0", + "jest-circus": "30.3.0", "jest-docblock": "30.2.0", - "jest-environment-node": "30.2.0", + "jest-environment-node": "30.3.0", "jest-regex-util": "30.0.1", - "jest-resolve": "30.2.0", - "jest-runner": "30.2.0", - "jest-util": "30.2.0", - "jest-validate": "30.2.0", - "micromatch": "^4.0.8", + "jest-resolve": "30.3.0", + "jest-runner": "30.3.0", + "jest-util": "30.3.0", + "jest-validate": "30.3.0", "parse-json": "^5.2.0", - "pretty-format": "30.2.0", + "pretty-format": "30.3.0", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, @@ -3948,16 +3990,16 @@ } }, "node_modules/jest-diff": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.2.0.tgz", - "integrity": "sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.3.0.tgz", + "integrity": "sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/diff-sequences": "30.0.1", + "@jest/diff-sequences": "30.3.0", "@jest/get-type": "30.1.0", "chalk": "^4.1.2", - "pretty-format": "30.2.0" + "pretty-format": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -3977,57 +4019,57 @@ } }, "node_modules/jest-each": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.2.0.tgz", - "integrity": "sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.3.0.tgz", + "integrity": "sha512-V8eMndg/aZ+3LnCJgSm13IxS5XSBM22QSZc9BtPK8Dek6pm+hfUNfwBdvsB3d342bo1q7wnSkC38zjX259qZNA==", "dev": true, "license": "MIT", "dependencies": { "@jest/get-type": "30.1.0", - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "chalk": "^4.1.2", - "jest-util": "30.2.0", - "pretty-format": "30.2.0" + "jest-util": "30.3.0", + "pretty-format": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-environment-node": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.2.0.tgz", - "integrity": "sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.3.0.tgz", + "integrity": "sha512-4i6HItw/JSiJVsC5q0hnKIe/hbYfZLVG9YJ/0pU9Hz2n/9qZe3Rhn5s5CUZA5ORZlcdT/vmAXRMyONXJwPrmYQ==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "30.2.0", - "@jest/fake-timers": "30.2.0", - "@jest/types": "30.2.0", + "@jest/environment": "30.3.0", + "@jest/fake-timers": "30.3.0", + "@jest/types": "30.3.0", "@types/node": "*", - "jest-mock": "30.2.0", - "jest-util": "30.2.0", - "jest-validate": "30.2.0" + "jest-mock": "30.3.0", + "jest-util": "30.3.0", + "jest-validate": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-haste-map": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.2.0.tgz", - "integrity": "sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.3.0.tgz", + "integrity": "sha512-mMi2oqG4KRU0R9QEtscl87JzMXfUhbKaFqOxmjb2CKcbHcUGFrJCBWHmnTiUqi6JcnzoBlO4rWfpdl2k/RfLCA==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "@types/node": "*", "anymatch": "^3.1.3", "fb-watchman": "^2.0.2", "graceful-fs": "^4.2.11", "jest-regex-util": "30.0.1", - "jest-util": "30.2.0", - "jest-worker": "30.2.0", - "micromatch": "^4.0.8", + "jest-util": "30.3.0", + "jest-worker": "30.3.0", + "picomatch": "^4.0.3", "walker": "^1.0.8" }, "engines": { @@ -4038,49 +4080,49 @@ } }, "node_modules/jest-leak-detector": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz", - "integrity": "sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.3.0.tgz", + "integrity": "sha512-cuKmUUGIjfXZAiGJ7TbEMx0bcqNdPPI6P1V+7aF+m/FUJqFDxkFR4JqkTu8ZOiU5AaX/x0hZ20KaaIPXQzbMGQ==", "dev": true, "license": "MIT", "dependencies": { "@jest/get-type": "30.1.0", - "pretty-format": "30.2.0" + "pretty-format": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz", - "integrity": "sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.3.0.tgz", + "integrity": "sha512-HEtc9uFQgaUHkC7nLSlQL3Tph4Pjxt/yiPvkIrrDCt9jhoLIgxaubo1G+CFOnmHYMxHwwdaSN7mkIFs6ZK8OhA==", "dev": true, "license": "MIT", "dependencies": { "@jest/get-type": "30.1.0", "chalk": "^4.1.2", - "jest-diff": "30.2.0", - "pretty-format": "30.2.0" + "jest-diff": "30.3.0", + "pretty-format": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-message-util": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.2.0.tgz", - "integrity": "sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.3.0.tgz", + "integrity": "sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "@types/stack-utils": "^2.0.3", "chalk": "^4.1.2", "graceful-fs": "^4.2.11", - "micromatch": "^4.0.8", - "pretty-format": "30.2.0", + "picomatch": "^4.0.3", + "pretty-format": "30.3.0", "slash": "^3.0.0", "stack-utils": "^2.0.6" }, @@ -4089,15 +4131,15 @@ } }, "node_modules/jest-mock": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.2.0.tgz", - "integrity": "sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.3.0.tgz", + "integrity": "sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "@types/node": "*", - "jest-util": "30.2.0" + "jest-util": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -4132,18 +4174,18 @@ } }, "node_modules/jest-resolve": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.2.0.tgz", - "integrity": "sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.3.0.tgz", + "integrity": "sha512-NRtTAHQlpd15F9rUR36jqwelbrDV/dY4vzNte3S2kxCKUJRYNd5/6nTSbYiak1VX5g8IoFF23Uj5TURkUW8O5g==", "dev": true, "license": "MIT", "dependencies": { "chalk": "^4.1.2", "graceful-fs": "^4.2.11", - "jest-haste-map": "30.2.0", + "jest-haste-map": "30.3.0", "jest-pnp-resolver": "^1.2.3", - "jest-util": "30.2.0", - "jest-validate": "30.2.0", + "jest-util": "30.3.0", + "jest-validate": "30.3.0", "slash": "^3.0.0", "unrs-resolver": "^1.7.11" }, @@ -4152,46 +4194,46 @@ } }, "node_modules/jest-resolve-dependencies": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz", - "integrity": "sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.3.0.tgz", + "integrity": "sha512-9ev8s3YN6Hsyz9LV75XUwkCVFlwPbaFn6Wp75qnI0wzAINYWY8Fb3+6y59Rwd3QaS3kKXffHXsZMziMavfz/nw==", "dev": true, "license": "MIT", "dependencies": { "jest-regex-util": "30.0.1", - "jest-snapshot": "30.2.0" + "jest-snapshot": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, "node_modules/jest-runner": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.2.0.tgz", - "integrity": "sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.3.0.tgz", + "integrity": "sha512-gDv6C9LGKWDPLia9TSzZwf4h3kMQCqyTpq+95PODnTRDO0g9os48XIYYkS6D236vjpBir2fF63YmJFtqkS5Duw==", "dev": true, "license": "MIT", "dependencies": { - "@jest/console": "30.2.0", - "@jest/environment": "30.2.0", - "@jest/test-result": "30.2.0", - "@jest/transform": "30.2.0", - "@jest/types": "30.2.0", + "@jest/console": "30.3.0", + "@jest/environment": "30.3.0", + "@jest/test-result": "30.3.0", + "@jest/transform": "30.3.0", + "@jest/types": "30.3.0", "@types/node": "*", "chalk": "^4.1.2", "emittery": "^0.13.1", "exit-x": "^0.2.2", "graceful-fs": "^4.2.11", "jest-docblock": "30.2.0", - "jest-environment-node": "30.2.0", - "jest-haste-map": "30.2.0", - "jest-leak-detector": "30.2.0", - "jest-message-util": "30.2.0", - "jest-resolve": "30.2.0", - "jest-runtime": "30.2.0", - "jest-util": "30.2.0", - "jest-watcher": "30.2.0", - "jest-worker": "30.2.0", + "jest-environment-node": "30.3.0", + "jest-haste-map": "30.3.0", + "jest-leak-detector": "30.3.0", + "jest-message-util": "30.3.0", + "jest-resolve": "30.3.0", + "jest-runtime": "30.3.0", + "jest-util": "30.3.0", + "jest-watcher": "30.3.0", + "jest-worker": "30.3.0", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, @@ -4200,32 +4242,32 @@ } }, "node_modules/jest-runtime": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.2.0.tgz", - "integrity": "sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.3.0.tgz", + "integrity": "sha512-CgC+hIBJbuh78HEffkhNKcbXAytQViplcl8xupqeIWyKQF50kCQA8J7GeJCkjisC6hpnC9Muf8jV5RdtdFbGng==", "dev": true, "license": "MIT", "dependencies": { - "@jest/environment": "30.2.0", - "@jest/fake-timers": "30.2.0", - "@jest/globals": "30.2.0", + "@jest/environment": "30.3.0", + "@jest/fake-timers": "30.3.0", + "@jest/globals": "30.3.0", "@jest/source-map": "30.0.1", - "@jest/test-result": "30.2.0", - "@jest/transform": "30.2.0", - "@jest/types": "30.2.0", + "@jest/test-result": "30.3.0", + "@jest/transform": "30.3.0", + "@jest/types": "30.3.0", "@types/node": "*", "chalk": "^4.1.2", "cjs-module-lexer": "^2.1.0", "collect-v8-coverage": "^1.0.2", - "glob": "^10.3.10", + "glob": "^10.5.0", "graceful-fs": "^4.2.11", - "jest-haste-map": "30.2.0", - "jest-message-util": "30.2.0", - "jest-mock": "30.2.0", + "jest-haste-map": "30.3.0", + "jest-message-util": "30.3.0", + "jest-mock": "30.3.0", "jest-regex-util": "30.0.1", - "jest-resolve": "30.2.0", - "jest-snapshot": "30.2.0", - "jest-util": "30.2.0", + "jest-resolve": "30.3.0", + "jest-snapshot": "30.3.0", + "jest-util": "30.3.0", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, @@ -4234,9 +4276,9 @@ } }, "node_modules/jest-snapshot": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.2.0.tgz", - "integrity": "sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.3.0.tgz", + "integrity": "sha512-f14c7atpb4O2DeNhwcvS810Y63wEn8O1HqK/luJ4F6M4NjvxmAKQwBUWjbExUtMxWJQ0wVgmCKymeJK6NZMnfQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4245,20 +4287,20 @@ "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-syntax-typescript": "^7.27.1", "@babel/types": "^7.27.3", - "@jest/expect-utils": "30.2.0", + "@jest/expect-utils": "30.3.0", "@jest/get-type": "30.1.0", - "@jest/snapshot-utils": "30.2.0", - "@jest/transform": "30.2.0", - "@jest/types": "30.2.0", + "@jest/snapshot-utils": "30.3.0", + "@jest/transform": "30.3.0", + "@jest/types": "30.3.0", "babel-preset-current-node-syntax": "^1.2.0", "chalk": "^4.1.2", - "expect": "30.2.0", + "expect": "30.3.0", "graceful-fs": "^4.2.11", - "jest-diff": "30.2.0", - "jest-matcher-utils": "30.2.0", - "jest-message-util": "30.2.0", - "jest-util": "30.2.0", - "pretty-format": "30.2.0", + "jest-diff": "30.3.0", + "jest-matcher-utils": "30.3.0", + "jest-message-util": "30.3.0", + "jest-util": "30.3.0", + "pretty-format": "30.3.0", "semver": "^7.7.2", "synckit": "^0.11.8" }, @@ -4267,9 +4309,9 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -4280,49 +4322,36 @@ } }, "node_modules/jest-util": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.2.0.tgz", - "integrity": "sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.3.0.tgz", + "integrity": "sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==", "dev": true, "license": "MIT", "dependencies": { - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "@types/node": "*", "chalk": "^4.1.2", "ci-info": "^4.2.0", "graceful-fs": "^4.2.11", - "picomatch": "^4.0.2" + "picomatch": "^4.0.3" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, - "node_modules/jest-util/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/jest-validate": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.2.0.tgz", - "integrity": "sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.3.0.tgz", + "integrity": "sha512-I/xzC8h5G+SHCb2P2gWkJYrNiTbeL47KvKeW5EzplkyxzBRBw1ssSHlI/jXec0ukH2q7x2zAWQm7015iusg62Q==", "dev": true, "license": "MIT", "dependencies": { "@jest/get-type": "30.1.0", - "@jest/types": "30.2.0", + "@jest/types": "30.3.0", "camelcase": "^6.3.0", "chalk": "^4.1.2", "leven": "^3.1.0", - "pretty-format": "30.2.0" + "pretty-format": "30.3.0" }, "engines": { "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" @@ -4342,19 +4371,19 @@ } }, "node_modules/jest-watcher": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.2.0.tgz", - "integrity": "sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.3.0.tgz", + "integrity": "sha512-PJ1d9ThtTR8aMiBWUdcownq9mDdLXsQzJayTk4kmaBRHKvwNQn+ANveuhEBUyNI2hR1TVhvQ8D5kHubbzBHR/w==", "dev": true, "license": "MIT", "dependencies": { - "@jest/test-result": "30.2.0", - "@jest/types": "30.2.0", + "@jest/test-result": "30.3.0", + "@jest/types": "30.3.0", "@types/node": "*", "ansi-escapes": "^4.3.2", "chalk": "^4.1.2", "emittery": "^0.13.1", - "jest-util": "30.2.0", + "jest-util": "30.3.0", "string-length": "^4.0.2" }, "engines": { @@ -4362,15 +4391,15 @@ } }, "node_modules/jest-worker": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.2.0.tgz", - "integrity": "sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.3.0.tgz", + "integrity": "sha512-DrCKkaQwHexjRUFTmPzs7sHQe0TSj9nvDALKGdwmK5mW9v7j90BudWirKAJHt3QQ9Dhrg1F7DogPzhChppkJpQ==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", "@ungap/structured-clone": "^1.3.0", - "jest-util": "30.2.0", + "jest-util": "30.3.0", "merge-stream": "^2.0.0", "supports-color": "^8.1.1" }, @@ -4553,9 +4582,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -4576,19 +4605,19 @@ } }, "node_modules/mariadb": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.5.tgz", - "integrity": "sha512-gThTYkhIS5rRqkVr+Y0cIdzr+GRqJ9sA2Q34e0yzmyhMCwyApf3OKAC1jnF23aSlIOqJuyaUFUcj7O1qZslmmQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.5.2.tgz", + "integrity": "sha512-9rztrI4nouxAY/82a+RlzzZ5ie2vxu2eYclkBvTy1ATXH1B9cnvZ0O71Pzsy/mlfDb5P3HhOg0JzQKkDRhctyA==", "license": "LGPL-2.1-or-later", "dependencies": { "@types/geojson": "^7946.0.16", - "@types/node": "^24.0.13", + "@types/node": ">=18", "denque": "^2.1.0", - "iconv-lite": "^0.6.3", + "iconv-lite": "^0.7.2", "lru-cache": "^10.4.3" }, "engines": { - "node": ">= 14" + "node": ">= 18" } }, "node_modules/mariadb/node_modules/@types/geojson": { @@ -4604,9 +4633,9 @@ "license": "ISC" }, "node_modules/marked": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-17.0.1.tgz", - "integrity": "sha512-boeBdiS0ghpWcSwoNm/jJBwdpFaMnZWRzjA6SkUMYb40SVaN1x7mmfGKp0jvexGcx+7y2La5zRZsYFZI6Qpypg==", + "version": "17.0.4", + "resolved": "https://registry.npmjs.org/marked/-/marked-17.0.4.tgz", + "integrity": "sha512-NOmVMM+KAokHMvjWmC5N/ZOvgmSWuqJB8FoYI019j4ogb/PeRMKoKIjReZ2w3376kkA8dSJIP8uD993Kxc0iRQ==", "license": "MIT", "bin": { "marked": "bin/marked.js" @@ -4625,9 +4654,9 @@ } }, "node_modules/mdn-data": { - "version": "2.12.2", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz", - "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==", + "version": "2.27.1", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz", + "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==", "license": "CC0-1.0" }, "node_modules/media-typer": { @@ -4674,20 +4703,6 @@ "node": ">= 0.6" } }, - "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/mime": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", @@ -4737,13 +4752,13 @@ } }, "node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -4753,23 +4768,23 @@ } }, "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { "node": ">=16 || 14 >=14.17" } }, "node_modules/mongodb": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-7.0.0.tgz", - "integrity": "sha512-vG/A5cQrvGGvZm2mTnCSz1LUcbOPl83hfB6bxULKQ8oFZauyox/2xbZOoGNl+64m8VBrETkdGCDBdOsCr3F3jg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-7.1.0.tgz", + "integrity": "sha512-kMfnKunbolQYwCIyrkxNJFB4Ypy91pYqua5NargS/f8ODNSJxT03ZU3n1JqL4mCzbSih8tvmMEMLpKTT7x5gCg==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.3.0", - "bson": "^7.0.0", + "bson": "^7.1.1", "mongodb-connection-string-url": "^7.0.0" }, "engines": { @@ -4809,9 +4824,9 @@ } }, "node_modules/mongodb-connection-string-url": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-7.0.0.tgz", - "integrity": "sha512-irhhjRVLE20hbkRl4zpAYLnDMM+zIZnp0IDB9akAFFUZp/3XdOfwwddc7y6cNvF2WCEtfTYRwYbIfYa2kVY0og==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-7.0.1.tgz", + "integrity": "sha512-h0AZ9A7IDVwwHyMxmdMXKy+9oNlF0zFoahHiX3vQ8e3KFcSP3VmsmfvtRSuLPxmyv2vjIDxqty8smTgie/SNRQ==", "license": "Apache-2.0", "dependencies": { "@types/whatwg-url": "^13.0.0", @@ -4905,9 +4920,9 @@ "license": "MIT" }, "node_modules/napi-postinstall": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz", - "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz", + "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==", "dev": true, "license": "MIT", "bin": { @@ -4944,32 +4959,32 @@ "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz", - "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", + "version": "2.0.36", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.36.tgz", + "integrity": "sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==", "dev": true, "license": "MIT" }, "node_modules/nodemailer": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.12.tgz", - "integrity": "sha512-H+rnK5bX2Pi/6ms3sN4/jRQvYSMltV6vqup/0SFOrxYYY/qoNvhXPlYq3e+Pm9RFJRwrMGbMIwi81M4dxpomhA==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.2.tgz", + "integrity": "sha512-zbj002pZAIkWQFxyAaqoxvn+zoIwRnS40hgjqTXudKOOJkiFFgBeNqjgD3/YCR12sZnrghWYBY+yP1ZucdDRpw==", "license": "MIT-0", "engines": { "node": ">=6.0.0" } }, "node_modules/nodemon": { - "version": "3.1.11", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz", - "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==", + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.14.tgz", + "integrity": "sha512-jakjZi93UtB3jHMWsXL68FXSAosbLfY0In5gtKq3niLSkrWznrVBzXFNOEMJUfc9+Ke7SHWoAZsiMkNP3vq6Jw==", "dev": true, "license": "MIT", "dependencies": { "chokidar": "^3.5.2", "debug": "^4", "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", + "minimatch": "^10.2.1", "pstree.remy": "^1.1.8", "semver": "^7.5.3", "simple-update-notifier": "^2.0.0", @@ -4988,15 +5003,27 @@ "url": "https://opencollective.com/nodemon" } }, + "node_modules/nodemon/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/nodemon/node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/nodemon/node_modules/has-flag": { @@ -5010,22 +5037,25 @@ } }, "node_modules/nodemon/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "*" + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/nodemon/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -5319,13 +5349,13 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" @@ -5355,9 +5385,9 @@ } }, "node_modules/pretty-format": { - "version": "30.2.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz", - "integrity": "sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==", + "version": "30.3.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz", + "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5429,9 +5459,9 @@ "license": "MIT" }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" @@ -5467,22 +5497,6 @@ "node": ">= 0.10" } }, - "node_modules/raw-body/node_modules/iconv-lite": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.1.tgz", - "integrity": "sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", @@ -5503,6 +5517,19 @@ "node": ">=8.10.0" } }, + "node_modules/readdirp/node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5568,23 +5595,9 @@ "license": "MIT" }, "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "license": "MIT" }, "node_modules/safer-buffer": { @@ -5616,31 +5629,35 @@ } }, "node_modules/send": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", - "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", + "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", "license": "MIT", "dependencies": { - "debug": "^4.3.5", + "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", - "http-errors": "^2.0.0", - "mime-types": "^3.0.1", + "http-errors": "^2.0.1", + "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", - "statuses": "^2.0.1" + "statuses": "^2.0.2" }, "engines": { "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/serve-static": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", - "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", + "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", "license": "MIT", "dependencies": { "encodeurl": "^2.0.0", @@ -5650,6 +5667,10 @@ }, "engines": { "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/setprototypeof": { @@ -5780,9 +5801,9 @@ } }, "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -5793,16 +5814,16 @@ } }, "node_modules/sinon": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.1.tgz", - "integrity": "sha512-Z0NVCW45W8Mg5oC/27/+fCqIHFnW8kpkFOq0j9XJIev4Ld0mKmERaZv5DMLAb9fGCevjKwaEeIQz5+MBXfZcDw==", + "version": "21.0.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.2.tgz", + "integrity": "sha512-VHV4UaoxIe5jrMd89Y9duI76T5g3Lp+ET+ctLhLDaZtSznDPah1KKpRElbdBV4RwqWSw2vadFiVs9Del7MbVeQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^15.1.0", - "@sinonjs/samsam": "^8.0.3", - "diff": "^8.0.2", + "@sinonjs/fake-timers": "^15.1.1", + "@sinonjs/samsam": "^9.0.2", + "diff": "^8.0.3", "supports-color": "^7.2.0" }, "funding": { @@ -5810,16 +5831,6 @@ "url": "https://opencollective.com/sinon" } }, - "node_modules/sinon/node_modules/@sinonjs/fake-timers": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.0.tgz", - "integrity": "sha512-cqfapCxwTGsrR80FEgOoPsTonoefMBY7dnUEbQ+GRcved0jvkJLzvX6F4WtN+HBqbPX/SiFsIRUp+IrCW/2I2w==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.1" - } - }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -6000,13 +6011,13 @@ } }, "node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" }, "engines": { "node": ">=12" @@ -6145,9 +6156,9 @@ "license": "MIT" }, "node_modules/synckit": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz", - "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==", + "version": "0.11.12", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz", + "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6190,7 +6201,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, "license": "ISC", "dependencies": { @@ -6209,9 +6220,9 @@ } }, "node_modules/test-exclude/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { @@ -6222,21 +6233,21 @@ } }, "node_modules/tldts": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.16.tgz", - "integrity": "sha512-5bdPHSwbKTeHmXrgecID4Ljff8rQjv7g8zKQPkCozRo2HWWni+p310FSn5ImI+9kWw9kK4lzOB5q/a6iv0IJsw==", + "version": "7.0.25", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.25.tgz", + "integrity": "sha512-keinCnPbwXEUG3ilrWQZU+CqcTTzHq9m2HhoUP2l7Xmi8l1LuijAXLpAJ5zRW+ifKTNscs4NdCkfkDCBYm352w==", "license": "MIT", "dependencies": { - "tldts-core": "^7.0.16" + "tldts-core": "^7.0.25" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.16.tgz", - "integrity": "sha512-XHhPmHxphLi+LGbH0G/O7dmUH9V65OY20R7vH8gETHsp5AZCjBk9l8sqmRKLaGOxnETU7XNSDUPtewAy/K6jbA==", + "version": "7.0.25", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.25.tgz", + "integrity": "sha512-ZjCZK0rppSBu7rjHYDYsEaMOIbbT+nWF57hKkv4IUmZWBNrBWBOjIElc0mKRgLM8bm7x/BBlof6t2gi/Oq/Asw==", "license": "MIT" }, "node_modules/tmpl": { @@ -6359,9 +6370,9 @@ "license": "MIT" }, "node_modules/undici-types": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz", - "integrity": "sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==", + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", "license": "MIT" }, "node_modules/unpipe": { @@ -6409,9 +6420,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", + "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", "dev": true, "funding": [ { @@ -6486,9 +6497,9 @@ } }, "node_modules/webidl-conversions": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.0.tgz", - "integrity": "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz", + "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==", "license": "BSD-2-Clause", "engines": { "node": ">=20" @@ -6507,6 +6518,18 @@ "node": ">=18" } }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/whatwg-mimetype": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", @@ -6661,9 +6684,9 @@ } }, "node_modules/ws": { - "version": "8.18.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", - "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", + "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", "license": "MIT", "engines": { "node": ">=10.0.0" diff --git a/package.json b/package.json index 287caaf9..cdc26259 100644 --- a/package.json +++ b/package.json @@ -33,34 +33,37 @@ "inviteMemberTests": "node --import ./env-loader.js --experimental-vm-modules node_modules/jest/bin/jest.js -t inviteMemberTests " }, "dependencies": { - "@iiif/helpers": "^1.5.7", + "@iiif/helpers": "^1.5.8", "cookie-parser": "^1.4.7", - "cors": "^2.8.5", + "cors": "^2.8.6", "debug": "^4.4.3", - "dompurify": "^3.3.1", - "dotenv": "^17.2.3", + "dompurify": "^3.3.3", + "dotenv": "^17.3.1", "express": "^5.2.1", "express-list-endpoints": "^7.1.1", - "express-oauth2-jwt-bearer": "^1.7.2", + "express-oauth2-jwt-bearer": "^1.7.4", "image-size": "^2.0.2", "jsdom": "27.0.0", - "mariadb": "^3.4.5", - "marked": "^17.0.1", + "mariadb": "^3.5.2", + "marked": "^17.0.4", "mime-types": "^3.0.2", - "mongodb": "^7.0.0", + "mongodb": "^7.1.0", "morgan": "^1.10.1", - "nodemailer": "^7.0.12", + "nodemailer": "^8.0.2", "tpen3-services": "file:" }, "devDependencies": { - "@jest/globals": "^30.2.0", - "jest": "^30.2.0", - "nodemon": "^3.1.11", - "sinon": "^21.0.1", + "@jest/globals": "^30.3.0", + "jest": "^30.3.0", + "nodemon": "^3.1.14", + "sinon": "^21.0.2", "supertest": "^7.2.2" }, + "overrides": { + "@asamuzakjp/css-color": "~3.2.0" + }, "engines": { - "node": ">=24.12.0", - "npm": ">=11.7.0" + "node": ">=24.14.0", + "npm": ">=11.0.0" } } diff --git a/userProfile/__tests__/end_to_end_unit.test.js b/userProfile/__tests__/end_to_end_unit.test.js index 577de280..45cd17f0 100644 --- a/userProfile/__tests__/end_to_end_unit.test.js +++ b/userProfile/__tests__/end_to_end_unit.test.js @@ -22,10 +22,10 @@ describe("Test private routes restfulness #user_class", () => { }) describe("Unauthorized GETs #user_class", () => { - it("/my/project should return 400 if there is no Authorization header #user_class", async () => { + it("/my/project should return 401 if there is no Authorization header #user_class", async () => { const response = await request(mainApp) .get("/my/projects") - expect(response.status).toBe(400) + expect(response.status).toBe(401) expect(response.body).toBeTruthy() }) @@ -37,10 +37,10 @@ describe("Unauthorized GETs #user_class", () => { expect(response.body).toBeTruthy() }) - it("/my/profile should return 400 if there is no Authorization header.", async () => { + it("/my/profile should return 401 if there is no Authorization header.", async () => { const response = await request(mainApp) .get("/my/profile") - expect(response.status).toBe(400) + expect(response.status).toBe(401) expect(response.body).toBeTruthy() }) From 3e04771737d4cf525904181a5b7ad1c908a7b6d4 Mon Sep 17 00:00:00 2001 From: Bryan Haberberger Date: Thu, 12 Mar 2026 15:41:34 -0500 Subject: [PATCH 256/262] Replace Bad Instance of `databaseTiny.find()` (#474) * Fix smoke test for development. Fix issue with bad usage of databaseTiny.find(). * Changes during review --- __tests__/smoke.test.js | 4 ++-- utilities/shared.js | 25 +++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/__tests__/smoke.test.js b/__tests__/smoke.test.js index c43a3c0c..a3cf220c 100644 --- a/__tests__/smoke.test.js +++ b/__tests__/smoke.test.js @@ -57,10 +57,10 @@ async function runSmokeChecks() { if (!(hasHeading || hasWelcome)) throw new Error('Expected TPEN3 Services index HTML not found in response') })) - // Protected endpoint requires authentication (400 when Authorization header is missing) + // Protected endpoint requires authentication (401 when Authorization header is missing) checks.push(await runCheck('Protected endpoint requires authentication', async () => { const res = await request('/my/profile') - if (res.status !== 400) throw new Error(`Expected 400, got ${res.status}`) + if (res.status !== 401) throw new Error(`Expected 401, got ${res.status}`) })) // CORS headers present for allowed origin diff --git a/utilities/shared.js b/utilities/shared.js index b3f1cd05..e2ff2441 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -84,8 +84,29 @@ export const updateLayerAndProject = async (layer, project, userId) => { const pageOverwrites = updatedLayer.pages .filter(page => page.id.startsWith(process.env.RERUMIDPREFIX)) .map(async page => { - const oldPage = await databaseTiny.find({_id: page.id.split("/").pop()}) - if(!oldPage) throw new Error(`Page with ID ${page.id} not found in RERUM`) + const oldPage = await fetch(page.id).then(async (resp) => { + if (resp.ok) return resp.json() + let rerumErrorMessage + try { + rerumErrorMessage = `${resp.status ?? 500}: ${page.id} - ${await resp.text()}` + } catch (e) { + rerumErrorMessage = `500: ${page.id} - A RERUM error occurred` + } + const err = new Error(rerumErrorMessage) + err.status = 502 + throw err + }) + .catch(err => { + if (err.status === 502) throw err + const genericRerumNetworkError = new Error(`500: ${page.id} - A RERUM error occurred`) + genericRerumNetworkError.status = 502 + throw genericRerumNetworkError + }) + if (!(oldPage?.id || oldPage?.["@id"])) { + const err = new Error(`500: ${page.id} - A RERUM error occurred`) + err.status = 502 + throw err + } oldPage.partOf = [{ id: updatedLayer.id, type: "AnnotationCollection" }] return databaseTiny.overwrite(oldPage) }) From 9240ab3f28f4b0e725c0cb16201e091161412ae4 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Mar 2026 13:49:11 -0500 Subject: [PATCH 257/262] Remove API.md and jsdom/dompurify/marked dependencies (#477) * Initial plan * Remove API.md and jsdom/dompurify/marked packages Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * changes during review --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> Co-authored-by: Bryan Haberberger --- API.md | 485 ------------------------------- __tests__/mount.test.js | 7 +- index.js | 50 ---- package-lock.json | 612 ---------------------------------------- package.json | 3 - public/API.html | 2 +- 6 files changed, 2 insertions(+), 1157 deletions(-) delete mode 100644 API.md diff --git a/API.md b/API.md deleted file mode 100644 index 50de059f..00000000 --- a/API.md +++ /dev/null @@ -1,485 +0,0 @@ -# TPEN Services API Documentation - -This document provides an overview of the available routes in the TPEN Services API. These routes allow interaction with the application for various functionalities. - -## Base URL - -- **Production**: [https://api.t-pen.org](https://api.t-pen.org) -- **Development**: [https://dev.api.t-pen.org](https://dev.api.t-pen.org) - -## Endpoints - -### 1. **Authentication** - -Endpoints marked with a 🔐 requiring authentication expect a valid JWT token in the `Authorization` header. Use the [public TPEN3 login](https://three.t-pen.org/login/) to get one of these JWT tokens. - ---- - -### 2. **Project** - -#### `POST /project/create` 🔐 - -- **Description**: Create a new project. This is a high-skill maneuver requiring a complete project object. -- **Request Body**: - - ```json - { - "label": "string", - "metadata": [ { Metadata } ], - "layers": [ { Layer } ], - "manifests": [ "URIs" ], - "creator": "URI", - "group": "hexstring" - } - ``` - -- **Responses**: - - - **201**: Project created successfully - - **400**: Project creation failed, validation errors - - **401**: Unauthorized - - **500**: Server error - - The Location header of a successful response is the Project id. - -#### `POST /import?createFrom="URL"` 🔐 - -- **Description**: Create a new project by importing a web resource. -- **Request Body**: - - ```json - { - "url": "URL" - } - ``` - -- **Responses**: - - - **201**: Project created successfully - - **400**: Project creation failed, validation errors - - **401**: Unauthorized - - **500**: Server error - - The Location header of a successful response is the Project id. The project will be created with the label and metadata of the imported resource. A complete project object will be created with the imported resource as the first manifest and returned. - -#### `GET /project/:id` 🔐 - -- **Description**: Retrieve a project by ID. -- **Parameters**: - - `id`: ID of the project. -- **Responses**: - - - **200**: Project found - ```json - { - "id": "string", - "label": "string", - "metadata": [ { Metadata } ], - "creator": "URI", - "layers": [ { Layer } ], - "manifests": [ "URIs" ], - "group": "hexstring", - "tools": [ "string" ], - "options": { OptionsMap } - } - ``` - - **404**: Project not found - - **401**: Unauthorized - - **403**: Forbidden - - **500**: Server error - -The response is not a complete Project data object, but a projection designed for use in the client interface. - ---- - -### 3. **Collaborators** - -Manage the users and roles in a Project. - -#### `POST /project/:projectId/invite-member` 🔐 - -- **Description**: Invite a user to a project. If the user does not have a TPEN account, they will be sent an email invitation. -- **Parameters**: - - `projectId`: ID of the project as a hexstring or the Project slug. -- **Request Body**: - - ```json - { - "email": "string", - "roles": ["string"] | "string" - } - ``` - - - `email`: The email address of the user to invite. - - `roles`: The roles of the user in the project as an array or space-delimited string. -- **Responses**: - - - **200**: User invited successfully - - **400**: User invitation failed, validation errors - - **401**: Unauthorized - - **403**: Forbidden - - **500**: Server error - -This API is not able to track the status of the invitation. Email addresses that fail to be delivered or are rejected by the recipient will not be reported. - -#### `POST /project/:projectId/remove-member` 🔐 - -- **Description**: Remove a user from a project group. -- **Parameters**: - - `projectId`: ID of the project. -- **Request Body**: - - ```json - { - "userID": "string" - } - ``` -- **Responses**: - - - **204**: User removed successfully - - **401**: Unauthorized - - **403**: Forbidden - - **500**: Server error - -This removes a user and their roles from the project. The user will no longer have access to the project, but their annotations will remain with full attribution. - -#### `PUT /project/:projectId/collaborator/:collaboratorId/setRoles` 🔐 - -- **Description**: Set the roles of a User in a project, replacing all currently defined roles. -- **Parameters**: - - `projectId`: ID of the project. - - `collaboratorId`: ID of the collaborator. -- **Request Body**: - - ```json - { - "roles": ["string"] | "string" - } - ``` -- **Responses**: - - - **200**: Roles set successfully - - **400**: Roles setting failed, validation errors - - **401**: Unauthorized - - **403**: Forbidden - - **500**: Server error - -The User requesting this action must have permissions to set roles for the collaborator. The OWNER role cannot be set using this endpoint. - -#### `POST /project/:projectId/switch/owner` 🔐 - -- **Description**: Transfer ownership of a project to another user. -- **Parameters**: - - `projectId`: ID of the project. -- **Request Body**: - - ```json - { - "newOwnerId": "hexstring" - } - ``` -- **Responses**: - - - **200**: Ownership transferred successfully - - **400**: Ownership transfer failed, validation errors - - **401**: Unauthorized - - **403**: Forbidden - - **500**: Server error - -The User requesting this action must be the current owner of the project. The OWNER role will be removed from the current owner and assigned to the new owner. The new owner must be a member of the project. If the current owner has no other roles, the CONTRIBUTOR role will be assigned to them. - -#### `POST /project/:projectId/setCustomRoles` 🔐 - -- **Description**: Set custom roles for a Project group. Custom roles must be provided as a JSON object with keys as roles and values as arrays of permissions or space-delimited strings. -- **Parameters**: - - `projectId`: ID of the project. -- **Request Body**: - - ```json - { - "roles": { - "roleName": ["permission1", "permission2"] | "space-delimited permissions" - } - } - ``` - -- **Responses**: - - - **200**: Custom roles set successfully - - **400**: Invalid request, validation errors - - **401**: Unauthenticated request - - **403**: Permission denied - - **500**: Server error - -The User requesting this action must have permissions to update roles. Default roles cannot be modified using this endpoint. Custom roles can be complicated and there is more detailed description of their use in the [Cookbook](#). - ---- - -### 4. **Users** - -Private account modification, personal details, and public profile retrieval. - -#### `GET /my/profile` 🔐 - -- **Description**: Retrieve the profile of the authenticated user. -- **Responses**: - - - **200**: Profile found - ```json - { - "_id": "hexstring", - "_sub": "string", - "agent": "URI", - "email": "string", - "profile": { - "displayName": "string", - "custom": Any - } - "name": "string" - } - ``` - - **401**: Unauthorized - - **500**: Server error - -Users can always see and manipulate their own profile. The profile object is a projection of the full user object. - -#### `GET /my/projects` 🔐 - -- **Description**: Retrieve a list of projects the authenticated user is a member of. -- **Responses**: - - - **200**: Projects found (or empty list if user has no projects) - ```json - { - "metrics": { - "newest": "project:hexstring/page:hexstring", - "lastModified": "project:hexstring/page:hexstring", - "myRecent": "hexstring" - }, - "projects": [ - { - "_id": "hexstring", - "label": "string", - "roles": ["string"] - }, ... - ] - } - ``` - - When the user has no projects, returns: - ```json - { - "metrics": null, - "projects": [] - } - ``` - - **401**: Unauthorized - - **500**: Server error - -The response includes a list of projects the user is a member of regardless of the permissions afforded to them in each project, along with metrics about the newest and most recently modified projects. - -#### `GET /user/:id` - -- **Description**: Retrieve the public profile of a user. -- **Parameters**: - - `id`: ID of the user. -- **Responses**: - - - **200**: Profile found - ```json - { - "_id": "hexstring", - "displayName": "string", - "custom": Any - } - ``` - - **404**: Profile not found - - **500**: Server error - -The response is a projection of the full user object. The public profile is available to all users and serialized into this response with whatever the user has chosen to share. The `custom` field is not an actual property - it is a placeholder for any additional fields the user has added to their profile. The `displayName` and `_id` fields are always present. - ---- - -### 5. **Layers** - -#### `POST /project/:projectId/layer` 🔐 - -- **Description**: Create a new layer within a project. -- **Parameters**: - - `projectId`: ID of the project. -- **Request Body**: - - ```json - { - "label": "string", - "canvases": ["string"] - } - ``` - -- **Responses**: - - - **201**: Layer created successfully - ```json - { - "id": "string", - "label": "string", - "pages": ["string"] - } - ``` - - **400**: Invalid input - - **404**: Project not found - - **401**: Unauthorized - - **500**: Server error - -Note that requests without at least one canvas are considered invalid. - -#### `PUT /project/:projectId/layer/:layerId` 🔐 - -- **Description**: Update an existing layer within a project. -- **Parameters**: - - `projectId`: ID of the project. - - `layerId`: ID of the layer. -- **Request Body**: - - ```json - { - "label": "string", - "canvases": ["string"] - } - ``` - -- **Responses**: - - - **200**: Layer updated successfully - ```json - { - "id": "string", - "label": "string", - "pages": ["string"] - } - ``` - - **400**: Invalid input - - **404**: Layer or project not found - - **401**: Unauthorized - - **500**: Server error - -Note that you may not empty the canvases of an existing layer. If the `canvases` property is an empty array the request will be treated as if it did not contain the `canvases` property at all. - -#### `GET /project/:projectId/layer/:layerId` - -- **Description**: Get an existing layer within a project. -- **Parameters**: - - `projectId`: ID of the project. - - `layerId`: ID of the layer. - -- **Responses**: - - - **200**: Layer found - ```json - { - "@context": "string", - "id": "string", - "type": "AnnotationCollection", - "label": { - "none":[ - "TPEN3 Layer" - ] - }, - "total": "integer", - "first": "string", - "last": "string" - } - ``` - - **500**: Server error - -#### `GET /project/:projectId/layer/:layerId/page/:pageid` -#### `GET /project/:projectId/page/:pageid` - -- **Description**: Get an existing page within a project. -- **Parameters**: - - `projectId`: ID of the project. - - `layerId`: Optional. ID of the layer. - - `pageId`: The ID of the page. - -- **Responses**: - - - **200**: Page found - ```json - { - "@context": "string", - "id": "string", - "type": "AnnotationPage", - "label": { - "none":[ - "TPEN3 Page" - ] - }, - "target": "string", - "items":[ {"type": "Canvas"} ], - "prev": "string", - "next": "string" - } - ``` - - **500**: Server error - -#### `GET /project/:projectId/page/:pageid/resolved` - -- **Description**: Get a fully resolved page with complete annotation data from RERUM. This endpoint resolves all annotation references in the page's items array by fetching the full annotation objects from RERUM which will include the Annotation body. -- **Parameters**: - - `projectId`: ID of the project. - - `pageId`: The ID of the page. - -- **Responses**: - - - **200**: Page found with fully resolved annotations - ```json - { - "@context": "http://www.w3.org/ns/anno.jsonld", - "id": "string", - "type": "AnnotationPage", - "label": { - "none":[ - "TPEN3 Page" - ] - }, - "target": "string", - "items": [ - { - "@context": "http://iiif.io/api/presentation/3/context.json", - "id": "string", - "type": "Annotation", - "motivation": "transcribing", - "target": { - "source": "string", - "type": "SpecificResource", - "selector": { - "type": "FragmentSelector", - "value": "string" - } - }, - "creator": "string", - "body": { - "type": "TextualBody", - "value": "string", - "format": "text/plain" - }, - "_createdAt": "timestamp", - "_modifiedAt": "timestamp", - "__rerum": { - "@context": "http://store.rerum.io/v1/context.json", - "createdAt": "timestamp", - "isOverwritten": "string" - } - } - ], - "partOf": [{"type":"Collection"}], - "prev": "string", - "next": "string", - "_createdAt": "timestamp", - "_modifiedAt": "timestamp" - } - ``` - - **404**: Page not found - - **500**: Server error - -**Note**: This endpoint is useful when you need complete annotation data in a single request instead of making multiple API calls to fetch individual annotations from RERUM. The annotations are resolved in parallel for better performance. diff --git a/__tests__/mount.test.js b/__tests__/mount.test.js index f21686a1..38dde54d 100644 --- a/__tests__/mount.test.js +++ b/__tests__/mount.test.js @@ -87,14 +87,10 @@ function routeExists(path, method = null) { describe('Check to see that all expected route patterns exist. #exists_unit', () => { - describe('Root and API routes', () => { + describe('Root routes', () => { it('GET / -- root index route', () => { expect(routeExists('/', 'get')).toBe(true) }) - - it('GET /api -- API documentation route', () => { - expect(routeExists('/api', 'get')).toBe(true) - }) }) describe('Private user routes (/my)', () => { @@ -343,7 +339,6 @@ describe('Check to see that critical repo files are present #exists_unit', () => expect(fs.existsSync(filePath+"CODEOWNERS")).toBeTruthy() expect(fs.existsSync(filePath+"CONTRIBUTING.md")).toBeTruthy() expect(fs.existsSync(filePath+"README.md")).toBeTruthy() - expect(fs.existsSync(filePath+"API.md")).toBeTruthy() expect(fs.existsSync(filePath+"LICENSE.md")).toBeTruthy() expect(fs.existsSync(filePath+".gitignore")).toBeTruthy() expect(fs.existsSync(filePath+"package.json")).toBeTruthy() diff --git a/index.js b/index.js index 40eefb70..a7246d34 100644 --- a/index.js +++ b/index.js @@ -16,32 +16,6 @@ export function respondWithHTML(res) { res.status(200).sendFile('index.html').end() } -import { JSDOM } from 'jsdom' -import DOMPurify from 'dompurify' - -const window = new JSDOM('').window -const purify = DOMPurify(window) - -import fs from 'fs' -import { marked } from 'marked' - -marked.use({ - gfm: true, -}) - -router - .route("/api") - .get(function (_req,res) { - fs.readFile('API.md', 'utf8', (err, data) => { - if (err) { - return respondWithError(res, 500, 'Failed to read API.md') - } - res.format({ - html: () => res.send(makeCleanFileFromMarkdown(data)) - }) - }) - }) - router .route("/") .get(function (_req, res, next) { @@ -52,27 +26,3 @@ router }) export { router as default } - -function makeCleanFileFromMarkdown(file) { - const sanitizedContent = purify.sanitize(marked.parse(file)) - return ` - - - - - - - API Documentation - - - - - - -
- ${sanitizedContent} -
- - - ` -} diff --git a/package-lock.json b/package-lock.json index f369b697..11c13d2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,15 +13,12 @@ "cookie-parser": "^1.4.7", "cors": "^2.8.6", "debug": "^4.4.3", - "dompurify": "^3.3.3", "dotenv": "^17.3.1", "express": "^5.2.1", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "^1.7.4", "image-size": "^2.0.2", - "jsdom": "27.0.0", "mariadb": "^3.5.2", - "marked": "^17.0.4", "mime-types": "^3.0.2", "mongodb": "^7.1.0", "morgan": "^1.10.1", @@ -40,34 +37,6 @@ "npm": ">=11.0.0" } }, - "node_modules/@asamuzakjp/dom-selector": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.8.1.tgz", - "integrity": "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ==", - "license": "MIT", - "dependencies": { - "@asamuzakjp/nwsapi": "^2.3.9", - "bidi-js": "^1.0.3", - "css-tree": "^3.1.0", - "is-potential-custom-element-name": "^1.0.1", - "lru-cache": "^11.2.6" - } - }, - "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": { - "version": "11.2.6", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", - "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", - "license": "BlueOak-1.0.0", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@asamuzakjp/nwsapi": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz", - "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==", - "license": "MIT" - }, "node_modules/@babel/code-frame": { "version": "7.29.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", @@ -564,22 +533,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@csstools/css-syntax-patches-for-csstree": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.0.tgz", - "integrity": "sha512-H4tuz2nhWgNKLt1inYpoVCfbJbMwX/lQKp3g69rrrIMIYlFD9+zTykOKhNR8uGrAmbS/kT9n6hTFkmDkxLgeTA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT-0" - }, "node_modules/@emnapi/core": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz", @@ -1331,13 +1284,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/trusted-types": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "license": "MIT", - "optional": true - }, "node_modules/@types/webidl-conversions": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", @@ -1483,9 +1429,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1500,9 +1443,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1517,9 +1457,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1534,9 +1471,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1551,9 +1485,6 @@ "riscv64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1568,9 +1499,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1585,9 +1513,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1602,9 +1527,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1690,15 +1612,6 @@ "node": ">= 0.6" } }, - "node_modules/agent-base": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", - "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -1926,15 +1839,6 @@ "node": ">= 0.8" } }, - "node_modules/bidi-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", - "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==", - "license": "MIT", - "dependencies": { - "require-from-string": "^2.0.2" - } - }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -2451,194 +2355,6 @@ "node": ">= 8" } }, - "node_modules/css-tree": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz", - "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==", - "license": "MIT", - "dependencies": { - "mdn-data": "2.27.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" - } - }, - "node_modules/cssstyle": { - "version": "5.3.7", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.7.tgz", - "integrity": "sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ==", - "license": "MIT", - "dependencies": { - "@asamuzakjp/css-color": "^4.1.1", - "@csstools/css-syntax-patches-for-csstree": "^1.0.21", - "css-tree": "^3.1.0", - "lru-cache": "^11.2.4" - }, - "engines": { - "node": ">=20" - } - }, - "node_modules/cssstyle/node_modules/@asamuzakjp/css-color": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz", - "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==", - "license": "MIT", - "dependencies": { - "@csstools/css-calc": "^2.1.3", - "@csstools/css-color-parser": "^3.0.9", - "@csstools/css-parser-algorithms": "^3.0.4", - "@csstools/css-tokenizer": "^3.0.3", - "lru-cache": "^10.4.3" - } - }, - "node_modules/cssstyle/node_modules/@asamuzakjp/css-color/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "license": "ISC" - }, - "node_modules/cssstyle/node_modules/@csstools/color-helpers": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz", - "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT-0", - "engines": { - "node": ">=18" - } - }, - "node_modules/cssstyle/node_modules/@csstools/css-calc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz", - "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT", - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.5", - "@csstools/css-tokenizer": "^3.0.4" - } - }, - "node_modules/cssstyle/node_modules/@csstools/css-color-parser": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz", - "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT", - "dependencies": { - "@csstools/color-helpers": "^5.1.0", - "@csstools/css-calc": "^2.1.4" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@csstools/css-parser-algorithms": "^3.0.5", - "@csstools/css-tokenizer": "^3.0.4" - } - }, - "node_modules/cssstyle/node_modules/@csstools/css-parser-algorithms": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", - "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT", - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@csstools/css-tokenizer": "^3.0.4" - } - }, - "node_modules/cssstyle/node_modules/@csstools/css-tokenizer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz", - "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/csstools" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/csstools" - } - ], - "license": "MIT", - "engines": { - "node": ">=18" - } - }, - "node_modules/cssstyle/node_modules/lru-cache": { - "version": "11.2.6", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", - "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", - "license": "BlueOak-1.0.0", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/data-urls": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.1.tgz", - "integrity": "sha512-euIQENZg6x8mj3fO6o9+fOW8MimUI4PpD/fZBhJfeioZVy9TUpM4UY7KjQNVZFlqwJ0UdzRDzkycB997HEq1BQ==", - "license": "MIT", - "dependencies": { - "whatwg-mimetype": "^5.0.0", - "whatwg-url": "^15.1.0" - }, - "engines": { - "node": ">=20" - } - }, - "node_modules/data-urls/node_modules/whatwg-mimetype": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", - "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==", - "license": "MIT", - "engines": { - "node": ">=20" - } - }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -2656,12 +2372,6 @@ } } }, - "node_modules/decimal.js": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", - "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", - "license": "MIT" - }, "node_modules/dedent": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz", @@ -2746,15 +2456,6 @@ "node": ">=0.3.1" } }, - "node_modules/dompurify": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.3.tgz", - "integrity": "sha512-Oj6pzI2+RqBfFG+qOaOLbFXLQ90ARpcGG6UePL82bJLtdsa6CYJD7nmiU8MW9nQNOtCHV3lZ/Bzq1X0QYbBZCA==", - "license": "(MPL-2.0 OR Apache-2.0)", - "optionalDependencies": { - "@types/trusted-types": "^2.0.7" - } - }, "node_modules/dotenv": { "version": "17.3.1", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz", @@ -2830,18 +2531,6 @@ "node": ">= 0.8" } }, - "node_modules/entities": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", - "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/error-ex": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", @@ -3459,18 +3148,6 @@ "node": ">= 0.4" } }, - "node_modules/html-encoding-sniffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", - "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", - "license": "MIT", - "dependencies": { - "whatwg-encoding": "^3.1.1" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", @@ -3498,32 +3175,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/https-proxy-agent": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -3699,12 +3350,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "license": "MIT" - }, "node_modules/is-promise": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", @@ -4453,45 +4098,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsdom": { - "version": "27.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.0.0.tgz", - "integrity": "sha512-lIHeR1qlIRrIN5VMccd8tI2Sgw6ieYXSVktcSHaNe3Z5nE/tcPQYQWOq00wxMvYOsz+73eAkNenVvmPC6bba9A==", - "license": "MIT", - "dependencies": { - "@asamuzakjp/dom-selector": "^6.5.4", - "cssstyle": "^5.3.0", - "data-urls": "^6.0.0", - "decimal.js": "^10.5.0", - "html-encoding-sniffer": "^4.0.0", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.6", - "is-potential-custom-element-name": "^1.0.1", - "parse5": "^7.3.0", - "rrweb-cssom": "^0.8.0", - "saxes": "^6.0.0", - "symbol-tree": "^3.2.4", - "tough-cookie": "^6.0.0", - "w3c-xmlserializer": "^5.0.0", - "webidl-conversions": "^8.0.0", - "whatwg-encoding": "^3.1.1", - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^15.0.0", - "ws": "^8.18.2", - "xml-name-validator": "^5.0.0" - }, - "engines": { - "node": ">=20" - }, - "peerDependencies": { - "canvas": "^3.0.0" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } - } - }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", @@ -4632,18 +4238,6 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, - "node_modules/marked": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/marked/-/marked-17.0.4.tgz", - "integrity": "sha512-NOmVMM+KAokHMvjWmC5N/ZOvgmSWuqJB8FoYI019j4ogb/PeRMKoKIjReZ2w3376kkA8dSJIP8uD993Kxc0iRQ==", - "license": "MIT", - "bin": { - "marked": "bin/marked.js" - }, - "engines": { - "node": ">= 20" - } - }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -4653,12 +4247,6 @@ "node": ">= 0.4" } }, - "node_modules/mdn-data": { - "version": "2.27.1", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz", - "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==", - "license": "CC0-1.0" - }, "node_modules/media-typer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", @@ -5256,18 +4844,6 @@ "license": "MIT", "optional": true }, - "node_modules/parse5": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", - "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", - "license": "MIT", - "dependencies": { - "entities": "^6.0.0" - }, - "funding": { - "url": "https://github.com/inikulin/parse5?sponsor=1" - } - }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -5540,15 +5116,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/resolve-cwd": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", @@ -5588,12 +5155,6 @@ "node": ">= 18" } }, - "node_modules/rrweb-cssom": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", - "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==", - "license": "MIT" - }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -5606,18 +5167,6 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, - "node_modules/saxes": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", - "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", - "license": "ISC", - "dependencies": { - "xmlchars": "^2.2.0" - }, - "engines": { - "node": ">=v12.22.7" - } - }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -5851,15 +5400,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-support": { "version": "0.5.13", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", @@ -6149,12 +5689,6 @@ "license": "ISC", "optional": true }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "license": "MIT" - }, "node_modules/synckit": { "version": "0.11.12", "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz", @@ -6232,24 +5766,6 @@ "node": "*" } }, - "node_modules/tldts": { - "version": "7.0.25", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.25.tgz", - "integrity": "sha512-keinCnPbwXEUG3ilrWQZU+CqcTTzHq9m2HhoUP2l7Xmi8l1LuijAXLpAJ5zRW+ifKTNscs4NdCkfkDCBYm352w==", - "license": "MIT", - "dependencies": { - "tldts-core": "^7.0.25" - }, - "bin": { - "tldts": "bin/cli.js" - } - }, - "node_modules/tldts-core": { - "version": "7.0.25", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.25.tgz", - "integrity": "sha512-ZjCZK0rppSBu7rjHYDYsEaMOIbbT+nWF57hKkv4IUmZWBNrBWBOjIElc0mKRgLM8bm7x/BBlof6t2gi/Oq/Asw==", - "license": "MIT" - }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -6289,34 +5805,10 @@ "nodetouch": "bin/nodetouch.js" } }, - "node_modules/tough-cookie": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz", - "integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==", - "license": "BSD-3-Clause", - "dependencies": { - "tldts": "^7.0.5" - }, - "engines": { - "node": ">=16" - } - }, "node_modules/tpen3-services": { "resolved": "", "link": true }, - "node_modules/tr46": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz", - "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==", - "license": "MIT", - "dependencies": { - "punycode": "^2.3.1" - }, - "engines": { - "node": ">=20" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -6474,18 +5966,6 @@ "node": ">= 0.8" } }, - "node_modules/w3c-xmlserializer": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", - "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", - "license": "MIT", - "dependencies": { - "xml-name-validator": "^5.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/walker": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", @@ -6496,62 +5976,6 @@ "makeerror": "1.0.12" } }, - "node_modules/webidl-conversions": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz", - "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=20" - } - }, - "node_modules/whatwg-encoding": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", - "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", - "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation", - "license": "MIT", - "dependencies": { - "iconv-lite": "0.6.3" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/whatwg-encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/whatwg-mimetype": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", - "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", - "license": "MIT", - "engines": { - "node": ">=18" - } - }, - "node_modules/whatwg-url": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz", - "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==", - "license": "MIT", - "dependencies": { - "tr46": "^6.0.0", - "webidl-conversions": "^8.0.0" - }, - "engines": { - "node": ">=20" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -6683,42 +6107,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/ws": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", - "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xml-name-validator": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", - "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", - "license": "Apache-2.0", - "engines": { - "node": ">=18" - } - }, - "node_modules/xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "license": "MIT" - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/package.json b/package.json index cdc26259..4e9c8b3b 100644 --- a/package.json +++ b/package.json @@ -37,15 +37,12 @@ "cookie-parser": "^1.4.7", "cors": "^2.8.6", "debug": "^4.4.3", - "dompurify": "^3.3.3", "dotenv": "^17.3.1", "express": "^5.2.1", "express-list-endpoints": "^7.1.1", "express-oauth2-jwt-bearer": "^1.7.4", "image-size": "^2.0.2", - "jsdom": "27.0.0", "mariadb": "^3.5.2", - "marked": "^17.0.4", "mime-types": "^3.0.2", "mongodb": "^7.1.0", "morgan": "^1.10.1", diff --git a/public/API.html b/public/API.html index 3b2b4d40..1c0ea621 100644 --- a/public/API.html +++ b/public/API.html @@ -686,7 +686,7 @@

GET/project/:projectId/page/:pageid

-

TPEN Services API Documentation | Generated from API.md

+

TPEN Services API Documentation

From 8e5e4baa9989fcde7f779de04f60adea8d48bf6f Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:44:56 -0500 Subject: [PATCH 258/262] Eliminate redundant project DB fetches across route handlers (#478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Initial plan * initial plan: eliminate redundant project data queries Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * eliminate redundant project data queries across route handlers - Add optional `project` param to `findPageById()` and `findLayerById()` in shared.js so callers with a pre-loaded project can skip the redundant DB fetch - Pass pre-loaded `project` to `findLayerById()` and `findPageById()` in layer/index.js - Pass pre-loaded `project` to `findPageById()` in page/index.js PUT /:pageId - Pass pre-loaded `project` to `findPageById()` in line/index.js (POST, PUT, PATCH×2) - Use `project.data` directly in customMetadataRouter.js GET/POST/PUT /:id/custom instead of calling `database.findOne()` again after `checkUserAccess()` already loaded it - Restructure projectReadRouter.js GET /:id to call `loadAsUser()` once and derive the access check from its result via new `userHasAccess()` helper (saves project+group load) - Remove redundant `loadAsUser()` call in projectReadRouter.js GET /:id/manifest; use `project.data` from `checkUserAccess()` for the existence check instead - Add optional `preloadedProjectData` param to `ProjectFactory.exportManifest()` so callers with already-loaded data skip the internal `loadAsUser()` fetch Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * address code review: add Array.isArray guard in userHasAccess, add comment on loadAsUser error pattern Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> * no package lock changes * changes during review * changes during review * Changes during review * Changes during review --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: thehabes <3287006+thehabes@users.noreply.github.com> Co-authored-by: Bryan Haberberger --- classes/Project/ProjectFactory.js | 10 +++++-- layer/index.js | 4 +-- line/index.js | 8 ++--- page/index.js | 2 +- project/customMetadataRouter.js | 11 ++++--- project/projectReadRouter.js | 50 ++++++++++++++++++++++++++----- utilities/shared.js | 8 ++--- 7 files changed, 65 insertions(+), 28 deletions(-) diff --git a/classes/Project/ProjectFactory.js b/classes/Project/ProjectFactory.js index 9e6b9213..ad7f2b71 100644 --- a/classes/Project/ProjectFactory.js +++ b/classes/Project/ProjectFactory.js @@ -729,6 +729,7 @@ export default class ProjectFactory { * manifest data is assembled, and the final JSON is saved to the filesystem. * * @param {string} projectId - Project ID for a specific project. + * @param {Object|null} preloadedProjectData - Pre-loaded project data to avoid a redundant DB query. Falls back to loadAsUser() if null. * @returns {Object} - Returns the assembled IIIF manifest object. * * The manifest follows the IIIF Presentation API 3.0 specification and includes: @@ -736,12 +737,15 @@ export default class ProjectFactory { * - A dynamically fetched list of manifest items, including canvases and their annotations. * - All elements are embedded in the manifest object. */ - static async exportManifest(projectId) { + static async exportManifest(projectId, preloadedProjectData = null) { if (!projectId) { throw { status: 400, message: "No project ID provided" } } - const project = await ProjectFactory.loadAsUser(projectId, null) + const project = preloadedProjectData ?? await ProjectFactory.loadAsUser(projectId, null) + if (!project || project instanceof Error) { + throw { status: project?.status || 404, message: project?.message || `No project found with ID '${projectId}'` } + } const manifestJson = await this.fetchJson(project.manifest[0]) const manifest = { @@ -1003,7 +1007,7 @@ export default class ProjectFactory { }, { $set: { - roles: { $mergeObjects: [{ $ifNull: ['$thisGroup.customRoles', {}] }, Group.defaultRoles] }, + roles: { $mergeObjects: [Group.defaultRoles, { $ifNull: ['$thisGroup.customRoles', {}] }] }, } }, { diff --git a/layer/index.js b/layer/index.js index f91b666a..fef114f8 100644 --- a/layer/index.js +++ b/layer/index.js @@ -42,7 +42,7 @@ router.route('/:layerId') return respondWithError(res, 403, 'You do not have permission to update this layer') } if (!project?.data) return respondWithError(res, 404, `Project ${projectId} was not found`) - const layer = await findLayerById(layerId, projectId) + const layer = await findLayerById(layerId, projectId, project) // Only update top-level properties that are present in the request Object.keys(update ?? {}).forEach(key => { layer[key] = update[key] @@ -56,7 +56,7 @@ router.route('/:layerId') }) let pages = [] if (providedPages && Array.isArray(providedPages) && providedPages.length > 0) { - pages = await Promise.all(providedPages.map(p => findPageById(p.split("/").pop(), projectId) )) + pages = await Promise.all(providedPages.map(p => findPageById(p.split("/").pop(), projectId, project) )) layer.pages = pages } await updateLayerAndProject(layer, project, user._id) diff --git a/line/index.js b/line/index.js index 43b1ff35..724e54b4 100644 --- a/line/index.js +++ b/line/index.js @@ -56,7 +56,7 @@ router.post('/', auth0Middleware(), async (req, res) => { return respondWithError(res, 403, 'You do not have permission to create lines in this project') } if (!project?.data) return respondWithError(res, 404, `Project ${req.params.projectId} was not found`) - const page = await findPageById(req.params.pageId, req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId, project) if (!req.body || (Array.isArray(req.body) && req.body.length === 0)) { return respondWithError(res, 400, "Request body with line data is required") @@ -120,7 +120,7 @@ router.put('/:lineId', auth0Middleware(), screenContentMiddleware(), async (req, return respondWithError(res, 403, 'You do not have permission to update lines in this project') } if (!project?.data) return respondWithError(res, 404, `Project ${req.params.projectId} was not found`) - const page = await findPageById(req.params.pageId, req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId, project) let oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) @@ -202,7 +202,7 @@ router.patch('/:lineId/text', auth0Middleware(), screenContentMiddleware(), asyn if (typeof req.body !== 'string') { return respondWithError(res, 400, 'Invalid request body. Expected a string.') } - const page = await findPageById(req.params.pageId, req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId, project) const oldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!oldLine) { return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) @@ -282,7 +282,7 @@ router.patch('/:lineId/bounds', auth0Middleware(), async (req, res) => { return respondWithError(res, 400, 'Invalid request body. Expected an object with x, y, w, and h as non-negative integers.') } const bounds = { x: parseInt(req.body.x, 10), y: parseInt(req.body.y, 10), w: parseInt(req.body.w, 10), h: parseInt(req.body.h, 10) } - const page = await findPageById(req.params.pageId, req.params.projectId) + const page = await findPageById(req.params.pageId, req.params.projectId, project) const findOldLine = page.items?.find(l => l.id.split('/').pop() === req.params.lineId?.split('/').pop()) if (!findOldLine) { return respondWithError(res, 404, `Line with ID '${req.params.lineId}' not found in page '${req.params.pageId}'`) diff --git a/page/index.js b/page/index.js index 012e6de1..da2d61a9 100644 --- a/page/index.js +++ b/page/index.js @@ -91,7 +91,7 @@ router.route('/:pageId') try { if (hasSuspiciousPageData(req.body)) return respondWithError(res, 400, "Suspicious page data will not be processed.") // Find the page object - const page = await findPageById(pageId, projectId) + const page = await findPageById(pageId, projectId, project) page.creator = user.agent.split('/').pop() page.partOf = layerId diff --git a/project/customMetadataRouter.js b/project/customMetadataRouter.js index d232d351..3609bd8d 100644 --- a/project/customMetadataRouter.js +++ b/project/customMetadataRouter.js @@ -90,8 +90,7 @@ router.route("/:id/custom").get(auth0Middleware(), async (req, res) => { return respondWithError(res, 403, "You do not have permission to read this project's metadata") } - // Fetch the project from database - const projectData = await database.findOne({ _id: id }, "projects") + const projectData = project.data if (!projectData) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) @@ -139,8 +138,8 @@ router.route("/:id/custom").post(auth0Middleware(), async (req, res) => { // Get namespace from request origin const namespace = getNamespaceFromOrigin(req) - // Fetch the full project data - const projectData = await database.findOne({ _id: id }, "projects") + // Use the already-loaded project data + const projectData = project.data if (!projectData) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) @@ -195,8 +194,8 @@ router.route("/:id/custom").put(auth0Middleware(), async (req, res) => { // Get namespace from request origin const namespace = getNamespaceFromOrigin(req) - // Fetch the full project data - const projectData = await database.findOne({ _id: id }, "projects") + // Use the already-loaded project data + const projectData = project.data if (!projectData) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) diff --git a/project/projectReadRouter.js b/project/projectReadRouter.js index 60cb9bf5..e82a7d06 100644 --- a/project/projectReadRouter.js +++ b/project/projectReadRouter.js @@ -92,6 +92,37 @@ function filterProjectInterfaces(project, namespaces) { } } +/** + * Check whether a user has the required access on a project loaded via ProjectFactory.loadAsUser(). + * This avoids a second database round-trip when the project data (with collaborators/roles) is + * already available from the loadAsUser aggregation result. + * + * @param {Object} projectData - The project object returned by ProjectFactory.loadAsUser() + * @param {string} userId - The user ID to check + * @param {string} action - Required action (e.g. ACTIONS.READ) + * @param {string} scope - Required scope (e.g. SCOPES.ALL) + * @param {string} entity - Required entity (e.g. ENTITIES.PROJECT) + * @returns {boolean} + */ +function userHasAccess(projectData, userId, action, scope, entity) { + const userRoleNames = projectData?.collaborators?.[userId]?.roles + if (!userRoleNames || !Array.isArray(userRoleNames)) return false + const rolePermissions = projectData.roles ?? {} + return userRoleNames.some(role => { + let perms = rolePermissions[role] + if (!perms) return false + // Custom roles may store permissions as a space-delimited string + if (typeof perms === 'string') perms = perms.split(' ') + if (!Array.isArray(perms)) return false + return perms.some(perm => { + const [permAction, permScope, permEntity] = perm.split("_") + return (permAction === action || permAction === "*") && + (permScope === scope || permScope === "*") && + (permEntity === entity || permEntity === "*") + }) + }) +} + router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { const { id } = req.params @@ -100,14 +131,14 @@ router.route("/:id/manifest").get(auth0Middleware(), async (req, res) => { if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") try { - if (!await new Project(id).checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PROJECT)) { + const project = new Project(id) + if (!await project.checkUserAccess(user._id, ACTIONS.UPDATE, SCOPES.ALL, ENTITIES.PROJECT)) { return respondWithError(res, 403, "You do not have permission to export this project") } - const project = await ProjectFactory.loadAsUser(id, null) - if (!project) { + if (!project.data) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) } - const manifest = await ProjectFactory.exportManifest(id) + const manifest = await ProjectFactory.exportManifest(id, project.data) await ProjectFactory.uploadFileToGitHub(manifest, `${id}`) res.status(200).json(manifest) } catch (error) { @@ -158,14 +189,17 @@ router.route("/:id").get(auth0Middleware(), async (req, res) => { if (!id) return respondWithError(res, 400, "No TPEN3 ID provided") if (!validateID(id)) return respondWithError(res, 400, "The TPEN3 project ID provided is invalid") try { - const project = new Project(id) - if (!(await project.checkUserAccess(user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT))) { - return respondWithError(res, 403, "You do not have permission to view this project") - } + // loadAsUser() returns an Error object (not throws) on DB failure const projectData = await ProjectFactory.loadAsUser(id, user._id) + if (projectData instanceof Error) { + return respondWithError(res, projectData.status || 500, projectData.message ?? "An error occurred while fetching the project data.") + } if (!projectData) { return respondWithError(res, 404, `No TPEN3 project with ID '${id}' found`) } + if (!userHasAccess(projectData, user._id, ACTIONS.READ, SCOPES.ALL, ENTITIES.PROJECT)) { + return respondWithError(res, 403, "You do not have permission to view this project") + } // Filter interfaces based on origin and query parameters const namespacesToInclude = getNamespacesToInclude(req) diff --git a/utilities/shared.js b/utilities/shared.js index e2ff2441..096182e2 100644 --- a/utilities/shared.js +++ b/utilities/shared.js @@ -252,8 +252,8 @@ export const getLayerContainingPage = (project, pageId) => { } // Find a page by ID (moved from page/index.js) -export async function findPageById(pageId, projectId) { - const projectData = (await Project.getById(projectId))?.data +export async function findPageById(pageId, projectId, project = null) { + const projectData = project?.data ?? (await Project.getById(projectId))?.data if (!projectData) { const error = new Error(`Project ${projectId} was not found`) error.status = 404 @@ -279,8 +279,8 @@ export async function findPageById(pageId, projectId) { return new Page(layerContainingPage.id, page) } -export async function findLayerById(layerId, projectId) { - const p = await Project.getById(projectId) +export async function findLayerById(layerId, projectId, project = null) { + const p = project?.data ? project : await Project.getById(projectId) if (!p?.data) { const error = new Error(`Project ${projectId} was not found`) error.status = 404 From 495c3f70efe682ba3810f6e687742f39947459fe Mon Sep 17 00:00:00 2001 From: Patrick Cuba Date: Wed, 25 Mar 2026 12:53:11 -0500 Subject: [PATCH 259/262] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- classes/Column/Column.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Column/Column.js b/classes/Column/Column.js index addc85d0..019e8a79 100644 --- a/classes/Column/Column.js +++ b/classes/Column/Column.js @@ -122,7 +122,7 @@ export default class Column { if (!projectId || typeof projectId !== 'string') { throw new Error('projectId must be a non-empty string') } - if (!label || typeof label !== 'string' || label.trim().length === 0) { + if (typeof label !== 'string' || label.trim().length === 0) { throw new Error('label must be a non-empty string') } if (!Array.isArray(annotations)) { From 2a22e9c8a17a03a6c1145be13b8e987ad933a4f2 Mon Sep 17 00:00:00 2001 From: cubap Date: Thu, 26 Mar 2026 11:04:24 -0500 Subject: [PATCH 260/262] adding versioning --- .github/workflows/cd_dev.yaml | 1 + .github/workflows/cd_prod.yaml | 1 + package.json | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index c8b42fa9..ec9780f6 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -79,6 +79,7 @@ jobs: git stash git checkout development git pull + npm version prerelease --preid=alpha --no-git-tag-version npm install pm2 start ecosystem.config.json --env development --cwd . - name: Wait for service to be ready diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 7650f506..72d04400 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -79,6 +79,7 @@ jobs: git stash git checkout main git pull + npm version prerelease --preid=alpha npm install pm2 start ecosystem.config.json --env production --cwd . - name: Wait for service to be ready diff --git a/package.json b/package.json index 4e9c8b3b..b9256ccc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tpen3-services", - "version": "0.0.0", + "version": "0.1.0-alpha.0", "description": "TPEN3 Services for data interaction.", "type": "module", "keywords": [ From 7970f586c538c742c9c40498009e6d2ca19285dd Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 27 Mar 2026 09:37:15 -0500 Subject: [PATCH 261/262] f --- .github/workflows/cd_dev.yaml | 1 - .github/workflows/cd_prod.yaml | 2 -- .github/workflows/ci_dev.yaml | 10 ++++++++++ .github/workflows/ci_prod.yaml | 10 ++++++++++ package-lock.json | 4 ++-- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index ec9780f6..c8b42fa9 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -79,7 +79,6 @@ jobs: git stash git checkout development git pull - npm version prerelease --preid=alpha --no-git-tag-version npm install pm2 start ecosystem.config.json --env development --cwd . - name: Wait for service to be ready diff --git a/.github/workflows/cd_prod.yaml b/.github/workflows/cd_prod.yaml index 30403417..7650f506 100644 --- a/.github/workflows/cd_prod.yaml +++ b/.github/workflows/cd_prod.yaml @@ -79,8 +79,6 @@ jobs: git stash git checkout main git pull - npm version minor --no-git-tag-version - npm version prerelease --preid=alpha npm install pm2 start ecosystem.config.json --env production --cwd . - name: Wait for service to be ready diff --git a/.github/workflows/ci_dev.yaml b/.github/workflows/ci_dev.yaml index 0ce4cf78..67b74383 100644 --- a/.github/workflows/ci_dev.yaml +++ b/.github/workflows/ci_dev.yaml @@ -51,4 +51,14 @@ jobs: run: | npm install npm run E2Etests + + - name: Bump version (patch + prerelease) + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + npm version patch --no-git-tag-version + npm version prerelease --preid=alpha + git add package.json package-lock.json || true + git commit -m "ci: bump version (patch+prerelease) [skip ci]" || echo "No changes to commit" + git push origin HEAD:development || echo "No changes to push" diff --git a/.github/workflows/ci_prod.yaml b/.github/workflows/ci_prod.yaml index e1fe40d3..4a945cb5 100644 --- a/.github/workflows/ci_prod.yaml +++ b/.github/workflows/ci_prod.yaml @@ -51,4 +51,14 @@ jobs: run: | npm install npm run E2Etests + + - name: Bump version (minor + prerelease) + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + npm version minor --no-git-tag-version + npm version prerelease --preid=alpha + git add package.json package-lock.json || true + git commit -m "ci: bump version (minor+prerelease) [skip ci]" || echo "No changes to commit" + git push origin HEAD:main || echo "No changes to push" diff --git a/package-lock.json b/package-lock.json index 11c13d2e..e319b9f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tpen3-services", - "version": "0.0.0", + "version": "0.1.0-alpha.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tpen3-services", - "version": "0.0.0", + "version": "0.1.0-alpha.0", "license": "CC-BY", "dependencies": { "@iiif/helpers": "^1.5.8", From fd059473647cab90e61807483afa0f619a56b721 Mon Sep 17 00:00:00 2001 From: cubap Date: Fri, 27 Mar 2026 09:47:39 -0500 Subject: [PATCH 262/262] Add --no-git-tag-version to prerelease step Prevent npm from creating git tags during CI prerelease bumps by adding `--no-git-tag-version` to the `npm version prerelease --preid=alpha` commands in .github/workflows/ci_dev.yaml and .github/workflows/ci_prod.yaml. This aligns the prerelease step with the existing patch/minor no-tag behavior and avoids unintended tags from CI. --- .github/workflows/ci_dev.yaml | 2 +- .github/workflows/ci_prod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_dev.yaml b/.github/workflows/ci_dev.yaml index 67b74383..915f1403 100644 --- a/.github/workflows/ci_dev.yaml +++ b/.github/workflows/ci_dev.yaml @@ -57,7 +57,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" npm version patch --no-git-tag-version - npm version prerelease --preid=alpha + npm version prerelease --preid=alpha --no-git-tag-version git add package.json package-lock.json || true git commit -m "ci: bump version (patch+prerelease) [skip ci]" || echo "No changes to commit" git push origin HEAD:development || echo "No changes to push" diff --git a/.github/workflows/ci_prod.yaml b/.github/workflows/ci_prod.yaml index 4a945cb5..3b66631b 100644 --- a/.github/workflows/ci_prod.yaml +++ b/.github/workflows/ci_prod.yaml @@ -57,7 +57,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" npm version minor --no-git-tag-version - npm version prerelease --preid=alpha + npm version prerelease --preid=alpha --no-git-tag-version git add package.json package-lock.json || true git commit -m "ci: bump version (minor+prerelease) [skip ci]" || echo "No changes to commit" git push origin HEAD:main || echo "No changes to push"