fix queues

src/drivers/redis.ts

@@ -140,8 +140,7 @@ export class RedisDriver extends BaseDriver {
 
   async queueItems(key: string): Promise<Buffer[]> {
     const _key = this.getQueueKey(key);
-    const items = await this.pool.use((r) => r.redis.lrangeBuffer(_key, 0, -1));
-    return items.reverse();
+    return this.pool.use((r) => r.redis.lrangeBuffer(_key, 0, -1));
   }
 
   override async queueAdd(
@@ -152,16 +151,16 @@ export class RedisDriver extends BaseDriver {
     const _key = this.getQueueKey(key);
     await this.pool.use(async (r) => {
       if (prior) {
-        await r.redis.lpush(_key, value);
-      } else {
         await r.redis.rpush(_key, value);
+      } else {
+        await r.redis.lpush(_key, value);
       }
     });
   }
 
   override async queueGather(key: string): Promise<Buffer> {
     const _key = this.getQueueKey(key);
-    const value = await this.pool.use((r) => r.redis.rpopBuffer(_key));
+    const value = await this.pool.use((r) => r.redis.lpopBuffer(_key));
     return value || undefined;
   }
 
@@ -173,22 +172,18 @@ export class RedisDriver extends BaseDriver {
   override async queueGatherBlocking(key: string): Promise<Buffer> {
     if (this.quitted) return;
     const _key = this.getQueueKey(key);
-    return this.useTempRedisClient(async (redisClient) => {
+    const res = await this.useTempRedisClient(async (redisClient) => {
       try {
-        const valueProm = redisClient.brpopBuffer(_key, 0);
+        const valueProm = redisClient.blpopBuffer(_key, 0);
         const exitProm = new Promise<void>((resolve) => {
           this.waitingBlockingProms.set(valueProm, resolve);
         });
         const value = await Promise.race([valueProm, exitProm]);
         this.waitingBlockingProms.delete(valueProm);
         if (value) return value?.[1];
-        //console.log('wait2');
-        return await this.queueGatherBlocking(key);
-      } catch (e) {
-        //console.log(e);
-        return await this.queueGatherBlocking(key);
-      }
+      } catch (e) {}
     });
+    return res || this.queueGatherBlocking(key);
   }
 
   async queueClear(key: string): Promise<void> {