@forklaunch/core 1.3.12 → 1.3.14
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/lib/{apiDefinition.types-CPWnG8GH.d.mts → apiDefinition.types-CCeDOt57.d.mts} +1 -1
- package/lib/{apiDefinition.types-BNRPj2PT.d.ts → apiDefinition.types-CKd_mi4-.d.ts} +1 -1
- package/lib/http/index.d.mts +7 -22
- package/lib/http/index.d.ts +7 -22
- package/lib/http/index.js +38 -29
- package/lib/http/index.js.map +1 -1
- package/lib/http/index.mjs +38 -29
- package/lib/http/index.mjs.map +1 -1
- package/lib/{openTelemetryCollector-DXGXRvQP.d.mts → openTelemetryCollector-BS-ej09T.d.mts} +22 -3
- package/lib/{openTelemetryCollector-DXGXRvQP.d.ts → openTelemetryCollector-BS-ej09T.d.ts} +22 -3
- package/lib/persistence/index.d.mts +2 -2
- package/lib/persistence/index.d.ts +2 -2
- package/lib/persistence/index.js +45 -1
- package/lib/persistence/index.js.map +1 -1
- package/lib/persistence/index.mjs +46 -2
- package/lib/persistence/index.mjs.map +1 -1
- package/lib/services/index.d.mts +3 -2
- package/lib/services/index.d.ts +3 -2
- package/lib/services/index.js.map +1 -1
- package/lib/services/index.mjs.map +1 -1
- package/lib/ws/index.d.mts +3 -2
- package/lib/ws/index.d.ts +3 -2
- package/package.json +1 -1
package/lib/http/index.mjs
CHANGED
|
@@ -346,7 +346,16 @@ async function getCachedJwks(jwksPublicKeyUrl) {
|
|
|
346
346
|
return cachedJwks.value;
|
|
347
347
|
} else {
|
|
348
348
|
const jwksResponse = await fetch(jwksPublicKeyUrl);
|
|
349
|
-
const
|
|
349
|
+
const text = await jwksResponse.text();
|
|
350
|
+
if (!text) {
|
|
351
|
+
if (cachedJwks.value) {
|
|
352
|
+
return cachedJwks.value;
|
|
353
|
+
}
|
|
354
|
+
throw new Error(
|
|
355
|
+
`JWKS endpoint returned empty response (status ${jwksResponse.status})`
|
|
356
|
+
);
|
|
357
|
+
}
|
|
358
|
+
const jwks = JSON.parse(text).keys;
|
|
350
359
|
cachedJwks.value = jwks;
|
|
351
360
|
cachedJwks.lastUpdated = /* @__PURE__ */ new Date();
|
|
352
361
|
cachedJwks.ttl = parseInt(
|
|
@@ -544,10 +553,10 @@ ${JSON.stringify(metadata, null, 2)}` : ""}`;
|
|
|
544
553
|
}
|
|
545
554
|
}
|
|
546
555
|
var PinoLogger = class _PinoLogger {
|
|
547
|
-
|
|
548
|
-
|
|
556
|
+
_pinoLogger;
|
|
557
|
+
_meta;
|
|
549
558
|
constructor(level, meta2 = {}) {
|
|
550
|
-
this
|
|
559
|
+
this._pinoLogger = pino({
|
|
551
560
|
level: level || "info",
|
|
552
561
|
formatters: {
|
|
553
562
|
level(label) {
|
|
@@ -565,7 +574,7 @@ var PinoLogger = class _PinoLogger {
|
|
|
565
574
|
}
|
|
566
575
|
}
|
|
567
576
|
});
|
|
568
|
-
this
|
|
577
|
+
this._meta = meta2;
|
|
569
578
|
}
|
|
570
579
|
log(level, ...args) {
|
|
571
580
|
let meta2 = {};
|
|
@@ -595,14 +604,14 @@ var PinoLogger = class _PinoLogger {
|
|
|
595
604
|
"correlation.id": "none",
|
|
596
605
|
...meta2
|
|
597
606
|
};
|
|
598
|
-
this
|
|
607
|
+
this._pinoLogger[level](...normalizeLogArgs(filteredArgs));
|
|
599
608
|
const formattedBody = safePrettyFormat(level, filteredArgs);
|
|
600
609
|
try {
|
|
601
610
|
logs.getLogger(process.env.OTEL_SERVICE_NAME ?? "unknown").emit({
|
|
602
611
|
severityText: level,
|
|
603
612
|
severityNumber: mapSeverity(level),
|
|
604
613
|
body: formattedBody,
|
|
605
|
-
attributes: { ...this
|
|
614
|
+
attributes: { ...this._meta, ...meta2 }
|
|
606
615
|
});
|
|
607
616
|
} catch (error) {
|
|
608
617
|
console.error("Failed to emit OpenTelemetry log:", error);
|
|
@@ -618,10 +627,10 @@ var PinoLogger = class _PinoLogger {
|
|
|
618
627
|
warn = (msg, ...args) => this.log("warn", msg, ...args);
|
|
619
628
|
trace = (msg, ...args) => this.log("trace", msg, ...args);
|
|
620
629
|
child(meta2 = {}) {
|
|
621
|
-
return new _PinoLogger(this
|
|
630
|
+
return new _PinoLogger(this._pinoLogger.level, { ...this._meta, ...meta2 });
|
|
622
631
|
}
|
|
623
632
|
getBaseLogger() {
|
|
624
|
-
return this
|
|
633
|
+
return this._pinoLogger;
|
|
625
634
|
}
|
|
626
635
|
};
|
|
627
636
|
function logger(level, meta2 = {}) {
|
|
@@ -946,38 +955,38 @@ function isForklaunchRequest(request) {
|
|
|
946
955
|
|
|
947
956
|
// src/http/telemetry/openTelemetryCollector.ts
|
|
948
957
|
var OpenTelemetryCollector = class {
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
958
|
+
_logger;
|
|
959
|
+
_serviceName;
|
|
960
|
+
_metrics;
|
|
952
961
|
// scoped creation and create this in middleware when api execute. Also add correlation id
|
|
953
962
|
constructor(serviceName, level, metricDefinitions) {
|
|
954
|
-
this
|
|
955
|
-
this
|
|
956
|
-
this
|
|
963
|
+
this._serviceName = serviceName;
|
|
964
|
+
this._logger = logger(level || "info");
|
|
965
|
+
this._metrics = {};
|
|
957
966
|
for (const [metricId, metricType] of Object.entries(
|
|
958
967
|
metricDefinitions ?? {}
|
|
959
968
|
)) {
|
|
960
969
|
switch (metricType) {
|
|
961
970
|
case "counter":
|
|
962
|
-
this
|
|
971
|
+
this._metrics[metricId] = metrics.getMeter(this._serviceName).createCounter(metricId);
|
|
963
972
|
break;
|
|
964
973
|
case "gauge":
|
|
965
|
-
this
|
|
974
|
+
this._metrics[metricId] = metrics.getMeter(this._serviceName).createGauge(metricId);
|
|
966
975
|
break;
|
|
967
976
|
case "histogram":
|
|
968
|
-
this
|
|
977
|
+
this._metrics[metricId] = metrics.getMeter(this._serviceName).createHistogram(metricId);
|
|
969
978
|
break;
|
|
970
979
|
case "upDownCounter":
|
|
971
|
-
this
|
|
980
|
+
this._metrics[metricId] = metrics.getMeter(this._serviceName).createUpDownCounter(metricId);
|
|
972
981
|
break;
|
|
973
982
|
case "observableCounter":
|
|
974
|
-
this
|
|
983
|
+
this._metrics[metricId] = metrics.getMeter(this._serviceName).createObservableCounter(metricId);
|
|
975
984
|
break;
|
|
976
985
|
case "observableGauge":
|
|
977
|
-
this
|
|
986
|
+
this._metrics[metricId] = metrics.getMeter(this._serviceName).createObservableGauge(metricId);
|
|
978
987
|
break;
|
|
979
988
|
case "observableUpDownCounter":
|
|
980
|
-
this
|
|
989
|
+
this._metrics[metricId] = metrics.getMeter(this._serviceName).createObservableUpDownCounter(metricId);
|
|
981
990
|
break;
|
|
982
991
|
}
|
|
983
992
|
}
|
|
@@ -987,25 +996,25 @@ var OpenTelemetryCollector = class {
|
|
|
987
996
|
);
|
|
988
997
|
}
|
|
989
998
|
log(level, ...args) {
|
|
990
|
-
this
|
|
999
|
+
this._logger.log(level, ...args);
|
|
991
1000
|
}
|
|
992
1001
|
info = (msg, ...args) => {
|
|
993
|
-
this
|
|
1002
|
+
this._logger.log("info", msg, ...args);
|
|
994
1003
|
};
|
|
995
1004
|
error = (msg, ...args) => {
|
|
996
|
-
this
|
|
1005
|
+
this._logger.log("error", msg, ...args);
|
|
997
1006
|
};
|
|
998
1007
|
warn = (msg, ...args) => {
|
|
999
|
-
this
|
|
1008
|
+
this._logger.log("warn", msg, ...args);
|
|
1000
1009
|
};
|
|
1001
1010
|
debug = (msg, ...args) => {
|
|
1002
|
-
this
|
|
1011
|
+
this._logger.log("debug", msg, ...args);
|
|
1003
1012
|
};
|
|
1004
1013
|
trace = (msg, ...args) => {
|
|
1005
|
-
this
|
|
1014
|
+
this._logger.log("trace", msg, ...args);
|
|
1006
1015
|
};
|
|
1007
1016
|
getMetric(metricId) {
|
|
1008
|
-
return this
|
|
1017
|
+
return this._metrics[metricId];
|
|
1009
1018
|
}
|
|
1010
1019
|
};
|
|
1011
1020
|
dotenv.config({ path: getEnvVar2("DOTENV_FILE_PATH") });
|