feat: delete inactivated users

* fs.promises use
* delete token array reassignment fix
* doc update

Author: pajgo

rfcs/inactive_users_cleanup.md

@@ -54,6 +54,9 @@ Function rendering `deleteInactivatedUsers.lua.hbs` and evals resulting script i
 The Script using a dozen constants, keys, and templates, so all these values rendered inside of the template using template context.
 Returns list of deleted users.
 
+*NOTE*: Using experimental `fs.promises.readFile` API function. On `node` 10.x it's an experimental feature,
+on `node` >= 11.x function becomes stable without any changes in API.
+
 #### deleteInactivatedUsers `USERS_ACTIVATED` `TTL` as seconds
 ##### Script paramerters:
 1. KEYS[1] Sorted Set name containing the list of users that didn't pass activation.

src/users.js

@@ -9,6 +9,7 @@ const RedisCluster = require('ioredis').Cluster;
 const Flakeless = require('ms-flakeless');
 const conf = require('./config');
 const get = require('./utils/get-value');
+const inactiveUsers = require('./utils/inactiveUsers');
 
 /**
  * @namespace Users
@@ -71,13 +72,13 @@ module.exports = class Users extends Microfleet {
     });
 
     this.on(`plugin:connect:${this.redisType}`, (redis) => {
-      const inactiveUsers = require('./utils/inactiveUsers');
       fsort.attach(redis, 'fsort');
 
       // init token manager
       const tokenManagerOpts = { backend: { connection: redis } };
       this.tokenManager = new TokenManager(merge({}, config.tokenManager, tokenManagerOpts));
 
+      // load deleteInactivatedUsers script from template and assign listener
       inactiveUsers.defineCommand(redis, config.redis);
       this.on('users:cleanup', inactiveUsers.cleanUsers);
     });
@@ -100,7 +101,7 @@ module.exports = class Users extends Microfleet {
     this.on(`plugin:close:${this.redisType}`, () => {
       this.dlock = null;
       this.tokenManager = null;
-      this.removeListener('users:cleanup');
+      this.removeListener('users:cleanup', inactiveUsers.cleanUsers);
     });
 
     // add migration connector

src/utils/inactiveUsers/defineCommand.js

@@ -1,7 +1,6 @@
-const Promise = require('bluebird');
 const hbs = require('handlebars');
 const path = require('path');
-const fs = require('fs');
+const fs = require('fs').promises;
 
 const key = require('../key');
 const {
@@ -57,10 +56,6 @@ const fields = {
   USERS_USERNAME_FIELD,
 };
 
-const readFile = f => Promise.fromCallback((cb) => {
-  return fs.readFile(f, 'utf-8', cb);
-});
-
 const prefixify = (prefix, obj) => {
   if (prefix !== '') {
     const objEntries = Object.entries(obj);
@@ -79,7 +74,7 @@ const prefixify = (prefix, obj) => {
  * @returns {Promise<void>}
  */
 async function compileTemplate(file, templateCtx) {
-  const contents = await readFile(file);
+  const contents = await fs.readFile(file, { encoding: 'utf-8' });
   const scriptTemplate = await hbs.compile(contents);
   const name = path.basename(file, '.lua.hbs');
 

src/utils/inactiveUsers/index.js

@@ -43,14 +43,13 @@ function cleanTokens(userIds) {
     USERS_ACTION_ORGANIZATION_INVITE, USERS_ACTION_ORGANIZATION_REGISTER,
   ];
 
-  const work = userIds.reduce((prev, id) => {
-    const delTokenActions = [];
+  const work = userIds.reduce((accum, id) => {
     for (const action of actions) {
-      delTokenActions.push(
+      accum.push(
         this.tokenManager.remove({ id, action })
       );
     }
-    return [...prev, ...delTokenActions];
+    return accum;
   }, []);
 
   return Promise.all(work);