mockaton 10.6.7 → 10.6.8

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "HTTP Mock Server",
 	"type": "module",
-	"version": "10.6.7",
+	"version": "10.6.8",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/Dashboard.css

@@ -78,7 +78,7 @@ body {
 
 select, a, input, button {
 	cursor: pointer;
-	
+
 	&:focus-visible {
 		outline: 2px solid var(--colorAccent);
 	}
@@ -628,6 +628,8 @@ table {
 		background: var(--colorAccent);
 		animation-name: _kfProgress;
 		animation-timing-function: linear;
+		animation-iteration-count: infinite;
+		animation-direction: alternate;
 		/* duration in JavaScript */
 	}
 }

package/src/Dashboard.js

@@ -65,7 +65,7 @@ initKeyboardNavigation()
 function render() {
 	restoreFocus(() => document.body.replaceChildren(...App()))
 	if (store.hasChosenLink)
-		previewMock(store.chosenLink.method, store.chosenLink.urlMask)
+		previewMock()
 }
 
 const t = translation => translation[0]
@@ -317,7 +317,7 @@ function renderRow(method, urlMask) {
 		unChooseOld()
 		trFor(Row.key(method, urlMask))
 			.replaceWith(Row(store.brokerAsRow(method, urlMask)))
-		previewMock(method, urlMask)
+		previewMock()
 	})
 
 	function trFor(key) {
@@ -362,7 +362,7 @@ function MockSelector(row) {
 				CSS.MockSelector,
 				row.selectedIdx > 0 && CSS.nonDefault,
 				row.selectedFileIs4xx && CSS.status4xx)
-		}, row.opts.map(([value, label, selected]) => 
+		}, row.opts.map(([value, label, selected]) =>
 			r('option', { value, selected }, label))))
 }
 
@@ -586,7 +586,6 @@ function PayloadViewerTitleWhenProxied({ mime, status, statusText, gatewayIsBad
 			' ' + mime))
 }
 
-// TODO indeterminate when there's store.delayJitter
 const SPINNER_DELAY = 80
 function PayloadViewerProgressBar() {
 	return (
@@ -594,7 +593,9 @@ function PayloadViewerProgressBar() {
 			r('div', { style: { animationDuration: store.delay - SPINNER_DELAY + 'ms' } })))
 }
 
-async function previewMock(method, urlMask) {
+async function previewMock() {
+	const { method, urlMask } = store.chosenLink
+
 	previewMock.controller?.abort()
 	previewMock.controller = new AbortController
 

package/src/DashboardStore.js

@@ -12,11 +12,8 @@ export const store = {
 	render() {},
 	renderRow(method, urlMask) {},
 
-	/** @type {State.brokersByMethod} */
-	brokersByMethod: {},
-
-	/** @type {State.staticBrokers} */
-	staticBrokers: {},
+	brokersByMethod: /** @type {State.brokersByMethod} */ {},
+	staticBrokers: /** @type {State.staticBrokers} */ {},
 
 	cookies: [],
 	comments: [],
@@ -62,6 +59,7 @@ export const store = {
 	setChosenLink(method, urlMask) {
 		store.chosenLink = { method, urlMask }
 	},
+	
 
 	async reset() {
 		try {
@@ -82,6 +80,7 @@ export const store = {
 		catch (error) { store.onError(error) }
 	},
 
+	
 	async setGlobalDelay(value) {
 		try {
 			const response = await mockaton.setGlobalDelay(value)
@@ -126,35 +125,33 @@ export const store = {
 
 	_dittoCache: new Map(),
 
-	dittoedUrlFor(method, urlMask) {
-		return store._dittoCache.get(method + '::' + urlMask)
-	},
-
 	brokersAsRowsByMethod(method) {
 		const rows = store._brokersAsArray(method)
+			.map(b => new BrokerRowModel(b, store.canProxy))
+			.sort((a, b) => a.urlMask.localeCompare(b.urlMask))
 		const urlMasksDittoed = dittoSplitPaths(rows.map(r => r.urlMask))
-		for (let i = 0; i < rows.length; i++) {
-			const r = rows[i]
+		rows.forEach((r, i) => {
+			store._dittoCache.set(r.method + '::' + r.urlMask, urlMasksDittoed[i])
 			r.setUrlMaskDittoed(urlMasksDittoed[i])
-			store._dittoCache.set(r.method + '::' + r.urlMask, r.urlMaskDittoed)
-		}
+		})
 		return rows
 	},
 
+	brokerAsRow(method, urlMask) {
+		const r = new BrokerRowModel(store.brokerFor(method, urlMask), store.canProxy)
+		r.setUrlMaskDittoed(store._dittoCache.get(r.method + '::' + r.urlMask))
+		return r
+	},
+
 	_brokersAsArray(byMethod = '*') {
-		const rows = []
+		const arr = []
 		for (const [method, brokers] of Object.entries(store.brokersByMethod))
 			if (byMethod === '*' || byMethod === method)
 				for (const broker of Object.values(brokers))
-					rows.push(new BrokerRowModel(broker, store.canProxy))
-		return rows.sort((a, b) => a.urlMask.localeCompare(b.urlMask))
-	},
-
-	brokerAsRow(method, urlMask) {
-		const row = new BrokerRowModel(store.brokerFor(method, urlMask), store.canProxy)
-		row.setUrlMaskDittoed(store.dittoedUrlFor(method, urlMask))
-		return row
+					arr.push(broker)
+		return arr
 	},
+	
 
 	previewLink(method, urlMask) {
 		store.setChosenLink(method, urlMask)
@@ -333,7 +330,7 @@ export class BrokerRowModel {
 		this.urlMask = urlMask
 		this.opts = this.#makeOptions()
 	}
-	
+
 	setUrlMaskDittoed(urlMaskDittoed) {
 		this.urlMaskDittoed = urlMaskDittoed
 	}