spec-3nweb-server 1.8.9 → 1.8.11

package/.gitlab-ci-linux.yml

@@ -6,7 +6,7 @@
 build for linux:
   extends: build
   rules: [ { when: on_success } ]
-  image: node-22
+  image: node-24
 
 
 test on linux:
@@ -14,7 +14,7 @@ test on linux:
   rules: [ { when: on_success } ]
   needs:
     - build for linux
-  image: node-22
+  image: node-24
 
 
 pack for linux:
@@ -23,7 +23,7 @@ pack for linux:
   needs:
     - build for linux
     - test on linux
-  image: node-22
+  image: node-24
 
 
 pack mock for linux:
@@ -32,7 +32,7 @@ pack mock for linux:
   needs:
     - build for linux
     - test on linux
-  image: node-22
+  image: node-24
 
 
 # pack deb:
@@ -41,7 +41,7 @@ pack mock for linux:
 #   needs:
 #     - build for linux
 #     - test on linux
-#   image: node-16
+#   image: node-24
 #   script:
 #     - npm run pack-deb
 #   artifacts:

package/.gitlab-ci.yml

@@ -52,7 +52,7 @@ publish to npm:
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
       when: manual
-  image: node-22
+  image: node-24
   script:
     - bash publish-task.sh $NPM_PUBLISH_TOKEN
 

package/build/config/from-yaml.js

@@ -23,7 +23,7 @@ const default_confs_1 = require("./default-confs");
 function readYamlConfFile(path) {
     const txt = (0, fs_1.readFileSync)(path, 'utf8');
     const conf = yaml.load(txt);
-    if (conf.rootFolder) {
+    if (!conf.rootFolder) {
         conf.rootFolder = default_confs_1.DEFAULT_DATA_ROOT_PATH;
     }
     return conf;

package/build/lib-common/canonical-address.js

@@ -17,7 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAndTransformAddress = exports.areAddressesEqual = exports.toCanonicalAddress = void 0;
-const punycode_1 = require("punycode");
+const punycode_1 = require("punycode/");
 /**
  * @param address
  * @return a canonical form of a given address.

package/build/main.js

@@ -24,6 +24,7 @@ const lib_1 = require("./lib");
 const signup_1 = require("./config/signup");
 const default_confs_1 = require("./config/default-confs");
 const file_1 = require("./lib-common/exceptions/file");
+const qrcode = require("qrcode-terminal");
 async function run(conf) {
     if (!conf.servicesConnect) {
         console.error(`❌ No connection settings found in configuration.`);
@@ -142,6 +143,7 @@ async function displaySignupInfo(conf) {
             const signupLink = signupLinkFrom(conf, undefined);
             if (signupLink) {
                 console.log(`Signup link:\n`, signupLink, `\n`);
+                displayAsQR(signupLink);
             }
         }
         else {
@@ -155,6 +157,10 @@ async function displaySignupInfo(conf) {
     console.log(`There are ${multiUserTokens.length} multi-user tokens.\n`);
     console.log(`There are ${singleUserTokens.length} single-user tokens.\n`);
 }
+function displayAsQR(str) {
+    qrcode.setErrorLevel('Q');
+    qrcode.generate(str, { small: true });
+}
 async function displayTokensList(conf) {
     const { multiUserTokens, singleUserTokens } = await (0, signup_1.readAllSignupTokens)(conf.rootFolder);
     if (multiUserTokens.length > 0) {
@@ -181,10 +187,6 @@ async function displayTokensList(conf) {
 async function displayTokenValue(conf, tokenId) {
     const ctx = await (0, signup_1.readTokenFile)(conf.rootFolder, tokenId);
     if (ctx) {
-        const signupLink = signupLinkFrom(conf, ctx.token);
-        if (signupLink) {
-            console.log(`\nSignup link:\n  ${signupLink}`);
-        }
         if (ctx.type === 'multi-domain') {
             console.log(`\nMulti-user signup context:`);
             console.log(`  domains:`, ctx.domains);
@@ -201,6 +203,11 @@ async function displayTokenValue(conf, tokenId) {
                 console.log(`  valid till: ${(new Date(ctx.validTill)).toString()}`);
             }
         }
+        const signupLink = signupLinkFrom(conf, ctx.token);
+        if (signupLink) {
+            console.log(`\nSignup link:\n  ${signupLink}`);
+            displayAsQR(signupLink);
+        }
         console.log(``);
     }
     else {
@@ -241,6 +248,12 @@ async function createSingleUserToken(conf, userId) {
     console.log(``);
 }
 const cmd = (0, cli_1.parseProcessArgv)();
+process.on('unhandledRejection', (err, p) => {
+    console.error(' -- Unhandled rejection of promise:', err);
+});
+process.on('uncaughtException', err => {
+    console.error(' -- Unhandled exception:', err);
+});
 if (cmd.runCmd) {
     const conf = assembleConfig(cmd.runCmd.config);
     run(conf);

package/build/mock/run-in-proc.js

@@ -34,13 +34,15 @@ function setTestCertsAndDNS(domains, thisSrvLoc) {
     https.globalAgent.options.ca = tls_options_1.sslOpts.cert;
     // inject dns mock
     const dnsRecs = {};
+    const reportAddress = `report@${thisSrvLoc.includes(':') ? thisSrvLoc.substring(0, thisSrvLoc.indexOf(':')) : thisSrvLoc}`;
     for (const domain of domains) {
         dnsRecs[domain] = [
             ['asmail', '=', `${thisSrvLoc}/asmail`],
             [
                 'mailerid=', `${thisSrvLoc}/mailerid`,
                 `3nstorage=${thisSrvLoc}/3nstorage`
-            ] // two 3NWeb records in one DNS TXT record
+            ],
+            [`report=${reportAddress}`]
             // XXX add other life-like records
         ];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.8.9",
+  "version": "1.8.11",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",
@@ -41,7 +41,8 @@
     "express": "^4.22.2",
     "js-yaml": "^4.3.0",
     "prompts": "^2.4.2",
-    "punycode": "^2.1.1",
+    "punycode": "^2.3.1",
+    "qrcode-terminal": "^0.12.0",
     "ws": "^7.5.11",
     "xsp-files": "^2.0.0"
   },
@@ -49,6 +50,7 @@
     "@types/express": "4.17.13",
     "@types/jasmine": "^3.9.1",
     "@types/node": "^16.11.7",
+    "@types/punycode": "^2.1.4",
     "@types/ws": "^4.0.0",
     "jasmine": "^3.9.0",
     "rxjs": "^5.3.0",

package/ts-code/config/from-yaml.ts

@@ -24,7 +24,7 @@ export function readYamlConfFile(path: string): Configurations {
 	const txt = readFileSync(path, 'utf8');
 	const conf = yaml.load(txt) as Configurations;
 
-	if (conf.rootFolder) {
+	if (!conf.rootFolder) {
 		conf.rootFolder = DEFAULT_DATA_ROOT_PATH;
 	}
 

package/ts-code/lib-common/canonical-address.ts

@@ -15,7 +15,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { toASCII } from 'punycode';
+import { toASCII } from 'punycode/';
 
 /**
  * @param address

package/ts-code/main.ts

@@ -29,6 +29,7 @@ import { Configurations, servicesApp, accountsApp, AppWithWSs } from './lib';
 import { addMultiDomainSignup, addSingleUserSignup, readAllSignupTokens, readNoTokensFile, readTokenFile } from './config/signup';
 import { DEFAULT_CONFIG_PATH } from './config/default-confs';
 import { Code } from './lib-common/exceptions/file';
+import * as qrcode from 'qrcode-terminal';
 
 async function run(conf: Configurations): Promise<void> {
 
@@ -159,6 +160,7 @@ async function displaySignupInfo(conf: Configurations): Promise<void> {
 			const signupLink = signupLinkFrom(conf, undefined);
 			if (signupLink) {
 				console.log(`Signup link:\n`, signupLink, `\n`);
+				displayAsQR(signupLink);
 			}
 		} else {
 			console.log(`Signup of users is allowed only with valid signup tokens.\n`);
@@ -174,6 +176,11 @@ async function displaySignupInfo(conf: Configurations): Promise<void> {
 	console.log(`There are ${singleUserTokens.length} single-user tokens.\n`);
 }
 
+function displayAsQR(str: string): void {
+	qrcode.setErrorLevel('Q');
+	qrcode.generate(str, { small: true });
+}
+
 async function displayTokensList(conf: Configurations): Promise<void> {
 	const {
 		multiUserTokens, singleUserTokens
@@ -203,10 +210,6 @@ async function displayTokenValue(
 ): Promise<void> {
 	const ctx = await readTokenFile(conf.rootFolder, tokenId);
 	if (ctx) {
-		const signupLink = signupLinkFrom(conf, ctx.token);
-		if (signupLink) {
-			console.log(`\nSignup link:\n  ${signupLink}`);
-		}
 		if (ctx.type === 'multi-domain') {
 			console.log(`\nMulti-user signup context:`);
 			console.log(`  domains:`, ctx.domains);
@@ -222,6 +225,11 @@ async function displayTokenValue(
 				console.log(`  valid till: ${(new Date(ctx.validTill)).toString()}`);
 			}
 		}
+		const signupLink = signupLinkFrom(conf, ctx.token);
+		if (signupLink) {
+			console.log(`\nSignup link:\n  ${signupLink}`);
+			displayAsQR(signupLink);
+		}
 		console.log(``);
 	} else {
 		console.error(`Token ${tokenId} is not found.`);
@@ -269,6 +277,13 @@ async function createSingleUserToken(
 
 const cmd = parseProcessArgv();
 
+process.on('unhandledRejection', (err, p) => {
+	console.error(' -- Unhandled rejection of promise:', err);
+});
+process.on('uncaughtException', err => {
+	console.error(' -- Unhandled exception:', err);
+});
+
 if (cmd.runCmd) {
 	const conf = assembleConfig(cmd.runCmd.config!);
 	run(conf);

package/ts-code/mock/run-in-proc.ts

@@ -37,13 +37,17 @@ export function setTestCertsAndDNS(
 
 	// inject dns mock
 	const dnsRecs: DnsTxtRecords = {};
+	const reportAddress = `report@${
+		thisSrvLoc.includes(':') ? thisSrvLoc.substring(0, thisSrvLoc.indexOf(':')) : thisSrvLoc
+	}`;
 	for (const domain of domains) {
 		dnsRecs[domain] = [
 			[ 'asmail', '=', `${thisSrvLoc}/asmail` ],	// one record in DNS TXT
 			[
 				'mailerid=', `${thisSrvLoc}/mailerid`,
 				`3nstorage=${thisSrvLoc}/3nstorage`
-			]	// two 3NWeb records in one DNS TXT record
+			],	// two 3NWeb records in one DNS TXT record
+			[ `report=${reportAddress}` ]
 			// XXX add other life-like records
 		];
 	}