stash

Author: leonitousconforti

.npmrc

@@ -6,6 +6,7 @@ public-hoist-pattern[]=vitest
 public-hoist-pattern[]=@types/*
 public-hoist-pattern[]=@vitest/*
 public-hoist-pattern[]=@effect/vitest
+public-hoist-pattern[]=@astrojs/check
 
 recursive-install=true
 dedupe-peer-dependents=false

.vscode/settings.json

@@ -10,6 +10,7 @@
     "cSpell.enabled": true,
     "cSpell.words": [
         "apks",
+        "astrojs",
         "authproxy",
         "bbnotes",
         "bbpost",

apps/tinyburg.app/api/handler.ts

@@ -0,0 +1,19 @@
+import { HttpApp, type HttpMiddleware } from "@effect/platform";
+import { type APIRoute } from "astro";
+import { Context, type ManagedRuntime } from "effect";
+
+import { AppRuntime } from "./runtime";
+import { AstroContext } from "./tags";
+
+export const makeAstroEndpoint = <E>(
+    app: HttpApp.Default<E, AstroContext | ManagedRuntime.ManagedRuntime.Context<typeof AppRuntime>>,
+    middleware?: HttpMiddleware.HttpMiddleware | undefined
+): APIRoute => {
+    return async (apiContext) => {
+        const runtime = await AppRuntime.runtime();
+        const context = Context.make(AstroContext, apiContext);
+        const appAstroContextOmitted = app as HttpApp.Default<E, never>;
+        const handler = HttpApp.toWebHandlerRuntime(runtime)(appAstroContextOmitted, middleware);
+        return await handler(apiContext.request, context);
+    };
+};

apps/tinyburg.app/lib/db.ts apps/tinyburg.app/api/runtime.tsapps/tinyburg.app/lib/db.ts renamed to apps/tinyburg.app/api/runtime.ts

@@ -1,15 +1,15 @@
-import { Path } from "@effect/platform";
+import { FetchHttpClient, Path, PlatformConfigProvider } from "@effect/platform";
 import { NodeContext } from "@effect/platform-node";
 import { PgClient, PgMigrator } from "@effect/sql-pg";
-import { Config, Effect, Layer, String } from "effect";
+import { Config, Effect, Layer, ManagedRuntime, String } from "effect";
 
 import { Repository } from "../domain/model.ts";
 
 /**
  * @since 1.0.0
  * @category Layers
  */
-export const SqlLive = PgClient.layerConfig({
+const SqlLive = PgClient.layerConfig({
     url: Config.redacted("DATABASE_URL"),
     transformQueryNames: Config.succeed(String.camelToSnake),
     transformResultNames: Config.succeed(String.snakeToCamel),
@@ -19,7 +19,7 @@ export const SqlLive = PgClient.layerConfig({
  * @since 1.0.0
  * @category Layers
  */
-export const MigratorLive = Effect.gen(function* () {
+const MigratorLive = Effect.gen(function* () {
     const path = yield* Path.Path;
     const migrations = yield* path.fromFileUrl(new URL("../migrations", import.meta.url));
     const loader = PgMigrator.fromFileSystem(migrations);
@@ -30,4 +30,19 @@ export const MigratorLive = Effect.gen(function* () {
  * @since 1.0.0
  * @category Layers
  */
-export const DatabaseLive = Repository.Default.pipe(Layer.provide(MigratorLive), Layer.provide(SqlLive));
+const DatabaseLive = Repository.Default.pipe(Layer.provide(MigratorLive), Layer.provide(SqlLive));
+
+/**
+ * @since 1.0.0
+ * @category Layers
+ */
+export const AppLive = Layer.mergeAll(DatabaseLive, FetchHttpClient.layer).pipe(
+    Layer.provide(PlatformConfigProvider.layerDotEnvAdd("./.env")),
+    Layer.provide(NodeContext.layer)
+);
+
+/**
+ * @since 1.0.0
+ * @category Runtime
+ */
+export const AppRuntime = ManagedRuntime.make(AppLive);

apps/tinyburg.app/api/tags.ts

@@ -0,0 +1,5 @@
+import type { APIContext } from "astro";
+
+import { Context } from "effect";
+
+export class AstroContext extends Context.Tag("AstroContext")<AstroContext, APIContext>() {}

apps/tinyburg.app/domain/model.ts

@@ -1,4 +1,5 @@
 import { Model, SqlClient, SqlSchema } from "@effect/sql";
+import { PlayerAuthKeySchema, PlayerIdSchema } from "@tinyburg/nimblebit-sdk/NimblebitConfig";
 import { DateTime, Duration, Effect, Schema } from "effect";
 
 /**
@@ -43,6 +44,32 @@ export class Session extends Model.Class<Session>("Session")({
     expiresAt: Model.DateTimeFromDate,
 }) {}
 
+/**
+ * @since 1.0.0
+ * @category Models
+ */
+export class TinyTowerAccount extends Model.Class<TinyTowerAccount>("TinyTowerAccount")({
+    id: Model.Generated(Schema.UUID),
+    userId: Schema.UUID,
+    playerId: PlayerIdSchema,
+    playerAuthKey: PlayerAuthKeySchema,
+    playerEmail: Schema.String,
+    createdAt: Model.DateTimeInsertFromDate,
+    verifiedAt: Model.DateTimeFromDate,
+}) {}
+
+/**
+ * @since 1.0.0
+ * @category Models
+ */
+export class PendingTinyTowerAccount extends Model.Class<PendingTinyTowerAccount>("PendingTinyTowerAccount")({
+    id: Model.Generated(Schema.UUID),
+    userId: Schema.UUID,
+    playerId: PlayerIdSchema,
+    playerEmail: Schema.String,
+    createdAt: Model.DateTimeInsertFromDate,
+}) {}
+
 /**
  * @since 1.0.0
  * @category Services
@@ -51,6 +78,7 @@ export class Repository extends Effect.Service<Repository>()("@tinyburg/tinyburg
     accessors: true,
     dependencies: [],
     effect: Effect.gen(function* () {
+        console.log("here");
         const sql = yield* SqlClient.SqlClient;
 
         const sessions = yield* Model.makeRepository(Session, {
@@ -59,6 +87,18 @@ export class Repository extends Effect.Service<Repository>()("@tinyburg/tinyburg
             spanPrefix: "tinyburg.app.domain.Repository.sessions",
         });
 
+        const _tinytowerAccounts = yield* Model.makeRepository(TinyTowerAccount, {
+            idColumn: "id",
+            tableName: "tinytower_accounts",
+            spanPrefix: "tinyburg.app.domain.Repository.tinytowerAccounts",
+        });
+
+        const _pendingTinyTowerAccounts = yield* Model.makeRepository(PendingTinyTowerAccount, {
+            idColumn: "id",
+            tableName: "pending_tinytower_accounts",
+            spanPrefix: "tinyburg.app.domain.Repository.pendingTinyTowerAccounts",
+        });
+
         const deleteSession = sessions.delete;
         const createSession = (
             user: User,

apps/tinyburg.app/migrations/0001_add_users_and_oauth.ts

@@ -32,8 +32,38 @@ export default Effect.flatMap(
             expires_at TIMESTAMPTZ NOT NULL
         );
 
+        -- TinyTower accounts linked to users
+        CREATE TABLE IF NOT EXISTS tinytower_accounts (
+            id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+            user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+            player_id TEXT NOT NULL UNIQUE,
+            player_auth_key TEXT NOT NULL,
+            player_email TEXT NOT NULL,
+            created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+            verified_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+        );
+
+        -- Helper function to add one day interval because generated columns need to be immutable
+        CREATE OR REPLACE FUNCTION add_one_day(ts TIMESTAMPTZ)
+        RETURNS TIMESTAMPTZ AS $$
+            SELECT ts + INTERVAL '1 day'
+        $$ LANGUAGE SQL IMMUTABLE;
+
+        -- Pending TinyTower link requests
+        CREATE TABLE IF NOT EXISTS pending_tinytower_accounts (
+            id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+            user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+            player_id TEXT NOT NULL,
+            player_email TEXT NOT NULL,
+            created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+            expires_at TIMESTAMPTZ NOT NULL GENERATED ALWAYS AS (add_one_day(created_at)) STORED
+        );
+
         -- Indexes for common query patterns
         CREATE INDEX IF NOT EXISTS idx_oauth_accounts_user_id ON oauth_accounts(user_id);
         CREATE INDEX IF NOT EXISTS idx_sessions_user_id ON sessions(user_id);
+        CREATE INDEX IF NOT EXISTS idx_tinytower_accounts_user_id ON tinytower_accounts(user_id);
+        CREATE INDEX IF NOT EXISTS idx_tinytower_accounts_player_id ON tinytower_accounts(player_id);
+        CREATE INDEX IF NOT EXISTS idx_pending_tinytower_accounts_user_id ON pending_tinytower_accounts(user_id);
     `
 );

apps/tinyburg.app/package.json

@@ -10,6 +10,7 @@
         "preview": "astro preview"
     },
     "dependencies": {
+        "@astrojs/check": "0.9.6",
         "@astrojs/node": "9.2.2",
         "@effect/cluster": "0.56.1",
         "@effect/experimental": "0.58.0",
@@ -19,6 +20,7 @@
         "@effect/sql": "0.49.0",
         "@effect/sql-pg": "0.50.1",
         "@effect/workflow": "0.16.0",
+        "@tinyburg/nimblebit-sdk": "workspace:*",
         "astro": "5.16.14",
         "effect": "3.19.14",
         "typescript": "5.9.3"