mockaton 8.9.0 → 8.9.1

package/README.md

@@ -30,7 +30,7 @@ which is handy for setting up tests  (see **Commander API** below).
 
 
 
-## No Need to Mock Everything
+## Fallback to your Backend
 Mockaton can fallback to your real backend on routes you don’t have mocks
 for. For that, type your backend address in the **Fallback Backend** field.
 

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "8.9.0",
+	"version": "8.9.1",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/Api.js

@@ -78,6 +78,13 @@ function listStaticFiles(req, response) {
 }
 
 function longPollAR_Events(req, response) {
+	// e.g. tab was hidden while new mocks were added or removed
+	const clientIsOutOfSync = parseInt(req.headers[DF.lastReceived_nAR], 10) !== countAR_Events()
+	if (clientIsOutOfSync) {
+		sendJSON(response, countAR_Events())
+		return
+	}
+
 	function onAddOrRemoveMock() {
 		unsubscribeAR_EventListener(onAddOrRemoveMock)
 		sendJSON(response, countAR_Events())

package/src/ApiConstants.js

@@ -20,7 +20,8 @@ export const DF = { // Dashboard Fields (XHR)
 	routeMethod: 'route_method',
 	routeUrlMask: 'route_url_mask',
 	delayed: 'delayed',
-	proxied: 'proxied'
+	proxied: 'proxied',
+	lastReceived_nAR: 'last_received_n_ar'
 }
 
 export const DEFAULT_500_COMMENT = '(Mockaton 500)'

package/src/Commander.js

@@ -85,9 +85,12 @@ export class Commander {
 		return this.#patch(API.reset)
 	}
 
-	getAR_EventsCount() {
+	getAR_EventsCount(nAR_EventReceived) {
 		return fetch(API.arEvents, {
-			signal: AbortSignal.timeout(LONG_POLL_SERVER_TIMEOUT + 1000)
+			signal: AbortSignal.timeout(LONG_POLL_SERVER_TIMEOUT + 1000),
+			headers: {
+				[DF.lastReceived_nAR]: nAR_EventReceived
+			}
 		})
 	}
 }

package/src/Dashboard.js

@@ -512,7 +512,7 @@ async function pollAR_Events() {
 		return
 	try {
 		pollAR_Events.isPolling = true
-		const response = await mockaton.getAR_EventsCount()
+		const response = await mockaton.getAR_EventsCount(pollAR_Events.oldAR_EventsCount)
 		if (response.ok) {
 			const nAR_Events = await response.json()
 			if (pollAR_Events.oldAR_EventsCount !== nAR_Events) { // because it could be < or >

package/src/ProxyRelay.js

@@ -1,10 +1,10 @@
 import { join } from 'node:path'
-import { existsSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
-import { write } from './utils/fs.js'
+
 import { config } from './config.js'
 import { extFor } from './utils/mime.js'
 import { readBody } from './utils/http-request.js'
+import { write, isFile } from './utils/fs.js'
 import { makeMockFilename } from './Filename.js'
 
 
@@ -26,7 +26,7 @@ export async function proxy(req, response) {
 	if (config.collectProxied) {
 		const ext = extFor(proxyResponse.headers.get('content-type'))
 		let filename = makeMockFilename(req.url, req.method, proxyResponse.status, ext)
-		if (existsSync(join(config.mocksDir, filename))) // TESTME
+		if (isFile(join(config.mocksDir, filename))) // TESTME
 			filename = makeMockFilename(req.url + `(${randomUUID()})`, req.method, proxyResponse.status, ext)
 		write(join(config.mocksDir, filename), body)
 	}