wip: Big refactor

Closes #2

.fleet/run.json

···
 {
     "configurations": [
         {
-            "name": "darkfeed [:app:run]",
+            "name": "darkfeed [:darkfeed:run]",
             "type": "gradle",
             "workingDir": "$PROJECT_DIR$",
             "tasks": [
-                ":app:run"
+                ":darkfeed:run"
             ],
             "environmentFile": "local.env",
             "initScripts": {

Containerfile

···
 FROM registry.access.redhat.com/ubi8/openjdk-21 AS build
 WORKDIR /build
 COPY --chown=jboss / .
-RUN ./gradlew --no-daemon :app:installDist
+RUN ./gradlew --no-daemon :darkfeed:installDist
 
 FROM registry.access.redhat.com/ubi8/openjdk-21
-COPY --from=build /build/app/build/install/app /app
-ENTRYPOINT /app/bin/app
+COPY --from=build /build/darkfeed/build/install/darkfeed /app
+ENTRYPOINT /app/bin/darkfeed

app/build.gradle.kts darkfeed/build.gradle.kts

···
 }
 
 application {
-    mainClass = "gay.averyrivers.ApplicationKt"
-    applicationDefaultJvmArgs = listOf("-Dio.ktor.development=true")
+    mainClass = "MainKt"
 }

app/src/main/kotlin/Application.kt

···
-package gay.averyrivers
-
-import gay.averyrivers.lexicon.app.bsky.feed.Generator
-import gay.averyrivers.lexicon.app.bsky.feed.Like
-import gay.averyrivers.lexicon.app.bsky.feed.Post
-import io.ktor.client.*
-import io.ktor.client.call.*
-import io.ktor.client.engine.cio.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
-import io.ktor.serialization.kotlinx.json.*
-import io.ktor.server.application.*
-import io.ktor.server.engine.*
-import io.ktor.server.netty.*
-import io.ktor.server.plugins.contentnegotiation.*
-import io.ktor.server.response.*
-import io.ktor.server.routing.*
-import io.ktor.server.util.*
-import kotlinx.coroutines.runBlocking
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import java.util.logging.Logger
-
-const val FEED_DISPLAY_NAME = "DarkFeed"
-const val FEED_DESCRIPTION = "Hi!"
-const val FEED_RECORD_KEY = "darkfeed"
-
-fun main() {
-    val ownerPds = System.getenv("DF_OWNER_PDS")
-    val ownerDid = System.getenv("DF_OWNER_DID")
-    val ownerAppPassword = System.getenv("DF_OWNER_PASSWORD")
-    val hostname = System.getenv("DF_HOSTNAME")
-
-    val api = BskyApi(
-        pdsUrl = buildUrl {
-            protocol = URLProtocol.HTTPS
-            host = ownerPds
-        },
-    )
-
-    // Make sure the feed generator record exists and points to the current
-    // feed generator's hostname.
-    runBlocking {
-        api.login(ownerDid, ownerAppPassword)
-
-        try {
-            verifyAndUpdateFeedGeneratorRecord(api, ownerDid, FEED_RECORD_KEY, hostname)
-            println("Successfully set feed generator record")
-        } catch (error: Exception) {
-            println("Failed to verify and update feed generator record: ${error.message}")
-        }
-    }
-
-    // Serve the feed generator API.
-    DarkFeedApi(
-        hostname = hostname,
-        bskyApi = api,
-        port = 8080,
-    ).serve()
-}
-
-/**
- * Verify the current feed generator record, creating or updating it if necessary.
- *
- * @param api Bluesky API instance. Requires login.
- * @param repo Owner of the record.
- * @param rkey Record key of the record to check.
- * @param labelerHostname Hostname of the feed generator.
- */
-suspend fun verifyAndUpdateFeedGeneratorRecord(api: BskyApi, repo: String, rkey: String, labelerHostname: String) {
-    // Get the current record.
-    var feedGeneratorRecord = api.getFeedGeneratorRecord(repo, rkey)
-
-    // If the current record exists and has the correct DID, nothing needs to be done.
-    if (feedGeneratorRecord?.did?.contains(labelerHostname) == true) return
-
-    // Update the current record if one exists, or create a new one if it doesn't.
-    feedGeneratorRecord = feedGeneratorRecord
-        ?.copy(did = "did:web:$labelerHostname")
-        ?: Generator(
-            did = "did:web:$labelerHostname",
-            displayName = FEED_DISPLAY_NAME,
-            description = FEED_DESCRIPTION,
-            createdAt = "2024-11-04T15:58:05.074Z",
-        )
-
-    // Store the new/updated record in the repo.
-    api.putFeedGeneratorRecord(repo, rkey, feedGeneratorRecord)
-}

app/src/main/kotlin/BskyApi.kt darkfeed/src/main/kotlin/api/BskyApi.kt

···
-package gay.averyrivers
+package api
 
-import gay.averyrivers.lexicon.app.bsky.feed.Generator
-import gay.averyrivers.lexicon.app.bsky.feed.LikeRef
-import gay.averyrivers.lexicon.app.bsky.feed.defs.PostView
-import gay.averyrivers.lexicon.com.atproto.label.defs.Label
+import api.lexicon.app.bsky.feed.Generator
+import api.lexicon.app.bsky.feed.LikeRef
+import api.lexicon.app.bsky.feed.defs.PostView
 import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.engine.cio.*

app/src/main/kotlin/DarkFeedApi.kt darkfeed/src/main/kotlin/server/FeedServer.kt

···
-package gay.averyrivers
+package server
 
+import api.BskyApi
+import api.lexicon.app.bsky.feed.FeedSkeleton
+import api.lexicon.app.bsky.feed.defs.PostView
+import api.lexicon.app.bsky.feed.defs.SkeletonFeedPost
 import com.auth0.jwt.JWT
-import gay.averyrivers.lexicon.app.bsky.feed.FeedSkeleton
-import gay.averyrivers.lexicon.app.bsky.feed.defs.PostView
-import gay.averyrivers.lexicon.app.bsky.feed.defs.SkeletonFeedPost
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
···
 
 val DESIRED_LABELS: List<String> = listOf("porn", "sexual", "nudity", "sexual-figurative")
 
-class DarkFeedApi(
+class FeedServer(
     private val hostname: String,
     private val bskyApi: BskyApi,
     private val port: Int = 8080,

app/src/main/kotlin/lexicon/app/bsky/feed/FeedSkeleton.kt

···
-package gay.averyrivers.lexicon.app.bsky.feed
-
-import gay.averyrivers.lexicon.app.bsky.feed.defs.SkeletonFeedPost
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class FeedSkeleton(
-    val cursor: String? = null,
-    val feed: List<SkeletonFeedPost>,
-)

app/src/main/kotlin/lexicon/app/bsky/feed/Generator.kt darkfeed/src/main/kotlin/api/lexicon/app/bsky/feed/Generator.kt

···
-package gay.averyrivers.lexicon.app.bsky.feed
+package api.lexicon.app.bsky.feed
 
 import kotlinx.serialization.Serializable
 

app/src/main/kotlin/lexicon/app/bsky/feed/Like.kt darkfeed/src/main/kotlin/api/lexicon/app/bsky/feed/Like.kt

···
-package gay.averyrivers.lexicon.app.bsky.feed
+package api.lexicon.app.bsky.feed
 
-import gay.averyrivers.lexicon.com.atproto.repo.StrongRef
+import api.lexicon.com.atproto.repo.StrongRef
 import kotlinx.serialization.Serializable
 
 @Serializable
···
     val uri: String,
     val cid: String,
     val value: Like,
-)
+)

app/src/main/kotlin/lexicon/app/bsky/feed/Post.kt darkfeed/src/main/kotlin/api/lexicon/app/bsky/feed/Post.kt

···
-package gay.averyrivers.lexicon.app.bsky.feed
+package api.lexicon.app.bsky.feed
 
 import kotlinx.serialization.Serializable
 
···
 data class Post(
     val text: String,
     val createdAt: String,
-)
+)

app/src/main/kotlin/lexicon/app/bsky/feed/defs/PostView.kt

···
-package gay.averyrivers.lexicon.app.bsky.feed.defs
-
-import gay.averyrivers.lexicon.com.atproto.label.defs.Label
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class PostView(
-    val uri: String,
-    val cid: String,
-    val labels: List<Label>?,
-)

app/src/main/kotlin/lexicon/app/bsky/feed/defs/SkeletonFeedPost.kt darkfeed/src/main/kotlin/api/lexicon/app/bsky/feed/defs/SkeletonFeedPost.kt

···
-package gay.averyrivers.lexicon.app.bsky.feed.defs
+package api.lexicon.app.bsky.feed.defs
 
 import kotlinx.serialization.Serializable
 
···
 data class SkeletonFeedPost(
     val post: String,
     val feedContext: String? = null,
-)
+)

app/src/main/kotlin/lexicon/com/atproto/label/defs/Label.kt darkfeed/src/main/kotlin/api/lexicon/com/atproto/label/defs/Label.kt

···
-package gay.averyrivers.lexicon.com.atproto.label.defs
+package api.lexicon.com.atproto.label.defs
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/kotlin/lexicon/com/atproto/repo/StrongRef.kt darkfeed/src/main/kotlin/api/lexicon/com/atproto/repo/StrongRef.kt

···
-package gay.averyrivers.lexicon.com.atproto.repo
+package api.lexicon.com.atproto.repo
 
 import kotlinx.serialization.Serializable
 
···
 data class StrongRef(
     val uri: String,
     val cid: String,
-)
+)

darkfeed/src/main/kotlin/Main.kt

···
+import api.BskyApi
+import api.lexicon.app.bsky.feed.Generator
+import io.ktor.http.*
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import server.FeedServer
+import kotlin.system.exitProcess
+
+/**
+ *
+ */
+data class AppContext(
+    /** PDS of the feed owner's account. */
+    val ownerPds: String,
+    /** DID of the feed owner's account. */
+    val ownerDid: String,
+    /** Password for the feed owner's account. */
+    val ownerPassword: String,
+    /** Hostname of the feed generator server. */
+    val hostname: String,
+    /** Record key for the feed generator record. */
+    val recordKey: String = "darkfeed",
+    /** Display name for the feed. */
+    val feedDisplayName: String = "DarkFeed",
+    /** Description for the feed. */
+    val description: String = "hi :3",
+)
+
+/**
+ * Print a message and exit the application.
+ *
+ * @param message Message to print.
+ * @param code Status code to exit with.
+ */
+fun printMessageAndExit(message: String, code: Int = 1): Nothing {
+    println(message)
+    exitProcess(code)
+}
+
+/**
+ * Verify the current feed generator record, creating or updating it if necessary.
+ *
+ * @param api Bluesky API instance. Requires login.
+ * @param ctx Application context.
+ */
+suspend fun verifyAndUpdateFeedGeneratorRecord(api: BskyApi, ctx: AppContext) {
+    // Get the current record stored in the repo.
+    var feedGeneratorRecord = api.getFeedGeneratorRecord(ctx.ownerDid, ctx.recordKey)
+
+    // TODO: Check all fields of the record against the context.
+    // If the current record exists and has the correct DID, nothing needs to be done.
+    if (feedGeneratorRecord?.did?.contains(ctx.hostname) == true) return
+
+    // Update the current record if one exists, or create a new one if it doesn't.
+    feedGeneratorRecord = feedGeneratorRecord
+        ?.copy(did = "did:web:${ctx.hostname}")
+        ?: Generator(
+            did = "did:web:${ctx.hostname}",
+            displayName = ctx.feedDisplayName,
+            description = ctx.description,
+            // TODO: Use the real time here.
+            createdAt = "2024-11-04T15:58:05.074Z"
+        )
+
+    // Store the new/updated record in the repo.
+    api.putFeedGeneratorRecord(ctx.ownerDid, ctx.recordKey, feedGeneratorRecord)
+}
+
+fun main() = runBlocking {
+    // Create app context from environment variables.
+    val ctx = AppContext(
+        ownerPds = System.getenv("FEED_ACCOUNT_PDS")
+            ?: "bsky.social",
+        ownerDid = System.getenv("FEED_ACCOUNT_DID")
+            ?: printMessageAndExit("error: variable FEED_ACCOUNT_DID not set"),
+        ownerPassword = System.getenv("FEED_ACCOUNT_PASSWORD")
+            ?: printMessageAndExit("error: variable FEED_ACCOUNT_PASSWORD not set"),
+        hostname = System.getenv("HOSTNAME")
+            ?: printMessageAndExit("error: variable HOSTNAME not set"),
+    )
+
+    // Create API instance.
+    val bskyApi = BskyApi(buildUrl {
+        protocol = URLProtocol.HTTPS
+        host = ctx.ownerPds
+    })
+
+    // Verify and update the feed generator record.
+    launch {
+        bskyApi.login(ctx.ownerDid, ctx.ownerPassword)
+
+        try {
+            verifyAndUpdateFeedGeneratorRecord(bskyApi, ctx)
+            println("main: feed generator record verified")
+        } catch (error: Exception) {
+            println("main: failed to verify and update feed generator record: ${error.message}")
+        }
+    }.join()
+
+    println("main: starting feed generator server")
+
+    // Start the feed server.
+    FeedServer(
+        hostname = ctx.hostname,
+        bskyApi = bskyApi,
+        port = 8080,
+    ).serve()
+}

darkfeed/src/main/kotlin/api/lexicon/app/bsky/feed/FeedSkeleton.kt

···
+package api.lexicon.app.bsky.feed
+
+import api.lexicon.app.bsky.feed.defs.SkeletonFeedPost
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedSkeleton(
+    val cursor: String? = null,
+    val feed: List<SkeletonFeedPost>,
+)

darkfeed/src/main/kotlin/api/lexicon/app/bsky/feed/defs/PostView.kt

···
+package api.lexicon.app.bsky.feed.defs
+
+import api.lexicon.com.atproto.label.defs.Label
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostView(
+    val uri: String,
+    val cid: String,
+    val labels: List<Label>?,
+)

fly.toml

···
-# fly.toml app configuration file generated for darkfeed on 2024-11-05T20:07:05-05:00
-#
-# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
-#
-
 app = 'darkfeed'
 primary_region = 'iad'
 
···
   memory = '512mb'
 
 [env]
-  DF_OWNER_PDS = 'bsky.social'
-  DF_OWNER_DID = 'did:plc:zhxv5pxpmojhnvaqy4mwailv'
-  DF_HOSTNAME = 'darkfeed.fly.dev'
+  FEED_ACCOUNT_PDS = 'bsky.social'
+  FEED_ACCOUNT_DID = 'did:plc:zhxv5pxpmojhnvaqy4mwailv'
+  HOSTNAME = 'darkfeed.fly.dev'

settings.gradle.kts

···
 }
 
 rootProject.name = "darkfeed"
-include("app")
+include("darkfeed")