@hexabot-ai/api 3.2.2-alpha.1 → 3.2.2-alpha.3

package/src/extensions/actions/web/http-request.action.ts

@@ -110,6 +110,26 @@ function isJsonContentType(contentType?: string) {
   );
 }
 
+function normalizeHeaderValue(value: unknown): string | undefined {
+  if (value === undefined || value === null) {
+    return undefined;
+  }
+
+  if (Array.isArray(value)) {
+    return value.map(String).join(', ');
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return String(value);
+  }
+
+  return undefined;
+}
+
 function resolveFinalUrl(response: {
   request?: { res?: { responseUrl?: string }; responseUrl?: string };
 }) {
@@ -175,10 +195,9 @@ export const HttpRequestAction = createAction<
         validateStatus: () => true,
         ...(requestData !== undefined ? { data: requestData } : {}),
       });
-      const contentTypeHeader = response.headers?.['content-type'];
-      const contentType = Array.isArray(contentTypeHeader)
-        ? contentTypeHeader.join(', ')
-        : contentTypeHeader;
+      const contentType = normalizeHeaderValue(
+        response.headers?.['content-type'],
+      );
       const responseData = response.data;
       let body: HttpRequestOutput['body'] = '';
 

package/src/extensions/channels/web/base-web-channel.ts

@@ -4,6 +4,8 @@
  * Full terms: see LICENSE.md.
  */
 
+import { randomUUID } from 'crypto';
+
 import type {
   Attachment,
   Source,
@@ -25,7 +27,6 @@ import {
 import { OnEvent } from '@nestjs/event-emitter';
 import { Request, Response } from 'express';
 import { Socket } from 'socket.io';
-import { v4 as uuidv4 } from 'uuid';
 import type { z } from 'zod';
 
 import { AttachmentOrmEntity } from '@/attachment/entities/attachment.entity';
@@ -37,16 +38,16 @@ import {
 import {
   ChannelCapabilities,
   DEFAULT_CHANNEL_CAPABILITIES,
-  ExtensionInject,
-  WebSocketChannelHandler,
-} from '@/channel';
+} from '@/channel/lib/channel-capabilities';
+import { ExtensionInject } from '@/channel/lib/extension-inject.decorator';
 import { MessageInboundEvent } from '@/channel/lib/inbound-events';
+import { WebSocketChannelHandler } from '@/channel/lib/transports/websocket-channel-handler';
 import { SourceService } from '@/channel/services/source.service';
 import { ChannelName } from '@/channel/types';
-import { SubscriberChannelData } from '@/chat';
 import { MessageCreateDto } from '@/chat/dto/message.dto';
 import { SubscriberCreateDto } from '@/chat/dto/subscriber.dto';
 import { MessageService } from '@/chat/services/message.service';
+import type { SubscriberChannelData } from '@/chat/types/channel';
 import { MenuService } from '@/cms/services/menu.service';
 import { config } from '@/config';
 import { SocketRequest } from '@/websocket/utils/socket-request';
@@ -125,7 +126,7 @@ export default abstract class BaseWebChannelHandler<N extends ChannelName>
   }
 
   generateId(): string {
-    return `${this.name}-${uuidv4()}`;
+    return `${this.name}-${randomUUID()}`;
   }
 
   getChannelAttributes(

package/src/extensions/channels/web/outbound/web-outbound-message-encoder.ts

@@ -24,8 +24,8 @@ import { ChannelOutboundMessageEncoder } from '@/channel/lib/outbound';
 import { ChannelAttachmentService } from '@/channel/services/channel-attachment.service';
 import { VIEW_MORE_PAYLOAD } from '@/chat/helpers/constants';
 import { ContentOrmEntity } from '@/cms/entities/content.entity';
-import { I18nService } from '@/i18n';
-import { LoggerService } from '@/logger';
+import { I18nService } from '@/i18n/services/i18n.service';
+import { LoggerService } from '@/logger/logger.service';
 
 import { Web } from '../types';
 

package/src/global.d.ts

@@ -8,10 +8,4 @@ import '../types/event-emitter';
 import '../types/express-session';
 import './types/ai-sdk-mcp-stdio';
 
-declare global {
-  type HyphenToUnderscore<S extends string> = S extends `${infer P}-${infer Q}`
-    ? `${P}_${HyphenToUnderscore<Q>}`
-    : S;
-}
-
 export {};

package/src/license/services/lemon-squeezy.service.ts

@@ -4,10 +4,11 @@
  * Full terms: see LICENSE.md.
  */
 
+import { randomUUID } from 'crypto';
+
 import { HttpService } from '@nestjs/axios';
 import { Injectable } from '@nestjs/common';
 import { AxiosError } from 'axios';
-import { v4 as uuidv4 } from 'uuid';
 
 import {
   LemonSqueezyActivationResponse,
@@ -52,7 +53,7 @@ export class LemonSqueezyService {
         `${LEMON_SQUEEZY_API_BASE_URL}/v1/licenses/activate`,
         {
           license_key: licenseKey,
-          instance_name: uuidv4(),
+          instance_name: randomUUID(),
         },
         {
           headers: {

package/src/mailer/mailer.module.ts

@@ -4,66 +4,13 @@
  * Full terms: see LICENSE.md.
  */
 
-import path from 'path';
-
 import { Global, Module } from '@nestjs/common';
-import {
-  ISendMailOptions,
-  MAILER_OPTIONS,
-  MailerOptions,
-  MailerModule as NestjsMailerModule,
-} from '@nestjs-modules/mailer';
-import SMTPTransport from 'nodemailer/lib/smtp-transport';
-
-import { config } from '@/config';
 
 import { MailerService } from './mailer.service';
-import { MjmlAdapter } from './mjml-adapter.class';
-
-const mailerOptions: MailerOptions = {
-  transport: new SMTPTransport({
-    ...config.emails.smtp,
-    logger: true,
-    debug: false,
-  }),
-  template: {
-    adapter: new MjmlAdapter(),
-    dir: path.join(process.cwd(), 'dist', 'templates'),
-    options: {
-      context: {
-        appName: config.parameters.appName,
-        appUrl: config.uiBaseUrl,
-      },
-    },
-  },
-  defaults: { from: config.emails.from },
-};
 
 @Global()
 @Module({
-  imports: [
-    ...(config.emails.isEnabled
-      ? [NestjsMailerModule.forRoot(mailerOptions)]
-      : []),
-  ],
-  providers: [
-    {
-      provide: MAILER_OPTIONS,
-      useValue: mailerOptions,
-    },
-    ...(config.emails.isEnabled
-      ? [MailerService]
-      : [
-          {
-            provide: MailerService,
-            useValue: {
-              sendMail(_options: ISendMailOptions) {
-                throw new Error('Email Service is not enabled');
-              },
-            },
-          },
-        ]),
-  ],
+  providers: [MailerService],
   exports: [MailerService],
 })
 export class MailerModule {}

package/src/mailer/mailer.service.ts

@@ -4,6 +4,90 @@
  * Full terms: see LICENSE.md.
  */
 
-import { MailerService as NestjsMailerService } from '@nestjs-modules/mailer';
+import { readFile } from 'fs/promises';
+import path from 'path';
 
-export class MailerService extends NestjsMailerService {}
+import { Injectable } from '@nestjs/common';
+import Handlebars from 'handlebars';
+import mjml2html from 'mjml';
+import nodemailer, {
+  SendMailOptions as NodemailerSendMailOptions,
+  SentMessageInfo,
+  Transporter,
+} from 'nodemailer';
+import SMTPTransport from 'nodemailer/lib/smtp-transport';
+
+import { config } from '@/config';
+
+export type SendMailOptions = NodemailerSendMailOptions & {
+  template?: string;
+  context?: Record<string, unknown>;
+};
+
+@Injectable()
+export class MailerService {
+  private readonly transporter?: Transporter<SentMessageInfo>;
+
+  constructor() {
+    if (!config.emails.isEnabled) {
+      return;
+    }
+
+    this.transporter = nodemailer.createTransport(
+      new SMTPTransport({
+        ...config.emails.smtp,
+        logger: true,
+        debug: false,
+      }),
+    );
+  }
+
+  async sendMail({ template, context, ...options }: SendMailOptions) {
+    if (!this.transporter) {
+      throw new Error('Email Service is not enabled');
+    }
+
+    const html = template
+      ? await this.renderTemplate(template, context)
+      : options.html;
+
+    return await this.transporter.sendMail({
+      from: config.emails.from,
+      ...options,
+      html,
+    });
+  }
+
+  async verifyAllTransporters(): Promise<boolean> {
+    if (!this.transporter) {
+      return false;
+    }
+
+    return await this.transporter.verify();
+  }
+
+  private async renderTemplate(
+    template: string,
+    context: Record<string, unknown> = {},
+  ): Promise<string> {
+    const templatePath = path.join(
+      process.cwd(),
+      'dist',
+      'templates',
+      template,
+    );
+    const content = await readFile(templatePath, 'utf-8');
+    const compiledHandlebars = Handlebars.compile(content)({
+      appName: config.parameters.appName,
+      appUrl: config.uiBaseUrl,
+      ...context,
+    });
+    const { errors, html } = mjml2html(compiledHandlebars);
+
+    if (errors.length) {
+      throw new Error('Unable to compile mjml template');
+    }
+
+    return html;
+  }
+}

package/src/user/entities/model.entity.ts

@@ -4,6 +4,8 @@
  * Full terms: see LICENSE.md.
  */
 
+import { createRequire } from 'node:module';
+
 import { modelSchema, modelFullSchema } from '@hexabot-ai/types';
 import { Column, Entity, Index, OneToMany } from 'typeorm';
 
@@ -14,7 +16,9 @@ import { BaseOrmEntity } from '@/database/entities/base.entity';
 import { ModelDto } from '../dto/model.dto';
 import { TRelation } from '../types/index.type';
 
-import { PermissionOrmEntity } from './permission.entity';
+import type { PermissionOrmEntity } from './permission.entity';
+
+const requireEntity = createRequire(__filename);
 
 @Entity({ name: 'models' })
 @Index(['name'], { unique: true })
@@ -34,11 +38,15 @@ export class ModelOrmEntity extends BaseOrmEntity<ModelDto> {
   @JsonColumn({ default: '{}' })
   attributes: Record<string, unknown>;
 
-  @Column({ nullable: true })
+  @Column({ type: 'varchar', nullable: true })
   relation?: TRelation;
 
-  @OneToMany(() => PermissionOrmEntity, (permission) => permission.model, {
-    cascade: ['remove'],
-  })
+  @OneToMany(
+    () => requireEntity('./permission.entity').PermissionOrmEntity,
+    (permission: PermissionOrmEntity) => permission.model,
+    {
+      cascade: ['remove'],
+    },
+  )
   permissions?: PermissionOrmEntity[];
 }

package/src/user/entities/permission.entity.ts

@@ -4,6 +4,8 @@
  * Full terms: see LICENSE.md.
  */
 
+import { createRequire } from 'node:module';
+
 import { permissionSchema, permissionFullSchema } from '@hexabot-ai/types';
 import {
   Column,
@@ -22,8 +24,10 @@ import { PermissionDto } from '../dto/permission.dto';
 import { Action } from '../types/action.type';
 import { TRelation } from '../types/index.type';
 
-import { ModelOrmEntity } from './model.entity';
-import { RoleOrmEntity } from './role.entity';
+import type { ModelOrmEntity } from './model.entity';
+import type { RoleOrmEntity } from './role.entity';
+
+const requireEntity = createRequire(__filename);
 
 @Entity({ name: 'permissions' })
 @Index(['model', 'action', 'role', 'relation'], { unique: true })
@@ -32,9 +36,13 @@ export class PermissionOrmEntity extends BaseOrmEntity<PermissionDto> {
 
   fullCls = permissionFullSchema;
 
-  @ManyToOne(() => ModelOrmEntity, (model) => model.permissions, {
-    onDelete: 'CASCADE',
-  })
+  @ManyToOne(
+    () => requireEntity('./model.entity').ModelOrmEntity,
+    (model: ModelOrmEntity) => model.permissions,
+    {
+      onDelete: 'CASCADE',
+    },
+  )
   @JoinColumn({ name: 'model_id' })
   @AsRelation()
   model!: ModelOrmEntity;
@@ -45,9 +53,13 @@ export class PermissionOrmEntity extends BaseOrmEntity<PermissionDto> {
   @EnumColumn({ enum: Action })
   action!: Action;
 
-  @ManyToOne(() => RoleOrmEntity, (role) => role.permissions, {
-    onDelete: 'CASCADE',
-  })
+  @ManyToOne(
+    () => requireEntity('./role.entity').RoleOrmEntity,
+    (role: RoleOrmEntity) => role.permissions,
+    {
+      onDelete: 'CASCADE',
+    },
+  )
   @JoinColumn({ name: 'role_id' })
   @AsRelation()
   role!: RoleOrmEntity;
@@ -55,6 +67,6 @@ export class PermissionOrmEntity extends BaseOrmEntity<PermissionDto> {
   @RelationId((permission: PermissionOrmEntity) => permission.role)
   private readonly roleId!: string;
 
-  @Column({ default: 'role' })
+  @Column({ type: 'varchar', default: 'role' })
   relation!: TRelation;
 }

package/src/user/entities/role.entity.ts

@@ -4,6 +4,8 @@
  * Full terms: see LICENSE.md.
  */
 
+import { createRequire } from 'node:module';
+
 import { roleSchema, roleFullSchema } from '@hexabot-ai/types';
 import { Column, Entity, Index, ManyToMany, OneToMany } from 'typeorm';
 
@@ -12,9 +14,11 @@ import { BaseOrmEntity } from '@/database/entities/base.entity';
 
 import { RoleDto } from '../dto/role.dto';
 
-import { PermissionOrmEntity } from './permission.entity';
+import type { PermissionOrmEntity } from './permission.entity';
 import { UserOrmEntity } from './user.entity';
 
+const requireEntity = createRequire(__filename);
+
 export type TRole = 'admin' | 'public';
 
 @Entity({ name: 'roles' })
@@ -31,9 +35,13 @@ export class RoleOrmEntity extends BaseOrmEntity<RoleDto> {
   @Column({ default: true })
   active!: boolean;
 
-  @OneToMany(() => PermissionOrmEntity, (permission) => permission.role, {
-    cascade: ['remove'],
-  })
+  @OneToMany(
+    () => requireEntity('./permission.entity').PermissionOrmEntity,
+    (permission: PermissionOrmEntity) => permission.role,
+    {
+      cascade: ['remove'],
+    },
+  )
   permissions?: PermissionOrmEntity[];
 
   @ManyToMany(() => UserOrmEntity, (user) => user.roles)

package/src/utils/generics/extension.ts

@@ -8,13 +8,11 @@ import { Inject, OnModuleInit } from '@nestjs/common';
 
 import { LoggerService } from '@/logger/logger.service';
 
-import { ExtensionName } from '../types/extension';
-
 export abstract class Extension implements OnModuleInit {
   @Inject(LoggerService)
   protected readonly logger: LoggerService;
 
-  constructor(public readonly name: ExtensionName) {}
+  constructor(public readonly name: string) {}
 
   getName() {
     return this.name;

package/src/utils/index.ts

@@ -62,8 +62,6 @@ export * from './pipes/zod.pipe';
 
 export * from './types/dto.types';
 
-export * from './types/extension';
-
 export * from './types/filter.types';
 
 export * from './types/format.types';

package/src/utils/pipes/uuid.pipe.ts

@@ -10,7 +10,7 @@ import {
   Injectable,
   PipeTransform,
 } from '@nestjs/common';
-import { validate as uuidValidate, version as uuidVersion } from 'uuid';
+import { isUUID } from 'class-validator';
 
 /**
  * Validates UUID route parameters by automatically checking parameters named `id`
@@ -56,13 +56,13 @@ export class UuidPipe implements PipeTransform {
 
   private ensureUuid(rawValue: string, paramName: string): void {
     const candidate = rawValue.trim();
-    if (!uuidValidate(candidate)) {
+    if (!isUUID(candidate)) {
       throw new BadRequestException(
         `Invalid UUID supplied for "${paramName}".`,
       );
     }
 
-    const version = uuidVersion(candidate);
+    const version = Number(candidate[14]);
     if (!this.allowedVersions.has(version)) {
       throw new BadRequestException(
         `Unsupported UUID version (${version}) supplied for "${paramName}".`,

package/src/utils/test/fixtures/contenttype.ts

@@ -7,9 +7,9 @@
 import { ContentType } from '@hexabot-ai/types';
 import { DataSource, DeepPartial } from 'typeorm';
 
-import { DEFAULT_CONTENT_TYPE_SCHEMA } from '@/cms';
 import { ContentTypeCreateDto } from '@/cms/dto/contentType.dto';
 import { ContentTypeOrmEntity } from '@/cms/entities/content-type.entity';
+import { DEFAULT_CONTENT_TYPE_SCHEMA } from '@/cms/services/content-type.service';
 
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { FixturesTypeBuilder } from '../types';

package/src/utils/test/fixtures/workflow.ts

@@ -11,7 +11,7 @@ import {
   installUserFixturesTypeOrm,
   userFixtureIds,
 } from '@/utils/test/fixtures/user';
-import { WorkflowCreateDto } from '@/workflow';
+import { WorkflowCreateDto } from '@/workflow/dto/workflow.dto';
 import { WorkflowVersionOrmEntity } from '@/workflow/entities/workflow-version.entity';
 import { WorkflowOrmEntity } from '@/workflow/entities/workflow.entity';
 import {

package/src/utils/test/providers/i18n-service.provider.ts

@@ -4,7 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
-import { I18nService } from '@/i18n';
+import { I18nService } from '@/i18n/services/i18n.service';
 
 export const I18nServiceProvider = {
   provide: I18nService,

package/src/utils/test/providers/mailer-service.provider.ts

@@ -4,7 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
-import { MailerService } from '@/mailer';
+import { MailerService } from '@/mailer/mailer.service';
 
 export const mailerMock = {
   sendMail: jest.fn((_options) =>

package/src/utils/test/providers/setting-service.provider.ts

@@ -4,7 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
-import { SettingService } from '@/setting';
+import { SettingService } from '@/setting/services/setting.service';
 
 export const SettingServiceProvider = {
   provide: SettingService,

package/src/utils/test/test.ts

@@ -4,14 +4,45 @@
  * Full terms: see LICENSE.md.
  */
 
+import type { TestingModule } from '@nestjs/testing';
 import { DataSource } from 'typeorm';
 
 const typeOrmDataSources: DataSource[] = [];
+const testingModules: TestingModule[] = [];
 
 export const registerTypeOrmDataSource = (dataSource: DataSource) => {
   typeOrmDataSources.push(dataSource);
 };
 
+export const registerTestingModule = (module: TestingModule) => {
+  const close = module.close.bind(module);
+  let closed = false;
+
+  module.close = async () => {
+    if (closed) {
+      return;
+    }
+
+    closed = true;
+    const moduleIndex = testingModules.indexOf(module);
+
+    if (moduleIndex >= 0) {
+      testingModules.splice(moduleIndex, 1);
+    }
+
+    await close();
+  };
+
+  testingModules.push(module);
+};
+
+export const closeTestingModules = async () => {
+  const modules = [...testingModules];
+
+  testingModules.length = 0;
+  await Promise.all(modules.map((module) => module.close()));
+};
+
 export const closeTypeOrmConnections = async () => {
   await Promise.all(
     typeOrmDataSources.map(async (dataSource) => {
@@ -25,3 +56,11 @@ export const closeTypeOrmConnections = async () => {
 
 export const getLastTypeOrmDataSource = () =>
   typeOrmDataSources[typeOrmDataSources.length - 1];
+
+export const closeTestingResources = async () => {
+  try {
+    await closeTestingModules();
+  } finally {
+    await closeTypeOrmConnections();
+  }
+};