@expo/entity-cache-adapter-redis 0.31.1 → 0.32.0
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 +2 -3
- package/build/GenericRedisCacher.d.ts +11 -0
- package/build/GenericRedisCacher.js +6 -0
- package/build/GenericRedisCacher.js.map +1 -1
- package/build/RedisCacheAdapterProvider.d.ts +4 -4
- package/build/RedisCacheAdapterProvider.js +3 -2
- package/build/RedisCacheAdapterProvider.js.map +1 -1
- package/build/RedisCommon.js +1 -1
- package/build/RedisCommon.js.map +1 -1
- package/build/__integration-tests__/BatchedRedisCacheAdapter-integration-test.js +10 -11
- package/build/__integration-tests__/BatchedRedisCacheAdapter-integration-test.js.map +1 -1
- package/build/__integration-tests__/{RedisCacheAdapter-integration-test.js → GenericRedisCacher-full-integration-test.js} +20 -22
- package/build/__integration-tests__/GenericRedisCacher-full-integration-test.js.map +1 -0
- package/build/__integration-tests__/GenericRedisCacher-integration-test.js +11 -25
- package/build/__integration-tests__/GenericRedisCacher-integration-test.js.map +1 -1
- package/build/__integration-tests__/errors-test.js +5 -6
- package/build/__integration-tests__/errors-test.js.map +1 -1
- package/build/__tests__/{RedisCacheAdapter-test.js → GenericRedisCacher-test.js} +35 -35
- package/build/__tests__/GenericRedisCacher-test.js.map +1 -0
- package/build/index.d.ts +0 -2
- package/build/index.js +1 -4
- package/build/index.js.map +1 -1
- package/build/testfixtures/RedisTestEntity.d.ts +2 -2
- package/build/testfixtures/RedisTestEntity.js +6 -7
- package/build/testfixtures/RedisTestEntity.js.map +1 -1
- package/build/testfixtures/createRedisIntegrationTestEntityCompanionProvider.d.ts +2 -2
- package/build/testfixtures/createRedisIntegrationTestEntityCompanionProvider.js +2 -2
- package/package.json +4 -4
- package/src/GenericRedisCacher.ts +28 -0
- package/src/RedisCacheAdapterProvider.ts +10 -5
- package/src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.ts +17 -15
- package/src/__integration-tests__/{RedisCacheAdapter-integration-test.ts → GenericRedisCacher-full-integration-test.ts} +26 -22
- package/src/__integration-tests__/GenericRedisCacher-integration-test.ts +12 -27
- package/src/__integration-tests__/errors-test.ts +5 -6
- package/src/__tests__/GenericRedisCacher-test.ts +193 -0
- package/src/index.ts +0 -2
- package/src/testfixtures/RedisTestEntity.ts +6 -8
- package/src/testfixtures/createRedisIntegrationTestEntityCompanionProvider.ts +3 -3
- package/build/RedisCacheAdapter.d.ts +0 -43
- package/build/RedisCacheAdapter.js +0 -44
- package/build/RedisCacheAdapter.js.map +0 -1
- package/build/__integration-tests__/RedisCacheAdapter-integration-test.js.map +0 -1
- package/build/__tests__/RedisCacheAdapter-test.js.map +0 -1
- package/src/RedisCacheAdapter.ts +0 -124
- package/src/__tests__/RedisCacheAdapter-test.ts +0 -169
- /package/build/__integration-tests__/{RedisCacheAdapter-integration-test.d.ts → GenericRedisCacher-full-integration-test.d.ts} +0 -0
- /package/build/__tests__/{RedisCacheAdapter-test.d.ts → GenericRedisCacher-test.d.ts} +0 -0
package/README.md
CHANGED
|
@@ -11,7 +11,7 @@ During `EntityCompanionProvider` instantiation:
|
|
|
11
11
|
```typescript
|
|
12
12
|
import Redis from 'ioredis';
|
|
13
13
|
|
|
14
|
-
const
|
|
14
|
+
const genericRedisCacherContext = {
|
|
15
15
|
redisClient: new Redis(new URL(process.env['REDIS_URL']!).toString()),
|
|
16
16
|
makeKeyFn(...parts: string[]): string {
|
|
17
17
|
const delimiter = ':';
|
|
@@ -21,7 +21,6 @@ const redisCacheAdapterContext = {
|
|
|
21
21
|
return escapedParts.join(delimiter);
|
|
22
22
|
},
|
|
23
23
|
cacheKeyPrefix: 'ent-',
|
|
24
|
-
cacheKeyVersion: 1,
|
|
25
24
|
ttlSecondsPositive: 86400, // 1 day
|
|
26
25
|
ttlSecondsNegative: 600, // 10 minutes
|
|
27
26
|
};
|
|
@@ -36,7 +35,7 @@ export const createDefaultEntityCompanionProvider = (
|
|
|
36
35
|
},
|
|
37
36
|
{
|
|
38
37
|
['redis']: {
|
|
39
|
-
cacheAdapterProvider: new RedisCacheAdapterProvider(
|
|
38
|
+
cacheAdapterProvider: new RedisCacheAdapterProvider(genericRedisCacheContext),
|
|
40
39
|
},
|
|
41
40
|
}
|
|
42
41
|
);
|
|
@@ -13,6 +13,16 @@ export interface GenericRedisCacheContext {
|
|
|
13
13
|
* Instance of ioredis.Redis
|
|
14
14
|
*/
|
|
15
15
|
redisClient: IRedis;
|
|
16
|
+
/**
|
|
17
|
+
* Create a key string for key parts (cache key prefix, versions, entity name, etc).
|
|
18
|
+
* Most commonly a simple `parts.join(':')`. See integration test for example.
|
|
19
|
+
*/
|
|
20
|
+
makeKeyFn: (...parts: string[]) => string;
|
|
21
|
+
/**
|
|
22
|
+
* Prefix prepended to all entity cache keys. Useful for adding a short, human-readable
|
|
23
|
+
* distintion for entity keys, e.g. `ent-`
|
|
24
|
+
*/
|
|
25
|
+
cacheKeyPrefix: string;
|
|
16
26
|
/**
|
|
17
27
|
* TTL for caching database hits. Successive entity loads within this TTL
|
|
18
28
|
* will be read from cache (unless invalidated).
|
|
@@ -32,4 +42,5 @@ export default class GenericRedisCacher<TFields> implements IEntityGenericCacher
|
|
|
32
42
|
cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void>;
|
|
33
43
|
cacheDBMissesAsync(keys: readonly string[]): Promise<void>;
|
|
34
44
|
invalidateManyAsync(keys: readonly string[]): Promise<void>;
|
|
45
|
+
makeCacheKey<N extends keyof TFields>(fieldName: N, fieldValue: NonNullable<TFields[N]>): string;
|
|
35
46
|
}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const entity_1 = require("@expo/entity");
|
|
7
|
+
const invariant_1 = __importDefault(require("invariant"));
|
|
7
8
|
const RedisCommon_1 = require("./RedisCommon");
|
|
8
9
|
const wrapNativeRedisCallAsync_1 = __importDefault(require("./errors/wrapNativeRedisCallAsync"));
|
|
9
10
|
// Sentinel value we store in Redis to negatively cache a database miss.
|
|
@@ -68,6 +69,11 @@ class GenericRedisCacher {
|
|
|
68
69
|
}
|
|
69
70
|
await (0, wrapNativeRedisCallAsync_1.default)(() => this.context.redisClient.del(...keys));
|
|
70
71
|
}
|
|
72
|
+
makeCacheKey(fieldName, fieldValue) {
|
|
73
|
+
const columnName = this.entityConfiguration.entityToDBFieldsKeyMapping.get(fieldName);
|
|
74
|
+
(0, invariant_1.default)(columnName, `database field mapping missing for ${String(fieldName)}`);
|
|
75
|
+
return this.context.makeKeyFn(this.context.cacheKeyPrefix, this.entityConfiguration.tableName, `v2.${this.entityConfiguration.cacheKeyVersion}`, columnName, String(fieldValue));
|
|
76
|
+
}
|
|
71
77
|
}
|
|
72
78
|
exports.default = GenericRedisCacher;
|
|
73
79
|
//# sourceMappingURL=GenericRedisCacher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenericRedisCacher.js","sourceRoot":"","sources":["../src/GenericRedisCacher.ts"],"names":[],"mappings":";;;;;AAAA,yCAOsB;
|
|
1
|
+
{"version":3,"file":"GenericRedisCacher.js","sourceRoot":"","sources":["../src/GenericRedisCacher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { IEntityCacheAdapterProvider, EntityConfiguration,
|
|
2
|
-
import {
|
|
1
|
+
import { IEntityCacheAdapterProvider, EntityConfiguration, IEntityCacheAdapter } from '@expo/entity';
|
|
2
|
+
import { GenericRedisCacheContext } from './GenericRedisCacher';
|
|
3
3
|
export default class RedisCacheAdapterProvider implements IEntityCacheAdapterProvider {
|
|
4
4
|
private readonly context;
|
|
5
|
-
constructor(context:
|
|
6
|
-
getCacheAdapter<TFields>(entityConfiguration: EntityConfiguration<TFields>):
|
|
5
|
+
constructor(context: GenericRedisCacheContext);
|
|
6
|
+
getCacheAdapter<TFields>(entityConfiguration: EntityConfiguration<TFields>): IEntityCacheAdapter<TFields>;
|
|
7
7
|
}
|
|
@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const entity_1 = require("@expo/entity");
|
|
7
|
+
const GenericRedisCacher_1 = __importDefault(require("./GenericRedisCacher"));
|
|
7
8
|
class RedisCacheAdapterProvider {
|
|
8
9
|
constructor(context) {
|
|
9
10
|
this.context = context;
|
|
10
11
|
}
|
|
11
12
|
getCacheAdapter(entityConfiguration) {
|
|
12
|
-
return new
|
|
13
|
+
return new entity_1.GenericEntityCacheAdapter(new GenericRedisCacher_1.default(this.context, entityConfiguration));
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
exports.default = RedisCacheAdapterProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisCacheAdapterProvider.js","sourceRoot":"","sources":["../src/RedisCacheAdapterProvider.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"RedisCacheAdapterProvider.js","sourceRoot":"","sources":["../src/RedisCacheAdapterProvider.ts"],"names":[],"mappings":";;;;;AAAA,yCAKsB;AAEtB,8EAAoF;AAEpF,MAAqB,yBAAyB;IAC5C,YAA6B,OAAiC;QAAjC,YAAO,GAAP,OAAO,CAA0B;IAAG,CAAC;IAElE,eAAe,CACb,mBAAiD;QAEjD,OAAO,IAAI,kCAAyB,CAAC,IAAI,4BAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAClG,CAAC;CACF;AARD,4CAQC"}
|
package/build/RedisCommon.js
CHANGED
|
@@ -20,7 +20,7 @@ exports.redisTransformerMap = new Map([
|
|
|
20
20
|
* behavior is to convert ISO strings back into Date
|
|
21
21
|
* objects and pass through null.
|
|
22
22
|
*/
|
|
23
|
-
write: (val) =>
|
|
23
|
+
write: (val) => val?.toISOString() ?? null,
|
|
24
24
|
read: (val) => (val ? new Date(val) : val),
|
|
25
25
|
},
|
|
26
26
|
],
|
package/build/RedisCommon.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisCommon.js","sourceRoot":"","sources":["../src/RedisCommon.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AAE5B,QAAA,mBAAmB,GAAG,IAAI,GAAG,CAAC;IACzC;QACE,kBAAS,CAAC,IAAI;QACd;YACE;;;;;;;;;;;;;eAaG;YACH,KAAK,EAAE,CAAC,GAAS,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"RedisCommon.js","sourceRoot":"","sources":["../src/RedisCommon.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AAE5B,QAAA,mBAAmB,GAAG,IAAI,GAAG,CAAC;IACzC;QACE,kBAAS,CAAC,IAAI;QACd;YACE;;;;;;;;;;;;;eAaG;YACH,KAAK,EAAE,CAAC,GAAS,EAAE,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,IAAI;YAChD,IAAI,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SAChD;KACF;CACF,CAAC,CAAC"}
|
|
@@ -10,7 +10,7 @@ const ioredis_1 = __importDefault(require("ioredis"));
|
|
|
10
10
|
const nullthrows_1 = __importDefault(require("nullthrows"));
|
|
11
11
|
const url_1 = require("url");
|
|
12
12
|
const uuid_1 = require("uuid");
|
|
13
|
-
const
|
|
13
|
+
const GenericRedisCacher_1 = __importDefault(require("../GenericRedisCacher"));
|
|
14
14
|
const RedisTestEntity_1 = __importDefault(require("../testfixtures/RedisTestEntity"));
|
|
15
15
|
const createRedisIntegrationTestEntityCompanionProvider_1 = require("../testfixtures/createRedisIntegrationTestEntityCompanionProvider");
|
|
16
16
|
class BatchedRedis {
|
|
@@ -44,12 +44,12 @@ class BatchedRedis {
|
|
|
44
44
|
await this.redis.del(...args);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
describe(
|
|
47
|
+
describe(GenericRedisCacher_1.default, () => {
|
|
48
48
|
const redis = new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString());
|
|
49
49
|
const redisClient = new BatchedRedis(redis);
|
|
50
|
-
let
|
|
50
|
+
let genericRedisCacheContext;
|
|
51
51
|
beforeAll(() => {
|
|
52
|
-
|
|
52
|
+
genericRedisCacheContext = {
|
|
53
53
|
redisClient,
|
|
54
54
|
makeKeyFn(...parts) {
|
|
55
55
|
const delimiter = ':';
|
|
@@ -57,7 +57,6 @@ describe(RedisCacheAdapter_1.default, () => {
|
|
|
57
57
|
return escapedParts.join(delimiter);
|
|
58
58
|
},
|
|
59
59
|
cacheKeyPrefix: 'test-',
|
|
60
|
-
cacheKeyVersion: 1,
|
|
61
60
|
ttlSecondsPositive: 86400,
|
|
62
61
|
ttlSecondsNegative: 600, // 10 minutes
|
|
63
62
|
};
|
|
@@ -70,18 +69,18 @@ describe(RedisCacheAdapter_1.default, () => {
|
|
|
70
69
|
});
|
|
71
70
|
it('has correct caching behavior', async () => {
|
|
72
71
|
// simulate two requests
|
|
73
|
-
const viewerContext = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
72
|
+
const viewerContext = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
74
73
|
const mgetSpy = jest.spyOn(redis, 'mget');
|
|
75
|
-
const
|
|
76
|
-
const cacheKeyMaker =
|
|
74
|
+
const genericCacher = viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity_1.default)['tableDataCoordinator']['cacheAdapter']['genericCacher'];
|
|
75
|
+
const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
|
|
77
76
|
const entity1Created = await RedisTestEntity_1.default.creator(viewerContext)
|
|
78
77
|
.setField('name', 'blah')
|
|
79
78
|
.enforceCreateAsync();
|
|
80
79
|
// loading an entity should put it in cache. load by multiple requests and multiple fields in same tick to ensure batch works
|
|
81
80
|
mgetSpy.mockClear();
|
|
82
|
-
const viewerContext1 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
83
|
-
const viewerContext2 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
84
|
-
const viewerContext3 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
81
|
+
const viewerContext1 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
82
|
+
const viewerContext2 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
83
|
+
const viewerContext3 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
85
84
|
const [entity1, entity2, entity3] = await Promise.all([
|
|
86
85
|
RedisTestEntity_1.default.loader(viewerContext1).enforcing().loadByIDAsync(entity1Created.getID()),
|
|
87
86
|
RedisTestEntity_1.default.loader(viewerContext2).enforcing().loadByIDAsync(entity1Created.getID()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BatchedRedisCacheAdapter-integration-test.js","sourceRoot":"","sources":["../../src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.ts"],"names":[],"mappings":";;;;;AAAA,2CAAwC;AACxC,yCAAuD;AACvD,0DAAkC;AAClC,sDAA4B;AAC5B,4DAAoC;AACpC,6BAA0B;AAC1B,+BAAoC;
|
|
1
|
+
{"version":3,"file":"BatchedRedisCacheAdapter-integration-test.js","sourceRoot":"","sources":["../../src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,38 +8,36 @@ const results_1 = require("@expo/results");
|
|
|
8
8
|
const ioredis_1 = __importDefault(require("ioredis"));
|
|
9
9
|
const url_1 = require("url");
|
|
10
10
|
const uuid_1 = require("uuid");
|
|
11
|
-
const
|
|
11
|
+
const GenericRedisCacher_1 = __importDefault(require("../GenericRedisCacher"));
|
|
12
12
|
const RedisTestEntity_1 = __importDefault(require("../testfixtures/RedisTestEntity"));
|
|
13
13
|
const createRedisIntegrationTestEntityCompanionProvider_1 = require("../testfixtures/createRedisIntegrationTestEntityCompanionProvider");
|
|
14
14
|
class TestViewerContext extends entity_1.ViewerContext {
|
|
15
15
|
}
|
|
16
|
-
describe(
|
|
17
|
-
|
|
18
|
-
let redisCacheAdapterContext;
|
|
16
|
+
describe(GenericRedisCacher_1.default, () => {
|
|
17
|
+
let genericRedisCacheContext;
|
|
19
18
|
beforeAll(() => {
|
|
20
|
-
|
|
21
|
-
redisClient,
|
|
19
|
+
genericRedisCacheContext = {
|
|
20
|
+
redisClient: new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString()),
|
|
22
21
|
makeKeyFn(...parts) {
|
|
23
22
|
const delimiter = ':';
|
|
24
23
|
const escapedParts = parts.map((part) => part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`));
|
|
25
24
|
return escapedParts.join(delimiter);
|
|
26
25
|
},
|
|
27
26
|
cacheKeyPrefix: 'test-',
|
|
28
|
-
cacheKeyVersion: 1,
|
|
29
27
|
ttlSecondsPositive: 86400,
|
|
30
28
|
ttlSecondsNegative: 600, // 10 minutes
|
|
31
29
|
};
|
|
32
30
|
});
|
|
33
31
|
beforeEach(async () => {
|
|
34
|
-
await redisClient.flushdb();
|
|
32
|
+
await genericRedisCacheContext.redisClient.flushdb();
|
|
35
33
|
});
|
|
36
34
|
afterAll(async () => {
|
|
37
|
-
redisClient.disconnect();
|
|
35
|
+
genericRedisCacheContext.redisClient.disconnect();
|
|
38
36
|
});
|
|
39
37
|
it('has correct caching behavior', async () => {
|
|
40
|
-
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
41
|
-
const
|
|
42
|
-
const cacheKeyMaker =
|
|
38
|
+
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
39
|
+
const genericCacher = viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity_1.default)['tableDataCoordinator']['cacheAdapter']['genericCacher'];
|
|
40
|
+
const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
|
|
43
41
|
const entity1Created = await RedisTestEntity_1.default.creator(viewerContext)
|
|
44
42
|
.setField('name', 'blah')
|
|
45
43
|
.enforceCreateAsync();
|
|
@@ -47,7 +45,7 @@ describe(RedisCacheAdapter_1.default, () => {
|
|
|
47
45
|
const entity1 = await RedisTestEntity_1.default.loader(viewerContext)
|
|
48
46
|
.enforcing()
|
|
49
47
|
.loadByIDAsync(entity1Created.getID());
|
|
50
|
-
const cachedJSON = await redisClient.get(cacheKeyMaker('id', entity1.getID()));
|
|
48
|
+
const cachedJSON = await genericRedisCacheContext.redisClient.get(cacheKeyMaker('id', entity1.getID()));
|
|
51
49
|
const cachedValue = JSON.parse(cachedJSON);
|
|
52
50
|
expect(cachedValue).toMatchObject({
|
|
53
51
|
id: entity1.getID(),
|
|
@@ -57,18 +55,18 @@ describe(RedisCacheAdapter_1.default, () => {
|
|
|
57
55
|
const nonExistentId = (0, uuid_1.v4)();
|
|
58
56
|
const entityNonExistentResult = await RedisTestEntity_1.default.loader(viewerContext).loadByIDAsync(nonExistentId);
|
|
59
57
|
expect(entityNonExistentResult.ok).toBe(false);
|
|
60
|
-
const nonExistentCachedValue = await redisClient.get(cacheKeyMaker('id', nonExistentId));
|
|
58
|
+
const nonExistentCachedValue = await genericRedisCacheContext.redisClient.get(cacheKeyMaker('id', nonExistentId));
|
|
61
59
|
expect(nonExistentCachedValue).toEqual('');
|
|
62
60
|
// load again through entities framework to ensure it reads negative result
|
|
63
61
|
const entityNonExistentResult2 = await RedisTestEntity_1.default.loader(viewerContext).loadByIDAsync(nonExistentId);
|
|
64
62
|
expect(entityNonExistentResult2.ok).toBe(false);
|
|
65
63
|
// invalidate from cache to ensure it invalidates correctly
|
|
66
64
|
await RedisTestEntity_1.default.loader(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
|
|
67
|
-
const cachedValueNull = await redisClient.get(cacheKeyMaker('id', entity1.getID()));
|
|
65
|
+
const cachedValueNull = await genericRedisCacheContext.redisClient.get(cacheKeyMaker('id', entity1.getID()));
|
|
68
66
|
expect(cachedValueNull).toBe(null);
|
|
69
67
|
});
|
|
70
68
|
it('caches and restores date fields', async () => {
|
|
71
|
-
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
69
|
+
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
72
70
|
const date = new Date();
|
|
73
71
|
const entity1 = await (0, results_1.enforceAsyncResult)(RedisTestEntity_1.default.creator(viewerContext).setField('dateField', date).createAsync());
|
|
74
72
|
expect(entity1.getField('dateField')).toEqual(date);
|
|
@@ -77,23 +75,23 @@ describe(RedisCacheAdapter_1.default, () => {
|
|
|
77
75
|
.loadByIDAsync(entity1.getID());
|
|
78
76
|
expect(entity2.getField('dateField')).toEqual(date);
|
|
79
77
|
// simulate new request
|
|
80
|
-
const vc2 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
78
|
+
const vc2 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
81
79
|
const entity3 = await RedisTestEntity_1.default.loader(vc2).enforcing().loadByIDAsync(entity1.getID());
|
|
82
80
|
expect(entity3.getField('dateField')).toEqual(date);
|
|
83
81
|
});
|
|
84
82
|
it('caches and restores empty string field keys', async () => {
|
|
85
|
-
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
83
|
+
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
86
84
|
const entity1 = await (0, results_1.enforceAsyncResult)(RedisTestEntity_1.default.creator(viewerContext).setField('name', '').createAsync());
|
|
87
85
|
const entity2 = await RedisTestEntity_1.default.loader(viewerContext)
|
|
88
86
|
.enforcing()
|
|
89
87
|
.loadByFieldEqualingAsync('name', '');
|
|
90
|
-
expect(entity2
|
|
88
|
+
expect(entity2?.getID()).toEqual(entity1.getID());
|
|
91
89
|
// simulate new request
|
|
92
|
-
const vc2 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
90
|
+
const vc2 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
93
91
|
const entity3 = await RedisTestEntity_1.default.loader(vc2)
|
|
94
92
|
.enforcing()
|
|
95
93
|
.loadByFieldEqualingAsync('name', '');
|
|
96
|
-
expect(entity3
|
|
94
|
+
expect(entity3?.getID()).toEqual(entity1.getID());
|
|
97
95
|
});
|
|
98
96
|
});
|
|
99
|
-
//# sourceMappingURL=
|
|
97
|
+
//# sourceMappingURL=GenericRedisCacher-full-integration-test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GenericRedisCacher-full-integration-test.js","sourceRoot":"","sources":["../../src/__integration-tests__/GenericRedisCacher-full-integration-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,35 +35,29 @@ const createRedisIntegrationTestEntityCompanionProvider_1 = require("../testfixt
|
|
|
35
35
|
class TestViewerContext extends entity_1.ViewerContext {
|
|
36
36
|
}
|
|
37
37
|
describe(GenericRedisCacher_1.default, () => {
|
|
38
|
-
|
|
39
|
-
let redisCacheAdapterContext;
|
|
38
|
+
let genericRedisCacheContext;
|
|
40
39
|
beforeAll(() => {
|
|
41
|
-
|
|
42
|
-
redisClient,
|
|
40
|
+
genericRedisCacheContext = {
|
|
41
|
+
redisClient: new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString()),
|
|
43
42
|
makeKeyFn(...parts) {
|
|
44
43
|
const delimiter = ':';
|
|
45
44
|
const escapedParts = parts.map((part) => part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`));
|
|
46
45
|
return escapedParts.join(delimiter);
|
|
47
46
|
},
|
|
48
47
|
cacheKeyPrefix: 'test-',
|
|
49
|
-
cacheKeyVersion: 1,
|
|
50
48
|
ttlSecondsPositive: 86400,
|
|
51
49
|
ttlSecondsNegative: 600, // 10 minutes
|
|
52
50
|
};
|
|
53
51
|
});
|
|
54
52
|
beforeEach(async () => {
|
|
55
|
-
await redisClient.flushdb();
|
|
53
|
+
await genericRedisCacheContext.redisClient.flushdb();
|
|
56
54
|
});
|
|
57
55
|
afterAll(async () => {
|
|
58
|
-
redisClient.disconnect();
|
|
56
|
+
genericRedisCacheContext.redisClient.disconnect();
|
|
59
57
|
});
|
|
60
58
|
it('has correct caching and loading behavior', async () => {
|
|
61
|
-
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
62
|
-
const genericRedisCacher = new GenericRedisCacher_1.default(
|
|
63
|
-
redisClient: redisCacheAdapterContext.redisClient,
|
|
64
|
-
ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
|
|
65
|
-
ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
|
|
66
|
-
}, RedisTestEntity_1.redisTestEntityConfiguration);
|
|
59
|
+
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
60
|
+
const genericRedisCacher = new GenericRedisCacher_1.default(genericRedisCacheContext, RedisTestEntity_1.redisTestEntityConfiguration);
|
|
67
61
|
const date = new Date();
|
|
68
62
|
const entity1Created = await RedisTestEntity_1.default.creator(viewerContext)
|
|
69
63
|
.setField('name', 'blah')
|
|
@@ -74,7 +68,7 @@ describe(GenericRedisCacher_1.default, () => {
|
|
|
74
68
|
[testKey, entity1Created.getAllFields()],
|
|
75
69
|
]);
|
|
76
70
|
await genericRedisCacher.cacheManyAsync(objectMap);
|
|
77
|
-
const cachedJSON = await redisClient.get(testKey);
|
|
71
|
+
const cachedJSON = await genericRedisCacheContext.redisClient.get(testKey);
|
|
78
72
|
const cachedValue = JSON.parse(cachedJSON);
|
|
79
73
|
expect(cachedValue).toMatchObject({
|
|
80
74
|
id: entity1Created.getID(),
|
|
@@ -89,11 +83,7 @@ describe(GenericRedisCacher_1.default, () => {
|
|
|
89
83
|
expect(loadedObjectMap.size).toBe(1);
|
|
90
84
|
});
|
|
91
85
|
it('has correct negative caching behaviour', async () => {
|
|
92
|
-
const genericRedisCacher = new GenericRedisCacher_1.default(
|
|
93
|
-
redisClient: redisCacheAdapterContext.redisClient,
|
|
94
|
-
ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
|
|
95
|
-
ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
|
|
96
|
-
}, RedisTestEntity_1.redisTestEntityConfiguration);
|
|
86
|
+
const genericRedisCacher = new GenericRedisCacher_1.default(genericRedisCacheContext, RedisTestEntity_1.redisTestEntityConfiguration);
|
|
97
87
|
const testKey = `test-id-key-non-existent-id`;
|
|
98
88
|
await genericRedisCacher.cacheDBMissesAsync([testKey]);
|
|
99
89
|
const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
|
|
@@ -101,12 +91,8 @@ describe(GenericRedisCacher_1.default, () => {
|
|
|
101
91
|
expect(cacheLoadResult.status).toBe(entity_1.CacheStatus.NEGATIVE);
|
|
102
92
|
});
|
|
103
93
|
it('has correct invalidation behaviour', async () => {
|
|
104
|
-
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
105
|
-
const genericRedisCacher = new GenericRedisCacher_1.default(
|
|
106
|
-
redisClient: redisCacheAdapterContext.redisClient,
|
|
107
|
-
ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
|
|
108
|
-
ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
|
|
109
|
-
}, RedisTestEntity_1.redisTestEntityConfiguration);
|
|
94
|
+
const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
95
|
+
const genericRedisCacher = new GenericRedisCacher_1.default(genericRedisCacheContext, RedisTestEntity_1.redisTestEntityConfiguration);
|
|
110
96
|
const date = new Date();
|
|
111
97
|
const entity1Created = await RedisTestEntity_1.default.creator(viewerContext)
|
|
112
98
|
.setField('name', 'blah')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenericRedisCacher-integration-test.js","sourceRoot":"","sources":["../../src/__integration-tests__/GenericRedisCacher-integration-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA0D;AAC1D,sDAA4B;AAC5B,6BAA0B;AAE1B,+
|
|
1
|
+
{"version":3,"file":"GenericRedisCacher-integration-test.js","sourceRoot":"","sources":["../../src/__integration-tests__/GenericRedisCacher-integration-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const entity_1 = require("@expo/entity");
|
|
7
7
|
const ioredis_1 = __importDefault(require("ioredis"));
|
|
8
8
|
const url_1 = require("url");
|
|
9
|
-
const
|
|
9
|
+
const GenericRedisCacher_1 = __importDefault(require("../GenericRedisCacher"));
|
|
10
10
|
const RedisTestEntity_1 = __importDefault(require("../testfixtures/RedisTestEntity"));
|
|
11
11
|
const createRedisIntegrationTestEntityCompanionProvider_1 = require("../testfixtures/createRedisIntegrationTestEntityCompanionProvider");
|
|
12
12
|
class TestViewerContext extends entity_1.ViewerContext {
|
|
13
13
|
}
|
|
14
|
-
describe(
|
|
14
|
+
describe(GenericRedisCacher_1.default, () => {
|
|
15
15
|
const redisClient = new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString());
|
|
16
|
-
let
|
|
16
|
+
let genericRedisCacheContext;
|
|
17
17
|
beforeAll(() => {
|
|
18
|
-
|
|
18
|
+
genericRedisCacheContext = {
|
|
19
19
|
redisClient,
|
|
20
20
|
makeKeyFn(...parts) {
|
|
21
21
|
const delimiter = ':';
|
|
@@ -23,7 +23,6 @@ describe(RedisCacheAdapter_1.default, () => {
|
|
|
23
23
|
return escapedParts.join(delimiter);
|
|
24
24
|
},
|
|
25
25
|
cacheKeyPrefix: 'test-',
|
|
26
|
-
cacheKeyVersion: 1,
|
|
27
26
|
ttlSecondsPositive: 86400,
|
|
28
27
|
ttlSecondsNegative: 600, // 10 minutes
|
|
29
28
|
};
|
|
@@ -33,7 +32,7 @@ describe(RedisCacheAdapter_1.default, () => {
|
|
|
33
32
|
});
|
|
34
33
|
it('throws when redis is disconnected', async () => {
|
|
35
34
|
redisClient.disconnect();
|
|
36
|
-
const vc1 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(
|
|
35
|
+
const vc1 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
|
|
37
36
|
await expect(RedisTestEntity_1.default.creator(vc1).setField('name', 'blah').enforceCreateAsync()).rejects.toThrow(entity_1.EntityCacheAdapterTransientError);
|
|
38
37
|
});
|
|
39
38
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors-test.js","sourceRoot":"","sources":["../../src/__integration-tests__/errors-test.ts"],"names":[],"mappings":";;;;;AAAA,yCAA+E;AAC/E,sDAA4B;AAC5B,6BAA0B;AAE1B
|
|
1
|
+
{"version":3,"file":"errors-test.js","sourceRoot":"","sources":["../../src/__integration-tests__/errors-test.ts"],"names":[],"mappings":";;;;;AAAA,yCAA+E;AAC/E,sDAA4B;AAC5B,6BAA0B;AAE1B,+EAAqF;AACrF,sFAA8D;AAC9D,yIAAsI;AAEtI,MAAM,iBAAkB,SAAQ,sBAAa;CAAG;AAEhD,QAAQ,CAAC,4BAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG,IAAI,iBAAK,CAAC,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7E,IAAI,wBAAkD,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE;QACb,wBAAwB,GAAG;YACzB,WAAW;YACX,SAAS,CAAC,GAAG,KAAe;gBAC1B,MAAM,SAAS,GAAG,GAAG,CAAC;gBACtB,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACtC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,SAAS,EAAE,CAAC,CAChE,CAAC;gBACF,OAAO,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,CAAC;YACD,cAAc,EAAE,OAAO;YACvB,kBAAkB,EAAE,KAAK;YACzB,kBAAkB,EAAE,GAAG,EAAE,aAAa;SACvC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,WAAW,CAAC,UAAU,EAAE,CAAC;QAEzB,MAAM,GAAG,GAAG,IAAI,iBAAiB,CAC/B,IAAA,qGAAiD,EAAC,wBAAwB,CAAC,CAC5E,CAAC;QAEF,MAAM,MAAM,CACV,yBAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,kBAAkB,EAAE,CAC3E,CAAC,OAAO,CAAC,OAAO,CAAC,yCAAgC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|