amqplib-init 1.0.0 → 1.1.0

package/index.js

@@ -1,5 +1,6 @@
 const amqp = require('amqplib');
 const shelljs = require('shelljs');
+const chalk = require('chalk-style');
 const sleep = (time) => {
   return new Promise(resolve => {
     setTimeout(_ => resolve(), time * 1000)
@@ -15,15 +16,16 @@ module.exports = {
     const {
       channelName = 'node-test-channel',
       prefetch = 1,
-      callback = Function,
+      callback = ()=> {},
       pmId = 0,
-      finish = Function,
+      finish = ()=> {},
       amqpLink = ``,
       heartbeat = 5,
       timeout = 120000,
+      delay = 0
     } = option;
     const durable = true;
-    console.log(`🚀 队列已执行...`);
+    chalk.log(`🚀 队列已执行...`);
     let connect = null;
     const amqpInit = async (reload = false) => {
       await sleep(1); // 等待一秒钟
@@ -32,55 +34,61 @@ module.exports = {
         timeout, // 设置连接超时时间为120秒
       });
       if (pmId > 0 && reload){
-        console.log(`‼️ 服务即将重启`);
+        chalk.log(`‼️ 服务即将重启`);
         shelljs.exec(`pm2 reload ${pmId}`);
       }
     }
     return new Promise(async (resolve) => {
       await amqpInit();
-      console.log(`✳️->RabbitMQ链接成功`);
+      chalk.log(`✳️->RabbitMQ链接成功`);
       const channel = await connect.createChannel();
-      console.log(`✳️->数据队列名称`, channelName);
-      console.log(`✳️->是否持久化`, durable);
+      chalk.log(`✳️->数据队列名称`, channelName);
+      chalk.log(`✳️->是否持久化`, durable);
       const { queue } = await channel.assertQueue(channelName, { durable });
       // 一次性读取一条;
       await channel.prefetch(prefetch);
-      console.log(`✳️->一次取多少条`, prefetch);
-      console.log(`✳️->消息队列: ${channelName} 正在运行中...`);
+      chalk.log(`✳️->一次取多少条`, prefetch);
+      chalk.log(`✳️->消息队列: ${channelName} 正在运行中...`);
       await channel.consume(queue, async (msg) => {
         if (msg !== null) {
           try {
             await channel.assertQueue(channelName, { durable });
             const content = JSON.parse(msg?.content?.toString());
-            console.log(`✳️->队列收到新消息: ${channelName}`);
+            chalk.log(`✳️->队列收到新消息: ${channelName}`);
             const startTime = new Date().getTime();
             callback(content).then(()=> {
               try {
-                channel.ack(msg);
-                const endTime = (new Date().getTime() - startTime);
-                console.log(`✳️->消息处理完成, 共耗时: ${endTime}ms`);
+                setTimeout(_=> {
+                  const endTime = (new Date().getTime() - startTime);
+                  chalk.log(`✳️->消息处理完成, 需要延迟: ${delay}ms, 共耗时: ${endTime}ms`);
+                  channel.ack(msg);
+                }, delay)
               } catch (e) {
-                console.log(`队列消费遇到异常`, e);
+                chalk.warning(`队列消费遇到异常`, e);
+                channel.reject(msg,true);
               }
+            }).catch(e => {
+              chalk.warning(`消息处理遇到异常`, e);
+              channel.reject(msg, true);
             });
           } catch (e) {
-            console.log(`队列遇到异常`, e);
+            chalk.error(`队列遇到异常`, e);
           }
         } else {
-          console.log(`消息异常`, msg);
+          chalk.log(`消息异常`, msg);
         }
-      });
+      }, { noAck: false });
       // 队列遇到错误
       connect.on('error', (err) => {
-        console.log('Connection error', err.message);
+        chalk.log('Connection error', err.message);
         amqpInit(true);
       });
       // 队列被关闭
       connect.on('close', function() {
-        console.log('Connection to RabbitMQ is closed');
+        chalk.log('Connection to RabbitMQ is closed');
         amqpInit(true);
       });
-      console.log(`✳️-队列已启动: finish~`);
+      chalk.log(`✳️-队列已启动: finish~`);
       finish && finish();
     })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amqplib-init",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "消息队列初始化",
   "main": "index.js",
   "scripts": {
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "amqplib": "^0.10.4",
+    "chalk-style": "^1.0.0",
     "shelljs": "^0.8.5"
   }
 }