commit e7e4d0563349594d5a887c6480afec39b39d46ca · gmstn.systems/shard

drizzle/0000_powerful_professor_monster.sql drizzle/0000_cute_maginty.sql

+1 -1

drizzle/meta/0000_snapshot.json

···

       1
       1
        
       {

     

       2
       2
        
         "version": "6",

     

       3
       3
        
         "dialect": "sqlite",

     

       4
       4
       -
         "id": "0313582b-1157-40b9-a307-168f53b51012",

     

       4
       4
       +
         "id": "86ec75bd-9ac5-453e-a223-8c0b5ee135d4",

     

       5
       5
        
         "prevId": "00000000-0000-0000-0000-000000000000",

     

       6
       6
        
         "tables": {

     

       7
       7
        
           "messages": {

+2 -2

drizzle/meta/_journal.json

···

       5
       5
        
           {

     

       6
       6
        
             "idx": 0,

     

       7
       7
        
             "version": "6",

     

       8
       8
       -
             "when": 1760861619063,

     

       9
       9
       -
             "tag": "0000_powerful_professor_monster",

     

       8
       8
       +
             "when": 1761759684737,

     

       9
       9
       +
             "tag": "0000_cute_maginty",

     

       10
       10
        
             "breakpoints": true

     

       11
       11
        
           }

     

       12
       12
        
         ]

+1

package.json

···

       33
       33
        
               "@atcute/client": "^4.0.5",

     

       34
       34
        
               "@atcute/crypto": "^2.2.5",

     

       35
       35
        
               "@atcute/identity-resolver": "^1.1.4",

     

       36
       36
       +
               "@atcute/tid": "^1.0.3",

     

       36
       37
        
               "@atcute/xrpc-server": "^0.1.2",

     

       37
       38
        
               "@fastify/websocket": "^11.2.0",

     

       38
       39
        
               "@libsql/client": "^0.15.15",

+8

pnpm-lock.yaml

···

       20
       20
        
             '@atcute/identity-resolver':

     

       21
       21
        
               specifier: ^1.1.4

     

       22
       22
        
               version: 1.1.4(@atcute/identity@1.1.1)

     

       23
       23
       +
             '@atcute/tid':

     

       24
       24
       +
               specifier: ^1.0.3

     

       25
       25
       +
               version: 1.0.3

     

       23
       26
        
             '@atcute/xrpc-server':

     

       24
       27
        
               specifier: ^0.1.2

     

       25
       28
        
               version: 0.1.2

     
···

       109
       112
        
       

     

       110
       113
        
         '@atcute/multibase@1.1.6':

     

       111
       114
        
           resolution: {integrity: sha512-HBxuCgYLKPPxETV0Rot4VP9e24vKl8JdzGCZOVsDaOXJgbRZoRIF67Lp0H/OgnJeH/Xpva8Z5ReoTNJE5dn3kg==}

     

       115
       115
       +
       

     

       116
       116
       +
         '@atcute/tid@1.0.3':

     

       117
       117
       +
           resolution: {integrity: sha512-wfMJx1IMdnu0CZgWl0uR4JO2s6PGT1YPhpytD4ZHzEYKKQVuqV6Eb/7vieaVo1eYNMp2FrY67FZObeR7utRl2w==}

     

       112
       118
        
       

     

       113
       119
        
         '@atcute/uint8array@1.0.5':

     

       114
       120
        
           resolution: {integrity: sha512-XLWWxoR2HNl2qU+FCr0rp1APwJXci7HnzbOQLxK55OaMNBXZ19+xNC5ii4QCsThsDxa4JS/JTzuiQLziITWf2Q==}

     
···

       1441
       1447
        
         '@atcute/multibase@1.1.6':

     

       1442
       1448
        
           dependencies:

     

       1443
       1449
        
             '@atcute/uint8array': 1.0.5

     

       1450
       1450
       +
       

     

       1451
       1451
       +
         '@atcute/tid@1.0.3': {}

     

       1444
       1452
        
       

     

       1445
       1453
        
         '@atcute/uint8array@1.0.5': {}

     

       1446
       1454

+1

src/db/schema/messages.ts

···

       15
       15
        
               channelAtUri: text("channel_at_uri"),

     

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

     

       17
       17
        
               content: text("content").notNull(),

     

       18
       18
       +
               sentAt: integer("created_at", { mode: "timestamp" }).notNull(),

     

       18
       19
        
               createdAt: integer("created_at", { mode: "timestamp" })

     

       19
       20
        
                   .notNull()

     

       20
       21
        
                   .default(sql`(unixepoch('now'))`),

+48

src/lib/handlers/connect.ts

···

       3
       3
        
           issuedHandshakes,

     

       4
       4
        
           isValidSession,

     

       5
       5
        
       } from "@/lib/sessions";

     

       6
       6
       +
       import { shardMessageSchema } from "@/lib/types/messages";

     

       6
       7
        
       import type { PreHandler, WsRouteHandler } from "@/lib/types/routes";

     

       8
       8
       +
       import { storeMessageInDb } from "@/lib/utils/gmstn";

     

       9
       9
       +
       import {

     

       10
       10
       +
           rawDataToString,

     

       11
       11
       +
           validateWsMessageType,

     

       12
       12
       +
       } from "@/lib/utils/ws/validate";

     

       13
       13
       +
       import { z } from "zod";

     

       7
       14
        
       

     

       8
       15
        
       export const connectPreHandler: PreHandler = (req, reply, done) => {

     

       9
       16
        
           const { query } = req;

     
···

       63
       70
        
               socket.close();

     

       64
       71
        
               return;

     

       65
       72
        
           }

     

       73
       73
       +
       

     

       74
       74
       +
           socket.on("message", (rawData) => {

     

       75
       75
       +
               const event = rawDataToString(rawData);

     

       76
       76
       +
       

     

       77
       77
       +
               const data: unknown = JSON.parse(event);

     

       78
       78
       +
               const validateTypeResult = validateWsMessageType(data);

     

       79
       79
       +
               if (!validateTypeResult.ok) return;

     

       80
       80
       +
       

     

       81
       81
       +
               const { type: messageType } = validateTypeResult.data;

     

       82
       82
       +
       

     

       83
       83
       +
               switch (messageType) {

     

       84
       84
       +
                   case "shard/message": {

     

       85
       85
       +
                       const {

     

       86
       86
       +
                           success,

     

       87
       87
       +
                           error,

     

       88
       88
       +
                           data: shardMessage,

     

       89
       89
       +
                       } = shardMessageSchema.safeParse(validateTypeResult.data);

     

       90
       90
       +
                       if (!success) {

     

       91
       91
       +
                           console.error(

     

       92
       92
       +
                               "could not parse",

     

       93
       93
       +
                               validateTypeResult.data,

     

       94
       94
       +
                               "as a valid ShardMessage.",

     

       95
       95
       +
                           );

     

       96
       96
       +
                           console.error(z.treeifyError(error));

     

       97
       97
       +
                           return;

     

       98
       98
       +
                       }

     

       99
       99
       +
                       storeMessageInDb(shardMessage)

     

       100
       100
       +
                           .then(() => {

     

       101
       101
       +
                               console.log("stored", shardMessage);

     

       102
       102
       +
                           })

     

       103
       103
       +
                           .catch((err: unknown) => {

     

       104
       104
       +
                               console.error(

     

       105
       105
       +
                                   "something went wrong storing",

     

       106
       106
       +
                                   shardMessage,

     

       107
       107
       +
                               );

     

       108
       108
       +
                               console.error(err);

     

       109
       109
       +
                           });

     

       110
       110
       +
                       break;

     

       111
       111
       +
                   }

     

       112
       112
       +
               }

     

       113
       113
       +
           });

     

       66
       114
        
       };

+41

src/lib/types/messages.ts

···

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

     

       2
       2
       +
       import { z } from "zod";

     

       3
       3
       +
       

     

       4
       4
       +
       export const websocketMessageSchema = z

     

       5
       5
       +
           .object({

     

       6
       6
       +
               type: z.union([

     

       7
       7
       +
                   z.literal("shard/message"),

     

       8
       8
       +
                   z.literal("shard/history"),

     

       9
       9
       +
                   z.literal("shard/requestHistory"),

     

       10
       10
       +
               ]),

     

       11
       11
       +
           })

     

       12
       12
       +
           .loose();

     

       13
       13
       +
       export type WebsocketMessage = z.infer<typeof websocketMessageSchema>;

     

       14
       14
       +
       

     

       15
       15
       +
       export const shardMessageSchema = websocketMessageSchema

     

       16
       16
       +
           .safeExtend({

     

       17
       17
       +
               type: z.literal("shard/message"),

     

       18
       18
       +
               channel: z.string(),

     

       19
       19
       +
               content: z.string(),

     

       20
       20
       +
               sentBy: didSchema,

     

       21
       21
       +
               sentAt: z.coerce.date(),

     

       22
       22
       +
           })

     

       23
       23
       +
           .strict();

     

       24
       24
       +
       export type ShardMessage = z.infer<typeof shardMessageSchema>;

     

       25
       25
       +
       

     

       26
       26
       +
       export const historyMessageSchema = websocketMessageSchema

     

       27
       27
       +
           .safeExtend({

     

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

     

       29
       29
       +
               messages: z.optional(z.array(shardMessageSchema)),

     

       30
       30
       +
               channel: z.string(),

     

       31
       31
       +
           })

     

       32
       32
       +
           .strict();

     

       33
       33
       +
       export type HistoryMessage = z.infer<typeof historyMessageSchema>;

     

       34
       34
       +
       

     

       35
       35
       +
       export const requestHistoryMessageSchema = websocketMessageSchema

     

       36
       36
       +
           .safeExtend({

     

       37
       37
       +
               type: z.literal("shard/requestHistory"),

     

       38
       38
       +
               channel: z.string(),

     

       39
       39
       +
           })

     

       40
       40
       +
           .strict();

     

       41
       41
       +
       export type RequestHistoryMessage = z.infer<typeof requestHistoryMessageSchema>;

-40

src/lib/types/ws/index.ts

···

       1
       1
       -
       import { shardMessagesInsertSchema } from "@/db/schema/messages";

     

       2
       2
       -
       import { verificationRequestSchema } from "@/lib/types/ws/verify";

     

       3
       3
       -
       import { z } from "zod";

     

       4
       4
       -
       

     

       5
       5
       -
       export const WebSocketMessageType = {

     

       6
       6
       -
           SHARD_VERIFY: "shard/verify",

     

       7
       7
       -
           SHARD_MESSAGE: "shard/message",

     

       8
       8
       -
       } as const;

     

       9
       9
       -
       export const webSocketMessageTypeSchema = z.enum(WebSocketMessageType);

     

       10
       10
       -
       export type WebSocketMessageType = z.infer<typeof webSocketMessageTypeSchema>;

     

       11
       11
       -
       

     

       12
       12
       -
       const webSocketMessageBase = z.object({

     

       13
       13
       -
           type: webSocketMessageTypeSchema,

     

       14
       14
       -
           data: z.unknown(),

     

       15
       15
       -
       });

     

       16
       16
       -
       

     

       17
       17
       -
       export const verificationMessageSchema = webSocketMessageBase.safeExtend({

     

       18
       18
       -
           type: z.literal("shard/verify"),

     

       19
       19
       -
           data: verificationRequestSchema,

     

       20
       20
       -
       });

     

       21
       21
       -
       export type VerificationMessage = z.infer<typeof verificationMessageSchema>;

     

       22
       22
       -
       

     

       23
       23
       -
       // there are only two difficult things in programming.

     

       24
       24
       -
       // 1. naming things

     

       25
       25
       -
       // 2. cache invalidation

     

       26
       26
       -
       // 3. off-by-one errors

     

       27
       27
       -
       export const shardMessageMessageSchema = webSocketMessageBase.safeExtend({

     

       28
       28
       -
           type: z.literal("shard/message"),

     

       29
       29
       -
           data: z.object({

     

       30
       30
       -
               message: shardMessagesInsertSchema,

     

       31
       31
       -
               sessionId: z.string(),

     

       32
       32
       -
           }),

     

       33
       33
       -
       });

     

       34
       34
       -
       export type ShardMessage = z.infer<typeof shardMessageMessageSchema>;

     

       35
       35
       -
       

     

       36
       36
       -
       export const webSocketMessageSchema = z.union([

     

       37
       37
       -
           verificationMessageSchema,

     

       38
       38
       -
           shardMessageMessageSchema,

     

       39
       39
       -
       ]);

     

       40
       40
       -
       export type WebSocketMessage = z.infer<typeof webSocketMessageSchema>;

-8

src/lib/types/ws/verify.ts

···

       1
       1
       -
       import { atUriSchema } from "@/lib/types/atproto";

     

       2
       2
       -
       import { z } from "zod";

     

       3
       3
       -
       

     

       4
       4
       -
       export const verificationRequestSchema = z.object({

     

       5
       5
       -
           interServiceJwt: z.unknown(),

     

       6
       6
       -
           channelAtUris: z.array(atUriSchema),

     

       7
       7
       -
       });

     

       8
       8
       -
       export type VerificationRequest = z.infer<typeof verificationRequestSchema>;

+32

src/lib/utils/gmstn.ts

···

       1
       1
       +
       import db from "@/db";

     

       2
       2
       +
       import { messagesTable, type ShardMessageInsert } from "@/db/schema/messages";

     

       3
       3
       +
       import type { ShardMessage } from "@/lib/types/messages";

     

       4
       4
       +
       import * as TID from "@atcute/tid";

     

       5
       5
       +
       

     

       6
       6
       +
       export const storeMessageInDb = async (message: ShardMessage) => {

     

       7
       7
       +
           const tid = TID.now();

     

       8
       8
       +
           const {

     

       9
       9
       +
               content,

     

       10
       10
       +
               channel: channelAtUri,

     

       11
       11
       +
               sentBy: authorDid,

     

       12
       12
       +
               sentAt,

     

       13
       13
       +
           } = message;

     

       14
       14
       +
           const messageToStore: ShardMessageInsert = {

     

       15
       15
       +
               id: tid,

     

       16
       16
       +
               authorDid,

     

       17
       17
       +
               content,

     

       18
       18
       +
               channelAtUri,

     

       19
       19
       +
               sentAt,

     

       20
       20
       +
               createdAt: new Date(),

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
           console.log("sentAt", sentAt.getTime());

     

       24
       24
       +
       

     

       25
       25
       +
           const insertResult = await db.insert(messagesTable).values(messageToStore);

     

       26
       26
       +
       

     

       27
       27
       +
           if (insertResult.rowsAffected > 0) console.log("Stored!");

     

       28
       28
       +
           else {

     

       29
       29
       +
               console.error("Something went wrong storing", messageToStore);

     

       30
       30
       +
               console.error("insertResult:", insertResult);

     

       31
       31
       +
           }

     

       32
       32
       +
       };

+45

src/lib/utils/ws/validate.ts

···

       1
       1
       +
       import type { WebsocketMessage } from "@/lib/types/messages";

     

       2
       2
       +
       import { websocketMessageSchema } from "@/lib/types/messages";

     

       3
       3
       +
       import type { Result } from "@/lib/utils/result";

     

       4
       4
       +
       import { z } from "zod";

     

       5
       5
       +
       import type { RawData } from "ws";

     

       6
       6
       +
       

     

       7
       7
       +
       export const rawDataToString = (data: RawData): string => {

     

       8
       8
       +
           if (Buffer.isBuffer(data)) {

     

       9
       9
       +
               return data.toString("utf-8");

     

       10
       10
       +
           }

     

       11
       11
       +
           if (Array.isArray(data)) {

     

       12
       12
       +
               return Buffer.concat(data).toString("utf-8");

     

       13
       13
       +
           }

     

       14
       14
       +
           return new TextDecoder().decode(data);

     

       15
       15
       +
       };

     

       16
       16
       +
       

     

       17
       17
       +
       export const validateWsMessageString = (

     

       18
       18
       +
           data: unknown,

     

       19
       19
       +
       ): Result<string, unknown> => {

     

       20
       20
       +
           const { success, error, data: message } = z.string().safeParse(data);

     

       21
       21
       +
           if (!success) {

     

       22
       22
       +
               console.error("Error decoding websocket message");

     

       23
       23
       +
               console.error(error);

     

       24
       24
       +
               return { ok: false, error: z.treeifyError(error) };

     

       25
       25
       +
           }

     

       26
       26
       +
           return { ok: true, data: message };

     

       27
       27
       +
       };

     

       28
       28
       +
       

     

       29
       29
       +
       export const validateWsMessageType = (

     

       30
       30
       +
           data: unknown,

     

       31
       31
       +
       ): Result<WebsocketMessage, unknown> => {

     

       32
       32
       +
           const {

     

       33
       33
       +
               success: wsMessageSuccess,

     

       34
       34
       +
               error: wsMessageError,

     

       35
       35
       +
               data: wsMessage,

     

       36
       36
       +
           } = websocketMessageSchema.safeParse(data);

     

       37
       37
       +
           if (!wsMessageSuccess) {

     

       38
       38
       +
               console.error(

     

       39
       39
       +
                   "Error parsing websocket message. The data might be the wrong shape.",

     

       40
       40
       +
               );

     

       41
       41
       +
               console.error(wsMessageError);

     

       42
       42
       +
               return { ok: false, error: z.treeifyError(wsMessageError) };

     

       43
       43
       +
           }

     

       44
       44
       +
           return { ok: true, data: wsMessage };

     

       45
       45
       +
       };