mockaton 12.7.2 → 13.0.1

package/src/server/MockBroker.js

@@ -11,14 +11,15 @@ export class MockBroker {
 		this.file = '' // selected mock filename
 		this.mocks = [] // filenames
 		this.status = -1
+		this.isStatic = false // doesn’t follow filename convention
 		this.delayed = false
 		this.proxied = false
-		this.auto500 = false
+		this.autoStatus = 0
 		this.urlMaskMatches = new UrlMatcher(file).urlMaskMatches
 		this.register(file)
 	}
 
-	#is500 = file => parseFilename(file).status === 500
+	#isStatus = (file, status) => parseFilename(file).status === status
 
 	#sortMocks() {
 		this.mocks.sort()
@@ -27,7 +28,7 @@ export class MockBroker {
 	}
 
 	register(file) {
-		if (this.auto500 && this.#is500(file))
+		if (this.autoStatus && this.#isStatus(file, this.autoStatus))
 			this.selectFile(file)
 		this.mocks.push(file)
 		this.#sortMocks()
@@ -44,27 +45,29 @@ export class MockBroker {
 	hasMock = file => this.mocks.includes(file)
 
 	selectFile(filename) {
+		const { status, isStatic } = parseFilename(filename)
 		this.file = filename
+		this.status = status
+		this.isStatic = isStatic
 		this.proxied = false
-		this.auto500 = false
-		this.status = parseFilename(filename).status
+		this.autoStatus = 0
 	}
 
 	selectDefaultFile() {
 		this.selectFile(this.mocks[0])
 	}
 
-	toggle500() {
-		const shouldUnset = this.auto500 || this.status === 500
+	toggleStatus(status) {
+		const shouldUnset = this.autoStatus === status || (!this.autoStatus && this.status === status)
 		if (shouldUnset)
 			this.selectDefaultFile()
 		else {
-			const f500 = this.mocks.find(this.#is500)
-			if (f500)
-				this.selectFile(f500)
+			const fStatus = this.mocks.find(f => parseFilename(f).status === status)
+			if (fStatus)
+				this.selectFile(fStatus)
 			else {
-				this.auto500 = true
-				this.status = 500
+				this.autoStatus = status
+				this.status = status
 			}
 		}
 		this.proxied = false
@@ -75,7 +78,7 @@ export class MockBroker {
 	}
 
 	setProxied(proxied) {
-		this.auto500 = false
+		this.autoStatus = 0
 		this.proxied = proxied
 	}
 

package/src/server/MockDispatcher.js

@@ -4,6 +4,7 @@ import { logger } from './utils/logger.js'
 
 import { proxy } from './ProxyRelay.js'
 import { cookie } from './cookie.js'
+import { parseFilename } from '../client/Filename.js'
 import { echoFilePlugin } from './MockDispatcherPlugins.js'
 import { brokerByRoute } from './mockBrokersCollection.js'
 import { config, calcDelay } from './config.js'
@@ -29,12 +30,25 @@ export async function dispatchMock(req, response) {
 		if (cookie.getCurrent())
 			response.setHeader('Set-Cookie', cookie.getCurrent())
 
-		response.statusCode = broker.auto500
-			? 500
+		const { isStatic } = parseFilename(broker.file)
+
+		if (isStatic && req.headers.range && !broker.autoStatus) {
+			setTimeout(async () => {
+				await response.partialContent(req.headers.range, join(config.mocksDir, broker.file))
+			}, Number(broker.delayed && calcDelay()))
+			logger.accessMock(req.url, broker.file)
+			return
+		}
+
+		response.statusCode = broker.autoStatus
+			? broker.autoStatus
 			: broker.status
-		const { mime, body } = broker.auto500
+
+		const { mime, body } = broker.autoStatus
 			? { mime: '', body: '' }
-			: await applyPlugins(join(config.mocksDir, broker.file), req, response)
+			: isStatic
+				? echoFilePlugin(join(config.mocksDir, broker.file))
+				: await applyPlugins(join(config.mocksDir, broker.file), req, response)
 
 		response.setHeader('Content-Type', mime)
 		response.setHeader('Content-Length', length(body))

package/src/server/Mockaton.js

@@ -15,25 +15,21 @@ import { config, setup } from './config.js'
 import { apiPatchReqs, apiGetReqs } from './Api.js'
 
 import { dispatchMock } from './MockDispatcher.js'
-import { dispatchStatic } from './StaticDispatcher.js'
 
-import * as staticCollection from './staticCollection.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
 
 import { watchDevSPA } from './WatcherDevClient.js'
-import { watchMocksDir, watchStaticDir } from './Watcher.js'
+import { watchMocksDir } from './Watcher.js'
 
 
 export function Mockaton(options) {
 	return new Promise((resolve, reject) => {
 		setup(options)
 		mockBrokerCollection.init()
-		staticCollection.init()
 
 		if (config.watcherEnabled) {
 			register('./cacheBustResolver.js', import.meta.url)
 			watchMocksDir()
-			watchStaticDir()
 		}
 		if (config.hotReload)
 			watchDevSPA()
@@ -84,9 +80,6 @@ async function onRequest(req, response) {
 		else if (method === 'GET' && apiGetReqs.has(pathname))
 			apiGetReqs.get(pathname)(req, response)
 
-		else if (method === 'GET' && staticCollection.brokerByRoute(pathname))
-			await dispatchStatic(req, response)
-
 		else
 			await dispatchMock(req, response)
 	}

package/src/server/Mockaton.test.config.js

@@ -6,9 +6,7 @@ export default {
 		userB: jwtCookie('CookieB', { email: 'john@example.test' }),
 	},
 	extraHeaders: ['custom_header_name', 'custom_header_val'],
-	extraMimes: {
-		['custom_extension']: 'custom_mime'
-	},
+	extraMimes: { ['custom_extension']: 'custom_mime' },
 	logLevel: 'verbose',
 	corsOrigins: ['https://example.test'],
 	corsExposedHeaders: ['Content-Encoding'],

package/src/server/Mockaton.test.js

@@ -17,14 +17,12 @@ import CONFIG from './Mockaton.test.config.js'
 
 
 const mocksDir = mkdtempSync(join(tmpdir(), 'mocks'))
-const staticDir = mkdtempSync(join(tmpdir(), 'static'))
 
 const stdout = []
 const stderr = []
 const proc = spawn(join(import.meta.dirname, 'cli.js'), [
+	mocksDir,
 	'--config', join(import.meta.dirname, 'Mockaton.test.config.js'),
-	'--mocks-dir', mocksDir,
-	'--static-dir', staticDir,
 	'--no-open'
 ])
 
@@ -47,10 +45,8 @@ const listFromMocksDir = d => readdir(join(mocksDir, d))
 const readFromMocksDir = f => readFile(join(mocksDir, f), 'utf8')
 
 const makeDirInMocks = dir => mkdir(join(mocksDir, dir), { recursive: true })
-const makeDirInStaticMocks = dir => mkdir(join(staticDir, dir), { recursive: true })
 
 const renameInMocksDir = (src, target) => rename(join(mocksDir, src), join(mocksDir, target))
-const renameInStaticMocksDir = (src, target) => rename(join(staticDir, src), join(staticDir, target))
 
 
 const api = new Commander(serverAddr)
@@ -128,7 +124,7 @@ class Fixture extends BaseFixture {
 class FixtureStatic extends BaseFixture {
 	constructor(file, body = '') {
 		super(file, body)
-		this.dir = staticDir
+		this.dir = mocksDir
 		this.urlMask = '/' + file
 		this.method = 'GET'
 	}
@@ -149,26 +145,24 @@ describe('Windows', () => {
 
 describe('Rejects malicious URLs', () => {
 	[
-		['double-encoded', `/${encodeURIComponent(encodeURIComponent('/'))}user`, 400],
-		['encoded null byte', '/user%00/admin', 400],
-		['invalid percent-encoding', '/user%ZZ', 400],
-		['encoded CRLF sequence', '/user%0d%0aSet-Cookie:%20x=1', 400],
-		['overlong/illegal UTF-8 sequence', '/user%C0%AF', 400],
-		['double-double-encoding trick', '/%25252Fuser', 400],
-		['zero-width/invisible char', '/user%E2%80%8Binfo', 404],
-		['encoded path traversal', '/user/..%2Fadmin', 404],
-		['raw path traversal', '/../user', 404],
-
-		['very long path', '/'.repeat(2048 + 1), 414]
+		['double-encoded', 400, `/${encodeURIComponent(encodeURIComponent('/'))}user`],
+		['encoded null byte', 400, '/user%00/admin'],
+		['invalid percent-encoding', 400, '/user%ZZ'],
+		['encoded CRLF sequence', 400, '/user%0d%0aSet-Cookie:%20x=1'],
+		['overlong/illegal UTF-8 sequence', 400, '/user%C0%AF'],
+		['double-double-encoding trick', 400, '/%25252Fuser'],
+		['zero-width/invisible char', 404, '/user%E2%80%8Binfo'],
+		['encoded path traversal', 404, '/user/..%2Fadmin'],
+		['raw path traversal', 404, '/../user'],
+		['very long path', 414, '/'.repeat(2048 + 1)]
 	]
-		.map(([title, url, status]) =>
-			test(title, async () =>
-				equal((await request(url)).status, status)))
+		.forEach(([title, status, url]) => test(title, async () =>
+			equal((await request(url)).status, status)))
 })
 
 
-describe('Warnings', () => {
-	test('rejects invalid filenames', async () => {
+describe('Filename Convention', () => {
+	test('registers invalid filenames as GET 200', async () => {
 		const fx0 = new Fixture('bar.GET._INVALID_STATUS_.json')
 		const fx1 = new Fixture('foo._INVALID_METHOD_.202.json')
 		const fx2 = new Fixture('missing-method-and-status.json')
@@ -177,10 +171,10 @@ describe('Warnings', () => {
 		await fx2.write()
 		await api.reset()
 
-		const log = stderr.join('')
-		match(log, /Invalid HTTP Response Status: "NaN"/)
-		match(log, /Unrecognized HTTP Method: "_INVALID_METHOD_"/)
-		match(log, /Invalid Filename Convention/)
+		const s = await fetchState()
+		equal(s.brokersByMethod.GET['/bar.GET._INVALID_STATUS_.json'].file, 'bar.GET._INVALID_STATUS_.json')
+		equal(s.brokersByMethod.GET['/foo._INVALID_METHOD_.202.json'].file, 'foo._INVALID_METHOD_.202.json')
+		equal(s.brokersByMethod.GET['/missing-method-and-status.json'].file, 'missing-method-and-status.json')
 
 		await fx0.unlink()
 		await fx1.unlink()
@@ -373,7 +367,7 @@ describe('Proxy Fallback', () => {
 		const CUSTOM_COOKIES = ['cookieX=x', 'cookieY=y']
 		const BODY_PAYLOAD = { a: 'b' }
 		const expectedBody = JSON.stringify(BODY_PAYLOAD, null, '  ') // config.formatCollectedJSON=true
-		
+
 		before(async () => {
 			fallbackServer = createServer(async (req, response) => {
 				response.writeHead(423, {
@@ -499,20 +493,20 @@ describe('Proxy Fallback', () => {
 			equal((await r.json()).proxied, false)
 		})
 
-		test('unsets auto500', async () => {
+		test('unsets autoStatus', async () => {
 			const fx = new Fixture('unset-500-on-proxy.GET.200.txt')
 			await fx.sync()
 			await api.setProxyFallback('https://example.test')
 
-			const r0 = await api.toggle500(fx.method, fx.urlMask)
+			const r0 = await api.toggleStatus(500, fx.method, fx.urlMask)
 			const b0 = await r0.json()
 			equal(b0.proxied, false)
-			equal(b0.auto500, true)
+			equal(b0.autoStatus, 500)
 
 			const r1 = await api.setRouteIsProxied(fx.method, fx.urlMask, true)
 			const b1 = await r1.json()
 			equal(b1.proxied, true)
-			equal(b1.auto500, false)
+			equal(b1.autoStatus, 0)
 
 			await fx.unlink()
 			await api.setProxyFallback('')
@@ -555,14 +549,6 @@ describe('404', () => {
 		await fx.unlink()
 	})
 
-	test('404s ignored static files', async () => {
-		const fx = new FixtureStatic('static-ignored.js~')
-		await fx.write()
-		await api.reset()
-		const r = await fx.request()
-		equal(r.status, 404)
-		await fx.unlink()
-	})
 })
 
 
@@ -662,7 +648,7 @@ describe('Static Files', () => {
 		await fxsIndex.write()
 		await fxsAsset.write()
 		await api.reset()
-	}) // the last test deletes them
+	})
 
 	describe('Static File Serving', () => {
 		test('Defaults to index.html', async () => {
@@ -680,64 +666,10 @@ describe('Static Files', () => {
 		})
 	})
 
-	test('Static File List', async () => {
-		const { staticBrokers } = await fetchState()
-		deepEqual(Object.keys(staticBrokers), [
-			fxsAsset.urlMask,
-			fxsIndex.urlMask
-		])
-	})
-
-	describe('Set Static Route is Delayed', () => {
-		test('422 for non-existing route', async () => {
-			const r = await api.setStaticRouteIsDelayed('/non-existing', true)
-			equal(r.status, 422)
-			equal(await r.text(), `Static route does not exist: /non-existing`)
-		})
-
-		test('422 for invalid delayed value', async () => {
-			const r = await api.setStaticRouteIsDelayed(fxsIndex.urlMask, 'not-a-boolean')
-			equal(await r.text(), 'Expected boolean for "delayed"')
-		})
-
-		test('200', async () => {
-			await api.setStaticRouteIsDelayed(fxsIndex.urlMask, true)
-			const { staticBrokers } = await fetchState()
-			equal(staticBrokers[fxsIndex.urlMask].delayed, true)
-		})
-	})
-
-	describe('Set Static Route Status Code', () => {
-		test('422 for non-existing route', async () => {
-			const r = await api.setStaticRouteStatus('/non-existing', 200)
-			equal(r.status, 422)
-			equal(await r.text(), `Static route does not exist: /non-existing`)
-		})
-
-		test('422 for invalid delayed value', async () => {
-			const r = await api.setStaticRouteStatus(fxsIndex.urlMask, 'not-200-or-404')
-			equal(r.status, 422)
-			equal(await r.text(), 'Expected 200 or 404 status code')
-		})
-
-		test('sets 404 and 200', async () => {
-			await api.setStaticRouteStatus(fxsIndex.urlMask, 404)
-			const r0 = await fxsIndex.request()
-			equal(r0.status, 404)
-
-			await api.setStaticRouteStatus(fxsIndex.urlMask, 200)
-			const r1 = await fxsIndex.request()
-			equal(r1.status, 200)
-		})
-
-		test('404s on a registered route but its file has been deleted', async () => {
-			// Possible: (1) due to watcher delay. (2) or, when not-watching and deleting.
-			const fx = new FixtureStatic('to-be-deleted.js')
-			await fx.sync()
-			await fx.unlink()
-			const r = await fx.request()
-			equal(r.status, 404)
-		})
+	test('are part of the normal mocks list', async () => {
+		const s = await fetchState()
+		equal(s.brokersByMethod.GET[fxsAsset.urlMask].file, fxsAsset.file)
+		equal(s.brokersByMethod.GET[fxsIndex.urlMask].file, fxsIndex.file)
 	})
 
 	describe('Static Partial Content', () => {
@@ -761,27 +693,27 @@ describe('Static Files', () => {
 		await fxsIndex.unlink()
 		await fxsAsset.unlink()
 		await api.reset()
-		const { staticBrokers } = await fetchState()
-		equal(staticBrokers[fxsIndex.urlMask], undefined)
-		equal(staticBrokers[fxsAsset.urlMask], undefined)
+		const s = await fetchState()
+		equal(s.brokersByMethod.GET?.[fxsIndex.urlMask], undefined)
+		equal(s.brokersByMethod.GET?.[fxsAsset.urlMask], undefined)
 	})
 })
 
 
-describe('500', () => {
+describe('Auto Status', () => {
 	test('toggling ON 500 on a route without 500 auto-generates one', async () => {
 		const fx = new Fixture('toggling-500-without-500.GET.200.json')
 		await fx.sync()
 		equal((await fx.request()).status, fx.status)
 
-		const bp0 = await api.toggle500(fx.method, fx.urlMask)
+		const bp0 = await api.toggleStatus(500, fx.method, fx.urlMask)
 		const b0 = await bp0.json()
-		equal(b0.auto500, true)
+		equal(b0.autoStatus, 500)
 		equal(b0.status, 500)
 		equal((await fx.request()).status, 500)
 
-		const r1 = await api.toggle500(fx.method, fx.urlMask)
-		equal((await r1.json()).auto500, false)
+		const r1 = await api.toggleStatus(500, fx.method, fx.urlMask)
+		equal((await r1.json()).autoStatus, 0)
 		equal((await fx.request()).status, fx.status)
 	})
 
@@ -792,15 +724,15 @@ describe('500', () => {
 		await fx500.write()
 		await api.reset()
 
-		const bp0 = await api.toggle500(fx200.method, fx200.urlMask)
+		const bp0 = await api.toggleStatus(500, fx200.method, fx200.urlMask)
 		const b0 = await bp0.json()
-		equal(b0.auto500, false)
+		equal(b0.autoStatus, 0)
 		equal(b0.status, 500)
 		equal(await (await fx200.request()).text(), fx500.body)
 
-		const bp1 = await api.toggle500(fx200.method, fx200.urlMask)
+		const bp1 = await api.toggleStatus(500, fx200.method, fx200.urlMask)
 		const b1 = await bp1.json()
-		equal(b0.auto500, false)
+		equal(b0.autoStatus, 0)
 		equal(b1.status, 200)
 		equal(await (await fx200.request()).text(), fx200.body)
 
@@ -813,11 +745,29 @@ describe('500', () => {
 		await fx.sync()
 		await api.setProxyFallback('https://example.test')
 		await api.setRouteIsProxied(fx.method, fx.urlMask, true)
-		await api.toggle500(fx.method, fx.urlMask)
+		await api.toggleStatus(500, fx.method, fx.urlMask)
 		equal((await fx.fetchBroker()).proxied, false)
 		await fx.unlink()
 		await api.setProxyFallback('')
 	})
+
+	test('toggling ON 404 for static routes', async () => {
+		const fx = new FixtureStatic('static-404.txt')
+		await fx.sync()
+		equal((await fx.request()).status, 200)
+
+		const bp0 = await api.toggleStatus(404, fx.method, fx.urlMask)
+		const b0 = await bp0.json()
+		equal(b0.autoStatus, 404)
+		equal(b0.status, 404)
+		equal((await fx.request()).status, 404)
+
+		const r1 = await api.toggleStatus(404, fx.method, fx.urlMask)
+		equal((await r1.json()).autoStatus, 0)
+		equal((await fx.request()).status, 200)
+
+		await fx.unlink()
+	})
 })
 
 
@@ -1110,16 +1060,16 @@ describe('Registering Mocks', () => {
 		equal(b, undefined)
 	})
 
-	test('registering a 500 unsets auto500', async () => {
+	test('registering a 500 unsets autoStatus', async () => {
 		const fx200 = new Fixture('reg-error.GET.200.txt')
 		const fx500 = new Fixture('reg-error.GET.500.txt')
 		await fx200.register()
-		await api.toggle500(fx200.method, fx200.urlMask)
+		await api.toggleStatus(500, fx200.method, fx200.urlMask)
 		const b0 = await fx200.fetchBroker()
-		equal(b0.auto500, true)
+		equal(b0.autoStatus, 500)
 		await fx500.register()
 		const b1 = await fx200.fetchBroker()
-		equal(b1.auto500, false)
+		equal(b1.autoStatus, 0)
 		deepEqual(b1.mocks, [
 			fx200.file,
 			fx500.file
@@ -1162,72 +1112,6 @@ describe('Registering Mocks', () => {
 })
 
 
-describe('Registering Static Mocks', () => {
-	test('when watcher is off, newly added mocks do not get registered', async () => {
-		await api.setWatchMocks(false)
-		const fx = new FixtureStatic('non-auto-registered-file.txt')
-		await fx.write()
-		await sleep()
-		const { staticBrokers } = await fetchState()
-		equal(staticBrokers['/' + fx.file], undefined)
-		await fx.unlink()
-	})
-
-	const fx = new FixtureStatic('static-register.txt', 'static-body')
-	test('registers static', async () => {
-		await api.setWatchMocks(true)
-		await fx.register()
-		const { staticBrokers } = await fetchState()
-		deepEqual(staticBrokers, {
-			['/' + fx.file]: {
-				route: '/' + fx.file,
-				status: 200,
-				delayed: false
-			}
-		})
-		const response = await fx.request()
-		equal(response.status, 200)
-		equal(await response.text(), fx.body)
-	})
-
-	test('unregisters static', async () => {
-		await fx.unregister()
-		const { staticBrokers } = await fetchState()
-		deepEqual(staticBrokers, {})
-	})
-
-	describe('getSyncVersion', () => {
-		const fx0 = new FixtureStatic('reg0/static0.txt')
-		let version
-		before(async () => {
-			await makeDirInStaticMocks('reg0')
-			await fx0.sync()
-			version = await resolveOnNextSyncVersion(-1)
-		})
-
-		const fx = new FixtureStatic('static1.txt')
-		test('responds when a file is added', async () => {
-			const prom = resolveOnNextSyncVersion(version)
-			await fx.write()
-			equal(await prom, version + 1)
-		})
-
-		test('responds when a file is deleted', async () => {
-			const prom = resolveOnNextSyncVersion(version + 1)
-			await fx.unlink()
-			equal(await prom, version + 2)
-		})
-
-		test('responds when dir is renamed', async () => {
-			const p0 = resolveOnNextSyncVersion(version + 2)
-			await renameInStaticMocksDir('reg0', 'reg1')
-			equal(await p0, version + 3)
-
-			const s = await fetchState()
-			equal(s.staticBrokers['/reg1/static0.txt'].route, '/reg1/static0.txt')
-		})
-	})
-})
 
 
 function sleep(ms = 100) {

package/src/server/Watcher.js

@@ -5,12 +5,10 @@ import { EventEmitter } from 'node:events'
 import { config } from './config.js'
 import { isFile, isDirectory } from './utils/fs.js'
 
-import * as staticCollection from './staticCollection.js'
 import * as mockBrokerCollection from './mockBrokersCollection.js'
 
 
 let mocksWatcher = null
-let staticWatcher = null
 
 
 /**
@@ -67,33 +65,6 @@ export function watchMocksDir() {
 }
 
 
-export function watchStaticDir() {
-	const dir = config.staticDir
-	if (!dir)
-		return
-
-	staticWatcher = staticWatcher || watch(dir, { recursive: true, persistent: false }, (_, file) => {
-		if (!file)
-			return
-
-		if (isDirectory(join(dir, file))) {
-			staticCollection.init()
-			uiSyncVersion.increment()
-		}
-		else if (!isFile(join(dir, file))) { // file deleted
-			staticCollection.unregisterMock(file)
-			uiSyncVersion.increment()
-		}
-		else if (staticCollection.registerMock(file))
-			uiSyncVersion.increment()
-		else {
-			// ignore file edits
-		}
-	})
-}
-
-
-
 /** Realtime notify ARR Events */
 export function sseClientSyncVersion(req, response) {
 	response.writeHead(200, {
@@ -125,12 +96,9 @@ export function sseClientSyncVersion(req, response) {
 
 export function startWatchers() {
 	watchMocksDir()
-	watchStaticDir()
 }
 
 export function stopWatchers() {
 	mocksWatcher?.close()
-	staticWatcher?.close()
 	mocksWatcher = null
-	staticWatcher = null
 }

package/src/server/cli.js

@@ -11,25 +11,25 @@ import pkgJSON from '../../package.json' with { type: 'json' }
 
 process.on('unhandledRejection', error => { throw error })
 
-let args
+let args, positionals
 try {
-	args = parseArgs({
+	const result = parseArgs({
 		options: {
 			config: { short: 'c', type: 'string' },
 
 			port: { short: 'p', type: 'string' },
 			host: { short: 'H', type: 'string' },
 
-			'mocks-dir': { short: 'm', type: 'string' },
-			'static-dir': { short: 's', type: 'string' },
-
 			quiet: { short: 'q', type: 'boolean' },
 			'no-open': { short: 'n', type: 'boolean' },
 
 			help: { short: 'h', type: 'boolean' },
 			version: { short: 'v', type: 'boolean' }
-		}
-	}).values
+		},
+		allowPositionals: true
+	})
+	args = result.values
+	positionals = result.positionals
 }
 catch (error) {
 	console.error(error.message)
@@ -45,14 +45,11 @@ if (args.version)
 
 else if (args.help)
 	console.log(`
-Usage: mockaton [options]
+Usage: mockaton [mocks-dir] [options]
 
 Options:
   -c, --config <file>    (default: ./mockaton.config.js)
   
-  -m, --mocks-dir <dir>  (default: ./mockaton-mocks/)
-  -s, --static-dir <dir> (default: ./mockaton-static-mocks/)
-  
   -H, --host <host>      (default: 127.0.0.1)
   -p, --port <port>      (default: 0) which means auto-assigned
   
@@ -80,8 +77,7 @@ else {
 	if (args.host) opts.host = args.host
 	if (args.port) opts.port = Number.isNaN(Number(args.port)) ? args.port : Number(args.port)
 
-	if (args['mocks-dir']) opts.mocksDir = args['mocks-dir']
-	if (args['static-dir']) opts.staticDir = args['static-dir']
+	if (positionals[0]) opts.mocksDir = positionals[0]
 
 	if (args.quiet) opts.logLevel = 'quiet'
 	if (args['no-open']) opts.onReady = () => {}