@abtnode/util 1.8.49 → 1.8.50

package/lib/base32.js

@@ -0,0 +1,14 @@
+const { fromBase58 } = require('@ocap/util');
+const { base32 } = require('multiformats/bases/base32');
+
+const encode = (did) => {
+  if (!did) {
+    return did;
+  }
+
+  const buffer = fromBase58(did);
+
+  return base32.encode(buffer);
+};
+
+module.exports = { encode };

package/lib/did-document.js

@@ -1,28 +1,24 @@
-const get = require('lodash/get');
 const stringify = require('json-stable-stringify');
 const { toBase64, toBase58 } = require('@ocap/util');
 const joinUrl = require('url-join');
 const pRetry = require('p-retry');
 const debug = require('debug')('@abtnode/util:did-document');
 const axios = require('./axios');
+const { encode: encodeBase32 } = require('./base32');
 
-const update = async ({ records, didRegistryUrl, wallet }) => {
+const getDID = (address) => `did:abt:${address}`;
+
+const update = async ({ services, didRegistryUrl, wallet }) => {
   debug('update did document', { didRegistryUrl });
 
-  const did = `did:abt:${wallet.address}`;
+  const did = getDID(wallet.address);
   const time = new Date().toISOString();
 
   const document = {
     '@context': 'https://www.w3.org/ns/did/v1',
     id: did,
     controller: did,
-    service: [
-      {
-        id: `${did}#dns`,
-        type: 'DNSRecords',
-        records,
-      },
-    ],
+    service: services,
     verificationMethod: [
       {
         id: `${did}#key-1`,
@@ -50,30 +46,66 @@ const update = async ({ records, didRegistryUrl, wallet }) => {
 
 const updateWithRetry = async (...args) => pRetry(() => update(...args), { retries: 3 });
 
-const updateDaemon = async ({ ips, wallet, didRegistryUrl, domain }) => {
-  try {
-    const filteredIps = (ips || []).filter(Boolean);
-    if (filteredIps.length === 0) {
-      return {
-        status: 'warn',
-        message: 'No DID Document to update',
-      };
-    }
-
-    const records = filteredIps.map((ip) => {
-      return {
-        type: 'A',
-        rr: wallet.address.toLowerCase(),
-        value: ip,
-        domain,
-      };
-    });
-
-    await updateWithRetry({ records, didRegistryUrl, wallet });
-    return { status: 'success' };
-  } catch (err) {
-    return { status: 'error', message: get(err, 'response.data') || err.message };
+const getServerServices = ({ ips, wallet, domain }) => {
+  const records = ips.map((ip) => ({
+    type: 'A',
+    rr: encodeBase32(wallet.address),
+    value: ip,
+    domain,
+  }));
+
+  const services = [
+    {
+      id: getDID(wallet.address),
+      type: 'DNSRecords',
+      records,
+    },
+  ];
+
+  return services;
+};
+
+const getBlockletServices = ({ blockletAppDid, daemonDidDomain, domain }) => {
+  return [
+    {
+      id: getDID(blockletAppDid),
+      type: 'DNSRecords',
+      records: [
+        {
+          type: 'CNAME',
+          rr: encodeBase32(blockletAppDid),
+          value: daemonDidDomain,
+          domain,
+        },
+      ],
+    },
+  ];
+};
+
+const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain }) => {
+  const filteredIps = (ips || []).filter(Boolean);
+  if (filteredIps.length === 0) {
+    throw new Error('No DID Document to update');
   }
+
+  const services = getServerServices({ ips: filteredIps, domain, wallet });
+
+  return updateWithRetry({ services, didRegistryUrl, wallet });
+};
+
+const updateBlockletDocument = async ({ wallet, didRegistryUrl, domain, daemonDidDomain, blockletAppDid }) => {
+  const services = getBlockletServices({ blockletAppDid, daemonDidDomain, domain });
+
+  return updateWithRetry({ services, didRegistryUrl, wallet });
 };
 
-module.exports = { updateDaemon };
+const disableDNS = async ({ wallet, didRegistryUrl }) => updateWithRetry({ services: [], didRegistryUrl, wallet });
+
+module.exports = {
+  updateServerDocument,
+  updateBlockletDocument,
+  disableDNS,
+  getDID,
+  getServerServices,
+  getBlockletServices,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.49",
+  "version": "1.8.50",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,10 +18,10 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.49",
-    "@abtnode/logger": "1.8.49",
+    "@abtnode/constant": "1.8.50",
+    "@abtnode/logger": "1.8.50",
     "@arcblock/jwt": "^1.18.32",
-    "@blocklet/constant": "1.8.49",
+    "@blocklet/constant": "1.8.50",
     "@ocap/mcrypto": "1.18.32",
     "@ocap/util": "1.18.32",
     "@ocap/wallet": "1.18.32",
@@ -41,6 +41,7 @@
     "is-docker": "^2.2.1",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
+    "multiformats": "9.9.0",
     "p-retry": "4.6.1",
     "parallel-transform": "^1.2.0",
     "public-ip": "^4.0.4",
@@ -63,5 +64,5 @@
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "627ac4fb21957fcbaf7c2c21e77de0f51ef9e30d"
+  "gitHead": "7f3ccb957659a6791b93b6fc4fbcbbd2c42f1efd"
 }