core-3nweb-client-lib 0.53.2 → 0.53.3

package/build/core/startup/sign-up.js

@@ -79,7 +79,7 @@ class SignUp {
     }
     async setServiceURL(serviceURL) {
         const url = new URL(serviceURL);
-        if (url.protocol !== 'https:') {
+        if ((url.protocol !== 'https:') && !url.hostname.endsWith('.onion')) {
             throw new Error("Url protocol must be https.");
         }
         this.serviceURL = serviceURL;

package/build/lib-client/networks.js

@@ -283,10 +283,12 @@ function checkAndPrepareURLfromDNS(value, address) {
 const wellKnownPath = '/.well-known/3nweb.json';
 async function locateInWellKnown(request, address, serviceLabel) {
     const host = domainOfAddress(address);
+    const protocol = (host.endsWith('.onion') ? 'http' : 'https');
     try {
         const reply = await request({
             method: 'GET',
-            url: `https://${host}${wellKnownPath}`
+            url: `${protocol}://${host}${wellKnownPath}`,
+            responseType: 'json'
         });
         if (reply.status === 200) {
             const recValue = reply.data[serviceLabel];

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

@@ -33,7 +33,7 @@ async function checkServicesStartingFromSignup(srvLocator, client, signupUrl, si
     }
     async function checkService(service, userDomain) {
         progress === null || progress === void 0 ? void 0 : progress({ start: true, service, userDomain });
-        const check = await checkUserDomainDNS(srvLocator, service, userDomain);
+        const check = await checkUserDomainNames(srvLocator, service, userDomain);
         recordResult(check);
         if (check.isOk) {
             await checkFstServiceEndpoint(service, check.serviceUrl);
@@ -125,12 +125,7 @@ async function checkSignup(client, signupURL, signupToken) {
         };
     }
 }
-// const srvLocator = makeServiceLocator(
-// 	{ resolveTxt: dns.resolveTxt },
-// 	dohAt(`https://cloudflare-dns.com/dns-query`),
-// 	dohAt(`https://dns.google/resolve`)
-// );
-async function checkUserDomainDNS(srvLocator, service, domain) {
+async function checkUserDomainNames(srvLocator, service, domain) {
     try {
         const serviceUrl = await (srvLocator(service, noop))(`u@${domain}`);
         return {

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

@@ -23,7 +23,8 @@ exports.getMailerIdInfoFor = getMailerIdInfoFor;
 const jwkeys_1 = require("../lib-common/jwkeys");
 const http_1 = require("../lib-common/exceptions/http");
 async function readJSONLocatedAt(client, url) {
-    if ((new URL(url)).protocol !== 'https:') {
+    const u = new URL(url);
+    if (u.protocol !== 'https:' && !u.hostname.endsWith('.onion')) {
         throw new Error("Url protocol must be https.");
     }
     const rep = await client.doBodylessRequest({

package/build/lib-common-on-node/request-from-node.js

@@ -18,15 +18,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeRequestFromNode = makeRequestFromNode;
 const https = require("https");
+const http = require("http");
 const request_utils_1 = require("../lib-client/request-utils");
 function makeRequestFromNode(getAgent) {
-    const nodeRequest = (opts) => https.request(opts);
+    const nodeHttpsRequest = (opts) => https.request(opts);
+    const nodeHttpRequest = (opts) => http.request(opts);
     return (opts, reqContentType, reqBody) => {
-        const httpsOpts = (0, request_utils_1.formHttpsReqOpts)(opts, reqContentType, reqBody);
+        const reqOpts = (0, request_utils_1.formHttpsReqOpts)(opts, reqContentType, reqBody);
         const agent = getAgent === null || getAgent === void 0 ? void 0 : getAgent();
         if (agent) {
-            httpsOpts.agent = agent;
+            reqOpts.agent = agent;
         }
-        return (0, request_utils_1.processRequest)(nodeRequest, httpsOpts, opts, reqBody);
+        const requestFn = ((reqOpts.protocol === 'http:') ? nodeHttpRequest : nodeHttpsRequest);
+        return (0, request_utils_1.processRequest)(requestFn, reqOpts, opts, reqBody);
     };
 }

package/package.json

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