@abtnode/util 1.16.11-next-ca5f18b5 → 1.16.11-next-3e55bc95

package/lib/did-document.js

@@ -18,7 +18,7 @@ const getDID = (address) => {
   return `did:abt:${address}`;
 };
 
-const update = async ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [] }) => {
+const update = ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [] }) => {
   debug('update did document', { didRegistryUrl });
 
   const did = getDID(wallet.address);
@@ -55,7 +55,7 @@ const update = async ({ id, services, didRegistryUrl, wallet, alsoKnownAs = [] }
   return axios.post(joinUrl(didRegistryUrl, '/.well-known/did-resolver/registries'), document, { timeout: 10 * 1000 });
 };
 
-const updateWithRetry = async (...args) => pRetry(() => update(...args), { retries: 3 });
+const updateWithRetry = (...args) => pRetry(() => update(...args), { retries: 3 });
 
 const getServerServices = ({ ips, wallet, domain }) => {
   const records = ips.map((ip) => ({
@@ -93,6 +93,7 @@ const getBlockletServices = ({ appPid, daemonDidDomain, domain }) => {
   ];
 };
 
+// eslint-disable-next-line require-await
 const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain }) => {
   const filteredIps = (ips || []).filter(Boolean);
   if (filteredIps.length === 0) {
@@ -104,14 +105,7 @@ const updateServerDocument = async ({ ips, wallet, didRegistryUrl, domain }) =>
   return updateWithRetry({ id: getDID(wallet.address), services, didRegistryUrl, wallet });
 };
 
-const updateBlockletDocument = async ({
-  wallet,
-  didRegistryUrl,
-  domain,
-  daemonDidDomain,
-  appPid,
-  alsoKnownAs = [],
-}) => {
+const updateBlockletDocument = ({ wallet, didRegistryUrl, domain, daemonDidDomain, appPid, alsoKnownAs = [] }) => {
   const services = getBlockletServices({ appPid, daemonDidDomain, domain });
   return updateWithRetry({ id: appPid, services, didRegistryUrl, alsoKnownAs, wallet });
 };

package/lib/ensure-endpoint-healthy.js

@@ -63,6 +63,7 @@ module.exports = async ({
   port,
   timeout = 10 * ONE_SECOND,
   minConsecutiveTime = (+process.env.ENDPOINT_CONSECUTIVE_TIME || 5) * ONE_SECOND,
+  // eslint-disable-next-line require-await
 }) => {
   debug('ensure endpoint healthy', { port, minConsecutiveTime });
 

package/lib/get-pm2-process-info.js

@@ -5,7 +5,7 @@ const noop = () => {};
 
 const getPm2ProcessInfo = (processId, { printError = noop, throwOnNotExist = true } = {}) =>
   new Promise((resolve, reject) => {
-    pm2.describe(processId, async (err, [info]) => {
+    pm2.describe(processId, (err, [info]) => {
       if (err) {
         printError('Failed to get blocklet status from pm2', { error: err });
         return reject(err);

package/lib/log.js

@@ -20,7 +20,7 @@ class StreamLog {
    * @param {Object} files Object { <level>: <filePath> }
    * @return {Boolean} if files change
    */
-  async setFiles(files) {
+  setFiles(files) {
     if (!isEqual(this._files, files)) {
       this.clearTails();
       this._files = files;
@@ -253,7 +253,7 @@ const getDownloadLogFilesFromServer = async ({ dates, nodeInfo, node } = {}) =>
   return glob(list);
 };
 
-const getDownloadLogFilesFromBlocklet = async ({ dates, blocklet } = {}) => {
+const getDownloadLogFilesFromBlocklet = ({ dates, blocklet } = {}) => {
   const logDir = path.join(blocklet.env.logsDir);
 
   const list = [];

package/lib/logo-middleware.js

@@ -11,7 +11,7 @@ const logger = require('@abtnode/logger')('@abtnode/util:logo-middleware');
  * @param {import('express').NextFunction} next
  * @returns
  */
-const ensureBlockletExist = async (req, res, next) => {
+const ensureBlockletExist = (req, res, next) => {
   const { blocklet } = req;
 
   if (!blocklet || !get(blocklet, 'env.appDir')) {
@@ -29,7 +29,7 @@ const ensureBlockletExist = async (req, res, next) => {
  * @param {import('express').NextFunction} next
  * @returns
  */
-const ensureCustomSquareLogo = async (req, res, next) => {
+const ensureCustomSquareLogo = (req, res, next) => {
   const { blocklet, sendOptions } = req;
 
   /** @type {string} */
@@ -58,7 +58,7 @@ const ensureCustomSquareLogo = async (req, res, next) => {
  * @param {import('express').NextFunction} next
  * @returns
  */
-const ensureBundleLogo = async (req, res, next) => {
+const ensureBundleLogo = (req, res, next) => {
   /**
    * @type {{
    *  blocklet: import('@abtnode/client').BlockletState, // 目前肯定是不准确的，但是有些属性是通用的，无伤大雅
@@ -85,12 +85,12 @@ const ensureBundleLogo = async (req, res, next) => {
  * @param {import('express').Response & {sendFallbackLogo: Function} } res
  * @returns
  */
-const fallbackLogo = async (_req, res) => {
+const fallbackLogo = (_req, res) => {
   res.sendFallbackLogo();
 };
 
 // eslint-disable-next-line no-unused-vars
-const cacheError = async (err, req, res, next) => {
+const cacheError = (err, req, res, next) => {
   logger.error('failed to send blocklet logo', { url: req.url, error: err });
   res.sendFallbackLogo();
 };
@@ -102,7 +102,7 @@ const cacheError = async (err, req, res, next) => {
  * @param {import('express').NextFunction} next
  * @returns
  */
-const ensureDefaultLogo = async (req, res, next) => {
+const ensureDefaultLogo = (req, res, next) => {
   /**
    * @type {{
    *  blocklet: import('@abtnode/client').BlockletState, // 目前肯定是不准确的，但是有些属性是通用的，无伤大雅
@@ -137,7 +137,7 @@ const ensureDefaultLogo = async (req, res, next) => {
  * @param {import('express').NextFunction} next
  * @returns
  */
-const ensureCustomFavicon = async (req, res, next) => {
+const ensureCustomFavicon = (req, res, next) => {
   /**
    * @type {{
    *  blocklet: import('@abtnode/client').BlockletState, // 目前肯定是不准确的，但是有些属性是通用的，无伤大雅

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-ca5f18b5",
+  "version": "1.16.11-next-3e55bc95",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.11-next-ca5f18b5",
-    "@abtnode/logger": "1.16.11-next-ca5f18b5",
-    "@blocklet/constant": "1.16.11-next-ca5f18b5",
+    "@abtnode/constant": "1.16.11-next-3e55bc95",
+    "@abtnode/logger": "1.16.11-next-3e55bc95",
+    "@blocklet/constant": "1.16.11-next-3e55bc95",
     "@ocap/client": "1.18.80",
     "@ocap/mcrypto": "1.18.80",
     "@ocap/util": "1.18.80",
@@ -71,5 +71,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "d797d0177d585b66d17876c99c994fda4d812f37"
+  "gitHead": "cf0251c2d85c617b03151495b5944061ceb373e5"
 }