Merge pull request #3 from bsv-blockchain/fix/slackthread

[ FIX ] slackthread

Author: sirdeggen

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "overlay-express-examples",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Run the overlay infrastructure for distributed applications.",
   "homepage": "https://github.com/bsv-blockchain/overlay-express-examples#readme",
   "bugs": {

package.json

@@ -1,19 +1,34 @@
 export default `
 # SlackThread Lookup Service Documentation
 
-The **SlackThread Lookup Service** (service ID: \`ls_slackthreads\`) lets clients search the on-chain *SlackThread* messages that are indexed by the **SlackThread Topic Manager**. Each record represents a Pay-to-Push-Drop output whose single field is a UTF-8 message of at least two characters.
+The **SlackThread Lookup Service** (service ID: \`ls_slackthread\`) lets clients search the on-chain *SlackThread* messages that are indexed by the **SlackThread Topic Manager**. Each record represents a Pay-to-Push-Drop output whose single field is a UTF-8 message of at least two characters.
 
 ## Example
 \`\`\`typescript
 import { LookupResolver } from '@bsv/sdk'
 
 const overlay = new LookupResolver()
 
+// find all
+const response2 = await overlay.query({ 
+    service: 'ls_slackthread', 
+    query: {} 
+}, 10000)
+
+// find by thread hash
 const response = await overlay.query({ 
-    service: 'ls_slackthreads', 
+    service: 'ls_slackthread', 
     query: {
         threadHash: 'some 32 byte hash of a thread'
     } 
 }, 10000)
+
+// find by txid
+const response3 = await overlay.query({ 
+    service: 'ls_slackthread', 
+    query: {
+        txid: 'some txid'
+    } 
+}, 10000)
 \`\`\`
 `

src/services/slackthreads/SlackThreadsLookupServiceDocs.md.ts

@@ -9,11 +9,12 @@ import {
   OutputSpent
 } from '@bsv/overlay'
 import { SlackThreadsStorage } from './SlackThreadsStorage.js'
-import { PushDrop, Utils } from '@bsv/sdk'
+import { Utils } from '@bsv/sdk'
 import { Db } from 'mongodb'
 
 export interface SlackThreadQuery {
   threadHash?: string
+  txid?: string
   limit?: number
   skip?: number
   startDate?: Date
@@ -39,18 +40,15 @@ export class SlackThreadLookupService implements LookupService {
   async outputAdmittedByTopic(payload: OutputAdmittedByTopic): Promise<void> {
     if (payload.mode !== 'locking-script') throw new Error('Invalid mode')
     const { topic, lockingScript, txid, outputIndex } = payload
-    if (payload.topic !== 'tm_slackthread') return
+    if (topic !== 'tm_slackthread') return
 
     try {
-      // Decode the PushDrop token
-      const result = PushDrop.decode(lockingScript)
-      if (!result.fields || result.fields.length < 1) throw new Error('Invalid SlackThread token: wrong field count')
-
-      const threadHash = Utils.toUTF8(result.fields[0])
-      if (threadHash.length < 2) throw new Error('Invalid SlackThread token: thread hash too short')
+      const threadHash = lockingScript.chunks[1].data
+      if (threadHash.length !== 32) throw new Error('Invalid SlackThread token: thread hash must be exactly 32 bytes')
+      const threadHashString = Utils.toHex(threadHash)
 
       // Persist for future lookup
-      await this.storage.storeRecord(txid, outputIndex, threadHash)
+      await this.storage.storeRecord(txid, outputIndex, threadHashString)
     } catch (err) {
       console.error(`SlackThreadLookupService: failed to index ${txid}.${outputIndex}`, err)
     }
@@ -88,6 +86,7 @@ export class SlackThreadLookupService implements LookupService {
 
     const {
       threadHash,
+      txid,
       limit = 50,
       skip = 0,
       startDate,
@@ -108,6 +107,10 @@ export class SlackThreadLookupService implements LookupService {
       return this.storage.findByThreadHash(threadHash, limit, skip, sortOrder)
     }
 
+    if (txid) {
+      return this.storage.findByTxid(txid, limit, skip, sortOrder)
+    }
+
     return this.storage.findAll(limit, skip, from, to, sortOrder)
   }
 

src/services/slackthreads/SlackThreadsLookupServiceFactory.ts

@@ -11,6 +11,14 @@ export class SlackThreadsStorage {
    */
   constructor(private readonly db: Db) {
     this.records = db.collection<SlackThreadRecord>('slackThreadRecords')
+    this.createSearchableIndex() // Initialize the searchable index
+  }
+
+  /* Ensures a text index exists for the `threadHash` field, enabling efficient searches.
+   * The index is named `threadHashIndex`.
+   */
+  private async createSearchableIndex(): Promise<void> {
+    await this.records.createIndex({ threadHash: 1 }, { name: 'threadHashIndex' })
   }
 
   /**
@@ -75,6 +83,42 @@ export class SlackThreadsStorage {
       )
   }
 
+  /**
+   * Finds SlackThread records containing the specified transaction ID (case-insensitive).
+   *
+   * @param txid            Partial or full transaction ID to search for
+   * @param limit         Max number of results to return (default = 50)
+   * @param skip          Number of results to skip for pagination (default = 0)
+   * @param sortOrder     'asc' | 'desc' – sort by createdAt (default = 'desc')
+   */
+  async findByTxid(
+    txid: string,
+    limit: number = 50,
+    skip: number = 0,
+    sortOrder: 'asc' | 'desc' = 'desc'
+  ): Promise<UTXOReference[]> {
+    if (!txid) return []
+
+    // Map text value → numeric MongoDB sort direction
+    const direction = sortOrder === 'asc' ? 1 : -1
+
+    return this.records
+      .find(
+        { txid },
+        { projection: { txid: 1, outputIndex: 1, createdAt: 1 } }
+      )
+      .sort({ createdAt: direction })
+      .skip(skip)
+      .limit(limit)
+      .toArray()
+      .then(results =>
+        results.map(r => ({
+          txid: r.txid,
+          outputIndex: r.outputIndex
+        }))
+      )
+  }
+
   /**
    * Retrieves all SlackThread records, optionally filtered by date range and sorted by creation time.
    * @param {number} [limit=50] - The maximum number of results to return

src/services/slackthreads/SlackThreadsStorage.ts

@@ -1,7 +1,7 @@
 export default `
 # SlackThread Topic Manager Documentation
 
-The **SlackThread Topic Manager** (topic ID: \`tm_slackthreads\`) lets clients Push hashes to chain and remove them by revealing the preimage.
+The **SlackThread Topic Manager** (topic ID: \`tm_slackthread\`) lets clients Push hashes to chain and remove them by revealing the preimage.
 
 Either there is a locking script of the form: