@abtnode/util 1.16.6-beta-4562aa60 → 1.16.6-beta-eaa4d39d

package/lib/base32.js

@@ -1,4 +1,4 @@
-const { toBuffer } = require('@ocap/util');
+const { toBuffer, toAddress } = require('@ocap/util');
 const { base32 } = require('multiformats/bases/base32');
 
 const encode = (did) => {
@@ -6,7 +6,7 @@ const encode = (did) => {
     return did;
   }
 
-  const buffer = toBuffer(did);
+  const buffer = toBuffer(toAddress(did));
 
   return base32.encode(buffer);
 };

package/lib/did-document.js

@@ -1,5 +1,5 @@
 const stringify = require('json-stable-stringify');
-const { toBase64, toBase58 } = require('@ocap/util');
+const { toBase64, toBase58, toDid } = require('@ocap/util');
 const joinUrl = require('url-join');
 const pRetry = require('p-retry');
 const debug = require('debug')('@abtnode/util:did-document');
@@ -18,7 +18,7 @@ const getDID = (address) => {
   return `did:abt:${address}`;
 };
 
-const update = async ({ services, didRegistryUrl, wallet, alsoKnownAs = [] }) => {
+const update = async ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [] }) => {
   debug('update did document', { didRegistryUrl });
 
   const did = getDID(wallet.address);
@@ -26,7 +26,7 @@ const update = async ({ services, didRegistryUrl, wallet, alsoKnownAs = [] }) =>
 
   const document = {
     '@context': 'https://www.w3.org/ns/did/v1',
-    id: did,
+    id: toDid(id),
     controller: did,
     service: services,
     alsoKnownAs,
@@ -101,7 +101,7 @@ const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain }) =>
 
   const services = getServerServices({ ips: filteredIps, domain, wallet });
 
-  return updateWithRetry({ services, didRegistryUrl, wallet });
+  return updateWithRetry({ id: getDID(wallet.address), services, didRegistryUrl, wallet });
 };
 
 const updateBlockletDocument = async ({
@@ -113,15 +113,16 @@ const updateBlockletDocument = async ({
   alsoKnownAs = [],
 }) => {
   const services = getBlockletServices({ appPid, daemonDidDomain, domain });
-  return updateWithRetry({ services, didRegistryUrl, alsoKnownAs, wallet });
+  return updateWithRetry({ id: appPid, services, didRegistryUrl, alsoKnownAs, wallet });
 };
 
-const disableDNS = async ({ wallet, didRegistryUrl }) => updateWithRetry({ services: [], didRegistryUrl, wallet });
+const disableBlockletDNS = async ({ appPid, wallet, didRegistryUrl }) =>
+  updateWithRetry({ id: appPid, services: [], didRegistryUrl, wallet });
 
 module.exports = {
   updateServerDocument,
   updateBlockletDocument,
-  disableDNS,
+  disableBlockletDNS,
   getDID,
   getServerServices,
   getBlockletServices,

package/lib/list-npm-package-version.js

@@ -1,5 +1,6 @@
 const semverClean = require('to-semver');
 const semverSort = require('semver-sort');
+const sortBy = require('lodash/sortBy');
 const axios = require('./axios');
 
 module.exports = async (name, { includePrereleases = false, limit = 10 } = {}) => {
@@ -16,5 +17,5 @@ module.exports = async (name, { includePrereleases = false, limit = 10 } = {}) =
     .map((version) => ({ version, publishedAt: time[version] }))
     .slice(0, limit);
 
-  return result;
+  return sortBy(result, 'publishedAt').reverse();
 };

package/lib/run-script.js

@@ -86,6 +86,7 @@ const runScript = (script, label, options = {}) => {
 
     child = spawn(command, args, {
       timeout: 2 * 60 * 1000,
+      windowsHide: true, // required for Windows
       detached: false,
       shell: false,
       stdio: ['ignore', 'pipe', 'pipe'],

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-4562aa60",
+  "version": "1.16.6-beta-eaa4d39d",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,14 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.6-beta-4562aa60",
-    "@abtnode/logger": "1.16.6-beta-4562aa60",
-    "@arcblock/jwt": "1.18.72",
-    "@blocklet/constant": "1.16.6-beta-4562aa60",
-    "@ocap/client": "1.18.72",
-    "@ocap/mcrypto": "1.18.72",
-    "@ocap/util": "1.18.72",
-    "@ocap/wallet": "1.18.72",
+    "@abtnode/constant": "1.16.6-beta-eaa4d39d",
+    "@abtnode/logger": "1.16.6-beta-eaa4d39d",
+    "@arcblock/jwt": "1.18.73",
+    "@blocklet/constant": "1.16.6-beta-eaa4d39d",
+    "@ocap/client": "1.18.73",
+    "@ocap/mcrypto": "1.18.73",
+    "@ocap/util": "1.18.73",
+    "@ocap/wallet": "1.18.73",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
@@ -73,5 +73,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "e49856099ffc3c16eda77480a7ad93b2e9760764"
+  "gitHead": "0d2ab99f67109e989f8182fc70bc3ee9fa430585"
 }