@abtnode/core 1.16.25-next-4f765cf3 → 1.16.25-next-a0747dd3

package/lib/team/manager.js

@@ -25,8 +25,6 @@ const {
 
 const { isCLI, getDbFilePath } = require('../util');
 
-const rbacCreationLock = new Lock('rbac-creation-lock');
-
 const States = {
   User: require('../states/user'),
   UserSession: require('../states/user-session'),
@@ -203,8 +201,8 @@ class TeamManager extends EventEmitter {
         throw new Error('Blocklet Server rbac instance has not been initialized');
       }
 
-      // FIXME: cross process lock
-      await rbacCreationLock.acquire();
+      const lock = Lock.getLock(`init-rbac-${did}`);
+      await lock.acquire();
       try {
         logger.info('create rbac', { did });
         const models = await this.getModels(did);
@@ -221,10 +219,10 @@ class TeamManager extends EventEmitter {
           }
         }
 
-        rbacCreationLock.release();
+        lock.release();
         return rbac;
       } catch (error) {
-        rbacCreationLock.release();
+        lock.release();
         throw error;
       }
     }
@@ -441,6 +439,8 @@ class TeamManager extends EventEmitter {
       return;
     }
 
+    const lock = Lock.getLock(`init-database-${did}`);
+    await lock.acquire();
     const dbPath = await this.getDataFileByDid(did);
     logger.info('initDatabase', { did, dbPath });
     try {
@@ -448,6 +448,8 @@ class TeamManager extends EventEmitter {
     } catch (error) {
       // This error is not fatal, just log it, will happen when there are multiple service processes
       logger.error('initDatabase failed', { did, dbPath, error });
+    } finally {
+      lock.release();
     }
   }
 
@@ -458,11 +460,11 @@ class TeamManager extends EventEmitter {
   async getOwnerAndAdminUsers(did, approved) {
     const passportState = await this.getPassportState(did);
 
-    const passorts = await passportState.find({
+    const passports = await passportState.find({
       where: { [Op.or]: [{ role: 'owner' }, { role: 'admin' }] },
       attributes: ['userDid'],
     });
-    const userDids = passorts.map((d) => d.userDid);
+    const userDids = passports.map((d) => d.userDid);
 
     const userState = await this.getUserState(did);
     const users = await userState.find({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-next-4f765cf3",
+  "version": "1.16.25-next-a0747dd3",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.25-next-4f765cf3",
-    "@abtnode/auth": "1.16.25-next-4f765cf3",
-    "@abtnode/certificate-manager": "1.16.25-next-4f765cf3",
-    "@abtnode/constant": "1.16.25-next-4f765cf3",
-    "@abtnode/cron": "1.16.25-next-4f765cf3",
-    "@abtnode/logger": "1.16.25-next-4f765cf3",
-    "@abtnode/models": "1.16.25-next-4f765cf3",
-    "@abtnode/queue": "1.16.25-next-4f765cf3",
-    "@abtnode/rbac": "1.16.25-next-4f765cf3",
-    "@abtnode/router-provider": "1.16.25-next-4f765cf3",
-    "@abtnode/static-server": "1.16.25-next-4f765cf3",
-    "@abtnode/timemachine": "1.16.25-next-4f765cf3",
-    "@abtnode/util": "1.16.25-next-4f765cf3",
+    "@abtnode/analytics": "1.16.25-next-a0747dd3",
+    "@abtnode/auth": "1.16.25-next-a0747dd3",
+    "@abtnode/certificate-manager": "1.16.25-next-a0747dd3",
+    "@abtnode/constant": "1.16.25-next-a0747dd3",
+    "@abtnode/cron": "1.16.25-next-a0747dd3",
+    "@abtnode/logger": "1.16.25-next-a0747dd3",
+    "@abtnode/models": "1.16.25-next-a0747dd3",
+    "@abtnode/queue": "1.16.25-next-a0747dd3",
+    "@abtnode/rbac": "1.16.25-next-a0747dd3",
+    "@abtnode/router-provider": "1.16.25-next-a0747dd3",
+    "@abtnode/static-server": "1.16.25-next-a0747dd3",
+    "@abtnode/timemachine": "1.16.25-next-a0747dd3",
+    "@abtnode/util": "1.16.25-next-a0747dd3",
     "@arcblock/did": "1.18.113",
     "@arcblock/did-auth": "1.18.113",
     "@arcblock/did-ext": "^1.18.113",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.113",
     "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25-next-4f765cf3",
-    "@blocklet/env": "1.16.25-next-4f765cf3",
-    "@blocklet/meta": "1.16.25-next-4f765cf3",
-    "@blocklet/resolver": "1.16.25-next-4f765cf3",
-    "@blocklet/sdk": "1.16.25-next-4f765cf3",
+    "@blocklet/constant": "1.16.25-next-a0747dd3",
+    "@blocklet/env": "1.16.25-next-a0747dd3",
+    "@blocklet/meta": "1.16.25-next-a0747dd3",
+    "@blocklet/resolver": "1.16.25-next-a0747dd3",
+    "@blocklet/sdk": "1.16.25-next-a0747dd3",
     "@did-space/client": "^0.3.67",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.113",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "acc090d310154d381747b0586133724ef09229fd"
+  "gitHead": "1b8ffe184a925ffac92f6b06eaaaf775d2923bb6"
 }