@lad-tech/nsc-toolkit 0.6.2 → 0.7.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/dist/Client.js +2 -2
- package/dist/Client.js.map +1 -1
- package/dist/types/Client.d.ts +2 -1
- package/dist/types/interfaces.d.ts +1 -1
- package/package.json +1 -1
- package/src/Client.ts +3 -1
- package/src/interfaces.ts +1 -0
package/dist/Client.js
CHANGED
|
@@ -10,8 +10,8 @@ const crypto_1 = require("crypto");
|
|
|
10
10
|
const promises_1 = require("timers/promises");
|
|
11
11
|
const ajv_1 = require("ajv");
|
|
12
12
|
class Client extends Root_1.Root {
|
|
13
|
-
constructor(natsConnection, serviceName, baggage, cache) {
|
|
14
|
-
super(natsConnection);
|
|
13
|
+
constructor(natsConnection, serviceName, baggage, cache, loggerOutputFormatter) {
|
|
14
|
+
super(natsConnection, loggerOutputFormatter);
|
|
15
15
|
this.serviceName = serviceName;
|
|
16
16
|
this.baggage = baggage;
|
|
17
17
|
this.cache = cache;
|
package/dist/Client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAC9B,+BAA+D;AAY/D,oDAAoD;AACpD,mCAAgD;AAChD,6BAA6B;AAC7B,mCAAoC;AACpC,8CAA6C;
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":"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"}
|
package/dist/types/Client.d.ts
CHANGED
|
@@ -3,13 +3,14 @@ import { Root } from './Root';
|
|
|
3
3
|
import { NatsConnection } from 'nats';
|
|
4
4
|
import { Baggage, Emitter, Listener, CacheSettings, MethodSettings } from './interfaces';
|
|
5
5
|
import { Readable } from 'stream';
|
|
6
|
+
import type { Logs } from '@lad-tech/toolbelt';
|
|
6
7
|
export declare class Client<E extends Emitter = {}> extends Root {
|
|
7
8
|
private serviceName;
|
|
8
9
|
private baggage?;
|
|
9
10
|
private cache?;
|
|
10
11
|
private subscriptions;
|
|
11
12
|
private REQUEST_HTTP_SETTINGS_TIMEOUT;
|
|
12
|
-
constructor(natsConnection: NatsConnection, serviceName: string, baggage?: Baggage | undefined, cache?: CacheSettings | undefined);
|
|
13
|
+
constructor(natsConnection: NatsConnection, serviceName: string, baggage?: Baggage | undefined, cache?: CacheSettings | undefined, loggerOutputFormatter?: Logs.OutputFormatter);
|
|
13
14
|
/**
|
|
14
15
|
* Make listener for service events. Auto subscribe and unsubscribe to subject
|
|
15
16
|
*/
|
|
@@ -25,7 +25,7 @@ export interface Method {
|
|
|
25
25
|
handler: (params: any) => Promise<any>;
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
-
export declare type ClientService<C = Client> = new (natsConnection: NatsConnection, baggage?: Baggage, cache?: CacheSettings) => C;
|
|
28
|
+
export declare type ClientService<C = Client> = new (natsConnection: NatsConnection, baggage?: Baggage, cache?: CacheSettings, loggerOutputFormatter?: Logs.OutputFormatter) => C;
|
|
29
29
|
export declare type Baggage = {
|
|
30
30
|
traceId: string;
|
|
31
31
|
spanId: string;
|
package/package.json
CHANGED
package/src/Client.ts
CHANGED
|
@@ -16,6 +16,7 @@ import { EventEmitter, Readable } from 'stream';
|
|
|
16
16
|
import * as http from 'http';
|
|
17
17
|
import { createHash } from 'crypto';
|
|
18
18
|
import { setTimeout } from 'timers/promises';
|
|
19
|
+
import type { Logs } from '@lad-tech/toolbelt';
|
|
19
20
|
import Ajv from 'ajv';
|
|
20
21
|
|
|
21
22
|
export class Client<E extends Emitter = {}> extends Root {
|
|
@@ -27,8 +28,9 @@ export class Client<E extends Emitter = {}> extends Root {
|
|
|
27
28
|
private serviceName: string,
|
|
28
29
|
private baggage?: Baggage,
|
|
29
30
|
private cache?: CacheSettings,
|
|
31
|
+
loggerOutputFormatter?: Logs.OutputFormatter
|
|
30
32
|
) {
|
|
31
|
-
super(natsConnection);
|
|
33
|
+
super(natsConnection, loggerOutputFormatter);
|
|
32
34
|
this.logger.setLocation(serviceName);
|
|
33
35
|
}
|
|
34
36
|
|