@dbos-inc/dbos-sdk 1.9.5-preview → 1.9.10-preview
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/src/dbos-runtime/cli.d.ts +1 -1
- package/dist/src/dbos-runtime/cli.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cli.js.map +1 -1
- package/dist/src/dbos-runtime/migrate.d.ts +1 -1
- package/dist/src/dbos-runtime/migrate.d.ts.map +1 -1
- package/dist/src/dbos-runtime/migrate.js +39 -24
- package/dist/src/dbos-runtime/migrate.js.map +1 -1
- package/dist/src/decorators.d.ts +0 -2
- package/dist/src/decorators.d.ts.map +1 -1
- package/dist/src/decorators.js +3 -17
- package/dist/src/decorators.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/kafka/kafka.d.ts +3 -2
- package/dist/src/kafka/kafka.d.ts.map +1 -1
- package/dist/src/kafka/kafka.js +29 -8
- package/dist/src/kafka/kafka.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +3 -2
- package/dist/src/telemetry/index.d.ts.map +1 -1
- package/dist/src/telemetry/index.js +2 -7
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/logs.d.ts +8 -8
- package/dist/src/telemetry/logs.d.ts.map +1 -1
- package/dist/src/telemetry/logs.js +0 -8
- package/dist/src/telemetry/logs.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -12,5 +12,5 @@ export interface DBOSConfigureOptions {
|
|
|
12
12
|
port?: number;
|
|
13
13
|
username?: string;
|
|
14
14
|
}
|
|
15
|
-
export declare function runAndLog(action: (configFile: ConfigFile, logger: GlobalLogger) => Promise<number>): Promise<void>;
|
|
15
|
+
export declare function runAndLog(action: (configFile: ConfigFile, logger: GlobalLogger) => Promise<number> | number): Promise<void>;
|
|
16
16
|
//# sourceMappingURL=cli.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAuD,MAAM,UAAU,CAAC;AAK3F,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAWjD,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AA6ED,wBAAsB,SAAS,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAuD,MAAM,UAAU,CAAC;AAK3F,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAWjD,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AA6ED,wBAAsB,SAAS,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,iBA2BjH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/dbos-runtime/cli.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/dbos-runtime/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import { GlobalLogger } from "../telemetry/logs";
|
|
|
2
2
|
import { ConfigFile } from "./config";
|
|
3
3
|
export declare function migrate(configFile: ConfigFile, logger: GlobalLogger): Promise<1 | 0>;
|
|
4
4
|
export declare function checkDatabaseExists(configFile: ConfigFile, logger: GlobalLogger): Promise<boolean>;
|
|
5
|
-
export declare function rollbackMigration(configFile: ConfigFile, logger: GlobalLogger):
|
|
5
|
+
export declare function rollbackMigration(configFile: ConfigFile, logger: GlobalLogger): 1 | 0;
|
|
6
6
|
//# sourceMappingURL=migrate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAuB,MAAM,UAAU,CAAC;AAK3D,wBAAsB,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAuB,MAAM,UAAU,CAAC;AAK3D,wBAAsB,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,kBA4DzE;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,oBAarF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,SAqB7E"}
|
|
@@ -46,30 +46,12 @@ async function migrate(configFile, logger) {
|
|
|
46
46
|
try {
|
|
47
47
|
migrationCommands?.forEach((cmd) => {
|
|
48
48
|
logger.info(`Executing migration command: ${cmd}`);
|
|
49
|
-
const migrateCommandOutput = (0, child_process_1.execSync)(cmd)
|
|
49
|
+
const migrateCommandOutput = (0, child_process_1.execSync)(cmd, { encoding: 'utf-8' });
|
|
50
50
|
logger.info(migrateCommandOutput.trimEnd());
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
catch (e) {
|
|
54
|
-
logger
|
|
55
|
-
if (e instanceof Error) {
|
|
56
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
|
|
57
|
-
const stderr = e.stderr;
|
|
58
|
-
if (stderr && Buffer.isBuffer(stderr) && stderr.length > 0) {
|
|
59
|
-
logger.error(`Standard Error: ${stderr.toString().trim()}`);
|
|
60
|
-
}
|
|
61
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
|
|
62
|
-
const stdout = e.stdout;
|
|
63
|
-
if (stdout && Buffer.isBuffer(stdout) && stdout.length > 0) {
|
|
64
|
-
logger.error(`Standard Output: ${stdout.toString().trim()}`);
|
|
65
|
-
}
|
|
66
|
-
if (e.message) {
|
|
67
|
-
logger.error(e.message);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
logger.error(e);
|
|
72
|
-
}
|
|
54
|
+
logMigrationError(e, logger, "Error running migration");
|
|
73
55
|
return 1;
|
|
74
56
|
}
|
|
75
57
|
logger.info("Creating DBOS tables and system database.");
|
|
@@ -104,8 +86,7 @@ async function checkDatabaseExists(configFile, logger) {
|
|
|
104
86
|
}
|
|
105
87
|
}
|
|
106
88
|
exports.checkDatabaseExists = checkDatabaseExists;
|
|
107
|
-
|
|
108
|
-
async function rollbackMigration(configFile, logger) {
|
|
89
|
+
function rollbackMigration(configFile, logger) {
|
|
109
90
|
logger.info("Starting Migration Rollback");
|
|
110
91
|
let dbType = configFile.database.app_db_client;
|
|
111
92
|
if (dbType == undefined) {
|
|
@@ -115,11 +96,12 @@ async function rollbackMigration(configFile, logger) {
|
|
|
115
96
|
try {
|
|
116
97
|
rollbackcommands?.forEach((cmd) => {
|
|
117
98
|
logger.info("Executing " + cmd);
|
|
118
|
-
(0, child_process_1.execSync)(cmd);
|
|
99
|
+
const migrateCommandOutput = (0, child_process_1.execSync)(cmd, { encoding: 'utf-8' });
|
|
100
|
+
logger.info(migrateCommandOutput.trimEnd());
|
|
119
101
|
});
|
|
120
102
|
}
|
|
121
103
|
catch (e) {
|
|
122
|
-
logger
|
|
104
|
+
logMigrationError(e, logger, "Error rolling back migration.");
|
|
123
105
|
return 1;
|
|
124
106
|
}
|
|
125
107
|
return 0;
|
|
@@ -167,4 +149,37 @@ async function createDBOSTables(configFile) {
|
|
|
167
149
|
await pgUserClient.end();
|
|
168
150
|
}
|
|
169
151
|
}
|
|
152
|
+
//Test to determine if e can be treated as an ExecSyncError.
|
|
153
|
+
function isExecSyncError(e) {
|
|
154
|
+
if (
|
|
155
|
+
//Safeguard against NaN. NaN type is number but NaN !== NaN
|
|
156
|
+
"pid" in e && (typeof e.pid === 'number' && e.pid === e.pid) &&
|
|
157
|
+
"stdout" in e && (Buffer.isBuffer(e.stdout) || typeof e.stdout === 'string') &&
|
|
158
|
+
"stderr" in e && (Buffer.isBuffer(e.stderr) || typeof e.stderr === 'string')) {
|
|
159
|
+
return true;
|
|
160
|
+
}
|
|
161
|
+
return false;
|
|
162
|
+
}
|
|
163
|
+
function logMigrationError(e, logger, title) {
|
|
164
|
+
logger.error(title);
|
|
165
|
+
if (e instanceof Error && isExecSyncError(e)) {
|
|
166
|
+
const stderr = e.stderr;
|
|
167
|
+
if (e.stderr.length > 0) {
|
|
168
|
+
logger.error(`Standard Error: ${stderr.toString().trim()}`);
|
|
169
|
+
}
|
|
170
|
+
const stdout = e.stdout;
|
|
171
|
+
if (stdout.length > 0) {
|
|
172
|
+
logger.error(`Standard Output: ${stdout.toString().trim()}`);
|
|
173
|
+
}
|
|
174
|
+
if (e.message) {
|
|
175
|
+
logger.error(e.message);
|
|
176
|
+
}
|
|
177
|
+
if (e.error?.message) {
|
|
178
|
+
logger.error(e.error?.message);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
logger.error(e);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
170
185
|
//# sourceMappingURL=migrate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":"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"}
|
package/dist/src/decorators.d.ts
CHANGED
|
@@ -62,7 +62,6 @@ export declare class MethodRegistration<This, Args extends unknown[], Return> im
|
|
|
62
62
|
requiredRole: string[] | undefined;
|
|
63
63
|
args: MethodParameter[];
|
|
64
64
|
constructor(origFunc: (this: This, ...args: Args) => Promise<Return>);
|
|
65
|
-
debug: boolean;
|
|
66
65
|
needInitialized: boolean;
|
|
67
66
|
origFunction: (this: This, ...args: Args) => Promise<Return>;
|
|
68
67
|
registeredFunction: ((this: This, ...args: Args) => Promise<Return>) | undefined;
|
|
@@ -107,7 +106,6 @@ export declare function DefaultArgRequired<T extends {
|
|
|
107
106
|
export declare function DefaultArgOptional<T extends {
|
|
108
107
|
new (...args: unknown[]): object;
|
|
109
108
|
}>(ctor: T): void;
|
|
110
|
-
export declare function Debug(): <This, Ctx extends DBOSContext, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ctx: Ctx, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ctx: Ctx, ...args: Args) => Promise<Return>>;
|
|
111
109
|
export declare function RequiredRole(anyOf: string[]): <This, Ctx extends DBOSContext, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ctx: Ctx, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ctx: Ctx, ...args: Args) => Promise<Return>>;
|
|
112
110
|
export declare function Workflow(config?: WorkflowConfig): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ctx: WorkflowContext, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ctx: WorkflowContext, ...args: Args) => Promise<Return>>;
|
|
113
111
|
export declare function Transaction(config?: TransactionConfig): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ctx: TransactionContext<any>, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ctx: TransactionContext<any>, ...args: Args) => Promise<Return>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,CAAC;AAG1B,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAmB,WAAW,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAIzE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAE9H,qBAAa,YAAY;IACvB,QAAQ,EAAE,aAAa,CAAU;IACjC,MAAM,EAAE,MAAM,CAAM;IACpB,SAAS,EAAE,MAAM,CAAM;IACvB,KAAK,EAAE,MAAM,CAAM;IAEnB,yBAAyB;IACzB,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM;IAO7B,gFAAgF;IAChF,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAS/C,sCAAsC;IAEtC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ;IAkB5B,cAAc,IAAI,MAAM;CAczB;AAqBD,oBAAY,QAAQ;IAClB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,IAAI,SAAS;CACd;AAED,oBAAY,kBAAkB;IAC5B,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED,qBAAa,eAAe;IAC1B,IAAI,EAAE,MAAM,CAAM;IAClB,QAAQ,EAAE,kBAAkB,CAA8B;IAC1D,QAAQ,EAAE,OAAO,CAAQ;IACzB,OAAO,EAAE,QAAQ,CAAiB;IAGlC,OAAO,EAAE,QAAQ,CAAU;IAC3B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,CAAM;gBAGP,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ;CAKtC;AAMD,MAAM,WAAW,oBAAoB;IAEnC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACnC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,eAAe,EAAE,CAAC;IAExB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAEhC,gBAAgB,IAAI,MAAM,EAAG,CAAC;IAE9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAGhC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC;IAEzC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;CAClD;AAED,qBAAa,kBAAkB,CAAE,IAAI,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,MAAM,CACrE,YAAW,sBAAsB;IAE/B,QAAQ,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAE5C,IAAI,EAAE,MAAM,CAAM;IAElB,YAAY,EAAE,MAAM,EAAE,GAAG,SAAS,CAAa;IAE/C,IAAI,EAAE,eAAe,EAAE,CAAM;gBAEjB,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC;IAIpE,
|
|
1
|
+
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"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"}
|
package/dist/src/decorators.js
CHANGED
|
@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
return result;
|
|
25
25
|
};
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.DBOSDeploy = exports.DBOSInitializer = exports.OrmEntities = exports.Communicator = exports.Transaction = exports.Workflow = exports.RequiredRole = exports.
|
|
27
|
+
exports.DBOSDeploy = exports.DBOSInitializer = exports.OrmEntities = exports.Communicator = exports.Transaction = exports.Workflow = exports.RequiredRole = exports.DefaultArgOptional = exports.DefaultArgRequired = exports.DefaultRequiredRole = exports.ArgVarchar = exports.ArgDate = exports.ArgName = exports.LogMask = exports.SkipLogging = exports.ArgOptional = exports.ArgRequired = exports.getOrCreateClassRegistration = exports.registerAndWrapFunction = exports.getOrCreateMethodArgsRegistration = exports.getRegisteredOperations = exports.ClassRegistration = exports.MethodRegistration = exports.MethodParameter = exports.ArgRequiredOptions = exports.LogMasks = exports.DBOSDataType = void 0;
|
|
28
28
|
require("reflect-metadata");
|
|
29
29
|
const crypto = __importStar(require("crypto"));
|
|
30
30
|
const error_1 = require("./error");
|
|
@@ -141,7 +141,6 @@ class MethodRegistration {
|
|
|
141
141
|
constructor(origFunc) {
|
|
142
142
|
this.origFunction = origFunc;
|
|
143
143
|
}
|
|
144
|
-
debug = false;
|
|
145
144
|
needInitialized = true;
|
|
146
145
|
origFunction;
|
|
147
146
|
registeredFunction;
|
|
@@ -385,15 +384,6 @@ exports.DefaultArgOptional = DefaultArgOptional;
|
|
|
385
384
|
///////////////////////
|
|
386
385
|
/* METHOD DECORATORS */
|
|
387
386
|
///////////////////////
|
|
388
|
-
function Debug() {
|
|
389
|
-
function logdec(target, propertyKey, inDescriptor) {
|
|
390
|
-
const { descriptor, registration } = registerAndWrapFunction(target, propertyKey, inDescriptor);
|
|
391
|
-
registration.debug = true;
|
|
392
|
-
return descriptor;
|
|
393
|
-
}
|
|
394
|
-
return logdec;
|
|
395
|
-
}
|
|
396
|
-
exports.Debug = Debug;
|
|
397
387
|
function RequiredRole(anyOf) {
|
|
398
388
|
function apidec(target, propertyKey, inDescriptor) {
|
|
399
389
|
const { descriptor, registration } = registerAndWrapFunction(target, propertyKey, inDescriptor);
|
|
@@ -442,9 +432,7 @@ function OrmEntities(entities) {
|
|
|
442
432
|
}
|
|
443
433
|
exports.OrmEntities = OrmEntities;
|
|
444
434
|
function DBOSInitializer() {
|
|
445
|
-
function decorator(target, propertyKey,
|
|
446
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
447
|
-
inDescriptor) {
|
|
435
|
+
function decorator(target, propertyKey, inDescriptor) {
|
|
448
436
|
const { descriptor, registration } = registerAndWrapFunction(target, propertyKey, inDescriptor);
|
|
449
437
|
registration.init = true;
|
|
450
438
|
return descriptor;
|
|
@@ -454,9 +442,7 @@ function DBOSInitializer() {
|
|
|
454
442
|
exports.DBOSInitializer = DBOSInitializer;
|
|
455
443
|
// For future use with Deploy
|
|
456
444
|
function DBOSDeploy() {
|
|
457
|
-
function decorator(target, propertyKey,
|
|
458
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
459
|
-
inDescriptor) {
|
|
445
|
+
function decorator(target, propertyKey, inDescriptor) {
|
|
460
446
|
const { descriptor, registration } = registerAndWrapFunction(target, propertyKey, inDescriptor);
|
|
461
447
|
registration.init = true;
|
|
462
448
|
return descriptor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export { WorkflowContext, WorkflowConfig, WorkflowHandle, StatusString, } from '
|
|
|
5
5
|
export { CommunicatorContext, CommunicatorConfig, } from './communicator';
|
|
6
6
|
export * as Error from './error';
|
|
7
7
|
export { DBOSResponseError } from './error';
|
|
8
|
-
export { LogMasks,
|
|
8
|
+
export { LogMasks, ArgRequired, ArgOptional, SkipLogging, LogMask, ArgName, ArgDate, ArgVarchar, DefaultRequiredRole, DefaultArgRequired, DefaultArgOptional, OrmEntities, Transaction, Workflow, Communicator, RequiredRole, DBOSInitializer, DBOSDeploy, } from "./decorators";
|
|
9
9
|
export { ArgSources, } from "./httpServer/handlerTypes";
|
|
10
10
|
export { HandlerContext, ArgSource, GetApi, PostApi, } from "./httpServer/handler";
|
|
11
11
|
export { DBOSHttpAuthMiddleware, DBOSHttpAuthReturn, MiddlewareContext, Authentication, KoaBodyParser, KoaCors, KoaMiddleware, OpenApiSecurityScheme } from "./httpServer/middleware";
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,cAAc,GACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,WAAW,EACX,WAAW,GACZ,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,eAAe,EACf,cAAc,EACd,cAAc,EACd,YAAY,GACb,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,cAAc,GACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,WAAW,EACX,WAAW,GACZ,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,eAAe,EACf,cAAc,EACd,cAAc,EACd,YAAY,GACb,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,QAAQ,EAGR,WAAW,EACX,WAAW,EACX,WAAW,EACX,OAAO,EACP,OAAO,EACP,OAAO,EACP,UAAU,EAGV,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAElB,WAAW,EAGX,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,UAAU,GACX,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,UAAU,GACX,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,cAAc,EAGd,SAAS,EAGT,MAAM,EACN,OAAO,GACR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EAGjB,cAAc,EACd,aAAa,EACb,OAAO,EACP,aAAa,EAGb,qBAAqB,EACtB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,KAAK,EACL,YAAY,GACb,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,aAAa,EACb,eAAe,EACf,SAAS,GACV,MAAM,uBAAuB,CAAC"}
|
package/dist/src/index.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Scheduled = exports.SchedulerConfig = exports.SchedulerMode = exports.KafkaConsume = exports.Kafka = exports.OpenApiSecurityScheme = exports.KoaMiddleware = exports.KoaCors = exports.KoaBodyParser = exports.Authentication = exports.PostApi = exports.GetApi = exports.ArgSource = exports.ArgSources = exports.DBOSDeploy = exports.DBOSInitializer = exports.RequiredRole = exports.Communicator = exports.Workflow = exports.Transaction = exports.OrmEntities = exports.DefaultArgOptional = exports.DefaultArgRequired = exports.DefaultRequiredRole = exports.ArgVarchar = exports.ArgDate = exports.ArgName = exports.LogMask = exports.SkipLogging = exports.ArgOptional = exports.ArgRequired = exports.
|
|
26
|
+
exports.Scheduled = exports.SchedulerConfig = exports.SchedulerMode = exports.KafkaConsume = exports.Kafka = exports.OpenApiSecurityScheme = exports.KoaMiddleware = exports.KoaCors = exports.KoaBodyParser = exports.Authentication = exports.PostApi = exports.GetApi = exports.ArgSource = exports.ArgSources = exports.DBOSDeploy = exports.DBOSInitializer = exports.RequiredRole = exports.Communicator = exports.Workflow = exports.Transaction = exports.OrmEntities = exports.DefaultArgOptional = exports.DefaultArgRequired = exports.DefaultRequiredRole = exports.ArgVarchar = exports.ArgDate = exports.ArgName = exports.LogMask = exports.SkipLogging = exports.ArgOptional = exports.ArgRequired = exports.LogMasks = exports.DBOSResponseError = exports.Error = exports.StatusString = exports.InitContext = exports.createTestingRuntime = void 0;
|
|
27
27
|
var testing_runtime_1 = require("./testing/testing_runtime");
|
|
28
28
|
Object.defineProperty(exports, "createTestingRuntime", { enumerable: true, get: function () { return testing_runtime_1.createTestingRuntime; } });
|
|
29
29
|
var context_1 = require("./context");
|
|
@@ -35,7 +35,6 @@ var error_1 = require("./error");
|
|
|
35
35
|
Object.defineProperty(exports, "DBOSResponseError", { enumerable: true, get: function () { return error_1.DBOSResponseError; } });
|
|
36
36
|
var decorators_1 = require("./decorators");
|
|
37
37
|
Object.defineProperty(exports, "LogMasks", { enumerable: true, get: function () { return decorators_1.LogMasks; } });
|
|
38
|
-
Object.defineProperty(exports, "Debug", { enumerable: true, get: function () { return decorators_1.Debug; } });
|
|
39
38
|
// Parameter Decorators
|
|
40
39
|
Object.defineProperty(exports, "ArgRequired", { enumerable: true, get: function () { return decorators_1.ArgRequired; } });
|
|
41
40
|
Object.defineProperty(exports, "ArgOptional", { enumerable: true, get: function () { return decorators_1.ArgOptional; } });
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAGmC;AAFjC,uHAAA,oBAAoB,OAAA;AAItB,qCAGmB;AADjB,sGAAA,WAAW,OAAA;AAQb,uCAKoB;AADlB,wGAAA,YAAY,OAAA;AAQd,iDAAiC;AAEjC,iCAEiB;AADf,0GAAA,iBAAiB,OAAA;AAGnB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAGmC;AAFjC,uHAAA,oBAAoB,OAAA;AAItB,qCAGmB;AADjB,sGAAA,WAAW,OAAA;AAQb,uCAKoB;AADlB,wGAAA,YAAY,OAAA;AAQd,iDAAiC;AAEjC,iCAEiB;AADf,0GAAA,iBAAiB,OAAA;AAGnB,2CA0BsB;AAzBpB,sGAAA,QAAQ,OAAA;AAER,uBAAuB;AACvB,yGAAA,WAAW,OAAA;AACX,yGAAA,WAAW,OAAA;AACX,yGAAA,WAAW,OAAA;AACX,qGAAA,OAAO,OAAA;AACP,qGAAA,OAAO,OAAA;AACP,qGAAA,OAAO,OAAA;AACP,wGAAA,UAAU,OAAA;AAEV,mBAAmB;AACnB,iHAAA,mBAAmB,OAAA;AACnB,gHAAA,kBAAkB,OAAA;AAClB,gHAAA,kBAAkB,OAAA;AAClB,2BAA2B;AAC3B,yGAAA,WAAW,OAAA;AAEX,oBAAoB;AACpB,yGAAA,WAAW,OAAA;AACX,sGAAA,QAAQ,OAAA;AACR,0GAAA,YAAY,OAAA;AACZ,0GAAA,YAAY,OAAA;AACZ,6GAAA,eAAe,OAAA;AACf,wGAAA,UAAU,OAAA;AAGZ,0DAEmC;AADjC,0GAAA,UAAU,OAAA;AAGZ,gDAS8B;AAN5B,gCAAgC;AAChC,oGAAA,SAAS,OAAA;AAET,sBAAsB;AACtB,iGAAA,MAAM,OAAA;AACN,kGAAA,OAAO,OAAA;AAGT,sDAaiC;AAR/B,wBAAwB;AACxB,4GAAA,cAAc,OAAA;AACd,2GAAA,aAAa,OAAA;AACb,qGAAA,OAAO,OAAA;AACP,2GAAA,aAAa,OAAA;AAEb,qBAAqB;AACrB,mHAAA,qBAAqB,OAAA;AAGvB,uCAGuB;AAFrB,8FAAA,KAAK,OAAA;AACL,qGAAA,YAAY,OAAA;AAGd,mDAI+B;AAH7B,0GAAA,aAAa,OAAA;AACb,4GAAA,eAAe,OAAA;AACf,sGAAA,SAAS,OAAA"}
|
|
@@ -4,11 +4,11 @@ import { ClassRegistration, MethodRegistration, RegistrationDefaults } from "../
|
|
|
4
4
|
import { DBOSExecutor } from "../dbos-executor";
|
|
5
5
|
type KafkaArgs = [string, number, KafkaMessage];
|
|
6
6
|
export declare class KafkaRegistration<This, Args extends unknown[], Return> extends MethodRegistration<This, Args, Return> {
|
|
7
|
-
|
|
7
|
+
kafkaTopics?: string | RegExp | Array<string | RegExp>;
|
|
8
8
|
consumerConfig?: ConsumerConfig;
|
|
9
9
|
constructor(origFunc: (this: This, ...args: Args) => Promise<Return>);
|
|
10
10
|
}
|
|
11
|
-
export declare function KafkaConsume(
|
|
11
|
+
export declare function KafkaConsume(topics: string | RegExp | Array<string | RegExp>, consumerConfig?: ConsumerConfig): <This, Ctx extends DBOSContext, Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ctx: Ctx, args_0: string, args_1: number, args_2: KafkaMessage) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ctx: Ctx, args_1: string, args_2: number, args_3: KafkaMessage) => Promise<Return>>;
|
|
12
12
|
export interface KafkaDefaults extends RegistrationDefaults {
|
|
13
13
|
kafkaConfig?: KafkaConfig;
|
|
14
14
|
}
|
|
@@ -25,6 +25,7 @@ export declare class DBOSKafka {
|
|
|
25
25
|
constructor(dbosExec: DBOSExecutor);
|
|
26
26
|
initKafka(): Promise<void>;
|
|
27
27
|
destroyKafka(): Promise<void>;
|
|
28
|
+
safeGroupName(topics: Array<string | RegExp>): string;
|
|
28
29
|
logRegisteredKafkaEndpoints(): void;
|
|
29
30
|
}
|
|
30
31
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kafka.d.ts","sourceRoot":"","sources":["../../../src/kafka/kafka.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAwB,MAAM,SAAS,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,oBAAoB,EAAyD,MAAM,eAAe,CAAC;AACnJ,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD,KAAK,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;AAM/C,qBAAa,iBAAiB,CAAC,IAAI,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,MAAM,CAAE,SAAQ,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC;IACjH,
|
|
1
|
+
{"version":3,"file":"kafka.d.ts","sourceRoot":"","sources":["../../../src/kafka/kafka.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAwB,MAAM,SAAS,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,oBAAoB,EAAyD,MAAM,eAAe,CAAC;AACnJ,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD,KAAK,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;AAM/C,qBAAa,iBAAiB,CAAC,IAAI,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,MAAM,CAAE,SAAQ,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC;IACjH,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,cAAc,CAAC;gBAEpB,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC;CAGrE;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,cAAc,CAAC,EAAE,cAAc,mDAElG,MAAM,eACD,MAAM,sQAWtB;AAMD,MAAM,WAAW,aAAc,SAAQ,oBAAoB;IACzD,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,sBAAsB,CAAC,EAAE,SAAS;IAAE,KAAI,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;CAAE,CAAE,SAAQ,iBAAiB,CAAC,EAAE,CAAE,YAAW,aAAa;IACxI,WAAW,CAAC,EAAE,WAAW,CAAC;gBAEd,IAAI,EAAE,EAAE;CAGrB;AAED,wBAAgB,KAAK,CAAC,WAAW,EAAE,WAAW,4BACH,OAAO,EAAE,KAAG,MAAM,mBAK5D;AAMD,qBAAa,SAAS;IAGR,QAAQ,CAAC,QAAQ,EAAE,YAAY;IAF3C,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAM;gBAEf,QAAQ,EAAE,YAAY;IAErC,SAAS;IAiET,YAAY;IAMlB,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;IAQ5C,2BAA2B;CAiB5B"}
|
package/dist/src/kafka/kafka.js
CHANGED
|
@@ -9,18 +9,18 @@ const utils_1 = require("../utils");
|
|
|
9
9
|
/* Kafka Method Decorators */
|
|
10
10
|
/////////////////////////////
|
|
11
11
|
class KafkaRegistration extends decorators_1.MethodRegistration {
|
|
12
|
-
|
|
12
|
+
kafkaTopics;
|
|
13
13
|
consumerConfig;
|
|
14
14
|
constructor(origFunc) {
|
|
15
15
|
super(origFunc);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
exports.KafkaRegistration = KafkaRegistration;
|
|
19
|
-
function KafkaConsume(
|
|
19
|
+
function KafkaConsume(topics, consumerConfig) {
|
|
20
20
|
function kafkadec(target, propertyKey, inDescriptor) {
|
|
21
21
|
const { descriptor, registration } = (0, decorators_1.registerAndWrapFunction)(target, propertyKey, inDescriptor);
|
|
22
22
|
const kafkaRegistration = registration;
|
|
23
|
-
kafkaRegistration.
|
|
23
|
+
kafkaRegistration.kafkaTopics = topics;
|
|
24
24
|
kafkaRegistration.consumerConfig = consumerConfig;
|
|
25
25
|
return descriptor;
|
|
26
26
|
}
|
|
@@ -54,7 +54,7 @@ class DBOSKafka {
|
|
|
54
54
|
async initKafka() {
|
|
55
55
|
for (const registeredOperation of this.dbosExec.registeredOperations) {
|
|
56
56
|
const ro = registeredOperation;
|
|
57
|
-
if (ro.
|
|
57
|
+
if (ro.kafkaTopics) {
|
|
58
58
|
const defaults = ro.defaults;
|
|
59
59
|
if (!ro.txnConfig && !ro.workflowConfig) {
|
|
60
60
|
throw new error_1.DBOSError(`Error registering method ${defaults.name}.${ro.name}: A Kafka decorator can only be assigned to a transaction or workflow!`);
|
|
@@ -62,8 +62,15 @@ class DBOSKafka {
|
|
|
62
62
|
if (!defaults.kafkaConfig) {
|
|
63
63
|
throw new error_1.DBOSError(`Error registering method ${defaults.name}.${ro.name}: Kafka configuration not found. Does class ${defaults.name} have an @Kafka decorator?`);
|
|
64
64
|
}
|
|
65
|
+
const topics = [];
|
|
66
|
+
if (Array.isArray(ro.kafkaTopics)) {
|
|
67
|
+
topics.push(...ro.kafkaTopics);
|
|
68
|
+
}
|
|
69
|
+
else if (ro.kafkaTopics) {
|
|
70
|
+
topics.push(ro.kafkaTopics);
|
|
71
|
+
}
|
|
65
72
|
const kafka = new kafkajs_1.Kafka(defaults.kafkaConfig);
|
|
66
|
-
const consumerConfig = ro.consumerConfig ?? { groupId:
|
|
73
|
+
const consumerConfig = ro.consumerConfig ?? { groupId: `${this.safeGroupName(topics)}` };
|
|
67
74
|
const consumer = kafka.consumer(consumerConfig);
|
|
68
75
|
await consumer.connect();
|
|
69
76
|
// A temporary workaround for https://github.com/tulios/kafkajs/pull/1558 until it gets fixed
|
|
@@ -74,7 +81,7 @@ class DBOSKafka {
|
|
|
74
81
|
const multiplier = defaults.kafkaConfig.retry ? defaults.kafkaConfig.retry.multiplier ?? 2 : 2;
|
|
75
82
|
for (let i = 0; i < maxRetries; i++) {
|
|
76
83
|
try {
|
|
77
|
-
await consumer.subscribe({
|
|
84
|
+
await consumer.subscribe({ topics: topics, fromBeginning: true });
|
|
78
85
|
break;
|
|
79
86
|
}
|
|
80
87
|
catch (error) {
|
|
@@ -116,14 +123,28 @@ class DBOSKafka {
|
|
|
116
123
|
await consumer.disconnect();
|
|
117
124
|
}
|
|
118
125
|
}
|
|
126
|
+
safeGroupName(topics) {
|
|
127
|
+
const safeGroupIdPart = topics
|
|
128
|
+
.map(r => r.toString())
|
|
129
|
+
.map(r => r.replaceAll(/[^a-zA-Z0-9\\-]/g, ''))
|
|
130
|
+
.join('-');
|
|
131
|
+
return `dbos-kafka-group-${safeGroupIdPart}`.slice(0, 255);
|
|
132
|
+
}
|
|
119
133
|
logRegisteredKafkaEndpoints() {
|
|
120
134
|
const logger = this.dbosExec.logger;
|
|
121
135
|
logger.info("Kafka endpoints supported:");
|
|
122
136
|
this.dbosExec.registeredOperations.forEach((registeredOperation) => {
|
|
123
137
|
const ro = registeredOperation;
|
|
124
|
-
if (ro.
|
|
138
|
+
if (ro.kafkaTopics) {
|
|
125
139
|
const defaults = ro.defaults;
|
|
126
|
-
|
|
140
|
+
if (Array.isArray(ro.kafkaTopics)) {
|
|
141
|
+
ro.kafkaTopics.forEach(kafkaTopic => {
|
|
142
|
+
logger.info(` ${kafkaTopic} -> ${defaults.name}.${ro.name}`);
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
logger.info(` ${ro.kafkaTopics} -> ${defaults.name}.${ro.name}`);
|
|
147
|
+
}
|
|
127
148
|
}
|
|
128
149
|
});
|
|
129
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../../src/kafka/kafka.ts"],"names":[],"mappings":";;;AAAA,qCAAsH;AAEtH,8CAAmJ;AAInJ,oCAAqC;AACrC,oCAAiC;AAIjC,6BAA6B;AAC7B,6BAA6B;AAC7B,6BAA6B;AAE7B,MAAa,iBAAwD,SAAQ,+BAAsC;IACjH,
|
|
1
|
+
{"version":3,"file":"kafka.js","sourceRoot":"","sources":["../../../src/kafka/kafka.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,9 @@ import { LoggerConfig } from "./logs";
|
|
|
2
2
|
import { OTLPExporterConfig } from "./exporters";
|
|
3
3
|
import { Span } from "@opentelemetry/sdk-trace-base";
|
|
4
4
|
import { LogRecord } from "@opentelemetry/api-logs";
|
|
5
|
-
|
|
6
|
-
export declare function
|
|
5
|
+
import { TelemetrySignal } from "./collector";
|
|
6
|
+
export declare function isTraceSignal(signal: TelemetrySignal): signal is Span;
|
|
7
|
+
export declare function isLogSignal(signal: TelemetrySignal): signal is LogRecord;
|
|
7
8
|
export interface TelemetryConfig {
|
|
8
9
|
logs?: LoggerConfig;
|
|
9
10
|
OTLPExporter?: OTLPExporterConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,IAAI,IAAI,CAGrE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,IAAI,SAAS,CAGxE;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC"}
|
|
@@ -1,19 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isLogSignal = exports.isTraceSignal = void 0;
|
|
4
|
-
// We could implement our own types and avoid having `any`, but this has likely little value
|
|
5
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
6
4
|
function isTraceSignal(signal) {
|
|
7
5
|
// Span is an interface that has a property 'kind'
|
|
8
|
-
|
|
9
|
-
return signal && 'kind' in signal;
|
|
6
|
+
return 'kind' in signal;
|
|
10
7
|
}
|
|
11
8
|
exports.isTraceSignal = isTraceSignal;
|
|
12
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13
9
|
function isLogSignal(signal) {
|
|
14
10
|
// LogRecord is an interface that has a property 'severityText' and 'severityNumber'
|
|
15
|
-
|
|
16
|
-
return signal && 'severityText' in signal && 'severityNumber' in signal;
|
|
11
|
+
return 'severityText' in signal && 'severityNumber' in signal;
|
|
17
12
|
}
|
|
18
13
|
exports.isLogSignal = isLogSignal;
|
|
19
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/telemetry/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/telemetry/index.ts"],"names":[],"mappings":";;;AAMA,SAAgB,aAAa,CAAC,MAAuB;IACnD,kDAAkD;IAClD,OAAO,MAAM,IAAI,MAAM,CAAC;AAC1B,CAAC;AAHD,sCAGC;AAED,SAAgB,WAAW,CAAC,MAAuB;IACjD,oFAAoF;IACpF,OAAO,cAAc,IAAI,MAAM,IAAI,gBAAgB,IAAI,MAAM,CAAC;AAChE,CAAC;AAHD,kCAGC"}
|