Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/apps/deno-runtime/acorn-walk.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type acorn from './acorn.d.ts';
import type acorn from './acorn.d';

export type FullWalkerCallback<TState> = (
node: acorn.AnyNode,
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/deno-runtime/error-handlers.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Messenger from './lib/messenger.ts';
import * as Messenger from './lib/messenger';

export function unhandledRejectionListener(event: PromiseRejectionEvent) {
event.preventDefault();
Expand Down
8 changes: 4 additions & 4 deletions packages/apps/deno-runtime/handlers/api-handler.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { IApiEndpoint } from '@rocket.chat/apps-engine/definition/api/IApiEndpoint';
import { Defined, JsonRpcError } from 'jsonrpc-lite';

import { AppObjectRegistry } from '../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../lib/accessors/mod.ts';
import { RequestContext } from '../lib/requestContext.ts';
import { wrapComposedApp } from '../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../AppObjectRegistry';
import { AppAccessorsInstance } from '../lib/accessors/mod';
import { RequestContext } from '../lib/requestContext';
import { wrapComposedApp } from '../lib/wrapAppForRequest';

export default async function apiHandler(request: RequestContext): Promise<JsonRpcError | Defined> {
const { method: call, params } = request;
Expand Down
10 changes: 5 additions & 5 deletions packages/apps/deno-runtime/handlers/app/construct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { Socket } from 'node:net';

import type { IParseAppPackageResult } from '@rocket.chat/apps/dist/server/compiler/IParseAppPackageResult';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { require } from '../../lib/require.ts';
import { sanitizeDeprecatedUsage } from '../../lib/sanitizeDeprecatedUsage.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { require } from '../../lib/require';
import { sanitizeDeprecatedUsage } from '../../lib/sanitizeDeprecatedUsage';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';

const ALLOWED_NATIVE_MODULES = ['path', 'url', 'crypto', 'buffer', 'stream', 'net', 'http', 'https', 'zlib', 'util', 'punycode', 'os', 'querystring', 'fs'];
const ALLOWED_EXTERNAL_MODULES = ['uuid'];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';

export default function handleGetStatus(): Promise<boolean> {
const app = AppObjectRegistry.get<App>('app');
Expand Down
8 changes: 4 additions & 4 deletions packages/apps/deno-runtime/handlers/app/handleInitialize.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleInitialize(request: RequestContext): Promise<boolean> {
const app = AppObjectRegistry.get<App>('app');
Expand Down
8 changes: 4 additions & 4 deletions packages/apps/deno-runtime/handlers/app/handleOnDisable.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleOnDisable(request: RequestContext): Promise<boolean> {
const app = AppObjectRegistry.get<App>('app');
Expand Down
8 changes: 4 additions & 4 deletions packages/apps/deno-runtime/handlers/app/handleOnEnable.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default function handleOnEnable(request: RequestContext): Promise<boolean> {
const app = AppObjectRegistry.get<App>('app');
Expand Down
8 changes: 4 additions & 4 deletions packages/apps/deno-runtime/handlers/app/handleOnInstall.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleOnInstall(request: RequestContext): Promise<boolean> {
const { params } = request;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default function handleOnPreSettingUpdate(request: RequestContext): Promise<object> {
const { params } = request;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleOnSettingUpdated(request: RequestContext): Promise<boolean> {
const { params } = request;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleOnUninstall(request: RequestContext): Promise<boolean> {
const { params } = request;
Expand Down
8 changes: 4 additions & 4 deletions packages/apps/deno-runtime/handlers/app/handleOnUpdate.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleOnUpdate(request: RequestContext): Promise<boolean> {
const { params } = request;
Expand Down
15 changes: 5 additions & 10 deletions packages/apps/deno-runtime/handlers/app/handleSetStatus.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';
import type { AppStatus as _AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { require } from '../../lib/require.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';

const { AppStatus } = require('@rocket.chat/apps-engine/definition/AppStatus.js') as {
AppStatus: typeof _AppStatus;
};
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleSetStatus(request: RequestContext): Promise<null> {
const { params } = request;
Expand All @@ -17,7 +12,7 @@ export default async function handleSetStatus(request: RequestContext): Promise<
throw new Error('Invalid params', { cause: 'invalid_param_type' });
}

const [status] = params as [typeof AppStatus];
const [status] = params as [AppStatus];

const app = AppObjectRegistry.get<App>('app');

Expand Down
10 changes: 5 additions & 5 deletions packages/apps/deno-runtime/handlers/app/handleUploadEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import type { IUploadDetails } from '@rocket.chat/apps-engine/definition/uploads
import { toArrayBuffer } from '@std/streams';
import { Defined, JsonRpcError } from 'jsonrpc-lite';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { assertAppAvailable, assertHandlerFunction, isPlainObject } from '../lib/assertions.ts';
import { AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { assertAppAvailable, assertHandlerFunction, isPlainObject } from '../lib/assertions';
import { AppAccessorsInstance } from '../../lib/accessors/mod';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export const uploadEvents = ['executePreFileUpload'] as const;

Expand Down
32 changes: 16 additions & 16 deletions packages/apps/deno-runtime/handlers/app/handler.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { Defined, JsonRpcError } from 'jsonrpc-lite';

import handleConstructApp from './construct.ts';
import handleInitialize from './handleInitialize.ts';
import handleGetStatus from './handleGetStatus.ts';
import handleSetStatus from './handleSetStatus.ts';
import handleOnEnable from './handleOnEnable.ts';
import handleOnInstall from './handleOnInstall.ts';
import handleOnDisable from './handleOnDisable.ts';
import handleOnUninstall from './handleOnUninstall.ts';
import handleOnPreSettingUpdate from './handleOnPreSettingUpdate.ts';
import handleOnSettingUpdated from './handleOnSettingUpdated.ts';
import handleOnUpdate from './handleOnUpdate.ts';
import handleUploadEvents, { uploadEvents } from './handleUploadEvents.ts';
import { isOneOf } from '../lib/assertions.ts';
import handleListener from '../listener/handler.ts';
import handleUIKitInteraction, { uikitInteractions } from '../uikit/handler.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import handleConstructApp from './construct';
import handleInitialize from './handleInitialize';
import handleGetStatus from './handleGetStatus';
import handleSetStatus from './handleSetStatus';
import handleOnEnable from './handleOnEnable';
import handleOnInstall from './handleOnInstall';
import handleOnDisable from './handleOnDisable';
import handleOnUninstall from './handleOnUninstall';
import handleOnPreSettingUpdate from './handleOnPreSettingUpdate';
import handleOnSettingUpdated from './handleOnSettingUpdated';
import handleOnUpdate from './handleOnUpdate';
import handleUploadEvents, { uploadEvents } from './handleUploadEvents';
import { isOneOf } from '../lib/assertions';
import handleListener from '../listener/handler';
import handleUIKitInteraction, { uikitInteractions } from '../uikit/handler';
import { RequestContext } from '../../lib/requestContext';

export default async function handleApp(request: RequestContext): Promise<Defined | JsonRpcError> {
const { method } = request;
Expand Down
29 changes: 12 additions & 17 deletions packages/apps/deno-runtime/handlers/listener/handler.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';
import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage';
import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom';
import type { AppsEngineException as _AppsEngineException } from '@rocket.chat/apps-engine/definition/exceptions/AppsEngineException';
import { AppsEngineException } from '@rocket.chat/apps-engine/definition/exceptions/AppsEngineException';
import { Defined, JsonRpcError } from 'jsonrpc-lite';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import { MessageExtender } from '../../lib/accessors/extenders/MessageExtender.ts';
import { RoomExtender } from '../../lib/accessors/extenders/RoomExtender.ts';
import { MessageBuilder } from '../../lib/accessors/builders/MessageBuilder.ts';
import { RoomBuilder } from '../../lib/accessors/builders/RoomBuilder.ts';
import { AppAccessors, AppAccessorsInstance } from '../../lib/accessors/mod.ts';
import { require } from '../../lib/require.ts';
import createRoom from '../../lib/roomFactory.ts';
import { Room } from '../../lib/room.ts';
import { RequestContext } from '../../lib/requestContext.ts';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest.ts';

const { AppsEngineException } = require('@rocket.chat/apps-engine/definition/exceptions/AppsEngineException.js') as {
AppsEngineException: typeof _AppsEngineException;
};
import { AppObjectRegistry } from '../../AppObjectRegistry';
import { MessageExtender } from '../../lib/accessors/extenders/MessageExtender';
import { RoomExtender } from '../../lib/accessors/extenders/RoomExtender';
import { MessageBuilder } from '../../lib/accessors/builders/MessageBuilder';
import { RoomBuilder } from '../../lib/accessors/builders/RoomBuilder';
import { AppAccessors, AppAccessorsInstance } from '../../lib/accessors/mod';
import createRoom from '../../lib/roomFactory';
import { Room } from '../../lib/room';
import { RequestContext } from '../../lib/requestContext';
import { wrapAppForRequest } from '../../lib/wrapAppForRequest';

export default async function handleListener(request: RequestContext): Promise<Defined | JsonRpcError> {
const { method, params } = request;
Expand Down Expand Up @@ -49,7 +44,7 @@ export default async function handleListener(request: RequestContext): Promise<D
return new JsonRpcError(e.message, AppsEngineException.JSONRPC_ERROR_CODE, { name: e.name });
}

return JsonRpcError.internalError({ message: e.message });
return JsonRpcError.internalError({ message: (e as { message?: string }).message });
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { IOutboundMessageProviders } from '@rocket.chat/apps-engine/definition/outboundCommunication/IOutboundCommsProvider';
import { JsonRpcError, Defined } from 'jsonrpc-lite';

import { AppObjectRegistry } from '../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../lib/accessors/mod.ts';
import { RequestContext } from '../lib/requestContext.ts';
import { wrapComposedApp } from '../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../AppObjectRegistry';
import { AppAccessorsInstance } from '../lib/accessors/mod';
import { RequestContext } from '../lib/requestContext';
import { wrapComposedApp } from '../lib/wrapAppForRequest';

export default async function outboundMessageHandler(request: RequestContext): Promise<JsonRpcError | Defined> {
const { method: call, params } = request;
Expand Down
10 changes: 5 additions & 5 deletions packages/apps/deno-runtime/handlers/scheduler-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import type { App } from '@rocket.chat/apps-engine/definition/App';
import type { IProcessor } from '@rocket.chat/apps-engine/definition/scheduler/IProcessor';
import { Defined, JsonRpcError } from 'jsonrpc-lite';

import { AppObjectRegistry } from '../AppObjectRegistry.ts';
import { AppAccessorsInstance } from '../lib/accessors/mod.ts';
import { RequestContext } from '../lib/requestContext.ts';
import { wrapAppForRequest } from '../lib/wrapAppForRequest.ts';
import { assertAppAvailable } from './lib/assertions.ts';
import { AppObjectRegistry } from '../AppObjectRegistry';
import { AppAccessorsInstance } from '../lib/accessors/mod';
import { RequestContext } from '../lib/requestContext';
import { wrapAppForRequest } from '../lib/wrapAppForRequest';
import { assertAppAvailable } from './lib/assertions';

export default async function handleScheduler(request: RequestContext): Promise<Defined | JsonRpcError> {
const { method, params } = request;
Expand Down
10 changes: 5 additions & 5 deletions packages/apps/deno-runtime/handlers/slashcommand-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import type { ISlashCommand } from '@rocket.chat/apps-engine/definition/slashcom
import { SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands/SlashCommandContext';
import { Defined, JsonRpcError } from 'jsonrpc-lite';

import { AppObjectRegistry } from '../AppObjectRegistry.ts';
import { AppAccessors, AppAccessorsInstance } from '../lib/accessors/mod.ts';
import createRoom from '../lib/roomFactory.ts';
import { RequestContext } from '../lib/requestContext.ts';
import { wrapComposedApp } from '../lib/wrapAppForRequest.ts';
import { AppObjectRegistry } from '../AppObjectRegistry';
import { AppAccessors, AppAccessorsInstance } from '../lib/accessors/mod';
import createRoom from '../lib/roomFactory';
import { RequestContext } from '../lib/requestContext';
import { wrapComposedApp } from '../lib/wrapAppForRequest';

export default async function slashCommandHandler(request: RequestContext): Promise<JsonRpcError | Defined> {
const { method: call, params } = request;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { spy } from 'https://deno.land/std@0.203.0/testing/mock.ts';
import { assertInstanceOf } from 'https://deno.land/std@0.203.0/assert/assert_instance_of.ts';
import { JsonRpcError } from 'jsonrpc-lite';

import { AppObjectRegistry } from '../../AppObjectRegistry.ts';
import apiHandler from '../api-handler.ts';
import { createMockRequest } from './helpers/mod.ts';
import { AppObjectRegistry } from '../../AppObjectRegistry';
import apiHandler from '../api-handler';
import { createMockRequest } from './helpers/mod';

describe('handlers > api', () => {
const mockEndpoint: IApiEndpoint = {
Expand Down
6 changes: 3 additions & 3 deletions packages/apps/deno-runtime/handlers/tests/helpers/mod.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { App } from '@rocket.chat/apps-engine/definition/App';

import { Logger } from '../../../lib/logger.ts';
import { RequestDescriptor } from '../../../lib/messenger.ts';
import { RequestContext } from '../../../lib/requestContext.ts';
import { Logger } from '../../../lib/logger';
import { RequestDescriptor } from '../../../lib/messenger';
import { RequestContext } from '../../../lib/requestContext';

export function createMockRequest({ method, params }: RequestDescriptor): RequestContext {
return {
Expand Down
Loading
Loading