@oneuptime/common 12.0.32 → 12.0.34

package/build/dist/UI/Utils/GlobalKeyboardShortcut.js

@@ -0,0 +1,138 @@
+/**
+ * The plumbing behind single-key global shortcuts — "?" for the shortcuts
+ * dialog, and "g then <key>" to jump between pages.
+ *
+ * Chorded shortcuts (Cmd/Ctrl+K) can be bound naively because they never
+ * collide with typing. Single-key ones can: every letter a shortcut claims is
+ * a letter someone is also trying to type into a search box, a note, or a
+ * YAML editor. Everything in this module exists to decide, from an event
+ * alone, whether a keypress was meant for the page or for the app — and it is
+ * kept free of React so both halves can be pinned by tests.
+ */
+/**
+ * How long the leader key stays armed. Long enough that "g" and "i" can be
+ * two deliberate presses rather than a chord, short enough that a "g" typed
+ * and then abandoned does not turn the next keystroke into a navigation.
+ */
+export const KEYBOARD_SEQUENCE_TIMEOUT_IN_MS = 1500;
+/**
+ * True when the keypress landed somewhere the user is composing text, and so
+ * belongs to that field rather than to the app.
+ *
+ * SELECT is included deliberately: a native select does its own type-ahead,
+ * and stealing those letters would break jumping to an option by name.
+ */
+export function isTextEntryTarget(target) {
+    if (!target) {
+        return false;
+    }
+    const element = target;
+    const tagName = (element.tagName || "").toUpperCase();
+    if (tagName === "INPUT" || tagName === "TEXTAREA" || tagName === "SELECT") {
+        return true;
+    }
+    if (element.isContentEditable === true) {
+        return true;
+    }
+    /*
+     * jsdom does not implement isContentEditable (it is always undefined), and
+     * some editors set the attribute on a wrapper rather than the focused node.
+     * The attribute is the reliable half of the pair.
+     */
+    if (typeof element.getAttribute === "function") {
+        const attribute = element.getAttribute("contenteditable");
+        if (attribute !== null && attribute !== "false") {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * True when a modal dialog is on screen. Global shortcuts stand down while one
+ * is open: navigating the page out from under a dialog the user is still
+ * filling in would discard their work without asking.
+ *
+ * The selector is the same one Modal itself uses to find the topmost dialog,
+ * so anything that reads as modal to assistive tech reads as modal here.
+ */
+export function hasOpenModalDialog(root) {
+    if (!root) {
+        return false;
+    }
+    return root.querySelector('[role="dialog"][aria-modal="true"]') !== null;
+}
+/**
+ * The shared gate for every single-key global shortcut: the key must be
+ * unmodified (a chord belongs to whoever bound that chord), unclaimed by
+ * another handler, and pressed outside a text field.
+ *
+ * Shift is deliberately not rejected — "?" is Shift+/ on most layouts, and the
+ * event already reports the shifted `key`.
+ */
+export function shouldIgnoreGlobalKeyPress(event) {
+    if (event.metaKey === true ||
+        event.ctrlKey === true ||
+        event.altKey === true) {
+        return true;
+    }
+    if (event.defaultPrevented === true) {
+        return true;
+    }
+    return isTextEntryTarget(event.target);
+}
+// ---- leader-key sequences ---------------------------------------------------
+export var KeyboardSequenceOutcome;
+(function (KeyboardSequenceOutcome) {
+    /** The leader key was pressed. The next key in time completes the sequence. */
+    KeyboardSequenceOutcome["Armed"] = "Armed";
+    /** A key arrived while armed and within the timeout. */
+    KeyboardSequenceOutcome["Completed"] = "Completed";
+    /** Not part of a sequence — the caller should do nothing. */
+    KeyboardSequenceOutcome["Ignored"] = "Ignored";
+})(KeyboardSequenceOutcome || (KeyboardSequenceOutcome = {}));
+export const EMPTY_KEYBOARD_SEQUENCE_STATE = {
+    leaderPressedAt: null,
+};
+/**
+ * One step of a "leader then key" sequence, as a pure function of the previous
+ * state and the key just pressed.
+ *
+ * Written as a reducer rather than a stateful class so the interesting cases —
+ * an expired leader, a repeated leader, a key with no leader before it — are
+ * ordinary function calls in a test instead of timer choreography.
+ */
+export function reduceKeyboardSequence(input) {
+    const key = input.key.toLowerCase();
+    const leaderKey = input.leaderKey.toLowerCase();
+    const isArmed = input.state.leaderPressedAt !== null &&
+        input.now - input.state.leaderPressedAt <= input.timeoutInMs;
+    /*
+     * A second leader press re-arms rather than completing. "g" is the one key
+     * that cannot be a destination, so treating "g g h" as "go home" is both the
+     * only sensible reading and the forgiving one.
+     */
+    if (key === leaderKey) {
+        return {
+            outcome: KeyboardSequenceOutcome.Armed,
+            state: { leaderPressedAt: input.now },
+            key: null,
+        };
+    }
+    if (isArmed) {
+        return {
+            outcome: KeyboardSequenceOutcome.Completed,
+            state: EMPTY_KEYBOARD_SEQUENCE_STATE,
+            key: key,
+        };
+    }
+    /*
+     * Either no leader, or one that timed out. Both disarm: a stale leader must
+     * not survive to pair with a keystroke a second later.
+     */
+    return {
+        outcome: KeyboardSequenceOutcome.Ignored,
+        state: EMPTY_KEYBOARD_SEQUENCE_STATE,
+        key: null,
+    };
+}
+//# sourceMappingURL=GlobalKeyboardShortcut.js.map

package/build/dist/UI/Utils/GlobalKeyboardShortcut.js.map

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

package/build/dist/UI/Utils/PageScrollLock.js

@@ -11,6 +11,7 @@
  * snapshot the other had already overwritten, leaving the page either scrolling
  * under a dialog that is still open or locked forever with no dialog on screen.
  */
+import { useLayoutEffect } from "react";
 let openDialogCount = 0;
 let bodyOverflowBeforeLock = "";
 let bodyPaddingRightBeforeLock = "";
@@ -31,13 +32,40 @@ export const lockPageScroll = () => {
     }
     document.body.style.overflow = "hidden";
 };
+const restoreBodyStyle = (property, value) => {
+    if (value === "") {
+        document.body.style.removeProperty(property);
+        return;
+    }
+    document.body.style.setProperty(property, value);
+};
 export const unlockPageScroll = () => {
-    openDialogCount = Math.max(0, openDialogCount - 1);
+    /*
+     * Nothing is open, so there is nothing of ours on the page to put back. A
+     * stray unlock — one surface releasing twice, a cleanup that outlives the
+     * lock it was paired with — has to be inert rather than paint a snapshot
+     * taken for some earlier dialog over whatever the page is wearing now.
+     */
+    if (openDialogCount === 0) {
+        return;
+    }
+    openDialogCount--;
     if (openDialogCount > 0 || typeof document === "undefined") {
         return;
     }
-    document.body.style.overflow = bodyOverflowBeforeLock;
-    document.body.style.paddingRight = bodyPaddingRightBeforeLock;
+    restoreBodyStyle("overflow", bodyOverflowBeforeLock);
+    restoreBodyStyle("padding-right", bodyPaddingRightBeforeLock);
+};
+export const usePageScrollLock = (isLocked) => {
+    useLayoutEffect(() => {
+        if (!isLocked) {
+            return undefined;
+        }
+        lockPageScroll();
+        return () => {
+            unlockPageScroll();
+        };
+    }, [isLocked]);
 };
 /*
  * Test-only escape hatch. The counter is module state that survives between

package/build/dist/UI/Utils/PageScrollLock.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageScrollLock.js","sourceRoot":"","sources":["../../../../UI/Utils/PageScrollLock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,IAAI,eAAe,GAAW,CAAC,CAAC;AAChC,IAAI,sBAAsB,GAAW,EAAE,CAAC;AACxC,IAAI,0BAA0B,GAAW,EAAE,CAAC;AAI5C,MAAM,CAAC,MAAM,cAAc,GAA2B,GAAS,EAAE;IAC/D,eAAe,EAAE,CAAC;IAElB,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IACtD,0BAA0B,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IAE9D;;;OAGG;IACH,MAAM,cAAc,GAClB,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC;IAE3D,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,GAAG,cAAc,IAAI,CAAC;IAC3D,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAA2B,GAAS,EAAE;IACjE,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC,CAAC;IAEnD,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,sBAAsB,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,0BAA0B,CAAC;AAChE,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,GAAS,EAAE;IACT,eAAe,GAAG,CAAC,CAAC;IACpB,sBAAsB,GAAG,EAAE,CAAC;IAC5B,0BAA0B,GAAG,EAAE,CAAC;AAClC,CAAC,CAAC"}
+{"version":3,"file":"PageScrollLock.js","sourceRoot":"","sources":["../../../../UI/Utils/PageScrollLock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,IAAI,eAAe,GAAW,CAAC,CAAC;AAChC,IAAI,sBAAsB,GAAW,EAAE,CAAC;AACxC,IAAI,0BAA0B,GAAW,EAAE,CAAC;AAI5C,MAAM,CAAC,MAAM,cAAc,GAA2B,GAAS,EAAE;IAC/D,eAAe,EAAE,CAAC;IAElB,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IACtD,0BAA0B,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IAE9D;;;OAGG;IACH,MAAM,cAAc,GAClB,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC;IAE3D,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,GAAG,cAAc,IAAI,CAAC;IAC3D,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;AAC1C,CAAC,CAAC;AAWF,MAAM,gBAAgB,GAA6B,CACjD,QAAgB,EAChB,KAAa,EACP,EAAE;IACR,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;QACjB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAE7C,OAAO;IACT,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAA2B,GAAS,EAAE;IACjE;;;;;OAKG;IACH,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,eAAe,EAAE,CAAC;IAElB,IAAI,eAAe,GAAG,CAAC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,gBAAgB,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;IACrD,gBAAgB,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;AAChE,CAAC,CAAC;AA4BF,MAAM,CAAC,MAAM,iBAAiB,GAA8B,CAC1D,QAAiB,EACX,EAAE;IACR,eAAe,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,cAAc,EAAE,CAAC;QAEjB,OAAO,GAAG,EAAE;YACV,gBAAgB,EAAE,CAAC;QACrB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,6BAA6B,GACxC,GAAS,EAAE;IACT,eAAe,GAAG,CAAC,CAAC;IACpB,sBAAsB,GAAG,EAAE,CAAC;IAC5B,0BAA0B,GAAG,EAAE,CAAC;AAClC,CAAC,CAAC"}

package/build/dist/UI/Utils/PermissionGate.js

@@ -1,4 +1,4 @@
-import { PermissionHelper, } from "../../Types/Permission";
+import Permission, { PermissionHelper, } from "../../Types/Permission";
 import PermissionUtil from "./Permission";
 import User from "./User";
 /*
@@ -120,6 +120,23 @@ export default class PermissionGate {
         return titles;
     }
     static hasPermission(model, action, userPermissions) {
+        if (this.hasDeclaredPermission(model, action, userPermissions)) {
+            return true;
+        }
+        /*
+         * The server widens a model's declared permissions with the matching
+         * *AllOperationalResources wildcard for anything marked
+         * @OperationalResource (TablePermission.getEffectiveModelPermissions, and
+         * its analytics twin). Without the same step here, somebody granted
+         * "Edit All Operational Resources" - and nothing else - was told by every
+         * gate in the UI that they could not edit a monitor, an incident or a
+         * dashboard, while the API happily accepted the write. The gate must not
+         * be stricter than the endpoint it is standing in front of.
+         */
+        const wildcard = this.getOperationalWildcard(model, action);
+        return Boolean(wildcard && userPermissions.includes(wildcard));
+    }
+    static hasDeclaredPermission(model, action, userPermissions) {
         switch (action) {
             case ModelAction.Create:
                 return model.hasCreatePermissions(userPermissions);
@@ -133,6 +150,30 @@ export default class PermissionGate {
                 return false;
         }
     }
+    /*
+     * The wildcard that covers this operation on this model, or null when the
+     * model is not an operational resource. Kept out of getModelPermissions on
+     * purpose: that list is what the "you need one of these permissions"
+     * sentence is built from, and the server names only the model's own
+     * permissions there too.
+     */
+    static getOperationalWildcard(model, action) {
+        if (!model.isOperationalResource) {
+            return null;
+        }
+        switch (action) {
+            case ModelAction.Create:
+                return Permission.CreateAllOperationalResources;
+            case ModelAction.Read:
+                return Permission.ReadAllOperationalResources;
+            case ModelAction.Update:
+                return Permission.EditAllOperationalResources;
+            case ModelAction.Delete:
+                return Permission.DeleteAllOperationalResources;
+            default:
+                return null;
+        }
+    }
     /*
      * Applies a gate to a card button in one line. Several tables replace the
      * built in create modal with a button that routes to a dedicated create

package/build/dist/UI/Utils/PermissionGate.js.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionGate.js","sourceRoot":"","sources":["../../../../UI/Utils/PermissionGate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PermissionGate.js","sourceRoot":"","sources":["../../../../UI/Utils/PermissionGate.ts"],"names":[],"mappings":"AAEA,OAAO,UAAU,EAAE,EACjB,gBAAgB,GAEjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,cAAc,MAAM,cAAc,CAAC;AAC1C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B;;;;;GAKG;AACH,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,gCAAiB,CAAA;AACnB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AA8DD;;;;GAIG;AACH,IAAI,oBAAoB,GAAuC,IAAI,CAAC;AAIpE,MAAM,kBAAkB,GACtB,GAAgC,EAAE;IAChC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,oBAAoB;YAClB,gBAAgB,CAAC,iCAAiC,EAAE,CAAC;IACzD,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEJ;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IAC1B,MAAM,CAAC,KAAK,CACjB,KAA+B,EAC/B,MAAmB,EACnB,OAA2C;;QAE3C;;;;WAIG;QACH,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzB,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC7B,CAAC;QAED,MAAM,eAAe,GACnB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,mCAAI,cAAc,CAAC,iBAAiB,EAAE,CAAC;QAE7D,MAAM,gBAAgB,GAAsB,IAAI,CAAC,mBAAmB,CAClE,KAAK,EACL,MAAM,CACP,CAAC;QAEF;;;;;WAKG;QACH,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAC9B,CAAC;QAED;;;;;WAKG;QACH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAC9B,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC7B,CAAC;QAED,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,cAAc,EAAE,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;SACzE,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,2BAA2B,CACvC,KAA+B,EAC/B,MAAmB,EACnB,OAA2C;QAE3C,MAAM,YAAY,GAChB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,KAAI,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC;QAExD,MAAM,MAAM,GAAkB,IAAI,CAAC,mBAAmB,CACpD,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CACxC,CAAC;QAEF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,iCAAiC,MAAM,SAAS,YAAY,GAAG,CAAC;QACzE,CAAC;QAED,OAAO,iCAAiC,MAAM,SAAS,YAAY,wCAAwC,MAAM,CAAC,IAAI,CACpH,IAAI,CACL,GAAG,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAC/B,KAA+B,EAC/B,MAAmB;QAEnB,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,KAAK,CAAC,oBAAoB,EAAE,IAAI,EAAE,CAAC;YAC5C,KAAK,WAAW,CAAC,IAAI;gBACnB,OAAO,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC;YAC1C,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,KAAK,CAAC,oBAAoB,EAAE,IAAI,EAAE,CAAC;YAC5C,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,KAAK,CAAC,oBAAoB,EAAE,IAAI,EAAE,CAAC;YAC5C;gBACE,OAAO,EAAE,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAC/B,WAA8B;QAE9B,MAAM,KAAK,GAAgC,kBAAkB,EAAE,CAAC;QAChE,MAAM,MAAM,GAAkB,EAAE,CAAC;QAEjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,cAAc,GAAgC,KAAK,CAAC,UAAU,CAAC,CAAC;YAEtE,IAAI,cAAc,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7D,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,MAAM,CAAC,aAAa,CAC1B,KAA+B,EAC/B,MAAmB,EACnB,eAAkC;QAElC,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC;QAED;;;;;;;;;WASG;QACH,MAAM,QAAQ,GAAsB,IAAI,CAAC,sBAAsB,CAC7D,KAAK,EACL,MAAM,CACP,CAAC;QAEF,OAAO,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAClC,KAA+B,EAC/B,MAAmB,EACnB,eAAkC;QAElC,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,KAAK,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YACrD,KAAK,WAAW,CAAC,IAAI;gBACnB,OAAO,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;YACnD,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,KAAK,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YACrD,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,KAAK,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YACrD;gBACE,OAAO,KAAK,CAAC;QACjB,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACK,MAAM,CAAC,sBAAsB,CACnC,KAA+B,EAC/B,MAAmB;QAEnB,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,UAAU,CAAC,6BAA6B,CAAC;YAClD,KAAK,WAAW,CAAC,IAAI;gBACnB,OAAO,UAAU,CAAC,2BAA2B,CAAC;YAChD,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,UAAU,CAAC,2BAA2B,CAAC;YAChD,KAAK,WAAW,CAAC,MAAM;gBACrB,OAAO,UAAU,CAAC,6BAA6B,CAAC;YAClD;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACI,MAAM,CAAC,cAAc,CAC1B,MAAwB,EACxB,KAA+B,EAC/B,MAAmB,EACnB,OAA2C;QAE3C,MAAM,MAAM,GAAyB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExE,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,uCACK,MAAM,KACT,QAAQ,EAAE,IAAI,EACd,OAAO,EAAE,MAAM,CAAC,cAAc,EAC9B,OAAO,EAAE,GAAG,EAAE;gBACZ,wDAAwD;YAC1D,CAAC,IACD;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACI,MAAM,CAAC,aAAa,CACzB,KAAqC,EACrC,UAAkB,EAClB,OAA2C;;QAE3C,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,aAAa,GACjB,KAAK,CAAC,mCAAmC,EAAE,CAAC,UAAU,CAAC,CAAC;QAE1D,MAAM,iBAAiB,GAAsB,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,KAAI,EAAE,CAAC;QAEvE,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,eAAe,GACnB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,mCAAI,cAAc,CAAC,iBAAiB,EAAE,CAAC;QAE7D,OAAO,gBAAgB,CAAC,wBAAwB,CAC9C,eAAe,EACf,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAED,4EAA4E;IACrE,MAAM,CAAC,yBAAyB;QACrC,oBAAoB,GAAG,IAAI,CAAC;IAC9B,CAAC;CACF"}

package/build/dist/UI/Utils/SensitiveUrlToken.js

@@ -0,0 +1,97 @@
+/*
+ * Client half of the sensitive-URL-token handoff.
+ *
+ * Common/Server/Views/Partials/SensitiveUrlToken.ejs runs in <head>, moves the
+ * bearer token out of the path into sessionStorage and rewrites the address bar
+ * to the token-free route. By the time React mounts, the token is no longer a
+ * route parameter, so pages read it from here instead of from the router.
+ *
+ * Deliberately not routed through Common/UI/Utils/Navigation: this is read
+ * during the reset and verification flows, where the value has to be available
+ * whether or not the bootstrap managed to clean the URL, and Navigation only
+ * ever sees whatever the router was given.
+ *
+ * TOKEN_ROUTES is duplicated in the partial. The two lists have to agree about
+ * which routes carry a token; Common/Tests/App/SensitiveUrlTokenBootstrap.test.ts
+ * asserts that they do.
+ */
+const STORAGE_KEY = "oneuptime-sensitive-url-token";
+/*
+ * Route segments whose NEXT path segment is a single-use bearer token. Matched
+ * against the second-to-last segment, so this covers
+ * /accounts/reset-password/<token>, /reset-password/<token> and
+ * /status-page/<id>/reset-password/<token> alike.
+ */
+const TOKEN_ROUTES = ["reset-password", "verify-email"];
+export default class SensitiveUrlToken {
+    /*
+     * The token for the current page, or "" when there is none.
+     *
+     * Order matters. sessionStorage is where the bootstrap normally puts it and
+     * is the only source that survives a reload of the cleaned URL. The in-memory
+     * handoff covers blocked storage. The path is the last resort: it only holds
+     * a token when the bootstrap could not run, and reading it keeps the flow
+     * working on the browsers where that happens.
+     */
+    static read() {
+        try {
+            const stored = window.sessionStorage.getItem(STORAGE_KEY);
+            if (stored) {
+                return stored;
+            }
+        }
+        catch (_a) {
+            /* Private mode or storage disabled; fall through. */
+        }
+        const handedOff = window
+            .__ONEUPTIME_SENSITIVE_URL_TOKEN__;
+        if (handedOff) {
+            return handedOff;
+        }
+        return SensitiveUrlToken.readFromPath(window.location.pathname);
+    }
+    /*
+     * Pull the token out of a path, if that path is a token-bearing route.
+     * Returns "" for the cleaned form of the same route, which is what the
+     * address bar holds once the bootstrap has run.
+     */
+    static readFromPath(pathname) {
+        const segments = SensitiveUrlToken.segmentsOf(pathname);
+        if (segments.length < 2) {
+            return "";
+        }
+        if (!TOKEN_ROUTES.includes(segments[segments.length - 2])) {
+            return "";
+        }
+        const token = segments[segments.length - 1];
+        try {
+            return decodeURIComponent(token);
+        }
+        catch (_a) {
+            // A malformed escape sequence is handed on verbatim.
+            return token;
+        }
+    }
+    /*
+     * Drop the stashed token once the flow that needed it has completed.
+     *
+     * Only call this on success. A failed reset (an expired token, a password the
+     * server rejected) has to leave the stash intact, or the retry — and any
+     * reload of the now token-free URL — has nothing to submit.
+     */
+    static clear() {
+        try {
+            window.sessionStorage.removeItem(STORAGE_KEY);
+        }
+        catch (_a) {
+            /* Nothing was stored, so nothing to remove. */
+        }
+        delete window.__ONEUPTIME_SENSITIVE_URL_TOKEN__;
+    }
+    static segmentsOf(pathname) {
+        return (pathname || "").split("/").filter((segment) => {
+            return segment !== "";
+        });
+    }
+}
+//# sourceMappingURL=SensitiveUrlToken.js.map

package/build/dist/UI/Utils/SensitiveUrlToken.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SensitiveUrlToken.js","sourceRoot":"","sources":["../../../../UI/Utils/SensitiveUrlToken.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,GAAW,+BAA+B,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,YAAY,GAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;AAMvE,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;;;;;OAQG;IACI,MAAM,CAAC,IAAI;QAChB,IAAI,CAAC;YACH,MAAM,MAAM,GAAkB,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAEzE,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAAC,WAAM,CAAC;YACP,qDAAqD;QACvD,CAAC;QAED,MAAM,SAAS,GAAwB,MAAwB;aAC5D,iCAAiC,CAAC;QAErC,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,YAAY,CAAC,QAAgB;QACzC,MAAM,QAAQ,GAAkB,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEvE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,EAAE,CAAC;YAC3D,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,KAAK,GAAW,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;QAErD,IAAI,CAAC;YACH,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAAC,WAAM,CAAC;YACP,qDAAqD;YACrD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,KAAK;QACjB,IAAI,CAAC;YACH,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;QAAC,WAAM,CAAC;YACP,+CAA+C;QACjD,CAAC;QAED,OAAQ,MAAwB,CAAC,iCAAiC,CAAC;IACrE,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,QAAgB;QACxC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,OAAe,EAAW,EAAE;YACrE,OAAO,OAAO,KAAK,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/build/dist/UI/Utils/Telemetry/BrowserTelemetryConfig.js

@@ -0,0 +1,14 @@
+import URL from "../../../Types/API/URL";
+/*
+ * Kept independent from the large UI Config module so this security boundary
+ * can be tested directly: backend OTLP names are intentionally not accepted
+ * by this function at all.
+ */
+export default function getBrowserTelemetryConfig(readEnvironmentVariable) {
+    const endpoint = readEnvironmentVariable("PUBLIC_OPENTELEMETRY_EXPORTER_OTLP_ENDPOINT");
+    return {
+        endpoint: endpoint ? URL.fromString(endpoint) : null,
+        browserIngestionKey: readEnvironmentVariable("PUBLIC_OPENTELEMETRY_EXPORTER_OTLP_BROWSER_INGESTION_KEY"),
+    };
+}
+//# sourceMappingURL=BrowserTelemetryConfig.js.map

package/build/dist/UI/Utils/Telemetry/BrowserTelemetryConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BrowserTelemetryConfig.js","sourceRoot":"","sources":["../../../../../UI/Utils/Telemetry/BrowserTelemetryConfig.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,wBAAwB,CAAC;AASzC;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAC/C,uBAAgD;IAEhD,MAAM,QAAQ,GAAW,uBAAuB,CAC9C,6CAA6C,CAC9C,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;QACpD,mBAAmB,EAAE,uBAAuB,CAC1C,0DAA0D,CAC3D;KACF,CAAC;AACJ,CAAC"}

package/build/dist/UI/Utils/Telemetry/Telemetry.js

@@ -1,4 +1,4 @@
-import { DisableTelemetry, OpenTelemetryExporterOtlpEndpoint, OpenTelemetryExporterOtlpHeaders, } from "../../Config";
+import { BrowserOpenTelemetryExporterOtlpEndpoint, BrowserOpenTelemetryExporterOtlpIngestionKey, DisableTelemetry, } from "../../Config";
 import { ZoneContextManager } from "@opentelemetry/context-zone";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { registerInstrumentations } from "@opentelemetry/instrumentation";
@@ -55,11 +55,13 @@ export default class Telemetry {
         if (DisableTelemetry) {
             return;
         }
-        const hasHeaders = Object.keys(OpenTelemetryExporterOtlpHeaders).length > 0;
-        if (OpenTelemetryExporterOtlpEndpoint && hasHeaders) {
+        if (BrowserOpenTelemetryExporterOtlpEndpoint &&
+            BrowserOpenTelemetryExporterOtlpIngestionKey) {
             const traceExporter = new OTLPTraceExporter({
-                url: URL.fromString((OpenTelemetryExporterOtlpEndpoint === null || OpenTelemetryExporterOtlpEndpoint === void 0 ? void 0 : OpenTelemetryExporterOtlpEndpoint.toString()) + "/v1/traces").toString(),
-                headers: OpenTelemetryExporterOtlpHeaders,
+                url: URL.fromString(BrowserOpenTelemetryExporterOtlpEndpoint.toString() + "/v1/traces").toString(),
+                headers: {
+                    "x-oneuptime-token": BrowserOpenTelemetryExporterOtlpIngestionKey,
+                },
             });
             const providerConfig = {
                 resource: resourceFromAttributes({

package/build/dist/UI/Utils/Telemetry/Telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Telemetry.js","sourceRoot":"","sources":["../../../../../UI/Utils/Telemetry/Telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Telemetry.js","sourceRoot":"","sources":["../../../../../UI/Utils/Telemetry/Telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wCAAwC,EACxC,4CAA4C,EAC5C,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,iDAAiD,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EACL,kBAAkB,EAElB,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,GAAG,MAAM,wBAAwB,CAAC;AAEzC;;;;GAIG;AACH,MAAM,oBAAoB,GAA8B,EAAE,CAAC;AAM3D;;;GAGG;AACH,MAAM,4BAA4B;IACzB,OAAO,CAAC,IAAqB;QAClC,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;YACvC,MAAM,KAAK,GAAuB,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAE5D,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAEM,KAAK;QACV,QAAQ;IACV,CAAC;IAEM,UAAU;QACf,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACb,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,UAIjC;QACC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAuB,UAAU,CAAC,GAAG,CAAC,CAAC;YAElD,IAAI,KAAK,EAAE,CAAC;gBACV,oBAAoB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,IAA6B;QAC9C,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IACE,wCAAwC;YACxC,4CAA4C,EAC5C,CAAC;YACD,MAAM,aAAa,GAAiB,IAAI,iBAAiB,CAAC;gBACxD,GAAG,EAAE,GAAG,CAAC,UAAU,CACjB,wCAAwC,CAAC,QAAQ,EAAE,GAAG,YAAY,CACnE,CAAC,QAAQ,EAAE;gBACZ,OAAO,EAAE;oBACP,mBAAmB,EAAE,4CAA4C;iBAClE;aACF,CAA4B,CAAC;YAE9B,MAAM,cAAc,GAAiB;gBACnC,QAAQ,EAAE,sBAAsB,CAAC;oBAC/B,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,WAAW;iBACtC,CAAC;gBACF,wEAAwE;gBACxE,cAAc,EAAE;oBACd,IAAI,kBAAkB,CAAC,aAAa,CAAC;oBACrC,IAAI,4BAA4B,EAA8B;iBAC/D;aACF,CAAC;YAEF,MAAM,QAAQ,GAAsB,IAAI,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAE1E,QAAQ,CAAC,QAAQ,CAAC;gBAChB,cAAc,EAAE,IAAI,kBAAkB,EAAE;aACzC,CAAC,CAAC;YAEH,wBAAwB,CAAC;gBACvB,gBAAgB,EAAE;oBAChB,IAAI,oBAAoB,EAAE;oBAC1B,IAAI,6BAA6B,EAAE;iBACpC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF"}

package/build/dist/UI/Utils/TestLLMProvider.js

@@ -20,11 +20,10 @@ export default class TestLLMProvider {
                 };
             }
             const responseData = response.data;
-            return {
-                success: true,
-                message: responseData["message"] ||
-                    "Connection successful. The LLM provider responded to a test prompt.",
-            };
+            return Object.assign({ success: true, message: responseData["message"] ||
+                    "Connection successful. The LLM provider responded to a test prompt." }, (typeof responseData["supportsToolCalling"] === "boolean"
+                ? { supportsToolCalling: responseData["supportsToolCalling"] }
+                : {}));
         }
         catch (err) {
             return {

package/build/dist/UI/Utils/TestLLMProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestLLMProvider.js","sourceRoot":"","sources":["../../../../UI/Utils/TestLLMProvider.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAKtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,GAAG,MAAM,WAAW,CAAC;AAO5B,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAGxB;QACC,IAAI,CAAC;YACH,MAAM,QAAQ,GACZ,MAAM,GAAG,CAAC,IAAI,iBACZ,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAClD,oBAAoB,CACrB,EACD,IAAI,EAAE;oBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;iBAClC,IACE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAClD,CAAC;YAEL,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;gBACzB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBAC1C,CAAC;YACJ,CAAC;YAED,MAAM,YAAY,GAAe,QAAQ,CAAC,IAAkB,CAAC;YAE7D,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EACJ,YAAY,CAAC,SAAS,CAAY;oBACnC,qEAAqE;aACxE,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC;aACrC,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"TestLLMProvider.js","sourceRoot":"","sources":["../../../../UI/Utils/TestLLMProvider.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAKtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,GAAG,MAAM,WAAW,CAAC;AAe5B,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAGxB;QACC,IAAI,CAAC;YACH,MAAM,QAAQ,GACZ,MAAM,GAAG,CAAC,IAAI,iBACZ,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAClD,oBAAoB,CACrB,EACD,IAAI,EAAE;oBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;iBAClC,IACE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAClD,CAAC;YAEL,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;gBACzB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAAC;iBAC1C,CAAC;YACJ,CAAC;YAED,MAAM,YAAY,GAAe,QAAQ,CAAC,IAAkB,CAAC;YAE7D,uBACE,OAAO,EAAE,IAAI,EACb,OAAO,EACJ,YAAY,CAAC,SAAS,CAAY;oBACnC,qEAAqE,IACpE,CAAC,OAAO,YAAY,CAAC,qBAAqB,CAAC,KAAK,SAAS;gBAC1D,CAAC,CAAC,EAAE,mBAAmB,EAAE,YAAY,CAAC,qBAAqB,CAAC,EAAE;gBAC9D,CAAC,CAAC,EAAE,CAAC,EACP;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC;aACrC,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}

package/build/dist/Utils/API.js

@@ -5,9 +5,11 @@ import Protocol from "../Types/API/Protocol";
 import Route from "../Types/API/Route";
 import URL from "../Types/API/URL";
 import APIException from "../Types/Exception/ApiException";
+import BadDataException from "../Types/Exception/BadDataException";
 import { RequestFailedPhase, } from "../Types/Probe/RequestFailedDetails";
 import axios from "axios";
 import Sleep from "../Types/Sleep";
+import HTTPResponseBodyReader from "./HTTPResponseBodyReader";
 class API {
     get protocol() {
         return this._protocol;
@@ -138,7 +140,7 @@ class API {
         return await this.fetchInternal(method, url, data, headers, params, newOptions);
     }
     static async fetchInternal(method, url, data, headers, params, options) {
-        var _a;
+        var _a, _b;
         const apiHeaders = this.getHeaders(headers);
         if (params) {
             url.addQueryParams(params);
@@ -163,7 +165,7 @@ class API {
             // Identical on every attempt, so build it once.
             const axiosOptions = {
                 method: method,
-                url: url.toString(),
+                url: (_a = options === null || options === void 0 ? void 0 : options.dispatchUrl) !== null && _a !== void 0 ? _a : url.toString(),
                 headers: finalHeaders,
                 data: finalBody,
             };
@@ -173,6 +175,30 @@ class API {
             if (options === null || options === void 0 ? void 0 : options.doNotFollowRedirects) {
                 axiosOptions.maxRedirects = 0;
             }
+            if ((options === null || options === void 0 ? void 0 : options.maxContentLength) !== undefined) {
+                axiosOptions.maxContentLength = options.maxContentLength;
+            }
+            if ((options === null || options === void 0 ? void 0 : options.maxBodyLength) !== undefined) {
+                axiosOptions.maxBodyLength = options.maxBodyLength;
+            }
+            if (options === null || options === void 0 ? void 0 : options.disableProxy) {
+                axiosOptions.proxy = false;
+            }
+            if (options === null || options === void 0 ? void 0 : options.signal) {
+                axiosOptions.signal = options.signal;
+            }
+            if (options === null || options === void 0 ? void 0 : options.responseBodyBudget) {
+                axiosOptions.responseType = "stream";
+                /*
+                 * Axios's Node adapter enforces maxContentLength in an async
+                 * generator before yielding the chunk that crosses the limit. That
+                 * would hide already-received bytes from the shared budget and let a
+                 * retry reclaim them. The streamed reader below is the sole response
+                 * cap in this mode; it charges every decompressed chunk before
+                 * rejecting and destroys the stream immediately.
+                 */
+                axiosOptions.maxContentLength = -1;
+            }
             // Attach proxy agents per request if provided (avoids global side-effects)
             if (options === null || options === void 0 ? void 0 : options.httpAgent) {
                 axiosOptions.httpAgent = options.httpAgent;
@@ -187,10 +213,22 @@ class API {
             for (let attempt = 0; attempt <= maxRetries; attempt++) {
                 attempts++;
                 try {
-                    result = await axios(axiosOptions);
+                    const axiosResult = await axios(axiosOptions);
+                    if (options === null || options === void 0 ? void 0 : options.responseBodyBudget) {
+                        axiosResult.data = await API.readBudgetedResponseBody(axiosResult, options.responseBodyBudget, options.limitRedirectResponseBody || false, method === HTTPMethod.HEAD, options.maximumResponseBytes);
+                    }
+                    result = axiosResult;
                     break;
                 }
                 catch (e) {
+                    if (e instanceof BadDataException) {
+                        throw e;
+                    }
+                    if ((options === null || options === void 0 ? void 0 : options.responseBodyBudget) &&
+                        axios.isAxiosError(e) &&
+                        e.response) {
+                        e.response.data = await API.readBudgetedResponseBody(e.response, options.responseBodyBudget, options.limitRedirectResponseBody || false, method === HTTPMethod.HEAD, options.maximumResponseBytes);
+                    }
                     if (attempt >= maxRetries) {
                         throw e;
                     }
@@ -240,6 +278,10 @@ class API {
                 ? {}
                 : { timeoutInMs: options.timeout }));
             if (!axios.isAxiosError(error)) {
+                if (error instanceof BadDataException) {
+                    this.notifyRequestComplete(options, Object.assign(Object.assign({}, baseOutcome), { error: error }));
+                    throw error;
+                }
                 const apiException = new APIException(error.message);
                 this.notifyRequestComplete(options, Object.assign(Object.assign({}, baseOutcome), { error: apiException }));
                 throw apiException;
@@ -258,10 +300,10 @@ class API {
                 this.notifyRequestComplete(options, Object.assign(Object.assign({}, baseOutcome), { error: thrownError, axiosError: error }));
                 throw thrownError;
             }
-            if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 &&
+            if (((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 401 &&
                 !(options === null || options === void 0 ? void 0 : options.skipAuthRefresh) &&
                 !(options === null || options === void 0 ? void 0 : options.hasAttemptedAuthRefresh)) {
-                const retryUrl = URL.fromString(url.toString());
+                const retryUrl = URL.fromStringLenient(url.toString());
                 const requestContext = {
                     method,
                     url: retryUrl,
@@ -292,6 +334,26 @@ class API {
             return errorResponse;
         }
     }
+    static async readBudgetedResponseBody(response, budget, limitRedirectResponseBody, isHeadResponse, maximumResponseBytes) {
+        const body = await HTTPResponseBodyReader.read(response.data, {
+            budget: budget,
+            statusCode: response.status,
+            headers: response.headers,
+            limitRedirectResponseBody: limitRedirectResponseBody,
+            isHeadResponse: isHeadResponse,
+            maximumResponseBytes: maximumResponseBytes,
+        });
+        const text = HTTPResponseBodyReader.decodeUtf8(body);
+        if (!text) {
+            return "";
+        }
+        try {
+            return JSON.parse(text);
+        }
+        catch (_a) {
+            return text;
+        }
+    }
     static notifyRequestComplete(options, outcome) {
         if (!(options === null || options === void 0 ? void 0 : options.onRequestComplete)) {
             return;