Merge pull request #461 from sinamics/slow-network-load

Bugfix slow network load

package.json

@@ -49,6 +49,7 @@
 		"next-intl": "3.1.4",
 		"next-themes": "^0.2.1",
 		"nodemailer": "^6.9.9",
+		"p-limit": "^6.1.0",
 		"pug": "^3.0.3",
 		"qrcode.react": "^3.1.0",
 		"react": "18.2.0",
@@ -105,4 +106,4 @@
 	"prisma": {
 		"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
 	}
-}
+}

src/server/api/routers/networkRouter.ts

@@ -78,7 +78,6 @@ export const networkRouter = createTRPCRouter({
 			if (input.central) {
 				return await ztController.central_network_detail(ctx, input.nwid, input.central);
 			}
-
 			// First, retrieve the network with organization details
 			let networkFromDatabase = await ctx.prisma.network.findUnique({
 				where: {
@@ -185,7 +184,6 @@ export const networkRouter = createTRPCRouter({
 			}
 			// check if there is other network using same routes and return a notification
 			const targetIPs = ztControllerResponse.network.routes.map((route) => route.target);
-
 			interface DuplicateRoutes {
 				authorId: string;
 				routes: RoutesEntity[];
@@ -223,6 +221,7 @@ export const networkRouter = createTRPCRouter({
 
 			// Convert the map back to an array of merged members
 			const mergedMembers = [...mergedMembersMap.values()];
+
 			// Construct the final response object
 			return {
 				network: {

src/server/api/services/memberService.ts

@@ -1,7 +1,7 @@
 import { UserContext } from "~/types/ctx";
 import { MemberEntity, Peers } from "~/types/local/member";
-import * as ztController from "~/utils/ztApi";
 import { determineConnectionStatus } from "../utils/memberUtils";
+import * as ztController from "~/utils/ztApi";
 import { prisma } from "~/server/db";
 import { sendWebhook } from "~/utils/webhook";
 import { HookType, MemberJoined } from "~/types/webhooks";
@@ -21,27 +21,31 @@ export const syncMemberPeersAndStatus = async (
 	ztMembers: MemberEntity[],
 ) => {
 	if (ztMembers.length === 0) return [];
+	// get peers
+	const controllerPeers = await ztController.peers(ctx);
+
 	const updatedMembers = await Promise.all(
 		ztMembers.map(async (ztMember) => {
 			// TODO currently there is no way to distinguish peers by network id, so we have to fetch all peers
 			// this will make the node active in all networks it is part of if it is active in one of them.
 			// Should open a issue at ZeroTier
-			const peers = await ztController.peer(ctx, ztMember.address).catch(() => null);
+			const peers = controllerPeers.filter(
+				(peer) => peer.address === ztMember.address,
+			)[0];
 
 			// Retrieve the member from the database
 			const dbMember = await retrieveActiveMemberFromDatabase(nwid, ztMember.id);
 
 			// Find the active preferred path in the peers object
 			const activePreferredPath = findActivePreferredPeerPath(peers);
-
 			const { physicalAddress, ...restOfDbMembers } = dbMember || {};
 
 			// Merge the data from the database with the data from Controller
 			const updatedMember = {
 				...restOfDbMembers,
 				...ztMember,
 				physicalAddress: activePreferredPath?.address ?? physicalAddress,
-				peers,
+				peers: peers || {},
 			} as MemberEntity;
 
 			// Update the connection status
@@ -98,7 +102,7 @@ export const syncMemberPeersAndStatus = async (
  * @param peers - The peers object containing paths.
  * @returns The active preferred path, or undefined if not found.
  */
-const findActivePreferredPeerPath = (peers: Peers) => {
+const findActivePreferredPeerPath = (peers: Peers | null) => {
 	if (!peers || typeof peers !== "object" || !Array.isArray(peers.paths)) {
 		return null;
 	}

src/types/local/member.d.ts

@@ -67,22 +67,16 @@ interface CentralMemberConfig {
 }
 
 export interface Peers {
-	active: boolean;
 	address: string;
 	isBonded: boolean;
 	latency: number;
-	lastReceive: number;
-	lastSend: number;
-	localSocket?: number;
 	paths?: Paths[];
 	role: string;
 	version: string;
-	physicalAddress: string;
+	physicalAddress?: string;
 	versionMajor: number;
 	versionMinor: number;
 	versionRev: number;
-	preferred: boolean;
-	trustedPathId: number;
 }
 
 export interface Paths {

src/utils/ztApi.ts

@@ -625,7 +625,7 @@ export const member_details = async (
 
 // Get all peers
 // https://docs.zerotier.com/service/v1/#operation/getPeers
-export const peers = async (ctx: UserContext): Promise<ZTControllerGetPeer> => {
+export const peers = async (ctx: UserContext): Promise<ZTControllerGetPeer[]> => {
 	// get headers based on local or central api
 	const { localControllerUrl } = await getOptions(ctx, false);
 
@@ -635,7 +635,7 @@ export const peers = async (ctx: UserContext): Promise<ZTControllerGetPeer> => {
 
 	try {
 		const response: AxiosResponse = await axios.get(addr, { headers });
-		return response.data as ZTControllerGetPeer;
+		return response.data as ZTControllerGetPeer[];
 	} catch (error) {
 		const message = `${error} (peers)`;
 		throw new APIError(message, error as AxiosError);