@airswap/stores: export createIndex from redis store

airswap · Feb 22, 2024 · b5bf09a · b5bf09a
1 parent 1c3637b
commit b5bf09a
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 72 deletions.
diff --git a/tools/stores/package.json b/tools/stores/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/stores",
-  "version": "4.2.4",
+  "version": "4.2.5",
   "description": "AirSwap: Storage for Indexing",
   "repository": {
     "type": "git",

diff --git a/tools/stores/redis/redis.create.js b/tools/stores/redis/redis.create.js
@@ -1,7 +1,7 @@
 require('dotenv').config({ path: '../../.env' })
 
 const { createClient } = require('redis')
-const { createIndex } = require('../build/redis/redis.index.js')
+const { createIndex } = require('../build/redis/redis.js')
 
 async function main() {
   if (!process.env.REDISCLOUD_URL) {

diff --git a/tools/stores/redis/redis.index.ts b/tools/stores/redis/redis.index.ts
diff --git a/tools/stores/redis/redis.ts b/tools/stores/redis/redis.ts
@@ -1,12 +1,11 @@
-import { createClient } from 'redis'
+import { createClient, SchemaFieldTypes } from 'redis'
 import {
   FullOrder,
   OrderFilter,
   Indexes,
   Direction,
   THIRTY_DAYS,
 } from '@airswap/utils'
-import { createIndex } from './redis.index'
 
 function tagsKey(token: string) {
   return `tags:${token.toLowerCase()}`
@@ -32,9 +31,9 @@ function cleanTags(tags: string[]) {
 }
 
 export class Redis {
-  private client: any
-  private ttl: number
-  private defaultReadLimit: number
+  public client: any
+  public ttl: number
+  public defaultReadLimit: number
 
   public constructor(
     connectionUrl: any,
@@ -172,13 +171,6 @@ export class Redis {
     return false
   }
 
-  public async setup() {
-    if (!this.client.isOpen) {
-      await this.client.connect()
-    }
-    await createIndex(this.client)
-  }
-
   public async flush() {
     if (!this.client.isOpen) {
       await this.client.connect()
@@ -192,3 +184,57 @@ export class Redis {
     }
   }
 }
+
+export async function createIndex(client) {
+  try {
+    await client.ft.dropIndex('index:ordersBySigner')
+  } catch (e) {}
+  await client.ft.create(
+    'index:ordersBySigner',
+    {
+      '$.chainId': {
+        type: SchemaFieldTypes.NUMERIC,
+        AS: 'chainId',
+      },
+      '$.nonce': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'nonce',
+      },
+      '$.expiry': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'expiry',
+      },
+      '$.signer.wallet': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'signerWallet',
+      },
+      '$.signer.token': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'signerToken',
+      },
+      '$.signer.amount': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'signerAmount',
+      },
+      '$.signer.id': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'signerId',
+      },
+      '$.sender.amount': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'senderAmount',
+      },
+      '$.sender.token': {
+        type: SchemaFieldTypes.TEXT,
+        AS: 'senderToken',
+      },
+      '$.tags.*': {
+        type: SchemaFieldTypes.TAG,
+        AS: 'tags',
+      },
+    },
+    {
+      ON: 'JSON',
+    }
+  )
+}
diff --git a/tools/stores/test/redis.ts b/tools/stores/test/redis.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai'
-import { Redis } from '../redis/redis'
+import { Redis, createIndex } from '../redis/redis'
 import { ChainIds } from '@airswap/utils'
 
 import {
@@ -46,7 +46,7 @@ async function createSignedOrder(
 describe('Redis', async () => {
   beforeEach(async () => {
     await store.flush()
-    await store.setup()
+    await createIndex(store.client)
     orderOne = await createSignedOrder('1', signerOne)
     orderTwo = await createSignedOrder('2', signerTwo)
   })