core-3nweb-client-lib 0.30.1 → 0.30.3

package/build/lib-client/objs-on-disk/obj-folders.js

@@ -88,8 +88,12 @@ class ObjFolders {
                 throw new Error(`Missing a can-move predicate when generations are present`);
             }
             this.generationsFolder = (0, path_1.join)(this.path, GENERATIONS_DIR);
-            this.rotationsProc = new RotationsProc(this.accessFolder, this.generationsFolder, this.generations, this.syncProcs, canMove, this.saveCfg, this.logError);
-            this.rotationsProc.scheduleStart(10 * 60);
+            // XXX rotation process is disabled, till its error is fixed
+            // this.rotationsProc = new RotationsProc(
+            // 	this.accessFolder, this.generationsFolder,
+            // 	this.generations, this.syncProcs, canMove, this.saveCfg,
+            // 	this.logError);
+            // this.rotationsProc.scheduleStart(10*60);
         }
         Object.freeze(this);
     }

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

@@ -172,19 +172,57 @@ function noServiceRecordExc(address) {
  */
 function extractPair(txtRecords, serviceLabel) {
     for (const txtRecord of txtRecords) {
-        const txt = txtRecord.join(' ');
-        const eqPos = txt.indexOf('=');
-        if (eqPos < 0) {
-            continue;
-        }
-        const name = txt.substring(0, eqPos).trim();
-        if (name === serviceLabel) {
-            const value = txt.substring(eqPos + 1).trim();
-            return value;
+        let joinedTXTstanzas = txtRecord.join('');
+        let record = getRecordAtStartOf(joinedTXTstanzas);
+        while (record) {
+            if (record.service === serviceLabel) {
+                const value = record.value.trim();
+                if (value.length > 0) {
+                    return value;
+                }
+            }
+            if (record.txtTail) {
+                record = getRecordAtStartOf(record.txtTail);
+            }
+            else {
+                break;
+            }
         }
     }
     return;
 }
+const recordsStarts = {
+    "3nstorage": '3nstorage=',
+    asmail: 'asmail=',
+    mailerid: 'mailerid='
+};
+function getRecordAtStartOf(txt) {
+    let service = undefined;
+    for (const [label, startSeq] of Object.entries(recordsStarts)) {
+        if (txt.startsWith(startSeq)) {
+            service = label;
+            txt = txt.substring(startSeq.length);
+            break;
+        }
+    }
+    if (!service) {
+        return;
+    }
+    for (const delimiter of Object.values(recordsStarts)) {
+        const endPos = txt.indexOf(delimiter);
+        if (endPos >= 0) {
+            return {
+                service,
+                value: txt.substring(0, endPos),
+                txtTail: txt.substring(endPos)
+            };
+        }
+    }
+    return {
+        service,
+        value: txt
+    };
+}
 const DNS_ERR_CODE = {
     NODATA: 'ENODATA',
     NOTFOUND: 'ENOTFOUND'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.30.1",
+  "version": "0.30.3",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -41,7 +41,7 @@
     "@types/ws": "^7.4.7",
     "jasmine": "^3.9.0",
     "protobufjs-cli": "^1.0.2",
-    "spec-3nweb-server": "^1.6.3",
+    "spec-3nweb-server": "^1.7.0",
     "tsuml2": "^0.6.1",
     "typescript": "^4.7.4"
   }