commit fffcd95bfe9ce3ffbc34f1f9bd51bff5cb24ab2f · gmstn.systems/shard

+68 -5

src/lib/handlers/connect.ts

···

       1
       1
        
       import {

     

       2
       2
        
           createNewSession,

     

       3
       3
       +
           deleteSession,

     

       3
       4
        
           issuedHandshakes,

     

       4
       5
        
           isValidSession,

     

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

     

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

     

       7
       7
       +
       import type { Did } from "@/lib/types/atproto";

     

       8
       8
       +
       import type { HistoryMessage } from "@/lib/types/messages";

     

       9
       9
       +
       import {

     

       10
       10
       +
           requestHistoryMessageSchema,

     

       11
       11
       +
           shardMessageSchema,

     

       12
       12
       +
       } from "@/lib/types/messages";

     

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

     

       8
       14
        
       import { atUriToString } from "@/lib/utils/atproto";

     

       9
       9
       -
       import { storeMessageInDb } from "@/lib/utils/gmstn";

     

       15
       15
       +
       import { getChannelHistory, storeMessageInDb } from "@/lib/utils/gmstn";

     

       10
       16
        
       import {

     

       11
       17
        
           rawDataToString,

     

       12
       18
        
           validateWsMessageType,

     
···

       73
       79
        
           }

     

       74
       80
        
       

     

       75
       81
        
           // convert at uri objects array to set of at uri strings for easier lookup.

     

       76
       76
       -
           const socketAllowedChannels = new Set(sessionInfo.allowedChannels.map(channel => atUriToString(channel)));

     

       82
       82
       +
           const socketAllowedChannels = new Set(

     

       83
       83
       +
               sessionInfo.allowedChannels.map((channel) => atUriToString(channel)),

     

       84
       84
       +
           );

     

       85
       85
       +
       

     

       86
       86
       +
           const socketLatticeDid = sessionInfo.latticeDid;

     

       77
       87
        
       

     

       78
       88
        
           socket.on("message", (rawData) => {

     

       79
       89
        
               const event = rawDataToString(rawData);

     
···

       101
       111
        
                           return;

     

       102
       112
        
                       }

     

       103
       113
        
       

     

       104
       104
       -
                       const { channel } = shardMessage

     

       105
       105
       -
                       if(!socketAllowedChannels.has(channel)) return;

     

       114
       114
       +
                       const { channel, routedThrough } = shardMessage;

     

       115
       115
       +
                       if (!socketAllowedChannels.has(channel)) return;

     

       116
       116
       +
                       if (routedThrough !== socketLatticeDid) return;

     

       106
       117
        
       

     

       107
       118
        
                       storeMessageInDb(shardMessage)

     

       108
       119
        
                           .then(() => {

     
···

       117
       128
        
                           });

     

       118
       129
        
                       break;

     

       119
       130
        
                   }

     

       131
       131
       +
                   case "shard/requestHistory": {

     

       132
       132
       +
                       const {

     

       133
       133
       +
                           success,

     

       134
       134
       +
                           error,

     

       135
       135
       +
                           data: requestHistoryMessage,

     

       136
       136
       +
                       } = requestHistoryMessageSchema.safeParse(

     

       137
       137
       +
                           validateTypeResult.data,

     

       138
       138
       +
                       );

     

       139
       139
       +
                       if (!success) {

     

       140
       140
       +
                           console.error(

     

       141
       141
       +
                               "could not parse",

     

       142
       142
       +
                               validateTypeResult.data,

     

       143
       143
       +
                               "as a valid request history message.",

     

       144
       144
       +
                           );

     

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

     

       146
       146
       +
                           return;

     

       147
       147
       +
                       }

     

       148
       148
       +
                       const { channel, requestedBy } = requestHistoryMessage;

     

       149
       149
       +
                       if (!socketAllowedChannels.has(channel)) return;

     

       150
       150
       +
       

     

       151
       151
       +
                       (async () => {

     

       152
       152
       +
                           const messagesResult = await getChannelHistory(channel);

     

       153
       153
       +
                           if (!messagesResult.ok) {

     

       154
       154
       +
                               console.error(messagesResult.error);

     

       155
       155
       +
                               throw new Error(

     

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

     

       157
       157
       +
                               );

     

       158
       158
       +
                           }

     

       159
       159
       +
                           const historyMessage: HistoryMessage = {

     

       160
       160
       +
                               type: "shard/history",

     

       161
       161
       +
                               channel,

     

       162
       162
       +
                               messages: messagesResult.data.map((message) => ({

     

       163
       163
       +
                                   type: "shard/message",

     

       164
       164
       +
                                   channel,

     

       165
       165
       +
                                   content: message.content,

     

       166
       166
       +
                                   sentBy: message.authorDid as Did,

     

       167
       167
       +
                                   sentAt: message.createdAt,

     

       168
       168
       +
                                   routedThrough: socketLatticeDid,

     

       169
       169
       +
                               })),

     

       170
       170
       +
                               forClient: requestedBy,

     

       171
       171
       +
                           };

     

       172
       172
       +
                           socket.send(JSON.stringify(historyMessage));

     

       173
       173
       +
                           console.log("sent off", historyMessage, "back to lattice");

     

       174
       174
       +
                       })().catch((e: unknown) => {

     

       175
       175
       +
                           console.error("Could not get channel history.");

     

       176
       176
       +
                           console.error(e);

     

       177
       177
       +
                       });

     

       178
       178
       +
                   }

     

       120
       179
        
               }

     

       180
       180
       +
           });

     

       181
       181
       +
       

     

       182
       182
       +
           socket.on("close", () => {

     

       183
       183
       +
               deleteSession(sessionInfo);

     

       121
       184
        
           });

     

       122
       185
        
       };

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>;

+19

src/lib/utils/gmstn.ts

···

       1
       1
        
       import db from "@/db";

     

       2
       2
       +
       import type { ShardMessageSelect } from "@/db/schema/messages";

     

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

     

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

     

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

     

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

     

       7
       7
       +
       import { eq } from "drizzle-orm";

     

       5
       8
        
       

     

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

     

       7
       10
        
           const tid = TID.now();

     
···

       28
       31
        
               console.error("insertResult:", insertResult);

     

       29
       32
        
           }

     

       30
       33
        
       };

     

       34
       34
       +
       

     

       35
       35
       +
       export const getChannelHistory = async (

     

       36
       36
       +
           channelAtUriString: string,

     

       37
       37
       +
       ): Promise<Result<Array<ShardMessageSelect>, unknown>> => {

     

       38
       38
       +
           const messages = await db

     

       39
       39
       +
               .select()

     

       40
       40
       +
               .from(messagesTable)

     

       41
       41
       +
               .where(eq(messagesTable.channelAtUri, channelAtUriString))

     

       42
       42
       +
               .limit(100);

     

       43
       43
       +
           if (messages.length === 0)

     

       44
       44
       +
               return {

     

       45
       45
       +
                   ok: false,

     

       46
       46
       +
                   error: "Channel either has no messages, or the provided channel at uri is wrong.",

     

       47
       47
       +
               };

     

       48
       48
       +
           return { ok: true, data: messages };

     

       49
       49
       +
       };