@x12i/memorix-service 3.6.2 → 3.7.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/README.md +223 -183
- package/dist/access-gate.d.ts +21 -0
- package/dist/access-gate.d.ts.map +1 -1
- package/dist/access-gate.js +71 -1
- package/dist/access-gate.js.map +1 -1
- package/dist/app.d.ts +2 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +18 -1
- package/dist/app.js.map +1 -1
- package/dist/blob-store/types.js +1 -1
- package/dist/blob-store/types.js.map +1 -1
- package/dist/callback-grant.d.ts.map +1 -1
- package/dist/callback-grant.js +10 -6
- package/dist/callback-grant.js.map +1 -1
- package/dist/caller-identity.d.ts +37 -0
- package/dist/caller-identity.d.ts.map +1 -0
- package/dist/caller-identity.js +77 -0
- package/dist/caller-identity.js.map +1 -0
- package/dist/catalog/catalog-service.js +1 -1
- package/dist/catalog/catalog-service.js.map +1 -1
- package/dist/catalog-bridge.d.ts.map +1 -1
- package/dist/catalog-bridge.js +74 -61
- package/dist/catalog-bridge.js.map +1 -1
- package/dist/catalog-store-cli.js +11 -11
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +13 -7
- package/dist/cli.js.map +1 -1
- package/dist/connector-catalog.d.ts +8 -3
- package/dist/connector-catalog.d.ts.map +1 -1
- package/dist/connector-catalog.js +66 -93
- package/dist/connector-catalog.js.map +1 -1
- package/dist/deployment-identity.d.ts +19 -0
- package/dist/deployment-identity.d.ts.map +1 -0
- package/dist/deployment-identity.js +105 -0
- package/dist/deployment-identity.js.map +1 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +68 -0
- package/dist/errors.js.map +1 -1
- package/dist/generic-connectors.d.ts +39 -1
- package/dist/generic-connectors.d.ts.map +1 -1
- package/dist/generic-connectors.js +142 -3
- package/dist/generic-connectors.js.map +1 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/jobs-scope.d.ts +1 -0
- package/dist/jobs-scope.d.ts.map +1 -1
- package/dist/jobs-scope.js +5 -4
- package/dist/jobs-scope.js.map +1 -1
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +1 -0
- package/dist/live.js.map +1 -1
- package/dist/magit/magit-pack-service.d.ts +1 -1
- package/dist/magit/magit-pack-service.js +4 -4
- package/dist/mgc-landing-stores.d.ts +94 -0
- package/dist/mgc-landing-stores.d.ts.map +1 -0
- package/dist/mgc-landing-stores.js +174 -0
- package/dist/mgc-landing-stores.js.map +1 -0
- package/dist/openapi/openapi.json +393 -2
- package/dist/optional-companion-url.d.ts +1 -1
- package/dist/optional-companion-url.js +1 -1
- package/dist/pipeline-compile.d.ts +1 -1
- package/dist/pipeline-compile.js +1 -1
- package/dist/platform.d.ts +19 -1
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +83 -13
- package/dist/platform.js.map +1 -1
- package/dist/request-countex.d.ts +56 -0
- package/dist/request-countex.d.ts.map +1 -0
- package/dist/request-countex.js +206 -0
- package/dist/request-countex.js.map +1 -0
- package/dist/routes/connector-invocations.d.ts.map +1 -1
- package/dist/routes/connector-invocations.js +6 -1
- package/dist/routes/connector-invocations.js.map +1 -1
- package/dist/routes/connector-ops.d.ts +2 -1
- package/dist/routes/connector-ops.d.ts.map +1 -1
- package/dist/routes/connector-ops.js +8 -5
- package/dist/routes/connector-ops.js.map +1 -1
- package/dist/routes/data.d.ts.map +1 -1
- package/dist/routes/data.js +13 -13
- package/dist/routes/data.js.map +1 -1
- package/dist/routes/jobs.d.ts.map +1 -1
- package/dist/routes/jobs.js +46 -21
- package/dist/routes/jobs.js.map +1 -1
- package/dist/routes/memory.d.ts.map +1 -1
- package/dist/routes/memory.js +187 -90
- package/dist/routes/memory.js.map +1 -1
- package/dist/routes/metadata.d.ts.map +1 -1
- package/dist/routes/metadata.js +27 -1
- package/dist/routes/metadata.js.map +1 -1
- package/dist/routes/mgc-landing.d.ts +7 -0
- package/dist/routes/mgc-landing.d.ts.map +1 -0
- package/dist/routes/mgc-landing.js +177 -0
- package/dist/routes/mgc-landing.js.map +1 -0
- package/dist/scope.d.ts +23 -0
- package/dist/scope.d.ts.map +1 -1
- package/dist/scope.js +13 -1
- package/dist/scope.js.map +1 -1
- package/dist/write-precondition.d.ts +14 -0
- package/dist/write-precondition.d.ts.map +1 -0
- package/dist/write-precondition.js +41 -0
- package/dist/write-precondition.js.map +1 -0
- package/openapi/openapi.json +393 -2
- package/package.json +109 -109
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { createCountex, } from "@x12i/countex";
|
|
2
|
+
import { MemoryCache, MemoryDurable } from "@x12i/countex/adapters/memory";
|
|
3
|
+
import { getRequestCaller, pathRequiresCaller } from "./caller-identity.js";
|
|
4
|
+
export const HTTP_REQUESTS_COUNTER_ID = "http_requests";
|
|
5
|
+
export const REQUEST_STATS_GLOBAL_SCOPE = "memorix-service";
|
|
6
|
+
const httpRequestsMap = {
|
|
7
|
+
counterId: HTTP_REQUESTS_COUNTER_ID,
|
|
8
|
+
scope: { path: "$.scope" },
|
|
9
|
+
eventTime: { path: "$.at" },
|
|
10
|
+
subjects: [{ type: "caller", path: "$.caller", required: true }],
|
|
11
|
+
metrics: [{ path: "$.statusClass", required: true }],
|
|
12
|
+
dimensions: [
|
|
13
|
+
{ name: "method", path: "$.method" },
|
|
14
|
+
{ name: "route", path: "$.route" },
|
|
15
|
+
],
|
|
16
|
+
measures: [
|
|
17
|
+
{
|
|
18
|
+
name: "latencyMs",
|
|
19
|
+
path: "$.latencyMs",
|
|
20
|
+
aggregations: ["sum", "count", "min", "max"],
|
|
21
|
+
onMissing: "zero",
|
|
22
|
+
unsigned: true,
|
|
23
|
+
},
|
|
24
|
+
],
|
|
25
|
+
delta: { default: 1 },
|
|
26
|
+
timeframes: ["minute", "hour", "all"],
|
|
27
|
+
cardinality: {
|
|
28
|
+
maxDimensionValuesPerName: 500,
|
|
29
|
+
onLimit: "overflow",
|
|
30
|
+
overflowValue: "__OTHER__",
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
function statusClass(code) {
|
|
34
|
+
if (code >= 500)
|
|
35
|
+
return "5xx";
|
|
36
|
+
if (code >= 400)
|
|
37
|
+
return "4xx";
|
|
38
|
+
if (code >= 300)
|
|
39
|
+
return "3xx";
|
|
40
|
+
if (code >= 200)
|
|
41
|
+
return "2xx";
|
|
42
|
+
return "1xx";
|
|
43
|
+
}
|
|
44
|
+
function normalizeRoute(url) {
|
|
45
|
+
const path = (url.split("?")[0] ?? url).trim() || "/";
|
|
46
|
+
return path.length > 200 ? `${path.slice(0, 200)}…` : path;
|
|
47
|
+
}
|
|
48
|
+
function pad2(n) {
|
|
49
|
+
return String(n).padStart(2, "0");
|
|
50
|
+
}
|
|
51
|
+
function minuteKey(d) {
|
|
52
|
+
return `${d.getUTCFullYear()}-${pad2(d.getUTCMonth() + 1)}-${pad2(d.getUTCDate())}T${pad2(d.getUTCHours())}:${pad2(d.getUTCMinutes())}`;
|
|
53
|
+
}
|
|
54
|
+
function hourKey(d) {
|
|
55
|
+
return `${d.getUTCFullYear()}-${pad2(d.getUTCMonth() + 1)}-${pad2(d.getUTCDate())}T${pad2(d.getUTCHours())}`;
|
|
56
|
+
}
|
|
57
|
+
function isQueryRow(r) {
|
|
58
|
+
return (!!r &&
|
|
59
|
+
typeof r === "object" &&
|
|
60
|
+
"keys" in r &&
|
|
61
|
+
"count" in r &&
|
|
62
|
+
typeof r.count === "number");
|
|
63
|
+
}
|
|
64
|
+
function rowFromQuery(r) {
|
|
65
|
+
const measures = r.measures?.latencyMs;
|
|
66
|
+
const sum = measures?.sum;
|
|
67
|
+
const countMeas = measures?.count;
|
|
68
|
+
const avg = typeof sum === "number" && typeof countMeas === "number" && countMeas > 0
|
|
69
|
+
? sum / countMeas
|
|
70
|
+
: measures?.avg;
|
|
71
|
+
return {
|
|
72
|
+
caller: String(r.keys.subject ?? "unknown"),
|
|
73
|
+
method: r.keys["dim:method"] != null ? String(r.keys["dim:method"]) : undefined,
|
|
74
|
+
route: r.keys["dim:route"] != null ? String(r.keys["dim:route"]) : undefined,
|
|
75
|
+
statusClass: r.keys.metric != null ? String(r.keys.metric) : undefined,
|
|
76
|
+
count: r.count,
|
|
77
|
+
latencyAvgMs: typeof avg === "number" ? Math.round(avg * 100) / 100 : undefined,
|
|
78
|
+
latencySumMs: typeof sum === "number" ? sum : undefined,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
function flattenTable(result) {
|
|
82
|
+
if (!Array.isArray(result.rows))
|
|
83
|
+
return [];
|
|
84
|
+
return result.rows.filter(isQueryRow).map(rowFromQuery);
|
|
85
|
+
}
|
|
86
|
+
export async function createRequestCountex(opts) {
|
|
87
|
+
let storage = "memory";
|
|
88
|
+
let durable = new MemoryDurable();
|
|
89
|
+
let mongoClient;
|
|
90
|
+
const uri = opts?.mongoUri?.trim();
|
|
91
|
+
if (uri) {
|
|
92
|
+
try {
|
|
93
|
+
const { MongoClient } = await import("mongodb");
|
|
94
|
+
const { MongoDurable } = await import("@x12i/countex/adapters/mongo");
|
|
95
|
+
mongoClient = new MongoClient(uri);
|
|
96
|
+
await mongoClient.connect();
|
|
97
|
+
durable = new MongoDurable({
|
|
98
|
+
client: mongoClient,
|
|
99
|
+
defaultDb: "memorix_request_countex",
|
|
100
|
+
});
|
|
101
|
+
storage = "mongo";
|
|
102
|
+
}
|
|
103
|
+
catch {
|
|
104
|
+
durable = new MemoryDurable();
|
|
105
|
+
storage = "memory";
|
|
106
|
+
mongoClient = undefined;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
const countex = createCountex({
|
|
110
|
+
maps: [httpRequestsMap],
|
|
111
|
+
durable,
|
|
112
|
+
cache: new MemoryCache(),
|
|
113
|
+
flush: {
|
|
114
|
+
everyMs: 10_000,
|
|
115
|
+
maxBufferedCells: 20_000,
|
|
116
|
+
maxBufferedEvents: 10_000,
|
|
117
|
+
flushOnShutdown: true,
|
|
118
|
+
onOverflow: "drop",
|
|
119
|
+
},
|
|
120
|
+
});
|
|
121
|
+
await countex.init();
|
|
122
|
+
return {
|
|
123
|
+
countex,
|
|
124
|
+
storage,
|
|
125
|
+
record: (event) => {
|
|
126
|
+
void countex.ingest(event).catch(() => undefined);
|
|
127
|
+
},
|
|
128
|
+
queryStats: async () => {
|
|
129
|
+
await countex.flush().catch(() => undefined);
|
|
130
|
+
const now = new Date();
|
|
131
|
+
const [byCaller, byCallerRoute] = await Promise.all([
|
|
132
|
+
countex.query({
|
|
133
|
+
scope: REQUEST_STATS_GLOBAL_SCOPE,
|
|
134
|
+
counterId: HTTP_REQUESTS_COUNTER_ID,
|
|
135
|
+
timeframe: { type: "all", from: "all", to: "all" },
|
|
136
|
+
groupBy: ["subject", "metric"],
|
|
137
|
+
format: "table",
|
|
138
|
+
measures: ["latencyMs"],
|
|
139
|
+
resolveLabels: true,
|
|
140
|
+
orderBy: "-count",
|
|
141
|
+
limit: 100,
|
|
142
|
+
}),
|
|
143
|
+
countex.query({
|
|
144
|
+
scope: REQUEST_STATS_GLOBAL_SCOPE,
|
|
145
|
+
counterId: HTTP_REQUESTS_COUNTER_ID,
|
|
146
|
+
timeframe: { type: "all", from: "all", to: "all" },
|
|
147
|
+
groupBy: ["subject", "metric", "dim:method", "dim:route"],
|
|
148
|
+
format: "table",
|
|
149
|
+
measures: ["latencyMs"],
|
|
150
|
+
resolveLabels: true,
|
|
151
|
+
orderBy: "-count",
|
|
152
|
+
limit: 200,
|
|
153
|
+
}),
|
|
154
|
+
]);
|
|
155
|
+
return {
|
|
156
|
+
ok: true,
|
|
157
|
+
enabled: true,
|
|
158
|
+
storage,
|
|
159
|
+
counterId: HTTP_REQUESTS_COUNTER_ID,
|
|
160
|
+
byCaller: flattenTable(byCaller),
|
|
161
|
+
byCallerRoute: flattenTable(byCallerRoute),
|
|
162
|
+
windows: { all: true, hour: hourKey(now), minute: minuteKey(now) },
|
|
163
|
+
};
|
|
164
|
+
},
|
|
165
|
+
flush: () => countex.flush(),
|
|
166
|
+
shutdown: async () => {
|
|
167
|
+
await countex.shutdown();
|
|
168
|
+
if (mongoClient)
|
|
169
|
+
await mongoClient.close().catch(() => undefined);
|
|
170
|
+
},
|
|
171
|
+
};
|
|
172
|
+
}
|
|
173
|
+
export function attachRequestCountex(app, handle) {
|
|
174
|
+
app.addHook("onRequest", async (req) => {
|
|
175
|
+
req._requestCountexStartedAt = Date.now();
|
|
176
|
+
});
|
|
177
|
+
app.addHook("onResponse", async (req, reply) => {
|
|
178
|
+
const path = req.url?.split("?")[0] ?? req.url ?? "";
|
|
179
|
+
if (!pathRequiresCaller(path))
|
|
180
|
+
return;
|
|
181
|
+
const caller = getRequestCaller(req) ?? "unknown";
|
|
182
|
+
const orgRaw = req.headers["x-memorix-org-id"];
|
|
183
|
+
const orgId = typeof orgRaw === "string" && orgRaw.trim()
|
|
184
|
+
? orgRaw.trim().toLocaleLowerCase("en-US")
|
|
185
|
+
: "unknown";
|
|
186
|
+
const started = req._requestCountexStartedAt ?? Date.now();
|
|
187
|
+
const latencyMs = Math.max(0, Date.now() - started);
|
|
188
|
+
const statusCode = reply.statusCode;
|
|
189
|
+
const at = new Date().toISOString();
|
|
190
|
+
const base = {
|
|
191
|
+
caller,
|
|
192
|
+
method: req.method,
|
|
193
|
+
route: normalizeRoute(path),
|
|
194
|
+
statusClass: statusClass(statusCode),
|
|
195
|
+
statusCode,
|
|
196
|
+
latencyMs,
|
|
197
|
+
at,
|
|
198
|
+
};
|
|
199
|
+
handle.record({ ...base, scope: orgId });
|
|
200
|
+
handle.record({ ...base, scope: REQUEST_STATS_GLOBAL_SCOPE });
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
export function registerRequestStatsRoute(app, handle) {
|
|
204
|
+
app.get("/_live/api/request-stats", async () => handle.queryStats());
|
|
205
|
+
}
|
|
206
|
+
//# sourceMappingURL=request-countex.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-countex.js","sourceRoot":"","sources":["../src/request-countex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector-invocations.d.ts","sourceRoot":"","sources":["../../src/routes/connector-invocations.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"connector-invocations.d.ts","sourceRoot":"","sources":["../../src/routes/connector-invocations.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAUtD,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,CAAC,CAiQf"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ServiceError } from "../errors.js";
|
|
2
|
+
import { normalizeOrgId } from "../scope.js";
|
|
2
3
|
function ledgerOf(platform) {
|
|
3
4
|
return platform.invocationLedger;
|
|
4
5
|
}
|
|
@@ -8,6 +9,10 @@ export async function registerConnectorInvocationRoutes(app, platform) {
|
|
|
8
9
|
if (!body.runId || !body.connectorId || !body.orgId || !body.sourceId) {
|
|
9
10
|
throw new ServiceError("VALIDATION", "runId, connectorId, orgId, sourceId required", 400);
|
|
10
11
|
}
|
|
12
|
+
const orgId = normalizeOrgId(body.orgId);
|
|
13
|
+
if (!orgId) {
|
|
14
|
+
throw new ServiceError("VALIDATION", "orgId required", 400);
|
|
15
|
+
}
|
|
11
16
|
const expiresAt = new Date(Date.now() + (body.expiresInSeconds ?? 900) * 1000).toISOString();
|
|
12
17
|
const ledger = ledgerOf(platform);
|
|
13
18
|
const grant = ledger.mintGrant({
|
|
@@ -16,7 +21,7 @@ export async function registerConnectorInvocationRoutes(app, platform) {
|
|
|
16
21
|
connectorId: body.connectorId,
|
|
17
22
|
connectorVersion: body.connectorVersion ?? "0.0.0",
|
|
18
23
|
workflowHash: body.workflowHash,
|
|
19
|
-
orgId
|
|
24
|
+
orgId,
|
|
20
25
|
sourceId: body.sourceId,
|
|
21
26
|
mode: body.mode ?? "knowledge",
|
|
22
27
|
workRef: body.workRef,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector-invocations.js","sourceRoot":"","sources":["../../src/routes/connector-invocations.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"connector-invocations.js","sourceRoot":"","sources":["../../src/routes/connector-invocations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { FastifyInstance } from "fastify";
|
|
2
2
|
import type { MemorixPlatform } from "../platform.js";
|
|
3
3
|
/**
|
|
4
|
-
* Path orgId must match scope header (fail-closed).
|
|
4
|
+
* Path orgId must match scope header (fail-closed, case-insensitive).
|
|
5
|
+
* Returns the canonical (lowercase) path orgId.
|
|
5
6
|
*/
|
|
6
7
|
export declare function resolveConnectorOpsOrg(req: {
|
|
7
8
|
headers: Record<string, string | string[] | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector-ops.d.ts","sourceRoot":"","sources":["../../src/routes/connector-ops.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"connector-ops.d.ts","sourceRoot":"","sources":["../../src/routes/connector-ops.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAqBtD;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;IACvD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,MAAM,CA2BR;AA0BD,kDAAkD;AAClD,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,CAAC,CAwKf"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ServiceError } from "../errors.js";
|
|
2
2
|
import { hasSecretPayload, MCO_ATTEMPTS_DEFAULT_LIMIT, MCO_ATTEMPTS_MAX_LIMIT, } from "../connector-ops/index.js";
|
|
3
3
|
import { validateSetOverride } from "../connector-ops/override-store.js";
|
|
4
|
+
import { normalizeOrgId, orgIdsEqual } from "../scope.js";
|
|
4
5
|
function header(headers, name) {
|
|
5
6
|
const v = headers[name] ?? headers[name.toLowerCase()];
|
|
6
7
|
if (Array.isArray(v))
|
|
@@ -8,21 +9,23 @@ function header(headers, name) {
|
|
|
8
9
|
return typeof v === "string" ? v : undefined;
|
|
9
10
|
}
|
|
10
11
|
/**
|
|
11
|
-
* Path orgId must match scope header (fail-closed).
|
|
12
|
+
* Path orgId must match scope header (fail-closed, case-insensitive).
|
|
13
|
+
* Returns the canonical (lowercase) path orgId.
|
|
12
14
|
*/
|
|
13
15
|
export function resolveConnectorOpsOrg(req) {
|
|
14
16
|
const params = (req.params ?? {});
|
|
15
|
-
const pathOrg = typeof params.orgId === "string" ? params.orgId
|
|
17
|
+
const pathOrg = typeof params.orgId === "string" ? normalizeOrgId(params.orgId) : "";
|
|
16
18
|
if (!pathOrg) {
|
|
17
19
|
throw new ServiceError("SCOPE_INVALID", "orgId path param required", 400);
|
|
18
20
|
}
|
|
19
|
-
const
|
|
21
|
+
const headerRaw = header(req.headers, "x-memorix-org-id") ??
|
|
20
22
|
header(req.headers, "x-org-id") ??
|
|
21
|
-
""
|
|
23
|
+
"";
|
|
24
|
+
const headerOrg = headerRaw ? normalizeOrgId(headerRaw) : "";
|
|
22
25
|
if (!headerOrg) {
|
|
23
26
|
throw new ServiceError("SCOPE_INVALID", "x-memorix-org-id (or x-org-id) is required", 400);
|
|
24
27
|
}
|
|
25
|
-
if (headerOrg
|
|
28
|
+
if (!orgIdsEqual(headerOrg, pathOrg)) {
|
|
26
29
|
throw new ServiceError("ORG_SCOPE_MISMATCH", "path orgId does not match request org scope header", 403);
|
|
27
30
|
}
|
|
28
31
|
return pathOrg;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector-ops.js","sourceRoot":"","sources":["../../src/routes/connector-ops.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAGhB,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"connector-ops.js","sourceRoot":"","sources":["../../src/routes/connector-ops.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMtD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,CAAC,CAkRf"}
|
package/dist/routes/data.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { resolveScope } from "../request-scope.js";
|
|
2
2
|
import { ServiceError } from "../errors.js";
|
|
3
|
-
import { requireCallbackAccess } from "../access-gate.js";
|
|
3
|
+
import { requireCallbackAccess, requireDeploymentAccess } from "../access-gate.js";
|
|
4
|
+
import { normalizeWritePrecondition } from "../write-precondition.js";
|
|
4
5
|
export async function registerDataRoutes(app, platform) {
|
|
5
6
|
app.get("/api/data/content", async (req) => {
|
|
6
7
|
requireCallbackAccess(req, "explore");
|
|
@@ -84,19 +85,19 @@ export async function registerDataRoutes(app, platform) {
|
|
|
84
85
|
};
|
|
85
86
|
});
|
|
86
87
|
app.post("/api/data/content", async (req) => {
|
|
88
|
+
requireDeploymentAccess(req, "write");
|
|
87
89
|
const scope = resolveScope(req);
|
|
88
90
|
const body = req.body;
|
|
89
91
|
if (!body.objectType || !body.contentType) {
|
|
90
92
|
throw new ServiceError("VALIDATION", "objectType, contentType required", 400);
|
|
91
93
|
}
|
|
92
|
-
|
|
93
|
-
throw new ServiceError("VALIDATION", "precondition required: absent | exact-revision", 400);
|
|
94
|
-
}
|
|
94
|
+
const precondition = normalizeWritePrecondition(body.precondition, body.expectedRevision);
|
|
95
95
|
const ports = platform.portsFor(scope);
|
|
96
|
-
const op = body.op ?? (
|
|
96
|
+
const op = body.op ?? (precondition.form === "absent" ? "add" : "upsert");
|
|
97
|
+
const expectedRevision = precondition.form === "exact-revision" ? precondition.expectedRevision : undefined;
|
|
97
98
|
try {
|
|
98
99
|
if (op === "remove") {
|
|
99
|
-
if (!body.record?.recordId ||
|
|
100
|
+
if (!body.record?.recordId || expectedRevision === undefined) {
|
|
100
101
|
throw new ServiceError("VALIDATION", "record.recordId and expectedRevision required for remove", 400);
|
|
101
102
|
}
|
|
102
103
|
const result = await ports.writer.remove({
|
|
@@ -104,7 +105,7 @@ export async function registerDataRoutes(app, platform) {
|
|
|
104
105
|
objectType: body.objectType,
|
|
105
106
|
contentType: body.contentType,
|
|
106
107
|
recordId: body.record.recordId,
|
|
107
|
-
precondition: { kind: "revision", revision:
|
|
108
|
+
precondition: { kind: "revision", revision: expectedRevision },
|
|
108
109
|
});
|
|
109
110
|
return { scope, written: true, result, precondition: body.precondition };
|
|
110
111
|
}
|
|
@@ -117,7 +118,7 @@ export async function registerDataRoutes(app, platform) {
|
|
|
117
118
|
contentType: body.contentType,
|
|
118
119
|
};
|
|
119
120
|
let result;
|
|
120
|
-
if (op === "add" ||
|
|
121
|
+
if (op === "add" || precondition.form === "absent") {
|
|
121
122
|
result = await ports.writer.add({
|
|
122
123
|
scope,
|
|
123
124
|
precondition: { kind: "absent" },
|
|
@@ -127,7 +128,7 @@ export async function registerDataRoutes(app, platform) {
|
|
|
127
128
|
else if (op === "patch") {
|
|
128
129
|
result = await ports.writer.patch({
|
|
129
130
|
scope,
|
|
130
|
-
precondition: { kind: "revision", revision: Number(
|
|
131
|
+
precondition: { kind: "revision", revision: Number(expectedRevision) },
|
|
131
132
|
objectType: body.objectType,
|
|
132
133
|
contentType: body.contentType,
|
|
133
134
|
recordId: body.record.recordId,
|
|
@@ -137,16 +138,15 @@ export async function registerDataRoutes(app, platform) {
|
|
|
137
138
|
else if (op === "replace") {
|
|
138
139
|
result = await ports.writer.replace({
|
|
139
140
|
scope,
|
|
140
|
-
precondition: { kind: "revision", revision: Number(
|
|
141
|
+
precondition: { kind: "revision", revision: Number(expectedRevision) },
|
|
141
142
|
record,
|
|
142
143
|
});
|
|
143
144
|
}
|
|
144
145
|
else {
|
|
146
|
+
// exact-revision upsert — never silently treat as create
|
|
145
147
|
result = await ports.writer.upsert({
|
|
146
148
|
scope,
|
|
147
|
-
precondition:
|
|
148
|
-
? { kind: "revision", revision: Number(body.expectedRevision) }
|
|
149
|
-
: { kind: "absent" },
|
|
149
|
+
precondition: { kind: "revision", revision: Number(expectedRevision) },
|
|
150
150
|
record,
|
|
151
151
|
});
|
|
152
152
|
}
|
package/dist/routes/data.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs.d.ts","sourceRoot":"","sources":["../../src/routes/jobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAc/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"jobs.d.ts","sourceRoot":"","sources":["../../src/routes/jobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAc/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAqNtD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,eAAe,EACpB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,CAAC,CA42Bf"}
|