comparing 2b18a611e4112b481c068b79557a77313b073462 and main on gmstn.systems/lattice

+12

src/lib/types/lexicon/systems.gmstn.development.channel.invite.ts

···

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

     

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

     

       3
       3
       +
       

     

       4
       4
       +
       export const systemsGmstnDevelopmentChannelInviteRecordSchema = z.object({

     

       5
       5
       +
           $type: z.string(),

     

       6
       6
       +
           channel: comAtprotoRepoStrongRefSchema,

     

       7
       7
       +
           recipient: didSchema,

     

       8
       8
       +
           createdAt: z.coerce.date(),

     

       9
       9
       +
       });

     

       10
       10
       +
       export type SystemsGmstnDevelopmentChannelInvite = z.infer<

     

       11
       11
       +
           typeof systemsGmstnDevelopmentChannelInviteRecordSchema

     

       12
       12
       +
       >;

+4 -3

src/lib/types/http/handlers.ts

···

       1
       1
       +
       import { systemsGmstnDevelopmentChannelMembershipRecordSchema } from "@/lib/types/lexicon/systems.gmstn.development.channel.membership";

     

       1
       2
        
       import { z } from "zod";

     

       2
       3
        
       

     

       3
       3
       -
       export const handshakeDataSchema = z.object({

     

       4
       4
       +
       export const latticeHandshakeDataSchema = z.object({

     

       4
       5
        
           interServiceJwt: z.string(),

     

       5
       5
       -
           channelAtUris: z.array(z.string()),

     

       6
       6
       +
           memberships: z.array(systemsGmstnDevelopmentChannelMembershipRecordSchema),

     

       6
       7
        
       });

     

       7
       7
       -
       export type HandshakeData = z.infer<typeof handshakeDataSchema>;

     

       8
       8
       +
       export type LatticeHandshakeData = z.infer<typeof latticeHandshakeDataSchema>;

+2 -2

src/routes/handshake/route.ts

···

       1
       1
       -
       import { clientHandshakeHandler } from "@/lib/handlers/handshake";

     

       1
       1
       +
       import { latticeHandshakeHandler } from "@/lib/handlers/latticeHandshake";

     

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

     

       3
       3
        
       

     

       4
       4
        
       export const handshakeRoute: Route = {

     

       5
       5
        
           method: "POST",

     

       6
       6
       -
           handler: clientHandshakeHandler,

     

       6
       6
       +
           handler: latticeHandshakeHandler,

     

       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;

+12 -1

src/lib/types/routes.ts

···

       1
       1
       -
       import type { FastifyReply, FastifyRequest } from "fastify";

     

       1
       1
       +
       import type {

     

       2
       2
       +
           FastifyReply,

     

       3
       3
       +
           FastifyRequest,

     

       4
       4
       +
           HookHandlerDoneFunction,

     

       5
       5
       +
       } from "fastify";

     

       2
       6
        
       import type { WebSocket } from "ws";

     

       3
       7
        
       

     

       4
       8
        
       export type RouteHandler = (

     
···

       6
       10
        
           reply: FastifyReply,

     

       7
       11
        
       ) => Response | Promise<Response>;

     

       8
       12
        
       

     

       13
       13
       +
       export type PreHandler = (

     

       14
       14
       +
           req: FastifyRequest,

     

       15
       15
       +
           reply: FastifyReply,

     

       16
       16
       +
           done: HookHandlerDoneFunction,

     

       17
       17
       +
       ) => void;

     

       18
       18
       +
       

     

       9
       19
        
       export type Method = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";

     

       10
       20
        
       

     

       11
       21
        
       export interface Route {

     
···

       21
       31
        
           method?: Method;

     

       22
       32
        
           handler?: RouteHandler;

     

       23
       33
        
           wsHandler: WsRouteHandler;

     

       34
       34
       +
           preHandler?: PreHandler;

     

       24
       35
        
           skipRegistrationCheckHttp?: true;

     

       25
       36
        
           skipRegistrationCheckWs?: true;

     

       26
       37
        
       }

+7

src/routes/connect/route.ts

···

       1
       1
       +
       import { connectPreHandler, connectWsHandler } from "@/lib/handlers/connect";

     

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

     

       3
       3
       +
       

     

       4
       4
       +
       export const connectRoute: WsRoute = {

     

       5
       5
       +
           wsHandler: connectWsHandler,

     

       6
       6
       +
           preHandler: connectPreHandler,

     

       7
       7
       +
       };

+1 -1

src/lib/utils/registration.ts

···

       3
       3
        
       import { prismCommitSchema } from "@/lib/types/prism";

     

       4
       4
        
       import type { RouteHandler, WsRouteHandler } from "@/lib/types/routes";

     

       5
       5
        
       import { newErrorResponse } from "@/lib/utils/http/responses";

     

       6
       6
       -
       import { rawDataToString } from "@/lib/utils/ws";

     

       6
       6
       +
       import { rawDataToString } from "@/lib/utils/ws/validate";

     

       7
       7
        
       import type { RawData } from "ws";

     

       8
       8
        
       import type WebSocket from "ws";

     

       9
       9

-11

src/lib/utils/ws/index.ts

···

       1
       1
       -
       import type { RawData } from "ws";

     

       2
       2
       -
       

     

       3
       3
       -
       export const rawDataToString = (data: RawData): string => {

     

       4
       4
       -
           if (Buffer.isBuffer(data)) {

     

       5
       5
       -
               return data.toString("utf-8");

     

       6
       6
       -
           }

     

       7
       7
       -
           if (Array.isArray(data)) {

     

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

     

       9
       9
       -
           }

     

       10
       10
       -
           return new TextDecoder().decode(data);

     

       11
       11
       -
       };

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

+44 -2

src/lib/handlers/connect.ts

···

       1
       1
        
       import {

     

       2
       2
        
           createNewSession,

     

       3
       3
       +
           deleteSession,

     

       3
       4
        
           issuedLatticeTokens,

     

       4
       5
        
           isValidSession,

     

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

     

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

     

       7
       7
       +
       import {

     

       8
       8
       +
           requestHistoryMessageSchema,

     

       9
       9
       +
           shardMessageSchema,

     

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

     

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

     

       8
       12
        
       import { stringToAtUri } from "@/lib/utils/atproto";

     

       9
       9
       -
       import { sendToChannelClients, storeMessageInShard } from "@/lib/utils/gmstn";

     

       13
       13
       +
       import {

     

       14
       14
       +
           sendHistoryRequestToShard,

     

       15
       15
       +
           sendToChannelClients,

     

       16
       16
       +
           storeMessageInShard,

     

       17
       17
       +
       } from "@/lib/utils/gmstn";

     

       10
       18
        
       import {

     

       11
       19
        
           rawDataToString,

     

       12
       20
        
           validateWsMessageType,

     
···

       105
       113
        
       

     

       106
       114
        
                       sendToChannelClients({ channelAtUri, message: shardMessage });

     

       107
       115
        
                       storeMessageInShard({ channelAtUri, message: shardMessage });

     

       116
       116
       +
                       break;

     

       117
       117
       +
                   }

     

       118
       118
       +
                   case "shard/requestHistory": {

     

       119
       119
       +
                       const {

     

       120
       120
       +
                           success,

     

       121
       121
       +
                           error,

     

       122
       122
       +
                           data: requestHistoryMessage,

     

       123
       123
       +
                       } = requestHistoryMessageSchema.safeParse(

     

       124
       124
       +
                           validateTypeResult.data,

     

       125
       125
       +
                       );

     

       126
       126
       +
                       if (!success) {

     

       127
       127
       +
                           console.error(

     

       128
       128
       +
                               "could not parse",

     

       129
       129
       +
                               validateTypeResult.data,

     

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

     

       131
       131
       +
                           );

     

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

     

       133
       133
       +
                           return;

     

       134
       134
       +
                       }

     

       135
       135
       +
       

     

       136
       136
       +
                       const { channel } = requestHistoryMessage;

     

       137
       137
       +
       

     

       138
       138
       +
                       const atUriParseResult = stringToAtUri(channel);

     

       139
       139
       +
                       if (!atUriParseResult.ok) return;

     

       140
       140
       +
                       const { data: channelAtUri } = atUriParseResult;

     

       141
       141
       +
       

     

       142
       142
       +
                       sendHistoryRequestToShard({

     

       143
       143
       +
                           channelAtUri,

     

       144
       144
       +
                           message: requestHistoryMessage,

     

       145
       145
       +
                       });

     

       108
       146
        
                   }

     

       109
       147
        
               }

     

       110
       148
        
           });

     

       149
       149
       +
       

     

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

     

       151
       151
       +
               deleteSession(sessionInfo);

     

       152
       152
       +
           });

     

       111
       153
        
       };

+54

src/lib/listeners/shard-history.ts

···

       1
       1
       +
       import { clientSessions } from "@/lib/sessions";

     

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

     

       3
       3
       +
       import {

     

       4
       4
       +
           rawDataToString,

     

       5
       5
       +
           validateWsMessageType,

     

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

     

       7
       7
       +
       import type WebSocket from "ws";

     

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

     

       9
       9
       +
       

     

       10
       10
       +
       export const attachHistoryFromShardListener = (socket: WebSocket) => {

     

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

     

       12
       12
       +
               const event = rawDataToString(rawData);

     

       13
       13
       +
       

     

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

     

       15
       15
       +
               const validateTypeResult = validateWsMessageType(data);

     

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

     

       17
       17
       +
       

     

       18
       18
       +
               console.log("received", validateTypeResult.data, "from shard")

     

       19
       19
       +
       

     

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

     

       21
       21
       +
               if (messageType !== "shard/history") return;

     

       22
       22
       +
               const {

     

       23
       23
       +
                   success,

     

       24
       24
       +
                   error,

     

       25
       25
       +
                   data: historyMessage,

     

       26
       26
       +
               } = historyMessageSchema.safeParse(validateTypeResult.data);

     

       27
       27
       +
               if (!success) {

     

       28
       28
       +
                   console.error(

     

       29
       29
       +
                       "could not parse",

     

       30
       30
       +
                       validateTypeResult.data,

     

       31
       31
       +
                       "as a valid history message.",

     

       32
       32
       +
                   );

     

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

     

       34
       34
       +
                   return;

     

       35
       35
       +
               }

     

       36
       36
       +
               const { forClient: intendedRecipient } = historyMessage;

     

       37
       37
       +
               const clientSessionInfo = clientSessions

     

       38
       38
       +
                   .keys()

     

       39
       39
       +
                   .find((sessionInfo) => sessionInfo.clientDid === intendedRecipient);

     

       40
       40
       +
               if (!clientSessionInfo) {

     

       41
       41
       +
                   console.error("Could not client session info in sessions map.");

     

       42
       42
       +
                   return;

     

       43
       43
       +
               }

     

       44
       44
       +
               const clientSocket = clientSessions.get(clientSessionInfo);

     

       45
       45
       +
               if (!clientSocket) {

     

       46
       46
       +
                   console.error(

     

       47
       47
       +
                       "Could find session info in map but somehow couldn't find socket? This should not happen.",

     

       48
       48
       +
                   );

     

       49
       49
       +
                   return;

     

       50
       50
       +
               }

     

       51
       51
       +
               clientSocket.send(JSON.stringify(historyMessage));

     

       52
       52
       +
               console.log("sent off", historyMessage, "to client")

     

       53
       53
       +
           });

     

       54
       54
       +
       };

+40 -1

src/lib/utils/gmstn.ts

···

       1
       1
       +
       import { attachHistoryFromShardListener } from "@/lib/listeners/shard-history";

     

       1
       2
        
       import { clientSessions } from "@/lib/sessions";

     

       2
       3
        
       import { shardSessions } from "@/lib/state";

     

       3
       4
        
       import type { AtUri, Did } from "@/lib/types/atproto";

     

       4
       5
        
       import type { ShardSessionInfo } from "@/lib/types/handshake";

     

       5
       5
       -
       import type { ShardMessage } from "@/lib/types/messages";

     

       6
       6
       +
       import type { RequestHistoryMessage, ShardMessage } from "@/lib/types/messages";

     

       6
       7
        
       import { getEndpointFromDid } from "@/lib/utils/atproto";

     

       7
       8
        
       import WebSocket from "ws";

     

       8
       9
        
       

     
···

       22
       23
        
           endpoint.searchParams.append("token", token);

     

       23
       24
        
           const ws = new WebSocket(endpoint);

     

       24
       25
        
           shardSessions.set(sessionInfo, ws);

     

       26
       26
       +
           attachHistoryFromShardListener(ws);

     

       25
       27
        
           return ws;

     

       26
       28
        
       };

     

       27
       29
        
       

     
···

       93
       95
        
               );

     

       94
       96
        
           });

     

       95
       97
        
       };

     

       98
       98
       +
       

     

       99
       99
       +
       export const sendHistoryRequestToShard = ({

     

       100
       100
       +
           channelAtUri,

     

       101
       101
       +
           message,

     

       102
       102
       +
       }: {

     

       103
       103
       +
           channelAtUri: AtUri;

     

       104
       104
       +
           message: RequestHistoryMessage;

     

       105
       105
       +
       }) => {

     

       106
       106
       +
           const shardSessionInfo = shardSessions

     

       107
       107
       +
               .keys()

     

       108
       108
       +
               .find((sessionInfo) =>

     

       109
       109
       +
                   sessionInfo.allowedChannels.some(

     

       110
       110
       +
                       (allowedChannel) => allowedChannel.rKey === channelAtUri.rKey,

     

       111
       111
       +
                   ),

     

       112
       112
       +
               );

     

       113
       113
       +
           if (!shardSessionInfo) return;

     

       114
       114
       +
       

     

       115
       115
       +
           const shardSocket = shardSessions.get(shardSessionInfo);

     

       116
       116
       +
           if (!shardSocket) {

     

       117
       117
       +
               console.error(

     

       118
       118
       +
                   "Could find session info object in map, but socket could not be retrieved from map. Race condition?",

     

       119
       119
       +
               );

     

       120
       120
       +
               return;

     

       121
       121
       +
           }

     

       122
       122
       +
           const messageToSendToShard = {

     

       123
       123
       +
               ...message,

     

       124
       124
       +
           };

     

       125
       125
       +
           if (shardSocket.readyState === WebSocket.OPEN)

     

       126
       126
       +
               shardSocket.send(JSON.stringify(messageToSendToShard));

     

       127
       127
       +
       

     

       128
       128
       +
           console.log(

     

       129
       129
       +
               "Sent off message",

     

       130
       130
       +
               message,

     

       131
       131
       +
               "to shard located at",

     

       132
       132
       +
               shardSocket.url,

     

       133
       133
       +
           );

     

       134
       134
       +
       };

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

+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 lattice 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.lattice.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
       +
       };

+1

.gitignore

···

       2
       2
        
       /node_modules

     

       3
       3
        
       /dist

     

       4
       4
        
       .env

     

       5
       5
       +
       .docker.env

     

       5
       6
        
       *.tsbuildinfo

+2 -1

src/lib/setup.ts

···

       112
       112
        
                   channels: channelAtUris,

     

       113
       113
        
               });

     

       114
       114
        
               if (!handshakeResult.ok) {

     

       115
       115
       -
                   console.error(handshakeResult.error);

     

       115
       115
       +
                   console.error("Handshake to", shardDid, "failed.");

     

       116
       116
       +
                   console.error(JSON.stringify(handshakeResult.error));

     

       116
       117
        
                   continue;

     

       117
       118
        
               }

     

       118
       119
        
               const sessionInfo = handshakeResult.data;

+1 -1

src/lib/env.ts

···

       27
       27
        
               "Environment variable SERVICE_DID not set. Defaulting to `did:web:localhost`",

     

       28
       28
        
           );

     

       29
       29
        
       }

     

       30
       30
       -
       export const SERVICE_DID = serviceDidParsed ?? "did:web:localhost";

     

       30
       30
       +
       export const SERVICE_DID = serviceDidParsed ?? `did:web:localhost%3A${SERVER_PORT.toString()}`;

     

       31
       31
        
       

     

       32
       32
        
       const constellationUrl = process.env.CONSTELLATION_URL;

     

       33
       33
        
       let constellationUrlParsed: URL | undefined;

Compare changes