@lido-nestjs/registry 1.1.0 → 1.1.3

package/dist/main/abstract-registry.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { LoggerService } from '@nestjs/common';
 import { Registry } from '@lido-nestjs/contracts';
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager } from '@mikro-orm/knex';
 import EventEmitter from 'events';
 import { CronJob } from 'cron';
 import { RegistryMetaFetchService } from '../fetch/meta.fetch';
@@ -47,6 +47,8 @@ export declare abstract class AbstractRegistryService {
     getMetaDataFromStorage(): Promise<RegistryMeta | null>;
     /** returns the latest operators data from the db */
     getOperatorsFromStorage(): Promise<RegistryOperator[]>;
+    getOperatorsKeysFromStorage(): Promise<RegistryKey[]>;
+    save(updatedKeys: RegistryKey[], currentOperators: RegistryOperator[], currMeta: RegistryMeta): Promise<void>;
     /** clears the db */
     clear(): Promise<void>;
 }

package/dist/main/abstract-registry.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var common = require('@nestjs/common');
 var contracts = require('@lido-nestjs/contracts');
-var core = require('@mikro-orm/core');
+var knex = require('@mikro-orm/knex');
 var logger = require('@lido-nestjs/logger');
 var decorators = require('@lido-nestjs/decorators');
 var EventEmitter = require('events');
@@ -85,7 +85,10 @@ exports.AbstractRegistryService = class AbstractRegistryService {
         }
         if (isSameContractState) {
             (_c = (_b = this.logger).debug) === null || _c === void 0 ? void 0 : _c.call(_b, 'Same state, no data update required', { currMeta });
-            await this.metaStorage.save(currMeta);
+            await this.entityManager.transactional(async (entityManager) => {
+                await entityManager.nativeDelete(meta_entity.RegistryMeta, {});
+                await entityManager.persist(new meta_entity.RegistryMeta(currMeta));
+            });
             (_e = (_d = this.logger).debug) === null || _e === void 0 ? void 0 : _e.call(_d, 'Updated metadata in the DB', { currMeta });
             return;
         }
@@ -100,19 +103,7 @@ exports.AbstractRegistryService = class AbstractRegistryService {
         this.logger.log('Fetched updated keys', {
             updatedKeys: updatedKeys.length,
         });
-        // save all data in a transaction
-        await this.entityManager.transactional(async (entityManager) => {
-            updatedKeys.forEach(async (operatorKey) => {
-                const instance = new key_entity.RegistryKey(operatorKey);
-                entityManager.persist(instance);
-            });
-            currentOperators.forEach(async (operator) => {
-                const instance = new operator_entity.RegistryOperator(operator);
-                entityManager.persist(instance);
-            });
-            const meta = new meta_entity.RegistryMeta(currMeta);
-            entityManager.persist(meta);
-        });
+        await this.save(updatedKeys, currentOperators, currMeta);
         this.logger.log('Saved data to the DB', {
             operators: currentOperators.length,
             updatedKeys: updatedKeys.length,
@@ -180,6 +171,28 @@ exports.AbstractRegistryService = class AbstractRegistryService {
     async getOperatorsFromStorage() {
         return await this.operatorStorage.findAll();
     }
+    async getOperatorsKeysFromStorage() {
+        return await this.keyStorage.findAll();
+    }
+    async save(updatedKeys, currentOperators, currMeta) {
+        // save all data in a transaction
+        await this.entityManager.transactional(async (entityManager) => {
+            await entityManager
+                .createQueryBuilder(key_entity.RegistryKey)
+                .insert(updatedKeys)
+                .onConflict(['index', 'operator_index'])
+                .merge()
+                .execute();
+            await entityManager
+                .createQueryBuilder(operator_entity.RegistryOperator)
+                .insert(currentOperators)
+                .onConflict('index')
+                .merge()
+                .execute();
+            await entityManager.nativeDelete(meta_entity.RegistryMeta, {});
+            await entityManager.persist(new meta_entity.RegistryMeta(currMeta));
+        });
+    }
     /** clears the db */
     async clear() {
         await this.entityManager.transactional(async (entityManager) => {
@@ -207,5 +220,5 @@ exports.AbstractRegistryService = tslib.__decorate([
         key_storage.RegistryKeyStorageService,
         operator_fetch.RegistryOperatorFetchService,
         operator_storage.RegistryOperatorStorageService,
-        core.EntityManager, Object])
+        knex.EntityManager, Object])
 ], exports.AbstractRegistryService);

package/dist/main/key-registry/key-registry.module.js

@@ -30,6 +30,7 @@ exports.KeyRegistryModule = KeyRegistryModule_1 = class KeyRegistryModule {
                     useValue: options,
                 },
             ],
+            exports: [registryFetch_module.RegistryFetchModule],
         };
     }
     static forFeatureAsync(options) {
@@ -45,6 +46,7 @@ exports.KeyRegistryModule = KeyRegistryModule_1 = class KeyRegistryModule {
                     useFactory: options.useFactory,
                 },
             ],
+            exports: [registryFetch_module.RegistryFetchModule],
         };
     }
 };
@@ -52,6 +54,6 @@ exports.KeyRegistryModule = KeyRegistryModule_1 = tslib.__decorate([
     common.Module({
         imports: [registryStorage_module.RegistryStorageModule],
         providers: [keyRegistry_service.KeyRegistryService],
-        exports: [keyRegistry_service.KeyRegistryService],
+        exports: [keyRegistry_service.KeyRegistryService, registryStorage_module.RegistryStorageModule],
     })
 ], exports.KeyRegistryModule);

package/dist/main/validator-registry/validator-registry.module.js

@@ -30,6 +30,7 @@ exports.ValidatorRegistryModule = ValidatorRegistryModule_1 = class ValidatorReg
                     useValue: options,
                 },
             ],
+            exports: [registryFetch_module.RegistryFetchModule],
         };
     }
     static forFeatureAsync(options) {
@@ -45,6 +46,7 @@ exports.ValidatorRegistryModule = ValidatorRegistryModule_1 = class ValidatorReg
                     useFactory: options.useFactory,
                 },
             ],
+            exports: [registryFetch_module.RegistryFetchModule],
         };
     }
 };
@@ -52,6 +54,6 @@ exports.ValidatorRegistryModule = ValidatorRegistryModule_1 = tslib.__decorate([
     common.Module({
         imports: [registryStorage_module.RegistryStorageModule],
         providers: [validatorRegistry_service.ValidatorRegistryService],
-        exports: [validatorRegistry_service.ValidatorRegistryService],
+        exports: [validatorRegistry_service.ValidatorRegistryService, registryStorage_module.RegistryStorageModule],
     })
 ], exports.ValidatorRegistryModule);

package/dist/storage/key.repository.d.ts

@@ -1,4 +1,4 @@
-import { EntityRepository } from '@mikro-orm/core';
+import { EntityRepository } from '@mikro-orm/knex';
 import { RegistryKey } from './key.entity';
 export declare class RegistryKeyRepository extends EntityRepository<RegistryKey> {
 }

package/dist/storage/key.repository.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var core = require('@mikro-orm/core');
+var knex = require('@mikro-orm/knex');
 
-class RegistryKeyRepository extends core.EntityRepository {
+class RegistryKeyRepository extends knex.EntityRepository {
 }
 
 exports.RegistryKeyRepository = RegistryKeyRepository;

package/dist/storage/meta.repository.d.ts

@@ -1,4 +1,4 @@
-import { EntityRepository } from '@mikro-orm/core';
+import { EntityRepository } from '@mikro-orm/knex';
 import { RegistryMeta } from './meta.entity';
 export declare class RegistryMetaRepository extends EntityRepository<RegistryMeta> {
 }

package/dist/storage/meta.repository.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var core = require('@mikro-orm/core');
+var knex = require('@mikro-orm/knex');
 
-class RegistryMetaRepository extends core.EntityRepository {
+class RegistryMetaRepository extends knex.EntityRepository {
 }
 
 exports.RegistryMetaRepository = RegistryMetaRepository;

package/dist/storage/operator.repository.d.ts

@@ -1,4 +1,4 @@
-import { EntityRepository } from '@mikro-orm/core';
+import { EntityRepository } from '@mikro-orm/knex';
 import { RegistryOperator } from './operator.entity';
 export declare class RegistryOperatorRepository extends EntityRepository<RegistryOperator> {
 }

package/dist/storage/operator.repository.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var core = require('@mikro-orm/core');
+var knex = require('@mikro-orm/knex');
 
-class RegistryOperatorRepository extends core.EntityRepository {
+class RegistryOperatorRepository extends knex.EntityRepository {
 }
 
 exports.RegistryOperatorRepository = RegistryOperatorRepository;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lido-nestjs/registry",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
@@ -36,6 +36,7 @@
   },
   "peerDependencies": {
     "@mikro-orm/core": "^5.2.0",
+    "@mikro-orm/knex": "^5.2.0",
     "@mikro-orm/nestjs": "^5.0.2",
     "@nestjs/common": "^8.2.5",
     "@nestjs/core": "^8.2.5",
@@ -46,6 +47,7 @@
   "devDependencies": {
     "@lido-nestjs/execution": "1.7.0",
     "@mikro-orm/core": "^5.2.0",
+    "@mikro-orm/knex": "^5.2.0",
     "@mikro-orm/nestjs": "^5.0.2",
     "@mikro-orm/sqlite": "^5.2.0",
     "@nestjs/common": "^8.2.5",