@jeffusion/bungee-core 6.8.2 → 6.9.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/config-storage-worker.js +37 -5
- package/dist/main.js +205 -94
- package/dist/observability-worker.js +36 -4
- package/package.json +2 -2
|
@@ -15214,6 +15214,7 @@ class LogQueryService {
|
|
|
15214
15214
|
transformer,
|
|
15215
15215
|
success,
|
|
15216
15216
|
transportOutcome,
|
|
15217
|
+
transportType,
|
|
15217
15218
|
searchTerm,
|
|
15218
15219
|
requestType,
|
|
15219
15220
|
sortBy = "timestamp",
|
|
@@ -15229,6 +15230,12 @@ class LogQueryService {
|
|
|
15229
15230
|
whereClauses.push("timestamp < ?");
|
|
15230
15231
|
whereParams.push(endTime);
|
|
15231
15232
|
}
|
|
15233
|
+
if (transportType !== undefined) {
|
|
15234
|
+
if (transportType !== "http" && transportType !== "websocket")
|
|
15235
|
+
throw new Error("Invalid transport type");
|
|
15236
|
+
whereClauses.push("transport_type = ?");
|
|
15237
|
+
whereParams.push(transportType);
|
|
15238
|
+
}
|
|
15232
15239
|
if (method) {
|
|
15233
15240
|
whereClauses.push("method = ?");
|
|
15234
15241
|
whereParams.push(method);
|
|
@@ -15330,6 +15337,7 @@ class LogQueryService {
|
|
|
15330
15337
|
transformer,
|
|
15331
15338
|
success,
|
|
15332
15339
|
transportOutcome,
|
|
15340
|
+
transportType,
|
|
15333
15341
|
searchTerm,
|
|
15334
15342
|
requestType,
|
|
15335
15343
|
sortBy = "timestamp",
|
|
@@ -15342,6 +15350,12 @@ class LogQueryService {
|
|
|
15342
15350
|
} = params;
|
|
15343
15351
|
const rowWhereClauses = [];
|
|
15344
15352
|
const rowWhereParams = [];
|
|
15353
|
+
if (transportType !== undefined) {
|
|
15354
|
+
if (transportType !== "http" && transportType !== "websocket")
|
|
15355
|
+
throw new Error("Invalid transport type");
|
|
15356
|
+
rowWhereClauses.push("transport_type = ?");
|
|
15357
|
+
rowWhereParams.push(transportType);
|
|
15358
|
+
}
|
|
15345
15359
|
if (method) {
|
|
15346
15360
|
rowWhereClauses.push("method = ?");
|
|
15347
15361
|
rowWhereParams.push(method);
|
|
@@ -15673,6 +15687,7 @@ class LogQueryService {
|
|
|
15673
15687
|
const headers = [
|
|
15674
15688
|
"requestId",
|
|
15675
15689
|
"timestamp",
|
|
15690
|
+
"transportType",
|
|
15676
15691
|
"method",
|
|
15677
15692
|
"path",
|
|
15678
15693
|
"query",
|
|
@@ -15699,6 +15714,7 @@ class LogQueryService {
|
|
|
15699
15714
|
return [
|
|
15700
15715
|
entry.requestId,
|
|
15701
15716
|
new Date(entry.timestamp).toISOString(),
|
|
15717
|
+
entry.transportType ?? "",
|
|
15702
15718
|
entry.method,
|
|
15703
15719
|
`"${entry.path}"`,
|
|
15704
15720
|
entry.query ? `"${entry.query}"` : "",
|
|
@@ -15946,6 +15962,7 @@ class LogQueryService {
|
|
|
15946
15962
|
requestId: row.request_id,
|
|
15947
15963
|
timestamp: row.timestamp,
|
|
15948
15964
|
method: row.method,
|
|
15965
|
+
transportType: row.transport_type,
|
|
15949
15966
|
path: row.path,
|
|
15950
15967
|
query: row.query || undefined,
|
|
15951
15968
|
status: row.status,
|
|
@@ -15992,10 +16009,14 @@ function getSingleParam(url, name) {
|
|
|
15992
16009
|
const values = url.searchParams.getAll(name);
|
|
15993
16010
|
return values.length === 0 ? undefined : values.length === 1 && values[0] !== "" ? values[0] : null;
|
|
15994
16011
|
}
|
|
15995
|
-
function
|
|
16012
|
+
function getLogFilters(url) {
|
|
15996
16013
|
const values = url.searchParams.getAll("status");
|
|
15997
16014
|
const statuses = values.map((value) => /^\d{3}$/.test(value) ? Number(value) : NaN);
|
|
15998
16015
|
const transport = getSingleParam(url, "transportOutcome");
|
|
16016
|
+
const transportType = getSingleParam(url, "transportType");
|
|
16017
|
+
if (transportType !== undefined && transportType !== "http" && transportType !== "websocket") {
|
|
16018
|
+
return Response.json({ error: "transportType must be http or websocket" }, { status: 400 });
|
|
16019
|
+
}
|
|
15999
16020
|
if (statuses.some((value) => !Number.isInteger(value) || value < 100 || value > 599)) {
|
|
16000
16021
|
return Response.json({ error: "status must contain HTTP status codes between 100 and 599" }, { status: 400 });
|
|
16001
16022
|
}
|
|
@@ -16004,6 +16025,7 @@ function getOutcomeFilters(url) {
|
|
|
16004
16025
|
}
|
|
16005
16026
|
return {
|
|
16006
16027
|
status: statuses.length === 0 ? undefined : statuses.length === 1 ? statuses[0] : [...new Set(statuses)],
|
|
16028
|
+
transportType,
|
|
16007
16029
|
transportOutcome: transport
|
|
16008
16030
|
};
|
|
16009
16031
|
}
|
|
@@ -16039,7 +16061,7 @@ class LogsHandler {
|
|
|
16039
16061
|
try {
|
|
16040
16062
|
const url = new URL(req.url);
|
|
16041
16063
|
const groupBy = url.searchParams.get("groupBy");
|
|
16042
|
-
const outcomeFilters =
|
|
16064
|
+
const outcomeFilters = getLogFilters(url);
|
|
16043
16065
|
if (outcomeFilters instanceof Response)
|
|
16044
16066
|
return outcomeFilters;
|
|
16045
16067
|
const params = {
|
|
@@ -16277,7 +16299,7 @@ class LogsHandler {
|
|
|
16277
16299
|
const format = url.searchParams.get("format") || "json";
|
|
16278
16300
|
if (format !== "json" && format !== "csv")
|
|
16279
16301
|
return Response.json({ error: "format must be json or csv" }, { status: 400 });
|
|
16280
|
-
const outcomeFilters =
|
|
16302
|
+
const outcomeFilters = getLogFilters(url);
|
|
16281
16303
|
if (outcomeFilters instanceof Response)
|
|
16282
16304
|
return outcomeFilters;
|
|
16283
16305
|
const params = {
|
|
@@ -17604,6 +17626,16 @@ var ACCESS_BASELINE = {
|
|
|
17604
17626
|
}
|
|
17605
17627
|
};
|
|
17606
17628
|
|
|
17629
|
+
// src/migrations/access-log-transport-type.ts
|
|
17630
|
+
var ACCESS_LOG_TRANSPORT_TYPE = {
|
|
17631
|
+
version: "005",
|
|
17632
|
+
name: "access_log_transport_type",
|
|
17633
|
+
up(db) {
|
|
17634
|
+
db.run(`ALTER TABLE access_logs ADD COLUMN transport_type TEXT
|
|
17635
|
+
CHECK (transport_type IS NULL OR transport_type IN ('http', 'websocket'))`);
|
|
17636
|
+
}
|
|
17637
|
+
};
|
|
17638
|
+
|
|
17607
17639
|
// src/migrations/migration-manager.ts
|
|
17608
17640
|
import { Database as Database4 } from "bun:sqlite";
|
|
17609
17641
|
import { mkdirSync as mkdirSync2, existsSync } from "fs";
|
|
@@ -18074,7 +18106,7 @@ class MigrationManager {
|
|
|
18074
18106
|
}
|
|
18075
18107
|
|
|
18076
18108
|
// src/migrations/index.ts
|
|
18077
|
-
var migrations = [ACCESS_BASELINE, LLM_TPS_SAMPLES, LLM_TPS_MODEL, LLM_TPS_UPSTREAM_HOST];
|
|
18109
|
+
var migrations = [ACCESS_BASELINE, LLM_TPS_SAMPLES, LLM_TPS_MODEL, LLM_TPS_UPSTREAM_HOST, ACCESS_LOG_TRANSPORT_TYPE];
|
|
18078
18110
|
|
|
18079
18111
|
// src/master-runtime/observability-worker.ts
|
|
18080
18112
|
function headerEntries(headers) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jeffusion/bungee-core",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.9.0",
|
|
4
4
|
"description": "Bungee reverse proxy core engine",
|
|
5
5
|
"main": "./dist/main.js",
|
|
6
6
|
"types": "./dist/main.d.ts",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"@iconify-json/lucide": "^1.2.145",
|
|
17
17
|
"@iconify-json/tabler": "^1.2.42",
|
|
18
18
|
"@iconify/utils": "^3.1.7",
|
|
19
|
-
"@jeffusion/bungee-types": "^6.
|
|
19
|
+
"@jeffusion/bungee-types": "^6.9.0",
|
|
20
20
|
"@types/lodash-es": "^4.17.12",
|
|
21
21
|
"@types/ws": "^8.18.1",
|
|
22
22
|
"acorn": "^8.15.0",
|