@abtnode/blocklet-services 1.16.17-beta-ce49fe0e → 1.16.17-beta-2ac96448

package/api/index.js

@@ -275,6 +275,7 @@ module.exports = function createServer(node, serverOptions = {}) {
     '/api/uploads',
     '/api/project/:did/:projectId/:type/upload',
     '/api/project/:did/:projectId/:releaseId/download/:file',
+    '/blocklet/logo/upload/:logoType/:did',
   ].forEach((pathname) => {
     server.use(
       `${WELLKNOWN_SERVICE_PATH_PREFIX}${pathname}`,

package/api/routes/blocklet.js

@@ -19,6 +19,7 @@ const {
   ensureBundleLogo,
   ensureDefaultLogo,
   ensureCustomFavicon,
+  ensureCustomRectLogo,
   fallbackLogo,
   cacheError,
 } = require('@abtnode/util/lib/logo-middleware');
@@ -82,8 +83,7 @@ module.exports = {
       next();
     };
 
-    server.get(
-      `${prefix}/blocklet/logo`,
+    const logoWorkflow = (...chain) => [
       attachSendLogoContext({
         onSendFallbackLogo,
         onGetBlocklet: ({ req }) => {
@@ -92,32 +92,20 @@ module.exports = {
       }),
       attachSendLogoFn,
       ensureBlockletExist,
+      ...chain,
       ensureCustomSquareLogo,
       ensureBundleLogo,
       ensureDefaultLogo,
       fallbackLogo,
-      cacheError
-    );
+      cacheError,
+    ];
 
-    ['/favicon.ico', `${prefix}/blocklet/favicon`].forEach((x) => {
-      server.get(
-        x,
-        attachSendLogoContext({
-          onSendFallbackLogo,
-          onGetBlocklet: ({ req }) => {
-            return req.getBlocklet();
-          },
-        }),
-        attachSendLogoFn,
-        ensureBlockletExist,
-        ensureCustomFavicon,
-        ensureCustomSquareLogo,
-        ensureBundleLogo,
-        ensureDefaultLogo,
-        fallbackLogo,
-        cacheError
-      );
+    server.get(`${prefix}/blocklet/logo`, ...logoWorkflow());
+
+    ['/favicon.ico', `${prefix}/blocklet/favicon`, `${prefix}/blocklet/logo-favicon`].forEach((x) => {
+      server.get(x, ...logoWorkflow(ensureCustomFavicon));
     });
+    server.get(`${prefix}/blocklet/logo-rect`, ...logoWorkflow(ensureCustomRectLogo));
 
     server.get(
       `${prefix}/blocklet/logo-bundle/?**`,

package/api/util/index.js

@@ -1,8 +1,7 @@
 const joinUrl = require('url-join');
-const get = require('lodash/get');
 const minimatch = require('minimatch');
 const { ROLES, WHO_CAN_ACCESS } = require('@abtnode/constant');
-const { BlockletSource, BLOCKLET_MODES, BlockletGroup } = require('@blocklet/constant');
+const { BLOCKLET_MODES, BlockletGroup } = require('@blocklet/constant');
 const { findWebInterface, findWebInterfacePort, findComponentByIdV2 } = require('@blocklet/meta/lib/util');
 const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 
@@ -22,48 +21,6 @@ const getComponentPrefix = (req) => {
   return '/';
 };
 
-const getLogoFromLogoUrl = (blocklet, version) => {
-  try {
-    if (!blocklet.meta.logoUrl) {
-      return null;
-    }
-
-    const url = `${blocklet.meta.logoUrl}?version=${version || ''}`;
-
-    if (blocklet.source === BlockletSource.registry) {
-      return new URL(url, blocklet.deployedFrom).href;
-    }
-
-    return url;
-  } catch (error) {
-    return null;
-  }
-};
-
-const getBlockletLogo = ({ baseUrl, blocklet }) => {
-  const version = get(blocklet, 'meta.version', '');
-  const customLogo = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO');
-  const customLogoSquare = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_SQUARE');
-
-  if (customLogoSquare) {
-    return customLogoSquare;
-  }
-
-  if (customLogo) {
-    return customLogo;
-  }
-
-  if (!baseUrl) {
-    return getLogoFromLogoUrl(blocklet, version);
-  }
-
-  if (get(blocklet, 'meta.logoUrl')) {
-    return getLogoFromLogoUrl(blocklet, version);
-  }
-
-  return `${baseUrl}/blocklet/logo?version=${version}`;
-};
-
 const shouldGotoStartPage = (req, blocklet) => {
   if (blocklet && blocklet.mode === BLOCKLET_MODES.DEVELOPMENT) {
     return false;
@@ -260,7 +217,6 @@ const shouldIgnoreUrl = (url, urls) => {
 };
 
 module.exports = {
-  getBlockletLogo,
   shouldGotoStartPage,
   ensureProxyUrl,
   getRedirectUrl,

package/build/asset-manifest.json

@@ -1,16 +1,16 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.ee013f15.js",
+    "main.js": "/.well-known/service/static/static/js/main.7dce6ab7.js",
     "static/js/4716.bd8bed1b.chunk.js": "/.well-known/service/static/static/js/4716.bd8bed1b.chunk.js",
     "static/js/6856.2eb98754.chunk.js": "/.well-known/service/static/static/js/6856.2eb98754.chunk.js",
     "static/js/3025.7dc2fe04.chunk.js": "/.well-known/service/static/static/js/3025.7dc2fe04.chunk.js",
     "static/js/9899.277d673f.chunk.js": "/.well-known/service/static/static/js/9899.277d673f.chunk.js",
     "static/js/6737.53cccea9.chunk.js": "/.well-known/service/static/static/js/6737.53cccea9.chunk.js",
-    "static/js/1760.1e5aaa46.chunk.js": "/.well-known/service/static/static/js/1760.1e5aaa46.chunk.js",
+    "static/js/1760.ed4e8587.chunk.js": "/.well-known/service/static/static/js/1760.ed4e8587.chunk.js",
     "static/js/9620.301493bc.chunk.js": "/.well-known/service/static/static/js/9620.301493bc.chunk.js",
     "static/js/1480.88c590c2.chunk.js": "/.well-known/service/static/static/js/1480.88c590c2.chunk.js",
-    "static/js/6186.1f08318c.chunk.js": "/.well-known/service/static/static/js/6186.1f08318c.chunk.js",
+    "static/js/6186.4a89edaf.chunk.js": "/.well-known/service/static/static/js/6186.4a89edaf.chunk.js",
     "static/js/4682.f90d26fd.chunk.js": "/.well-known/service/static/static/js/4682.f90d26fd.chunk.js",
     "static/js/6711.fa6dfc37.chunk.js": "/.well-known/service/static/static/js/6711.fa6dfc37.chunk.js",
     "static/js/8437.13d39ce4.chunk.js": "/.well-known/service/static/static/js/8437.13d39ce4.chunk.js",
@@ -27,18 +27,18 @@
     "static/js/2653.3873eb86.chunk.js": "/.well-known/service/static/static/js/2653.3873eb86.chunk.js",
     "static/js/3593.4d68c718.chunk.js": "/.well-known/service/static/static/js/3593.4d68c718.chunk.js",
     "static/css/4802.bf353f58.chunk.css": "/.well-known/service/static/static/css/4802.bf353f58.chunk.css",
-    "static/js/4802.534357c1.chunk.js": "/.well-known/service/static/static/js/4802.534357c1.chunk.js",
+    "static/js/4802.b3a4b474.chunk.js": "/.well-known/service/static/static/js/4802.b3a4b474.chunk.js",
     "static/js/6771.a1510398.chunk.js": "/.well-known/service/static/static/js/6771.a1510398.chunk.js",
     "static/css/5982.ac464505.chunk.css": "/.well-known/service/static/static/css/5982.ac464505.chunk.css",
     "static/js/5982.0abe67c3.chunk.js": "/.well-known/service/static/static/js/5982.0abe67c3.chunk.js",
-    "static/js/6139.c781eea4.chunk.js": "/.well-known/service/static/static/js/6139.c781eea4.chunk.js",
+    "static/js/6139.f7ca5bd6.chunk.js": "/.well-known/service/static/static/js/6139.f7ca5bd6.chunk.js",
     "static/js/4023.8cfc3ec6.chunk.js": "/.well-known/service/static/static/js/4023.8cfc3ec6.chunk.js",
     "static/js/8792.fa2c5f5e.chunk.js": "/.well-known/service/static/static/js/8792.fa2c5f5e.chunk.js",
     "static/js/1565.cf381434.chunk.js": "/.well-known/service/static/static/js/1565.cf381434.chunk.js",
     "static/js/2393.528e5343.chunk.js": "/.well-known/service/static/static/js/2393.528e5343.chunk.js",
     "static/css/5547.5f9be15f.chunk.css": "/.well-known/service/static/static/css/5547.5f9be15f.chunk.css",
-    "static/js/5547.2e5aa64f.chunk.js": "/.well-known/service/static/static/js/5547.2e5aa64f.chunk.js",
-    "static/js/4461.02f584b7.chunk.js": "/.well-known/service/static/static/js/4461.02f584b7.chunk.js",
+    "static/js/5547.980439e8.chunk.js": "/.well-known/service/static/static/js/5547.980439e8.chunk.js",
+    "static/js/4461.d60aa7be.chunk.js": "/.well-known/service/static/static/js/4461.d60aa7be.chunk.js",
     "static/js/5509.a196d497.chunk.js": "/.well-known/service/static/static/js/5509.a196d497.chunk.js",
     "static/js/5683.47011724.chunk.js": "/.well-known/service/static/static/js/5683.47011724.chunk.js",
     "static/js/7006.8f0645e5.chunk.js": "/.well-known/service/static/static/js/7006.8f0645e5.chunk.js",
@@ -68,7 +68,7 @@
     "static/js/7648.955e20c7.chunk.js": "/.well-known/service/static/static/js/7648.955e20c7.chunk.js",
     "static/js/4932.c7c954aa.chunk.js": "/.well-known/service/static/static/js/4932.c7c954aa.chunk.js",
     "static/js/2093.185a5563.chunk.js": "/.well-known/service/static/static/js/2093.185a5563.chunk.js",
-    "static/js/3255.2cf7c752.chunk.js": "/.well-known/service/static/static/js/3255.2cf7c752.chunk.js",
+    "static/js/716.cf9ba82c.chunk.js": "/.well-known/service/static/static/js/716.cf9ba82c.chunk.js",
     "static/js/5969.2791e4e5.chunk.js": "/.well-known/service/static/static/js/5969.2791e4e5.chunk.js",
     "static/js/8604.a8ef404e.chunk.js": "/.well-known/service/static/static/js/8604.a8ef404e.chunk.js",
     "static/js/6465.e704f56b.chunk.js": "/.well-known/service/static/static/js/6465.e704f56b.chunk.js",
@@ -104,16 +104,16 @@
     "index.html": "/.well-known/service/static/index.html",
     "static/media/space-connected.svg": "/.well-known/service/static/static/media/space-connected.9a4e18fd2bc7d065191b0d241a131c28.svg",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.ee013f15.js.map": "/.well-known/service/static/static/js/main.ee013f15.js.map",
+    "main.7dce6ab7.js.map": "/.well-known/service/static/static/js/main.7dce6ab7.js.map",
     "4716.bd8bed1b.chunk.js.map": "/.well-known/service/static/static/js/4716.bd8bed1b.chunk.js.map",
     "6856.2eb98754.chunk.js.map": "/.well-known/service/static/static/js/6856.2eb98754.chunk.js.map",
     "3025.7dc2fe04.chunk.js.map": "/.well-known/service/static/static/js/3025.7dc2fe04.chunk.js.map",
     "9899.277d673f.chunk.js.map": "/.well-known/service/static/static/js/9899.277d673f.chunk.js.map",
     "6737.53cccea9.chunk.js.map": "/.well-known/service/static/static/js/6737.53cccea9.chunk.js.map",
-    "1760.1e5aaa46.chunk.js.map": "/.well-known/service/static/static/js/1760.1e5aaa46.chunk.js.map",
+    "1760.ed4e8587.chunk.js.map": "/.well-known/service/static/static/js/1760.ed4e8587.chunk.js.map",
     "9620.301493bc.chunk.js.map": "/.well-known/service/static/static/js/9620.301493bc.chunk.js.map",
     "1480.88c590c2.chunk.js.map": "/.well-known/service/static/static/js/1480.88c590c2.chunk.js.map",
-    "6186.1f08318c.chunk.js.map": "/.well-known/service/static/static/js/6186.1f08318c.chunk.js.map",
+    "6186.4a89edaf.chunk.js.map": "/.well-known/service/static/static/js/6186.4a89edaf.chunk.js.map",
     "4682.f90d26fd.chunk.js.map": "/.well-known/service/static/static/js/4682.f90d26fd.chunk.js.map",
     "6711.fa6dfc37.chunk.js.map": "/.well-known/service/static/static/js/6711.fa6dfc37.chunk.js.map",
     "8437.13d39ce4.chunk.js.map": "/.well-known/service/static/static/js/8437.13d39ce4.chunk.js.map",
@@ -130,18 +130,18 @@
     "2653.3873eb86.chunk.js.map": "/.well-known/service/static/static/js/2653.3873eb86.chunk.js.map",
     "3593.4d68c718.chunk.js.map": "/.well-known/service/static/static/js/3593.4d68c718.chunk.js.map",
     "4802.bf353f58.chunk.css.map": "/.well-known/service/static/static/css/4802.bf353f58.chunk.css.map",
-    "4802.534357c1.chunk.js.map": "/.well-known/service/static/static/js/4802.534357c1.chunk.js.map",
+    "4802.b3a4b474.chunk.js.map": "/.well-known/service/static/static/js/4802.b3a4b474.chunk.js.map",
     "6771.a1510398.chunk.js.map": "/.well-known/service/static/static/js/6771.a1510398.chunk.js.map",
     "5982.ac464505.chunk.css.map": "/.well-known/service/static/static/css/5982.ac464505.chunk.css.map",
     "5982.0abe67c3.chunk.js.map": "/.well-known/service/static/static/js/5982.0abe67c3.chunk.js.map",
-    "6139.c781eea4.chunk.js.map": "/.well-known/service/static/static/js/6139.c781eea4.chunk.js.map",
+    "6139.f7ca5bd6.chunk.js.map": "/.well-known/service/static/static/js/6139.f7ca5bd6.chunk.js.map",
     "4023.8cfc3ec6.chunk.js.map": "/.well-known/service/static/static/js/4023.8cfc3ec6.chunk.js.map",
     "8792.fa2c5f5e.chunk.js.map": "/.well-known/service/static/static/js/8792.fa2c5f5e.chunk.js.map",
     "1565.cf381434.chunk.js.map": "/.well-known/service/static/static/js/1565.cf381434.chunk.js.map",
     "2393.528e5343.chunk.js.map": "/.well-known/service/static/static/js/2393.528e5343.chunk.js.map",
     "5547.5f9be15f.chunk.css.map": "/.well-known/service/static/static/css/5547.5f9be15f.chunk.css.map",
-    "5547.2e5aa64f.chunk.js.map": "/.well-known/service/static/static/js/5547.2e5aa64f.chunk.js.map",
-    "4461.02f584b7.chunk.js.map": "/.well-known/service/static/static/js/4461.02f584b7.chunk.js.map",
+    "5547.980439e8.chunk.js.map": "/.well-known/service/static/static/js/5547.980439e8.chunk.js.map",
+    "4461.d60aa7be.chunk.js.map": "/.well-known/service/static/static/js/4461.d60aa7be.chunk.js.map",
     "5509.a196d497.chunk.js.map": "/.well-known/service/static/static/js/5509.a196d497.chunk.js.map",
     "5683.47011724.chunk.js.map": "/.well-known/service/static/static/js/5683.47011724.chunk.js.map",
     "7006.8f0645e5.chunk.js.map": "/.well-known/service/static/static/js/7006.8f0645e5.chunk.js.map",
@@ -171,7 +171,7 @@
     "7648.955e20c7.chunk.js.map": "/.well-known/service/static/static/js/7648.955e20c7.chunk.js.map",
     "4932.c7c954aa.chunk.js.map": "/.well-known/service/static/static/js/4932.c7c954aa.chunk.js.map",
     "2093.185a5563.chunk.js.map": "/.well-known/service/static/static/js/2093.185a5563.chunk.js.map",
-    "3255.2cf7c752.chunk.js.map": "/.well-known/service/static/static/js/3255.2cf7c752.chunk.js.map",
+    "716.cf9ba82c.chunk.js.map": "/.well-known/service/static/static/js/716.cf9ba82c.chunk.js.map",
     "5969.2791e4e5.chunk.js.map": "/.well-known/service/static/static/js/5969.2791e4e5.chunk.js.map",
     "8604.a8ef404e.chunk.js.map": "/.well-known/service/static/static/js/8604.a8ef404e.chunk.js.map",
     "6465.e704f56b.chunk.js.map": "/.well-known/service/static/static/js/6465.e704f56b.chunk.js.map",
@@ -186,6 +186,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.ee013f15.js"
+    "static/js/main.7dce6ab7.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico?imageFilter=resize&w=32"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.ee013f15.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico?imageFilter=resize&w=32"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.7dce6ab7.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>