@mamindom/common 1.0.122 → 1.0.123

package/dist/grpc/registry/grpc.registry.d.ts

@@ -47,9 +47,14 @@ export declare const GRPC_CLIENTS: {
     };
     readonly CART_PACKAGE: {
         readonly package: "cart.v1";
-        readonly protoPath: readonly [string];
+        readonly protoPath: readonly [string, string];
         readonly env: "CART_GRPC_URL";
     };
+    readonly CRM_PACKAGE: {
+        readonly package: "crm.v1";
+        readonly protoPath: readonly [string];
+        readonly env: "INTEGRATION_GRPC_URL";
+    };
     readonly ORDER_PACKAGE: {
         readonly package: "order.v1";
         readonly protoPath: readonly [string];

package/dist/grpc/registry/grpc.registry.js

@@ -84,9 +84,14 @@ exports.GRPC_CLIENTS = {
     },
     CART_PACKAGE: {
         package: 'cart.v1',
-        protoPath: [contracts_1.PROTO_PATHS.CART],
+        protoPath: [contracts_1.PROTO_PATHS.CART, contracts_1.PROTO_PATHS.CRM_CALCULATION],
         env: 'CART_GRPC_URL'
     },
+    CRM_PACKAGE: {
+        package: 'crm.v1',
+        protoPath: [contracts_1.PROTO_PATHS.CRM_CALCULATION],
+        env: 'INTEGRATION_GRPC_URL'
+    },
     ORDER_PACKAGE: {
         package: 'order.v1',
         protoPath: [contracts_1.PROTO_PATHS.ORDER],

package/dist/rbac/permissions.js

@@ -78,6 +78,11 @@ exports.PERMISSION_GROUPS = [
                 key: 'orders.assign',
                 groupKey: 'orders',
                 label: 'Призначення менеджера'
+            },
+            {
+                key: 'orders.pickup.confirm',
+                groupKey: 'orders',
+                label: 'Підтвердження видачі самовивозу'
             }
         ]
     },
@@ -303,6 +308,7 @@ exports.SYSTEM_ROLE_DEFAULTS = {
             'orders.cancel',
             'orders.refund',
             'orders.assign',
+            'orders.pickup.confirm',
             'customers.view',
             'customers.edit',
             'customers.notify',

package/dist/rmq/bootstrap-dlx.d.ts

@@ -1,37 +1,12 @@
-/**
- * Convention: dead-letter exchange and queue names are derived from the
- * primary queue name. `cart_queue` → `cart.dlx` + `cart.dlq`. The `_queue`
- * or `-queue` suffix is stripped; if absent, the whole name is used.
- *
- * Keeping this as a pure function (instead of env vars) prevents the class
- * of bugs where producer and consumer disagree on DLX naming and trigger
- * PRECONDITION_FAILED on queue declare.
- */
 export declare function dlxNameFor(queue: string): string;
 export declare function dlqNameFor(queue: string): string;
-/**
- * queueOptions.arguments needed for a queue that should dead-letter into its
- * conventional DLX. Use in `app.connectMicroservice(...)` and in every
- * `ClientsModule.registerAsync` that declares the same queue, so producer
- * and consumer declares stay equivalent.
- */
 export declare function rmqQueueDlxArguments(queue: string): {
     'x-dead-letter-exchange': string;
 };
 export interface BootstrapRmqDlxOptions {
     url: string;
     queue: string;
+    maxAttempts?: number;
+    retryDelayMs?: number;
 }
-/**
- * Idempotently declares the DLX trio for the given queue: fanout exchange +
- * DLQ queue + binding. Run once at service bootstrap, before connecting RMQ
- * microservice. Safe to repeat — RabbitMQ no-ops on identical re-declares.
- *
- * `amqplib` is loaded lazily so services that import other helpers from this
- * module but don't actually run RMQ (e.g. gateway-service) don't need amqplib
- * in their node_modules.
- *
- * Why fanout: dead-lettered messages keep their original routing key, but
- * we want every message into the DLX to land in the DLQ regardless of key.
- */
 export declare function bootstrapRmqDlx(opts: BootstrapRmqDlxOptions): Promise<void>;

package/dist/rmq/bootstrap-dlx.js

@@ -5,15 +5,6 @@ exports.dlqNameFor = dlqNameFor;
 exports.rmqQueueDlxArguments = rmqQueueDlxArguments;
 exports.bootstrapRmqDlx = bootstrapRmqDlx;
 const common_1 = require("@nestjs/common");
-/**
- * Convention: dead-letter exchange and queue names are derived from the
- * primary queue name. `cart_queue` → `cart.dlx` + `cart.dlq`. The `_queue`
- * or `-queue` suffix is stripped; if absent, the whole name is used.
- *
- * Keeping this as a pure function (instead of env vars) prevents the class
- * of bugs where producer and consumer disagree on DLX naming and trigger
- * PRECONDITION_FAILED on queue declare.
- */
 function dlxNameFor(queue) {
     return `${stripQueueSuffix(queue)}.dlx`;
 }
@@ -23,34 +14,30 @@ function dlqNameFor(queue) {
 function stripQueueSuffix(queue) {
     return queue.replace(/[_-]queue$/, '');
 }
-/**
- * queueOptions.arguments needed for a queue that should dead-letter into its
- * conventional DLX. Use in `app.connectMicroservice(...)` and in every
- * `ClientsModule.registerAsync` that declares the same queue, so producer
- * and consumer declares stay equivalent.
- */
 function rmqQueueDlxArguments(queue) {
     return { 'x-dead-letter-exchange': dlxNameFor(queue) };
 }
-/**
- * Idempotently declares the DLX trio for the given queue: fanout exchange +
- * DLQ queue + binding. Run once at service bootstrap, before connecting RMQ
- * microservice. Safe to repeat — RabbitMQ no-ops on identical re-declares.
- *
- * `amqplib` is loaded lazily so services that import other helpers from this
- * module but don't actually run RMQ (e.g. gateway-service) don't need amqplib
- * in their node_modules.
- *
- * Why fanout: dead-lettered messages keep their original routing key, but
- * we want every message into the DLX to land in the DLQ regardless of key.
- */
 async function bootstrapRmqDlx(opts) {
     const logger = new common_1.Logger('RmqDlxBootstrap');
     const dlx = dlxNameFor(opts.queue);
     const dlq = dlqNameFor(opts.queue);
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const amqp = require('amqplib');
-    const connection = await amqp.connect(opts.url);
+    const maxAttempts = opts.maxAttempts ?? 60;
+    const retryDelayMs = opts.retryDelayMs ?? 5000;
+    let connection;
+    for (let attempt = 1; connection === undefined; attempt++) {
+        try {
+            connection = await amqp.connect(opts.url);
+        }
+        catch (err) {
+            if (attempt >= maxAttempts) {
+                throw err;
+            }
+            logger.warn(`RMQ connect failed (attempt ${String(attempt)}/${String(maxAttempts)}), retrying in ${String(retryDelayMs)}ms: ${err instanceof Error ? err.message : String(err)}`);
+            await new Promise(resolve => setTimeout(resolve, retryDelayMs));
+        }
+    }
     try {
         const channel = await connection.createChannel();
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@mamindom/common",
-	"version": "1.0.122",
+	"version": "1.0.123",
 	"type": "commonjs",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
 		"typescript": "^5.9.3"
 	},
 	"dependencies": {
-		"@mamindom/contracts": "^1.0.152",
+		"@mamindom/contracts": "^1.0.154",
 		"@nestjs/common": "^11.1.16",
 		"@nestjs/config": "^4.0.3",
 		"@nestjs/microservices": "^11.1.16"