mysql.disconnect: consolidate into */mysql.js classes

msimerson · msimerson · commit d8eb058155dd · 2026-04-12T20:22:13.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,6 +91,8 @@ jobs:
 
   test-docker:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v6
       - name: Generate .env
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Unreleased
 
+- add: TOML stores for group, nameserver, permission, session
+
 ### [3.0.0-alpha.11] - 2026-04-07
 
 - decorate user & group with permissions
diff --git a/lib/config.js b/lib/config.js
@@ -18,7 +18,7 @@ class Config {
     const str = await fs.readFile(`./conf.d/${name}.toml`, 'utf8')
     const cfg = parse(str)
     applyEnvOverrides(name, cfg)
-    if (this.debug) console.debug(cfg)
+    // if (this.debug) console.debug(cfg)
 
     if (name === 'http') {
       const tls = await loadPEM('./conf.d')
@@ -37,7 +37,7 @@ class Config {
     const str = fsSync.readFileSync(`./conf.d/${name}.toml`, 'utf8')
     const cfg = parse(str)
     applyEnvOverrides(name, cfg)
-    if (this.debug) console.debug(cfg)
+    // if (this.debug) console.debug(cfg)
 
     if (name === 'http') {
       const tls = loadPEMSync('./conf.d')
diff --git a/lib/group/store/base.js b/lib/group/store/base.js
@@ -16,6 +16,10 @@ class GroupBase {
     this.debug = args?.debug ?? false
   }
 
+  disconnect() {
+    // noop, for repos that need to clean up resources
+  }
+
   // -------------------------------------------------------------------------
   // Repo contract – subclasses must implement these
   // -------------------------------------------------------------------------
diff --git a/lib/group/store/mysql.js b/lib/group/store/mysql.js
@@ -163,6 +163,10 @@ class Group extends GroupBase {
     const r = await Mysql.execute(...Mysql.delete(`nt_group`, { nt_group_id: args.id }))
     return r.affectedRows === 1
   }
+
+  disconnect() {
+    return this.mysql?.disconnect()
+  }
 }
 
 export default Group
diff --git a/lib/group/test/index.js b/lib/group/test/index.js
@@ -6,7 +6,7 @@ import Group from '../index.js'
 import testCase from '../test/group.json' with { type: 'json' }
 
 after(async () => {
-  Group.mysql.disconnect()
+  Group.disconnect()
 })
 
 describe('group', function () {
diff --git a/lib/mysql.js b/lib/mysql.js
@@ -12,11 +12,8 @@ class Mysql {
   }
 
   async connect() {
-    // if (this.dbh && this.dbh?.connection?.connectionId) return this.dbh;
-
     const cfg = await Config.get('mysql')
-    if (_debug) console.log(cfg)
-
+    // if (_debug) console.log(cfg)
     this.dbh = await mysql.createConnection(cfg)
     if (_debug) console.log(`MySQL connection id ${this.dbh.connection.connectionId}`)
     return this.dbh
diff --git a/lib/nameserver/store/base.js b/lib/nameserver/store/base.js
@@ -39,6 +39,10 @@ class NameserverBase {
   async destroy(_args) {
     throw new Error('destroy() not implemented by this repo')
   }
+
+  disconnect() {
+    // noop by default
+  }
 }
 
 export default NameserverBase
diff --git a/lib/nameserver/store/mysql.js b/lib/nameserver/store/mysql.js
@@ -94,6 +94,10 @@ class Nameserver extends NameserverBase {
     const r = await Mysql.execute(...Mysql.delete(`nt_nameserver`, { nt_nameserver_id: args.id }))
     return r.affectedRows === 1
   }
+
+  disconnect() {
+    return this.mysql?.disconnect()
+  }
 }
 
 export default Nameserver
diff --git a/lib/nameserver/test/index.js b/lib/nameserver/test/index.js
@@ -12,7 +12,7 @@ before(async () => {
 
 after(async () => {
   await Nameserver.destroy({ id: testCase.id })
-  Nameserver.mysql.disconnect()
+  await Nameserver.disconnect()
 })
 
 describe('nameserver', function () {
diff --git a/lib/permission/store/mysql.js b/lib/permission/store/mysql.js
@@ -119,6 +119,10 @@ class PermissionRepoMySQL extends PermissionBase {
     const r = await Mysql.execute(...Mysql.delete(`nt_perm`, mapToDbColumn(args, permDbMap)))
     return r.affectedRows === 1
   }
+
+  disconnect() {
+    return this.mysql?.disconnect()
+  }
 }
 
 export default PermissionRepoMySQL
diff --git a/lib/permission/test/index.js b/lib/permission/test/index.js
@@ -15,7 +15,7 @@ before(async () => {
 })
 
 after(async () => {
-  await Permission.mysql.disconnect()
+  await Permission.disconnect()
 })
 
 describe('permission', function () {
diff --git a/lib/session/store/mysql.js b/lib/session/store/mysql.js
@@ -72,6 +72,10 @@ class SessionRepoMySQL {
     const r = await Mysql.execute(...Mysql.delete(`nt_user_session`, mapToDbColumn(args, sessionDbMap)))
     return r.affectedRows === 1
   }
+
+  disconnect() {
+    return this.mysql?.disconnect()
+  }
 }
 
 export default SessionRepoMySQL
diff --git a/lib/session/store/toml.js b/lib/session/store/toml.js
@@ -128,6 +128,10 @@ class SessionRepoTOML {
     await this._save(filtered)
     return true
   }
+
+  disconnect() {
+    // noop
+  }
 }
 
 export default SessionRepoTOML
diff --git a/lib/session/test/index.js b/lib/session/test/index.js
@@ -19,7 +19,7 @@ before(async () => {
 after(async () => {
   await Session.delete({ uid: sessionUser.id })
   await User.destroy({ id: sessionUser.id })
-  await User.mysql.disconnect()
+  await User.disconnect()
 })
 
 describe('session', function () {
diff --git a/lib/user/store/base.js b/lib/user/store/base.js
@@ -19,6 +19,10 @@ class UserBase {
     this.debug = args?.debug ?? false
   }
 
+  disconnect() {
+    // noop, for repos that need to clean up resources
+  }
+
   // -------------------------------------------------------------------------
   // Repo contract – subclasses must implement these
   // -------------------------------------------------------------------------
diff --git a/lib/user/store/mysql.js b/lib/user/store/mysql.js
@@ -206,6 +206,10 @@ class UserRepoMySQL extends UserBase {
     const r = await Mysql.execute(...Mysql.delete(`nt_user`, mapToDbColumn({ id: args.id }, userDbMap)))
     return r.affectedRows === 1
   }
+
+  disconnect() {
+    return this.mysql?.disconnect()
+  }
 }
 
 export default UserRepoMySQL
diff --git a/lib/user/test/index.js b/lib/user/test/index.js
@@ -12,7 +12,7 @@ before(async () => {
 })
 
 after(async () => {
-  User.mysql.disconnect()
+  await User.disconnect()
 })
 
 function sanitize(u) {
diff --git a/lib/zone/store/base.js b/lib/zone/store/base.js
@@ -37,6 +37,10 @@ class ZoneBase {
   async destroy(_args) {
     throw new Error('destroy() not implemented by this repo')
   }
+
+  disconnect() {
+    // noop by default, overridden by repos that need to clean up resources
+  }
 }
 
 export default ZoneBase
diff --git a/lib/zone/store/mysql.js b/lib/zone/store/mysql.js
@@ -181,6 +181,10 @@ class ZoneRepoMySQL extends ZoneBase {
     const r = await Mysql.execute(...Mysql.delete(`nt_zone`, { nt_zone_id: args.id }))
     return r.affectedRows === 1
   }
+
+  disconnect() {
+    return this.mysql?.disconnect()
+  }
 }
 
 export default ZoneRepoMySQL
diff --git a/lib/zone/test/index.js b/lib/zone/test/index.js
@@ -12,7 +12,7 @@ before(async () => {
 
 after(async () => {
   // await Zone.destroy({ id: testCase.id })
-  Zone.mysql.disconnect()
+  await Zone.disconnect()
 })
 
 describe('zone', function () {
diff --git a/lib/zone_record/store/base.js b/lib/zone_record/store/base.js
@@ -37,6 +37,10 @@ class ZoneRecordBase {
   async destroy(_args) {
     throw new Error('destroy() not implemented by this repo')
   }
+
+  disconnect() {
+    // noop by default
+  }
 }
 
 export default ZoneRecordBase
diff --git a/lib/zone_record/store/mysql.js b/lib/zone_record/store/mysql.js
@@ -92,6 +92,10 @@ class ZoneRecordMySQL extends ZoneRecordBase {
     const r = await Mysql.execute(...Mysql.delete(`nt_zone_record`, { nt_zone_record_id: args.id }))
     return r.affectedRows === 1
   }
+
+  disconnect() {
+    this.mysql?.disconnect()
+  }
 }
 
 export default ZoneRecordMySQL
diff --git a/lib/zone_record/test/index.js b/lib/zone_record/test/index.js
@@ -8,7 +8,7 @@ import ZoneRecord from '../index.js'
 
 after(async () => {
   // await ZoneRecord.destroy({ id: testCase.id })
-  ZoneRecord.mysql.disconnect()
+  await ZoneRecord.disconnect()
 })
 
 describe('zone_record', function () {
diff --git a/routes/index.js b/routes/index.js
@@ -139,9 +139,9 @@ async function setup() {
     }
   })
 
-  server.events.on('stop', () => {
-    if (User.mysql) User.mysql.disconnect()
-    if (Session.mysql) Session.mysql.disconnect()
+  server.events.on('stop', async () => {
+    await User.disconnect()
+    await Session.disconnect()
   })
 }
 
diff --git a/test-fixtures.js b/test-fixtures.js
@@ -35,8 +35,8 @@ async function setup() {
   await User.create(userCase)
   await User.create(userCaseR)
   // await createTestSession()
-  await User.mysql.disconnect()
-  await Group.mysql.disconnect()
+  await User.disconnect()
+  await Group.disconnect()
   process.exit(0)
 }
 
@@ -60,7 +60,7 @@ async function teardown() {
   await User.destroy({ id: userCaseR.id })
   await Group.destroy({ id: groupCase.id })
   await Group.destroy({ id: groupCaseR.id })
-  await User.mysql.disconnect()
-  await Group.mysql.disconnect()
+  await User.disconnect()
+  await Group.disconnect()
   process.exit(0)
 }

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,10 @@ class Group extends GroupBase {`
`163`	`163`	const r = await Mysql.execute(...Mysql.delete(`nt_group`, { nt_group_id: args.id }))
`164`	`164`	`return r.affectedRows === 1`
`165`	`165`	`}`
	`166`	`+`
	`167`	`+ disconnect() {`
	`168`	`+ return this.mysql?.disconnect()`
	`169`	`+ }`
`166`	`170`	`}`
`167`	`171`
`168`	`172`	`export default Group`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ class NameserverBase {`
`39`	`39`	`async destroy(_args) {`
`40`	`40`	`throw new Error('destroy() not implemented by this repo')`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ disconnect() {`
	`44`	`+ // noop by default`
	`45`	`+ }`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`export default NameserverBase`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,10 @@ class Nameserver extends NameserverBase {`
`94`	`94`	const r = await Mysql.execute(...Mysql.delete(`nt_nameserver`, { nt_nameserver_id: args.id }))
`95`	`95`	`return r.affectedRows === 1`
`96`	`96`	`}`
	`97`	`+`
	`98`	`+ disconnect() {`
	`99`	`+ return this.mysql?.disconnect()`
	`100`	`+ }`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`export default Nameserver`