.forgejo/workflows/build.yaml

@@ -39,7 +39,6 @@ jobs:
           submodules: recursive
       - uses: actions/setup-node@v4
         with:
-          token: ${{ secrets.GH_TOKEN }}
           node-version: lts/*
           cache: yarn
           cache-dependency-path: '**/yarn.lock'
@@ -50,6 +49,9 @@ jobs:
             ~/node_modules
             ~/.cache/ms-playwright
           key: ${{ runner.os }}-pio-playwright-${{ hashFiles('**/yarn.lock') }}
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '>=3.10'
       - name: Get current date
         id: dateAndTime
         run: echo "dateAndTime=$(date +'%Y-%m-%d-%H:%M')" >> $GITHUB_OUTPUT
@@ -118,7 +120,7 @@ jobs:
             output/littlefs.bin
       - name: Create release
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: https://code.forgejo.org/actions/forgejo-release@v2.5.3
+        uses: https://code.forgejo.org/actions/forgejo-release@v2.5.1
         with:
           url: 'https://git.btclock.dev/'
           repo: '${{ github.repository }}'

package.json

@@ -69,5 +69,6 @@
 		"es5-ext": ">=0.10.64",
 		"ws": ">=8.18.0",
 		"micromatch": ">=4.0.8"
-	}
+	},
+	"packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

patches/@sveltejs+kit+2.15.0+001+initial.patch

@@ -1,17 +1,30 @@
 diff --git a/node_modules/@sveltejs/kit/src/exports/vite/index.js b/node_modules/@sveltejs/kit/src/exports/vite/index.js
-index ddbe746..1d926a4 100644
+index 21bc3d4..eef2db3 100644
 --- a/node_modules/@sveltejs/kit/src/exports/vite/index.js
 +++ b/node_modules/@sveltejs/kit/src/exports/vite/index.js
-@@ -658,9 +658,9 @@ async function kit({ svelte_config }) {
+@@ -648,9 +648,9 @@ async function kit({ svelte_config }) {
  							output: {
  								format: inline ? 'iife' : 'esm',
  								name: `__sveltekit_${version_hash}.app`,
 -								entryFileNames: ssr ? '[name].js' : `${prefix}/[name].[hash].${ext}`,
--								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[hash].${ext}`,
+-								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[name].[hash].${ext}`,
 -								assetFileNames: `${prefix}/assets/[name].[hash][extname]`,
 +								entryFileNames: ssr ? '[name].js' : `${prefix}/[hash].${ext}`,
-+								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/c[hash].${ext}`,
-+								assetFileNames: `${prefix}/a[hash][extname]`,
++								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[hash].${ext}`,
++								assetFileNames: `${prefix}/assets/[hash][extname]`,
  								hoistTransitiveImports: false,
  								sourcemapIgnoreList,
  								manualChunks: split ? undefined : () => 'bundle',
+@@ -665,9 +665,9 @@ async function kit({ svelte_config }) {
+ 					worker: {
+ 						rollupOptions: {
+ 							output: {
+-								entryFileNames: `${prefix}/workers/[name]-[hash].js`,
+-								chunkFileNames: `${prefix}/workers/chunks/[name]-[hash].js`,
+-								assetFileNames: `${prefix}/workers/assets/[name]-[hash][extname]`,
++								entryFileNames: `${prefix}/workers/[hash].js`,
++								chunkFileNames: `${prefix}/workers/chunks/[hash].js`,
++								assetFileNames: `${prefix}/workers/assets/[hash][extname]`,
+ 								hoistTransitiveImports: false
+ 							}
+ 						}

src/lib/components/settings/DisplaySettings.svelte

@@ -115,7 +115,7 @@
 				max={4095}
 				step={1}
 				size={$uiSettings.inputSize}
-				onChange={onFlBrightnessChange}
+				on:change={onFlBrightnessChange}
 			/>
 
 			<SettingsInput
@@ -190,7 +190,6 @@
 					size={$uiSettings.inputSize}
 				/>
 
-				{#if $settings.hasLightLevel}
 				<SettingsSwitch
 					id="flOffWhenDark"
 					bind:checked={$settings.flOffWhenDark}
@@ -198,7 +197,6 @@
 					size={$uiSettings.inputSize}
 				/>
 			{/if}
-			{/if}
 		</Row>
 	</ToggleHeader>
 </Row>

src/lib/components/settings/ExtraFeaturesSettings.svelte

@@ -13,7 +13,6 @@
 	export let miningPoolMap: Map<string, string>;
 
 	let validBitaxe = false;
-	let validLocalPool = false;
 	const testBitaxe = async () => {
 		try {
 			const response = await fetch(`http://${$settings.bitaxeHostname}/api/system/info`);
@@ -62,49 +61,6 @@
 		miningPoolMap.get(pool) || pool,
 		pool
 	]);
-
-	const testLocalPool = async () => {
-		try {
-			const controller = new AbortController();
-			const timeoutId = setTimeout(() => controller.abort(), 1000);
-
-			const response = await fetch(
-				`http://${$settings.localPoolEndpoint}/api/client/${$settings.miningPoolUser}`,
-				{ signal: controller.signal }
-			);
-			clearTimeout(timeoutId);
-
-			if (!response.ok) {
-				dispatch('showToast', {
-					color: 'danger',
-					text: `Failed to connect to local pool! status: ${response.status}`
-				});
-				validLocalPool = false;
-				throw new Error();
-			}
-
-			const poolInfo = await response.json();
-			dispatch('showToast', {
-				color: 'success',
-				text: `Can connect to local public pool, ${poolInfo.workersCount} workers`
-			});
-			validLocalPool = true;
-		} catch (error) {
-			if (error.name === 'AbortError') {
-				dispatch('showToast', {
-					color: 'danger',
-					text: `Connection to local pool timed out after 1 second`
-				});
-			} else {
-				dispatch('showToast', {
-					color: 'danger',
-					text: `Failed to connect to local pool, check the endpoint and make sure you are connected to the same network.`
-				});
-			}
-			console.error('Failed to fetch local pool info:', error);
-			validLocalPool = false;
-		}
-	};
 </script>
 
 <Row>
@@ -222,21 +178,6 @@
 							size={$uiSettings.inputSize}
 							selectClass={$uiSettings.selectClass}
 						/>
-						{#if $settings.miningPoolName === 'local_public_pool'}
-							<SettingsInput
-								id="localPoolEndpoint"
-								label={$_('section.settings.localPoolEndpoint', { default: 'Local Pool Endpoint' })}
-								bind:value={$settings.localPoolEndpoint}
-								placeholder="umbrel.local:2019"
-								required={true}
-								valid={validLocalPool}
-								size={$uiSettings.inputSize}
-							>
-								<Button type="button" color="success" on:click={testLocalPool}>
-									{$_('test', { default: 'Test' })}
-								</Button>
-							</SettingsInput>
-						{/if}
 						<SettingsInput
 							id="miningPoolUser"
 							label={$_('section.settings.miningPoolUser')}

src/lib/components/settings/ScreenSpecificSettings.svelte

@@ -4,7 +4,6 @@
 	import { Row, Col } from '@sveltestrap/sveltestrap';
 	import ToggleHeader from '../ToggleHeader.svelte';
 	import { uiSettings } from '$lib/uiSettings';
-	import { DataSourceType } from '$lib/types/dataSource';
 
 	export let settings;
 	export let isOpen = false;
@@ -100,7 +99,7 @@
 				{/each}
 			{/if}
 		</Row>
-		{#if $settings.actCurrencies && $settings.dataSource == DataSourceType.BTCLOCK_SOURCE}
+		{#if $settings.actCurrencies && $settings.useNostr !== true}
 			<Row>
 				<h5>{$_('section.settings.currencies')}</h5>
 				<small>{$_('restartRequired')}</small>

src/routes/Settings.svelte

@@ -30,8 +30,7 @@
 		['public_pool', 'public-pool.io'],
 		['gobrrr_pool', 'Go Brrr pool'],
 		['ckpool', 'CKPool'],
-		['eu_ckpool', 'EU CKPool'],
-		['local_public_pool', 'Public Pool (local)']
+		['eu_ckpool', 'EU CKPool']
 	]);
 
 	const dispatch = createEventDispatcher();

tests/shared.ts

@@ -1,38 +1,3 @@
-interface Page {
-	route: (url: string, handler: (route: Route) => Promise<void>) => Promise<void>;
-}
-
-interface Route {
-	fulfill: (response: {
-		json?: typeof statusJson | typeof settingsJson | typeof latestReleaseFake;
-		status?: number;
-		headers?: Record<string, string>;
-		body?: ReadableStream;
-	}) => Promise<void>;
-}
-
-export const fetchLatestBlockHeight = async () => {
-	const response = await fetch('https://ws.btclock.dev/api/lastblock');
-	const blockHeight = await response.text();
-	return ['BLOCK/HEIGHT', ...blockHeight.trim().split('')];
-};
-
-export const fetchLatestRelease = async () => {
-	try {
-		const response = await fetch(
-			'https://git.btclock.dev/api/v1/repos/btclock/btclock_v3/releases/latest'
-		);
-		if (!response.ok) throw new Error('Failed to fetch latest release');
-		const data = await response.json();
-		settingsJson.gitTag = data.tag_name;
-		return data;
-	} catch (error) {
-		console.warn('Failed to fetch latest release, using fallback:', error);
-		settingsJson.gitTag = latestReleaseFake.tag_name;
-		return latestReleaseFake;
-	}
-};
-
 export const statusJson = {
 	currentScreen: 20,
 	numScreens: 7,
@@ -48,7 +13,7 @@ export const statusJson = {
 		nostr: true
 	},
 	rssi: -66,
-	data: ['BLOCK/HEIGHT', '0', '0', '0', '0', '0', '0'],
+	data: ['BLOCK/HEIGHT', '8', '7', '6', '5', '4', '3'],
 	currency: 'USD',
 	leds: [
 		{ red: 0, green: 0, blue: 0, hex: '#000000' },
@@ -90,7 +55,7 @@ export const settingsJson = {
 	ip: '192.168.20.231',
 	txPower: 78,
 	gitRev: '25d8b92bcbc8938417c140355ea3ba99ff9eb4b7',
-	gitTag: '3.2.27',
+	gitTag: '3.2.23',
 	bitaxeEnabled: false,
 	bitaxeHostname: 'bitaxe1',
 	miningPoolStats: false,
@@ -188,11 +153,7 @@ export const latestReleaseFake = {
 	}
 };
 
-export const initMock = async ({ page }: { page: Page }) => {
-	// Update status with latest block height
-	statusJson.data = await fetchLatestBlockHeight();
-	const latestRelease = await fetchLatestRelease();
-
+export const initMock = async ({ page }) => {
 	await page.route('*/**/api/status', async (route) => {
 		await route.fulfill({ json: statusJson });
 	});
@@ -252,6 +213,6 @@ export const initMock = async ({ page }: { page: Page }) => {
 	});
 
 	await page.route('**/api/v1/repos/btclock/btclock_v3/releases/latest', async (route) => {
-		await route.fulfill({ json: latestRelease });
+		await route.fulfill({ json: latestReleaseFake });
 	});
 };