@nictool/dns-resource-record 1.4.0 → 1.5.0

package/rr/nsec3param.js

@@ -11,7 +11,7 @@ export default class NSEC3PARAM extends RR {
   setHashAlgorithm(val) {
     // Hash Algorithm is a single octet.
     // The Hash Algorithm field is represented as an unsigned decimal integer.
-    if (!val) this.throwHelp(`NSEC3PARAM: 'hash algorithm' is required`)
+    if (val === undefined || val === null) this.throwHelp(`NSEC3PARAM: 'hash algorithm' is required`)
 
     this.is8bitInt('NSEC3PARAM', 'hash algorithm', val)
 
@@ -20,7 +20,7 @@ export default class NSEC3PARAM extends RR {
 
   setFlags(val) {
     // The Flags field is represented as an unsigned decimal integer.
-    if (!val) this.throwHelp(`NSEC3PARAM: 'flags' is required`)
+    if (val === undefined || val === null) this.throwHelp(`NSEC3PARAM: 'flags' is required`)
 
     this.is8bitInt('NSEC3PARAM', 'flags', val)
 
@@ -29,7 +29,7 @@ export default class NSEC3PARAM extends RR {
 
   setIterations(val) {
     // The Iterations field is represented as an unsigned decimal integer. 0-65535
-    if (!val) this.throwHelp(`NSEC3PARAM: 'iterations' is required`)
+    if (val === undefined || val === null) this.throwHelp(`NSEC3PARAM: 'iterations' is required`)
 
     this.is16bitInt('NSEC3PARAM', 'iterations', val)
 
@@ -41,6 +41,15 @@ export default class NSEC3PARAM extends RR {
     // hexadecimal digits.  Whitespace is not allowed within the
     // sequence.  The Salt field is represented as "-" (without the
     // quotes) when the Salt Length field has a value of 0
+    if (val === '-') {
+      this.set('salt', val)
+      return
+    }
+
+    if (val !== undefined && val !== null && !/^[0-9A-Fa-f]*$/.test(val)) {
+      this.throwHelp(`NSEC3PARAM: 'salt' must be hex or '-'`)
+    }
+
     this.set('salt', val)
   }
 
@@ -62,10 +71,10 @@ export default class NSEC3PARAM extends RR {
 
   /******  IMPORTERS   *******/
 
-  fromBind(str) {
+  fromBind({ bindline }) {
     // test.example.com  3600  IN  NSEC3PARAM  <hash> <flags> <iterations> <salt>
     // Example: test.example.com. 3600 IN NSEC3PARAM 1 1 12 aabbccdd
-    const [owner, ttl, c, type, ha, flags, iterations, salt] = str.split(/\s+/)
+    const [owner, ttl, c, type, ha, flags, iterations, salt] = bindline.split(/\s+/)
     return new NSEC3PARAM({
       owner,
       ttl: parseInt(ttl, 10),
@@ -78,22 +87,27 @@ export default class NSEC3PARAM extends RR {
     })
   }
 
-  fromTinydns(opts) {
-    const rd = opts.rd
-
+  fromTinydns({ tinyline }) {
     // RDATA format: Hash Algorithm (3 octal chars) + Flags (3 octal chars) + Iterations (6 octal chars) + Salt (escaped hex string)
-    if (rd.length < 12) {
+    const [owner, _typeId, rd, ttl, ts, loc] = tinyline.slice(1).split(':')
+    if (rd.length < 4) {
       this.throwHelp(`NSEC3PARAM: RDATA too short: ${rd}`)
     }
 
+    // rd may contain actual binary characters (from JS string '\\001' -> char 0x01),
+    // so convert via octalToChar and read bytes from a Buffer for robust parsing.
+    const bytes = Buffer.from(TINYDNS.octalToChar(rd), 'binary')
+
     return new NSEC3PARAM({
-      owner: this.fullyQualify(opts.owner),
-      ttl: parseInt(opts.ttl, 10),
+      owner: this.fullyQualify(owner),
+      ttl: parseInt(ttl, 10),
       type: 'NSEC3PARAM',
-      'hash algorithm': TINYDNS.octalToUInt8(rd.substring(0, 3)),
-      flags: TINYDNS.octalToUInt8(rd.substring(3, 6)),
-      iterations: TINYDNS.octalToUInt16(rd.substring(6, 12)),
-      salt: TINYDNS.unescapeOctal(rd.substring(12)),
+      'hash algorithm': bytes.readUInt8(0),
+      flags: bytes.readUInt8(1),
+      iterations: bytes.readUInt16BE(2),
+      salt: bytes.slice(4).toString('utf8'),
+      timestamp: ts,
+      location: loc?.trim() ?? '',
     })
   }
 
@@ -108,12 +122,11 @@ export default class NSEC3PARAM extends RR {
   toTinydns() {
     const dataRe = new RegExp(/[\r\n\t:\\/]/, 'g')
 
-    let rdata = ''
-    rdata += TINYDNS.UInt8toOctal(this.get('hash algorithm'))
-    rdata += TINYDNS.UInt8toOctal(this.get('flags'))
-    rdata += TINYDNS.UInt16toOctal(this.get('iterations'))
-    rdata += TINYDNS.escapeOctal(dataRe, this.get('salt'))
-
-    return this.getTinydnsGeneric(rdata)
+    return this.getTinydnsGeneric(
+      TINYDNS.UInt8toOctal(this.get('hash algorithm')) +
+        TINYDNS.UInt8toOctal(this.get('flags')) +
+        TINYDNS.UInt16toOctal(this.get('iterations')) +
+        TINYDNS.escapeOctal(dataRe, this.get('salt')),
+    )
   }
 }

package/rr/nxt.js

@@ -43,9 +43,9 @@ export default class NXT extends RR {
 
   /******  IMPORTERS   *******/
 
-  fromTinydns(opts) {
-    const [owner, n, rdata, ttl, ts, loc] = opts.tinyline.substring(1).split(':')
-    if (n != 30) this.throwHelp('NXT fromTinydns, invalid n')
+  fromTinydns({ tinyline }) {
+    const [owner, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
+    if (parseInt(n, 10) !== this.getTypeId()) this.throwHelp('NXT fromTinydns, invalid n')
 
     const binaryRdata = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
     const [nextDomain, _escapedLen, binaryLen] = TINYDNS.unpackDomainName(rdata)
@@ -57,20 +57,20 @@ export default class NXT extends RR {
       'next domain': nextDomain,
       'type bit map': binaryRdata.slice(binaryLen).toString(),
       timestamp: ts,
-      location: loc !== '' && loc !== '\n' ? loc : '',
+      location: loc?.trim() ?? '',
     })
   }
 
-  fromBind(opts) {
+  fromBind({ bindline }) {
     // test.example.com  3600  IN  NXT NextDomain TypeBitMap
-    const [owner, ttl, c, type, next] = opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, next] = bindline.split(/\s+/)
     return new NXT({
       owner,
       ttl: parseInt(ttl, 10),
       class: c,
       type: type,
       'next domain': next,
-      'type bit map': opts.bindline.split(/\s+/).slice(5).filter(removeParens).join(' ').trim(),
+      'type bit map': bindline.split(/\s+/).slice(5).filter(removeParens).join(' ').trim(),
     })
   }
 

package/rr/openpgpkey.js

@@ -28,11 +28,14 @@ export default class OPENPGPKEY extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromBind(obj) {
+  fromBind({ bindline: bindline }) {
     // test.example.com  3600  IN  OPENPGPKEY  <base64 public key>
-    const regex = /^([\S]+)\s+(\d{1,10})\s+(IN)\s+(OPENPGPKEY)\s+([\W\w]*)$/
-    // eslint-disable-next-line no-unused-vars
-    const [ignore, owner, ttl, c, type, publickey] = obj.bindline.trim().match(regex)
+    const regex =
+      /^(?<owner>\S+)\s+(?<ttl>\d{1,10})\s+(?<class>IN)\s+(?<type>OPENPGPKEY)\s+(?<publickey>\S[\s\S]*)$/i
+    const match = bindline.trim().match(regex)
+    if (!match) this.throwHelp(`unable to parse OPENPGPKEY: ${bindline}`)
+
+    const { owner, ttl, class: c, type, publickey } = match.groups
 
     return new OPENPGPKEY({
       owner,
@@ -43,12 +46,15 @@ export default class OPENPGPKEY extends RR {
     })
   }
 
-  fromTinydns(opts) {
+  fromTinydns({ tinyline }) {
+    const [owner, _typeId, rd, ttl, ts, loc] = tinyline.slice(1).split(':')
     return new OPENPGPKEY({
-      owner: this.fullyQualify(opts.owner),
-      ttl: parseInt(opts.ttl, 10),
+      owner: this.fullyQualify(owner),
+      ttl: parseInt(ttl, 10),
       type: 'OPENPGPKEY',
-      'public key': Buffer.from(TINYDNS.unescapeOctal(opts.rd), 'base64').toString('utf-8'),
+      'public key': Buffer.from(TINYDNS.unescapeOctal(rd), 'base64').toString('utf-8'),
+      timestamp: ts,
+      location: loc?.trim() ?? '',
     })
   }
 

package/rr/ptr.js

@@ -31,9 +31,9 @@ export default class PTR extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromTinydns(opts) {
+  fromTinydns({ tinyline }) {
     // ^fqdn:p:ttl:timestamp:lo
-    const [fqdn, p, ttl, ts, loc] = opts.tinyline.substring(1).split(':')
+    const [fqdn, p, ttl, ts, loc] = tinyline.slice(1).split(':')
 
     return new PTR({
       owner: this.fullyQualify(fqdn),
@@ -41,13 +41,13 @@ export default class PTR extends RR {
       type: 'PTR',
       dname: this.fullyQualify(p),
       timestamp: ts,
-      location: loc !== '' && loc !== '\n' ? loc : '',
+      location: loc?.trim() ?? '',
     })
   }
 
-  fromBind(opts) {
+  fromBind({ bindline }) {
     // test.example.com  3600  IN  PTR  dname
-    const [owner, ttl, c, type, dname] = opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, dname] = bindline.split(/\s+/)
     return new PTR({
       owner,
       ttl: parseInt(ttl, 10),

package/rr/rp.js

@@ -52,9 +52,9 @@ export default class RP extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromBind(opts) {
+  fromBind({ bindline }) {
     // test.example.com  3600  IN  RP  mbox txt
-    const [owner, ttl, c, type, mbox, txt] = opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, mbox, txt] = bindline.split(/\s+/)
     return new RP({
       owner,
       ttl: parseInt(ttl, 10),
@@ -65,6 +65,23 @@ export default class RP extends RR {
     })
   }
 
+  fromTinydns({ tinyline }) {
+    const [owner, _typeId, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
+
+    const [mbox, consumed] = TINYDNS.unpackDomainName(rdata)
+    const txt = TINYDNS.unpackDomainName(rdata.slice(consumed))[0]
+
+    return new RP({
+      owner: this.fullyQualify(owner),
+      ttl: parseInt(ttl, 10),
+      type: 'RP',
+      mbox,
+      txt,
+      timestamp: ts,
+      location: loc?.trim() ?? '',
+    })
+  }
+
   /******  EXPORTERS   *******/
   toBind(zone_opts) {
     return `${this.getPrefix(zone_opts)}\t${this.getFQDN('mbox', zone_opts)}\t${this.getFQDN('txt', zone_opts)}\n`

package/rr/rrsig.js

@@ -1,4 +1,5 @@
 import RR from '../rr.js'
+import * as TINYDNS from '../lib/tinydns.js'
 
 export default class RRSIG extends RR {
   constructor(opts) {
@@ -101,16 +102,89 @@ export default class RRSIG extends RR {
 
   /******  IMPORTERS   *******/
 
-  // fromBind (str) {
-  //   // test.example.com  3600  IN  RRSIG ...
-  //   const [ owner, ttl, c, type ] = str.split(/\s+/)
-  //   return new RRSIG({
-  //     owner,
-  //     ttl          : parseInt(ttl, 10),
-  //     class        : c,
-  //     type         : type,
-  //   })
-  // }
+  fromBind({ bindline }) {
+    // example.com. 3600 IN RRSIG typecovered algorithm labels origttl sigexp siginc keytag signersname ( signature )
+    const parts = bindline.trim().split(/\s+/)
+    return new RRSIG({
+      owner: parts[0],
+      ttl: parseInt(parts[1], 10),
+      class: parts[2],
+      type: 'RRSIG',
+      'type covered': parseInt(parts[4], 10),
+      algorithm: parseInt(parts[5], 10),
+      labels: parseInt(parts[6], 10),
+      'original ttl': parseInt(parts[7], 10),
+      'signature expiration': parseInt(parts[8], 10),
+      'signature inception': parseInt(parts[9], 10),
+      'key tag': parseInt(parts[10], 10),
+      'signers name': parts[11],
+      signature: parts
+        .slice(12)
+        .filter((a) => a !== '(' && a !== ')')
+        .join(' ')
+        .trim(),
+    })
+  }
+
+  fromTinydns({ tinyline }) {
+    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
+    if (parseInt(n, 10) !== this.getTypeId()) this.throwHelp('RRSIG fromTinydns, invalid n')
+
+    const bytes = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
+    const typeCovered = bytes.readUInt16BE(0)
+    const algorithm = bytes.readUInt8(2)
+    const labels = bytes.readUInt8(3)
+    const originalTtl = bytes.readUInt32BE(4)
+    const signatureExpiration = bytes.readUInt32BE(8)
+    const signatureInception = bytes.readUInt32BE(12)
+    const keyTag = bytes.readUInt16BE(16)
+
+    let pos = 18
+    const labelArr = []
+    while (pos < bytes.length) {
+      const len = bytes.readUInt8(pos++)
+      if (len === 0) break
+      labelArr.push(bytes.slice(pos, pos + len).toString())
+      pos += len
+    }
+    const signersName = `${labelArr.join('.')}.`
+    const signature = bytes.slice(pos).toString()
+
+    return new RRSIG({
+      owner: this.fullyQualify(fqdn),
+      ttl: parseInt(ttl, 10),
+      type: 'RRSIG',
+      'type covered': typeCovered,
+      algorithm,
+      labels,
+      'original ttl': originalTtl,
+      'signature expiration': signatureExpiration,
+      'signature inception': signatureInception,
+      'key tag': keyTag,
+      'signers name': signersName,
+      signature,
+      timestamp: ts,
+      location: loc?.trim() ?? '',
+    })
+  }
 
   /******  EXPORTERS   *******/
+  toBind(zone_opts) {
+    return `${this.getPrefix(zone_opts)}\t${this.get('type covered')}\t${this.get('algorithm')}\t${this.get('labels')}\t${this.get('original ttl')}\t${this.get('signature expiration')}\t${this.get('signature inception')}\t${this.get('key tag')}\t${this.getFQDN('signers name', zone_opts)}\t${this.get('signature')}\n`
+  }
+
+  toTinydns() {
+    const dataRe = new RegExp(/[\r\n\t:]/, 'g')
+    return this.getTinydnsGeneric(
+      TINYDNS.UInt16toOctal(this.get('type covered')) +
+        TINYDNS.UInt8toOctal(this.get('algorithm')) +
+        TINYDNS.UInt8toOctal(this.get('labels')) +
+        TINYDNS.UInt32toOctal(this.get('original ttl')) +
+        TINYDNS.UInt32toOctal(this.get('signature expiration')) +
+        TINYDNS.UInt32toOctal(this.get('signature inception')) +
+        TINYDNS.UInt16toOctal(this.get('key tag')) +
+        TINYDNS.packDomainName(this.get('signers name')) +
+        TINYDNS.escapeOctal(dataRe, this.get('signature')),
+    )
+  }
 }

package/rr/sig.js

@@ -1,5 +1,7 @@
 import RR from '../rr.js'
 
+import * as TINYDNS from '../lib/tinydns.js'
+
 export default class SIG extends RR {
   constructor(opts) {
     super(opts)
@@ -15,8 +17,7 @@ export default class SIG extends RR {
 
   setAlgorithm(val) {
     // a 1 octet Algorithm field
-
-    this.is8bitInt('SIG', 'labels', val)
+    this.is8bitInt('SIG', 'algorithm', val)
 
     this.set('algorithm', val)
   }
@@ -90,18 +91,93 @@ export default class SIG extends RR {
   }
 
   /******  IMPORTERS   *******/
-  // fromBind (str) {
-  //   // test.example.com  3600  IN  SIG ...
-  //   const [ owner, ttl, c, type ] = str.split(/\s+/)
-  //   return new SIG({
-  //     owner,
-  //     ttl          : parseInt(ttl, 10),
-  //     class        : c,
-  //     type         : type,
-  //   })
-  // }
+
+  fromBind({ bindline }) {
+    // example.com. 3600 IN SIG TypeCovered Algorithm Labels OrigTTL SigExpiration SigInception KeyTag SignersName ( Signature )
+    const parts = bindline.trim().split(/\s+/)
+
+    return new SIG({
+      owner: parts[0],
+      ttl: parseInt(parts[1], 10),
+      class: parts[2],
+      type: 'SIG',
+      'type covered': parseInt(parts[4], 10),
+      algorithm: parseInt(parts[5], 10),
+      labels: parseInt(parts[6], 10),
+      'original ttl': parseInt(parts[7], 10),
+      'signature expiration': parseInt(parts[8], 10),
+      'signature inception': parseInt(parts[9], 10),
+      'key tag': parseInt(parts[10], 10),
+      'signers name': parts[11],
+      signature: parts
+        .slice(12)
+        .filter((a) => a !== '(' && a !== ')')
+        .join(' ')
+        .trim(),
+    })
+  }
 
   /******  EXPORTERS   *******/
+  toTinydns() {
+    const dataRe = new RegExp(/[\r\n\t:]/, 'g')
+
+    return this.getTinydnsGeneric(
+      TINYDNS.UInt16toOctal(this.get('type covered')) +
+        TINYDNS.UInt8toOctal(this.get('algorithm')) +
+        TINYDNS.UInt8toOctal(this.get('labels')) +
+        TINYDNS.UInt32toOctal(this.get('original ttl')) +
+        TINYDNS.UInt32toOctal(this.get('signature expiration')) +
+        TINYDNS.UInt32toOctal(this.get('signature inception')) +
+        TINYDNS.UInt16toOctal(this.get('key tag')) +
+        TINYDNS.packDomainName(this.get('signers name')) +
+        TINYDNS.escapeOctal(dataRe, this.get('signature')),
+    )
+  }
+
+  fromTinydns({ tinyline }) {
+    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.substring(1).split(':')
+    if (parseInt(n, 10) !== this.getTypeId()) this.throwHelp('SIG fromTinydns, invalid n')
+
+    const bytes = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
+
+    const typeCovered = bytes.readUInt16BE(0)
+    const algorithm = bytes.readUInt8(2)
+    const labels = bytes.readUInt8(3)
+    const originalTtl = bytes.readUInt32BE(4)
+    const signatureExpiration = bytes.readUInt32BE(8)
+    const signatureInception = bytes.readUInt32BE(12)
+    const keyTag = bytes.readUInt16BE(16)
+
+    // parse signers name from binary buffer starting at offset 18
+    let pos = 18
+    const labelsArr = []
+    while (pos < bytes.length) {
+      const len = bytes.readUInt8(pos++)
+      if (len === 0) break
+      labelsArr.push(bytes.slice(pos, pos + len).toString())
+      pos += len
+    }
+    const signersName = `${labelsArr.join('.')}.`
+
+    const signature = bytes.slice(pos).toString()
+
+    return new SIG({
+      owner: this.fullyQualify(fqdn),
+      ttl: parseInt(ttl, 10),
+      type: 'SIG',
+      'type covered': typeCovered,
+      algorithm,
+      labels,
+      'original ttl': originalTtl,
+      'signature expiration': signatureExpiration,
+      'signature inception': signatureInception,
+      'key tag': keyTag,
+      'signers name': signersName,
+      signature,
+      timestamp: ts,
+      location: loc?.trim() ?? '',
+    })
+  }
 
   toBind(zone_opts) {
     return `${this.getFQDN('owner', zone_opts)}	${this.get('ttl')}	${this.get('class')}	SIG${this.getRdataFields()

package/rr/smimea.js

@@ -76,9 +76,9 @@ export default class SMIMEA extends RR {
 
   /******  IMPORTERS   *******/
 
-  fromBind(opts) {
+  fromBind({ bindline }) {
     // test.example.com  3600  IN  SMIMEA, usage, selector, match, data
-    const [owner, ttl, c, type, usage, selector, match] = opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, usage, selector, match] = bindline.split(/\s+/)
     return new SMIMEA({
       owner,
       ttl: parseInt(ttl, 10),
@@ -87,12 +87,12 @@ export default class SMIMEA extends RR {
       'certificate usage': parseInt(usage, 10),
       selector: parseInt(selector, 10),
       'matching type': parseInt(match, 10),
-      'certificate association data': opts.bindline.split(/\s+/).slice(7).join(' ').trim(),
+      'certificate association data': bindline.split(/\s+/).slice(7).join(' ').trim(),
     })
   }
 
-  fromTinydns(opts) {
-    const [owner, _typeId, rdata, ttl, ts, loc] = opts.tinyline.substring(1).split(':')
+  fromTinydns({ tinyline }) {
+    const [owner, _typeId, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
     const binaryRdata = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
 
     return new SMIMEA({
@@ -104,7 +104,7 @@ export default class SMIMEA extends RR {
       'matching type': binaryRdata.readUInt8(2),
       'certificate association data': binaryRdata.slice(3).toString(),
       timestamp: ts,
-      location: loc !== '' && loc !== '\n' ? loc : '',
+      location: loc?.trim() ?? '',
     })
   }
 

package/rr/soa.js

@@ -84,10 +84,10 @@ export default class SOA extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromBind(opts) {
+  fromBind({ bindline }) {
     // example.com TTL IN  SOA mname rname serial refresh retry expire minimum
     const [owner, ttl, c, type, mname, rname, serial, refresh, retry, expire, minimum] =
-      opts.bindline.split(/[\s+]/)
+      bindline.split(/[\s+]/)
 
     return new SOA({
       owner,
@@ -104,9 +104,9 @@ export default class SOA extends RR {
     })
   }
 
-  fromTinydns(opts) {
+  fromTinydns({ tinyline }) {
     // Zfqdn:mname:rname:ser:ref:ret:exp:min:ttl:time:lo
-    const [fqdn, mname, rname, ser, ref, ret, exp, min, ttl, ts, loc] = opts.tinyline.substring(1).split(':')
+    const [fqdn, mname, rname, ser, ref, ret, exp, min, ttl, ts, loc] = tinyline.slice(1).split(':')
 
     return new SOA({
       owner: this.fullyQualify(fqdn),
@@ -114,13 +114,13 @@ export default class SOA extends RR {
       type: 'SOA',
       mname: this.fullyQualify(mname),
       rname: this.fullyQualify(rname),
-      serial: parseInt(ser || opts.default?.serial, 10),
+      serial: parseInt(ser ?? this.default?.serial, 10),
       refresh: parseInt(ref, 10) || 16384,
       retry: parseInt(ret, 10) || 2048,
       expire: parseInt(exp, 10) || 1048576,
       minimum: parseInt(min, 10) || 2560,
       timestamp: parseInt(ts) || '',
-      location: loc !== '' && loc !== '\n' ? loc : '',
+      location: loc?.trim() ?? '',
     })
   }
 

package/rr/spf.js

@@ -31,9 +31,9 @@ export default class SPF extends TXT {
   }
 
   /******  IMPORTERS   *******/
-  fromTinydns(opts) {
+  fromTinydns({ tinyline }) {
     // SPF via generic, :fqdn:n:rdata:ttl:timestamp:lo
-    const [fqdn, n, rdata, ttl, ts, loc] = opts.tinyline.substring(1).split(':')
+    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
     if (n != 99) this.throwHelp('SPF fromTinydns, invalid n')
 
     return new SPF({
@@ -42,7 +42,7 @@ export default class SPF extends TXT {
       data: TINYDNS.octalToChar(rdata),
       ttl: parseInt(ttl, 10),
       timestamp: ts,
-      location: loc !== '' && loc !== '\n' ? loc : '',
+      location: loc?.trim() ?? '',
     })
   }
 

package/rr/srv.js

@@ -54,22 +54,22 @@ export default class SRV extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromTinydns(opts) {
-    const str = opts.tinyline
+  fromTinydns({ tinyline }) {
+    const str = tinyline
     let fqdn, addr, port, pri, weight, ttl, ts, loc, n, rdata
 
     if (str[0] === 'S') {
       // patched tinydns with S records
-      ;[fqdn, addr, port, pri, weight, ttl, ts, loc] = str.substring(1).split(':')
+      ;[fqdn, addr, port, pri, weight, ttl, ts, loc] = str.slice(1).split(':')
     } else {
       // tinydns generic record format
-      ;[fqdn, n, rdata, ttl, ts, loc] = str.substring(1).split(':')
+      ;[fqdn, n, rdata, ttl, ts, loc] = str.slice(1).split(':')
       if (n != 33) this.throwHelp('SRV fromTinydns: invalid n')
 
-      pri = TINYDNS.octalToUInt16(rdata.substring(0, 8))
-      weight = TINYDNS.octalToUInt16(rdata.substring(8, 16))
-      port = TINYDNS.octalToUInt16(rdata.substring(16, 24))
-      addr = TINYDNS.unpackDomainName(rdata.substring(24))[0]
+      pri = TINYDNS.octalToUInt16(rdata.slice(0, 8))
+      weight = TINYDNS.octalToUInt16(rdata.slice(8, 16))
+      port = TINYDNS.octalToUInt16(rdata.slice(16, 24))
+      addr = TINYDNS.unpackDomainName(rdata.slice(24))[0]
     }
 
     return new SRV({
@@ -81,13 +81,13 @@ export default class SRV extends RR {
       port: parseInt(port, 10),
       target: this.fullyQualify(addr),
       timestamp: ts,
-      location: loc !== '' && loc !== '\n' ? loc : '',
+      location: loc?.trim() ?? '',
     })
   }
 
-  fromBind(opts) {
+  fromBind({ bindline }) {
     // test.example.com  3600  IN  SRV Priority Weight Port Target
-    const [owner, ttl, c, type, pri, weight, port, target] = opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, pri, weight, port, target] = bindline.split(/\s+/)
     return new SRV({
       owner: owner,
       ttl: parseInt(ttl, 10),

package/rr/sshfp.js

@@ -59,26 +59,26 @@ export default class SSHFP extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromTinydns(opts) {
+  fromTinydns({ tinyline }) {
     // SSHFP via generic, :fqdn:n:rdata:ttl:timestamp:lo
-    const [fqdn, n, rdata, ttl, ts, loc] = opts.tinyline.substring(1).split(':')
+    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
     if (n != 44) this.throwHelp('SSHFP fromTinydns, invalid n')
 
     return new SSHFP({
       owner: this.fullyQualify(fqdn),
       ttl: parseInt(ttl, 10),
       type: 'SSHFP',
-      algorithm: TINYDNS.octalToUInt8(rdata.substring(0, 4)),
-      fptype: TINYDNS.octalToUInt8(rdata.substring(4, 8)),
-      fingerprint: TINYDNS.octalToHex(rdata.substring(8)),
+      algorithm: TINYDNS.octalToUInt8(rdata.slice(0, 4)),
+      fptype: TINYDNS.octalToUInt8(rdata.slice(4, 8)),
+      fingerprint: TINYDNS.octalToHex(rdata.slice(8)),
       timestamp: ts,
-      location: loc !== '' && loc !== '\n' ? loc : '',
+      location: loc?.trim() ?? '',
     })
   }
 
-  fromBind(opts) {
+  fromBind({ bindline }) {
     // test.example.com  3600  IN  SSHFP  algo fptype fp
-    const [owner, ttl, c, type, algo, fptype, fp] = opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, algo, fptype, fp] = bindline.split(/\s+/)
     return new SSHFP({
       owner,
       ttl: parseInt(ttl, 10),