Reformat

Author: nocapscripts

build.js

@@ -1,9 +1,28 @@
 import { build } from "esbuild";
 
-build({
-    entryPoints: ["./src/index.ts"],
-    outfile: "dist/build.js",
-    bundle: true,
-    platform: "node",
-    logLevel: "info",
-})
+async function buildProject() {
+  try {
+    await build({
+      entryPoints: ["./src/index.ts"],
+      outfile: "dist/build.js",
+      bundle: true,
+      platform: "node",       // Ensures Node.js standard libs are included
+      target: ["node14"],     // Use `node14` for best compatibility with FiveM
+      sourcemap: false,       
+      minify: false,
+
+      // Avoid bundling native or optional Node.js deps
+      external: [
+        "bson",               // Used by mongodb
+        "dns", "fs", "net", "tls", "buffer", "crypto", "stream", "zlib", "http", "https"
+      ],
+    });
+
+    console.log("✅ Build succeeded!");
+  } catch (error) {
+    console.error("❌ Build failed:", error);
+    process.exit(1);
+  }
+}
+
+buildProject();

package.json

@@ -9,13 +9,12 @@
     "watch": "esbuild --watch --bundle --platform=node --target=node16.9.1 src/index.ts --outfile=dist/build.js"
   },
   "devDependencies": {
-    "esbuild": "^0.20.0",
-    "typescript": "^5.3.3"
+    "esbuild": "^0.25.5",
+    "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@citizenfx/server": "^2.0.7401-1",
-    "@types/mongodb": "^4.0.7",
-    "@types/node": "^20.11.15",
-    "perf_hooks": "^0.0.1"
+    "@citizenfx/server": "^2.0.14862-1",
+    "@types/node": "^24.0.4",
+    "mongodb": "^4.15.0"
   }
 }

src/database/index.ts

@@ -1,64 +1,19 @@
-import { sleep } from "./utils/sleep";
-import { connectToDatabase } from "./database";
+import * as TheQueries from "./query/queries";
 import { withTiming } from "./utils/timer";
-import { Count } from "./query/count";
-import { Find } from "./query/find";
-import { FindOne } from "./query/findOne";
-import { FindMany } from "./query/findMany";
-import { UpdateOne } from "./query/updateOne";
-import { InsertOne } from "./query/insertOne";
-import { BulkWrite } from "./query/bulkWrite";
-import { DeleteOne } from "./query/deleteOne";
-import { InsertMany } from "./query/insertMany";
-import { UpdateMany } from "./query/updateMany";
-import { ReplaceOne } from "./query/replaceOne";
-import { DeleteMany } from "./query/deleteMany";
-import { CreateIndex } from "./query/createIndex";
-import { FindOneAndDelete } from "./query/findOneAndDelete";
-import { FindAll } from "./query/findAll";
 
 export const credentials: string = GetConvar("mongoCredentials", "null");
 export const resourceName: string = GetCurrentResourceName();
 
-async function initializeMongo() {
-  while (true) {
-    try {
-      await connectToDatabase();
-      console.log("^2MongoDB connection established^7");
-      break; // exit loop on successful connection
-    } catch (error: any) {
-      console.error(`^1MongoDB connection failed: ${error.message}, retrying in 30 seconds...^7`);
-      await sleep(30000);
-    }
+// Wrap each query function with timing
+for (const [name, fn] of Object.entries(TheQueries)) {
+  if (typeof fn === "function") {
+    exports(name, async (...args: any[]) => {
+      return withTiming(() => fn(...args), { label: name });
+    });
   }
 }
 
-// Run the MongoDB initialization on resource start
-initializeMongo().catch((err) => {
-  console.error("^1Unhandled error during MongoDB initialization:^7", err);
-});
-
-// Export all query functions for FiveM usage
-const queries = {
-  Count,
-  Find,
-  FindOne,
-  FindMany,
-  FindAll,
-  FindOneAndDelete,
-  InsertOne,
-  InsertMany,
-  UpdateOne,
-  UpdateMany,
-  ReplaceOne,
-  DeleteOne,
-  DeleteMany,
-  BulkWrite,
-  CreateIndex,
-};
-
-// Export each with timing
-for (const [name, fn] of Object.entries(queries)) {
-  exports(name, (...args: any[]) => withTiming(name, () => fn(...args)));
-}
-
+// Optional: log ready message
+setTimeout(() => {
+  console.log("^2MongoDB module loaded and ready^7");
+}, 500);