@abtnode/util 1.16.7 → 1.16.8-beta-0c0c5eb2

package/lib/format-context.js

@@ -1,10 +1,13 @@
+const omit = require('lodash/omit');
 const get = require('lodash/get');
 
 // Format context: https://github.com/graphql/express-graphql
 module.exports = (ctx = {}) => {
-  if (ctx && ctx.user) {
-    delete ctx.user.avatar;
-  }
+  // 不要更改入参的值，base case
+  // if (ctx && ctx.user) {
+  //   delete ctx.user.avatar;
+  // }
+  const contextUser = omit(ctx?.user || {}, 'avatar');
 
   const safeGet = (key, _default = '') =>
     (typeof ctx.get === 'function' ? ctx.get(key) : get(ctx, `headers[${key}]`)) || _default;
@@ -13,7 +16,7 @@ module.exports = (ctx = {}) => {
     ip: safeGet('x-real-ip', '127.0.0.1'),
     ua: safeGet('user-agent'),
     protocol: safeGet('x-real-protocol').replace(/:$/, '') || 'http',
-    user: ctx.user || {},
+    user: contextUser,
     url: ctx.originalUrl,
     query: ctx.query,
     hostname: safeGet('x-real-hostname'),

package/lib/run-script.js

@@ -5,6 +5,17 @@ const which = require('which');
 const stream = require('stream');
 const spawn = require('cross-spawn');
 
+const getDate = () => {
+  const date = new Date();
+  const year = date.getFullYear();
+  const month = `0${date.getMonth() + 1}`.slice(-2);
+  const day = `0${date.getDate()}`.slice(-2);
+  const hours = `0${date.getHours()}`.slice(-2);
+  const minutes = `0${date.getMinutes()}`.slice(-2);
+  const seconds = `0${date.getSeconds()}`.slice(-2);
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
+
 class PrefixTransform extends stream.Transform {
   constructor(prefix, state) {
     super();
@@ -15,7 +26,8 @@ class PrefixTransform extends stream.Transform {
 
   // transform all output from child process with a prefix for better readability
   _transform(chunk, _encoding, callback) {
-    const { prefix, state } = this;
+    const { prefix: rawPrefix, state } = this;
+    const prefix = `[${getDate()}] ${rawPrefix}`;
     const nPrefix = `\n${prefix}`;
     const firstPrefix = state.lastIsLineBreak ? prefix : state.lastPrefix !== prefix ? '\n' : '';
     const prefixed = `${firstPrefix}${chunk}`.replace(/\n/g, nPrefix);

package/lib/url-evaluation/index.js

@@ -82,6 +82,7 @@ const evaluateURLs = async (urls, options = {}) => {
 
 module.exports = {
   isIpEcho,
+  isDidDomain,
   evaluateURL,
   evaluateURLs,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.7",
+  "version": "1.16.8-beta-0c0c5eb2",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.7",
-    "@abtnode/logger": "1.16.7",
-    "@blocklet/constant": "1.16.7",
+    "@abtnode/constant": "1.16.8-beta-0c0c5eb2",
+    "@abtnode/logger": "1.16.8-beta-0c0c5eb2",
+    "@blocklet/constant": "1.16.8-beta-0c0c5eb2",
     "@ocap/client": "1.18.78",
     "@ocap/mcrypto": "1.18.78",
     "@ocap/util": "1.18.78",
@@ -71,5 +71,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "dadd7bfa319e2ee5144bdccb6e280ffe4b8d2679"
+  "gitHead": "0d8ec3154caf670770284dbdabc61a5f4e8b205f"
 }