@abtnode/util 1.16.11-beta-0ae58a71 → 1.16.11-beta-f9719c31

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/format-context.js

@@ -3,10 +3,6 @@ const get = require('lodash/get');
 
 // Format context: https://github.com/graphql/express-graphql
 module.exports = (ctx = {}) => {
-  // 不要更改入参的值，base case
-  // if (ctx && ctx.user) {
-  //   delete ctx.user.avatar;
-  // }
   const contextUser = omit(ctx?.user || {}, 'avatar');
 
   const safeGet = (key, _default = '') =>

package/lib/format-error.js

@@ -0,0 +1,28 @@
+const formatError = (err) => {
+  const { details, errors, response } = err;
+
+  // graphql error
+  if (Array.isArray(errors)) {
+    return errors.map((x) => x.message).join('\n');
+  }
+
+  // joi validate error
+  if (Array.isArray(details)) {
+    const formatted = details.map((e) => {
+      const errorMessage = e.message.replace(/["]/g, "'");
+      const errorPath = e.path.join('.');
+      return `${errorPath}: ${errorMessage}`;
+    });
+
+    return `Validate failed: ${formatted.join(';')}`;
+  }
+
+  // axios error
+  if (response) {
+    return `Request failed: ${response.status} ${response.statusText}: ${JSON.stringify(response.data)}`;
+  }
+
+  return err.message;
+};
+
+module.exports = formatError;

package/lib/get-chain-client.js

@@ -2,8 +2,14 @@ const joinUrl = require('url-join');
 const Client = require('@ocap/client');
 
 // cache ocap clients for smaller memory consumption
+/** @type {Map<string, import('@ocap/client')>} */
 const clients = new Map();
 
+/**
+ * @description
+ * @param {string} chainHost
+ * @return {import('@ocap/client')}
+ */
 const getChainClient = (chainHost) => {
   const endpoint = joinUrl(chainHost, '/');
   if (!clients.has(endpoint)) {

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/lib/user.js

@@ -5,6 +5,7 @@ const cloneDeep = require('lodash/cloneDeep');
 const { USER_AVATAR_DIR, USER_AVATAR_URL_PREFIX } = require('@abtnode/constant');
 
 const md5 = require('./md5');
+const axios = require('./axios');
 
 const getAvatarFile = (dataDir, fileName) =>
   path.join(dataDir, USER_AVATAR_DIR, fileName.substring(0, 2), fileName.substring(2));
@@ -90,9 +91,40 @@ function updateConnectedAccount(connectedAccounts = [], connectedAccount = {}) {
   return updated;
 }
 
+const getAvatarByUrl = async (url) => {
+  try {
+    const { data } = await axios.get(url, {
+      responseType: 'arraybuffer',
+    });
+    const base64Content = Buffer.from(data, 'binary').toString('base64');
+
+    return `data:image/png;base64,${base64Content}`;
+  } catch (error) {
+    console.error(`Fetch avatar failed: ${url}`, error);
+    throw error;
+  }
+};
+
+const getEmailHash = (email) => md5(email.trim().toLowerCase());
+
+const getAvatarByEmail = async (email) => {
+  try {
+    const emailHash = getEmailHash(email);
+    const gravatarUrl = `https://www.gravatar.com/avatar/${emailHash}`;
+    const avatarBase64 = await getAvatarByUrl(gravatarUrl);
+    return avatarBase64;
+  } catch (error) {
+    console.error(`Fetch gravatar failed: ${email}`, error);
+    return null;
+  }
+};
+
 module.exports = {
   extractUserAvatar,
   parseUserAvatar,
   getAvatarFile,
   updateConnectedAccount,
+  getAvatarByUrl,
+  getAvatarByEmail,
+  getEmailHash,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-beta-0ae58a71",
+  "version": "1.16.11-beta-f9719c31",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,13 +18,13 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.11-beta-0ae58a71",
-    "@abtnode/logger": "1.16.11-beta-0ae58a71",
-    "@blocklet/constant": "1.16.11-beta-0ae58a71",
-    "@ocap/client": "1.18.80",
-    "@ocap/mcrypto": "1.18.80",
-    "@ocap/util": "1.18.80",
-    "@ocap/wallet": "1.18.80",
+    "@abtnode/constant": "1.16.11-beta-f9719c31",
+    "@abtnode/logger": "1.16.11-beta-f9719c31",
+    "@blocklet/constant": "1.16.11-beta-f9719c31",
+    "@ocap/client": "1.18.84",
+    "@ocap/mcrypto": "1.18.84",
+    "@ocap/util": "1.18.84",
+    "@ocap/wallet": "1.18.84",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
@@ -71,5 +71,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "5d044a08b4399eb855563e670af7cbd0d3851e94"
+  "gitHead": "2d88c5df1a414e5b6a8d575984e1940de7573976"
 }