doc(CONTRIBUTORS): added

Author: msimerson

.release

@@ -1,3 +1,7 @@
+# Changelog
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/).
+
 # CHANGES
 
 ### Unreleased
@@ -39,6 +43,9 @@
 - lib/user.get: convert booleans
 
 
+[3.0.0-alpha.0]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.0
+[3.0.0-alpha.1]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.1
+[3.0.0-alpha.2]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.2
 [3.0.0-alpha.3]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.3
 [3.0.0-alpha.4]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.4
 [3.0.0-alpha.5]: https://github.com/NicTool/api/releases/tag/3.0.0-alpha.5

CHANGELOG.md

@@ -0,0 +1,9 @@
+# Contributors
+
+This handcrafted artisanal software is brought to you by:
+
+| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/NicTool/api/commits?author=msimerson">14</a>)|
+| :---: |
+
+<sub>this file is generated by [.release](https://github.com/msimerson/.release).
+Contribute to this project to get your GitHub profile included here.</sub>

CONTRIBUTORS.md

@@ -12,7 +12,7 @@ class Config {
     this.getEnv(opts)
   }
 
-  async getEnv(opts = {}) {
+  getEnv(opts = {}) {
     this.env = process.env.NODE_ENV ?? opts.env ?? ''
     this.debug = Boolean(process.env.NODE_DEBUG)
     if (this.debug) console.log(`debug: true, env: ${this.env}`)

lib/config.js

@@ -17,13 +17,13 @@ describe('config', () => {
 
     it(`loads mysql cov config`, async () => {
       const cfg = await Config.get('mysql', 'cov')
-      assert.deepEqual(cfg, mysqlTestCfg)
+      assert.deepEqual(cfg, mysqlCovCfg)
     })
 
     it(`loads mysql cov config (from cache)`, async () => {
       process.env.NODE_DEBUG = 1
       const cfg = await Config.get('mysql', 'cov')
-      assert.deepEqual(cfg, mysqlTestCfg)
+      assert.deepEqual(cfg, mysqlCovCfg)
       process.env.NODE_DEBUG = ''
     })
 
@@ -39,20 +39,28 @@ describe('config', () => {
 
     it(`detects NODE_DEBUG env`, async () => {
       process.env.NODE_DEBUG = 1
-      let cfg = await Config.get('mysql', 'test')
+      await Config.get('mysql', 'test')
       assert.equal(Config.debug, true)
 
       process.env.NODE_DEBUG = ''
-      cfg = await Config.get('mysql', 'test')
+      await Config.get('mysql', 'test')
       assert.equal(Config.debug, false)
-
-      cfg = await Config.get('mysql', 'test')
-      assert.equal(cfg.user, 'root')
     })
   })
 })
 
 const mysqlTestCfg = {
+  host: '127.0.0.1',
+  port: 3306,
+  user: 'nictool',
+  password: 'StaySafeOutThere',
+  database: 'nictool',
+  timezone: '+00:00',
+  dateStrings: ['DATETIME', 'TIMESTAMP'],
+  decimalNumbers: true,
+}
+
+const mysqlCovCfg = {
   host: '127.0.0.1',
   port: 3306,
   user: 'root',

lib/config.test.js

@@ -5,11 +5,20 @@ import User from './user.js'
 import Session from './session.js'
 import userCase from './test/user.json' with { type: 'json' }
 
+const sessionUser = {
+  ...userCase,
+  id: userCase.id + 100,
+  username: `${userCase.username}-session`,
+  email: `session-${userCase.email}`,
+}
+
 before(async () => {
-  await User.create(userCase)
+  await User.create(sessionUser)
 })
 
 after(async () => {
+  await Session.delete({ uid: sessionUser.id })
+  await User.destroy({ id: sessionUser.id })
   await User.mysql.disconnect()
 })
 
@@ -20,7 +29,7 @@ describe('session', function () {
   describe('create', () => {
     it('creates a login session', async () => {
       sessionId = await Session.create({
-        nt_user_id: userCase.id,
+        nt_user_id: sessionUser.id,
         session: '3.0.0',
         last_access: parseInt(Date.now() / 1000, 10),
       })
@@ -31,7 +40,6 @@ describe('session', function () {
   describe('get', () => {
     it('finds a session by id', async () => {
       const s = await Session.get({ id: sessionId })
-      // console.log(s)
       assert.ok(s?.id)
     })
 

lib/session.test.js

@@ -12,7 +12,7 @@
     "interval": 0,
     "serials": true,
     "status": "last run:03-05 15:25<br>last cp :09-20 12:59",
-    "type": "NSD"
+    "type": "nsd"
   },
   "ttl": 3600
 }

lib/test/nameserver.json

@@ -51,6 +51,8 @@ class Zone {
       for (const f of ['description', 'location']) {
         if ([null].includes(row[f])) row[f] = ''
       }
+      if (row['last_publish'] === undefined) delete row['last_publish']
+      if (/00:00:00/.test(row['last_publish'])) row['last_publish'] = null
       if (args.deleted === false) delete row.deleted
     }
 

lib/zone.js

@@ -5,6 +5,8 @@ import { mapToDbColumn } from './util.js'
 
 const zrDbMap = { id: 'nt_zone_record_id', zid: 'nt_zone_id', owner: 'name' }
 const boolFields = ['deleted']
+const keepZeroWeightFor = new Set(['SRV', 'URI'])
+const keepZeroPriorityFor = new Set(['HTTPS', 'SVCB', 'URI'])
 
 class ZoneRecord {
   constructor() {
@@ -29,6 +31,10 @@ class ZoneRecord {
   async get(args) {
     args = JSON.parse(JSON.stringify(args))
     if (args.deleted === undefined) args.deleted = false
+    if (args.type !== undefined) {
+      args.type_id = RR.typeMap[args.type]
+      delete args.type
+    }
 
     const rows = await Mysql.execute(
       ...Mysql.select(
@@ -107,15 +113,21 @@ function dbToObject(rows) {
     const map = getMap(row.type)
     if (map) unApplyMap(row, map)
 
-    for (const f of [
-      'description',
-      'other',
-      'location',
-      'weight',
-      'priority',
-      'timestamp',
-    ]) {
-      if (null === row[f]) delete row[f]
+    if ([null, ''].includes(row.description)) delete row.description
+    if ([null, '', '0'].includes(row.other)) delete row.other
+    if ([null, ''].includes(row.location)) delete row.location
+    if (row.timestamp === null) delete row.timestamp
+
+    if (row.weight === null) {
+      delete row.weight
+    } else if (row.weight === 0 && !keepZeroWeightFor.has(row.type)) {
+      delete row.weight
+    }
+
+    if (row.priority === null) {
+      delete row.priority
+    } else if (row.priority === 0 && !keepZeroPriorityFor.has(row.type)) {
+      delete row.priority
     }
   }
 

lib/zone_record.js

@@ -35,7 +35,11 @@ describe('zone_record', function () {
       })
 
       it('GET by name', async () => {
-        const zrs = await ZoneRecord.get({ zone_record: testCase.zone_record })
+        const zrs = await ZoneRecord.get({
+          owner: testCase.owner,
+          type: testCase.type,
+          zid: testCase.zid,
+        })
         delete zrs[0].last_modified
         assert.deepEqual(zrs[0], testCase)
       })