diff --git a/app.js b/app.js index 25fc46d1..3f0ba6b8 100644 --- a/app.js +++ b/app.js @@ -66,7 +66,7 @@ io.engine.ws = new (require('ws').Server)({ }) // others -var realtime = require('./lib/realtime.js') +var realtime = require('./lib/realtime/realtime.js') // assign socket io to realtime realtime.io = io diff --git a/lib/processQueue.js b/lib/realtime/processQueue.js similarity index 100% rename from lib/processQueue.js rename to lib/realtime/processQueue.js diff --git a/lib/realtime.js b/lib/realtime/realtime.js similarity index 99% rename from lib/realtime.js rename to lib/realtime/realtime.js index 6b9e4e14..b73cec90 100644 --- a/lib/realtime.js +++ b/lib/realtime/realtime.js @@ -12,13 +12,13 @@ const moment = require('moment') const get = require('lodash/get') // core -const config = require('./config') -const logger = require('./logger') -const history = require('./web/history') -const models = require('./models') +const config = require('../config') +const logger = require('../logger') +const history = require('../web/history') +const models = require('../models') // ot -const ot = require('./ot') +const ot = require('../ot') const { ProcessQueue } = require('./processQueue') const { RealtimeClientConnection } = require('./realtimeClientConnection') diff --git a/lib/realtimeCleanDanglingUserJob.js b/lib/realtime/realtimeCleanDanglingUserJob.js similarity index 94% rename from lib/realtimeCleanDanglingUserJob.js rename to lib/realtime/realtimeCleanDanglingUserJob.js index 916e436c..7719d63e 100644 --- a/lib/realtimeCleanDanglingUserJob.js +++ b/lib/realtime/realtimeCleanDanglingUserJob.js @@ -1,8 +1,8 @@ 'use strict' const async = require('async') -const config = require('./config') -const logger = require('./logger') +const config = require('../config') +const logger = require('../logger') /** * clean when user not in any rooms or user not in connected list diff --git a/lib/realtimeClientConnection.js b/lib/realtime/realtimeClientConnection.js similarity index 98% rename from lib/realtimeClientConnection.js rename to lib/realtime/realtimeClientConnection.js index b1490791..b723bc26 100644 --- a/lib/realtimeClientConnection.js +++ b/lib/realtime/realtimeClientConnection.js @@ -2,9 +2,9 @@ const get = require('lodash/get') -const config = require('./config') -const models = require('./models') -const logger = require('./logger') +const config = require('../config') +const models = require('../models') +const logger = require('../logger') class RealtimeClientConnection { constructor (socket) { diff --git a/lib/realtimeSaveRevisionJob.js b/lib/realtime/realtimeSaveRevisionJob.js similarity index 92% rename from lib/realtimeSaveRevisionJob.js rename to lib/realtime/realtimeSaveRevisionJob.js index 08327499..967449d0 100644 --- a/lib/realtimeSaveRevisionJob.js +++ b/lib/realtime/realtimeSaveRevisionJob.js @@ -1,7 +1,7 @@ 'use strict' -const models = require('./models') -const logger = require('./logger') +const models = require('../models') +const logger = require('../logger') /** * clean when user not in any rooms or user not in connected list diff --git a/lib/realtimeUpdateDirtyNoteJob.js b/lib/realtime/realtimeUpdateDirtyNoteJob.js similarity index 96% rename from lib/realtimeUpdateDirtyNoteJob.js rename to lib/realtime/realtimeUpdateDirtyNoteJob.js index 5f8de295..c428ec53 100644 --- a/lib/realtimeUpdateDirtyNoteJob.js +++ b/lib/realtime/realtimeUpdateDirtyNoteJob.js @@ -1,7 +1,7 @@ 'use strict' -const config = require('./config') -const logger = require('./logger') +const config = require('../config') +const logger = require('../logger') const moment = require('moment') class UpdateDirtyNoteJob { diff --git a/lib/web/status/index.js b/lib/web/status/index.js index 2644a76b..19c65978 100644 --- a/lib/web/status/index.js +++ b/lib/web/status/index.js @@ -1,6 +1,6 @@ 'use strict' -const realtime = require('../../realtime') +const realtime = require('../../realtime/realtime') const config = require('../../config') exports.getStatus = async (req, res) => { diff --git a/test/connectionQueue.test.js b/test/connectionQueue.test.js index 3bf7c734..326b5110 100644 --- a/test/connectionQueue.test.js +++ b/test/connectionQueue.test.js @@ -4,7 +4,7 @@ const assert = require('assert') const sinon = require('sinon') -const { ProcessQueue } = require('../lib/processQueue') +const { ProcessQueue } = require('../lib/realtime/processQueue') describe('ProcessQueue', function () { let clock diff --git a/test/realtime/cleanDanglingUser.test.js b/test/realtime/cleanDanglingUser.test.js index 012195ca..576ee711 100644 --- a/test/realtime/cleanDanglingUser.test.js +++ b/test/realtime/cleanDanglingUser.test.js @@ -31,13 +31,13 @@ describe('cleanDanglingUser', function () { afterEach(() => { clock.restore() - removeModuleFromRequireCache('../../lib/realtime') + removeModuleFromRequireCache('../../lib/realtime/realtime') mock.stopAll() sinon.restore() }) it('should call queueForDisconnectSpy when user is dangling', (done) => { - const realtime = require('../../lib/realtime') + const realtime = require('../../lib/realtime/realtime') const queueForDisconnectSpy = sinon.spy(realtime, 'queueForDisconnect') realtime.io = { to: sinon.stub().callsFake(function () { diff --git a/test/realtime/connection.test.js b/test/realtime/connection.test.js index 3baa9c10..bba201ca 100644 --- a/test/realtime/connection.test.js +++ b/test/realtime/connection.test.js @@ -31,7 +31,7 @@ describe('realtime#connection', function () { mock('../../lib/realtimeCleanDanglingUserJob', realtimeJobStub) mock('../../lib/realtimeSaveRevisionJob', realtimeJobStub) mock('../../lib/ot', require('../testDoubles/otFake')) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') }) afterEach(() => { diff --git a/test/realtime/dirtyNoteUpdate.test.js b/test/realtime/dirtyNoteUpdate.test.js index be2a7c70..0ba65131 100644 --- a/test/realtime/dirtyNoteUpdate.test.js +++ b/test/realtime/dirtyNoteUpdate.test.js @@ -27,7 +27,7 @@ describe('realtime#update note is dirty timer', function () { } }) mock('../../lib/config', {}) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') realtime.io = { to: sinon.stub().callsFake(function () { @@ -39,8 +39,8 @@ describe('realtime#update note is dirty timer', function () { }) afterEach(() => { - removeModuleFromRequireCache('../../lib/realtimeUpdateDirtyNoteJob') - removeModuleFromRequireCache('../../lib/realtime') + removeModuleFromRequireCache('../../lib/realtime/realtimeUpdateDirtyNoteJob') + removeModuleFromRequireCache('../../lib/realtime/realtime') mock.stopAll() clock.restore() }) diff --git a/test/realtime/disconnect-process.test.js b/test/realtime/disconnect-process.test.js index 4f8a5b89..8a04d894 100644 --- a/test/realtime/disconnect-process.test.js +++ b/test/realtime/disconnect-process.test.js @@ -28,7 +28,7 @@ describe('realtime#disconnect', function () { }) mock('../../lib/config', {}) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') updateNoteStub = sinon.stub(realtime, 'updateNote').callsFake((note, callback) => { callback(null, note) }) @@ -60,7 +60,7 @@ describe('realtime#disconnect', function () { }) afterEach(() => { - removeModuleFromRequireCache('../../lib/realtime') + removeModuleFromRequireCache('../../lib/realtime/realtime') mock.stopAll() sinon.restore() }) diff --git a/test/realtime/extractNoteIdFromSocket.test.js b/test/realtime/extractNoteIdFromSocket.test.js index 55a09d98..99b2c927 100644 --- a/test/realtime/extractNoteIdFromSocket.test.js +++ b/test/realtime/extractNoteIdFromSocket.test.js @@ -14,14 +14,14 @@ describe('realtime#extractNoteIdFromSocket', function () { }) afterEach(() => { - delete require.cache[require.resolve('../../lib/realtime')] + delete require.cache[require.resolve('../../lib/realtime/realtime')] mock.stopAll() }) describe('urlPath not set', function () { beforeEach(() => { mock('../../lib/config', {}) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') }) let realtime @@ -76,7 +76,7 @@ describe('realtime#extractNoteIdFromSocket', function () { mock('../../lib/config', { urlPath: urlPath }) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') const incomingNoteId = 'myNoteId' const incomingSocket = makeMockSocket({ referer: `https://localhost:3000/${urlPath}/${incomingNoteId}` diff --git a/test/realtime/ifMayEdit.test.js b/test/realtime/ifMayEdit.test.js index 88c11661..957a0e65 100644 --- a/test/realtime/ifMayEdit.test.js +++ b/test/realtime/ifMayEdit.test.js @@ -81,7 +81,7 @@ describe('realtime#ifMayEdit', function () { client.request.user.id = noteOwnerId } client.noteId = noteId - const realtime = require('../../lib/realtime') + const realtime = require('../../lib/realtime/realtime') realtime.getNotePool()[noteId] = note const callback = sinon.stub() realtime.ifMayEdit(client, callback) @@ -98,7 +98,7 @@ describe('realtime#ifMayEdit', function () { client.noteId = noteId const callback = sinon.stub() client.origin = 'operation' - const realtime = require('../../lib/realtime') + const realtime = require('../../lib/realtime/realtime') realtime.getNotePool()[noteId] = note realtime.ifMayEdit(client, callback) assert(callback.calledOnce) @@ -116,7 +116,7 @@ describe('realtime#ifMayEdit', function () { client.request.user.id = loggedInUserId const callback = sinon.stub() client.origin = 'operation' - const realtime = require('../../lib/realtime') + const realtime = require('../../lib/realtime/realtime') realtime.getNotePool()[noteId] = note realtime.ifMayEdit(client, callback) assert(callback.calledOnce) diff --git a/test/realtime/parseNoteIdFromSocket.test.js b/test/realtime/parseNoteIdFromSocket.test.js index 15e28c34..6ed7b129 100644 --- a/test/realtime/parseNoteIdFromSocket.test.js +++ b/test/realtime/parseNoteIdFromSocket.test.js @@ -23,12 +23,12 @@ describe('realtime#parseNoteIdFromSocketAsync', function () { }) afterEach(() => { - removeModuleFromRequireCache('../../lib/realtime') + removeModuleFromRequireCache('../../lib/realtime/realtime') mock.stopAll() }) it('should return null when socket not send noteId', async function () { - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') const mockSocket = makeMockSocket() try { const notes = await realtime.parseNoteIdFromSocketAsync(mockSocket) @@ -49,12 +49,12 @@ describe('realtime#parseNoteIdFromSocketAsync', function () { }) }) it('should return noteId when noteId exists', async function () { - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') const noteId = '123456' const mockSocket = makeMockSocket(undefined, { noteId: noteId }) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') let parsedNoteId try { parsedNoteId = await realtime.parseNoteIdFromSocketAsync(mockSocket) @@ -76,12 +76,12 @@ describe('realtime#parseNoteIdFromSocketAsync', function () { }) }) it('should return null when noteId not exists', async function () { - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') const noteId = '123456' const mockSocket = makeMockSocket(undefined, { noteId: noteId }) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') const parsedNoteId = await realtime.parseNoteIdFromSocketAsync(mockSocket) assert(parsedNoteId === null) }) @@ -99,12 +99,12 @@ describe('realtime#parseNoteIdFromSocketAsync', function () { }) }) it('should return error when noteId parse error', async function () { - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') const noteId = '123456' const mockSocket = makeMockSocket(undefined, { noteId: noteId }) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') try { await realtime.parseNoteIdFromSocketAsync(mockSocket) } catch (err) { diff --git a/test/realtime/realtime.test.js b/test/realtime/realtime.test.js index 8891b872..b4c713b4 100644 --- a/test/realtime/realtime.test.js +++ b/test/realtime/realtime.test.js @@ -50,7 +50,7 @@ describe('realtime', function () { } }) mock('../../lib/config', {}) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') }) Object.keys(viewPermission).forEach(function (permission) { diff --git a/test/realtime/saveRevisionJob.test.js b/test/realtime/saveRevisionJob.test.js index 7594842c..0a5bab0b 100644 --- a/test/realtime/saveRevisionJob.test.js +++ b/test/realtime/saveRevisionJob.test.js @@ -34,8 +34,8 @@ describe('save revision job', function () { afterEach(() => { clock.restore() - removeModuleFromRequireCache('../../lib/realtime') - removeModuleFromRequireCache('../../lib/realtimeSaveRevisionJob') + removeModuleFromRequireCache('../../lib/realtime/realtime') + removeModuleFromRequireCache('../../lib/realtime/realtimeSaveRevisionJob') mock.stopAll() sinon.restore() }) @@ -44,7 +44,7 @@ describe('save revision job', function () { mockModels.Revision.saveAllNotesRevision.callsFake((callback) => { callback(null, []) }) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') clock.tick(5 * 60 * 1000) clock.restore() setTimeout(() => { @@ -58,7 +58,7 @@ describe('save revision job', function () { mockModels.Revision.saveAllNotesRevision.callsFake((callback) => { callback(null, [1]) }) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') clock.tick(5 * 60 * 1000) clock.restore() setTimeout(() => { diff --git a/test/realtime/socket-events.test.js b/test/realtime/socket-events.test.js index 0015d179..4c577c60 100644 --- a/test/realtime/socket-events.test.js +++ b/test/realtime/socket-events.test.js @@ -76,7 +76,7 @@ describe('realtime#socket event', function () { mock('../../lib/models', modelsMock) mock('../../lib/config', configMock) mock('../../lib/ot', require('../testDoubles/otFake')) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') // get all socket event handler clientSocket = makeMockSocket(null, { @@ -122,8 +122,8 @@ describe('realtime#socket event', function () { }) afterEach(function () { - removeModuleFromRequireCache('../../lib/realtime') - removeModuleFromRequireCache('../../lib/realtimeClientConnection') + removeModuleFromRequireCache('../../lib/realtime/realtime') + removeModuleFromRequireCache('../../lib/realtime/realtimeClientConnection') mock.stopAll() sinon.restore() clock.restore() diff --git a/test/realtime/updateNote.test.js b/test/realtime/updateNote.test.js index f2291cdf..95b3721e 100644 --- a/test/realtime/updateNote.test.js +++ b/test/realtime/updateNote.test.js @@ -47,7 +47,7 @@ describe('realtime#updateNote', function () { it('should save history to each edited user', function (done) { modelsStub.Note.findOne.returns(Promise.resolve({})) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') const updateHistoryStub = sinon.stub(realtime, 'updateHistory') const callback = sinon.stub() @@ -86,7 +86,7 @@ describe('realtime#updateNote', function () { name: 'User 01' }) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') realtime.updateNote(note, callback) clock.restore() @@ -125,7 +125,7 @@ describe('realtime#updateNote', function () { }) clock.tick(1000) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') realtime.updateNote(note, callback) setTimeout(() => { assert(note.lastchangeuserprofile.name === 'User 01') @@ -159,7 +159,7 @@ describe('realtime#updateNote', function () { }) clock.tick(1000) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') realtime.updateNote(note, callback) setTimeout(() => { assert(modelsStub.User.findOne.callCount === 0) @@ -196,7 +196,7 @@ describe('realtime#updateNote', function () { }) clock.tick(1000) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') realtime.updateNote(note, callback) setTimeout(() => { assert(modelsStub.User.findOne.callCount === 0) @@ -233,7 +233,7 @@ describe('realtime#updateNote', function () { }) clock.tick(1000) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') realtime.updateNote(note, callback) setTimeout(() => { assert(modelsStub.User.findOne.called) @@ -272,7 +272,7 @@ describe('realtime#updateNote', function () { }) clock.tick(1000) - realtime = require('../../lib/realtime') + realtime = require('../../lib/realtime/realtime') realtime.updateNote(note, callback) setTimeout(() => { assert(note.lastchangeuserprofile.name === 'User 01')