update to pdsv2 (#33)

* update to pdsv2

* do not tag latest

* update service entry

* add handle check endpoint for caddy

* fix build, replace yarn with npm

* update pds version

---------

Co-authored-by: Devin Ivy <[email protected]>
Co-authored-by: Jake Gold <[email protected]>

.github/workflows/build-and-push-ghcr.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - pdsv2
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}
@@ -51,7 +52,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           file: ./Dockerfile
           tags: |
-            ghcr.io/bluesky-social/pds:latest
             ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

Dockerfile

@@ -1,12 +1,14 @@
-FROM node:18-alpine as build
+FROM node:20.11-alpine3.18 as build
+
+RUN npm install -g pnpm
 
 # Move files into the image and install
 WORKDIR /app
 COPY ./service ./
-RUN yarn install --production --frozen-lockfile > /dev/null
+RUN pnpm install --production --frozen-lockfile > /dev/null
 
 # Uses assets from build stage to reduce build size
-FROM node:18-alpine
+FROM node:20.11-alpine3.18
 
 RUN apk add --update dumb-init
 
@@ -19,6 +21,8 @@ COPY --from=build /app /app
 EXPOSE 3000
 ENV PDS_PORT=3000
 ENV NODE_ENV=production
+# potential perf issues w/ io_uring on this version of node
+ENV UV_USE_IO_URING=0
 
 CMD ["node", "--enable-source-maps", "index.js"]
 

installer.sh

@@ -175,13 +175,13 @@ function main {
 
   From your DNS provider's control panel, create the required
   DNS record with the value of your server's public IP address.
-  
+
   + Any DNS name that can be resolved on the public internet will work.
   + Replace example.com below with any valid domain name you control.
   + A TTL of 600 seconds (10 minutes) is recommended.
-  
+
   Example DNS record:
-  
+
     NAME                TYPE   VALUE
     ----                ----   -----
     example.com         A      ${PUBLIC_IP:-Server public IP}
@@ -235,7 +235,7 @@ INSTALLER_MESSAGE
       sleep 2
     done
   fi
-  
+
   apt-get update
   apt-get install --yes ${REQUIRED_SYSTEM_PACKAGES}
 
@@ -400,7 +400,7 @@ SYSTEMD_UNIT_FILE
 
   cat <<INSTALLER_MESSAGE
 ========================================================================
-PDS installation successful! 
+PDS installation successful!
 ------------------------------------------------------------------------
 
 Check service status      : sudo systemctl status pds
@@ -417,10 +417,10 @@ HTTP Control Panel     Inbound    443    TCP       Any
 
 Required DNS entries
 ------------------------------------------------------------------------
-Name                         Type       Value          
+Name                         Type       Value
 -------                      ---------  ---------------
-${PDS_HOSTNAME}              A          ${PUBLIC_IP}   
-*.${PDS_HOSTNAME}            A          ${PUBLIC_IP}   
+${PDS_HOSTNAME}              A          ${PUBLIC_IP}
+*.${PDS_HOSTNAME}            A          ${PUBLIC_IP}
 
 Detected public IP of this server: ${PUBLIC_IP}
 

service/index.js

@@ -1,7 +1,6 @@
 "use strict";
 const {
   PDS,
-  Database,
   envToCfg,
   envToSecrets,
   readEnv,
@@ -15,19 +14,11 @@ const main = async () => {
   const cfg = envToCfg(env);
   const secrets = envToSecrets(env);
   const pds = await PDS.create(cfg, secrets);
-  if (cfg.db.dialect === "pg") {
-    // Migrate using credentialed user
-    const migrateDb = Database.postgres({
-      url: cfg.db.migrationUrl,
-      schema: cfg.db.schema,
-    });
-    await migrateDb.migrateToLatestOrThrow();
-    await migrateDb.close();
-  } else {
-    await pds.ctx.db.migrateToLatestOrThrow();
-  }
   await pds.start();
-  httpLogger.info("pds is running");
+  httpLogger.info("pds has started");
+  pds.app.get("/check-handle", (req, res) => {
+    checkHandleRoute(pds, req, res);
+  });
   // Graceful shutdown (see also https://aws.amazon.com/blogs/containers/graceful-shutdowns-with-ecs/)
   process.on("SIGTERM", async () => {
     httpLogger.info("pds is stopping");
@@ -36,4 +27,43 @@ const main = async () => {
   });
 };
 
+async function checkHandleRoute(
+  /** @type {PDS} */ pds,
+  /** @type {import('express').Request} */ req,
+  /** @type {import('express').Response} */ res
+) {
+  try {
+    const { domain } = req.query;
+    if (!domain || typeof domain !== "string") {
+      return res.status(400).json({
+        error: "InvalidRequest",
+        message: "bad or missing domain query param",
+      });
+    }
+    const isHostedHandle = pds.ctx.cfg.identity.serviceHandleDomains.find(
+      (avail) => domain.endsWith(avail)
+    );
+    if (!isHostedHandle) {
+      return res.status(400).json({
+        error: "InvalidRequest",
+        message: "handles are not provided on this domain",
+      });
+    }
+    const account = await pds.ctx.accountManager.getAccount(domain);
+    if (!account) {
+      return res.status(404).json({
+        error: "NotFound",
+        message: "handle not found for this domain",
+      });
+    }
+    return res.json({ did: account.did, handle: account.handle });
+  } catch (err) {
+    httpLogger.error({ err }, "check handle failed");
+    return res.status(500).json({
+      error: "InternalServerError",
+      message: "Internal Server Error",
+    });
+  }
+}
+
 main();

service/package.json

@@ -6,6 +6,6 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@atproto/pds": "0.3.0-beta.3"
+    "@atproto/pds": "0.4.0-beta.1"
   }
 }