Add view counter

apps/timsexperiments/.env.local

@@ -1 +1,2 @@
-PUBLIC_VIEW_COUNTER_API=http://localhost:8787/views
+# PUBLIC_VIEW_COUNTER_API=http://localhost:8787/views
+PUBLIC_VIEW_COUNTER_API=https://dev.views.timsexperiments.foo/

apps/timsexperiments/package.json

@@ -27,7 +27,7 @@
     "@radix-ui/react-slot": "^1.0.2",
     "@radix-ui/react-toast": "^1.1.5",
     "@timsexperiments/theme": "^0.0.0",
-    "@timsexperiments/three-rubiks-cube": "^0.0.3",
+    "@timsexperiments/three-rubiks-cube": "^0.0.5",
     "@timsexperiments/views-client": "workspace:*",
     "@types/hast": "^3.0.4",
     "@types/react": "^18.2.47",

apps/timsexperiments/src/components/nav/Nav.astro

@@ -51,4 +51,4 @@ import { Home, Compass, FlaskConical, Mail, UserRoundPlus } from 'lucide-react';
   }
 </style>
 
-<script src="./nav.ts"></script>
+<script src="@/scripts/nav.ts"></script>

apps/timsexperiments/src/env.d.ts

@@ -1,3 +1,11 @@
 /// <reference path="../.astro/db-types.d.ts" />
 /// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
+
+interface ImportMetaEnv {
+  readonly PUBLIC_VIEW_COUNTER_API: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}

apps/timsexperiments/src/components/nav/nav.ts → apps/timsexperiments/src/scripts/nav.ts

@@ -36,11 +36,6 @@ const observer = new IntersectionObserver(
       if (entry.isIntersecting && !anyIntersecting) {
         anyIntersecting = true;
         navigator.classList.add('active');
-        console.log(
-          'scrolling the navigator for',
-          entry.target.id,
-          'into view'
-        );
         navigator.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
       } else {
         navigator.classList.remove('active');

apps/view-counter/src/index.ts

@@ -4,9 +4,9 @@ import { ViewsHandler } from './views';
 /**
  * Welcome to Cloudflare Workers! This is your first worker.
  *
- * - Run `bun run dev` in your terminal to start a development server
+ * - Run `pnpm run dev` in your terminal to start a development server
  * - Open a browser tab at http://localhost:8787/ to see your worker in action
- * - Run `bun run deploy` to publish your worker
+ * - Run `pnpm run deploy` to publish your worker
  *
  * Learn more at https://developers.cloudflare.com/workers/
  */

apps/view-counter/src/views/index.ts

@@ -12,7 +12,6 @@ export class ViewsHandler implements RouteHandler {
 		env: Env,
 		baseHeaders: Record<string, string>,
 	) {
-		console.log(env.TURSO_AUTH_TOKEN);
 		const db = createDb({
 			url: env.TURSO_URL,
 			authToken: env.TURSO_AUTH_TOKEN,
@@ -66,8 +65,15 @@ export class ViewsHandler implements RouteHandler {
 
 	private async POST(): Promise<Response> {
 		const clientIP = this.request.headers.get('CF-Connecting-IP')!;
-		const view = (await this.request.json()) as Omit<View, 'ipAddress'>;
-		await this.db.add({ ipAddress: clientIP, ...view });
+		const view = (await this.request.json()) as Omit<View, 'ipAddress' | 'path'>;
+		const { page, ...rest } = view;
+		let pageUrl: URL;
+		try {
+			pageUrl = new URL(page);
+		} catch {
+			return badRequestResponse({ message: 'Page must be a valid fully qualified URL.', headers: this.baseHeaders });
+		}
+		await this.db.add({ ipAddress: clientIP, ...rest, page: pageUrl.href, path: pageUrl.pathname });
 		return responseNoContent({ headers: this.baseHeaders });
 	}
 }

packages/view-storage/package.json

@@ -3,16 +3,16 @@
   "module": "src/index.ts",
   "types": "src/index.ts",
   "type": "module",
+  "dependencies": {
+    "@libsql/client": "^0.6.0",
+    "drizzle-orm": "^0.30.8"
+  },
   "devDependencies": {
     "@types/bun": "latest",
     "dotenv": "^16.4.5",
     "drizzle-kit": "^0.20.17"
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
-  },
-  "dependencies": {
-    "@libsql/client": "^0.6.0",
-    "drizzle-orm": "^0.30.8"
   }
 }

packages/view-storage/src/client.ts

@@ -2,14 +2,14 @@ import { createClient } from "@libsql/client";
 import { drizzle } from "drizzle-orm/libsql";
 
 export type CreateDbOptions = {
+  authToken: string;
   url: string;
-  authToken?: string;
 };
 
-export function createDb({ url, authToken }: CreateDbOptions) {
+export function createDb({ authToken, url }: CreateDbOptions) {
   const client = createClient({
-    url,
     authToken,
+    url,
   });
   return drizzle(client);
 }

packages/view-storage/src/schema.ts

@@ -13,6 +13,7 @@ export const views = sqliteTable(
   {
     id: integer("id").primaryKey(),
     page: text("page", { length: 256 }).notNull(),
+    path: text("path", { length: 256 }).notNull(),
     ipAddress: text("ip_address", { length: 40 }).notNull(),
     viewedAt: integer("viewed_at", { mode: "timestamp_ms" })
       .default(sql`CURRENT_TIMESTAMP`)

packages/views-client/package.json

@@ -9,5 +9,8 @@
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
+  },
+  "dependencies": {
+    "valibot": "^0.32.0"
   }
 }

packages/views-client/src/index.ts

@@ -1,24 +1,39 @@
 import { type View } from "@timsexperiments/view-storage";
+import * as v from "valibot";
 
-export type GetViewsOptions = {
-  page: string;
-};
+const GetViewsSchema = v.object({
+  page: v.pipe(v.string(), v.url()),
+});
 
-export type AddViewOpitons = {
-  page: string;
-};
+export type GetViewsOptions = v.InferOutput<typeof GetViewsSchema>;
 
-export type ViewsClientOptions = {
-  host: string;
-};
+const AddViewSchema = v.object({
+  page: v.pipe(v.string(), v.url()),
+});
+
+export type AddViewOpitons = v.InferOutput<typeof AddViewSchema>;
+
+const ViewsClientOptionsSchema = v.object({
+  host: v.pipe(v.string(), v.url()),
+});
+
+export type ViewsClientOptions = v.InferOutput<typeof ViewsClientOptionsSchema>;
 
 /**
  * Client for interacting with the timsexperiments views api.
  */
 export class ViewsClient {
   private readonly url;
 
-  constructor({ host }: ViewsClientOptions) {
+  constructor(options: ViewsClientOptions) {
+    const parsed = v.safeParse(ViewsClientOptionsSchema, options);
+    if (!parsed.success) {
+      throw new ViewClientError(
+        "Invalid options provided: " + JSON.stringify(parsed.issues)
+      );
+    }
+
+    const { host } = parsed.output;
     this.url = new URL(host);
   }
 
@@ -29,7 +44,14 @@ export class ViewsClient {
    * @param {string} options.page - The page for which to retrieve views.
    * @returns {Promise<View>} - A promise that resolves to the retrieved views.
    */
-  async getViews({ page }: GetViewsOptions) {
+  async getViews(options: GetViewsOptions) {
+    const parsed = v.safeParse(GetViewsSchema, options);
+    if (!parsed.success) {
+      throw new ViewClientError(
+        "Invalid options provided: " + JSON.stringify(parsed.issues)
+      );
+    }
+    const { page } = parsed.output;
     const url = this.viewsUrl;
     url.searchParams.append("page", page);
     const response = await fetch(url.href);
@@ -43,12 +65,20 @@ export class ViewsClient {
    * @param {string} options.page - The page for which to add a view.
    * @returns {Promise<void>} - A promise that resolves when the view is added successfully.
    */
-  async addView({ page }: AddViewOpitons) {
+  async addView(options: AddViewOpitons) {
+    const parsed = v.safeParse(AddViewSchema, options);
+    if (!parsed.success) {
+      throw new ViewClientError(
+        "Invalid options provided: " + JSON.stringify(parsed.issues)
+      );
+    }
+    const { page } = parsed.output;
+    const pageUrl = new URL(page);
     const url = this.viewsUrl;
     await fetch(url.href, {
       method: "POST",
       body: JSON.stringify({
-        page,
+        page: pageUrl.href,
       }),
       headers: {
         "Content-Type": "application/json",
@@ -64,3 +94,10 @@ export class ViewsClient {
 }
 
 export default ViewsClient;
+
+export class ViewClientError extends Error {
+  constructor(message: string, options?: ErrorOptions) {
+    super(message, options);
+    this.name = "ViewClientError";
+  }
+}