comparing 7c34ea9f5a68f0ce23145fd7af37bb7ec3e736c1 and main on gmstn.systems/lattice

+4 -1

src/lib/utils/domains.ts

···

       5
        
       export const isDomain = (str: string) => {

     

       6
        
           try {

     

       7
        
               const url = new URL(str.includes("://") ? str : `https://${str}`);

     

       8
       -
               return url.hostname.includes(".") && !url.hostname.startsWith(".");

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
           } catch {

     

       10
        
               return false;

     

       11
        
           }

···

       5
        
       export const isDomain = (str: string) => {

     

       6
        
           try {

     

       7
        
               const url = new URL(str.includes("://") ? str : `https://${str}`);

     

       8
       +
               return (

     

       9
       +
                   (url.hostname.includes(".") && !url.hostname.startsWith(".")) ||

     

       10
       +
                   url.hostname === "localhost"

     

       11
       +
               );

     

       12
        
           } catch {

     

       13
        
               return false;

     

       14
        
           }

-43

src/index.old.ts

···

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

     

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

     

       3
       -
       import { validateNewMessage } from "@/lib/validators";

     

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

     

       5
       -
       import WebSocket from "ws";

     

       6
       -
       

     

       7
       -
       const wss = new WebSocket.Server({ port: 8080 });

     

       8
       -
       

     

       9
       -
       const messages: ShardMessage[] = [];

     

       10
       -
       const clients = new Set<WebSocket>();

     

       11
       -
       

     

       12
       -
       wss.on("connection", (ws) => {

     

       13
       -
           clients.add(ws);

     

       14
       -
       

     

       15
       -
           ws.send(

     

       16
       -
               JSON.stringify({

     

       17
       -
                   type: "shard/history",

     

       18
       -
                   messages: messages,

     

       19
       -
               }),

     

       20
       -
           );

     

       21
       -
       

     

       22
       -
           ws.on("message", (data: RawData) => {

     

       23
       -
               const jsonText = rawDataToString(data);

     

       24
       -
               const jsonData: unknown = JSON.parse(jsonText);

     

       25
       -
       

     

       26
       -
               const shardMessage = validateNewMessage(jsonData);

     

       27
       -
               if (!shardMessage) return;

     

       28
       -
       

     

       29
       -
               messages.push(shardMessage);

     

       30
       -
       

     

       31
       -
               clients.forEach((client) => {

     

       32
       -
                   if (client.readyState === WebSocket.OPEN) {

     

       33
       -
                       client.send(JSON.stringify(shardMessage));

     

       34
       -
                   }

     

       35
       -
               });

     

       36
       -
           });

     

       37
       -
       

     

       38
       -
           ws.on("close", () => {

     

       39
       -
               clients.delete(ws);

     

       40
       -
           });

     

       41
       -
       });

     

       42
       -
       

     

       43
       -
       console.log("Server running on ws://localhost:8080");

+191

src/lib/handlers/handshake.ts

···

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

     

       2
       +
       import { issueNewLatticeToken } from "@/lib/sessions";

     

       3
       +
       import { HttpGeneralErrorType } from "@/lib/types/http/errors";

     

       4
       +
       import { handshakeDataSchema } from "@/lib/types/http/handlers";

     

       5
       +
       import { systemsGmstnDevelopmentChannelRecordSchema } from "@/lib/types/lexicon/systems.gmstn.development.channel";

     

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

     

       7
       +
       import { stringToAtUri } from "@/lib/utils/atproto";

     

       8
       +
       import {

     

       9
       +
           getConstellationBacklink,

     

       10
       +
           getPdsRecordFromBacklink,

     

       11
       +
       } from "@/lib/utils/constellation";

     

       12
       +
       import {

     

       13
       +
           newErrorResponse,

     

       14
       +
           newSuccessResponse,

     

       15
       +
       } from "@/lib/utils/http/responses";

     

       16
       +
       import { verifyServiceJwt } from "@/lib/utils/verifyJwt";

     

       17
       +
       import { z } from "zod";

     

       18
       +
       

     

       19
       +
       export const handshakeHandler: RouteHandler = async (req) => {

     

       20
       +
           const {

     

       21
       +
               success: handshakeParseSuccess,

     

       22
       +
               error: handshakeParseError,

     

       23
       +
               data: handshakeData,

     

       24
       +
           } = handshakeDataSchema.safeParse(req.body);

     

       25
       +
           if (!handshakeParseSuccess) {

     

       26
       +
               return newErrorResponse(400, {

     

       27
       +
                   message: HttpGeneralErrorType.TYPE_ERROR,

     

       28
       +
                   details: z.treeifyError(handshakeParseError),

     

       29
       +
               });

     

       30
       +
           }

     

       31
       +
       

     

       32
       +
           const { interServiceJwt, channelAtUris: channelAtUriStrings } =

     

       33
       +
               handshakeData;

     

       34
       +
           const allowedChannels = channelAtUriStrings.map((channel) => {

     

       35
       +
               const res = stringToAtUri(channel);

     

       36
       +
               if (!res.ok) return;

     

       37
       +
               return res.data;

     

       38
       +
           });

     

       39
       +
       

     

       40
       +
           const verifyJwtResult = await verifyServiceJwt(interServiceJwt);

     

       41
       +
           if (!verifyJwtResult.ok) {

     

       42
       +
               const { error } = verifyJwtResult;

     

       43
       +
               return newErrorResponse(

     

       44
       +
                   401,

     

       45
       +
                   {

     

       46
       +
                       message:

     

       47
       +
                           "JWT authentication failed. Did you submit the right inter-service JWT to the right endpoint with the right signatures?",

     

       48
       +
                       details: error,

     

       49
       +
                   },

     

       50
       +
                   {

     

       51
       +
                       headers: {

     

       52
       +
                           "WWW-Authenticate":

     

       53
       +
                               'Bearer error="invalid_token", error_description="JWT signature verification failed"',

     

       54
       +
                       },

     

       55
       +
                   },

     

       56
       +
               );

     

       57
       +
           }

     

       58
       +
       

     

       59
       +
           // TODO:

     

       60
       +
           // if(PRIVATE_SHARD) doAllowCheck()

     

       61
       +
           // see the sequence diagram for the proper flow.

     

       62
       +
           // not implemented for now because we support public first

     

       63
       +
       

     

       64
       +
           const constellationResponse = await getConstellationBacklink({

     

       65
       +
               subject: `at://${OWNER_DID}/systems.gmstn.development.shard/${SERVICE_DID.slice(8)}`,

     

       66
       +
               source: {

     

       67
       +
                   nsid: "systems.gmstn.development.channel",

     

       68
       +
                   fieldName: "storeAt.uri",

     

       69
       +
               },

     

       70
       +
           });

     

       71
       +
           if (!constellationResponse.ok) {

     

       72
       +
               const { error } = constellationResponse;

     

       73
       +
               if ("fetchStatus" in error)

     

       74
       +
                   return newErrorResponse(error.fetchStatus, {

     

       75
       +
                       message:

     

       76
       +
                           "Could not fetch backlinks from constellation. Likely something went wrong on our side.",

     

       77
       +
                       details: error.message,

     

       78
       +
                   });

     

       79
       +
               else

     

       80
       +
                   return newErrorResponse(400, {

     

       81
       +
                       message: HttpGeneralErrorType.TYPE_ERROR,

     

       82
       +
                       details: z.treeifyError(error),

     

       83
       +
                   });

     

       84
       +
           }

     

       85
       +
       

     

       86
       +
           const pdsRecordFetchPromises = constellationResponse.data.records.map(

     

       87
       +
               async (backlink) => {

     

       88
       +
                   const recordResult = await getPdsRecordFromBacklink(backlink);

     

       89
       +
                   if (!recordResult.ok) {

     

       90
       +
                       console.error(

     

       91
       +
                           `something went wrong fetching the record from the given backlink ${JSON.stringify(backlink)}`,

     

       92
       +
                       );

     

       93
       +
                       throw new Error(

     

       94
       +
                           JSON.stringify({ error: recordResult.error, backlink }),

     

       95
       +
                       );

     

       96
       +
                   }

     

       97
       +
                   return recordResult.data;

     

       98
       +
               },

     

       99
       +
           );

     

       100
       +
       

     

       101
       +
           let pdsChannelRecords;

     

       102
       +
           try {

     

       103
       +
               pdsChannelRecords = await Promise.all(pdsRecordFetchPromises);

     

       104
       +
           } catch (err) {

     

       105
       +
               return newErrorResponse(500, {

     

       106
       +
                   message:

     

       107
       +
                       "Something went wrong when fetching backlink channel records. Check the Shard logs if possible.",

     

       108
       +
                   details: err,

     

       109
       +
               });

     

       110
       +
           }

     

       111
       +
       

     

       112
       +
           const {

     

       113
       +
               success: channelRecordsParseSuccess,

     

       114
       +
               error: channelRecordsParseError,

     

       115
       +
               data: channelRecordsParsed,

     

       116
       +
           } = z

     

       117
       +
               .array(systemsGmstnDevelopmentChannelRecordSchema)

     

       118
       +
               .safeParse(pdsChannelRecords);

     

       119
       +
           if (!channelRecordsParseSuccess) {

     

       120
       +
               return newErrorResponse(500, {

     

       121
       +
                   message:

     

       122
       +
                       "One of the backlinks returned by Constellation did not resolve to a proper lexicon Channel record.",

     

       123
       +
                   details: z.treeifyError(channelRecordsParseError),

     

       124
       +
               });

     

       125
       +
           }

     

       126
       +
       

     

       127
       +
           // TODO:

     

       128
       +
           // for private shards, ensure that the channels described by constellation backlinks are made

     

       129
       +
           // by authorised parties (check owner pds for workspace management permissions)

     

       130
       +
           // do another fetch to owner's pds first to grab the records, then cross-reference with the

     

       131
       +
           // did of the backlink. if there are any channels described by unauthorised parties, simply drop them.

     

       132
       +
       

     

       133
       +
           let mismatchOrIncorrect = false;

     

       134
       +
           const requestingLatticeDid = verifyJwtResult.value.issuer;

     

       135
       +
       

     

       136
       +
           channelRecordsParsed.forEach((channel) => {

     

       137
       +
               if (mismatchOrIncorrect) return;

     

       138
       +
       

     

       139
       +
               const { storeAt: storeAtRecord, routeThrough: routeThroughRecord } =

     

       140
       +
                   channel;

     

       141
       +
               const storeAtRecordParseResult = stringToAtUri(storeAtRecord.uri);

     

       142
       +
               if (!storeAtRecordParseResult.ok) {

     

       143
       +
                   mismatchOrIncorrect = true;

     

       144
       +
                   return;

     

       145
       +
               }

     

       146
       +
               const storeAtUri = storeAtRecordParseResult.data;

     

       147
       +
       

     

       148
       +
               // FIXME: this assumes that the current shard's SERVICE_DID is a did:web.

     

       149
       +
               // we should resolve the full record or add something that can tell us where to find this shard.

     

       150
       +
               // likely, we should simply resolve the described shard record, which we can technically do faaaaar earlier on in the request

     

       151
       +
               // or even store it in memory upon first boot of a shard.

     

       152
       +
               // also incorrectly assumes that the storeAt rkey is a domain when it can in fact be anything.

     

       153
       +
               // we should probably just resolve this properly first but for now, i cba.

     

       154
       +
               if (storeAtUri.rKey !== SERVICE_DID.slice(8)) {

     

       155
       +
                   mismatchOrIncorrect = true;

     

       156
       +
                   return;

     

       157
       +
               }

     

       158
       +
       

     

       159
       +
               const routeThroughRecordParseResult = stringToAtUri(

     

       160
       +
                   routeThroughRecord.uri,

     

       161
       +
               );

     

       162
       +
               if (!routeThroughRecordParseResult.ok) {

     

       163
       +
                   mismatchOrIncorrect = true;

     

       164
       +
                   return;

     

       165
       +
               }

     

       166
       +
               const routeThroughUri = routeThroughRecordParseResult.data;

     

       167
       +
       

     

       168
       +
               // FIXME: this also assumes that the requesting lattice's DID is a did:web

     

       169
       +
               // see above for the rest of the issues.

     

       170
       +
               if (routeThroughUri.rKey === requestingLatticeDid.slice(8)) {

     

       171
       +
                   mismatchOrIncorrect = true;

     

       172
       +
                   return;

     

       173
       +
               }

     

       174
       +
           });

     

       175
       +
       

     

       176
       +
           // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition

     

       177
       +
           if (mismatchOrIncorrect)

     

       178
       +
               return newErrorResponse(400, {

     

       179
       +
                   message:

     

       180
       +
                       "Channels provided during the handshake had a mismatch between the channel values. Ensure that you are only submitting exactly the channels you have access to.",

     

       181
       +
               });

     

       182
       +
       

     

       183
       +
           // yipee, it's a valid request :3

     

       184
       +
       

     

       185
       +
           const sessionInfo = issueNewLatticeToken({

     

       186
       +
               allowedChannels,

     

       187
       +
               clientDid: verifyJwtResult.value.issuer,

     

       188
       +
           });

     

       189
       +
       

     

       190
       +
           return newSuccessResponse({ sessionInfo });

     

       191
       +
       };

src/lib/utils/crypto.ts

···

       1
       +
       import * as crypto from "node:crypto";

     

       2
       +
       

     

       3
       +
       export const generateNewSecret = () => {

     

       4
       +
           return crypto.randomBytes(32).toString("hex");

     

       5
       +
       };

     

       6
       +
       

     

       7
       +
       export const SESSIONS_SECRET = generateNewSecret();

+14

src/lib/utils/verifyJwt.ts

···

       1
       +
       import { SERVER_PORT, SERVICE_DID } from "@/lib/env";

     

       2
       +
       import { didDocResolver } from "@/lib/utils/atproto";

     

       3
       +
       import { ServiceJwtVerifier } from "@atcute/xrpc-server/auth";

     

       4
       +
       

     

       5
       +
       export const verifyServiceJwt = async (jwt: string) => {

     

       6
       +
           const serviceDid = SERVICE_DID.startsWith("did:web:localhost")

     

       7
       +
               ? (`${SERVICE_DID}%3A${SERVER_PORT.toString()}` as `did:${string}:${string}`)

     

       8
       +
               : SERVICE_DID;

     

       9
       +
           const verifier = new ServiceJwtVerifier({

     

       10
       +
               resolver: didDocResolver,

     

       11
       +
               serviceDid,

     

       12
       +
           });

     

       13
       +
           return await verifier.verify(jwt);

     

       14
       +
       };

-30

src/routes/testing/route.ts

···

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

     

       2
       -
       import { initiateHandshakeTo } from "@/lib/utils/handshake";

     

       3
       -
       import {

     

       4
       -
           newErrorResponse,

     

       5
       -
           newSuccessResponse,

     

       6
       -
       } from "@/lib/utils/http/responses";

     

       7
       -
       

     

       8
       -
       export const testingRoute: Route = {

     

       9
       -
           method: "GET",

     

       10
       -
           handler: async () => {

     

       11
       -
               const sessionInfo = await initiateHandshakeTo({

     

       12
       -
                   did: "did:web:localhost%3A7337",

     

       13
       -
                   channels: [

     

       14
       -
                       {

     

       15
       -
                           authority: "did:plc:knucpdtudgdpyoeydicvhzel",

     

       16
       -
                           collection: "systems.gmstn.development.channel",

     

       17
       -
                           rKey: "3m3tpcwneq22e",

     

       18
       -
                       },

     

       19
       -
                   ],

     

       20
       -
               });

     

       21
       -
               if (!sessionInfo.ok)

     

       22
       -
                   return newErrorResponse(400, {

     

       23
       -
                       message: "something went wrong with the handshake.",

     

       24
       -
                       details: sessionInfo.error,

     

       25
       -
                   });

     

       26
       -
               return newSuccessResponse({

     

       27
       -
                   sessionInfo: sessionInfo.data,

     

       28
       -
               });

     

       29
       -
           },

     

       30
       -
       };

+19

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

···

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

     

       2
       +
       import { z } from "zod";

     

       3
       +
       

     

       4
       +
       export const systemsGmstnDevelopmentChannelMembershipRecordSchema = z.object({

     

       5
       +
           $type: z.string(),

     

       6
       +
           state: z.union([

     

       7
       +
               z.literal("accepted"),

     

       8
       +
               z.literal("rejected"),

     

       9
       +
               z.literal("left"),

     

       10
       +
           ]),

     

       11
       +
           invite: comAtprotoRepoStrongRefSchema,

     

       12
       +
           channel: comAtprotoRepoStrongRefSchema,

     

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

     

       14
       +
           updatedAt: z.coerce.date(),

     

       15
       +
       });

     

       16
       +
       

     

       17
       +
       export type SystemsGmstnDevelopmentChannelMembership = z.infer<

     

       18
       +
           typeof systemsGmstnDevelopmentChannelMembershipRecordSchema

     

       19
       +
       >;

+2 -2

src/lib/utils/constellation.ts

···

       5
        
           ConstellationBacklinkResponse,

     

       6
        
       } from "@/lib/types/constellation";

     

       7
        
       import { constellationBacklinkResponseSchema } from "@/lib/types/constellation";

     

       8
       -
       import { getRecordFromAtUri } from "@/lib/utils/atproto";

     

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

     

       10
        
       import type { ZodError } from "zod";

     

       11
        
       

     
···

       57
        
           backlink: ConstellationBacklink,

     

       58
        
       ): Promise<Result<unknown, unknown>> => {

     

       59
        
           const atUri = createAtUriFromBacklink(backlink);

     

       60
       -
           const atUriRecordResult = await getRecordFromAtUri(atUri);

     

       61
        
           if (!atUriRecordResult.ok)

     

       62
        
               return { ok: false, error: atUriRecordResult.error };

     

       63
        
           return { ok: true, data: atUriRecordResult.data };

···

       5
        
           ConstellationBacklinkResponse,

     

       6
        
       } from "@/lib/types/constellation";

     

       7
        
       import { constellationBacklinkResponseSchema } from "@/lib/types/constellation";

     

       8
       +
       import { getRecordFromFullAtUri } from "@/lib/utils/atproto";

     

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

     

       10
        
       import type { ZodError } from "zod";

     

       11
        
       

     
···

       57
        
           backlink: ConstellationBacklink,

     

       58
        
       ): Promise<Result<unknown, unknown>> => {

     

       59
        
           const atUri = createAtUriFromBacklink(backlink);

     

       60
       +
           const atUriRecordResult = await getRecordFromFullAtUri(atUri);

     

       61
        
           if (!atUriRecordResult.ok)

     

       62
        
               return { ok: false, error: atUriRecordResult.error };

     

       63
        
           return { ok: true, data: atUriRecordResult.data };

+12

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

···

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

     

       2
       +
       import { z } from "zod";

     

       3
       +
       

     

       4
       +
       export const systemsGmstnDevelopmentChannelInviteRecordSchema = z.object({

     

       5
       +
           $type: z.string(),

     

       6
       +
           channel: comAtprotoRepoStrongRefSchema,

     

       7
       +
           recipient: didSchema,

     

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

     

       9
       +
       });

     

       10
       +
       export type SystemsGmstnDevelopmentChannelInvite = z.infer<

     

       11
       +
           typeof systemsGmstnDevelopmentChannelInviteRecordSchema

     

       12
       +
       >;

src/server/index.ts

···

       1
        
       import websocket from "@fastify/websocket";

     

       0
        
       
     

       2
        
       import Fastify from "fastify";

     

       3
        
       

     

       4
        
       export const setupServer = async () => {

     
···

       6
        
               logger: true,

     

       7
        
           });

     

       8
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
           await fastify.register(websocket);

     

       10
        
       

     

       11
        
           return fastify;

···

       1
        
       import websocket from "@fastify/websocket";

     

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

     

       3
        
       import Fastify from "fastify";

     

       4
        
       

     

       5
        
       export const setupServer = async () => {

     
···

       7
        
               logger: true,

     

       8
        
           });

     

       9
        
       

     

       10
       +
           await fastify.register(cors, {

     

       11
       +
               origin: true,

     

       12
       +
           });

     

       13
       +
       

     

       14
        
           await fastify.register(websocket);

     

       15
        
       

     

       16
        
           return fastify;

src/routes/connect/route.ts

···

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

     

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

     

       3
       +
       

     

       4
       +
       export const connectRoute: WsRoute = {

     

       5
       +
           wsHandler: connectWsHandler,

     

       6
       +
           preHandler: connectPreHandler,

     

       7
       +
       };

-11

src/lib/utils/ws/index.ts

···

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

     

       2
       -
       

     

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

     

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

     

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

     

       6
       -
           }

     

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

     

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

     

       9
       -
           }

     

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

     

       11
       -
       };

+45

src/lib/utils/ws/validate.ts

···

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

     

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

     

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

     

       4
       +
       import { z } from "zod";

     

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

     

       6
       +
       

     

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

     

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

     

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

     

       10
       +
           }

     

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

     

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

     

       13
       +
           }

     

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

     

       15
       +
       };

     

       16
       +
       

     

       17
       +
       export const validateWsMessageString = (

     

       18
       +
           data: unknown,

     

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

     

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

     

       21
       +
           if (!success) {

     

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

     

       23
       +
               console.error(error);

     

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

     

       25
       +
           }

     

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

     

       27
       +
       };

     

       28
       +
       

     

       29
       +
       export const validateWsMessageType = (

     

       30
       +
           data: unknown,

     

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

     

       32
       +
           const {

     

       33
       +
               success: wsMessageSuccess,

     

       34
       +
               error: wsMessageError,

     

       35
       +
               data: wsMessage,

     

       36
       +
           } = websocketMessageSchema.safeParse(data);

     

       37
       +
           if (!wsMessageSuccess) {

     

       38
       +
               console.error(

     

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

     

       40
       +
               );

     

       41
       +
               console.error(wsMessageError);

     

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

     

       43
       +
           }

     

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

     

       45
       +
       };

+4 -4

src/lib/sessions.ts

···

       78
        
           return sessionInfo;

     

       79
        
       };

     

       80
        
       

     

       81
       -
       export const activeLatticeSessions = new Map<LatticeSessionInfo, WebSocket>();

     

       82
        
       

     

       83
        
       export const isValidSession = (sessionInfo: LatticeSessionInfo) => {

     

       84
        
           return (

     
···

       99
        
           } catch {

     

       100
        
               return { ok: false };

     

       101
        
           }

     

       102
       -
           activeLatticeSessions.set(sessionInfo, socket);

     

       103
        
           return { ok: true, data: { sessionSocket: socket } };

     

       104
        
       };

     

       105
        
       

     

       106
        
       export const deleteSession = (

     

       107
        
           sessionInfo: LatticeSessionInfo,

     

       108
        
       ): Result<undefined, undefined> => {

     

       109
       -
           if (!activeLatticeSessions.has(sessionInfo)) return { ok: false };

     

       110
        
           try {

     

       111
       -
               activeLatticeSessions.delete(sessionInfo);

     

       112
        
           } catch {

     

       113
        
               return { ok: false };

     

       114
        
           }

···

       78
        
           return sessionInfo;

     

       79
        
       };

     

       80
        
       

     

       81
       +
       export const clientSessions = new Map<LatticeSessionInfo, WebSocket>();

     

       82
        
       

     

       83
        
       export const isValidSession = (sessionInfo: LatticeSessionInfo) => {

     

       84
        
           return (

     
···

       99
        
           } catch {

     

       100
        
               return { ok: false };

     

       101
        
           }

     

       102
       +
           clientSessions.set(sessionInfo, socket);

     

       103
        
           return { ok: true, data: { sessionSocket: socket } };

     

       104
        
       };

     

       105
        
       

     

       106
        
       export const deleteSession = (

     

       107
        
           sessionInfo: LatticeSessionInfo,

     

       108
        
       ): Result<undefined, undefined> => {

     

       109
       +
           if (!clientSessions.has(sessionInfo)) return { ok: false };

     

       110
        
           try {

     

       111
       +
               clientSessions.delete(sessionInfo);

     

       112
        
           } catch {

     

       113
        
               return { ok: false };

     

       114
        
           }

+44 -2

src/lib/handlers/connect.ts

···

       1
        
       import {

     

       2
        
           createNewSession,

     

       0
        
       
     

       3
        
           issuedLatticeTokens,

     

       4
        
           isValidSession,

     

       5
        
       } from "@/lib/sessions";

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
       import {

     

       11
        
           rawDataToString,

     

       12
        
           validateWsMessageType,

     
···

       105
        
       

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       108
        
                   }

     

       109
        
               }

     

       110
        
           });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       111
        
       };

···

       1
        
       import {

     

       2
        
           createNewSession,

     

       3
       +
           deleteSession,

     

       4
        
           issuedLatticeTokens,

     

       5
        
           isValidSession,

     

       6
        
       } from "@/lib/sessions";

     

       7
       +
       import {

     

       8
       +
           requestHistoryMessageSchema,

     

       9
       +
           shardMessageSchema,

     

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

     

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

     

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

     

       13
       +
       import {

     

       14
       +
           sendHistoryRequestToShard,

     

       15
       +
           sendToChannelClients,

     

       16
       +
           storeMessageInShard,

     

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

     

       18
        
       import {

     

       19
        
           rawDataToString,

     

       20
        
           validateWsMessageType,

     
···

       113
        
       

     

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

     

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

     

       116
       +
                       break;

     

       117
       +
                   }

     

       118
       +
                   case "shard/requestHistory": {

     

       119
       +
                       const {

     

       120
       +
                           success,

     

       121
       +
                           error,

     

       122
       +
                           data: requestHistoryMessage,

     

       123
       +
                       } = requestHistoryMessageSchema.safeParse(

     

       124
       +
                           validateTypeResult.data,

     

       125
       +
                       );

     

       126
       +
                       if (!success) {

     

       127
       +
                           console.error(

     

       128
       +
                               "could not parse",

     

       129
       +
                               validateTypeResult.data,

     

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

     

       131
       +
                           );

     

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

     

       133
       +
                           return;

     

       134
       +
                       }

     

       135
       +
       

     

       136
       +
                       const { channel } = requestHistoryMessage;

     

       137
       +
       

     

       138
       +
                       const atUriParseResult = stringToAtUri(channel);

     

       139
       +
                       if (!atUriParseResult.ok) return;

     

       140
       +
                       const { data: channelAtUri } = atUriParseResult;

     

       141
       +
       

     

       142
       +
                       sendHistoryRequestToShard({

     

       143
       +
                           channelAtUri,

     

       144
       +
                           message: requestHistoryMessage,

     

       145
       +
                       });

     

       146
        
                   }

     

       147
        
               }

     

       148
        
           });

     

       149
       +
       

     

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

     

       151
       +
               deleteSession(sessionInfo);

     

       152
       +
           });

     

       153
        
       };

+54

src/lib/listeners/shard-history.ts

···

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

     

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

     

       3
       +
       import {

     

       4
       +
           rawDataToString,

     

       5
       +
           validateWsMessageType,

     

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

     

       7
       +
       import type WebSocket from "ws";

     

       8
       +
       import { z } from "zod";

     

       9
       +
       

     

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

     

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

     

       12
       +
               const event = rawDataToString(rawData);

     

       13
       +
       

     

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

     

       15
       +
               const validateTypeResult = validateWsMessageType(data);

     

       16
       +
               if (!validateTypeResult.ok) return;

     

       17
       +
       

     

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

     

       19
       +
       

     

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

     

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

     

       22
       +
               const {

     

       23
       +
                   success,

     

       24
       +
                   error,

     

       25
       +
                   data: historyMessage,

     

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

     

       27
       +
               if (!success) {

     

       28
       +
                   console.error(

     

       29
       +
                       "could not parse",

     

       30
       +
                       validateTypeResult.data,

     

       31
       +
                       "as a valid history message.",

     

       32
       +
                   );

     

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

     

       34
       +
                   return;

     

       35
       +
               }

     

       36
       +
               const { forClient: intendedRecipient } = historyMessage;

     

       37
       +
               const clientSessionInfo = clientSessions

     

       38
       +
                   .keys()

     

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

     

       40
       +
               if (!clientSessionInfo) {

     

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

     

       42
       +
                   return;

     

       43
       +
               }

     

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

     

       45
       +
               if (!clientSocket) {

     

       46
       +
                   console.error(

     

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

     

       48
       +
                   );

     

       49
       +
                   return;

     

       50
       +
               }

     

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

     

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

     

       53
       +
           });

     

       54
       +
       };

+40 -1

src/lib/utils/gmstn.ts

···

       0
        
       
     

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

     

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

     

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

     

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

     

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

     

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

     

       7
        
       import WebSocket from "ws";

     

       8
        
       

     
···

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

     

       23
        
           const ws = new WebSocket(endpoint);

     

       24
        
           shardSessions.set(sessionInfo, ws);

     

       0
        
       
     

       25
        
           return ws;

     

       26
        
       };

     

       27
        
       

     
···

       93
        
               );

     

       94
        
           });

     

       95
        
       };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       8
        
       import WebSocket from "ws";

     

       9
        
       

     
···

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

     

       24
        
           const ws = new WebSocket(endpoint);

     

       25
        
           shardSessions.set(sessionInfo, ws);

     

       26
       +
           attachHistoryFromShardListener(ws);

     

       27
        
           return ws;

     

       28
        
       };

     

       29
        
       

     
···

       95
        
               );

     

       96
        
           });

     

       97
        
       };

     

       98
       +
       

     

       99
       +
       export const sendHistoryRequestToShard = ({

     

       100
       +
           channelAtUri,

     

       101
       +
           message,

     

       102
       +
       }: {

     

       103
       +
           channelAtUri: AtUri;

     

       104
       +
           message: RequestHistoryMessage;

     

       105
       +
       }) => {

     

       106
       +
           const shardSessionInfo = shardSessions

     

       107
       +
               .keys()

     

       108
       +
               .find((sessionInfo) =>

     

       109
       +
                   sessionInfo.allowedChannels.some(

     

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

     

       111
       +
                   ),

     

       112
       +
               );

     

       113
       +
           if (!shardSessionInfo) return;

     

       114
       +
       

     

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

     

       116
       +
           if (!shardSocket) {

     

       117
       +
               console.error(

     

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

     

       119
       +
               );

     

       120
       +
               return;

     

       121
       +
           }

     

       122
       +
           const messageToSendToShard = {

     

       123
       +
               ...message,

     

       124
       +
           };

     

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

     

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

     

       127
       +
       

     

       128
       +
           console.log(

     

       129
       +
               "Sent off message",

     

       130
       +
               message,

     

       131
       +
               "to shard located at",

     

       132
       +
               shardSocket.url,

     

       133
       +
           );

     

       134
       +
       };

src/lib/handlers/getOwnerDid.ts

···

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

     

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

     

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

     

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

     

       5
       +
       

     

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

     

       7
       +
           const { registered } = getRegistrationState();

     

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

     

       9
       +
       };

src/routes/index.ts

···

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

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       6
        
       

     

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

     

       8
        
           "/": indexRoute,

     

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

     

       10
        
           "/handshake": handshakeRoute,

     

       11
        
           "/connect": connectRoute,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
       };

···

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

     

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

     

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

     

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

     

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

     

       8
        
       

     

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

     

       10
        
           "/": indexRoute,

     

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

     

       12
        
           "/handshake": handshakeRoute,

     

       13
        
           "/connect": connectRoute,

     

       14
       +
           "/xrpc/_health": healthRoute,

     

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

     

       16
       +
               systemsGmstnDevelopmentShardGetOwnerRoute,

     

       17
        
       };

+10

src/routes/xrpc/_health/route.ts

···

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

     

       2
       +
       

     

       3
       +
       export const healthRoute: Route = {

     

       4
       +
           method: "GET",

     

       5
       +
           handler: () => {

     

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

     

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

     

       8
       +
               });

     

       9
       +
           },

     

       10
       +
       };

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

···

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

     

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

     

       3
       +
       

     

       4
       +
       export const systemsGmstnDevelopmentShardGetOwnerRoute: Route = {

     

       5
       +
           method: "GET",

     

       6
       +
           handler: getOwnerHandler,

     

       7
       +
       };

.gitignore

···

       2
        
       /node_modules

     

       3
        
       /dist

     

       4
        
       .env

     

       0
        
       
     

       5
        
       *.tsbuildinfo

···

       2
        
       /node_modules

     

       3
        
       /dist

     

       4
        
       .env

     

       5
       +
       .docker.env

     

       6
        
       *.tsbuildinfo

+1 -1

src/index.ts

···

       55
        
               }

     

       56
        
           }

     

       57
        
       

     

       58
       -
           server.listen({ port: SERVER_PORT }).catch((err: unknown) => {

     

       59
        
               server.log.error(err);

     

       60
        
               process.exit(1);

     

       61
        
           });

···

       55
        
               }

     

       56
        
           }

     

       57
        
       

     

       58
       +
           server.listen({ port: SERVER_PORT, host: "::" }).catch((err: unknown) => {

     

       59
        
               server.log.error(err);

     

       60
        
               process.exit(1);

     

       61
        
           });

+2 -1

src/lib/setup.ts

···

       112
        
                   channels: channelAtUris,

     

       113
        
               });

     

       114
        
               if (!handshakeResult.ok) {

     

       115
       -
                   console.error(handshakeResult.error);

     

       0
        
       
     

       116
        
                   continue;

     

       117
        
               }

     

       118
        
               const sessionInfo = handshakeResult.data;

···

       112
        
                   channels: channelAtUris,

     

       113
        
               });

     

       114
        
               if (!handshakeResult.ok) {

     

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

     

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

     

       117
        
                   continue;

     

       118
        
               }

     

       119
        
               const sessionInfo = handshakeResult.data;

+1 -1

src/lib/env.ts

···

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

     

       28
        
           );

     

       29
        
       }

     

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

     

       31
        
       

     

       32
        
       const constellationUrl = process.env.CONSTELLATION_URL;

     

       33
        
       let constellationUrlParsed: URL | undefined;

···

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

     

       28
        
           );

     

       29
        
       }

     

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

     

       31
        
       

     

       32
        
       const constellationUrl = process.env.CONSTELLATION_URL;

     

       33
        
       let constellationUrlParsed: URL | undefined;

Compare changes