@upstash/redis 0.0.0-ci.e3757170 → 0.0.0-ci.ec2c4106-20221122
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/README.md +36 -279
- package/esm/deps/deno.land/x/base64@v0.2.1/base.js +100 -0
- package/esm/deps/deno.land/x/base64@v0.2.1/base64url.js +9 -0
- package/esm/deps/deno.land/x/sha1@v1.0.3/deps.js +1 -0
- package/esm/deps/deno.land/x/sha1@v1.0.3/mod.js +191 -0
- package/esm/deps/denopkg.com/chiefbiiko/std-encoding@v1.0.0/mod.js +50 -0
- package/esm/pkg/commands/getdel.js +9 -0
- package/esm/pkg/commands/lpos.js +19 -0
- package/esm/pkg/commands/mod.js +2 -0
- package/esm/pkg/commands/scan.js +3 -0
- package/esm/pkg/commands/sdiffstore.js +1 -1
- package/esm/pkg/commands/set.js +16 -4
- package/esm/pkg/commands/zmscore.js +10 -0
- package/esm/pkg/commands/zrange.js +6 -0
- package/esm/pkg/http.js +84 -3
- package/esm/pkg/pipeline.js +42 -6
- package/esm/pkg/redis.js +69 -2
- package/esm/pkg/script.js +77 -0
- package/esm/platforms/cloudflare.js +10 -2
- package/esm/platforms/fastly.js +1 -0
- package/esm/platforms/node_with_fetch.js +14 -1
- package/esm/platforms/nodejs.js +14 -1
- package/esm/version.js +1 -0
- package/package.json +1 -39
- package/script/deps/deno.land/x/base64@v0.2.1/base.js +104 -0
- package/script/deps/deno.land/x/base64@v0.2.1/base64url.js +13 -0
- package/script/deps/deno.land/x/sha1@v1.0.3/deps.js +6 -0
- package/script/deps/deno.land/x/sha1@v1.0.3/mod.js +196 -0
- package/script/deps/denopkg.com/chiefbiiko/std-encoding@v1.0.0/mod.js +55 -0
- package/script/pkg/commands/getdel.js +13 -0
- package/script/pkg/commands/lpos.js +23 -0
- package/script/pkg/commands/mod.js +2 -0
- package/script/pkg/commands/scan.js +3 -0
- package/script/pkg/commands/sdiffstore.js +1 -1
- package/script/pkg/commands/set.js +16 -4
- package/script/pkg/commands/zmscore.js +14 -0
- package/script/pkg/commands/zrange.js +6 -0
- package/script/pkg/http.js +84 -3
- package/script/pkg/pipeline.js +41 -5
- package/script/pkg/redis.js +68 -1
- package/script/pkg/script.js +81 -0
- package/script/platforms/cloudflare.js +10 -2
- package/script/platforms/fastly.js +1 -0
- package/script/platforms/node_with_fetch.js +14 -1
- package/script/platforms/nodejs.js +14 -1
- package/script/version.js +4 -0
- package/types/deps/deno.land/x/base64@v0.2.1/base.d.ts +5 -0
- package/types/deps/deno.land/x/base64@v0.2.1/base64url.d.ts +1 -0
- package/types/deps/deno.land/x/sha1@v1.0.3/deps.d.ts +1 -0
- package/types/deps/deno.land/x/sha1@v1.0.3/mod.d.ts +26 -0
- package/types/deps/denopkg.com/chiefbiiko/std-encoding@v1.0.0/mod.d.ts +3 -0
- package/types/pkg/commands/bitop.d.ts +0 -1
- package/types/pkg/commands/bitpos.d.ts +1 -1
- package/types/pkg/commands/getdel.d.ts +7 -0
- package/types/pkg/commands/lpop.d.ts +1 -1
- package/types/pkg/commands/lpos.d.ts +15 -0
- package/types/pkg/commands/mget.d.ts +1 -1
- package/types/pkg/commands/mod.d.ts +2 -0
- package/types/pkg/commands/rpop.d.ts +2 -2
- package/types/pkg/commands/scan.d.ts +1 -0
- package/types/pkg/commands/sdiffstore.d.ts +1 -1
- package/types/pkg/commands/set.d.ts +31 -2
- package/types/pkg/commands/spop.d.ts +2 -2
- package/types/pkg/commands/zadd.d.ts +1 -1
- package/types/pkg/commands/zmscore.d.ts +7 -0
- package/types/pkg/commands/zrange.d.ts +7 -0
- package/types/pkg/http.d.ts +53 -5
- package/types/pkg/pipeline.d.ts +29 -8
- package/types/pkg/redis.d.ts +40 -8
- package/types/pkg/script.d.ts +42 -0
- package/types/platforms/cloudflare.d.ts +8 -7
- package/types/platforms/fastly.d.ts +2 -6
- package/types/platforms/node_with_fetch.d.ts +2 -21
- package/types/platforms/nodejs.d.ts +3 -6
- package/types/version.d.ts +1 -0
package/script/pkg/http.js
CHANGED
|
@@ -28,9 +28,22 @@ class HttpClient {
|
|
|
28
28
|
writable: true,
|
|
29
29
|
value: void 0
|
|
30
30
|
});
|
|
31
|
+
this.options = {
|
|
32
|
+
backend: config.options?.backend,
|
|
33
|
+
agent: config.agent,
|
|
34
|
+
responseEncoding: config.responseEncoding ?? "base64", // default to base64
|
|
35
|
+
};
|
|
31
36
|
this.baseUrl = config.baseUrl.replace(/\/$/, "");
|
|
32
|
-
this.headers = {
|
|
33
|
-
|
|
37
|
+
this.headers = {
|
|
38
|
+
"Content-Type": "application/json",
|
|
39
|
+
"Upstash-Telemetry-Runtime": config.telemetry?.runtime,
|
|
40
|
+
"Upstash-Telemetry-Platform": config.telemetry?.platform,
|
|
41
|
+
"Upstash-Telemetry-Sdk": config.telemetry?.sdk,
|
|
42
|
+
...config.headers,
|
|
43
|
+
};
|
|
44
|
+
if (this.options.responseEncoding === "base64") {
|
|
45
|
+
this.headers["Upstash-Encoding"] = "base64";
|
|
46
|
+
}
|
|
34
47
|
if (typeof config?.retry === "boolean" && config?.retry === false) {
|
|
35
48
|
this.retry = {
|
|
36
49
|
attempts: 1,
|
|
@@ -46,11 +59,19 @@ class HttpClient {
|
|
|
46
59
|
}
|
|
47
60
|
}
|
|
48
61
|
async request(req) {
|
|
62
|
+
const headers = Object.entries(this.headers).reduce((acc, [key, value]) => {
|
|
63
|
+
if (value) {
|
|
64
|
+
acc[key] = value;
|
|
65
|
+
}
|
|
66
|
+
return acc;
|
|
67
|
+
}, {});
|
|
68
|
+
console.log({ headers });
|
|
49
69
|
const requestOptions = {
|
|
50
70
|
method: "POST",
|
|
51
|
-
headers
|
|
71
|
+
headers,
|
|
52
72
|
body: JSON.stringify(req.body),
|
|
53
73
|
keepalive: true,
|
|
74
|
+
agent: this.options?.agent,
|
|
54
75
|
/**
|
|
55
76
|
* Fastly specific
|
|
56
77
|
*/
|
|
@@ -75,7 +96,67 @@ class HttpClient {
|
|
|
75
96
|
if (!res.ok) {
|
|
76
97
|
throw new error_js_1.UpstashError(body.error);
|
|
77
98
|
}
|
|
99
|
+
if (this.options?.responseEncoding === "base64") {
|
|
100
|
+
return Array.isArray(body) ? body.map(decode) : decode(body);
|
|
101
|
+
}
|
|
78
102
|
return body;
|
|
79
103
|
}
|
|
80
104
|
}
|
|
81
105
|
exports.HttpClient = HttpClient;
|
|
106
|
+
function base64decode(b64) {
|
|
107
|
+
let dec = "";
|
|
108
|
+
try {
|
|
109
|
+
/**
|
|
110
|
+
* Using only atob() is not enough because it doesn't work with unicode characters
|
|
111
|
+
*/
|
|
112
|
+
const binString = atob(b64);
|
|
113
|
+
const size = binString.length;
|
|
114
|
+
const bytes = new Uint8Array(size);
|
|
115
|
+
for (let i = 0; i < size; i++) {
|
|
116
|
+
bytes[i] = binString.charCodeAt(i);
|
|
117
|
+
}
|
|
118
|
+
dec = new TextDecoder().decode(bytes);
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
dec = b64;
|
|
122
|
+
}
|
|
123
|
+
try {
|
|
124
|
+
return decodeURIComponent(dec);
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
return dec;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
function decode(raw) {
|
|
131
|
+
let result = undefined;
|
|
132
|
+
switch (typeof raw.result) {
|
|
133
|
+
case "undefined":
|
|
134
|
+
return raw;
|
|
135
|
+
case "number": {
|
|
136
|
+
result = raw.result;
|
|
137
|
+
break;
|
|
138
|
+
}
|
|
139
|
+
case "object": {
|
|
140
|
+
if (Array.isArray(raw.result)) {
|
|
141
|
+
result = raw.result.map((v) => typeof v === "string"
|
|
142
|
+
? base64decode(v)
|
|
143
|
+
: Array.isArray(v)
|
|
144
|
+
? v.map(base64decode)
|
|
145
|
+
: v);
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
// If it's not an array it must be null
|
|
149
|
+
// Apparently null is an object in javascript
|
|
150
|
+
result = null;
|
|
151
|
+
}
|
|
152
|
+
break;
|
|
153
|
+
}
|
|
154
|
+
case "string": {
|
|
155
|
+
result = raw.result === "OK" ? "OK" : base64decode(raw.result);
|
|
156
|
+
break;
|
|
157
|
+
}
|
|
158
|
+
default:
|
|
159
|
+
break;
|
|
160
|
+
}
|
|
161
|
+
return { result, error: raw.error };
|
|
162
|
+
}
|
package/script/pkg/pipeline.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Pipeline = void 0;
|
|
4
4
|
const mod_js_1 = require("./commands/mod.js");
|
|
5
5
|
const error_js_1 = require("./error.js");
|
|
6
|
+
const zmscore_js_1 = require("./commands/zmscore.js");
|
|
6
7
|
/**
|
|
7
8
|
* Upstash REST API supports command pipelining to send multiple commands in
|
|
8
9
|
* batch, instead of sending each command one by one and waiting for a response.
|
|
@@ -19,7 +20,7 @@ const error_js_1 = require("./error.js");
|
|
|
19
20
|
* **Examples:**
|
|
20
21
|
*
|
|
21
22
|
* ```ts
|
|
22
|
-
* const p = redis.pipeline()
|
|
23
|
+
* const p = redis.pipeline() // or redis.multi()
|
|
23
24
|
* p.set("key","value")
|
|
24
25
|
* p.get("key")
|
|
25
26
|
* const res = await p.exec()
|
|
@@ -42,7 +43,7 @@ const error_js_1 = require("./error.js");
|
|
|
42
43
|
* ```
|
|
43
44
|
*/
|
|
44
45
|
class Pipeline {
|
|
45
|
-
constructor(
|
|
46
|
+
constructor(opts) {
|
|
46
47
|
Object.defineProperty(this, "client", {
|
|
47
48
|
enumerable: true,
|
|
48
49
|
configurable: true,
|
|
@@ -61,6 +62,12 @@ class Pipeline {
|
|
|
61
62
|
writable: true,
|
|
62
63
|
value: void 0
|
|
63
64
|
});
|
|
65
|
+
Object.defineProperty(this, "multiExec", {
|
|
66
|
+
enumerable: true,
|
|
67
|
+
configurable: true,
|
|
68
|
+
writable: true,
|
|
69
|
+
value: void 0
|
|
70
|
+
});
|
|
64
71
|
/**
|
|
65
72
|
* Send the pipeline request to upstash.
|
|
66
73
|
*
|
|
@@ -79,8 +86,9 @@ class Pipeline {
|
|
|
79
86
|
if (this.commands.length === 0) {
|
|
80
87
|
throw new Error("Pipeline is empty");
|
|
81
88
|
}
|
|
89
|
+
const path = this.multiExec ? ["multi-exec"] : ["pipeline"];
|
|
82
90
|
const res = (await this.client.request({
|
|
83
|
-
path
|
|
91
|
+
path,
|
|
84
92
|
body: Object.values(this.commands).map((c) => c.command),
|
|
85
93
|
}));
|
|
86
94
|
return res.map(({ error, result }, i) => {
|
|
@@ -253,6 +261,15 @@ class Pipeline {
|
|
|
253
261
|
writable: true,
|
|
254
262
|
value: (...args) => this.chain(new mod_js_1.GetBitCommand(args, this.commandOptions))
|
|
255
263
|
});
|
|
264
|
+
/**
|
|
265
|
+
* @see https://redis.io/commands/getdel
|
|
266
|
+
*/
|
|
267
|
+
Object.defineProperty(this, "getdel", {
|
|
268
|
+
enumerable: true,
|
|
269
|
+
configurable: true,
|
|
270
|
+
writable: true,
|
|
271
|
+
value: (...args) => this.chain(new mod_js_1.GetDelCommand(args, this.commandOptions))
|
|
272
|
+
});
|
|
256
273
|
/**
|
|
257
274
|
* @see https://redis.io/commands/getrange
|
|
258
275
|
*/
|
|
@@ -478,6 +495,15 @@ class Pipeline {
|
|
|
478
495
|
writable: true,
|
|
479
496
|
value: (...args) => this.chain(new mod_js_1.LPopCommand(args, this.commandOptions))
|
|
480
497
|
});
|
|
498
|
+
/**
|
|
499
|
+
* @see https://redis.io/commands/lpos
|
|
500
|
+
*/
|
|
501
|
+
Object.defineProperty(this, "lpos", {
|
|
502
|
+
enumerable: true,
|
|
503
|
+
configurable: true,
|
|
504
|
+
writable: true,
|
|
505
|
+
value: (...args) => this.chain(new mod_js_1.LPosCommand(args, this.commandOptions))
|
|
506
|
+
});
|
|
481
507
|
/**
|
|
482
508
|
* @see https://redis.io/commands/lpush
|
|
483
509
|
*/
|
|
@@ -1005,6 +1031,15 @@ class Pipeline {
|
|
|
1005
1031
|
writable: true,
|
|
1006
1032
|
value: (...args) => this.chain(new mod_js_1.ZLexCountCommand(args, this.commandOptions))
|
|
1007
1033
|
});
|
|
1034
|
+
/**
|
|
1035
|
+
* @see https://redis.io/commands/zmscore
|
|
1036
|
+
*/
|
|
1037
|
+
Object.defineProperty(this, "zmscore", {
|
|
1038
|
+
enumerable: true,
|
|
1039
|
+
configurable: true,
|
|
1040
|
+
writable: true,
|
|
1041
|
+
value: (...args) => this.chain(new zmscore_js_1.ZMScoreCommand(args, this.commandOptions))
|
|
1042
|
+
});
|
|
1008
1043
|
/**
|
|
1009
1044
|
* @see https://redis.io/commands/zpopmax
|
|
1010
1045
|
*/
|
|
@@ -1113,9 +1148,10 @@ class Pipeline {
|
|
|
1113
1148
|
writable: true,
|
|
1114
1149
|
value: (...args) => this.chain(new mod_js_1.ZUnionStoreCommand(args, this.commandOptions))
|
|
1115
1150
|
});
|
|
1116
|
-
this.client = client;
|
|
1151
|
+
this.client = opts.client;
|
|
1117
1152
|
this.commands = [];
|
|
1118
|
-
this.commandOptions = commandOptions;
|
|
1153
|
+
this.commandOptions = opts.commandOptions;
|
|
1154
|
+
this.multiExec = opts.multiExec ?? false;
|
|
1119
1155
|
}
|
|
1120
1156
|
/**
|
|
1121
1157
|
* Pushes a command into the pipelien and returns a chainable instance of the
|
package/script/pkg/redis.js
CHANGED
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Redis = void 0;
|
|
4
4
|
const mod_js_1 = require("./commands/mod.js");
|
|
5
5
|
const pipeline_js_1 = require("./pipeline.js");
|
|
6
|
+
const script_js_1 = require("./script.js");
|
|
7
|
+
const zmscore_js_1 = require("./commands/zmscore.js");
|
|
6
8
|
/**
|
|
7
9
|
* Serverless redis client for upstash.
|
|
8
10
|
*/
|
|
@@ -31,6 +33,18 @@ class Redis {
|
|
|
31
33
|
writable: true,
|
|
32
34
|
value: void 0
|
|
33
35
|
});
|
|
36
|
+
/**
|
|
37
|
+
* Wrap a new middleware around the HTTP client.
|
|
38
|
+
*/
|
|
39
|
+
Object.defineProperty(this, "use", {
|
|
40
|
+
enumerable: true,
|
|
41
|
+
configurable: true,
|
|
42
|
+
writable: true,
|
|
43
|
+
value: (middleware) => {
|
|
44
|
+
const makeRequest = this.client.request.bind(this.client);
|
|
45
|
+
this.client.request = (req) => middleware(req, makeRequest);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
34
48
|
/**
|
|
35
49
|
* Create a new pipeline that allows you to send requests in bulk.
|
|
36
50
|
*
|
|
@@ -40,7 +54,30 @@ class Redis {
|
|
|
40
54
|
enumerable: true,
|
|
41
55
|
configurable: true,
|
|
42
56
|
writable: true,
|
|
43
|
-
value: () => new pipeline_js_1.Pipeline(
|
|
57
|
+
value: () => new pipeline_js_1.Pipeline({
|
|
58
|
+
client: this.client,
|
|
59
|
+
commandOptions: this.opts,
|
|
60
|
+
multiExec: false,
|
|
61
|
+
})
|
|
62
|
+
});
|
|
63
|
+
/**
|
|
64
|
+
* Create a new transaction to allow executing multiple steps atomically.
|
|
65
|
+
*
|
|
66
|
+
* All the commands in a transaction are serialized and executed sequentially. A request sent by
|
|
67
|
+
* another client will never be served in the middle of the execution of a Redis Transaction. This
|
|
68
|
+
* guarantees that the commands are executed as a single isolated operation.
|
|
69
|
+
*
|
|
70
|
+
* @see {@link Pipeline}
|
|
71
|
+
*/
|
|
72
|
+
Object.defineProperty(this, "multi", {
|
|
73
|
+
enumerable: true,
|
|
74
|
+
configurable: true,
|
|
75
|
+
writable: true,
|
|
76
|
+
value: () => new pipeline_js_1.Pipeline({
|
|
77
|
+
client: this.client,
|
|
78
|
+
commandOptions: this.opts,
|
|
79
|
+
multiExec: true,
|
|
80
|
+
})
|
|
44
81
|
});
|
|
45
82
|
/**
|
|
46
83
|
* @see https://redis.io/commands/append
|
|
@@ -204,6 +241,15 @@ class Redis {
|
|
|
204
241
|
writable: true,
|
|
205
242
|
value: (...args) => new mod_js_1.GetBitCommand(args, this.opts).exec(this.client)
|
|
206
243
|
});
|
|
244
|
+
/**
|
|
245
|
+
* @see https://redis.io/commands/getdel
|
|
246
|
+
*/
|
|
247
|
+
Object.defineProperty(this, "getdel", {
|
|
248
|
+
enumerable: true,
|
|
249
|
+
configurable: true,
|
|
250
|
+
writable: true,
|
|
251
|
+
value: (...args) => new mod_js_1.GetDelCommand(args, this.opts).exec(this.client)
|
|
252
|
+
});
|
|
207
253
|
/**
|
|
208
254
|
* @see https://redis.io/commands/getrange
|
|
209
255
|
*/
|
|
@@ -429,6 +475,15 @@ class Redis {
|
|
|
429
475
|
writable: true,
|
|
430
476
|
value: (...args) => new mod_js_1.LPopCommand(args, this.opts).exec(this.client)
|
|
431
477
|
});
|
|
478
|
+
/**
|
|
479
|
+
* @see https://redis.io/commands/lpos
|
|
480
|
+
*/
|
|
481
|
+
Object.defineProperty(this, "lpos", {
|
|
482
|
+
enumerable: true,
|
|
483
|
+
configurable: true,
|
|
484
|
+
writable: true,
|
|
485
|
+
value: (...args) => new mod_js_1.LPosCommand(args, this.opts).exec(this.client)
|
|
486
|
+
});
|
|
432
487
|
/**
|
|
433
488
|
* @see https://redis.io/commands/lpush
|
|
434
489
|
*/
|
|
@@ -956,6 +1011,15 @@ class Redis {
|
|
|
956
1011
|
writable: true,
|
|
957
1012
|
value: (...args) => new mod_js_1.ZLexCountCommand(args, this.opts).exec(this.client)
|
|
958
1013
|
});
|
|
1014
|
+
/**
|
|
1015
|
+
* @see https://redis.io/commands/zmscore
|
|
1016
|
+
*/
|
|
1017
|
+
Object.defineProperty(this, "zmscore", {
|
|
1018
|
+
enumerable: true,
|
|
1019
|
+
configurable: true,
|
|
1020
|
+
writable: true,
|
|
1021
|
+
value: (...args) => new zmscore_js_1.ZMScoreCommand(args, this.opts).exec(this.client)
|
|
1022
|
+
});
|
|
959
1023
|
/**
|
|
960
1024
|
* @see https://redis.io/commands/zpopmax
|
|
961
1025
|
*/
|
|
@@ -1067,5 +1131,8 @@ class Redis {
|
|
|
1067
1131
|
this.client = client;
|
|
1068
1132
|
this.opts = opts;
|
|
1069
1133
|
}
|
|
1134
|
+
createScript(script) {
|
|
1135
|
+
return new script_js_1.Script(this, script);
|
|
1136
|
+
}
|
|
1070
1137
|
}
|
|
1071
1138
|
exports.Redis = Redis;
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Script = void 0;
|
|
4
|
+
const mod_js_1 = require("../deps/deno.land/x/sha1@v1.0.3/mod.js");
|
|
5
|
+
/**
|
|
6
|
+
* Creates a new script.
|
|
7
|
+
*
|
|
8
|
+
* Scripts offer the ability to optimistically try to execute a script without having to send the
|
|
9
|
+
* entire script to the server. If the script is loaded on the server, it tries again by sending
|
|
10
|
+
* the entire script. Afterwards, the script is cached on the server.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* ```ts
|
|
14
|
+
* const redis = new Redis({...})
|
|
15
|
+
*
|
|
16
|
+
* const script = redis.createScript<string>("return ARGV[1];")
|
|
17
|
+
* const arg1 = await script.eval([], ["Hello World"])
|
|
18
|
+
* assertEquals(arg1, "Hello World")
|
|
19
|
+
* ```
|
|
20
|
+
*/
|
|
21
|
+
class Script {
|
|
22
|
+
constructor(redis, script) {
|
|
23
|
+
Object.defineProperty(this, "script", {
|
|
24
|
+
enumerable: true,
|
|
25
|
+
configurable: true,
|
|
26
|
+
writable: true,
|
|
27
|
+
value: void 0
|
|
28
|
+
});
|
|
29
|
+
Object.defineProperty(this, "sha1", {
|
|
30
|
+
enumerable: true,
|
|
31
|
+
configurable: true,
|
|
32
|
+
writable: true,
|
|
33
|
+
value: void 0
|
|
34
|
+
});
|
|
35
|
+
Object.defineProperty(this, "redis", {
|
|
36
|
+
enumerable: true,
|
|
37
|
+
configurable: true,
|
|
38
|
+
writable: true,
|
|
39
|
+
value: void 0
|
|
40
|
+
});
|
|
41
|
+
this.redis = redis;
|
|
42
|
+
this.sha1 = this.digest(script);
|
|
43
|
+
this.script = script;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Send an `EVAL` command to redis.
|
|
47
|
+
*/
|
|
48
|
+
async eval(keys, args) {
|
|
49
|
+
return await this.redis.eval(this.script, keys, args);
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Calculates the sha1 hash of the script and then calls `EVALSHA`.
|
|
53
|
+
*/
|
|
54
|
+
async evalsha(keys, args) {
|
|
55
|
+
return await this.redis.evalsha(this.sha1, keys, args);
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Optimistically try to run `EVALSHA` first.
|
|
59
|
+
* If the script is not loaded in redis, it will fall back and try again with `EVAL`.
|
|
60
|
+
*
|
|
61
|
+
* Following calls will be able to use the cached script
|
|
62
|
+
*/
|
|
63
|
+
async exec(keys, args) {
|
|
64
|
+
const res = await this.redis.evalsha(this.sha1, keys, args).catch(async (err) => {
|
|
65
|
+
if (err instanceof Error &&
|
|
66
|
+
err.message.toLowerCase().includes("noscript")) {
|
|
67
|
+
return await this.redis.eval(this.script, keys, args);
|
|
68
|
+
}
|
|
69
|
+
throw err;
|
|
70
|
+
});
|
|
71
|
+
return res;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Compute the sha1 hash of the script and return its hex representation.
|
|
75
|
+
*/
|
|
76
|
+
digest(s) {
|
|
77
|
+
const hash = (0, mod_js_1.sha1)(s, "utf8", "hex");
|
|
78
|
+
return typeof hash === "string" ? hash : new TextDecoder().decode(hash);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
exports.Script = Script;
|
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.Redis = void 0;
|
|
27
27
|
const core = __importStar(require("../pkg/redis.js"));
|
|
28
28
|
const http_js_1 = require("../pkg/http.js");
|
|
29
|
+
const version_js_1 = require("../version.js");
|
|
29
30
|
/**
|
|
30
31
|
* Serverless redis client for upstash.
|
|
31
32
|
*/
|
|
@@ -41,7 +42,7 @@ class Redis extends core.Redis {
|
|
|
41
42
|
* });
|
|
42
43
|
* ```
|
|
43
44
|
*/
|
|
44
|
-
constructor(config) {
|
|
45
|
+
constructor(config, env) {
|
|
45
46
|
if (config.url.startsWith(" ") ||
|
|
46
47
|
config.url.endsWith(" ") ||
|
|
47
48
|
/\r|\n/.test(config.url)) {
|
|
@@ -52,10 +53,17 @@ class Redis extends core.Redis {
|
|
|
52
53
|
/\r|\n/.test(config.token)) {
|
|
53
54
|
console.warn("The redis token contains whitespace or newline, which can cause errors!");
|
|
54
55
|
}
|
|
56
|
+
const telemetry = {};
|
|
57
|
+
if (!env?.UPSTASH_DISABLE_TELEMETRY) {
|
|
58
|
+
telemetry.platform = "cloudflare";
|
|
59
|
+
telemetry.sdk = `@upstash/redis@${version_js_1.VERSION}`;
|
|
60
|
+
}
|
|
55
61
|
const client = new http_js_1.HttpClient({
|
|
56
62
|
retry: config.retry,
|
|
57
63
|
baseUrl: config.url,
|
|
58
64
|
headers: { authorization: `Bearer ${config.token}` },
|
|
65
|
+
responseEncoding: config.responseEncoding,
|
|
66
|
+
telemetry,
|
|
59
67
|
});
|
|
60
68
|
super(client, {
|
|
61
69
|
automaticDeserialization: config.automaticDeserialization,
|
|
@@ -83,7 +91,7 @@ class Redis extends core.Redis {
|
|
|
83
91
|
if (!token) {
|
|
84
92
|
throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`. Please add it via `wrangler secret put UPSTASH_REDIS_REST_TOKEN`");
|
|
85
93
|
}
|
|
86
|
-
return new Redis({ ...opts, url, token });
|
|
94
|
+
return new Redis({ ...opts, url, token }, env);
|
|
87
95
|
}
|
|
88
96
|
}
|
|
89
97
|
exports.Redis = Redis;
|
|
@@ -58,6 +58,7 @@ class Redis extends core.Redis {
|
|
|
58
58
|
retry: config.retry,
|
|
59
59
|
headers: { authorization: `Bearer ${config.token}` },
|
|
60
60
|
options: { backend: config.backend },
|
|
61
|
+
responseEncoding: config.responseEncoding,
|
|
61
62
|
});
|
|
62
63
|
super(client, {
|
|
63
64
|
automaticDeserialization: config.automaticDeserialization,
|
|
@@ -27,6 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
27
|
exports.Redis = void 0;
|
|
28
28
|
const core = __importStar(require("../pkg/redis.js"));
|
|
29
29
|
const http_js_1 = require("../pkg/http.js");
|
|
30
|
+
const version_js_1 = require("../version.js");
|
|
30
31
|
require("isomorphic-fetch");
|
|
31
32
|
/**
|
|
32
33
|
* Serverless redis client for upstash.
|
|
@@ -47,11 +48,23 @@ class Redis extends core.Redis {
|
|
|
47
48
|
/\r|\n/.test(configOrRequester.token)) {
|
|
48
49
|
console.warn("The redis token contains whitespace or newline, which can cause errors!");
|
|
49
50
|
}
|
|
51
|
+
const telemetry = {};
|
|
52
|
+
if (!process.env.UPSTASH_DISABLE_TELEMETRY) {
|
|
53
|
+
telemetry.runtime = `node@${process.version}`;
|
|
54
|
+
telemetry.platform = process.env.VERCEL
|
|
55
|
+
? "vercel"
|
|
56
|
+
: process.env.AWS_REGION
|
|
57
|
+
? "aws"
|
|
58
|
+
: "unknown";
|
|
59
|
+
telemetry.sdk = `@upstash/redis@${version_js_1.VERSION}`;
|
|
60
|
+
}
|
|
50
61
|
const client = new http_js_1.HttpClient({
|
|
51
62
|
baseUrl: configOrRequester.url,
|
|
52
63
|
retry: configOrRequester.retry,
|
|
53
64
|
headers: { authorization: `Bearer ${configOrRequester.token}` },
|
|
54
|
-
//
|
|
65
|
+
// agent: configOrRequester.agent,
|
|
66
|
+
responseEncoding: configOrRequester.responseEncoding,
|
|
67
|
+
telemetry,
|
|
55
68
|
});
|
|
56
69
|
super(client, {
|
|
57
70
|
automaticDeserialization: configOrRequester.automaticDeserialization,
|
|
@@ -27,6 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
27
|
exports.Redis = void 0;
|
|
28
28
|
const core = __importStar(require("../pkg/redis.js"));
|
|
29
29
|
const http_js_1 = require("../pkg/http.js");
|
|
30
|
+
const version_js_1 = require("../version.js");
|
|
30
31
|
/**
|
|
31
32
|
* Serverless redis client for upstash.
|
|
32
33
|
*/
|
|
@@ -46,11 +47,23 @@ class Redis extends core.Redis {
|
|
|
46
47
|
/\r|\n/.test(configOrRequester.token)) {
|
|
47
48
|
console.warn("The redis token contains whitespace or newline, which can cause errors!");
|
|
48
49
|
}
|
|
50
|
+
const telemetry = {};
|
|
51
|
+
if (!process.env.UPSTASH_DISABLE_TELEMETRY) {
|
|
52
|
+
telemetry.runtime = `node@${process.version}`;
|
|
53
|
+
telemetry.platform = process.env.VERCEL
|
|
54
|
+
? "vercel"
|
|
55
|
+
: process.env.AWS_REGION
|
|
56
|
+
? "aws"
|
|
57
|
+
: "unknown";
|
|
58
|
+
telemetry.sdk = `@upstash/redis@${version_js_1.VERSION}`;
|
|
59
|
+
}
|
|
49
60
|
const client = new http_js_1.HttpClient({
|
|
50
61
|
baseUrl: configOrRequester.url,
|
|
51
62
|
retry: configOrRequester.retry,
|
|
52
63
|
headers: { authorization: `Bearer ${configOrRequester.token}` },
|
|
53
|
-
|
|
64
|
+
agent: configOrRequester.agent,
|
|
65
|
+
responseEncoding: configOrRequester.responseEncoding,
|
|
66
|
+
telemetry,
|
|
54
67
|
});
|
|
55
68
|
super(client, {
|
|
56
69
|
automaticDeserialization: configOrRequester.automaticDeserialization,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const byteLength: (b64: string) => number, toUint8Array: (b64: string) => Uint8Array, fromUint8Array: (buf: Uint8Array) => string;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { encode, decode } from "../../../denopkg.com/chiefbiiko/std-encoding@v1.0.0/mod.js";
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/** Byte length of a SHA1 digest. */
|
|
2
|
+
export declare const BYTES: number;
|
|
3
|
+
/** A class representation of the SHA1 algorithm. */
|
|
4
|
+
export declare class SHA1 {
|
|
5
|
+
readonly hashSize: number;
|
|
6
|
+
private _buf;
|
|
7
|
+
private _bufIdx;
|
|
8
|
+
private _count;
|
|
9
|
+
private _K;
|
|
10
|
+
private _H;
|
|
11
|
+
private _finalized;
|
|
12
|
+
/** Creates a SHA1 instance. */
|
|
13
|
+
constructor();
|
|
14
|
+
/** Reduces the four input numbers to a single one. */
|
|
15
|
+
protected static F(t: number, b: number, c: number, d: number): number;
|
|
16
|
+
/** Initializes a hash instance. */
|
|
17
|
+
init(): SHA1;
|
|
18
|
+
/** Updates a hash with additional message data. */
|
|
19
|
+
update(msg: string | Uint8Array, inputEncoding?: string): SHA1;
|
|
20
|
+
/** Finalizes a hash with additional message data. */
|
|
21
|
+
digest(outputEncoding?: string): string | Uint8Array;
|
|
22
|
+
/** Performs one transformation cycle. */
|
|
23
|
+
private transform;
|
|
24
|
+
}
|
|
25
|
+
/** Generates a SHA1 hash of the input data. */
|
|
26
|
+
export declare function sha1(msg: string | Uint8Array, inputEncoding?: string, outputEncoding?: string): string | Uint8Array;
|
|
@@ -6,7 +6,6 @@ export declare class BitOpCommand extends Command<number, number> {
|
|
|
6
6
|
constructor(cmd: [
|
|
7
7
|
op: "and" | "or" | "xor",
|
|
8
8
|
destinationKey: string,
|
|
9
|
-
sourceKey: string,
|
|
10
9
|
...sourceKeys: string[]
|
|
11
10
|
], opts?: CommandOptions<number, number>);
|
|
12
11
|
constructor(cmd: [op: "not", destinationKey: string, sourceKey: string], opts?: CommandOptions<number, number>);
|
|
@@ -3,5 +3,5 @@ import { Command, CommandOptions } from "./command.js";
|
|
|
3
3
|
* @see https://redis.io/commands/bitpos
|
|
4
4
|
*/
|
|
5
5
|
export declare class BitPosCommand extends Command<number, number> {
|
|
6
|
-
constructor(cmd: [key: string,
|
|
6
|
+
constructor(cmd: [key: string, bit: 0 | 1, start?: number, end?: number], opts?: CommandOptions<number, number>);
|
|
7
7
|
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Command, CommandOptions } from "./command.js";
|
|
2
|
+
/**
|
|
3
|
+
* @see https://redis.io/commands/getdel
|
|
4
|
+
*/
|
|
5
|
+
export declare class GetDelCommand<TData = string> extends Command<unknown | null, TData | null> {
|
|
6
|
+
constructor(cmd: [key: string], opts?: CommandOptions<unknown | null, TData | null>);
|
|
7
|
+
}
|
|
@@ -3,5 +3,5 @@ import { Command, CommandOptions } from "./command.js";
|
|
|
3
3
|
* @see https://redis.io/commands/lpop
|
|
4
4
|
*/
|
|
5
5
|
export declare class LPopCommand<TData = string> extends Command<unknown | null, TData | null> {
|
|
6
|
-
constructor(cmd: [key: string], opts?: CommandOptions<unknown | null, TData | null>);
|
|
6
|
+
constructor(cmd: [key: string, count?: number], opts?: CommandOptions<unknown | null, TData | null>);
|
|
7
7
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Command, CommandOptions } from "./command.js";
|
|
2
|
+
/**
|
|
3
|
+
* @see https://redis.io/commands/lpos
|
|
4
|
+
*/
|
|
5
|
+
export declare class LPosCommand<TData = number> extends Command<TData, TData> {
|
|
6
|
+
constructor(cmd: [
|
|
7
|
+
key: string,
|
|
8
|
+
element: unknown,
|
|
9
|
+
opts?: {
|
|
10
|
+
rank?: number;
|
|
11
|
+
count?: number;
|
|
12
|
+
maxLen?: number;
|
|
13
|
+
}
|
|
14
|
+
], opts?: CommandOptions<TData, TData>);
|
|
15
|
+
}
|
|
@@ -3,5 +3,5 @@ import { Command, CommandOptions } from "./command.js";
|
|
|
3
3
|
* @see https://redis.io/commands/mget
|
|
4
4
|
*/
|
|
5
5
|
export declare class MGetCommand<TData extends unknown[]> extends Command<(string | null)[], TData> {
|
|
6
|
-
constructor(cmd: [...keys:
|
|
6
|
+
constructor(cmd: [...keys: string[]], opts?: CommandOptions<(string | null)[], TData>);
|
|
7
7
|
}
|
|
@@ -19,6 +19,7 @@ export * from "./get.js";
|
|
|
19
19
|
export * from "./getbit.js";
|
|
20
20
|
export * from "./getrange.js";
|
|
21
21
|
export * from "./getset.js";
|
|
22
|
+
export * from "./getdel.js";
|
|
22
23
|
export * from "./hdel.js";
|
|
23
24
|
export * from "./hexists.js";
|
|
24
25
|
export * from "./hget.js";
|
|
@@ -42,6 +43,7 @@ export * from "./lindex.js";
|
|
|
42
43
|
export * from "./linsert.js";
|
|
43
44
|
export * from "./llen.js";
|
|
44
45
|
export * from "./lpop.js";
|
|
46
|
+
export * from "./lpos.js";
|
|
45
47
|
export * from "./lpush.js";
|
|
46
48
|
export * from "./lpushx.js";
|
|
47
49
|
export * from "./lrange.js";
|
|
@@ -2,6 +2,6 @@ import { Command, CommandOptions } from "./command.js";
|
|
|
2
2
|
/**
|
|
3
3
|
* @see https://redis.io/commands/rpop
|
|
4
4
|
*/
|
|
5
|
-
export declare class RPopCommand<TData = string> extends Command<unknown | null, TData | null> {
|
|
6
|
-
constructor(cmd: [key: string], opts?: CommandOptions<unknown | null, TData | null>);
|
|
5
|
+
export declare class RPopCommand<TData extends unknown | unknown[] = string> extends Command<unknown | null, TData | null> {
|
|
6
|
+
constructor(cmd: [key: string, count?: number], opts?: CommandOptions<unknown | null, TData | null>);
|
|
7
7
|
}
|