@abtnode/util 1.16.26-beta-bdd2d7c0 → 1.16.26-beta-346cba92

package/lib/blocklet.js

@@ -1,5 +1,11 @@
 const path = require('path');
 const { createHash } = require('crypto');
+const isUrl = require('is-url');
+const joinURL = require('url-join');
+const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
+
+const getLogoHash = (logo) => encodeURIComponent((logo || '').split('/').slice(-1)[0].slice(0, 7));
 
 const getComponentApiKey = ({ serverSk, app, component } = {}) => {
   if (!serverSk) {
@@ -19,8 +25,54 @@ const getComponentApiKey = ({ serverSk, app, component } = {}) => {
   return token;
 };
 
+const formatLogoURL = (logoURL, defaultLogoURL) => {
+  if (!logoURL) {
+    return logoURL;
+  }
+
+  if (isUrl(logoURL)) {
+    const tmp = new URL(logoURL);
+    if (!tmp.searchParams.get('imageFilter')) {
+      tmp.searchParams.set('imageFilter', 'convert');
+      tmp.searchParams.set('f', 'png');
+      tmp.searchParams.set('h', '80');
+
+      return tmp.href;
+    }
+
+    return logoURL;
+  }
+
+  const tmp = new URL(defaultLogoURL);
+  if (!logoURL.endsWith('.svg')) {
+    tmp.searchParams.set('imageFilter', 'convert');
+    tmp.searchParams.set('f', 'png');
+    tmp.searchParams.set('h', '80');
+  }
+
+  tmp.searchParams.set('hash', getLogoHash(logoURL));
+  return `${tmp.pathname}${tmp.search}`;
+};
+
+const getBlockletLogos = (blocklet) => {
+  let appLogo = blocklet.environments?.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE)?.value;
+  let appLogoRect = blocklet.environments?.find(
+    (x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_RECT
+  )?.value;
+
+  appLogo = formatLogoURL(appLogo, `http://127.0.0.1${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo`);
+  appLogoRect = formatLogoURL(appLogoRect, `http://127.0.0.1${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo-rect`);
+
+  return {
+    appLogo: appLogo || joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo?imageFilter=convert&f=png&h=80'),
+    appLogoRect: appLogoRect || '',
+  };
+};
+
 module.exports = {
   getComponentApiKey,
   getAppImageCacheDir: (cacheDir) => path.join(cacheDir, '.services', 'image-filter'),
   getAppOgCacheDir: (cacheDir) => path.join(cacheDir, '.services', 'open-graph'),
+  getBlockletLogos,
+  getLogoHash,
 };

package/lib/serverless.js

@@ -0,0 +1,15 @@
+const { NODE_MODES } = require('@abtnode/constant');
+
+/**
+ * Check if the node is in serverless mode
+ * @param {object} param
+ * @param {string} param.mode
+ * @param {string} param.previousMode
+ * @returns {boolean} whether the node is in serverless mode
+ */
+const isInServerlessMode = ({ mode, previousMode } = {}) =>
+  mode === NODE_MODES.SERVERLESS || previousMode === NODE_MODES.SERVERLESS;
+
+module.exports = {
+  isInServerlessMode,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.26-beta-bdd2d7c0",
+  "version": "1.16.26-beta-346cba92",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,14 +18,14 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.26-beta-bdd2d7c0",
-    "@abtnode/logger": "1.16.26-beta-bdd2d7c0",
-    "@blocklet/constant": "1.16.26-beta-bdd2d7c0",
-    "@blocklet/meta": "1.16.26-beta-bdd2d7c0",
-    "@ocap/client": "1.18.114",
-    "@ocap/mcrypto": "1.18.114",
-    "@ocap/util": "1.18.114",
-    "@ocap/wallet": "1.18.114",
+    "@abtnode/constant": "1.16.26-beta-346cba92",
+    "@abtnode/logger": "1.16.26-beta-346cba92",
+    "@blocklet/constant": "1.16.26-beta-346cba92",
+    "@blocklet/meta": "1.16.26-beta-346cba92",
+    "@ocap/client": "1.18.115",
+    "@ocap/mcrypto": "1.18.115",
+    "@ocap/util": "1.18.115",
+    "@ocap/wallet": "1.18.115",
     "archiver": "^7.0.1",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
@@ -76,5 +76,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "74cf28155629081722b1f62797eb5e89e27809f1"
+  "gitHead": "389bb6584585302b9b12ec7133c73cb28b0d663b"
 }