comparing 601b351df6e7025ece0f42edefb1fa7c44b88d1b and main on gmstn.systems/shard

+7

src/lib/utils/atproto.ts

···

       121
       121
        
       export const atUriRegexp =

     

       122
       122
        
           /^at:\/\/([a-zA-Z0-9._:%-]+)(?:\/([a-zA-Z0-9-.]+)(?:\/([a-zA-Z0-9._~:@!$&%')(*+,;=-]+))?)?(?:#(\/[a-zA-Z0-9._~:@!$&%')(*+,;=\-[\]/\\]*))?$/;

     

       123
       123
        
       

     

       124
       124
       +
       export const atUriToString = ({ authority, collection, rKey }: AtUri) => {

     

       125
       125
       +
           let result = `at://${authority}`;

     

       126
       126
       +
           result += collection ? `/${collection}` : "";

     

       127
       127
       +
           result += rKey ? `/${rKey}` : "";

     

       128
       128
       +
           return result;

     

       129
       129
       +
       };

     

       130
       130
       +
       

     

       124
       131
        
       export const stringToAtUri = (str: string): Result<AtUri, unknown> => {

     

       125
       132
        
           const isValidAtUri = atUriRegexp.test(str);

     

       126
       133
        
           if (!isValidAtUri)

-2

src/db/schema/messages.ts

···

       9
       9
        
       export const messagesTable = sqliteTable(

     

       10
       10
        
           "messages",

     

       11
       11
        
           {

     

       12
       12
       -
               // we do incrementing numbers for now but for goodness sake we need to come up with something better

     

       13
       13
       -
               // TODO: id by snowflakes or something more sane.

     

       14
       12
        
               id: text("id").primaryKey(),

     

       15
       13
        
               channelAtUri: text("channel_at_uri"),

     

       16
       14
        
               authorDid: text("author_did").notNull(),

+2

src/lib/types/messages.ts

···

       29
       29
        
               type: z.literal("shard/history"),

     

       30
       30
        
               messages: z.optional(z.array(shardMessageSchema)),

     

       31
       31
        
               channel: z.string(),

     

       32
       32
       +
               forClient: didSchema,

     

       32
       33
        
           })

     

       33
       34
        
           .strict();

     

       34
       35
        
       export type HistoryMessage = z.infer<typeof historyMessageSchema>;

     
···

       37
       38
        
           .safeExtend({

     

       38
       39
        
               type: z.literal("shard/requestHistory"),

     

       39
       40
        
               channel: z.string(),

     

       41
       41
       +
               requestedBy: didSchema,

     

       40
       42
        
           })

     

       41
       43
        
           .strict();

     

       42
       44
        
       export type RequestHistoryMessage = z.infer<typeof requestHistoryMessageSchema>;

+9

src/lib/handlers/getOwnerDid.ts

···

       1
       1
       +
       import { OWNER_DID } from "@/lib/env";

     

       2
       2
       +
       import { getRegistrationState } from "@/lib/state";

     

       3
       3
       +
       import type { RouteHandler } from "@/lib/types/routes";

     

       4
       4
       +
       import { newSuccessResponse } from "@/lib/utils/http/responses";

     

       5
       5
       +
       

     

       6
       6
       +
       export const getOwnerHandler: RouteHandler = () => {

     

       7
       7
       +
           const { registered } = getRegistrationState();

     

       8
       8
       +
           return newSuccessResponse({ registered, ownerDid: OWNER_DID });

     

       9
       9
       +
       };

+11 -1

src/lib/types/http/responses.ts

···

       1
       1
        
       import { sessionInfoSchema } from "@/lib/sessions";

     

       2
       2
       +
       import { didSchema } from "@/lib/types/atproto";

     

       2
       3
        
       import { httpResponseErrorInfoSchema } from "@/lib/types/http/errors";

     

       3
       4
        
       import { z } from "zod";

     

       4
       5
        
       

     
···

       16
       17
        
       });

     

       17
       18
        
       export type HandshakeResponse = z.infer<typeof handshakeResponseSchema>;

     

       18
       19
        
       

     

       19
       19
       -
       export const httpResponseDataSchema = z.union([handshakeResponseSchema]);

     

       20
       20
       +
       export const getOwnerDidResponseSchema = z.object({

     

       21
       21
       +
           registered: z.boolean(),

     

       22
       22
       +
           ownerDid: didSchema,

     

       23
       23
       +
       });

     

       24
       24
       +
       export type GetOwnerDidResponse = z.infer<typeof getOwnerDidResponseSchema>;

     

       25
       25
       +
       

     

       26
       26
       +
       export const httpResponseDataSchema = z.union([

     

       27
       27
       +
           handshakeResponseSchema,

     

       28
       28
       +
           getOwnerDidResponseSchema,

     

       29
       29
       +
       ]);

     

       20
       30
        
       export type HttpResponseData = z.infer<typeof httpResponseDataSchema>;

     

       21
       31
        
       

     

       22
       32
        
       const httpResponseBaseSchema = z.object({

+5

src/routes/index.ts

···

       3
       3
        
       import { didWebDocRoute } from "@/routes/dot-well-known/did-dot-json/route";

     

       4
       4
        
       import { handshakeRoute } from "@/routes/handshake/route";

     

       5
       5
        
       import { indexRoute } from "@/routes/route";

     

       6
       6
       +
       import { healthRoute } from "@/routes/xrpc/_health/route";

     

       7
       7
       +
       import { systemsGmstnDevelopmentShardGetOwnerRoute } from "@/routes/xrpc/systems.gmstn.development.shard.getOwner/route";

     

       6
       8
        
       

     

       7
       9
        
       export const routes: Record<string, Route | WsRoute> = {

     

       8
       10
        
           "/": indexRoute,

     

       9
       11
        
           "/.well-known/did.json": didWebDocRoute,

     

       10
       12
        
           "/handshake": handshakeRoute,

     

       11
       13
        
           "/connect": connectRoute,

     

       14
       14
       +
           "/xrpc/_health": healthRoute,

     

       15
       15
       +
           "/xrpc/systems.gmstn.development.shard.getOwner":

     

       16
       16
       +
               systemsGmstnDevelopmentShardGetOwnerRoute,

     

       12
       17
        
       };

+10

src/routes/xrpc/_health/route.ts

···

       1
       1
       +
       import type { Route } from "@/lib/types/routes";

     

       2
       2
       +
       

     

       3
       3
       +
       export const healthRoute: Route = {

     

       4
       4
       +
           method: "GET",

     

       5
       5
       +
           handler: () => {

     

       6
       6
       +
               return new Response("this shard is running at 0.0.1", {

     

       7
       7
       +
                   headers: { "content-type": "text/plain; charset=utf-8" },

     

       8
       8
       +
               });

     

       9
       9
       +
           },

     

       10
       10
       +
       };

+7

src/routes/xrpc/systems.gmstn.development.shard.getOwner/route.ts

···

       1
       1
       +
       import { getOwnerHandler } from "@/lib/handlers/getOwnerDid";

     

       2
       2
       +
       import type { Route } from "@/lib/types/routes";

     

       3
       3
       +
       

     

       4
       4
       +
       export const systemsGmstnDevelopmentShardGetOwnerRoute: Route = {

     

       5
       5
       +
           method: "GET",

     

       6
       6
       +
           handler: getOwnerHandler,

     

       7
       7
       +
       };

+5

src/server/index.ts

···

       1
       1
        
       import websocket from "@fastify/websocket";

     

       2
       2
       +
       import cors from "@fastify/cors";

     

       2
       3
        
       import Fastify from "fastify";

     

       3
       4
        
       

     

       4
       5
        
       export const setupServer = async () => {

     
···

       6
       7
        
               logger: true,

     

       7
       8
        
           });

     

       8
       9
        
       

     

       10
       10
       +
           await fastify.register(cors, {

     

       11
       11
       +
               origin: true,

     

       12
       12
       +
           });

     

       13
       13
       +
       

     

       9
       14
        
           await fastify.register(websocket);

     

       10
       15
        
       

     

       11
       16
        
           return fastify;

+1 -1

src/lib/handlers/connect.ts

···

       153
       153
        
                           if (!messagesResult.ok) {

     

       154
       154
        
                               console.error(messagesResult.error);

     

       155
       155
        
                               throw new Error(

     

       156
       156
       -
                                   "Channel history function returned 0 results.",

     

       156
       156
       +
                                   "Something went wrong when trying to get messages from the DB. Check the schema and the connection?",

     

       157
       157
        
                               );

     

       158
       158
        
                           }

     

       159
       159
        
                           const historyMessage: HistoryMessage = {

+1

.gitignore

···

       2
       2
        
       /node_modules

     

       3
       3
        
       /dist

     

       4
       4
        
       .env

     

       5
       5
       +
       .docker.env

     

       5
       6
        
       *.tsbuildinfo

+2

shell.nix

···

       9
       9
        
         pnpm,

     

       10
       10
        
         typescript,

     

       11
       11
        
         typescript-language-server,

     

       12
       12
       +
         docker,

     

       12
       13
        
       

     

       13
       14
        
         callPackage,

     

       14
       15
        
       }:

     
···

       25
       26
        
           pnpm

     

       26
       27
        
           typescript

     

       27
       28
        
           typescript-language-server

     

       29
       29
       +
           docker

     

       28
       30
        
         ];

     

       29
       31
        
       

     

       30
       32
        
         shellHook = ''

+47

.github/workflows/push-image.yaml

···

       1
       1
       +
       name: Build and Push Docker Image

     

       2
       2
       +
       

     

       3
       3
       +
       on:

     

       4
       4
       +
           push:

     

       5
       5
       +
               tags:

     

       6
       6
       +
                   - "v*"

     

       7
       7
       +
       

     

       8
       8
       +
       env:

     

       9
       9
       +
           REGISTRY: ghcr.io

     

       10
       10
       +
           IMAGE_NAME: ${{ github.repository }}

     

       11
       11
       +
       

     

       12
       12
       +
       jobs:

     

       13
       13
       +
           build-and-push:

     

       14
       14
       +
               runs-on: ubuntu-latest

     

       15
       15
       +
               permissions:

     

       16
       16
       +
                   contents: read

     

       17
       17
       +
                   packages: write

     

       18
       18
       +
       

     

       19
       19
       +
               steps:

     

       20
       20
       +
                   - name: Checkout repository

     

       21
       21
       +
                     uses: actions/checkout@v4

     

       22
       22
       +
       

     

       23
       23
       +
                   - name: Log in to GitHub Container Registry

     

       24
       24
       +
                     uses: docker/login-action@v3

     

       25
       25
       +
                     with:

     

       26
       26
       +
                         registry: ${{ env.REGISTRY }}

     

       27
       27
       +
                         username: ${{ github.actor }}

     

       28
       28
       +
                         password: ${{ secrets.GITHUB_TOKEN }}

     

       29
       29
       +
       

     

       30
       30
       +
                   - name: Extract metadata (tags, labels)

     

       31
       31
       +
                     id: meta

     

       32
       32
       +
                     uses: docker/metadata-action@v5

     

       33
       33
       +
                     with:

     

       34
       34
       +
                         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

     

       35
       35
       +
                         tags: |

     

       36
       36
       +
                             type=semver,pattern={{version}}

     

       37
       37
       +
                             type=semver,pattern={{major}}.{{minor}}

     

       38
       38
       +
                             type=semver,pattern={{major}}

     

       39
       39
       +
                             type=raw,value=latest

     

       40
       40
       +
       

     

       41
       41
       +
                   - name: Build and push Docker image

     

       42
       42
       +
                     uses: docker/build-push-action@v5

     

       43
       43
       +
                     with:

     

       44
       44
       +
                         context: .

     

       45
       45
       +
                         push: true

     

       46
       46
       +
                         tags: ${{ steps.meta.outputs.tags }}

     

       47
       47
       +
                         labels: ${{ steps.meta.outputs.labels }}

Compare changes