@abtnode/util 1.7.27 → 1.8.2

package/lib/axios.js

@@ -2,6 +2,4 @@
 // https://github.com/axios/axios/issues/3384
 const { default: axios } = require('axios');
 
-axios.defaults.proxy = false;
-
 module.exports = axios;

package/lib/download-file.js

@@ -6,6 +6,39 @@ const axios = require('./axios');
 
 const CANCEL = '__cancel__';
 
+/**
+ *
+ *
+ * @param {Stream} stream
+ * @returns {Promise<string>}
+ */
+async function getErrorMessageFromStream(stream) {
+  const str = await streamToString(stream);
+
+  try {
+    const json = JSON.parse(str);
+    return json.error;
+  } catch (error) {
+    return str;
+  }
+}
+
+/**
+ *
+ *
+ * @param {*} stream
+ * @return {Promise<string>}
+ */
+async function streamToString(stream) {
+  const chunks = [];
+
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
+  }
+
+  return Buffer.concat(chunks).toString('utf-8');
+}
+
 /**
  *
  *
@@ -80,6 +113,11 @@ const downloadFile = async (url, dest, { timeout = 600 * 1000, cancelCtrl } = {}
     }
 
     source.cancel();
+
+    if (err?.response?.data) {
+      throw new Error(await getErrorMessageFromStream(err.response.data));
+    }
+
     throw err;
   }
 };

package/lib/public-to-store.js

@@ -0,0 +1,85 @@
+const { sign } = require('@arcblock/jwt');
+const { BlockletSource } = require('@blocklet/meta/lib/constants');
+const { WHO_CAN_ACCESS } = require('@abtnode/constant');
+const logger = require('@abtnode/logger')('@abtnode/util:public-to-store');
+
+const getWallet = require('./get-app-wallet');
+const axios = require('./axios');
+
+const getAppToken = (blocklet) =>
+  sign(blocklet.environmentObj?.BLOCKLET_APP_ID, blocklet.environmentObj?.BLOCKLET_APP_SK);
+
+const getAppId = (blocklet) => blocklet.environmentObj?.BLOCKLET_APP_ID;
+
+const getAppSK = (blocklet) => blocklet.environmentObj?.BLOCKLET_APP_SK;
+
+const getBlockletDid = (blocklet) => blocklet.meta?.bundleDid;
+
+const getAppUrl = (blocklet) => blocklet.environmentObj?.BLOCKLET_APP_URL;
+
+/**
+ * verify manages the permissions of blocklet public instance
+ * @param {*} blocklet
+ * @returns bool
+ */
+const verifyPublicInstance = (blocklet) => {
+  const { whoCanAccess = WHO_CAN_ACCESS.ALL } = blocklet.settings;
+  return blocklet.source === BlockletSource.registry && whoCanAccess === WHO_CAN_ACCESS.ALL;
+};
+
+/**
+ *
+ * @param {*} blocklet
+ * @param {*} {userDid publicToStore}
+ * @returns bool
+ */
+async function handleInstanceInStore(blocklet, { userDid = null, publicToStore = false } = {}) {
+  if (!blocklet) {
+    logger.error('blocklet argument is required');
+    throw new Error('blocklet argument is required');
+  }
+
+  const ownerDid = userDid || blocklet.settings?.owner?.did;
+  if (!ownerDid) {
+    return false;
+  }
+
+  if (!verifyPublicInstance(blocklet)) {
+    logger.error('no permission to set publicInstance');
+    throw new Error('no permission to set publicInstance');
+  }
+
+  const appToken = getAppToken(blocklet);
+  const blockletDid = getBlockletDid(blocklet);
+  const appId = getAppId(blocklet);
+  const appSK = getAppSK(blocklet);
+  const wallet = getWallet(appSK);
+  const body = {
+    appToken,
+    appId,
+    appPK: wallet.publicKey,
+    ownerDid,
+    appUrl: getAppUrl(blocklet),
+    blockletDid,
+  };
+
+  const api = axios.create({ baseURL: blocklet.deployedFrom, timeout: 1000 * 10 });
+  if (!publicToStore) {
+    try {
+      await api.delete(`/api/blocklet-instances/${appId}`, { data: body });
+    } catch (error) {
+      logger.error('failed to delete blocklet instance', { error });
+      throw new Error('failed to delete blocklet instance');
+    }
+  } else {
+    try {
+      await api.put(`/api/blocklet-instances/${appId}`, body);
+    } catch (error) {
+      logger.error('failed to update blocklet instance', { error });
+      throw new Error('failed to delete blocklet instance');
+    }
+  }
+  return true;
+}
+
+module.exports = handleInstanceInStore;

package/lib/sleep.js

@@ -1 +1,2 @@
+// eslint-disable-next-line no-promise-executor-return
 module.exports = (timeout = 0) => new Promise((resolve) => setTimeout(resolve, timeout));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.27",
+  "version": "1.8.2",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,10 +18,13 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.27",
-    "@ocap/mcrypto": "1.17.0",
-    "@ocap/util": "1.17.0",
-    "@ocap/wallet": "1.17.0",
+    "@abtnode/constant": "1.8.2",
+    "@abtnode/logger": "1.8.2",
+    "@arcblock/jwt": "^1.17.2",
+    "@blocklet/meta": "1.8.2",
+    "@ocap/mcrypto": "1.17.2",
+    "@ocap/util": "1.17.2",
+    "@ocap/wallet": "1.17.2",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.20.0",
     "axon": "^2.0.3",
@@ -56,5 +59,5 @@
     "fs-extra": "^10.0.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "81a5492df66389b0aede13f033d1e493450833bc"
+  "gitHead": "fcbe3c97f3825c507ee16714f49bbf8f58c5b59f"
 }