@abtnode/util 1.16.25-next-bc2f4c63 → 1.16.26-beta-e0056285

package/lib/format-back-slash.js

@@ -1,4 +1,5 @@
-const lodash = require('lodash');
+const replace = require('lodash/replace');
+const escapeRegExp = require('lodash/escapeRegExp');
 
 /**
  * Replace the back slack('\') with forward slash('/')
@@ -6,4 +7,4 @@ const lodash = require('lodash');
  * @param {*} flag RegExp flag, default is 'g'
  * @returns
  */
-module.exports = (str) => lodash.replace(str, new RegExp(lodash.escapeRegExp('\\'), 'g'), '/');
+module.exports = (str) => replace(str, new RegExp(escapeRegExp('\\'), 'g'), '/');

package/lib/get-ec2-meta.js

@@ -1,12 +1,18 @@
-const axios = require('axios');
 const debug = require('debug')('get-ec2-meta');
+const axios = require('./axios');
 
 const HOST = 'http://169.254.169.254/latest';
 
 // Link: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-retrieval.html
 // Link: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-add-user-data.html
 const getEc2Meta = async (key, timeout = 5000) => {
-  const url = key === 'user-data' ? `${HOST}/${key}` : `${HOST}/meta-data/${key}`;
+  let url = `${HOST}/meta-data/${key}`;
+  if (key === 'user-data') {
+    url = `${HOST}/${key}`;
+  }
+  if (key === 'instance-identity') {
+    url = `${HOST}/dynamic/instance-identity/document`;
+  }
 
   try {
     const result = await axios.get(url, { timeout });
@@ -17,7 +23,30 @@ const getEc2Meta = async (key, timeout = 5000) => {
 
     return '';
   } catch (err) {
-    debug('Failed to fetch ec2 meta', err.message);
+    debug('Failed to fetch ec2 meta', err);
+
+    if (err.response?.status === 401) {
+      try {
+        let result = await axios.put(
+          `${HOST}/api/token`,
+          {},
+          {
+            timeout,
+            headers: {
+              'X-aws-ec2-metadata-token-ttl-seconds': 21600,
+            },
+          }
+        );
+        result = await axios.get(url, { timeout, headers: { 'X-aws-ec2-metadata-token': result.data } });
+        if (result.status === 200) {
+          return result.data;
+        }
+        return '';
+      } catch (e) {
+        debug('Failed to fetch ec2 meta with auth', e);
+      }
+    }
+
     return '';
   }
 };

package/lib/is-ec2.js

@@ -1,15 +1,10 @@
-const axios = require('./axios');
+const getEc2Meta = require('./get-ec2-meta');
 
 // Whether we are running in an pre-baked image
 // 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;
-  }
+  const meta = await getEc2Meta('instance-identity');
+  return !!meta;
 }
 
 module.exports = isEC2;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-next-bc2f4c63",
+  "version": "1.16.26-beta-e0056285",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,15 +18,15 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.25-next-bc2f4c63",
-    "@abtnode/logger": "1.16.25-next-bc2f4c63",
-    "@blocklet/constant": "1.16.25-next-bc2f4c63",
-    "@blocklet/meta": "1.16.25-next-bc2f4c63",
+    "@abtnode/constant": "1.16.26-beta-e0056285",
+    "@abtnode/logger": "1.16.26-beta-e0056285",
+    "@blocklet/constant": "1.16.26-beta-e0056285",
+    "@blocklet/meta": "1.16.26-beta-e0056285",
     "@ocap/client": "1.18.113",
     "@ocap/mcrypto": "1.18.113",
     "@ocap/util": "1.18.113",
     "@ocap/wallet": "1.18.113",
-    "archiver": "^5.3.1",
+    "archiver": "^7.0.1",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.2",
     "axon": "^2.0.3",
@@ -76,5 +76,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "499ecf2bde0cdb25dbfdd1cf7807212f5fe37ad9"
+  "gitHead": "a79b8637ad50d136e7c5d91bfb41dc7a7c337485"
 }