@abtnode/util 1.8.1 → 1.8.4

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/run-script.js

@@ -84,7 +84,7 @@ const runScript = (script, label, options = {}) => {
     const stderr = wrapStream(process.stderr, label, state);
 
     child = spawn(command, args, {
-      timeout: 30 * 60 * 1000,
+      timeout: 2 * 60 * 1000,
       detached: false,
       shell: false,
       stdio: ['ignore', 'pipe', 'pipe'],

package/package.json

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

package/lib/public-to-store.js

@@ -1,81 +0,0 @@
-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}
- */
-async function handleInstanceInStore(blocklet, { userDid = null, publicToStore = true } = {}) {
-  if (!blocklet) {
-    throw new Error('blocklet argument is required');
-  }
-
-  const ownerDid = userDid || blocklet.settings?.owner?.did;
-  if (!verifyPublicInstance(blocklet)) {
-    throw new Error('no permission to set publicInstance ');
-  }
-
-  if (!ownerDid) {
-    return false;
-  }
-
-  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 });
-    }
-  } else {
-    try {
-      await api.put(`/api/blocklet-instances/${appId}`, body);
-    } catch (error) {
-      logger.error('failed to update blocklet instance', { error });
-    }
-  }
-  return true;
-}
-
-module.exports = handleInstanceInStore;