@abtnode/core 1.8.45 → 1.8.47

package/lib/blocklet/extras.js

@@ -3,19 +3,21 @@ const cloneDeep = require('lodash/cloneDeep');
 const security = require('@abtnode/util/lib/security');
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 
-const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '' }) => {
-  const metaConfigs = (oldConfigs || []).filter((x) => !x.custom);
-  const customConfigs = (oldConfigs || []).filter((x) => x.custom);
-
-  const metaConfigsToKeep = metaConfigs.filter((x) => newConfigs.find((n) => n.key === x.key || n.name === x.key));
+const removeDeletedMetaConfigs = (oldConfigs, newConfigs) =>
+  oldConfigs.filter((old) => newConfigs.some(({ key, name }) => [key, name].includes(old.key)));
 
+const mergeConfigs = ({ old: oldConfigs, cur: newConfigs = [], did = '', dek = '' }) => {
+  const enableSecurity = dek && did;
   const isUpdatingCustomConfig = newConfigs.every((x) => x.key);
-  const configs = isUpdatingCustomConfig ? metaConfigs : metaConfigsToKeep;
 
-  const enableSecurity = dek && did;
+  const customConfigs = (oldConfigs || []).filter((x) => x.custom);
+  const appConfigs = (oldConfigs || []).filter((x) => !x.custom && !!BLOCKLET_CONFIGURABLE_KEY[x.key]);
+
+  const allMetaConfigs = (oldConfigs || []).filter((x) => !x.custom && !BLOCKLET_CONFIGURABLE_KEY[x.key]);
+  const metaConfigs = isUpdatingCustomConfig ? allMetaConfigs : removeDeletedMetaConfigs(allMetaConfigs, newConfigs);
 
   // oldConfig 表示从数据库中可以用的字段
-  const oldConfig = [...configs, ...customConfigs].reduce((acc, x) => {
+  const oldConfig = [...metaConfigs, ...appConfigs, ...customConfigs].reduce((acc, x) => {
     acc[x.key] = {
       value: x.value,
       required: x.required,

package/lib/util/blocklet.js

@@ -677,14 +677,12 @@ const getProcessInfo = (processId) =>
 
 const deleteProcess = (processId) =>
   new Promise((resolve, reject) => {
-    pm2.connect(() => {
-      pm2.delete(processId, async (err) => {
-        if (isUsefulError(err)) {
-          logger.error('blocklet process delete failed', { error: err });
-          return reject(err);
-        }
-        return resolve();
-      });
+    pm2.delete(processId, async (err) => {
+      if (isUsefulError(err)) {
+        logger.error('blocklet process delete failed', { error: err });
+        return reject(err);
+      }
+      return resolve();
     });
   });
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.45",
+  "version": "1.8.47",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.45",
-    "@abtnode/certificate-manager": "1.8.45",
-    "@abtnode/constant": "1.8.45",
-    "@abtnode/cron": "1.8.45",
-    "@abtnode/db": "1.8.45",
-    "@abtnode/logger": "1.8.45",
-    "@abtnode/queue": "1.8.45",
-    "@abtnode/rbac": "1.8.45",
-    "@abtnode/router-provider": "1.8.45",
-    "@abtnode/static-server": "1.8.45",
-    "@abtnode/timemachine": "1.8.45",
-    "@abtnode/util": "1.8.45",
+    "@abtnode/auth": "1.8.47",
+    "@abtnode/certificate-manager": "1.8.47",
+    "@abtnode/constant": "1.8.47",
+    "@abtnode/cron": "1.8.47",
+    "@abtnode/db": "1.8.47",
+    "@abtnode/logger": "1.8.47",
+    "@abtnode/queue": "1.8.47",
+    "@abtnode/rbac": "1.8.47",
+    "@abtnode/router-provider": "1.8.47",
+    "@abtnode/static-server": "1.8.47",
+    "@abtnode/timemachine": "1.8.47",
+    "@abtnode/util": "1.8.47",
     "@arcblock/did": "1.18.31",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.31",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.31",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.31",
-    "@blocklet/constant": "1.8.45",
-    "@blocklet/meta": "1.8.45",
-    "@blocklet/sdk": "1.8.45",
+    "@blocklet/constant": "1.8.47",
+    "@blocklet/meta": "1.8.47",
+    "@blocklet/sdk": "1.8.47",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.31",
     "@ocap/util": "1.18.31",
@@ -82,5 +82,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "a84232c1a3bb713e3b9de41092d01694420cd8b5"
+  "gitHead": "87f368c3add9af5ae5c9db3b34682b743032acb4"
 }