@abtnode/util 1.16.8-beta-186fd5aa → 1.16.8-next-d1e52353

package/lib/lock.js

@@ -15,7 +15,7 @@ module.exports = class Lock {
           if (!this.locked) {
             this.locked = true;
             this.events.removeListener('release', tryAcquire);
-            resolve();
+            resolve(true);
           }
         };
 
@@ -23,7 +23,7 @@ module.exports = class Lock {
       } else {
         // Otherwise, take the lock and resolve immediately
         this.locked = true;
-        resolve();
+        resolve(true);
       }
     });
   }

package/lib/{user-avatar.js → user.js}

@@ -1,5 +1,6 @@
 const path = require('path');
 const fs = require('fs-extra');
+const cloneDeep = require('lodash/cloneDeep');
 
 const { USER_AVATAR_DIR, USER_AVATAR_URL_PREFIX } = require('@abtnode/constant');
 
@@ -62,8 +63,36 @@ const parseUserAvatar = async (avatar, { dataDir } = {}) => {
   return data;
 };
 
+function updateConnectedAccount(connectedAccounts = [], connectedAccount = {}) {
+  const now = new Date().toISOString();
+  const accounts = connectedAccounts.filter(Boolean);
+  const updated = cloneDeep(accounts);
+  const updates = Array.isArray(connectedAccount) ? connectedAccount : [connectedAccount];
+  updates.filter(Boolean).forEach((x) => {
+    if (x.provider && x.did) {
+      const index = updated.findIndex((item) => item.provider === x.provider && item.did === x.did);
+      if (index > -1) {
+        updated[index] = {
+          ...accounts[index],
+          ...x,
+          lastLoginAt: now,
+        };
+      } else {
+        updated.push({
+          firstLoginAt: now,
+          ...x,
+          lastLoginAt: now,
+        });
+      }
+    }
+  });
+
+  return updated;
+}
+
 module.exports = {
   extractUserAvatar,
   parseUserAvatar,
   getAvatarFile,
+  updateConnectedAccount,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-beta-186fd5aa",
+  "version": "1.16.8-next-d1e52353",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.8-beta-186fd5aa",
-    "@abtnode/logger": "1.16.8-beta-186fd5aa",
-    "@blocklet/constant": "1.16.8-beta-186fd5aa",
+    "@abtnode/constant": "1.16.8-next-d1e52353",
+    "@abtnode/logger": "1.16.8-next-d1e52353",
+    "@blocklet/constant": "1.16.8-next-d1e52353",
     "@ocap/client": "1.18.78",
     "@ocap/mcrypto": "1.18.78",
     "@ocap/util": "1.18.78",
@@ -71,5 +71,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "3150c3a5c3e041fe7f5a3902418d9d62adee3173"
+  "gitHead": "d357376aa3df9ef789befc7f548629deecb04d96"
 }