@memberjunction/server 5.48.0 → 5.50.0

package/dist/resolvers/adhoc-query-helpers.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Pure, dependency-free helpers for {@link AdhocQueryResolver}. Kept in their own
+ * module (no type-graphql / mssql imports) so the total-row-count boundary logic is
+ * unit-testable without standing up the GraphQL resolver or a database.
+ */
+/**
+ * Determines the exact total row count from the page alone, when it can be known
+ * without a separate `COUNT(*)`:
+ *
+ * - **Not paging** (`maxRows == null`): the query ran uncapped, so every row came
+ *   back — the total is just the number returned.
+ * - **Short page** (`pageLength < maxRows`): a page shorter than the page size means
+ *   there are no rows beyond it, so the total is `startRow + pageLength` exactly.
+ * - **Full page** (`pageLength >= maxRows`): more rows may exist — returns `null` to
+ *   signal that a `COUNT(*)` is required to know the true total.
+ */
+export declare function exactTotalFromPage(startRow: number, pageLength: number, maxRows: number | null): number | null;
+/**
+ * Reads the total row count from a `COUNT(*)` recordset (`[{ TotalRowCount }]`),
+ * falling back to `fallback` when the count is absent, non-numeric, or negative — so
+ * an unexpected count shape never yields a misleading total. `fallback` should be a
+ * safe lower bound (e.g. `startRow + rowsReturned`).
+ */
+export declare function resolveAdhocTotalRowCount(countRows: ReadonlyArray<{
+    TotalRowCount?: unknown;
+}> | null | undefined, fallback: number): number;
+//# sourceMappingURL=adhoc-query-helpers.d.ts.map

package/dist/resolvers/adhoc-query-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adhoc-query-helpers.d.ts","sourceRoot":"","sources":["../../src/resolvers/adhoc-query-helpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAC9B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GAAG,IAAI,GACvB,MAAM,GAAG,IAAI,CAQf;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACrC,SAAS,EAAE,aAAa,CAAC;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EACxE,QAAQ,EAAE,MAAM,GACjB,MAAM,CASR"}

package/dist/resolvers/adhoc-query-helpers.js

@@ -0,0 +1,42 @@
+/**
+ * Pure, dependency-free helpers for {@link AdhocQueryResolver}. Kept in their own
+ * module (no type-graphql / mssql imports) so the total-row-count boundary logic is
+ * unit-testable without standing up the GraphQL resolver or a database.
+ */
+/**
+ * Determines the exact total row count from the page alone, when it can be known
+ * without a separate `COUNT(*)`:
+ *
+ * - **Not paging** (`maxRows == null`): the query ran uncapped, so every row came
+ *   back — the total is just the number returned.
+ * - **Short page** (`pageLength < maxRows`): a page shorter than the page size means
+ *   there are no rows beyond it, so the total is `startRow + pageLength` exactly.
+ * - **Full page** (`pageLength >= maxRows`): more rows may exist — returns `null` to
+ *   signal that a `COUNT(*)` is required to know the true total.
+ */
+export function exactTotalFromPage(startRow, pageLength, maxRows) {
+    if (maxRows == null) {
+        return pageLength;
+    }
+    if (pageLength < maxRows) {
+        return startRow + pageLength;
+    }
+    return null;
+}
+/**
+ * Reads the total row count from a `COUNT(*)` recordset (`[{ TotalRowCount }]`),
+ * falling back to `fallback` when the count is absent, non-numeric, or negative — so
+ * an unexpected count shape never yields a misleading total. `fallback` should be a
+ * safe lower bound (e.g. `startRow + rowsReturned`).
+ */
+export function resolveAdhocTotalRowCount(countRows, fallback) {
+    const raw = countRows?.[0]?.TotalRowCount;
+    if (raw != null) {
+        const n = Number(raw);
+        if (Number.isFinite(n) && n >= 0) {
+            return Math.floor(n);
+        }
+    }
+    return fallback;
+}
+//# sourceMappingURL=adhoc-query-helpers.js.map

package/dist/resolvers/adhoc-query-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adhoc-query-helpers.js","sourceRoot":"","sources":["../../src/resolvers/adhoc-query-helpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kBAAkB,CAC9B,QAAgB,EAChB,UAAkB,EAClB,OAAsB;IAEtB,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC;IACtB,CAAC;IACD,IAAI,UAAU,GAAG,OAAO,EAAE,CAAC;QACvB,OAAO,QAAQ,GAAG,UAAU,CAAC;IACjC,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACrC,SAAwE,EACxE,QAAgB;IAEhB,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC;IAC1C,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACd,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}

package/dist/rest/OAuthCallbackHandler.d.ts

@@ -99,6 +99,15 @@ export declare class OAuthCallbackHandler {
      * @param res - Express response
      */
     private handleExchange;
+    /**
+     * Escapes HTML-special characters in a string so untrusted (e.g. query-string-derived)
+     * values can be safely interpolated into an HTML response without introducing
+     * reflected-XSS. Escapes `&`, `<`, `>`, `"`, and `'`.
+     *
+     * @param value - The raw string to escape
+     * @returns The HTML-escaped string
+     */
+    private escapeHtml;
     /**
      * Gets the system user from cache.
      */

package/dist/rest/OAuthCallbackHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OAuthCallbackHandler.d.ts","sourceRoot":"","sources":["../../src/rest/OAuthCallbackHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAgB9B;;GAEG;AACH,MAAM,WAAW,2BAA2B;IACxC,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,oBAAoB;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiB;gBAEzC,OAAO,EAAE,2BAA2B;IAYhD;;OAEG;IACH,OAAO,CAAC,WAAW;IAcnB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA8BzB;;OAEG;IACH,OAAO,CAAC,eAAe;IAmCvB;;;;;;;;OAQG;YACW,cAAc;IAkF5B;;;;;;;OAOG;YACW,SAAS;IA0EvB;;;;;;;OAOG;YACW,YAAY;IA2F1B;;;;;;;;;OASG;YACW,cAAc;IA+F5B;;OAEG;IACH,OAAO,CAAC,aAAa;IAQrB;;OAEG;YACW,sBAAsB;IAoDpC;;OAEG;YACW,oBAAoB;IAmElC;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAwBzB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAwBvB;;OAEG;IACI,iBAAiB,IAAI,OAAO,CAAC,MAAM;IAI1C;;OAEG;IACI,sBAAsB,IAAI,OAAO,CAAC,MAAM;CAGlD;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,2BAA2B,GAAG;IAC9E,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC;CACvC,CAMA"}
+{"version":3,"file":"OAuthCallbackHandler.d.ts","sourceRoot":"","sources":["../../src/rest/OAuthCallbackHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAgB9B;;GAEG;AACH,MAAM,WAAW,2BAA2B;IACxC,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,oBAAoB;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiB;gBAEzC,OAAO,EAAE,2BAA2B;IAYhD;;OAEG;IACH,OAAO,CAAC,WAAW;IAcnB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA+BzB;;OAEG;IACH,OAAO,CAAC,eAAe;IAmCvB;;;;;;;;OAQG;YACW,cAAc;IAkF5B;;;;;;;OAOG;YACW,SAAS;IA0EvB;;;;;;;OAOG;YACW,YAAY;IA2F1B;;;;;;;;;OASG;YACW,cAAc;IA+F5B;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IASlB;;OAEG;IACH,OAAO,CAAC,aAAa;IAQrB;;OAEG;YACW,sBAAsB;IAoDpC;;OAEG;YACW,oBAAoB;IAmElC;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAwBzB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAwBvB;;OAEG;IACI,iBAAiB,IAAI,OAAO,CAAC,MAAM;IAI1C;;OAEG;IACI,sBAAsB,IAAI,OAAO,CAAC,MAAM;CAGlD;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,2BAA2B,GAAG;IAC9E,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC;CACvC,CAMA"}

package/dist/rest/OAuthCallbackHandler.js

@@ -71,7 +71,8 @@ export class OAuthCallbackHandler {
      * Renders a success page after OAuth authorization completes.
      */
     handleSuccessPage(req, res) {
-        const { state, connectionId } = req.query;
+        const { connectionId } = req.query;
+        const safeConnectionId = connectionId ? this.escapeHtml(String(connectionId)) : '';
         res.status(200).send(`
 <!DOCTYPE html>
 <html lang="en">
@@ -93,7 +94,7 @@ export class OAuthCallbackHandler {
         <div class="icon">✅</div>
         <h1>Authorization Successful</h1>
         <p>Your MCP server connection has been authorized. You can close this window and return to MemberJunction.</p>
-        ${connectionId ? `<div class="details">Connection ID: ${connectionId}</div>` : ''}
+        ${safeConnectionId ? `<div class="details">Connection ID: ${safeConnectionId}</div>` : ''}
     </div>
 </body>
 </html>
@@ -104,8 +105,8 @@ export class OAuthCallbackHandler {
      */
     handleErrorPage(req, res) {
         const { error, error_description } = req.query;
-        const errorCode = error ? String(error) : 'unknown_error';
-        const errorMessage = error_description ? String(error_description) : 'An error occurred during authorization.';
+        const errorCode = this.escapeHtml(error ? String(error) : 'unknown_error');
+        const errorMessage = this.escapeHtml(error_description ? String(error_description) : 'An error occurred during authorization.');
         res.status(200).send(`
 <!DOCTYPE html>
 <html lang="en">
@@ -463,6 +464,22 @@ export class OAuthCallbackHandler {
     // ========================================
     // Helper Methods
     // ========================================
+    /**
+     * Escapes HTML-special characters in a string so untrusted (e.g. query-string-derived)
+     * values can be safely interpolated into an HTML response without introducing
+     * reflected-XSS. Escapes `&`, `<`, `>`, `"`, and `'`.
+     *
+     * @param value - The raw string to escape
+     * @returns The HTML-escaped string
+     */
+    escapeHtml(value) {
+        return value
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;');
+    }
     /**
      * Gets the system user from cache.
      */

package/dist/rest/OAuthCallbackHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"OAuthCallbackHandler.js","sourceRoot":"","sources":["../../src/rest/OAuthCallbackHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OAuthCallbackHandler.js","sourceRoot":"","sources":["../../src/rest/OAuthCallbackHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAY,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAG/E,6CAA6C;AAC7C,MAAM,6BAA6B,GAAG,4BAA4B,CAAC;AAEnE,kCAAkC;AAClC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAE7C,iDAAiD;AACjD,MAAM,iCAAiC,GAAG,iCAAiC,CAAC;AAc5E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,OAAO,oBAAoB;IAM7B,YAAY,OAAoC;QAC5C,IAAI,CAAC,OAAO,GAAG;YACX,kBAAkB,EAAE,GAAG,OAAO,CAAC,SAAS,gBAAgB;YACxD,gBAAgB,EAAE,GAAG,OAAO,CAAC,SAAS,cAAc;YACpD,GAAG,OAAO;SACb,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QACvC,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAED;;OAEG;IACK,WAAW;QACf,iCAAiC;QACjC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAErE,kFAAkF;QAClF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnE,uBAAuB;QACvB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,GAAoB,EAAE,GAAqB;QACjE,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QACnC,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;UAqBnB,gBAAgB,CAAC,CAAC,CAAC,uCAAuC,gBAAgB,QAAQ,CAAC,CAAC,CAAC,EAAE;;;;SAIxF,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,GAAoB,EAAE,GAAqB;QAC/D,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC;QAEhI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;kCAqBK,SAAS;qCACN,YAAY;;;;;SAKxC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,cAAc,CAAC,GAAoB,EAAE,GAAqB;QACpE,SAAS,CAAC,uCAAuC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACpE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAC5D,SAAS,CAAC,wCAAwC,KAAK,WAAW,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,YAAY,KAAK,IAAI,MAAM,EAAE,CAAC,CAAC;QAE7H,sCAAsC;QACtC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,CAAC;YACxE,OAAO;QACX,CAAC;QAED,IAAI,CAAC;YACD,qCAAqC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACxC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,QAAQ,CAAC,4CAA4C,CAAC,CAAC;gBACvD,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,EAAE,4BAA4B,CAAC,CAAC;gBACxE,OAAO;YACX,CAAC;YAED,0DAA0D;YAC1D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACvE,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,0CAA0C,CAAC,CAAC;gBACvF,OAAO;YACX,CAAC;YAED,iCAAiC;YACjC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,QAAQ,CAAC,yBAAyB,SAAS,CAAC,MAAM,qBAAqB,CAAC,CAAC;gBACzE,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,EAAE,wBAAwB,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;gBACjG,OAAO;YACX,CAAC;YAED,yCAAyC;YACzC,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,YAAY,GAAG,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC;gBAC5F,MAAM,IAAI,CAAC,YAAY,CAAC,wBAAwB,CAC5C,KAAK,EACL,MAAM,CAAC,KAAK,CAAC,EACb,YAAY,EACZ,WAAW,CACd,CAAC;gBACF,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;gBACpF,OAAO;YACX,CAAC;YAED,yCAAyC;YACzC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;gBACxG,OAAO;YACX,CAAC;YAED,2BAA2B;YAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;YAE3F,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,SAAS,CAAC,sDAAsD,KAAK,EAAE,CAAC,CAAC;gBACzE,2DAA2D;gBAC3D,gBAAgB,CAAC,QAAQ,CAAC,iCAAiC,CAAC,SAAS,CAAC,YAAY,EAAE;oBAChF,cAAc,EAAE,KAAK;oBACrB,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACxC,CAAC,CAAC;gBACH,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAC5F,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,0CAA0C,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC1E,IAAI,CAAC,eAAe,CAChB,GAAG,EACH,MAAM,CAAC,SAAS,IAAI,sBAAsB,EAC1C,MAAM,CAAC,YAAY,IAAI,sBAAsB,EAC7C,SAAS,CAAC,iBAAiB,CAC9B,CAAC;YACN,CAAC;QAEL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,QAAQ,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,EAAE,8BAA8B,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,SAAS,CAAC,GAAoB,EAAE,GAAqB;QAC/D,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;QAC7C,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;QACpF,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAa,CAAC;QAE9C,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,yBAAyB;aAC1C,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YAEjF,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,WAAW;oBACtB,YAAY,EAAE,+BAA+B;iBAChD,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,8BAA8B;YAC9B,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,WAAW;oBACtB,YAAY,EAAE,eAAe;iBAChC,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,aAAa;YACb,IAAI,MAAsD,CAAC;YAC3D,QAAQ,SAAS,CAAC,MAAM,EAAE,CAAC;gBACvB,KAAK,SAAS;oBACV,MAAM,GAAG,IAAI,IAAI,EAAE,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;oBACnE,MAAM;gBACV,KAAK,WAAW;oBACZ,MAAM,GAAG,WAAW,CAAC;oBACrB,MAAM;gBACV,KAAK,QAAQ;oBACT,MAAM,GAAG,QAAQ,CAAC;oBAClB,MAAM;gBACV,KAAK,SAAS;oBACV,MAAM,GAAG,SAAS,CAAC;oBACnB,MAAM;gBACV;oBACI,MAAM,GAAG,SAAS,CAAC;YAC3B,CAAC;YAED,GAAG,CAAC,IAAI,CAAC;gBACL,MAAM;gBACN,YAAY,EAAE,SAAS,CAAC,YAAY;gBACpC,WAAW,EAAE,SAAS,CAAC,WAAW,EAAE,WAAW,EAAE;gBACjD,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,YAAY,EAAE,SAAS,CAAC,gBAAgB;gBACxC,WAAW,EAAE,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,SAAS;aAC3D,CAAC,CAAC;QAEP,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,QAAQ,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAC;YAClD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,cAAc;gBACzB,YAAY,EAAE,oCAAoC;aACrD,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,YAAY,CAAC,GAAoB,EAAE,GAAqB;QAClE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACvE,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAa,CAAC;QAE9C,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,yBAAyB;aAC1C,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,iBAAiB;gBAC5B,YAAY,EAAE,0BAA0B;aAC3C,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,CAAC;YACD,oCAAoC;YACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAC1E,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,WAAW;oBACtB,YAAY,EAAE,sBAAsB;iBACvC,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,qBAAqB;YACrB,MAAM,WAAW,GAAyB;gBACtC,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,WAAW,EAAE,gBAAgB;oBACzB,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,IAAI,EAAE,IAAI,gBAAgB,EAAE,CAAC,IAAI,EAAE;oBAC1D,CAAC,CAAC,MAAM,CAAC,WAAW;gBACxB,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;gBACjE,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,0BAA0B,EAAE,MAAM,CAAC,0BAA0B;gBAC7D,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;aAC5C,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;gBAC9B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,uBAAuB;oBAClC,YAAY,EAAE,yCAAyC;iBAC1D,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,sDAAsD;YACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAC5D,YAAY,EACZ,MAAM,CAAC,QAAQ,EACf,WAAW,EACX,IAAI,CAAC,OAAO,CAAC,SAAS,EACtB,WAAW,EACX,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CACnF,CAAC;YAEF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,GAAG,CAAC,IAAI,CAAC;oBACL,OAAO,EAAE,IAAI;oBACb,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE;oBAC1C,OAAO,EAAE,mDAAmD;iBAC/D,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,mBAAmB;oBAC9B,YAAY,EAAE,MAAM,CAAC,YAAY;iBACpC,CAAC,CAAC;YACP,CAAC;QAEL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,QAAQ,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC;YACpD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,cAAc;gBACzB,YAAY,EAAE,+BAA+B;aAChD,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED;;;;;;;;;OASG;IACK,KAAK,CAAC,cAAc,CAAC,GAAoB,EAAE,GAAqB;QACpE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACjC,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAa,CAAC;QAE9C,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,cAAc;gBACzB,YAAY,EAAE,yBAAyB;aAC1C,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,iBAAiB;gBAC5B,YAAY,EAAE,mCAAmC;aACpD,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,iBAAiB;gBAC5B,YAAY,EAAE,oCAAoC;aACrD,CAAC,CAAC;YACH,OAAO;QACX,CAAC;QAED,IAAI,CAAC;YACD,wDAAwD;YACxD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAExE,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,iBAAiB;oBAC5B,YAAY,EAAE,0CAA0C;iBAC3D,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,8DAA8D;YAC9D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChD,QAAQ,CAAC,yBAAyB,WAAW,CAAC,EAAE,kDAAkD,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;gBACtH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,WAAW;oBACtB,YAAY,EAAE,4DAA4D;iBAC7E,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,8CAA8C;YAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;YAE3F,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,SAAS,CAAC,+DAA+D,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC;gBAEnG,2DAA2D;gBAC3D,gBAAgB,CAAC,QAAQ,CAAC,iCAAiC,CAAC,SAAS,CAAC,YAAY,EAAE;oBAChF,cAAc,EAAE,KAAK;oBACrB,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACxC,CAAC,CAAC;gBAEH,GAAG,CAAC,IAAI,CAAC;oBACL,OAAO,EAAE,IAAI;oBACb,YAAY,EAAE,SAAS,CAAC,YAAY;iBACvC,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,2CAA2C,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC3E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,iBAAiB;oBAChD,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,kDAAkD;oBACvF,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,KAAK;iBAC3C,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,QAAQ,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;YAC/D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,cAAc;gBACzB,YAAY,EAAE,oDAAoD;aACrE,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,2CAA2C;IAC3C,iBAAiB;IACjB,2CAA2C;IAE3C;;;;;;;OAOG;IACK,UAAU,CAAC,KAAa;QAC5B,OAAO,KAAK;aACP,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;aACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;aACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;aACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;aACvB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACK,aAAa;QACjB,IAAI,CAAC;YACD,OAAO,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC9C,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,sBAAsB,CAChC,cAAsB,EACtB,WAAqB;QAWrB,IAAI,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAS5B;gBACC,UAAU,EAAE,iCAAiC;gBAC7C,WAAW,EAAE,mBAAmB,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG;gBACrE,MAAM,EAAE,CAAC,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,CAAC;gBACvI,UAAU,EAAE,QAAQ;aACvB,EAAE,WAAW,CAAC,CAAC;YAEhB,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpE,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACjC,OAAO;gBACH,YAAY,EAAE,MAAM,CAAC,qBAAqB;gBAC1C,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,SAAS;gBACxC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,SAAS;gBACtD,SAAS,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBACrC,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC1E,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,IAAI,SAAS;aAC3D,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,wDAAwD,KAAK,EAAE,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,oBAAoB,CAC9B,YAAoB,EACpB,WAAqB;QAUrB,IAAI,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,OAAO,EAAE,CAAC;YAEzB,kCAAkC;YAClC,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,OAAO,CAA0B;gBACzD,UAAU,EAAE,6BAA6B;gBACzC,WAAW,EAAE,OAAO,YAAY,GAAG;gBACnC,MAAM,EAAE,CAAC,aAAa,CAAC;gBACvB,UAAU,EAAE,QAAQ;aACvB,EAAE,WAAW,CAAC,CAAC;YAEhB,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChF,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YAEnD,0BAA0B;YAC1B,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,OAAO,CAOlC;gBACC,UAAU,EAAE,kBAAkB;gBAC9B,WAAW,EAAE,OAAO,QAAQ,GAAG;gBAC/B,MAAM,EAAE;oBACJ,gBAAgB,EAAE,aAAa,EAAE,8BAA8B;oBAC/D,eAAe,EAAE,4BAA4B,EAAE,kBAAkB;iBACpE;gBACD,UAAU,EAAE,QAAQ;aACvB,EAAE,WAAW,CAAC,CAAC;YAEhB,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtF,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO;gBACH,QAAQ;gBACR,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,SAAS;gBAClD,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,SAAS;gBAC5C,4BAA4B,EAAE,MAAM,CAAC,4BAA4B,IAAI,SAAS;gBAC9E,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,SAAS;gBAChD,0BAA0B,EAAE,MAAM,CAAC,0BAA0B,IAAI,SAAS;gBAC1E,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,SAAS;aACzD,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,sDAAsD,KAAK,EAAE,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;;OAGG;IACK,iBAAiB,CAAC,GAAqB,EAAE,KAAa,EAAE,YAAoB,EAAE,iBAA0B;QAC5G,6EAA6E;QAC7E,IAAI,iBAAiB,EAAE,CAAC;YACpB,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBACvC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACzC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;gBACnD,SAAS,CAAC,iDAAiD,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC7E,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAClC,OAAO;YACX,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,QAAQ,CAAC,iDAAiD,iBAAiB,4BAA4B,CAAC,CAAC;gBACzG,mCAAmC;YACvC,CAAC;QACL,CAAC;QAED,6CAA6C;QAC7C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAmB,CAAC,CAAC;QACtD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QACnD,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACK,eAAe,CAAC,GAAqB,EAAE,SAAiB,EAAE,YAAoB,EAAE,iBAA0B;QAC9G,2EAA2E;QAC3E,IAAI,iBAAiB,EAAE,CAAC;YACpB,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBACvC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACvC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACzC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;gBACxD,SAAS,CAAC,4DAA4D,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACxF,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAClC,OAAO;YACX,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,QAAQ,CAAC,iDAAiD,iBAAiB,4BAA4B,CAAC,CAAC;gBACzG,mCAAmC;YACvC,CAAC;QACL,CAAC;QAED,2CAA2C;QAC3C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAiB,CAAC,CAAC;QACpD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;QACxD,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtC,CAAC;IAED;;OAEG;IACI,iBAAiB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED;;OAEG;IACI,sBAAsB;QACzB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACpC,CAAC;CACJ;AAED;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CAAC,OAAoC;IAI3E,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAClD,OAAO;QACH,cAAc,EAAE,OAAO,CAAC,iBAAiB,EAAE;QAC3C,mBAAmB,EAAE,OAAO,CAAC,sBAAsB,EAAE;KACxD,CAAC;AACN,CAAC"}

package/dist/telephony/media-upgrade-router.d.ts

@@ -19,6 +19,20 @@ import type { Server as HttpServer } from 'node:http';
 import type { WebSocketServer } from 'ws';
 /** Registers a media WebSocket route. Called by each vendor router's attach step. */
 export declare function RegisterMediaUpgradeRoute(path: string, wss: WebSocketServer): void;
+/**
+ * Whether an upgrade request's pathname should be routed to the GraphQL subscriptions socket.
+ *
+ * `GRAPHQL_ROOT_PATH` defaults to `/` (see `config.ts` / the docker README). On the HTTP side that
+ * default is invisible — Express's `app.use(graphqlRootPath, ...)` mounts with PREFIX matching, so a
+ * request to `/graphql` lands on the GraphQL middleware even when the configured root is the bare `/`.
+ * A WebSocket upgrade has no such prefix-matching fallback: it needs an exact pathname match. With no
+ * override, a stock install's default root (`/`) never matches the shipped MJExplorer client's hardcoded
+ * `GRAPHQL_WS_URI` (`ws://<host>/graphql`), so every subscription upgrade gets silently rejected — surfaces
+ * client-side as "WebSocket handshake: Unexpected response code: 400". Accept the conventional `/graphql`
+ * suffix as an alias of the bare root so a stock install works out of the box; a non-default `graphqlPath`
+ * (e.g. `/api`) keeps requiring an exact match, unchanged.
+ */
+export declare function IsGraphQLWsPath(pathname: string, graphqlPath: string): boolean;
 /**
  * Installs the single path-routing `upgrade` dispatcher. No-op when no media routes are registered, so
  * the GraphQL server keeps its own listener untouched. Otherwise it removes the auto-attached listeners

package/dist/telephony/media-upgrade-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media-upgrade-router.d.ts","sourceRoot":"","sources":["../../src/telephony/media-upgrade-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAmB,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAK1C,qFAAqF;AACrF,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,IAAI,CAElF;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAqB5H"}
+{"version":3,"file":"media-upgrade-router.d.ts","sourceRoot":"","sources":["../../src/telephony/media-upgrade-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAmB,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAK1C,qFAAqF;AACrF,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,IAAI,CAElF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAE9E;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAqB5H"}

package/dist/telephony/media-upgrade-router.js

@@ -21,6 +21,22 @@ const mediaRoutes = new Map();
 export function RegisterMediaUpgradeRoute(path, wss) {
     mediaRoutes.set(path, wss);
 }
+/**
+ * Whether an upgrade request's pathname should be routed to the GraphQL subscriptions socket.
+ *
+ * `GRAPHQL_ROOT_PATH` defaults to `/` (see `config.ts` / the docker README). On the HTTP side that
+ * default is invisible — Express's `app.use(graphqlRootPath, ...)` mounts with PREFIX matching, so a
+ * request to `/graphql` lands on the GraphQL middleware even when the configured root is the bare `/`.
+ * A WebSocket upgrade has no such prefix-matching fallback: it needs an exact pathname match. With no
+ * override, a stock install's default root (`/`) never matches the shipped MJExplorer client's hardcoded
+ * `GRAPHQL_WS_URI` (`ws://<host>/graphql`), so every subscription upgrade gets silently rejected — surfaces
+ * client-side as "WebSocket handshake: Unexpected response code: 400". Accept the conventional `/graphql`
+ * suffix as an alias of the bare root so a stock install works out of the box; a non-default `graphqlPath`
+ * (e.g. `/api`) keeps requiring an exact match, unchanged.
+ */
+export function IsGraphQLWsPath(pathname, graphqlPath) {
+    return pathname === graphqlPath || (graphqlPath === '/' && pathname === '/graphql');
+}
 /**
  * Installs the single path-routing `upgrade` dispatcher. No-op when no media routes are registered, so
  * the GraphQL server keeps its own listener untouched. Otherwise it removes the auto-attached listeners
@@ -41,7 +57,7 @@ export function InstallMediaUpgradeDispatcher(httpServer, graphqlWss, graphqlPat
     };
     httpServer.on('upgrade', (req, socket, head) => {
         const pathname = (req.url ?? '').split('?')[0];
-        if (pathname === graphqlPath) {
+        if (IsGraphQLWsPath(pathname, graphqlPath)) {
             dispatch(graphqlWss, req, socket, head);
             return;
         }

package/dist/telephony/media-upgrade-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"media-upgrade-router.js","sourceRoot":"","sources":["../../src/telephony/media-upgrade-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,mEAAmE;AACnE,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;AAEvD,qFAAqF;AACrF,MAAM,UAAU,yBAAyB,CAAC,IAAY,EAAE,GAAoB;IACxE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,6BAA6B,CAAC,UAAsB,EAAE,UAA2B,EAAE,WAAmB;IAClH,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;IACX,CAAC;IACD,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,GAAoB,EAAE,GAAoB,EAAE,MAAc,EAAE,IAAY,EAAQ,EAAE;QAChG,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC;IACF,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAoB,EAAE,MAAc,EAAE,IAAY,EAAE,EAAE;QAC5E,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC3B,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO;QACX,CAAC;QACD,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,GAAG,EAAE,CAAC;YACN,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACjC,OAAO;QACX,CAAC;QACD,MAAM,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"media-upgrade-router.js","sourceRoot":"","sources":["../../src/telephony/media-upgrade-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,mEAAmE;AACnE,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;AAEvD,qFAAqF;AACrF,MAAM,UAAU,yBAAyB,CAAC,IAAY,EAAE,GAAoB;IACxE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,WAAmB;IACjE,OAAO,QAAQ,KAAK,WAAW,IAAI,CAAC,WAAW,KAAK,GAAG,IAAI,QAAQ,KAAK,UAAU,CAAC,CAAC;AACxF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,6BAA6B,CAAC,UAAsB,EAAE,UAA2B,EAAE,WAAmB;IAClH,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;IACX,CAAC;IACD,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,GAAoB,EAAE,GAAoB,EAAE,MAAc,EAAE,IAAY,EAAQ,EAAE;QAChG,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC;IACF,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAoB,EAAE,MAAc,EAAE,IAAY,EAAE,EAAE;QAC5E,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,eAAe,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC;YACzC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO;QACX,CAAC;QACD,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,GAAG,EAAE,CAAC;YACN,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACjC,OAAO;QACX,CAAC;QACD,MAAM,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACP,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "5.48.0",
+  "version": "5.50.0",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -27,93 +27,94 @@
     "@as-integrations/express5": "^1.0.0",
     "@graphql-tools/schema": "latest",
     "@graphql-tools/utils": "^11.0.0",
-    "@memberjunction/actions": "5.48.0",
-    "@memberjunction/actions-apollo": "5.48.0",
-    "@memberjunction/actions-base": "5.48.0",
-    "@memberjunction/actions-bizapps-accounting": "5.48.0",
-    "@memberjunction/actions-bizapps-crm": "5.48.0",
-    "@memberjunction/actions-bizapps-formbuilders": "5.48.0",
-    "@memberjunction/actions-bizapps-lms": "5.48.0",
-    "@memberjunction/actions-bizapps-social": "5.48.0",
-    "@memberjunction/ai": "5.48.0",
-    "@memberjunction/ai-agent-manager": "5.48.0",
-    "@memberjunction/ai-agent-manager-actions": "5.48.0",
-    "@memberjunction/ai-agents": "5.48.0",
-    "@memberjunction/ai-bridge-base": "5.48.0",
-    "@memberjunction/ai-bridge-ringcentral": "5.48.0",
-    "@memberjunction/ai-bridge-server": "5.48.0",
-    "@memberjunction/ai-bridge-teams": "5.48.0",
-    "@memberjunction/ai-bridge-twilio": "5.48.0",
-    "@memberjunction/ai-bridge-vonage": "5.48.0",
-    "@memberjunction/ai-core-plus": "5.48.0",
-    "@memberjunction/ai-engine-base": "5.48.0",
-    "@memberjunction/ai-mcp-client": "5.48.0",
-    "@memberjunction/ai-prompts": "5.48.0",
-    "@memberjunction/ai-provider-bundle": "5.48.0",
-    "@memberjunction/ai-vector-sync": "5.48.0",
-    "@memberjunction/ai-vectordb": "5.48.0",
-    "@memberjunction/ai-vectors-pinecone": "5.48.0",
-    "@memberjunction/aiengine": "5.48.0",
-    "@memberjunction/api-keys": "5.48.0",
-    "@memberjunction/auth-providers": "5.48.0",
-    "@memberjunction/clustering-engine": "5.48.0",
-    "@memberjunction/codegen-lib": "5.48.0",
-    "@memberjunction/communication-engine": "5.48.0",
-    "@memberjunction/communication-ms-graph": "5.48.0",
-    "@memberjunction/notifications": "5.48.0",
-    "@memberjunction/communication-sendgrid": "5.48.0",
-    "@memberjunction/communication-types": "5.48.0",
-    "@memberjunction/component-registry-client-sdk": "5.48.0",
-    "@memberjunction/computer-use": "5.48.0",
-    "@memberjunction/computer-use-engine": "5.48.0",
-    "@memberjunction/config": "5.48.0",
-    "@memberjunction/core": "5.48.0",
-    "@memberjunction/core-actions": "5.48.0",
-    "@memberjunction/core-entities": "5.48.0",
-    "@memberjunction/core-entities-server": "5.48.0",
-    "@memberjunction/credentials": "5.48.0",
-    "@memberjunction/data-context": "5.48.0",
-    "@memberjunction/data-context-server": "5.48.0",
-    "@memberjunction/doc-utils": "5.48.0",
-    "@memberjunction/encryption": "5.48.0",
-    "@memberjunction/entity-communications-base": "5.48.0",
-    "@memberjunction/entity-communications-server": "5.48.0",
-    "@memberjunction/esignature": "5.48.0",
-    "@memberjunction/external-change-detection": "5.48.0",
-    "@memberjunction/generic-database-provider": "5.48.0",
-    "@memberjunction/global": "5.48.0",
-    "@memberjunction/graphql-dataprovider": "5.48.0",
-    "@memberjunction/integration-engine": "5.48.0",
-    "@memberjunction/integration-progress-artifacts": "5.48.0",
-    "@memberjunction/integration-schema-builder": "5.48.0",
-    "@memberjunction/interactive-component-types": "5.48.0",
-    "@memberjunction/lists": "5.48.0",
-    "@memberjunction/lists-base": "5.48.0",
-    "@memberjunction/livekit-room-server": "5.48.0",
-    "@memberjunction/postgresql-dataprovider": "5.48.0",
-    "@memberjunction/queue": "5.48.0",
-    "@memberjunction/record-comparison": "5.48.0",
-    "@memberjunction/redis-provider": "5.48.0",
-    "@memberjunction/remote-browser-base": "5.48.0",
-    "@memberjunction/remote-browser-cdp": "5.48.0",
-    "@memberjunction/remote-browser-selfhost": "5.48.0",
-    "@memberjunction/remote-browser-server": "5.48.0",
-    "@memberjunction/scheduling-actions": "5.48.0",
-    "@memberjunction/scheduling-base-types": "5.48.0",
-    "@memberjunction/scheduling-engine": "5.48.0",
-    "@memberjunction/scheduling-engine-base": "5.48.0",
-    "@memberjunction/schema-engine": "5.48.0",
-    "@memberjunction/search-engine": "5.48.0",
-    "@memberjunction/server-extensions-core": "5.48.0",
-    "@memberjunction/sql-dialect": "5.48.0",
-    "@memberjunction/sqlserver-dataprovider": "5.48.0",
-    "@memberjunction/storage": "5.48.0",
-    "@memberjunction/tag-engine": "5.48.0",
-    "@memberjunction/tag-engine-base": "5.48.0",
-    "@memberjunction/templates": "5.48.0",
-    "@memberjunction/testing-engine": "5.48.0",
-    "@memberjunction/testing-engine-base": "5.48.0",
-    "@memberjunction/version-history": "5.48.0",
+    "@memberjunction/actions": "5.50.0",
+    "@memberjunction/actions-apollo": "5.50.0",
+    "@memberjunction/actions-base": "5.50.0",
+    "@memberjunction/actions-bizapps-accounting": "5.50.0",
+    "@memberjunction/actions-bizapps-crm": "5.50.0",
+    "@memberjunction/actions-bizapps-formbuilders": "5.50.0",
+    "@memberjunction/actions-bizapps-lms": "5.50.0",
+    "@memberjunction/actions-bizapps-social": "5.50.0",
+    "@memberjunction/ai": "5.50.0",
+    "@memberjunction/ai-agent-manager": "5.50.0",
+    "@memberjunction/ai-agent-manager-actions": "5.50.0",
+    "@memberjunction/ai-agents": "5.50.0",
+    "@memberjunction/ai-bridge-base": "5.50.0",
+    "@memberjunction/ai-bridge-ringcentral": "5.50.0",
+    "@memberjunction/ai-bridge-server": "5.50.0",
+    "@memberjunction/ai-bridge-teams": "5.50.0",
+    "@memberjunction/ai-bridge-twilio": "5.50.0",
+    "@memberjunction/ai-bridge-vonage": "5.50.0",
+    "@memberjunction/ai-core-plus": "5.50.0",
+    "@memberjunction/ai-engine-base": "5.50.0",
+    "@memberjunction/ai-mcp-client": "5.50.0",
+    "@memberjunction/ai-prompts": "5.50.0",
+    "@memberjunction/ai-provider-bundle": "5.50.0",
+    "@memberjunction/ai-vector-sync": "5.50.0",
+    "@memberjunction/ai-vectordb": "5.50.0",
+    "@memberjunction/ai-vectors-pinecone": "5.50.0",
+    "@memberjunction/aiengine": "5.50.0",
+    "@memberjunction/api-keys": "5.50.0",
+    "@memberjunction/auth-providers": "5.50.0",
+    "@memberjunction/clustering-engine": "5.50.0",
+    "@memberjunction/codegen-lib": "5.50.0",
+    "@memberjunction/communication-engine": "5.50.0",
+    "@memberjunction/communication-ms-graph": "5.50.0",
+    "@memberjunction/communication-sendgrid": "5.50.0",
+    "@memberjunction/communication-types": "5.50.0",
+    "@memberjunction/component-registry-client-sdk": "5.50.0",
+    "@memberjunction/computer-use": "5.50.0",
+    "@memberjunction/computer-use-engine": "5.50.0",
+    "@memberjunction/config": "5.50.0",
+    "@memberjunction/core": "5.50.0",
+    "@memberjunction/core-actions": "5.50.0",
+    "@memberjunction/core-entities": "5.50.0",
+    "@memberjunction/core-entities-server": "5.50.0",
+    "@memberjunction/credentials": "5.50.0",
+    "@memberjunction/data-context": "5.50.0",
+    "@memberjunction/data-context-server": "5.50.0",
+    "@memberjunction/doc-utils": "5.50.0",
+    "@memberjunction/encryption": "5.50.0",
+    "@memberjunction/entity-communications-base": "5.50.0",
+    "@memberjunction/entity-communications-server": "5.50.0",
+    "@memberjunction/esignature": "5.50.0",
+    "@memberjunction/external-change-detection": "5.50.0",
+    "@memberjunction/generic-database-provider": "5.50.0",
+    "@memberjunction/global": "5.50.0",
+    "@memberjunction/graphql-dataprovider": "5.50.0",
+    "@memberjunction/integration-engine": "5.50.0",
+    "@memberjunction/integration-engine-base": "5.50.0",
+    "@memberjunction/integration-progress-artifacts": "5.50.0",
+    "@memberjunction/integration-schema-builder": "5.50.0",
+    "@memberjunction/interactive-component-types": "5.50.0",
+    "@memberjunction/lists": "5.50.0",
+    "@memberjunction/lists-base": "5.50.0",
+    "@memberjunction/livekit-room-server": "5.50.0",
+    "@memberjunction/notifications": "5.50.0",
+    "@memberjunction/postgresql-dataprovider": "5.50.0",
+    "@memberjunction/queue": "5.50.0",
+    "@memberjunction/record-comparison": "5.50.0",
+    "@memberjunction/redis-provider": "5.50.0",
+    "@memberjunction/remote-browser-base": "5.50.0",
+    "@memberjunction/remote-browser-cdp": "5.50.0",
+    "@memberjunction/remote-browser-selfhost": "5.50.0",
+    "@memberjunction/remote-browser-server": "5.50.0",
+    "@memberjunction/scheduling-actions": "5.50.0",
+    "@memberjunction/scheduling-base-types": "5.50.0",
+    "@memberjunction/scheduling-engine": "5.50.0",
+    "@memberjunction/scheduling-engine-base": "5.50.0",
+    "@memberjunction/schema-engine": "5.50.0",
+    "@memberjunction/search-engine": "5.50.0",
+    "@memberjunction/server-extensions-core": "5.50.0",
+    "@memberjunction/sql-dialect": "5.50.0",
+    "@memberjunction/sqlserver-dataprovider": "5.50.0",
+    "@memberjunction/storage": "5.50.0",
+    "@memberjunction/tag-engine": "5.50.0",
+    "@memberjunction/tag-engine-base": "5.50.0",
+    "@memberjunction/templates": "5.50.0",
+    "@memberjunction/testing-engine": "5.50.0",
+    "@memberjunction/testing-engine-base": "5.50.0",
+    "@memberjunction/version-history": "5.50.0",
     "@octokit/auth-app": "^7.1.5",
     "@octokit/rest": "^21.1.1",
     "@types/compression": "^1.8.1",
@@ -150,9 +151,10 @@
     "typedi": "^0.10.0",
     "uuid": "^13.0.0",
     "ws": "^8.19.0",
-    "zod": "~3.24.4"
+    "zod": "^3.25.0"
   },
   "devDependencies": {
+    "@types/express": "^4.17.25",
     "pkgroll": "2.23.0",
     "typescript": "^5.9.3",
     "vitest": "^3.1.1"