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

package/dist/workflow/workflow.module.js

@@ -12,8 +12,8 @@ const schedule_1 = require("@nestjs/schedule");
 const typeorm_1 = require("@nestjs/typeorm");
 const chat_module_1 = require("../chat/chat.module");
 const thread_entity_1 = require("../chat/entities/thread.entity");
-const cms_1 = require("../cms");
-const user_1 = require("../user");
+const cms_module_1 = require("../cms/cms.module");
+const user_module_1 = require("../user/user.module");
 const conversational_workflow_context_1 = require("./contexts/conversational-workflow.context");
 const manual_workflow_context_1 = require("./contexts/manual-workflow.context");
 const scheduled_workflow_context_1 = require("./contexts/scheduled-workflow.context");
@@ -62,9 +62,9 @@ exports.WorkflowModule = WorkflowModule = __decorate([
                 mcp_server_entity_1.McpServerOrmEntity,
                 thread_entity_1.ThreadOrmEntity,
             ]),
-            (0, common_1.forwardRef)(() => cms_1.CmsModule),
+            (0, common_1.forwardRef)(() => cms_module_1.CmsModule),
             (0, common_1.forwardRef)(() => chat_module_1.ChatModule),
-            user_1.UserModule,
+            user_module_1.UserModule,
         ],
         controllers: [
             workflow_controller_1.WorkflowController,

package/dist/workflow/workflow.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.module.js","sourceRoot":"","sources":["../../src/workflow/workflow.module.ts"],"names":[],"mappings":";;;;;;;;;AAMA,2CAAoD;AACpD,+CAAqD;AACrD,6CAAgD;AAEhD,qDAAgD;AAChD,kEAAgE;AAChE,gCAAkC;AAClC,kCAAoC;AAEpC,gGAA2F;AAC3F,gFAA2E;AAC3E,sFAAiF;AACjF,kFAA6E;AAC7E,+EAA0E;AAC1E,6FAAwF;AACxF,mFAA8E;AAC9E,2FAAsF;AACtF,2EAAuE;AACvE,oEAAkE;AAClE,kFAAgF;AAChF,0EAAwE;AACxE,wEAAsE;AACtE,gFAA8E;AAC9E,gEAA+D;AAC/D,gFAA2E;AAC3E,8FAAyF;AACzF,sFAAiF;AACjF,oFAA+E;AAC/E,4FAAuF;AACvF,4EAAwE;AACxE,2EAAwE;AACxE,yDAAuD;AACvD,gEAA4D;AAC5D,gFAA0E;AAC1E,sEAAiE;AACjE,oFAA+E;AAC/E,4EAAuE;AACvE,8DAA0D;AAC1D,0EAAqE;AACrE,sFAAiF;AACjF,kFAA6E;AAC7E,kEAA8D;AAoEvD,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAlE1B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,mCAAiB;gBACjB,kDAAwB;gBACxB,0CAAoB;gBACpB,oDAAyB;gBACzB,4CAAqB;gBACrB,sCAAkB;gBAClB,+BAAe;aAChB,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,eAAS,CAAC;YAC3B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,iBAAU;SACX;QACD,WAAW,EAAE;YACX,wCAAkB;YAClB,uDAAyB;YACzB,+CAAqB;YACrB,yDAA0B;YAC1B,2CAAmB;SACpB;QACD,SAAS,EAAE;YACT,wCAAkB;YAClB,uDAAyB;YACzB,+CAAqB;YACrB,yDAA0B;YAC1B,iDAAsB;YACtB,2CAAmB;YACnB,+CAAsB;YACtB,8BAAc;YACd,kCAAe;YACf,iDAAsB;YACtB,yCAAkB;YAClB,mDAAuB;YACvB,2CAAmB;YACnB,8BAAa;YACb,qCAAgB;YAChB,8CAAoB;YACpB,4BAAiB;YACjB,qDAAwB;YACxB,+DAA6B;YAC7B,+CAAqB;YACrB,qDAAwB;YACxB,iDAAsB;YACtB,gCAAc;SACf;QACD,OAAO,EAAE;YACP,wCAAkB;YAClB,uDAAyB;YACzB,+CAAqB;YACrB,yDAA0B;YAC1B,iDAAsB;YACtB,2CAAmB;YACnB,kCAAe;YACf,iDAAsB;YACtB,yCAAkB;YAClB,mDAAuB;YACvB,2CAAmB;YACnB,8BAAa;YACb,qCAAgB;YAChB,8CAAoB;YACpB,+DAA6B;YAC7B,gCAAc;SACf;KACF,CAAC;GACW,cAAc,CAAG"}
+{"version":3,"file":"workflow.module.js","sourceRoot":"","sources":["../../src/workflow/workflow.module.ts"],"names":[],"mappings":";;;;;;;;;AAMA,2CAAoD;AACpD,+CAAqD;AACrD,6CAAgD;AAEhD,qDAAgD;AAChD,kEAAgE;AAChE,kDAA6C;AAC7C,qDAAgD;AAEhD,gGAA2F;AAC3F,gFAA2E;AAC3E,sFAAiF;AACjF,kFAA6E;AAC7E,+EAA0E;AAC1E,6FAAwF;AACxF,mFAA8E;AAC9E,2FAAsF;AACtF,2EAAuE;AACvE,oEAAkE;AAClE,kFAAgF;AAChF,0EAAwE;AACxE,wEAAsE;AACtE,gFAA8E;AAC9E,gEAA+D;AAC/D,gFAA2E;AAC3E,8FAAyF;AACzF,sFAAiF;AACjF,oFAA+E;AAC/E,4FAAuF;AACvF,4EAAwE;AACxE,2EAAwE;AACxE,yDAAuD;AACvD,gEAA4D;AAC5D,gFAA0E;AAC1E,sEAAiE;AACjE,oFAA+E;AAC/E,4EAAuE;AACvE,8DAA0D;AAC1D,0EAAqE;AACrE,sFAAiF;AACjF,kFAA6E;AAC7E,kEAA8D;AAoEvD,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAlE1B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,mCAAiB;gBACjB,kDAAwB;gBACxB,0CAAoB;gBACpB,oDAAyB;gBACzB,4CAAqB;gBACrB,sCAAkB;gBAClB,+BAAe;aAChB,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,sBAAS,CAAC;YAC3B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,wBAAU;SACX;QACD,WAAW,EAAE;YACX,wCAAkB;YAClB,uDAAyB;YACzB,+CAAqB;YACrB,yDAA0B;YAC1B,2CAAmB;SACpB;QACD,SAAS,EAAE;YACT,wCAAkB;YAClB,uDAAyB;YACzB,+CAAqB;YACrB,yDAA0B;YAC1B,iDAAsB;YACtB,2CAAmB;YACnB,+CAAsB;YACtB,8BAAc;YACd,kCAAe;YACf,iDAAsB;YACtB,yCAAkB;YAClB,mDAAuB;YACvB,2CAAmB;YACnB,8BAAa;YACb,qCAAgB;YAChB,8CAAoB;YACpB,4BAAiB;YACjB,qDAAwB;YACxB,+DAA6B;YAC7B,+CAAqB;YACrB,qDAAwB;YACxB,iDAAsB;YACtB,gCAAc;SACf;QACD,OAAO,EAAE;YACP,wCAAkB;YAClB,uDAAyB;YACzB,+CAAqB;YACrB,yDAA0B;YAC1B,iDAAsB;YACtB,2CAAmB;YACnB,kCAAe;YACf,iDAAsB;YACtB,yCAAkB;YAClB,mDAAuB;YACvB,2CAAmB;YACnB,8BAAa;YACb,qCAAgB;YAChB,8CAAoB;YACpB,+DAA6B;YAC7B,gCAAc;SACf;KACF,CAAC;GACW,cAAc,CAAG"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hexabot-ai/api",
   "private": false,
-  "version": "3.2.2-alpha.2",
+  "version": "3.2.2-alpha.3",
   "description": "Hexabot is a solution for creating and managing chatbots across multiple channels, leveraging AI for advanced conversational capabilities. It provides a user-friendly interface for building, training, and deploying chatbots with integrated support for various messaging platforms.",
   "author": "Hexastack",
   "license": "FCL-1.0-ALv2",
@@ -51,6 +51,7 @@
     "ai": "^6.0.17",
     "async-mutex": "^0.5.0",
     "axios": "^1.15.2",
+    "better-sqlite3": "^12.9.0",
     "bcryptjs": "^3.0.2",
     "cache-manager": "^7.2.4",
     "cacheable": "^2.1.0",
@@ -86,12 +87,11 @@
     "rxjs": "^7.8.2",
     "sanitize-filename": "^1.6.3",
     "slug": "^11.0.0",
-    "sqlite3": "^6.0.1",
     "typeorm": "^0.3.28",
     "yaml": "^2.8.3",
     "zod": "^4.3.6",
-    "@hexabot-ai/agentic": "3.1.2-alpha.2",
-    "@hexabot-ai/types": "3.0.2-alpha.2"
+    "@hexabot-ai/agentic": "3.1.2-alpha.3",
+    "@hexabot-ai/types": "3.0.2-alpha.3"
   },
   "devDependencies": {
     "@compodoc/compodoc": "^1.1.31",
@@ -142,7 +142,7 @@
     "tsconfig-paths": "^4.2.0",
     "tsconfig-paths-jest": "^0.0.1",
     "typescript": "^5.1.3",
-    "@hexabot-ai/frontend": "3.2.2-alpha.2"
+    "@hexabot-ai/frontend": "3.2.2-alpha.3"
   },
   "optionalDependencies": {
     "@css-inline/css-inline-linux-arm64-musl": "^0.14.1",

package/src/cms/services/content-type.service.ts

@@ -8,8 +8,8 @@ import { ContentType } from '@hexabot-ai/types';
 import { Injectable } from '@nestjs/common';
 import { JSONSchema7 } from 'json-schema';
 
-import { InferCreateDto } from '@/utils';
 import { BaseOrmService } from '@/utils/generics/base-orm.service';
+import type { InferCreateDto } from '@/utils/types/dto.types';
 
 import { ContentTypeOrmEntity } from '../entities/content-type.entity';
 import { ContentTypeRepository } from '../repositories/content-type.repository';

package/src/cms/services/rag.service.ts

@@ -9,7 +9,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 
 import { LoggerService } from '@/logger/logger.service';
 import { SettingService } from '@/setting/services/setting.service';
-import { UserOrmEntity } from '@/user';
+import type { UserOrmEntity } from '@/user/entities/user.entity';
 import {
   DeleteEntityEvent,
   InsertEntityEvent,

package/src/database/decorators/json-column.decorator.ts

@@ -12,6 +12,7 @@ type JsonColumnOptions = Omit<ColumnOptions, 'type'>;
 
 const dbTypeToJsonColumn: Record<string, ColumnType> = {
   sqlite: 'simple-json',
+  'better-sqlite3': 'simple-json',
   postgres: 'json',
   mysql: 'json',
   mariadb: 'json',

package/src/database/typeorm-config.service.ts

@@ -51,7 +51,7 @@ export class TypeormConfigService implements TypeOrmOptionsFactory {
         // @ts-expect-error type mismatch)
         return {
           ...base,
-          type: 'sqlite',
+          type: 'better-sqlite3',
           database: db.sqlitePath ?? 'hexabot.sqlite',
         };
     }

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

@@ -38,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';

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/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/utils.ts

@@ -14,6 +14,7 @@ import {
   DataSource,
   DataSourceOptions,
   EntitySchema,
+  EntitySubscriberInterface,
   EntityTarget,
   getMetadataArgsStorage,
 } from 'typeorm';
@@ -258,15 +259,38 @@ const addEntityToLookup = (
 const refreshEntityLookup = (lookup: Map<string, EntityTarget<any>>): void => {
   buildEntityLookup().forEach((entity, key) => lookup.set(key, entity));
 };
-const registeredSubscribers = new Set<unknown>();
+const GENERATED_ORM_HOOK_SUBSCRIBER = Symbol('generatedOrmHookSubscriber');
+type SubscriberWithListenTo = EntitySubscriberInterface & {
+  listenTo: NonNullable<EntitySubscriberInterface['listenTo']>;
+};
+type GeneratedOrmHookSubscriber = SubscriberWithListenTo & {
+  [GENERATED_ORM_HOOK_SUBSCRIBER]: true;
+};
+const isGeneratedOrmHookSubscriber = (
+  subscriber: unknown,
+): subscriber is GeneratedOrmHookSubscriber =>
+  Boolean(
+    subscriber &&
+      typeof subscriber === 'object' &&
+      (subscriber as Record<PropertyKey, unknown>)[
+        GENERATED_ORM_HOOK_SUBSCRIBER
+      ],
+  );
+const hasListenTo = (
+  subscriber: unknown,
+): subscriber is SubscriberWithListenTo =>
+  Boolean(
+    subscriber &&
+      typeof subscriber === 'object' &&
+      typeof (subscriber as { listenTo?: unknown }).listenTo === 'function',
+  );
 const registerAllRepositorySubscribers = (
   dataSource: DataSource,
   entityClasses: (new (...args: any[]) => BaseOrmEntity<any>)[],
 ): void => {
   for (const EntityClass of entityClasses) {
-    if (registeredSubscribers.has(EntityClass)) continue;
-
     const subscriber = {
+      [GENERATED_ORM_HOOK_SUBSCRIBER]: true,
       listenTo: () => EntityClass,
       ...Object.fromEntries(
         ORM_HOOK_NAMES.map((name) => [
@@ -283,14 +307,34 @@ const registerAllRepositorySubscribers = (
       ),
     };
     const exists = dataSource.subscribers.some(
-      (s) => typeof s.listenTo === 'function' && s.listenTo() === EntityClass,
+      (subscriber) =>
+        hasListenTo(subscriber) && subscriber.listenTo() === EntityClass,
     );
     if (!exists) {
       dataSource.subscribers.push(subscriber as any);
-      registeredSubscribers.add(EntityClass);
     }
   }
 };
+const pruneGeneratedRepositorySubscribers = (dataSource: DataSource): void => {
+  const concreteSubscriberTargets = new Set(
+    dataSource.subscribers
+      .filter(
+        (subscriber): subscriber is SubscriberWithListenTo =>
+          !isGeneratedOrmHookSubscriber(subscriber) && hasListenTo(subscriber),
+      )
+      .map((subscriber) => subscriber.listenTo()),
+  );
+  const subscribers = dataSource.subscribers.filter(
+    (subscriber) =>
+      !isGeneratedOrmHookSubscriber(subscriber) ||
+      !concreteSubscriberTargets.has(subscriber.listenTo()),
+  );
+  dataSource.subscribers.splice(
+    0,
+    dataSource.subscribers.length,
+    ...subscribers,
+  );
+};
 const normalizeRepositoryToken = (token: string): string | undefined => {
   if (!token.endsWith(TYPEORM_REPOSITORY_SUFFIX)) {
     return undefined;
@@ -687,10 +731,11 @@ export const buildTestingMocks = async ({
   const entitiesArray = Array.from(typeOrmEntities);
   let typeOrmRootModule: DynamicModule | undefined;
   let typeOrmProviders: Provider[] = [];
+  let typeOrmDataSource: DataSource | undefined;
 
   if (shouldUseTypeOrm) {
     const baseOptions: DataSourceOptions = {
-      type: 'sqlite',
+      type: 'better-sqlite3',
       database: ':memory:',
       synchronize: true,
       dropSchema: true,
@@ -700,6 +745,7 @@ export const buildTestingMocks = async ({
     } as DataSourceOptions;
     const dataSource = new DataSource(baseOptions);
     await dataSource.initialize();
+    typeOrmDataSource = dataSource;
     registerAllRepositorySubscribers(dataSource, entitiesArray as any[]);
     await runTypeOrmFixtures(dataSource);
     registerTypeOrmDataSource(dataSource);
@@ -732,6 +778,9 @@ export const buildTestingMocks = async ({
     ...rest,
   });
   const module = await testingModuleBuilder.compile();
+  if (typeOrmDataSource) {
+    pruneGeneratedRepositorySubscribers(typeOrmDataSource);
+  }
   registerTestingModule(module);
 
   return {

package/src/workflow/contexts/workflow-runtime.context.ts

@@ -9,7 +9,7 @@ import { WorkflowRunFull } from '@hexabot-ai/types';
 import { forwardRef, Inject, Injectable, Scope } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 
-import { ActionService } from '@/actions';
+import { ActionService } from '@/actions/actions.service';
 import { MessageService } from '@/chat/services/message.service';
 import { SubscriberService } from '@/chat/services/subscriber.service';
 import { ContentTypeService } from '@/cms/services/content-type.service';
@@ -17,7 +17,7 @@ import { ContentService } from '@/cms/services/content.service';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LoggerService } from '@/logger/logger.service';
 import { SettingService } from '@/setting/services/setting.service';
-import { CredentialService } from '@/user';
+import { CredentialService } from '@/user/services/credential.service';
 import { cloneObject } from '@/utils/helpers/clone';
 import { WorkflowContextState, WorkflowType } from '@/workflow/types';
 

package/src/workflow/controllers/workflow.controller.ts

@@ -27,8 +27,8 @@ import { DeleteResult } from 'typeorm/driver/mongodb/typings';
 
 import { ActionService } from '@/actions/actions.service';
 import { I18nService } from '@/i18n/services/i18n.service';
-import { UserService } from '@/user';
-import { UuidParam } from '@/utils';
+import { UserService } from '@/user/services/user.service';
+import { UuidParam } from '@/utils/decorators/uuid-param.decorator';
 import { BaseOrmController } from '@/utils/generics/base-orm.controller';
 import { PopulatePipe } from '@/utils/pipes/populate.pipe';
 import { TypeOrmSearchFilterPipe } from '@/utils/pipes/typeorm-search-filter.pipe';

package/src/workflow/entities/mcp-server.entity.ts

@@ -24,8 +24,8 @@ import {
   OnBeforeUpdate,
 } from '@/database/decorators/orm-event-hooks.decorator';
 import { BaseOrmEntity } from '@/database/entities/base.entity';
-import { CredentialOrmEntity } from '@/user';
-import { AsRelation } from '@/utils';
+import { CredentialOrmEntity } from '@/user/entities/credential.entity';
+import { AsRelation } from '@/utils/decorators/relation-ref.decorator';
 
 import { McpServerDto } from '../dto/mcp-server.dto';
 import { McpServerTransport } from '../types';

package/src/workflow/entities/workflow.entity.ts

@@ -181,7 +181,8 @@ export class WorkflowOrmEntity extends BaseOrmEntity<WorkflowDto> {
       });
       await event.manager.save(WorkflowVersionOrmEntity, version);
     } catch (error: any) {
-      if (error.code !== 'SQLITE_CONSTRAINT') {
+      const code = error?.code ?? error?.driverError?.code;
+      if (typeof code !== 'string' || !code.startsWith('SQLITE_CONSTRAINT')) {
         throw error;
       }
     }

package/src/workflow/services/workflow-scheduler.service.ts

@@ -13,7 +13,7 @@ import { RemoveEvent } from 'typeorm';
 import { AppInstance } from '@/app.instance';
 import { config } from '@/config';
 import { LoggerService } from '@/logger/logger.service';
-import { UserService } from '@/user';
+import { UserService } from '@/user/services/user.service';
 import {
   InsertEntityEvent,
   UpdateEntityEvent,

package/src/workflow/workflow.module.ts

@@ -10,8 +10,8 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { ChatModule } from '@/chat/chat.module';
 import { ThreadOrmEntity } from '@/chat/entities/thread.entity';
-import { CmsModule } from '@/cms';
-import { UserModule } from '@/user';
+import { CmsModule } from '@/cms/cms.module';
+import { UserModule } from '@/user/user.module';
 
 import { ConversationalWorkflowContext } from './contexts/conversational-workflow.context';
 import { ManualWorkflowContext } from './contexts/manual-workflow.context';