@opra/nestjs 1.0.0-beta.4 → 1.0.0-beta.6

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.
Files changed (35) hide show
  1. package/cjs/base-nestjs-adapter.js +15 -0
  2. package/cjs/constants.js +3 -3
  3. package/cjs/http/opra-http-core.module.js +71 -37
  4. package/cjs/http/opra-http-nestjs-adapter.js +9 -16
  5. package/cjs/http/opra-http.module.js +10 -0
  6. package/cjs/http/services/opra-middleware.js +2 -5
  7. package/cjs/index.js +2 -2
  8. package/cjs/kafka/opra-kafka-core.module.js +107 -0
  9. package/cjs/{rpc/kafka → kafka}/opra-kafka-nestjs-adapter.js +17 -15
  10. package/cjs/{rpc/kafka → kafka}/opra-kafka.module.js +13 -3
  11. package/esm/base-nestjs-adapter.js +11 -0
  12. package/esm/constants.js +2 -2
  13. package/esm/http/opra-http-core.module.js +73 -39
  14. package/esm/http/opra-http-nestjs-adapter.js +9 -16
  15. package/esm/http/opra-http.module.js +10 -0
  16. package/esm/http/services/opra-middleware.js +4 -7
  17. package/esm/index.js +2 -2
  18. package/esm/kafka/opra-kafka-core.module.js +104 -0
  19. package/esm/{rpc/kafka → kafka}/opra-kafka-nestjs-adapter.js +17 -15
  20. package/esm/{rpc/kafka → kafka}/opra-kafka.module.js +13 -3
  21. package/package.json +5 -5
  22. package/types/base-nestjs-adapter.d.ts +5 -0
  23. package/types/constants.d.ts +2 -2
  24. package/types/http/opra-http-core.module.d.ts +3 -1
  25. package/types/http/opra-http-nestjs-adapter.d.ts +5 -4
  26. package/types/http/opra-http.module.d.ts +21 -8
  27. package/types/http/services/opra-middleware.d.ts +1 -3
  28. package/types/index.d.cts +2 -2
  29. package/types/index.d.ts +2 -2
  30. package/types/{rpc/kafka → kafka}/opra-kafka-core.module.d.ts +5 -3
  31. package/types/{rpc/kafka → kafka}/opra-kafka-nestjs-adapter.d.ts +3 -3
  32. package/types/kafka/opra-kafka.module.d.ts +33 -0
  33. package/cjs/rpc/kafka/opra-kafka-core.module.js +0 -60
  34. package/esm/rpc/kafka/opra-kafka-core.module.js +0 -57
  35. package/types/rpc/kafka/opra-kafka.module.d.ts +0 -21
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.BaseNestAdapter = void 0;
4
+ // import { Injector } from '@nestjs/core/injector/injector';
5
+ // import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
6
+ // import { Module } from '@nestjs/core/injector/module';
7
+ // import { REQUEST_CONTEXT_ID } from '@nestjs/core/router/request/request-constants';
8
+ // import { BaseRpcContext, PatternMetadata } from '@nestjs/microservices';
9
+ // import { RequestContextHost } from '@nestjs/microservices/context/request-context-host';
10
+ class BaseNestAdapter {
11
+ constructor(moduleRef) {
12
+ this.moduleRef = moduleRef;
13
+ }
14
+ }
15
+ exports.BaseNestAdapter = BaseNestAdapter;
package/cjs/constants.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.OPRA_KAFKA_MODULE_OPTIONS = exports.OPRA_HTTP_MODULE_OPTIONS = exports.IS_PUBLIC_KEY = void 0;
3
+ exports.OPRA_KAFKA_MODULE_CONFIG = exports.OPRA_HTTP_API_CONFIG = exports.IS_PUBLIC_KEY = void 0;
4
4
  exports.IS_PUBLIC_KEY = 'opra:isPublic';
5
- exports.OPRA_HTTP_MODULE_OPTIONS = 'OPRA_HTTP_MODULE_OPTIONS';
6
- exports.OPRA_KAFKA_MODULE_OPTIONS = 'OPRA_KAFKA_MODULE_OPTIONS';
5
+ exports.OPRA_HTTP_API_CONFIG = 'OPRA_HTTP_API_CONFIG';
6
+ exports.OPRA_KAFKA_MODULE_CONFIG = 'OPRA_KAFKA_MODULE_CONFIG';
@@ -11,6 +11,7 @@ const constants_js_1 = require("../constants.js");
11
11
  const opra_http_nestjs_adapter_js_1 = require("./opra-http-nestjs-adapter.js");
12
12
  const opra_exception_filter_js_1 = require("./services/opra-exception-filter.js");
13
13
  const opra_middleware_js_1 = require("./services/opra-middleware.js");
14
+ const opraHttpNestjsAdapterToken = Symbol('OpraHttpNestjsAdapter');
14
15
  let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
15
16
  constructor(opraAdapter) {
16
17
  this.opraAdapter = opraAdapter;
@@ -21,53 +22,86 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
21
22
  method: common_1.RequestMethod.ALL,
22
23
  });
23
24
  }
24
- static forRoot(init) {
25
- const opraAdapter = new opra_http_nestjs_adapter_js_1.OpraHttpNestjsAdapter(init);
26
- const token = init?.id || opra_http_nestjs_adapter_js_1.OpraHttpNestjsAdapter;
27
- const providers = [
28
- ...(init?.providers || []),
29
- {
30
- provide: constants_js_1.OPRA_HTTP_MODULE_OPTIONS,
31
- useValue: { ...init.options },
32
- },
33
- {
34
- provide: token,
35
- inject: [core_1.ModuleRef],
36
- useFactory: async (moduleRef) => {
37
- (0, ts_gems_1.asMutable)(opraAdapter).document = await common_2.ApiDocumentFactory.createDocument({
38
- ...init,
39
- api: { transport: 'http', name: init.name, controllers: init.controllers },
40
- });
41
- opraAdapter.interceptors.map(x => {
25
+ static forRoot(moduleOptions) {
26
+ return this._getDynamicModule({
27
+ ...moduleOptions,
28
+ providers: [
29
+ ...(moduleOptions?.providers || []),
30
+ {
31
+ provide: constants_js_1.OPRA_HTTP_API_CONFIG,
32
+ useValue: { ...moduleOptions },
33
+ },
34
+ ],
35
+ });
36
+ }
37
+ static forRootAsync(moduleOptions) {
38
+ if (!moduleOptions.useFactory)
39
+ throw new Error('Invalid configuration. Must provide "useFactory"');
40
+ return this._getDynamicModule({
41
+ ...moduleOptions,
42
+ providers: [
43
+ ...(moduleOptions?.providers || []),
44
+ {
45
+ provide: constants_js_1.OPRA_HTTP_API_CONFIG,
46
+ inject: moduleOptions.inject,
47
+ useFactory: moduleOptions.useFactory,
48
+ },
49
+ ],
50
+ });
51
+ }
52
+ static _getDynamicModule(moduleOptions) {
53
+ const token = moduleOptions?.token || opra_http_nestjs_adapter_js_1.OpraHttpNestjsAdapter;
54
+ const opraNestAdapter = new opra_http_nestjs_adapter_js_1.OpraHttpNestjsAdapter({
55
+ ...moduleOptions,
56
+ interceptors: undefined,
57
+ });
58
+ const adapterProvider = {
59
+ provide: token,
60
+ inject: [core_1.ModuleRef, constants_js_1.OPRA_HTTP_API_CONFIG],
61
+ useFactory: async (moduleRef, apiConfig) => {
62
+ opraNestAdapter.logger = opraNestAdapter.logger || new common_1.Logger(apiConfig.name);
63
+ (0, ts_gems_1.asMutable)(opraNestAdapter).document = await common_2.ApiDocumentFactory.createDocument({
64
+ ...apiConfig,
65
+ api: {
66
+ transport: 'http',
67
+ name: apiConfig.name,
68
+ description: apiConfig.description,
69
+ controllers: moduleOptions.controllers,
70
+ },
71
+ });
72
+ if (moduleOptions.interceptors) {
73
+ opraNestAdapter.interceptors = moduleOptions.interceptors.map(x => {
42
74
  if ((0, common_2.isConstructor)(x)) {
43
- return (ctx, next) => {
75
+ return async (ctx, next) => {
44
76
  const interceptor = moduleRef.get(x);
45
77
  if (typeof interceptor.intercept === 'function')
46
- return interceptor.intercept(ctx, next());
78
+ return interceptor.intercept(ctx, next);
47
79
  };
48
80
  }
49
81
  return x;
50
82
  });
51
- return opraAdapter;
52
- },
53
- },
54
- {
55
- provide: core_1.APP_FILTER,
56
- useClass: opra_exception_filter_js_1.OpraExceptionFilter,
83
+ }
84
+ return opraNestAdapter;
57
85
  },
58
- ];
59
- if (token !== opra_http_nestjs_adapter_js_1.OpraHttpNestjsAdapter) {
60
- providers.push({
61
- provide: token,
62
- useValue: opraAdapter,
63
- });
64
- }
86
+ };
65
87
  return {
88
+ global: moduleOptions.global,
66
89
  module: OpraHttpCoreModule_1,
67
- controllers: opraAdapter.nestControllers,
68
- imports: [...(init?.imports || [])],
69
- exports: [...(init?.exports || []), token],
70
- providers,
90
+ controllers: opraNestAdapter.nestControllers,
91
+ providers: [
92
+ ...(moduleOptions?.providers || []),
93
+ adapterProvider,
94
+ {
95
+ provide: opraHttpNestjsAdapterToken,
96
+ useExisting: token,
97
+ },
98
+ {
99
+ provide: core_1.APP_FILTER,
100
+ useClass: opra_exception_filter_js_1.OpraExceptionFilter,
101
+ },
102
+ ],
103
+ imports: [...(moduleOptions?.imports || [])],
104
+ exports: [...(moduleOptions?.exports || []), adapterProvider],
71
105
  };
72
106
  }
73
107
  async onModuleDestroy() {
@@ -10,28 +10,21 @@ const http_1 = require("@opra/http");
10
10
  const ts_gems_1 = require("ts-gems");
11
11
  const public_decorator_js_1 = require("../decorators/public.decorator.js");
12
12
  class OpraHttpNestjsAdapter extends http_1.HttpAdapter {
13
- constructor(init) {
13
+ constructor(options) {
14
14
  super((function () {
15
15
  const document = new common_2.ApiDocument();
16
- document.api = new common_2.HttpApi({ owner: document, name: init.name, transport: 'http' });
16
+ document.api = new common_2.HttpApi({ owner: document, name: '', transport: 'http' });
17
17
  return document;
18
- })(), {
19
- ...init.options,
20
- interceptors: init.options?.interceptors,
21
- });
18
+ })(), options);
22
19
  this.nestControllers = [];
23
- this.options = init.options;
24
- let basePath = init.options?.basePath || '/';
25
- if (!basePath.startsWith('/'))
26
- basePath = '/' + basePath;
27
- this._addRootController(basePath);
28
- if (init.controllers)
29
- init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
20
+ this._addRootController(options.schemaIsPublic);
21
+ if (options.controllers)
22
+ options.controllers.forEach(c => this._addToNestControllers(c, this.basePath, []));
30
23
  }
31
24
  async close() {
32
25
  //
33
26
  }
34
- _addRootController(basePath) {
27
+ _addRootController(isPublic) {
35
28
  const _this = this;
36
29
  let RootController = class RootController {
37
30
  schema(_req, next) {
@@ -48,10 +41,10 @@ class OpraHttpNestjsAdapter extends http_1.HttpAdapter {
48
41
  ], RootController.prototype, "schema", null);
49
42
  RootController = tslib_1.__decorate([
50
43
  (0, common_1.Controller)({
51
- path: basePath,
44
+ path: this.basePath,
52
45
  })
53
46
  ], RootController);
54
- if (this.options?.schemaRouteIsPublic) {
47
+ if (isPublic) {
55
48
  (0, public_decorator_js_1.Public)()(RootController.prototype, 'schema', Object.getOwnPropertyDescriptor(RootController.prototype, 'schema'));
56
49
  }
57
50
  this.nestControllers.push(RootController);
@@ -16,6 +16,16 @@ let OpraHttpModule = OpraHttpModule_1 = class OpraHttpModule {
16
16
  imports: [opra_http_core_module_js_1.OpraHttpCoreModule.forRoot(init)],
17
17
  };
18
18
  }
19
+ /**
20
+ *
21
+ * @param options
22
+ */
23
+ static forRootAsync(options) {
24
+ return {
25
+ module: OpraHttpModule_1,
26
+ imports: [opra_http_core_module_js_1.OpraHttpCoreModule.forRootAsync(options)],
27
+ };
28
+ }
19
29
  };
20
30
  exports.OpraHttpModule = OpraHttpModule;
21
31
  exports.OpraHttpModule = OpraHttpModule = OpraHttpModule_1 = tslib_1.__decorate([
@@ -4,12 +4,10 @@ exports.OpraMiddleware = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const common_1 = require("@nestjs/common");
6
6
  const http_1 = require("@opra/http");
7
- const constants_js_1 = require("../../constants.js");
8
7
  const opra_http_nestjs_adapter_js_1 = require("../opra-http-nestjs-adapter.js");
9
8
  let OpraMiddleware = class OpraMiddleware {
10
- constructor(opraAdapter, options) {
9
+ constructor(opraAdapter) {
11
10
  this.opraAdapter = opraAdapter;
12
- this.options = options;
13
11
  }
14
12
  use(req, res, next) {
15
13
  const request = http_1.HttpIncoming.from(req);
@@ -31,6 +29,5 @@ let OpraMiddleware = class OpraMiddleware {
31
29
  exports.OpraMiddleware = OpraMiddleware;
32
30
  exports.OpraMiddleware = OpraMiddleware = tslib_1.__decorate([
33
31
  (0, common_1.Injectable)(),
34
- tslib_1.__param(1, (0, common_1.Inject)(constants_js_1.OPRA_HTTP_MODULE_OPTIONS)),
35
- tslib_1.__metadata("design:paramtypes", [opra_http_nestjs_adapter_js_1.OpraHttpNestjsAdapter, Object])
32
+ tslib_1.__metadata("design:paramtypes", [opra_http_nestjs_adapter_js_1.OpraHttpNestjsAdapter])
36
33
  ], OpraMiddleware);
package/cjs/index.js CHANGED
@@ -7,5 +7,5 @@ tslib_1.__exportStar(require("./constants.js"), exports);
7
7
  tslib_1.__exportStar(require("./decorators/public.decorator.js"), exports);
8
8
  tslib_1.__exportStar(require("./http/opra-http.module.js"), exports);
9
9
  tslib_1.__exportStar(require("./http/opra-http-nestjs-adapter.js"), exports);
10
- tslib_1.__exportStar(require("./rpc/kafka/opra-kafka.module.js"), exports);
11
- tslib_1.__exportStar(require("./rpc/kafka/opra-kafka-nestjs-adapter.js"), exports);
10
+ tslib_1.__exportStar(require("./kafka/opra-kafka.module.js"), exports);
11
+ tslib_1.__exportStar(require("./kafka/opra-kafka-nestjs-adapter.js"), exports);
@@ -0,0 +1,107 @@
1
+ "use strict";
2
+ var OpraKafkaCoreModule_1;
3
+ Object.defineProperty(exports, "__esModule", { value: true });
4
+ exports.OpraKafkaCoreModule = void 0;
5
+ const tslib_1 = require("tslib");
6
+ const common_1 = require("@nestjs/common");
7
+ const core_1 = require("@nestjs/core");
8
+ const common_2 = require("@opra/common");
9
+ const constants_js_1 = require("../constants.js");
10
+ const opra_kafka_nestjs_adapter_js_1 = require("./opra-kafka-nestjs-adapter.js");
11
+ const opraKafkaNestjsAdapterToken = Symbol('OpraKafkaNestjsAdapter');
12
+ let OpraKafkaCoreModule = OpraKafkaCoreModule_1 = class OpraKafkaCoreModule {
13
+ constructor(adapter, init) {
14
+ this.adapter = adapter;
15
+ this.init = init;
16
+ }
17
+ static forRoot(moduleOptions) {
18
+ return this._getDynamicModule({
19
+ ...moduleOptions,
20
+ providers: [
21
+ ...(moduleOptions?.providers || []),
22
+ {
23
+ provide: constants_js_1.OPRA_KAFKA_MODULE_CONFIG,
24
+ useValue: {
25
+ ...moduleOptions,
26
+ logger: moduleOptions.logger || new common_1.Logger(moduleOptions.name),
27
+ },
28
+ },
29
+ ],
30
+ });
31
+ }
32
+ static forRootAsync(moduleOptions) {
33
+ if (!moduleOptions.useFactory)
34
+ throw new Error('Invalid configuration. Must provide "useFactory"');
35
+ return this._getDynamicModule({
36
+ ...moduleOptions,
37
+ providers: [
38
+ ...(moduleOptions?.providers || []),
39
+ {
40
+ provide: constants_js_1.OPRA_KAFKA_MODULE_CONFIG,
41
+ inject: moduleOptions.inject,
42
+ useFactory: async (...args) => {
43
+ const result = await moduleOptions.useFactory(...args);
44
+ result.logger = result.logger || new common_1.Logger(result.name);
45
+ return result;
46
+ },
47
+ },
48
+ ],
49
+ });
50
+ }
51
+ static _getDynamicModule(moduleOptions) {
52
+ const token = moduleOptions.id || opra_kafka_nestjs_adapter_js_1.OpraKafkaNestjsAdapter;
53
+ const adapterProvider = {
54
+ provide: token,
55
+ inject: [core_1.ModuleRef, constants_js_1.OPRA_KAFKA_MODULE_CONFIG],
56
+ useFactory: async (moduleRef, config) => {
57
+ const adapter = new opra_kafka_nestjs_adapter_js_1.OpraKafkaNestjsAdapter(moduleRef);
58
+ await adapter.initialize(config);
59
+ if (moduleOptions.interceptors) {
60
+ adapter.adapter.interceptors = moduleOptions.interceptors.map(x => {
61
+ if ((0, common_2.isConstructor)(x)) {
62
+ return async (ctx, next) => {
63
+ const interceptor = moduleRef.get(x);
64
+ if (typeof interceptor.intercept === 'function')
65
+ return interceptor.intercept(ctx, next);
66
+ };
67
+ }
68
+ return x;
69
+ });
70
+ }
71
+ return adapter;
72
+ },
73
+ };
74
+ return {
75
+ global: moduleOptions.global,
76
+ module: OpraKafkaCoreModule_1,
77
+ controllers: moduleOptions.controllers,
78
+ providers: [
79
+ ...(moduleOptions?.providers || []),
80
+ adapterProvider,
81
+ {
82
+ provide: opraKafkaNestjsAdapterToken,
83
+ useExisting: token,
84
+ },
85
+ ],
86
+ imports: [...(moduleOptions?.imports || [])],
87
+ exports: [...(moduleOptions?.exports || []), adapterProvider],
88
+ };
89
+ }
90
+ async onModuleInit() {
91
+ await this.adapter.initialize(this.init);
92
+ }
93
+ async onApplicationBootstrap() {
94
+ await this.adapter.start();
95
+ }
96
+ async onApplicationShutdown() {
97
+ await this.adapter.stop();
98
+ }
99
+ };
100
+ exports.OpraKafkaCoreModule = OpraKafkaCoreModule;
101
+ exports.OpraKafkaCoreModule = OpraKafkaCoreModule = OpraKafkaCoreModule_1 = tslib_1.__decorate([
102
+ (0, common_1.Module)({}),
103
+ (0, common_1.Global)(),
104
+ tslib_1.__param(0, (0, common_1.Inject)(opraKafkaNestjsAdapterToken)),
105
+ tslib_1.__param(1, (0, common_1.Inject)(constants_js_1.OPRA_KAFKA_MODULE_CONFIG)),
106
+ tslib_1.__metadata("design:paramtypes", [opra_kafka_nestjs_adapter_js_1.OpraKafkaNestjsAdapter, Object])
107
+ ], OpraKafkaCoreModule);
@@ -4,12 +4,13 @@ exports.OpraKafkaNestjsAdapter = void 0;
4
4
  const index_1 = require("@nestjs/core/errors/exceptions/index");
5
5
  const common_1 = require("@opra/common");
6
6
  const kafka_1 = require("@opra/kafka");
7
+ const base_nestjs_adapter_js_1 = require("../base-nestjs-adapter.js");
7
8
  /**
8
9
  * @class
9
10
  */
10
- class OpraKafkaNestjsAdapter {
11
+ class OpraKafkaNestjsAdapter extends base_nestjs_adapter_js_1.BaseNestAdapter {
11
12
  constructor(moduleRef) {
12
- this.moduleRef = moduleRef;
13
+ super(moduleRef);
13
14
  }
14
15
  get document() {
15
16
  if (!this._document)
@@ -55,25 +56,26 @@ class OpraKafkaNestjsAdapter {
55
56
  _scanControllers() {
56
57
  const container = this.moduleRef.container;
57
58
  const modules = container.getModules();
58
- const controllerInstances = [];
59
+ const out = [];
59
60
  modules.forEach(({ controllers }) => {
60
61
  controllers.forEach(wrapper => {
61
62
  const ctor = Object.getPrototypeOf(wrapper.instance).constructor;
62
63
  const metadata = Reflect.getMetadata(common_1.RPC_CONTROLLER_METADATA, ctor);
63
- if (metadata) {
64
- const instance = {};
65
- Object.setPrototypeOf(instance, wrapper.instance);
66
- controllerInstances.push(instance);
67
- if (metadata.operations) {
68
- // for (const [k, _] of Object.keys(metadata.operations)) {
69
- // const fn = instance[k];
70
- // instance[k] = fn;
71
- // }
72
- }
73
- }
64
+ if (!metadata)
65
+ return;
66
+ const instance = {};
67
+ Object.setPrototypeOf(instance, wrapper.instance);
68
+ out.push(wrapper.instance);
69
+ // if (metadata.operations) {
70
+ // for (const [k, _] of Object.keys(metadata.operations)) {
71
+ // const isRequestScoped = !wrapper.isDependencyTreeStatic();
72
+ // // const fn = instance[k];
73
+ // // instance[k] = fn;
74
+ // }
75
+ // }
74
76
  });
75
77
  });
76
- return controllerInstances;
78
+ return out;
77
79
  }
78
80
  }
79
81
  exports.OpraKafkaNestjsAdapter = OpraKafkaNestjsAdapter;
@@ -8,12 +8,22 @@ const opra_kafka_core_module_js_1 = require("./opra-kafka-core.module.js");
8
8
  let OpraKafkaModule = OpraKafkaModule_1 = class OpraKafkaModule {
9
9
  /**
10
10
  *
11
- * @param init
11
+ * @param options
12
12
  */
13
- static forRoot(init) {
13
+ static forRoot(options) {
14
14
  return {
15
15
  module: OpraKafkaModule_1,
16
- imports: [opra_kafka_core_module_js_1.OpraKafkaCoreModule.forRoot(init)],
16
+ imports: [opra_kafka_core_module_js_1.OpraKafkaCoreModule.forRoot(options)],
17
+ };
18
+ }
19
+ /**
20
+ *
21
+ * @param options
22
+ */
23
+ static forRootAsync(options) {
24
+ return {
25
+ module: OpraKafkaModule_1,
26
+ imports: [opra_kafka_core_module_js_1.OpraKafkaCoreModule.forRootAsync(options)],
17
27
  };
18
28
  }
19
29
  };
@@ -0,0 +1,11 @@
1
+ // import { Injector } from '@nestjs/core/injector/injector';
2
+ // import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
3
+ // import { Module } from '@nestjs/core/injector/module';
4
+ // import { REQUEST_CONTEXT_ID } from '@nestjs/core/router/request/request-constants';
5
+ // import { BaseRpcContext, PatternMetadata } from '@nestjs/microservices';
6
+ // import { RequestContextHost } from '@nestjs/microservices/context/request-context-host';
7
+ export class BaseNestAdapter {
8
+ constructor(moduleRef) {
9
+ this.moduleRef = moduleRef;
10
+ }
11
+ }
package/esm/constants.js CHANGED
@@ -1,3 +1,3 @@
1
1
  export const IS_PUBLIC_KEY = 'opra:isPublic';
2
- export const OPRA_HTTP_MODULE_OPTIONS = 'OPRA_HTTP_MODULE_OPTIONS';
3
- export const OPRA_KAFKA_MODULE_OPTIONS = 'OPRA_KAFKA_MODULE_OPTIONS';
2
+ export const OPRA_HTTP_API_CONFIG = 'OPRA_HTTP_API_CONFIG';
3
+ export const OPRA_KAFKA_MODULE_CONFIG = 'OPRA_KAFKA_MODULE_CONFIG';
@@ -1,13 +1,14 @@
1
1
  var OpraHttpCoreModule_1;
2
2
  import { __decorate, __metadata } from "tslib";
3
- import { Global, Module, RequestMethod, } from '@nestjs/common';
3
+ import { Global, Logger, Module, RequestMethod, } from '@nestjs/common';
4
4
  import { APP_FILTER, ModuleRef } from '@nestjs/core';
5
5
  import { ApiDocumentFactory, isConstructor } from '@opra/common';
6
6
  import { asMutable } from 'ts-gems';
7
- import { OPRA_HTTP_MODULE_OPTIONS } from '../constants.js';
7
+ import { OPRA_HTTP_API_CONFIG } from '../constants.js';
8
8
  import { OpraHttpNestjsAdapter } from './opra-http-nestjs-adapter.js';
9
9
  import { OpraExceptionFilter } from './services/opra-exception-filter.js';
10
10
  import { OpraMiddleware } from './services/opra-middleware.js';
11
+ const opraHttpNestjsAdapterToken = Symbol('OpraHttpNestjsAdapter');
11
12
  let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
12
13
  constructor(opraAdapter) {
13
14
  this.opraAdapter = opraAdapter;
@@ -18,53 +19,86 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
18
19
  method: RequestMethod.ALL,
19
20
  });
20
21
  }
21
- static forRoot(init) {
22
- const opraAdapter = new OpraHttpNestjsAdapter(init);
23
- const token = init?.id || OpraHttpNestjsAdapter;
24
- const providers = [
25
- ...(init?.providers || []),
26
- {
27
- provide: OPRA_HTTP_MODULE_OPTIONS,
28
- useValue: { ...init.options },
29
- },
30
- {
31
- provide: token,
32
- inject: [ModuleRef],
33
- useFactory: async (moduleRef) => {
34
- asMutable(opraAdapter).document = await ApiDocumentFactory.createDocument({
35
- ...init,
36
- api: { transport: 'http', name: init.name, controllers: init.controllers },
37
- });
38
- opraAdapter.interceptors.map(x => {
22
+ static forRoot(moduleOptions) {
23
+ return this._getDynamicModule({
24
+ ...moduleOptions,
25
+ providers: [
26
+ ...(moduleOptions?.providers || []),
27
+ {
28
+ provide: OPRA_HTTP_API_CONFIG,
29
+ useValue: { ...moduleOptions },
30
+ },
31
+ ],
32
+ });
33
+ }
34
+ static forRootAsync(moduleOptions) {
35
+ if (!moduleOptions.useFactory)
36
+ throw new Error('Invalid configuration. Must provide "useFactory"');
37
+ return this._getDynamicModule({
38
+ ...moduleOptions,
39
+ providers: [
40
+ ...(moduleOptions?.providers || []),
41
+ {
42
+ provide: OPRA_HTTP_API_CONFIG,
43
+ inject: moduleOptions.inject,
44
+ useFactory: moduleOptions.useFactory,
45
+ },
46
+ ],
47
+ });
48
+ }
49
+ static _getDynamicModule(moduleOptions) {
50
+ const token = moduleOptions?.token || OpraHttpNestjsAdapter;
51
+ const opraNestAdapter = new OpraHttpNestjsAdapter({
52
+ ...moduleOptions,
53
+ interceptors: undefined,
54
+ });
55
+ const adapterProvider = {
56
+ provide: token,
57
+ inject: [ModuleRef, OPRA_HTTP_API_CONFIG],
58
+ useFactory: async (moduleRef, apiConfig) => {
59
+ opraNestAdapter.logger = opraNestAdapter.logger || new Logger(apiConfig.name);
60
+ asMutable(opraNestAdapter).document = await ApiDocumentFactory.createDocument({
61
+ ...apiConfig,
62
+ api: {
63
+ transport: 'http',
64
+ name: apiConfig.name,
65
+ description: apiConfig.description,
66
+ controllers: moduleOptions.controllers,
67
+ },
68
+ });
69
+ if (moduleOptions.interceptors) {
70
+ opraNestAdapter.interceptors = moduleOptions.interceptors.map(x => {
39
71
  if (isConstructor(x)) {
40
- return (ctx, next) => {
72
+ return async (ctx, next) => {
41
73
  const interceptor = moduleRef.get(x);
42
74
  if (typeof interceptor.intercept === 'function')
43
- return interceptor.intercept(ctx, next());
75
+ return interceptor.intercept(ctx, next);
44
76
  };
45
77
  }
46
78
  return x;
47
79
  });
48
- return opraAdapter;
49
- },
50
- },
51
- {
52
- provide: APP_FILTER,
53
- useClass: OpraExceptionFilter,
80
+ }
81
+ return opraNestAdapter;
54
82
  },
55
- ];
56
- if (token !== OpraHttpNestjsAdapter) {
57
- providers.push({
58
- provide: token,
59
- useValue: opraAdapter,
60
- });
61
- }
83
+ };
62
84
  return {
85
+ global: moduleOptions.global,
63
86
  module: OpraHttpCoreModule_1,
64
- controllers: opraAdapter.nestControllers,
65
- imports: [...(init?.imports || [])],
66
- exports: [...(init?.exports || []), token],
67
- providers,
87
+ controllers: opraNestAdapter.nestControllers,
88
+ providers: [
89
+ ...(moduleOptions?.providers || []),
90
+ adapterProvider,
91
+ {
92
+ provide: opraHttpNestjsAdapterToken,
93
+ useExisting: token,
94
+ },
95
+ {
96
+ provide: APP_FILTER,
97
+ useClass: OpraExceptionFilter,
98
+ },
99
+ ],
100
+ imports: [...(moduleOptions?.imports || [])],
101
+ exports: [...(moduleOptions?.exports || []), adapterProvider],
68
102
  };
69
103
  }
70
104
  async onModuleDestroy() {
@@ -7,28 +7,21 @@ import { HttpAdapter } from '@opra/http';
7
7
  import { asMutable } from 'ts-gems';
8
8
  import { Public } from '../decorators/public.decorator.js';
9
9
  export class OpraHttpNestjsAdapter extends HttpAdapter {
10
- constructor(init) {
10
+ constructor(options) {
11
11
  super((function () {
12
12
  const document = new ApiDocument();
13
- document.api = new HttpApi({ owner: document, name: init.name, transport: 'http' });
13
+ document.api = new HttpApi({ owner: document, name: '', transport: 'http' });
14
14
  return document;
15
- })(), {
16
- ...init.options,
17
- interceptors: init.options?.interceptors,
18
- });
15
+ })(), options);
19
16
  this.nestControllers = [];
20
- this.options = init.options;
21
- let basePath = init.options?.basePath || '/';
22
- if (!basePath.startsWith('/'))
23
- basePath = '/' + basePath;
24
- this._addRootController(basePath);
25
- if (init.controllers)
26
- init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
17
+ this._addRootController(options.schemaIsPublic);
18
+ if (options.controllers)
19
+ options.controllers.forEach(c => this._addToNestControllers(c, this.basePath, []));
27
20
  }
28
21
  async close() {
29
22
  //
30
23
  }
31
- _addRootController(basePath) {
24
+ _addRootController(isPublic) {
32
25
  const _this = this;
33
26
  let RootController = class RootController {
34
27
  schema(_req, next) {
@@ -45,10 +38,10 @@ export class OpraHttpNestjsAdapter extends HttpAdapter {
45
38
  ], RootController.prototype, "schema", null);
46
39
  RootController = __decorate([
47
40
  Controller({
48
- path: basePath,
41
+ path: this.basePath,
49
42
  })
50
43
  ], RootController);
51
- if (this.options?.schemaRouteIsPublic) {
44
+ if (isPublic) {
52
45
  Public()(RootController.prototype, 'schema', Object.getOwnPropertyDescriptor(RootController.prototype, 'schema'));
53
46
  }
54
47
  this.nestControllers.push(RootController);