@abtnode/util 1.16.26-beta-351de484 → 1.16.26-beta-63f52a83

package/lib/base32.js

@@ -1,4 +1,4 @@
-const { toBuffer, toAddress } = require('@ocap/util');
+const { toBuffer, toAddress, toBase58, toHex } = require('@ocap/util');
 const { base32 } = require('multiformats/bases/base32');
 
 const encode = (did) => {
@@ -11,4 +11,18 @@ const encode = (did) => {
   return base32.encode(buffer);
 };
 
-module.exports = { encode };
+const decode = (str) => {
+  if (!str) {
+    return str;
+  }
+
+  const buffer = base32.decode(str);
+  const base58 = toBase58(buffer);
+  if (base58.length > 30) {
+    return base58;
+  }
+
+  return toHex(buffer);
+};
+
+module.exports = { encode, decode };

package/lib/logo-middleware.js

@@ -3,6 +3,7 @@ const http = require('http');
 const https = require('https');
 const path = require('path');
 const get = require('lodash/get');
+const pick = require('lodash/pick');
 
 const logger = require('@abtnode/logger')('@abtnode/util:logo-middleware');
 
@@ -41,7 +42,7 @@ const sendCustomRemoteFile = (req, res, url) => {
 
   const opts = Object.assign(new URL(tmp.href), {
     method: req.method,
-    headers: req.headers,
+    headers: pick(req.headers, ['user-agent', 'accept', 'accept-encoding', 'accept-language', 'referer', 'cookie']),
   });
 
   const request = opts.protocol === 'https:' ? https.request : http.request;

package/lib/user.js

@@ -191,7 +191,8 @@ const getAvatarByUrl = async (url) => {
   }
 };
 
-const getEmailHash = (email) => md5(email.trim().toLowerCase());
+// HACK: 即使传入空值，也会返回空字符串的 md5 值
+const getEmailHash = (email) => md5(email?.trim()?.toLowerCase() || '');
 
 const getAvatarByEmail = async (email) => {
   try {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.26-beta-351de484",
+  "version": "1.16.26-beta-63f52a83",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,10 +18,10 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.26-beta-351de484",
-    "@abtnode/logger": "1.16.26-beta-351de484",
-    "@blocklet/constant": "1.16.26-beta-351de484",
-    "@blocklet/meta": "1.16.26-beta-351de484",
+    "@abtnode/constant": "1.16.26-beta-63f52a83",
+    "@abtnode/logger": "1.16.26-beta-63f52a83",
+    "@blocklet/constant": "1.16.26-beta-63f52a83",
+    "@blocklet/meta": "1.16.26-beta-63f52a83",
     "@ocap/client": "1.18.115",
     "@ocap/mcrypto": "1.18.115",
     "@ocap/util": "1.18.115",
@@ -76,5 +76,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "00eba435a21506382c7823ea804abea196390a0f"
+  "gitHead": "ce04b1916e531d79d9535111cd370c69c04fcbc1"
 }