@nictool/dns-resource-record 1.2.2 → 1.2.3

package/CHANGELOG.md

@@ -4,6 +4,14 @@ Notable changes to this project are documented in this file.
 
 #### Unreleased
 
+### [1.2.3] - 2025-04-14
+
+- test(\*): fully qualify node modules
+- feat(rr.isIPv?): added regexes to validate format
+- dep(node:{net|util): remove, for browser compatiblity
+- doc(CONTRIBUTORS.md): added
+- ci: disable codeql schedule (#45)
+
 ### [1.2.2] - 2024-11-17
 
 - dep(eslint): update to v9 & config
@@ -300,7 +308,8 @@ Notable changes to this project are documented in this file.
 [1.1.5]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.5
 [1.1.6]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.6
 [1.1.8]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.8
-[1.2.1]: https://github.com/NicTool/dns-resource-record/releases/tag/1.2.1
-[1.2.2]: https://github.com/NicTool/dns-resource-record/releases/tag/v1.2.2
 [1.1.7]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.7
 [1.2.0]: https://github.com/NicTool/dns-resource-record/releases/tag/1.2.0
+[1.2.1]: https://github.com/NicTool/dns-resource-record/releases/tag/v1.2.1
+[1.2.2]: https://github.com/NicTool/dns-resource-record/releases/tag/1.2.2
+[1.2.3]: https://github.com/NicTool/dns-resource-record/releases/tag/v1.2.3

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@nictool/dns-resource-record",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "DNS Resource Records",
   "main": "index.js",
-  "file": [
+  "files": [
     "lib",
     "rr",
     "CHANGELOG.md",
@@ -13,7 +13,7 @@
   "scripts": {
     "format:check": "npm run prettier; npm run lint",
     "format": "npm run prettier -- --write && npm run lint --fix",
-    "lint": "npx eslint@9 **/*.js",
+    "lint": "npx eslint **/*.js",
     "lint:fix": "npm run lint -- --fix",
     "prettier": "npx prettier --ignore-path .gitignore --check .",
     "prettier:fix": "npx prettier --ignore-path .gitignore --write .",
@@ -45,9 +45,14 @@
   },
   "homepage": "https://github.com/NicTool/dns-resource-record#readme",
   "devDependencies": {
-    "@eslint/js": "^9.15.0",
+    "@eslint/js": "^10.0.0",
     "eslint": "^9.15.0",
-    "globals": "^15.12.0",
-    "mocha": "^10.8.2"
+    "globals": "^16.0.0",
+    "mocha": "^11.2.2"
+  },
+  "prettier": {
+    "semi": false,
+    "singleQuote": true,
+    "trailingComma": "all"
   }
 }

package/rr/a.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 export default class A extends RR {
@@ -10,7 +8,7 @@ export default class A extends RR {
   /****** Resource record specific setters   *******/
   setAddress(val) {
     if (!val) this.throwHelp('A: address is required')
-    if (!net.isIPv4(val)) this.throwHelp('A address must be IPv4')
+    if (!this.isIPv4(val)) this.throwHelp('A address must be IPv4')
     this.set('address', val)
   }
 

package/rr/aaaa.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
@@ -11,7 +9,7 @@ export default class AAAA extends RR {
   /****** Resource record specific setters   *******/
   setAddress(val) {
     if (!val) this.throwHelp('AAAA: address is required')
-    if (!net.isIPv6(val)) this.throwHelp(`AAAA: address must be IPv6 (${val})`)
+    if (!this.isIPv6(val)) this.throwHelp(`AAAA: address must be IPv6 (${val})`)
 
     this.set('address', this.expand(val.toLowerCase())) // lower case: RFC 5952
   }

package/rr/cname.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 export default class CNAME extends RR {
@@ -14,7 +12,7 @@ export default class CNAME extends RR {
 
     if (!val) this.throwHelp('CNAME: cname is required')
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`CNAME: cname must be a FQDN: RFC 2181`)
 
     if (!this.isFullyQualified('CNAME', 'cname', val)) return

package/rr/dname.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
@@ -12,7 +10,7 @@ export default class DNAME extends RR {
   setTarget(val) {
     if (!val) this.throwHelp('DNAME: target is required')
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`DNAME: target must be a domain name`)
 
     this.isFullyQualified('DNAME', 'target', val)

package/rr/ipseckey.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 import * as TINYDNS from '../lib/tinydns.js'
@@ -39,10 +37,10 @@ export default class IPSECKEY extends RR {
         if (val !== '.') throw gwErr
         break
       case 1:
-        if (!net.isIPv4(val)) throw gwErr
+        if (!this.isIPv4(val)) throw gwErr
         break
       case 2:
-        if (!net.isIPv6(val)) throw gwErr
+        if (!this.isIPv6(val)) throw gwErr
         break
     }
 

package/rr/mx.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 export default class MX extends RR {
@@ -18,7 +16,7 @@ export default class MX extends RR {
   setExchange(val) {
     if (!val) this.throwHelp('MX: exchange is required')
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`MX: exchange must be a FQDN`)
 
     this.isFullyQualified('MX', 'exchange', val)

package/rr/srv.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
@@ -30,7 +28,7 @@ export default class SRV extends RR {
   setTarget(val) {
     if (!val) this.throwHelp(`SRV: target is required`)
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`SRV: target must be a FQDN`)
 
     this.isFullyQualified('SRV', 'target', val)

package/rr.js

@@ -1,5 +1,3 @@
-import util from 'node:util'
-
 export default class RR extends Map {
   constructor(opts) {
     super()
@@ -128,7 +126,7 @@ export default class RR extends Map {
     if (this.constructor.name === 'RR') throw new Error(e)
 
     const example = this.getCanonical
-      ? `Example ${this.constructor.name}:\n${util.inspect(this.getCanonical(), { depth: null })}\n\n`
+      ? `Example ${this.constructor.name}:\n${this.getCanonical()}\n\n`
       : `${this.constructor.name} records have the fields: ${this.getFields().join(', ')}\n\n`
 
     throw new Error(`${e}\n\n${example}${this.citeRFC()}\n`)
@@ -313,6 +311,17 @@ export default class RR extends Map {
     )
   }
 
+  isIPv4(string) {
+    // https://stackoverflow.com/questions/5284147/validating-ipv4-addresses-with-regexp
+    return /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$/.test(string)
+  }
+
+  isIPv6(string) {
+    return /^(?:(?:[a-fA-F\d]{1,4}:){7}(?:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,2}|:)|(?:[a-fA-F\d]{1,4}:){4}(?:(?::[a-fA-F\d]{1,4}){0,1}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,3}|:)|(?:[a-fA-F\d]{1,4}:){3}(?:(?::[a-fA-F\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,4}|:)|(?:[a-fA-F\d]{1,4}:){2}(?:(?::[a-fA-F\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,5}|:)|(?:[a-fA-F\d]{1,4}:){1}(?:(?::[a-fA-F\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,6}|:)|(?::(?:(?::[a-fA-F\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,7}|:)))(?:%[0-9a-zA-Z]{1,})?$/gm.test(
+      string,
+    )
+  }
+
   toBind(zone_opts) {
     return `${this.getPrefix(zone_opts)}\t${this.getRdataFields()
       .map((f) => this.getQuoted(f))

package/.codeclimate.yml

@@ -1,25 +0,0 @@
-checks:
-  return-statements:
-    enabled: false
-  similar-code:
-    enabled: false
-  file-lines:
-    config:
-      threshold: 500
-  method-lines:
-    config:
-      threshold: 50
-  method-complexity:
-    config:
-      threshold: 10
-
-plugins:
-  eslint:
-    enabled: true
-    channel: 'eslint-8'
-    config:
-      config: '.eslintrc.yaml'
-
-ratings:
-  paths:
-    - '**.js'

package/.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: msimerson

package/.github/workflows/ci.yml

@@ -1,43 +0,0 @@
-name: CI
-
-on:
-  push:
-  pull_request:
-
-env:
-  CI: true
-
-jobs:
-  lint:
-    uses: NicTool/.github/.github/workflows/lint.yml@main
-
-  coverage:
-    uses: NicTool/.github/.github/workflows/coverage.yml@main
-    secrets: inherit
-
-  test:
-    needs: get-lts
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: ${{ fromJson(needs.get-lts.outputs.active) }}
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-      - run: npm test
-
-  get-lts:
-    needs: lint
-    runs-on: ubuntu-latest
-    steps:
-      - id: get
-        uses: msimerson/node-lts-versions@v1
-    outputs:
-      lts: ${{ steps.get.outputs.lts }}
-      active: ${{ steps.get.outputs.active }}

package/.github/workflows/codeql.yml

@@ -1,14 +0,0 @@
-name: CodeQL
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [main]
-  schedule:
-    - cron: '18 7 * * 4'
-
-jobs:
-  codeql:
-    uses: NicTool/.github/.github/workflows/codeql.yml@main

package/.github/workflows/publish.yml

@@ -1,16 +0,0 @@
-name: publish
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - package.json
-
-env:
-  CI: true
-
-jobs:
-  publish:
-    uses: NicTool/.github/.github/workflows/publish.yml@main
-    secrets: inherit

package/.gitmodules

@@ -1,3 +0,0 @@
-[submodule ".release"]
-	path = .release
-	url = https://github.com/msimerson/.release

package/.prettierrc.yml

@@ -1,3 +0,0 @@
-trailingComma: 'all'
-semi: false
-singleQuote: true

package/DEVELOP.md

@@ -1,9 +0,0 @@
-# Release process
-
-In your local repo:
-
-```sh
-git submodule update --init --recursive
-```
-
-Read and follow the instructions in .release/README.md

package/eslint.config.mjs

@@ -1,41 +0,0 @@
-import globals from 'globals'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import js from '@eslint/js'
-import { FlatCompat } from '@eslint/eslintrc'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
-  allConfig: js.configs.all,
-})
-
-export default [
-  {
-    languageOptions: {
-      ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-        ...globals.browser,
-        ...globals.mocha,
-      },
-      sourceType: 'module',
-    },
-
-    rules: {
-      // 'no-undef': [ 'warn' ],
-      'no-unused-vars': [
-        'error',
-        {
-          args: 'none',
-        },
-      ],
-
-      'dot-notation': 'error',
-      'prefer-const': 'warn',
-    },
-  },
-  js.configs.recommended,
-]

package/test/a.js

@@ -1,75 +0,0 @@
-import A from '../rr/a.js'
-import * as base from './base.js'
-
-const defaults = { class: 'IN', ttl: 3600, type: 'A', address: '192.0.2.127' }
-
-const validRecords = [
-  {
-    ...defaults,
-    owner: 'test.example.com.',
-    testB: 'test.example.com.\t3600\tIN\tA\t192.0.2.127\n',
-    testT: '+test.example.com:192.0.2.127:3600::\n',
-  },
-  {
-    ...defaults,
-    owner: 'test.example.com.',
-    ttl: 2147483647,
-    testB: 'test.example.com.\t2147483647\tIN\tA\t192.0.2.127\n',
-    testT: '+test.example.com:192.0.2.127:2147483647::\n',
-  },
-  {
-    ...defaults,
-    owner: 'a.',
-    ttl: 86400,
-    testB: 'a.\t86400\tIN\tA\t192.0.2.127\n',
-    testT: '+a:192.0.2.127:86400::\n',
-  },
-  {
-    ...defaults,
-    owner: '*.example.com.',
-    testB: '*.example.com.\t3600\tIN\tA\t192.0.2.127\n',
-    testT: '+*.example.com:192.0.2.127:3600::\n',
-  },
-]
-
-const invalidRecords = [
-  { ...defaults, owner: '', msg: /RFC/ },
-  { ...defaults, owner: 'something*', msg: /fully/ },
-  { ...defaults, owner: 'some*thing', msg: /fully/ },
-  { ...defaults, owner: '*something', msg: /fully/ },
-  { ...defaults, owner: 'something.*', msg: /fully/ },
-  { ...defaults, address: 'hosts.not.valid.here', msg: /address must be IPv4/ },
-  { ...defaults, address: '', msg: /address is required/ },
-  { ...defaults, address: undefined, msg: /address is required/ },
-  { ...defaults, address: '1.x.2.3', msg: /address must be IPv4/ },
-  { ...defaults, address: '.1.2.3', msg: /address must be IPv4/ },
-  { ...defaults, type: '', msg: /type is required/ },
-  { ...defaults, type: undefined, msg: /type is required/ },
-  { ...defaults, ttl: '', msg: /TTL must be numeric/ },
-  { ...defaults, ttl: -299, msg: /TTL must be a 32-bit integer/ },
-  { ...defaults, ttl: 2147483648, msg: /TTL must be a 32-bit integer/ },
-]
-
-// copy invalid properties to a valid object
-for (let i = 0; i < invalidRecords.length; i++) {
-  const temp = JSON.parse(JSON.stringify(validRecords[0]))
-  Object.assign(temp, invalidRecords[i])
-  invalidRecords[i] = temp
-}
-
-describe('A record', function () {
-  base.valid(A, validRecords)
-  base.invalid(A, invalidRecords)
-
-  base.getDescription(A)
-  base.getRFCs(A, validRecords[0])
-  base.getRdataFields(A, ['address'])
-  base.getFields(A, ['address'])
-  base.getTypeId(A, 1)
-
-  base.toBind(A, validRecords)
-  base.toTinydns(A, validRecords)
-
-  base.fromBind(A, validRecords)
-  base.fromTinydns(A, validRecords)
-})

package/test/aaaa.js

@@ -1,86 +0,0 @@
-import assert from 'assert'
-
-import * as base from './base.js'
-import AAAA from '../rr/aaaa.js'
-
-const defaults = { class: 'IN', ttl: 3600, type: 'AAAA' }
-
-const validRecords = [
-  {
-    ...defaults,
-    owner: 'test.example.com.',
-    address: '2001:0db8:0020:000a:0000:0000:0000:0004',
-    testB: 'test.example.com.\t3600\tIN\tAAAA\t2001:db8:20:a::4\n',
-    testT:
-      ':test.example.com:28:\\040\\001\\015\\270\\000\\040\\000\\012\\000\\000\\000\\000\\000\\000\\000\\004:3600::\n',
-  },
-]
-
-const invalidRecords = [
-  {
-    ...defaults,
-    owner: 'test.example.com.',
-    address: '192.0.2.204',
-    msg: /address must be IPv6/,
-  },
-]
-
-describe('AAAA record', function () {
-  base.valid(AAAA, validRecords)
-  base.invalid(AAAA, invalidRecords)
-
-  base.getDescription(AAAA)
-  base.getRFCs(AAAA, validRecords[0])
-  base.getFields(AAAA, ['address'])
-  base.getTypeId(AAAA, 28)
-
-  base.toBind(AAAA, validRecords)
-  base.toTinydns(AAAA, validRecords)
-
-  base.fromBind(AAAA, validRecords)
-  base.fromTinydns(AAAA, validRecords)
-
-  for (const val of validRecords) {
-    it(`imports tinydns AAAA (generic) record (${val.owner})`, async function () {
-      const r = new AAAA({ tinyline: val.testT })
-      if (process.env.DEBUG) console.dir(r)
-      for (const f of ['owner', 'address', 'ttl']) {
-        assert.deepStrictEqual(
-          r.get(f),
-          val[f],
-          `${f}: ${r.get(f)} !== ${val[f]}`,
-        )
-      }
-    })
-  }
-
-  const tests = [
-    { e: '2001:0db8:0020:000a:0000:0000:0000:0004', c: '2001:db8:20:a::4' },
-    { e: '0000:0000:0000:0000:0000:0000:0000:0000', c: '::' },
-    { e: '0000:0000:0000:0000:0000:0000:0000:0001', c: '::1' },
-    { e: '2001:0db8:0000:0000:0000:0000:0002:0001', c: '2001:db8::2:1' },
-    { e: '2001:0db8:0000:0001:0001:0001:0001:0001', c: '2001:db8:0:1:1:1:1:1' },
-    {
-      e: '2001:0DB8:0000:0000:0008:0800:200C:417A',
-      c: '2001:DB8::8:800:200C:417A',
-    },
-  ]
-
-  describe('compress', function () {
-    const r = new AAAA(null)
-    for (const t of tests) {
-      it(`compresses IPv6 address (${t.e})`, function () {
-        assert.equal(r.compress(t.e), t.c)
-      })
-    }
-  })
-
-  describe('expand', function () {
-    const r = new AAAA(null)
-    for (const t of tests) {
-      it(`expands IPv6 address (${t.c})`, function () {
-        assert.equal(r.expand(t.c), t.e)
-      })
-    }
-  })
-})