@abtnode/util 1.8.47 → 1.8.49

package/lib/get-ip.js

@@ -16,7 +16,7 @@ const getExternalIp = async ({ v6 = false, timeout = 5000 } = {}) => {
 
 const getIP = async ({ includeV6 = false, timeout = 5000, includeExternal = true } = {}) => {
   try {
-    if (isEC2()) {
+    if (await isEC2()) {
       const [internal, external, internalV6, externalV6] = await Promise.all([
         getEc2Meta('local-ipv4', timeout),
         includeExternal ? getEc2Meta('public-ipv4', timeout) : '',

package/lib/is-ec2.js

@@ -1,14 +1,15 @@
-const fs = require('fs');
+const axios = require('./axios');
 
 // Whether we are running in an pre-baked image
-function isEC2() {
-  const identifyFile = '/sys/hypervisor/uuid';
-  if (fs.existsSync(identifyFile)) {
-    const identity = fs.readFileSync(identifyFile).toString();
-    return identity.toLowerCase().startsWith('ec2');
+// refer: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify_ec2_instances.html
+async function isEC2() {
+  try {
+    const url = 'http://169.254.169.254/latest/dynamic/instance-identity/document';
+    const { status } = await axios.get(url, { timeout: 1000 });
+    return status === 200;
+  } catch {
+    return false;
   }
-
-  return false;
 }
 
 module.exports = isEC2;

package/lib/logo-middleware.js

@@ -0,0 +1,136 @@
+const fs = require('fs');
+const path = require('path');
+const get = require('lodash/get');
+
+const logger = require('@abtnode/logger')('@abtnode/util:logo-middleware');
+
+const ensureBlockletExist = async (req, res, next) => {
+  const { blocklet } = req;
+
+  if (!blocklet || !get(blocklet, 'env.appDir')) {
+    res.sendFallbackLogo();
+    return;
+  }
+
+  next();
+};
+
+const ensureCustomSquareLogo = async (req, res, next) => {
+  const { blocklet, sendOptions } = req;
+
+  const customLogoSquare = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_SQUARE');
+
+  if (customLogoSquare) {
+    if (customLogoSquare.startsWith('http')) {
+      res.redirect(customLogoSquare);
+      return;
+    }
+
+    const logoFile = path.join(get(blocklet, 'env.appDir'), customLogoSquare);
+    if (fs.existsSync(logoFile)) {
+      res.sendFile(logoFile, sendOptions);
+      return;
+    }
+  }
+
+  next();
+};
+
+const ensureBundleLogo = async (req, res, next) => {
+  const { blocklet, sendOptions } = req;
+
+  if (blocklet.meta.logo) {
+    const logoFile = path.join(get(blocklet, 'env.appDir'), blocklet.meta.logo);
+
+    if (fs.existsSync(logoFile)) {
+      res.sendFile(logoFile, sendOptions);
+      return;
+    }
+  }
+
+  next();
+};
+
+const fallbackLogo = async (req, res) => {
+  res.sendFallbackLogo();
+};
+
+// eslint-disable-next-line no-unused-vars
+const cacheError = async (err, req, res, next) => {
+  logger.error('failed to send blocklet logo', { url: req.url, error: err });
+  res.sendFallbackLogo();
+};
+
+const ensureDefaultLogo = async (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);
+      return;
+    }
+
+    const logoPngFile = path.join(get(blocklet, 'env.dataDir'), 'logo.png');
+    if (fs.existsSync(logoPngFile)) {
+      res.sendFile(logoPngFile, sendOptions);
+      return;
+    }
+  }
+
+  next();
+};
+
+const ensureCustomFavicon = async (req, res, next) => {
+  const { blocklet, sendOptions } = req;
+
+  const customLogoFavicon = get(blocklet, 'environmentObj.BLOCKLET_APP_LOGO_FAVICON');
+  if (customLogoFavicon) {
+    if (customLogoFavicon.startsWith('http')) {
+      res.redirect(customLogoFavicon);
+      return;
+    }
+
+    const logoFile = path.join(get(blocklet, 'env.appDir'), customLogoFavicon);
+    if (fs.existsSync(logoFile)) {
+      res.sendFile(logoFile, sendOptions);
+      return;
+    }
+  }
+
+  next();
+};
+
+const attachSendLogoContext =
+  ({ onSendFallbackLogo, onGetBlocklet }) =>
+  async (req, res, next) => {
+    const sendOptions = { maxAge: '1d' };
+
+    req.sendOptions = sendOptions;
+
+    try {
+      req.blocklet = await onGetBlocklet({ req });
+    } catch (error) {
+      logger.error('failed to get blocklet', { url: req.url, error });
+      req.blocklet = null;
+    }
+
+    res.sendFallbackLogo = () => {
+      onSendFallbackLogo({ res, sendOptions });
+    };
+
+    next();
+  };
+
+module.exports = {
+  attachSendLogoContext,
+  ensureBlockletExist,
+  ensureCustomSquareLogo,
+  ensureBundleLogo,
+  ensureCustomFavicon,
+  ensureDefaultLogo,
+  fallbackLogo,
+  cacheError,
+};

package/lib/security.js

@@ -30,8 +30,16 @@ const formatEnv = (raw, stringifyObject = true) => {
   return value;
 };
 
+// https://github.com/joaquimserafim/base64-url/blob/54d9c9ede66a8724f280cf24fd18c38b9a53915f/index.js#L10
+const escape = (str) => str.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+const encodeEncryptionKey = (key) => escape(Buffer.from(key).toString('base64'));
+const unescape = (str) => (str + '==='.slice((str.length + 3) % 4)).replace(/-/g, '+').replace(/_/g, '/');
+const decodeEncryptionKey = (str) => new Uint8Array(Buffer.from(unescape(str), 'base64'));
+
 module.exports = {
   encrypt,
   decrypt,
   formatEnv,
+  encodeEncryptionKey,
+  decodeEncryptionKey,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.47",
+  "version": "1.8.49",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,13 +18,13 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.47",
-    "@abtnode/logger": "1.8.47",
-    "@arcblock/jwt": "^1.18.31",
-    "@blocklet/constant": "1.8.47",
-    "@ocap/mcrypto": "1.18.31",
-    "@ocap/util": "1.18.31",
-    "@ocap/wallet": "1.18.31",
+    "@abtnode/constant": "1.8.49",
+    "@abtnode/logger": "1.8.49",
+    "@arcblock/jwt": "^1.18.32",
+    "@blocklet/constant": "1.8.49",
+    "@ocap/mcrypto": "1.18.32",
+    "@ocap/util": "1.18.32",
+    "@ocap/wallet": "1.18.32",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
     "axon": "^2.0.3",
@@ -63,5 +63,5 @@
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1"
   },
-  "gitHead": "87f368c3add9af5ae5c9db3b34682b743032acb4"
+  "gitHead": "627ac4fb21957fcbaf7c2c21e77de0f51ef9e30d"
 }