From 725ba147d3f308ae5bc7f5c60b562768a081421e Mon Sep 17 00:00:00 2001 From: Raccoon Date: Sat, 12 Jun 2021 09:28:15 +0800 Subject: [PATCH] enable noImplicitReturns Signed-off-by: Raccoon --- lib/models/revision.ts | 3 ++- lib/realtime/realtime.ts | 9 ++++++--- lib/realtime/realtimeCleanDanglingUserJob.ts | 4 +++- lib/realtime/realtimeSaveRevisionJob.ts | 4 +++- lib/workers/dmpWorker.ts | 17 ++++++++++++----- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/lib/models/revision.ts b/lib/models/revision.ts index 3550666e..fa49c851 100644 --- a/lib/models/revision.ts +++ b/lib/models/revision.ts @@ -23,7 +23,8 @@ function createDmpWorker() { if (config.debug) logger.info('dmp worker process started') worker.on('message', function (data) { if (!data || !data.msg || !data.cacheKey) { - return logger.error('dmp worker error: not enough data on message') + logger.error('dmp worker error: not enough data on message') + return } var cacheKey = data.cacheKey switch (data.msg) { diff --git a/lib/realtime/realtime.ts b/lib/realtime/realtime.ts index e3b3f815..dfc613fd 100644 --- a/lib/realtime/realtime.ts +++ b/lib/realtime/realtime.ts @@ -533,7 +533,10 @@ export function queueForDisconnect(socket) { if (Object.keys(note.users).length === 0) { if (note.server.isDirty) { exports.updateNote(note, function (err, _note) { - if (err) return logger.error('disconnect note failed: ' + err) + if (err) { + logger.error('disconnect note failed: ' + err) + return + } // clear server before delete to avoid memory leaks note.server.document = '' note.server.operations = [] @@ -657,7 +660,7 @@ function operationCallback(socket, operation) { } // TODO: test it -export function updateHistory(userId, note, time) { +export function updateHistory(userId, note, time?: any) { var noteId = note.alias ? note.alias : models.Note.encodeNoteId(note.id) if (note.server) history.updateHistory(userId, noteId, note.server.document, time) } @@ -687,7 +690,7 @@ function getUniqueColorPerNote(noteId, maxAttempt = 10) { function queueForConnect(socket) { connectProcessQueue.push(socket.id, async function () { try { - const noteId = await exports.parseNoteIdFromSocketAsync(socket) + const noteId = await exports.parseNoteIdFromSocketAsync(socket) as string if (!noteId) { return exports.failConnection(404, 'note id not found', socket) } diff --git a/lib/realtime/realtimeCleanDanglingUserJob.ts b/lib/realtime/realtimeCleanDanglingUserJob.ts index 1a75f6c2..da2bbf2d 100644 --- a/lib/realtime/realtimeCleanDanglingUserJob.ts +++ b/lib/realtime/realtimeCleanDanglingUserJob.ts @@ -45,7 +45,9 @@ export class CleanDanglingUserJob { } return callback(null, null) }, function (err) { - if (err) return logger.error('cleaner error', err) + if (err) { + logger.error('cleaner error', err) + } }) } } diff --git a/lib/realtime/realtimeSaveRevisionJob.ts b/lib/realtime/realtimeSaveRevisionJob.ts index 18038851..723e963d 100644 --- a/lib/realtime/realtimeSaveRevisionJob.ts +++ b/lib/realtime/realtimeSaveRevisionJob.ts @@ -30,7 +30,9 @@ export class SaveRevisionJob { saveRevision() { if (this.getSaverSleep()) return models.Revision.saveAllNotesRevision((err, notes) => { - if (err) return logger.error('revision saver failed: ' + err) + if (err) { + logger.error('revision saver failed: ' + err) + } if (notes && notes.length <= 0) { this.setSaverSleep(true) } diff --git a/lib/workers/dmpWorker.ts b/lib/workers/dmpWorker.ts index 459b1835..4254982d 100644 --- a/lib/workers/dmpWorker.ts +++ b/lib/workers/dmpWorker.ts @@ -8,12 +8,14 @@ import * as logger from "../logger"; var dmp = new DiffMatchPatch() process.on('message', function (data) { if (!data || !data.msg || !data.cacheKey) { - return logger.error('dmp worker error: not enough data') + logger.error('dmp worker error: not enough data') + return null } switch (data.msg) { case 'create patch': if (!Object.hasOwnProperty.call(data, 'lastDoc') || !Object.hasOwnProperty.call(data, 'currDoc')) { - return logger.error('dmp worker error: not enough data on create patch') + logger.error('dmp worker error: not enough data on create patch') + return null } try { var patch = createPatch(data.lastDoc, data.currDoc) @@ -52,9 +54,10 @@ process.on('message', function (data) { } break } + return null }) -function createPatch (lastDoc, currDoc) { +function createPatch(lastDoc, currDoc) { var msStart = (new Date()).getTime() var diff = dmp.diff_main(lastDoc, currDoc) var patch = dmp.patch_make(lastDoc, diff) @@ -67,7 +70,7 @@ function createPatch (lastDoc, currDoc) { return patch } -function getRevision (revisions, count) { +function getRevision(revisions, count) { var msStart = (new Date()).getTime() var startContent = null var lastPatch = [] @@ -91,7 +94,11 @@ function getRevision (revisions, count) { for (let i = 0, l = applyPatches.length; i < l; i++) { for (let j = 0, m = applyPatches[i].diffs.length; j < m; j++) { var diff = applyPatches[i].diffs[j] - if (diff[0] === DiffMatchPatch.DIFF_INSERT) { diff[0] = DiffMatchPatch.DIFF_DELETE } else if (diff[0] === DiffMatchPatch.DIFF_DELETE) { diff[0] = DiffMatchPatch.DIFF_INSERT } + if (diff[0] === DiffMatchPatch.DIFF_INSERT) { + diff[0] = DiffMatchPatch.DIFF_DELETE + } else if (diff[0] === DiffMatchPatch.DIFF_DELETE) { + diff[0] = DiffMatchPatch.DIFF_INSERT + } } } } else {