@abtnode/util 1.16.13 → 1.16.14-beta-0c29907f

package/lib/user.js

@@ -1,8 +1,14 @@
 const path = require('path');
 const fs = require('fs-extra');
+const joinUrl = require('url-join');
 const cloneDeep = require('lodash/cloneDeep');
 
-const { USER_AVATAR_DIR, USER_AVATAR_URL_PREFIX } = require('@abtnode/constant');
+const {
+  USER_AVATAR_DIR,
+  WELLKNOWN_SERVICE_PATH_PREFIX,
+  USER_AVATAR_PATH_PREFIX,
+  USER_AVATAR_URL_PREFIX,
+} = require('@abtnode/constant');
 
 const md5 = require('./md5');
 const axios = require('./axios');
@@ -10,6 +16,66 @@ const axios = require('./axios');
 const getAvatarFile = (dataDir, fileName) =>
   path.join(dataDir, USER_AVATAR_DIR, fileName.substring(0, 2), fileName.substring(2));
 
+const getServerAvatarUrl = (baseUrl, info) => {
+  if (!baseUrl) {
+    return '';
+  }
+
+  let origin = baseUrl;
+  try {
+    origin = new URL(baseUrl).origin;
+  } catch {
+    // Do nothing;
+  }
+
+  return joinUrl(
+    origin,
+    process.env.NODE_ENV === 'production' ? info.routing.adminPath : '',
+    `/images/node.png?v=${info.version}`
+  );
+};
+
+const getAppAvatarUrl = (baseUrl) => {
+  if (!baseUrl) {
+    return '';
+  }
+
+  let origin = baseUrl;
+  try {
+    origin = new URL(baseUrl).origin;
+  } catch {
+    // Do nothing;
+  }
+
+  return joinUrl(origin, WELLKNOWN_SERVICE_PATH_PREFIX, `/blocklet/logo?t=${Date.now()}`);
+};
+
+const getUserAvatarUrl = (baseUrl, avatar, info = {}, isServer = false) => {
+  if (!avatar) {
+    return '';
+  }
+
+  if (!avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
+    throw new Error('User avatar is not persisted on disk');
+  }
+
+  const filename = avatar.split('/').pop();
+
+  let origin = baseUrl;
+  try {
+    origin = new URL(baseUrl).origin;
+  } catch {
+    // Do nothing;
+  }
+
+  if (isServer) {
+    const prefix = process.env.NODE_ENV !== 'development' ? info.routing.adminPath : '';
+    return joinUrl(origin, prefix, USER_AVATAR_PATH_PREFIX, info.did, filename);
+  }
+
+  return joinUrl(origin, WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX, filename);
+};
+
 /**
  * save base64 avatar data to storage and return url
  */
@@ -127,4 +193,7 @@ module.exports = {
   getAvatarByUrl,
   getAvatarByEmail,
   getEmailHash,
+  getUserAvatarUrl,
+  getAppAvatarUrl,
+  getServerAvatarUrl,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13",
+  "version": "1.16.14-beta-0c29907f",
   "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.13",
-    "@abtnode/logger": "1.16.13",
-    "@blocklet/constant": "1.16.13",
-    "@ocap/client": "1.18.84",
-    "@ocap/mcrypto": "1.18.84",
-    "@ocap/util": "1.18.84",
-    "@ocap/wallet": "1.18.84",
+    "@abtnode/constant": "1.16.14-beta-0c29907f",
+    "@abtnode/logger": "1.16.14-beta-0c29907f",
+    "@blocklet/constant": "1.16.14-beta-0c29907f",
+    "@ocap/client": "1.18.87",
+    "@ocap/mcrypto": "1.18.87",
+    "@ocap/util": "1.18.87",
+    "@ocap/wallet": "1.18.87",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
@@ -74,5 +74,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "0f07f6617a8cf53a4fa693d6ca227f6f6bd90af2"
+  "gitHead": "1f02851a71861dbf09bfedfa9df6d9fc6d2355a3"
 }