@hiliosai/sdk 0.1.10 → 0.1.12

package/package.json

@@ -1,29 +1,25 @@
 {
   "name": "@hiliosai/sdk",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "module",
   "exports": {
     ".": "./src/index.ts"
   },
   "scripts": {
     "build": "tsup",
-    "format": "bunx prettier --write ./**/*.{ts,json,md,yaml}",
+    "format": "bunx prettier --write ./**/*.{ts,json}",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@keyv/redis": "5.1.5",
     "@ltv/env": "4.0.3",
     "@moleculer/channels": "0.2.0",
-    "keyv": "5.5.5",
-    "lodash": "4.17.21",
     "moleculer": "0.14.35"
   },
   "devDependencies": {
     "@hiliosai/prettier": "workspace:*",
     "@hiliosai/typescript": "workspace:*",
     "@pkg/dev-utils": "workspace:*",
-    "@types/lodash": "4.17.21",
     "bun-types": "latest"
   },
   "prettier": "@hiliosai/prettier"
-}
+}

package/src/configs/moleculer/index.ts

@@ -1,7 +1,11 @@
 import env from '@ltv/env';
-import type {BrokerOptions} from 'moleculer';
+import type {BrokerOptions, Middleware} from 'moleculer';
 import os from 'os';
 
+import {
+  ContextHelpersMiddleware,
+  PermissionsMiddleware,
+} from '../../middlewares';
 import {bulkheadConfig} from './bulkhead';
 import {ChannelsMiddleware} from './channels';
 import {circuitBreakerConfig} from './circuit-breaker';
@@ -79,7 +83,16 @@ const configs: BrokerOptions = {
   // Enable built-in tracing function. More info: https://moleculer.services/docs/0.14/tracing.html
   tracing: tracingConfig,
 
-  middlewares: [ChannelsMiddleware],
+  middlewares: [
+    ChannelsMiddleware,
+    PermissionsMiddleware as Middleware,
+    ContextHelpersMiddleware as Middleware,
+  ],
 };
 
+export const createConfig = (customConfig: BrokerOptions) => ({
+  ...configs,
+  ...customConfig,
+});
+
 export default configs;

package/src/datasources/extensions/soft-delete.extension.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * Soft Delete Extension for Prisma
  * Automatically handles soft deletes by setting deletedAt instead of removing records

package/src/datasources/extensions/tenant.extension.ts

@@ -1,18 +1,19 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * Multi-Tenant Extension for Prisma
  * Automatically filters queries by tenant context for multi-tenant applications
- * 
+ *
  * Usage:
  * ```typescript
  * import { createTenantExtension } from './extensions/tenant.extension';
- * 
+ *
  * class MyPrismaDS extends PrismaDatasource<PrismaClient> {
  *   protected applyExtensions(client: PrismaClient) {
  *     return client.$extends(createTenantExtension());
  *   }
  * }
  * ```
- * 
+ *
  * Requires models to have `tenantId String` field
  */
 
@@ -27,71 +28,71 @@ export function createTenantExtension() {
 
   return {
     name: 'Tenant',
-    
+
     client: {
       // Set tenant context
       $setTenant(tenantId: string) {
         tenantContext.currentTenantId = tenantId;
       },
-      
+
       // Get current tenant
       $getCurrentTenant() {
         return tenantContext.currentTenantId;
       },
-      
+
       // Clear tenant context
       $clearTenant() {
         tenantContext.currentTenantId = null;
       },
     },
-    
+
     query: {
       $allModels: {
         // Automatically add tenantId filter to all read operations
-        async findMany({ args, query }: any) {
+        async findMany({args, query}: any) {
           if (tenantContext.currentTenantId) {
             args.where ??= {};
             args.where.tenantId ??= tenantContext.currentTenantId;
           }
           return query(args);
         },
-        
-        async findUnique({ args, query }: any) {
+
+        async findUnique({args, query}: any) {
           if (tenantContext.currentTenantId) {
             args.where ??= {};
             args.where.tenantId ??= tenantContext.currentTenantId;
           }
           return query(args);
         },
-        
-        async findFirst({ args, query }: any) {
+
+        async findFirst({args, query}: any) {
           if (tenantContext.currentTenantId) {
             args.where ??= {};
             args.where.tenantId ??= tenantContext.currentTenantId;
           }
           return query(args);
         },
-        
+
         // Automatically add tenantId to create operations
-        async create({ args, query }: any) {
+        async create({args, query}: any) {
           if (tenantContext.currentTenantId) {
             args.data ??= {};
             args.data.tenantId ??= tenantContext.currentTenantId;
           }
           return query(args);
         },
-        
+
         // Add tenantId filter to update operations
-        async update({ args, query }: any) {
+        async update({args, query}: any) {
           if (tenantContext.currentTenantId) {
             args.where ??= {};
             args.where.tenantId ??= tenantContext.currentTenantId;
           }
           return query(args);
         },
-        
+
         // Add tenantId filter to delete operations
-        async delete({ args, query }: any) {
+        async delete({args, query}: any) {
           if (tenantContext.currentTenantId) {
             args.where ??= {};
             args.where.tenantId ??= tenantContext.currentTenantId;
@@ -101,4 +102,4 @@ export function createTenantExtension() {
       },
     },
   };
-}
+}

package/src/index.ts

@@ -6,4 +6,5 @@ export * from './configs';
 export * from './env';
 export * from './datasources';
 export * from './mixins';
+export * from './utils';
 export {default as env} from './env';

package/src/service/define-integration.ts

@@ -9,11 +9,7 @@ import {
 } from '../types/channels';
 import type {AppContext} from '../types/context';
 import type {IntegrationConfig} from '../types/integration';
-import type {
-  NormalizedMessage,
-  SendResult,
-  WebhookEvent,
-} from '../types/message';
+import type {Message, SendResult, WebhookEvent} from '../types/message';
 import type {DatasourceInstanceTypes} from '../types/datasource';
 import type {
   IntegrationServiceConfig,
@@ -204,7 +200,7 @@ export function defineIntegration<
         ctx: AppContext<
           TDatasources,
           {
-            message: NormalizedMessage;
+            message: Message;
             channelId: string;
           }
         >

package/src/service/define-service.ts

@@ -1,10 +1,10 @@
-import omit from 'lodash/omit';
 import type {ServiceSchema as MoleculerServiceSchema} from 'moleculer';
 
 import {MemoizeMixin} from '../middlewares';
 import type {DatasourceConstructorRegistry} from '../middlewares/datasource.middleware';
 import {DatasourceMixin} from '../mixins';
 import type {ServiceConfig} from '../types/service';
+import {omit} from '../utils';
 
 /**
  * Define a service
@@ -47,13 +47,10 @@ export function defineService<
     propsToOmit
   ) as unknown as MoleculerServiceSchema<TSettings>;
 
-  const datasources = config.datasources ?? {};
-
-  // TODO: Add mixins config support
   return {
     ...serviceSchema,
     mixins: [
-      DatasourceMixin(datasources),
+      DatasourceMixin(config.datasources),
       MemoizeMixin(),
       ...(serviceSchema.mixins ?? []),
     ],

package/src/types/channels.ts

@@ -1,5 +1,5 @@
 import type {IntegrationPlatform} from './platform';
-import type {NormalizedMessage} from './message';
+import type {Message} from './message';
 
 /**
  * Channel event payload types for reliable messaging via @moleculer/channels
@@ -10,7 +10,7 @@ export interface IntegrationMessageReceivedPayload {
   tenantId: string;
   channelId: string;
   platform: IntegrationPlatform;
-  message: NormalizedMessage;
+  message: Message;
   timestamp: number;
   metadata?: Record<string, unknown>;
 }
@@ -29,7 +29,7 @@ export interface IntegrationMessageFailedPayload {
   channelId: string;
   platform: IntegrationPlatform;
   error: string; // Serialized error message
-  message?: NormalizedMessage;
+  message?: Message;
   timestamp: number;
   retryCount?: number;
   metadata?: Record<string, unknown>;

package/src/types/message.ts

@@ -59,22 +59,56 @@ export interface CarouselItem {
   buttons?: MessageButton[];
 }
 
-export interface NormalizedMessage {
+export type MessageDirection = 'incoming' | 'outgoing' | 'internal';
+
+export type MessageType =
+  | 'text'
+  | 'image'
+  | 'file'
+  | 'audio'
+  | 'video'
+  | 'location'
+  | 'contact'
+  | 'sticker'
+  | 'template';
+
+export type MessageStatus =
+  | 'pending'
+  | 'sent'
+  | 'delivered'
+  | 'read'
+  | 'failed';
+
+export interface Message {
   id: string;
   conversationId: string;
   from: MessageParticipant;
   to: MessageParticipant;
   content: MessageContent;
+  direction: MessageDirection;
+  type: MessageType;
+  status: MessageStatus;
   timestamp: number;
   platform: IntegrationPlatform;
   replyTo?: string;
   threadId?: string;
+  attachments?: MessageAttachment[];
+  metadata?: Record<string, any>;
+}
+
+export interface MessageAttachment {
+  id: string;
+  name: string;
+  type: string;
+  size: number;
+  url: string;
+  thumbnail?: string;
   metadata?: Record<string, any>;
 }
 
-export interface PlatformMessage {
+export interface PlatformMessage<P = any> {
   platform: IntegrationPlatform;
-  payload: any;
+  payload: P;
 }
 
 export interface WebhookEvent<TPayload = any> {

package/src/types/service.ts

@@ -11,8 +11,7 @@ import type {DatasourceConstructorRegistry} from '../middlewares/datasource.midd
 import type {AppContext} from './context';
 import type {DatasourceInstanceTypes} from './datasource';
 import type {BaseSpec, IntegrationConfig} from './integration';
-import type {NormalizedMessage, SendResult, WebhookEvent} from './message';
-
+import type {Message, SendResult, WebhookEvent} from './message';
 
 // Type to infer TypeScript types from Moleculer parameter schemas
 type InferParamsType<T> = T extends Record<string, any>
@@ -123,7 +122,7 @@ export type ServiceConfig<
   TSettings,
   DatasourceInstanceTypes<TDatasourceConstructors>
 > & {
-  datasources?: TDatasourceConstructors;
+  datasources: TDatasourceConstructors;
 };
 
 // Integration-specific types
@@ -140,7 +139,7 @@ export interface IntegrationServiceConfig<
   // Core integration methods
   normalize<TPayload = any>(
     webhook: WebhookEvent<TPayload>
-  ): Promise<NormalizedMessage[]>;
+  ): Promise<Message[]>;
   getChannelConfig(
     ctx: TContext,
     channelId: string
@@ -148,7 +147,7 @@ export interface IntegrationServiceConfig<
   validateWebhook?<TPayload = any>(webhook: WebhookEvent<TPayload>): boolean;
   sendMessage(
     ctx: TContext,
-    message: NormalizedMessage,
+    message: Message,
     config: IntegrationConfig
   ): Promise<SendResult>;
 
@@ -181,7 +180,7 @@ export interface IntegrationServiceSchema<TSettings = unknown>
   spec: BaseSpec;
   normalize<TPayload = any>(
     webhook: WebhookEvent<TPayload>
-  ): Promise<NormalizedMessage[]>;
+  ): Promise<Message[]>;
   getChannelConfig(
     ctx: AppContext,
     channelId: string
@@ -189,7 +188,7 @@ export interface IntegrationServiceSchema<TSettings = unknown>
   validateWebhook?<TPayload = any>(webhook: WebhookEvent<TPayload>): boolean;
   sendMessage(
     ctx: AppContext,
-    message: NormalizedMessage,
+    message: Message,
     config: IntegrationConfig
   ): Promise<SendResult>;
   verifyWebhook?(params: {

package/src/utils/index.ts

@@ -0,0 +1,8 @@
+export function omit<T extends Record<string, unknown>, K extends keyof T>(
+  obj: T,
+  keys: K[]
+): Omit<T, K> {
+  const result = {...obj};
+  keys.forEach((key) => delete result[key]);
+  return result;
+}

package/tsup.config.ts

@@ -1,4 +1,3 @@
- 
 import {defineConfig} from '@pkg/dev-utils';
 
 export default defineConfig({