chore(server): getting rid of module-scoped event emitters - batch #1

packages/server/modules/activitystream/index.ts

@@ -24,7 +24,6 @@ import {
   acquireTaskLockFactory,
   releaseTaskLockFactory
 } from '@/modules/core/repositories/scheduledTasks'
-import { UsersEmitter, UsersEvents } from '@/modules/core/events/usersEmitter'
 import { Knex } from 'knex'
 import {
   onServerAccessRequestCreatedFactory,
@@ -40,7 +39,8 @@ import { isProjectResourceTarget } from '@/modules/serverinvites/helpers/core'
 import { publish } from '@/modules/shared/utils/subscriptions'
 import { isStreamAccessRequest } from '@/modules/accessrequests/repositories'
 import { ServerInvitesEvents } from '@/modules/serverinvites/domain/events'
-import { ProjectEvents, ProjectsEmitter } from '@/modules/core/events/projectsEmitter'
+import { ProjectEvents } from '@/modules/core/domain/projects/events'
+import { UserEvents } from '@/modules/core/domain/users/events'
 
 let scheduledTask: ReturnType<ScheduleExecution> | null = null
 let quitEventListeners: Optional<() => void> = undefined
@@ -57,8 +57,8 @@ const initializeEventListeners = ({
   db: Knex
 }) => {
   const quitCbs = [
-    UsersEmitter.listen(
-      UsersEvents.Created,
+    eventBus.listen(
+      UserEvents.Created,
       // this activity will always go in the main DB
       onUserCreatedFactory({ saveActivity: saveActivityFactory({ db }) })
     ),
@@ -90,12 +90,20 @@ const initializeEventListeners = ({
         getStream: getStreamFactory({ db })
       })(payload)
     }),
-    ProjectsEmitter.listen(ProjectEvents.Created, async ({ ownerId, project }) => {
-      await addStreamCreatedActivityFactory({
-        saveActivity: saveActivityFactory({ db }),
-        publish
-      })({ streamId: project.id, creatorId: ownerId, stream: project, input: project })
-    })
+    eventBus.listen(
+      ProjectEvents.Created,
+      async ({ payload: { ownerId, project } }) => {
+        await addStreamCreatedActivityFactory({
+          saveActivity: saveActivityFactory({ db }),
+          publish
+        })({
+          streamId: project.id,
+          creatorId: ownerId,
+          stream: project,
+          input: project
+        })
+      }
+    )
   ]
 
   return () => quitCbs.forEach((quit) => quit())

packages/server/modules/activitystream/services/eventListener.ts

@@ -14,7 +14,7 @@ import {
   SaveActivity
 } from '@/modules/activitystream/domain/operations'
 import { GetStream } from '@/modules/core/domain/streams/operations'
-import { UsersEvents, UsersEventsPayloads } from '@/modules/core/events/usersEmitter'
+import { UserEvents } from '@/modules/core/domain/users/events'
 import {
   ServerInvitesEvents,
   ServerInvitesEventsPayloads
@@ -23,11 +23,12 @@ import {
   isProjectResourceTarget,
   resolveTarget
 } from '@/modules/serverinvites/helpers/core'
+import { EventPayload } from '@/modules/shared/services/eventBus'
 
 export const onUserCreatedFactory =
   ({ saveActivity }: { saveActivity: SaveActivity }) =>
-  async (payload: UsersEventsPayloads[UsersEvents.Created]) => {
-    const { user } = payload
+  async (payload: EventPayload<typeof UserEvents.Created>) => {
+    const { user } = payload.payload
 
     await saveActivity({
       streamId: null,

packages/server/modules/activitystream/tests/activity.spec.js

@@ -51,7 +51,6 @@ const {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } = require('@/modules/serverinvites/repositories/serverInvites')
-const { UsersEmitter } = require('@/modules/core/events/usersEmitter')
 const { createPersonalAccessTokenFactory } = require('@/modules/core/services/tokens')
 const {
   storePersonalApiTokenFactory,
@@ -65,6 +64,7 @@ const {
   storeSingleObjectIfNotFoundFactory,
   storeClosuresIfNotFoundFactory
 } = require('@/modules/core/repositories/objects')
+const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 const getUser = getUserFactory({ db })
 const getUserActivity = getUserActivityFactory({ db })
@@ -109,7 +109,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 
 const createPersonalAccessToken = createPersonalAccessTokenFactory({

packages/server/modules/activitystream/tests/activitySummary.spec.ts

@@ -35,7 +35,6 @@ import {
 import { collectAndValidateCoreTargetsFactory } from '@/modules/serverinvites/services/coreResourceCollection'
 import { buildCoreInviteEmailContentsFactory } from '@/modules/serverinvites/services/coreEmailContents'
 import { getEventBus } from '@/modules/shared/services/eventBus'
-import { ProjectsEmitter } from '@/modules/core/events/projectsEmitter'
 import { createBranchFactory } from '@/modules/core/repositories/branches'
 import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/users'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
@@ -78,7 +77,7 @@ const createStream = legacyCreateStreamFactory({
     }),
     createStream: createStreamFactory({ db }),
     createBranch: createBranchFactory({ db }),
-    projectsEventsEmitter: ProjectsEmitter.emit
+    emitEvent: getEventBus().emit
   })
 })
 const deleteStream = deleteStreamFactory({ db })

packages/server/modules/auth/index.ts

@@ -52,14 +52,14 @@ import {
   findEmailFactory,
   findPrimaryEmailForUserFactory
 } from '@/modules/core/repositories/userEmails'
-import { UsersEmitter } from '@/modules/core/events/usersEmitter'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { requestNewEmailVerificationFactory } from '@/modules/emails/services/verification/request'
 import { deleteOldAndInsertNewVerificationFactory } from '@/modules/emails/repositories'
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { sendEmail } from '@/modules/emails/services/sending'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import { initializeEventListenerFactory } from '@/modules/auth/services/postAuth'
+import { getEventBus } from '@/modules/shared/services/eventBus'
 
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
@@ -86,7 +86,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 
 const findOrCreateUser = findOrCreateUserFactory({
@@ -158,7 +158,7 @@ export const init: SpeckleModule['init'] = async (app, isInitial) => {
   // Listen to event emitters
   if (isInitial) {
     const initializeEventListener = initializeEventListenerFactory({
-      usersEventsListener: UsersEmitter.listen,
+      eventBus: getEventBus(),
       logger: authLogger
     })
     initializeEventListener()

packages/server/modules/auth/services/postAuth.ts

@@ -3,23 +3,20 @@ import {
   addToMailchimpAudience,
   triggerMailchimpCustomerJourney
 } from '@/modules/auth/services/mailchimp'
-import {
-  UsersEvents,
-  UsersEventsListener,
-  UsersEventsPayloads
-} from '@/modules/core/events/usersEmitter'
+import { UserEvents } from '@/modules/core/domain/users/events'
 import {
   enableMixpanel,
   getMailchimpNewsletterIds,
   getMailchimpOnboardingIds,
   getMailchimpStatus
 } from '@/modules/shared/helpers/envHelper'
+import { EventBus, EventPayload } from '@/modules/shared/services/eventBus'
 import { mixpanel } from '@/modules/shared/utils/mixpanel'
 
 const onUserCreatedFactory =
   (deps: { logger: Logger }) =>
-  async (payload: UsersEventsPayloads[UsersEvents.Created]) => {
-    const { user, signUpCtx } = payload
+  async (payload: EventPayload<typeof UserEvents.Created>) => {
+    const { user, signUpCtx } = payload.payload
 
     try {
       // Send event to MP
@@ -59,10 +56,9 @@ const onUserCreatedFactory =
   }
 
 export const initializeEventListenerFactory =
-  (deps: { usersEventsListener: UsersEventsListener; logger: Logger }) => () => {
+  (deps: { eventBus: EventBus; logger: Logger }) => () => {
     const onUserCreated = onUserCreatedFactory(deps)
-
-    const cbs = [deps.usersEventsListener(UsersEvents.Created, onUserCreated)]
+    const cbs = [deps.eventBus.listen(UserEvents.Created, onUserCreated)]
 
     return () => cbs.forEach((cb) => cb())
   }

packages/server/modules/auth/tests/apps.graphql.spec.js

@@ -52,7 +52,6 @@ const {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } = require('@/modules/serverinvites/repositories/serverInvites')
-const { UsersEmitter } = require('@/modules/core/events/usersEmitter')
 const {
   storeApiTokenFactory,
   storeTokenScopesFactory,
@@ -61,6 +60,7 @@ const {
   storePersonalApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
 const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 let sendRequest
 let server
@@ -109,7 +109,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 const createPersonalAccessToken = createPersonalAccessTokenFactory({
   storeApiToken: storeApiTokenFactory({ db }),

packages/server/modules/auth/tests/apps.spec.js

@@ -62,7 +62,6 @@ const {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } = require('@/modules/serverinvites/repositories/serverInvites')
-const { UsersEmitter } = require('@/modules/core/events/usersEmitter')
 const {
   storeApiTokenFactory,
   storeTokenScopesFactory,
@@ -75,6 +74,7 @@ const {
   updateApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
 const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 const db = knex
 const getApp = getAppFactory({ db: knex })
@@ -141,7 +141,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 const validateToken = validateTokenFactory({
   revokeUserTokenById: revokeUserTokenByIdFactory({ db }),

packages/server/modules/auth/tests/auth.spec.js

@@ -37,7 +37,6 @@ const {
 } = require('@/modules/serverinvites/services/coreEmailContents')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 const { createBranchFactory } = require('@/modules/core/repositories/branches')
-const { ProjectsEmitter } = require('@/modules/core/events/projectsEmitter')
 const {
   getUsersFactory,
   getUserFactory,
@@ -66,7 +65,6 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { UsersEmitter } = require('@/modules/core/events/usersEmitter')
 const {
   getServerInfoFactory,
   updateServerInfoFactory
@@ -102,7 +100,7 @@ const createStream = legacyCreateStreamFactory({
     }),
     createStream: createStreamFactory({ db }),
     createBranch: createBranchFactory({ db }),
-    projectsEventsEmitter: ProjectsEmitter.emit
+    emitEvent: getEventBus().emit
   })
 })
 
@@ -131,7 +129,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 const getUserByEmail = legacyGetUserByEmailFactory({ db })
 const updateServerInfo = updateServerInfoFactory({ db })

packages/server/modules/blobstorage/tests/blobstorage.graph.spec.js

@@ -34,7 +34,6 @@ const {
 } = require('@/modules/serverinvites/services/coreEmailContents')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 const { createBranchFactory } = require('@/modules/core/repositories/branches')
-const { ProjectsEmitter } = require('@/modules/core/events/projectsEmitter')
 const {
   getUsersFactory,
   getUserFactory,
@@ -62,7 +61,6 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { UsersEmitter } = require('@/modules/core/events/usersEmitter')
 const { getServerInfoFactory } = require('@/modules/core/repositories/server')
 
 const getServerInfo = getServerInfoFactory({ db })
@@ -93,7 +91,7 @@ const createStream = legacyCreateStreamFactory({
     }),
     createStream: createStreamFactory({ db }),
     createBranch: createBranchFactory({ db }),
-    projectsEventsEmitter: ProjectsEmitter.emit
+    emitEvent: getEventBus().emit
   })
 })
 
@@ -122,7 +120,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 
 describe('Blobs graphql @blobstorage', () => {

packages/server/modules/blobstorage/tests/blobstorage.integration.spec.ts

@@ -27,7 +27,6 @@ import { sendEmail } from '@/modules/emails/services/sending'
 import { createUserFactory } from '@/modules/core/services/users/management'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { finalizeInvitedServerRegistrationFactory } from '@/modules/serverinvites/services/processing'
-import { UsersEmitter } from '@/modules/core/events/usersEmitter'
 import { createTokenFactory } from '@/modules/core/services/tokens'
 import {
   storeApiTokenFactory,
@@ -42,6 +41,7 @@ import { faker } from '@faker-js/faker'
 import { BasicTestUser } from '@/test/authHelper'
 import cryptoRandomString from 'crypto-random-string'
 import type { BlobStorageItem } from '@/modules/blobstorage/domain/types'
+import { getEventBus } from '@/modules/shared/services/eventBus'
 
 const getServerInfo = getServerInfoFactory({ db })
 
@@ -70,7 +70,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 
 const createRandomUser = async (): Promise<BasicTestUser> => {

packages/server/modules/cli/commands/download/project.ts

@@ -59,7 +59,6 @@ import {
 import { getBlobsFactory } from '@/modules/blobstorage/repositories'
 import { validateInputAttachmentsFactory } from '@/modules/comments/services/commentTextService'
 import { VersionsEmitter } from '@/modules/core/events/versionsEmitter'
-import { ProjectsEmitter } from '@/modules/core/events/projectsEmitter'
 import { saveActivityFactory } from '@/modules/activitystream/repositories'
 import { publish } from '@/modules/shared/utils/subscriptions'
 import { addCommitCreatedActivityFactory } from '@/modules/activitystream/services/commitActivity'
@@ -78,6 +77,7 @@ import {
   storeProjectRoleFactory
 } from '@/modules/core/repositories/projects'
 import { storeModelFactory } from '@/modules/core/repositories/models'
+import { getEventBus } from '@/modules/shared/services/eventBus'
 
 const command: CommandModule<
   unknown,
@@ -220,7 +220,7 @@ const command: CommandModule<
       storeModel: storeModelFactory({ db: projectDb }),
       // THIS MUST GO TO THE MAIN DB
       storeProjectRole: storeProjectRoleFactory({ db }),
-      projectsEventsEmitter: ProjectsEmitter.emit
+      emitEvent: getEventBus().emit
     })
 
     const createObject = createObjectFactory({

packages/server/modules/comments/tests/comments.graph.spec.js

@@ -82,7 +82,6 @@ const {
   buildCoreInviteEmailContentsFactory
 } = require('@/modules/serverinvites/services/coreEmailContents')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
-const { ProjectsEmitter } = require('@/modules/core/events/projectsEmitter')
 const { saveActivityFactory } = require('@/modules/activitystream/repositories')
 const { publish } = require('@/modules/shared/utils/subscriptions')
 const {
@@ -115,7 +114,6 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { UsersEmitter } = require('@/modules/core/events/usersEmitter')
 const { getServerInfoFactory } = require('@/modules/core/repositories/server')
 const { createObjectFactory } = require('@/modules/core/services/objects/management')
 
@@ -186,7 +184,7 @@ const createStream = legacyCreateStreamFactory({
     }),
     createStream: createStreamFactory({ db }),
     createBranch: createBranchFactory({ db }),
-    projectsEventsEmitter: ProjectsEmitter.emit
+    emitEvent: getEventBus().emit
   })
 })
 
@@ -220,7 +218,7 @@ const createUser = createUserFactory({
     }),
     requestNewEmailVerification
   }),
-  usersEventsEmitter: UsersEmitter.emit
+  emitEvent: getEventBus().emit
 })
 const createObject = createObjectFactory({
   storeSingleObjectIfNotFoundFactory: storeSingleObjectIfNotFoundFactory({ db }),