arkos 1.8.0-canary.21 → 1.8.0-canary.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/modules/base/base.middlewares.js +5 -6
- package/dist/cjs/modules/base/base.middlewares.js.map +1 -1
- package/dist/cjs/modules/file-upload/utils/helpers/serve-upload-dir.js +11 -30
- package/dist/cjs/modules/file-upload/utils/helpers/serve-upload-dir.js.map +1 -1
- package/dist/cjs/modules/file-upload/utils/helpers/upload-serving-validation.js +42 -1
- package/dist/cjs/modules/file-upload/utils/helpers/upload-serving-validation.js.map +1 -1
- package/dist/cjs/modules/file-upload/utils/helpers/upload-serving.registry.js +8 -0
- package/dist/cjs/modules/file-upload/utils/helpers/upload-serving.registry.js.map +1 -1
- package/dist/cjs/utils/arkos-router/arkos-router-openapi-manager.js +1 -2
- package/dist/cjs/utils/arkos-router/arkos-router-openapi-manager.js.map +1 -1
- package/dist/cjs/utils/arkos-router/index.js +1 -2
- package/dist/cjs/utils/arkos-router/index.js.map +1 -1
- package/dist/cjs/utils/arkos-router/route-config-validator.js +5 -9
- package/dist/cjs/utils/arkos-router/route-config-validator.js.map +1 -1
- package/dist/cjs/utils/arkos-router/types/index.js.map +1 -1
- package/dist/cjs/utils/arkos-router/utils/helpers/apply-arkos-router-proxy.js +7 -1
- package/dist/cjs/utils/arkos-router/utils/helpers/apply-arkos-router-proxy.js.map +1 -1
- package/dist/cjs/utils/cli/utils/cli.helpers.js +1 -1
- package/dist/cjs/utils/helpers/dynamic-loader.helpers.js +1 -2
- package/dist/cjs/utils/helpers/dynamic-loader.helpers.js.map +1 -1
- package/dist/cjs/utils/prisma/prisma-json-schema-generator.js +2 -3
- package/dist/cjs/utils/prisma/prisma-json-schema-generator.js.map +1 -1
- package/dist/esm/modules/base/base.middlewares.js +5 -6
- package/dist/esm/modules/base/base.middlewares.js.map +1 -1
- package/dist/esm/modules/file-upload/utils/helpers/serve-upload-dir.js +13 -32
- package/dist/esm/modules/file-upload/utils/helpers/serve-upload-dir.js.map +1 -1
- package/dist/esm/modules/file-upload/utils/helpers/upload-serving-validation.js +41 -1
- package/dist/esm/modules/file-upload/utils/helpers/upload-serving-validation.js.map +1 -1
- package/dist/esm/modules/file-upload/utils/helpers/upload-serving.registry.js +8 -0
- package/dist/esm/modules/file-upload/utils/helpers/upload-serving.registry.js.map +1 -1
- package/dist/esm/utils/arkos-router/arkos-router-openapi-manager.js +1 -2
- package/dist/esm/utils/arkos-router/arkos-router-openapi-manager.js.map +1 -1
- package/dist/esm/utils/arkos-router/index.js +1 -2
- package/dist/esm/utils/arkos-router/index.js.map +1 -1
- package/dist/esm/utils/arkos-router/route-config-validator.js +5 -6
- package/dist/esm/utils/arkos-router/route-config-validator.js.map +1 -1
- package/dist/esm/utils/arkos-router/types/index.js.map +1 -1
- package/dist/esm/utils/arkos-router/utils/helpers/apply-arkos-router-proxy.js +7 -1
- package/dist/esm/utils/arkos-router/utils/helpers/apply-arkos-router-proxy.js.map +1 -1
- package/dist/esm/utils/cli/utils/cli.helpers.js +1 -1
- package/dist/esm/utils/helpers/dynamic-loader.helpers.js +1 -2
- package/dist/esm/utils/helpers/dynamic-loader.helpers.js.map +1 -1
- package/dist/esm/utils/prisma/prisma-json-schema-generator.js +2 -3
- package/dist/esm/utils/prisma/prisma-json-schema-generator.js.map +1 -1
- package/dist/types/modules/file-upload/utils/helpers/serve-upload-dir.d.ts +6 -10
- package/dist/types/modules/file-upload/utils/helpers/upload-serving-validation.d.ts +6 -0
- package/dist/types/modules/file-upload/utils/helpers/upload-serving.registry.d.ts +7 -0
- package/dist/types/utils/arkos-router/types/index.d.ts +13 -8
- package/package.json +1 -1
|
@@ -21,7 +21,6 @@ const url_helpers_1 = require("../../utils/helpers/url-helpers.js");
|
|
|
21
21
|
const utils_1 = require("../../exports/utils/index.js");
|
|
22
22
|
const validation_manager_1 = __importDefault(require("../../types/validation/validation-manager.js"));
|
|
23
23
|
const dynamic_loader_1 = require("../../utils/dynamic-loader.js");
|
|
24
|
-
const exit_error_1 = __importDefault(require("../../utils/helpers/exit-error.js"));
|
|
25
24
|
function callNext(_, _1, next) {
|
|
26
25
|
next();
|
|
27
26
|
}
|
|
@@ -182,9 +181,9 @@ function validateRequestInputs(routeConfig) {
|
|
|
182
181
|
};
|
|
183
182
|
if (!validationConfig?.resolver &&
|
|
184
183
|
Object.keys(routeConfig.validation || {}).length > 0)
|
|
185
|
-
throw (
|
|
184
|
+
throw Error(`Trying to pass validators into route \"${routeConfig.path}\" config validation option without choosing a validation resolver under arkos config { validation: {} }.`);
|
|
186
185
|
if (validators === true)
|
|
187
|
-
throw (
|
|
186
|
+
throw Error(`Invalid value ${validators} passed to validation option, it can only receive false or object of { query, body, params }.`);
|
|
188
187
|
const validatorsKey = [
|
|
189
188
|
"body",
|
|
190
189
|
"query",
|
|
@@ -198,7 +197,7 @@ function validateRequestInputs(routeConfig) {
|
|
|
198
197
|
key != "body" &&
|
|
199
198
|
openapi.parameters?.some((parameter) => parameter.in === validationToParameterMapping[key]) &&
|
|
200
199
|
validators?.[key]) {
|
|
201
|
-
throw (
|
|
200
|
+
throw Error(`Error in ${routeConfig.path}: when usign validation.${key} you must not define parameters under openapi.parameters as documentation of req.${key} because the ${validatorName} you passed under validation.${key} will be added as jsonSchema into the api documenation, if you wish to define documenation by yourself do not define validation.${key}.
|
|
202
201
|
|
|
203
202
|
Read more about strict validation at https://www.arkosjs.com/docs/guides/validation/setup#strict-mode.
|
|
204
203
|
`);
|
|
@@ -208,11 +207,11 @@ Read more about strict validation at https://www.arkosjs.com/docs/guides/validat
|
|
|
208
207
|
openapi.requestBody &&
|
|
209
208
|
validators?.[key] &&
|
|
210
209
|
key === "body") {
|
|
211
|
-
throw (
|
|
210
|
+
throw Error(`When usign validation.${key} you must not define json-schema under openapi.requestBody as documentation for req.${key}, because the ${validatorName} you passed under validation.${key} will be added as json-schema into the api documenation, if you wish to define documenation by yourself do not define validation.${key}.`);
|
|
212
211
|
}
|
|
213
212
|
if (validators?.[key] &&
|
|
214
213
|
!validation_manager_1.default.isValidator(validators?.[key]))
|
|
215
|
-
throw (
|
|
214
|
+
throw Error(`Your validation resolver is set to ${arkosConfig?.validation?.resolver}, please provide a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } } under route ${routeConfig.path}. Received ${validators?.[key]}`);
|
|
216
215
|
});
|
|
217
216
|
return (0, error_handler_1.catchAsync)(async (req, _, next) => {
|
|
218
217
|
for (const key of validatorsKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.middlewares.js","sourceRoot":"","sources":["../../../../src/modules/base/base.middlewares.ts"],"names":[],"mappings":"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","sourcesContent":["import { NextFunction, Request, Response } from \"express\";\nimport {\n PrismaQueryOptions,\n ArkosNextFunction,\n ArkosRequest,\n ArkosRequestHandler,\n ArkosResponse,\n AuthPrismaQueryOptions,\n} from \"../../types\";\nimport { getArkosConfig } from \"../../server\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport {\n AppError,\n BadRequestError,\n catchAsync,\n} from \"../../exports/error-handler\";\nimport validateDto from \"../../utils/validate-dto\";\nimport validateSchema from \"../../utils/validate-schema\";\nimport { ClassConstructor } from \"class-transformer\";\nimport { ValidatorOptions } from \"class-validator\";\nimport { resolvePrismaQueryOptions } from \"./utils/helpers/base.middlewares.helpers\";\nimport { ArkosRouteConfig } from \"../../utils/arkos-router/types\";\nimport { capitalize } from \"../../utils/helpers/text.helpers\";\nimport errorPrettifier from \"./utils/error-prettifier\";\nimport { lenientDecode } from \"../../utils/helpers/url-helpers\";\nimport { pascalCase } from \"../../exports/utils\";\nimport validationManager from \"../../types/validation/validation-manager\";\nimport { ZodType } from \"zod\";\nimport { isZodSchema } from \"../../utils/dynamic-loader\";\nimport ExitError from \"../../utils/helpers/exit-error\";\n\nexport function callNext(_: Request, _1: Response, next: NextFunction) {\n next();\n}\n\n/**\n * Deep comparison helper for objects\n */\nfunction deepEqual(a: any, b: any): boolean {\n if (a === b) return true;\n if (a == null || b == null) return false;\n if (typeof a !== \"object\" || typeof b !== \"object\") return a === b;\n\n const keysA = Object.keys(a);\n const keysB = Object.keys(b);\n\n if (keysA.length !== keysB.length) return false;\n\n for (const key of keysA) {\n if (!keysB.includes(key)) return false;\n if (!deepEqual(a[key], b[key])) return false;\n }\n\n return true;\n}\n\n/**\n * Sends response with backward compatibility support\n * Compares current values against original values to detect middleware changes\n * If values were modified by subsequent middleware, use the modified version\n */\nexport function sendResponse(req: ArkosRequest, res: ArkosResponse) {\n let responseData;\n let responseStatus;\n\n const originalData = (res as any).originalData;\n const originalStatus = (res as any).originalStatus;\n\n const currentReqData = req.responseData;\n const currentReqStatus = req.responseStatus;\n const currentLocalsData = res.locals?.data;\n const currentLocalsStatus = res.locals?.status;\n\n if (\n currentReqData !== undefined &&\n !deepEqual(currentReqData, originalData)\n ) {\n responseData = currentReqData;\n } else if (\n currentLocalsData !== undefined &&\n !deepEqual(currentLocalsData, originalData)\n ) {\n responseData = currentLocalsData;\n } else if (originalData !== undefined) {\n responseData = originalData;\n } else {\n responseData = currentReqData ?? currentLocalsData;\n }\n\n if (currentReqStatus !== undefined && currentReqStatus !== originalStatus) {\n responseStatus = currentReqStatus;\n } else if (\n currentLocalsStatus !== undefined &&\n currentLocalsStatus !== originalStatus\n ) {\n responseStatus = currentLocalsStatus;\n } else if (originalStatus !== undefined) {\n responseStatus = originalStatus;\n } else {\n responseStatus = currentReqStatus ?? currentLocalsStatus;\n }\n\n // Send response\n\n if (Number(responseStatus) === 204) {\n res.status(Number(responseStatus)).send();\n } else if (\n (responseData !== undefined || responseData !== null) &&\n responseStatus\n ) {\n res.status(Number(responseStatus)).json(responseData);\n } else if (\n Number(responseStatus) &&\n (responseData === undefined || responseData === null)\n ) {\n res.status(Number(responseStatus)).send();\n } else {\n res.status(500).json({\n message: \"No status or data attached to the response\",\n });\n }\n}\n\n/**\n * Type representing all possible actions that can be performed on a controller\n * Combines both standard CRUD operations and auth-specific operations\n */\nexport type ControllerActions =\n | keyof PrismaQueryOptions<any>\n | keyof Omit<AuthPrismaQueryOptions<any>, keyof PrismaQueryOptions<any>>;\n\n/**\n * Middleware to add Prisma query options to the request's query parameters.\n *\n * @template T - The type of the Prisma model.\n * @param {PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>} prismaQueryOptions - The Prisma query options to attach.\n * @param {ControllerActions} action - The controller action to apply.\n * @returns A middleware function that attaches the query options to the request.\n */\nexport function addPrismaQueryOptionsToRequest<T extends Record<string, any>>(\n prismaQueryOptions: PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>,\n action: ControllerActions,\n) {\n return (req: ArkosRequest, _: ArkosResponse, next: NextFunction) => {\n const configs = getArkosConfig();\n\n const resolvedOptions = resolvePrismaQueryOptions(\n prismaQueryOptions,\n action,\n );\n\n const requestQueryOptions = configs?.request?.parameters\n ?.allowDangerousPrismaQueryOptions\n ? JSON.parse((req.query?.prismaQueryOptions as string) || \"{}\")\n : {};\n\n req.prismaQueryOptions = deepmerge(resolvedOptions, requestQueryOptions);\n\n next();\n };\n}\n\n/**\n * Logs request events with colored text such as errors, requests responses.\n *\n */\nexport function handleRequestLogs(\n req: Request,\n res: Response,\n next: NextFunction,\n) {\n const startTime = Date.now();\n\n const methodColors = {\n GET: \"\\x1b[36m\", // Cyan\n POST: \"\\x1b[32m\", // Green\n PUT: \"\\x1b[33m\", // Orange/Yellow\n PATCH: \"\\x1b[33m\", // Orange/Yellow\n DELETE: \"\\x1b[31m\", // Red\n HEAD: \"\\x1b[34m\", // Blue\n OPTIONS: \"\\x1b[34m\", // Blue\n };\n\n const getStatusColor = (statusCode: number) => {\n if (statusCode >= 200 && statusCode < 300) return \"\\x1b[32m\";\n if (statusCode >= 300 && statusCode < 400) return \"\\x1b[33m\";\n if (statusCode >= 400 && statusCode < 500) return \"\\x1b[33m\";\n if (statusCode >= 500) return \"\\x1b[31m\";\n return \"\\x1b[0m\";\n };\n\n res.on(\"finish\", () => {\n const isProduction = process.env.ARKOS_BUILD == \"true\";\n const duration = Date.now() - startTime;\n\n const now = new Date();\n\n const date = now.toISOString().split(\"T\")[0];\n const time = now.toTimeString().split(\" \")[0];\n\n const timestamp = isProduction ? `${date} ${time}` : time;\n\n const methodColor =\n methodColors[req.method as keyof typeof methodColors] || \"\\x1b[0m\";\n const statusColor = getStatusColor(res.statusCode);\n\n console.info(\n `[\\x1b[36mInfo\\x1b[0m] \\x1b[90m${timestamp}\\x1b[0m ${methodColor}${\n req.method\n }\\x1b[0m ${lenientDecode(req.originalUrl)} ${statusColor}${\n res.statusCode\n }\\x1b[0m \\x1b[35m${duration}ms\\x1b[0m`,\n );\n });\n\n next();\n}\n\n/**\n * @deprecated Will be removed in v2.0, please ArkosRouter instead.\n */\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n schemaOrDtoClass?: ClassConstructor<T>,\n classValidatorValidationOptions?: ValidatorOptions,\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n schemaOrDtoClass?: ZodType<T>,\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n schemaOrDtoClass?: ZodType<T> | ClassConstructor<T>,\n classValidatorValidationOptions?: ValidatorOptions,\n) {\n return catchAsync(\n async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n const validationConfigs = getArkosConfig()?.validation;\n const resolver = validationConfigs?.resolver;\n const body = req.body;\n\n const dtoValidationOptions = deepmerge(\n {\n whitelist: true,\n forbidNonWhitelisted: true,\n ...classValidatorValidationOptions,\n },\n validationConfigs?.validationOptions || {},\n );\n\n const runDtoValidation = () =>\n validateDto(\n schemaOrDtoClass as ClassConstructor<T>,\n body,\n dtoValidationOptions,\n );\n\n const runZodValidation = () =>\n validateSchema(schemaOrDtoClass as any, body);\n\n if (schemaOrDtoClass) {\n if (resolver === \"class-validator\") req.body = await runDtoValidation();\n else if (resolver === \"zod\") req.body = await runZodValidation();\n else if (resolver === \"hybrid\")\n req.body = isZodSchema(schemaOrDtoClass)\n ? await runZodValidation()\n : await runDtoValidation();\n }\n\n next();\n },\n );\n}\n\nexport function validateRequestInputs(routeConfig: ArkosRouteConfig) {\n const arkosConfig = getArkosConfig();\n const validationConfig = arkosConfig.validation;\n const validators = routeConfig?.validation;\n const openapi = routeConfig?.experimental?.openapi;\n\n const validationToParameterMapping = {\n query: \"query\",\n params: \"path\",\n headers: \"header\",\n cookies: \"cookie\",\n };\n\n if (\n !validationConfig?.resolver &&\n Object.keys(routeConfig.validation || {}).length > 0\n )\n throw ExitError(\n `Trying to pass validators into route \\\"${routeConfig.path}\\\" config validation option without choosing a validation resolver under arkos config { validation: {} }.`,\n );\n\n if ((validators as any) === true)\n throw ExitError(\n `Invalid value ${validators} passed to validation option, it can only receive false or object of { query, body, params }.`,\n );\n\n const validatorsKey: (\"body\" | \"query\" | \"params\")[] = [\n \"body\",\n \"query\",\n \"params\",\n ];\n\n const { validationFn, validatorNameType, validatorName } = validationManager;\n\n if (typeof validators === \"object\")\n validatorsKey.forEach((key) => {\n if (\n openapi &&\n typeof openapi === \"object\" &&\n key != \"body\" &&\n openapi.parameters?.some(\n (parameter: any) =>\n parameter.in === validationToParameterMapping[key],\n ) &&\n validators?.[key]\n ) {\n throw ExitError(\n `Error in ${routeConfig.path}: when usign validation.${key} you must not define parameters under openapi.parameters as documentation of req.${key} because the ${validatorName} you passed under validation.${key} will be added as jsonSchema into the api documenation, if you wish to define documenation by yourself do not define validation.${key}.\n\nRead more about strict validation at https://www.arkosjs.com/docs/guides/validation/setup#strict-mode.\n`,\n );\n }\n\n if (\n openapi &&\n typeof openapi === \"object\" &&\n openapi.requestBody &&\n validators?.[key] &&\n key === \"body\"\n ) {\n throw ExitError(\n `When usign validation.${key} you must not define json-schema under openapi.requestBody as documentation for req.${key}, because the ${validatorName} you passed under validation.${key} will be added as json-schema into the api documenation, if you wish to define documenation by yourself do not define validation.${key}.`,\n );\n }\n\n if (\n validators?.[key] &&\n !validationManager.isValidator(validators?.[key])\n )\n throw ExitError(\n `Your validation resolver is set to ${arkosConfig?.validation?.resolver}, please provide a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } } under route ${routeConfig.path}. Received ${validators?.[key]}`,\n );\n });\n\n return catchAsync(\n async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n for (const key of validatorsKey) {\n const validator = (validators as any)?.[key];\n const NotAllowedInputError = new BadRequestError(\n `Request ${key} is not allowed on this route`,\n `Request${capitalize(key)}NotAllowed`,\n { [key]: req[key] },\n );\n\n const shouldValidate = validationManager.shouldValidate(\n validator,\n req?.[key],\n );\n\n if (shouldValidate === \"prohibit\") throw NotAllowedInputError;\n else if (shouldValidate === \"passthrough\") continue;\n\n if (validator)\n try {\n req[key] = await (validationFn as any)(\n validator,\n req[key],\n arkosConfig.validation?.validationOptions,\n );\n } catch (err: any) {\n const isZod = isZodSchema(validator);\n\n const prettifiedError = errorPrettifier.prettify(\n isZod ? \"zod\" : (\"class-validator\" as any),\n err,\n );\n\n const error = prettifiedError[0];\n throw new AppError(\n error?.message || err?.message || `Request ${key} is invalid`,\n 400,\n `InvalidRequest${pascalCase(key)}`,\n isZod && typeof err?.format === \"function\" ? err.format() : err,\n );\n }\n }\n\n next();\n },\n );\n}\n\n"]}
|
|
1
|
+
{"version":3,"file":"base.middlewares.js","sourceRoot":"","sources":["../../../../src/modules/base/base.middlewares.ts"],"names":[],"mappings":"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","sourcesContent":["import { NextFunction, Request, Response } from \"express\";\nimport {\n PrismaQueryOptions,\n ArkosNextFunction,\n ArkosRequest,\n ArkosRequestHandler,\n ArkosResponse,\n AuthPrismaQueryOptions,\n} from \"../../types\";\nimport { getArkosConfig } from \"../../server\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport {\n AppError,\n BadRequestError,\n catchAsync,\n} from \"../../exports/error-handler\";\nimport validateDto from \"../../utils/validate-dto\";\nimport validateSchema from \"../../utils/validate-schema\";\nimport { ClassConstructor } from \"class-transformer\";\nimport { ValidatorOptions } from \"class-validator\";\nimport { resolvePrismaQueryOptions } from \"./utils/helpers/base.middlewares.helpers\";\nimport { ArkosRouteConfig } from \"../../utils/arkos-router/types\";\nimport { capitalize } from \"../../utils/helpers/text.helpers\";\nimport errorPrettifier from \"./utils/error-prettifier\";\nimport { lenientDecode } from \"../../utils/helpers/url-helpers\";\nimport { pascalCase } from \"../../exports/utils\";\nimport validationManager from \"../../types/validation/validation-manager\";\nimport { ZodType } from \"zod\";\nimport { isZodSchema } from \"../../utils/dynamic-loader\";\n\nexport function callNext(_: Request, _1: Response, next: NextFunction) {\n next();\n}\n\n/**\n * Deep comparison helper for objects\n */\nfunction deepEqual(a: any, b: any): boolean {\n if (a === b) return true;\n if (a == null || b == null) return false;\n if (typeof a !== \"object\" || typeof b !== \"object\") return a === b;\n\n const keysA = Object.keys(a);\n const keysB = Object.keys(b);\n\n if (keysA.length !== keysB.length) return false;\n\n for (const key of keysA) {\n if (!keysB.includes(key)) return false;\n if (!deepEqual(a[key], b[key])) return false;\n }\n\n return true;\n}\n\n/**\n * Sends response with backward compatibility support\n * Compares current values against original values to detect middleware changes\n * If values were modified by subsequent middleware, use the modified version\n */\nexport function sendResponse(req: ArkosRequest, res: ArkosResponse) {\n let responseData;\n let responseStatus;\n\n const originalData = (res as any).originalData;\n const originalStatus = (res as any).originalStatus;\n\n const currentReqData = req.responseData;\n const currentReqStatus = req.responseStatus;\n const currentLocalsData = res.locals?.data;\n const currentLocalsStatus = res.locals?.status;\n\n if (\n currentReqData !== undefined &&\n !deepEqual(currentReqData, originalData)\n ) {\n responseData = currentReqData;\n } else if (\n currentLocalsData !== undefined &&\n !deepEqual(currentLocalsData, originalData)\n ) {\n responseData = currentLocalsData;\n } else if (originalData !== undefined) {\n responseData = originalData;\n } else {\n responseData = currentReqData ?? currentLocalsData;\n }\n\n if (currentReqStatus !== undefined && currentReqStatus !== originalStatus) {\n responseStatus = currentReqStatus;\n } else if (\n currentLocalsStatus !== undefined &&\n currentLocalsStatus !== originalStatus\n ) {\n responseStatus = currentLocalsStatus;\n } else if (originalStatus !== undefined) {\n responseStatus = originalStatus;\n } else {\n responseStatus = currentReqStatus ?? currentLocalsStatus;\n }\n\n // Send response\n\n if (Number(responseStatus) === 204) {\n res.status(Number(responseStatus)).send();\n } else if (\n (responseData !== undefined || responseData !== null) &&\n responseStatus\n ) {\n res.status(Number(responseStatus)).json(responseData);\n } else if (\n Number(responseStatus) &&\n (responseData === undefined || responseData === null)\n ) {\n res.status(Number(responseStatus)).send();\n } else {\n res.status(500).json({\n message: \"No status or data attached to the response\",\n });\n }\n}\n\n/**\n * Type representing all possible actions that can be performed on a controller\n * Combines both standard CRUD operations and auth-specific operations\n */\nexport type ControllerActions =\n | keyof PrismaQueryOptions<any>\n | keyof Omit<AuthPrismaQueryOptions<any>, keyof PrismaQueryOptions<any>>;\n\n/**\n * Middleware to add Prisma query options to the request's query parameters.\n *\n * @template T - The type of the Prisma model.\n * @param {PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>} prismaQueryOptions - The Prisma query options to attach.\n * @param {ControllerActions} action - The controller action to apply.\n * @returns A middleware function that attaches the query options to the request.\n */\nexport function addPrismaQueryOptionsToRequest<T extends Record<string, any>>(\n prismaQueryOptions: PrismaQueryOptions<T> | AuthPrismaQueryOptions<T>,\n action: ControllerActions,\n) {\n return (req: ArkosRequest, _: ArkosResponse, next: NextFunction) => {\n const configs = getArkosConfig();\n\n const resolvedOptions = resolvePrismaQueryOptions(\n prismaQueryOptions,\n action,\n );\n\n const requestQueryOptions = configs?.request?.parameters\n ?.allowDangerousPrismaQueryOptions\n ? JSON.parse((req.query?.prismaQueryOptions as string) || \"{}\")\n : {};\n\n req.prismaQueryOptions = deepmerge(resolvedOptions, requestQueryOptions);\n\n next();\n };\n}\n\n/**\n * Logs request events with colored text such as errors, requests responses.\n *\n */\nexport function handleRequestLogs(\n req: Request,\n res: Response,\n next: NextFunction,\n) {\n const startTime = Date.now();\n\n const methodColors = {\n GET: \"\\x1b[36m\", // Cyan\n POST: \"\\x1b[32m\", // Green\n PUT: \"\\x1b[33m\", // Orange/Yellow\n PATCH: \"\\x1b[33m\", // Orange/Yellow\n DELETE: \"\\x1b[31m\", // Red\n HEAD: \"\\x1b[34m\", // Blue\n OPTIONS: \"\\x1b[34m\", // Blue\n };\n\n const getStatusColor = (statusCode: number) => {\n if (statusCode >= 200 && statusCode < 300) return \"\\x1b[32m\";\n if (statusCode >= 300 && statusCode < 400) return \"\\x1b[33m\";\n if (statusCode >= 400 && statusCode < 500) return \"\\x1b[33m\";\n if (statusCode >= 500) return \"\\x1b[31m\";\n return \"\\x1b[0m\";\n };\n\n res.on(\"finish\", () => {\n const isProduction = process.env.ARKOS_BUILD == \"true\";\n const duration = Date.now() - startTime;\n\n const now = new Date();\n\n const date = now.toISOString().split(\"T\")[0];\n const time = now.toTimeString().split(\" \")[0];\n\n const timestamp = isProduction ? `${date} ${time}` : time;\n\n const methodColor =\n methodColors[req.method as keyof typeof methodColors] || \"\\x1b[0m\";\n const statusColor = getStatusColor(res.statusCode);\n\n console.info(\n `[\\x1b[36mInfo\\x1b[0m] \\x1b[90m${timestamp}\\x1b[0m ${methodColor}${\n req.method\n }\\x1b[0m ${lenientDecode(req.originalUrl)} ${statusColor}${\n res.statusCode\n }\\x1b[0m \\x1b[35m${duration}ms\\x1b[0m`,\n );\n });\n\n next();\n}\n\n/**\n * @deprecated Will be removed in v2.0, please ArkosRouter instead.\n */\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n schemaOrDtoClass?: ClassConstructor<T>,\n classValidatorValidationOptions?: ValidatorOptions,\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n schemaOrDtoClass?: ZodType<T>,\n): ArkosRequestHandler;\nexport function handleRequestBodyValidationAndTransformation<T extends object>(\n schemaOrDtoClass?: ZodType<T> | ClassConstructor<T>,\n classValidatorValidationOptions?: ValidatorOptions,\n) {\n return catchAsync(\n async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n const validationConfigs = getArkosConfig()?.validation;\n const resolver = validationConfigs?.resolver;\n const body = req.body;\n\n const dtoValidationOptions = deepmerge(\n {\n whitelist: true,\n forbidNonWhitelisted: true,\n ...classValidatorValidationOptions,\n },\n validationConfigs?.validationOptions || {},\n );\n\n const runDtoValidation = () =>\n validateDto(\n schemaOrDtoClass as ClassConstructor<T>,\n body,\n dtoValidationOptions,\n );\n\n const runZodValidation = () =>\n validateSchema(schemaOrDtoClass as any, body);\n\n if (schemaOrDtoClass) {\n if (resolver === \"class-validator\") req.body = await runDtoValidation();\n else if (resolver === \"zod\") req.body = await runZodValidation();\n else if (resolver === \"hybrid\")\n req.body = isZodSchema(schemaOrDtoClass)\n ? await runZodValidation()\n : await runDtoValidation();\n }\n\n next();\n },\n );\n}\n\nexport function validateRequestInputs(routeConfig: ArkosRouteConfig) {\n const arkosConfig = getArkosConfig();\n const validationConfig = arkosConfig.validation;\n const validators = routeConfig?.validation;\n const openapi = routeConfig?.experimental?.openapi;\n\n const validationToParameterMapping = {\n query: \"query\",\n params: \"path\",\n headers: \"header\",\n cookies: \"cookie\",\n };\n\n if (\n !validationConfig?.resolver &&\n Object.keys(routeConfig.validation || {}).length > 0\n )\n throw Error(\n `Trying to pass validators into route \\\"${routeConfig.path}\\\" config validation option without choosing a validation resolver under arkos config { validation: {} }.`,\n );\n\n if ((validators as any) === true)\n throw Error(\n `Invalid value ${validators} passed to validation option, it can only receive false or object of { query, body, params }.`,\n );\n\n const validatorsKey: (\"body\" | \"query\" | \"params\")[] = [\n \"body\",\n \"query\",\n \"params\",\n ];\n\n const { validationFn, validatorNameType, validatorName } = validationManager;\n\n if (typeof validators === \"object\")\n validatorsKey.forEach((key) => {\n if (\n openapi &&\n typeof openapi === \"object\" &&\n key != \"body\" &&\n openapi.parameters?.some(\n (parameter: any) =>\n parameter.in === validationToParameterMapping[key],\n ) &&\n validators?.[key]\n ) {\n throw Error(\n `Error in ${routeConfig.path}: when usign validation.${key} you must not define parameters under openapi.parameters as documentation of req.${key} because the ${validatorName} you passed under validation.${key} will be added as jsonSchema into the api documenation, if you wish to define documenation by yourself do not define validation.${key}.\n\nRead more about strict validation at https://www.arkosjs.com/docs/guides/validation/setup#strict-mode.\n`,\n );\n }\n\n if (\n openapi &&\n typeof openapi === \"object\" &&\n openapi.requestBody &&\n validators?.[key] &&\n key === \"body\"\n ) {\n throw Error(\n `When usign validation.${key} you must not define json-schema under openapi.requestBody as documentation for req.${key}, because the ${validatorName} you passed under validation.${key} will be added as json-schema into the api documenation, if you wish to define documenation by yourself do not define validation.${key}.`,\n );\n }\n\n if (\n validators?.[key] &&\n !validationManager.isValidator(validators?.[key])\n )\n throw Error(\n `Your validation resolver is set to ${arkosConfig?.validation?.resolver}, please provide a valid ${validatorName} in order to use in { validation: { ${key}: ${validatorNameType} } } under route ${routeConfig.path}. Received ${validators?.[key]}`,\n );\n });\n\n return catchAsync(\n async (req: ArkosRequest, _: ArkosResponse, next: ArkosNextFunction) => {\n for (const key of validatorsKey) {\n const validator = (validators as any)?.[key];\n const NotAllowedInputError = new BadRequestError(\n `Request ${key} is not allowed on this route`,\n `Request${capitalize(key)}NotAllowed`,\n { [key]: req[key] },\n );\n\n const shouldValidate = validationManager.shouldValidate(\n validator,\n req?.[key],\n );\n\n if (shouldValidate === \"prohibit\") throw NotAllowedInputError;\n else if (shouldValidate === \"passthrough\") continue;\n\n if (validator)\n try {\n req[key] = await (validationFn as any)(\n validator,\n req[key],\n arkosConfig.validation?.validationOptions,\n );\n } catch (err: any) {\n const isZod = isZodSchema(validator);\n\n const prettifiedError = errorPrettifier.prettify(\n isZod ? \"zod\" : (\"class-validator\" as any),\n err,\n );\n\n const error = prettifiedError[0];\n throw new AppError(\n error?.message || err?.message || `Request ${key} is invalid`,\n 400,\n `InvalidRequest${pascalCase(key)}`,\n isZod && typeof err?.format === \"function\" ? err.format() : err,\n );\n }\n }\n\n next();\n },\n );\n}\n\n"]}
|
|
@@ -33,15 +33,6 @@ function substituteParams(template, values) {
|
|
|
33
33
|
.map((segment) => segment.startsWith(":") ? values[segment.slice(1)] : segment)
|
|
34
34
|
.join("/");
|
|
35
35
|
}
|
|
36
|
-
function stripMountSegments(url, segmentCount) {
|
|
37
|
-
const queryIndex = url.indexOf("?");
|
|
38
|
-
const rawPath = queryIndex === -1 ? url : url.slice(0, queryIndex);
|
|
39
|
-
const query = queryIndex === -1 ? "" : url.slice(queryIndex);
|
|
40
|
-
const parts = rawPath.split("/");
|
|
41
|
-
const start = rawPath.startsWith("/") ? segmentCount + 1 : segmentCount;
|
|
42
|
-
const remainder = parts.slice(start).join("/");
|
|
43
|
-
return `/${remainder}${query}`;
|
|
44
|
-
}
|
|
45
36
|
function isSafeServedPath(value) {
|
|
46
37
|
if (!value || value.includes("\\") || value.includes("\0"))
|
|
47
38
|
return false;
|
|
@@ -81,34 +72,23 @@ function serveUploadDir(dir, options = {}) {
|
|
|
81
72
|
allowParams: true,
|
|
82
73
|
label: "upload directory",
|
|
83
74
|
});
|
|
84
|
-
const mountPath = (0, upload_path_helper_1.normalizeUploadUrlPath)(options.urlPath ?? `/${normalizedDir}`);
|
|
85
|
-
if (mountPath === "/")
|
|
86
|
-
throw new Error(`Invalid upload URL path "/" for upload directory "${normalizedDir}": it must contain at least one segment.`);
|
|
87
|
-
(0, upload_path_helper_1.assertSafeUploadPath)(mountPath.replace(/^\//, ""), {
|
|
88
|
-
allowParams: true,
|
|
89
|
-
label: "upload URL path",
|
|
90
|
-
});
|
|
91
75
|
if (options.prepare !== undefined && typeof options.prepare !== "function")
|
|
92
76
|
throw new Error(`Invalid prepare function for upload directory "${normalizedDir}": expected a function.`);
|
|
93
77
|
const dirParams = (0, helpers_1.extractPathParams)(`/${normalizedDir}`);
|
|
94
|
-
const pathParams = (0, helpers_1.extractPathParams)(mountPath);
|
|
95
78
|
if (dirParams.length > 0 && !options.prepare)
|
|
96
79
|
throw new Error(`Dynamic upload directory "${normalizedDir}" requires a prepare function.`);
|
|
97
80
|
const recursive = options.recursive === true;
|
|
98
81
|
const dynamic = dirParams.length > 0;
|
|
99
|
-
const
|
|
100
|
-
|
|
82
|
+
const router = (0, arkos_router_1.default)({ mergeParams: true });
|
|
83
|
+
let cachedStatic;
|
|
84
|
+
upload_serving_registry_1.uploadServingRegistry.registerServeSource({
|
|
101
85
|
dir: normalizedDir,
|
|
102
|
-
urlPath: mountPath,
|
|
103
86
|
dirParams,
|
|
104
|
-
pathParams,
|
|
105
87
|
recursive,
|
|
106
88
|
dynamic,
|
|
107
89
|
hasPrepare: !!options.prepare,
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
const router = (0, arkos_router_1.default)();
|
|
111
|
-
let cachedStatic;
|
|
90
|
+
router: router._arkos,
|
|
91
|
+
});
|
|
112
92
|
const resolveDirectory = async (req, _res, next) => {
|
|
113
93
|
try {
|
|
114
94
|
const config = (0, server_1.getArkosConfig)();
|
|
@@ -179,10 +159,9 @@ function serveUploadDir(dir, options = {}) {
|
|
|
179
159
|
}
|
|
180
160
|
else {
|
|
181
161
|
const filePath = req.params[0];
|
|
182
|
-
if (
|
|
162
|
+
if (typeof filePath !== "string" || !isSafeServedPath(filePath))
|
|
183
163
|
return next(notFound());
|
|
184
164
|
}
|
|
185
|
-
req.url = stripMountSegments(req.url, mountSegments);
|
|
186
165
|
if (req.url.split("?")[0] === "/")
|
|
187
166
|
return next(notFound());
|
|
188
167
|
if (!dynamic)
|
|
@@ -195,16 +174,18 @@ function serveUploadDir(dir, options = {}) {
|
|
|
195
174
|
if (err?.code === "ENOENT" ||
|
|
196
175
|
err?.status === 403 ||
|
|
197
176
|
err?.statusCode === 403)
|
|
198
|
-
return next(new app_error_1.default(`File ${req.path} was not found`, 404, "FileNotFound", {
|
|
177
|
+
return next(new app_error_1.default(`File ${req.path} was not found`, 404, "FileNotFound", {
|
|
178
|
+
filepath: req.path,
|
|
179
|
+
}));
|
|
199
180
|
next(err);
|
|
200
181
|
};
|
|
201
182
|
const openapi = openApiConfig(normalizedDir);
|
|
202
183
|
router.get({
|
|
203
|
-
path:
|
|
184
|
+
path: "/",
|
|
204
185
|
experimental: { openapi },
|
|
205
186
|
}, resolveDirectory, serveExactFile, handleStaticError);
|
|
206
187
|
router.get({
|
|
207
|
-
path:
|
|
188
|
+
path: recursive ? "/*" : "/:fileName",
|
|
208
189
|
experimental: { openapi },
|
|
209
190
|
}, resolveDirectory, serveFolder, handleStaticError);
|
|
210
191
|
return router;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-upload-dir.js","sourceRoot":"","sources":["../../../../../../src/modules/file-upload/utils/helpers/serve-upload-dir.ts"],"names":[],"mappings":"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","sourcesContent":["import express from \"express\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport AppError from \"../../../error-handler/utils/app-error\";\nimport { ArkosRequest, ArkosRequestHandler } from \"../../../../types\";\nimport type { UploadPrepare } from \"../../../../types/upload\";\nimport ArkosRouter from \"../../../../utils/arkos-router\";\nimport { IArkosRouter } from \"../../../../utils/arkos-router/types\";\nimport { extractPathParams } from \"../../../../utils/arkos-router/utils/helpers\";\nimport { getArkosConfig } from \"../../../../server\";\nimport deepmerge from \"../../../../utils/helpers/deepmerge.helper\";\nimport {\n assertSafeUploadPath,\n isRealPathInside,\n isSafeUploadParam,\n normalizeUploadDir,\n normalizeUploadUrlPath,\n resolveUploadPath,\n} from \"./upload-path.helper\";\nimport {\n uploadServingRegistry,\n UploadServeRegistration,\n} from \"./upload-serving.registry\";\n\nconst DEFAULT_STATIC_OPTIONS = {\n maxAge: \"1y\",\n etag: true,\n lastModified: true,\n dotfiles: \"ignore\",\n fallthrough: false,\n index: false,\n cacheControl: true,\n};\n\nexport type ServeUploadDirOptions = {\n /**\n * Public URL folder, relative to the file upload `baseRoute`.\n *\n * @default `\"/\" + dir`\n */\n urlPath?: string;\n /**\n * Resolves the disk parameters for this folder. Required for every dynamic\n * folder (`:param` in `dir`). It may be async and may throw to deny the\n * request.\n */\n prepare?: UploadPrepare;\n /**\n * Options passed to `express.static`.\n */\n expressStatic?: Parameters<typeof express.static>[1];\n /**\n * Allow files in nested folders.\n *\n * @default false\n */\n recursive?: boolean;\n};\n\nfunction buildStaticOptions(\n overrides?: Parameters<typeof express.static>[1]\n) {\n const config = getArkosConfig();\n\n return deepmerge(\n deepmerge(DEFAULT_STATIC_OPTIONS, config.fileUpload?.expressStatic || {}),\n overrides || {}\n ) as Parameters<typeof express.static>[1];\n}\n\nfunction substituteParams(\n template: string,\n values: Record<string, string>\n): string {\n return template\n .split(\"/\")\n .map((segment) =>\n segment.startsWith(\":\") ? values[segment.slice(1)] : segment\n )\n .join(\"/\");\n}\n\nfunction stripMountSegments(url: string, segmentCount: number): string {\n const queryIndex = url.indexOf(\"?\");\n const rawPath = queryIndex === -1 ? url : url.slice(0, queryIndex);\n const query = queryIndex === -1 ? \"\" : url.slice(queryIndex);\n const parts = rawPath.split(\"/\");\n const start = rawPath.startsWith(\"/\") ? segmentCount + 1 : segmentCount;\n const remainder = parts.slice(start).join(\"/\");\n\n return `/${remainder}${query}`;\n}\n\nfunction isSafeServedPath(value: string): boolean {\n if (!value || value.includes(\"\\\\\") || value.includes(\"\\0\")) return false;\n\n return value\n .split(\"/\")\n .every(\n (segment) => segment !== \"\" && segment !== \".\" && segment !== \"..\"\n );\n}\n\nfunction notFound() {\n return new AppError(\"File not found\", 404, \"FileNotFound\");\n}\n\nfunction getLocals(req: ArkosRequest): Record<string, any> {\n return req.res?.locals || {};\n}\n\nfunction openApiConfig(dir: string) {\n return {\n tags: [\"File Upload\"],\n summary: \"Retrieve uploaded file\",\n description: `Serves files from the \"${dir}\" upload directory.`,\n responses: {\n \"200\": {\n description: \"File retrieved successfully\",\n content: {\n \"application/octet-stream\": {\n schema: { type: \"string\", format: \"binary\" },\n },\n },\n },\n \"404\": {\n description: \"File not found\",\n },\n },\n };\n}\n\n/**\n * Serves a folder from the upload directory.\n *\n * Authentication belongs on the router mount:\n *\n * ```ts\n * fileUploadRouter.use(\n * { authentication: fileUploadPolicy.View },\n * arkos.serveUploadDir(\"/storage/acme\", { urlPath: \"/private/files\" })\n * );\n * ```\n *\n * When the resolved `dir` is a file, the route serves that file directly.\n * When it is a directory, the remainder of the request URL is served from it.\n */\nexport function serveUploadDir(\n dir: string,\n options: ServeUploadDirOptions = {}\n): IArkosRouter {\n const normalizedDir = normalizeUploadDir(dir);\n\n assertSafeUploadPath(normalizedDir, {\n allowParams: true,\n label: \"upload directory\",\n });\n\n const mountPath = normalizeUploadUrlPath(\n options.urlPath ?? `/${normalizedDir}`\n );\n\n if (mountPath === \"/\")\n throw new Error(\n `Invalid upload URL path \"/\" for upload directory \"${normalizedDir}\": it must contain at least one segment.`\n );\n\n assertSafeUploadPath(mountPath.replace(/^\\//, \"\"), {\n allowParams: true,\n label: \"upload URL path\",\n });\n\n if (options.prepare !== undefined && typeof options.prepare !== \"function\")\n throw new Error(\n `Invalid prepare function for upload directory \"${normalizedDir}\": expected a function.`\n );\n\n const dirParams = extractPathParams(`/${normalizedDir}`);\n const pathParams = extractPathParams(mountPath);\n\n if (dirParams.length > 0 && !options.prepare)\n throw new Error(\n `Dynamic upload directory \"${normalizedDir}\" requires a prepare function.`\n );\n\n const recursive = options.recursive === true;\n const dynamic = dirParams.length > 0;\n const mountSegments = mountPath.split(\"/\").filter(Boolean).length;\n\n const registration: UploadServeRegistration = {\n dir: normalizedDir,\n urlPath: mountPath,\n dirParams,\n pathParams,\n recursive,\n dynamic,\n hasPrepare: !!options.prepare,\n };\n\n uploadServingRegistry.registerServe(registration);\n\n const router = ArkosRouter();\n let cachedStatic: express.RequestHandler | undefined;\n\n const resolveDirectory: ArkosRequestHandler = async (req, _res, next) => {\n try {\n const config = getArkosConfig();\n const baseUploadDir = config.fileUpload?.baseUploadDir || \"uploads\";\n const basePath = path.resolve(process.cwd(), baseUploadDir);\n const prepared = options.prepare\n ? await options.prepare(req, getLocals(req))\n : undefined;\n const values = prepared?.dirParams ?? {};\n\n for (const param of dirParams) {\n const value = values[param];\n\n if (value === undefined)\n throw new Error(\n `Missing required upload directory param \":${param}\" for \"${normalizedDir}\" on \"${req.method} ${req.originalUrl}\".`\n );\n\n if (!isSafeUploadParam(value))\n return next(notFound());\n }\n\n const resolvedDir = substituteParams(normalizedDir, values);\n const rootPath = resolveUploadPath(basePath, resolvedDir, {\n strictSegments: true,\n });\n\n if (!rootPath) return next(notFound());\n\n if (!(await isRealPathInside(basePath, rootPath)))\n return next(notFound());\n\n let stats: fs.Stats;\n\n try {\n stats = await fs.promises.stat(rootPath);\n } catch {\n return next(notFound());\n }\n\n req.__arkos = {\n ...req.__arkos,\n uploadDir: resolvedDir,\n uploadPath: rootPath,\n uploadKind: stats.isFile()\n ? \"file\"\n : stats.isDirectory()\n ? \"directory\"\n : undefined,\n };\n\n if (!req.__arkos.uploadKind) return next(notFound());\n\n next();\n } catch (error) {\n next(error);\n }\n };\n\n const serveExactFile: ArkosRequestHandler = (req, res, next) => {\n const rootPath = req.__arkos?.uploadPath;\n\n if (req.__arkos?.uploadKind !== \"file\" || !rootPath)\n return next(notFound());\n\n req.url = `/${encodeURIComponent(path.basename(rootPath))}${\n req.url.includes(\"?\") ? req.url.slice(req.url.indexOf(\"?\")) : \"\"\n }`;\n\n const staticHandler = express.static(\n path.dirname(rootPath),\n buildStaticOptions(options.expressStatic)\n );\n\n staticHandler(req, res, next);\n };\n\n const serveFolder: ArkosRequestHandler = (req, res, next) => {\n const rootPath = req.__arkos?.uploadPath;\n\n if (req.__arkos?.uploadKind !== \"directory\" || !rootPath)\n return next(notFound());\n\n if (!recursive) {\n const fileName = (req.params as any).fileName;\n\n if (\n typeof fileName !== \"string\" ||\n fileName.includes(\"/\") ||\n !isSafeServedPath(fileName)\n )\n return next(notFound());\n } else {\n const filePath = (req.params as any)[0] as string | undefined;\n\n if (!filePath || !isSafeServedPath(filePath)) return next(notFound());\n }\n\n req.url = stripMountSegments(req.url, mountSegments);\n\n if (req.url.split(\"?\")[0] === \"/\") return next(notFound());\n\n if (!dynamic)\n cachedStatic ??= express.static(\n rootPath,\n buildStaticOptions(options.expressStatic)\n );\n\n const staticHandler =\n cachedStatic ??\n express.static(rootPath, buildStaticOptions(options.expressStatic));\n\n staticHandler(req, res, next);\n };\n\n const handleStaticError = (\n err: any,\n req: any,\n _res: any,\n next: (error?: any) => void\n ) => {\n if (\n err?.code === \"ENOENT\" ||\n err?.status === 403 ||\n err?.statusCode === 403\n )\n return next(\n new AppError(\n `File ${req.path} was not found`,\n 404,\n \"FileNotFound\",\n { filepath: req.path }\n )\n );\n\n next(err);\n };\n\n const openapi = openApiConfig(normalizedDir);\n\n router.get(\n {\n path: mountPath,\n experimental: { openapi },\n },\n resolveDirectory,\n serveExactFile,\n handleStaticError as any\n );\n\n router.get(\n {\n path: `${mountPath}${recursive ? \"/*\" : \"/:fileName\"}`,\n experimental: { openapi },\n },\n resolveDirectory,\n serveFolder,\n handleStaticError as any\n );\n\n return router;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"serve-upload-dir.js","sourceRoot":"","sources":["../../../../../../src/modules/file-upload/utils/helpers/serve-upload-dir.ts"],"names":[],"mappings":"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","sourcesContent":["import express from \"express\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport AppError from \"../../../error-handler/utils/app-error\";\nimport {\n ArkosNextFunction,\n ArkosRequest,\n ArkosRequestHandler,\n ArkosResponse,\n} from \"../../../../types\";\nimport type { UploadPrepare } from \"../../../../types/upload\";\nimport ArkosRouter from \"../../../../utils/arkos-router\";\nimport {\n IArkosRouter,\n InternalIArkosRouter,\n} from \"../../../../utils/arkos-router/types\";\nimport { extractPathParams } from \"../../../../utils/arkos-router/utils/helpers\";\nimport { getArkosConfig } from \"../../../../server\";\nimport deepmerge from \"../../../../utils/helpers/deepmerge.helper\";\nimport {\n assertSafeUploadPath,\n isRealPathInside,\n isSafeUploadParam,\n normalizeUploadDir,\n resolveUploadPath,\n} from \"./upload-path.helper\";\nimport { uploadServingRegistry } from \"./upload-serving.registry\";\n\nconst DEFAULT_STATIC_OPTIONS = {\n maxAge: \"1y\",\n etag: true,\n lastModified: true,\n dotfiles: \"ignore\",\n fallthrough: false,\n index: false,\n cacheControl: true,\n};\n\nexport type ServeUploadDirOptions = {\n /**\n * Resolves the disk parameters for this folder. Required for every dynamic\n * folder (`:param` in `dir`). It may be async and may throw to deny the\n * request.\n */\n prepare?: UploadPrepare;\n /**\n * Options passed to `express.static`.\n */\n expressStatic?: Parameters<typeof express.static>[1];\n /**\n * Allow files in nested folders.\n *\n * @default false\n */\n recursive?: boolean;\n};\n\nfunction buildStaticOptions(overrides?: Parameters<typeof express.static>[1]) {\n const config = getArkosConfig();\n\n return deepmerge(\n deepmerge(DEFAULT_STATIC_OPTIONS, config.fileUpload?.expressStatic || {}),\n overrides || {},\n ) as Parameters<typeof express.static>[1];\n}\n\nfunction substituteParams(\n template: string,\n values: Record<string, string>,\n): string {\n return template\n .split(\"/\")\n .map((segment) =>\n segment.startsWith(\":\") ? values[segment.slice(1)] : segment,\n )\n .join(\"/\");\n}\n\nfunction isSafeServedPath(value: string): boolean {\n if (!value || value.includes(\"\\\\\") || value.includes(\"\\0\")) return false;\n\n return value\n .split(\"/\")\n .every((segment) => segment !== \"\" && segment !== \".\" && segment !== \"..\");\n}\n\ntype StaticError = {\n code?: string;\n status?: number;\n statusCode?: number;\n};\n\nfunction notFound() {\n return new AppError(\"File not found\", 404, \"FileNotFound\");\n}\n\nfunction getLocals(req: ArkosRequest): Record<string, unknown> {\n return req.res?.locals || {};\n}\n\nfunction openApiConfig(dir: string) {\n return {\n tags: [\"File Upload\"],\n summary: \"Retrieve uploaded file\",\n description: `Serves files from the \"${dir}\" upload directory.`,\n responses: {\n \"200\": {\n description: \"File retrieved successfully\",\n content: {\n \"application/octet-stream\": {\n schema: { type: \"string\", format: \"binary\" },\n },\n },\n },\n \"404\": {\n description: \"File not found\",\n },\n },\n };\n}\n\n/**\n * Serves a folder from the upload directory.\n *\n * Authentication belongs on the router mount:\n *\n * ```ts\n * fileUploadRouter.use(\n * { path: \"/private/files\", authentication: fileUploadPolicy.View },\n * arkos.serveUploadDir(\"/storage/acme\")\n * );\n * ```\n *\n * The `path` of the `use()` config is the public URL folder, relative to the\n * file upload `baseRoute`. When the resolved `dir` is a file, the route serves\n * that file directly. When it is a directory, the remainder of the request URL\n * is served from it.\n */\nexport function serveUploadDir(\n dir: string,\n options: ServeUploadDirOptions = {},\n): IArkosRouter {\n const normalizedDir = normalizeUploadDir(dir);\n\n assertSafeUploadPath(normalizedDir, {\n allowParams: true,\n label: \"upload directory\",\n });\n\n if (options.prepare !== undefined && typeof options.prepare !== \"function\")\n throw new Error(\n `Invalid prepare function for upload directory \"${normalizedDir}\": expected a function.`,\n );\n\n const dirParams = extractPathParams(`/${normalizedDir}`);\n\n if (dirParams.length > 0 && !options.prepare)\n throw new Error(\n `Dynamic upload directory \"${normalizedDir}\" requires a prepare function.`,\n );\n\n const recursive = options.recursive === true;\n const dynamic = dirParams.length > 0;\n\n const router = ArkosRouter({ mergeParams: true });\n let cachedStatic: express.RequestHandler | undefined;\n\n uploadServingRegistry.registerServeSource({\n dir: normalizedDir,\n dirParams,\n recursive,\n dynamic,\n hasPrepare: !!options.prepare,\n router: (router as InternalIArkosRouter)._arkos,\n });\n\n const resolveDirectory: ArkosRequestHandler = async (req, _res, next) => {\n try {\n const config = getArkosConfig();\n const baseUploadDir = config.fileUpload?.baseUploadDir || \"uploads\";\n const basePath = path.resolve(process.cwd(), baseUploadDir);\n const prepared = options.prepare\n ? await options.prepare(req, getLocals(req))\n : undefined;\n const values = prepared?.dirParams ?? {};\n\n for (const param of dirParams) {\n const value = values[param];\n\n if (value === undefined)\n throw new Error(\n `Missing required upload directory param \":${param}\" for \"${normalizedDir}\" on \"${req.method} ${req.originalUrl}\".`,\n );\n\n if (!isSafeUploadParam(value)) return next(notFound());\n }\n\n const resolvedDir = substituteParams(normalizedDir, values);\n const rootPath = resolveUploadPath(basePath, resolvedDir, {\n strictSegments: true,\n });\n\n if (!rootPath) return next(notFound());\n\n if (!(await isRealPathInside(basePath, rootPath)))\n return next(notFound());\n\n let stats: fs.Stats;\n\n try {\n stats = await fs.promises.stat(rootPath);\n } catch {\n return next(notFound());\n }\n\n req.__arkos = {\n ...req.__arkos,\n uploadDir: resolvedDir,\n uploadPath: rootPath,\n uploadKind: stats.isFile()\n ? \"file\"\n : stats.isDirectory()\n ? \"directory\"\n : undefined,\n };\n\n if (!req.__arkos.uploadKind) return next(notFound());\n\n next();\n } catch (error) {\n next(error);\n }\n };\n\n const serveExactFile: ArkosRequestHandler = (req, res, next) => {\n const rootPath = req.__arkos?.uploadPath;\n\n if (req.__arkos?.uploadKind !== \"file\" || !rootPath)\n return next(notFound());\n\n req.url = `/${encodeURIComponent(path.basename(rootPath))}${\n req.url.includes(\"?\") ? req.url.slice(req.url.indexOf(\"?\")) : \"\"\n }`;\n\n const staticHandler = express.static(\n path.dirname(rootPath),\n buildStaticOptions(options.expressStatic),\n );\n\n staticHandler(req, res, next);\n };\n\n const serveFolder: ArkosRequestHandler = (req, res, next) => {\n const rootPath = req.__arkos?.uploadPath;\n\n if (req.__arkos?.uploadKind !== \"directory\" || !rootPath)\n return next(notFound());\n\n if (!recursive) {\n const fileName: unknown = req.params.fileName;\n\n if (\n typeof fileName !== \"string\" ||\n fileName.includes(\"/\") ||\n !isSafeServedPath(fileName)\n )\n return next(notFound());\n } else {\n const filePath: unknown = req.params[0];\n\n if (typeof filePath !== \"string\" || !isSafeServedPath(filePath))\n return next(notFound());\n }\n\n if (req.url.split(\"?\")[0] === \"/\") return next(notFound());\n\n if (!dynamic)\n cachedStatic ??= express.static(\n rootPath,\n buildStaticOptions(options.expressStatic),\n );\n\n const staticHandler =\n cachedStatic ??\n express.static(rootPath, buildStaticOptions(options.expressStatic));\n\n staticHandler(req, res, next);\n };\n\n const handleStaticError = (\n err: StaticError | undefined,\n req: ArkosRequest,\n _res: ArkosResponse,\n next: ArkosNextFunction,\n ) => {\n if (\n err?.code === \"ENOENT\" ||\n err?.status === 403 ||\n err?.statusCode === 403\n )\n return next(\n new AppError(`File ${req.path} was not found`, 404, \"FileNotFound\", {\n filepath: req.path,\n }),\n );\n\n next(err);\n };\n\n const openapi = openApiConfig(normalizedDir);\n\n router.get(\n {\n path: \"/\",\n experimental: { openapi },\n },\n resolveDirectory,\n serveExactFile,\n handleStaticError,\n );\n\n router.get(\n {\n path: recursive ? \"/*\" : \"/:fileName\",\n experimental: { openapi },\n },\n resolveDirectory,\n serveFolder,\n handleStaticError,\n );\n\n return router;\n}\n\n"]}
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.resolveUploadServeSources = resolveUploadServeSources;
|
|
6
7
|
exports.validateUploadServingConfig = validateUploadServingConfig;
|
|
7
8
|
const sheu_1 = __importDefault(require("../../../../utils/sheu.js"));
|
|
8
9
|
const server_1 = require("../../../../server.js");
|
|
@@ -103,13 +104,53 @@ function warnAboutUnusedUrlParams(dir, urlPath, route, suppress) {
|
|
|
103
104
|
.map((param) => `":${param}"`)
|
|
104
105
|
.join(", ")} but uploadDir "${dir}" does not use them.`, { timestamp: true });
|
|
105
106
|
}
|
|
107
|
+
function mountedUrlPaths(router, trail = []) {
|
|
108
|
+
if (trail.includes(router))
|
|
109
|
+
throw new Error("Circular router mount detected while resolving upload URLs.");
|
|
110
|
+
if (router.mounts.length === 0)
|
|
111
|
+
return ["/"];
|
|
112
|
+
return router.mounts.flatMap(({ parent, path }) => {
|
|
113
|
+
if (typeof path !== "string")
|
|
114
|
+
throw new Error(`Upload routers must be mounted with a string path, received ${String(path)}.`);
|
|
115
|
+
return mountedUrlPaths(parent, [...trail, router]).map((base) => (0, upload_path_helper_1.normalizeUploadUrlPath)(`${base.replace(/\/$/, "")}/${path.replace(/^\//, "")}`));
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
function resolveUploadServeSources(baseRoute) {
|
|
119
|
+
const normalizedBaseRoute = normalizeBaseRoute(baseRoute);
|
|
120
|
+
const basePrefix = normalizedBaseRoute === "/" ? "/" : `${normalizedBaseRoute}/`;
|
|
121
|
+
return upload_serving_registry_1.uploadServingRegistry.getServeSources().flatMap((source) => {
|
|
122
|
+
if (source.router.mounts.length === 0)
|
|
123
|
+
throw new Error(`Upload directory "${source.dir}" is not mounted. Mount the router returned by arkos.serveUploadDir() with use({ path }) on the file upload router.`);
|
|
124
|
+
return mountedUrlPaths(source.router).map((fullPath) => {
|
|
125
|
+
if (fullPath === normalizedBaseRoute || !fullPath.startsWith(basePrefix))
|
|
126
|
+
throw new Error(`Upload directory "${source.dir}" is mounted at "${fullPath}", outside fileUpload.baseRoute "${normalizedBaseRoute}". Mount it on the file upload router.`);
|
|
127
|
+
const urlPath = `/${fullPath.slice(basePrefix.length)}`;
|
|
128
|
+
(0, upload_path_helper_1.assertSafeUploadPath)(urlPath.replace(/^\//, ""), {
|
|
129
|
+
allowParams: true,
|
|
130
|
+
label: "upload URL path",
|
|
131
|
+
});
|
|
132
|
+
return {
|
|
133
|
+
dir: source.dir,
|
|
134
|
+
urlPath,
|
|
135
|
+
dirParams: source.dirParams,
|
|
136
|
+
pathParams: (0, helpers_1.extractPathParams)(urlPath),
|
|
137
|
+
recursive: source.recursive,
|
|
138
|
+
dynamic: source.dynamic,
|
|
139
|
+
hasPrepare: source.hasPrepare,
|
|
140
|
+
};
|
|
141
|
+
});
|
|
142
|
+
});
|
|
143
|
+
}
|
|
106
144
|
function validateUploadServingConfig() {
|
|
107
145
|
const config = (0, server_1.getArkosConfig)();
|
|
108
146
|
const serving = config.fileUpload?.serving || "all";
|
|
109
147
|
const findFileEnabled = upload_serving_registry_1.uploadServingRegistry.isFindFileServingEnabled();
|
|
110
148
|
const baseRoute = config.fileUpload?.baseRoute || "/api/uploads";
|
|
111
149
|
const suppressUnusedUrlParams = config.warnings?.fileUpload?.suppressUnusedUrlParams === true;
|
|
112
|
-
const serveRegistrations =
|
|
150
|
+
const serveRegistrations = [
|
|
151
|
+
...upload_serving_registry_1.uploadServingRegistry.getServeRegistrations(),
|
|
152
|
+
...resolveUploadServeSources(baseRoute),
|
|
153
|
+
];
|
|
113
154
|
const writeRegistrations = upload_serving_registry_1.uploadServingRegistry.getWriteRegistrations();
|
|
114
155
|
const seenServePaths = new Map();
|
|
115
156
|
const seenServeDirs = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-serving-validation.js","sourceRoot":"","sources":["../../../../../../src/modules/file-upload/utils/helpers/upload-serving-validation.ts"],"names":[],"mappings":"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","sourcesContent":["import sheu from \"../../../../utils/sheu\";\nimport { getArkosConfig } from \"../../../../server\";\nimport { extractPathParams } from \"../../../../utils/arkos-router/utils/helpers\";\nimport type { UploadUrlPath } from \"../../../../types/upload\";\nimport {\n DEFAULT_UPLOAD_DIRS,\n assertSafeUploadPath,\n normalizeUploadDir,\n normalizeUploadUrlPath,\n} from \"./upload-path.helper\";\nimport {\n uploadServingRegistry,\n UploadServeRegistration,\n UploadWriteRegistration,\n} from \"./upload-serving.registry\";\n\ntype TemplateMatch = {\n params: Record<string, string>;\n matched: number;\n remaining: string[];\n};\n\nfunction isExactUrlPath(\n urlPath: UploadUrlPath | undefined\n): urlPath is { exact: string } {\n return !!urlPath && typeof urlPath === \"object\";\n}\n\nfunction normalizeBaseRoute(baseRoute: string): string {\n const withLeadingSlash = baseRoute.startsWith(\"/\")\n ? baseRoute\n : `/${baseRoute}`;\n\n return withLeadingSlash.length > 1\n ? withLeadingSlash.replace(/\\/+$/, \"\")\n : withLeadingSlash;\n}\n\nfunction assertUrlPathIsRelativeToBaseRoute(\n urlPath: string,\n baseRoute: string,\n route: string\n) {\n const normalizedBaseRoute = normalizeBaseRoute(baseRoute);\n\n if (\n urlPath === normalizedBaseRoute ||\n urlPath.startsWith(`${normalizedBaseRoute}/`)\n )\n throw new Error(\n `Invalid urlPath \"${urlPath}\" on route \"${route}\": it is relative to baseRoute and must not include \"${normalizedBaseRoute}\".`\n );\n}\n\nfunction substitutePath(\n pathTemplate: string,\n params: Record<string, string>\n): string {\n return pathTemplate\n .split(\"/\")\n .map((segment) =>\n segment.startsWith(\":\") ? params[segment.slice(1)] : segment\n )\n .join(\"/\");\n}\n\nfunction matchDirTemplates(\n serveDir: string,\n writeDir: string,\n recursive: boolean\n): TemplateMatch | null {\n const serveSegments = normalizeUploadDir(serveDir).split(\"/\");\n const writeSegments = normalizeUploadDir(writeDir).split(\"/\");\n\n if (serveSegments.length > writeSegments.length) return null;\n if (serveSegments.length < writeSegments.length && !recursive) return null;\n\n const params: Record<string, string> = {};\n\n for (let index = 0; index < serveSegments.length; index++) {\n const serveSegment = serveSegments[index];\n const writeSegment = writeSegments[index];\n\n if (serveSegment.startsWith(\":\")) {\n if (writeSegment.startsWith(\":\")) {\n if (serveSegment.slice(1) !== writeSegment.slice(1)) return null;\n params[serveSegment.slice(1)] = serveSegment;\n } else params[serveSegment.slice(1)] = writeSegment;\n } else if (serveSegment !== writeSegment) return null;\n }\n\n return {\n params,\n matched: serveSegments.length,\n remaining: writeSegments.slice(serveSegments.length),\n };\n}\n\nfunction validateWriteUrlPath(\n registration: UploadWriteRegistration,\n baseRoute: string\n) {\n const { urlPath, route, dir } = registration;\n\n if (urlPath === undefined) return;\n\n if (!dir)\n throw new Error(\n `Route \"${route}\" declares urlPath but does not declare uploadDir.`\n );\n\n if (isExactUrlPath(urlPath)) {\n const exact = urlPath.exact;\n\n if (typeof exact !== \"string\" || !exact.startsWith(\"/\"))\n throw new Error(\n `Invalid exact urlPath on route \"${route}\": it must be a string starting with \"/\".`\n );\n\n if (exact.length > 1 && exact.endsWith(\"/\"))\n throw new Error(\n `Invalid exact urlPath \"${exact}\" on route \"${route}\": it must not end with \"/\".`\n );\n\n if (exact === \"/\")\n throw new Error(\n `Invalid exact urlPath \"/\" on route \"${route}\": it must contain at least one segment.`\n );\n\n assertSafeUploadPath(exact.replace(/^\\//, \"\"), {\n label: \"exact upload urlPath\",\n });\n\n assertUrlPathIsRelativeToBaseRoute(exact, baseRoute, route);\n\n if (registration.type === \"array\")\n throw new Error(\n `Exact urlPath \"${exact}\" on route \"${route}\" cannot be used with array uploads because every file would share the same URL.`\n );\n\n return;\n }\n\n if (!urlPath.startsWith(\"/\"))\n throw new Error(\n `Invalid urlPath \"${urlPath}\" on route \"${route}\": it must start with \"/\".`\n );\n\n if (urlPath.endsWith(\"/\"))\n throw new Error(\n `Invalid urlPath \"${urlPath}\" on route \"${route}\": it must not end with \"/\".`\n );\n\n assertSafeUploadPath(urlPath.replace(/^\\//, \"\"), {\n allowParams: true,\n label: \"upload urlPath\",\n });\n\n assertUrlPathIsRelativeToBaseRoute(urlPath, baseRoute, route);\n}\n\nfunction warnAboutUnusedUrlParams(\n dir: string,\n urlPath: string,\n route: string,\n suppress: boolean\n) {\n if (suppress) return;\n\n const dirParams = extractPathParams(`/${dir}`);\n const unused = extractPathParams(urlPath).filter(\n (param) => !dirParams.includes(param)\n );\n\n if (unused.length > 0)\n sheu.warn(\n `Upload urlPath \"${urlPath}\" on route \"${route}\" declares ${unused\n .map((param) => `\":${param}\"`)\n .join(\", \")} but uploadDir \"${dir}\" does not use them.`,\n { timestamp: true }\n );\n}\n\n/**\n * Validates the upload serving registrations collected while building the\n * routers. Must run once, after every router has been constructed.\n */\nexport function validateUploadServingConfig() {\n const config = getArkosConfig();\n const serving = config.fileUpload?.serving || \"all\";\n const findFileEnabled = uploadServingRegistry.isFindFileServingEnabled();\n const baseRoute = config.fileUpload?.baseRoute || \"/api/uploads\";\n const suppressUnusedUrlParams =\n config.warnings?.fileUpload?.suppressUnusedUrlParams === true;\n const serveRegistrations = uploadServingRegistry.getServeRegistrations();\n const writeRegistrations = uploadServingRegistry.getWriteRegistrations();\n\n const seenServePaths = new Map<string, string>();\n const seenServeDirs = new Map<string, string>();\n const seenExactWritePaths = new Map<string, string>();\n const warnedRoutes = new Set<string>();\n\n for (const registration of serveRegistrations) {\n const dir = normalizeUploadDir(registration.dir);\n const publicPath = normalizeUploadUrlPath(registration.urlPath);\n const firstDirSegment = dir.split(\"/\")[0];\n const firstPathSegment = publicPath.replace(/^\\//, \"\").split(\"/\")[0];\n\n if (registration.dynamic && !registration.hasPrepare)\n throw new Error(\n `Dynamic upload directory \"${dir}\" requires a prepare function.`\n );\n\n if (registration.pathParams.length > 0 && !suppressUnusedUrlParams) {\n const unused = registration.pathParams.filter(\n (param) => !registration.dirParams.includes(param)\n );\n\n if (unused.length > 0)\n sheu.warn(\n `Upload URL path \"${publicPath}\" declares ${unused\n .map((param) => `\":${param}\"`)\n .join(\", \")} but the upload directory \"${dir}\" does not use them.`,\n { timestamp: true }\n );\n }\n\n if (\n findFileEnabled &&\n (DEFAULT_UPLOAD_DIRS as readonly string[]).includes(firstDirSegment)\n )\n throw new Error(\n `Cannot serve upload directory \"${dir}\" with arkos.serveUploadDir(): \"${firstDirSegment}\" is a built-in upload root and is always served while findFile is enabled.`\n );\n\n if (\n findFileEnabled &&\n (DEFAULT_UPLOAD_DIRS as readonly string[]).includes(firstPathSegment)\n )\n throw new Error(\n `Cannot register upload URL path \"${publicPath}\": \"/${firstPathSegment}\" is a built-in upload root and is always served while findFile is enabled.`\n );\n\n if (seenServePaths.has(publicPath))\n throw new Error(\n `Duplicate upload serving path \"${publicPath}\" registered with arkos.serveUploadDir().`\n );\n\n seenServePaths.set(publicPath, dir);\n\n if (seenServeDirs.has(dir))\n throw new Error(\n seenServeDirs.get(dir) === publicPath\n ? `Duplicate arkos.serveUploadDir() registration for \"${dir}\".`\n : `Upload directory \"${dir}\" is served at multiple paths: \"${seenServeDirs.get(\n dir\n )}\" and \"${publicPath}\".`\n );\n\n seenServeDirs.set(dir, publicPath);\n }\n\n let warnedAboutAllMode = false;\n\n for (const registration of writeRegistrations) {\n const dir = registration.dir\n ? normalizeUploadDir(registration.dir)\n : undefined;\n\n validateWriteUrlPath(registration, baseRoute);\n\n if (!dir) continue;\n\n assertSafeUploadPath(dir, { allowParams: true, label: \"uploadDir\" });\n\n const dirParams = extractPathParams(`/${dir}`);\n\n if (dirParams.length > 0 && !registration.hasPrepare)\n throw new Error(\n `Dynamic upload directory \"${dir}\" on route \"${registration.route}\" requires a prepare function.`\n );\n\n if (\n registration.urlPath !== undefined &&\n !isExactUrlPath(registration.urlPath)\n ) {\n const warningKey = `${registration.route}:${dir}:${registration.urlPath}`;\n\n if (!warnedRoutes.has(warningKey)) {\n warnAboutUnusedUrlParams(\n dir,\n registration.urlPath,\n registration.route,\n suppressUnusedUrlParams\n );\n warnedRoutes.add(warningKey);\n }\n }\n\n if (isExactUrlPath(registration.urlPath)) {\n const exact = registration.urlPath.exact;\n\n if (seenExactWritePaths.has(exact))\n throw new Error(\n `Duplicate exact urlPath \"${exact}\" on route \"${registration.route}\"; it is already used on route \"${seenExactWritePaths.get(\n exact\n )}\".`\n );\n\n seenExactWritePaths.set(exact, registration.route);\n continue;\n }\n\n const firstDirSegment = dir.split(\"/\")[0];\n\n if (\n findFileEnabled &&\n (DEFAULT_UPLOAD_DIRS as readonly string[]).includes(firstDirSegment)\n )\n continue;\n\n if (serving === \"all\") {\n if (!warnedAboutAllMode && serveRegistrations.length > 0) {\n warningAboutAllMode();\n warnedAboutAllMode = true;\n }\n continue;\n }\n\n if (registration.serve === false) continue;\n\n const writePublicPath = normalizeUploadUrlPath(\n registration.urlPath ?? `/${dir}`\n );\n\n let bestMatch:\n | { registration: UploadServeRegistration; match: TemplateMatch }\n | undefined;\n\n for (const serveRegistration of serveRegistrations) {\n const match = matchDirTemplates(\n serveRegistration.dir,\n dir,\n serveRegistration.recursive\n );\n\n if (!match) continue;\n\n if (!bestMatch || match.matched > bestMatch.match.matched) {\n bestMatch = { registration: serveRegistration, match };\n continue;\n }\n\n if (\n match.matched === bestMatch.match.matched &&\n normalizeUploadUrlPath(serveRegistration.urlPath) !==\n normalizeUploadUrlPath(bestMatch.registration.urlPath)\n )\n throw new Error(\n `Upload directory \"${dir}\" on route \"${registration.route}\" is ambiguously served by \"${bestMatch.registration.urlPath}\" and \"${serveRegistration.urlPath}\".`\n );\n }\n\n if (!bestMatch)\n throw new Error(\n `Upload directory \"${dir}\" used by route \"${registration.route}\" is not served. Register it with arkos.serveUploadDir(\"${dir}\"), register one of its parent folders with arkos.serveUploadDir(parent, { recursive: true }), or set \"serve: false\" in the route's uploads config.`\n );\n\n const servedPublicPath = normalizeUploadUrlPath(\n `${substitutePath(bestMatch.registration.urlPath, bestMatch.match.params)}${\n bestMatch.match.remaining.length\n ? `/${bestMatch.match.remaining.join(\"/\")}`\n : \"\"\n }`\n );\n\n if (servedPublicPath !== writePublicPath)\n throw new Error(\n `Generated URL \"${writePublicPath}\" does not match served URL \"${servedPublicPath}\" for upload directory \"${dir}\".`\n );\n }\n\n if (\n serving === \"all\" &&\n serveRegistrations.length > 0 &&\n !warnedAboutAllMode\n )\n warningAboutAllMode();\n}\n\nfunction warningAboutAllMode() {\n sheu.warn(\n `fileUpload.serving is \"all\"; per-folder permissions registered via arkos.serveUploadDir() are not enforced.`,\n { timestamp: true }\n );\n}\n"]}
|
|
1
|
+
{"version":3,"file":"upload-serving-validation.js","sourceRoot":"","sources":["../../../../../../src/modules/file-upload/utils/helpers/upload-serving-validation.ts"],"names":[],"mappings":"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","sourcesContent":["import sheu from \"../../../../utils/sheu\";\nimport { getArkosConfig } from \"../../../../server\";\nimport { extractPathParams } from \"../../../../utils/arkos-router/utils/helpers\";\nimport type { UploadUrlPath } from \"../../../../types/upload\";\nimport {\n DEFAULT_UPLOAD_DIRS,\n assertSafeUploadPath,\n normalizeUploadDir,\n normalizeUploadUrlPath,\n} from \"./upload-path.helper\";\nimport {\n uploadServingRegistry,\n UploadServeRegistration,\n UploadWriteRegistration,\n} from \"./upload-serving.registry\";\nimport type { ArkosRouterState } from \"../../../../utils/arkos-router/types\";\n\ntype TemplateMatch = {\n params: Record<string, string>;\n matched: number;\n remaining: string[];\n};\n\nfunction isExactUrlPath(\n urlPath: UploadUrlPath | undefined\n): urlPath is { exact: string } {\n return !!urlPath && typeof urlPath === \"object\";\n}\n\nfunction normalizeBaseRoute(baseRoute: string): string {\n const withLeadingSlash = baseRoute.startsWith(\"/\")\n ? baseRoute\n : `/${baseRoute}`;\n\n return withLeadingSlash.length > 1\n ? withLeadingSlash.replace(/\\/+$/, \"\")\n : withLeadingSlash;\n}\n\nfunction assertUrlPathIsRelativeToBaseRoute(\n urlPath: string,\n baseRoute: string,\n route: string\n) {\n const normalizedBaseRoute = normalizeBaseRoute(baseRoute);\n\n if (\n urlPath === normalizedBaseRoute ||\n urlPath.startsWith(`${normalizedBaseRoute}/`)\n )\n throw new Error(\n `Invalid urlPath \"${urlPath}\" on route \"${route}\": it is relative to baseRoute and must not include \"${normalizedBaseRoute}\".`\n );\n}\n\nfunction substitutePath(\n pathTemplate: string,\n params: Record<string, string>\n): string {\n return pathTemplate\n .split(\"/\")\n .map((segment) =>\n segment.startsWith(\":\") ? params[segment.slice(1)] : segment\n )\n .join(\"/\");\n}\n\nfunction matchDirTemplates(\n serveDir: string,\n writeDir: string,\n recursive: boolean\n): TemplateMatch | null {\n const serveSegments = normalizeUploadDir(serveDir).split(\"/\");\n const writeSegments = normalizeUploadDir(writeDir).split(\"/\");\n\n if (serveSegments.length > writeSegments.length) return null;\n if (serveSegments.length < writeSegments.length && !recursive) return null;\n\n const params: Record<string, string> = {};\n\n for (let index = 0; index < serveSegments.length; index++) {\n const serveSegment = serveSegments[index];\n const writeSegment = writeSegments[index];\n\n if (serveSegment.startsWith(\":\")) {\n if (writeSegment.startsWith(\":\")) {\n if (serveSegment.slice(1) !== writeSegment.slice(1)) return null;\n params[serveSegment.slice(1)] = serveSegment;\n } else params[serveSegment.slice(1)] = writeSegment;\n } else if (serveSegment !== writeSegment) return null;\n }\n\n return {\n params,\n matched: serveSegments.length,\n remaining: writeSegments.slice(serveSegments.length),\n };\n}\n\nfunction validateWriteUrlPath(\n registration: UploadWriteRegistration,\n baseRoute: string\n) {\n const { urlPath, route, dir } = registration;\n\n if (urlPath === undefined) return;\n\n if (!dir)\n throw new Error(\n `Route \"${route}\" declares urlPath but does not declare uploadDir.`\n );\n\n if (isExactUrlPath(urlPath)) {\n const exact = urlPath.exact;\n\n if (typeof exact !== \"string\" || !exact.startsWith(\"/\"))\n throw new Error(\n `Invalid exact urlPath on route \"${route}\": it must be a string starting with \"/\".`\n );\n\n if (exact.length > 1 && exact.endsWith(\"/\"))\n throw new Error(\n `Invalid exact urlPath \"${exact}\" on route \"${route}\": it must not end with \"/\".`\n );\n\n if (exact === \"/\")\n throw new Error(\n `Invalid exact urlPath \"/\" on route \"${route}\": it must contain at least one segment.`\n );\n\n assertSafeUploadPath(exact.replace(/^\\//, \"\"), {\n label: \"exact upload urlPath\",\n });\n\n assertUrlPathIsRelativeToBaseRoute(exact, baseRoute, route);\n\n if (registration.type === \"array\")\n throw new Error(\n `Exact urlPath \"${exact}\" on route \"${route}\" cannot be used with array uploads because every file would share the same URL.`\n );\n\n return;\n }\n\n if (!urlPath.startsWith(\"/\"))\n throw new Error(\n `Invalid urlPath \"${urlPath}\" on route \"${route}\": it must start with \"/\".`\n );\n\n if (urlPath.endsWith(\"/\"))\n throw new Error(\n `Invalid urlPath \"${urlPath}\" on route \"${route}\": it must not end with \"/\".`\n );\n\n assertSafeUploadPath(urlPath.replace(/^\\//, \"\"), {\n allowParams: true,\n label: \"upload urlPath\",\n });\n\n assertUrlPathIsRelativeToBaseRoute(urlPath, baseRoute, route);\n}\n\nfunction warnAboutUnusedUrlParams(\n dir: string,\n urlPath: string,\n route: string,\n suppress: boolean\n) {\n if (suppress) return;\n\n const dirParams = extractPathParams(`/${dir}`);\n const unused = extractPathParams(urlPath).filter(\n (param) => !dirParams.includes(param)\n );\n\n if (unused.length > 0)\n sheu.warn(\n `Upload urlPath \"${urlPath}\" on route \"${route}\" declares ${unused\n .map((param) => `\":${param}\"`)\n .join(\", \")} but uploadDir \"${dir}\" does not use them.`,\n { timestamp: true }\n );\n}\n\nfunction mountedUrlPaths(\n router: ArkosRouterState,\n trail: ArkosRouterState[] = []\n): string[] {\n if (trail.includes(router))\n throw new Error(\"Circular router mount detected while resolving upload URLs.\");\n\n if (router.mounts.length === 0) return [\"/\"];\n\n return router.mounts.flatMap(({ parent, path }) => {\n if (typeof path !== \"string\")\n throw new Error(\n `Upload routers must be mounted with a string path, received ${String(path)}.`\n );\n\n return mountedUrlPaths(parent, [...trail, router]).map((base) =>\n normalizeUploadUrlPath(`${base.replace(/\\/$/, \"\")}/${path.replace(/^\\//, \"\")}`)\n );\n });\n}\n\n/**\n * Resolves each arkos.serveUploadDir() into the URL paths it is mounted at,\n * relative to baseRoute, by walking the routers it was mounted through.\n */\nexport function resolveUploadServeSources(\n baseRoute: string\n): UploadServeRegistration[] {\n const normalizedBaseRoute = normalizeBaseRoute(baseRoute);\n const basePrefix =\n normalizedBaseRoute === \"/\" ? \"/\" : `${normalizedBaseRoute}/`;\n\n return uploadServingRegistry.getServeSources().flatMap((source) => {\n if (source.router.mounts.length === 0)\n throw new Error(\n `Upload directory \"${source.dir}\" is not mounted. Mount the router returned by arkos.serveUploadDir() with use({ path }) on the file upload router.`\n );\n\n return mountedUrlPaths(source.router).map((fullPath) => {\n if (fullPath === normalizedBaseRoute || !fullPath.startsWith(basePrefix))\n throw new Error(\n `Upload directory \"${source.dir}\" is mounted at \"${fullPath}\", outside fileUpload.baseRoute \"${normalizedBaseRoute}\". Mount it on the file upload router.`\n );\n\n const urlPath = `/${fullPath.slice(basePrefix.length)}`;\n\n assertSafeUploadPath(urlPath.replace(/^\\//, \"\"), {\n allowParams: true,\n label: \"upload URL path\",\n });\n\n return {\n dir: source.dir,\n urlPath,\n dirParams: source.dirParams,\n pathParams: extractPathParams(urlPath),\n recursive: source.recursive,\n dynamic: source.dynamic,\n hasPrepare: source.hasPrepare,\n };\n });\n });\n}\n\n/**\n * Validates the upload serving registrations collected while building the\n * routers. Must run once, after every router has been constructed.\n */\nexport function validateUploadServingConfig() {\n const config = getArkosConfig();\n const serving = config.fileUpload?.serving || \"all\";\n const findFileEnabled = uploadServingRegistry.isFindFileServingEnabled();\n const baseRoute = config.fileUpload?.baseRoute || \"/api/uploads\";\n const suppressUnusedUrlParams =\n config.warnings?.fileUpload?.suppressUnusedUrlParams === true;\n const serveRegistrations = [\n ...uploadServingRegistry.getServeRegistrations(),\n ...resolveUploadServeSources(baseRoute),\n ];\n const writeRegistrations = uploadServingRegistry.getWriteRegistrations();\n\n const seenServePaths = new Map<string, string>();\n const seenServeDirs = new Map<string, string>();\n const seenExactWritePaths = new Map<string, string>();\n const warnedRoutes = new Set<string>();\n\n for (const registration of serveRegistrations) {\n const dir = normalizeUploadDir(registration.dir);\n const publicPath = normalizeUploadUrlPath(registration.urlPath);\n const firstDirSegment = dir.split(\"/\")[0];\n const firstPathSegment = publicPath.replace(/^\\//, \"\").split(\"/\")[0];\n\n if (registration.dynamic && !registration.hasPrepare)\n throw new Error(\n `Dynamic upload directory \"${dir}\" requires a prepare function.`\n );\n\n if (registration.pathParams.length > 0 && !suppressUnusedUrlParams) {\n const unused = registration.pathParams.filter(\n (param) => !registration.dirParams.includes(param)\n );\n\n if (unused.length > 0)\n sheu.warn(\n `Upload URL path \"${publicPath}\" declares ${unused\n .map((param) => `\":${param}\"`)\n .join(\", \")} but the upload directory \"${dir}\" does not use them.`,\n { timestamp: true }\n );\n }\n\n if (\n findFileEnabled &&\n (DEFAULT_UPLOAD_DIRS as readonly string[]).includes(firstDirSegment)\n )\n throw new Error(\n `Cannot serve upload directory \"${dir}\" with arkos.serveUploadDir(): \"${firstDirSegment}\" is a built-in upload root and is always served while findFile is enabled.`\n );\n\n if (\n findFileEnabled &&\n (DEFAULT_UPLOAD_DIRS as readonly string[]).includes(firstPathSegment)\n )\n throw new Error(\n `Cannot register upload URL path \"${publicPath}\": \"/${firstPathSegment}\" is a built-in upload root and is always served while findFile is enabled.`\n );\n\n if (seenServePaths.has(publicPath))\n throw new Error(\n `Duplicate upload serving path \"${publicPath}\" registered with arkos.serveUploadDir().`\n );\n\n seenServePaths.set(publicPath, dir);\n\n if (seenServeDirs.has(dir))\n throw new Error(\n seenServeDirs.get(dir) === publicPath\n ? `Duplicate arkos.serveUploadDir() registration for \"${dir}\".`\n : `Upload directory \"${dir}\" is served at multiple paths: \"${seenServeDirs.get(\n dir\n )}\" and \"${publicPath}\".`\n );\n\n seenServeDirs.set(dir, publicPath);\n }\n\n let warnedAboutAllMode = false;\n\n for (const registration of writeRegistrations) {\n const dir = registration.dir\n ? normalizeUploadDir(registration.dir)\n : undefined;\n\n validateWriteUrlPath(registration, baseRoute);\n\n if (!dir) continue;\n\n assertSafeUploadPath(dir, { allowParams: true, label: \"uploadDir\" });\n\n const dirParams = extractPathParams(`/${dir}`);\n\n if (dirParams.length > 0 && !registration.hasPrepare)\n throw new Error(\n `Dynamic upload directory \"${dir}\" on route \"${registration.route}\" requires a prepare function.`\n );\n\n if (\n registration.urlPath !== undefined &&\n !isExactUrlPath(registration.urlPath)\n ) {\n const warningKey = `${registration.route}:${dir}:${registration.urlPath}`;\n\n if (!warnedRoutes.has(warningKey)) {\n warnAboutUnusedUrlParams(\n dir,\n registration.urlPath,\n registration.route,\n suppressUnusedUrlParams\n );\n warnedRoutes.add(warningKey);\n }\n }\n\n if (isExactUrlPath(registration.urlPath)) {\n const exact = registration.urlPath.exact;\n\n if (seenExactWritePaths.has(exact))\n throw new Error(\n `Duplicate exact urlPath \"${exact}\" on route \"${registration.route}\"; it is already used on route \"${seenExactWritePaths.get(\n exact\n )}\".`\n );\n\n seenExactWritePaths.set(exact, registration.route);\n continue;\n }\n\n const firstDirSegment = dir.split(\"/\")[0];\n\n if (\n findFileEnabled &&\n (DEFAULT_UPLOAD_DIRS as readonly string[]).includes(firstDirSegment)\n )\n continue;\n\n if (serving === \"all\") {\n if (!warnedAboutAllMode && serveRegistrations.length > 0) {\n warningAboutAllMode();\n warnedAboutAllMode = true;\n }\n continue;\n }\n\n if (registration.serve === false) continue;\n\n const writePublicPath = normalizeUploadUrlPath(\n registration.urlPath ?? `/${dir}`\n );\n\n let bestMatch:\n | { registration: UploadServeRegistration; match: TemplateMatch }\n | undefined;\n\n for (const serveRegistration of serveRegistrations) {\n const match = matchDirTemplates(\n serveRegistration.dir,\n dir,\n serveRegistration.recursive\n );\n\n if (!match) continue;\n\n if (!bestMatch || match.matched > bestMatch.match.matched) {\n bestMatch = { registration: serveRegistration, match };\n continue;\n }\n\n if (\n match.matched === bestMatch.match.matched &&\n normalizeUploadUrlPath(serveRegistration.urlPath) !==\n normalizeUploadUrlPath(bestMatch.registration.urlPath)\n )\n throw new Error(\n `Upload directory \"${dir}\" on route \"${registration.route}\" is ambiguously served by \"${bestMatch.registration.urlPath}\" and \"${serveRegistration.urlPath}\".`\n );\n }\n\n if (!bestMatch)\n throw new Error(\n `Upload directory \"${dir}\" used by route \"${registration.route}\" is not served. Register it with arkos.serveUploadDir(\"${dir}\"), register one of its parent folders with arkos.serveUploadDir(parent, { recursive: true }), or set \"serve: false\" in the route's uploads config.`\n );\n\n const servedPublicPath = normalizeUploadUrlPath(\n `${substitutePath(bestMatch.registration.urlPath, bestMatch.match.params)}${\n bestMatch.match.remaining.length\n ? `/${bestMatch.match.remaining.join(\"/\")}`\n : \"\"\n }`\n );\n\n if (servedPublicPath !== writePublicPath)\n throw new Error(\n `Generated URL \"${writePublicPath}\" does not match served URL \"${servedPublicPath}\" for upload directory \"${dir}\".`\n );\n }\n\n if (\n serving === \"all\" &&\n serveRegistrations.length > 0 &&\n !warnedAboutAllMode\n )\n warningAboutAllMode();\n}\n\nfunction warningAboutAllMode() {\n sheu.warn(\n `fileUpload.serving is \"all\"; per-folder permissions registered via arkos.serveUploadDir() are not enforced.`,\n { timestamp: true }\n );\n}\n"]}
|
|
@@ -5,6 +5,7 @@ class UploadServingRegistry {
|
|
|
5
5
|
constructor() {
|
|
6
6
|
this.writeRegistrations = [];
|
|
7
7
|
this.serveRegistrations = [];
|
|
8
|
+
this.serveSources = [];
|
|
8
9
|
this.findFileServingEnabled = false;
|
|
9
10
|
}
|
|
10
11
|
registerWrite(registration) {
|
|
@@ -13,12 +14,18 @@ class UploadServingRegistry {
|
|
|
13
14
|
registerServe(registration) {
|
|
14
15
|
this.serveRegistrations.push(registration);
|
|
15
16
|
}
|
|
17
|
+
registerServeSource(source) {
|
|
18
|
+
this.serveSources.push(source);
|
|
19
|
+
}
|
|
16
20
|
getWriteRegistrations() {
|
|
17
21
|
return [...this.writeRegistrations];
|
|
18
22
|
}
|
|
19
23
|
getServeRegistrations() {
|
|
20
24
|
return [...this.serveRegistrations];
|
|
21
25
|
}
|
|
26
|
+
getServeSources() {
|
|
27
|
+
return [...this.serveSources];
|
|
28
|
+
}
|
|
22
29
|
setFindFileServingEnabled(enabled) {
|
|
23
30
|
this.findFileServingEnabled = enabled;
|
|
24
31
|
}
|
|
@@ -28,6 +35,7 @@ class UploadServingRegistry {
|
|
|
28
35
|
reset() {
|
|
29
36
|
this.writeRegistrations = [];
|
|
30
37
|
this.serveRegistrations = [];
|
|
38
|
+
this.serveSources = [];
|
|
31
39
|
this.findFileServingEnabled = false;
|
|
32
40
|
}
|
|
33
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-serving.registry.js","sourceRoot":"","sources":["../../../../../../src/modules/file-upload/utils/helpers/upload-serving.registry.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"upload-serving.registry.js","sourceRoot":"","sources":["../../../../../../src/modules/file-upload/utils/helpers/upload-serving.registry.ts"],"names":[],"mappings":";;;AA6BA,MAAa,qBAAqB;IAAlC;QACU,uBAAkB,GAA8B,EAAE,CAAC;QACnD,uBAAkB,GAA8B,EAAE,CAAC;QACnD,iBAAY,GAAwB,EAAE,CAAC;QACvC,2BAAsB,GAAG,KAAK,CAAC;IAwCzC,CAAC;IAtCC,aAAa,CAAC,YAAqC;QACjD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED,aAAa,CAAC,YAAqC;QACjD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED,mBAAmB,CAAC,MAAyB;QAC3C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,qBAAqB;QACnB,OAAO,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IAED,qBAAqB;QACnB,OAAO,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IAED,eAAe;QACb,OAAO,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,yBAAyB,CAAC,OAAgB;QACxC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC;IACxC,CAAC;IAED,wBAAwB;QACtB,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC;IACtC,CAAC;CACF;AA5CD,sDA4CC;AAEY,QAAA,qBAAqB,GAAG,IAAI,qBAAqB,EAAE,CAAC","sourcesContent":["import type { UploadUrlPath } from \"../../../../types/upload\";\nimport type { ArkosRouterState } from \"../../../../utils/arkos-router/types\";\n\nexport type UploadWriteRegistration = {\n dir?: string;\n urlPath?: UploadUrlPath;\n serve?: boolean;\n route: string;\n hasPrepare?: boolean;\n type?: \"single\" | \"array\" | \"fields\";\n};\n\nexport type UploadServeRegistration = {\n dir: string;\n urlPath: string;\n dirParams: string[];\n pathParams: string[];\n recursive: boolean;\n dynamic: boolean;\n hasPrepare: boolean;\n};\n\nexport type UploadServeSource = Omit<\n UploadServeRegistration,\n \"urlPath\" | \"pathParams\"\n> & {\n router: ArkosRouterState;\n};\n\nexport class UploadServingRegistry {\n private writeRegistrations: UploadWriteRegistration[] = [];\n private serveRegistrations: UploadServeRegistration[] = [];\n private serveSources: UploadServeSource[] = [];\n private findFileServingEnabled = false;\n\n registerWrite(registration: UploadWriteRegistration) {\n this.writeRegistrations.push(registration);\n }\n\n registerServe(registration: UploadServeRegistration) {\n this.serveRegistrations.push(registration);\n }\n\n registerServeSource(source: UploadServeSource) {\n this.serveSources.push(source);\n }\n\n getWriteRegistrations() {\n return [...this.writeRegistrations];\n }\n\n getServeRegistrations() {\n return [...this.serveRegistrations];\n }\n\n getServeSources() {\n return [...this.serveSources];\n }\n\n setFindFileServingEnabled(enabled: boolean) {\n this.findFileServingEnabled = enabled;\n }\n\n isFindFileServingEnabled() {\n return this.findFileServingEnabled;\n }\n\n reset() {\n this.writeRegistrations = [];\n this.serveRegistrations = [];\n this.serveSources = [];\n this.findFileServingEnabled = false;\n }\n}\n\nexport const uploadServingRegistry = new UploadServingRegistry();\n"]}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const deepmerge_helper_1 = __importDefault(require("../helpers/deepmerge.helper.js"));
|
|
7
|
-
const exit_error_1 = __importDefault(require("../helpers/exit-error.js"));
|
|
8
7
|
class ArkosRouterOpenAPIManager {
|
|
9
8
|
resolveSchemaFieldName(name) {
|
|
10
9
|
return name.replace(/\[\]/g, "[0]");
|
|
@@ -152,7 +151,7 @@ class ArkosRouterOpenAPIManager {
|
|
|
152
151
|
errors.push(`Upload field '${name}' is not required in config but marked as required in schema`);
|
|
153
152
|
}
|
|
154
153
|
if (errors.length > 0) {
|
|
155
|
-
throw
|
|
154
|
+
throw new Error(`ValidationError: Invalid multipart/form-data schema for route '${routePath}':\n${errors.map((e) => ` - ${e}`).join("\n")}`);
|
|
156
155
|
}
|
|
157
156
|
}
|
|
158
157
|
}
|