Merge pull request #10 from bchainhub/update/contrib-10

Fixed types

Author: rastislavcore

package.json

@@ -50,7 +50,7 @@
 		"@sveltejs/vite-plugin-svelte": "^3.1.2",
 		"@types/eslint": "^9.6.1",
 		"@types/node": "^20",
-		"eslint": "^9.9.1",
+		"eslint": "^9.10.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-svelte": "^2.43.0",
 		"globals": "^15.9.0",
@@ -79,6 +79,7 @@
 		"payto-rl": "^1.0.1",
 		"postcss": "^8.4.45",
 		"tailwindcss": "^3.4.10",
+		"txms.js": "^1.3.1",
 		"uuid": "^10.0.0"
 	}
 }

src/app.d.ts

@@ -1,4 +1,6 @@
-import type { D1Database, KVNamespace, R2Bucket } from '@cloudflare/workers-types';
+type D1Database = import('@cloudflare/workers-types').D1Database;
+type KVNamespace = import('@cloudflare/workers-types').KVNamespace;
+type R2Bucket = import('@cloudflare/workers-types').R2Bucket;
 
 interface Config {
 	title: string;
@@ -56,6 +58,24 @@ type MenuItem = NavbarItem & {
 	action?: () => void;
 };
 
+interface User {
+	name?: string | null;
+	email?: string | null;
+	image?: string | null;
+	id?: string | null;      // Optional user ID (can be from OAuth provider or internal)
+	role?: string | null;     // Optional role for authorization
+	[key: string]: any;       // Allow other properties as needed for flexibility
+}
+
+// Define the session type to include user and session-specific properties
+interface Session {
+	user?: User | null;       // User information associated with the session
+	expires: string;          // Expiration date as an ISO string
+	accessToken?: string;     // Optional access token for OAuth/JWT providers
+	refreshToken?: string;    // Optional refresh token for OAuth/JWT providers
+	[key: string]: any;       // Allow extensions for future changes or addons
+}
+
 declare namespace App {
 	interface Locals {
 		db?: D1Database;
@@ -69,7 +89,8 @@ declare namespace App {
 	}
 
 	interface PageData {
-		config: Config;
+		session: Session | null;
+		config?: Config;
 	}
 
 	interface Platform {
@@ -80,17 +101,7 @@ declare namespace App {
 		env?: Env;
 		// Cloudflare-specific properties
 		cf?: {
-			asn?: string;               // Autonomous System Number
-			asOrganization?: string;    // Organization name of ASN
-			city?: string;              // City of the request origin
-			continent?: string;         // Continent of the request origin
-			country?: string;           // Country code (ISO 3166-1 Alpha 2)
-			latitude?: string;          // Latitude of the request origin
-			longitude?: string;         // Longitude of the request origin
-			postalCode?: string;        // Postal code of the request origin
-			region?: string;            // Region name
-			regionCode?: string;        // Region code
-			timezone?: string;          // Timezone of the request origin
+			[key: string]: string | undefined;
 		};
 	}
 }

src/lib/components/Header.svelte

@@ -22,7 +22,6 @@
 	];
 
 	const handleSelect = (event: CustomEvent<{ label: string; action: () => void; }>) => {
-		console.log(`Selected item: ${event.detail.label}`);
 		event.detail.action();
 	};
 
@@ -46,7 +45,7 @@
 	};
 
 	const rotateTheme = () => {
-		let prefersDark = defaultMode;
+		let prefersDark = defaultMode === 'dark' ? true : false;
 		if (typeof window !== 'undefined') {
 			prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
 		}
@@ -87,11 +86,11 @@
 				const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
 				document.documentElement.setAttribute('data-theme', prefersDark ? 'dark' : 'light');
 			} else {
-				document.documentElement.setAttribute('data-theme', theme);
+				document.documentElement.setAttribute('data-theme', theme ?? '');
 			}
-			localStorage.setItem('theme', theme);
+			localStorage.setItem('theme', theme ?? '');
 		} else {
-			localStorage.setItem('theme', theme);
+			localStorage.setItem('theme', theme ?? '');
 		}
 	};
 

src/lib/helpers/db.ts

@@ -2,21 +2,14 @@ import { env } from '$env/dynamic/private';
 import type { D1Database } from '@cloudflare/workers-types';
 import type { RequestEvent } from '@sveltejs/kit';
 
-interface ExtendedPlatform extends Readonly<App.Platform> {
-	env: {
-		[key: string]: D1Database;
-	};
-}
-
 /**
  * Retrieves and validates the database instance from the RequestEvent object.
  * @param event - The RequestEvent object provided by SvelteKit.
  * @returns The database instance.
  * @throws Will throw an error if the database name is not defined or the database instance is not found.
  */
 export function getDatabaseInstance(event: RequestEvent): D1Database {
-	const platform = event.platform as ExtendedPlatform;
-	if (!platform) {
+	if (!event.platform) {
 		throw new Error("Platform is undefined.");
 	}
 
@@ -25,7 +18,7 @@ export function getDatabaseInstance(event: RequestEvent): D1Database {
 		throw new Error("Database name not defined.");
 	}
 
-	const db = platform.env[dbName] as D1Database | undefined;
+	const db = (event.platform?.env as Record<string, D1Database | undefined>)?.[dbName];
 
 	if (!db) {
 		throw new Error("Database not found.");

src/lib/helpers/kv.ts

@@ -2,21 +2,14 @@ import { env } from '$env/dynamic/private';
 import type { KVNamespace } from '@cloudflare/workers-types';
 import type { RequestEvent } from '@sveltejs/kit';
 
-interface ExtendedPlatform extends Readonly<App.Platform> {
-	env: {
-		[key: string]: KVNamespace;
-	};
-}
-
 /**
  * Retrieves and validates the KV namespace instance from the RequestEvent object.
  * @param event - The RequestEvent object provided by SvelteKit.
  * @returns The KV namespace instance.
  * @throws Will throw an error if the KV namespace is not defined or not found.
  */
 export function getKVNamespace(event: RequestEvent): KVNamespace {
-	const platform = event.platform as ExtendedPlatform;
-	if (!platform) {
+	if (!event.platform) {
 		throw new Error("Platform is undefined.");
 	}
 
@@ -25,7 +18,7 @@ export function getKVNamespace(event: RequestEvent): KVNamespace {
 		throw new Error("KV namespace name not defined.");
 	}
 
-	const kv = platform.env[kvName] as KVNamespace | undefined;
+	const kv = (event.platform?.env as Record<string, KVNamespace | undefined>)?.[kvName];
 
 	if (!kv) {
 		throw new Error("KV namespace not found.");

src/lib/helpers/r2.ts

@@ -2,21 +2,14 @@ import { env } from '$env/dynamic/private';
 import type { R2Bucket } from '@cloudflare/workers-types';
 import type { RequestEvent } from '@sveltejs/kit';
 
-interface ExtendedPlatform extends Readonly<App.Platform> {
-	env: {
-		[key: string]: R2Bucket;
-	};
-}
-
 /**
  * Retrieves and validates the R2 bucket instance from the RequestEvent object.
  * @param event - The RequestEvent object provided by SvelteKit.
  * @returns The R2 bucket instance.
  * @throws Will throw an error if the R2 bucket binding is not defined or not found.
  */
 export function getR2Bucket(event: RequestEvent): R2Bucket {
-	const platform = event.platform as ExtendedPlatform;
-	if (!platform) {
+	if (!event.platform) {
 		throw new Error("Platform is undefined.");
 	}
 
@@ -28,7 +21,7 @@ export function getR2Bucket(event: RequestEvent): R2Bucket {
 		throw new Error("R2 bucket name not defined.");
 	}
 
-	const bucket = platform.env[bucketName] as R2Bucket | undefined;
+	const bucket = (event.platform?.env as Record<string, R2Bucket | undefined>)?.[bucketName];
 
 	if (!bucket) {
 		throw new Error("R2 bucket not found.");

src/routes/+page.svelte

@@ -21,6 +21,7 @@
 		<li><a href="https://github.com/bchainhub/ican.js" target="_blank" rel="noopener noreferrer">ICAN / IBAN Validation</a></li>
 		<li><a href="https://github.com/bchainhub/exchange-rounding" target="_blank" rel="noopener noreferrer">Exchange Number Format</a></li>
 		<li><a href="https://github.com/bchainhub/payto-rl" target="_blank" rel="noopener noreferrer">PayTo resource locators</a></li>
+		<li><a href="https://txms.info" target="_blank" rel="noopener noreferrer">TxMS - 0G connectivity for transaction transmission</a></li>
 		<li><a href="https://github.com/uuidjs/uuid" target="_blank" rel="noopener noreferrer">UUID</a></li>
 	</ul>
 </div>

src/routes/db/init/+server.ts

@@ -18,7 +18,7 @@ export const GET: RequestHandler = async ({ platform, locals }) => {
 		await up(locals.db);
 
 		// Additional fields for the Authenticator table
-		await locals.db.prepare(`
+		await locals.db?.prepare(`
 			CREATE TABLE IF NOT EXISTS "Authenticator" (
 				"id" TEXT NOT NULL PRIMARY KEY,
 				"credentialID" TEXT NOT NULL,
@@ -34,15 +34,15 @@ export const GET: RequestHandler = async ({ platform, locals }) => {
 		`).run();
 
 		// Index for the credentialID field
-		await locals.db.prepare(`
+		await locals.db?.prepare(`
 			CREATE UNIQUE INDEX IF NOT EXISTS "Authenticator_credentialID_key" ON "Authenticator"("credentialID");
 		`).run();
 
 		// Additional fields for the User table:
 		// coreId - The Core ID of the user (free item)
 		// isActive - Whether the user Core ID is updated (user is activated)
 		// isVerified - Whether the user Core ID is KYC verified (free item)
-		await locals.db.prepare(`
+		await locals.db?.prepare(`
 			ALTER TABLE users ADD COLUMN coreId CHAR(44);
 			CREATE INDEX idx_coreid ON users (coreId);
 			ALTER TABLE users ADD COLUMN isActive BOOLEAN DEFAULT 0;

src/site.config.ts

@@ -1,4 +1,3 @@
-import type { Config } from './app';
 export const config: Config = {
 	title: "MOTA",
 	url: "http://localhost:3000",
@@ -109,7 +108,6 @@ export const config: Config = {
 		metadata: [
 			{ name: "viewport", content: "width=device-width, initial-scale=1.0" },
 			{ name: "theme-color", content: "#25c19f" },
-			{ name: "apple-mobile-web-app-capable", content: "yes" },
 			{ name: "description", content: "This is SvetleKit Boilerplate website" },
 			{ name: "keywords", content: "website, sveltekit, vite, cloudflare" },
 			{ property: "og:type", content: "website" }