@marianmeres/kv 1.2.3 → 1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapter/deno-kv.js +1 -1
- package/dist/adapter/memory.d.ts +1 -1
- package/dist/adapter/postgres.js +21 -11
- package/dist/adapter/redis.js +23 -11
- package/package.json +2 -2
package/dist/adapter/deno-kv.js
CHANGED
|
@@ -32,7 +32,7 @@ export class AdapterDenoKv extends AdapterAbstract {
|
|
|
32
32
|
_type = "deno-kv";
|
|
33
33
|
options = {
|
|
34
34
|
defaultTtl: 0, // no ttl by default
|
|
35
|
-
db: null,
|
|
35
|
+
db: null, // will be set in constructor via options merge
|
|
36
36
|
logger: createClog("KV/deno-kv"),
|
|
37
37
|
};
|
|
38
38
|
constructor(namespace = "", options = {}) {
|
package/dist/adapter/memory.d.ts
CHANGED
package/dist/adapter/postgres.js
CHANGED
|
@@ -38,7 +38,7 @@ export class AdapterPostgres extends AdapterAbstract {
|
|
|
38
38
|
options = {
|
|
39
39
|
defaultTtl: 0, // no ttl by default
|
|
40
40
|
logger: createClog("KV/postgres"),
|
|
41
|
-
db: null,
|
|
41
|
+
db: null, // will be set in constructor via options merge
|
|
42
42
|
tableName: "__kv",
|
|
43
43
|
ttlCleanupIntervalSec: 0,
|
|
44
44
|
};
|
|
@@ -71,6 +71,11 @@ export class AdapterPostgres extends AdapterAbstract {
|
|
|
71
71
|
ON ${tableName} (expires_at)
|
|
72
72
|
WHERE expires_at IS NOT NULL
|
|
73
73
|
`);
|
|
74
|
+
// Index for efficient prefix lookups with LIKE 'prefix%' queries
|
|
75
|
+
await db.query(`
|
|
76
|
+
CREATE INDEX IF NOT EXISTS idx_${safe(tableName)}_key_prefix
|
|
77
|
+
ON ${tableName} (key text_pattern_ops)
|
|
78
|
+
`);
|
|
74
79
|
this._initialized = true;
|
|
75
80
|
this.#maybeTTLCleanup();
|
|
76
81
|
}
|
|
@@ -180,16 +185,21 @@ export class AdapterPostgres extends AdapterAbstract {
|
|
|
180
185
|
async clear(pattern) {
|
|
181
186
|
this._assertInitialized();
|
|
182
187
|
const { db, tableName } = this.options;
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
188
|
+
const likePattern = pattern === "*"
|
|
189
|
+
? this.namespace + "%"
|
|
190
|
+
: this.namespace + this.#likePattern(pattern);
|
|
191
|
+
// Batch large deletions to prevent long-running transactions
|
|
192
|
+
const batchSize = 10000;
|
|
193
|
+
let totalDeleted = 0;
|
|
194
|
+
let deleted;
|
|
195
|
+
do {
|
|
196
|
+
const { rowCount } = await db.query(`DELETE FROM ${tableName} WHERE key IN (
|
|
197
|
+
SELECT key FROM ${tableName} WHERE key LIKE $1 LIMIT $2
|
|
198
|
+
)`, [likePattern, batchSize]);
|
|
199
|
+
deleted = rowCount ?? 0;
|
|
200
|
+
totalDeleted += deleted;
|
|
201
|
+
} while (deleted === batchSize);
|
|
202
|
+
return totalDeleted;
|
|
193
203
|
}
|
|
194
204
|
/** @inheritdoc */
|
|
195
205
|
async setMultiple(keyValuePairs, options = {}) {
|
package/dist/adapter/redis.js
CHANGED
|
@@ -36,7 +36,7 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
36
36
|
options = {
|
|
37
37
|
defaultTtl: 0, // no ttl by default
|
|
38
38
|
logger: createClog("KV/redis"),
|
|
39
|
-
db: null,
|
|
39
|
+
db: null, // will be set in constructor via options merge
|
|
40
40
|
isCluster: false,
|
|
41
41
|
};
|
|
42
42
|
constructor(namespace = "", options = {}) {
|
|
@@ -97,7 +97,7 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
97
97
|
this._assertInitialized();
|
|
98
98
|
key = this._withNs(key);
|
|
99
99
|
const { db } = this.options;
|
|
100
|
-
return
|
|
100
|
+
return Number(await db.del(key)) > 0;
|
|
101
101
|
}
|
|
102
102
|
/** @inheritdoc */
|
|
103
103
|
async exists(key) {
|
|
@@ -111,9 +111,20 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
111
111
|
this._assertInitialized();
|
|
112
112
|
const { db, isCluster } = this.options;
|
|
113
113
|
if (isCluster) {
|
|
114
|
-
throw new Error("
|
|
114
|
+
throw new Error("keys() is not supported in Redis Cluster mode");
|
|
115
115
|
}
|
|
116
|
-
|
|
116
|
+
// Use SCAN instead of KEYS for non-blocking iteration
|
|
117
|
+
const fullPattern = this.namespace + pattern;
|
|
118
|
+
const keys = [];
|
|
119
|
+
let cursor = "0";
|
|
120
|
+
do {
|
|
121
|
+
const result = await db.scan(cursor, {
|
|
122
|
+
MATCH: fullPattern,
|
|
123
|
+
COUNT: 100,
|
|
124
|
+
});
|
|
125
|
+
cursor = `${result.cursor}`;
|
|
126
|
+
keys.push(...result.keys.map((k) => String(k)));
|
|
127
|
+
} while (cursor !== "0");
|
|
117
128
|
return keys
|
|
118
129
|
.map((k) => {
|
|
119
130
|
// strip namespace if exists
|
|
@@ -133,7 +144,8 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
133
144
|
const keys = await this.keys(pattern);
|
|
134
145
|
if (keys.length === 0)
|
|
135
146
|
return 0;
|
|
136
|
-
|
|
147
|
+
// Use UNLINK instead of DEL for non-blocking memory reclamation
|
|
148
|
+
return Number(await db.unlink(keys.map((k) => this._withNs(k))));
|
|
137
149
|
}
|
|
138
150
|
/** @inheritdoc */
|
|
139
151
|
async setMultiple(keyValuePairs, options = {}) {
|
|
@@ -146,7 +158,7 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
146
158
|
pipeline.set(key, JSON.stringify(value), { EX: ttl });
|
|
147
159
|
}
|
|
148
160
|
const res = await pipeline.exec();
|
|
149
|
-
return res.map((v) => v === "OK");
|
|
161
|
+
return res.map((v) => String(v) === "OK");
|
|
150
162
|
}
|
|
151
163
|
/** @inheritdoc */
|
|
152
164
|
async getMultiple(keys) {
|
|
@@ -176,7 +188,7 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
176
188
|
async expire(key, ttl) {
|
|
177
189
|
this._assertInitialized();
|
|
178
190
|
key = this._withNs(key);
|
|
179
|
-
return
|
|
191
|
+
return Number(await this.options.db.expire(key, ttl)) > 0;
|
|
180
192
|
}
|
|
181
193
|
/** @inheritdoc */
|
|
182
194
|
async ttl(key) {
|
|
@@ -216,18 +228,18 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
216
228
|
for (const [i, op] of operations.entries()) {
|
|
217
229
|
switch (op.type) {
|
|
218
230
|
case "set":
|
|
219
|
-
res[i] = res[i] === "OK";
|
|
231
|
+
res[i] = String(res[i]) === "OK";
|
|
220
232
|
break;
|
|
221
233
|
case "get":
|
|
222
234
|
try {
|
|
223
|
-
res[i] = JSON.parse(res[i]);
|
|
235
|
+
res[i] = JSON.parse(String(res[i]));
|
|
224
236
|
}
|
|
225
237
|
catch (_e) {
|
|
226
238
|
/**/
|
|
227
239
|
}
|
|
228
240
|
break;
|
|
229
241
|
case "delete":
|
|
230
|
-
res[i] = res[i] > 0;
|
|
242
|
+
res[i] = Number(res[i]) > 0;
|
|
231
243
|
break;
|
|
232
244
|
}
|
|
233
245
|
}
|
|
@@ -241,7 +253,7 @@ export class AdapterRedis extends AdapterAbstract {
|
|
|
241
253
|
const keys = (await db.keys("*")).toSorted();
|
|
242
254
|
const out = {};
|
|
243
255
|
for (const _key of keys) {
|
|
244
|
-
const key = this._withoutNs(_key);
|
|
256
|
+
const key = this._withoutNs(String(_key));
|
|
245
257
|
out[key] = {
|
|
246
258
|
value: await this.get(key),
|
|
247
259
|
ttl: await this.ttl(key),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@marianmeres/kv",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/mod.js",
|
|
6
6
|
"types": "dist/mod.d.ts",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"@marianmeres/clog": "^3.15.0",
|
|
17
17
|
"@types/pg": "^8.16.0",
|
|
18
18
|
"@types/redis": "^4.0.10",
|
|
19
|
-
"pg": "^8.
|
|
19
|
+
"pg": "^8.17.1",
|
|
20
20
|
"redis": "^5.10.0"
|
|
21
21
|
},
|
|
22
22
|
"repository": {
|