@tradetrust-tt/dnsprove 2.12.3 → 2.13.0

package/dist/index.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "OpenAttestationDnsDidRecord", {
   }
 });
 exports.queryDns = exports.parseOpenAttestationRecord = exports.parseDocumentStoreResults = exports.parseDnsDidResults = exports.getDocumentStoreRecords = exports.getDnsDidRecords = exports.defaultDnsResolvers = void 0;
-var _axios = _interopRequireDefault(require("axios"));
+var _index = _interopRequireDefault(require("../node_modules/axios/index"));
 var _dnsTxt = require("./records/dnsTxt");
 var _dnsDid = require("./records/dnsDid");
 var _logger = require("./util/logger");
@@ -39,7 +39,7 @@ const _getLogger = (0, _logger.getLogger)("index"),
   trace = _getLogger.trace;
 const defaultDnsResolvers = exports.defaultDnsResolvers = [( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* (domain) {
-    const _yield$axios = yield (0, _axios.default)({
+    const _yield$axios = yield (0, _index.default)({
         method: "GET",
         url: `https://dns.google/resolve?name=${domain}&type=TXT`
       }),
@@ -51,7 +51,7 @@ const defaultDnsResolvers = exports.defaultDnsResolvers = [( /*#__PURE__*/functi
   };
 }()), ( /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(function* (domain) {
-    const _yield$axios2 = yield (0, _axios.default)({
+    const _yield$axios2 = yield (0, _index.default)({
         method: "GET",
         url: `https://cloudflare-dns.com/dns-query?name=${domain}&type=TXT`,
         headers: {
@@ -113,6 +113,9 @@ const queryDns = exports.queryDns = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(function* (domain, customDnsResolvers) {
     let data;
     let i = 0;
+    if (domain.includes("://")) {
+      domain = domain.replace(/(^\w+:|^)\/\//, "");
+    }
     while (!data && i < customDnsResolvers.length) {
       try {
         const customDnsResolver = customDnsResolvers[i];

package/dist/records/dnsTxt.js

@@ -29,6 +29,8 @@ let EthereumNetworks = exports.EthereumNetworks = void 0;
   EthereumNetworks["xdcapothem"] = "51";
   EthereumNetworks["stabilityTestnet"] = "20180427";
   EthereumNetworks["stability"] = "101010";
+  EthereumNetworks["hedera"] = "295";
+  EthereumNetworks["hederatestnet"] = "296";
 })(EthereumNetworks || (exports.EthereumNetworks = EthereumNetworks = {}));
 let HederaNetworks = exports.HederaNetworks = void 0;
 (function (HederaNetworks) {
@@ -36,7 +38,7 @@ let HederaNetworks = exports.HederaNetworks = void 0;
   HederaNetworks["testnet"] = "296";
 })(HederaNetworks || (exports.HederaNetworks = HederaNetworks = {}));
 const HederaNetworkIdT = exports.HederaNetworkIdT = (0, _runtypes.Union)((0, _runtypes.Literal)(HederaNetworks.mainnet), (0, _runtypes.Literal)(HederaNetworks.testnet));
-const EthereumNetworkIdT = exports.EthereumNetworkIdT = (0, _runtypes.Union)((0, _runtypes.Literal)(EthereumNetworks.homestead), (0, _runtypes.Literal)(EthereumNetworks.ropsten), (0, _runtypes.Literal)(EthereumNetworks.rinkeby), (0, _runtypes.Literal)(EthereumNetworks.goerli), (0, _runtypes.Literal)(EthereumNetworks.sepolia), (0, _runtypes.Literal)(EthereumNetworks.polygon), (0, _runtypes.Literal)(EthereumNetworks.polygonAmoy), (0, _runtypes.Literal)(EthereumNetworks.xdc), (0, _runtypes.Literal)(EthereumNetworks.xdcapothem), (0, _runtypes.Literal)(EthereumNetworks.stabilityTestnet), (0, _runtypes.Literal)(EthereumNetworks.stability), (0, _runtypes.Literal)(EthereumNetworks.local));
+const EthereumNetworkIdT = exports.EthereumNetworkIdT = (0, _runtypes.Union)((0, _runtypes.Literal)(EthereumNetworks.homestead), (0, _runtypes.Literal)(EthereumNetworks.ropsten), (0, _runtypes.Literal)(EthereumNetworks.rinkeby), (0, _runtypes.Literal)(EthereumNetworks.goerli), (0, _runtypes.Literal)(EthereumNetworks.sepolia), (0, _runtypes.Literal)(EthereumNetworks.polygon), (0, _runtypes.Literal)(EthereumNetworks.polygonAmoy), (0, _runtypes.Literal)(EthereumNetworks.xdc), (0, _runtypes.Literal)(EthereumNetworks.xdcapothem), (0, _runtypes.Literal)(EthereumNetworks.stabilityTestnet), (0, _runtypes.Literal)(EthereumNetworks.stability), (0, _runtypes.Literal)(EthereumNetworks.local), (0, _runtypes.Literal)(EthereumNetworks.hedera), (0, _runtypes.Literal)(EthereumNetworks.hederatestnet));
 const OpenAttestationDNSTextRecordT = exports.OpenAttestationDNSTextRecordT = (0, _runtypes.Union)((0, _runtypes.Record)({
   type: RecordTypesT,
   net: (0, _runtypes.Literal)("ethereum"),

package/dist/ts/records/dnsTxt.d.ts

@@ -15,18 +15,20 @@ export declare enum EthereumNetworks {
     xdc = "50",
     xdcapothem = "51",
     stabilityTestnet = "20180427",
-    stability = "101010"
+    stability = "101010",
+    hedera = "295",
+    hederatestnet = "296"
 }
 export declare enum HederaNetworks {
     mainnet = "295",
     testnet = "296"
 }
 export declare const HederaNetworkIdT: Union<[Literal<HederaNetworks.mainnet>, Literal<HederaNetworks.testnet>]>;
-export declare const EthereumNetworkIdT: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>]>;
+export declare const EthereumNetworkIdT: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>, Literal<EthereumNetworks.hedera>, Literal<EthereumNetworks.hederatestnet>]>;
 export declare const OpenAttestationDNSTextRecordT: Union<[import("runtypes").Intersect<[Record<{
     type: Literal<"openatts">;
     net: Literal<"ethereum">;
-    netId: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>]>;
+    netId: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>, Literal<EthereumNetworks.hedera>, Literal<EthereumNetworks.hederatestnet>]>;
     addr: import("runtypes").Constraint<String, string, unknown>;
 }, false>, Partial<{
     dnssec: Boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradetrust-tt/dnsprove",
-  "version": "2.12.3",
+  "version": "2.13.0",
   "description": "Helper utility for retrieving OpenAttestations document store address records from DNS",
   "license": "Apache-2.0",
   "repository": {
@@ -45,7 +45,7 @@
     "generator-nod"
   ],
   "dependencies": {
-    "axios": "0.21.1",
+    "axios": "1.7.2",
     "debug": "^4.3.1",
     "runtypes": "^6.3.0"
   },

package/src/index.test.ts

@@ -172,15 +172,41 @@ describe("queryDns", () => {
   let server: SetupServerApi;
 
   const sampleResponse = {
-    AD: false,
+    Status: 0,
+    TC: false,
+    RD: true,
+    RA: true,
+    AD: true,
+    CD: false,
+    Question: [{ name: "donotuse.openattestation.com.", type: 16 }],
     Answer: [
       {
-        name: "google.com",
+        name: "donotuse.openattestation.com.",
         type: 16,
-        TTL: 3529,
-        data: '"docusign=1b0a6754-49b1-4db5-8540-d2c12664b289"',
+        TTL: 300,
+        data: "openatts a=dns-did; p=did:ethr:0xE712878f6E8d5d4F9e87E10DA604F9cB564C9a89#controller; v=1.0;",
+      },
+      {
+        name: "donotuse.openattestation.com.",
+        type: 16,
+        TTL: 300,
+        data:
+          "openatts DO NOT ADD ANY RECORDS BEYOND THIS AS THIS DOMAIN IS USED FOR DNSPROVE NPM LIBRARY INTEGRATION TESTS",
+      },
+      {
+        name: "donotuse.openattestation.com.",
+        type: 16,
+        TTL: 300,
+        data: "openatts fooooooobarrrrrrrrr this entry exists to ensure validation works",
+      },
+      {
+        name: "donotuse.openattestation.com.",
+        type: 16,
+        TTL: 300,
+        data: "openatts net=ethereum netId=3 addr=0x2f60375e8144e16Adf1979936301D8341D58C36C",
       },
     ],
+    Comment: "Response from 205.251.199.177.",
   };
 
   const testDnsResolvers: CustomDnsResolver[] = [
@@ -216,8 +242,9 @@ describe("queryDns", () => {
     server = setupServer(...handlers);
     server.listen();
 
-    const records = await queryDns("https://google.com", testDnsResolvers);
-    expect(sampleResponse).toStrictEqual(records);
+    const records = await queryDns("https://donotuse.openattestation.com", testDnsResolvers);
+    const sortedAnswer = records?.Answer.sort((a, b) => a.data.localeCompare(b.data));
+    expect(sortedAnswer).toStrictEqual(sampleResponse.Answer);
   });
 
   test("Should fallback to second dns when first dns is down", async () => {
@@ -232,9 +259,10 @@ describe("queryDns", () => {
     server = setupServer(...handlers);
     server.listen();
 
-    const records = await queryDns("https://google.com", testDnsResolvers);
+    const records = await queryDns("https://donotuse.openattestation.com", testDnsResolvers);
 
-    expect(sampleResponse).toStrictEqual(records);
+    const sortedAnswer = records?.Answer.sort((a, b) => a.data.localeCompare(b.data));
+    expect(sortedAnswer).toStrictEqual(sampleResponse.Answer);
   });
 
   test("Should throw error when all dns provided are down", async () => {
@@ -249,7 +277,7 @@ describe("queryDns", () => {
     server = setupServer(...handlers);
     server.listen();
     try {
-      await queryDns("https://google.com", testDnsResolvers);
+      await queryDns("https://donotuse.openattestation.com", testDnsResolvers);
     } catch (e: any) {
       expect(e.code).toStrictEqual(DnsproveStatusCode.IDNS_QUERY_ERROR_GENERAL);
     }
@@ -261,35 +289,42 @@ describe("getDocumentStoreRecords for Hedera", () => {
     {
       type: "openatts",
       net: "hedera",
-      netId: "296",
+      netId: "295",
+      addr: "0x222B69788e2e9B7FB93a3a0fE258D4604Dc7df21",
       dnssec: false,
-      addr: "0x3DE43bfd3D771931E46CbBd4EDE0D3d95C85f81A",
     },
     {
+      type: "openatts",
+      net: "hedera",
+      netId: "296",
       addr: "0x222B69788e2e9B7FB93a3a0fE258D4604Dc7df21",
       dnssec: false,
-      net: "hedera",
-      netId: "295",
-      type: "openatts",
     },
     {
-      addr: "0xB9cf2eFcBeCdF96E6A7E46AECd79A784B41Bcf6B",
-      dnssec: false,
+      type: "openatts",
       net: "hedera",
       netId: "296",
-      type: "openatts",
+      addr: "0x3DE43bfd3D771931E46CbBd4EDE0D3d95C85f81A",
+      dnssec: false,
     },
     {
-      addr: "0x222B69788e2e9B7FB93a3a0fE258D4604Dc7df21",
-      dnssec: false,
+      type: "openatts",
       net: "hedera",
       netId: "296",
-      type: "openatts",
+      addr: "0xB9cf2eFcBeCdF96E6A7E46AECd79A784B41Bcf6B",
+      dnssec: false,
     },
   ];
 
   test("it should work with trustlv.org", async () => {
-    const records = await getDocumentStoreRecords("trustlv.org");
+    const records = (await getDocumentStoreRecords("trustlv.org")).sort((a, b) => {
+      if (a.netId < b.netId) return -1;
+      if (a.netId > b.netId) return 1;
+      if (a.addr < b.addr) return -1;
+      if (a.addr > b.addr) return 1;
+      return 0;
+    });
+
     expect(records).toStrictEqual(sampleDnsTextRecord);
   });
 });

package/src/index.ts

@@ -1,4 +1,4 @@
-import axios from "axios";
+import axios from "../node_modules/axios/index";
 import { OpenAttestationDNSTextRecord, OpenAttestationDNSTextRecordT } from "./records/dnsTxt";
 import { OpenAttestationDnsDidRecord, OpenAttestationDnsDidRecordT } from "./records/dnsDid";
 import { getLogger } from "./util/logger";
@@ -85,6 +85,10 @@ export const queryDns = async (domain: string, customDnsResolvers: CustomDnsReso
 
   let i = 0;
 
+  if (domain.includes("://")) {
+    domain = domain.replace(/(^\w+:|^)\/\//, "");
+  }
+
   while (!data && i < customDnsResolvers.length) {
     try {
       const customDnsResolver = customDnsResolvers[i];

package/src/records/dnsTxt.ts

@@ -26,6 +26,8 @@ export enum EthereumNetworks {
   xdcapothem = "51",
   stabilityTestnet = "20180427",
   stability = "101010",
+  hedera = "295",
+  hederatestnet = "296",
 }
 
 export enum HederaNetworks {
@@ -46,7 +48,9 @@ export const EthereumNetworkIdT = Union(
   Literal(EthereumNetworks.xdcapothem),
   Literal(EthereumNetworks.stabilityTestnet),
   Literal(EthereumNetworks.stability),
-  Literal(EthereumNetworks.local)
+  Literal(EthereumNetworks.local),
+  Literal(EthereumNetworks.hedera),
+  Literal(EthereumNetworks.hederatestnet)
 );
 
 export const OpenAttestationDNSTextRecordT = Union(