merge: resolve package.json/package-lock.json conflicts with upstream

Upstream bumped fast-xml-parser to ^5.7.0. Kept our fflate ^0.8.2
addition and regenerated package-lock.json.

Author: stephanbuettig

automation/webpack.prod.ts

@@ -168,7 +168,7 @@ export default merge(common, {
                     ],
                     'connect-src': [
                         "'self'", 'data:',
-                        'http://127.0.0.1:45456', 'http://127.0.0.1:45457', 'ws://127.0.0.1:45456',
+                        'http://127.0.0.1:45456', 'http://127.0.0.1:45457', 'ws://127.0.0.1:45456', 'ws://127.0.0.1:45457',
                         'https://*.httptoolkit.tech', 'https://*.ingest.us.sentry.io'
                     ],
                     'report-uri': CSP_REPORT_URL,

package-lock.json

@@ -93,7 +93,7 @@
     "deserialize-error": "0.0.3",
     "dompurify": "^3.4.0",
     "fast-json-patch": "^3.1.1",
-    "fast-xml-parser": "^5.5.7",
+    "fast-xml-parser": "^5.7.0",
     "fflate": "^0.8.2",
     "graphql": "^15.8.0",
     "har-validator": "^5.1.3",
@@ -144,7 +144,6 @@
     "typesafe-get": "^2.1.1",
     "typescript": "^5.9.3",
     "ua-parser-js": "^0.7.33",
-    "uuid": "^3.3.2",
     "xml-beautifier": "^0.4.0",
     "yaml": "^1.10.3"
   },

package.json

@@ -1,5 +1,4 @@
 import * as Sentry from '@sentry/browser';
-import * as uuid from 'uuid/v4';
 
 import { UI_VERSION, serverVersion, desktopVersion } from './services/service-versions';
 import { ApiError } from './services/server-api-types';
@@ -58,7 +57,7 @@ export function initSentry(dsn: string | undefined) {
     // We use a random id to distinguish between many errors in one session vs
     // one error in many sessions. This isn't persisted and can't be used to
     // identify anybody between sessions.
-    const randomId = uuid();
+    const randomId = crypto.randomUUID();
     Sentry.getCurrentScope().setUser({
         id: randomId,
         username: `anon-${randomId}`

src/errors.ts

@@ -100,6 +100,22 @@ export class AccountStore {
             : undefined;
     }
 
+    // Expose the JWT directly, for delegating auth to remote services (e.g. HTK local server
+    // for MCP, public endpoint cloud server).
+    get userJwt(): string {
+        if (this.isLoggedIn && this.accountDataLastUpdated !== Infinity) {
+            // We read accountDataLastUpdated just to set up a subscription, so this will
+            // re-calculate on each JWT update, since we can't observe localStorage directly.
+            // It's never actually Infinity.
+
+            const jwt = localStorage.getItem('last_jwt');
+            if (!jwt) throw new Error("No JWT found for logged in user");
+            return jwt;
+        } else {
+            throw new Error("Can't get JWT for logged out user");
+        }
+    }
+
     private updateUser = flow(function * (this: AccountStore) {
         this.user = yield getLatestUserData();
         this.accountDataLastUpdated = Date.now();

src/model/account/account-store.ts

@@ -1,5 +1,4 @@
 import * as _ from 'lodash';
-import * as uuid from 'uuid/v4'
 import { observable } from 'mobx';
 import {
     matchers,
@@ -46,7 +45,7 @@ import * as RtcRule from './definitions/rtc-rule-definitions';
 
 export function getNewRule(rulesStore: RulesStore): HtkRule {
     return observable({
-        id: uuid(),
+        id: crypto.randomUUID(),
         type: 'http', // New rules default to HTTP (i.e. they show HTTP step options)
         activated: true,
         matchers: [],
@@ -146,7 +145,7 @@ function buildRequestMatchers(request: HtkRequest) {
 
 export function buildRuleFromRequest(rulesStore: RulesStore, request: HtkRequest): HtkRule {
     return {
-        id: uuid(),
+        id: crypto.randomUUID(),
         type: 'http',
         activated: true,
         matchers: buildRequestMatchers(request),
@@ -187,7 +186,7 @@ export function buildRuleFromExchange(exchange: HttpExchangeView): HtkRule {
     }
 
     return {
-        id: uuid(),
+        id: crypto.randomUUID(),
         type: 'http',
         activated: true,
         matchers: buildRequestMatchers(exchange.request),

src/model/rules/rule-creation.ts

@@ -1,13 +1,11 @@
 import * as _ from 'lodash';
 
 import {
-    requestSteps,
     MOCKTTP_PARAM_REF,
     PassThroughStepConnectionOptions,
     ProxySetting,
     RuleParameterReference,
-    ProxySettingSource,
-    webSocketSteps
+    ProxySettingSource
 } from 'mockttp';
 import * as MockRTC from 'mockrtc';
 
@@ -17,11 +15,9 @@ import {
     flow,
     computed,
     observe,
-    when,
     reaction,
     runInAction
 } from 'mobx';
-import * as uuid from 'uuid/v4';
 import * as serializr from 'serializr';
 import { encode as encodeBase64, decode as decodeBase64 } from 'base64-arraybuffer';
 import * as semver from 'semver';
@@ -681,7 +677,7 @@ export class RulesStore {
         const targetItem = targetParent.items[targetIndex];
 
         targetParent.items[targetIndex] = {
-            id: uuid(),
+            id: crypto.randomUUID(),
             title: "New group",
             items: [
                 targetItem,

src/model/rules/rules-store.ts

@@ -1,5 +1,4 @@
 import * as _ from 'lodash';
-import * as uuid from 'uuid/v4'
 import { observable } from 'mobx';
 
 import { HtkRule } from './rules';
@@ -167,7 +166,7 @@ export function cloneRule<R extends HtkRule>(rule: R): R {
     return observable({
         ...rule, // All handler/matcher/checker state is immutable
         matchers: [...rule.matchers], // Except the matcher array itself
-        id: uuid() // And we need a different rule id
+        id: crypto.randomUUID() // And we need a different rule id
     });
 };
 
@@ -176,7 +175,7 @@ export function cloneRuleGroup<G extends HtkRuleGroup>(group: HtkRuleGroup): G {
         ...group,
         items: group.items.map(i => cloneItem(i)),
         collapsed: true,
-        id: uuid()
+        id: crypto.randomUUID()
     } as G;
 }
 

src/model/rules/rules-structure.ts

@@ -1,6 +1,5 @@
 import * as _ from 'lodash';
 import { action, flow, observable, runInAction } from 'mobx';
-import * as uuid from 'uuid/v4';
 import {
     MOCKTTP_PARAM_REF,
     ProxySetting,
@@ -77,7 +76,7 @@ export class SendStore {
     @action.bound
     addRequestInput(requestInput = new RequestInput()): RequestInput {
         const newSendRequest = observable({
-            id: uuid(),
+            id: crypto.randomUUID(),
             request: requestInput,
             sentExchange: undefined
         });
@@ -154,7 +153,7 @@ export class SendStore {
                 sendRequest.pendingSend.promise.then(clearPending, clearPending);
             });
 
-            const exchangeId = uuid();
+            const exchangeId = crypto.randomUUID();
 
             const passthroughOptions = this.rulesStore.activePassthroughOptions;
 

src/model/send/send-store.ts

@@ -1,5 +1,3 @@
-import * as uuid from 'uuid/v4';
-
 import { InputTlsFailure } from '../../types';
 import { HTKEventBase } from '../events/event-base';
 
@@ -15,7 +13,7 @@ export class FailedTlsConnection extends HTKEventBase {
             .join('\n');
     }
 
-    readonly id = uuid();
+    readonly id = crypto.randomUUID();
 
     readonly upstreamHostname = this.failureEvent.tlsMetadata.sniHostname ??
         this.failureEvent.destination?.hostname ??