Export modular near (#117)

* Export modular near

* typo

* sync with main, add admin module

packages/common-near/CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Add alias `parseProjectManifest`, also follow type of `INetworkCommonModule` (#116)
+
 ## [3.5.0] - 2024-05-02
 ### Changed
 - Update dependencies and apply changes to match (#109)

packages/common-near/package.json

@@ -14,7 +14,7 @@
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "dependencies": {
-    "@subql/common": "^3.5.1",
+    "@subql/common": "^4.0.0",
     "@subql/types-near": "workspace:*",
     "js-yaml": "^4.1.0",
     "reflect-metadata": "^0.1.13"
@@ -24,7 +24,7 @@
     "class-validator": "*"
   },
   "devDependencies": {
-    "@types/bn.js": "4.11.6",
+    "@types/bn.js": "5.1.5",
     "@types/js-yaml": "^4.0.4",
     "@types/pino": "^6.3.12"
   }

packages/common-near/src/index.ts

@@ -2,3 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0
 
 export * from './project';
+
+import {INetworkCommonModule} from '@subql/types-core';
+import {NearDatasource, NearRuntimeDatasource, NearCustomDatasource} from '@subql/types-near';
+import * as p from './project';
+
+// This provides a compiled time check to ensure that the correct exports are provided
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const _ = {
+  ...p,
+} satisfies INetworkCommonModule<NearDatasource, NearRuntimeDatasource, NearCustomDatasource>;

packages/common-near/src/project/index.ts

@@ -6,3 +6,6 @@ export * from './models';
 export * from './types';
 export * from './utils';
 export * from './versioned';
+
+import {parseNearProjectManifest} from './load';
+export {parseNearProjectManifest as parseProjectManifest};

packages/common-near/src/project/versioned/v1_0_0/model.ts

@@ -27,7 +27,7 @@ const NEAR_NODE_NAME = `@subql/node-near`;
 
 export class NearRunnerNodeImpl extends RunnerNodeImpl {
   @Equals(NEAR_NODE_NAME, {message: `Runner Near node name incorrect, suppose be '${NEAR_NODE_NAME}'`})
-  name: string;
+  name: string = NEAR_NODE_NAME;
 }
 
 export class NearRuntimeDataSourceImpl extends RuntimeDataSourceBase implements NearRuntimeDatasource {
@@ -80,7 +80,7 @@ export class ProjectNetworkV1_0_0 extends CommonProjectNetworkV1_0_0<FileType> {
   @ValidateNested()
   @Type(() => FileType)
   @IsOptional()
-  chaintypes?: FileType;
+  chaintypes?: FileType = undefined;
 }
 
 export class DeploymentV1_0_0 extends BaseDeploymentV1_0_0 {
@@ -131,7 +131,7 @@ export class ProjectManifestV1_0_0Impl
   }
 
   @Equals('1.0.0')
-  specVersion: string;
+  specVersion = '1.0.0';
   @Type(() => NearCustomDataSourceImpl, {
     discriminator: {
       property: 'kind',

packages/node/CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Bump version with `@subql/common-near`, sync with `@subql/node-core`, add admin module
+
 ## [3.11.1] - 2024-05-02
 ### Fixed
 - Sandbox Uint8Array and missing pg dep issue

packages/node/Dockerfile

@@ -35,6 +35,10 @@ RUN rm /app.tgz && \
     yarn cache clean && \
     rm -rf /root/.npm /root/.cache
 
+# Create ./.monitor directory and set permissions
+RUN mkdir -p .monitor && \
+    chown 1000:1000 .monitor
+
 # Make the user not ROOT
 USER 1000
 

packages/node/package.json

@@ -24,9 +24,8 @@
     "@nestjs/event-emitter": "^2.0.0",
     "@nestjs/platform-express": "^9.4.0",
     "@nestjs/schedule": "^3.0.1",
-    "@subql/common": "^3.5.1",
     "@subql/common-near": "workspace:*",
-    "@subql/node-core": "^10.1.1",
+    "@subql/node-core": "^10.10.0",
     "@subql/types-near": "workspace:*",
     "lodash": "^4.17.21",
     "near-api-js": "^2.1.4",

packages/node/src/admin/admin.module.ts

@@ -0,0 +1,13 @@
+// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
+// SPDX-License-Identifier: GPL-3.0
+
+import { Module } from '@nestjs/common';
+import { adminControllers, adminServices } from '@subql/node-core';
+import { FetchModule } from '../indexer/fetch.module';
+
+@Module({
+  imports: [FetchModule],
+  controllers: [...adminControllers],
+  providers: [...adminServices],
+})
+export class AdminModule {}

packages/node/src/app.module.ts

@@ -5,6 +5,7 @@ import { Module } from '@nestjs/common';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { ScheduleModule } from '@nestjs/schedule';
 import { DbModule } from '@subql/node-core';
+import { AdminModule } from './admin/admin.module';
 import { ConfigureModule } from './configure/configure.module';
 import { FetchModule } from './indexer/fetch.module';
 import { MetaModule } from './meta/meta.module';
@@ -17,6 +18,7 @@ import { MetaModule } from './meta/meta.module';
     ScheduleModule.forRoot(),
     FetchModule,
     MetaModule,
+    AdminModule,
   ],
   controllers: [],
 })

packages/node/src/indexer/api.service.ts

@@ -12,6 +12,7 @@ import {
   ConnectionPoolService,
   ApiService as BaseApiService,
   IBlock,
+  exitWithError,
 } from '@subql/node-core';
 import * as Near from 'near-api-js';
 import {
@@ -57,8 +58,7 @@ export class ApiService extends BaseApiService<
     try {
       network = this.project.network;
     } catch (e) {
-      logger.error(e);
-      process.exit(1);
+      exitWithError(new Error(`Failed to init api`, { cause: e }), logger);
     }
 
     if (this.nodeConfig?.profiler) {

packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts

@@ -15,6 +15,7 @@ import {
   PoiSyncService,
   InMemoryCacheService,
   createIndexerWorker,
+  MonitorServiceInterface,
 } from '@subql/node-core';
 import { NearBlock, NearDatasource } from '@subql/types-near';
 import { SubqueryProject } from '../../configure/SubqueryProject';
@@ -47,6 +48,7 @@ export class WorkerBlockDispatcherService
     dynamicDsService: DynamicDsService,
     unfinalizedBlocksSevice: UnfinalizedBlocksService,
     connectionPoolState: ConnectionPoolStateManager<NearApiConnection>,
+    monitorService?: MonitorServiceInterface,
   ) {
     super(
       nodeConfig,
@@ -73,7 +75,9 @@ export class WorkerBlockDispatcherService
           connectionPoolState,
           project.root,
           projectService.startHeight,
+          monitorService,
         ),
+      monitorService,
     );
   }
 

packages/node/src/indexer/fetch.module.ts

@@ -16,6 +16,7 @@ import {
   PoiSyncService,
   InMemoryCacheService,
   SandboxService,
+  MonitorService,
 } from '@subql/node-core';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { ApiService } from './api.service';
@@ -58,6 +59,7 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
         dynamicDsService: DynamicDsService,
         unfinalizedBlocks: UnfinalizedBlocksService,
         connectionPoolState: ConnectionPoolStateManager<NearApiConnection>,
+        monitorService?: MonitorService,
       ) =>
         nodeConfig.workers
           ? new WorkerBlockDispatcherService(
@@ -73,6 +75,7 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
               dynamicDsService,
               unfinalizedBlocks,
               connectionPoolState,
+              monitorService,
             )
           : new BlockDispatcherService(
               apiService,
@@ -101,6 +104,7 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
         DynamicDsService,
         UnfinalizedBlocksService,
         ConnectionPoolStateManager,
+        MonitorService,
       ],
     },
     FetchService,
@@ -118,7 +122,8 @@ import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
       provide: 'IProjectService',
     },
     UnfinalizedBlocksService,
+    MonitorService,
   ],
-  exports: [StoreService, StoreCacheService],
+  exports: [StoreService, StoreCacheService, MonitorService, PoiService],
 })
 export class FetchModule {}

packages/node/src/indexer/worker/worker-fetch.module.ts

@@ -13,6 +13,8 @@ import {
   WorkerInMemoryCacheService,
   SandboxService,
   WorkerUnfinalizedBlocksService,
+  MonitorService,
+  WorkerMonitorService,
 } from '@subql/node-core';
 import { SubqueryProject } from '../../configure/SubqueryProject';
 import { ApiService } from '../api.service';
@@ -69,6 +71,10 @@ import { WorkerService } from '../worker/worker.service';
       useClass: ProjectService,
     },
     WorkerService,
+    {
+      provide: MonitorService,
+      useFactory: () => new WorkerMonitorService((global as any).host),
+    },
     {
       provide: UnfinalizedBlocksService,
       useFactory: () =>

packages/node/src/init.ts

@@ -2,7 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0
 
 import { NestFactory } from '@nestjs/core';
-import { getLogger, getValidPort, NestLogger } from '@subql/node-core';
+import {
+  exitWithError,
+  getLogger,
+  getValidPort,
+  NestLogger,
+} from '@subql/node-core';
 import { AppModule } from './app.module';
 import { ApiService } from './indexer/api.service';
 import { FetchService } from './indexer/fetch.service';
@@ -45,7 +50,6 @@ export async function bootstrap(): Promise<void> {
 
     logger.info(`Node started on port: ${port}`);
   } catch (e) {
-    logger.error(e, 'Node failed to start');
-    process.exit(1);
+    exitWithError(new Error('Node failed to start', { cause: e }), logger);
   }
 }

packages/node/src/subcommands/testing.init.ts

@@ -1,7 +1,7 @@
 // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 
-import { getLogger } from '@subql/node-core';
+import { getLogger, exitWithError } from '@subql/node-core';
 import { ConfigureModule } from '../configure/configure.module';
 import { TestingService } from './testing.service';
 
@@ -13,8 +13,7 @@ export async function testingInit(): Promise<void> {
     const testingService = new TestingService(nodeConfig, project);
     await testingService.run();
   } catch (e) {
-    logger.error(e, 'Testing failed');
-    process.exit(1);
+    exitWithError(new Error('Testing failed', { cause: e }), logger);
   }
   process.exit(0);
 }

packages/node/tsconfig.json

@@ -1,16 +1,12 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "es2017",
     "sourceMap": true,
     "tsBuildInfoFile": "dist/.tsbuildinfo",
     "rootDir": "src",
     "outDir": "./dist"
   },
-  "references": [
-    { "path": "../common-near" },
-    { "path": "../types" },
-  ],
+  "references": [{ "path": "../common-near" }, { "path": "../types" }],
   "include": ["src/**/*"],
   "exclude": ["node_modules", "test", "dist"]
 }

packages/types/CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Bump version with `@subql/types-core`
+
 ## [3.3.0] - 2024-05-02
 ### Changed
 - Update dependencies and apply changes to match (#109)

packages/types/package.json

@@ -17,7 +17,7 @@
     "/dist"
   ],
   "dependencies": {
-    "@subql/types-core": "^0.7.0",
+    "@subql/types-core": "^0.9.0",
     "bn.js": "5.2.1",
     "near-api-js": "^1.1.0"
   },

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2017",
+    "target": "es2022",
     "noImplicitAny": false,
     "noImplicitThis": true,
     "moduleResolution": "node",
@@ -11,7 +11,7 @@
     "experimentalDecorators": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "lib": ["ES2017", "ES2020"],
+    "lib": ["ES2022"],
     "emitDecoratorMetadata": true,
     "declaration": true,
     "sourceMap": true,