@rpcbase/server 0.481.0 → 0.482.0

package/dist/{handler-BA2YiqnG.js → handler-B45bHxic.js}

@@ -1,4 +1,4 @@
-import { loadModel, getTenantFilesystemDb } from "@rpcbase/db";
+import { models, getTenantFilesystemDb } from "@rpcbase/db";
 import { GridFSBucket, ObjectId } from "mongodb";
 import { JSDOM } from "jsdom";
 import createDOMPurify from "dompurify";
@@ -124,8 +124,8 @@ const completeUpload = async (_payload, ctx) => {
   }
   const modelCtx = getModelCtx(ctx, tenantId);
   const [UploadSession, UploadChunk] = await Promise.all([
-    loadModel("RBUploadSession", modelCtx),
-    loadModel("RBUploadChunk", modelCtx)
+    models.get("RBUploadSession", modelCtx),
+    models.get("RBUploadChunk", modelCtx)
   ]);
   const ability = buildUploadsAbility(ctx, tenantId);
   if (!ability.can("update", "RBUploadSession")) {
@@ -352,8 +352,8 @@ const getStatus = async (_payload, ctx) => {
   }
   const modelCtx = getModelCtx(ctx, tenantId);
   const [UploadSession, UploadChunk] = await Promise.all([
-    loadModel("RBUploadSession", modelCtx),
-    loadModel("RBUploadChunk", modelCtx)
+    models.get("RBUploadSession", modelCtx),
+    models.get("RBUploadChunk", modelCtx)
   ]);
   const ability = buildUploadsAbility(ctx, tenantId);
   if (!ability.can("read", "RBUploadSession")) {
@@ -428,8 +428,8 @@ const initUpload = async (payload, ctx) => {
   const chunksTotal = Math.ceil(totalSize / chunkSize);
   const modelCtx = getModelCtx(ctx, tenantId);
   const [UploadSession, UploadChunk] = await Promise.all([
-    loadModel("RBUploadSession", modelCtx),
-    loadModel("RBUploadChunk", modelCtx)
+    models.get("RBUploadSession", modelCtx),
+    models.get("RBUploadChunk", modelCtx)
   ]);
   await ensureUploadIndexes(UploadSession, UploadChunk);
   const uploadId = new ObjectId().toString();
@@ -474,8 +474,8 @@ const uploadChunk = async (payload, ctx) => {
   }
   const modelCtx = getModelCtx(ctx, tenantId);
   const [UploadSession, UploadChunk] = await Promise.all([
-    loadModel("RBUploadSession", modelCtx),
-    loadModel("RBUploadChunk", modelCtx)
+    models.get("RBUploadSession", modelCtx),
+    models.get("RBUploadChunk", modelCtx)
   ]);
   const ability = buildUploadsAbility(ctx, tenantId);
   if (!ability.can("update", "RBUploadSession")) {

package/dist/{handler-B_mMDLBO.js → handler-BvRk-c8E.js}

@@ -1,4 +1,4 @@
-import { loadModel } from "@rpcbase/db";
+import { models } from "@rpcbase/db";
 import { buildAbilityFromSession, getAccessibleByQuery } from "@rpcbase/db/acl";
 import { createNotification, sendNotificationsDigestForUser } from "./notifications.js";
 import { o as object, b as boolean, n as number, a as array, s as string, r as record, u as unknown, _ as _enum } from "./schemas-D5T9tDtI.js";
@@ -139,10 +139,10 @@ const listNotifications = async (payload, ctx) => {
   const unreadOnly = parsed.data.unreadOnly === true;
   const limit = parsed.data.limit ?? 50;
   const markSeen = parsed.data.markSeen === true;
-  const SettingsModel = await loadModel("RBNotificationSettings", ctx);
+  const SettingsModel = await models.get("RBNotificationSettings", ctx);
   const settings = await SettingsModel.findOne({ userId }).lean();
   const disabledTopics = buildDisabledTopics(settings, "inApp");
-  const NotificationModel = await loadModel("RBNotification", ctx);
+  const NotificationModel = await models.get("RBNotification", ctx);
   const queryFilters = [
     { userId },
     getAccessibleByQuery(ability, "read", "RBNotification")
@@ -234,7 +234,7 @@ const markRead = async (_payload, ctx) => {
     ctx.res.status(400);
     return { ok: false, error: "missing_notification_id" };
   }
-  const NotificationModel = await loadModel("RBNotification", ctx);
+  const NotificationModel = await models.get("RBNotification", ctx);
   const now = /* @__PURE__ */ new Date();
   try {
     await NotificationModel.updateOne(
@@ -257,10 +257,10 @@ const markAllRead = async (_payload, ctx) => {
     ctx.res.status(403);
     return { ok: false, error: "forbidden" };
   }
-  const SettingsModel = await loadModel("RBNotificationSettings", ctx);
+  const SettingsModel = await models.get("RBNotificationSettings", ctx);
   const settings = await SettingsModel.findOne({ userId: session.userId }).lean();
   const disabledTopics = buildDisabledTopics(settings, "inApp");
-  const NotificationModel = await loadModel("RBNotification", ctx);
+  const NotificationModel = await models.get("RBNotification", ctx);
   const queryFilters = [
     { userId: session.userId },
     { archivedAt: { $exists: false } },
@@ -288,7 +288,7 @@ const archiveNotification = async (_payload, ctx) => {
     ctx.res.status(400);
     return { ok: false, error: "missing_notification_id" };
   }
-  const NotificationModel = await loadModel("RBNotification", ctx);
+  const NotificationModel = await models.get("RBNotification", ctx);
   try {
     await NotificationModel.updateOne(
       { $and: [{ _id: notificationId }, { archivedAt: { $exists: false } }, getAccessibleByQuery(ability, "update", "RBNotification")] },
@@ -310,7 +310,7 @@ const getSettings = async (_payload, ctx) => {
     ctx.res.status(403);
     return { ok: false, error: "forbidden" };
   }
-  const SettingsModel = await loadModel("RBNotificationSettings", ctx);
+  const SettingsModel = await models.get("RBNotificationSettings", ctx);
   const settings = await SettingsModel.findOne(
     { $and: [{ userId: session.userId }, getAccessibleByQuery(ability, "read", "RBNotificationSettings")] }
   ).lean();
@@ -346,7 +346,7 @@ const updateSettings = async (payload, ctx) => {
     ctx.res.status(400);
     return { ok: false, error: "invalid_payload" };
   }
-  const SettingsModel = await loadModel("RBNotificationSettings", ctx);
+  const SettingsModel = await models.get("RBNotificationSettings", ctx);
   const nextValues = {};
   if (parsed.data.digestFrequency) {
     nextValues.digestFrequency = parsed.data.digestFrequency;

package/dist/{handler-Dd20DHyz.js → handler-lOVgWqyF.js}

@@ -1,4 +1,4 @@
-import { loadModel, ZRBRtsChangeOp } from "@rpcbase/db";
+import { models, ZRBRtsChangeOp } from "@rpcbase/db";
 import { buildAbilityFromSession } from "@rpcbase/db/acl";
 import { o as object, a as array, s as string, n as number, b as boolean, _ as _enum } from "./schemas-D5T9tDtI.js";
 const Route = "/api/rb/rts/changes";
@@ -72,8 +72,8 @@ const changesHandler = async (payload, ctx) => {
   const ability = buildAbilityFromSession({ tenantId, session: ctx.req.session });
   const modelCtx = getModelCtx(ctx, tenantId);
   const [RtsChange, RtsCounter] = await Promise.all([
-    loadModel("RBRtsChange", modelCtx),
-    loadModel("RBRtsCounter", modelCtx)
+    models.get("RBRtsChange", modelCtx),
+    models.get("RBRtsCounter", modelCtx)
   ]);
   const counter = await RtsCounter.findOne({ _id: "rts" }, { seq: 1 }).lean();
   const latestSeq = Number(counter?.seq ?? 0) || 0;

package/dist/notifications.js

@@ -1,7 +1,7 @@
-import { loadModel, loadRbModel } from "@rpcbase/db";
+import { models } from "@rpcbase/db";
 import { s as sendEmail } from "./email-DEw8keax.js";
 const routes = Object.entries({
-  .../* @__PURE__ */ Object.assign({ "./api/notifications/handler.ts": () => import("./handler-B_mMDLBO.js") })
+  .../* @__PURE__ */ Object.assign({ "./api/notifications/handler.ts": () => import("./handler-BvRk-c8E.js") })
 }).reduce((acc, [path, mod]) => {
   acc[path.replace("./api/", "@rpcbase/server/notifications/api/")] = mod;
   return acc;
@@ -18,7 +18,7 @@ const createNotification = async (ctx, input) => {
   const topic = typeof input.topic === "string" ? input.topic.trim() : "";
   const body = typeof input.body === "string" ? input.body.trim() : "";
   const url = typeof input.url === "string" ? input.url.trim() : "";
-  const NotificationModel = await loadModel("RBNotification", ctx);
+  const NotificationModel = await models.get("RBNotification", ctx);
   const doc = await NotificationModel.create({
     userId,
     ...topic ? { topic } : {},
@@ -57,8 +57,8 @@ const sendNotificationsDigestForUser = async (ctx, {
   userId,
   force = false
 }) => {
-  const SettingsModel = await loadModel("RBNotificationSettings", ctx);
-  const NotificationModel = await loadModel("RBNotification", ctx);
+  const SettingsModel = await models.get("RBNotificationSettings", ctx);
+  const NotificationModel = await models.get("RBNotification", ctx);
   const settings = await SettingsModel.findOne({ userId }).lean();
   const digestFrequencyRaw = typeof settings?.digestFrequency === "string" ? settings.digestFrequency : "weekly";
   const digestFrequency = digestFrequencyRaw === "daily" || digestFrequencyRaw === "weekly" || digestFrequencyRaw === "off" ? digestFrequencyRaw : "weekly";
@@ -92,7 +92,7 @@ const sendNotificationsDigestForUser = async (ctx, {
     );
     return { ok: true, sent: false, skippedReason: "empty" };
   }
-  const UserModel = await loadRbModel("RBUser", ctx);
+  const UserModel = await models.getGlobal("RBUser", ctx);
   const user = await UserModel.findById(userId, { email: 1 }).lean();
   const email = typeof user?.email === "string" ? user.email.trim() : "";
   if (!email) {

package/dist/rts/index.js

@@ -1,9 +1,9 @@
 import { randomUUID } from "node:crypto";
-import { loadRbModel, loadModel } from "@rpcbase/db";
+import { models } from "@rpcbase/db";
 import { buildAbilityFromSession, getTenantRolesFromSessionUser, buildAbility, getAccessibleByQuery } from "@rpcbase/db/acl";
 import { WebSocketServer } from "ws";
 const routes = Object.entries({
-  .../* @__PURE__ */ Object.assign({ "./api/changes/handler.ts": () => import("../handler-Dd20DHyz.js") })
+  .../* @__PURE__ */ Object.assign({ "./api/changes/handler.ts": () => import("../handler-lOVgWqyF.js") })
 }).reduce((acc, [path, mod]) => {
   acc[path.replace("./api/", "@rpcbase/server/rts/api/")] = mod;
   return acc;
@@ -166,7 +166,7 @@ const parseUpgradeMeta = async ({
     throw new Error("Missing rb-user-id header (reverse-proxy) and no session middleware configured");
   }
   const rbCtx = { req: { session: null } };
-  const User = await loadRbModel("RBUser", rbCtx);
+  const User = await models.getGlobal("RBUser", rbCtx);
   const user = await User.findById(headerUserId, { tenants: 1, tenantRoles: 1 }).lean();
   const tenantsRaw = user?.tenants;
   const tenants = Array.isArray(tenantsRaw) ? tenantsRaw.map((t) => String(t)) : [];
@@ -187,7 +187,7 @@ const getTenantModel = async (tenantId, modelName) => {
       }
     }
   };
-  return loadModel(modelName, ctx);
+  return models.get(modelName, ctx);
 };
 const normalizeLimit = (limit) => {
   if (typeof limit !== "number") return QUERY_MAX_LIMIT;

package/dist/uploads.js

@@ -1,5 +1,5 @@
 const routes = Object.entries({
-  .../* @__PURE__ */ Object.assign({ "./api/file-uploads/handler.ts": () => import("./handler-BA2YiqnG.js"), "./api/files/handler.ts": () => import("./handler-Cohj3cz3.js") })
+  .../* @__PURE__ */ Object.assign({ "./api/file-uploads/handler.ts": () => import("./handler-B45bHxic.js"), "./api/files/handler.ts": () => import("./handler-Cohj3cz3.js") })
 }).reduce((acc, [path, mod]) => {
   acc[path.replace("./api/", "@rpcbase/server/uploads/api/")] = mod;
   return acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.481.0",
+  "version": "0.482.0",
   "type": "module",
   "files": [
     "dist"