fix(packages/db): make use of @npwd/database (#1088)

- inc password cases where user:password@host and the password has a trailing @

apps/game/server/boot/boot.db.ts

@@ -1,6 +1,4 @@
-import { CONNECTION_STRING } from '../db';
-import DbInterface from '../db/db_wrapper';
-import { parseUri } from '../db/parseUri';
+import { CONNECTION_STRING, DbInterface, parseUri } from '@npwd/database';
 import { config } from '../config';
 
 const mysqlConnectionString = GetConvar(CONNECTION_STRING, 'none');

apps/game/server/commands/registerCommands.ts

@@ -1,8 +1,6 @@
 import { mainLogger } from '../sv_logger';
 import { config } from '../config';
-import DbInterface from '../db/db_wrapper';
-import { CONNECTION_STRING } from '../db';
-import { parseUri } from '../db/parseUri';
+import { CONNECTION_STRING, DbInterface, parseUri } from '@npwd/database';
 
 const mysqlConnectionString = GetConvar(CONNECTION_STRING, 'none');
 

apps/game/server/misc/functions.ts

@@ -1,5 +1,5 @@
 import { config } from '../server';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '@npwd/database';
 import { generateUniquePhoneNumber } from './generateUniquePhoneNumber';
 import { playerLogger } from '../players/player.utils';
 import { ResultSetHeader } from 'mysql2';

apps/game/server/misc/generateUniquePhoneNumber.ts

@@ -1,5 +1,5 @@
 import { config } from '../server';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '@npwd/database';
 import { playerLogger } from '../players/player.utils';
 
 const exp = global.exports;

packages/database/src/calls/index.ts

@@ -1,6 +1,6 @@
 import { CallHistoryItem } from '@typings/call';
 import { FetchDefaultLimits } from '@game/server/utils/ServerConstants';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 
 export class _CallsRepo {
   async saveCall(call: CallHistoryItem): Promise<void> {

packages/database/src/contacts/index.ts

@@ -1,6 +1,6 @@
 import { Contact, PreDBContact } from '@typings/contact';
 import { ResultSetHeader } from 'mysql2';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 
 export class _ContactsDB {
   async fetchAllContacts(identifier: string): Promise<Contact[]> {

packages/database/src/darkchat/index.ts

@@ -1,4 +1,4 @@
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 import {
   ChannelItemProps,
   ChannelMember,

packages/database/src/db/db_wrapper.ts

@@ -72,6 +72,4 @@ class _DbInterface {
     return <T>castRes;
   }
 }
-const DbInterface = new _DbInterface();
-
-export default DbInterface;
+export const DbInterface = new _DbInterface();

packages/database/src/db/index.ts

@@ -0,0 +1,4 @@
+export * from './db_utils';
+export * from './db_wrapper';
+export * from './parseUri';
+export * from './pool'

packages/database/src/db/parseUri.ts

@@ -24,6 +24,19 @@ export const parseUri = (connectionUri: string) => {
         (options as Record<typeof key, any>)[key] = value;
       }
     });
+
+    if (!options.password || !options.user || !options.database) {
+      const regex = new RegExp('^(?:([^:/?#.]+):)?(?://(?:([^/?]*):([^/?]*)@)?([[A-Za-z0-9_.]+]*)(?::([0-9]+))?)?(?:\\\\?([^#]*))?$', '')
+      const specialCharactersRegex = regex.exec(connectionUri);
+      if (specialCharactersRegex) {
+        options.user = specialCharactersRegex[2] || void 0;
+        options.password = specialCharactersRegex[3] || void 0;
+        options.host = specialCharactersRegex[4];
+        options.port = parseInt(specialCharactersRegex[5]);
+        options.database = specialCharactersRegex[6].replace(/^\/+/, "");
+      }
+    }
+
     return options;
   }  
 

packages/database/src/index.ts

@@ -8,5 +8,4 @@ export * from './match/index';
 export * from './marketplace/index';
 export * from './darkchat/index';
 export * from './calls/index';
-
-export { pool } from './db/pool';
+export * from './db/index'

packages/database/src/marketplace/index.ts

@@ -5,7 +5,7 @@ import {
   ReportListingDTO,
 } from '@typings/marketplace';
 import { ResultSetHeader } from 'mysql2';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 
 export class _MarketplaceDB {
   async addListing(

packages/database/src/match/index.ts

@@ -1,10 +1,9 @@
 import { Like, Match, NewProfile, Profile } from '@typings/match';
-import { pool } from '../db/pool';
+import { DbInterface, pool } from '../db';
 import { ResultSetHeader } from 'mysql2';
 import { config } from '@npwd/config/server';
 import { generateProfileName } from '@game/server/utils/generateProfileName';
 import { matchLogger } from '@game/server/match/match.utils';
-import DbInterface from '../db/db_wrapper';
 
 const DEFAULT_IMAGE = 'https://upload.wikimedia.org/wikipedia/commons/a/ac/No_image_available.svg';
 const MATCHES_PER_PAGE = 20;

packages/database/src/messages/index.ts

@@ -1,4 +1,4 @@
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 import { CreateMessageDTO, Message, MessageConversation, MessagesRequest } from '@typings/messages';
 import { ResultSetHeader } from 'mysql2';
 import { messagesLogger } from '../../../../apps/game/server/messages/messages.utils';

packages/database/src/notes/index.ts

@@ -1,6 +1,6 @@
 import { BeforeDBNote, NoteItem } from '@typings/notes';
 import { ResultSetHeader } from 'mysql2';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 
 export class _NotesDB {
   async addNote(identifier: string, note: BeforeDBNote): Promise<number> {

packages/database/src/photo/index.ts

@@ -1,5 +1,5 @@
 import { GalleryPhoto } from '@typings/photo';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 
 export class _PhotoDB {
   async uploadPhoto(identifier: string, image: string): Promise<GalleryPhoto> {

packages/database/src/players/index.ts

@@ -1,5 +1,5 @@
 import { config } from '@npwd/config/server';
-import DbInterface from '../db/db_wrapper';
+import { DbInterface } from '../db';
 
 export class _PlayerRepo {
   async fetchIdentifierFromPhoneNumber(phoneNumber: string): Promise<string | null> {

packages/database/src/twitter/index.ts

@@ -1,10 +1,9 @@
 import { NewTweet, TwitterProfile as Profile, Tweet } from '@typings/twitter';
-import { pool } from '../db/pool';
+import { DbInterface, pool } from '../db';
 import { ResultSetHeader } from 'mysql2';
 import { config } from '@npwd/config/server';
 import { generateProfileName } from '../../../../apps/game/server/utils/generateProfileName';
 import { twitterLogger } from '../../../../apps/game/server/twitter/twitter.utils';
-import DbInterface from '../db/db_wrapper';
 
 const SELECT_FIELDS = `
   npwd_twitter_tweets.id,