@abtnode/util 1.8.36 → 1.8.38

package/lib/nft.js

@@ -0,0 +1,15 @@
+const last = require('lodash/last');
+const get = require('lodash/get');
+
+const getNftExpirationDate = (asset) => last(get(asset, 'data.value.expirationDate', []));
+
+const isNFTExpired = (asset) => {
+  const expirationDate = getNftExpirationDate(asset);
+  return isDateExpired(expirationDate);
+};
+
+const isDateExpired = (expirationDate) => !!expirationDate && new Date(expirationDate).getTime() <= Date.now();
+
+const isNFTConsumed = (asset) => !!asset.data.value.consumedTime;
+
+module.exports = { isNFTExpired, getNftExpirationDate, isNFTConsumed };

package/lib/security.js

@@ -4,7 +4,34 @@ const AES = require('@ocap/mcrypto/lib/crypter/aes').default;
 const encrypt = (m, s, i) => AES.encrypt(m, crypto.pbkdf2Sync(i, s, 256, 32, 'sha512').toString('hex'));
 const decrypt = (m, s, i) => AES.decrypt(m, crypto.pbkdf2Sync(i, s, 256, 32, 'sha512').toString('hex'));
 
+const formatEnv = (raw, stringifyObject = true) => {
+  let value = raw;
+
+  // ensure no
+  if (Array.isArray(value) && value.every((x) => x.originFileObj && x.url)) {
+    value = value.map((x) => x.url);
+    if (value.length === 1) {
+      [value] = value;
+    }
+  }
+
+  // ensure no objects
+  if (stringifyObject) {
+    if (value && typeof value === 'object') {
+      value = JSON.stringify(value);
+    }
+  }
+
+  // ensure no line breaks for environment variables
+  if (value && typeof value === 'string') {
+    value = value.replace(/(\r\n|\n|\r)/gm, ' ');
+  }
+
+  return value;
+};
+
 module.exports = {
   encrypt,
   decrypt,
+  formatEnv,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.36",
+  "version": "1.8.38",
   "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.36",
-    "@abtnode/logger": "1.8.36",
-    "@arcblock/jwt": "^1.18.15",
-    "@blocklet/constant": "1.8.36",
-    "@ocap/mcrypto": "1.18.15",
-    "@ocap/util": "1.18.15",
-    "@ocap/wallet": "1.18.15",
+    "@abtnode/constant": "1.8.38",
+    "@abtnode/logger": "1.8.38",
+    "@arcblock/jwt": "^1.18.18",
+    "@blocklet/constant": "1.8.38",
+    "@ocap/mcrypto": "1.18.18",
+    "@ocap/util": "1.18.18",
+    "@ocap/wallet": "1.18.18",
     "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": "507e974ce88bad1aa002c593130b32982207f803"
+  "gitHead": "cbb88f107eb6b403c8cd47a765920575860c7bc7"
 }