@antelopejs/dms-api 0.1.3 → 0.1.5
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/README.md +6 -4
- package/dist/db/models/routes.model.d.ts +1 -0
- package/dist/db/models/routes.model.js +9 -0
- package/dist/db/models/routes.model.js.map +1 -1
- package/dist/db/models/routes_statistics.model.d.ts +2 -0
- package/dist/db/models/routes_statistics.model.js +12 -0
- package/dist/db/models/routes_statistics.model.js.map +1 -1
- package/dist/db/tables/request_log.table.js +0 -1
- package/dist/db/tables/request_log.table.js.map +1 -1
- package/dist/db/tables/routes_statistics.table.d.ts +2 -0
- package/dist/db/tables/routes_statistics.table.js +9 -1
- package/dist/db/tables/routes_statistics.table.js.map +1 -1
- package/dist/pages/module.d.ts +1 -1
- package/dist/pages/settings/form.d.ts +1 -1
- package/dist/pages/settings/page.d.ts +1 -1
- package/dist/routes/routes.d.ts +1 -1
- package/dist/routes/routes.js +2 -2
- package/dist/routes/routes.js.map +1 -1
- package/dist/services/request-log/read.d.ts +1 -1
- package/dist/services/request-log/read.js +2 -2
- package/dist/services/request-log/read.js.map +1 -1
- package/dist/services/routes-sync.js +2 -1
- package/dist/services/routes-sync.js.map +1 -1
- package/dist/services/statistics-prune.d.ts +2 -2
- package/dist/services/statistics-prune.js +19 -4
- package/dist/services/statistics-prune.js.map +1 -1
- package/dist/services/statistics-write.d.ts +4 -1
- package/dist/services/statistics-write.js +34 -18
- package/dist/services/statistics-write.js.map +1 -1
- package/frontend-vue/package.json +1 -3
- package/frontend-vue/pnpm-lock.yaml +100 -226
- package/package.json +10 -9
package/README.md
CHANGED
|
@@ -55,7 +55,9 @@ screenshots or shared demos. The module prunes logs and statistics hourly.
|
|
|
55
55
|
|
|
56
56
|
Use the pnpm version declared in `package.json`. The repository's `dev` script
|
|
57
57
|
starts its playground backend; `frontend:dev` starts the published Inertia
|
|
58
|
-
dashboard loader.
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
dashboard loader. The playground connects to MongoDB at
|
|
59
|
+
`mongodb://localhost:27017` unless `MONGO_URL` points it elsewhere. `pnpm build`
|
|
60
|
+
compiles the backend, and `pnpm test` runs the backend unit tests (`tests/`)
|
|
61
|
+
followed by the frontend test suite. To typecheck
|
|
62
|
+
the complete application, set `DMS_FRONTEND_WORKSPACE` to the workspace
|
|
63
|
+
generated by `ajs dms prepare`, then run `pnpm --dir frontend-vue typecheck`.
|
|
@@ -18,5 +18,6 @@ declare const RouteModel_base: {
|
|
|
18
18
|
validate(obj: unknown, options?: import("@antelopejs/interface-database-decorators").ValidateInputOptions): import("@antelopejs/interface-database-decorators").ValidationResult;
|
|
19
19
|
};
|
|
20
20
|
export declare class RouteModel extends RouteModel_base {
|
|
21
|
+
getByRoute(method: string, uri: string): Promise<Route | undefined>;
|
|
21
22
|
}
|
|
22
23
|
export {};
|
|
@@ -3,7 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RouteModel = void 0;
|
|
4
4
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
5
5
|
const routes_table_1 = require("../tables/routes.table");
|
|
6
|
+
const routes_statistics_table_1 = require("../tables/routes_statistics.table");
|
|
6
7
|
class RouteModel extends (0, interface_database_decorators_1.BasicDataModel)(routes_table_1.Route, routes_table_1.routesTableName) {
|
|
8
|
+
async getByRoute(method, uri) {
|
|
9
|
+
const normalized = (0, routes_statistics_table_1.normalizeRouteMethod)(method);
|
|
10
|
+
const [route] = await this.table
|
|
11
|
+
.filter((row) => row.key("method").eq(normalized).and(row.key("uri").eq(uri)))
|
|
12
|
+
.slice(0, 1)
|
|
13
|
+
.run();
|
|
14
|
+
return RouteModel.fromDatabase(route);
|
|
15
|
+
}
|
|
7
16
|
}
|
|
8
17
|
exports.RouteModel = RouteModel;
|
|
9
18
|
//# sourceMappingURL=routes.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.model.js","sourceRoot":"","sources":["../../../src/db/models/routes.model.ts"],"names":[],"mappings":";;;AAAA,6FAA2E;AAC3E,yDAAgE;
|
|
1
|
+
{"version":3,"file":"routes.model.js","sourceRoot":"","sources":["../../../src/db/models/routes.model.ts"],"names":[],"mappings":";;;AAAA,6FAA2E;AAC3E,yDAAgE;AAChE,+EAAyE;AAEzE,MAAa,UAAW,SAAQ,IAAA,8CAAc,EAAC,oBAAK,EAAE,8BAAe,CAAC;IAMpE,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,GAAW;QAC1C,MAAM,UAAU,GAAG,IAAA,8CAAoB,EAAC,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK;aAC7B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACd,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAC7D;aACA,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;aACX,GAAG,EAAE,CAAC;QACT,OAAO,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;CACF;AAhBD,gCAgBC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { AtomicMutationOutcome } from "@antelopejs/interface-database/atomic";
|
|
1
2
|
import { RouteStatistics } from "../tables/routes_statistics.table";
|
|
2
3
|
declare const RouteStatisticsModel_base: {
|
|
3
4
|
new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
|
|
@@ -19,5 +20,6 @@ declare const RouteStatisticsModel_base: {
|
|
|
19
20
|
};
|
|
20
21
|
export declare class RouteStatisticsModel extends RouteStatisticsModel_base {
|
|
21
22
|
getByRoute(method: string, uri: string): Promise<RouteStatistics | undefined>;
|
|
23
|
+
replaceStatistics(doc: RouteStatistics): Promise<AtomicMutationOutcome>;
|
|
22
24
|
}
|
|
23
25
|
export {};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RouteStatisticsModel = void 0;
|
|
4
|
+
const node_crypto_1 = require("node:crypto");
|
|
4
5
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
5
6
|
const routes_statistics_table_1 = require("../tables/routes_statistics.table");
|
|
6
7
|
class RouteStatisticsModel extends (0, interface_database_decorators_1.BasicDataModel)(routes_statistics_table_1.RouteStatistics, routes_statistics_table_1.routesStatisticsTableName) {
|
|
@@ -8,6 +9,17 @@ class RouteStatisticsModel extends (0, interface_database_decorators_1.BasicData
|
|
|
8
9
|
const id = (0, routes_statistics_table_1.getRouteStatsKey)(method, uri);
|
|
9
10
|
return this.get(id);
|
|
10
11
|
}
|
|
12
|
+
async replaceStatistics(doc) {
|
|
13
|
+
return this.table
|
|
14
|
+
.atomicMutation(doc._id, {
|
|
15
|
+
type: "update",
|
|
16
|
+
revisionField: "revision",
|
|
17
|
+
expectedRevision: doc.revision ?? { kind: "missing" },
|
|
18
|
+
nextRevision: (0, node_crypto_1.randomUUID)(),
|
|
19
|
+
patch: { statistics: doc.statistics },
|
|
20
|
+
})
|
|
21
|
+
.run();
|
|
22
|
+
}
|
|
11
23
|
}
|
|
12
24
|
exports.RouteStatisticsModel = RouteStatisticsModel;
|
|
13
25
|
//# sourceMappingURL=routes_statistics.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes_statistics.model.js","sourceRoot":"","sources":["../../../src/db/models/routes_statistics.model.ts"],"names":[],"mappings":";;;AAAA,6FAA2E;AAC3E,+EAI2C;AAE3C,MAAa,oBAAqB,SAAQ,IAAA,8CAAc,EACtD,yCAAe,EACf,mDAAyB,CAC1B;IAIC,KAAK,CAAC,UAAU,CACd,MAAc,EACd,GAAW;QAEX,MAAM,EAAE,GAAG,IAAA,0CAAgB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"routes_statistics.model.js","sourceRoot":"","sources":["../../../src/db/models/routes_statistics.model.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,6FAA2E;AAC3E,+EAI2C;AAE3C,MAAa,oBAAqB,SAAQ,IAAA,8CAAc,EACtD,yCAAe,EACf,mDAAyB,CAC1B;IAIC,KAAK,CAAC,UAAU,CACd,MAAc,EACd,GAAW;QAEX,MAAM,EAAE,GAAG,IAAA,0CAAgB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;IAQD,KAAK,CAAC,iBAAiB,CACrB,GAAoB;QAEpB,OAAO,IAAI,CAAC,KAAK;aACd,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE;YACvB,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,UAAU;YACzB,gBAAgB,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;YACrD,YAAY,EAAE,IAAA,wBAAU,GAAE;YAC1B,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE;SACtC,CAAC;aACD,GAAG,EAAE,CAAC;IACX,CAAC;CACF;AAlCD,oDAkCC"}
|
|
@@ -19,7 +19,6 @@ let RequestLog = class RequestLog extends interface_database_decorators_1.Table
|
|
|
19
19
|
exports.RequestLog = RequestLog;
|
|
20
20
|
__decorate([
|
|
21
21
|
(0, interface_database_decorators_1.Index)({ group: exports.REQUEST_LOG_ORDER_INDEX }),
|
|
22
|
-
(0, interface_database_decorators_1.Index)(),
|
|
23
22
|
(0, interface_database_decorators_1.Field)("date"),
|
|
24
23
|
__metadata("design:type", Date)
|
|
25
24
|
], RequestLog.prototype, "timestamp", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_log.table.js","sourceRoot":"","sources":["../../../src/db/tables/request_log.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAKmD;AAEnD,qDAAoD;AAEvC,QAAA,mBAAmB,GAAG,aAAa,CAAC;AACpC,QAAA,uBAAuB,GAAG,cAAc,CAAC;AAQ/C,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"request_log.table.js","sourceRoot":"","sources":["../../../src/db/tables/request_log.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAKmD;AAEnD,qDAAoD;AAEvC,QAAA,mBAAmB,GAAG,aAAa,CAAC;AACpC,QAAA,uBAAuB,GAAG,cAAc,CAAC;AAQ/C,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,qCAAK;CAuEpC,CAAA;AAvEY,gCAAU;AAMb;IAFP,IAAA,qCAAK,EAAC,EAAE,KAAK,EAAE,+BAAuB,EAAE,CAAC;IACzC,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;6CAAC;AAIhB;IAFP,IAAA,qCAAK,EAAC,EAAE,KAAK,EAAE,+BAAuB,EAAE,CAAC;IACzC,IAAA,qCAAK,EAAC,QAAQ,CAAC;;uCACI;AAIZ;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;0CACW;AAMnB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;uCACI;AAIZ;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;2CACQ;AAKhB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;2CACS;AAGjB;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;8CAC8B;AAGnC;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;yCACoC;AAGzC;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;kDACkC;AAGvC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+CACa;AAGrB;IADP,IAAA,qCAAK,EAAC,SAAS,CAAC;;wDACqB;AAI9B;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;8CACW;AAInB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;kDACe;AAGvB;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;mDACmC;AAGxC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;gDACc;AAGtB;IADP,IAAA,qCAAK,EAAC,SAAS,CAAC;;yDACsB;AAG/B;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;yCACmB;AAGxB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;sCACI;AAGZ;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;6CACW;qBAtEhB,UAAU;IADtB,IAAA,6CAAa,EAAC,2BAAmB,EAAE,uBAAW,CAAC;GACnC,UAAU,CAuEtB"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Table } from "@antelopejs/interface-database-decorators";
|
|
2
2
|
import type { DayStatistics, HttpMethod } from "@/types";
|
|
3
3
|
export declare const routesStatisticsTableName = "routes_statistics";
|
|
4
|
+
export declare function normalizeRouteMethod(method: string): string;
|
|
4
5
|
export declare function getRouteStatsKey(method: string, uri: string): string;
|
|
5
6
|
export declare class RouteStatistics extends Table {
|
|
6
7
|
method: HttpMethod;
|
|
7
8
|
uri: string;
|
|
8
9
|
statistics: DayStatistics[];
|
|
10
|
+
revision?: string;
|
|
9
11
|
}
|
|
@@ -10,12 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.RouteStatistics = exports.routesStatisticsTableName = void 0;
|
|
13
|
+
exports.normalizeRouteMethod = normalizeRouteMethod;
|
|
13
14
|
exports.getRouteStatsKey = getRouteStatsKey;
|
|
14
15
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
15
16
|
const constants_1 = require("../../types/constants");
|
|
16
17
|
exports.routesStatisticsTableName = "routes_statistics";
|
|
18
|
+
function normalizeRouteMethod(method) {
|
|
19
|
+
return method.toUpperCase();
|
|
20
|
+
}
|
|
17
21
|
function getRouteStatsKey(method, uri) {
|
|
18
|
-
return `${method
|
|
22
|
+
return `${normalizeRouteMethod(method)}:${uri}`;
|
|
19
23
|
}
|
|
20
24
|
let RouteStatistics = class RouteStatistics extends interface_database_decorators_1.Table {
|
|
21
25
|
};
|
|
@@ -32,6 +36,10 @@ __decorate([
|
|
|
32
36
|
(0, interface_database_decorators_1.Field)(["any"]),
|
|
33
37
|
__metadata("design:type", Array)
|
|
34
38
|
], RouteStatistics.prototype, "statistics", void 0);
|
|
39
|
+
__decorate([
|
|
40
|
+
(0, interface_database_decorators_1.Field)("string"),
|
|
41
|
+
__metadata("design:type", String)
|
|
42
|
+
], RouteStatistics.prototype, "revision", void 0);
|
|
35
43
|
exports.RouteStatistics = RouteStatistics = __decorate([
|
|
36
44
|
(0, interface_database_decorators_1.RegisterTable)(exports.routesStatisticsTableName, constants_1.SCHEMA_NAME)
|
|
37
45
|
], RouteStatistics);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes_statistics.table.js","sourceRoot":"","sources":["../../../src/db/tables/routes_statistics.table.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"routes_statistics.table.js","sourceRoot":"","sources":["../../../src/db/tables/routes_statistics.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAcA,oDAEC;AAOD,4CAEC;AAzBD,6FAImD;AAEnD,qDAAoD;AAEvC,QAAA,yBAAyB,GAAG,mBAAmB,CAAC;AAM7D,SAAgB,oBAAoB,CAAC,MAAc;IACjD,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC;AAC9B,CAAC;AAOD,SAAgB,gBAAgB,CAAC,MAAc,EAAE,GAAW;IAC1D,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;AAClD,CAAC;AAGM,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,qCAAK;CAiBzC,CAAA;AAjBY,0CAAe;AAElB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+CACW;AAGnB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;4CACI;AAGZ;IADP,IAAA,qCAAK,EAAC,CAAC,KAAK,CAAC,CAAC;;mDACqB;AAQ5B;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;iDACU;0BAhBf,eAAe;IAD3B,IAAA,6CAAa,EAAC,iCAAyB,EAAE,uBAAW,CAAC;GACzC,eAAe,CAiB3B"}
|
package/dist/pages/module.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const apiModule: import("@antelopejs/interface-dms
|
|
1
|
+
export declare const apiModule: import("@antelopejs/interface-dms").CategoryInfo;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { formSchema } from "@antelopejs/interface-dms/base";
|
|
2
|
-
export declare const apiSettingsForm: import("@antelopejs/interface-dms/
|
|
2
|
+
export declare const apiSettingsForm: import("@antelopejs/interface-dms/base").FormBuilder;
|
|
3
3
|
export declare const apiSettingsFormSchema: ReturnType<typeof formSchema>;
|
|
@@ -4,6 +4,6 @@ declare const ApiSettingsPage_base: {
|
|
|
4
4
|
location: string;
|
|
5
5
|
};
|
|
6
6
|
export declare class ApiSettingsPage extends ApiSettingsPage_base {
|
|
7
|
-
static content: import("@antelopejs/interface-dms/
|
|
7
|
+
static content: import("@antelopejs/interface-dms/base").FormBuilder;
|
|
8
8
|
}
|
|
9
9
|
export {};
|
package/dist/routes/routes.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { User } from "@antelopejs/interface-dms/auth/db";
|
|
2
2
|
declare const RoutesController_base: import("@antelopejs/interface-api").ControllerClass<object>;
|
|
3
3
|
export declare class RoutesController extends RoutesController_base {
|
|
4
|
-
getTree(_user: User, period?: string): Promise<import("@antelopejs/interface-dms/
|
|
4
|
+
getTree(_user: User, period?: string): Promise<import("@antelopejs/interface-dms/base").TreeNode[]>;
|
|
5
5
|
getRouteDoc(_user: User, id: string): Promise<{
|
|
6
6
|
registeredAt: Date | null;
|
|
7
7
|
updatedAt: Date | null;
|
package/dist/routes/routes.js
CHANGED
|
@@ -39,7 +39,7 @@ let RoutesController = class RoutesController extends (0, interface_api_1.Contro
|
|
|
39
39
|
async getRouteDoc(_user, id) {
|
|
40
40
|
const inspection = (0, introspection_1.getRouteInspection)(id);
|
|
41
41
|
(0, interface_api_util_1.assert)(inspection, 404, "Route not found");
|
|
42
|
-
const route = await (0, interface_database_decorators_1.GetModel)(db_1.RouteModel).
|
|
42
|
+
const route = await (0, interface_database_decorators_1.GetModel)(db_1.RouteModel).getByRoute(inspection.method, inspection.location);
|
|
43
43
|
return {
|
|
44
44
|
...inspection,
|
|
45
45
|
registeredAt: route?.createdAt ?? null,
|
|
@@ -61,7 +61,7 @@ let RoutesController = class RoutesController extends (0, interface_api_1.Contro
|
|
|
61
61
|
(0, statistics_read_1.getRouteStatistics)(stats, inspection.method, inspection.location, days),
|
|
62
62
|
(0, statistics_read_1.getResponseTimesStatistics)(stats, inspection.method, inspection.location, days),
|
|
63
63
|
(0, statistics_aggregate_1.getRouteAggregate)(stats, inspection.method, inspection.location, days),
|
|
64
|
-
(0, read_1.getRecentLogsForRoute)(log,
|
|
64
|
+
(0, read_1.getRecentLogsForRoute)(log, inspection.method, inspection.location, RECENT_LOGS_DEFAULT),
|
|
65
65
|
]);
|
|
66
66
|
return {
|
|
67
67
|
route: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/routes/routes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuE;AACvE,uEAAwD;AACxD,6FAAqE;AACrE,yDAA4E;AAE5E,6BAAyE;AACzE,4DAGkC;AAClC,8CAAuE;AACvE,sDAAoE;AACpE,4CAAsD;AACtD,kDAAqD;AACrD,0EAGyC;AACzC,gEAGoC;AACpC,0CAAuD;AAEvD,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAQxB,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,IAAA,0BAAU,EAAC,wBAAwB,CAAC;IAElE,AAAN,KAAK,CAAC,OAAO,CACI,KAAW,EACI,MAAe;QAE7C,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtC,IAAA,wCAAQ,EAAC,yBAAoB,CAAC,CAAC,MAAM,EAAE;YACvC,IAAA,0BAAkB,EAAC,IAAA,wCAAQ,EAAC,eAAU,CAAC,EAAE,IAAA,yBAAc,GAAE,CAAC;SAC3D,CAAC,CAAC;QACH,OAAO,IAAA,2BAAoB,EAAC,KAAK,EAAE,IAAI,EAAE,IAAA,wBAAe,EAAC,MAAM,CAAC,CAAC,CAAC;IACpE,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACA,KAAW,EACA,EAAU;QAEpC,MAAM,UAAU,GAAG,IAAA,kCAAkB,EAAC,EAAE,CAAC,CAAC;QAC1C,IAAA,2BAAM,EAAC,UAAU,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAA,wCAAQ,EAAC,eAAU,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/routes/routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,4 @@ import type { RequestLogFilters, RequestLogPage } from "@/db/models/request_log.
|
|
|
3
3
|
import type { RequestLog } from "@/db/tables/request_log.table";
|
|
4
4
|
export declare function queryRequestLogsScoped(model: RequestLogModel, filters: RequestLogFilters, keys: Set<string> | null | undefined): Promise<RequestLogPage>;
|
|
5
5
|
export declare function getRequestLog(model: RequestLogModel, id: string): Promise<RequestLog | undefined>;
|
|
6
|
-
export declare function getRecentLogsForRoute(model: RequestLogModel,
|
|
6
|
+
export declare function getRecentLogsForRoute(model: Pick<RequestLogModel, "query">, method: string, uri: string, limit?: number): Promise<RequestLog[]>;
|
|
@@ -19,8 +19,8 @@ function queryRequestLogsScoped(model, filters, keys) {
|
|
|
19
19
|
async function getRequestLog(model, id) {
|
|
20
20
|
return model.get(id);
|
|
21
21
|
}
|
|
22
|
-
async function getRecentLogsForRoute(model,
|
|
23
|
-
const page = await model.query({
|
|
22
|
+
async function getRecentLogsForRoute(model, method, uri, limit = 20) {
|
|
23
|
+
const page = await model.query({ method, uri, limit });
|
|
24
24
|
return page.results;
|
|
25
25
|
}
|
|
26
26
|
//# sourceMappingURL=read.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/services/request-log/read.ts"],"names":[],"mappings":";;AA8BA,wDAsBC;AAED,sCAKC;
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../src/services/request-log/read.ts"],"names":[],"mappings":";;AA8BA,wDAsBC;AAED,sCAKC;AAQD,sDAQC;AArED,mCAAqC;AAQrC,MAAM,uBAAuB,GAAG,EAAE,GAAG,kBAAU,CAAC;AAgBhD,SAAgB,sBAAsB,CACpC,KAAsB,EACtB,OAA0B,EAC1B,IAAoC;IAEpC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAKvC,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,OAAO,KAAK,CAAC,KAAK,CAAC;QAMjB,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,uBAAuB,CAAC;QACrD,GAAG,OAAO;QACV,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC;KACrB,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,KAAsB,EACtB,EAAU;IAEV,OAAO,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACvB,CAAC;AAQM,KAAK,UAAU,qBAAqB,CACzC,KAAqC,EACrC,MAAc,EACd,GAAW,EACX,KAAK,GAAG,EAAE;IAEV,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IACvD,OAAO,IAAI,CAAC,OAAO,CAAC;AACtB,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.syncRoutes = syncRoutes;
|
|
4
|
+
const routes_statistics_table_1 = require("@/db/tables/routes_statistics.table");
|
|
4
5
|
const scope_1 = require("./scope");
|
|
5
6
|
function normalizeMethod(method) {
|
|
6
|
-
return
|
|
7
|
+
return (0, routes_statistics_table_1.normalizeRouteMethod)(method);
|
|
7
8
|
}
|
|
8
9
|
function getRouteKey(method, uri) {
|
|
9
10
|
return `${normalizeMethod(method)}:${uri}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes-sync.js","sourceRoot":"","sources":["../../src/services/routes-sync.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"routes-sync.js","sourceRoot":"","sources":["../../src/services/routes-sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export declare function pruneAllStatistics(statsModel:
|
|
1
|
+
import { type RouteStatisticsStore } from "./statistics-write";
|
|
2
|
+
export declare function pruneAllStatistics(statsModel: RouteStatisticsStore): Promise<number>;
|
|
@@ -3,9 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.pruneAllStatistics = pruneAllStatistics;
|
|
4
4
|
const config_1 = require("@/config");
|
|
5
5
|
const statistics_utils_1 = require("./statistics-utils");
|
|
6
|
+
const statistics_write_1 = require("./statistics-write");
|
|
6
7
|
function pruneOldStats(statistics, cutoff) {
|
|
7
8
|
return statistics.filter((stat) => stat.day >= cutoff);
|
|
8
9
|
}
|
|
10
|
+
async function pruneRouteStats(statsModel, initial, cutoff) {
|
|
11
|
+
let routeStats = initial;
|
|
12
|
+
for (let attempt = 0; attempt < statistics_write_1.MAX_STATISTICS_WRITE_ATTEMPTS; attempt++) {
|
|
13
|
+
if (!routeStats)
|
|
14
|
+
return false;
|
|
15
|
+
const pruned = pruneOldStats(routeStats.statistics, cutoff);
|
|
16
|
+
if (pruned.length === routeStats.statistics.length)
|
|
17
|
+
return false;
|
|
18
|
+
routeStats.statistics = pruned;
|
|
19
|
+
const outcome = await statsModel.replaceStatistics(routeStats);
|
|
20
|
+
if (outcome !== "not-applied")
|
|
21
|
+
return outcome === "applied";
|
|
22
|
+
await (0, statistics_write_1.statisticsRetryDelay)(attempt + 1);
|
|
23
|
+
routeStats = await statsModel.get(routeStats._id);
|
|
24
|
+
}
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
9
27
|
async function pruneAllStatistics(statsModel) {
|
|
10
28
|
const { statisticsLifetime } = (0, config_1.getConfig)();
|
|
11
29
|
const today = (0, statistics_utils_1.getTodayTimestamp)();
|
|
@@ -13,10 +31,7 @@ async function pruneAllStatistics(statsModel) {
|
|
|
13
31
|
const allStats = await statsModel.getAll();
|
|
14
32
|
let prunedCount = 0;
|
|
15
33
|
for (const routeStats of allStats) {
|
|
16
|
-
|
|
17
|
-
routeStats.statistics = pruneOldStats(routeStats.statistics, cutoff);
|
|
18
|
-
if (routeStats.statistics.length < originalLength) {
|
|
19
|
-
await statsModel.update(routeStats);
|
|
34
|
+
if (await pruneRouteStats(statsModel, routeStats, cutoff)) {
|
|
20
35
|
prunedCount++;
|
|
21
36
|
}
|
|
22
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statistics-prune.js","sourceRoot":"","sources":["../../src/services/statistics-prune.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"statistics-prune.js","sourceRoot":"","sources":["../../src/services/statistics-prune.ts"],"names":[],"mappings":";;AA+CA,gDAiBC;AAhED,qCAAqC;AAGrC,yDAAuD;AACvD,yDAI4B;AAE5B,SAAS,aAAa,CACpB,UAA2B,EAC3B,MAAc;IAEd,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC;AACzD,CAAC;AAQD,KAAK,UAAU,eAAe,CAC5B,UAAgC,EAChC,OAAwB,EACxB,MAAc;IAEd,IAAI,UAAU,GAAgC,OAAO,CAAC;IACtD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,gDAA6B,EAAE,OAAO,EAAE,EAAE,CAAC;QACzE,IAAI,CAAC,UAAU;YAAE,OAAO,KAAK,CAAC;QAC9B,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC5D,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACjE,UAAU,CAAC,UAAU,GAAG,MAAM,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC/D,IAAI,OAAO,KAAK,aAAa;YAAE,OAAO,OAAO,KAAK,SAAS,CAAC;QAC5D,MAAM,IAAA,uCAAoB,EAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QACxC,UAAU,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAOM,KAAK,UAAU,kBAAkB,CACtC,UAAgC;IAEhC,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAA,oCAAiB,GAAE,CAAC;IAClC,MAAM,MAAM,GAAG,KAAK,GAAG,kBAAkB,CAAC;IAE1C,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;IAC3C,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,KAAK,MAAM,UAAU,IAAI,QAAQ,EAAE,CAAC;QAClC,IAAI,MAAM,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;YAC1D,WAAW,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import type { RouteStatisticsModel } from "@/db";
|
|
2
2
|
import type { RequestStatistics } from "@/types";
|
|
3
|
-
export
|
|
3
|
+
export type RouteStatisticsStore = Pick<RouteStatisticsModel, "get" | "getAll" | "insert" | "replaceStatistics">;
|
|
4
|
+
export declare const MAX_STATISTICS_WRITE_ATTEMPTS = 10;
|
|
5
|
+
export declare function statisticsRetryDelay(attempt: number): Promise<void>;
|
|
6
|
+
export declare function addRequestStatistics(model: RouteStatisticsStore, request: RequestStatistics): Promise<void>;
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MAX_STATISTICS_WRITE_ATTEMPTS = void 0;
|
|
4
|
+
exports.statisticsRetryDelay = statisticsRetryDelay;
|
|
3
5
|
exports.addRequestStatistics = addRequestStatistics;
|
|
6
|
+
const node_crypto_1 = require("node:crypto");
|
|
4
7
|
const routes_statistics_table_1 = require("@/db/tables/routes_statistics.table");
|
|
5
8
|
const statistics_utils_1 = require("./statistics-utils");
|
|
6
9
|
function isClientError(statusCode) {
|
|
@@ -51,34 +54,47 @@ function updateRouteStats(existing, request, today) {
|
|
|
51
54
|
existing.statistics.push(createDayStats(request, today));
|
|
52
55
|
}
|
|
53
56
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
57
|
+
exports.MAX_STATISTICS_WRITE_ATTEMPTS = 10;
|
|
58
|
+
const RETRY_BASE_DELAY_MS = 2;
|
|
59
|
+
const RETRY_MAX_DELAY_MS = 250;
|
|
60
|
+
function statisticsRetryDelay(attempt) {
|
|
61
|
+
const ceiling = Math.min(RETRY_MAX_DELAY_MS, RETRY_BASE_DELAY_MS * 2 ** attempt);
|
|
62
|
+
return new Promise((resolve) => setTimeout(resolve, Math.random() * ceiling));
|
|
63
|
+
}
|
|
64
|
+
async function insertRouteStats(model, id, request, today) {
|
|
63
65
|
try {
|
|
64
66
|
await model.insert({
|
|
65
67
|
_id: id,
|
|
66
68
|
method: request.method.toUpperCase(),
|
|
67
69
|
uri: request.uri,
|
|
68
70
|
statistics: [createDayStats(request, today)],
|
|
71
|
+
revision: (0, node_crypto_1.randomUUID)(),
|
|
69
72
|
});
|
|
73
|
+
return true;
|
|
70
74
|
}
|
|
71
75
|
catch (error) {
|
|
72
|
-
if (isDuplicateKeyError(error))
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
76
|
+
if (isDuplicateKeyError(error))
|
|
77
|
+
return false;
|
|
78
|
+
throw error;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
async function addRequestStatistics(model, request) {
|
|
82
|
+
const id = (0, routes_statistics_table_1.getRouteStatsKey)(request.method, request.uri);
|
|
83
|
+
const today = (0, statistics_utils_1.getTodayTimestamp)();
|
|
84
|
+
for (let attempt = 0; attempt < exports.MAX_STATISTICS_WRITE_ATTEMPTS; attempt++) {
|
|
85
|
+
if (attempt > 0)
|
|
86
|
+
await statisticsRetryDelay(attempt);
|
|
87
|
+
const existing = await model.get(id);
|
|
88
|
+
if (!existing) {
|
|
89
|
+
if (await insertRouteStats(model, id, request, today))
|
|
90
|
+
return;
|
|
91
|
+
continue;
|
|
81
92
|
}
|
|
93
|
+
updateRouteStats(existing, request, today);
|
|
94
|
+
const outcome = await model.replaceStatistics(existing);
|
|
95
|
+
if (outcome !== "not-applied")
|
|
96
|
+
return;
|
|
82
97
|
}
|
|
98
|
+
throw new Error(`Route statistics for ${id} kept changing concurrently; request not recorded`);
|
|
83
99
|
}
|
|
84
100
|
//# sourceMappingURL=statistics-write.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statistics-write.js","sourceRoot":"","sources":["../../src/services/statistics-write.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"statistics-write.js","sourceRoot":"","sources":["../../src/services/statistics-write.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,6 @@
|
|
|
15
15
|
"test": "vitest run"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@vueuse/core": "^13.0.0",
|
|
19
|
-
"@vueuse/integrations": "^12.5.0",
|
|
20
18
|
"json-schema-to-zod": "^2.6.0",
|
|
21
19
|
"vue": "^3.5.18",
|
|
22
20
|
"vuedraggable": "^4.1.0",
|
|
@@ -29,7 +27,7 @@
|
|
|
29
27
|
"eslint-plugin-vue": "^10.0.0",
|
|
30
28
|
"prettier": "^3.5.3",
|
|
31
29
|
"prettier-plugin-tailwindcss": "^0.6.11",
|
|
32
|
-
"typescript": "^
|
|
30
|
+
"typescript": "^6.0.3",
|
|
33
31
|
"vitest": "^3.2.4"
|
|
34
32
|
}
|
|
35
33
|
}
|