improve membersURI

.gitignore

@@ -8,3 +8,5 @@ coverage
 # Remove some common IDE working directories
 .idea
 .vscode
+
+pnpm-lock.yaml

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://www.snapshot.org", "https://www.daostar.org/schemas"];
 
 router.get('/:space', async (req, res) => {
   let space: any = {};
@@ -34,31 +34,49 @@ 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
 
-    if (!space.verified) return res.status(400).json({ error: 'INVALID' });
-  } catch (e) {
-    return res.status(404).json({ error: 'NOT_FOUND' });
-  }
+    const space = await getSpace(spaceId);
+    if (!space.verified) {
+      return res.status(400).json({ error: 'INVALID_SPACE', message: 'The specified space is not verified.' });
+    }
 
-  const members = [...space.admins, ...space.moderators, ...space.members].map(
-    member => ({
+    // Includes space.members, space.admins, space.moderators and voters
+    const combinedMembersResult = await getCombinedMembersAndVoters(spaceId, cursor, pageSize);
+
+    const members = combinedMembersResult.members.map(address => ({
       type: 'EthereumAddress',
-      id: member
-    })
-  );
+      id: address
+    }));
 
-  return res.json({
-    '@context': context,
-    type: 'DAO',
-    name: space.name,
-    members
-  });
+    const responseObject = {
+      '@context': context, 
+      type: 'DAO',
+      name: space.name,
+      members: members,
+      nextCursor: combinedMembersResult.nextCursor
+    };
+
+    return res.json(responseObject);
+
+  } catch (e) {
+    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.' });
+  }
+  }
 });
 
+
 router.get('/:space/proposals', async (req, res) => {
   const id = req.params.space;
   let space: any = {};

src/helpers/spaces.ts

@@ -145,6 +145,55 @@ async function getVotes() {
   return await db.queryAsync(query);
 }
 
+export async function getCombinedMembersAndVoters(spaceId, cursor = null, pageSize) {
+  let query;
+  const params = [spaceId, spaceId, spaceId, spaceId];
+
+  query = `
+    SELECT address
+    FROM (
+      (SELECT DISTINCT JSON_UNQUOTE(JSON_EXTRACT(settings, '$.admins[*]')) AS address 
+       FROM spaces 
+       WHERE id = ?)
+      UNION
+      (SELECT DISTINCT JSON_UNQUOTE(JSON_EXTRACT(settings, '$.moderators[*]')) AS address 
+       FROM spaces 
+       WHERE id = ?)
+      UNION
+      (SELECT DISTINCT JSON_UNQUOTE(JSON_EXTRACT(settings, '$.members[*]')) AS address 
+       FROM spaces 
+       WHERE id = ?)
+      UNION
+      (SELECT DISTINCT voter AS address
+       FROM votes
+       WHERE space = ?)
+    ) AS combined_addresses
+    WHERE (? IS NULL OR address > ?)
+    ORDER BY address
+    LIMIT ?
+  `;
+
+  if (cursor) {
+    params.push(cursor, cursor, pageSize); 
+  } else {
+    params.push(null, null, 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,