diff --git a/dist/Mongo.js b/dist/Mongo.js index 06bb88d..2311a9c 100644 --- a/dist/Mongo.js +++ b/dist/Mongo.js @@ -20,13 +20,10 @@ class MongoConnect { this.emitter = emitter; this.userConfig = userConfig; this.config = { - keepAlive: true, - poolSize: 5, + maxPoolSize: 5, connectTimeoutMS: 30000, socketTimeoutMS: 30000, serverSelectionTimeoutMS: 10000, - useUnifiedTopology: true, - connectWithNoPrimary: false, readPreference: mongodb_1.ReadPreference.SECONDARY_PREFERRED, }; this.config.authSource = (userConfig.auth || {}).authSource; @@ -72,9 +69,7 @@ class MongoConnect { return joiner.join(""); } static isValidError(err) { - return (err instanceof mongodb_1.MongoServerSelectionError || - err instanceof mongodb_1.MongoNetworkError || - err instanceof mongodb_1.MongoTimeoutError); + return err instanceof mongodb_1.MongoError; } getClient() { return this.mongoClient; @@ -110,10 +105,6 @@ class MongoConnect { } this.client = this.mongoClient.db(this.userConfig.db); this.success(`Successfully connected in ${this.mode} mode`); - mongodb_1.Logger.setLevel("info"); - mongodb_1.Logger.setCurrentLogger((msg, context) => { - this.log(msg, context); - }); if (oldMongoClient instanceof mongodb_1.MongoClient) { // Do NOT wait. If you wait, this might block indefinitely due to the older server being out of action. oldMongoClient.close(); @@ -125,8 +116,7 @@ exports.MongoConnect = MongoConnect; async function handleMongoError(err, mongo) { if (MongoConnect.isValidError(err)) { if (mongo.reconnecting === null) { - mongo.reconnecting = mongo.connect() - .then(() => { + mongo.reconnecting = mongo.connect().then(() => { return null; }); } @@ -142,7 +132,7 @@ var MODES; MODES["SERVER"] = "server"; MODES["REPLSET"] = "replset"; MODES["SHARD"] = "shard"; -})(MODES = exports.MODES || (exports.MODES = {})); +})(MODES || (exports.MODES = MODES = {})); function MongoFactory(mode, name, emitter, config) { switch (mode) { case MODES.SERVER: @@ -213,4 +203,4 @@ function castToObjectId(value) { return mongodb_1.ObjectId.createFromHexString(value); } exports.castToObjectId = castToObjectId; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Mongo.js","sourceRoot":"","sources":["../src/Mongo.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Mongo.js","sourceRoot":"","sources":["../src/Mongo.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index db1c913..3e0bfad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@quizizz/mongo", - "version": "0.1.1", + "version": "0.2.2", "description": "A simple wrapper around mongo native nodejs", "main": "dist/Mongo.js", "types": "dist/Mongo.d.ts", @@ -8,7 +8,7 @@ "/dist" ], "scripts": { - "compile": "npx tsc", + "compile-ts": "npx tsc", "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { @@ -22,9 +22,10 @@ ], "license": "ISC", "dependencies": { - "mongodb": "^3.6.9" + "mongodb": "6.3.0" }, "devDependencies": { - "@types/mongodb": "^3.6.17" + "@types/node": "^20.10.1", + "typescript": "^5.3.2" } -} \ No newline at end of file +} diff --git a/src/Mongo.ts b/src/Mongo.ts index 725e6e7..baccf47 100644 --- a/src/Mongo.ts +++ b/src/Mongo.ts @@ -3,12 +3,9 @@ import { Db, MongoClient, MongoClientOptions, - Logger as MongoLogger, + MongoError, ObjectId, ReadPreference, - MongoServerSelectionError, - MongoNetworkError, - MongoTimeoutError, } from "mongodb"; export interface Server { @@ -59,13 +56,10 @@ export class MongoConnect implements Mongo { this.emitter = emitter; this.userConfig = userConfig; this.config = { - keepAlive: true, - poolSize: 5, + maxPoolSize: 5, connectTimeoutMS: 30000, socketTimeoutMS: 30000, serverSelectionTimeoutMS: 10000, - useUnifiedTopology: true, - connectWithNoPrimary: false, readPreference: ReadPreference.SECONDARY_PREFERRED, }; this.config.authSource = (userConfig.auth || {}).authSource; @@ -124,15 +118,11 @@ export class MongoConnect implements Mongo { } static isValidError(err: Error) { - return ( - err instanceof MongoServerSelectionError || - err instanceof MongoNetworkError || - err instanceof MongoTimeoutError - ); + return err instanceof MongoError; } getClient(): MongoClient { - return this.mongoClient; + return this.mongoClient; } async connect(): Promise { @@ -164,10 +154,6 @@ export class MongoConnect implements Mongo { } this.client = this.mongoClient.db(this.userConfig.db); this.success(`Successfully connected in ${this.mode} mode`); - MongoLogger.setLevel("info"); - MongoLogger.setCurrentLogger((msg, context) => { - this.log(msg, context); - }); if (oldMongoClient instanceof MongoClient) { // Do NOT wait. If you wait, this might block indefinitely due to the older server being out of action. oldMongoClient.close(); @@ -179,14 +165,13 @@ export class MongoConnect implements Mongo { export async function handleMongoError(err: Error, mongo: Mongo) { if (MongoConnect.isValidError(err)) { if (mongo.reconnecting === null) { - mongo.reconnecting = mongo.connect() - .then(() => { - return null; - }); + mongo.reconnecting = mongo.connect().then(() => { + return null; + }); } await (mongo.reconnecting || Promise.resolve()); mongo.reconnecting = null; - return null + return null; } return err; } @@ -225,7 +210,7 @@ export function MongoFactory( mode: MODES, name: string, emitter: events.EventEmitter, - config: ServerConfig | ReplicaConfig | ShardConfig, + config: ServerConfig | ReplicaConfig | ShardConfig ): Mongo { switch (mode) { case MODES.SERVER: @@ -243,7 +228,7 @@ class ServerMongo extends MongoConnect { constructor( name: string, emitter: events.EventEmitter, - config: ServerConfig, + config: ServerConfig ) { const { db, host, port, auth } = config; const userConfig: UserConfig = { @@ -288,8 +273,11 @@ class ShardMongo extends MongoConnect { } } - -export function MongoFactoryAuto(name: string, emitter: events.EventEmitter, config: MongoConfig) { +export function MongoFactoryAuto( + name: string, + emitter: events.EventEmitter, + config: MongoConfig +) { if ((config as ReplicaConfig).replica) { return MongoFactory(MODES.REPLSET, name, emitter, config); } else if ((config as ShardConfig).shard) { @@ -319,4 +307,3 @@ export function castToObjectId(value: string) { export type MongoConfig = ServerConfig | ReplicaConfig | ShardConfig; export { ObjectId, MongoClient, Db }; -