Merge branch 'main' into feat/use-node-18-alpine-image

decentraland · Jan 8, 2025 · 530225d · 530225d
2 parents 3da17d0 + 6e521b7
commit 530225d
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -11,15 +11,15 @@
     "lint:fix": "eslint '**/*.{js,ts}' --fix"
   },
   "devDependencies": {
-    "@dcl/eslint-config": "^2.0.0",
+    "@dcl/eslint-config": "^2.2.1",
     "@protobuf-ts/protoc": "^2.9.4",
-    "@types/node": "^20.11.28",
+    "@types/node": "^20.12.7",
     "@types/redis": "^4.0.11",
     "@types/ws": "^8.5.10",
     "@well-known-components/test-helpers": "^1.5.6",
     "nodemon": "^3.1.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.5"
   },
   "prettier": {
     "printWidth": 120,

diff --git a/src/adapters/redis.ts b/src/adapters/redis.ts
@@ -11,10 +11,12 @@ export default async function createRedisComponent(
 ): Promise<IRedisComponent> {
   const { logs, config } = components
   const logger = logs.getLogger('redis-component')
-  const REDIS_URL = (await config.getString('REDIS_CONNECTION_STRING')) || `redis://127.0.0.1:6379`
+  const REDIS_HOST = (await config.getString('REDIS_HOST')) || '127.0.0.1'
+
+  const url = `redis://${REDIS_HOST}:6379`
 
   const client = createClient({
-    url: REDIS_URL
+    url
   })
 
   client.on('error', (err) => {

diff --git a/src/adapters/rpcServer.ts b/src/adapters/rpcServer.ts
@@ -124,7 +124,7 @@ export default async function createRpcServerComponent(
       async getPendingFriendshipRequests(_request, context) {
         try {
           const pendingRequests = await db.getReceivedFriendshipRequests(context.address)
-          const mappedRequestss = pendingRequests.map(({ address, timestamp, metadata }) => ({
+          const mappedRequests = pendingRequests.map(({ address, timestamp, metadata }) => ({
             user: { address },
             createdAt: new Date(timestamp).getTime(),
             message: metadata?.message || ''
@@ -134,7 +134,7 @@ export default async function createRpcServerComponent(
             response: {
               $case: 'requests',
               requests: {
-                requests: mappedRequestss
+                requests: mappedRequests
               }
             }
           }
@@ -151,7 +151,7 @@ export default async function createRpcServerComponent(
       async getSentFriendshipRequests(_request, context) {
         try {
           const pendingRequests = await db.getSentFriendshipRequests(context.address)
-          const mappedRequestss = pendingRequests.map(({ address, timestamp, metadata }) => ({
+          const mappedRequests = pendingRequests.map(({ address, timestamp, metadata }) => ({
             user: { address },
             createdAt: new Date(timestamp).getTime(),
             message: metadata?.message || ''
@@ -161,7 +161,7 @@ export default async function createRpcServerComponent(
             response: {
               $case: 'requests',
               requests: {
-                requests: mappedRequestss
+                requests: mappedRequests
               }
             }
           }

diff --git a/src/migrations/1736277138587_add-indexes.ts b/src/migrations/1736277138587_add-indexes.ts
@@ -0,0 +1,40 @@
+import { MigrationBuilder, ColumnDefinitions } from 'node-pg-migrate'
+
+export const shorthands: ColumnDefinitions | undefined = undefined
+
+export async function up(pgm: MigrationBuilder): Promise<void> {
+  // Address indexes + constraints
+  pgm.createIndex('friendships', 'address_requester', { name: 'friendships_address_requester', method: 'hash' })
+  pgm.createIndex('friendships', 'address_requested', { name: 'friendships_address_requested', method: 'hash' })
+
+  pgm.createConstraint('friendships', 'unique_addresses', {
+    unique: ['address_requester', 'address_requested']
+  })
+
+  pgm.createConstraint('friendships', 'address_requester_smaller_than_address_requested', {
+    check: 'address_requester < address_requested'
+  })
+
+  // Lowercase indexes
+  pgm.createIndex('friendships', 'LOWER(address_requester) text_pattern_ops', {
+    name: 'friendships_address_requester_lower',
+    method: 'btree'
+  })
+  pgm.createIndex('friendships', 'LOWER(address_requested) text_pattern_ops', {
+    name: 'friendships_address_requested_lower',
+    method: 'btree'
+  })
+
+  // Friendship history index
+  pgm.createIndex('friendship_actions', 'friendship_id', { name: 'friendship_actions_friendship_id' })
+}
+
+export async function down(pgm: MigrationBuilder): Promise<void> {
+  pgm.dropIndex('friendships', 'friendships_address_requester')
+  pgm.dropIndex('friendships', 'friendships_address_requested')
+  pgm.dropConstraint('friendships', 'unique_addresses')
+  pgm.dropConstraint('friendships', 'address_requester_smaller_than_address_requested')
+  pgm.dropIndex('friendships', 'friendships_address_requester_lower')
+  pgm.dropIndex('friendships', 'friendships_address_requested_lower')
+  pgm.dropIndex('friendship_actions', 'friendship_actions_friendship_id')
+}