mirror/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-01-13 16:40:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1560 from HeyPuter/DS/main

Browse Source 
fix: expiry time for dbkv
This commit is contained in:
Daniel Salazar
2025-09-15 10:44:21 -07:00
committed by GitHub
parent f89f429849 860f68a9a5
commit 4e563b4238
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/src/services/DBKVService.js
View File

@@ -74,13 +74,12 @@ class DBKVService extends BaseService {
});
const expiredKeys = [];
const validRows = {};
rows.forEach(row => {
if ( row?.expireAt && row.expireAt < Date.now() ) {
if ( row?.expireAt && row.expireAt < (Date.now() / 1000) ) {
expiredKeys.push(row);
validRows[row.kkey] = null;
kv[row.kkey] = null;
} else {
validRows[row.kkey] = row.value ?? null;
kv[row.kkey] = row.value ?? null;
}
});
@@ -146,11 +145,11 @@ class DBKVService extends BaseService {
try {
await this.db.write(`INSERT INTO kv (user_id, app, kkey_hash, kkey, value, expireAt)
VALUES (?, ?, ?, ?, ?, ?) ` +
this.db.case({
mysql: 'ON DUPLICATE KEY UPDATE value = ?',
sqlite: 'ON CONFLICT(user_id, app, kkey_hash) DO UPDATE SET value = excluded.value',
}),
VALUES (?, ?, ?, ?, ?, ?) ${
this.db.case({
mysql: 'ON DUPLICATE KEY UPDATE value = ?',
sqlite: 'ON CONFLICT(user_id, app, kkey_hash) DO UPDATE SET value = excluded.value',
})}`,
[
user.id, app?.uid ?? GLOBAL_APP_KEY, key_hash, key,
JSON.stringify(value), expireAt ?? null,
@@ -286,11 +285,11 @@ class DBKVService extends BaseService {
try {
await this.db.write(`INSERT INTO kv (user_id, app, kkey_hash, kkey, value, expireAt)
VALUES (?, ?, ?, ?, ?, ?) ` +
this.db.case({
mysql: 'ON DUPLICATE KEY UPDATE expireAt = ?',
sqlite: 'ON CONFLICT(user_id, app, kkey_hash) DO UPDATE SET expireAt = excluded.expireAt',
}),
VALUES (?, ?, ?, ?, ?, ?) ${
this.db.case({
mysql: 'ON DUPLICATE KEY UPDATE expireAt = ?',
sqlite: 'ON CONFLICT(user_id, app, kkey_hash) DO UPDATE SET expireAt = excluded.expireAt',
})}`,
[
user.id,
app?.uid ?? GLOBAL_APP_KEY,