@memberjunction/server 6.2.0-edge.2 → 6.2.0-edge.3

package/dist/services/WorkQueueHostService.js

@@ -0,0 +1,97 @@
+/**
+ * @fileoverview Starts the durable work-queue host inside MJServer when `workQueue.enabled` is set.
+ * @module MJServer/services
+ */
+import { randomBytes } from 'node:crypto';
+import { hostname } from 'node:os';
+import { LogError, LogStatus } from '@memberjunction/core';
+import { UserCache } from '@memberjunction/generic-database-provider';
+import { MJWorkLogger, WorkQueueEngine, WorkQueueHost } from '@memberjunction/work-queue-engine';
+import { TaskGraphProviderFactory } from './TaskGraphProviderFactory.js';
+export const WORK_QUEUE_DISABLE_ENV = 'MJ_DISABLE_WORK_QUEUE_HOST';
+/** Matches the width of WorkQueueDelivery.LeaseOwner. */
+const MAX_INSTANCE_ID_LENGTH = 200;
+export const DEFAULT_WORK_QUEUE_HOST_START_DEPENDENCIES = {
+    Env: process.env,
+    FindUserByEmail: email => UserCache.Users.find(user => user.Email?.trim().toLowerCase() === email.trim().toLowerCase()),
+    ConfigureEngine: async (user, provider) => {
+        await WorkQueueEngine.Instance.Config(false, user, provider);
+        await ReportTopologyIssues(WorkQueueEngine.Instance);
+        return WorkQueueEngine.Instance;
+    },
+    CreateHost: (config, engine, user, provider, providerSource) => new WorkQueueHost(config, engine, user, provider, new MJWorkLogger(), { ProviderSource: providerSource }),
+};
+/**
+ * Topology rows, capability gating, driver bindings and database prerequisites (03 §11) — including SQL Server's
+ * READ_COMMITTED_SNAPSHOT requirement (03 §7). Problems are logged, never thrown: the planner still gates each
+ * subscription, and an operator can read the same list from WorkQueue.ValidateBindings.
+ */
+async function ReportTopologyIssues(engine) {
+    try {
+        for (const issue of await engine.ValidateTopology()) {
+            const line = `[WorkQueue] ${issue.Severity}: ${issue.Subject} — ${issue.Message}`;
+            if (issue.Severity === 'Error') {
+                LogError(line);
+            }
+            else {
+                LogStatus(line);
+            }
+        }
+    }
+    catch (error) {
+        LogError(`[WorkQueue] Topology validation failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+export function IsWorkQueueHostDisabledByEnv(env) {
+    return env[WORK_QUEUE_DISABLE_ENV] === '1';
+}
+/**
+ * Host and pid for humans reading logs; the random suffix for uniqueness — containers routinely share pid 1 and
+ * HOSTNAME is not always exported. A restart is a new instance, so a dead process's leases simply expire.
+ */
+export function CreateWorkQueueInstanceID(env = process.env) {
+    const host = env.HOSTNAME ?? hostname();
+    return `${host}-${process.pid}-${randomBytes(4).toString('hex')}`.slice(0, MAX_INSTANCE_ID_LENGTH);
+}
+export function BuildWorkQueueHostConfig(config, instanceID) {
+    return {
+        InstanceID: instanceID,
+        Subscriptions: config.subscriptions.map(entry => ({ Name: entry.name, Concurrency: entry.concurrency })),
+        IdlePollMinMs: config.idlePollMinMs,
+        IdlePollMaxMs: config.idlePollMaxMs,
+        ShutdownDrainMs: config.shutdownDrainMs,
+        SweeperIntervalMs: config.sweeperEnabled ? config.sweeperIntervalMs : 0,
+        ReconcileIntervalMs: config.reconcileIntervalMs,
+    };
+}
+/** A fresh SQL Server provider per delivery over the shared pool; the server provider otherwise. */
+export class MJServerWorkQueueProviderSource {
+    constructor(pool, fallback) {
+        this.fallback = fallback;
+        this.factory = pool ? new TaskGraphProviderFactory(pool) : null;
+    }
+    CreateProvider() {
+        return this.factory ? this.factory.CreateProvider() : Promise.resolve(this.fallback);
+    }
+}
+/** Returns the started host, or null when this instance runs no subscriptions. */
+export async function StartWorkQueueHost(config, provider, providerSource, dependencies = DEFAULT_WORK_QUEUE_HOST_START_DEPENDENCIES) {
+    if (!config.enabled) {
+        return null;
+    }
+    if (IsWorkQueueHostDisabledByEnv(dependencies.Env)) {
+        LogStatus(`[WorkQueue] Host disabled by ${WORK_QUEUE_DISABLE_ENV}=1 — this process publishes but runs no subscriptions.`);
+        return null;
+    }
+    const user = dependencies.FindUserByEmail(config.systemUserEmail);
+    if (!user) {
+        throw new Error(`[WorkQueue] System user not found with email: ${config.systemUserEmail} — set workQueue.systemUserEmail in mj.config.cjs`);
+    }
+    const engine = await dependencies.ConfigureEngine(user, provider);
+    const hostConfig = BuildWorkQueueHostConfig(config, CreateWorkQueueInstanceID(dependencies.Env));
+    const host = dependencies.CreateHost(hostConfig, engine, user, provider, providerSource);
+    await host.Start();
+    LogStatus(`🔄 Work Queue host ${hostConfig.InstanceID}: ${hostConfig.Subscriptions.map(s => `${s.Name}×${s.Concurrency}`).join(', ')}`);
+    return host;
+}
+//# sourceMappingURL=WorkQueueHostService.js.map

package/dist/services/WorkQueueHostService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkQueueHostService.js","sourceRoot":"","sources":["../../src/services/WorkQueueHostService.ts"],"names":[],"mappings":"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"}

package/dist/services/workQueueConfig.d.ts

@@ -0,0 +1,103 @@
+/**
+ * @fileoverview The `workQueue` configuration section. Kept out of config.ts so it can be tested without
+ * config.ts's module-load database validation.
+ * @module MJServer/services
+ */
+import { z } from 'zod';
+export declare const WorkQueueSubscriptionEntrySchema: z.ZodObject<{
+    /** A subscription name, or '*' for every MJWorker subscription. */
+    name: z.ZodString;
+    /** Deliveries this instance processes concurrently for the subscription. */
+    concurrency: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+}, "strip", z.ZodTypeAny, {
+    name?: string;
+    concurrency?: number;
+}, {
+    name?: string;
+    concurrency?: number;
+}>;
+/**
+ * Durable work-queue host. When enabled, this process runs its share of MJWorker subscriptions. Every claim is atomic
+ * against shared state, so any number of instances may enable it against one database.
+ */
+export declare const WorkQueueSchema: z.ZodEffects<z.ZodObject<{
+    enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    systemUserEmail: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    subscriptions: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        /** A subscription name, or '*' for every MJWorker subscription. */
+        name: z.ZodString;
+        /** Deliveries this instance processes concurrently for the subscription. */
+        concurrency: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    }, "strip", z.ZodTypeAny, {
+        name?: string;
+        concurrency?: number;
+    }, {
+        name?: string;
+        concurrency?: number;
+    }>, "many">>>;
+    idlePollMinMs: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    idlePollMaxMs: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    shutdownDrainMs: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    sweeperEnabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sweeperIntervalMs: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    reconcileIntervalMs: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+}, "strip", z.ZodTypeAny, {
+    enabled?: boolean;
+    systemUserEmail?: string;
+    subscriptions?: {
+        name?: string;
+        concurrency?: number;
+    }[];
+    idlePollMinMs?: number;
+    idlePollMaxMs?: number;
+    shutdownDrainMs?: number;
+    sweeperEnabled?: boolean;
+    sweeperIntervalMs?: number;
+    reconcileIntervalMs?: number;
+}, {
+    enabled?: boolean;
+    systemUserEmail?: string;
+    subscriptions?: {
+        name?: string;
+        concurrency?: number;
+    }[];
+    idlePollMinMs?: number;
+    idlePollMaxMs?: number;
+    shutdownDrainMs?: number;
+    sweeperEnabled?: boolean;
+    sweeperIntervalMs?: number;
+    reconcileIntervalMs?: number;
+}>, {
+    enabled?: boolean;
+    systemUserEmail?: string;
+    subscriptions?: {
+        name?: string;
+        concurrency?: number;
+    }[];
+    idlePollMinMs?: number;
+    idlePollMaxMs?: number;
+    shutdownDrainMs?: number;
+    sweeperEnabled?: boolean;
+    sweeperIntervalMs?: number;
+    reconcileIntervalMs?: number;
+}, {
+    enabled?: boolean;
+    systemUserEmail?: string;
+    subscriptions?: {
+        name?: string;
+        concurrency?: number;
+    }[];
+    idlePollMinMs?: number;
+    idlePollMaxMs?: number;
+    shutdownDrainMs?: number;
+    sweeperEnabled?: boolean;
+    sweeperIntervalMs?: number;
+    reconcileIntervalMs?: number;
+}>;
+export type WorkQueueConfig = z.infer<typeof WorkQueueSchema>;
+/**
+ * The merge base for mj.config.cjs. Like scheduledJobs and integrationSyncWorker, the EFFECTIVE default system user
+ * is the placeholder: set workQueue.systemUserEmail explicitly, or StartWorkQueueHost fails fast and says so.
+ */
+export declare const DEFAULT_WORK_QUEUE_CONFIG: WorkQueueConfig;
+//# sourceMappingURL=workQueueConfig.d.ts.map

package/dist/services/workQueueConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workQueueConfig.d.ts","sourceRoot":"","sources":["../../src/services/workQueueConfig.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gCAAgC;IAC3C,mEAAmE;;IAEnE,4EAA4E;;;;;;;;EAE5E,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;QAV1B,mEAAmE;;QAEnE,4EAA4E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB1E,CAAC;AAEL,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,eAUvC,CAAC"}

package/dist/services/workQueueConfig.js

@@ -0,0 +1,48 @@
+/**
+ * @fileoverview The `workQueue` configuration section. Kept out of config.ts so it can be tested without
+ * config.ts's module-load database validation.
+ * @module MJServer/services
+ */
+import { z } from 'zod';
+export const WorkQueueSubscriptionEntrySchema = z.object({
+    /** A subscription name, or '*' for every MJWorker subscription. */
+    name: z.string().min(1),
+    /** Deliveries this instance processes concurrently for the subscription. */
+    concurrency: z.number().int().positive().optional().default(4),
+});
+/**
+ * Durable work-queue host. When enabled, this process runs its share of MJWorker subscriptions. Every claim is atomic
+ * against shared state, so any number of instances may enable it against one database.
+ */
+export const WorkQueueSchema = z
+    .object({
+    enabled: z.boolean().optional().default(false),
+    systemUserEmail: z.string().optional().default('system@memberjunction.org'),
+    subscriptions: z.array(WorkQueueSubscriptionEntrySchema).optional().default([{ name: '*', concurrency: 4 }]),
+    idlePollMinMs: z.number().int().positive().optional().default(250),
+    idlePollMaxMs: z.number().int().positive().optional().default(5000),
+    shutdownDrainMs: z.number().int().nonnegative().optional().default(8000),
+    sweeperEnabled: z.boolean().optional().default(true),
+    sweeperIntervalMs: z.number().int().positive().optional().default(60000),
+    reconcileIntervalMs: z.number().int().nonnegative().optional().default(30000),
+})
+    .refine(config => config.idlePollMaxMs >= config.idlePollMinMs, {
+    message: 'workQueue.idlePollMaxMs must be >= workQueue.idlePollMinMs',
+    path: ['idlePollMaxMs'],
+});
+/**
+ * The merge base for mj.config.cjs. Like scheduledJobs and integrationSyncWorker, the EFFECTIVE default system user
+ * is the placeholder: set workQueue.systemUserEmail explicitly, or StartWorkQueueHost fails fast and says so.
+ */
+export const DEFAULT_WORK_QUEUE_CONFIG = {
+    enabled: false,
+    systemUserEmail: 'not.set@nowhere.com',
+    subscriptions: [{ name: '*', concurrency: 4 }],
+    idlePollMinMs: 250,
+    idlePollMaxMs: 5000,
+    shutdownDrainMs: 8000,
+    sweeperEnabled: true,
+    sweeperIntervalMs: 60000,
+    reconcileIntervalMs: 30000,
+};
+//# sourceMappingURL=workQueueConfig.js.map

package/dist/services/workQueueConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workQueueConfig.js","sourceRoot":"","sources":["../../src/services/workQueueConfig.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,CAAC,MAAM,CAAC;IACvD,mEAAmE;IACnE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,4EAA4E;IAC5E,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;CAC/D,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;KAC7B,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAC9C,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC;IAC3E,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5G,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC;IAClE,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACnE,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACxE,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACpD,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACxE,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;CAC9E,CAAC;KACD,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,EAAE;IAC9D,OAAO,EAAE,4DAA4D;IACrE,IAAI,EAAE,CAAC,eAAe,CAAC;CACxB,CAAC,CAAC;AAIL;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAoB;IACxD,OAAO,EAAE,KAAK;IACd,eAAe,EAAE,qBAAqB;IACtC,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;IAC9C,aAAa,EAAE,GAAG;IAClB,aAAa,EAAE,IAAI;IACnB,eAAe,EAAE,IAAI;IACrB,cAAc,EAAE,IAAI;IACpB,iBAAiB,EAAE,KAAK;IACxB,mBAAmB,EAAE,KAAK;CAC3B,CAAC"}

package/dist/types.d.ts

@@ -110,6 +110,11 @@ export type RunViewGenericParams = {
      * Propagated to `RunViewParams.DataSource`.
      */
     dataSource?: 'Live' | 'Materialized';
+    /**
+     * When true, binary fields (`varbinary` / `bytea`, as base64 strings) are returned.
+     * Propagated to `RunViewParams.IncludeBinaryFields`.
+     */
+    includeBinaryFields?: boolean;
 };
 export declare class MJServerEvent {
     type: 'setupComplete' | 'requestReceived' | 'requestCompleted' | 'requestFailed';

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAqDxE,MAAM,OAAO,YAAY;CAGxB;AAED,MAAM,OAAO,cAAc;IASzB,YAAY,IAA4J;QACtK,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AAAA,CAAC;AA8CF,MAAM,OAAO,aAAa;CAKzB;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAA2B,EAAE,WAA6B,EAAE,WAAwB,EAAE,SAAe;IACpI,MAAM,KAAK,GAAG,IAAI,aAAa,EAAE,CAAC;IAClC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,CAAC,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAC1B,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC;IACjB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IAC1B,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,cAAc,CAAC;IACvC,GAAG,CAAC,SAAS,GAAG,oBAAoB,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,0CAA0C;AAC1C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAA2B,EAAE,WAA6B,EAAE,WAAwB,EAAE,SAAe;IACpI,OAAO,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAqDxE,MAAM,OAAO,YAAY;CAGxB;AAED,MAAM,OAAO,cAAc;IASzB,YAAY,IAA4J;QACtK,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AAAA,CAAC;AAmDF,MAAM,OAAO,aAAa;CAKzB;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAA2B,EAAE,WAA6B,EAAE,WAAwB,EAAE,SAAe;IACpI,MAAM,KAAK,GAAG,IAAI,aAAa,EAAE,CAAC;IAClC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,CAAC,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAC1B,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC;IACjB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IAC1B,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,cAAc,CAAC;IACvC,GAAG,CAAC,SAAS,GAAG,oBAAoB,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,0CAA0C;AAC1C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAA2B,EAAE,WAA6B,EAAE,WAAwB,EAAE,SAAe;IACpI,OAAO,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "6.2.0-edge.2",
+  "version": "6.2.0-edge.3",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -19,98 +19,99 @@
     "@as-integrations/express5": "^1.0.0",
     "@graphql-tools/schema": "^10.0.38",
     "@graphql-tools/utils": "^11.0.0",
-    "@memberjunction/actions": "6.2.0-edge.2",
-    "@memberjunction/actions-apollo": "6.2.0-edge.2",
-    "@memberjunction/actions-base": "6.2.0-edge.2",
-    "@memberjunction/actions-bizapps-accounting": "6.2.0-edge.2",
-    "@memberjunction/actions-bizapps-crm": "6.2.0-edge.2",
-    "@memberjunction/actions-bizapps-formbuilders": "6.2.0-edge.2",
-    "@memberjunction/actions-bizapps-lms": "6.2.0-edge.2",
-    "@memberjunction/actions-bizapps-social": "6.2.0-edge.2",
-    "@memberjunction/ai": "6.2.0-edge.2",
-    "@memberjunction/ai-agent-manager": "6.2.0-edge.2",
-    "@memberjunction/ai-agent-manager-actions": "6.2.0-edge.2",
-    "@memberjunction/ai-agents": "6.2.0-edge.2",
-    "@memberjunction/ai-bridge-base": "6.2.0-edge.2",
-    "@memberjunction/ai-bridge-ringcentral": "6.2.0-edge.2",
-    "@memberjunction/ai-bridge-server": "6.2.0-edge.2",
-    "@memberjunction/ai-bridge-teams": "6.2.0-edge.2",
-    "@memberjunction/ai-bridge-twilio": "6.2.0-edge.2",
-    "@memberjunction/ai-bridge-vonage": "6.2.0-edge.2",
-    "@memberjunction/ai-core-plus": "6.2.0-edge.2",
-    "@memberjunction/ai-engine-base": "6.2.0-edge.2",
-    "@memberjunction/ai-mcp-client": "6.2.0-edge.2",
-    "@memberjunction/ai-prompts": "6.2.0-edge.2",
-    "@memberjunction/ai-provider-bundle": "6.2.0-edge.2",
-    "@memberjunction/ai-vector-dupe": "6.2.0-edge.2",
-    "@memberjunction/ai-vector-sync": "6.2.0-edge.2",
-    "@memberjunction/ai-vectordb": "6.2.0-edge.2",
-    "@memberjunction/ai-vectors-pinecone": "6.2.0-edge.2",
-    "@memberjunction/aiengine": "6.2.0-edge.2",
-    "@memberjunction/api-keys": "6.2.0-edge.2",
-    "@memberjunction/auth-providers": "6.2.0-edge.2",
-    "@memberjunction/clustering-engine": "6.2.0-edge.2",
-    "@memberjunction/codegen-lib": "6.2.0-edge.2",
-    "@memberjunction/communication-engine": "6.2.0-edge.2",
-    "@memberjunction/communication-ms-graph": "6.2.0-edge.2",
-    "@memberjunction/communication-sendgrid": "6.2.0-edge.2",
-    "@memberjunction/communication-types": "6.2.0-edge.2",
-    "@memberjunction/component-registry-client-sdk": "6.2.0-edge.2",
-    "@memberjunction/computer-use": "6.2.0-edge.2",
-    "@memberjunction/computer-use-engine": "6.2.0-edge.2",
-    "@memberjunction/config": "6.2.0-edge.2",
-    "@memberjunction/core": "6.2.0-edge.2",
-    "@memberjunction/core-actions": "6.2.0-edge.2",
-    "@memberjunction/core-entities": "6.2.0-edge.2",
-    "@memberjunction/core-entities-server": "6.2.0-edge.2",
-    "@memberjunction/credentials": "6.2.0-edge.2",
-    "@memberjunction/data-context": "6.2.0-edge.2",
-    "@memberjunction/data-context-server": "6.2.0-edge.2",
-    "@memberjunction/doc-utils": "6.2.0-edge.2",
-    "@memberjunction/encryption": "6.2.0-edge.2",
-    "@memberjunction/entity-communications-base": "6.2.0-edge.2",
-    "@memberjunction/entity-communications-server": "6.2.0-edge.2",
-    "@memberjunction/esignature": "6.2.0-edge.2",
-    "@memberjunction/external-change-detection": "6.2.0-edge.2",
-    "@memberjunction/generic-database-provider": "6.2.0-edge.2",
-    "@memberjunction/global": "6.2.0-edge.2",
-    "@memberjunction/graphql-dataprovider": "6.2.0-edge.2",
-    "@memberjunction/integration-engine": "6.2.0-edge.2",
-    "@memberjunction/integration-engine-base": "6.2.0-edge.2",
-    "@memberjunction/integration-progress-artifacts": "6.2.0-edge.2",
-    "@memberjunction/integration-schema-builder": "6.2.0-edge.2",
-    "@memberjunction/interactive-component-types": "6.2.0-edge.2",
-    "@memberjunction/lists": "6.2.0-edge.2",
-    "@memberjunction/lists-base": "6.2.0-edge.2",
-    "@memberjunction/livekit-room-server": "6.2.0-edge.2",
-    "@memberjunction/network-utils": "6.2.0-edge.2",
-    "@memberjunction/notifications": "6.2.0-edge.2",
-    "@memberjunction/postgresql-dataprovider": "6.2.0-edge.2",
-    "@memberjunction/queue": "6.2.0-edge.2",
-    "@memberjunction/record-comparison": "6.2.0-edge.2",
-    "@memberjunction/redis-provider": "6.2.0-edge.2",
-    "@memberjunction/remote-browser-base": "6.2.0-edge.2",
-    "@memberjunction/remote-browser-cdp": "6.2.0-edge.2",
-    "@memberjunction/remote-browser-selfhost": "6.2.0-edge.2",
-    "@memberjunction/remote-browser-server": "6.2.0-edge.2",
-    "@memberjunction/scheduling-actions": "6.2.0-edge.2",
-    "@memberjunction/scheduling-base-types": "6.2.0-edge.2",
-    "@memberjunction/scheduling-engine": "6.2.0-edge.2",
-    "@memberjunction/scheduling-engine-base": "6.2.0-edge.2",
-    "@memberjunction/schema-engine": "6.2.0-edge.2",
-    "@memberjunction/search-engine": "6.2.0-edge.2",
-    "@memberjunction/server-extensions-core": "6.2.0-edge.2",
-    "@memberjunction/sql-dialect": "6.2.0-edge.2",
-    "@memberjunction/sql-parser": "6.2.0-edge.2",
-    "@memberjunction/sqlserver-dataprovider": "6.2.0-edge.2",
-    "@memberjunction/storage": "6.2.0-edge.2",
-    "@memberjunction/tag-engine": "6.2.0-edge.2",
-    "@memberjunction/tag-engine-base": "6.2.0-edge.2",
-    "@memberjunction/task-graph": "6.2.0-edge.2",
-    "@memberjunction/templates": "6.2.0-edge.2",
-    "@memberjunction/testing-engine": "6.2.0-edge.2",
-    "@memberjunction/testing-engine-base": "6.2.0-edge.2",
-    "@memberjunction/version-history": "6.2.0-edge.2",
+    "@memberjunction/actions": "6.2.0-edge.3",
+    "@memberjunction/actions-apollo": "6.2.0-edge.3",
+    "@memberjunction/actions-base": "6.2.0-edge.3",
+    "@memberjunction/actions-bizapps-accounting": "6.2.0-edge.3",
+    "@memberjunction/actions-bizapps-crm": "6.2.0-edge.3",
+    "@memberjunction/actions-bizapps-formbuilders": "6.2.0-edge.3",
+    "@memberjunction/actions-bizapps-lms": "6.2.0-edge.3",
+    "@memberjunction/actions-bizapps-social": "6.2.0-edge.3",
+    "@memberjunction/ai": "6.2.0-edge.3",
+    "@memberjunction/ai-agent-manager": "6.2.0-edge.3",
+    "@memberjunction/ai-agent-manager-actions": "6.2.0-edge.3",
+    "@memberjunction/ai-agents": "6.2.0-edge.3",
+    "@memberjunction/ai-bridge-base": "6.2.0-edge.3",
+    "@memberjunction/ai-bridge-ringcentral": "6.2.0-edge.3",
+    "@memberjunction/ai-bridge-server": "6.2.0-edge.3",
+    "@memberjunction/ai-bridge-teams": "6.2.0-edge.3",
+    "@memberjunction/ai-bridge-twilio": "6.2.0-edge.3",
+    "@memberjunction/ai-bridge-vonage": "6.2.0-edge.3",
+    "@memberjunction/ai-core-plus": "6.2.0-edge.3",
+    "@memberjunction/ai-engine-base": "6.2.0-edge.3",
+    "@memberjunction/ai-mcp-client": "6.2.0-edge.3",
+    "@memberjunction/ai-prompts": "6.2.0-edge.3",
+    "@memberjunction/ai-provider-bundle": "6.2.0-edge.3",
+    "@memberjunction/ai-vector-dupe": "6.2.0-edge.3",
+    "@memberjunction/ai-vector-sync": "6.2.0-edge.3",
+    "@memberjunction/ai-vectordb": "6.2.0-edge.3",
+    "@memberjunction/ai-vectors-pinecone": "6.2.0-edge.3",
+    "@memberjunction/aiengine": "6.2.0-edge.3",
+    "@memberjunction/api-keys": "6.2.0-edge.3",
+    "@memberjunction/auth-providers": "6.2.0-edge.3",
+    "@memberjunction/clustering-engine": "6.2.0-edge.3",
+    "@memberjunction/codegen-lib": "6.2.0-edge.3",
+    "@memberjunction/communication-engine": "6.2.0-edge.3",
+    "@memberjunction/communication-ms-graph": "6.2.0-edge.3",
+    "@memberjunction/communication-sendgrid": "6.2.0-edge.3",
+    "@memberjunction/communication-types": "6.2.0-edge.3",
+    "@memberjunction/component-registry-client-sdk": "6.2.0-edge.3",
+    "@memberjunction/computer-use": "6.2.0-edge.3",
+    "@memberjunction/computer-use-engine": "6.2.0-edge.3",
+    "@memberjunction/config": "6.2.0-edge.3",
+    "@memberjunction/core": "6.2.0-edge.3",
+    "@memberjunction/core-actions": "6.2.0-edge.3",
+    "@memberjunction/core-entities": "6.2.0-edge.3",
+    "@memberjunction/core-entities-server": "6.2.0-edge.3",
+    "@memberjunction/credentials": "6.2.0-edge.3",
+    "@memberjunction/data-context": "6.2.0-edge.3",
+    "@memberjunction/data-context-server": "6.2.0-edge.3",
+    "@memberjunction/doc-utils": "6.2.0-edge.3",
+    "@memberjunction/encryption": "6.2.0-edge.3",
+    "@memberjunction/entity-communications-base": "6.2.0-edge.3",
+    "@memberjunction/entity-communications-server": "6.2.0-edge.3",
+    "@memberjunction/esignature": "6.2.0-edge.3",
+    "@memberjunction/external-change-detection": "6.2.0-edge.3",
+    "@memberjunction/generic-database-provider": "6.2.0-edge.3",
+    "@memberjunction/global": "6.2.0-edge.3",
+    "@memberjunction/graphql-dataprovider": "6.2.0-edge.3",
+    "@memberjunction/integration-engine": "6.2.0-edge.3",
+    "@memberjunction/integration-engine-base": "6.2.0-edge.3",
+    "@memberjunction/integration-progress-artifacts": "6.2.0-edge.3",
+    "@memberjunction/integration-schema-builder": "6.2.0-edge.3",
+    "@memberjunction/interactive-component-types": "6.2.0-edge.3",
+    "@memberjunction/lists": "6.2.0-edge.3",
+    "@memberjunction/lists-base": "6.2.0-edge.3",
+    "@memberjunction/livekit-room-server": "6.2.0-edge.3",
+    "@memberjunction/network-utils": "6.2.0-edge.3",
+    "@memberjunction/notifications": "6.2.0-edge.3",
+    "@memberjunction/postgresql-dataprovider": "6.2.0-edge.3",
+    "@memberjunction/queue": "6.2.0-edge.3",
+    "@memberjunction/record-comparison": "6.2.0-edge.3",
+    "@memberjunction/redis-provider": "6.2.0-edge.3",
+    "@memberjunction/remote-browser-base": "6.2.0-edge.3",
+    "@memberjunction/remote-browser-cdp": "6.2.0-edge.3",
+    "@memberjunction/remote-browser-selfhost": "6.2.0-edge.3",
+    "@memberjunction/remote-browser-server": "6.2.0-edge.3",
+    "@memberjunction/scheduling-actions": "6.2.0-edge.3",
+    "@memberjunction/scheduling-base-types": "6.2.0-edge.3",
+    "@memberjunction/scheduling-engine": "6.2.0-edge.3",
+    "@memberjunction/scheduling-engine-base": "6.2.0-edge.3",
+    "@memberjunction/schema-engine": "6.2.0-edge.3",
+    "@memberjunction/search-engine": "6.2.0-edge.3",
+    "@memberjunction/server-extensions-core": "6.2.0-edge.3",
+    "@memberjunction/sql-dialect": "6.2.0-edge.3",
+    "@memberjunction/sql-parser": "6.2.0-edge.3",
+    "@memberjunction/sqlserver-dataprovider": "6.2.0-edge.3",
+    "@memberjunction/storage": "6.2.0-edge.3",
+    "@memberjunction/tag-engine": "6.2.0-edge.3",
+    "@memberjunction/tag-engine-base": "6.2.0-edge.3",
+    "@memberjunction/task-graph": "6.2.0-edge.3",
+    "@memberjunction/templates": "6.2.0-edge.3",
+    "@memberjunction/testing-engine": "6.2.0-edge.3",
+    "@memberjunction/testing-engine-base": "6.2.0-edge.3",
+    "@memberjunction/version-history": "6.2.0-edge.3",
+    "@memberjunction/work-queue-engine": "6.2.0-edge.3",
     "@octokit/auth-app": "^7.1.5",
     "@octokit/rest": "^21.1.1",
     "@types/compression": "^1.8.1",
@@ -149,7 +150,7 @@
     "zod": "^3.25.0"
   },
   "devDependencies": {
-    "@memberjunction/conversations-runtime": "6.2.0-edge.2",
+    "@memberjunction/conversations-runtime": "6.2.0-edge.3",
     "@types/express": "^5.0.6",
     "pkgroll": "2.23.0",
     "rimraf": "6.1.2",

package/src/__tests__/AdhocQueryResolver.bugs.test.ts

@@ -60,20 +60,15 @@ function stubMetadata(): void {
 
 describe('AdhocQueryResolver source-shape contract', () => {
 
-    it('Bug #2: AdhocQueryResolver must import RenderPipeline (currently does not)', () => {
+    it('Bug #2: AdhocQueryResolver must hand the SQL to the provider ad-hoc path, authorizing the rendered SQL first', () => {
         const src = readResolverSource();
-        // After the fix, the resolver should delegate composition + Nunjucks +
-        // MaxRows handling to the canonical pipeline rather than re-implementing
-        // a partial subset.
-        const importsRenderPipeline =
-            /import\s*\{[^}]*\bRenderPipeline\b[^}]*\}\s*from\s*['"]@memberjunction\/generic-database-provider['"]/.test(src);
-        expect(importsRenderPipeline).toBe(true);
-    });
-
-    it('Bug #2: AdhocQueryResolver must call RenderPipeline.Run() somewhere (currently does not)', () => {
-        const src = readResolverSource();
-        const callsRenderPipelineRun = /\bRenderPipeline\.Run\s*\(/.test(src);
-        expect(callsRenderPipelineRun).toBe(true);
+        // Composition, comment removal, the single-read rule and the row cap all happen in the
+        // provider's ad-hoc path (RenderPipeline), shared with in-process callers. The resolver must
+        // delegate there rather than re-implement a partial subset.
+        expect(/\.RunQuery\(\{[\s\S]*SQL: input\.SQL/.test(src)).toBe(true);
+        // It renders only to authorize what will be read, never to run it.
+        expect(/RenderPipeline\.Run\(/.test(src)).toBe(true);
+        expect(/assertFullQueryUsesReadableEntityViews\(rendered\.Trace\.AfterTemplates/.test(src)).toBe(true);
     });
 
     it('Bug #3: AdhocQueryResolver must NOT contain the manual `SELECT TOP N * FROM (...)` wrap', () => {
@@ -126,29 +121,13 @@ ORDER BY JoinYear DESC`;
         // success/failure, the resolver should never hand a string containing
         // "{{query:" to SQL Server.
         //
-        // We encode this as a contract on the resolver source: it must call
-        // into RenderPipeline whenever composition tokens are present, OR
-        // reject early with a clear error. Either way, the literal text
-        // "{{query:" must not reach `request.query(...)`.
+        // We encode this as a contract on the resolver source: it must not execute SQL itself.
+        // It hands input.SQL to the read-only provider's ad-hoc path, which renders it through
+        // RenderPipeline (resolving composition tokens) before anything reaches the database.
         const src = readResolverSource();
-
-        // Acceptable post-fix shape: source mentions RenderPipeline.Run and
-        // passes input.SQL through it. We've already asserted the import +
-        // call above; here we additionally require that input.SQL flows
-        // through RenderPipeline.Run rather than directly to request.query.
-        //
-        // The current code contains `request.query(executableSql)` where
-        // `executableSql` is derived from input.SQL via a string concat —
-        // bypassing the pipeline entirely.
-        const directlyExecutesInputSQL = /request\.query\s*\(\s*input\.SQL\s*\)/.test(src);
-        expect(directlyExecutesInputSQL).toBe(false);
-
-        // And — the executable string must be derived from a pipeline result,
-        // not from an inline template literal that just concatenates input.SQL.
-        // Heuristic: the file should reference `FinalSQL` (the pipeline's
-        // output field) somewhere — this is what gets sent to the DB.
-        const referencesFinalSQL = /\bFinalSQL\b/.test(src);
-        expect(referencesFinalSQL).toBe(true);
+        const executesSQLItself = /request\.query\s*\(|\.ExecuteSQL\s*\(|new sql\.Request/.test(src);
+        expect(executesSQLItself).toBe(false);
+        expect(/\.RunQuery\(\{[\s\S]*SQL: input\.SQL/.test(src)).toBe(true);
     });
 });
 

package/src/__tests__/AdhocQueryResolver.pagination.test.ts

@@ -79,9 +79,13 @@ describe('AdhocQueryResolver pagination source-shape contract', () => {
         expect(/TotalRowCount:\s*recordset\.length/.test(src)).toBe(false);
     });
 
-    it('must consume the RenderPipeline PagingResult.CountSQL', () => {
+    it('must page through the read-only provider, passing MaxRows, StartRow and the timeout', () => {
         const src = readResolverSource();
-        expect(/PagingResult\??\.CountSQL/.test(src)).toBe(true);
+        // The provider's ad-hoc path renders, pages in the database and counts; the resolver
+        // must hand it the paging inputs rather than run SQL itself.
+        expect(/GetReadOnlyProvider\(/.test(src)).toBe(true);
+        expect(/\.RunQuery\(\{[\s\S]*SQL: input\.SQL[\s\S]*MaxRows: input\.MaxRows[\s\S]*StartRow: startRow[\s\S]*TimeoutSeconds/.test(src)).toBe(true);
+        expect(/from 'mssql'|new sql\.Request/.test(src)).toBe(false);
     });
 });
 

package/src/__tests__/AdhocQueryResolver.scopeGuard.test.ts

@@ -71,12 +71,12 @@ describe('AdhocQueryResolver scope guard placement', () => {
         expect(/\bIsScopeLimitedPrincipal\s*\(/.test(src)).toBe(true);
     });
 
-    it('refuses the principal BEFORE acquiring a data source', () => {
+    it('refuses the principal BEFORE acquiring the read-only provider', () => {
         // Authorization must gate the work, not run alongside it: if the guard landed after
-        // the pool were acquired (or the SQL executed), a scope-limited caller would already
+        // the provider were acquired (or the SQL executed), a scope-limited caller would already
         // have reached the database.
         const guardAt = src.indexOf('IsScopeLimitedPrincipal(');
-        const dataSourceAt = src.indexOf('GetReadOnlyDataSource(');
+        const dataSourceAt = src.indexOf('GetReadOnlyProvider(');
         expect(guardAt).toBeGreaterThan(-1);
         expect(dataSourceAt).toBeGreaterThan(-1);
         expect(guardAt).toBeLessThan(dataSourceAt);