@abtnode/util 1.16.11-beta-069c3537 → 1.16.11-next-a232f5fb

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/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-069c3537",
+  "version": "1.16.11-next-a232f5fb",
   "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-beta-069c3537",
-    "@abtnode/logger": "1.16.11-beta-069c3537",
-    "@blocklet/constant": "1.16.11-beta-069c3537",
+    "@abtnode/constant": "1.16.11-next-a232f5fb",
+    "@abtnode/logger": "1.16.11-next-a232f5fb",
+    "@blocklet/constant": "1.16.11-next-a232f5fb",
     "@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": "a89c7f13901d2c2d50b09d68d6088ca705648ff6"
+  "gitHead": "1af264e9b6648aa191fbf23c67717262ac717697"
 }