@rpcbase/server 0.476.0 → 0.477.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/{handler-DEEir2xV.js → handler-BOTZftAB.js} +29 -29
- package/dist/{handler-BITFtEr_.js → handler-B_mMDLBO.js} +80 -39
- package/dist/{handler-BYVnU9H-.js → handler-Cl-0-832.js} +1 -1
- package/dist/{handler-CHuOXAtH.js → handler-Dd20DHyz.js} +15 -11
- package/dist/index.d.ts +0 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +102 -87
- package/dist/notifications/api/notifications/handler.d.ts.map +1 -1
- package/dist/notifications.js +1 -1
- package/dist/rts/api/changes/handler.d.ts.map +1 -1
- package/dist/rts/index.d.ts +3 -1
- package/dist/rts/index.d.ts.map +1 -1
- package/dist/{index-Ckx0UHs6.js → rts/index.js} +99 -32
- package/dist/{schemas-DI7ewltq.js → schemas-D5T9tDtI.js} +609 -12
- package/dist/{shared-Chfrv8o6.js → shared-UGuDRAKK.js} +16 -30
- package/dist/uploads/api/file-uploads/handlers/completeUpload.d.ts.map +1 -1
- package/dist/uploads/api/file-uploads/handlers/getStatus.d.ts.map +1 -1
- package/dist/uploads/api/file-uploads/handlers/uploadChunk.d.ts.map +1 -1
- package/dist/uploads/api/file-uploads/shared.d.ts +3 -0
- package/dist/uploads/api/file-uploads/shared.d.ts.map +1 -1
- package/dist/uploads.js +1 -1
- package/package.json +4 -4
- package/dist/passwordHashStorage.test.d.ts +0 -2
- package/dist/passwordHashStorage.test.d.ts.map +0 -1
- package/dist/rts/api/changes/handler.test.d.ts +0 -2
- package/dist/rts/api/changes/handler.test.d.ts.map +0 -1
- package/dist/rts/index.ws.test.d.ts +0 -2
- package/dist/rts/index.ws.test.d.ts.map +0 -1
- package/dist/rts.d.ts +0 -3
- package/dist/rts.d.ts.map +0 -1
- package/dist/rts.js +0 -13
- package/dist/uploads/api/files/handlers/getFile.test.d.ts +0 -2
- package/dist/uploads/api/files/handlers/getFile.test.d.ts.map +0 -1
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { loadModel } from "@rpcbase/db";
|
|
2
|
+
import { loadRbModel, loadModel } from "@rpcbase/db";
|
|
3
|
+
import { buildAbilityFromSession, getTenantRolesFromSessionUser, buildAbility, getAccessibleByQuery } from "@rpcbase/db/acl";
|
|
3
4
|
import { WebSocketServer } from "ws";
|
|
5
|
+
const routes = Object.entries({
|
|
6
|
+
.../* @__PURE__ */ Object.assign({ "./api/changes/handler.ts": () => import("../handler-Dd20DHyz.js") })
|
|
7
|
+
}).reduce((acc, [path, mod]) => {
|
|
8
|
+
acc[path.replace("./api/", "@rpcbase/server/rts/api/")] = mod;
|
|
9
|
+
return acc;
|
|
10
|
+
}, {});
|
|
4
11
|
const TENANT_ID_QUERY_PARAM = "rb-tenant-id";
|
|
5
12
|
const USER_ID_HEADER = "rb-user-id";
|
|
6
13
|
const QUERY_KEY_MAX_LEN = 4096;
|
|
@@ -150,14 +157,25 @@ const parseUpgradeMeta = async ({
|
|
|
150
157
|
} else {
|
|
151
158
|
throw new Error("Tenant not authorized for this session");
|
|
152
159
|
}
|
|
153
|
-
|
|
160
|
+
const ability2 = buildAbilityFromSession({ tenantId, session: upgradeReq.session });
|
|
161
|
+
return { tenantId, userId: sessionUserId, ability: ability2 };
|
|
154
162
|
}
|
|
155
163
|
const raw = req.headers[USER_ID_HEADER];
|
|
156
164
|
const headerUserId = Array.isArray(raw) ? raw[0] : raw;
|
|
157
165
|
if (!headerUserId) {
|
|
158
166
|
throw new Error("Missing rb-user-id header (reverse-proxy) and no session middleware configured");
|
|
159
167
|
}
|
|
160
|
-
|
|
168
|
+
const rbCtx = { req: { session: null } };
|
|
169
|
+
const User = await loadRbModel("RBUser", rbCtx);
|
|
170
|
+
const user = await User.findById(headerUserId, { tenants: 1, tenantRoles: 1 }).lean();
|
|
171
|
+
const tenantsRaw = user?.tenants;
|
|
172
|
+
const tenants = Array.isArray(tenantsRaw) ? tenantsRaw.map((t) => String(t)) : [];
|
|
173
|
+
if (!tenants.includes(tenantId)) {
|
|
174
|
+
throw new Error("Tenant not authorized for this session");
|
|
175
|
+
}
|
|
176
|
+
const roles = getTenantRolesFromSessionUser(user, tenantId);
|
|
177
|
+
const ability = buildAbility({ tenantId, userId: headerUserId, roles: roles.length ? roles : ["owner"] });
|
|
178
|
+
return { tenantId, userId: headerUserId, ability };
|
|
161
179
|
};
|
|
162
180
|
const getTenantModel = async (tenantId, modelName) => {
|
|
163
181
|
const ctx = {
|
|
@@ -208,16 +226,28 @@ const scheduleDispatchSubscriptionsForModel = (tenantId, modelName) => {
|
|
|
208
226
|
const runAndSendQuery = async ({
|
|
209
227
|
tenantId,
|
|
210
228
|
targetSocketIds,
|
|
229
|
+
ability,
|
|
211
230
|
modelName,
|
|
212
231
|
queryKey,
|
|
213
232
|
query,
|
|
214
233
|
options
|
|
215
234
|
}) => {
|
|
235
|
+
if (!ability.can("read", modelName)) {
|
|
236
|
+
const payload2 = { type: "query_payload", modelName, queryKey, error: "forbidden" };
|
|
237
|
+
for (const socketId of targetSocketIds) {
|
|
238
|
+
const ws = sockets.get(socketId);
|
|
239
|
+
if (!ws) continue;
|
|
240
|
+
sendWs(ws, payload2);
|
|
241
|
+
}
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
216
244
|
const model = await getTenantModel(tenantId, modelName);
|
|
217
245
|
const projection = options.projection ?? void 0;
|
|
218
246
|
const sort = options.sort;
|
|
219
247
|
const limit = normalizeLimit(options.limit);
|
|
220
|
-
const
|
|
248
|
+
const accessQuery = getAccessibleByQuery(ability, "read", modelName);
|
|
249
|
+
const finalQuery = { $and: [query, accessQuery] };
|
|
250
|
+
const queryPromise = model.find(finalQuery, projection);
|
|
221
251
|
if (sort && Object.keys(sort).length) {
|
|
222
252
|
queryPromise.sort(sort);
|
|
223
253
|
}
|
|
@@ -232,27 +262,35 @@ const runAndSendQuery = async ({
|
|
|
232
262
|
};
|
|
233
263
|
const dispatchSubscriptionsForModel = async (tenantId, modelName) => {
|
|
234
264
|
const tenantSubs = subscriptions.get(tenantId);
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
265
|
+
if (!tenantSubs || !tenantSubs.size) return;
|
|
266
|
+
for (const userSubs of tenantSubs.values()) {
|
|
267
|
+
const modelSubs = userSubs.get(modelName);
|
|
268
|
+
if (!modelSubs || !modelSubs.size) continue;
|
|
269
|
+
for (const [queryKey, sub] of modelSubs.entries()) {
|
|
270
|
+
const targetSocketIds = Array.from(sub.socketIds);
|
|
271
|
+
if (!targetSocketIds.length) continue;
|
|
272
|
+
const socketId = targetSocketIds[0];
|
|
273
|
+
const meta = socketMeta.get(socketId);
|
|
274
|
+
const ability = meta?.ability;
|
|
275
|
+
if (!ability) continue;
|
|
276
|
+
try {
|
|
277
|
+
await runAndSendQuery({
|
|
278
|
+
tenantId,
|
|
279
|
+
targetSocketIds,
|
|
280
|
+
ability,
|
|
281
|
+
modelName,
|
|
282
|
+
queryKey,
|
|
283
|
+
query: sub.query,
|
|
284
|
+
options: sub.options
|
|
285
|
+
});
|
|
286
|
+
} catch (err) {
|
|
287
|
+
const error = redactErrorMessage(err);
|
|
288
|
+
const payload = { type: "query_payload", modelName, queryKey, error };
|
|
289
|
+
for (const socketId2 of targetSocketIds) {
|
|
290
|
+
const ws = sockets.get(socketId2);
|
|
291
|
+
if (!ws) continue;
|
|
292
|
+
sendWs(ws, payload);
|
|
293
|
+
}
|
|
256
294
|
}
|
|
257
295
|
}
|
|
258
296
|
}
|
|
@@ -286,6 +324,7 @@ const ensureChangeStream = async (tenantId, modelName) => {
|
|
|
286
324
|
const addSocketSubscription = ({
|
|
287
325
|
socketId,
|
|
288
326
|
tenantId,
|
|
327
|
+
userId,
|
|
289
328
|
modelName,
|
|
290
329
|
queryKey,
|
|
291
330
|
query,
|
|
@@ -293,8 +332,10 @@ const addSocketSubscription = ({
|
|
|
293
332
|
}) => {
|
|
294
333
|
const tenantSubs = subscriptions.get(tenantId) ?? /* @__PURE__ */ new Map();
|
|
295
334
|
subscriptions.set(tenantId, tenantSubs);
|
|
296
|
-
const
|
|
297
|
-
tenantSubs.set(
|
|
335
|
+
const userSubs = tenantSubs.get(userId) ?? /* @__PURE__ */ new Map();
|
|
336
|
+
tenantSubs.set(userId, userSubs);
|
|
337
|
+
const modelSubs = userSubs.get(modelName) ?? /* @__PURE__ */ new Map();
|
|
338
|
+
userSubs.set(modelName, modelSubs);
|
|
298
339
|
const existing = modelSubs.get(queryKey);
|
|
299
340
|
if (existing) {
|
|
300
341
|
existing.socketIds.add(socketId);
|
|
@@ -314,11 +355,13 @@ const addSocketSubscription = ({
|
|
|
314
355
|
const removeSocketSubscription = ({
|
|
315
356
|
socketId,
|
|
316
357
|
tenantId,
|
|
358
|
+
userId,
|
|
317
359
|
modelName,
|
|
318
360
|
queryKey
|
|
319
361
|
}) => {
|
|
320
362
|
const tenantSubs = subscriptions.get(tenantId);
|
|
321
|
-
const
|
|
363
|
+
const userSubs = tenantSubs?.get(userId);
|
|
364
|
+
const modelSubs = userSubs?.get(modelName);
|
|
322
365
|
const sub = modelSubs?.get(queryKey);
|
|
323
366
|
if (sub) {
|
|
324
367
|
sub.socketIds.delete(socketId);
|
|
@@ -335,7 +378,21 @@ const removeSocketSubscription = ({
|
|
|
335
378
|
}
|
|
336
379
|
}
|
|
337
380
|
if (modelSubs && modelSubs.size === 0) {
|
|
338
|
-
|
|
381
|
+
userSubs?.delete(modelName);
|
|
382
|
+
}
|
|
383
|
+
if (userSubs && userSubs.size === 0) {
|
|
384
|
+
tenantSubs?.delete(userId);
|
|
385
|
+
}
|
|
386
|
+
const hasAnyModelSubs = (() => {
|
|
387
|
+
const byUser = subscriptions.get(tenantId);
|
|
388
|
+
if (!byUser) return false;
|
|
389
|
+
for (const subs of byUser.values()) {
|
|
390
|
+
const modelSubs2 = subs.get(modelName);
|
|
391
|
+
if (modelSubs2 && modelSubs2.size > 0) return true;
|
|
392
|
+
}
|
|
393
|
+
return false;
|
|
394
|
+
})();
|
|
395
|
+
if (!hasAnyModelSubs) {
|
|
339
396
|
const tenantStreams = changeStreams.get(tenantId);
|
|
340
397
|
const stream = tenantStreams?.get(modelName);
|
|
341
398
|
if (stream) {
|
|
@@ -361,6 +418,7 @@ const cleanupSocket = (socketId) => {
|
|
|
361
418
|
removeSocketSubscription({
|
|
362
419
|
socketId,
|
|
363
420
|
tenantId: meta.tenantId,
|
|
421
|
+
userId: meta.userId,
|
|
364
422
|
modelName,
|
|
365
423
|
queryKey
|
|
366
424
|
});
|
|
@@ -404,6 +462,7 @@ const handleClientMessage = async ({
|
|
|
404
462
|
removeSocketSubscription({
|
|
405
463
|
socketId,
|
|
406
464
|
tenantId: meta.tenantId,
|
|
465
|
+
userId: meta.userId,
|
|
407
466
|
modelName: message.modelName,
|
|
408
467
|
queryKey: message.queryKey
|
|
409
468
|
});
|
|
@@ -411,6 +470,11 @@ const handleClientMessage = async ({
|
|
|
411
470
|
}
|
|
412
471
|
if (!message.query || typeof message.query !== "object") return;
|
|
413
472
|
const options = normalizeOptions(message.options);
|
|
473
|
+
const ability = meta.ability;
|
|
474
|
+
if (!ability.can("read", message.modelName)) {
|
|
475
|
+
sendWs(ws, { type: "query_payload", modelName: message.modelName, queryKey: message.queryKey, error: "forbidden" });
|
|
476
|
+
return;
|
|
477
|
+
}
|
|
414
478
|
if (message.type === "registerQuery") {
|
|
415
479
|
const existing = socketSubscriptions.get(socketId)?.get(message.modelName)?.has(message.queryKey) ?? false;
|
|
416
480
|
if (!existing) {
|
|
@@ -427,6 +491,7 @@ const handleClientMessage = async ({
|
|
|
427
491
|
addSocketSubscription({
|
|
428
492
|
socketId,
|
|
429
493
|
tenantId: meta.tenantId,
|
|
494
|
+
userId: meta.userId,
|
|
430
495
|
modelName: message.modelName,
|
|
431
496
|
queryKey: message.queryKey,
|
|
432
497
|
query: message.query,
|
|
@@ -444,6 +509,7 @@ const handleClientMessage = async ({
|
|
|
444
509
|
await runAndSendQuery({
|
|
445
510
|
tenantId: meta.tenantId,
|
|
446
511
|
targetSocketIds: [socketId],
|
|
512
|
+
ability,
|
|
447
513
|
modelName: message.modelName,
|
|
448
514
|
queryKey: message.queryKey,
|
|
449
515
|
query: message.query,
|
|
@@ -556,7 +622,8 @@ const notifyRtsModelChanged = (tenantId, modelName) => {
|
|
|
556
622
|
scheduleDispatchSubscriptionsForModel(tenantId, modelName);
|
|
557
623
|
};
|
|
558
624
|
export {
|
|
559
|
-
initRts
|
|
560
|
-
notifyRtsModelChanged
|
|
561
|
-
registerRtsHandler
|
|
625
|
+
initRts,
|
|
626
|
+
notifyRtsModelChanged,
|
|
627
|
+
registerRtsHandler,
|
|
628
|
+
routes
|
|
562
629
|
};
|