core-3nweb-client-lib 0.50.0 → 0.50.1

package/build/lib-client/service-locator.js

@@ -247,42 +247,42 @@ function makeServiceLocator(...resolvers) {
     }
     return (serviceLabel, logError) => async (address) => {
         const domain = domainOfAddress(address);
-        let prevConnectionExc = undefined;
+        let exc = undefined;
+        let connectionExc = undefined;
         for (let i = 0; i < resolvers.length; i += 1) {
             const resolver = resolvers[i];
+            let txtRecords;
             try {
-                const txtRecords = await resolver.resolveTxt(domain);
-                const recValue = extractPair(txtRecords, serviceLabel);
-                if (!recValue) {
-                    throw noServiceRecordExc(address);
-                }
-                const url = checkAndPrepareURL(recValue);
-                return url;
+                txtRecords = await resolver.resolveTxt(domain);
             }
             catch (err) {
                 await logError(err, `Resolver ${i + 1} fails to get TXT records of ${domain}`);
                 const { code, hostname, message } = err;
                 if (code === exports.NODATA) {
-                    throw noServiceRecordExc(address);
+                    exc = noServiceRecordExc(address);
                 }
                 else if ((code === exports.SERVFAIL)
                     || (code === exports.CONNREFUSED)
                     || (code === exports.TIMEOUT)) {
-                    if (!prevConnectionExc) {
-                        prevConnectionExc = noConnectionExc({ code, hostname, message });
-                    }
+                    connectionExc !== null && connectionExc !== void 0 ? connectionExc : (connectionExc = noConnectionExc({ code, hostname, message }));
                 }
                 else if ((code === exports.NOTFOUND) || hostname) {
-                    throw domainNotFoundExc(address, { code, hostname, message });
+                    exc !== null && exc !== void 0 ? exc : (exc = domainNotFoundExc(address, { code, hostname, message }));
                 }
                 else {
-                    if (!prevConnectionExc) {
-                        prevConnectionExc = err;
-                    }
+                    exc !== null && exc !== void 0 ? exc : (exc = err);
                 }
+                continue;
+            }
+            const recValue = extractPair(txtRecords, serviceLabel);
+            if (recValue) {
+                return checkAndPrepareURL(recValue);
+            }
+            else {
+                exc !== null && exc !== void 0 ? exc : (exc = noServiceRecordExc(address));
             }
         }
-        throw prevConnectionExc;
+        throw exc !== null && exc !== void 0 ? exc : connectionExc;
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",