@abtnode/util 1.16.17-beta-ce49fe0e → 1.16.17-beta-2679e686

package/lib/logo-middleware.js

@@ -78,7 +78,34 @@ const ensureCustomSquareLogo = (req, res, next) => {
       return;
     }
 
-    const logoFile = path.join(get(blocklet, 'env.appDir'), customLogoSquare);
+    const logoFile = path.join(get(blocklet, 'env.dataDir'), customLogoSquare);
+    if (fs.existsSync(logoFile)) {
+      res.sendLogoFile(logoFile, sendOptions);
+      return;
+    }
+  }
+
+  next();
+};
+
+/**
+ * @param {import('express').Request & {blocklet: any, sendOptions: any}} req
+ * @param {import('express').Response & {sendFallbackLogo: Function, sendLogoFile: Function} } res
+ * @param {import('express').NextFunction} next
+ * @returns
+ */
+const ensureCustomRectLogo = (req, res, next) => {
+  const { blocklet, sendOptions } = req;
+
+  /** @type {string} */
+  const logo = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_RECT');
+  if (logo) {
+    if (logo.startsWith('http')) {
+      sendCustomRemoteFile(req, res, logo);
+      return;
+    }
+
+    const logoFile = path.join(get(blocklet, 'env.dataDir'), logo);
     if (fs.existsSync(logoFile)) {
       res.sendLogoFile(logoFile, sendOptions);
       return;
@@ -179,14 +206,15 @@ const ensureCustomFavicon = (req, res, next) => {
    * */
   const { blocklet, sendOptions } = req;
 
-  const customLogoFavicon = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_FAVICON');
-  if (customLogoFavicon) {
-    if (customLogoFavicon.startsWith('http')) {
-      sendCustomRemoteFile(req, res, customLogoFavicon);
+  /** @type {string} */
+  const logo = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_FAVICON');
+  if (logo) {
+    if (logo.startsWith('http')) {
+      sendCustomRemoteFile(req, res, logo);
       return;
     }
 
-    const logoFile = path.join(get(blocklet, 'env.appDir'), customLogoFavicon);
+    const logoFile = path.join(get(blocklet, 'env.dataDir'), logo);
     if (fs.existsSync(logoFile)) {
       res.sendLogoFile(logoFile, sendOptions);
       return;
@@ -223,6 +251,7 @@ module.exports = {
   ensureCustomSquareLogo,
   ensureBundleLogo,
   ensureCustomFavicon,
+  ensureCustomRectLogo,
   ensureDefaultLogo,
   fallbackLogo,
   cacheError,

package/lib/logo.js

@@ -9,12 +9,13 @@ const axios = require('./axios');
  * @param {{
  *  customLogoSquareUrl?: string;
  *  appDir: string;
+ *  dataDir: string;
  *  logo?: string;
  *  defaultLogoPath?: string;
  * }}{ blocklet }
  * @return {Promise<string | undefined>}
  */
-async function getLogoUrl({ customLogoSquareUrl, appDir, logo, defaultLogoPath }) {
+async function getLogoUrl({ customLogoSquareUrl, appDir, dataDir, logo, defaultLogoPath }) {
   if (customLogoSquareUrl) {
     if (isUrl(customLogoSquareUrl)) {
       const res = await axios.get(customLogoSquareUrl, { responseType: 'stream' }).catch(() => {
@@ -23,10 +24,14 @@ async function getLogoUrl({ customLogoSquareUrl, appDir, logo, defaultLogoPath }
       if (res.data) {
         return customLogoSquareUrl;
       }
-    } else if (appDir) {
-      const localCustomLogoSquareUrl = join(appDir, customLogoSquareUrl);
-      if (existsSync(localCustomLogoSquareUrl)) {
-        return localCustomLogoSquareUrl;
+    } else {
+      const logoInDataDir = dataDir && join(dataDir, customLogoSquareUrl);
+      const logoInAppDir = appDir && join(appDir, customLogoSquareUrl);
+      if (existsSync(logoInDataDir)) {
+        return logoInDataDir;
+      }
+      if (existsSync(logoInAppDir)) {
+        return logoInDataDir;
       }
     }
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-ce49fe0e",
+  "version": "1.16.17-beta-2679e686",
   "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.17-beta-ce49fe0e",
-    "@abtnode/logger": "1.16.17-beta-ce49fe0e",
-    "@blocklet/constant": "1.16.17-beta-ce49fe0e",
-    "@blocklet/meta": "1.16.17-beta-ce49fe0e",
+    "@abtnode/constant": "1.16.17-beta-2679e686",
+    "@abtnode/logger": "1.16.17-beta-2679e686",
+    "@blocklet/constant": "1.16.17-beta-2679e686",
+    "@blocklet/meta": "1.16.17-beta-2679e686",
     "@ocap/client": "1.18.92",
     "@ocap/mcrypto": "1.18.92",
     "@ocap/util": "1.18.92",
@@ -76,5 +76,5 @@
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "d8a04ff2ef9cd52a02d019bc2c9a743785e869c3"
+  "gitHead": "abbe4a479b379552cd9ebd8c27732b360844cb73"
 }