misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix AppLockService and redis-lock library

Browse source
This commit is contained in:
Hazelnoot 2025-10-02 22:33:13 -04:00
parent 5f76740f77
commit 23594d7373
6 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
packages/backend/src/core/AppLockService.ts
View file

@ -5,7 +5,7 @@
import { promisify } from 'node:util';
import { Inject, Injectable } from '@nestjs/common';
import redisLock from 'redis-lock';
import redisLock, { Unlock, NodeRedis } from 'redis-lock';
import * as Redis from 'ioredis';
import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js';
@ -17,13 +17,13 @@ const retryDelay = 100;
@Injectable()
export class AppLockService {
private lock: (key: string, timeout?: number, _?: (() => Promise<void>) | undefined) => Promise<() => void>;
private lock: (key: string, timeout?: number) => Promise<Unlock>;
constructor(
@Inject(DI.redis)
private redisClient: Redis.Redis,
) {
this.lock = promisify(redisLock(this.redisClient, retryDelay));
this.lock = redisLock(adaptRedis(this.redisClient), retryDelay);
}
/**
@ -33,12 +33,36 @@ export class AppLockService {
* @returns Unlock function
*/
@bindThis
public getApLock(uri: string, timeout = 30 * 1000): Promise<() => void> {
public getApLock(uri: string, timeout = 30 * 1000): Promise<Unlock> {
return this.lock(`ap-object:${uri}`, timeout);
}
@bindThis
public getChartInsertLock(lockKey: string, timeout = 30 * 1000): Promise<() => void> {
public getChartInsertLock(lockKey: string, timeout = 30 * 1000): Promise<Unlock> {
return this.lock(`chart-insert:${lockKey}`, timeout);
}
}
/**
* Adapts an ioredis instance into something close enough to NodeRedis that it works with redis-lock.
*/
function adaptRedis(ioredis: Redis.Redis): NodeRedis {
return {
v4: true,
async set(key: string, value: string | number, opts?: { PX?: number, NX?: boolean }) {
if (opts) {
if (opts.PX != null && opts.NX) {
return ioredis.set(key, value, 'PX', opts.PX, 'NX');
} else if (opts.PX != null) {
return ioredis.set(key, value, 'PX', opts.PX);
} else if (opts.NX) {
return ioredis.set(key, value, 'NX');
}
}
return ioredis.set(key, value);
},
async del(key: string) {
return await ioredis.del(key);
},
};
}