Merge pull request #79 from Permissionless-Software-Foundation/dh-counter-offer-data

feat(offer): Added more Counter Offer data

package-lock.json

@@ -15,7 +15,7 @@
         "@fortawesome/react-fontawesome": "0.2.2",
         "@noble/hashes": "1.8.0",
         "axios": "0.27.2",
-        "bch-dex-lib": "2.2.0",
+        "bch-dex-lib": "2.3.1",
         "bch-message-lib": "2.2.1",
         "bch-nostr": "1.3.4",
         "bch-token-sweep": "2.2.1",
@@ -10043,9 +10043,9 @@
       "license": "MIT"
     },
     "node_modules/bch-dex-lib": {
-      "version": "2.2.0",
+      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/bch-dex-lib/-/bch-dex-lib-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/bch-dex-lib/-/bch-dex-lib-2.3.1.tgz",
-      "integrity": "sha512-SORqn4qNmbxfL2SbbapOpbcCB+FtqasR+GT0XRifdkXFjA3aDL0gwMsHjh8IzLZnKtPYSBcfgzKQFxEsXCJNug==",
+      "integrity": "sha512-HlY21BpUUaSsuZNWF5LGPwSJU7m2kYbNMcS36o22RSHuO1kiBMONHwkV+v22kdbDk3T/Iz+AZN0mzJvH5neCXw==",
       "license": "MIT",
       "dependencies": {
         "@chris.troutner/retry-queue": "1.0.10",

package.json

@@ -9,7 +9,7 @@
     "@fortawesome/react-fontawesome": "0.2.2",
     "@noble/hashes": "1.8.0",
     "axios": "0.27.2",
-    "bch-dex-lib": "2.2.0",
+    "bch-dex-lib": "2.3.1",
     "bch-message-lib": "2.2.1",
     "bch-nostr": "1.3.4",
     "bch-token-sweep": "2.2.1",

src/components/app-body/counter-offers/counter-offer-card.js

@@ -0,0 +1,71 @@
+/*
+  This Card component displays a counter offer with token icon, name, and price.
+*/
+
+// Global npm libraries
+import React, { useState } from 'react'
+import { Container, Row, Col, Card, Button } from 'react-bootstrap'
+import Jdenticon from '@chris.troutner/react-jdenticon'
+
+function CounterOfferCard (props) {
+  const { offer } = props
+  const [icon, setIcon] = useState(offer.tokenIcon)
+
+  return (
+    <>
+      <Col xs={12} sm={6} lg={4} style={{ padding: '25px' }}>
+        <Card className='shadow-sm'>
+          <Card.Body style={{ textAlign: 'center', padding: '10px' }}>
+            {/** If the icon is loaded, display it */}
+            {icon && (
+              <Card.Img
+                src={icon}
+                style={{ height: '100px', width: 'auto', margin: '0 auto' }}
+                onError={(e) => {
+                  setIcon(null) // Set the icon to null if it fails to load the image url.
+                }}
+              />
+            )}
+
+            {/** If the icon is not loaded, display the Jdenticon */}
+            {!icon && (
+              <div style={{ display: 'flex', justifyContent: 'center', marginBottom: '10px' }}>
+                <Jdenticon size='100' value={offer.tokenId} />
+              </div>
+            )}
+
+            <Card.Title style={{ textAlign: 'center', marginTop: '10px' }}>
+              <h4>{offer.ticker}</h4>
+            </Card.Title>
+
+            <Container>
+              <Row>
+                <Col>
+                  {/* <strong>{offer.tokenName}</strong> */}
+                  <strong>Counter Offer UTXO</strong>
+                </Col>
+              </Row>
+              <br />
+
+              <Row>
+                {/* <Col>Price:</Col> */}
+                <Col><strong>{offer.price}</strong></Col>
+              </Row>
+              <br />
+
+              <Row className='text-center'>
+                <Col>
+                  <Button disabled variant='danger' size='sm'>
+                    Cancel
+                  </Button>
+                </Col>
+              </Row>
+            </Container>
+          </Card.Body>
+        </Card>
+      </Col>
+    </>
+  )
+}
+
+export default CounterOfferCard

src/components/app-body/counter-offers/index.js

@@ -0,0 +1,90 @@
+/*
+  Shows Counter Offers created by the user.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect } from 'react'
+import { Container, Row, Col, Spinner } from 'react-bootstrap'
+
+// Local libraries
+import CounterOfferCard from './counter-offer-card'
+import AsyncLoad from '../../../services/async-load'
+
+function CounterOffers (props) {
+  const appData = props.appData
+
+  const [counterOffers, setCounterOffers] = useState([])
+  const [isLoading, setIsLoading] = useState(true)
+
+  // Generate counter offer cards
+  const generateCards = () => {
+    return counterOffers.map((offer) => (
+      <CounterOfferCard
+        key={offer.id}
+        offer={offer}
+        appData={appData}
+      />
+    ))
+  }
+
+  useEffect(() => {
+    const loadWallet = async () => {
+      try {
+        setIsLoading(true)
+        const { bchWalletState, serverUrl } = appData
+        const asyncLoad = new AsyncLoad()
+        await asyncLoad.loadWalletLib()
+        const counterOfferWallet = await asyncLoad.getDerivatedWallet(serverUrl, bchWalletState.mnemonic, "m/44'/245'/0'/0/1")
+
+        const utxoStore = counterOfferWallet.utxos.utxoStore
+        const bchUtxos = utxoStore.bchUtxos
+        setCounterOffers(bchUtxos)
+        console.log('counterOffers', bchUtxos)
+        setIsLoading(false)
+      } catch (error) {
+        setIsLoading(false)
+        console.log('error', error)
+      }
+    }
+
+    loadWallet()
+  }, [appData])
+
+  return (
+    <Container>
+      <Row>
+        <Col>
+          <h1>Counter Offers</h1>
+          <p className='text-muted'>Your pending counter offers</p>
+        </Col>
+      </Row>
+      {isLoading
+        ? (
+          <Row className='text-center' style={{ padding: '50px' }}>
+            <Col>
+              <Spinner animation='border' role='status'>
+                <span className='visually-hidden'>Loading...</span>
+              </Spinner>
+              <p className='mt-3 text-muted'>Loading counter offers...</p>
+            </Col>
+          </Row>
+          )
+        : (
+          <>
+            <Row>
+              {generateCards()}
+            </Row>
+            {counterOffers.length === 0 && (
+              <Row className='text-center'>
+                <Col>
+                  <p>No counter offers found.</p>
+                </Col>
+              </Row>
+            )}
+          </>
+          )}
+    </Container>
+  )
+}
+
+export default CounterOffers

src/components/app-body/index.js

@@ -30,6 +30,7 @@ import ContentCreators from './nostr/content-creators/index.js'
 import UserDataReview from './user-data-review'
 import Offers from './offers'
 import NostrChat from './nostr-chat'
+import CounterOffers from './counter-offers'
 function AppBody (props) {
   // Dependency injection through props
   const appData = props.appData
@@ -55,6 +56,7 @@ function AppBody (props) {
         <Route path='/content-creators' element={<ContentCreators appData={appData} />} />
         <Route path='/user-data/:tokenId' element={<UserDataReview appData={appData} />} />
         <Route path='/offers' element={<Offers appData={appData} />} />
+        <Route path='/counter-offers' element={<CounterOffers appData={appData} />} />
         <Route path='/nostr-chat' element={<NostrChat appData={appData} />} />
       </Routes>
       {/** Show in all paths except the servers view */}

src/components/app-body/nfts-for-sale/buy-button.js

@@ -6,6 +6,7 @@
 // Global npm libraries
 import React, { useState } from 'react'
 import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'
+import AsyncLoad from '../../../services/async-load'
 
 function BuyButton (props) {
   const { token, appData, onSuccess } = props
@@ -45,10 +46,19 @@ function BuyButton (props) {
 
       // Generate a counter offer.
       const bchDexLib = appData.dexLib
-      const { offerData, partialHex } = await bchDexLib.take.takeOffer(
+      const { offerData, partialHex, counterOfferUtxo } = await bchDexLib.take.takeOffer(
         targetOffer
       )
 
+      // Get counter offer data
+      const asyncLoad = new AsyncLoad()
+      const { takerAddr, takerNpub, counterOfferAddr } = await asyncLoad.getCounterOfferMetadata(appData)
+
+      offerData.takerAddr = takerAddr
+      offerData.takerNpub = takerNpub
+      offerData.counterOfferAddr = counterOfferAddr
+      offerData.counterOfferUtxo = counterOfferUtxo.txid
+
       progress.push(<p key='progress-msg2'>Uploading counter offer to Nostr...</p>)
       setProgressMsg(progress)
 

src/components/app-body/nfts-for-sale/info-button.js

@@ -138,7 +138,7 @@ function InfoButton (props) {
 
           </Container>
         </Modal.Body>
-        <Modal.Footer style={{ justifyContent: 'center'}}>
+        <Modal.Footer style={{ justifyContent: 'center' }}>
           {!loading && <Button style={{ width: '135px' }} onClick={updateOffer}>Update</Button>}
           {loading && <Spinner />}
         </Modal.Footer>

src/components/app-body/nfts-for-sale/seller-profile.js

@@ -0,0 +1,186 @@
+/*
+  This component displays the seller's profile information for an NFT listing.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect } from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faUser } from '@fortawesome/free-solid-svg-icons'
+
+function SellerProfile (props) {
+  const { npub, appData } = props
+  const [profile, setProfile] = useState(null)
+  const [imageError, setImageError] = useState(false)
+  const [isLoading, setIsLoading] = useState(true)
+
+  const { nostrQueries } = appData
+
+  // Get profile if npub is provided.
+  useEffect(() => {
+    const start = async () => {
+      setIsLoading(true)
+      try {
+        const pubKey = nostrQueries.npubToHex(npub)
+        const profile = await nostrQueries.getProfile(pubKey)
+        setProfile(profile)
+      } catch (error) {
+        console.warn('Error fetching seller profile:', error)
+      } finally {
+        setIsLoading(false)
+      }
+    }
+    if (npub) {
+      start()
+    } else {
+      setIsLoading(false)
+    }
+  }, [npub, nostrQueries])
+
+  // handle img url errors
+  const handleImageError = (type) => {
+    setImageError(true)
+  }
+
+  // go to profile
+  const goToProfile = () => {
+    if (npub) {
+      const profileUrl = `${window.location.origin}/profile/${npub}#single-view`
+      window.open(profileUrl, '_blank')
+    }
+  }
+
+  // Get display name - use profile name, npub short form, or "Anonymous User"
+  const getDisplayName = () => {
+    if (profile?.name) return profile.name
+    if (npub) {
+      return npub.slice(0, 8) + '...' + npub.slice(-6)
+    }
+    return 'Anonymous User'
+  }
+
+  return (
+    <div
+      onClick={goToProfile}
+      className='seller-profile-container'
+      style={{
+        padding: '4px 8px',
+        backgroundColor: '#f8f9fa',
+        borderRadius: '6px',
+        border: '1px solid #e9ecef',
+        transition: 'all 0.2s ease',
+        cursor: 'pointer',
+        display: 'flex',
+        justifyContent: 'center',
+        width: '100%'
+      }}
+      onMouseEnter={(e) => {
+        e.currentTarget.style.backgroundColor = '#e9ecef'
+        e.currentTarget.style.borderColor = '#dee2e6'
+      }}
+      onMouseLeave={(e) => {
+        e.currentTarget.style.backgroundColor = '#f8f9fa'
+        e.currentTarget.style.borderColor = '#e9ecef'
+      }}
+    >
+      <div className='d-flex align-items-center justify-content-center gap-1'>
+        {/* Seller Label */}
+        <small
+          className='text-muted fw-semibold'
+          style={{
+            fontSize: '0.65rem',
+            textTransform: 'uppercase',
+            letterSpacing: '0.3px'
+          }}
+        >
+          Seller:
+        </small>
+
+        {/* Profile Picture or Placeholder */}
+        <div
+          className='d-flex align-items-center justify-content-center'
+          style={{
+            width: '24px',
+            height: '24px',
+            borderRadius: '50%',
+            backgroundColor: '#e9ecef',
+            border: '1.5px solid #dee2e6',
+            overflow: 'hidden',
+            flexShrink: 0,
+            cursor: 'pointer',
+            transition: 'transform 0.2s ease'
+          }}
+          onClick={(e) => {
+            e.stopPropagation()
+            goToProfile()
+          }}
+          onMouseEnter={(e) => {
+            e.currentTarget.style.transform = 'scale(1.1)'
+          }}
+          onMouseLeave={(e) => {
+            e.currentTarget.style.transform = 'scale(1)'
+          }}
+        >
+          {isLoading
+            ? (
+              <FontAwesomeIcon
+                icon={faUser}
+                style={{
+                  color: '#adb5bd',
+                  fontSize: '12px',
+                  opacity: 0.5
+                }}
+              />
+              )
+            : (profile?.picture && !imageError)
+                ? (
+                  <img
+                    src={profile.picture}
+                    alt='Seller profile'
+                    className='w-100 h-100'
+                    style={{ objectFit: 'cover' }}
+                    onError={() => handleImageError('picture')}
+                  />
+                  )
+                : (
+                  <FontAwesomeIcon
+                    icon={faUser}
+                    style={{
+                      color: '#6c757d',
+                      fontSize: '12px'
+                    }}
+                  />
+                  )}
+        </div>
+
+        {/* Seller Name */}
+        <span
+          onClick={(e) => {
+            e.stopPropagation()
+            goToProfile()
+          }}
+          className='cursor-pointer fw-medium'
+          style={{
+            color: '#495057',
+            fontSize: '0.8rem',
+            transition: 'color 0.2s ease',
+            maxWidth: '120px',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap'
+          }}
+          onMouseEnter={(e) => {
+            e.currentTarget.style.color = '#007bff'
+          }}
+          onMouseLeave={(e) => {
+            e.currentTarget.style.color = '#495057'
+          }}
+          title={profile?.name || npub}
+        >
+          {getDisplayName()}
+        </span>
+      </div>
+    </div>
+  )
+}
+
+export default SellerProfile

src/components/app-body/nfts-for-sale/token-card.js

@@ -10,14 +10,12 @@ import Jdenticon from '@chris.troutner/react-jdenticon'
 // Local libraries
 import InfoButton from './info-button'
 import BuyButton from './buy-button'
-
+import SellerProfile from './seller-profile'
 function TokenCard (props) {
   const { token, appData, handleRefresh, hideBuyBtn } = props
   const [icon, setIcon] = useState(token.icon)
   const [tokenData, setTokenData] = useState(token.tokenData)
 
-  console.log('TokenCard() appData: ', appData)
-
   // Update icon state every token.icon and token.tokenData changes
   useEffect(() => {
     console.log('setting icon')
@@ -28,8 +26,14 @@ function TokenCard (props) {
   return (
     <>
       <Col xs={12} sm={6} lg={4} style={{ padding: '25px' }}>
-        <Card>
+        <Card className='shadow-sm'>
-          <Card.Body style={{ textAlign: 'center' }}>
+          <Card.Body style={{ textAlign: 'center', padding: '10px' }}>
+            {/* Seller Profile Section */}
+            <Row className='mb-2'>
+              <Col className='text-center mb-2'>
+                <SellerProfile npub={token.makerNpub} appData={appData} />
+              </Col>
+            </Row>
             {/** If the icon is loaded, display it */
               icon && (
                 <Card.Img
@@ -50,7 +54,6 @@ function TokenCard (props) {
             <Card.Title style={{ textAlign: 'center', marginTop: '10px' }}>
               <h4>{token.ticker}</h4>
             </Card.Title>
-
             <Container>
               <Row>
                 <Col>

src/components/app-body/nostr-chat/index.js

@@ -5,16 +5,22 @@
 // Global npm libraries
 import React, { useCallback, useEffect, useState, useRef } from 'react'
 import { Container, Row, Col } from 'react-bootstrap'
-import { RelayPool } from 'nostr'
+import NostrRestClient, { generateSubId } from '../../../services/nostr-rest-client.js'
 
 // Local libraries
 import ChatSidebar from './chat-sidebar'
 import ChatMain from './chat-main'
 import config from '../../../config'
 
+// Global variables and constants
+
 function NostrChat (props) {
   const { appData } = props
   const { nostrQueries, bchWalletState, startChannelChat } = appData
+  // Initialize REST client for SSE subscriptions
+  const restClient = useRef(new NostrRestClient())
+  // Track active subscriptions for cleanup
+  const subscriptionsRef = useRef({})
 
   const [messages, setMessages] = useState([])
   const [loadedMessages, setLoadedMessages] = useState(false)
@@ -28,6 +34,8 @@ function NostrChat (props) {
   const [selectedChannel, setSelectedChannel] = useState(null)
   const [selectedChannelIsDm, setSelectedChannelIsDm] = useState(false)
 
+  const [deletedChats] = useState(appData.nostrQueries.deletedChats)
+
   const profilesRef = useRef({})
   const dmChannelsRef = useRef([])
 
@@ -177,44 +185,90 @@ function NostrChat (props) {
     }
   }, [appData, onMsgRead])
 
-  // Handle nostr pool for group channels
+  // Handle SSE subscription for group channels
   useEffect(() => {
     // fetch messages when channel selected and channel metadata are loaded
     if (!selectedChannel || !channelsLoaded || selectedChannelIsDm) return
 
-    // Load messages for group channel
+    // wait for deleted chats
-    const relays = nostrQueries.relays
+    if (!deletedChats || !Array.isArray(deletedChats)) return
-    if (relays.length === 0) {
-      return
-    }
 
-    const pool = RelayPool(relays)
+    // Create subscription for group channel messages
+    const subId = generateSubId(`group-${selectedChannel}`)
+    const filter = { limit: 10, kinds: [42], '#e': [selectedChannel] }
 
-    // const pool = RelayPool([config.nostrRelay])
+    // Track if EOSE has been called
-    pool.on('open', relay => {
+    let eoseCalled = false
-      relay.subscribe('REQ', { limit: 10, kinds: [42], '#e': [selectedChannel] })
+    let eoseTimeoutId = null
-    })
 
-    pool.on('eose', relay => {
+    const subscription = restClient.current.createSubscription(subId, filter, {
-      if (!selectedChannelIsDm) {
+      onEvent: (ev) => {
-        setLoadedMessages(true)
+        console.log('Group post retrieved from REST API', ev.content)
+        const onBlackList = nostrQueries.blackList.find((val) => { return val === ev.pubkey })
+        const isDeleted = deletedChats.find((val) => { return val.eventId === ev.id })
+        if (!onBlackList && !isDeleted) {
+          onMsgRead(ev)
+        }
+      },
+      onEose: () => {
+        eoseCalled = true
+        if (eoseTimeoutId) {
+          clearTimeout(eoseTimeoutId)
+          eoseTimeoutId = null
+        }
+        if (!selectedChannelIsDm) {
+          // Use setTimeout to ensure state updates from onEvent callbacks are processed
+          // before setting loadedMessages to true
+          setTimeout(() => {
+            setLoadedMessages(true)
+          }, 100)
+        }
+      },
+      onClosed: (message) => {
+        console.log('Group channel subscription closed:', message)
+      },
+      onError: (error) => {
+        console.warn('Group channel subscription error:', error)
       }
     })
 
-    pool.on('event', (relay, subId, ev) => {
+    subscriptionsRef.current[subId] = subscription
-      console.log('Group post retrieved from ', relay.url, ev.content)
+
-      const onBlackList = nostrQueries.blackList.find((val) => { return val === ev.pubkey })
+    // Set up EOSE timeout fallback - if EOSE doesn't arrive within 10 seconds, set loadedMessages anyway
-      if (!onBlackList)onMsgRead(ev)
+    const EOSE_TIMEOUT_MS = 10000 // 10 seconds
-    })
+    eoseTimeoutId = setTimeout(() => {
+      if (!eoseCalled && !selectedChannelIsDm) {
+        console.warn(`EOSE timeout reached for subscription ${subId} - setting loadedMessages to true`)
+        setLoadedMessages(true)
+      }
+    }, EOSE_TIMEOUT_MS)
+
+    // Capture values for cleanup
+    const subscriptionsRefValue = subscriptionsRef.current
+    const restClientValue = restClient.current
 
     return () => {
-      // Close pool on component unmount or selected channel changes
+      // Clear EOSE timeout if it exists
-      console.log('Close existing pool for group channel')
+      if (eoseTimeoutId) {
-      pool.close()
+        clearTimeout(eoseTimeoutId)
+      }
+      // Close subscription on component unmount or selected channel changes
+      console.log('Close existing subscription for group channel')
+      if (subscriptionsRefValue[subId]) {
+        subscriptionsRefValue[subId].close()
+        delete subscriptionsRefValue[subId]
+      }
+      restClientValue.closeSubscription(subId).catch(err => {
+        // Subscription already closed is not an error - this is expected behavior
+        const errorMessage = err?.message || err?.toString() || ''
+        if (!errorMessage.includes('not found') && !errorMessage.includes('already closed')) {
+          console.warn('Error closing subscription:', err)
+        }
+      })
     }
-  }, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, channelsLoaded])
+  }, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, channelsLoaded, deletedChats])
 
-  // Handle nostr pool for dm channels
+  // Handle SSE subscription for dm channels
   useEffect(() => {
     // fetch messages when channel selected and channel metadata are loaded
 
@@ -223,44 +277,85 @@ function NostrChat (props) {
     const { nostrKeyPair } = bchWalletState
     const dmPubKey = selectedChannel
 
-    // Load messages for group channel
+    // Create subscription for DM channel messages
-    const relays = nostrQueries.relays
+    const subId = generateSubId(`dm-${dmPubKey}`)
-    if (relays.length === 0) {
+    // Use array of filters for multiple conditions
-      return
+    const filters = [
-    }
+      { limit: 10, kinds: [4], '#p': [nostrKeyPair.pubHex], authors: [dmPubKey] }, // received messages
+      { limit: 10, kinds: [4], '#p': [dmPubKey], authors: [nostrKeyPair.pubHex] } // sent messages
+    ]
 
-    const pool = RelayPool(relays)
+    // Track if EOSE has been called
+    let eoseCalled = false
+    let eoseTimeoutId = null
 
-    // const pool = RelayPool([config.nostrRelay])
+    const subscription = restClient.current.createSubscription(subId, filters, {
-    pool.on('open', relay => {
+      onEvent: (ev) => {
-      relay.subscribe('REQ', [
+        console.log('DM post retrieved from REST API', ev.content)
-        { limit: 10, kinds: [4], '#p': [nostrKeyPair.pubHex], authors: [dmPubKey] }, // received messages
+        // decrypt message
-        { limit: 10, kinds: [4], '#p': [dmPubKey], authors: [nostrKeyPair.pubHex] } // sent messages
+        if (ev.pubkey === nostrKeyPair.pubHex) {
-      ])
+          // Sent messages
+          decryptMsg({ ev, pubKey: dmPubKey })
+        } else {
+          // Received messages
+          decryptMsg({ ev, pubKey: ev.pubkey })
+        }
+      },
+      onEose: () => {
+        eoseCalled = true
+        if (eoseTimeoutId) {
+          clearTimeout(eoseTimeoutId)
+          eoseTimeoutId = null
+        }
+        if (selectedChannelIsDm) {
+          // Use setTimeout to ensure state updates from onEvent callbacks are processed
+          // before setting loadedMessages to true
+          setTimeout(() => {
+            setLoadedMessages(true)
+          }, 100)
+        }
+      },
+      onClosed: (message) => {
+        console.log('DM channel subscription closed:', message)
+      },
+      onError: (error) => {
+        console.warn('DM channel subscription error:', error)
+      }
     })
 
-    pool.on('eose', relay => {
+    subscriptionsRef.current[subId] = subscription
-      if (selectedChannelIsDm) {
+
+    // Set up EOSE timeout fallback - if EOSE doesn't arrive within 10 seconds, set loadedMessages anyway
+    const EOSE_TIMEOUT_MS = 10000 // 10 seconds
+    eoseTimeoutId = setTimeout(() => {
+      if (!eoseCalled && selectedChannelIsDm) {
+        console.warn(`EOSE timeout reached for subscription ${subId} - setting loadedMessages to true`)
         setLoadedMessages(true)
       }
-    })
+    }, EOSE_TIMEOUT_MS)
 
-    pool.on('event', (relay, subId, ev) => {
+    // Capture values for cleanup
-      console.log('DM post retrieved from ', relay.url, ev.content)
+    const subscriptionsRefValue = subscriptionsRef.current
-      // decrpt message
+    const restClientValue = restClient.current
-      if (ev.pubkey === nostrKeyPair.pubHex) {
-        // Sent messages
-        decryptMsg({ ev, pubKey: dmPubKey })
-      } else {
-        // Received messages
-        decryptMsg({ ev, pubKey: ev.pubkey })
-      }
-    })
 
     return () => {
-      // Close pool on component unmount or selected channel changes
+      // Clear EOSE timeout if it exists
-      console.log('Close existing pool for private channel')
+      if (eoseTimeoutId) {
-      pool.close()
+        clearTimeout(eoseTimeoutId)
+      }
+      // Close subscription on component unmount or selected channel changes
+      console.log('Close existing subscription for private channel')
+      if (subscriptionsRefValue[subId]) {
+        subscriptionsRefValue[subId].close()
+        delete subscriptionsRefValue[subId]
+      }
+      restClientValue.closeSubscription(subId).catch(err => {
+        // Subscription already closed is not an error - this is expected behavior
+        const errorMessage = err?.message || err?.toString() || ''
+        if (!errorMessage.includes('not found') && !errorMessage.includes('already closed')) {
+          console.warn('Error closing subscription:', err)
+        }
+      })
     }
   }, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, bchWalletState, decryptMsg])
 
@@ -299,30 +394,52 @@ function NostrChat (props) {
     }
   }, [nostrQueries, dmListLoaded])
 
-  // Keep live NPI04  for new dms
+  // Keep live subscription for new DMs
   useEffect(() => {
     if (!dmListLoaded || !channelsLoaded) return
     const { bchWalletState } = appData
     const { nostrKeyPair } = bchWalletState
-    const relays = nostrQueries.relays
 
-    const pool = RelayPool(relays)
+    // Create subscription for new incoming DM notifications
-    // const pool = RelayPool([config.nostrRelay])
+    const subId = generateSubId('dm-notify')
-    pool.on('open', relay => {
+    const filter = { limit: 0, kinds: [4], '#p': [nostrKeyPair.pubHex] } // received messages
-      relay.subscribe('REQ', [
+
-        { limit: 0, kinds: [4], '#p': [nostrKeyPair.pubHex] } // received messages
+    const subscription = restClient.current.createSubscription(subId, filter, {
-      ])
+      onEvent: (ev) => {
+        console.log('New message received from REST API', ev)
+        handleIncomingDms(ev.pubkey)
+      },
+      onEose: () => {
+        // EOSE received, subscription is active
+      },
+      onClosed: (message) => {
+        console.log('DM notification subscription closed:', message)
+      },
+      onError: (error) => {
+        console.warn('DM notification subscription error:', error)
+      }
     })
 
-    pool.on('event', (relay, subId, ev) => {
+    subscriptionsRef.current[subId] = subscription
-      console.log('New message received', ev)
+
-      handleIncomingDms(ev.pubkey)
+    // Capture values for cleanup
-    })
+    const subscriptionsRefValue = subscriptionsRef.current
+    const restClientValue = restClient.current
 
     return () => {
-      // Close pool on component unmount or selected channel changes
+      // Close subscription on component unmount
-      console.log('Close existing pool for private channel')
+      console.log('Close existing subscription for DM notifications')
-      pool.close()
+      if (subscriptionsRefValue[subId]) {
+        subscriptionsRefValue[subId].close()
+        delete subscriptionsRefValue[subId]
+      }
+      restClientValue.closeSubscription(subId).catch(err => {
+        // Subscription already closed is not an error - this is expected behavior
+        const errorMessage = err?.message || err?.toString() || ''
+        if (!errorMessage.includes('not found') && !errorMessage.includes('already closed')) {
+          console.warn('Error closing subscription:', err)
+        }
+      })
     }
   }, [handleIncomingDms, appData, nostrQueries, dmListLoaded, channelsLoaded])
 

src/components/app-body/nostr-chat/message-input.js

@@ -9,11 +9,13 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faPaperPlane } from '@fortawesome/free-solid-svg-icons'
 import { finalizeEvent } from 'nostr-tools/pure'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
-import { Relay } from 'nostr-tools/relay'
+import NostrRestClient from '../../../services/nostr-rest-client.js'
 
 function MessageInput (props) {
   const { appData, selectedChannel, profiles } = props
-  const { bchWalletState, writeRelays, nostrQueries } = appData
+  const { bchWalletState, nostrQueries } = appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
   const [isDm, setIsDm] = useState(false)
   const [dmProfile, setDmProfile] = useState(false)
   const [message, setMessage] = useState('')
@@ -57,25 +59,19 @@ function MessageInput (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
+      // Publish the message via REST API (handles broadcasting to multiple relays)
-      for (let i = 0; i < writeRelays.length; i++) {
+      try {
-        const relayUrl = writeRelays[i]
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
 
-        try {
+        if (!result.accepted) {
-          // Connect to a relay.
+          throw new Error(`Failed to publish: ${result.message || 'Unknown error'}`)
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
-
-          // Publish the message to the relay.
-          const result = await relay.publish(signedEvent)
-          console.log('result: ', result)
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
         }
+      } catch (err) {
+        console.warn(`Error publishing message: ${err}`)
+        throw err
       }
+
       setMessage('')
       setOnFetch(false)
     } catch (error) {
@@ -111,25 +107,19 @@ function MessageInput (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
+      // Publish the message via REST API (handles broadcasting to multiple relays)
-      for (let i = 0; i < writeRelays.length; i++) {
+      try {
-        const relayUrl = writeRelays[i]
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
 
-        try {
+        if (!result.accepted) {
-          // Connect to a relay.
+          throw new Error(`Failed to publish: ${result.message || 'Unknown error'}`)
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
-
-          // Publish the message to the relay.
-          const result = await relay.publish(signedEvent)
-          console.log('result: ', result)
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
         }
+      } catch (err) {
+        console.warn(`Error publishing message: ${err}`)
+        throw err
       }
+
       setMessage('')
       setOnFetch(false)
     } catch (error) {

src/components/app-body/nostr-chat/message-list.js

@@ -13,7 +13,7 @@ import { Spinner } from 'react-bootstrap'
 function MessageList (props) {
   const { messages, loadedMessages } = props
   console.log('loadedMessages', loadedMessages)
-  const [groupedMessages, setGroupedMessages] = useState([])
+  const [groupedMessages, setGroupedMessages] = useState({})
   const msgContainerRef = useRef()
   // Group messages by date
   const groupMessagesByDate = useCallback((messages) => {

src/components/app-body/nostr/content-creators/follow-btn.js

@@ -1,13 +1,15 @@
 import React, { useState, useEffect } from 'react'
 import { Spinner } from 'react-bootstrap'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils'
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 function FollowBtn (props) {
   const [onFetch, setOnFetch] = useState(false)
   const [isFollowing, setIsFollowing] = useState(false)
   const { creator, appData, creatorProfile, followList, refreshFollowList } = props
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
 
   useEffect(() => {
     const isFollowing = followList.find(item => item[1] === creator.pubkey)
@@ -27,8 +29,8 @@ function FollowBtn (props) {
       if (!existing) {
         const creatorName = creatorProfile.name || ''
 
-        // add creator to the list
+        // add creator to the list (relay URL in tag is optional, REST API handles relay selection)
-        currentList.push(['p', creator.pubkey, 'wss://nostr-relay.psfoundation.info', creatorName])
+        currentList.push(['p', creator.pubkey, '', creatorName])
         await submitFollowList(currentList)
         await refreshFollowList()
       } else {
@@ -73,10 +75,7 @@ function FollowBtn (props) {
       // Convert private key to binary
       const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
 
-      // Relay list
+      // Generate a follow list event.
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
-      // Generate a post.
       const eventTemplate = {
         kind: 3,
         created_at: Math.floor(Date.now() / 1000),
@@ -89,16 +88,14 @@ function FollowBtn (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Connect to a relay.
+      // Publish the follow list via REST API (handles broadcasting to multiple relays)
-      const relay = await Relay.connect(psf)
+      const result = await restClient.publishEvent(signedEvent)
-      console.log(`connected to ${relay.url}`)
-
-      // Publish the message to the relay.
-      const result = await relay.publish(signedEvent)
       console.log('result: ', result)
 
-      // Close the connection to the relay.
+      if (!result.accepted) {
-      relay.close()
+        throw new Error(`Failed to publish follow list: ${result.message || 'Unknown error'}`)
+      }
+
       setTimeout(() => {
         setOnFetch(false)
       }, 1000)

src/components/app-body/nostr/feeds/feed-card.js

@@ -10,8 +10,8 @@ import { faUser, faHeart as faHeartSolid } from '@fortawesome/free-solid-svg-ico
 import { faHeart } from '@fortawesome/free-regular-svg-icons'
 import * as nip19 from 'nostr-tools/nip19'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 // Local libraries
 import CopyOnClick from '../../bch-wallet/copy-on-click.js'
@@ -19,7 +19,9 @@ import NostrFormat from '../nostr-format'
 
 function FeedCard (props) {
   const { post, appData, profiles } = props
-  const { nostrKeyPair, writeRelays } = appData.bchWalletState
+  const { nostrKeyPair } = appData.bchWalletState
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
 
   const [profile, setProfile] = useState(profiles[post.pubkey])
 
@@ -103,25 +105,22 @@ function FeedCard (props) {
       }
       console.log(`eventTemplate: ${JSON.stringify(eventTemplate, null, 2)}`)
 
-      writeRelays.map(async (relayUrl) => {
+      // Sign the post
-        try {
+      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
-          // Sign the post
+      console.log('signedEvent: ', signedEvent)
-          const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
-          console.log('signedEvent: ', signedEvent)
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
 
-          // Publish the message to the relay.
+      // Publish the like via REST API (handles broadcasting to multiple relays)
-          const result = await relay.publish(signedEvent)
+      try {
-          console.log('result: ', result)
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
 
-          // Close the connection to the relay.
+        if (!result.accepted) {
-          relay.close()
+          throw new Error(`Failed to publish like: ${result.message || 'Unknown error'}`)
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
         }
-      })
+      } catch (err) {
+        console.warn(`Error publishing like: ${err}`)
+        throw err
+      }
 
       await handleLikes(post, nostrKeyPair.pubHex)
       setLikesFetched(true)

src/components/app-body/nostr/nostr-post/profile-post.js

@@ -7,14 +7,16 @@ import React, { useState, useEffect } from 'react'
 import { Container, Form, Button, Spinner } from 'react-bootstrap'
 import Accordion from 'react-bootstrap/Accordion'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 // Local libraries
 
 function ProfilePost (props) {
   const { appData } = props
-  const { bchWalletState, writeRelays } = appData
+  const { bchWalletState } = appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
   const [accordionKey, setAccordionKey] = useState(null)
   const [onFetch, setOnFetch] = useState(false)
   const [formLoaded, setFormLoaded] = useState(false)
@@ -88,23 +90,13 @@ function ProfilePost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
+      // Publish the profile via REST API (handles broadcasting to multiple relays)
-      writeRelays.map(async (relayUrl) => {
+      const result = await restClient.publishEvent(signedEvent)
-        try {
+      console.log('result: ', result)
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
 
-          // Publish the message to the relay.
+      if (!result.accepted) {
-          const result = await relay.publish(signedEvent)
+        throw new Error(`Failed to publish profile: ${result.message || 'Unknown error'}`)
-          console.log('result: ', result)
+      }
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
-        }
-      })
 
       setSuccessMsg('Post successfully published!')
       setOnFetch(false)

src/components/app-body/nostr/nostr-post/public-post.js

@@ -7,15 +7,17 @@ import React, { useState } from 'react'
 import { Container, Form, Button, Spinner } from 'react-bootstrap'
 import Accordion from 'react-bootstrap/Accordion'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 // Local libraries
 
 function PublicPost (props) {
   const [accordionKey, setAccordionKey] = useState('0')
   const [onFetch, setOnFetch] = useState(false)
-  const { bchWalletState, writeRelays } = props.appData
+  const { bchWalletState } = props.appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
   const [formData, setFormData] = useState({
     content: ''
   })
@@ -62,23 +64,13 @@ function PublicPost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
+      // Publish the post via REST API (handles broadcasting to multiple relays)
-      writeRelays.map(async (relayUrl) => {
+      const result = await restClient.publishEvent(signedEvent)
-        try {
+      console.log('result: ', result)
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
 
-          // Publish the message to the relay.
+      if (!result.accepted) {
-          const result = await relay.publish(signedEvent)
+        throw new Error(`Failed to publish post: ${result.message || 'Unknown error'}`)
-          console.log('result: ', result)
+      }
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
-        }
-      })
 
       resetForm()
       setSuccessMsg('Post successfully published!')

src/components/app-body/offers/index.js

@@ -8,7 +8,7 @@ import React, { useState, useEffect, useCallback } from 'react'
 import { Container, Row, Col, Table, Button, Spinner } from 'react-bootstrap'
 import axios from 'axios'
 import { DatatableWrapper, TableBody, TableHeader } from 'react-bs-datatable'
-
+import AsyncLoad from '../../../services/async-load'
 // Local libraries
 import config from '../../../config'
 import WaitingModal from '../../waiting-modal'
@@ -100,10 +100,19 @@ function Offers (props) {
 
       // Generate a counter offer.
       const bchDexLib = appData.dexLib
-      const { offerData, partialHex } = await bchDexLib.take.takeOffer(
+      const { offerData, partialHex, counterOfferUtxo } = await bchDexLib.take.takeOffer(
         targetOfferEventId
       )
 
+      // Get counter offer data
+      const asyncLoad = new AsyncLoad()
+      const { takerAddr, takerNpub, counterOfferAddr } = await asyncLoad.getCounterOfferMetadata(appData)
+
+      offerData.takerAddr = takerAddr
+      offerData.takerNpub = takerNpub
+      offerData.counterOfferAddr = counterOfferAddr
+      offerData.counterOfferUtxo = counterOfferUtxo.txid
+
       // Upload the counter offer to Nostr.
       const nostr = appData.nostr
       const { eventId, noteId } = await nostr.testNostrUpload({

src/components/nav-menu/index.js

@@ -58,6 +58,14 @@ function NavMenu (props) {
                 Fungible Tokens
               </NavLink>
 
+              <NavLink
+                className={currentPath === '/counter-offers' ? 'nav-link-active' : 'nav-link-inactive'}
+                to='/counter-offers'
+                onClick={handleClickEvent}
+              >
+                Counter Offers
+              </NavLink>
+
               <hr />
 
               <NavLink

src/config/index.js

@@ -18,6 +18,12 @@ const config = {
   // dexServer: 'http://localhost:5700',
 
   nostrTopic: 'bch-dex-test-topic-02',
+
+  // REST API endpoint for Nostr relay interactions (primary interface)
+  nostrRestApiUrl: 'https://nostr-relay-api.psfoundation.info',
+  // nostrRestApiUrl: 'http://localhost:5942',
+
+  // Legacy relay URLs kept for reference (may be used in tags, but actual connections use REST API)
   nostrRelay: 'wss://nostr-relay.psfoundation.info',
   nostrRelays: [
     'wss://nostr-relay.psfoundation.info',

src/hooks/state.js

@@ -46,6 +46,7 @@ function useAppState () {
   const [hideSpinner, setHideSpinner] = useState(false)
   const [denyClose, setDenyClose] = useState(false)
   const [isSingleView, setIsSingleView] = useState(false)
+
   // Background process state
   const [asyncBackGroundInitState, setAsyncBackGroundInitState] = useState({
     bchInitLoaded: false, slpInitLoaded: false, asyncBackgroundFinished: false
@@ -59,8 +60,8 @@ function useAppState () {
   const [readRelays, setReadRelays] = useState(relaysData.filter(relay => relay.read).map(relay => relay.address)) // Read relays
   const [writeRelays, setWriteRelays] = useState(relaysData.filter(relay => relay.write).map(relay => relay.address)) // Write relays
 
-  // Nostr queries service
+  // Nostr queries service (REST API handles relays server-side, pass empty array for compatibility)
-  const nostrQueriesRef = useRef(new NostrQueries({ relays: readRelays }))
+  const nostrQueriesRef = useRef(new NostrQueries({ relays: [] }))
 
   // ProfileDM
   const [startChannelChat, setStartChannelChat] = useState('')
@@ -135,7 +136,7 @@ function useAppState () {
     updateLocalStorage({ nftData: allCacheData }) // Update the local storage
   }
 
-  // Update relays data
+  // Update relays data (kept for UI compatibility, REST API handles relays server-side)
   function updateRelaysData (relaysData) {
     setRelaysData(relaysData)
     updateLocalStorage({ relays: relaysData }) // Update the local storage
@@ -147,10 +148,12 @@ function useAppState () {
     const writeRelays = relaysData.filter(relay => relay.write).map(relay => relay.address)
     setWriteRelays(writeRelays)
     console.log('writeRelays: ', writeRelays)
-    nostrQueriesRef.current = new NostrQueries({ relays: readRelays })
+    // NostrQueries no longer needs relay updates (REST API handles relays server-side)
+    // Recreate instance for compatibility, but pass empty array
+    nostrQueriesRef.current = new NostrQueries({ relays: [] })
   }
 
-  // Restore relays data
+  // Restore relays data (kept for UI compatibility, REST API handles relays server-side)
   function restoreRelaysData () {
     const relaysData = [...localStorageDefault.relays] // Create a new array  in order to detect changes
     setRelaysData(relaysData)
@@ -163,7 +166,9 @@ function useAppState () {
     const writeRelays = relaysData.filter(relay => relay.write).map(relay => relay.address)
     setWriteRelays(writeRelays)
     console.log('writeRelays: ', writeRelays)
-    nostrQueriesRef.current = new NostrQueries({ relays: readRelays })
+    // NostrQueries no longer needs relay updates (REST API handles relays server-side)
+    // Recreate instance for compatibility, but pass empty array
+    nostrQueriesRef.current = new NostrQueries({ relays: [] })
   }
 
   // Update background state

src/services/async-load.js

@@ -333,6 +333,59 @@ class AsyncLoad {
       throw error
     }
   }
+
+  async getDerivatedWallet (restURL, mnemonic, hdPath = "m/44'/245'/0'/0/0", initialize = true) {
+    try {
+      const options = {
+        interface: 'consumer-api',
+        restURL,
+        noUpdate: true,
+        hdPath
+      }
+
+      const wallet = new this.BchWallet(mnemonic, options)
+
+      // Wait for wallet to initialize.
+      await wallet.walletInfoPromise
+      if (initialize) {
+        await wallet.initialize()
+      }
+
+      return wallet
+    } catch (error) {
+      console.error('Error initStarterWallet: ', error)
+      throw error
+    }
+  }
+
+  // Get buyer and counter offer data.
+  async getCounterOfferMetadata (appData) {
+    try {
+      const { bchWalletState, serverUrl } = appData
+      // Start async load lib
+      const asyncLoad = new AsyncLoad()
+      await asyncLoad.loadWalletLib()
+
+      // Buyer wallet data
+      const buyerWallet = await asyncLoad.getDerivatedWallet(serverUrl, bchWalletState.mnemonic, "m/44'/245'/0'/0/0", false)
+      const buyerAddr = buyerWallet.walletInfo.cashAddress
+      const buyerKeyPair = asyncLoad.nostrKeyPairFromWIF(buyerWallet.walletInfo.privateKey)
+      const buyerNpub = buyerKeyPair.npub
+
+      // Counter offer wallet data
+      const counterOfferWallet = await asyncLoad.getDerivatedWallet(serverUrl, bchWalletState.mnemonic, "m/44'/245'/0'/0/1", false)
+      const counterOfferAddr = counterOfferWallet.walletInfo.cashAddress
+
+      return {
+        takerAddr: buyerAddr,
+        takerNpub: buyerNpub,
+        counterOfferAddr
+      }
+    } catch (error) {
+      console.error('Error getCounterOfferMetadata()', error)
+      throw error
+    }
+  }
 }
 
 function sleep (ms) {

src/services/nostr-queries.js

@@ -1,26 +1,38 @@
 /**
  *  Nostr class for query into relay pools
- *
+ *  Refactored to use REST API instead of WebSocket
  */
-import { RelayPool } from 'nostr'
+import NostrRestClient, { generateSubId } from './nostr-rest-client.js'
 import * as nip19 from 'nostr-tools/nip19'
 import { nip04 } from 'nostr-tools'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
 import axios from 'axios'
+import config from '../config'
+
+const SERVER = `${config.dexServer}/`
 
 export default class NostrQueries {
   constructor ({ relays }) {
-    this.relays = relays || []
+    // Keep relays property for backward compatibility (empty array)
+    this.relays = []
+
+    // Initialize REST client
+    this.restClient = new NostrRestClient()
 
     this.loadedProfiles = {}
     this.loadedChannelsInfo = {}
     this.blackList = []
     this.blackListFetched = false
+
+    this.deletedChats = []
+    this.deletedPosts = []
   }
 
   async start () {
     try {
       await this.getBlackList()
+      await this.fetchDeletedChats()
+      await this.fetchDeletedPosts()
     } catch (error) {
       console.error('NostrQueries.start() error : ', error.message)
       throw error
@@ -28,7 +40,8 @@ export default class NostrQueries {
   }
 
   setRelays (relays) {
-    this.relays = relays
+    // No-op for backward compatibility (REST API handles relays server-side)
+    this.relays = []
   }
 
   npubToHex (npub) {
@@ -41,160 +54,50 @@ export default class NostrQueries {
     return nip19.npubEncode(hex)
   }
 
-  // Load profile from nostr relays
+  // Load profile from nostr relays via REST API
-  // It uses multiple relays. It will exit after the first successful retrieval
-  // from any relay. If one relay fails, it will move on to the next one.
   async getProfile (pubHex) {
     try {
-      if (this.relays.length === 0) {
-        return false
-      }
       const existingProfile = this.loadedProfiles[pubHex]
       if (existingProfile) {
         console.log(`Returning profile from cache :  ${existingProfile.name}`)
         return existingProfile
       }
 
-      for (let i = 0; i < this.relays.length; i++) {
+      const subId = generateSubId('profile')
-        const profile = await new Promise((resolve) => {
+      const filter = { limit: 5, kinds: [0], authors: [pubHex] }
-          const relay = this.relays[i]
-          // const pool = RelayPool(config.nostrRelays)
-          const pool = RelayPool([relay])
-          pool.on('open', relay => {
-            relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubHex] })
-          })
 
-          pool.on('eose', relay => {
+      const events = await this.restClient.queryEvents(subId, filter)
-            relay.close()
-            resolve(false)
-          })
 
-          pool.on('event', (relay, subId, ev) => {
+      // Find the most recent profile event (kind 0 events are replaceable)
-            try {
+      if (events && events.length > 0) {
-              const profile = JSON.parse(ev.content)
+        // Sort by created_at descending to get most recent
-              // console.log('profile', profile)
+        events.sort((a, b) => b.created_at - a.created_at)
-              console.log(`Profile found  for ${pubHex} at ${relay.url}`)
+        const profileEvent = events[0]
-              resolve(profile)
+        try {
-            } catch (error) {
+          const profile = JSON.parse(profileEvent.content)
-              resolve(false)
+          console.log(`Profile found for ${pubHex}`)
-            }
+          this.loadedProfiles[pubHex] = profile
-            relay.close()
-          })
-          pool.on('error', (relay) => {
-            console.log(`Error fetching ${pubHex} profile. relay connection error :${relay.url} `)
-            relay.close()
-            resolve(false)
-          })
-        })
-        // Stop looking for profile if found
-        if (profile) {
-          this.loadedProfiles[pubHex] = profile // Store profile
           return profile
+        } catch (error) {
+          console.warn(`Error parsing profile content for ${pubHex}:`, error)
+          return false
         }
       }
+
+      return false
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching profile for ${pubHex}:`, error)
+      return false
     }
   }
 
-  // Get Feeds by user pubkey
+  // Get Feeds by user pubkey via REST API
   async getUserFeeds (pubHex) {
     try {
-      if (this.relays.length === 0) {
+      const subId = generateSubId('user-feeds')
-        return []
+      const filter = { limit: 5, kinds: [1], authors: [pubHex] }
-      }
-      let feeds = await new Promise((resolve) => {
-        let list = []
-        const closedRelays = []
 
-        const pool = RelayPool(this.relays)
+      let feeds = await this.restClient.queryEvents(subId, filter)
-
-        pool.on('open', relay => {
-          relay.subscribe('subid', { limit: 5, kinds: [1], authors: [pubHex] })
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          list = [...list, ev]
-        })
-        pool.on('error', (relay) => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          } // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-      })
-      // Remove duplicated feeds
-      feeds = feeds.filter((val, i, list) => {
-        const existingIndex = list.findIndex(value => value.id === val.id)
-        return existingIndex === i
-      })
-
-      // Sort from newest to oldest
-      feeds.sort((a, b) => b.created_at - a.created_at)
-
-      return feeds
-    } catch (error) {
-      console.warn(error)
-    }
-  }
-
-  // Get global feeds
-  async getGlobalFeeds () {
-    try {
-      if (this.relays.length === 0) {
-        return []
-      }
-
-      let feeds = await new Promise((resolve, reject) => {
-        let list = []
-        const closedRelays = []
-
-        const pool = RelayPool(this.relays)
-        // const pool = RelayPool([config.nostrRelay])
-        pool.on('open', relay => {
-          relay.subscribe('REQ', { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] })
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          console.log('post retrieved from ', relay.url, ev.sig)
-          list = [...list, ev]
-        })
-        pool.on('error', (relay) => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-      })
 
       // Remove duplicated feeds
       feeds = feeds.filter((val, i, list) => {
@@ -205,111 +108,80 @@ export default class NostrQueries {
       // Sort from newest to oldest
       feeds.sort((a, b) => b.created_at - a.created_at)
 
-      // console.log('feeds', feeds)
+      return feeds || []
-
-      return feeds
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching user feeds for ${pubHex}:`, error)
-    }
-  }
-
-  // Get follow list by pubkey
-  async getFollowList (pubHex) {
-    if (this.relays.length === 0) {
       return []
     }
-    return new Promise((resolve, reject) => {
-      let list = []
-      const closedRelays = []
-
-      const pool = RelayPool(this.relays)
-      // const pool = RelayPool([config.nostrRelay])
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 1, kinds: [3], authors: [pubHex] })
-      })
-
-      pool.on('eose', relay => {
-        relay.close()
-        if (!closedRelays.includes(relay)) {
-          closedRelays.push(relay)
-        }
-        // Resolve list if all relays are closed
-        if (closedRelays.length === this.relays.length) {
-          resolve(list)
-        }
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        // console.log('Received event:', ev)
-        // Merge list received from all relays
-        list = [...list, ...ev.tags]
-      })
-      pool.on('error', (relay) => {
-        relay.close()
-        if (!closedRelays.includes(relay)) {
-          closedRelays.push(relay)
-        }
-        // Resolve list if all relays are closed
-        if (closedRelays.length === this.relays.length) {
-          resolve(list)
-        }
-      })
-    })
   }
 
-  // Get event likes
+  // Get global feeds via REST API
+  async getGlobalFeeds () {
+    try {
+      const subId = generateSubId('global-feeds')
+      const filter = { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] }
+
+      let feeds = await this.restClient.queryEvents(subId, filter)
+
+      // Filter out deleted posts
+      feeds = feeds.filter((ev) => {
+        const isDeleted = this.deletedPosts.find((val) => { return val.eventId === ev.id })
+        return !isDeleted
+      })
+
+      // Remove duplicated feeds
+      feeds = feeds.filter((val, i, list) => {
+        const existingIndex = list.findIndex(value => value.id === val.id)
+        return existingIndex === i
+      })
+
+      // Sort from newest to oldest
+      feeds.sort((a, b) => b.created_at - a.created_at)
+
+      return feeds || []
+    } catch (error) {
+      console.warn('Error fetching global feeds:', error)
+      return []
+    }
+  }
+
+  // Get follow list by pubkey via REST API
+  async getFollowList (pubHex) {
+    try {
+      const subId = generateSubId('follow-list')
+      const filter = { limit: 1, kinds: [3], authors: [pubHex] }
+
+      const events = await this.restClient.queryEvents(subId, filter)
+
+      // Get the most recent follow list (kind 3 events are replaceable)
+      if (events && events.length > 0) {
+        // Sort by created_at descending to get most recent
+        events.sort((a, b) => b.created_at - a.created_at)
+        const followListEvent = events[0]
+        return followListEvent.tags || []
+      }
+
+      return []
+    } catch (error) {
+      console.warn(`Error fetching follow list for ${pubHex}:`, error)
+      return []
+    }
+  }
+
+  // Get event likes via REST API
   async getPostLikes (postId) {
     try {
-      if (this.relays.length === 0) {
+      const subId = generateSubId('post-likes')
-        return []
+      const filter = { kinds: [7], '#e': [postId] }
-      }
-      let likesRes = await new Promise((resolve) => {
-        const likes = []
-        const closedRelays = []
 
-        const pool = RelayPool(this.relays)
+      let likesRes = await this.restClient.queryEvents(subId, filter)
-        pool.on('open', relay => {
-          relay.subscribe('subid', { kinds: [7], '#e': [postId] })
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(likes)
-          }
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          try {
-            // Count likes
-            if (ev.content === '+' || ev.content === '-') {
-              likes.push(ev)
-            }
-          } catch (error) {
-            // skip error
-          }
-        })
-        pool.on('error', (relay) => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(likes)
-          }
-        })
-      })
 
       // Remove duplicated events
       likesRes = likesRes.filter((val, i, list) => {
         const existingIndex = list.findIndex(value => value.id === val.id)
         return existingIndex === i
       })
+
       // Get likes
       const likesArr = likesRes.filter((val, i, list) => {
         return val.content === '+'
@@ -319,129 +191,91 @@ export default class NostrQueries {
       const dislikesArr = likesRes.filter((val, i, list) => {
         return val.content === '-'
       })
+
       // For every user dislike remove a user like from the array
       for (let i = 0; i < dislikesArr.length; i++) {
         const disLike = dislikesArr[i]
         const likeExist = likesArr.findIndex(val => val.pubkey === disLike.pubkey)
         if (likeExist >= 0) likesArr.splice(likeExist, 1)
       }
+
       // Return array of likes.
       return likesArr
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching post likes for ${postId}:`, error)
+      return []
     }
   }
 
   async getChannelInfo (channelId) {
     try {
-      if (this.relays.length === 0) {
-        return false
-      }
       const existingChInfo = this.loadedChannelsInfo[channelId]
       if (existingChInfo) {
         console.log(`Returning ch info from cache :  ${existingChInfo.name}`)
         return existingChInfo
       }
-      for (let i = 0; i < this.relays.length; i++) {
-        const info = await new Promise((resolve) => {
-          const relay = this.relays[i]
-          // const pool = RelayPool(config.nostrRelays)
-          const pool = RelayPool([relay])
-          pool.on('open', relay => {
-            relay.subscribe('REQ', { limit: 1, kinds: [41], '#e': [channelId] })
-          })
 
-          pool.on('eose', relay => {
+      const subId = generateSubId('channel-info')
-            relay.close()
+      const filter = { limit: 1, kinds: [41], '#e': [channelId] }
-            resolve(false)
-          })
 
-          pool.on('event', (relay, subId, ev) => {
+      const events = await this.restClient.queryEvents(subId, filter)
-            try {
+
-              const chInfo = JSON.parse(ev.content)
+      if (events && events.length > 0) {
-              resolve(chInfo)
+        // Sort by created_at descending to get most recent
-            } catch (error) {
+        events.sort((a, b) => b.created_at - a.created_at)
-              resolve(false)
+        const channelEvent = events[0]
-            }
+        try {
-            relay.close()
+          const chInfo = JSON.parse(channelEvent.content)
-          })
+          this.loadedChannelsInfo[channelId] = chInfo
-          pool.on('error', (relay) => {
+          return chInfo
-            relay.close()
+        } catch (error) {
-            resolve(false)
+          console.warn(`Error parsing channel info for ${channelId}:`, error)
-          })
+          return false
-        })
-        // Stop looking for profile if found
-        if (info) {
-          this.loadedChannelsInfo[channelId] = info
-          return info
         }
       }
+
+      return false
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching channel info for ${channelId}:`, error)
+      return false
     }
   }
 
-  // Get associated pub keys from kind 04 inbox
+  // Get associated pub keys from kind 04 inbox via REST API
   async getDms (pubKey) {
     try {
-      if (this.relays.length === 0) {
+      const subId = generateSubId('dms')
-        return []
+      // Use array of filters for multiple conditions
+      const filters = [
+        { limit: 100, kinds: [4], '#p': [pubKey] }, // received messages
+        { limit: 100, kinds: [4], authors: [pubKey] } // sent messages
+      ]
+
+      const events = await this.restClient.queryEvents(subId, filters)
+
+      const list = []
+      for (const ev of events) {
+        if (ev.pubkey === pubKey) {
+          // Sent message - get recipient from tags
+          if (ev.tags && ev.tags.length > 0 && ev.tags[0][0] === 'p') {
+            list.push(ev.tags[0][1])
+          }
+        } else {
+          // Received message - get sender pubkey
+          list.push(ev.pubkey)
+        }
       }
 
-      let dms = await new Promise((resolve, reject) => {
+      // Remove duplicated pubkeys
-        let list = []
+      const dms = list.filter((val, i, list) => {
-        const closedRelays = []
-
-        const pool = RelayPool(this.relays)
-        // const pool = RelayPool([config.nostrRelay])
-        pool.on('open', relay => {
-          relay.subscribe('REQ', [
-            { limit: 100, kinds: [4], '#p': [pubKey] }, // received messages
-            { limit: 100, kinds: [4], authors: [pubKey] } // sent messages
-          ])
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          // console.log('post retrieved from ', relay.url, ev.sig)
-          if (ev.pubkey === pubKey) {
-            const pk = ev.tags[0][1]
-            list = [...list, pk]
-          } else {
-            list = [...list, ev.pubkey]
-          }
-        })
-        pool.on('error', (relay) => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-      })
-
-      // Remove duplicated feeds
-      dms = dms.filter((val, i, list) => {
         const existingIndex = list.findIndex(value => value === val)
         return existingIndex === i
       })
 
       return dms
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching DMs for ${pubKey}:`, error)
+      return []
     }
   }
 
@@ -506,4 +340,39 @@ export default class NostrQueries {
       throw error
     }
   }
+
+  // Get all deleted chats
+  async fetchDeletedChats () {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}nostr/deletedChat`
+      }
+      const result = await axios.request(options)
+      const { deletedChats } = result.data
+      this.deletedChats = deletedChats
+    } catch (error) {
+      console.error('Error fetchDeletedChats: ', error)
+      throw error
+    }
+  }
+
+  // Get all deleted posts
+  async fetchDeletedPosts () {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}nostr/deletedPost`
+      }
+      const result = await axios.request(options)
+      console.log('result', result)
+      const { deletedPosts } = result.data
+      console.log('deletedPosts', deletedPosts)
+
+      this.deletedPosts = deletedPosts
+    } catch (error) {
+      console.error('Error fetchDeletedPosts: ', error)
+      throw error
+    }
+  }
 }

src/services/nostr-rest-client.js

@@ -0,0 +1,239 @@
+/**
+ * REST API Client for Nostr relay interactions via REST2NOSTR proxy
+ */
+
+import config from '../config/index.js'
+
+/**
+ * Generate a unique subscription ID
+ * @param {string} prefix - Prefix for the subscription ID
+ * @returns {string} Unique subscription ID
+ */
+export function generateSubId (prefix = 'sub') {
+  return `${prefix}-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`
+}
+
+class NostrRestClient {
+  constructor (localConfig = {}) {
+    this.apiUrl = localConfig.apiUrl || config.nostrRestApiUrl
+    this.activeSubscriptions = new Map() // Track active SSE subscriptions
+  }
+
+  /**
+   * Publish a signed event to the relay
+   * @param {Object} signedEvent - Signed Nostr event
+   * @returns {Promise<Object>} Response with {accepted, message, eventId}
+   */
+  async publishEvent (signedEvent) {
+    try {
+      const response = await fetch(`${this.apiUrl}/event`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(signedEvent)
+      })
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        throw new Error(`HTTP ${response.status}: ${errorText}`)
+      }
+
+      const result = await response.json()
+      return result
+    } catch (error) {
+      console.error('Error publishing event:', error)
+      throw error
+    }
+  }
+
+  /**
+   * Query events statelessly (GET request)
+   * @param {string} subId - Subscription ID
+   * @param {Array|Object} filters - Filter object or array of filters
+   * @returns {Promise<Array>} Array of events
+   */
+  async queryEvents (subId, filters) {
+    try {
+      // Ensure filters is an array
+      const filtersArray = Array.isArray(filters) ? filters : [filters]
+
+      // Encode filters as query parameter
+      const filtersJson = encodeURIComponent(JSON.stringify(filtersArray))
+      const url = `${this.apiUrl}/req/${subId}?filters=${filtersJson}`
+
+      const response = await fetch(url)
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        throw new Error(`HTTP ${response.status}: ${errorText}`)
+      }
+
+      const events = await response.json()
+      return events
+    } catch (error) {
+      console.error('Error querying events:', error)
+      throw error
+    }
+  }
+
+  /**
+   * Create a subscription for Server-Sent Events (SSE)
+   * @param {string} subId - Subscription ID
+   * @param {Array|Object} filters - Filter object or array of filters
+   * @param {Object} callbacks - Callback functions {onEvent, onEose, onClosed, onError}
+   * @returns {EventSource} EventSource instance for cleanup
+   */
+  createSubscription (subId, filters, callbacks = {}) {
+    const { onEvent, onEose, onClosed, onError } = callbacks
+
+    // Ensure filters is an array
+    const filtersArray = Array.isArray(filters) ? filters : [filters]
+
+    // Use POST method for SSE subscription
+    // Note: EventSource doesn't support POST, so we'll use fetch with streaming
+    // However, for simplicity and browser compatibility, we'll use a workaround:
+    // Create a form and use POST, or use EventSource with GET if the server supports it
+
+    // For now, we'll use fetch with streaming and parse SSE manually
+    // This is more complex but allows POST with filters in body
+    const abortController = new AbortController()
+
+    const fetchSubscription = async () => {
+      try {
+        const response = await fetch(`${this.apiUrl}/req/${subId}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Accept: 'text/event-stream'
+          },
+          body: JSON.stringify(filtersArray),
+          signal: abortController.signal
+        })
+
+        if (!response.ok) {
+          const errorText = await response.text()
+          if (onError) {
+            onError(new Error(`HTTP ${response.status}: ${errorText}`))
+          }
+          return
+        }
+
+        const reader = response.body.getReader()
+        const decoder = new TextDecoder()
+        let buffer = ''
+
+        while (true) {
+          const { done, value } = await reader.read()
+
+          if (done) {
+            break
+          }
+
+          buffer += decoder.decode(value, { stream: true })
+          const lines = buffer.split('\n')
+          buffer = lines.pop() || '' // Keep incomplete line in buffer
+
+          for (const line of lines) {
+            if (line.startsWith('data: ')) {
+              try {
+                const data = JSON.parse(line.slice(6)) // Remove 'data: ' prefix
+
+                if (data.type === 'connected') {
+                  // Connection established
+                  console.log(`Subscription ${subId} connected`)
+                } else if (data.type === 'event' && data.data) {
+                  // Event received
+                  if (onEvent) {
+                    onEvent(data.data)
+                  }
+                } else if (data.type === 'eose') {
+                  // End of stored events
+                  if (onEose) {
+                    onEose()
+                  }
+                } else if (data.type === 'closed') {
+                  // Subscription closed
+                  if (onClosed) {
+                    onClosed(data.message || 'Subscription closed')
+                  }
+                  return // Stop reading
+                }
+              } catch (parseError) {
+                console.warn('Error parsing SSE message:', parseError, line)
+              }
+            }
+          }
+        }
+      } catch (error) {
+        if (error.name === 'AbortError') {
+          // Subscription was cancelled, this is expected
+          return
+        }
+        console.error('Error in SSE subscription:', error)
+        if (onError) {
+          onError(error)
+        }
+      }
+    }
+
+    // Store subscription for cleanup
+    const subscription = {
+      subId,
+      abortController,
+      close: () => {
+        abortController.abort()
+        this.closeSubscription(subId)
+      }
+    }
+
+    this.activeSubscriptions.set(subId, subscription)
+
+    // Start the subscription
+    fetchSubscription()
+
+    return subscription
+  }
+
+  /**
+   * Close an existing subscription
+   * @param {string} subId - Subscription ID to close
+   * @returns {Promise<void>}
+   */
+  async closeSubscription (subId) {
+    try {
+      // Abort the fetch if it's still active
+      const subscription = this.activeSubscriptions.get(subId)
+      if (subscription && subscription.abortController) {
+        subscription.abortController.abort()
+      }
+
+      // Send DELETE request to close subscription
+      const response = await fetch(`${this.apiUrl}/req/${subId}`, {
+        method: 'DELETE'
+      })
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        console.warn(`Error closing subscription ${subId}:`, errorText)
+      }
+
+      // Remove from active subscriptions
+      this.activeSubscriptions.delete(subId)
+    } catch (error) {
+      console.error(`Error closing subscription ${subId}:`, error)
+      // Still remove from active subscriptions even if DELETE fails
+      this.activeSubscriptions.delete(subId)
+    }
+  }
+
+  /**
+   * Close all active subscriptions
+   */
+  async closeAllSubscriptions () {
+    const subIds = Array.from(this.activeSubscriptions.keys())
+    await Promise.all(subIds.map(subId => this.closeSubscription(subId)))
+  }
+}
+
+export default NostrRestClient

src/services/nostr.js

@@ -10,10 +10,10 @@
 // import * as nip19 from '@chris.troutner/nostr-tools/nip19'
 
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import BchNostr from 'bch-nostr'
 import * as nip19 from 'nostr-tools/nip19'
 import config from '../config/index.js'
+import NostrRestClient from './nostr-rest-client.js'
 
 class NostrBrowser {
   constructor (localConfig = {}) {
@@ -27,6 +27,9 @@ class NostrBrowser {
       relayWs: config.nostrRelay,
       topic: config.nostrTopic
     })
+
+    // Initialize REST client for publishing events
+    this.restClient = new NostrRestClient()
   }
 
   async testNostrUpload (inObj = {}) {
@@ -69,7 +72,6 @@ class NostrBrowser {
       //   tags: [['t', 'bch-dex-test-topic-01']]
       // }
 
-      const relayWs = config.nostrRelay
       const eventTemplate = {
         kind: 867,
         created_at: Math.floor(Date.now() / 1000),
@@ -82,18 +84,12 @@ class NostrBrowser {
       // console.log('signedEvent: ', signedEvent)
       const eventId = signedEvent.id
 
-      // Connect to a relay.
+      // Publish the message via REST API
-      const relay = await Relay.connect(relayWs, {
+      const result = await this.restClient.publishEvent(signedEvent)
-        /* global WebSocket */
-        webSocket: WebSocket
-      })
-      // console.log(`connected to ${relay.url}`)
 
-      // Publish the message to the relay.
+      if (!result.accepted) {
-      await relay.publish(signedEvent)
+        throw new Error(`Failed to publish event: ${result.message || 'Unknown error'}`)
-
+      }
-      // Close the connection to the relay.
-      relay.close()
 
       // const eventId = await this.bchNostr.post.uploadToNostr(inObj)