mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

db/ReadOnlyManager.js: completed conversion

Browse source 
Requires temporary hack within `Pad.remove()` to allow for the lack of
callback on the rewritten version.
This commit is contained in:
Ray Bellis 2019-01-30 16:19:51 +00:00
parent bb80325d2c
commit 5192a0c498
2 changed files with 30 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/db/Pad.js
View file

@ -19,6 +19,7 @@ var crypto = require("crypto");
var randomString = require("../utils/randomstring"); var randomString = require("../utils/randomstring");
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks'); var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const thenify = require("thenify").withCallback; const thenify = require("thenify").withCallback;
const nodeify = require("nodeify");
// serialization/deserialization attributes // serialization/deserialization attributes
var attributeBlackList = ["id"]; var attributeBlackList = ["id"];
@ -621,7 +622,12 @@ Pad.prototype.remove = thenify(function remove(callback) {
// remove the readonly entries // remove the readonly entries
function(callback) { function(callback) {
readOnlyManager.getReadOnlyId(padID, function(err, readonlyID) { // @TODO - temporary until surrounding code is Promisified
function getReadOnlyId(padID, callback) {
return nodeify(readOnlyManager.getReadOnlyId(padID), callback);
}
getReadOnlyId(padID, function(err, readonlyID) {
if (ERR(err, callback)) return; if (ERR(err, callback)) return;
db.remove("pad2readonly:" + padID); db.remove("pad2readonly:" + padID);

67
src/node/db/ReadOnlyManager.js
View file

@ -19,80 +19,47 @@
*/ */
var ERR = require("async-stacktrace"); var db = require("./DB");
var db = require("./DB").db;
var async = require("async");
var randomString = require("../utils/randomstring"); var randomString = require("../utils/randomstring");
const thenify = require("thenify").withCallback;
/** /**
* returns a read only id for a pad * returns a read only id for a pad
* @param {String} padId the id of the pad * @param {String} padId the id of the pad
*/ */
exports.getReadOnlyId = thenify(function (padId, callback) exports.getReadOnlyId = async function (padId)
{ {
var readOnlyId;
async.waterfall([
// check if there is a pad2readonly entry // check if there is a pad2readonly entry
function(callback) { let readOnlyId = await db.get("pad2readonly:" + padId);
db.get("pad2readonly:" + padId, callback);
},
function(dbReadOnlyId, callback) {
if (dbReadOnlyId == null) {
// there is no readOnly Entry in the database, let's create one // there is no readOnly Entry in the database, let's create one
if (readOnlyId == null) {
readOnlyId = "r." + randomString(16); readOnlyId = "r." + randomString(16);
db.set("pad2readonly:" + padId, readOnlyId); db.set("pad2readonly:" + padId, readOnlyId);
db.set("readonly2pad:" + readOnlyId, padId); db.set("readonly2pad:" + readOnlyId, padId);
} else {
// there is a readOnly Entry in the database, let's take this one
readOnlyId = dbReadOnlyId;
} }
callback(); return readOnlyId;
} }
],
function(err) {
if (ERR(err, callback)) return;
// return the results
callback(null, readOnlyId);
})
});
/** /**
* returns the padId for a read only id * returns the padId for a read only id
* @param {String} readOnlyId read only id * @param {String} readOnlyId read only id
*/ */
exports.getPadId = thenify(function(readOnlyId, callback) exports.getPadId = function(readOnlyId)
{ {
db.get("readonly2pad:" + readOnlyId, callback); return db.get("readonly2pad:" + readOnlyId);
}); }
/** /**
* returns the padId and readonlyPadId in an object for any id * returns the padId and readonlyPadId in an object for any id
* @param {String} padIdOrReadonlyPadId read only id or real pad id * @param {String} padIdOrReadonlyPadId read only id or real pad id
*/ */
exports.getIds = thenify(function(id, callback) { exports.getIds = async function(id) {
if (id.indexOf("r.") == 0) { let readonly = (id.indexOf("r.") === 0);
exports.getPadId(id, function (err, value) {
if (ERR(err, callback)) return;
callback(null, { // Might be null, if this is an unknown read-only id
readOnlyPadId: id, let readOnlyPadId = readonly ? id : await exports.getReadOnlyId(id);
padId: value, // Might be null, if this is an unknown read-only id let padId = readonly ? await exports.getPadId(id) : id;
readonly: true
}); return { readOnlyPadId, padId, readonly };
}); }
} else {
exports.getReadOnlyId(id, function (err, value) {
callback(null, {
readOnlyPadId: value,
padId: id,
readonly: false
});
});
}
});