ghost 5.33.7 → 5.33.8

package/core/boot.js

@@ -292,6 +292,7 @@ async function initServices({config}) {
     const audienceFeedback = require('./server/services/audience-feedback');
     const emailSuppressionList = require('./server/services/email-suppression-list');
     const emailService = require('./server/services/email-service');
+    const emailAnalytics = require('./server/services/email-analytics');
     const mentionsService = require('./server/services/mentions');
 
     const urlUtils = require('./shared/url-utils');
@@ -316,6 +317,7 @@ async function initServices({config}) {
         slack.listen(),
         audienceFeedback.init(),
         emailService.init(),
+        emailAnalytics.init(),
         mega.listen(),
         webhooks.listen(),
         appService.init(),

package/core/built/admin/assets/{chunk.143.9057a1659075c0ee7336.js → chunk.143.caa7dbd727b76021c31b.js}

@@ -10,8 +10,8 @@ return s.unparse(t,{columns:r})}},96616:(e,r,t)=>{var n={"./af":21516,"./af.js":
 function s(e){var r=o(e)
 return t(r)}function o(e){if(!t.o(n,e)){var r=new Error("Cannot find module '"+e+"'")
 throw r.code="MODULE_NOT_FOUND",r}return n[e]}s.keys=function(){return Object.keys(n)},s.resolve=o,e.exports=s,s.id=96616},7456:e=>{"use strict"
-e.exports=require("@ember/test-waiters")},11975:()=>{},28162:(e,r,t)=>{var n,s
-e.exports=(n=_eai_d,s=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?s("_eai_dyn_"+e):s("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return s("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},n("@joeattardi/emoji-button",[],(function(){return t(28936)})),n("@sentry/browser",[],(function(){return t(40545)})),n("@sentry/utils",[],(function(){return t(59517)})),n("@tryghost/color-utils",[],(function(){return t(82485)})),n("@tryghost/helpers",[],(function(){return t(74752)})),n("@tryghost/kg-clean-basic-html",[],(function(){return t(89096)})),n("@tryghost/kg-parser-plugins",[],(function(){return t(3199)})),n("@tryghost/kg-parser-plugins/lib/cards/softReturn",[],(function(){return t(74557)})),n("@tryghost/limit-service",[],(function(){return t(12336)})),n("@tryghost/members-csv/lib/unparse",[],(function(){return t(91883)})),n("@tryghost/nql-lang",[],(function(){return t(75420)})),n("@tryghost/string",[],(function(){return t(57348)})),n("@tryghost/timezone-data",[],(function(){return t(28961)})),n("element-resize-detector",[],(function(){return t(87381)})),n("ember-css-transitions/modifiers/css-transition",[],(function(){return t(56112)})),n("ember-keyboard",[],(function(){return t(86771)})),n("ember-keyboard/helpers/if-key.js",[],(function(){return t(43481)})),n("ember-keyboard/helpers/on-key.js",[],(function(){return t(66415)})),n("ember-keyboard/modifiers/on-key.js",[],(function(){return t(4146)})),n("ember-keyboard/services/keyboard.js",[],(function(){return t(35466)})),n("ember-modifier",[],(function(){return t(92509)})),n("ember-moment/helpers/-base.js",[],(function(){return t(76465)})),n("ember-moment/helpers/is-after.js",[],(function(){return t(876)})),n("ember-moment/helpers/is-before.js",[],(function(){return t(13971)})),n("ember-moment/helpers/is-between.js",[],(function(){return t(2063)})),n("ember-moment/helpers/is-same-or-after.js",[],(function(){return t(12915)})),n("ember-moment/helpers/is-same-or-before.js",[],(function(){return t(46102)})),n("ember-moment/helpers/is-same.js",[],(function(){return t(71465)})),n("ember-moment/helpers/moment-add.js",[],(function(){return t(64462)})),n("ember-moment/helpers/moment-calendar.js",[],(function(){return t(69021)})),n("ember-moment/helpers/moment-diff.js",[],(function(){return t(95198)})),n("ember-moment/helpers/moment-duration.js",[],(function(){return t(17216)})),n("ember-moment/helpers/moment-format.js",[],(function(){return t(99152)})),n("ember-moment/helpers/moment-from-now.js",[],(function(){return t(16396)})),n("ember-moment/helpers/moment-from.js",[],(function(){return t(48478)})),n("ember-moment/helpers/moment-subtract.js",[],(function(){return t(4647)})),n("ember-moment/helpers/moment-to-date.js",[],(function(){return t(18351)})),n("ember-moment/helpers/moment-to-now.js",[],(function(){return t(94612)})),n("ember-moment/helpers/moment-to.js",[],(function(){return t(91857)})),n("ember-moment/helpers/moment.js",[],(function(){return t(26852)})),n("ember-moment/helpers/now.js",[],(function(){return t(67842)})),n("ember-moment/helpers/unix.js",[],(function(){return t(29700)})),n("ember-moment/helpers/utc.js",[],(function(){return t(71755)})),n("ember-moment/services/moment.js",[],(function(){return t(27475)})),n("fast-deep-equal",[],(function(){return t(64710)})),n("focus-trap",[],(function(){return t(10755)})),n("intersection-observer-admin",[],(function(){return t(77577)})),n("markdown-it",[],(function(){return t(77647)})),n("markdown-it-footnote",[],(function(){return t(41297)})),n("markdown-it-lazy-headers",[],(function(){return t(72553)})),n("markdown-it-mark",[],(function(){return t(76519)})),n("markdown-it-sub",[],(function(){return t(8830)})),n("markdown-it-sup",[],(function(){return t(55977)})),n("moment-timezone",[],(function(){return t(19127)})),n("papaparse",[],(function(){return t(99112)})),n("raf-pool",[],(function(){return t(42586)})),n("react",[],(function(){return t(36058)})),n("react-dom",[],(function(){return t(18971)})),n("react-dom/client",[],(function(){return t(79793)})),n("tooltip.js",[],(function(){return t(15028)})),n("validator",[],(function(){return t(2228)})),void n("_eai_dyn_@sentry/tracing",[],(function(){return t.e(79).then(t.bind(t,98079))})))},78478:function(e,r){window._eai_r=require,window._eai_d=define}},s={}
+e.exports=require("@ember/test-waiters")},11975:()=>{},77255:(e,r,t)=>{var n,s
+e.exports=(n=_eai_d,s=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?s("_eai_dyn_"+e):s("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return s("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},n("@joeattardi/emoji-button",[],(function(){return t(28936)})),n("@sentry/browser",[],(function(){return t(40545)})),n("@sentry/utils",[],(function(){return t(59517)})),n("@tryghost/color-utils",[],(function(){return t(82485)})),n("@tryghost/helpers",[],(function(){return t(74752)})),n("@tryghost/kg-clean-basic-html",[],(function(){return t(89096)})),n("@tryghost/kg-parser-plugins",[],(function(){return t(3199)})),n("@tryghost/kg-parser-plugins/lib/cards/softReturn",[],(function(){return t(74557)})),n("@tryghost/limit-service",[],(function(){return t(12336)})),n("@tryghost/members-csv/lib/unparse",[],(function(){return t(91883)})),n("@tryghost/nql-lang",[],(function(){return t(75420)})),n("@tryghost/string",[],(function(){return t(57348)})),n("@tryghost/timezone-data",[],(function(){return t(28961)})),n("element-resize-detector",[],(function(){return t(87381)})),n("ember-css-transitions/modifiers/css-transition",[],(function(){return t(56112)})),n("ember-keyboard",[],(function(){return t(86771)})),n("ember-keyboard/helpers/if-key.js",[],(function(){return t(43481)})),n("ember-keyboard/helpers/on-key.js",[],(function(){return t(66415)})),n("ember-keyboard/modifiers/on-key.js",[],(function(){return t(4146)})),n("ember-keyboard/services/keyboard.js",[],(function(){return t(35466)})),n("ember-modifier",[],(function(){return t(92509)})),n("ember-moment/helpers/-base.js",[],(function(){return t(76465)})),n("ember-moment/helpers/is-after.js",[],(function(){return t(876)})),n("ember-moment/helpers/is-before.js",[],(function(){return t(13971)})),n("ember-moment/helpers/is-between.js",[],(function(){return t(2063)})),n("ember-moment/helpers/is-same-or-after.js",[],(function(){return t(12915)})),n("ember-moment/helpers/is-same-or-before.js",[],(function(){return t(46102)})),n("ember-moment/helpers/is-same.js",[],(function(){return t(71465)})),n("ember-moment/helpers/moment-add.js",[],(function(){return t(64462)})),n("ember-moment/helpers/moment-calendar.js",[],(function(){return t(69021)})),n("ember-moment/helpers/moment-diff.js",[],(function(){return t(95198)})),n("ember-moment/helpers/moment-duration.js",[],(function(){return t(17216)})),n("ember-moment/helpers/moment-format.js",[],(function(){return t(99152)})),n("ember-moment/helpers/moment-from-now.js",[],(function(){return t(16396)})),n("ember-moment/helpers/moment-from.js",[],(function(){return t(48478)})),n("ember-moment/helpers/moment-subtract.js",[],(function(){return t(4647)})),n("ember-moment/helpers/moment-to-date.js",[],(function(){return t(18351)})),n("ember-moment/helpers/moment-to-now.js",[],(function(){return t(94612)})),n("ember-moment/helpers/moment-to.js",[],(function(){return t(91857)})),n("ember-moment/helpers/moment.js",[],(function(){return t(26852)})),n("ember-moment/helpers/now.js",[],(function(){return t(67842)})),n("ember-moment/helpers/unix.js",[],(function(){return t(29700)})),n("ember-moment/helpers/utc.js",[],(function(){return t(71755)})),n("ember-moment/services/moment.js",[],(function(){return t(27475)})),n("fast-deep-equal",[],(function(){return t(64710)})),n("focus-trap",[],(function(){return t(10755)})),n("intersection-observer-admin",[],(function(){return t(77577)})),n("markdown-it",[],(function(){return t(77647)})),n("markdown-it-footnote",[],(function(){return t(41297)})),n("markdown-it-lazy-headers",[],(function(){return t(72553)})),n("markdown-it-mark",[],(function(){return t(76519)})),n("markdown-it-sub",[],(function(){return t(8830)})),n("markdown-it-sup",[],(function(){return t(55977)})),n("moment-timezone",[],(function(){return t(19127)})),n("papaparse",[],(function(){return t(99112)})),n("raf-pool",[],(function(){return t(42586)})),n("react",[],(function(){return t(36058)})),n("react-dom",[],(function(){return t(18971)})),n("react-dom/client",[],(function(){return t(79793)})),n("tooltip.js",[],(function(){return t(15028)})),n("validator",[],(function(){return t(2228)})),void n("_eai_dyn_@sentry/tracing",[],(function(){return t.e(79).then(t.bind(t,98079))})))},88562:function(e,r){window._eai_r=require,window._eai_d=define}},s={}
 function o(e){var r=s[e]
 if(void 0!==r)return r.exports
 var t=s[e]={id:e,loaded:!1,exports:{}}
@@ -42,8 +42,8 @@ var r=(r,t)=>{var n,s,[i,u,a]=t,m=0
 if(i.some((r=>0!==e[r]))){for(n in u)o.o(u,n)&&(o.m[n]=u[n])
 if(a)var c=a(o)}for(r&&r(t);m<i.length;m++)s=i[m],o.o(e,s)&&e[s]&&e[s][0](),e[s]=0
 return o.O(c)},t=globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]
-t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),o.O(void 0,[963],(()=>o(o.s=78478)))
-var i=o.O(void 0,[963],(()=>o(o.s=28162)))
+t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),o.O(void 0,[963],(()=>o(o.s=88562)))
+var i=o.O(void 0,[963],(()=>o(o.s=77255)))
 i=o.O(i),__ember_auto_import__=i})()
 
-//# sourceMappingURL=chunk.143.9057a1659075c0ee7336.map
+//# sourceMappingURL=chunk.143.caa7dbd727b76021c31b.map

package/core/built/admin/assets/{chunk.178.1d2c848ebe2c7baa38dd.js → chunk.178.9803e6194593a0ed6595.js}

@@ -1,11 +1,11 @@
-var __ember_auto_import__;(()=>{var r={78478:function(r,e){window._eai_r=require,window._eai_d=define},50696:r=>{r.exports=function(){_eai_d
+var __ember_auto_import__;(()=>{var r={88562:function(r,e){window._eai_r=require,window._eai_d=define},4481:r=>{r.exports=function(){_eai_d
 var r=_eai_r
 window.emberAutoImportDynamic=function(e){return 1===arguments.length?r("_eai_dyn_"+e):r("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return r("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))}}()}},e={}
 function t(_){var o=e[_]
 if(void 0!==o)return o.exports
 var i=e[_]={exports:{}}
-return r[_].call(i.exports,i,i.exports,t),i.exports}t(78478)
-var _=t(50696)
+return r[_].call(i.exports,i,i.exports,t),i.exports}t(88562)
+var _=t(4481)
 __ember_auto_import__=_})()
 
-//# sourceMappingURL=chunk.178.1d2c848ebe2c7baa38dd.map
+//# sourceMappingURL=chunk.178.9803e6194593a0ed6595.map

package/core/built/admin/assets/{ghost-904f203ff1f5f6bff4e55a03f39a4fbf.js → ghost-872d240189f9b5ff85f4f7cb2ac3ab4c.js}

@@ -5862,7 +5862,7 @@ return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:r
 return Object.keys(i).forEach((function(e){a[e]=i[e]})),a.enumerable=!!a.enumerable,a.configurable=!!a.configurable,("value"in a||a.initializer)&&(a.writable=!0),a=r.slice().reverse().reduce((function(r,i){return i(e,t,r)||r}),a),n&&void 0!==a.initializer&&(a.value=a.initializer?a.initializer.call(n):void 0,a.initializer=void 0),void 0===a.initializer&&(Object.defineProperty(e,t,a),a=null),a}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 let C=(i=Ember._tracked,n=Ember._tracked,a=Ember._tracked,s=Ember._tracked,o=Ember._action,l=Ember._action,u=Ember._action,d=Ember._tracked,c=Ember._tracked,p=Ember._action,m=Ember._tracked,h=Ember._tracked,b=Ember._action,g=Ember._action,f=(0,r.task)({drop:!0}),v=(0,r.task)({drop:!0}),y=class{get isLoading(){return this.setupTask.isRunning}get willEmail(){return"publish"!==this.publishType&&this.recipientFilter&&this.post.isDraft&&!this.post.email||this.post.isDraft&&this.post.email&&"failed"===this.post.email.status}get willPublish(){return"send"!==this.publishType}get willOnlyEmail(){return"send"===this.publishType}get minScheduledAt(){return t.default.utc().add(5,"seconds").milliseconds(0)}get defaultScheduledAt(){return t.default.utc().add(10,"minutes").milliseconds(0)}toggleScheduled(e){void 0===e&&(e=!this.isScheduled),this.isScheduled=e,!e||this.scheduledAtUTC&&!this.scheduledAtUTC.isBefore(this.defaultScheduledAt)||(this.scheduledAtUTC=this.defaultScheduledAt)}setScheduledAt(e){(e=t.default.utc(e).milliseconds(0)).isBefore(this.minScheduledAt)?this.scheduledAtUTC=this.minScheduledAt:this.scheduledAtUTC=e}resetPastScheduledAt(){this.scheduledAtUTC.isBefore(this.minScheduledAt)&&(this.isScheduled=!1,this.scheduledAt=null)}get publishTypeOptions(){return[{value:"publish+send",label:"Publish and email",display:"Publish and email",disabled:this.emailDisabled},{value:"publish",label:"Publish only",display:"Publish"},{value:"send",label:"Email only",display:"Email",disabled:this.emailDisabled}]}get selectedPublishTypeOption(){return this.publishTypeOptions.find((e=>e.value===this.publishType))}get emailDisabledInSettings(){return"disabled"===this.settings.editorDefaultEmailRecipients||"none"===this.settings.membersSignupAccess}get emailUnavailable(){return this.post.isPage||this.post.email||this.emailDisabledInSettings}get emailDisabled(){const e=0===this.totalMemberCount
 return!this.mailgunIsConfigured||e||this.emailDisabledError}get mailgunIsConfigured(){return this.settings.mailgunIsConfigured||this.config.mailgunIsConfigured}setPublishType(e){this.publishType=e}get newsletters(){return this.allNewsletters.filter((e=>"active"===e.status)).sort(((e,t)=>{let{sortOrder:r}=e,{sortOrder:i}=t
-return r-i}))}get defaultNewsletter(){return this.newsletters[0]}get onlyDefaultNewsletter(){return 1===this.newsletters.length}get recipientFilter(){return this.selectedRecipientFilter||this.post.emailSegment||this.defaultRecipientFilter}get defaultRecipientFilter(){const e=this.settings.editorDefaultEmailRecipients,t=this.settings.editorDefaultEmailRecipientsFilter
+return r-i}))}get defaultNewsletter(){return this.newsletters[0]}get onlyDefaultNewsletter(){return 1===this.newsletters.length}get recipientFilter(){return this.selectedRecipientFilter||this.post.newsletter&&this.post.emailSegment||this.defaultRecipientFilter}get defaultRecipientFilter(){const e=this.settings.editorDefaultEmailRecipients,t=this.settings.editorDefaultEmailRecipientsFilter
 return"disabled"===e?null:"visibility"===e||"filter"===e&&null===t?"public"===this.post.visibility||"members"===this.post.visibility?"status:free,status:-free":"paid"===this.post.visibility?"status:-free":"tiers"===this.post.visibility?this.post.visibilitySegment:this.post.visibility:t}get fullRecipientFilter(){let e=this.newsletter.recipientFilter
 return this.recipientFilter&&(e+=`+(${this.recipientFilter})`),e}setNewsletter(e){this.newsletter=e}setRecipientFilter(e){this.selectedRecipientFilter=e}constructor(){let{config:e,limit:t,post:r,settings:i,store:n,user:a}=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
 S(this,"config",null),S(this,"limit",null),S(this,"settings",null),S(this,"store",null),S(this,"post",null),S(this,"user",null),z(this,"publishDisabledError",w,this),z(this,"totalMemberCount",k,this),z(this,"isScheduled",E,this),z(this,"scheduledAtUTC",P,this),z(this,"publishType",O,this),z(this,"emailDisabledError",j,this),S(this,"allNewsletters",[]),z(this,"newsletter",_,this),z(this,"selectedRecipientFilter",T,this),this.config=e,this.limit=t,this.post=r,this.settings=i,this.store=n,this.user=a,this.allNewsletters=this.store.peekAll("newsletter"),this.setupTask.perform()}*setupTask(){yield this.fetchRequiredDataTask.perform(),this.newsletter=this.defaultNewsletter,(this.emailUnavailable||this.emailDisabled)&&(this.publishType="publish"),"filter"===this.settings.editorDefaultEmailRecipients&&null===this.settings.editorDefaultEmailRecipientsFilter&&(this.publishType="publish"),this.post.isSent&&(this.publishType="send")}*fetchRequiredDataTask(){const e=[]
@@ -5989,4 +5989,4 @@ var t=Ember.Component.extend({})
 e.default=t})),define("ghost-admin/config/environment",[],(function(){try{var e="ghost-admin/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),r={default:JSON.parse(decodeURIComponent(t))}
 return Object.defineProperty(r,"__esModule",{value:!0}),r}catch(i){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"5.33",name:"ghost-admin"})
 
-//# sourceMappingURL=ghost-904f203ff1f5f6bff4e55a03f39a4fbf.map
+//# sourceMappingURL=ghost-872d240189f9b5ff85f4f7cb2ac3ab4c.map

package/core/built/admin/index.html

@@ -58,7 +58,7 @@
 
     <script src="assets/vendor-0441964c34d58f2aacd5a04bbe240243.js"></script>
 <script src="assets/chunk.963.e47ead5abeca4cf69fed.js"></script>
-<script src="assets/chunk.143.9057a1659075c0ee7336.js"></script>
-    <script src="assets/ghost-904f203ff1f5f6bff4e55a03f39a4fbf.js"></script>
+<script src="assets/chunk.143.caa7dbd727b76021c31b.js"></script>
+    <script src="assets/ghost-872d240189f9b5ff85f4f7cb2ac3ab4c.js"></script>
 </body>
 </html>

package/core/server/api/endpoints/utils/serializers/output/email-posts.js

@@ -5,7 +5,7 @@ const membersService = require('../../../../../services/members');
 module.exports = {
     async read(model, apiConfig, frame) {
         const tiersModels = await membersService.api.productRepository.list({
-            withRelated: ['monthlyPrice', 'yearlyPrice']
+            limit: 'all'
         });
         const tiers = tiersModels.data && tiersModels.data.map(tierModel => tierModel.toJSON());
 

package/core/server/api/endpoints/utils/serializers/output/pages.js

@@ -13,7 +13,7 @@ module.exports = {
         let pages = [];
 
         const tiersModels = await membersService.api.productRepository.list({
-            withRelated: ['monthlyPrice', 'yearlyPrice']
+            limit: 'all'
         });
         const tiers = tiersModels.data ? tiersModels.data.map(tierModel => tierModel.toJSON()) : [];
 

package/core/server/api/endpoints/utils/serializers/output/posts.js

@@ -13,7 +13,7 @@ module.exports = {
         let posts = [];
 
         const tiersModels = await membersService.api.productRepository.list({
-            withRelated: ['monthlyPrice', 'yearlyPrice']
+            limit: 'all'
         });
         const tiers = tiersModels.data ? tiersModels.data.map(tierModel => tierModel.toJSON()) : [];
         if (models.meta) {

package/core/server/api/endpoints/utils/serializers/output/previews.js

@@ -4,7 +4,7 @@ const membersService = require('../../../../../services/members');
 module.exports = {
     async all(model, apiConfig, frame) {
         const tiersModels = await membersService.api.productRepository.list({
-            withRelated: ['monthlyPrice', 'yearlyPrice']
+            limit: 'all'
         });
         const tiers = tiersModels.data ? tiersModels.data.map(tierModel => tierModel.toJSON()) : [];
 

package/core/server/services/email-analytics/events/StartEmailAnalyticsJobEvent.js

@@ -0,0 +1,22 @@
+/**
+ * This is an event that is used to circumvent the job manager that currently isn't able to run scheduled jobs on the main thread (not offloaded).
+ * We simply emit this event in the job manager and listen for it on the main thread.
+ */
+module.exports = class StartEmailAnalyticsJobEvent {
+    /**
+     * @param {any} data
+     * @param {Date} timestamp
+     */
+    constructor(data, timestamp) {
+        this.data = data;
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * @param {any} [data]
+     * @param {Date} [timestamp]
+     */
+    static create(data, timestamp) {
+        return new StartEmailAnalyticsJobEvent(data, timestamp ?? new Date);
+    }
+};

package/core/server/services/email-analytics/index.js

@@ -1,23 +1,3 @@
-const config = require('../../../shared/config');
-const db = require('../../data/db');
-const settings = require('../../../shared/settings-cache');
-const {EmailAnalyticsService} = require('@tryghost/email-analytics-service');
-const {EmailEventProcessor} = require('@tryghost/email-service');
-const MailgunProvider = require('@tryghost/email-analytics-provider-mailgun');
-const queries = require('./lib/queries');
-const DomainEvents = require('@tryghost/domain-events');
+const EmailAnalyticsServiceWrapper = require('./wrapper');
 
-const eventProcessor = new EmailEventProcessor({
-    domainEvents: DomainEvents,
-    db
-});
-
-module.exports = new EmailAnalyticsService({
-    config,
-    settings,
-    eventProcessor,
-    providers: [
-        new MailgunProvider({config, settings})
-    ],
-    queries
-});
+module.exports = new EmailAnalyticsServiceWrapper();

package/core/server/services/email-analytics/jobs/fetch-latest/index.js

@@ -1,4 +1,5 @@
 const {parentPort} = require('worker_threads');
+const StartEmailAnalyticsJobEvent = require('../../events/StartEmailAnalyticsJobEvent');
 
 // recurring job to fetch analytics since the most recently seen event timestamp
 
@@ -24,22 +25,15 @@ if (parentPort) {
 }
 
 (async () => {
-    const {run} = require('./run');
-    const {eventStats, aggregateEndDate, fetchStartDate} = await run({
-        domainEvents: {
-            dispatch(event) {
-                parentPort.postMessage({
-                    event: {
-                        type: event.constructor.name, 
-                        data: event
-                    }
-                });
-            }
+    // We send an evnet message, so that it is emitted on the main thread by the job manager
+    // This will start the email analytics job on the main thread (the wrapper service is listening for this event)
+    parentPort.postMessage({
+        event: {
+            type: StartEmailAnalyticsJobEvent.name
         }
     });
 
     if (parentPort) {
-        parentPort.postMessage(`Fetched ${eventStats.totalEvents} events and aggregated stats for ${eventStats.emailIds.length} emails in ${aggregateEndDate - fetchStartDate}ms`);
         parentPort.postMessage('done');
     } else {
         // give the logging pipes time finish writing before exit

package/core/server/services/email-analytics/wrapper.js

@@ -0,0 +1,90 @@
+const logging = require('@tryghost/logging');
+const debug = require('@tryghost/debug')('jobs:email-analytics:fetch-latest');
+
+class EmailAnalyticsServiceWrapper {
+    init() {
+        if (this.service) {
+            return;
+        }
+
+        const {EmailAnalyticsService} = require('@tryghost/email-analytics-service');
+        const {EmailEventStorage, EmailEventProcessor} = require('@tryghost/email-service');
+        const MailgunProvider = require('@tryghost/email-analytics-provider-mailgun');
+        const {EmailRecipientFailure, EmailSpamComplaintEvent} = require('../../models');
+        const StartEmailAnalyticsJobEvent = require('./events/StartEmailAnalyticsJobEvent');
+
+        const domainEvents = require('@tryghost/domain-events');
+        const config = require('../../../shared/config');
+        const settings = require('../../../shared/settings-cache');
+        const db = require('../../data/db');
+        const queries = require('./lib/queries');
+        const membersService = require('../members');
+        const membersRepository = membersService.api.members;
+
+        this.eventStorage = new EmailEventStorage({
+            db,
+            membersRepository,
+            models: {
+                EmailRecipientFailure,
+                EmailSpamComplaintEvent
+            }
+        });
+
+        // Since this is running in a worker thread, we cant dispatch directly
+        // So we post the events as a message to the job manager
+        const eventProcessor = new EmailEventProcessor({
+            domainEvents,
+            db,
+            eventStorage: this.eventStorage
+        });
+
+        this.service = new EmailAnalyticsService({
+            config,
+            settings,
+            eventProcessor,
+            providers: [
+                new MailgunProvider({config, settings})
+            ],
+            queries
+        });
+
+        // We currently cannot trigger a non-offloaded job from the job manager
+        // So the email analytics jobs simply emits an event.
+        domainEvents.subscribe(StartEmailAnalyticsJobEvent, async () => {
+            await this.startFetch();
+        });
+    }
+
+    async startFetch() {
+        if (this.fetching) {
+            logging.info('Email analytics fetch already running, skipping');
+            return;
+        }
+        this.fetching = true;
+
+        logging.info('Email analytics fetch started');
+        try {
+            const fetchStartDate = new Date();
+            debug('Starting email analytics fetch of latest events');
+            const eventStats = await this.service.fetchLatest();
+            const fetchEndDate = new Date();
+            debug(`Finished fetching ${eventStats.totalEvents} analytics events in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms`);
+
+            const aggregateStartDate = new Date();
+            debug(`Starting email analytics aggregation for ${eventStats.emailIds.length} emails`);
+            await this.service.aggregateStats(eventStats);
+            const aggregateEndDate = new Date();
+            debug(`Finished aggregating email analytics in ${aggregateEndDate.getTime() - aggregateStartDate.getTime()}ms`);
+
+            logging.info(`Fetched ${eventStats.totalEvents} events and aggregated stats for ${eventStats.emailIds.length} emails in ${aggregateEndDate.getTime() - fetchStartDate.getTime()}ms`);
+
+            this.fetching = false;
+            return eventStats;
+        } catch (e) {
+            logging.error(e, 'Error while fetching email analytics');
+        }
+        this.fetching = false;
+    }
+}
+
+module.exports = EmailAnalyticsServiceWrapper;

package/core/server/services/email-service/wrapper.js

@@ -13,8 +13,8 @@ class EmailServiceWrapper {
             return;
         }
 
-        const {EmailService, EmailController, EmailRenderer, SendingService, BatchSendingService, EmailSegmenter, EmailEventStorage, MailgunEmailProvider} = require('@tryghost/email-service');
-        const {Post, Newsletter, Email, EmailBatch, EmailRecipient, Member, EmailRecipientFailure, EmailSpamComplaintEvent} = require('../../models');
+        const {EmailService, EmailController, EmailRenderer, SendingService, BatchSendingService, EmailSegmenter, MailgunEmailProvider} = require('@tryghost/email-service');
+        const {Post, Newsletter, Email, EmailBatch, EmailRecipient, Member} = require('../../models');
         const MailgunClient = require('@tryghost/mailgun-client');
         const configService = require('../../../shared/config');
         const settingsCache = require('../../../shared/settings-cache');
@@ -25,7 +25,6 @@ class EmailServiceWrapper {
         const sentry = require('../../../shared/sentry');
         const membersRepository = membersService.api.members;
         const limitService = require('../limits');
-        const domainEvents = require('@tryghost/domain-events');
 
         const mobiledocLib = require('../../lib/mobiledoc');
         const lexicalLib = require('../../lib/lexical');
@@ -116,16 +115,6 @@ class EmailServiceWrapper {
                 Email
             }
         });
-
-        this.eventStorage = new EmailEventStorage({
-            db,
-            membersRepository,
-            models: {
-                EmailRecipientFailure,
-                EmailSpamComplaintEvent
-            }
-        });
-        this.eventStorage.listen(domainEvents);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.33.7",
+  "version": "5.33.8",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -58,36 +58,36 @@
   "dependencies": {
     "@sentry/node": "7.11.1",
     "@tryghost/adapter-base-cache": "0.1.3",
-    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.33.7.tgz",
+    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.33.8.tgz",
     "@tryghost/admin-api-schema": "4.2.1",
-    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.33.7.tgz",
-    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.33.7.tgz",
-    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.33.7.tgz",
+    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.33.8.tgz",
+    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.33.8.tgz",
+    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.33.8.tgz",
     "@tryghost/bookshelf-plugins": "0.6.3",
-    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.33.7.tgz",
+    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.33.8.tgz",
     "@tryghost/color-utils": "0.1.22",
     "@tryghost/config-url-helpers": "1.0.4",
-    "@tryghost/constants": "file:components/tryghost-constants-5.33.7.tgz",
-    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.33.7.tgz",
-    "@tryghost/data-generator": "file:components/tryghost-data-generator-5.33.7.tgz",
+    "@tryghost/constants": "file:components/tryghost-constants-5.33.8.tgz",
+    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.33.8.tgz",
+    "@tryghost/data-generator": "file:components/tryghost-data-generator-5.33.8.tgz",
     "@tryghost/database-info": "0.3.14",
     "@tryghost/debug": "0.1.21",
-    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.33.7.tgz",
-    "@tryghost/dynamic-routing-events": "file:components/tryghost-dynamic-routing-events-5.33.7.tgz",
-    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.33.7.tgz",
-    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.33.7.tgz",
-    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.33.7.tgz",
+    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.33.8.tgz",
+    "@tryghost/dynamic-routing-events": "file:components/tryghost-dynamic-routing-events-5.33.8.tgz",
+    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.33.8.tgz",
+    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.33.8.tgz",
+    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.33.8.tgz",
     "@tryghost/email-mock-receiver": "0.1.0",
-    "@tryghost/email-service": "file:components/tryghost-email-service-5.33.7.tgz",
-    "@tryghost/email-suppression-list": "file:components/tryghost-email-suppression-list-5.33.7.tgz",
+    "@tryghost/email-service": "file:components/tryghost-email-service-5.33.8.tgz",
+    "@tryghost/email-suppression-list": "file:components/tryghost-email-suppression-list-5.33.8.tgz",
     "@tryghost/errors": "1.2.20",
-    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.33.7.tgz",
+    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.33.8.tgz",
     "@tryghost/helpers": "1.1.75",
-    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.33.7.tgz",
+    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.33.8.tgz",
     "@tryghost/http-cache-utils": "0.1.6",
     "@tryghost/image-transform": "1.2.3",
-    "@tryghost/importer-revue": "file:components/tryghost-importer-revue-5.33.7.tgz",
-    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.33.7.tgz",
+    "@tryghost/importer-revue": "file:components/tryghost-importer-revue-5.33.8.tgz",
+    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.33.8.tgz",
     "@tryghost/kg-card-factory": "4.0.0",
     "@tryghost/kg-default-atoms": "4.0.0",
     "@tryghost/kg-default-cards": "6.0.0",
@@ -95,50 +95,50 @@
     "@tryghost/kg-lexical-html-renderer": "0.0.11",
     "@tryghost/kg-mobiledoc-html-renderer": "6.0.0",
     "@tryghost/limit-service": "1.2.4",
-    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.33.7.tgz",
-    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.33.7.tgz",
-    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.33.7.tgz",
+    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.33.8.tgz",
+    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.33.8.tgz",
+    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.33.8.tgz",
     "@tryghost/logging": "2.4.0",
-    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.33.7.tgz",
-    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.33.7.tgz",
-    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.33.7.tgz",
-    "@tryghost/member-events": "file:components/tryghost-member-events-5.33.7.tgz",
-    "@tryghost/members-api": "file:components/tryghost-members-api-5.33.7.tgz",
-    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.33.7.tgz",
-    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.33.7.tgz",
-    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.33.7.tgz",
-    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.33.7.tgz",
-    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.33.7.tgz",
-    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.33.7.tgz",
+    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.33.8.tgz",
+    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.33.8.tgz",
+    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.33.8.tgz",
+    "@tryghost/member-events": "file:components/tryghost-member-events-5.33.8.tgz",
+    "@tryghost/members-api": "file:components/tryghost-members-api-5.33.8.tgz",
+    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.33.8.tgz",
+    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.33.8.tgz",
+    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.33.8.tgz",
+    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.33.8.tgz",
+    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.33.8.tgz",
+    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.33.8.tgz",
     "@tryghost/metrics": "1.0.20",
-    "@tryghost/minifier": "file:components/tryghost-minifier-5.33.7.tgz",
-    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.33.7.tgz",
-    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.33.7.tgz",
-    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.33.7.tgz",
-    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.33.7.tgz",
-    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.33.7.tgz",
+    "@tryghost/minifier": "file:components/tryghost-minifier-5.33.8.tgz",
+    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.33.8.tgz",
+    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.33.8.tgz",
+    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.33.8.tgz",
+    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.33.8.tgz",
+    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.33.8.tgz",
     "@tryghost/nodemailer": "0.3.31",
     "@tryghost/nql": "0.11.0",
-    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.33.7.tgz",
-    "@tryghost/package-json": "file:components/tryghost-package-json-5.33.7.tgz",
+    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.33.8.tgz",
+    "@tryghost/package-json": "file:components/tryghost-package-json-5.33.8.tgz",
     "@tryghost/pretty-cli": "1.2.33",
     "@tryghost/promise": "0.2.1",
     "@tryghost/request": "0.1.34",
-    "@tryghost/security": "file:components/tryghost-security-5.33.7.tgz",
-    "@tryghost/session-service": "file:components/tryghost-session-service-5.33.7.tgz",
-    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.33.7.tgz",
+    "@tryghost/security": "file:components/tryghost-security-5.33.8.tgz",
+    "@tryghost/session-service": "file:components/tryghost-session-service-5.33.8.tgz",
+    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.33.8.tgz",
     "@tryghost/social-urls": "0.1.34",
-    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.33.7.tgz",
-    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.33.7.tgz",
+    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.33.8.tgz",
+    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.33.8.tgz",
     "@tryghost/string": "0.2.2",
-    "@tryghost/tiers": "file:components/tryghost-tiers-5.33.7.tgz",
+    "@tryghost/tiers": "file:components/tryghost-tiers-5.33.8.tgz",
     "@tryghost/tpl": "0.1.21",
-    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.33.7.tgz",
+    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.33.8.tgz",
     "@tryghost/url-utils": "4.3.0",
     "@tryghost/validator": "0.1.31",
-    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.33.7.tgz",
+    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.33.8.tgz",
     "@tryghost/version": "0.1.19",
-    "@tryghost/webmentions": "file:components/tryghost-webmentions-5.33.7.tgz",
+    "@tryghost/webmentions": "file:components/tryghost-webmentions-5.33.8.tgz",
     "@tryghost/zip": "1.1.31",
     "amperize": "0.6.1",
     "analytics-node": "6.2.0",
@@ -233,62 +233,62 @@
     "@tryghost/logging": "2.4.0",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
-    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.33.7.tgz",
-    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.33.7.tgz",
-    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.33.7.tgz",
-    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.33.7.tgz",
-    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.33.7.tgz",
-    "@tryghost/constants": "file:components/tryghost-constants-5.33.7.tgz",
-    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.33.7.tgz",
-    "@tryghost/data-generator": "file:components/tryghost-data-generator-5.33.7.tgz",
-    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.33.7.tgz",
-    "@tryghost/dynamic-routing-events": "file:components/tryghost-dynamic-routing-events-5.33.7.tgz",
-    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.33.7.tgz",
-    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.33.7.tgz",
-    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.33.7.tgz",
-    "@tryghost/email-events": "file:components/tryghost-email-events-5.33.7.tgz",
-    "@tryghost/email-service": "file:components/tryghost-email-service-5.33.7.tgz",
-    "@tryghost/email-suppression-list": "file:components/tryghost-email-suppression-list-5.33.7.tgz",
-    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.33.7.tgz",
-    "@tryghost/extract-api-key": "file:components/tryghost-extract-api-key-5.33.7.tgz",
-    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.33.7.tgz",
-    "@tryghost/i18n": "file:components/tryghost-i18n-5.33.7.tgz",
-    "@tryghost/importer-revue": "file:components/tryghost-importer-revue-5.33.7.tgz",
-    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.33.7.tgz",
-    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.33.7.tgz",
-    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.33.7.tgz",
-    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.33.7.tgz",
-    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.33.7.tgz",
-    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.33.7.tgz",
-    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.33.7.tgz",
-    "@tryghost/member-events": "file:components/tryghost-member-events-5.33.7.tgz",
-    "@tryghost/members-api": "file:components/tryghost-members-api-5.33.7.tgz",
-    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.33.7.tgz",
-    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.33.7.tgz",
-    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.33.7.tgz",
-    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.33.7.tgz",
-    "@tryghost/minifier": "file:components/tryghost-minifier-5.33.7.tgz",
-    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.33.7.tgz",
-    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.33.7.tgz",
-    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.33.7.tgz",
-    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.33.7.tgz",
-    "@tryghost/mw-update-user-last-seen": "file:components/tryghost-mw-update-user-last-seen-5.33.7.tgz",
-    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.33.7.tgz",
-    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.33.7.tgz",
-    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.33.7.tgz",
-    "@tryghost/package-json": "file:components/tryghost-package-json-5.33.7.tgz",
-    "@tryghost/members-payments": "file:components/tryghost-members-payments-5.33.7.tgz",
-    "@tryghost/referrers": "file:components/tryghost-referrers-5.33.7.tgz",
-    "@tryghost/security": "file:components/tryghost-security-5.33.7.tgz",
-    "@tryghost/session-service": "file:components/tryghost-session-service-5.33.7.tgz",
-    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.33.7.tgz",
-    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.33.7.tgz",
-    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.33.7.tgz",
-    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.33.7.tgz",
-    "@tryghost/tiers": "file:components/tryghost-tiers-5.33.7.tgz",
-    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.33.7.tgz",
-    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.33.7.tgz",
-    "@tryghost/version-notifications-data-service": "file:components/tryghost-version-notifications-data-service-5.33.7.tgz",
-    "@tryghost/webmentions": "file:components/tryghost-webmentions-5.33.7.tgz"
+    "@tryghost/adapter-manager": "file:components/tryghost-adapter-manager-5.33.8.tgz",
+    "@tryghost/api-framework": "file:components/tryghost-api-framework-5.33.8.tgz",
+    "@tryghost/api-version-compatibility-service": "file:components/tryghost-api-version-compatibility-service-5.33.8.tgz",
+    "@tryghost/audience-feedback": "file:components/tryghost-audience-feedback-5.33.8.tgz",
+    "@tryghost/bootstrap-socket": "file:components/tryghost-bootstrap-socket-5.33.8.tgz",
+    "@tryghost/constants": "file:components/tryghost-constants-5.33.8.tgz",
+    "@tryghost/custom-theme-settings-service": "file:components/tryghost-custom-theme-settings-service-5.33.8.tgz",
+    "@tryghost/data-generator": "file:components/tryghost-data-generator-5.33.8.tgz",
+    "@tryghost/domain-events": "file:components/tryghost-domain-events-5.33.8.tgz",
+    "@tryghost/dynamic-routing-events": "file:components/tryghost-dynamic-routing-events-5.33.8.tgz",
+    "@tryghost/email-analytics-provider-mailgun": "file:components/tryghost-email-analytics-provider-mailgun-5.33.8.tgz",
+    "@tryghost/email-analytics-service": "file:components/tryghost-email-analytics-service-5.33.8.tgz",
+    "@tryghost/email-content-generator": "file:components/tryghost-email-content-generator-5.33.8.tgz",
+    "@tryghost/email-events": "file:components/tryghost-email-events-5.33.8.tgz",
+    "@tryghost/email-service": "file:components/tryghost-email-service-5.33.8.tgz",
+    "@tryghost/email-suppression-list": "file:components/tryghost-email-suppression-list-5.33.8.tgz",
+    "@tryghost/express-dynamic-redirects": "file:components/tryghost-express-dynamic-redirects-5.33.8.tgz",
+    "@tryghost/extract-api-key": "file:components/tryghost-extract-api-key-5.33.8.tgz",
+    "@tryghost/html-to-plaintext": "file:components/tryghost-html-to-plaintext-5.33.8.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-5.33.8.tgz",
+    "@tryghost/importer-revue": "file:components/tryghost-importer-revue-5.33.8.tgz",
+    "@tryghost/job-manager": "file:components/tryghost-job-manager-5.33.8.tgz",
+    "@tryghost/link-redirects": "file:components/tryghost-link-redirects-5.33.8.tgz",
+    "@tryghost/link-replacer": "file:components/tryghost-link-replacer-5.33.8.tgz",
+    "@tryghost/link-tracking": "file:components/tryghost-link-tracking-5.33.8.tgz",
+    "@tryghost/magic-link": "file:components/tryghost-magic-link-5.33.8.tgz",
+    "@tryghost/mailgun-client": "file:components/tryghost-mailgun-client-5.33.8.tgz",
+    "@tryghost/member-attribution": "file:components/tryghost-member-attribution-5.33.8.tgz",
+    "@tryghost/member-events": "file:components/tryghost-member-events-5.33.8.tgz",
+    "@tryghost/members-api": "file:components/tryghost-members-api-5.33.8.tgz",
+    "@tryghost/members-csv": "file:components/tryghost-members-csv-5.33.8.tgz",
+    "@tryghost/members-events-service": "file:components/tryghost-members-events-service-5.33.8.tgz",
+    "@tryghost/members-importer": "file:components/tryghost-members-importer-5.33.8.tgz",
+    "@tryghost/members-ssr": "file:components/tryghost-members-ssr-5.33.8.tgz",
+    "@tryghost/minifier": "file:components/tryghost-minifier-5.33.8.tgz",
+    "@tryghost/mw-api-version-mismatch": "file:components/tryghost-mw-api-version-mismatch-5.33.8.tgz",
+    "@tryghost/mw-cache-control": "file:components/tryghost-mw-cache-control-5.33.8.tgz",
+    "@tryghost/mw-error-handler": "file:components/tryghost-mw-error-handler-5.33.8.tgz",
+    "@tryghost/mw-session-from-token": "file:components/tryghost-mw-session-from-token-5.33.8.tgz",
+    "@tryghost/mw-update-user-last-seen": "file:components/tryghost-mw-update-user-last-seen-5.33.8.tgz",
+    "@tryghost/mw-vhost": "file:components/tryghost-mw-vhost-5.33.8.tgz",
+    "@tryghost/oembed-service": "file:components/tryghost-oembed-service-5.33.8.tgz",
+    "@tryghost/members-offers": "file:components/tryghost-members-offers-5.33.8.tgz",
+    "@tryghost/package-json": "file:components/tryghost-package-json-5.33.8.tgz",
+    "@tryghost/members-payments": "file:components/tryghost-members-payments-5.33.8.tgz",
+    "@tryghost/referrers": "file:components/tryghost-referrers-5.33.8.tgz",
+    "@tryghost/security": "file:components/tryghost-security-5.33.8.tgz",
+    "@tryghost/session-service": "file:components/tryghost-session-service-5.33.8.tgz",
+    "@tryghost/settings-path-manager": "file:components/tryghost-settings-path-manager-5.33.8.tgz",
+    "@tryghost/staff-service": "file:components/tryghost-staff-service-5.33.8.tgz",
+    "@tryghost/stats-service": "file:components/tryghost-stats-service-5.33.8.tgz",
+    "@tryghost/members-stripe-service": "file:components/tryghost-members-stripe-service-5.33.8.tgz",
+    "@tryghost/tiers": "file:components/tryghost-tiers-5.33.8.tgz",
+    "@tryghost/update-check-service": "file:components/tryghost-update-check-service-5.33.8.tgz",
+    "@tryghost/verification-trigger": "file:components/tryghost-verification-trigger-5.33.8.tgz",
+    "@tryghost/version-notifications-data-service": "file:components/tryghost-version-notifications-data-service-5.33.8.tgz",
+    "@tryghost/webmentions": "file:components/tryghost-webmentions-5.33.8.tgz"
   }
 }

package/core/server/services/email-analytics/jobs/fetch-latest/run.js

@@ -1,57 +0,0 @@
-const debug = require('@tryghost/debug')('jobs:email-analytics:fetch-latest');
-
-async function run({domainEvents}) {
-    const config = require('../../../../../shared/config');
-    const db = require('../../../../data/db');
-
-    const settingsRows = await db.knex('settings')
-        .whereIn('key', ['mailgun_api_key', 'mailgun_domain', 'mailgun_base_url']);
-
-    const settingsCache = {};
-
-    settingsRows.forEach((row) => {
-        settingsCache[row.key] = row.value;
-    });
-
-    const settings = {
-        get(key) {
-            return settingsCache[key];
-        }
-    };
-
-    const {EmailAnalyticsService} = require('@tryghost/email-analytics-service');
-    const MailgunProvider = require('@tryghost/email-analytics-provider-mailgun');
-    const queries = require('../../lib/queries');
-    const {EmailEventProcessor} = require('@tryghost/email-service');
-
-    // Since this is running in a worker thread, we cant dispatch directly
-    // So we post the events as a message to the job manager
-    const eventProcessor = new EmailEventProcessor({
-        domainEvents,
-        db
-    });
-
-    const emailAnalyticsService = new EmailAnalyticsService({
-        config,
-        settings,
-        eventProcessor,
-        providers: [
-            new MailgunProvider({config, settings})
-        ],
-        queries
-    });
-
-    const fetchStartDate = new Date();
-    debug('Starting email analytics fetch of latest events');
-    const eventStats = await emailAnalyticsService.fetchLatest();
-    const fetchEndDate = new Date();
-    debug(`Finished fetching ${eventStats.totalEvents} analytics events in ${fetchEndDate - fetchStartDate}ms`);
-
-    const aggregateStartDate = new Date();
-    debug(`Starting email analytics aggregation for ${eventStats.emailIds.length} emails`);
-    await emailAnalyticsService.aggregateStats(eventStats);
-    const aggregateEndDate = new Date();
-    debug(`Finished aggregating email analytics in ${aggregateEndDate - aggregateStartDate}ms`);
-    return {eventStats, fetchStartDate, fetchEndDate, aggregateStartDate, aggregateEndDate};
-}
-module.exports.run = run;