Update dependencies and change goose joke generator to work with D1 (#63)

* Update .gitignore

* Update all wranglers

* Update cloudflare workers types

* Update goose-joke-generator to work with D1

* Remove jsnation hashtag

* Update examples README description of goose-joke-generator

Author: brettimus

.gitignore

@@ -6,6 +6,15 @@ templates/**/package-lock.json
 # Ignore package-lock.json files in examples
 examples/**/package-lock.json
 
+# Ignore .wrangler folder in examples
+examples/**/.wrangler
+
+# Ignore .dev.vars files in examples
+examples/**/.dev.vars
+
+# Ignore .prod.vars files in examples
+examples/**/.prod.vars
+
 # Ignore test apps
 cli/test-apps/**
 !cli/test-apps/.gitkeep
@@ -14,4 +23,7 @@ cli/test-apps/**
 .DS_Store
 
 # Ignore VSCode settings
-.vscode/
+.vscode/
+
+# script for removing nodemodules
+remove_node_modules.sh

examples/README.md

@@ -87,7 +87,7 @@ A GitHub PR review bot that provides "goosey" code reviews using Claude. Built w
 </details>
 
 ### 😄 [Goose Joke Generator](./goose-joke-generator)
-A web app that generates (terrible) goose-themed jokes using Cloudflare AI. Stores jokes in a Neon Postgres database and includes rate limiting functionality.
+A web app that generates (terrible) goose-themed jokes using Cloudflare AI. Stores jokes in a D1 sqlite database and includes rate limiting functionality.
 
 - See it live: https://goose-jokes.fp.dev
 

examples/cf-retrieval-augmented-goose/package.json

@@ -26,14 +26,14 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20241205.0",
+    "@cloudflare/workers-types": "^4.20250321.0",
     "@fiberplane/hono-otel": "^0.6.2",
     "@types/node": "^22.2.0",
     "drizzle-kit": "^0.28.1",
     "pg": "^8.13.1",
     "pgvector": "^0.2.0",
     "tsx": "^4.19.2",
     "typescript": "^5.5.4",
-    "wrangler": "^3.95.0"
+    "wrangler": "^4.4.0"
   }
 }

examples/goose-joke-generator/.dev.vars.example

@@ -1 +1 @@
-DATABASE_URL=
+# no env vars necessary for this project

examples/goose-joke-generator/.fpxconfig/.gitignore

@@ -0,0 +1,3 @@
+CLOUDFLARE_D1_TOKEN=
+CLOUDFLARE_ACCOUNT_ID=
+CLOUDFLARE_DATABASE_ID=

examples/goose-joke-generator/.prod.vars.example

@@ -0,0 +1,44 @@
+# D1 — what's going on here?
+
+D1 is Cloudflare's relational database. It's basically sqlite!
+
+Working with HONC + D1 locally is a little peculiar. We've done as best as goosily possible to make it easy for you, but you'll see some eye-raising funkiness if you look at the migration and seed scripts :goose:.
+
+Visit https://developers.cloudflare.com/d1/ for more information
+
+## Local development
+
+Wrangler spins up a local D1 database for you to work with.
+
+You don't really have to worry about this too much, though, because the `db:setup` command will try to take care of everything for you.
+
+When you run `npm run db:setup`, it runs the following commands:
+
+```sh
+npm run db:touch
+npm run db:generate
+npm run db:migrate
+npm run db:seed
+```
+
+This is how it works
+
+- runs `db:touch` to make sure the local database exists
+- runs `db:generate` to create the database migration _files_
+- runs `db:migrate` to apply the migration files (run them) on the local database
+- runs `db:seed` to seed the local database with some data
+
+
+## Production
+
+Create a Cloudflare account and D1 instance, retrieve the database key and your account id from the dashboard and addionally create an API token with D1 edit rights, and add it to your .prod.vars file.
+
+```sh
+CLOUDFLARE_D1_TOKEN=""
+CLOUDFLARE_ACCOUNT_ID=""
+CLOUDFLARE_DATABASE_ID=""
+```
+
+(This is also covered in the README.md file.)
+
+Then run `npm run db:migrate:prod` to apply the migrations to the production database.

examples/goose-joke-generator/D1-explained.md

@@ -1,18 +1,14 @@
 ## 🪿 Goose Joke Generator
 
-This is a project created with the Neon HONC template.
+This is a project created with the D1 HONC template.
 
-It is a simple Goose Joke Generator that uses Cloudflare AI to generate jokes, and store them in a Neon Postgres database.
+It is a simple Goose Joke Generator that uses Cloudflare AI to generate jokes, and store them in a D1 database.
 
 The jokes are of a particularly poor quality.
 
 ### Getting started
 
-Make sure you have Neon set up and the api is configured to use your database. 
-
-To do this, create a `.dev.vars` file with your Neon connection string as the `DATABASE_URL` key and value (see: `.dev.vars.example`).
-
-Also make sure you are logged in to Cloudflare and have access to Workers AI.
+Make sure you are logged in to Cloudflare and have access to Workers AI.
 
 Then, run `pnpm dev` to kick off the app locally.
 
@@ -26,7 +22,6 @@ Then, run `pnpm dev` to kick off the app locally.
 │   └── db
 │       └── schema.ts # Database schema
 ├── seed.ts # Seeding script
-├── .dev.vars.example # Example .dev.vars file
 ├── wrangler.toml # Cloudflare Workers configuration
 ├── drizzle.config.ts # Drizzle configuration
 ├── tsconfig.json # TypeScript configuration
@@ -49,25 +44,36 @@ Run the development server:
 pnpm dev
 ```
 
-Test and debug with Fiberplane:
-
-```sh
-pnpm fiberplane
-```
-
 ### Deploying to Cloudflare
 
 > **Remember this uses some AI!** So you will be billed for any newly generated goose jokes.
 
 Deploy with Cloudflare Wrangler.
 
-First set the DATABASE_URL as a secret:
+#### Setting up the D1 database
+First, create the D1 database:
 
 ```sh
-pnpx wrangler secret put DATABASE_URL
-# when prompted, enter your Neon connection string
+pnpx wrangler d1 create goose-joke-generator
 ```
 
+Then, update your wrangler.toml file to include the D1 database id:
+
+```toml
+[[d1_databases]]
+binding = "DB"
+database_name = "goose-joke-generator"
+database_id = "<result from previous command>"
+```
+
+Finally, create a `.prod.vars` file with your Cloudflare API token, account ID, and database ID (See: `D1-explained.md`), and run the migrations against production:
+
+```sh
+pnpm run db:migrate:prod
+```
+
+#### Setting up KV for the rate limiter
+
 Then, create the KV binding on your account, since we use that for the rate limiter:
 
 ```sh

examples/goose-joke-generator/README.md

@@ -1,13 +1,68 @@
+import fs from "node:fs";
+import path from "node:path";
 import { config } from "dotenv";
 import { defineConfig } from "drizzle-kit";
 
-config({ path: "./.dev.vars" });
+let dbConfig: ReturnType<typeof defineConfig>;
+if (process.env.ENVIRONMENT === "production") {
+  config({ path: "./.prod.vars" });
+  dbConfig = defineConfig({
+    schema: "./src/db/schema.ts",
+    out: "./drizzle/migrations",
+    dialect: "sqlite",
+    driver: "d1-http",
+    dbCredentials: {
+      accountId: process.env.CLOUDFLARE_ACCOUNT_ID ?? "",
+      databaseId: process.env.CLOUDFLARE_DATABASE_ID ?? "",
+      token: process.env.CLOUDFLARE_D1_TOKEN ?? "",
+    },
+  });
+} else {
+  config({ path: "./.dev.vars" });
+  const localD1DB = getLocalD1DB();
+  if (!localD1DB) {
+    process.exit(1);
+  }
 
-export default defineConfig({
-  schema: "./src/db/schema.ts",
-  out: "./drizzle",
-  dialect: "postgresql",
-  dbCredentials: {
-    url: process.env.DATABASE_URL ?? "",
-  },
-});
+  dbConfig = defineConfig({
+    schema: "./src/db/schema.ts",
+    out: "./drizzle/migrations",
+    dialect: "sqlite",
+    dbCredentials: {
+      url: localD1DB,
+    },
+  });
+}
+
+export default dbConfig;
+
+function getLocalD1DB() {
+  try {
+    const basePath = path.resolve(".wrangler");
+    const files = fs
+      .readdirSync(basePath, { encoding: "utf-8", recursive: true })
+      .filter((f) => f.endsWith(".sqlite"));
+
+    // In case there are multiple .sqlite files, we want the most recent one.
+    files.sort((a, b) => {
+      const statA = fs.statSync(path.join(basePath, a));
+      const statB = fs.statSync(path.join(basePath, b));
+      return statB.mtime.getTime() - statA.mtime.getTime();
+    });
+    const dbFile = files[0];
+
+    if (!dbFile) {
+      throw new Error(`.sqlite file not found in ${basePath}`);
+    }
+
+    const url = path.resolve(basePath, dbFile);
+
+    return url;
+  } catch (err) {
+    if (err instanceof Error) {
+      console.log(`Error resolving local D1 DB: ${err.message}`);
+    } else {
+      console.log(`Error resolving local D1 DB: ${err}`);
+    }
+  }
+}

examples/goose-joke-generator/drizzle.config.ts

@@ -0,0 +1,6 @@
+CREATE TABLE `jokes` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`content` text NOT NULL,
+	`created_at` text DEFAULT (CURRENT_TIMESTAMP) NOT NULL,
+	`updated_at` text DEFAULT (CURRENT_TIMESTAMP) NOT NULL
+);