@abtnode/util 1.16.15-beta-9318a201 → 1.16.15-beta-ed0db59e

package/lib/logo-middleware.js

@@ -1,12 +1,13 @@
 const fs = require('fs');
+const http = require('http');
+const https = require('https');
 const path = require('path');
 const get = require('lodash/get');
 
 const logger = require('@abtnode/logger')('@abtnode/util:logo-middleware');
 
 /**
- *
- * @param {import('express').Request} req
+ * @param {import('express').Request & {blocklet: any, sendOptions: any}} req
  * @param {import('express').Response & {sendFallbackLogo: Function} } res
  * @param {import('express').NextFunction} next
  * @returns
@@ -23,9 +24,46 @@ const ensureBlockletExist = (req, res, next) => {
 };
 
 /**
- *
  * @param {import('express').Request} req
  * @param {import('express').Response & {sendFallbackLogo: Function} } res
+ * @param {string} url
+ * @returns
+ */
+const sendCustomRemoteFile = (req, res, url) => {
+  const tmp = new URL(url);
+  // pass along image filter params
+  Object.keys(req.query || {}).forEach((key) => {
+    if (tmp.searchParams.get(key)) {
+      return;
+    }
+    tmp.searchParams.set(key, req.query[key]);
+  });
+
+  const opts = Object.assign(new URL(tmp.href), {
+    method: req.method,
+    headers: req.headers,
+  });
+
+  const request = opts.protocol === 'https:' ? https.request : http.request;
+
+  request(opts, (x) => {
+    ['content-type', 'content-length', 'cache-control', 'date', 'etag', 'last-modified'].forEach((key) => {
+      if (x.headers[key]) {
+        res.header(key, x.headers[key]);
+      }
+    });
+    x.pipe(res);
+  })
+    .on('error', (err) => {
+      logger.error('failed to get customized logo', { url: req.url, error: err });
+      res.sendFallbackLogo();
+    })
+    .end();
+};
+
+/**
+ * @param {import('express').Request & {blocklet: any, sendOptions: any}} req
+ * @param {import('express').Response & {sendFallbackLogo: Function, sendLogoFile: Function} } res
  * @param {import('express').NextFunction} next
  * @returns
  */
@@ -34,16 +72,15 @@ const ensureCustomSquareLogo = (req, res, next) => {
 
   /** @type {string} */
   const customLogoSquare = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_SQUARE');
-
   if (customLogoSquare) {
     if (customLogoSquare.startsWith('http')) {
-      res.redirect(customLogoSquare);
+      sendCustomRemoteFile(req, res, customLogoSquare);
       return;
     }
 
     const logoFile = path.join(get(blocklet, 'env.appDir'), customLogoSquare);
     if (fs.existsSync(logoFile)) {
-      res.sendFile(logoFile, sendOptions);
+      res.sendLogoFile(logoFile, sendOptions);
       return;
     }
   }
@@ -53,8 +90,8 @@ const ensureCustomSquareLogo = (req, res, next) => {
 
 /**
  *
- * @param {import('express').Request} req
- * @param {import('express').Response & {sendFallbackLogo: Function} } res
+ * @param {import('express').Request & {blocklet: any, sendOptions: any}} req
+ * @param {import('express').Response & {sendFallbackLogo: Function, sendLogoFile: Function} } res
  * @param {import('express').NextFunction} next
  * @returns
  */
@@ -71,7 +108,7 @@ const ensureBundleLogo = (req, res, next) => {
     const logoFile = path.join(get(blocklet, 'env.appDir'), blocklet.meta.logo);
 
     if (fs.existsSync(logoFile)) {
-      res.sendFile(logoFile, sendOptions);
+      res.sendLogoFile(logoFile, sendOptions);
       return;
     }
   }
@@ -96,9 +133,8 @@ const cacheError = (err, req, res, next) => {
 };
 
 /**
- *
- * @param {import('express').Request} req
- * @param {import('express').Response & {sendFallbackLogo: Function} } res
+ * @param {import('express').Request & {blocklet: any, sendOptions: any}} req
+ * @param {import('express').Response & {sendFallbackLogo: Function, sendLogoFile: Function} } res
  * @param {import('express').NextFunction} next
  * @returns
  */
@@ -112,8 +148,6 @@ const ensureDefaultLogo = (req, res, next) => {
   const { blocklet, sendOptions } = req;
 
   if (blocklet && get(blocklet, 'env.dataDir')) {
-    get(blocklet, 'env.dataDir');
-
     const logoSvgFile = path.join(get(blocklet, 'env.dataDir'), 'logo.svg');
     if (fs.existsSync(logoSvgFile)) {
       res.sendFile(logoSvgFile, sendOptions);
@@ -122,7 +156,7 @@ const ensureDefaultLogo = (req, res, next) => {
 
     const logoPngFile = path.join(get(blocklet, 'env.dataDir'), 'logo.png');
     if (fs.existsSync(logoPngFile)) {
-      res.sendFile(logoPngFile, sendOptions);
+      res.sendLogoFile(logoPngFile, sendOptions);
       return;
     }
   }
@@ -131,9 +165,8 @@ const ensureDefaultLogo = (req, res, next) => {
 };
 
 /**
- *
- * @param {import('express').Request} req
- * @param {import('express').Response & {sendFallbackLogo: Function} } res
+ * @param {import('express').Request & {blocklet: any, sendOptions: any}} req
+ * @param {import('express').Response & {sendFallbackLogo: Function, sendLogoFile: Function} } res
  * @param {import('express').NextFunction} next
  * @returns
  */
@@ -149,13 +182,13 @@ const ensureCustomFavicon = (req, res, next) => {
   const customLogoFavicon = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_FAVICON');
   if (customLogoFavicon) {
     if (customLogoFavicon.startsWith('http')) {
-      res.redirect(customLogoFavicon);
+      sendCustomRemoteFile(req, res, customLogoFavicon);
       return;
     }
 
     const logoFile = path.join(get(blocklet, 'env.appDir'), customLogoFavicon);
     if (fs.existsSync(logoFile)) {
-      res.sendFile(logoFile, sendOptions);
+      res.sendLogoFile(logoFile, sendOptions);
       return;
     }
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-9318a201",
+  "version": "1.16.15-beta-ed0db59e",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.15-beta-9318a201",
-    "@abtnode/logger": "1.16.15-beta-9318a201",
-    "@blocklet/constant": "1.16.15-beta-9318a201",
+    "@abtnode/constant": "1.16.15-beta-ed0db59e",
+    "@abtnode/logger": "1.16.15-beta-ed0db59e",
+    "@blocklet/constant": "1.16.15-beta-ed0db59e",
     "@ocap/client": "1.18.89",
     "@ocap/mcrypto": "1.18.89",
     "@ocap/util": "1.18.89",
@@ -71,5 +71,5 @@
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "f3722cbd4fe10c5fa083cad7e859ecff6095060d"
+  "gitHead": "647ebe45f6214ea5c284c9234f1319b6ff72f915"
 }