improve membersURI

.gitignore

@@ -7,4 +7,4 @@ coverage
 
 # Remove some common IDE working directories
 .idea
-.vscode
+.vscode

src/eip4824.ts

@@ -1,9 +1,9 @@
 import express from 'express';
-import { getSpace } from './helpers/spaces';
+import { getCombinedMembersAndVoters, getSpace } from './helpers/spaces';
 import db, { sequencerDB } from './helpers/mysql';
 
 const router = express.Router();
-const context = '<http://www.daostar.org/schemas>';
+const context = ['https://snapshot.org', 'https://daostar.org/schemas'];
 
 router.get('/:space', async (req, res) => {
   let space: any = {};
@@ -34,31 +34,68 @@ router.get('/:space', async (req, res) => {
 });
 
 router.get('/:space/members', async (req, res) => {
-  let space: any = {};
-
   try {
-    space = await getSpace(req.params.space);
+    const spaceId = req.params.space;
+    const cursor = req.query.cursor || null;  
+    const pageSize = 500; // Default page size
+
+    const space = await getSpace(spaceId);
+    if (!space.verified) {
+      return res.status(400).json({
+        error: 'INVALID_SPACE',
+        message: 'The specified space is not verified.'
+      });
+    }
 
-    if (!space.verified) return res.status(400).json({ error: 'INVALID' });
+    const combinedMembersResult = await getCombinedMembersAndVoters(
+      spaceId,
+      cursor,
+      pageSize,
+      space.admins || [],
+      space.moderators || [],
+      space.members || []
+    );
+
+    const members = [
+      ...space.admins.map(admin => ({ type: 'EthereumAddress', id: admin })),
+      ...space.moderators.map(moderator => ({ type: 'EthereumAddress', id: moderator })),
+      ...space.members.map(member => ({ type: 'EthereumAddress', id: member })),
+      ...combinedMembersResult.members.map(voter => ({ type: 'EthereumAddress', id: voter }))
+    ];
+
+    const responseObject = {
+      '@context': context,
+      type: 'DAO',
+      name: space.name,
+      members: members,
+      nextCursor: combinedMembersResult.nextCursor
+    };
+
+    return res.json(responseObject);
   } catch (e) {
-    return res.status(404).json({ error: 'NOT_FOUND' });
+    const error = e as Error;
+    console.error(error);
+
+    if (error.message.includes('database')) {
+      return res.status(500).json({
+        error: 'DATABASE_ERROR',
+        message: 'Failed to retrieve data from the database.'
+      });
+    } else if (error.message.includes('parameter')) {
+      return res.status(400).json({
+        error: 'INVALID_PARAMETER',
+        message: 'Invalid or missing parameter.'
+      });
+    } else {
+      return res.status(500).json({
+        error: 'INTERNAL_SERVER_ERROR',
+        message: 'An unexpected error occurred.'
+      });
+    }
   }
-
-  const members = [...space.admins, ...space.moderators, ...space.members].map(
-    member => ({
-      type: 'EthereumAddress',
-      id: member
-    })
-  );
-
-  return res.json({
-    '@context': context,
-    type: 'DAO',
-    name: space.name,
-    members
-  });
 });
 
+
 router.get('/:space/proposals', async (req, res) => {
   const id = req.params.space;
   let space: any = {};

src/helpers/spaces.ts

@@ -145,6 +145,51 @@ async function getVotes() {
   return await db.queryAsync(query);
 }
 
+export async function getCombinedMembersAndVoters(spaceId: string, cursor: string | null, pageSize: number, knownAdmins: string[] = [], knownModerators: string[] = [], knownMembers: string[] = []) {
+  const params: (string | number)[] = [];
+  let subqueries: string[] = [];
+
+  // Excluding known addresses fetched during the Space verification
+  const exclusionList = [...knownAdmins, ...knownModerators, ...knownMembers];
+  let placeholders = exclusionList.map(() => '?').join(', ');
+
+  // Other roles are already known and fetched at the app level while Space Verification
+  subqueries.push(`
+    SELECT DISTINCT voter AS address
+    FROM votes
+    WHERE space_id = ? AND voter NOT IN (${placeholders})
+  `);
+  params.push(spaceId, ...exclusionList);
+
+  const cursorClause = cursor ? ' AND address > ?' : '';
+  const query = `
+    SELECT address
+    FROM (${subqueries.join(' UNION ')})
+    WHERE 1=1 ${cursorClause}
+    ORDER BY address
+    LIMIT ?
+  `;
+
+  if (cursor) {
+    params.push(cursor);
+  }
+  params.push(pageSize);  
+
+  const results = await db.queryAsync(query, params);
+  if (!results || results.length === 0) {
+    return Promise.reject(new Error('NOT_FOUND'));
+  }
+
+  const nextCursor = results.length === pageSize ? results[results.length - 1].address : null;
+  return {
+    members: results.map(row => row.address),
+    nextCursor: nextCursor
+  };
+}
+
+
+
+
 async function getFollowers() {
   const query = `
     SELECT space, COUNT(id) as count,