Skip to content

Commit e62071c

Browse files
nsarrazinnsarrazin
committed
feat(db): allow use of in memory db when MONGODB_URL not set
1 parent fcd098f commit e62071c

File tree

5 files changed

+92
-90
lines changed

5 files changed

+92
-90
lines changed

‎src/lib/jobs/refresh-assistants-counts.ts

+38-38
Original file line numberDiff line numberDiff line change
@@ -26,49 +26,49 @@ async function refreshAssistantsCountsHelper() {
2626
}
2727

2828
try {
29-
await Database.getInstance()
30-
.getClient()
31-
.withSession((session) =>
32-
session.withTransaction(async () => {
29+
await (await Database.getInstance()).getClient().withSession((session) =>
30+
session.withTransaction(async () => {
31+
await (
3332
await Database.getInstance()
34-
.getCollections()
35-
.assistants.aggregate([
36-
{ $project: { _id: 1 } },
37-
{ $set: { last24HoursCount: 0 } },
38-
{
39-
$unionWith: {
40-
coll: "assistants.stats",
41-
pipeline: [
42-
{
43-
$match: { "date.at": { $gte: subDays(new Date(), 1) }, "date.span": "hour" },
33+
)
34+
.getCollections()
35+
.assistants.aggregate([
36+
{ $project: { _id: 1 } },
37+
{ $set: { last24HoursCount: 0 } },
38+
{
39+
$unionWith: {
40+
coll: "assistants.stats",
41+
pipeline: [
42+
{
43+
$match: { "date.at": { $gte: subDays(new Date(), 1) }, "date.span": "hour" },
44+
},
45+
{
46+
$group: {
47+
_id: "$assistantId",
48+
last24HoursCount: { $sum: "$count" },
4449
},
45-
{
46-
$group: {
47-
_id: "$assistantId",
48-
last24HoursCount: { $sum: "$count" },
49-
},
50-
},
51-
],
52-
},
50+
},
51+
],
5352
},
54-
{
55-
$group: {
56-
_id: "$_id",
57-
last24HoursCount: { $sum: "$last24HoursCount" },
58-
},
53+
},
54+
{
55+
$group: {
56+
_id: "$_id",
57+
last24HoursCount: { $sum: "$last24HoursCount" },
5958
},
60-
{
61-
$merge: {
62-
into: "assistants",
63-
on: "_id",
64-
whenMatched: "merge",
65-
whenNotMatched: "discard",
66-
},
59+
},
60+
{
61+
$merge: {
62+
into: "assistants",
63+
on: "_id",
64+
whenMatched: "merge",
65+
whenNotMatched: "discard",
6766
},
68-
])
69-
.next();
70-
})
71-
);
67+
},
68+
])
69+
.next();
70+
})
71+
);
7272
} catch (e) {
7373
logger.error(e, "Refresh assistants counter failed!");
7474
}

‎src/lib/migrations/migrations.ts

+21-25
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ export async function checkAndRunMigrations() {
1313
}
1414

1515
// check if all migrations have already been run
16-
const migrationResults = await Database.getInstance()
16+
const migrationResults = await (await Database.getInstance())
1717
.getCollections()
1818
.migrationResults.find()
1919
.toArray();
2020

2121
logger.info("[MIGRATIONS] Begin check...");
2222

2323
// connect to the database
24-
const connectedClient = await Database.getInstance().getClient().connect();
24+
const connectedClient = await (await Database.getInstance()).getClient().connect();
2525

2626
const lockId = await acquireLock(LOCK_KEY);
2727

@@ -74,25 +74,23 @@ export async function checkAndRunMigrations() {
7474
}. Applying...`
7575
);
7676

77-
await Database.getInstance()
78-
.getCollections()
79-
.migrationResults.updateOne(
80-
{ _id: migration._id },
81-
{
82-
$set: {
83-
name: migration.name,
84-
status: "ongoing",
85-
},
77+
await (await Database.getInstance()).getCollections().migrationResults.updateOne(
78+
{ _id: migration._id },
79+
{
80+
$set: {
81+
name: migration.name,
82+
status: "ongoing",
8683
},
87-
{ upsert: true }
88-
);
84+
},
85+
{ upsert: true }
86+
);
8987

9088
const session = connectedClient.startSession();
9189
let result = false;
9290

9391
try {
9492
await session.withTransaction(async () => {
95-
result = await migration.up(Database.getInstance());
93+
result = await migration.up(await Database.getInstance());
9694
});
9795
} catch (e) {
9896
logger.info(`[MIGRATIONS] "${migration.name}" failed!`);
@@ -101,18 +99,16 @@ export async function checkAndRunMigrations() {
10199
await session.endSession();
102100
}
103101

104-
await Database.getInstance()
105-
.getCollections()
106-
.migrationResults.updateOne(
107-
{ _id: migration._id },
108-
{
109-
$set: {
110-
name: migration.name,
111-
status: result ? "success" : "failure",
112-
},
102+
await (await Database.getInstance()).getCollections().migrationResults.updateOne(
103+
{ _id: migration._id },
104+
{
105+
$set: {
106+
name: migration.name,
107+
status: result ? "success" : "failure",
113108
},
114-
{ upsert: true }
115-
);
109+
},
110+
{ upsert: true }
111+
);
116112
}
117113
}
118114

‎src/lib/server/database.ts

+25-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import type { MigrationResult } from "$lib/types/MigrationResult";
1414
import type { Semaphore } from "$lib/types/Semaphore";
1515
import type { AssistantStats } from "$lib/types/AssistantStats";
1616
import type { CommunityToolDB } from "$lib/types/Tool";
17-
17+
import { MongoMemoryServer } from "mongodb-memory-server";
1818
import { logger } from "$lib/server/logger";
1919
import { building } from "$app/environment";
2020
import type { TokenCache } from "$lib/types/TokenCache";
@@ -23,21 +23,24 @@ import { onExit } from "./exitHandler";
2323
export const CONVERSATION_STATS_COLLECTION = "conversations.stats";
2424

2525
export class Database {
26-
private client: MongoClient;
26+
private client?: MongoClient;
27+
private mongoServer?: MongoMemoryServer;
2728

2829
private static instance: Database;
2930

30-
private constructor() {
31+
private async init() {
3132
if (!env.MONGODB_URL) {
32-
throw new Error(
33-
"Please specify the MONGODB_URL environment variable inside .env.local. Set it to mongodb://localhost:27017 if you are running MongoDB locally, or to a MongoDB Atlas free instance for example."
34-
);
33+
logger.warn("No MongoDB URL found, using in-memory server");
34+
this.mongoServer = await MongoMemoryServer.create();
35+
this.client = new MongoClient(this.mongoServer.getUri(), {
36+
directConnection: env.MONGODB_DIRECT_CONNECTION === "true",
37+
});
38+
} else {
39+
this.client = new MongoClient(env.MONGODB_URL, {
40+
directConnection: env.MONGODB_DIRECT_CONNECTION === "true",
41+
});
3542
}
3643

37-
this.client = new MongoClient(env.MONGODB_URL, {
38-
directConnection: env.MONGODB_DIRECT_CONNECTION === "true",
39-
});
40-
4144
this.client.connect().catch((err) => {
4245
logger.error(err, "Connection error");
4346
process.exit(1);
@@ -46,12 +49,13 @@ export class Database {
4649
this.client.on("open", () => this.initDatabase());
4750

4851
// Disconnect DB on exit
49-
onExit(() => this.client.close(true));
52+
onExit(() => this.client?.close(true));
5053
}
5154

52-
public static getInstance(): Database {
55+
public static async getInstance(): Promise<Database> {
5356
if (!Database.instance) {
5457
Database.instance = new Database();
58+
await Database.instance.init();
5559
}
5660

5761
return Database.instance;
@@ -61,13 +65,21 @@ export class Database {
6165
* Return mongoClient
6266
*/
6367
public getClient(): MongoClient {
68+
if (!this.client) {
69+
throw new Error("Database not initialized");
70+
}
71+
6472
return this.client;
6573
}
6674

6775
/**
6876
* Return map of database's collections
6977
*/
7078
public getCollections() {
79+
if (!this.client) {
80+
throw new Error("Database not initialized");
81+
}
82+
7183
const db = this.client.db(
7284
env.MONGODB_DB_NAME + (import.meta.env.MODE === "test" ? "-test" : "")
7385
);
@@ -247,4 +259,4 @@ export class Database {
247259

248260
export const collections = building
249261
? ({} as unknown as ReturnType<typeof Database.prototype.getCollections>)
250-
: Database.getInstance().getCollections();
262+
: await Database.getInstance().then((db) => db.getCollections());

‎src/routes/assistants/+page.server.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { base } from "$app/paths";
22
import { env } from "$env/dynamic/private";
3-
import { Database, collections } from "$lib/server/database.js";
3+
import { collections } from "$lib/server/database.js";
44
import { SortKey, type Assistant } from "$lib/types/Assistant";
55
import type { User } from "$lib/types/User";
66
import { generateQueryTokens } from "$lib/utils/searchTokens.js";
@@ -58,9 +58,8 @@ export const load = async ({ url, locals }) => {
5858
...shouldBeFeatured,
5959
};
6060

61-
const assistants = await Database.getInstance()
62-
.getCollections()
63-
.assistants.find(filter)
61+
const assistants = await collections.assistants
62+
.find(filter)
6463
.sort({
6564
...(sort === SortKey.TRENDING && { last24HoursCount: -1 }),
6665
userCount: -1,
@@ -70,9 +69,7 @@ export const load = async ({ url, locals }) => {
7069
.limit(NUM_PER_PAGE)
7170
.toArray();
7271

73-
const numTotalItems = await Database.getInstance()
74-
.getCollections()
75-
.assistants.countDocuments(filter);
72+
const numTotalItems = await collections.assistants.countDocuments(filter);
7673

7774
return {
7875
assistants: JSON.parse(JSON.stringify(assistants)) as Array<Assistant>,

‎src/routes/tools/+page.server.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { env } from "$env/dynamic/private";
22
import { authCondition } from "$lib/server/auth.js";
3-
import { Database, collections } from "$lib/server/database.js";
3+
import { collections } from "$lib/server/database.js";
44
import { toolFromConfigs } from "$lib/server/tools/index.js";
55
import { SortKey } from "$lib/types/Assistant.js";
66
import { ReviewStatus } from "$lib/types/Review";
@@ -60,9 +60,8 @@ export const load = async ({ url, locals }) => {
6060
}),
6161
};
6262

63-
const communityTools = await Database.getInstance()
64-
.getCollections()
65-
.tools.find(filter)
63+
const communityTools = await collections.tools
64+
.find(filter)
6665
.skip(NUM_PER_PAGE * pageIndex)
6766
.sort({
6867
...(sort === SortKey.TRENDING && { last24HoursUseCount: -1 }),
@@ -84,9 +83,7 @@ export const load = async ({ url, locals }) => {
8483

8584
const tools = [...(pageIndex == 0 && !username ? configTools : []), ...communityTools];
8685

87-
const numTotalItems =
88-
(await Database.getInstance().getCollections().tools.countDocuments(filter)) +
89-
toolFromConfigs.length;
86+
const numTotalItems = (await collections.tools.countDocuments(filter)) + toolFromConfigs.length;
9087

9188
return {
9289
tools: JSON.parse(JSON.stringify(tools)) as CommunityToolDB[],

0 commit comments

Comments
 (0)