@node-c/persistance-redis 1.0.0-alpha3 → 1.0.0-alpha4
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/entityService/redis.entity.service.definitions.d.ts +6 -3
- package/dist/repository/redis.repository.definitions.d.ts +1 -0
- package/dist/repository/redis.repository.definitions.js.map +1 -1
- package/dist/repository/redis.repository.service.d.ts +1 -0
- package/dist/repository/redis.repository.service.js +62 -8
- package/dist/repository/redis.repository.service.js.map +1 -1
- package/dist/store/redis.store.definitions.d.ts +1 -0
- package/dist/store/redis.store.service.d.ts +7 -1
- package/dist/store/redis.store.service.js +109 -29
- package/dist/store/redis.store.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { PersistanceCountOptions, PersistanceDeleteOptions, PersistanceFindOneOptions, PersistanceFindOptions, PersistanceUpdateOptions } from '@node-c/core';
|
|
2
|
+
export interface BaseCreateOptions extends BaseOptions {
|
|
3
|
+
ttl?: number;
|
|
4
|
+
}
|
|
2
5
|
export interface BaseOptions {
|
|
3
6
|
forceTransaction?: boolean;
|
|
4
7
|
transactionId?: string;
|
|
5
8
|
}
|
|
6
|
-
export type BulkCreateOptions =
|
|
9
|
+
export type BulkCreateOptions = BaseCreateOptions;
|
|
7
10
|
export interface CountOptions extends BaseOptions, Omit<PersistanceCountOptions, 'withDeleted'> {
|
|
8
11
|
}
|
|
9
|
-
export type CreateOptions =
|
|
12
|
+
export type CreateOptions = BaseCreateOptions;
|
|
10
13
|
export interface DeleteOptions extends BaseOptions, Omit<PersistanceDeleteOptions, 'softDelete'> {
|
|
11
14
|
}
|
|
12
15
|
export interface FindOneOptions extends BaseOptions, Omit<PersistanceFindOneOptions, 'include' | 'orderBy' | 'select' | 'selectOperator' | 'withDeleted'> {
|
|
@@ -15,5 +18,5 @@ export interface FindOneOptions extends BaseOptions, Omit<PersistanceFindOneOpti
|
|
|
15
18
|
export interface FindOptions extends BaseOptions, Omit<PersistanceFindOptions, 'include' | 'orderBy' | 'select' | 'selectOperator' | 'withDeleted'> {
|
|
16
19
|
requirePrimaryKeys?: boolean;
|
|
17
20
|
}
|
|
18
|
-
export interface UpdateOptions extends
|
|
21
|
+
export interface UpdateOptions extends BaseCreateOptions, PersistanceUpdateOptions {
|
|
19
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.repository.definitions.js","sourceRoot":"","sources":["../../src/repository/redis.repository.definitions.ts"],"names":[],"mappings":";;;AAkBA,IAAY,sBASX;AATD,WAAY,sBAAsB;IAEhC,6CAAmB,CAAA;IAEnB,2CAAiB,CAAA;IAEjB,qDAA2B,CAAA;IAE3B,2CAAiB,CAAA;AACnB,CAAC,EATW,sBAAsB,sCAAtB,sBAAsB,QASjC;
|
|
1
|
+
{"version":3,"file":"redis.repository.definitions.js","sourceRoot":"","sources":["../../src/repository/redis.repository.definitions.ts"],"names":[],"mappings":";;;AAkBA,IAAY,sBASX;AATD,WAAY,sBAAsB;IAEhC,6CAAmB,CAAA;IAEnB,2CAAiB,CAAA;IAEjB,qDAA2B,CAAA;IAE3B,2CAAiB,CAAA;AACnB,CAAC,EATW,sBAAsB,sCAAtB,sBAAsB,QASjC;AA6BD,IAAY,qBAOX;AAPD,WAAY,qBAAqB;IAE/B,gDAAuB,CAAA;IAEvB,kDAAyB,CAAA;IAEzB,0CAAiB,CAAA;AACnB,CAAC,EAPW,qBAAqB,qCAArB,qBAAqB,QAOhC"}
|
|
@@ -6,6 +6,7 @@ export declare class RedisRepositoryService<Entity> {
|
|
|
6
6
|
protected persistanceModuleName: string;
|
|
7
7
|
protected schema: EntitySchema;
|
|
8
8
|
protected store: RedisStoreService;
|
|
9
|
+
protected defaultTTL?: number;
|
|
9
10
|
protected primaryKeys: string[];
|
|
10
11
|
protected storeDelimiter: string;
|
|
11
12
|
constructor(configProvider: ConfigProviderService, persistanceModuleName: string, schema: EntitySchema, store: RedisStoreService);
|
|
@@ -40,9 +40,10 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
40
40
|
this.persistanceModuleName = persistanceModuleName;
|
|
41
41
|
this.schema = schema;
|
|
42
42
|
this.store = store;
|
|
43
|
-
const { storeDelimiter } = configProvider.config.persistance[persistanceModuleName];
|
|
43
|
+
const { defaultTTL, storeDelimiter, ttlPerEntity } = configProvider.config.persistance[persistanceModuleName];
|
|
44
44
|
const { columns, name: entityName } = schema;
|
|
45
45
|
const primaryKeys = [];
|
|
46
|
+
this.defaultTTL = (ttlPerEntity === null || ttlPerEntity === void 0 ? void 0 : ttlPerEntity[entityName]) || defaultTTL;
|
|
46
47
|
for (const columnName in columns) {
|
|
47
48
|
const { primary, primaryOrder } = columns[columnName];
|
|
48
49
|
if (primary) {
|
|
@@ -62,8 +63,11 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
62
63
|
const { exactSearch, filters, findAll, page, perPage, withValues: optWithValues } = options;
|
|
63
64
|
const paginationOptions = {};
|
|
64
65
|
const withValues = typeof optWithValues === 'undefined' || optWithValues === true ? true : false;
|
|
66
|
+
let count = 0;
|
|
67
|
+
let hasNonPrimaryKeyFilters = false;
|
|
65
68
|
let storeEntityKey = '';
|
|
66
|
-
if (filters) {
|
|
69
|
+
if (filters && Object.keys(filters).length) {
|
|
70
|
+
let primaryKeyFiltersCount = 0;
|
|
67
71
|
storeEntityKey =
|
|
68
72
|
storeDelimiter +
|
|
69
73
|
primaryKeys
|
|
@@ -72,6 +76,7 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
72
76
|
if (typeof value !== 'undefined' &&
|
|
73
77
|
typeof value !== 'object' &&
|
|
74
78
|
(typeof value !== 'string' || value.length)) {
|
|
79
|
+
primaryKeyFiltersCount++;
|
|
75
80
|
return value;
|
|
76
81
|
}
|
|
77
82
|
if (exactSearch) {
|
|
@@ -81,8 +86,9 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
81
86
|
return '*';
|
|
82
87
|
})
|
|
83
88
|
.join(storeDelimiter);
|
|
89
|
+
hasNonPrimaryKeyFilters = primaryKeyFiltersCount === Object.keys(filters).length;
|
|
84
90
|
if (!findAll) {
|
|
85
|
-
|
|
91
|
+
count = perPage || 100;
|
|
86
92
|
paginationOptions.count = count;
|
|
87
93
|
paginationOptions.cursor = (page ? page - 1 : 0) * count;
|
|
88
94
|
}
|
|
@@ -91,7 +97,50 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
91
97
|
throw new core_1.ApplicationError(`[RedisRepositoryService ${entityName}][Error]: ` +
|
|
92
98
|
'Either filters or findAll is required when calling the find method.');
|
|
93
99
|
}
|
|
94
|
-
|
|
100
|
+
if (findAll) {
|
|
101
|
+
const { values: initialResults } = yield store.scan(`${entityName}${storeEntityKey}`, Object.assign(Object.assign({}, paginationOptions), { parseToJSON: true, scanAll: findAll, withValues }));
|
|
102
|
+
if (!hasNonPrimaryKeyFilters) {
|
|
103
|
+
return initialResults;
|
|
104
|
+
}
|
|
105
|
+
return initialResults.filter(item => {
|
|
106
|
+
let filterResult = true;
|
|
107
|
+
for (const key in filters) {
|
|
108
|
+
if (primaryKeys.includes(key)) {
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
if (item[key] !== filters[key]) {
|
|
112
|
+
filterResult = false;
|
|
113
|
+
break;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return filterResult;
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
let results = [];
|
|
120
|
+
while (results.length < count) {
|
|
121
|
+
const { cursor: newCursor, values: innerResults } = yield store.scan(`${entityName}${storeEntityKey}`, Object.assign(Object.assign({}, paginationOptions), { parseToJSON: true, scanAll: findAll, withValues }));
|
|
122
|
+
results = results.concat(innerResults.filter(item => {
|
|
123
|
+
let filterResult = true;
|
|
124
|
+
for (const key in filters) {
|
|
125
|
+
if (primaryKeys.includes(key)) {
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
if (item[key] !== filters[key]) {
|
|
129
|
+
filterResult = false;
|
|
130
|
+
break;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return filterResult;
|
|
134
|
+
}));
|
|
135
|
+
if (newCursor === 0) {
|
|
136
|
+
break;
|
|
137
|
+
}
|
|
138
|
+
paginationOptions.cursor = newCursor;
|
|
139
|
+
}
|
|
140
|
+
if (results.length > count) {
|
|
141
|
+
results = results.slice(0, count);
|
|
142
|
+
}
|
|
143
|
+
return results;
|
|
95
144
|
});
|
|
96
145
|
}
|
|
97
146
|
prepare(data, options) {
|
|
@@ -178,9 +227,9 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
178
227
|
}
|
|
179
228
|
save(data, options) {
|
|
180
229
|
return __awaiter(this, void 0, void 0, function* () {
|
|
181
|
-
const { schema, store, storeDelimiter } = this;
|
|
230
|
+
const { defaultTTL, schema, store, storeDelimiter } = this;
|
|
182
231
|
const { name: entityName } = schema;
|
|
183
|
-
const { delete: optDelete, onConflict, transactionId } = options || {};
|
|
232
|
+
const { delete: optDelete, onConflict, transactionId, ttl } = options || {};
|
|
184
233
|
const actualData = data instanceof Array ? data : [data];
|
|
185
234
|
if (optDelete) {
|
|
186
235
|
const prepareOptions = {
|
|
@@ -191,7 +240,9 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
191
240
|
for (const i in actualData) {
|
|
192
241
|
deleteKeys.push((yield this.prepare(actualData[i], prepareOptions)).storeEntityKey);
|
|
193
242
|
}
|
|
194
|
-
|
|
243
|
+
if (deleteKeys.length) {
|
|
244
|
+
yield store.delete(deleteKeys, { transactionId });
|
|
245
|
+
}
|
|
195
246
|
return deleteKeys;
|
|
196
247
|
}
|
|
197
248
|
const prepareOptions = {
|
|
@@ -202,7 +253,10 @@ let RedisRepositoryService = class RedisRepositoryService {
|
|
|
202
253
|
const results = [];
|
|
203
254
|
for (const i in actualData) {
|
|
204
255
|
const { data: validatedEntity, storeEntityKey } = yield this.prepare(actualData[i], prepareOptions);
|
|
205
|
-
yield store.set(`${entityName}${storeDelimiter}${storeEntityKey}`, validatedEntity, {
|
|
256
|
+
yield store.set(`${entityName}${storeDelimiter}${storeEntityKey}`, validatedEntity, {
|
|
257
|
+
transactionId,
|
|
258
|
+
ttl: ttl || defaultTTL
|
|
259
|
+
});
|
|
206
260
|
results.push(validatedEntity);
|
|
207
261
|
}
|
|
208
262
|
return results;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.repository.service.js","sourceRoot":"","sources":["../../src/repository/redis.repository.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,uCAAkG;AAElG,qDAA2C;AAC3C,0DAAkD;AAClD,iCAAuC;AACvC,+BAAkC;AAElC,iFAOwC;AAExC,uDAAkD;AAClD,oCAA6C;
|
|
1
|
+
{"version":3,"file":"redis.repository.service.js","sourceRoot":"","sources":["../../src/repository/redis.repository.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,11 @@ export declare class RedisStoreService {
|
|
|
5
5
|
protected configProvider: ConfigProviderService;
|
|
6
6
|
protected client: RedisClientType;
|
|
7
7
|
protected persistanceModuleName: string;
|
|
8
|
+
protected defaultTTL?: number;
|
|
9
|
+
protected storeDelimiter: string;
|
|
8
10
|
protected storeKey: string;
|
|
9
11
|
protected transactions: GenericObject<RedisTransaction>;
|
|
12
|
+
protected useHashmap: boolean;
|
|
10
13
|
constructor(configProvider: ConfigProviderService, client: RedisClientType, persistanceModuleName: string);
|
|
11
14
|
static createClient(config: AppConfig, options: {
|
|
12
15
|
persistanceModuleName: string;
|
|
@@ -15,6 +18,9 @@ export declare class RedisStoreService {
|
|
|
15
18
|
delete(handle: string | string[], options?: StoreDeleteOptions): Promise<number>;
|
|
16
19
|
endTransaction(transactionId: string): Promise<void>;
|
|
17
20
|
get<Value = unknown>(handle: string, options?: GetOptions): Promise<Value>;
|
|
18
|
-
scan<Values = unknown[]>(handle: string, options: ScanOptions): Promise<
|
|
21
|
+
scan<Values = unknown[]>(handle: string, options: ScanOptions): Promise<{
|
|
22
|
+
cursor: number;
|
|
23
|
+
values: Values;
|
|
24
|
+
}>;
|
|
19
25
|
set<Entry = unknown>(handle: string, entry: Entry, options?: SetOptions): Promise<void>;
|
|
20
26
|
}
|
|
@@ -32,18 +32,21 @@ let RedisStoreService = class RedisStoreService {
|
|
|
32
32
|
this.configProvider = configProvider;
|
|
33
33
|
this.client = client;
|
|
34
34
|
this.persistanceModuleName = persistanceModuleName;
|
|
35
|
-
const { storeKey } = configProvider.config.persistance[persistanceModuleName];
|
|
35
|
+
const { defaultTTL, storeDelimiter, storeKey, useHashmap } = configProvider.config.persistance[persistanceModuleName];
|
|
36
|
+
this.defaultTTL = defaultTTL;
|
|
37
|
+
this.storeDelimiter = storeDelimiter || definitions_1.Constants.DEFAULT_STORE_DELIMITER;
|
|
36
38
|
this.storeKey = storeKey;
|
|
37
39
|
this.transactions = {};
|
|
40
|
+
this.useHashmap = typeof useHashmap !== 'undefined' ? useHashmap : true;
|
|
38
41
|
}
|
|
39
42
|
static createClient(config, options) {
|
|
40
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
44
|
const { persistanceModuleName } = options;
|
|
42
|
-
const { password, host, port } = config.persistance[persistanceModuleName];
|
|
45
|
+
const { password, host, port, user } = config.persistance[persistanceModuleName];
|
|
43
46
|
const client = (0, redis_1.createClient)({
|
|
44
47
|
password: password || undefined,
|
|
45
48
|
socket: { host: host || '0.0.0.0', port: port || 6379 },
|
|
46
|
-
username: 'default'
|
|
49
|
+
username: user || 'default'
|
|
47
50
|
});
|
|
48
51
|
yield client.connect();
|
|
49
52
|
return client;
|
|
@@ -56,17 +59,19 @@ let RedisStoreService = class RedisStoreService {
|
|
|
56
59
|
}
|
|
57
60
|
delete(handle, options) {
|
|
58
61
|
return __awaiter(this, void 0, void 0, function* () {
|
|
59
|
-
const { transactions } = this;
|
|
62
|
+
const { client, storeDelimiter, storeKey, transactions, useHashmap } = this;
|
|
60
63
|
const { transactionId } = options || {};
|
|
61
64
|
if (transactionId) {
|
|
62
65
|
const transaction = transactions[transactionId];
|
|
63
66
|
if (!transaction) {
|
|
64
67
|
throw new core_1.ApplicationError(`[RedisStoreService][Error]: Transaction with id "${transactionId}" not found.`);
|
|
65
68
|
}
|
|
66
|
-
transactions[transactionId] =
|
|
69
|
+
transactions[transactionId] = useHashmap
|
|
70
|
+
? transaction.hDel(storeKey, handle)
|
|
71
|
+
: transaction.del(`${storeKey}${storeDelimiter}${handle}`);
|
|
67
72
|
return 0;
|
|
68
73
|
}
|
|
69
|
-
return yield
|
|
74
|
+
return useHashmap ? yield client.hDel(storeKey, handle) : yield client.del(`${storeKey}${storeDelimiter}${handle}`);
|
|
70
75
|
});
|
|
71
76
|
}
|
|
72
77
|
endTransaction(transactionId) {
|
|
@@ -82,34 +87,64 @@ let RedisStoreService = class RedisStoreService {
|
|
|
82
87
|
}
|
|
83
88
|
get(handle, options) {
|
|
84
89
|
return __awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
const { client, storeDelimiter, storeKey, useHashmap } = this;
|
|
85
91
|
const { parseToJSON } = options || {};
|
|
86
|
-
const value =
|
|
92
|
+
const value = useHashmap
|
|
93
|
+
? yield client.hGet(storeKey, handle)
|
|
94
|
+
: yield client.get(`${storeKey}${storeDelimiter}${handle}`);
|
|
87
95
|
return parseToJSON && typeof value === 'string' ? JSON.parse(value) : value;
|
|
88
96
|
});
|
|
89
97
|
}
|
|
90
98
|
scan(handle, options) {
|
|
91
99
|
return __awaiter(this, void 0, void 0, function* () {
|
|
92
|
-
const { client, storeKey } = this;
|
|
100
|
+
const { client, storeDelimiter, storeKey, useHashmap } = this;
|
|
93
101
|
const { count, cursor: optCursor, parseToJSON, scanAll, withValues } = options;
|
|
94
|
-
const
|
|
102
|
+
const getValues = typeof withValues === 'undefined' || withValues === true;
|
|
103
|
+
const hashmapMethod = (getValues
|
|
95
104
|
? client.hScan.bind(client)
|
|
96
105
|
: client.hScanNoValues.bind(client));
|
|
106
|
+
let cursor = 0;
|
|
97
107
|
let keys = [];
|
|
98
108
|
let parsedValues = [];
|
|
99
109
|
let values = [];
|
|
100
110
|
if (scanAll) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
111
|
+
if (useHashmap) {
|
|
112
|
+
while (true) {
|
|
113
|
+
const { cursor: newCursor, keys: newKeys, tuples: newValues } = yield hashmapMethod(storeKey, cursor, { count, match: handle });
|
|
114
|
+
cursor = newCursor;
|
|
115
|
+
if (newValues) {
|
|
116
|
+
values = values.concat(newValues);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
keys = keys.concat(newKeys);
|
|
120
|
+
}
|
|
121
|
+
if (cursor === 0) {
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
107
124
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
while (true) {
|
|
128
|
+
const { cursor: newCursor, keys: newKeys } = yield client.scan(cursor, {
|
|
129
|
+
MATCH: `${storeKey}${storeDelimiter}${handle}`
|
|
130
|
+
});
|
|
131
|
+
cursor = newCursor;
|
|
132
|
+
if (getValues) {
|
|
133
|
+
for (const i in keys) {
|
|
134
|
+
const key = keys[i];
|
|
135
|
+
const value = yield client.get(`${storeKey}${storeDelimiter}${key}`);
|
|
136
|
+
if (value === null) {
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
139
|
+
values.push({ field: key, value });
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
keys = keys.concat(newKeys);
|
|
144
|
+
}
|
|
145
|
+
if (cursor === 0) {
|
|
146
|
+
break;
|
|
147
|
+
}
|
|
113
148
|
}
|
|
114
149
|
}
|
|
115
150
|
}
|
|
@@ -117,12 +152,37 @@ let RedisStoreService = class RedisStoreService {
|
|
|
117
152
|
if (typeof count === 'undefined') {
|
|
118
153
|
throw new core_1.ApplicationError('The "count" options is required when the "findAll" options is not positive.');
|
|
119
154
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
155
|
+
if (useHashmap) {
|
|
156
|
+
const { keys: newKeys, tuples: newValues } = yield hashmapMethod(storeKey, optCursor || 0, {
|
|
157
|
+
count,
|
|
158
|
+
match: handle
|
|
159
|
+
});
|
|
160
|
+
if (newValues) {
|
|
161
|
+
values = values.concat(newValues);
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
keys = keys.concat(newKeys);
|
|
165
|
+
}
|
|
123
166
|
}
|
|
124
167
|
else {
|
|
125
|
-
keys =
|
|
168
|
+
const { cursor: newCursor, keys: newKeys } = yield client.scan(optCursor || 0, {
|
|
169
|
+
COUNT: count,
|
|
170
|
+
MATCH: `${storeKey}${storeDelimiter}${handle}`
|
|
171
|
+
});
|
|
172
|
+
cursor = newCursor;
|
|
173
|
+
if (getValues) {
|
|
174
|
+
for (const i in newKeys) {
|
|
175
|
+
const key = newKeys[i];
|
|
176
|
+
const value = yield client.get(key);
|
|
177
|
+
if (value === null) {
|
|
178
|
+
continue;
|
|
179
|
+
}
|
|
180
|
+
values.push({ field: key, value });
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
keys = keys.concat(newKeys);
|
|
185
|
+
}
|
|
126
186
|
}
|
|
127
187
|
}
|
|
128
188
|
if (parseToJSON) {
|
|
@@ -138,23 +198,43 @@ let RedisStoreService = class RedisStoreService {
|
|
|
138
198
|
else {
|
|
139
199
|
parsedValues = values.map(({ value }) => value);
|
|
140
200
|
}
|
|
141
|
-
return parsedValues;
|
|
201
|
+
return { cursor, values: parsedValues };
|
|
142
202
|
});
|
|
143
203
|
}
|
|
144
204
|
set(handle, entry, options) {
|
|
145
205
|
return __awaiter(this, void 0, void 0, function* () {
|
|
146
|
-
const { transactions } = this;
|
|
147
|
-
const { transactionId } = options || {};
|
|
206
|
+
const { client, defaultTTL, storeDelimiter, storeKey, transactions, useHashmap } = this;
|
|
207
|
+
const { transactionId, ttl } = options || {};
|
|
208
|
+
const actualTTL = ttl || defaultTTL;
|
|
148
209
|
const valueToSet = typeof entry !== 'string' ? JSON.stringify(entry) : entry;
|
|
149
210
|
if (transactionId) {
|
|
150
211
|
const transaction = transactions[transactionId];
|
|
151
212
|
if (!transaction) {
|
|
152
213
|
throw new core_1.ApplicationError(`[RedisStoreService][Error]: Transaction with id "${transactionId}" not found.`);
|
|
153
214
|
}
|
|
154
|
-
|
|
215
|
+
if (useHashmap) {
|
|
216
|
+
transactions[transactionId] = transaction.hSet(this.storeKey, handle, valueToSet);
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
const fullKey = `${storeKey}${storeDelimiter}${handle}`;
|
|
220
|
+
transactions[transactionId] = transaction.set(fullKey, valueToSet);
|
|
221
|
+
if (actualTTL) {
|
|
222
|
+
transactions[transactionId] = transactions[transactionId].expire(fullKey, actualTTL, 'NX');
|
|
223
|
+
}
|
|
224
|
+
}
|
|
155
225
|
return;
|
|
156
226
|
}
|
|
157
|
-
|
|
227
|
+
let result;
|
|
228
|
+
if (useHashmap) {
|
|
229
|
+
result = yield client.hSet(storeKey, handle, valueToSet);
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
const fullKey = `${storeKey}${storeDelimiter}${handle}`;
|
|
233
|
+
result = yield client.set(fullKey, valueToSet);
|
|
234
|
+
if (actualTTL) {
|
|
235
|
+
yield client.expire(fullKey, actualTTL, 'NX');
|
|
236
|
+
}
|
|
237
|
+
}
|
|
158
238
|
if (result !== 'OK' && result !== 1) {
|
|
159
239
|
throw new core_1.ApplicationError(`[RedisStoreService][Error]: Value not set for handle "${handle}". Result: ${result}`);
|
|
160
240
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.store.service.js","sourceRoot":"","sources":["../../src/store/redis.store.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,uCAMsB;AAEtB,iCAAsD;AACtD,+BAAkC;AAWlC,uDAAkD;AAI3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;
|
|
1
|
+
{"version":3,"file":"redis.store.service.js","sourceRoot":"","sources":["../../src/store/redis.store.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@node-c/persistance-redis",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-alpha4",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"@nestjs/common": "^10.4.9",
|
|
16
|
-
"@node-c/core": "^1.0.0-
|
|
16
|
+
"@node-c/core": "^1.0.0-alpha4",
|
|
17
17
|
"class-validator": "^0.14.1",
|
|
18
18
|
"immutable": "^5.1.0",
|
|
19
19
|
"ramda": "^0.30.1",
|