format & add version

.prettierrc.yaml

@@ -2,4 +2,4 @@ trailingComma: 'es5'
 tabWidth: 2
 semi: false
 singleQuote: true
-printWidth: 100
+printWidth: 100

worker/.editorconfig

@@ -1,13 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = tab
-tab_width = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.yml]
-indent_style = space

worker/.prettierrc

@@ -1,6 +0,0 @@
-{
-	"printWidth": 140,
-	"singleQuote": true,
-	"semi": true,
-	"useTabs": true
-}

worker/.prettierrc.yaml

@@ -0,0 +1,5 @@
+trailingComma: 'es5'
+tabWidth: 2
+semi: false
+singleQuote: true
+printWidth: 100

worker/src/index.ts

@@ -4,218 +4,219 @@ import { fetchTimeout, getWorkerLocation, withTimeout } from './util'
 import { MonitorState, MonitorTarget } from '../../uptime.types'
 
 export interface Env {
-	UPTIMEFLARE_STATE: KVNamespace
+  UPTIMEFLARE_STATE: KVNamespace
 }
 
 async function getStatus(
-	monitor: MonitorTarget
+  monitor: MonitorTarget
 ): Promise<{ ping: number; up: boolean; err: string }> {
-	let status = {
-		ping: 0,
-		up: false,
-		err: 'Unknown',
-	}
+  let status = {
+    ping: 0,
+    up: false,
+    err: 'Unknown',
+  }
 
-	const startTime = Date.now()
+  const startTime = Date.now()
 
-	if (monitor.method === 'TCP_PING') {
-		// TCP port endpoint monitor
-		// TODO: TCP timeout
-		try {
-			const [hostname, port] = monitor.target.split(':')
+  if (monitor.method === 'TCP_PING') {
+    // TCP port endpoint monitor
+    // TODO: TCP timeout
+    try {
+      const [hostname, port] = monitor.target.split(':')
 
-			// Write "PING\n"
-			const socket = connect({ hostname: hostname, port: Number(port) })
-			const writer = socket.writable.getWriter()
-			await writer.write(new TextEncoder().encode('PING\n'))
-			// Can't do this: await socket.close()
+      // Write "PING\n"
+      const socket = connect({ hostname: hostname, port: Number(port) })
+      const writer = socket.writable.getWriter()
+      await writer.write(new TextEncoder().encode('PING\n'))
+      // Can't do this: await socket.close()
 
-			// https://github.com/cloudflare/workerd/issues/1305
-			await withTimeout(monitor.timeout || 10000, socket.closed)
+      // https://github.com/cloudflare/workerd/issues/1305
+      await withTimeout(monitor.timeout || 10000, socket.closed)
 
-			console.log(`${monitor.name} connected to ${monitor.target}`)
+      console.log(`${monitor.name} connected to ${monitor.target}`)
 
-			status.ping = Date.now() - startTime
-			status.up = true
-			status.err = ''
-		} catch (e: Error | any) {
-			console.log(`${monitor.name} errored with ${e.name}: ${e.message}`)
-			status.up = false
-			status.err = e.name + ': ' + e.message
-		}
-	} else {
-		// HTTP endpoint monitor
-		try {
-			const response = await fetchTimeout(monitor.target, monitor.timeout || 10000, {
-				method: monitor.method,
-				headers: monitor.headers as any,
-				body: monitor.body,
-				cf: {
-					cacheTtlByStatus: {
-						'100-599': -1, // Don't cache any status code, from https://developers.cloudflare.com/workers/runtime-apis/request/#requestinitcfproperties
-					},
-				},
-			})
+      status.ping = Date.now() - startTime
+      status.up = true
+      status.err = ''
+    } catch (e: Error | any) {
+      console.log(`${monitor.name} errored with ${e.name}: ${e.message}`)
+      status.up = false
+      status.err = e.name + ': ' + e.message
+    }
+  } else {
+    // HTTP endpoint monitor
+    try {
+      const response = await fetchTimeout(monitor.target, monitor.timeout || 10000, {
+        method: monitor.method,
+        headers: monitor.headers as any,
+        body: monitor.body,
+        cf: {
+          cacheTtlByStatus: {
+            '100-599': -1, // Don't cache any status code, from https://developers.cloudflare.com/workers/runtime-apis/request/#requestinitcfproperties
+          },
+        },
+      })
 
-			console.log(`${monitor.name} responded with ${response.status}`)
-			status.ping = Date.now() - startTime
+      console.log(`${monitor.name} responded with ${response.status}`)
+      status.ping = Date.now() - startTime
 
-			if (monitor.expectedCodes) {
-				if (!monitor.expectedCodes.includes(response.status)) {
-					status.up = false
-					status.err = `Expected codes: ${JSON.stringify(monitor.expectedCodes)}, Got: ${
-						response.status
-					}`
-					return status
-				}
-			} else {
-				if (response.status < 200 || response.status > 299) {
-					status.up = false
-					status.err = `Expected codes: 2xx, Got: ${response.status}`
-					return status
-				}
-			}
+      if (monitor.expectedCodes) {
+        if (!monitor.expectedCodes.includes(response.status)) {
+          status.up = false
+          status.err = `Expected codes: ${JSON.stringify(monitor.expectedCodes)}, Got: ${
+            response.status
+          }`
+          return status
+        }
+      } else {
+        if (response.status < 200 || response.status > 299) {
+          status.up = false
+          status.err = `Expected codes: 2xx, Got: ${response.status}`
+          return status
+        }
+      }
 
-			if (monitor.responseKeyword) {
-				const responseBody = await response.text()
-				if (!responseBody.includes(monitor.responseKeyword)) {
-					status.up = false
-					status.err = "HTTP response doesn't contain the configured keyword"
-					return status
-				}
-			}
+      if (monitor.responseKeyword) {
+        const responseBody = await response.text()
+        if (!responseBody.includes(monitor.responseKeyword)) {
+          status.up = false
+          status.err = "HTTP response doesn't contain the configured keyword"
+          return status
+        }
+      }
 
-			status.up = true
-			status.err = ''
-		} catch (e: any) {
-			console.log(`${monitor.name} errored with ${e.name}: ${e.message}`)
-			if (e.name === 'AbortError') {
-				status.ping = monitor.timeout || 10000
-				status.up = false
-				status.err = `Timeout after ${status.ping}ms`
-			} else {
-				status.up = false
-				status.err = e.name + ': ' + e.message
-			}
-		}
-	}
+      status.up = true
+      status.err = ''
+    } catch (e: any) {
+      console.log(`${monitor.name} errored with ${e.name}: ${e.message}`)
+      if (e.name === 'AbortError') {
+        status.ping = monitor.timeout || 10000
+        status.up = false
+        status.err = `Timeout after ${status.ping}ms`
+      } else {
+        status.up = false
+        status.err = e.name + ': ' + e.message
+      }
+    }
+  }
 
-	return status
+  return status
 }
 
 export default {
-	async scheduled(event: ScheduledEvent, env: Env, ctx: ExecutionContext): Promise<void> {
-		const workerLocation = (await getWorkerLocation()) || 'ERROR'
-		console.log(`Running scheduled event on ${workerLocation}...`)
+  async scheduled(event: ScheduledEvent, env: Env, ctx: ExecutionContext): Promise<void> {
+    const workerLocation = (await getWorkerLocation()) || 'ERROR'
+    console.log(`Running scheduled event on ${workerLocation}...`)
 
-		// Read state, set init state if it doesn't exist
-		let state =
-			((await env.UPTIMEFLARE_STATE.get('state', {
-				type: 'json',
-			})) as unknown as MonitorState) ||
-			({
-				lastUpdate: 0,
-				overallUp: 0,
-				overallDown: 0,
-				incident: {},
-				latency: {},
-			} as MonitorState)
-		state.overallDown = 0
-		state.overallUp = 0
+    // Read state, set init state if it doesn't exist
+    let state =
+      ((await env.UPTIMEFLARE_STATE.get('state', {
+        type: 'json',
+      })) as unknown as MonitorState) ||
+      ({
+        version: 1,
+        lastUpdate: 0,
+        overallUp: 0,
+        overallDown: 0,
+        incident: {},
+        latency: {},
+      } as MonitorState)
+    state.overallDown = 0
+    state.overallUp = 0
 
-		// Check each monitor
-		// TODO: callback exception handler
-		// TODO: advanced status check
-		// TODO: concurrent status check
-		for (const monitor of config.monitors) {
-			console.log(`[${workerLocation}] Checking ${monitor.name}...`)
+    // Check each monitor
+    // TODO: callback exception handler
+    // TODO: advanced status check
+    // TODO: concurrent status check
+    for (const monitor of config.monitors) {
+      console.log(`[${workerLocation}] Checking ${monitor.name}...`)
 
-			const status = await getStatus(monitor)
-			const currentTimeSecond = Math.round(Date.now() / 1000)
+      const status = await getStatus(monitor)
+      const currentTimeSecond = Math.round(Date.now() / 1000)
 
-			// Update counters
-			status.up ? state.overallUp++ : state.overallDown++
+      // Update counters
+      status.up ? state.overallUp++ : state.overallDown++
 
-			// Update incidents
+      // Update incidents
 
-			// Create a dummy incident to store the start time of the monitoring and simplify logic
-			state.incident[monitor.id] = state.incident[monitor.id] || [
-				{
-					start: [currentTimeSecond],
-					end: currentTimeSecond,
-					error: ['dummy'],
-				},
-			]
-			// Then lastIncident here must not be undefined
-			const lastIncident = state.incident[monitor.id].slice(-1)[0]
-			const timeString = new Date().toLocaleString(config.dateLocale, {
-				timeZone: config.timezone,
-			})
+      // Create a dummy incident to store the start time of the monitoring and simplify logic
+      state.incident[monitor.id] = state.incident[monitor.id] || [
+        {
+          start: [currentTimeSecond],
+          end: currentTimeSecond,
+          error: ['dummy'],
+        },
+      ]
+      // Then lastIncident here must not be undefined
+      const lastIncident = state.incident[monitor.id].slice(-1)[0]
+      const timeString = new Date().toLocaleString(config.dateLocale, {
+        timeZone: config.timezone,
+      })
 
-			if (status.up) {
-				// Current status is up
-				// close existing incident if any
-				if (lastIncident.end === undefined) {
-					lastIncident.end = currentTimeSecond
-					await config.callback(
-						`✔️${monitor.name} came back up at ${timeString} after ${Math.round(
-							(lastIncident.end - lastIncident.start.slice(-1)[0]) / 60
-						)} minutes of downtime`
-					)
-				}
-			} else {
-				// Current status is down
-				// open new incident if not already open
-				if (lastIncident.end !== undefined) {
-					state.incident[monitor.id].push({
-						start: [currentTimeSecond],
-						end: undefined,
-						error: [status.err],
-					})
-					await config.callback(
-						`❌${monitor.name} went down at ${timeString} with error ${status.err}`
-					)
-				} else if (
-					lastIncident.end === undefined &&
-					lastIncident.error.slice(-1)[0] !== status.err
-				) {
-					// append if the error message changes
-					lastIncident.start.push(currentTimeSecond)
-					lastIncident.error.push(status.err)
-					await config.callback(
-						`❌${monitor.name} is still down at ${timeString} with error ${status.err}`
-					)
-				}
-			}
+      if (status.up) {
+        // Current status is up
+        // close existing incident if any
+        if (lastIncident.end === undefined) {
+          lastIncident.end = currentTimeSecond
+          await config.callback(
+            `✔️${monitor.name} came back up at ${timeString} after ${Math.round(
+              (lastIncident.end - lastIncident.start.slice(-1)[0]) / 60
+            )} minutes of downtime`
+          )
+        }
+      } else {
+        // Current status is down
+        // open new incident if not already open
+        if (lastIncident.end !== undefined) {
+          state.incident[monitor.id].push({
+            start: [currentTimeSecond],
+            end: undefined,
+            error: [status.err],
+          })
+          await config.callback(
+            `❌${monitor.name} went down at ${timeString} with error ${status.err}`
+          )
+        } else if (
+          lastIncident.end === undefined &&
+          lastIncident.error.slice(-1)[0] !== status.err
+        ) {
+          // append if the error message changes
+          lastIncident.start.push(currentTimeSecond)
+          lastIncident.error.push(status.err)
+          await config.callback(
+            `❌${monitor.name} is still down at ${timeString} with error ${status.err}`
+          )
+        }
+      }
 
-			// append to latency data
-			let latencyLists = state.latency[monitor.id] || {
-				recent: [],
-				all: [],
-			}
+      // append to latency data
+      let latencyLists = state.latency[monitor.id] || {
+        recent: [],
+        all: [],
+      }
 
-			const record = {
-				loc: workerLocation,
-				ping: status.ping,
-				time: currentTimeSecond,
-			}
-			latencyLists.recent.push(record)
-			if (latencyLists.all.length === 0 || currentTimeSecond - latencyLists.all[0].time > 60 * 60) {
-				latencyLists.all.push(record)
-			}
+      const record = {
+        loc: workerLocation,
+        ping: status.ping,
+        time: currentTimeSecond,
+      }
+      latencyLists.recent.push(record)
+      if (latencyLists.all.length === 0 || currentTimeSecond - latencyLists.all[0].time > 60 * 60) {
+        latencyLists.all.push(record)
+      }
 
-			// discard old data
-			while (latencyLists.recent[0]?.time < currentTimeSecond - 12 * 60 * 60) {
-				latencyLists.recent.shift()
-			}
-			while (latencyLists.all[0]?.time < currentTimeSecond - 90 * 24 * 60 * 60) {
-				latencyLists.all.shift()
-			}
-			state.latency[monitor.id] = latencyLists
-		}
+      // discard old data
+      while (latencyLists.recent[0]?.time < currentTimeSecond - 12 * 60 * 60) {
+        latencyLists.recent.shift()
+      }
+      while (latencyLists.all[0]?.time < currentTimeSecond - 90 * 24 * 60 * 60) {
+        latencyLists.all.shift()
+      }
+      state.latency[monitor.id] = latencyLists
+    }
 
-		// Update state
-		state.lastUpdate = Math.round(Date.now() / 1000)
-		await env.UPTIMEFLARE_STATE.put('state', JSON.stringify(state))
-	},
+    // Update state
+    state.lastUpdate = Math.round(Date.now() / 1000)
+    await env.UPTIMEFLARE_STATE.put('state', JSON.stringify(state))
+  },
 }