core-3nweb-client-lib 0.53.0 → 0.53.1

package/build/lib-client/networks.d.ts

@@ -1,7 +1,8 @@
 import { NetClient, RequestFn, OpenServiceEventsSource } from './request-utils';
 import { LogError } from './logging/log-to-file';
 export type ServiceTypeDNSLabel = 'mailerid' | 'asmail' | '3nstorage';
-export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel | 'report', logError: LogError) => ServiceLocator;
+export type DNSLabel = ServiceTypeDNSLabel | 'report' | 'w3nApp';
+export type ServiceLocatorMaker = (serviceLabel: DNSLabel, logError: LogError) => ServiceLocator;
 export type ServiceLocator = (address: string) => Promise<string>;
 export interface DnsResolver {
     resolveTxt: (hostname: string) => Promise<string[][]>;

package/build/lib-client/networks.js

@@ -34,10 +34,6 @@ function domainOfAddress(address) {
         return address.substring(indOfAt + 1);
     }
 }
-function checkAndPrepareURL(value) {
-    // XXX insert some value sanity check
-    return 'https://' + value;
-}
 function domainNotFoundExc(address, cause) {
     return (0, runtime_1.makeRuntimeException)('service-locating', { address, cause }, { domainNotFound: true });
 }
@@ -94,7 +90,8 @@ const recordsStarts = {
     "3nstorage": '3nstorage=',
     asmail: 'asmail=',
     mailerid: 'mailerid=',
-    report: 'report='
+    report: 'report=',
+    w3nApp: 'w3n-app='
 };
 function getRecordAtStartOf(txt) {
     let service = undefined;
@@ -147,23 +144,6 @@ exports.TIMEOUT = "ETIMEOUT";
 // export const LOADIPHLPAPI = "ELOADIPHLPAPI";
 // export const ADDRGETNETWORKPARAMS = "EADDRGETNETWORKPARAMS";
 // export const CANCELLED = "ECANCELLED";
-// XXX
-//  - service exist in network.
-//  - we go from name to address to service location in a network, and a request function ?
-//    Or, should we assume that request function will engage with proper network, based on location,
-//    implying that location string should always map to one network: regular | tor | i2p.
-//    Implicit rule allows us not to force making request fn here, as well as naming system in one net,
-//    pointing to another. bank.xyz can be served by server <key>.onion, and vice versa.
-//
-//  - this function, ... doesn't have to change, as DnsResolver is given. May be  we should make a more
-//    general wrap, that gonna use this for DNS in regular net?
-//  - and, we may probably want to make function here as a reusable wrapper around different network request fns.
-//    Regular net request, may internally switch into proxy/hidding modes. Other networks provide anonymity,
-//    hence, these additional options should stay "inside" regular network request fn.
-//
-//  - should we have a reusable wrapper creator here, creating coherent pair of naming and request functions.
-//    Cause, if embedding doesn't have explicit implementation for Tor, both initial naming and net-maker functions
-//    should be coherent.
 const onionTLD = '.onion';
 const i2pTLD = '.i2p';
 function makeMissingImplementationException(networkType, location) {
@@ -269,12 +249,7 @@ function makeServiceLocatorInDNS(...resolvers) {
             }
             const recValue = extractPair(txtRecords, serviceLabel);
             if (recValue) {
-                if (serviceLabel === 'report') {
-                    return recValue;
-                }
-                else {
-                    return checkAndPrepareURL(recValue);
-                }
+                return postProcessValue(serviceLabel, recValue);
             }
             else {
                 exc !== null && exc !== void 0 ? exc : (exc = noServiceRecordExc(address));
@@ -284,6 +259,18 @@ function makeServiceLocatorInDNS(...resolvers) {
     }
     return locateInDNS;
 }
+function postProcessValue(serviceLabel, recordValue) {
+    switch (serviceLabel) {
+        case 'report':
+            return recordValue;
+        default:
+            return checkAndPrepareURL(recordValue);
+    }
+}
+function checkAndPrepareURL(value) {
+    // XXX insert some value sanity check
+    return 'https://' + value;
+}
 const wellKnownPath = '/.well-known/3nweb.json';
 async function locateInWellKnown(request, address, serviceLabel) {
     const host = domainOfAddress(address);
@@ -295,12 +282,7 @@ async function locateInWellKnown(request, address, serviceLabel) {
         if (reply.status === 200) {
             const recValue = reply.data[serviceLabel];
             if (recValue) {
-                if (serviceLabel === 'report') {
-                    return recValue;
-                }
-                else {
-                    return checkAndPrepareURL(recValue);
-                }
+                return postProcessValue(serviceLabel, recValue);
             }
             else {
                 throw noServiceRecordExc(address);

package/build/tests/libs-for-tests/core-runner.js

@@ -63,6 +63,7 @@ exports.testApp = {
 let numOfRunningCores = 0;
 const DATA_FOLDER = (0, path_1.join)(__dirname, '..', '..', '..', 'test-data');
 function resolveTxt(domain) {
+    // used non-promise dns method mocked for test data, hence, we use it here
     return new Promise((resolve, reject) => (0, dns_1.resolveTxt)(domain, (err, records) => {
         if (err) {
             reject(err);

package/package.json

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