From 464e6df7d3e84962be9b80c0206453a777cfc6c0 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 14:53:26 +0200 Subject: [PATCH 001/123] options: { asJSON: true } --- .github/workflows/deploy.yml | 20 ++++++++++---------- flareact.config.js | 1 + package.json | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8429426..c6c2dbc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,18 +18,18 @@ jobs: with: node-version: '16' - run: yarn install - - run: yarn kv-gc + - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@2.0.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + apt-get update && apt-get install -y jq + export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - #postCommands: | + postCommands: | #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} diff --git a/flareact.config.js b/flareact.config.js index 8bd3f87..369ab2d 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -4,6 +4,7 @@ module.exports = { test: /\.ya?ml$/, type: 'json', use: 'yaml-loader', + options: { asJSON: true } }) return config diff --git a/package.json b/package.json index 7bd568a..a59c96c 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ "postcss-cli": "^10.1.0", "prettier": "^2.8.8", "tailwindcss": "^3.3.2", - "yaml-loader": "^0.6.0" + "yaml-loader": "^0.8.0" } } From a9b9c8aae83ea6a4b71e048c7e1958b743ad7539 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 14:58:35 +0200 Subject: [PATCH 002/123] --- flareact.config.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/flareact.config.js b/flareact.config.js index 369ab2d..e2458f0 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -2,10 +2,14 @@ module.exports = { webpack: (config, options) => { config.module.rules.push({ test: /\.ya?ml$/, - type: 'json', - use: 'yaml-loader', - options: { asJSON: true } - }) + use: [ + options.defaultLoaders.yaml-loader, + { + loader: "yaml-loader", + options: { asJSON: true } + }, + ], + }); return config }, From 99543d55ae5b966183d6737079122db9bef72670 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:01:13 +0200 Subject: [PATCH 003/123] --- flareact.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/flareact.config.js b/flareact.config.js index e2458f0..ff17be9 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -8,6 +8,7 @@ module.exports = { loader: "yaml-loader", options: { asJSON: true } }, + { loader: 'yaml-loader' } ], }); From 218aac64b135dd94aa892abdaa42d0ea3e4b3cf9 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:05:58 +0200 Subject: [PATCH 004/123] --- flareact.config.js | 13 ++++--------- src/functions/cronTrigger.js | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/flareact.config.js b/flareact.config.js index ff17be9..7699c07 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -2,15 +2,10 @@ module.exports = { webpack: (config, options) => { config.module.rules.push({ test: /\.ya?ml$/, - use: [ - options.defaultLoaders.yaml-loader, - { - loader: "yaml-loader", - options: { asJSON: true } - }, - { loader: 'yaml-loader' } - ], - }); + type: 'json', + use: 'yaml-loader', + options: { asJSON: true }, + }) return config }, diff --git a/src/functions/cronTrigger.js b/src/functions/cronTrigger.js index ef44721..f606e25 100644 --- a/src/functions/cronTrigger.js +++ b/src/functions/cronTrigger.js @@ -1,5 +1,5 @@ -import config from '../../config.yaml' - +//import config from '../../config.yaml' +const { config } = require('../../config.yaml'); import { notifySlack, notifyTelegram, From 29e2d85f70de9e400f57560485291266f34f4e36 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:13:26 +0200 Subject: [PATCH 005/123] --- flareact.config.js | 16 ++++++++++++++++ src/functions/cronTrigger.js | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/flareact.config.js b/flareact.config.js index 7699c07..7f0385a 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -10,3 +10,19 @@ module.exports = { return config }, } +module.exports = { + webpack: (config, options) => { + config.module.rules.push({ + test: /\.ya?ml$/, + type: 'json', + use: [ + { + loader: "yaml-loader", + options: { asJSON: true, isWorker: true }, + }, + ], + }); + + return config; + }, +}; \ No newline at end of file diff --git a/src/functions/cronTrigger.js b/src/functions/cronTrigger.js index f606e25..ef44721 100644 --- a/src/functions/cronTrigger.js +++ b/src/functions/cronTrigger.js @@ -1,5 +1,5 @@ -//import config from '../../config.yaml' -const { config } = require('../../config.yaml'); +import config from '../../config.yaml' + import { notifySlack, notifyTelegram, From eec4eaa841d01825027a7937aafdf52c8aa8fa58 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:14:52 +0200 Subject: [PATCH 006/123] --- flareact.config.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/flareact.config.js b/flareact.config.js index 7f0385a..709e339 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -1,15 +1,4 @@ -module.exports = { - webpack: (config, options) => { - config.module.rules.push({ - test: /\.ya?ml$/, - type: 'json', - use: 'yaml-loader', - options: { asJSON: true }, - }) - return config - }, -} module.exports = { webpack: (config, options) => { config.module.rules.push({ From 451455162d2e5ea9a0560f915767e2cc37bf33a8 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:22:43 +0200 Subject: [PATCH 007/123] --- flareact.config.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/flareact.config.js b/flareact.config.js index 709e339..44ff76f 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -1,17 +1,12 @@ - module.exports = { webpack: (config, options) => { config.module.rules.push({ test: /\.ya?ml$/, type: 'json', - use: [ - { - loader: "yaml-loader", - options: { asJSON: true, isWorker: true }, - }, - ], - }); + loader: 'yaml-loader', + options: { asJSON: true } + }) - return config; + return config }, -}; \ No newline at end of file +} From 29ac364860b3f062d457dbfe3128c3533e96ebf1 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:31:30 +0200 Subject: [PATCH 008/123] --- flareact.config.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/flareact.config.js b/flareact.config.js index 44ff76f..66258b5 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -1,12 +1,17 @@ + module.exports = { webpack: (config, options) => { config.module.rules.push({ test: /\.ya?ml$/, - type: 'json', - loader: 'yaml-loader', - options: { asJSON: true } - }) + use: [ + options.defaultLoaders.yaml-loader, + { + loader: "yaml-loader/loader", + options: { asJSON: true }, + }, + ], + }); - return config + return config; }, -} +}; \ No newline at end of file From 4280247ade36e09fde823fb10444ae30cc52f92c Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:36:23 +0200 Subject: [PATCH 009/123] --- flareact.config.js | 16 +++++----------- package.json | 2 +- src/functions/cronTrigger.js | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/flareact.config.js b/flareact.config.js index 66258b5..8bd3f87 100644 --- a/flareact.config.js +++ b/flareact.config.js @@ -1,17 +1,11 @@ - module.exports = { webpack: (config, options) => { config.module.rules.push({ test: /\.ya?ml$/, - use: [ - options.defaultLoaders.yaml-loader, - { - loader: "yaml-loader/loader", - options: { asJSON: true }, - }, - ], - }); + type: 'json', + use: 'yaml-loader', + }) - return config; + return config }, -}; \ No newline at end of file +} diff --git a/package.json b/package.json index a59c96c..7bd568a 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ "postcss-cli": "^10.1.0", "prettier": "^2.8.8", "tailwindcss": "^3.3.2", - "yaml-loader": "^0.8.0" + "yaml-loader": "^0.6.0" } } diff --git a/src/functions/cronTrigger.js b/src/functions/cronTrigger.js index ef44721..f606e25 100644 --- a/src/functions/cronTrigger.js +++ b/src/functions/cronTrigger.js @@ -1,5 +1,5 @@ -import config from '../../config.yaml' - +//import config from '../../config.yaml' +const { config } = require('../../config.yaml'); import { notifySlack, notifyTelegram, From e89c8ab9be4ba523dd4e32898954119cf5414279 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:40:08 +0200 Subject: [PATCH 010/123] --- src/functions/cronTrigger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/cronTrigger.js b/src/functions/cronTrigger.js index f606e25..e457222 100644 --- a/src/functions/cronTrigger.js +++ b/src/functions/cronTrigger.js @@ -1,5 +1,5 @@ //import config from '../../config.yaml' -const { config } = require('../../config.yaml'); +const config = require('../../config.yaml'); import { notifySlack, notifyTelegram, From 2740a2391293d1262e665046f6e678bd7a29455d Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 15:45:53 +0200 Subject: [PATCH 011/123] --- .github/workflows/deploy.yml | 18 +++++++++--------- src/functions/cronTrigger.js | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c6c2dbc..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,16 +20,16 @@ jobs: - run: yarn install - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@2.0.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - apt-get update && apt-get install -y jq - export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - postCommands: | + #postCommands: | #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} diff --git a/src/functions/cronTrigger.js b/src/functions/cronTrigger.js index e457222..2bcf05d 100644 --- a/src/functions/cronTrigger.js +++ b/src/functions/cronTrigger.js @@ -1,5 +1,5 @@ -//import config from '../../config.yaml' -const config = require('../../config.yaml'); +import config from '../../config.yaml' +zz import { notifySlack, notifyTelegram, From ec0ac7d6e07ceed880d1dd2e1f42213f299b3945 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 13:46:59 +0000 Subject: [PATCH 012/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index f16764f..837beb5 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue May 2 02:02:19 CEST 2023 +Tue May 2 15:46:59 CEST 2023 ``` --- From 27f76e415644e807c5883de9f3c6d5099fa54cd9 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:01:07 +0200 Subject: [PATCH 013/123] --- config.json | 168 ++++++++++++++++++++++++++ src/components/monitorCard.js | 2 +- src/components/monitorHistogram.js | 2 +- src/components/monitorStatusHeader.js | 2 +- src/components/monitorStatusLabel.js | 2 +- src/functions/cronTrigger.js | 2 +- src/functions/helpers.js | 2 +- 7 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 config.json diff --git a/config.json b/config.json new file mode 100644 index 0000000..7876621 --- /dev/null +++ b/config.json @@ -0,0 +1,168 @@ +{ + "settings": { + "title": "status", + "url": "", + "logo": "favicon.svg", + "daysInHistogram": 90, + "collectResponseTimes": true, + "allmonitorsOperational": "All Systems Operational", + "notAllmonitorsOperational": "Not All Systems Operational", + "monitorLabelOperational": "Operational", + "monitorLabelNotOperational": "No Response", + "monitorLabelNoData": "No data", + "dayInHistogramNoData": "No data", + "dayInHistogramOperational": "Response", + "dayInHistogramNotOperational": " incident(s)" + }, + "monitors": [ + { + "id": "milankomaj-934e3", + "name": "milankomaj", + "url": "https://milankomaj-934e3.firebaseapp.com", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "description": "milankomaj-934e3.firebaseapp.com" + }, + { + "id": "radio-fm", + "name": "radio fm", + "description": "mp3/128/https", + "url": "https://icecast.stv.livebox.sk/fm_128.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-regina", + "name": "radio regina", + "description": "mp3/128/https", + "url": "https://icecast.stv.livebox.sk/regina-bb_128.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-fun", + "name": "fun radio", + "description": "mp3/128/https", + "url": "https://stream.funradio.sk:18443/fun128.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-europa", + "name": "europa 2", + "description": "mp3/128/https", + "url": "https://stream.bauermedia.sk/europa2.mp3", + "method": "HEAD", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-jemne", + "name": "radio melody", + "description": "mp3/128/https", + "url": "https://stream.bauermedia.sk/melody-hi.mp3", + "method": "HEAD", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-rock", + "name": "radio rock", + "description": "mp3/128/https", + "url": "https://stream.bauermedia.sk/rock-hi.mp3", + "method": "HEAD", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-slovensko", + "name": "radio slovensko", + "description": "mp3/128/https", + "url": "https://icecast.stv.livebox.sk/slovensko_128.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-expres", + "name": "radio expres", + "description": "mp3/128/https", + "url": "https://stream.expres.sk/128.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-kiks", + "name": "radio kiks", + "description": "mp3/192/https", + "url": "https://stream.radiokiks.sk/kiks_hq.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-vlna", + "name": "radio vlna", + "description": "mp3/128/https", + "url": "https://stream.radiovlna.sk/vlna-hi.mp3", + "method": "HEAD", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-wow", + "name": "radio wow", + "description": "radioserver/https", + "url": "https://radioserver.online:9816", + "method": "GET", + "expectStatus": 200, + "followRedirect": true, + "linkable": false + }, + { + "id": "bb-fm", + "name": "bb fm", + "description": "radioserver/https", + "url": "https://stream.bbfm.sk:18443", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-best", + "name": "best fm", + "description": "mp3/128/http()", + "url": "http://stream2.bestfm.sk/128.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + }, + { + "id": "radio-kosice", + "name": "rádio košice", + "description": "mp3/128/https", + "url": "https://stream.21.sk/radiokosice-128.mp3", + "method": "GET", + "expectStatus": 200, + "followRedirect": false, + "linkable": false + } + ] +} \ No newline at end of file diff --git a/src/components/monitorCard.js b/src/components/monitorCard.js index ca74824..8f2bec8 100644 --- a/src/components/monitorCard.js +++ b/src/components/monitorCard.js @@ -1,4 +1,4 @@ -import config from '../../config.yaml' +import config from '../../config.json' import MonitorStatusLabel from './monitorStatusLabel' import MonitorHistogram from './monitorHistogram' diff --git a/src/components/monitorHistogram.js b/src/components/monitorHistogram.js index 398e343..64c657e 100644 --- a/src/components/monitorHistogram.js +++ b/src/components/monitorHistogram.js @@ -1,5 +1,5 @@ import React from 'react' -import config from '../../config.yaml' +import config from '../../config.json' import MonitorDayAverage from './monitorDayAverage' export default function MonitorHistogram({ monitorId, kvMonitor }) { diff --git a/src/components/monitorStatusHeader.js b/src/components/monitorStatusHeader.js index d111c04..4efac3a 100644 --- a/src/components/monitorStatusHeader.js +++ b/src/components/monitorStatusHeader.js @@ -1,4 +1,4 @@ -import config from '../../config.yaml' +import config from '../../config.json' import { locations } from '../functions/helpers' const classes = { diff --git a/src/components/monitorStatusLabel.js b/src/components/monitorStatusLabel.js index f03b160..befeea0 100644 --- a/src/components/monitorStatusLabel.js +++ b/src/components/monitorStatusLabel.js @@ -1,4 +1,4 @@ -import config from '../../config.yaml' +import config from '../../config.json' const classes = { gray: 'bg-gray-200 text-gray-800 dark:bg-gray-800 dark:text-gray-200', diff --git a/src/functions/cronTrigger.js b/src/functions/cronTrigger.js index 2bcf05d..3c5e54d 100644 --- a/src/functions/cronTrigger.js +++ b/src/functions/cronTrigger.js @@ -1,4 +1,4 @@ -import config from '../../config.yaml' +import config from '../../config.json' zz import { notifySlack, diff --git a/src/functions/helpers.js b/src/functions/helpers.js index 9c07600..20cdddc 100644 --- a/src/functions/helpers.js +++ b/src/functions/helpers.js @@ -1,4 +1,4 @@ -import config from '../../config.yaml' +import config from '../../config.json' import { useEffect, useState } from 'react' const kvDataKey = 'monitors_data_v1_1' From 7d88e9a347348ea9c2d96107f7a6c76e29957aa1 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 14:02:48 +0000 Subject: [PATCH 014/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 837beb5..efdb46f 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue May 2 15:46:59 CEST 2023 +Tue May 2 16:02:48 CEST 2023 ``` --- From 29becb2518be16678d8abf8ff1732f41577b95d5 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:03:05 +0200 Subject: [PATCH 015/123] --- .github/workflows/deploy.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..432c386 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,17 +20,17 @@ jobs: - run: yarn install - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@2.0.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + apt-get update && apt-get install -y jq + export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - #postCommands: | - #yarn kv-gc + postCommands: | + yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} From c336ec107a52d83f84f531eb43539261f69c1c19 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:08:32 +0200 Subject: [PATCH 016/123] --- .github/workflows/deploy.yml | 20 ++++++++++---------- src/components/monitorCard.js | 2 +- src/components/monitorHistogram.js | 2 +- src/components/monitorStatusHeader.js | 2 +- src/components/monitorStatusLabel.js | 2 +- src/functions/cronTrigger.js | 4 ++-- src/functions/helpers.js | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 432c386..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,17 +20,17 @@ jobs: - run: yarn install - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@2.0.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - apt-get update && apt-get install -y jq - export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - postCommands: | - yarn kv-gc + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} diff --git a/src/components/monitorCard.js b/src/components/monitorCard.js index 8f2bec8..ca74824 100644 --- a/src/components/monitorCard.js +++ b/src/components/monitorCard.js @@ -1,4 +1,4 @@ -import config from '../../config.json' +import config from '../../config.yaml' import MonitorStatusLabel from './monitorStatusLabel' import MonitorHistogram from './monitorHistogram' diff --git a/src/components/monitorHistogram.js b/src/components/monitorHistogram.js index 64c657e..398e343 100644 --- a/src/components/monitorHistogram.js +++ b/src/components/monitorHistogram.js @@ -1,5 +1,5 @@ import React from 'react' -import config from '../../config.json' +import config from '../../config.yaml' import MonitorDayAverage from './monitorDayAverage' export default function MonitorHistogram({ monitorId, kvMonitor }) { diff --git a/src/components/monitorStatusHeader.js b/src/components/monitorStatusHeader.js index 4efac3a..d111c04 100644 --- a/src/components/monitorStatusHeader.js +++ b/src/components/monitorStatusHeader.js @@ -1,4 +1,4 @@ -import config from '../../config.json' +import config from '../../config.yaml' import { locations } from '../functions/helpers' const classes = { diff --git a/src/components/monitorStatusLabel.js b/src/components/monitorStatusLabel.js index befeea0..f03b160 100644 --- a/src/components/monitorStatusLabel.js +++ b/src/components/monitorStatusLabel.js @@ -1,4 +1,4 @@ -import config from '../../config.json' +import config from '../../config.yaml' const classes = { gray: 'bg-gray-200 text-gray-800 dark:bg-gray-800 dark:text-gray-200', diff --git a/src/functions/cronTrigger.js b/src/functions/cronTrigger.js index 3c5e54d..ef44721 100644 --- a/src/functions/cronTrigger.js +++ b/src/functions/cronTrigger.js @@ -1,5 +1,5 @@ -import config from '../../config.json' -zz +import config from '../../config.yaml' + import { notifySlack, notifyTelegram, diff --git a/src/functions/helpers.js b/src/functions/helpers.js index 20cdddc..9c07600 100644 --- a/src/functions/helpers.js +++ b/src/functions/helpers.js @@ -1,4 +1,4 @@ -import config from '../../config.json' +import config from '../../config.yaml' import { useEffect, useState } from 'react' const kvDataKey = 'monitors_data_v1_1' From 540916a885179aeeb7caa0d121413444ff58a37e Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 14:09:46 +0000 Subject: [PATCH 017/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index efdb46f..74ad473 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue May 2 16:02:48 CEST 2023 +Tue May 2 16:09:46 CEST 2023 ``` --- From 0c22a76a76ac12aab21b00004ee9b7e79f516099 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:46:39 +0200 Subject: [PATCH 018/123] --- .github/workflows/deploy.yml | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..c6c2dbc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,16 +20,16 @@ jobs: - run: yarn install - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@2.0.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + apt-get update && apt-get install -y jq + export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - #postCommands: | + postCommands: | #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} diff --git a/package.json b/package.json index 7bd568a..c659166 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "v1.5.0-canary.2", "laco": "^1.2.1", "laco-react": "^1.1.0", "react": "^17.0.2", From 19f6537fd2a704ed21f69576435b1584ea3b99ac Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:49:02 +0200 Subject: [PATCH 019/123] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c659166..f8d62e1 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "v1.5.0-canary.2", + "flareact": "^0.10.1", "laco": "^1.2.1", "laco-react": "^1.1.0", "react": "^17.0.2", From 889ae2db25b5f20500ddfabf9dd8195405def01a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:51:02 +0200 Subject: [PATCH 020/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c6c2dbc..432c386 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") postCommands: | - #yarn kv-gc + yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} From c8c2ed3c7a053b75c79686b4b3b84923e75637b1 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:53:05 +0200 Subject: [PATCH 021/123] --- .github/workflows/deploy.yml | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 432c386..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,17 +20,17 @@ jobs: - run: yarn install - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@2.0.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - apt-get update && apt-get install -y jq - export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - postCommands: | - yarn kv-gc + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} diff --git a/package.json b/package.json index f8d62e1..7bd568a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.1", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", "react": "^17.0.2", From d06846fc9335a6ceb0ea2ea791e40c97a85b7927 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 2 May 2023 16:11:34 +0000 Subject: [PATCH 022/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 74ad473..8fbc7f6 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue May 2 16:09:46 CEST 2023 +Tue May 2 18:11:34 CEST 2023 ``` --- From 923edc9d9a1d813b6e7eaa1cfb929889e0530913 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 1 Jun 2023 00:42:28 +0000 Subject: [PATCH 023/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 8fbc7f6..1a97391 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue May 2 18:11:34 CEST 2023 +Thu Jun 1 02:42:28 CEST 2023 ``` --- From ff6ba025e9ee0907fa41834eeeee8736ad88452f Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:22:11 +0200 Subject: [PATCH 024/123] wrangler@1 --- .github/workflows/deploy.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..36970e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,19 +18,18 @@ jobs: with: node-version: '16' - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + # apt-get update && apt-get install -y jq + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - #postCommands: | - #yarn kv-gc + postCommands: | + yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} From 2996e2937e7d3b6fc73f0ef977a772f8fcc91161 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:25:50 +0200 Subject: [PATCH 025/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 36970e1..8b0f473 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '16' + node-version: '12' - run: yarn install - run: yarn build - name: Publish From 518b6ec339e6ccbaedd7a2b6f38a1d5fe1c8c41a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:30:30 +0200 Subject: [PATCH 026/123] --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7bd568a..237192a 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,19 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", + "autoprefixer": "^10.0.2", "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", - "tailwindcss": "^3.3.2", + "postcss": "^8.2.13", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } } From f50ac0070a7a2e0154e4d67ed3bc11edb2e19355 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:35:29 +0200 Subject: [PATCH 027/123] --- wrangler.toml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/wrangler.toml b/wrangler.toml index 088e2a9..6eb662f 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,12 +1,11 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +account_id = "" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23 kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" [triggers] crons = ["*/10 * * * *"] @@ -14,10 +13,3 @@ crons = ["*/10 * * * *"] [site] bucket = "out" #entry-point = "./" - -# uncomment and adjust following if you are not using GitHub Actions -#[env.production] -#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] -#zone_id="xxx" -#route="xxx" - From 777b4bc862fb2670509557a97a80614dacad1c92 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:38:17 +0200 Subject: [PATCH 028/123] --- wrangler.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrangler.toml b/wrangler.toml index 6eb662f..25e12f1 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -3,7 +3,7 @@ workers_dev = true account_id = "" type = "webpack" webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23 +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] From 3607b553f29541616c61c05881c2433cdb0b7045 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:42:43 +0200 Subject: [PATCH 029/123] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 237192a..c528a8d 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "devDependencies": { "autoprefixer": "^10.0.2", - "node-fetch": "^3.3.1", + "node-fetch": "^2.6.1", "postcss": "^8.2.13", "postcss-cli": "^8.3.0", "prettier": "^2.2.0", From 571f67ef97c7bc5fd0cea248aabf481f7f56a3bf Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:45:48 +0200 Subject: [PATCH 030/123] --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b0f473..d79263c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,9 +24,9 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - # apt-get update && apt-get install -y jq + apt-get update && apt-get install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + # namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") postCommands: | yarn kv-gc From f631c454c432d7f2146e4b829599d1a9235767bb Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:51:40 +0200 Subject: [PATCH 031/123] --- .github/workflows/deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d79263c..1cea115 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,9 +24,8 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - apt-get update && apt-get install -y jq + sudo apt-fast -y update && sudo apt-fast install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - # namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") postCommands: | yarn kv-gc From 59d1199dc1621596b5c446e9a002ea810fa20fcd Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:54:05 +0200 Subject: [PATCH 032/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1cea115..f2a0be3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - sudo apt-fast -y update && sudo apt-fast install -y jq + apt-fast -y update && apt-fast install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") postCommands: | From ecee978703b501831d0b7c4517b81ca71263c8aa Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:58:11 +0200 Subject: [PATCH 033/123] --- .github/workflows/deploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f2a0be3..b9eca17 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,16 +17,15 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '12' - - run: yarn install + - run: apt-fast -y update && apt-fast install -y jq + - run: yarn build - run: yarn build - name: Publish uses: cloudflare/wrangler-action@1.3.0 with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - apt-fast -y update && apt-fast install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | yarn kv-gc env: From d6c70732c9ea06af9b664525e249bc2ad47121e9 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:03:32 +0200 Subject: [PATCH 034/123] --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9eca17..184939e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,8 +13,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 with: node-version: '12' - run: apt-fast -y update && apt-fast install -y jq From ccf24ed99644fe625167926ccf8aebca588174ae Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:08:53 +0200 Subject: [PATCH 035/123] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c528a8d..f6d4470 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv-gc": "node ./src/cli/gcMonitors.js", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, From ce919fa5ac35a04a990d55ef2630d5bf56de8234 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:15:08 +0200 Subject: [PATCH 036/123] --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f6d4470..34de904 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.js", + "kv-gc": "node ./src/cli/gcMonitors.mjs", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, @@ -21,12 +21,12 @@ "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.0.2", - "node-fetch": "^2.6.1", - "postcss": "^8.2.13", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "autoprefixer": "^10.4.14", + "node-fetch": "^3.3.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^2.8.8", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } } From 4d91fbece367d0e43b32a056ba9ef8ba8a736522 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:17:56 +0200 Subject: [PATCH 037/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 184939e..7da7b87 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: with: node-version: '12' - run: apt-fast -y update && apt-fast install -y jq - - run: yarn build + - run: yarn install - run: yarn build - name: Publish uses: cloudflare/wrangler-action@1.3.0 From 52be0d5c941dba4f1d0c39bb7d711e116a49278f Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:20:30 +0200 Subject: [PATCH 038/123] --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 34de904..c528a8d 100644 --- a/package.json +++ b/package.json @@ -21,12 +21,12 @@ "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", - "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", - "tailwindcss": "^3.3.2", + "autoprefixer": "^10.0.2", + "node-fetch": "^2.6.1", + "postcss": "^8.2.13", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } } From 2ea54968c382a75e4dbe30b2b95bf22d4251345a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:33:17 +0200 Subject: [PATCH 039/123] --- .github/workflows/deploy.yml | 19 ++++++++----------- package.json | 6 +++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7da7b87..54ce32d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,26 +13,23 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-node@v1 with: node-version: '12' - - run: apt-fast -y update && apt-fast install -y jq - run: yarn install - run: yarn build - name: Publish uses: cloudflare/wrangler-action@1.3.0 with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | - yarn kv-gc + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + wrangler kv:namespace create KV_STATUS_PAGE || true + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + postCommands: | + yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} - KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} - CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy @@ -43,7 +40,7 @@ jobs: run: | date >> ./timestamp zone=$(TZ='Europe/Bratislava' date -r ./timestamp) - sed -i "11s/.*/$zone/" ./.github/README.md + sed -i "10s/.*/$zone/" ./.github/README.md git config --global user.email ${{ secrets.EMAIL }} git config --global user.name ${{ secrets.NAME }} git add ./.github/README.md diff --git a/package.json b/package.json index c528a8d..6f0bbe9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv-gc": "node ./src/cli/gcMonitors.js", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, @@ -23,10 +23,10 @@ "devDependencies": { "autoprefixer": "^10.0.2", "node-fetch": "^2.6.1", - "postcss": "^8.2.13", + "postcss": "^8.2.10", "postcss-cli": "^8.3.0", "prettier": "^2.2.0", "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } -} +} \ No newline at end of file From 594d665b4e278b5fda0fe1a2bab03daf9a28c3ab Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:43:27 +0200 Subject: [PATCH 040/123] --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 54ce32d..3127e79 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,11 +19,14 @@ jobs: node-version: '12' - run: yarn install - run: yarn build + env: + NODE_ENV: production - name: Publish uses: cloudflare/wrangler-action@1.3.0 with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | + apt-get update && apt-get install -y jq && apt-get install -y tee wrangler kv:namespace create KV_STATUS_PAGE || true export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") postCommands: | From 8e96893fe17ddb61d5141e9cae85f7b566120f29 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:44:00 +0200 Subject: [PATCH 041/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3127e79..ba0e7f6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: wrangler kv:namespace create KV_STATUS_PAGE || true export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") postCommands: | - yarn kv-gc + env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: From 79be9da81dd66ca6b49c7b17c1d7c2da516373ed Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:47:25 +0200 Subject: [PATCH 042/123] --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ba0e7f6..9963296 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,6 +17,7 @@ jobs: - uses: actions/setup-node@v1 with: node-version: '12' + - run: apt-fast update && apt-fast install -y jq && apt-fast install -y tee - run: yarn install - run: yarn build env: @@ -26,11 +27,10 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - apt-get update && apt-get install -y jq && apt-get install -y tee wrangler kv:namespace create KV_STATUS_PAGE || true export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") postCommands: | - + env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: From 52a7419d18ad73bd2b260230b00aa83e9012867a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 14:51:22 +0200 Subject: [PATCH 043/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9963296..c5c98b4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v1 with: node-version: '12' - - run: apt-fast update && apt-fast install -y jq && apt-fast install -y tee + - run: apt-fast update && apt-fast install -y jq - run: yarn install - run: yarn build env: From f0aa4ca0beda1a3f57900d457eeea3f074d374f9 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 15:20:25 +0200 Subject: [PATCH 044/123] --- .github/workflows/deploy.yml | 31 +++++++++++++++++-------------- package.json | 22 +++++++++++----------- wrangler.toml | 16 ++++++++++++---- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c5c98b4..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,25 +14,28 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: - node-version: '12' - - run: apt-fast update && apt-fast install -y jq + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - env: - NODE_ENV: production - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - wrangler kv:namespace create KV_STATUS_PAGE || true - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} + KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} + CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy @@ -43,7 +46,7 @@ jobs: run: | date >> ./timestamp zone=$(TZ='Europe/Bratislava' date -r ./timestamp) - sed -i "10s/.*/$zone/" ./.github/README.md + sed -i "11s/.*/$zone/" ./.github/README.md git config --global user.email ${{ secrets.EMAIL }} git config --global user.name ${{ secrets.NAME }} git add ./.github/README.md diff --git a/package.json b/package.json index 6f0bbe9..7bd568a 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.js", + "kv-gc": "node ./src/cli/gcMonitors.mjs", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", - "node-fetch": "^2.6.1", - "postcss": "^8.2.10", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "autoprefixer": "^10.4.14", + "node-fetch": "^3.3.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^2.8.8", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } -} \ No newline at end of file +} diff --git a/wrangler.toml b/wrangler.toml index 25e12f1..088e2a9 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,11 +1,12 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -account_id = "" -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] @@ -13,3 +14,10 @@ crons = ["*/10 * * * *"] [site] bucket = "out" #entry-point = "./" + +# uncomment and adjust following if you are not using GitHub Actions +#[env.production] +#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] +#zone_id="xxx" +#route="xxx" + From b30e46087ee0adda514a2a6b1287b420567cba0d Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 30 Jun 2023 13:22:38 +0000 Subject: [PATCH 045/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 1a97391..fb539c5 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Thu Jun 1 02:42:28 CEST 2023 +Fri Jun 30 15:22:38 CEST 2023 ``` --- From c0c26cfdbf4d4c96311dda0052b5f81ec45b9cdc Mon Sep 17 00:00:00 2001 From: milankomaj Date: Sat, 1 Jul 2023 00:41:57 +0000 Subject: [PATCH 046/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index fb539c5..cb8b2c3 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Jun 30 15:22:38 CEST 2023 +Sat Jul 1 02:41:57 CEST 2023 ``` --- From e60a7371f847c92fef4664640688afd954a4ab98 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 1 Aug 2023 00:37:17 +0000 Subject: [PATCH 047/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index cb8b2c3..6d5f7c3 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Sat Jul 1 02:41:57 CEST 2023 +Tue Aug 1 02:37:17 CEST 2023 ``` --- From c9f02a524d5436ffc1963a8fd90275ebd10969bc Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:19:00 +0200 Subject: [PATCH 048/123] v1 --- .github/workflows/deploy.yml | 21 ++++++++++----------- config.json | 6 +++--- config.yaml | 6 +++--- wrangler.toml | 12 +++++------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..36970e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,19 +18,18 @@ jobs: with: node-version: '16' - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + # apt-get update && apt-get install -y jq + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - #postCommands: | - #yarn kv-gc + postCommands: | + yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} diff --git a/config.json b/config.json index 7876621..6986181 100644 --- a/config.json +++ b/config.json @@ -107,9 +107,9 @@ { "id": "radio-kiks", "name": "radio kiks", - "description": "mp3/192/https", - "url": "https://stream.radiokiks.sk/kiks_hq.mp3", - "method": "GET", + "description": "mp3/128/https", + "url": "https://online.radiokiks.sk:8000/kiks_hq.mp3", + "method": "HEAD", "expectStatus": 200, "followRedirect": false, "linkable": false diff --git a/config.yaml b/config.yaml index eddc35a..ddfa0b7 100644 --- a/config.yaml +++ b/config.yaml @@ -97,9 +97,9 @@ monitors: - id: radio-kiks name: radio kiks - description: 'mp3/192/https' - url: 'https://stream.radiokiks.sk/kiks_hq.mp3' - method: GET + description: 'mp3/128/https' + url: 'https://online.radiokiks.sk:8000/kiks_hq.mp3' + method: HEAD expectStatus: 200 followRedirect: false linkable: false # allows the title to be a link, default=true diff --git a/wrangler.toml b/wrangler.toml index 088e2a9..6d006e9 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,23 +1,21 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" + [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -#entry-point = "./" +entry-point = "./" # uncomment and adjust following if you are not using GitHub Actions #[env.production] #kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] #zone_id="xxx" #route="xxx" - From 100b9c6d3456c2df543385c3ca015bcbceecb3ce Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:25:58 +0200 Subject: [PATCH 049/123] --- .github/workflows/deploy.yml | 5 ++--- package.json | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 36970e1..8d13718 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,12 +24,11 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - # apt-get update && apt-get install -y jq + apt-get update && apt-get install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - postCommands: | - yarn kv-gc + postCommands: env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} diff --git a/package.json b/package.json index 7bd568a..f6d4470 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv-gc": "node ./src/cli/gcMonitors.js", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", - "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", - "tailwindcss": "^3.3.2", + "autoprefixer": "^10.0.2", + "node-fetch": "^2.6.1", + "postcss": "^8.2.13", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } } From ef7d1c4e643813e606810e1c6fcefb6d2b927cfb Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:28:13 +0200 Subject: [PATCH 050/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8d13718..2fe6d22 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - apt-get update && apt-get install -y jq + # apt-get update && apt-get install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") From 513005c96c8076fd271fd9202474f9168c720b35 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:37:20 +0200 Subject: [PATCH 051/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2fe6d22..42043c6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - # apt-get update && apt-get install -y jq + apt-fast install -y && apt-fast install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") From f1a3df29413d22ebaf4be6762c8cf8a0a4fb0ad8 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:39:47 +0200 Subject: [PATCH 052/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 42043c6..916f6c8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - apt-fast install -y && apt-fast install -y jq + sudo apt-fast -y update && sudo apt-fast install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") From cb994ee928f63fabc7dcc4a4b85d5b5a2845a535 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:42:04 +0200 Subject: [PATCH 053/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 916f6c8..685f737 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - sudo apt-fast -y update && sudo apt-fast install -y jq + apt-fast -y update && apt-fast install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") From 4287e68f2b93e29b9f6ef3babed2e7838202c7ba Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:48:43 +0200 Subject: [PATCH 054/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 685f737..8693f27 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '16' + node-version: '12' - run: yarn install - run: yarn build - name: Publish From e4403cd0aa0ef6a5f78b18fc1148821a57eb11d9 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:51:13 +0200 Subject: [PATCH 055/123] --- .github/workflows/deploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8693f27..bf61aea 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,8 +13,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 with: node-version: '12' - run: yarn install @@ -24,7 +24,6 @@ jobs: with: apiToken: ${{ secrets.CF_API_TOKEN }} preCommands: | - apt-fast -y update && apt-fast install -y jq export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") From 84f539123d19ce8f5f17a55727cc106829f5cc12 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 16:55:42 +0200 Subject: [PATCH 056/123] --- .github/workflows/deploy.yml | 25 ++++++++++++++----------- package.json | 20 ++++++++++---------- wrangler.toml | 12 +++++++----- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bf61aea..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,21 +13,24 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: - node-version: '12' + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - postCommands: + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} diff --git a/package.json b/package.json index f6d4470..7bd568a 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.js", + "kv-gc": "node ./src/cli/gcMonitors.mjs", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", - "node-fetch": "^2.6.1", - "postcss": "^8.2.13", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "autoprefixer": "^10.4.14", + "node-fetch": "^3.3.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^2.8.8", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } } diff --git a/wrangler.toml b/wrangler.toml index 6d006e9..088e2a9 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,21 +1,23 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] - +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -entry-point = "./" +#entry-point = "./" # uncomment and adjust following if you are not using GitHub Actions #[env.production] #kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] #zone_id="xxx" #route="xxx" + From b2e4ac56eac0431bcbf57e55a927fdd0ba2f5ac0 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 11 Aug 2023 14:56:56 +0000 Subject: [PATCH 057/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 6d5f7c3..6a1e29f 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue Aug 1 02:37:17 CEST 2023 +Fri Aug 11 16:56:56 CEST 2023 ``` --- From 3dd6e1246852066a177ef422a38d1fa3c54696e7 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 17 Aug 2023 16:15:56 +0200 Subject: [PATCH 058/123] v1 --- .github/workflows/deploy.yml | 26 ++++++++++---------------- package.json | 22 +++++++++++----------- wrangler.toml | 18 +++++------------- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..a582bbb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,28 +14,22 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '12' + - run: apt-fast update && apt-fast install -y jq - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + postCommands: | - #postCommands: | - #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} - KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} - CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy diff --git a/package.json b/package.json index 7bd568a..6f0bbe9 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv-gc": "node ./src/cli/gcMonitors.js", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", - "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", - "tailwindcss": "^3.3.2", + "autoprefixer": "^10.0.2", + "node-fetch": "^2.6.1", + "postcss": "^8.2.10", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } -} +} \ No newline at end of file diff --git a/wrangler.toml b/wrangler.toml index 088e2a9..927a101 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,23 +1,15 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +account_id = "" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -#entry-point = "./" - -# uncomment and adjust following if you are not using GitHub Actions -#[env.production] -#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] -#zone_id="xxx" -#route="xxx" - +entry-point = "./" From f62c2d7130292d49db6b158f5a3dc18f0b6bd12a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 17 Aug 2023 14:18:50 +0000 Subject: [PATCH 059/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 6a1e29f..3e95849 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Aug 11 16:56:56 CEST 2023 +Thu Aug 17 16:18:50 CEST 2023 ``` --- From c553ffe08a077720cff84afc72b3b5f091f2f3fb Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 17 Aug 2023 16:24:39 +0200 Subject: [PATCH 060/123] --- .github/workflows/deploy.yml | 26 ++++++++++++++++---------- package.json | 22 +++++++++++----------- wrangler.toml | 17 ++++++++++++----- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a582bbb..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,22 +14,28 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: - node-version: '12' - - run: apt-fast update && apt-fast install -y jq + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} + KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} + CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy diff --git a/package.json b/package.json index 6f0bbe9..7bd568a 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.js", + "kv-gc": "node ./src/cli/gcMonitors.mjs", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", - "node-fetch": "^2.6.1", - "postcss": "^8.2.10", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "autoprefixer": "^10.4.14", + "node-fetch": "^3.3.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^2.8.8", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } -} \ No newline at end of file +} diff --git a/wrangler.toml b/wrangler.toml index 927a101..a2178c6 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,15 +1,22 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -account_id = "" -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -entry-point = "./" +#entry-point = "./" + +# uncomment and adjust following if you are not using GitHub Actions +#[env.production] +#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] +#zone_id="xxx" +#route="xxx" From f3479e923168dc5a7058275f6d38e8c121ef9d8c Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 17 Aug 2023 14:26:03 +0000 Subject: [PATCH 061/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 3e95849..9db3419 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Thu Aug 17 16:18:50 CEST 2023 +Thu Aug 17 16:26:03 CEST 2023 ``` --- From 4c67a9a1a9ae0de578e64e402d9c597f950d2e6d Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 18 Aug 2023 10:37:37 +0200 Subject: [PATCH 062/123] --- .github/workflows/deploy.yml | 26 ++++++++++---------------- config.json | 4 ++-- config.yaml | 4 ++-- package.json | 21 +++++++++++---------- wrangler.toml | 17 +++++------------ 5 files changed, 30 insertions(+), 42 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..a582bbb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,28 +14,22 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '12' + - run: apt-fast update && apt-fast install -y jq - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + postCommands: | - #postCommands: | - #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} - KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} - CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy diff --git a/config.json b/config.json index 6986181..047a46b 100644 --- a/config.json +++ b/config.json @@ -107,8 +107,8 @@ { "id": "radio-kiks", "name": "radio kiks", - "description": "mp3/128/https", - "url": "https://online.radiokiks.sk:8000/kiks_hq.mp3", + "description": "radioserver/https", + "url": "https://online.radiokiks.sk:8000", "method": "HEAD", "expectStatus": 200, "followRedirect": false, diff --git a/config.yaml b/config.yaml index ddfa0b7..b2d3085 100644 --- a/config.yaml +++ b/config.yaml @@ -97,8 +97,8 @@ monitors: - id: radio-kiks name: radio kiks - description: 'mp3/128/https' - url: 'https://online.radiokiks.sk:8000/kiks_hq.mp3' + description: 'radioserver/https' + url: 'https://online.radiokiks.sk:8000' method: HEAD expectStatus: 200 followRedirect: false diff --git a/package.json b/package.json index 7bd568a..1bd7509 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,25 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv-gc": "node ./src/cli/gcMonitors.js", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", - "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", - "tailwindcss": "^3.3.2", + "autoprefixer": "^10.0.2", + "node-fetch": "^2.6.1", + "postcss": "^8.2.10", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } } + diff --git a/wrangler.toml b/wrangler.toml index a2178c6..77224ca 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,22 +1,15 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +account_id = "" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -#entry-point = "./" - -# uncomment and adjust following if you are not using GitHub Actions -#[env.production] -#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] -#zone_id="xxx" -#route="xxx" +entry-point = "./" \ No newline at end of file From 20531d0a197b47e73717d96623dd76675b90d42a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 18 Aug 2023 08:40:30 +0000 Subject: [PATCH 063/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 9db3419..905cc22 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Thu Aug 17 16:26:03 CEST 2023 +Fri Aug 18 10:40:30 CEST 2023 ``` --- From 0209b37b61dec685e9b2395b901f71c4aee98b2d Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 18 Aug 2023 10:49:06 +0200 Subject: [PATCH 064/123] --- .github/workflows/deploy.yml | 26 ++++++++++++++++---------- package.json | 21 ++++++++++----------- wrangler.toml | 17 ++++++++++++----- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a582bbb..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,22 +14,28 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: - node-version: '12' - - run: apt-fast update && apt-fast install -y jq + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} + KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} + CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy diff --git a/package.json b/package.json index 1bd7509..7bd568a 100644 --- a/package.json +++ b/package.json @@ -9,25 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.js", + "kv-gc": "node ./src/cli/gcMonitors.mjs", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", - "node-fetch": "^2.6.1", - "postcss": "^8.2.10", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "autoprefixer": "^10.4.14", + "node-fetch": "^3.3.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^2.8.8", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } } - diff --git a/wrangler.toml b/wrangler.toml index 77224ca..a2178c6 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,15 +1,22 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -account_id = "" -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -entry-point = "./" \ No newline at end of file +#entry-point = "./" + +# uncomment and adjust following if you are not using GitHub Actions +#[env.production] +#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] +#zone_id="xxx" +#route="xxx" From 1ca95ab96df0fa974f443e59be286e7a6f7dd497 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 18 Aug 2023 08:50:26 +0000 Subject: [PATCH 065/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 905cc22..c5c76bd 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Aug 18 10:40:30 CEST 2023 +Fri Aug 18 10:50:26 CEST 2023 ``` --- From 9e6aa50c6921f16cf02202476a1cf3e35847111e Mon Sep 17 00:00:00 2001 From: milankomaj Date: Mon, 21 Aug 2023 17:11:46 +0200 Subject: [PATCH 066/123] --- .github/workflows/deploy.yml | 28 +++++++++++----------------- config.json | 2 +- config.yaml | 2 +- package.json | 18 +++++++++--------- wrangler.toml | 17 +++++------------ 5 files changed, 27 insertions(+), 40 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..37f73ae 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,28 +14,22 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '12' + - run: apt-fast update && apt-fast install -y jq - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - - #postCommands: | - #yarn kv-gc + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + postCommands: | + yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} - KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} - CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy diff --git a/config.json b/config.json index 047a46b..26dd4c9 100644 --- a/config.json +++ b/config.json @@ -109,7 +109,7 @@ "name": "radio kiks", "description": "radioserver/https", "url": "https://online.radiokiks.sk:8000", - "method": "HEAD", + "method": "GET", "expectStatus": 200, "followRedirect": false, "linkable": false diff --git a/config.yaml b/config.yaml index b2d3085..82a76ae 100644 --- a/config.yaml +++ b/config.yaml @@ -99,7 +99,7 @@ monitors: name: radio kiks description: 'radioserver/https' url: 'https://online.radiokiks.sk:8000' - method: HEAD + method: GET expectStatus: 200 followRedirect: false linkable: false # allows the title to be a link, default=true diff --git a/package.json b/package.json index 7bd568a..07bcaf1 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,19 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", + "autoprefixer": "^10.0.2", "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", - "tailwindcss": "^3.3.2", + "postcss": "^8.2.10", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } -} +} \ No newline at end of file diff --git a/wrangler.toml b/wrangler.toml index a2178c6..927a101 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,22 +1,15 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +account_id = "" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -#entry-point = "./" - -# uncomment and adjust following if you are not using GitHub Actions -#[env.production] -#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] -#zone_id="xxx" -#route="xxx" +entry-point = "./" From 05912a0f85825340fe3fafbfe53b4ab7f3c49e92 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Mon, 21 Aug 2023 15:14:49 +0000 Subject: [PATCH 067/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index c5c76bd..3f37132 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Aug 18 10:50:26 CEST 2023 +Mon Aug 21 17:14:49 CEST 2023 ``` --- From 22213317c79f6876740c62f0cb8df3a61f860a4c Mon Sep 17 00:00:00 2001 From: milankomaj Date: Mon, 21 Aug 2023 17:15:57 +0200 Subject: [PATCH 068/123] --- .github/workflows/deploy.yml | 28 +++++++++++++++++----------- package.json | 18 +++++++++--------- wrangler.toml | 17 ++++++++++++----- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 37f73ae..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,22 +14,28 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: - node-version: '12' - - run: apt-fast update && apt-fast install -y jq + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | - yarn kv-gc + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} + KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} + CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy diff --git a/package.json b/package.json index 07bcaf1..7bd568a 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,19 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", + "autoprefixer": "^10.4.14", "node-fetch": "^3.3.1", - "postcss": "^8.2.10", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^2.8.8", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } -} \ No newline at end of file +} diff --git a/wrangler.toml b/wrangler.toml index 927a101..a2178c6 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,15 +1,22 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -account_id = "" -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -entry-point = "./" +#entry-point = "./" + +# uncomment and adjust following if you are not using GitHub Actions +#[env.production] +#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] +#zone_id="xxx" +#route="xxx" From aff0ed9133aa74e29d6514e31b4005cbe3cae2db Mon Sep 17 00:00:00 2001 From: milankomaj Date: Mon, 21 Aug 2023 15:17:29 +0000 Subject: [PATCH 069/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 3f37132..ce6b50d 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Mon Aug 21 17:14:49 CEST 2023 +Mon Aug 21 17:17:29 CEST 2023 ``` --- From 77ddb853c18bbe19653f5961f5c914075e0d7d9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 17:19:23 +0200 Subject: [PATCH 070/123] Bump prettier from 2.8.8 to 3.0.2 (#78) Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bd568a..68153f7 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node-fetch": "^3.3.1", "postcss": "^8.4.23", "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", + "prettier": "^3.0.2", "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } From b33cb1ecb8336cfb58dfa815f7af25f1b1a6a7a7 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Mon, 21 Aug 2023 15:20:34 +0000 Subject: [PATCH 071/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index ce6b50d..de2dc96 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Mon Aug 21 17:17:29 CEST 2023 +Mon Aug 21 17:20:34 CEST 2023 ``` --- From 1fe8711cbfa0ebe5a87396a4ee4a16672422081f Mon Sep 17 00:00:00 2001 From: milankomaj Date: Sun, 27 Aug 2023 16:21:48 +0200 Subject: [PATCH 072/123] status 302 --- .github/workflows/deploy.yml | 25 +++++++++++-------------- config.json | 2 +- config.yaml | 2 +- package.json | 16 ++++++++-------- wrangler.toml | 17 +++++------------ 5 files changed, 26 insertions(+), 36 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..c284ed7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,23 +14,20 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '12' + - run: apt-fast update && apt-fast install -y jq - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") - - #postCommands: | - #yarn kv-gc + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + postCommands: | + yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} diff --git a/config.json b/config.json index 26dd4c9..8a3ebb7 100644 --- a/config.json +++ b/config.json @@ -110,7 +110,7 @@ "description": "radioserver/https", "url": "https://online.radiokiks.sk:8000", "method": "GET", - "expectStatus": 200, + "expectStatus": 302, "followRedirect": false, "linkable": false }, diff --git a/config.yaml b/config.yaml index 82a76ae..1de6e6c 100644 --- a/config.yaml +++ b/config.yaml @@ -100,7 +100,7 @@ monitors: description: 'radioserver/https' url: 'https://online.radiokiks.sk:8000' method: GET - expectStatus: 200 + expectStatus: 302 followRedirect: false linkable: false # allows the title to be a link, default=true diff --git a/package.json b/package.json index 68153f7..9f43530 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,19 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", + "autoprefixer": "^10.0.2", "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^3.0.2", - "tailwindcss": "^3.3.2", + "postcss": "^8.2.10", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } } diff --git a/wrangler.toml b/wrangler.toml index a2178c6..77224ca 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,22 +1,15 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +account_id = "" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -#entry-point = "./" - -# uncomment and adjust following if you are not using GitHub Actions -#[env.production] -#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] -#zone_id="xxx" -#route="xxx" +entry-point = "./" \ No newline at end of file From f5581c171a43880c53f8cfa1f3bc902f84482189 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Sun, 27 Aug 2023 14:27:27 +0000 Subject: [PATCH 073/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index de2dc96..3c293ff 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Mon Aug 21 17:20:34 CEST 2023 +Sun Aug 27 16:27:27 CEST 2023 ``` --- From 6fe1e7490d56cd9d8f665d58f6836f8eae41c80d Mon Sep 17 00:00:00 2001 From: milankomaj Date: Sun, 27 Aug 2023 16:33:49 +0200 Subject: [PATCH 074/123] --- .github/workflows/deploy.yml | 25 ++++++++++++++----------- package.json | 16 ++++++++-------- wrangler.toml | 17 ++++++++++++----- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c284ed7..72eee95 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,20 +14,23 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: - node-version: '12' - - run: apt-fast update && apt-fast install -y jq + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | - yarn kv-gc + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} diff --git a/package.json b/package.json index 9f43530..7bd568a 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,19 @@ "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", + "autoprefixer": "^10.4.14", "node-fetch": "^3.3.1", - "postcss": "^8.2.10", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^2.8.8", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } } diff --git a/wrangler.toml b/wrangler.toml index 77224ca..a2178c6 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,15 +1,22 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -account_id = "" -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -entry-point = "./" \ No newline at end of file +#entry-point = "./" + +# uncomment and adjust following if you are not using GitHub Actions +#[env.production] +#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] +#zone_id="xxx" +#route="xxx" From e1d9fdebecff0f7ba657a3a27862756d9300b6d2 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Sun, 27 Aug 2023 14:35:06 +0000 Subject: [PATCH 075/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 3c293ff..9c84911 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Sun Aug 27 16:27:27 CEST 2023 +Sun Aug 27 16:35:06 CEST 2023 ``` --- From 36fccfcd34836f2c9f746680f60e28a711dc6dd4 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 1 Sep 2023 00:29:20 +0000 Subject: [PATCH 076/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 9c84911..ee5cc52 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Sun Aug 27 16:35:06 CEST 2023 +Fri Sep 1 02:29:20 CEST 2023 ``` --- From 9a4405c71a3db54d65fc64777c79b07f3ff972d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:53:08 +0200 Subject: [PATCH 077/123] Bump actions/checkout from 3 to 4 (#80) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/deploy.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 74f3dcd..93520a3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index aae9bfc..773f18b 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -9,6 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Dependency Review uses: actions/dependency-review-action@main diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72eee95..20f642f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: node-version: '16' @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest needs: deploy steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Timestamp shell: bash run: | From c32dfd05298f27d8ae659ffc06c17197f15d6f7b Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 12 Sep 2023 12:54:30 +0000 Subject: [PATCH 078/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index ee5cc52..4e310e0 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Sep 1 02:29:20 CEST 2023 +Tue Sep 12 14:54:30 CEST 2023 ``` --- From fe2bcc1e39dcb345f67e7e424214016a4b4cbd69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:55:07 +0200 Subject: [PATCH 079/123] Bump prettier from 2.8.8 to 3.0.3 (#79) Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.3. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.3) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bd568a..9398479 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node-fetch": "^3.3.1", "postcss": "^8.4.23", "postcss-cli": "^10.1.0", - "prettier": "^2.8.8", + "prettier": "^3.0.3", "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } From 15e00ca666656e5b2935b26660c471d2d384e720 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 12 Sep 2023 12:56:14 +0000 Subject: [PATCH 080/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 4e310e0..2cdf1e5 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue Sep 12 14:54:30 CEST 2023 +Tue Sep 12 14:56:14 CEST 2023 ``` --- From 40bcf6657165e4ea147c77ad93b854a2a48f7aef Mon Sep 17 00:00:00 2001 From: milankomaj Date: Sun, 1 Oct 2023 00:32:08 +0000 Subject: [PATCH 081/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 2cdf1e5..5aabd40 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue Sep 12 14:56:14 CEST 2023 +Sun Oct 1 02:32:08 CEST 2023 ``` --- From 13d4ea5172db91e13d1dba38c089ef94fc54f51c Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 1 Nov 2023 00:30:02 +0000 Subject: [PATCH 082/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 5aabd40..d75c3bc 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Sun Oct 1 02:32:08 CEST 2023 +Wed Nov 1 01:30:02 CET 2023 ``` --- From f77c129a5609b5db4b476e08118b8fc1cc9034fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 16:00:44 +0100 Subject: [PATCH 083/123] Bump actions/setup-node from 3 to 4 (#81) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 20f642f..34e95e6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,7 +14,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '16' - run: yarn install From d5f8ef9aa77d3fa840af332bdc28bc0b5da550c4 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Tue, 7 Nov 2023 15:01:46 +0000 Subject: [PATCH 084/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index d75c3bc..684b935 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Nov 1 01:30:02 CET 2023 +Tue Nov 7 16:01:46 CET 2023 ``` --- From ff76dac8f936c65130e50f3d6e28f49626824754 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 1 Dec 2023 00:32:52 +0000 Subject: [PATCH 085/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 684b935..7086f77 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Tue Nov 7 16:01:46 CET 2023 +Fri Dec 1 01:32:52 CET 2023 ``` --- From e6943934f20d5be36ba842d140779abd4f32f8f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 01:25:24 +0100 Subject: [PATCH 086/123] Bump github/codeql-action from 2 to 3 (#83) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 93520a3..a911853 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-extended @@ -55,7 +55,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -69,4 +69,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From ad53b124b477499a8899a7117ec94f6306066459 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 27 Dec 2023 00:26:17 +0000 Subject: [PATCH 087/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 7086f77..23f677c 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Dec 1 01:32:52 CET 2023 +Wed Dec 27 01:26:17 CET 2023 ``` --- From 0833fccdb44135c7b80aaac3a21845df680016f1 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Mon, 1 Jan 2024 00:33:49 +0000 Subject: [PATCH 088/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 23f677c..1b1e140 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Dec 27 01:26:17 CET 2023 +Mon Jan 1 01:33:49 CET 2024 ``` --- From c92baaf42431cb37579d2bc3fb80f8b2f521b30a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 1 Feb 2024 00:29:43 +0000 Subject: [PATCH 089/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 1b1e140..2ad25a9 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Mon Jan 1 01:33:49 CET 2024 +Thu Feb 1 01:29:43 CET 2024 ``` --- From 2e1203acd4f4a7ad1a4698193556a9ccaad75a9b Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 13:17:04 +0100 Subject: [PATCH 090/123] --- .github/workflows/deploy.yml | 30 ++++++++++++------------------ config.json | 4 ++-- config.yaml | 4 ++-- package.json | 22 +++++++++++----------- wrangler.toml | 17 +++++------------ 5 files changed, 32 insertions(+), 45 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 34e95e6..a582bbb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,34 +13,28 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '12' + - run: apt-fast update && apt-fast install -y jq - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + postCommands: | - #postCommands: | - #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} - KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} - CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Timestamp shell: bash run: | diff --git a/config.json b/config.json index 8a3ebb7..66ff07d 100644 --- a/config.json +++ b/config.json @@ -147,8 +147,8 @@ { "id": "radio-best", "name": "best fm", - "description": "mp3/128/http()", - "url": "http://stream2.bestfm.sk/128.mp3", + "description": "radioserver/https", + "url": "https://stream3.bestfm.sk:8000/128.mp3", "method": "GET", "expectStatus": 200, "followRedirect": false, diff --git a/config.yaml b/config.yaml index 1de6e6c..d10a569 100644 --- a/config.yaml +++ b/config.yaml @@ -133,8 +133,8 @@ monitors: - id: radio-best name: best fm - description: 'mp3/128/http()' - url: 'http://stream2.bestfm.sk/128.mp3' + description: 'radioserver/https' + url: 'https://stream3.bestfm.sk:8000/128.mp3' method: GET expectStatus: 200 followRedirect: false diff --git a/package.json b/package.json index 9398479..6f0bbe9 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv-gc": "node ./src/cli/gcMonitors.js", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", - "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^3.0.3", - "tailwindcss": "^3.3.2", + "autoprefixer": "^10.0.2", + "node-fetch": "^2.6.1", + "postcss": "^8.2.10", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } -} +} \ No newline at end of file diff --git a/wrangler.toml b/wrangler.toml index a2178c6..77224ca 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,22 +1,15 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +account_id = "" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -#entry-point = "./" - -# uncomment and adjust following if you are not using GitHub Actions -#[env.production] -#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] -#zone_id="xxx" -#route="xxx" +entry-point = "./" \ No newline at end of file From 8a480aaeabcd5a2e6629e9dfba223c5d406187db Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 12:19:15 +0000 Subject: [PATCH 091/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 2ad25a9..21de305 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Thu Feb 1 01:29:43 CET 2024 +Wed Feb 14 13:19:15 CET 2024 ``` --- From 272e05a2f887bbc6432563fb9abafe20b9687c47 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 13:23:11 +0100 Subject: [PATCH 092/123] best fm --- config.json | 2 +- config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 66ff07d..45f2336 100644 --- a/config.json +++ b/config.json @@ -148,7 +148,7 @@ "id": "radio-best", "name": "best fm", "description": "radioserver/https", - "url": "https://stream3.bestfm.sk:8000/128.mp3", + "url": "https://stream3.bestfm.sk:8000", "method": "GET", "expectStatus": 200, "followRedirect": false, diff --git a/config.yaml b/config.yaml index d10a569..63962e1 100644 --- a/config.yaml +++ b/config.yaml @@ -134,7 +134,7 @@ monitors: - id: radio-best name: best fm description: 'radioserver/https' - url: 'https://stream3.bestfm.sk:8000/128.mp3' + url: 'https://stream3.bestfm.sk:8000' method: GET expectStatus: 200 followRedirect: false From 5b10e0c908d9e099758dc06135efe7271b8535b9 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 12:25:20 +0000 Subject: [PATCH 093/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 21de305..2e4c2b8 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 13:19:15 CET 2024 +Wed Feb 14 13:25:20 CET 2024 ``` --- From 0e30b3ea89890104e0d03910cd50420a71bb290b Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 13:57:11 +0100 Subject: [PATCH 094/123] --- config.json | 2 +- config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 45f2336..a03b7b0 100644 --- a/config.json +++ b/config.json @@ -149,7 +149,7 @@ "name": "best fm", "description": "radioserver/https", "url": "https://stream3.bestfm.sk:8000", - "method": "GET", + "method": "HEAD", "expectStatus": 200, "followRedirect": false, "linkable": false diff --git a/config.yaml b/config.yaml index 63962e1..9df1677 100644 --- a/config.yaml +++ b/config.yaml @@ -135,7 +135,7 @@ monitors: name: best fm description: 'radioserver/https' url: 'https://stream3.bestfm.sk:8000' - method: GET + method: HEAD expectStatus: 200 followRedirect: false linkable: false # allows the title to be a link, default=true From 781425771a369a4d04efd452bc96d1185a976f38 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 12:59:18 +0000 Subject: [PATCH 095/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 2e4c2b8..dcafac4 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 13:25:20 CET 2024 +Wed Feb 14 13:59:18 CET 2024 ``` --- From 45252a084a1726dc864c564ae05b1426249b8c88 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:11:37 +0100 Subject: [PATCH 096/123] --- config.json | 2 +- config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index a03b7b0..a64c617 100644 --- a/config.json +++ b/config.json @@ -150,7 +150,7 @@ "description": "radioserver/https", "url": "https://stream3.bestfm.sk:8000", "method": "HEAD", - "expectStatus": 200, + "expectStatus": 302, "followRedirect": false, "linkable": false }, diff --git a/config.yaml b/config.yaml index 9df1677..1609c46 100644 --- a/config.yaml +++ b/config.yaml @@ -136,7 +136,7 @@ monitors: description: 'radioserver/https' url: 'https://stream3.bestfm.sk:8000' method: HEAD - expectStatus: 200 + expectStatus: 302 followRedirect: false linkable: false # allows the title to be a link, default=true From d61332744e4437b7632ca31f2eef0c8c14a46532 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 13:13:44 +0000 Subject: [PATCH 097/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index dcafac4..e7d5356 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 13:59:18 CET 2024 +Wed Feb 14 14:13:44 CET 2024 ``` --- From c47cd907d422f5019c7348e2798df4195582ac8d Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:31:45 +0100 Subject: [PATCH 098/123] --- config.json | 4 ++-- config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.json b/config.json index a64c617..e3f2e41 100644 --- a/config.json +++ b/config.json @@ -147,8 +147,8 @@ { "id": "radio-best", "name": "best fm", - "description": "radioserver/https", - "url": "https://stream3.bestfm.sk:8000", + "description": "mp3/128/https", + "url": "https://stream3.bestfm.sk:8000/128.mp3", "method": "HEAD", "expectStatus": 302, "followRedirect": false, diff --git a/config.yaml b/config.yaml index 1609c46..a7bd428 100644 --- a/config.yaml +++ b/config.yaml @@ -133,8 +133,8 @@ monitors: - id: radio-best name: best fm - description: 'radioserver/https' - url: 'https://stream3.bestfm.sk:8000' + description: 'mp3/128/https + url: 'https://stream3.bestfm.sk:8000/128.mp3' method: HEAD expectStatus: 302 followRedirect: false From ae363ae660bf2889b5a86b04c1eca251efe1efdd Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 13:33:31 +0000 Subject: [PATCH 099/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index e7d5356..0315395 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 14:13:44 CET 2024 +Wed Feb 14 14:33:31 CET 2024 ``` --- From 0520f9a84976aa6bc5178e65abd7f6ff5f0d03da Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:02:09 +0100 Subject: [PATCH 100/123] --- .github/workflows/deploy.yml | 30 ++++++++++++++++++------------ package.json | 22 +++++++++++----------- wrangler.toml | 17 ++++++++++++----- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a582bbb..34e95e6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,28 +13,34 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: '12' - - run: apt-fast update && apt-fast install -y jq + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} + KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} + CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Timestamp shell: bash run: | diff --git a/package.json b/package.json index 6f0bbe9..9398479 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.js", + "kv-gc": "node ./src/cli/gcMonitors.mjs", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", - "node-fetch": "^2.6.1", - "postcss": "^8.2.10", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "autoprefixer": "^10.4.14", + "node-fetch": "^3.3.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^3.0.3", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } -} \ No newline at end of file +} diff --git a/wrangler.toml b/wrangler.toml index 77224ca..a2178c6 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,15 +1,22 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -account_id = "" -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -entry-point = "./" \ No newline at end of file +#entry-point = "./" + +# uncomment and adjust following if you are not using GitHub Actions +#[env.production] +#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] +#zone_id="xxx" +#route="xxx" From 47cfa4be3499018f5dfe4e38ac5ad1cfb27cf8ff Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:03:21 +0000 Subject: [PATCH 101/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 0315395..0d422e7 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 14:33:31 CET 2024 +Wed Feb 14 15:03:21 CET 2024 ``` --- From 1255ee458b860648dbb903a2857ba4daac64305d Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:11:36 +0100 Subject: [PATCH 102/123] --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 34e95e6..0deb0ec 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: with: node-version: '16' - run: yarn install - - run: yarn kv-gc + - run: npm run kv-gc - run: yarn build #- name: Publish #uses: cloudflare/wrangler-action@2.0.0 From 42e41dde05332fae2a7f6ac49eaedaa43ac37a20 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:12:47 +0000 Subject: [PATCH 103/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 0d422e7..cf2afed 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:03:21 CET 2024 +Wed Feb 14 15:12:47 CET 2024 ``` --- From 76e379a35a1607cac86473a120567afdeea4d4a8 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:18:30 +0100 Subject: [PATCH 104/123] --- .github/workflows/deploy.yml | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0deb0ec..4bff381 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: with: node-version: '16' - run: yarn install - - run: npm run kv-gc + - run: yarn kv - run: yarn build #- name: Publish #uses: cloudflare/wrangler-action@2.0.0 diff --git a/package.json b/package.json index 9398479..e4c0fd6 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv": "npm run dev", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, From cb2a26a4c9718fa865dfe5c338e8c922ed87915a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:19:41 +0000 Subject: [PATCH 105/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index cf2afed..317b090 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:12:47 CET 2024 +Wed Feb 14 15:19:41 CET 2024 ``` --- From 9ea8dcff8c06729d0e4e5b0437d28f95a39001d7 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:22:25 +0100 Subject: [PATCH 106/123] --- .github/workflows/deploy.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4bff381..aecc87f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: with: node-version: '16' - run: yarn install - - run: yarn kv + - run: npm run kv - run: yarn build #- name: Publish #uses: cloudflare/wrangler-action@2.0.0 diff --git a/package.json b/package.json index e4c0fd6..7dc0592 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", "kv-gc": "node ./src/cli/gcMonitors.mjs", - "kv": "npm run dev", + "kv": "npm run kv-gc", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, From 374e224c10edfb054d2ac99b7018d0f997f4b92e Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:23:33 +0000 Subject: [PATCH 107/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 317b090..90edd21 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:19:41 CET 2024 +Wed Feb 14 15:23:33 CET 2024 ``` --- From 36dacf89f8ba1ad311f23daade24b23ad28d7fbc Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:25:34 +0100 Subject: [PATCH 108/123] --- .github/workflows/deploy.yml | 2 +- config.yaml | 2 +- package.json | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aecc87f..34e95e6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: with: node-version: '16' - run: yarn install - - run: npm run kv + - run: yarn kv-gc - run: yarn build #- name: Publish #uses: cloudflare/wrangler-action@2.0.0 diff --git a/config.yaml b/config.yaml index a7bd428..f7ab20e 100644 --- a/config.yaml +++ b/config.yaml @@ -133,7 +133,7 @@ monitors: - id: radio-best name: best fm - description: 'mp3/128/https + description: 'mp3/128/https' url: 'https://stream3.bestfm.sk:8000/128.mp3' method: HEAD expectStatus: 302 diff --git a/package.json b/package.json index 7dc0592..9398479 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", "kv-gc": "node ./src/cli/gcMonitors.mjs", - "kv": "npm run kv-gc", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, From eb2d9ae6622f15f8fb46a978f808013d6ba3dbe8 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:26:40 +0000 Subject: [PATCH 109/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 90edd21..91a9152 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:23:33 CET 2024 +Wed Feb 14 15:26:40 CET 2024 ``` --- From 16328ed6b6d224fc5e7047a98732cead66fa425e Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:31:17 +0100 Subject: [PATCH 110/123] --- .github/workflows/deploy.yml | 30 ++++++++++++------------------ package.json | 20 ++++++++++---------- wrangler.toml | 17 +++++------------ 3 files changed, 27 insertions(+), 40 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 34e95e6..a582bbb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,34 +13,28 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '12' + - run: apt-fast update && apt-fast install -y jq - run: yarn install - - run: yarn kv-gc - run: yarn build - #- name: Publish - #uses: cloudflare/wrangler-action@2.0.0 - #with: - #apiToken: ${{ secrets.CF_API_TOKEN }} - #preCommands: | - #apt-get update && apt-get install -y jq - #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") - #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + - name: Publish + uses: cloudflare/wrangler-action@1.3.0 + with: + apiToken: ${{ secrets.CF_API_TOKEN }} + preCommands: | + export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") + postCommands: | - #postCommands: | - #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} - KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} - CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Timestamp shell: bash run: | diff --git a/package.json b/package.json index 9398479..8cf45c2 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.mjs", + "kv-gc": "node ./src/cli/gcMonitors.js", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^1.5.0", + "flareact": "^0.10.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { - "autoprefixer": "^10.4.14", - "node-fetch": "^3.3.1", - "postcss": "^8.4.23", - "postcss-cli": "^10.1.0", - "prettier": "^3.0.3", - "tailwindcss": "^3.3.2", + "autoprefixer": "^10.0.2", + "node-fetch": "^2.6.1", + "postcss": "^8.2.10", + "postcss-cli": "^8.3.0", + "prettier": "^2.2.0", + "tailwindcss": "^2.0.1", "yaml-loader": "^0.6.0" } } diff --git a/wrangler.toml b/wrangler.toml index a2178c6..927a101 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,22 +1,15 @@ name = "status" -compatibility_date = "2022-04-05" -#account_id = "" workers_dev = true -main = "./index.js" +account_id = "" +type = "webpack" +webpack_config = "node_modules/flareact/webpack" +compatibility_date = "2021-07-23" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] -[build] -command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -#entry-point = "./" - -# uncomment and adjust following if you are not using GitHub Actions -#[env.production] -#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] -#zone_id="xxx" -#route="xxx" +entry-point = "./" From 80cfccad17d0cc430e52a3b54941719d86c218c5 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:35:00 +0000 Subject: [PATCH 111/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 91a9152..66a73e2 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:26:40 CET 2024 +Wed Feb 14 15:35:00 CET 2024 ``` --- From 1cbab905d5cd2b0cb05803e8420d44a518bfd8e2 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:42:30 +0100 Subject: [PATCH 112/123] --- config.json | 4 ++-- config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.json b/config.json index e3f2e41..a64c617 100644 --- a/config.json +++ b/config.json @@ -147,8 +147,8 @@ { "id": "radio-best", "name": "best fm", - "description": "mp3/128/https", - "url": "https://stream3.bestfm.sk:8000/128.mp3", + "description": "radioserver/https", + "url": "https://stream3.bestfm.sk:8000", "method": "HEAD", "expectStatus": 302, "followRedirect": false, diff --git a/config.yaml b/config.yaml index f7ab20e..1609c46 100644 --- a/config.yaml +++ b/config.yaml @@ -133,8 +133,8 @@ monitors: - id: radio-best name: best fm - description: 'mp3/128/https' - url: 'https://stream3.bestfm.sk:8000/128.mp3' + description: 'radioserver/https' + url: 'https://stream3.bestfm.sk:8000' method: HEAD expectStatus: 302 followRedirect: false From 7f27343673cee1a13f7a1701cea8e39846186e59 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:44:35 +0000 Subject: [PATCH 113/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 66a73e2..5880c7f 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:35:00 CET 2024 +Wed Feb 14 15:44:35 CET 2024 ``` --- From 3c05ac451bf0bfcc63f3bd36ef160df511299a42 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 15:53:40 +0100 Subject: [PATCH 114/123] --- .github/workflows/deploy.yml | 30 ++++++++++++++++++------------ package.json | 20 ++++++++++---------- wrangler.toml | 17 ++++++++++++----- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a582bbb..34e95e6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,28 +13,34 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: '12' - - run: apt-fast update && apt-fast install -y jq + node-version: '16' - run: yarn install + - run: yarn kv-gc - run: yarn build - - name: Publish - uses: cloudflare/wrangler-action@1.3.0 - with: - apiToken: ${{ secrets.CF_API_TOKEN }} - preCommands: | - export KV_NAMESPACE_ID=$(npx @cloudflare/wrangler@1 kv:namespace list 2> >(tee stderr.log >&2) | head -1 | node -pe "JSON.parse(fs.readFileSync('/dev/stdin').toString()).find(kv => kv.title.includes('KV_STATUS_PAGE')).id") - postCommands: | + #- name: Publish + #uses: cloudflare/wrangler-action@2.0.0 + #with: + #apiToken: ${{ secrets.CF_API_TOKEN }} + #preCommands: | + #apt-get update && apt-get install -y jq + #export KV_NAMESPACE_ID=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("KV_STATUS_PAGE")))' | jq -r ".[0].id") + #namespace_id=$(wrangler kv:namespace list | jq -c 'map(select(.title | contains("__status-workers_sites_assets")))' | jq -r ".[0].id") + #postCommands: | + #yarn kv-gc env: CF_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} + KV_NAMESPACE_ID: ${{ secrets.KV_NAMESPACE_ID }} + CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }} timestamp: runs-on: ubuntu-latest needs: deploy steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Timestamp shell: bash run: | diff --git a/package.json b/package.json index 8cf45c2..9398479 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,24 @@ "dev": "flareact dev", "build": "yarn css && flareact build", "deploy": "yarn build && flareact publish", - "kv-gc": "node ./src/cli/gcMonitors.js", + "kv-gc": "node ./src/cli/gcMonitors.mjs", "format": "prettier --write '**/*.{js,css,json,md}'", "css": "postcss public/tailwind.css -o public/style.css" }, "dependencies": { - "flareact": "^0.10.0", + "flareact": "^1.5.0", "laco": "^1.2.1", "laco-react": "^1.1.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "devDependencies": { - "autoprefixer": "^10.0.2", - "node-fetch": "^2.6.1", - "postcss": "^8.2.10", - "postcss-cli": "^8.3.0", - "prettier": "^2.2.0", - "tailwindcss": "^2.0.1", + "autoprefixer": "^10.4.14", + "node-fetch": "^3.3.1", + "postcss": "^8.4.23", + "postcss-cli": "^10.1.0", + "prettier": "^3.0.3", + "tailwindcss": "^3.3.2", "yaml-loader": "^0.6.0" } } diff --git a/wrangler.toml b/wrangler.toml index 927a101..a2178c6 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,15 +1,22 @@ name = "status" +compatibility_date = "2022-04-05" +#account_id = "" workers_dev = true -account_id = "" -type = "webpack" -webpack_config = "node_modules/flareact/webpack" -compatibility_date = "2021-07-23" +main = "./index.js" kv_namespaces = [{binding="KV_STATUS_PAGE", id="f0d41ec3d6f545188d33f201fd6680a7", preview_id="f0d41ec3d6f545188d33f201fd6680a7"}] +[build] +command = "npm run build" [triggers] crons = ["*/10 * * * *"] [site] bucket = "out" -entry-point = "./" +#entry-point = "./" + +# uncomment and adjust following if you are not using GitHub Actions +#[env.production] +#kv-namespaces = [{binding="KV_STATUS_PAGE", id="xxxx", preview_id=""}] +#zone_id="xxx" +#route="xxx" From 5a5e84d42aca14cdd3da6131c98fe0f681da9d5b Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 14 Feb 2024 14:54:53 +0000 Subject: [PATCH 115/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 5880c7f..f862d20 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:44:35 CET 2024 +Wed Feb 14 15:54:53 CET 2024 ``` --- From 2418508cded88936b7fb3855533b39104d9bf365 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 1 Mar 2024 00:32:22 +0000 Subject: [PATCH 116/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index f862d20..40ad8ad 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed Feb 14 15:54:53 CET 2024 +Fri Mar 1 01:32:22 CET 2024 ``` --- From 2c8fb6b38b3c7089227d2c66696caff90798bd41 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Mon, 1 Apr 2024 00:32:41 +0000 Subject: [PATCH 117/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 40ad8ad..860785d 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Mar 1 01:32:22 CET 2024 +Mon Apr 1 02:32:41 CEST 2024 ``` --- From 1751e12b03c4ac8a0d08390d60fc595c0a5544a8 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Wed, 1 May 2024 00:32:20 +0000 Subject: [PATCH 118/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 860785d..9635b9c 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Mon Apr 1 02:32:41 CEST 2024 +Wed May 1 02:32:20 CEST 2024 ``` --- From 888e2aaff2643fbad909fa431ac6962cc66ccf9c Mon Sep 17 00:00:00 2001 From: milankomaj Date: Sat, 1 Jun 2024 00:33:33 +0000 Subject: [PATCH 119/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 9635b9c..7dcc657 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Wed May 1 02:32:20 CEST 2024 +Sat Jun 1 02:33:33 CEST 2024 ``` --- From ed3f2ed207be9b8868e13361c581f8ade1d04ec2 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 5 Jul 2024 09:46:32 +0000 Subject: [PATCH 120/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 7dcc657..58e7fb8 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Sat Jun 1 02:33:33 CEST 2024 +Fri Jul 5 11:46:32 CEST 2024 ``` --- From 2b448c7f5da2c86abe19ad6034fef391b8c1aaa3 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 1 Aug 2024 00:44:41 +0000 Subject: [PATCH 121/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 58e7fb8..e4ec3c3 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Fri Jul 5 11:46:32 CEST 2024 +Thu Aug 1 02:44:41 CEST 2024 ``` --- From 88d7dcf927b7426cb8b759b8a0344cef8a00cf5a Mon Sep 17 00:00:00 2001 From: milankomaj Date: Fri, 2 Aug 2024 01:18:54 +0200 Subject: [PATCH 122/123] Update dependabot.yml --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f9c3dc1..560c7e5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,17 +7,17 @@ version: 2 updates: - package-ecosystem: "npm" # See documentation for possible values directory: "/" # Location of package manifests - open-pull-requests-limit: 10 schedule: interval: "weekly" day: "friday" time: "11:00" + open-pull-requests-limit: 10 # Set update schedule for GitHub Actions - package-ecosystem: "github-actions" - open-pull-requests-limit: 10 directory: "/" schedule: interval: "weekly" day: "saturday" time: "11:00" + open-pull-requests-limit: 10 From b347097dcc794becd87c16198fbb37124be24932 Mon Sep 17 00:00:00 2001 From: milankomaj Date: Thu, 1 Aug 2024 23:19:43 +0000 Subject: [PATCH 123/123] timestamp --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index e4ec3c3..260b711 100644 --- a/.github/README.md +++ b/.github/README.md @@ -8,7 +8,7 @@ Cloudflare Worker - Status Page - ##### [![CodeQL](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/codeql-analysis.yml) [![Deploy](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml/badge.svg)](https://github.com/milankomaj/status-page/actions/workflows/deploy.yml) ``` -Thu Aug 1 02:44:41 CEST 2024 +Fri Aug 2 01:19:43 CEST 2024 ``` ---