@antelopejs/redis 1.1.0 → 1.1.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/README.md
CHANGED
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
|
|
10
10
|
The Redis module of AntelopeJS. It connects one shared [`ioredis`](https://github.com/redis/ioredis) client and serves it to the Redis and Redis Scheduler interfaces.
|
|
11
11
|
|
|
12
|
+
Part of [AntelopeJS](https://github.com/AntelopeJS/antelopejs), the TypeScript framework where modules depend on contracts and the application chooses the provider. Built by the team behind [AntelopeJS DMS](https://github.com/AntelopeJS/dms).
|
|
13
|
+
|
|
12
14
|
## Interfaces
|
|
13
15
|
|
|
14
16
|
| Interface | Documentation |
|
|
@@ -91,7 +93,7 @@ const greeting = await client.get("greeting");
|
|
|
91
93
|
|
|
92
94
|
| Package | Supported | Tested with |
|
|
93
95
|
| --------------------------------------- | ---------------- | ----------- |
|
|
94
|
-
| `@antelopejs/interface-core` | `>=0.2.4 <1.0.0` | `0.
|
|
96
|
+
| `@antelopejs/interface-core` | `>=0.2.4 <1.0.0` | `0.4.0` |
|
|
95
97
|
| `@antelopejs/interface-redis` | `>=0.0.9 <1.0.0` | `0.0.9` |
|
|
96
98
|
| `@antelopejs/interface-redis-scheduler` | `>=0.0.8 <1.0.0` | `0.0.8` |
|
|
97
99
|
|
package/dist/index.js
CHANGED
|
@@ -47,15 +47,27 @@ function construct(config) {
|
|
|
47
47
|
redisConfig = config;
|
|
48
48
|
}
|
|
49
49
|
function destroy() { }
|
|
50
|
+
let startedClient;
|
|
50
51
|
async function start() {
|
|
51
52
|
const client = await createRedisClient(redisConfig);
|
|
52
53
|
if (redisConfig.useMock || redisConfig.lazyConnect) {
|
|
53
|
-
|
|
54
|
+
try {
|
|
55
|
+
await client.connect();
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
client.disconnect();
|
|
59
|
+
throw error;
|
|
60
|
+
}
|
|
54
61
|
}
|
|
62
|
+
startedClient = client;
|
|
55
63
|
interface_redis_1.internal.SetClient(client);
|
|
56
64
|
}
|
|
57
65
|
async function stop() {
|
|
58
|
-
const client =
|
|
66
|
+
const client = startedClient;
|
|
67
|
+
if (!client) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
startedClient = undefined;
|
|
59
71
|
await client.quit();
|
|
60
72
|
void interface_redis_1.internal.UnsetClient();
|
|
61
73
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,8BAEC;AAED,0BAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,8BAEC;AAED,0BAAkC;AAIlC,sBAYC;AAED,oBAQC;AAvCD,sDAAmD;AACnD,iEAAuD;AAOvD,IAAI,WAAwB,CAAC;AAC7B,SAAgB,SAAS,CAAC,MAAmB;IAC3C,WAAW,GAAG,MAAM,CAAC;AACvB,CAAC;AAED,SAAgB,OAAO,KAAU,CAAC;AAElC,IAAI,aAAgC,CAAC;AAE9B,KAAK,UAAU,KAAK;IACzB,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACD,aAAa,GAAG,MAAM,CAAC;IACvB,0BAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAEM,KAAK,UAAU,IAAI;IACxB,MAAM,MAAM,GAAG,aAAa,CAAC;IAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IACD,aAAa,GAAG,SAAS,CAAC;IAC1B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACpB,KAAK,0BAAQ,CAAC,WAAW,EAAE,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,MAAmB;IAClD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,wDAAa,cAAc,GAAC,CAAC;QAC5D,OAAO,IAAI,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,CAAC;IAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,iBAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,iBAAK,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,IAAI,iBAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACjC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
40
|
+
const net = __importStar(require("node:net"));
|
|
41
|
+
const index_1 = require("../index");
|
|
42
|
+
const TEST_HOST = "127.0.0.1";
|
|
43
|
+
const TEST_PORT = 26390;
|
|
44
|
+
const STOP_DEADLINE_MS = 1000;
|
|
45
|
+
const RECONNECT_WINDOW_MS = 500;
|
|
46
|
+
function settlesWithin(promise, ms) {
|
|
47
|
+
return Promise.race([
|
|
48
|
+
promise.then(() => true, () => true),
|
|
49
|
+
new Promise((resolve) => setTimeout(() => resolve(false), ms)),
|
|
50
|
+
]);
|
|
51
|
+
}
|
|
52
|
+
function delay(ms) {
|
|
53
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
54
|
+
}
|
|
55
|
+
describe("A module whose start failed", () => {
|
|
56
|
+
let server;
|
|
57
|
+
let connections = 0;
|
|
58
|
+
const url = `redis://${TEST_HOST}:${TEST_PORT}`;
|
|
59
|
+
before(async () => {
|
|
60
|
+
await (0, index_1.stop)();
|
|
61
|
+
server = net.createServer((socket) => {
|
|
62
|
+
connections += 1;
|
|
63
|
+
socket.destroy();
|
|
64
|
+
});
|
|
65
|
+
await new Promise((resolve) => server.listen(TEST_PORT, TEST_HOST, resolve));
|
|
66
|
+
});
|
|
67
|
+
after(async () => {
|
|
68
|
+
await new Promise((resolve) => server.close(resolve));
|
|
69
|
+
(0, index_1.construct)({ useMock: true });
|
|
70
|
+
await (0, index_1.start)();
|
|
71
|
+
});
|
|
72
|
+
it("rejects start and settles stop", async () => {
|
|
73
|
+
(0, index_1.construct)({ url, lazyConnect: true, maxRetriesPerRequest: 0 });
|
|
74
|
+
await node_assert_1.default.rejects((0, index_1.start)());
|
|
75
|
+
node_assert_1.default.strictEqual(await settlesWithin((0, index_1.stop)(), STOP_DEADLINE_MS), true);
|
|
76
|
+
});
|
|
77
|
+
it("stops reconnecting once start rejects", async () => {
|
|
78
|
+
(0, index_1.construct)({ url, lazyConnect: true, maxRetriesPerRequest: 0 });
|
|
79
|
+
await node_assert_1.default.rejects((0, index_1.start)());
|
|
80
|
+
const afterReject = connections;
|
|
81
|
+
await delay(RECONNECT_WINDOW_MS);
|
|
82
|
+
node_assert_1.default.strictEqual(connections, afterReject);
|
|
83
|
+
await (0, index_1.stop)();
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
//# sourceMappingURL=failed-start.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"failed-start.test.js","sourceRoot":"","sources":["../../src/test/failed-start.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAiC;AACjC,8CAAgC;AAEhC,oCAAkD;AAElD,MAAM,SAAS,GAAG,WAAW,CAAC;AAC9B,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAEhC,SAAS,aAAa,CAAC,OAAsB,EAAE,EAAU;IACvD,OAAO,OAAO,CAAC,IAAI,CAAC;QAClB,OAAO,CAAC,IAAI,CACV,GAAG,EAAE,CAAC,IAAI,EACV,GAAG,EAAE,CAAC,IAAI,CACX;QACD,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;KACxE,CAAC,CAAC;AACL,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,IAAI,MAAkB,CAAC;IACvB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,WAAW,SAAS,IAAI,SAAS,EAAE,CAAC;IAEhD,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,MAAM,IAAA,YAAI,GAAE,CAAC;QACb,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,WAAW,IAAI,CAAC,CAAC;YACjB,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAClC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAC7C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,IAAA,iBAAS,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7B,MAAM,IAAA,aAAK,GAAE,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,IAAA,iBAAS,EAAC,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/D,MAAM,qBAAM,CAAC,OAAO,CAAC,IAAA,aAAK,GAAE,CAAC,CAAC;QAE9B,qBAAM,CAAC,WAAW,CAAC,MAAM,aAAa,CAAC,IAAA,YAAI,GAAE,EAAE,gBAAgB,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,IAAA,iBAAS,EAAC,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/D,MAAM,qBAAM,CAAC,OAAO,CAAC,IAAA,aAAK,GAAE,CAAC,CAAC;QAC9B,MAAM,WAAW,GAAG,WAAW,CAAC;QAEhC,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAEjC,qBAAM,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAC7C,MAAM,IAAA,YAAI,GAAE,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/redis",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"description": "Redis module for AntelopeJS, implementing the Redis and Redis Scheduler interfaces with ioredis",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"antelopejs",
|
|
@@ -33,11 +33,11 @@
|
|
|
33
33
|
"lint:fix": "oxlint --fix",
|
|
34
34
|
"lint": "oxlint",
|
|
35
35
|
"prepack": "pnpm run build",
|
|
36
|
-
"release": "pnpm run lint && pnpm run test && pnpm run prepack && release-it",
|
|
36
|
+
"release": "pnpm run typecheck && pnpm run lint && pnpm run test && pnpm run prepack && release-it",
|
|
37
37
|
"test": "pnpm run build && ajs module test .",
|
|
38
38
|
"format:check": "oxfmt --check .",
|
|
39
39
|
"knip": "knip",
|
|
40
|
-
"prepare": "if
|
|
40
|
+
"prepare": "if [ -e .git ] && command -v git >/dev/null 2>&1 && command -v lefthook >/dev/null 2>&1 && GIT_DIR=.git GIT_WORK_TREE=. git rev-parse --git-dir >/dev/null 2>&1; then GIT_DIR=.git GIT_WORK_TREE=. lefthook install; fi",
|
|
41
41
|
"checks": "antelopejs-checks",
|
|
42
42
|
"size": "antelopejs-check-size",
|
|
43
43
|
"sync": "antelopejs-sync",
|
|
@@ -54,8 +54,8 @@
|
|
|
54
54
|
"ioredis-mock": "^8.13.1"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@antelopejs/core": "^1.
|
|
58
|
-
"@antelopejs/tooling-configs": "^0.
|
|
57
|
+
"@antelopejs/core": "^1.21.0",
|
|
58
|
+
"@antelopejs/tooling-configs": "^0.5.1",
|
|
59
59
|
"@types/chai": "^4.3.20",
|
|
60
60
|
"@types/ioredis-mock": "^8.2.7",
|
|
61
61
|
"@types/mocha": "^10.0.10",
|