@appsemble/node-utils 0.21.2 → 0.22.0

package/EmailQuotaExceededError.d.ts

@@ -0,0 +1,3 @@
+export declare class EmailQuotaExceededError extends Error {
+    constructor(message: string);
+}

package/EmailQuotaExceededError.js

@@ -0,0 +1,8 @@
+export class EmailQuotaExceededError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'EmailQuotaExceededError';
+        Error.captureStackTrace(this, EmailQuotaExceededError);
+    }
+}
+//# sourceMappingURL=EmailQuotaExceededError.js.map

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.21.2/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.22.0/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.21.2/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.21.2)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.22.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.22.0)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.21.2/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.22.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/index.d.ts

@@ -7,7 +7,7 @@ export * from './handleError.js';
 export * from './interceptors.js';
 export * from './logger.js';
 export * from './middleware/loggerMiddleware.js';
-export * from './middleware/boom.js';
+export * from './middleware/error.js';
 export * from './middleware/conditional.js';
 export * from './middleware/frontend.js';
 export * from './parsers.js';
@@ -30,3 +30,5 @@ export * from './server/routes/appRouter/iconHandler.js';
 export * from './server/controllers/index.js';
 export * from './server/types.js';
 export * from './koa.js';
+export { bulmaVersion, faVersion, version } from './versions.cjs';
+export * from './EmailQuotaExceededError.js';

package/index.js

@@ -7,7 +7,7 @@ export * from './handleError.js';
 export * from './interceptors.js';
 export * from './logger.js';
 export * from './middleware/loggerMiddleware.js';
-export * from './middleware/boom.js';
+export * from './middleware/error.js';
 export * from './middleware/conditional.js';
 export * from './middleware/frontend.js';
 export * from './parsers.js';
@@ -30,4 +30,6 @@ export * from './server/routes/appRouter/iconHandler.js';
 export * from './server/controllers/index.js';
 export * from './server/types.js';
 export * from './koa.js';
+export { bulmaVersion, faVersion, version } from './versions.cjs';
+export * from './EmailQuotaExceededError.js';
 //# sourceMappingURL=index.js.map

package/jsonschema.d.ts

@@ -1,2 +1,3 @@
 import { type ValidatorResult } from 'jsonschema';
-export declare function handleValidatorResult(result: ValidatorResult, msg?: string): void;
+import { type Context } from 'koa';
+export declare function handleValidatorResult(ctx: Context, result: ValidatorResult, msg?: string): void;

package/jsonschema.js

@@ -1,7 +1,18 @@
-import { badRequest } from '@hapi/boom';
-export function handleValidatorResult(result, msg = 'JSON schema validation failed') {
+export function handleValidatorResult(ctx, result, msg = 'JSON schema validation failed') {
     if (!result.valid) {
-        throw badRequest(msg, { errors: result.errors });
+        if (ctx.response === undefined) {
+            throw new Error(msg, { cause: result.errors });
+        }
+        ctx.response.status = 400;
+        ctx.response.body = {
+            statusCode: 400,
+            error: 'Bad Request',
+            message: msg,
+            data: {
+                errors: result.errors,
+            },
+        };
+        ctx.throw();
     }
 }
 //# sourceMappingURL=jsonschema.js.map

package/middleware/error.d.ts

@@ -0,0 +1,2 @@
+import { type Middleware } from 'koa';
+export declare function errorMiddleware(): Middleware;

package/middleware/error.js

@@ -0,0 +1,27 @@
+export function errorMiddleware() {
+    return async (ctx, next) => {
+        try {
+            await next();
+        }
+        catch (error) {
+            ctx.response.type = 'json';
+            if (ctx.status && ctx.body) {
+                ctx.app.emit('event', error, ctx);
+            }
+            else if (error instanceof Error &&
+                error.message === 'Fields "subject" and "body" must be a valid string') {
+                ctx.response.status = 400;
+                ctx.response.body = {
+                    error: 'Bad Request',
+                    message: 'Fields "subject" and "body" must be a valid string',
+                    statusCode: 400,
+                };
+                ctx.app.emit('event', error, ctx);
+            }
+            else {
+                throw error;
+            }
+        }
+    };
+}
+//# sourceMappingURL=error.js.map

package/middleware/{boom.test.js → error.test.js}

@@ -1,17 +1,22 @@
-import { notFound, unauthorized } from '@hapi/boom';
 import { request, setTestApp } from 'axios-test-instance';
 import Koa from 'koa';
-import { boomMiddleware } from './boom.js';
-describe('boomMiddleware', () => {
+import { errorMiddleware } from './error.js';
+describe('errorMiddleware', () => {
     let app;
     beforeEach(async () => {
         app = new Koa();
-        app.use(boomMiddleware());
+        app.use(errorMiddleware());
         await setTestApp(app);
     });
-    it('should catch boom errors', async () => {
-        app.use(() => {
-            throw notFound('Error not found', "It's nowhere to be seen!");
+    it('should catch Koa errors', async () => {
+        app.use((ctx) => {
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'Error not found',
+            };
+            ctx.throw();
         });
         const response = await request.get('/');
         expect(response).toMatchObject({
@@ -20,11 +25,10 @@ describe('boomMiddleware', () => {
                 statusCode: 404,
                 error: 'Not Found',
                 message: 'Error not found',
-                data: "It's nowhere to be seen!",
             },
         });
     });
-    it('should rethrow non-boom errors', async () => {
+    it('should rethrow non-Koa errors', async () => {
         app.silent = true;
         const error = new Error('This is a test error');
         let result;
@@ -38,8 +42,15 @@ describe('boomMiddleware', () => {
         expect(result).toBe(error);
     });
     it('should set Koa headers correctly', async () => {
-        app.use(() => {
-            throw unauthorized('Not authorized!', ['Basic realm="Access to test data", charset="UTF-8"']);
+        app.use((ctx) => {
+            ctx.set('www-authenticate', 'Basic realm="Access to test data", charset="UTF-8"');
+            ctx.response.status = 401;
+            ctx.response.body = {
+                error: 'Unauthorized',
+                message: 'Not authorized!',
+                statusCode: 401,
+            };
+            ctx.throw();
         });
         const response = await request.get('/');
         expect(response).toMatchObject({
@@ -55,4 +66,4 @@ describe('boomMiddleware', () => {
         });
     });
 });
-//# sourceMappingURL=boom.test.js.map
+//# sourceMappingURL=error.test.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -21,6 +21,12 @@
   "author": "Appsemble <info@appsemble.com> (https://appsemble.com)",
   "sideEffects": false,
   "type": "module",
+  "exports": {
+    ".": [
+      "./index.js",
+      "./index.ts"
+    ]
+  },
   "files": [
     "**/*.d.ts",
     "**/*.js",
@@ -31,11 +37,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.21.2",
-    "@appsemble/utils": "0.21.2",
+    "@appsemble/types": "0.22.0",
+    "@appsemble/utils": "0.22.0",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
-    "@hapi/boom": "^10.0.0",
     "@koa/cors": "^4.0.0",
     "@odata/parser": "^0.2.0",
     "@types/koa": "^2.0.0",
@@ -86,13 +91,11 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@sinonjs/fake-timers": "^10.0.0",
     "@types/koa-compress": "^4.0.0",
     "@types/koa-range": "^0.3.0",
-    "@types/sinonjs__fake-timers": "^8.0.0",
     "axios-mock-adapter": "^1.0.0",
     "axios-test-instance": "^7.0.0",
-    "vitest": "^0.33.0"
+    "vitest": "^0.34.0"
   },
   "peerDependencies": {
     "prettier": "^2"

package/resource.d.ts

@@ -10,10 +10,11 @@ import { type File } from 'koas-body-parser';
  *
  * @param app The app to get the resource definition of
  * @param resourceType The name of the resource definition to get.
+ * @param ctx Context used to throw back the errors.
  * @param view The view that’s being used.
  * @returns The matching resource definition.
  */
-export declare function getResourceDefinition(app: App, resourceType: string, view?: string): ResourceDefinition;
+export declare function getResourceDefinition(app: App, resourceType: string, ctx?: Context, view?: string): ResourceDefinition;
 /**
  * Extracts the IDs of resource request body.
  *

package/resource.js

@@ -1,6 +1,5 @@
 import { randomUUID } from 'node:crypto';
 import { handleValidatorResult } from '@appsemble/node-utils';
-import { notFound } from '@hapi/boom';
 import { addMilliseconds, isPast, parseISO } from 'date-fns';
 import { ValidationError, Validator } from 'jsonschema';
 import parseDuration from 'parse-duration';
@@ -15,20 +14,54 @@ function stripResource({ $author, $created, $editor, $updated, ...data }) {
  *
  * @param app The app to get the resource definition of
  * @param resourceType The name of the resource definition to get.
+ * @param ctx Context used to throw back the errors.
  * @param view The view that’s being used.
  * @returns The matching resource definition.
  */
-export function getResourceDefinition(app, resourceType, view) {
+export function getResourceDefinition(app, resourceType, ctx, view) {
     var _a;
     if (!app) {
-        throw notFound('App not found');
+        if (ctx === undefined) {
+            throw new Error('App not found');
+        }
+        else {
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App not found',
+            };
+            ctx.throw();
+        }
     }
     const definition = (_a = app.definition.resources) === null || _a === void 0 ? void 0 : _a[resourceType];
     if (!definition) {
-        throw notFound(`App does not have resources called ${resourceType}`);
+        if (ctx === undefined || ctx.response === undefined) {
+            throw new Error(`App does not have resources called ${resourceType}`);
+        }
+        else {
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: `App does not have resources called ${resourceType}`,
+            };
+            ctx.throw();
+        }
     }
     if (view && !definition.views[view]) {
-        throw notFound(`View ${view} does not exist for resource type ${resourceType}`);
+        if (ctx === undefined) {
+            throw new Error(`View ${view} does not exist for resource type ${resourceType}`);
+        }
+        else {
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: `View ${view} does not exist for resource type ${resourceType}`,
+            };
+            ctx.throw();
+        }
     }
     return definition;
 }
@@ -166,7 +199,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
             result.errors.push(new ValidationError('is not referenced from the resource', assetId, null, ['assets', assetId], 'binary', 'format'));
         }
     }
-    handleValidatorResult(result, 'Resource validation failed');
+    handleValidatorResult(ctx, result, 'Resource validation failed');
     return [resource, preparedAssets, knownAssetIds.filter((id) => !reusedAssets.has(id))];
 }
 //# sourceMappingURL=resource.js.map

package/server/controllers/action.js

@@ -1,9 +1,8 @@
-import { getRemapperContext, logger } from '@appsemble/node-utils';
+import { getRemapperContext, logger, version } from '@appsemble/node-utils';
 import { defaultLocale, formatRequestAction, remap } from '@appsemble/utils';
-import { badGateway, badRequest, methodNotAllowed, notFound } from '@hapi/boom';
 import axios from 'axios';
 import { get, pick } from 'lodash-es';
-import pkg from '../../package.json' assert { type: 'json' };
+import { EmailQuotaExceededError } from '../../EmailQuotaExceededError.js';
 /**
  * These response headers are forwarded when proxying requests.
  */
@@ -17,11 +16,31 @@ const supportedActions = ['email', 'notify', 'request'];
 async function handleEmail(ctx, app, action, options) {
     const { mailer, method, request: { body: data }, user, } = ctx;
     if (method !== 'POST') {
-        throw methodNotAllowed('Method must be POST for email actions');
+        ctx.response.status = 405;
+        ctx.response.body = {
+            statusCode: 405,
+            message: 'Method must be POST for email actions',
+            error: 'Method Not Allowed',
+        };
+        ctx.throw();
     }
     const { email, reloadUser } = options;
     await reloadUser({ context: ctx });
-    await email({ action, data, mailer, user, options, context: ctx });
+    try {
+        await email({ action, data, mailer, user, options, context: ctx });
+    }
+    catch (error) {
+        if (error instanceof EmailQuotaExceededError) {
+            ctx.response.status = 429;
+            ctx.response.body = {
+                statusCode: 429,
+                error: 'Too Many Requests',
+                message: error.message,
+            };
+            ctx.throw();
+        }
+        ctx.throw(error);
+    }
     ctx.status = 204;
 }
 async function handleNotify(ctx, app, action, options) {
@@ -54,7 +73,13 @@ async function handleRequestProxy(ctx, app, action, useBody, options) {
             data = JSON.parse(query.data);
         }
         catch {
-            throw badRequest('data should be a JSON object');
+            ctx.response.status = 400;
+            ctx.response.body = {
+                status: 400,
+                message: 'data should be a JSON object.',
+                error: 'Bad Request',
+            };
+            ctx.throw();
         }
     }
     const { applyAppServiceSecrets, reloadUser } = options;
@@ -69,14 +94,21 @@ async function handleRequestProxy(ctx, app, action, useBody, options) {
     let axiosConfig = formatRequestAction(action, data, (remapper, d) => remap(remapper, d, remapperContext), remapperContext.context);
     axiosConfig = await applyAppServiceSecrets({ axiosConfig, context: ctx, app });
     if (axiosConfig.method.toUpperCase() !== method) {
-        throw badRequest('Method does match the request action method');
+        ctx.response.status = 400;
+        ctx.response.body = {
+            statusCode: 400,
+            message: 'Method does not match the request action method',
+            error: 'Bad Request',
+        };
+        ctx.throw();
     }
     if (useBody) {
         axiosConfig.data = data;
     }
-    axiosConfig.headers['user-agent'] = `AppsembleServer/${pkg.version}`;
+    axiosConfig.headers['user-agent'] = `AppsembleServer/${version}`;
     axiosConfig.responseType = 'stream';
     axiosConfig.validateStatus = () => true;
+    axiosConfig.decompress = false;
     let response;
     logger.verbose(`Forwarding request to ${axios.getUri(axiosConfig)}`);
     try {
@@ -84,7 +116,13 @@ async function handleRequestProxy(ctx, app, action, useBody, options) {
     }
     catch (err) {
         logger.error(err);
-        throw badGateway();
+        ctx.response.status = 502;
+        ctx.response.body = {
+            statusCode: 502,
+            error: 'Bad Gateway',
+            message: 'Bad Gateway',
+        };
+        ctx.throw(502);
     }
     ctx.status = response.status;
     ctx.set(pick(response.headers, allowResponseHeaders));
@@ -95,7 +133,13 @@ function createProxyHandler(useBody, options) {
         const { pathParams: { appId, path }, } = ctx;
         const app = await options.getApp({ context: ctx, query: { where: { id: appId } } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App not found',
+            };
+            ctx.throw();
         }
         const appAction = get(app.definition, path);
         const action = supportedActions.find((act) => act === (appAction === null || appAction === void 0 ? void 0 : appAction.type));
@@ -107,7 +151,13 @@ function createProxyHandler(useBody, options) {
             case 'request':
                 return handleRequestProxy(ctx, app, appAction, useBody, options);
             default:
-                throw badRequest('path does not point to a proxyable action');
+                ctx.response.status = 400;
+                ctx.response.body = {
+                    statusCode: 400,
+                    message: 'path does not point to a proxyable action',
+                    error: 'Bad Request',
+                };
+                ctx.throw();
         }
     };
 }

package/server/controllers/appMembers.js

@@ -1,17 +1,34 @@
-import { notFound } from '@hapi/boom';
 export function createGetAppMember({ getApp, getAppMembers }) {
     return async (ctx) => {
         const { pathParams: { appId, memberId }, } = ctx;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App not found',
+            };
+            ctx.throw();
         }
         if (app.definition.security === undefined) {
-            throw notFound('App does not have a security definition');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App does not have a security definition',
+            };
+            ctx.throw();
         }
         const appMembers = await getAppMembers({ context: ctx, app, memberId });
         if (appMembers.length !== 1) {
-            throw notFound('App member not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App member not found',
+            };
+            ctx.throw();
         }
         ctx.body = appMembers[0];
     };

package/server/controllers/appMessages.js

@@ -1,13 +1,17 @@
 import { getAppsembleMessages, mergeMessages, } from '@appsemble/node-utils';
 import { defaultLocale, extractAppMessages, normalizeBlockName, } from '@appsemble/utils';
-import { badRequest, notFound } from '@hapi/boom';
 import tags from 'language-tags';
 export function createGetMessages({ getApp, getAppMessages, getBlockMessages, }) {
     return async (ctx) => {
         var _a, _b, _c, _d, _e;
         const { pathParams: { appId, language }, query: { merge, override = 'true' }, } = ctx;
         if (!tags.check(language)) {
-            throw badRequest(`Language “${language}” is invalid`);
+            ctx.response.status = 400;
+            ctx.response.body = {
+                error: 'Bad Request',
+                message: '`Language “${language}” is invalid`',
+            };
+            ctx.throw();
         }
         const lang = language.toLowerCase();
         const baseLanguage = tags(language)
@@ -16,7 +20,13 @@ export function createGetMessages({ getApp, getAppMessages, getBlockMessages, })
         const baseLang = baseLanguage && String(baseLanguage).toLowerCase();
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                status: 404,
+                message: 'App not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const appMessages = await getAppMessages({ context: ctx, app, language });
         const blockPrefixes = [];
@@ -35,7 +45,13 @@ export function createGetMessages({ getApp, getAppMessages, getBlockMessages, })
         const blockMessages = await getBlockMessages({ context: ctx, blockQuery, baseLang, lang });
         if ((!appMessages.length || (merge && !appMessages.some((m) => m.language === lang))) &&
             lang !== (app.definition.defaultLanguage || defaultLocale)) {
-            throw notFound(`Language “${language}” could not be found`);
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: `Language “${language}” could not be found`,
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const baseLanguageMessages = override === 'true' && appMessages.find((m) => m.language === baseLang);
         const languageMessages = override === 'true' && appMessages.find((m) => m.language === lang);

package/server/controllers/assets.js

@@ -1,12 +1,17 @@
 import { Permission } from '@appsemble/utils';
-import { notFound } from '@hapi/boom';
 import { extension } from 'mime-types';
 export function createGetAssets({ checkRole, getApp, getAppAssets }) {
     return async (ctx) => {
         const { pathParams: { appId }, queryParams: { $skip, $top }, } = ctx;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'App not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const findOptions = {
             limit: $top,
@@ -22,13 +27,25 @@ export function createGetAssetById({ getApp, getAppAssets }) {
         const { pathParams: { appId, assetId }, } = ctx;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'App not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const assets = await getAppAssets({ app, context: ctx });
         // Pick asset id over asset name
         const asset = assets.find((a) => a.id === assetId) || assets.find((a) => a.name === assetId);
         if (!asset) {
-            throw notFound('Asset not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'Asset not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         if (assetId !== asset.id) {
             // Redirect to asset using current asset ID
@@ -60,7 +77,13 @@ export function createCreateAsset({ createAppAsset, getApp }) {
         const { pathParams: { appId }, request: { body: { file: { contents, filename, mime }, name, }, }, } = ctx;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'App not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const asset = await createAppAsset({
             app,

package/server/controllers/oauth2Provider.js

@@ -1,7 +1,7 @@
 export function createGetUserInfo({ getAppUserInfo }) {
     return async (ctx) => {
         const { client, user } = ctx;
-        ctx.body = await getAppUserInfo({ context: ctx, client, user });
+        ctx.body = await getAppUserInfo({ context: ctx, client, user, ctx });
     };
 }
 //# sourceMappingURL=oauth2Provider.js.map

package/server/controllers/resources.js

@@ -1,16 +1,28 @@
 import { getRemapperContext, getResourceDefinition, logger, processResourceBody, } from '@appsemble/node-utils';
 import { defaultLocale, remap } from '@appsemble/utils';
-import { badRequest, internal, notFound } from '@hapi/boom';
 function generateQuery(ctx, { parseQuery }) {
     try {
         return parseQuery({ $filter: ctx.queryParams.$filter, $orderby: ctx.queryParams.$orderby });
     }
     catch (error) {
         if (error instanceof Error) {
-            throw badRequest('Unable to process this query', { syntaxError: error.message });
+            ctx.response.status = 400;
+            ctx.response.body = {
+                statusCode: 400,
+                error: 'Bad Request',
+                message: 'Unable to process this query',
+                data: { syntaxError: error.message },
+            };
+            ctx.throw();
         }
         logger.error(error);
-        throw internal('Unable to process this query');
+        ctx.response.status = 500;
+        ctx.response.body = {
+            statusCode: 500,
+            error: 'Internal Server Error',
+            message: 'Unable to process this query',
+        };
+        ctx.throw();
     }
 }
 export function createQueryResources(options) {
@@ -26,6 +38,7 @@ export function createQueryResources(options) {
             resourceType,
             action: 'query',
             options,
+            ctx,
         });
         const findOptions = {
             limit: $top,
@@ -51,7 +64,7 @@ export function createQueryResources(options) {
             context: ctx,
         });
         const view = (_a = ctx.queryParams) === null || _a === void 0 ? void 0 : _a.view;
-        const resourceDefinition = getResourceDefinition(app, resourceType, view);
+        const resourceDefinition = getResourceDefinition(app, resourceType, ctx, view);
         if (view) {
             const context = await getRemapperContext(app, app.definition.defaultLanguage || defaultLocale, user && {
                 sub: user.id,
@@ -78,6 +91,7 @@ export function createCountResources(options) {
             action,
             resourceType,
             options,
+            ctx,
         });
         const { where } = generateQuery(ctx, options);
         const findOptions = {
@@ -110,13 +124,14 @@ export function createGetResourceById(options) {
         const { getApp, getAppResource, verifyResourceActionPermission } = options;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         const view = (_a = ctx.queryParams) === null || _a === void 0 ? void 0 : _a.view;
-        const resourceDefinition = getResourceDefinition(app, resourceType, view);
+        const resourceDefinition = getResourceDefinition(app, resourceType, ctx, view);
         const userQuery = await verifyResourceActionPermission({
             app,
             context: ctx,
             action,
             resourceType,
             options,
+            ctx,
         });
         const findOptions = {
             where: {
@@ -135,7 +150,13 @@ export function createGetResourceById(options) {
             findOptions,
         });
         if (!resource) {
-            throw notFound('Resource not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'Resource not found',
+            };
+            ctx.throw();
         }
         if (view) {
             const context = await getRemapperContext(app, app.definition.defaultLanguage || defaultLocale, user && {
@@ -157,8 +178,8 @@ export function createCreateResource(options) {
         const { createAppResourcesWithAssets, getApp, verifyResourceActionPermission } = options;
         const action = 'create';
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
-        const resourceDefinition = getResourceDefinition(app, resourceType);
-        await verifyResourceActionPermission({ app, context: ctx, action, resourceType, options });
+        const resourceDefinition = getResourceDefinition(app, resourceType, ctx);
+        await verifyResourceActionPermission({ app, context: ctx, action, resourceType, options, ctx });
         const [processedBody, preparedAssets] = processResourceBody(ctx, resourceDefinition);
         if (Array.isArray(processedBody) && !processedBody.length) {
             ctx.body = [];
@@ -183,13 +204,14 @@ export function createUpdateResource(options) {
         const { getApp, getAppAssets, getAppResource, updateAppResource, verifyResourceActionPermission, } = options;
         const action = 'update';
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
-        const resourceDefinition = getResourceDefinition(app, resourceType);
+        const resourceDefinition = getResourceDefinition(app, resourceType, ctx);
         const userQuery = await verifyResourceActionPermission({
             app,
             context: ctx,
             action,
             resourceType,
             options,
+            ctx,
         });
         const findOptions = {
             where: {
@@ -208,7 +230,13 @@ export function createUpdateResource(options) {
             findOptions,
         });
         if (!oldResource) {
-            throw notFound('Resource not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'Resource not found',
+            };
+            ctx.throw();
         }
         const appAssets = await getAppAssets({ context: ctx, app });
         const [processedBody, preparedAssets, deletedAssetIds] = processResourceBody(ctx, resourceDefinition, appAssets.filter((asset) => asset.resourceId === resourceId).map((asset) => asset.id), oldResource.expires);
@@ -239,6 +267,7 @@ export function createDeleteResource(options) {
             action,
             resourceType,
             options,
+            ctx,
         });
         const findOptions = {
             where: {
@@ -257,7 +286,13 @@ export function createDeleteResource(options) {
             findOptions,
         });
         if (!resource) {
-            throw notFound('Resource not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'Resource not found',
+            };
+            ctx.throw();
         }
         await deleteAppResource({
             app,

package/server/controllers/resources.test.js

@@ -173,7 +173,7 @@ describe('createQueryResources', () => {
             getAppUrl: mockGetAppUrl,
             getAppMessages: mockGetAppMessages,
         };
-        const resourceDefinition = getResourceDefinition(mockApp, 'mockResourceType', 'view');
+        const resourceDefinition = getResourceDefinition(mockApp, 'mockResourceType', mockCtx, 'view');
         const remapperContext = await getRemapperContext(mockApp, mockApp.definition.defaultLanguage || defaultLocale, null, options, mockCtx);
         const remappedResources = mockResources.map((resource) => remap(resourceDefinition.views.view.remap, resource, remapperContext));
         const middleware = createQueryResources(options);
@@ -413,7 +413,7 @@ describe('createGetResourceById', () => {
             getAppUrl: mockGetAppUrl,
             getAppMessages: mockGetAppMessages,
         };
-        const resourceDefinition = getResourceDefinition(mockApp, 'mockResourceType', 'view');
+        const resourceDefinition = getResourceDefinition(mockApp, 'mockResourceType', mockCtx, 'view');
         const remapperContext = await getRemapperContext(mockApp, mockApp.definition.defaultLanguage || defaultLocale, null, options, mockCtx);
         const remappedResource = remap(resourceDefinition.views.view.remap, mockResource, remapperContext);
         const middleware = createGetResourceById(options);

package/server/controllers/teams.js

@@ -1,10 +1,15 @@
-import { notFound } from '@hapi/boom';
 export function createGetTeams({ getApp, getAppTeams }) {
     return async (ctx) => {
         const { pathParams: { appId }, user, } = ctx;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App not found',
+            };
+            ctx.throw();
         }
         ctx.body = await getAppTeams({ context: ctx, app, user });
     };

package/server/routes/appRouter/blockAssetHandler.js

@@ -1,10 +1,15 @@
-import { notFound } from '@hapi/boom';
 export function createBlockAssetHandler({ getBlockAsset }) {
     return async (ctx) => {
         const { params: { filename, name, version }, } = ctx;
         const blockAsset = await getBlockAsset({ filename, name, version, context: ctx });
         if (!blockAsset) {
-            throw notFound('Block asset not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'Block asset not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         ctx.body = blockAsset.content;
         ctx.type = blockAsset.mime;

package/server/routes/appRouter/blockCssHandler.js

@@ -1,10 +1,15 @@
-import { notFound } from '@hapi/boom';
 export function createBlockCssHandler({ getApp, getAppBlockStyles }) {
     return async (ctx) => {
         const { params: { name }, } = ctx;
         const app = await getApp({ context: ctx });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App not found',
+            };
+            ctx.throw();
         }
         const appBlockStyles = await getAppBlockStyles({ app, name, context: ctx });
         const [style] = appBlockStyles;

package/server/routes/appRouter/bulmaHandler.js

@@ -1,7 +1,6 @@
 import { createRequire } from 'node:module';
-import { logger } from '@appsemble/node-utils';
+import { bulmaVersion, logger } from '@appsemble/node-utils';
 import { baseTheme } from '@appsemble/utils';
-import bulma from 'bulma/package.json' assert { type: 'json' };
 import { renderSync } from 'sass';
 import stripBom from 'strip-bom';
 const require = createRequire(import.meta.url);
@@ -76,7 +75,7 @@ export function createBulmaHandler({ createTheme, getTheme }) {
     return async (ctx) => {
         const { query } = ctx;
         const theme = {
-            bulmaVersion: bulma.version,
+            bulmaVersion,
             primaryColor: (getQueryParameter(query.primaryColor) || baseTheme.primaryColor).toLowerCase(),
             linkColor: (getQueryParameter(query.linkColor) || baseTheme.linkColor).toLowerCase(),
             successColor: (getQueryParameter(query.successColor) || baseTheme.successColor).toLowerCase(),

package/server/routes/appRouter/cssHandler.js

@@ -1,9 +1,14 @@
-import { notFound } from '@hapi/boom';
 export function createCssHandler(type, { getAppStyles }) {
     return async (ctx) => {
         const app = await getAppStyles({ context: ctx, query: { attributes: [type], raw: true } });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'App not found',
+            };
+            ctx.throw();
         }
         ctx.body = app[type];
         ctx.type = 'css';

package/server/routes/appRouter/index.js

@@ -1,8 +1,7 @@
 import { createRequire } from 'node:module';
 import { dirname } from 'node:path';
-import { tinyRouter } from '@appsemble/node-utils';
+import { faVersion, tinyRouter } from '@appsemble/node-utils';
 import { noop, partialNormalized, partialSemver } from '@appsemble/utils';
-import faPkg from '@fortawesome/fontawesome-free/package.json' assert { type: 'json' };
 import mount from 'koa-mount';
 import serve from 'koa-static';
 import { createBlockAssetHandler } from './blockAssetHandler.js';
@@ -50,7 +49,7 @@ export function createAppRouter(options) {
         },
         {
             route: /^\/fa\//,
-            get: mount(`/fa/${faPkg.version}`, serve(dirname(require.resolve('@fortawesome/fontawesome-free/package.json')))),
+            get: mount(`/fa/${faVersion}`, serve(dirname(require.resolve('@fortawesome/fontawesome-free/package.json')))),
         },
         {
             route: '/core.css',

package/server/routes/appRouter/indexHandler.js

@@ -1,11 +1,10 @@
 import { randomBytes } from 'node:crypto';
 import { createThemeURL, defaultLocale, getAppBlocks, mergeThemes } from '@appsemble/utils';
-import faPkg from '@fortawesome/fontawesome-free/package.json' assert { type: 'json' };
-import bulmaPkg from 'bulma/package.json' assert { type: 'json' };
 import { organizationBlocklist } from '../../../organizationBlocklist.js';
 import { makeCSP, render } from '../../../render.js';
-export const bulmaURL = `/bulma/${bulmaPkg.version}/bulma.min.css`;
-export const faURL = `/fa/${faPkg.version}/css/all.min.css`;
+import { bulmaVersion, faVersion } from '../../../versions.cjs';
+export const bulmaURL = `/bulma/${bulmaVersion}/bulma.min.css`;
+export const faURL = `/fa/${faVersion}/css/all.min.css`;
 export function createIndexHandler({ createSettings, getApp, getAppDetails, getAppMessages, getAppUrl, getCsp, getHost, }) {
     return async (ctx) => {
         var _a;

package/server/routes/appRouter/manifestHandler.js

@@ -1,12 +1,17 @@
 import { baseTheme, normalize } from '@appsemble/utils';
-import { notFound } from '@hapi/boom';
 import { extension } from 'mime-types';
 const iconSizes = [48, 144, 192, 512];
 export function createManifestHandler({ getApp, getAppScreenshots }) {
     return async (ctx) => {
         const app = await getApp({ context: ctx });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'Block asset not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const { defaultPage, description, name, theme = baseTheme } = app.definition;
         const { themeColor = '#ffffff', splashColor = themeColor } = theme;

package/server/routes/appRouter/screenshotHandler.js

@@ -1,15 +1,26 @@
-import { notFound } from '@hapi/boom';
 export function createScreenshotHandler({ getApp, getAppScreenshots }) {
     return async (ctx) => {
         const { id } = ctx.params;
         const app = await getApp({ context: ctx });
         if (!app) {
-            throw notFound('App not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'App not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const appScreenshots = await getAppScreenshots({ app, context: ctx });
         const appScreenshot = appScreenshots.find((screenshot) => screenshot.id === Number.parseInt(id));
         if (!appScreenshot) {
-            throw notFound('Screenshot not found');
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'Screenshot not found',
+                error: 'Not Found',
+            };
+            ctx.throw();
         }
         const { mime, screenshot } = appScreenshot;
         ctx.type = mime;

package/server/routes/appRouter/serviceWorkerHandler.js

@@ -8,7 +8,15 @@ export function createServiceWorkerHandler({ getApp, getBlocksAssetsPaths }) {
             ? readFile(new URL('../../../../../dist/app/service-worker.js', import.meta.url), 'utf8')
             : ctx.fs.promises.readFile(filename, 'utf8'));
         const app = await getApp({ context: ctx });
-        ctx.assert(app, 404, 'App does not exist.');
+        if (!app) {
+            ctx.response.status = 404;
+            ctx.response.body = {
+                statusCode: 404,
+                message: 'App does not exist.',
+                error: 'Not Found',
+            };
+            ctx.throw();
+        }
         const identifiableBlocks = getAppBlocks(app.definition);
         const blocksAssetsPaths = await getBlocksAssetsPaths({ identifiableBlocks, context: ctx });
         ctx.body = `const blockAssets=${JSON.stringify(blocksAssetsPaths)};${serviceWorker}`;

package/server/types.d.ts

@@ -3,7 +3,7 @@
 import { type App, type AppMember, type AppMessages, type Asset, type BlockConfig, type BlockDefinition, type BlockManifest, type EmailActionDefinition, type Resource, type ResourceDefinition, type TeamMember, type Theme as ThemeType, type UserInfo } from '@appsemble/types';
 import { type IdentifiableBlock, type Permission } from '@appsemble/utils';
 import { type RawAxiosRequestConfig } from 'axios';
-import { type DefaultContext as DefaultContextInterface, type DefaultState, type ParameterizedContext } from 'koa';
+import { type Context, type DefaultContext as DefaultContextInterface, type DefaultState, type ParameterizedContext } from 'koa';
 export interface UtilsUser {
     id: string;
     name: string;
@@ -19,6 +19,7 @@ declare module 'koa' {
         body: any;
     }
     interface DefaultContext {
+        appPath: string;
         appHost: string;
         appsembleApp: App;
         appBlocks: BlockManifest[];
@@ -130,6 +131,7 @@ export interface GetAppUserInfoParams {
         app: App;
     } | {};
     user: UtilsUser;
+    ctx: Context;
 }
 export interface ExtendedTeam extends TeamMember {
     size: number;
@@ -198,6 +200,7 @@ export interface VerifyResourceActionPermissionParams {
     resourceType: string;
     action: Action;
     options: Options;
+    ctx: Context;
 }
 export interface ApplyAppServiceSecretsParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;

package/tinyRouter.js

@@ -1,5 +1,4 @@
 import { has } from '@appsemble/utils';
-import { methodNotAllowed } from '@hapi/boom';
 /**
  * A tiny dynamic router middleware for GET requests.
  *
@@ -23,7 +22,13 @@ export function tinyRouter(routes) {
         let m = method.toLowerCase();
         if (!has(result, m)) {
             if (!has(result, 'any')) {
-                throw methodNotAllowed();
+                ctx.response.status = 405;
+                ctx.response.body = {
+                    statusCode: 405,
+                    error: 'Method Not Allowed',
+                    message: 'Method not allowed',
+                };
+                ctx.throw();
             }
             m = 'any';
         }

package/tinyRouter.test.js

@@ -1,6 +1,7 @@
 import { noop } from '@appsemble/utils';
 import { request, setTestApp } from 'axios-test-instance';
 import Koa from 'koa';
+import { errorMiddleware } from './index.js';
 import { tinyRouter } from './tinyRouter.js';
 let app;
 let context;
@@ -24,10 +25,7 @@ it('should assign the match group to params', async () => {
     expect(context.params).toStrictEqual({ foo: '1', bar: '2' });
 });
 it('should throw method not allowed if a URL is matched, but not for the given method', async () => {
-    let error;
-    app.on('error', (err) => {
-        error = err;
-    });
+    app.use(errorMiddleware());
     app.use(tinyRouter([
         {
             route: '/',
@@ -35,8 +33,7 @@ it('should throw method not allowed if a URL is matched, but not for the given m
         },
     ]));
     await request.post('/');
-    expect(error.isBoom).toBe(true);
-    expect(error.output.statusCode).toBe(405);
+    expect(context.status).toBe(405);
 });
 it('should fall back to the any handler if it exists', async () => {
     const any = vi.fn();

package/middleware/boom.d.ts

@@ -1,7 +0,0 @@
-import { type Middleware } from 'koa';
-/**
- * Koa middleware for handling Boom errors.
- *
- * @returns Koa middleware that converts Boom errors into an HTTP response.
- */
-export declare function boomMiddleware(): Middleware;

package/middleware/boom.js

@@ -1,32 +0,0 @@
-import { SCIMError } from '../scim.js';
-/**
- * Koa middleware for handling Boom errors.
- *
- * @returns Koa middleware that converts Boom errors into an HTTP response.
- */
-export function boomMiddleware() {
-    return async (ctx, next) => {
-        try {
-            await next();
-        }
-        catch (error) {
-            if (error instanceof SCIMError) {
-                ctx.status = Number(error.status);
-                ctx.body = error;
-                return;
-            }
-            const err = error;
-            if (!err.isBoom) {
-                throw err;
-            }
-            const { output } = err;
-            ctx.status = output.statusCode;
-            ctx.body = output.payload;
-            if (err.data) {
-                ctx.body.data = err.data;
-            }
-            ctx.set(output.headers);
-        }
-    };
-}
-//# sourceMappingURL=boom.js.map

package/vitest.config.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vitest/dist/config.js").UserProjectConfigExport;
-export default _default;