@devrev/ts-adaas 1.11.1-beta.0 → 1.11.1-beta.1
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/logger/logger.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { AxiosError, RawAxiosResponseHeaders } from 'axios';
|
|
|
4
4
|
export declare class Logger extends Console {
|
|
5
5
|
private options?;
|
|
6
6
|
private tags;
|
|
7
|
+
private originalConsole;
|
|
7
8
|
constructor({ event, options }: LoggerFactoryInterface);
|
|
8
9
|
private valueToString;
|
|
9
10
|
logFn(args: unknown[], level: LogLevel): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EACL,sBAAsB,EACtB,QAAQ,EAER,cAAc,EACf,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EACL,sBAAsB,EACtB,QAAQ,EAER,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAgB,MAAM,OAAO,CAAC;AAI1E,qBAAa,MAAO,SAAQ,OAAO;IACjC,OAAO,CAAC,OAAO,CAAC,CAAuB;IACvC,OAAO,CAAC,IAAI,CAAqC;IACjD,OAAO,CAAC,eAAe,CAAU;gBAErB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAUtD,OAAO,CAAC,aAAa;IAYrB,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI;IA2BpC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI7B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;CAGzC;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,cAAc,CA2B5E;AACD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAE1D;AAED,eAAO,MAAM,cAAc,GAAI,OAAO,OAAO,YAK5C,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,MAAM,EAAE,GAAG,CAAC;QACZ,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,CAAC;IACF,YAAY,EAAE,OAAO,CAAC;IACtB,sBAAsB,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,OAAO,CAAC;QACd,OAAO,EAAE,uBAAuB,CAAC;QACjC,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,kBAAkB,CAwBzE"}
|
package/dist/logger/logger.js
CHANGED
|
@@ -7,12 +7,11 @@ exports.serializeAxiosError = serializeAxiosError;
|
|
|
7
7
|
const node_console_1 = require("node:console");
|
|
8
8
|
const node_util_1 = require("node:util");
|
|
9
9
|
const logger_interfaces_1 = require("./logger.interfaces");
|
|
10
|
-
const node_worker_threads_1 = require("node:worker_threads");
|
|
11
|
-
const workers_1 = require("../types/workers");
|
|
12
10
|
const axios_1 = require("axios");
|
|
13
11
|
class Logger extends node_console_1.Console {
|
|
14
12
|
constructor({ event, options }) {
|
|
15
13
|
super(process.stdout, process.stderr);
|
|
14
|
+
this.originalConsole = console; // Store original console before replacement
|
|
16
15
|
this.options = options;
|
|
17
16
|
this.tags = Object.assign(Object.assign({}, event.payload.event_context), { dev_oid: event.payload.event_context.dev_oid });
|
|
18
17
|
}
|
|
@@ -28,36 +27,27 @@ class Logger extends node_console_1.Console {
|
|
|
28
27
|
}
|
|
29
28
|
logFn(args, level) {
|
|
30
29
|
var _a;
|
|
31
|
-
if (
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.isLocalDevelopment) {
|
|
31
|
+
// Use original console methods to avoid circular reference
|
|
32
|
+
this.originalConsole[level](...args);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
let message;
|
|
36
|
+
if (args.length === 1 && typeof args[0] === 'string') {
|
|
37
|
+
// Single string argument - use directly
|
|
38
|
+
message = args[0];
|
|
39
|
+
}
|
|
40
|
+
else if (args.length === 1) {
|
|
41
|
+
// Single non-string argument - convert to string properly
|
|
42
|
+
message = this.valueToString(args[0]);
|
|
34
43
|
}
|
|
35
44
|
else {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
// Single string argument - use directly
|
|
39
|
-
message = args[0];
|
|
40
|
-
}
|
|
41
|
-
else if (args.length === 1) {
|
|
42
|
-
// Single non-string argument - convert to string properly
|
|
43
|
-
message = this.valueToString(args[0]);
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
// Multiple arguments - create a readable format
|
|
47
|
-
message = args.map((arg) => this.valueToString(arg)).join(' ');
|
|
48
|
-
}
|
|
49
|
-
const logObject = Object.assign({ message }, this.tags);
|
|
50
|
-
console[level](JSON.stringify(logObject));
|
|
45
|
+
// Multiple arguments - create a readable format
|
|
46
|
+
message = args.map((arg) => this.valueToString(arg)).join(' ');
|
|
51
47
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
subject: workers_1.WorkerMessageSubject.WorkerMessageLog,
|
|
56
|
-
payload: {
|
|
57
|
-
args: args.map((arg) => this.valueToString(arg)),
|
|
58
|
-
level,
|
|
59
|
-
},
|
|
60
|
-
});
|
|
48
|
+
const logObject = Object.assign({ message }, this.tags);
|
|
49
|
+
// Use original console methods to avoid circular reference
|
|
50
|
+
this.originalConsole[level](JSON.stringify(logObject));
|
|
61
51
|
}
|
|
62
52
|
}
|
|
63
53
|
log(...args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/workers/spawn.ts"],"names":[],"mappings":"AAYA,OAAO,EAIL,qBAAqB,EACrB,cAAc,EACf,MAAM,kBAAkB,CAAC;AA4D1B;;;;;;;;;;GAUG;AACH,wBAAsB,KAAK,CAAC,cAAc,EAAE,EAC1C,KAAK,EACL,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,OAAO,GACR,EAAE,qBAAqB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAmEvD;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,wBAAwB,CAA6C;IAC7E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAA4C;gBAE/C,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;
|
|
1
|
+
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../src/workers/spawn.ts"],"names":[],"mappings":"AAYA,OAAO,EAIL,qBAAqB,EACrB,cAAc,EACf,MAAM,kBAAkB,CAAC;AA4D1B;;;;;;;;;;GAUG;AACH,wBAAsB,KAAK,CAAC,cAAc,EAAE,EAC1C,KAAK,EACL,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,OAAO,GACR,EAAE,qBAAqB,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAmEvD;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,gBAAgB,CAA4C;IACpE,OAAO,CAAC,wBAAwB,CAA6C;IAC7E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,OAAO,CAA4C;gBAE/C,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;IAyE/D,OAAO,CAAC,aAAa;YAYP,kBAAkB;CA6BjC"}
|
package/dist/workers/spawn.js
CHANGED
|
@@ -170,14 +170,6 @@ class Spawn {
|
|
|
170
170
|
await this.exitFromMainThread();
|
|
171
171
|
});
|
|
172
172
|
worker.on(workers_1.WorkerEvent.WorkerMessage, async (message) => {
|
|
173
|
-
var _a, _b;
|
|
174
|
-
// Since it is not possible to log from the worker thread, we need to log
|
|
175
|
-
// from the main thread.
|
|
176
|
-
if ((message === null || message === void 0 ? void 0 : message.subject) === workers_1.WorkerMessageSubject.WorkerMessageLog) {
|
|
177
|
-
const args = (_a = message.payload) === null || _a === void 0 ? void 0 : _a.args;
|
|
178
|
-
const level = (_b = message.payload) === null || _b === void 0 ? void 0 : _b.level;
|
|
179
|
-
this.logger.logFn(args, level);
|
|
180
|
-
}
|
|
181
173
|
// If worker sends a message that it has emitted an event, then set alreadyEmitted to true.
|
|
182
174
|
if ((message === null || message === void 0 ? void 0 : message.subject) === workers_1.WorkerMessageSubject.WorkerMessageEmitted) {
|
|
183
175
|
this.logger.info('Worker has emitted message to ADaaS.');
|
package/package.json
CHANGED