atomic-queues 2.0.2 → 2.1.0

package/README.md

@@ -159,12 +159,20 @@ The library auto-discovers `@CommandHandler` and `@QueryHandler` classes at boot
 // Fire-and-forget
 await queueBus.enqueue(new WithdrawCommand(accountId, 100));
 
-// Enqueue and block until result
+// Enqueue and block until result — return type inferred from Reply<T> brand
 const balance = await queueBus.enqueueAndWait(new GetBalanceQuery(accountId));
 
 // Scoped to an entity type
 await queueBus.forEntity('account').enqueueBulk([charge1, charge2, charge3]);
 
+// Cross-service: string-based API — no class import needed
+await queueBus.enqueue('warehouse', 'ReserveStockCommand', 'SKU-001', { sku: 'SKU-001', quantity: 50 });
+const stock = await queueBus.enqueueAndWait('warehouse', 'GetStockQuery', 'SKU-001', { sku: 'SKU-001' });
+
+// Scoped cross-service
+const warehouse = queueBus.forEntity('warehouse');
+await warehouse.enqueue('ReserveStockCommand', 'SKU-001', { sku: 'SKU-001', quantity: 50 });
+
 // Actor-style direct send
 await actorSystem.send('account', accountId, new DepositCommand(100));
 const balance = await actorSystem.sendAndWait('account', accountId, new GetBalanceQuery());
@@ -228,17 +236,23 @@ atomic-queues replaces all of that with Redis.
 Enable the distributed registry and any service connected to the same Redis instance can send typed messages to any entity — regardless of which service owns the handler.
 
 ```typescript
-// billing-service: defines and handles the entity
+// warehouse-service: defines and handles the entity
 AtomicQueuesModule.forRoot({
   redis: { url: process.env.REDIS_URL },
-  registry: { enabled: true, serviceName: 'billing-service' },
+  registry: { enabled: true, serviceName: 'warehouse-service' },
 })
 
-// payments-service: sends to it (shared Redis, no code dependency on billing)
-await queueBus.enqueue(new WithdrawCommand(accountId, 100));
+// order-service: generate classes from the live registry, then use them like local CQRS
+import { ReserveStockCommand, GetStockQuery } from './generated';
+
+await queueBus.enqueue(new ReserveStockCommand({ sku: 'SKU-001', quantity: 50 }));
+const stock = await queueBus.enqueueAndWait(new GetStockQuery({ sku: 'SKU-001' }));
+stock.available; // fully typed — no string API, no explicit timeout, no code dependency on warehouse-service
 ```
 
-When `billing-service` starts, it scans its own `@Actor`, `@CommandHandler`, and `@QueryHandler` classes and publishes **entity contracts** to Redis — a JSON document listing the entity type, accepted messages, and optional JSON schemas, refreshed via heartbeat TTL. When `payments-service` enqueues a message, the registry validates it at the call site *before* it enters the log: entity type exists, message name is accepted, payload matches schema. Errors are immediate and descriptive — not silent dead letters discovered hours later in a DLQ dashboard.
+When `warehouse-service` starts, it scans its own `@Actor`, `@CommandHandler`, and `@QueryHandler` classes and publishes **entity contracts** to Redis — a JSON document listing the entity type, accepted messages, optional JSON schemas, and reply schemas, refreshed via heartbeat TTL. When `order-service` enqueues a message, the registry validates it at the call site *before* it enters the log: entity type exists, message name is accepted, payload matches schema. Errors are immediate and descriptive — not silent dead letters discovered hours later in a DLQ dashboard.
+
+The Lua scheduler ensures each node only dispatches messages for entity types it owns handlers for. Services that don't own any handlers (API gateways, pure producers) participate in the registry without stealing messages from handler-owning nodes.
 
 ### What this replaces
 
@@ -252,7 +266,7 @@ Think about what you no longer need:
 
 **No service discovery.** The registry *is* service discovery. When a service starts, it publishes what it handles. When a service stops, its registrations TTL out. Other services discover capabilities by reading the registry.
 
-**No serialization framework.** Messages are JSON. The wire protocol is three Redis commands. No Protobuf compilation step, no `.proto` files, no code generation from IDL. (Though atomic-queues does offer codegen from the live registry — it generates TypeScript interfaces so Service A gets compile-time type safety for messages destined to Service B, without importing Service B's code.)
+**No serialization framework.** Messages are JSON. The wire protocol is three Redis commands. No Protobuf compilation step, no `.proto` files, no code generation from IDL. (Though atomic-queues does offer codegen from the live registry — it generates decorated TypeScript classes so Service A gets compile-time type safety for messages destined to Service B, without importing Service B's code.)
 
 **No separate dead-letter infrastructure.** Failed messages are dead-lettered per entity type in Redis, queryable via the same connection.
 
@@ -281,15 +295,118 @@ The Zod schema serializes to JSON Schema and stores in the registry. Every servi
 
 Multiple services can handle different message types on the same entity. Service A handles `DepositCommand` and `WithdrawCommand` on the `account` entity type. Service B handles `FreezeAccountCommand` on the same entity type. The registry merges their contracts automatically. The dispatch gate still ensures single-writer semantics per entity instance, regardless of which service's executor picks up the message.
 
-### Contract codegen
+### Runtime introspection
+
+Any service can discover what the cluster offers at runtime — no config files, no shared code:
+
+```typescript
+const contracts = await queueBus.introspect();
+
+contracts.entityTypes();                              // ['account', 'warehouse', ...]
+contracts.hasEntity('warehouse');                      // true
+contracts.messagesFor('warehouse');                    // ['ReserveStockCommand', 'GetStockQuery']
+contracts.accepts('warehouse', 'ReserveStockCommand'); // true
+contracts.schemaFor('warehouse', 'ReserveStockCommand');  // { properties: { sku: ..., quantity: ... } }
+contracts.replySchemaFor('warehouse', 'GetStockQuery');   // { properties: { sku: ..., available: ... } }
+
+// Human-readable summary for logging/debugging
+console.log(contracts.toString());
+```
+
+### Raw cross-service API
+
+For quick prototyping or dynamic dispatch, you can also use the string-based API — no classes, no codegen, no imports:
+
+```typescript
+// Fire-and-forget
+await queueBus.enqueue('warehouse', 'ReserveStockCommand', 'SKU-001', {
+  sku: 'SKU-001',
+  quantity: 50,
+});
+
+// Request-reply
+const stock = await queueBus.enqueueAndWait('warehouse', 'GetStockQuery', 'SKU-001', {
+  sku: 'SKU-001',
+});
+
+// Scoped to an entity type
+const warehouse = queueBus.forEntity('warehouse');
+await warehouse.enqueue('ReserveStockCommand', 'SKU-001', { sku: 'SKU-001', quantity: 50 });
+const stock = await warehouse.enqueueAndWait('GetStockQuery', 'SKU-001', { sku: 'SKU-001' });
+```
+
+This works out of the box — the registry validates entity type and message name at the call site. For production services, class codegen gives you full type safety.
 
-Generate typed interfaces from the live registry:
+### Class codegen (recommended)
+
+Generate fully decorated TypeScript classes from the live registry — import them and use them like local CQRS classes with full autocomplete, type safety, and zero string APIs:
 
 ```bash
-REDIS_URL=redis://localhost:6379 npx atomic-queues generate --ts --output ./generated/contracts.ts
+npx atomic-queues generate --classes -o src/generated
+```
+
+This produces one file per entity type plus a barrel `index.ts`:
+
+```
+src/generated/
+  warehouse.ts    # ReserveStockCommand, GetStockQuery, data interfaces, reply interfaces
+  billing.ts      # ChargeCommand, GetInvoiceQuery, ...
+  index.ts        # export * from './warehouse'; export * from './billing';
+```
+
+Then use them exactly like local command/query classes:
+
+```typescript
+import { ReserveStockCommand, GetStockQuery } from './generated';
+
+// Fire-and-forget — full autocomplete on constructor fields
+await queueBus.enqueue(new ReserveStockCommand({ sku: 'SKU-001', quantity: 50 }));
+
+// Request-reply — return type inferred from Reply<T> brand, no explicit timeout
+const stock = await queueBus.enqueueAndWait(new GetStockQuery({ sku: 'SKU-001' }));
+stock.available; // typed as number — full IDE support
+```
+
+Generated query classes implement `Reply<T>` via a phantom type brand, so `enqueueAndWait` infers the return type at compile time with zero runtime cost. No explicit generics, no timeout parameter — timeouts are resolved from config.
+
+You can also filter to specific entity types:
+
+```bash
+npx atomic-queues generate --classes -o src/generated --entities warehouse,billing
+```
+
+### Other codegen formats
+
+```bash
+# TypeScript interfaces + DispatchMap (for typed string-based API)
+npx atomic-queues generate --ts --output ./generated/contracts.ts
+
+# JSON Schema (language-agnostic)
+npx atomic-queues generate --json-schema --output ./generated/schema.json
+
+# Full registry snapshot
+npx atomic-queues generate --snapshot --output ./generated/snapshot.json
+```
+
+### Config-driven timeouts
+
+`enqueueAndWait` resolves timeouts automatically — you never need to pass one explicitly:
+
+```typescript
+AtomicQueuesModule.forRoot({
+  executor: {
+    gateTTL: 30,
+    defaultReplyTimeout: 15000,     // global fallback: 15s
+  },
+  entities: {
+    warehouse: {
+      replyTimeout: 5000,           // warehouse-specific: 5s
+    },
+  },
+})
 ```
 
-Also supports `--json-schema` for language-agnostic schema export and `--snapshot` for full registry dumps.
+Resolution chain: explicit arg → per-entity `replyTimeout` → global `defaultReplyTimeout` → `gateTTL * 2 * 1000`. If nothing is configured, defaults to 60s.
 
 ---
 
@@ -368,8 +485,9 @@ AtomicQueuesModule.forRoot({
   redis: { host: 'localhost', port: 6379 },
 
   executor: {
-    poolSize: 1,          // concurrent executors per node
-    gateTTL: 30,          // seconds before gate expires (safety net)
+    poolSize: 1,              // concurrent executors per node
+    gateTTL: 30,              // seconds before gate expires (safety net)
+    defaultReplyTimeout: 15000, // global default for enqueueAndWait (ms)
   },
 
   entities: {
@@ -379,6 +497,7 @@ AtomicQueuesModule.forRoot({
       retry: { maxAttempts: 5, backoff: 'exponential', backoffDelay: 2000 },
       actorIdleTimeout: 120000,
       statePersistence: true,
+      replyTimeout: 5000,     // per-entity enqueueAndWait timeout (ms)
     },
   },
 
@@ -446,6 +565,7 @@ npm install zod zod-to-json-schema # for schema validation in the registry
 | `@Actor('type')` | Declare a virtual actor class |
 | `@On(MessageClass)` | Handle a message type on an actor |
 | `@Schema(zodSchema)` | Attach a Zod schema for registry validation |
+| `@ReplySchema(zodSchema)` | Attach a reply schema for query codegen |
 
 ---
 
@@ -457,7 +577,7 @@ V2 is a full rewrite of the internals. BullMQ is removed. Workers are removed. T
 
 **What's removed**: `@WorkerProcessor`, `@JobHandler`, `@EntityScaler`, `@OnSpawnWorker`, `@OnTerminateWorker`, `@GetActiveEntities`, `@GetDesiredWorkerCount`, `.forProcessor()`. All worker and scaling concepts are gone.
 
-**What's new**: `@Actor`, `@On`, `@Schema`, `ActorSystem`, `RegistryService`, distributed registry, codegen CLI.
+**What's new**: `@Actor`, `@On`, `@Schema`, `@ReplySchema`, `ActorSystem`, `RegistryService`, distributed registry, runtime introspection (`queueBus.introspect()`), cross-service string-based API, `Reply<T>` phantom type, class codegen CLI (`--classes`), config-driven timeouts.
 
 **Migration steps**: (1) remove all `@WorkerProcessor` classes — replace with `@Actor` or configure entity defaults in module config; (2) remove all scaling decorators; (3) run the data migration script to drain in-flight BullMQ jobs to the new log format; (4) remove `bullmq` and `@nestjs/bullmq` from your dependencies.
 

package/dist/cli/generators/classes.d.ts

@@ -0,0 +1,12 @@
+import { RegistrySnapshot } from '../../services/registry/registry.types';
+export interface GeneratedFile {
+    filename: string;
+    content: string;
+}
+/**
+ * Generates instantiable TypeScript classes from the registry snapshot.
+ * Each entity type gets its own file with decorated command/query classes
+ * that work directly with `queueBus.enqueue()` and `queueBus.enqueueAndWait()`.
+ */
+export declare function generateClasses(snapshot: RegistrySnapshot): GeneratedFile[];
+//# sourceMappingURL=classes.d.ts.map

package/dist/cli/generators/classes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"classes.d.ts","sourceRoot":"","sources":["../../../src/cli/generators/classes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA+B,MAAM,wCAAwC,CAAC;AAEvG,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,aAAa,EAAE,CAqB3E"}

package/dist/cli/generators/classes.js

@@ -0,0 +1,141 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateClasses = generateClasses;
+/**
+ * Generates instantiable TypeScript classes from the registry snapshot.
+ * Each entity type gets its own file with decorated command/query classes
+ * that work directly with `queueBus.enqueue()` and `queueBus.enqueueAndWait()`.
+ */
+function generateClasses(snapshot) {
+    const files = [];
+    for (const entity of snapshot.entities) {
+        const filename = `${kebabCase(entity.entityType)}.ts`;
+        const content = generateEntityFile(entity, snapshot);
+        files.push({ filename, content });
+    }
+    // Barrel index
+    const barrelLines = [
+        header(snapshot),
+        '',
+    ];
+    for (const entity of snapshot.entities) {
+        barrelLines.push(`export * from './${kebabCase(entity.entityType)}';`);
+    }
+    barrelLines.push('');
+    files.push({ filename: 'index.ts', content: barrelLines.join('\n') });
+    return files;
+}
+function generateEntityFile(entity, snapshot) {
+    const lines = [];
+    const messages = Object.entries(entity.messages);
+    const hasReply = messages.some(([, spec]) => spec.kind === 'query' && spec.replySchema?.properties);
+    lines.push(header(snapshot));
+    lines.push(`// Entity: ${entity.entityType} (service: ${entity.serviceName})`);
+    lines.push('');
+    // Imports
+    const imports = ['EntityType'];
+    const hasEntityId = messages.some(([, spec]) => spec.entityIdField);
+    if (hasEntityId)
+        imports.push('QueueEntityId');
+    lines.push(`import { ${imports.join(', ')} } from 'atomic-queues';`);
+    if (hasReply) {
+        lines.push(`import type { Reply } from 'atomic-queues';`);
+    }
+    lines.push('');
+    for (const [msgName, spec] of messages) {
+        lines.push(generateMessage(entity.entityType, msgName, spec));
+        lines.push('');
+    }
+    return lines.join('\n');
+}
+function generateMessage(entityType, msgName, spec) {
+    const lines = [];
+    const fields = extractFields(spec);
+    const hasReplySchema = !!spec.replySchema?.properties;
+    // Data interface
+    const dataInterfaceName = `${msgName}Data`;
+    lines.push(`export interface ${dataInterfaceName} {`);
+    for (const field of fields) {
+        lines.push(`  ${field.name}${field.required ? '' : '?'}: ${field.tsType};`);
+    }
+    lines.push('}');
+    lines.push('');
+    // Reply interface (for queries with reply schemas)
+    if (hasReplySchema) {
+        const replyFields = extractFieldsFromSchema(spec.replySchema);
+        const replyName = `${msgName}Reply`;
+        lines.push(`export interface ${replyName} {`);
+        for (const field of replyFields) {
+            lines.push(`  ${field.name}${field.required ? '' : '?'}: ${field.tsType};`);
+        }
+        lines.push('}');
+        lines.push('');
+    }
+    // Class
+    const replyImpl = hasReplySchema ? ` implements Reply<${msgName}Reply>` : '';
+    lines.push(`@EntityType('${entityType}')`);
+    lines.push(`export class ${msgName}${replyImpl} {`);
+    // Phantom reply brand (type-only)
+    if (hasReplySchema) {
+        lines.push(`  declare readonly __reply: ${msgName}Reply;`);
+        lines.push('');
+    }
+    // Fields with @QueueEntityId on the entity ID field
+    for (const field of fields) {
+        if (field.name === spec.entityIdField) {
+            lines.push(`  @QueueEntityId() readonly ${field.name}!: ${field.tsType};`);
+        }
+        else {
+            lines.push(`  readonly ${field.name}${field.required ? '!' : '?'}: ${field.tsType};`);
+        }
+    }
+    // Constructor
+    lines.push('');
+    lines.push(`  constructor(data: ${dataInterfaceName}) {`);
+    lines.push('    Object.assign(this, data);');
+    lines.push('  }');
+    lines.push('}');
+    return lines.join('\n');
+}
+function extractFields(spec) {
+    return extractFieldsFromSchema(spec.schema);
+}
+function extractFieldsFromSchema(schema) {
+    if (!schema?.properties)
+        return [];
+    const required = new Set(schema.required ?? []);
+    return Object.entries(schema.properties).map(([name, propSchema]) => ({
+        name,
+        tsType: jsonSchemaTypeToTS(propSchema),
+        required: required.has(name),
+    }));
+}
+function jsonSchemaTypeToTS(schema) {
+    if (!schema.type)
+        return 'any';
+    switch (schema.type) {
+        case 'string': return schema.enum ? schema.enum.map((v) => `'${v}'`).join(' | ') : 'string';
+        case 'number':
+        case 'integer': return 'number';
+        case 'boolean': return 'boolean';
+        case 'array': return schema.items ? `${jsonSchemaTypeToTS(schema.items)}[]` : 'any[]';
+        case 'object': return 'Record<string, any>';
+        case 'null': return 'null';
+        default: return 'any';
+    }
+}
+function header(snapshot) {
+    return [
+        '// Auto-generated by atomic-queues — do not edit',
+        `// Source: Redis registry (prefix: '${snapshot.keyPrefix}')`,
+        `// Generated: ${new Date(snapshot.generatedAt).toISOString()}`,
+        '// Regenerate: npx atomic-queues generate --classes',
+    ].join('\n');
+}
+function kebabCase(str) {
+    return str
+        .replace(/([a-z])([A-Z])/g, '$1-$2')
+        .replace(/[\s_]+/g, '-')
+        .toLowerCase();
+}
+//# sourceMappingURL=classes.js.map

package/dist/cli/generators/classes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"classes.js","sourceRoot":"","sources":["../../../src/cli/generators/classes.ts"],"names":[],"mappings":"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"}

package/dist/cli/generators/typescript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/cli/generators/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CA6CrE"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/cli/generators/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAiGrE"}

package/dist/cli/generators/typescript.js

@@ -8,6 +8,7 @@ function generateTypeScript(snapshot) {
     lines.push(`// Generated: ${new Date(snapshot.generatedAt).toISOString()}`);
     lines.push('// DO NOT EDIT — regenerate with: npx atomic-queues generate --ts');
     lines.push('');
+    // ── Per-entity namespaces with message interfaces ──────────────────────
     for (const entity of snapshot.entities) {
         const namespace = pascalCase(entity.entityType) + 'Entity';
         lines.push(`export namespace ${namespace} {`);
@@ -37,6 +38,40 @@ function generateTypeScript(snapshot) {
         lines.push('}');
         lines.push('');
     }
+    // ── DispatchMap — maps entity type → message name → payload type ───────
+    lines.push('// ── Dispatch type maps (for use with TypedDispatch / TypedDispatchAndWait) ──');
+    lines.push('');
+    lines.push('export interface DispatchMap {');
+    for (const entity of snapshot.entities) {
+        const namespace = pascalCase(entity.entityType) + 'Entity';
+        lines.push(`  '${entity.entityType}': {`);
+        for (const [msgName, spec] of Object.entries(entity.messages)) {
+            const hasSchema = spec.schema?.properties && Object.keys(spec.schema.properties).length > 0;
+            const type = hasSchema ? `${namespace}.${msgName}` : 'Record<string, any>';
+            lines.push(`    '${msgName}': ${type};`);
+        }
+        lines.push('  };');
+    }
+    lines.push('}');
+    lines.push('');
+    // ── ReplyMap — maps entity type → query name → reply type ─────────────
+    const hasAnyReply = snapshot.entities.some(e => Object.values(e.messages).some(m => m.kind === 'query' && m.replySchema?.properties));
+    if (hasAnyReply) {
+        lines.push('export interface ReplyMap {');
+        for (const entity of snapshot.entities) {
+            const namespace = pascalCase(entity.entityType) + 'Entity';
+            const queries = Object.entries(entity.messages).filter(([, spec]) => spec.kind === 'query' && spec.replySchema?.properties);
+            if (queries.length > 0) {
+                lines.push(`  '${entity.entityType}': {`);
+                for (const [msgName] of queries) {
+                    lines.push(`    '${msgName}': ${namespace}.${msgName}Reply;`);
+                }
+                lines.push('  };');
+            }
+        }
+        lines.push('}');
+        lines.push('');
+    }
     return lines.join('\n');
 }
 function jsonSchemaTypeToTS(schema) {

package/dist/cli/generators/typescript.js.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/cli/generators/typescript.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/cli/generators/typescript.ts"],"names":[],"mappings":"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"}