@abtnode/util 1.16.13-beta-55b3e93d → 1.16.13-beta-423a40b1

package/lib/ensure-endpoint-healthy.js

@@ -36,9 +36,7 @@ const ensureStarted = async ({ host, port, timeout = 10 * ONE_SECOND, elapse = 0
     const spend = elapse + (Date.now() - startTime);
 
     if (spend >= timeout) {
-      throw new Error(
-        `the service is not ready within ${Math.ceil(timeout / ONE_SECOND)} seconds, please check your network`
-      );
+      throw new Error(`service not ready within ${Math.ceil(timeout / ONE_SECOND)} seconds`);
     }
 
     return ensureStarted({ host, port, timeout, elapse: spend });
@@ -46,7 +44,7 @@ const ensureStarted = async ({ host, port, timeout = 10 * ONE_SECOND, elapse = 0
 };
 
 const ensureHealthy = async ({ host, port, minConsecutiveTime = 5 * ONE_SECOND }) => {
-  const checkInterval = 100; // ms
+  const checkInterval = 200; // ms
   const minCheckTimes = Math.ceil(minConsecutiveTime / checkInterval);
 
   debug('check if healthy', { port });

package/lib/express-bearer-token.js

@@ -0,0 +1,90 @@
+/**
+ * Fork from https://github.com/tkellen/js-express-bearer-token
+ */
+
+const parseCookie = require('cookie').parse;
+const decodeCookie = require('cookie-parser').signedCookie;
+
+const getCookie = (serializedCookies, key) => parseCookie(serializedCookies)[key] || false;
+
+module.exports = (opts) => {
+  if (!opts) {
+    // eslint-disable-next-line no-param-reassign
+    opts = {
+      cookie: false,
+    };
+  }
+
+  const queryKey = opts.queryKey || 'access_token';
+  const bodyKey = opts.bodyKey || 'access_token';
+  const headerName = opts.headerName || 'authorization';
+  const headerKey = opts.headerKey || 'Bearer';
+  const reqKey = opts.reqKey || 'token';
+  const { cookie } = opts;
+
+  if (cookie && !cookie.key) {
+    cookie.key = 'access_token';
+  }
+
+  if (cookie && cookie.signed && !cookie.secret) {
+    throw new Error(
+      '[express-bearer-token]: You must provide a secret token to cookie attribute, or disable signed property'
+    );
+  }
+
+  return (req, res, next) => {
+    let token;
+    let error;
+
+    // query
+    if (req.query && req.query[queryKey]) {
+      token = req.query[queryKey];
+    }
+
+    // body
+    if (req.body && req.body[bodyKey]) {
+      if (token) {
+        error = true;
+      }
+      token = req.body[bodyKey];
+    }
+
+    // headers
+    if (req.headers) {
+      if (req.headers[headerName]) {
+        const parts = req.headers[headerName].split(' ');
+        if (parts.length === 2 && parts[0] === headerKey) {
+          if (token) {
+            error = true;
+          }
+          // eslint-disable-next-line prefer-destructuring
+          token = parts[1];
+        }
+      }
+
+      // cookie
+      if (cookie && req.headers.cookie) {
+        const plainCookie = getCookie(req.headers.cookie || '', cookie.key); // seeks the key
+        if (plainCookie) {
+          const cookieToken = cookie.signed ? decodeCookie(plainCookie, cookie.secret) : plainCookie;
+
+          if (cookieToken) {
+            if (token) {
+              error = true;
+            }
+            token = cookieToken;
+          }
+        }
+      }
+    }
+
+    // RFC6750 states the access_token MUST NOT be provided
+    // in more than one place in a single request.
+    if (error) {
+      res.status(400).send('Access token found in multiple locations');
+    } else {
+      req[reqKey] = token;
+      next();
+    }
+  };
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13-beta-55b3e93d",
+  "version": "1.16.13-beta-423a40b1",
   "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.13-beta-55b3e93d",
-    "@abtnode/logger": "1.16.13-beta-55b3e93d",
-    "@blocklet/constant": "1.16.13-beta-55b3e93d",
+    "@abtnode/constant": "1.16.13-beta-423a40b1",
+    "@abtnode/logger": "1.16.13-beta-423a40b1",
+    "@blocklet/constant": "1.16.13-beta-423a40b1",
     "@ocap/client": "1.18.84",
     "@ocap/mcrypto": "1.18.84",
     "@ocap/util": "1.18.84",
@@ -29,6 +29,8 @@
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
     "axon": "^2.0.3",
+    "cookie": "^0.5.0",
+    "cookie-parser": "^1.4.6",
     "cross-spawn": "^7.0.3",
     "dayjs": "^1.11.7",
     "debug": "^4.3.4",
@@ -65,11 +67,12 @@
     "which": "^2.0.2"
   },
   "devDependencies": {
+    "cookie-signature": "^1.0.6",
     "detect-port": "^1.5.1",
     "express": "^4.18.2",
     "fs-extra": "^10.1.0",
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "1c734de99ff70fad99e9cc3fb55834e0bb6f5bfd"
+  "gitHead": "1aee04f45042bd4784ca72f9f8b93918980be4d4"
 }