build: some improvements (#542)

.editorconfig

@@ -2,4 +2,5 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 2
+charset = utf-8

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+---
+name: "Bug report \U0001F41E"
+about: Create a bug report
+labels: bug
+---
+
+## Describe the bug
+
+A clear and concise description of what the bug is.
+
+### Steps to reproduce
+
+Steps to reproduce the behavior.
+
+### Expected behavior
+
+A clear and concise description of what you expected to happen.
+
+### Environment
+
+- OS: [e.g. Arch Linux]
+- Other details that you think may affect.
+
+### Additional context
+
+Add any other context about the problem here.

.github/workflows/testing.yaml

@@ -1,40 +1,34 @@
-name: testing
+name: Testing
 on:
   pull_request:
     branches:
       - main
 jobs:
   test:
-    name: Node ${{ matrix.node_version }} - ${{ matrix.architecture }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-22.04
-        node_version:
-          - 14
-          - 16
-          - 18
-        architecture:
-          - x64
+    name: Node.js 20
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          version: latest
-      - uses: actions/setup-node@v3
+          version: 9
+      - name: Setup node
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: 20
           check-latest: true
-          architecture: ${{ matrix.architecture }}
-      - run: docker compose up -d
-      - run: docker compose exec -T cluster-1_master-1 redis-cli --cluster create 127.0.0.1:16380 127.0.0.1:16381 127.0.0.1:16382 --cluster-yes
-      - run: docker compose exec -T cluster-2_master-1 redis-cli --cluster create 127.0.0.1:16480 127.0.0.1:16481 127.0.0.1:16482 --cluster-yes
+          architecture: x64
+          cache: 'pnpm'
+      - name: Run docker-compose
+        uses: hoverkraft-tech/[email protected]
+        with:
+          compose-file: './compose.yaml'
+          up-flags: '-d'
+          down-flags: '-v'
+      - run: docker compose exec cluster-m1 redis-cli -a mycluster --cluster create 127.0.0.1:7380 127.0.0.1:7381 127.0.0.1:7382 --cluster-yes
       - run: pnpm install --frozen-lockfile
-      - run: pnpm -F "@liaoliaots/nestjs-redis" lint
-      - run: pnpm -F "@liaoliaots/nestjs-redis" test
-      - run: pnpm -F "@liaoliaots/nestjs-redis" test:e2e
-      - run: pnpm -F "@liaoliaots/nestjs-redis-health" lint
-      - run: pnpm -F "@liaoliaots/nestjs-redis-health" test
-      - run: pnpm -F "@liaoliaots/nestjs-redis-health" test:e2e
-      - run: docker compose down -v
+      - run: pnpm run -F "@liaoliaots/nestjs-redis" lint
+      - run: pnpm run -F "@liaoliaots/nestjs-redis" test
+      - run: pnpm run -F "@liaoliaots/nestjs-redis" test:e2e

.prettierrc.yaml

@@ -0,0 +1,6 @@
+printWidth: 120
+tabWidth: 2
+singleQuote: true
+trailingComma: none
+arrowParens: avoid
+endOfLine: auto

compose.yaml

@@ -5,16 +5,16 @@ services:
     image: redis/redis-stack-server:latest
     network_mode: host
     environment:
-      - 'REDIS_ARGS=--port 6380 --requirepass myredis --appendonly yes'
+      - 'REDIS_ARGS=--port 6380 --requirepass myredis'
   cluster-m1:
     image: redis:latest
     network_mode: host
-    command: 'redis-server --port 7380 --requirepass mycluster --cluster-enabled yes --cluster-config-file nodes.conf --appendonly yes'
+    command: 'redis-server --port 7380 --requirepass mycluster --cluster-enabled yes --cluster-config-file nodes.conf'
   cluster-m2:
     image: redis:latest
     network_mode: host
-    command: 'redis-server --port 7381 --requirepass mycluster --cluster-enabled yes --cluster-config-file nodes.conf --appendonly yes'
+    command: 'redis-server --port 7381 --requirepass mycluster --cluster-enabled yes --cluster-config-file nodes.conf'
   cluster-m3:
     image: redis:latest
     network_mode: host
-    command: 'redis-server --port 7382 --requirepass mycluster --cluster-enabled yes --cluster-config-file nodes.conf --appendonly yes'
+    command: 'redis-server --port 7382 --requirepass mycluster --cluster-enabled yes --cluster-config-file nodes.conf'

eslint.config.js

@@ -5,19 +5,21 @@ import prettier from 'eslint-plugin-prettier/recommended';
 // @ts-ignore
 import jest from 'eslint-plugin-jest';
 
+const jestFiles = ['packages/*/test/**/*', 'packages/**/*.spec.ts'];
+
 export default tseslint.config(
   {
-    ignores: ['.prettierrc.js', 'eslint.config.js', 'sample', '**/dist', 'packages/*/*.js']
+    ignores: ['eslint.config.js', 'packages/*/dist/', 'packages/*/*.js']
   },
   eslint.configs.recommended,
   ...tseslint.configs.recommendedTypeChecked,
   ...tseslint.configs.stylisticTypeChecked,
   {
-    files: ['packages/**/test/**', 'packages/**/*.spec.ts'],
+    files: jestFiles,
     ...jest.configs['flat/recommended']
   },
   {
-    files: ['packages/**/test/**', 'packages/**/*.spec.ts'],
+    files: jestFiles,
     ...jest.configs['flat/style']
   },
   prettier,
@@ -28,12 +30,11 @@ export default tseslint.config(
         ...globals.jest
       },
       parserOptions: {
-        project: ['./packages/*/tsconfig.json'],
+        ecmaVersion: 'latest',
+        projectService: true,
         tsconfigRootDir: import.meta.dirname
       }
-    }
-  },
-  {
+    },
     linterOptions: {
       reportUnusedDisableDirectives: true
     }

package.json

@@ -16,7 +16,6 @@
     "@nestjs/common": "10.4.3",
     "@nestjs/core": "10.4.3",
     "@nestjs/platform-fastify": "10.4.3",
-    "@nestjs/terminus": "10.2.3",
     "@nestjs/testing": "10.4.3",
     "@tsconfig/node20": "20.1.4",
     "@types/eslint__js": "8.42.3",

packages/redis/test/cluster/src/app.module.ts

@@ -10,13 +10,13 @@ import { ManagerController } from './controllers/manager.controller';
         return {
           config: [
             {
-              nodes: [{ host: '127.0.0.1', port: 16380 }],
-              redisOptions: { password: 'cluster1' }
+              nodes: [{ host: '127.0.0.1', port: 7380 }],
+              redisOptions: { password: 'mycluster' }
             },
             {
               namespace: 'client1',
-              nodes: [{ host: '127.0.0.1', port: 16480 }],
-              redisOptions: { password: 'cluster2' }
+              nodes: [{ host: '127.0.0.1', port: 7380 }],
+              redisOptions: { password: 'mycluster' }
             }
           ]
         };

packages/redis/test/redis/src/redis-config.service.ts

@@ -8,7 +8,10 @@ export class RedisConfigService implements RedisOptionsFactory {
       commonOptions: {
         host: '127.0.0.1'
       },
-      config: [{ port: 6380 }, { namespace: 'client1', port: 6381 }]
+      config: [
+        { port: 6380, password: 'myredis' },
+        { namespace: 'client1', port: 6380, password: 'myredis' }
+      ]
     };
   }
 }