@rpcbase/server 0.511.0 → 0.512.0

package/dist/index.js

@@ -9,19 +9,18 @@ import { dirname, posix, sep } from "path";
 import fs, { createReadStream, readFileSync } from "node:fs";
 import { createInterface } from "node:readline";
 import { AsyncLocalStorage } from "node:async_hooks";
-import assert$1 from "assert";
-import crypto, { hkdfSync, scrypt } from "crypto";
+import { g as getDerivedKey, r as resolveRtsRequestTenantId, i as isRtsRequestAuthorized, b as buildRtsAbilityFromRequest, n as normalizeRtsQueryOptions, a as runRtsQuery } from "./queryExecutor-DSCpsVI8.js";
 import httpProxy from "http-proxy-3";
 import fsPromises from "node:fs/promises";
 import inspector from "node:inspector";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import crypto, { scrypt } from "crypto";
 import { Writable, Transform } from "node:stream";
 import { StrictMode, createElement } from "react";
 import { renderToPipeableStream, renderToStaticMarkup } from "react-dom/server";
 import { jsx } from "react/jsx-runtime";
 import { createPath, matchRoutes, parsePath, createStaticRouter, StaticRouterProvider } from "@rpcbase/router";
-import { r as resolveRtsRequestTenantId, i as isRtsRequestAuthorized, b as buildRtsAbilityFromRequest, n as normalizeRtsQueryOptions, a as runRtsQuery } from "./queryExecutor-Xh88REQn.js";
 import { s } from "./email-DEw8keax.js";
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -3459,16 +3458,6 @@ const ensurePosthogShutdown = () => {
   process.on("SIGINT", stop);
   process.on("beforeExit", shutdown);
 };
-const getDerivedKey = (masterKey, info, length = 32, salt = "") => {
-  assert$1(masterKey?.length >= 32, "MASTER_KEY must be 32 chars or longer.");
-  return Buffer.from(hkdfSync(
-    "sha256",
-    masterKey,
-    Buffer.from(salt),
-    Buffer.from(info),
-    length
-  )).toString("hex");
-};
 const POSTHOG_INGEST_TARGET = "https://eu.i.posthog.com";
 const getStatusCode = (errorCode) => {
   if (typeof errorCode === "string" && /HPE_INVALID/.test(errorCode)) {
@@ -4441,6 +4430,7 @@ const createRtsSsrCollector = (req, opts) => {
   const maxSerializedBytes = DEFAULT_MAX_SERIALIZED_BYTES;
   const registrations = /* @__PURE__ */ new Map();
   const resolved = /* @__PURE__ */ new Map();
+  const resolvedPageInfo = /* @__PURE__ */ new Map();
   const runtime = {
     registerQuery(query) {
       const modelName = typeof query.modelName === "string" ? query.modelName.trim() : "";
@@ -4458,6 +4448,9 @@ const createRtsSsrCollector = (req, opts) => {
     },
     getQueryData(modelName, queryKey) {
       return resolved.get(makeRegistrationKey(modelName, queryKey));
+    },
+    getQueryPageInfo(modelName, queryKey) {
+      return resolvedPageInfo.get(makeRegistrationKey(modelName, queryKey));
     }
   };
   const resolve = async () => {
@@ -4472,18 +4465,19 @@ const createRtsSsrCollector = (req, opts) => {
     for (const registration of registrations.values()) {
       const options = normalizeRtsQueryOptions(registration.options);
       try {
-        const data = await runRtsQuery({
+        const result = await runRtsQuery({
           tenantId,
           ability,
           modelName: registration.modelName,
           query: registration.query,
           options
         });
-        const boundedData = maxDocsPerQuery > 0 ? data.slice(0, maxDocsPerQuery) : data;
+        const boundedData = maxDocsPerQuery > 0 ? result.data.slice(0, maxDocsPerQuery) : result.data;
         queryEntries.push({
           modelName: registration.modelName,
           queryKey: registration.queryKey,
-          data: boundedData
+          data: boundedData,
+          ...result.pageInfo ? { pageInfo: result.pageInfo } : {}
         });
       } catch {
         continue;
@@ -4505,8 +4499,10 @@ const createRtsSsrCollector = (req, opts) => {
       }
     }
     resolved.clear();
+    resolvedPageInfo.clear();
     for (const entry of payload.queries) {
       resolved.set(makeRegistrationKey(entry.modelName, entry.queryKey), entry.data);
+      resolvedPageInfo.set(makeRegistrationKey(entry.modelName, entry.queryKey), entry.pageInfo);
     }
     return payload.queries.length ? payload : null;
   };