Skip to content

Commit

Permalink
Renames
Browse files Browse the repository at this point in the history
  • Loading branch information
dcadenas committed Oct 15, 2024
1 parent 15aa4ce commit 2c54a09
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 27 deletions.
4 changes: 2 additions & 2 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import pinoHTTP from "pino-http";
import promClient from "prom-client";
import promBundle from "express-prom-bundle";
import cors from "cors";
import { getRedisClient } from "./getRedisClient.js";
import { getNip05RedisClient } from "./getRedisClient.js";
import routes from "./routes.js";
import logger from "./logger.js";
import NameRecordRepository from "./nameRecordRepository.js";
import fetchAndSendLatestEntries from "./slackNotifier.js";
import config from "../config/index.js";

const redisClient = await getRedisClient();
const redisClient = await getNip05RedisClient();
const nameRecordRepository = new NameRecordRepository(redisClient);
const app = express();

Expand Down
24 changes: 12 additions & 12 deletions src/getRedisClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const redisImportPromise =
let redisClient;
let remoteRedisClient;

async function initializeRedis() {
async function initializeNip05Redis() {
try {
const Redis = (await redisImportPromise).default;
redisClient = new Redis({
Expand All @@ -17,41 +17,41 @@ async function initializeRedis() {
db: config.redis.db,
});

redisClient.on("connect", () => logger.info("Connected to Redis"));
redisClient.on("error", (err) => logger.error(err, "Redis error"));
redisClient.on("connect", () => logger.info("Connected to Nip 05 Redis"));
redisClient.on("error", (err) => logger.error(err, "Nip 05 Redis error"));
} catch (error) {
// istanbul ignore next
logger.error(error, "Error initializing Redis client");
logger.error(error, "Error initializing Nip 05 Redis client");
}
}

async function initializeRemoteRedis() {
async function initializeVanishRequestsRedis() {
try {
const Redis = (await redisImportPromise).default;
remoteRedisClient = new Redis(config.redis.remote_host);

remoteRedisClient.on("connect", () =>
logger.info("Connected to Remote Redis")
logger.info("Connected to vanish requests Redis")
);
remoteRedisClient.on("error", (err) =>
logger.error(err, "Remote Redis error")
logger.error(err, "Vanish requests Redis error")
);
} catch (error) {
// istanbul ignore next
logger.error(error, "Error initializing Remote Redis client");
logger.error(error, "Error initializing vanish requests Redis client");
}
}

export async function getRedisClient() {
export async function getNip05RedisClient() {
if (!redisClient) {
await initializeRedis();
await initializeNip05Redis();
}
return redisClient;
}

export async function getRemoteRedisClient() {
export async function getVanishRequestsRedisClient() {
if (!remoteRedisClient) {
await initializeRemoteRedis();
await initializeVanishRequestsRedis();
}
return remoteRedisClient;
}
4 changes: 0 additions & 4 deletions src/nameRecordRepository.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ export default class NameRecordRepository {
count: 1000,
});

let processingPromises = [];

return new Promise((resolve, reject) => {
stream.on("data", (resultKeys) => {
stream.pause();
Expand All @@ -111,8 +109,6 @@ export default class NameRecordRepository {
pipeline
.exec()
.then((results) => {
const processing = [];

for (let i = 0; i < resultKeys.length; i++) {
const key = resultKeys[i];
const [err, associatedPubkey] = results[i];
Expand Down
13 changes: 8 additions & 5 deletions src/server.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import app from "./app.js";
import logger from "./logger.js";
import config from "../config/index.js";
import { getRemoteRedisClient, getRedisClient } from "./getRedisClient.js";
import VanishSubscriber from "./vanishSubscriber.js"; // Import the VanishSubscriber class

const vanishRequestsRedisClient = await getRemoteRedisClient();
const nip05RedisClient = await getRedisClient();
import {
getVanishRequestsRedisClient,
getNip05RedisClient,
} from "./getRedisClient.js";
import VanishSubscriber from "./vanishSubscriber.js";

const vanishRequestsRedisClient = await getVanishRequestsRedisClient();
const nip05RedisClient = await getNip05RedisClient();

const server = app.listen(config.port, () => {
logger.info(`Server is running on port ${config.port}`);
Expand Down
4 changes: 2 additions & 2 deletions test/app.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import request from "supertest";
import { getRedisClient } from "../src/getRedisClient.js";
import { getNip05RedisClient } from "../src/getRedisClient.js";
import app from "../src/app.js";
import config from "../config/index.js";
import { getNip98AuthToken, createUserPayload } from "./testUtils.js";
Expand All @@ -10,7 +10,7 @@ const notSystemSecret =
"73685b53bdf5ac16498f2dc6a9891d076039adbe7eebff88b7f7ac72963450e2";
const notSystemPubkey =
"a7e5c75a2f70a5e2a17fb6eadefd8e2b0830e906a3b03e576159cfaa5783b0d9";
const redisClient = await getRedisClient();
const redisClient = await getNip05RedisClient();
const nip98PostAuthToken = await getNip98AuthToken({
url: "http://nos.social/api/names",
method: "POST",
Expand Down
4 changes: 2 additions & 2 deletions test/auth.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import request from "supertest";
import { getRedisClient } from "../src/getRedisClient.js";
import { getNip05RedisClient } from "../src/getRedisClient.js";
import app from "../src/app.js";
import config from "../config";
import {
Expand All @@ -8,7 +8,7 @@ import {
servicePubkeySecret,
} from "./testUtils.js";

const redisClient = await getRedisClient();
const redisClient = await getNip05RedisClient();
export const userPrivateKey =
"b45556a314c245b020690b0b59f21e4ed394ffa7baedfd65e0927ea19d014220";
export const userPubkey =
Expand Down

0 comments on commit 2c54a09

Please sign in to comment.