@livepreso/api 6.56.1 → 6.57.1

package/src/collections/adjunct-sub-slides.js

@@ -13,6 +13,19 @@ export const AdjunctSubSlideCollection = DuplicateIdCollection.extend(
 	/** @lends collections.AdjunctSubSlideCollection# */ {
 		comparator: "sequence",
 		model: "AdjunctSubSlideModel",
+
+		/**
+		 * Fetch a collection of adjunct slides related to an appointment
+		 * @param {Integer} id - The id of the appointment
+		 * @return {Promise} - A collection of AdjunctSlide models
+		 */
+		fetchByAppointmentID(id) {
+			return this.fetch({
+				data: {
+					appointment: id,
+				},
+			});
+		},
 	},
 );
 

package/src/fixtures.js

@@ -22,6 +22,8 @@ const presentationCollections = {
 	PresentationSubSlides: presentation.PresentationSubSlides,
 };
 
+const _buildStack = new Set();
+
 function uuid() {
 	return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
 		const r = (Math.random() * 16) | 0;
@@ -70,7 +72,17 @@ function makeFactory(name, Model, ignoreFields = []) {
 				continue;
 			}
 			factory.attr(key, () => {
-				return Factory.build(value);
+				if (_buildStack.has(value)) {
+					throw new Error(
+						`Recursion detected: ${[..._buildStack].join(" -> ")} -> ${value}`,
+					);
+				}
+				_buildStack.add(value);
+				try {
+					return Factory.build(value);
+				} finally {
+					_buildStack.delete(value);
+				}
 			});
 		}
 	}
@@ -187,6 +199,8 @@ factories.UserModel.attr("first_name", () => faker.name.firstName()).attr(
 
 factories.TenancyModel.attr("administrator", null);
 
+factories.RoomModel.attr("hostedpreso", null);
+
 factories.TemplateModel.sequence("sequence")
 	// Prevent max call stack overflow
 	.attr("original_template", null)
@@ -201,7 +215,7 @@ factories.ContactModel.attr("customer", null)
 	.attr("name_first", () => faker.name.firstName())
 	.attr("name_last", () => faker.name.lastName())
 	.attr("email", () => faker.internet.email())
-	.after((contact, options) => {
+	.after((contact) => {
 		if (!contact.customer) {
 			contact.customer = M("CustomerModel", {
 				contact_set: [contact],

package/src/models/base.js

@@ -12,6 +12,8 @@ import qs from "qs";
 import { registeredStates } from "../state-register.js";
 import { sync } from "../sync.js";
 
+const URL_TEMPLATE_RE = /(\{(?:\w+\.?)+\})/g;
+
 /**
  * @constructor
  * @alias models.BaseModel
@@ -154,7 +156,11 @@ export const BaseModel = Model.extend(
 
 		// Internal function. Used by collection as well.
 		_matchesURL(url, matchesDetail = true) {
-			if (!this.modelName || this.urlRoot() === Api.getURL()) {
+			if (
+				typeof url !== "string" ||
+				!this.modelName ||
+				this.urlRoot() === Api.getURL()
+			) {
 				return false;
 			}
 
@@ -435,6 +441,13 @@ export const BaseModel = Model.extend(
 		save() {
 			return Model.prototype.save.apply(this, arguments).tap((response) => {
 				this._updateResponse(response);
+				// Sort events after server response to ensure ascending order
+				// since the server may return them in a different order
+				if (this.events && this.events.length > 1) {
+					this.events.sort((a, b) => {
+						return new Date(a.timestamp) - new Date(b.timestamp);
+					});
+				}
 			});
 		},
 
@@ -653,8 +666,8 @@ export const BaseModel = Model.extend(
 			// So if you have /path/to/{model.id}/
 			// It will check the model from "this.model.id" and replace
 			// it in the url
-			const re = /(\{(?:\w+\.?)+\})/g;
-			const matches = resp.match(re) || [];
+			URL_TEMPLATE_RE.lastIndex = 0;
+			const matches = resp.match(URL_TEMPLATE_RE) || [];
 			for (const match of matches) {
 				const path = match.slice(1, -1);
 				const replacement = _.get(this, path);

package/src/models/deck-version.js

@@ -50,6 +50,8 @@ export const DeckVersionModel = BaseModel.extend(
 			image_256_archive: "string",
 			image_512_archive: "string",
 			namespaced_key: "string",
+			created_date: "date",
+			modified_date: "date",
 			creation_status: "string",
 			creation_percent: "number",
 			update_description: "string",

package/src/models/dispatch-preview.js

@@ -23,9 +23,6 @@ export const DispatchPreviewModel = BaseModel.extend(
 				.then((resp) => {
 					this.content = resp.text;
 					return resp.text;
-				})
-				.catch(superagent.SuperagentPromiseError, (e) => {
-					throw e;
 				});
 		},
 	},

package/src/models/dispatch.js

@@ -109,7 +109,7 @@ export const DispatchModel = BaseModel.extend(
 				data.snapshot = this._retrieveURL(this.snapshot);
 			}
 
-			return data;
+			return _.omit(data, ["contentModel"]);
 		},
 
 		serialize() {

package/src/models/manifest-json.js

@@ -197,18 +197,13 @@ export const ManifestJSONModel = BaseModel.extend(
 			const imports = _.map(fixturePaths, (fixture, key) => {
 				const path = `${rootAssetUrl}${fixture}`;
 
-				return superagent
-					.get(path)
-					.then((response) => {
-						if (response.text) {
-							fixtures[key] = JSON.parse(response.text);
-						} else {
-							fixtures[key] = response.body || {};
-						}
-					})
-					.catch(superagent.SuperagentPromiseError, (e) => {
-						throw e;
-					});
+				return superagent.get(path).then((response) => {
+					if (response.text) {
+						fixtures[key] = JSON.parse(response.text);
+					} else {
+						fixtures[key] = response.body || {};
+					}
+				});
 			});
 
 			await Promise.all(imports);

package/src/models/room.js

@@ -1,5 +1,6 @@
 import { BaseModel } from "./base.js";
 import { register } from "../state-register.js";
+import "./hosted-preso.js";
 
 /**
  * @constructor
@@ -38,6 +39,10 @@ export const RoomModel = BaseModel.extend(
 			wamp_version: "string",
 			websocket_server_uri: "string",
 		},
+
+		children: {
+			hostedpreso: "HostedPresoModel",
+		},
 	},
 );
 

package/src/models/user.js

@@ -143,15 +143,15 @@ export const UserModel = BaseModel.extend(
 						presomanager.isGlobalTemporarySlideManager ||
 						presomanager.isTeamTemporarySlideManager;
 
+					presomanager.canModifyContent =
+						this.actions.indexOf("Create Content") > -1 ||
+						this.actions.indexOf("Manage Team Editable Text") > -1;
+
 					presomanager.isPresoManagerUser =
 						presomanager.canModifyTemporarySlides ||
 						presomanager.canModifyNotes ||
 						presomanager.canModifyContent;
 
-					presomanager.canModifyContent =
-						this.actions.indexOf("Create Content") > -1 ||
-						this.actions.indexOf("Manage Team Editable Text") > -1;
-
 					const appointments = {
 						canUploadCustomSlides:
 							this.actions.indexOf("Upload Custom Slides") > -1 &&

package/src/presentation/base-presentation-model.js

@@ -128,10 +128,14 @@ BasePresentationModel.getVisibilityAndSequence = function (
 	if (choicelist) {
 		// All items should have a choicelist entry - if it's not in
 		// the choicelist, it's not in the preso
-		const choice = choicelist.find((item) => item.url === url);
+		const choice = options.choicelistMap
+			? options.choicelistMap.get(url)
+			: choicelist.find((item) => item.url === url);
 
 		if (choice) {
-			config.sequence = choicelist.indexOf(choice);
+			config.sequence = options.choicelistMap
+				? choice._idx
+				: choicelist.indexOf(choice);
 			config.visible = choice.visible;
 		} else {
 			config.visible = false;
@@ -140,7 +144,9 @@ BasePresentationModel.getVisibilityAndSequence = function (
 		// Non-adjunct subslides and adjunct sections/slides/subslides
 		// have no selections - they fall through here using their
 		// model's values
-		const selection = selections.find((selection) => selection.url === url);
+		const selection = options.selectionsMap
+			? options.selectionsMap.get(url)
+			: selections.find((selection) => selection.url === url);
 
 		if (selection) {
 			config.visible = selection.visible;
@@ -155,9 +161,11 @@ BasePresentationModel.getVisibilityAndSequence = function (
 	return config;
 };
 
-const getAppointmentTags = function (model, tags) {
+const getAppointmentTags = function (model, tags, options) {
 	const url = model.adjunct?.url() || model.url();
-	const tagItem = tags.find((tag) => tag.content_url === url);
+	const tagItem = options?.appointmentTagsMap
+		? options.appointmentTagsMap.get(url)
+		: tags.find((tag) => tag.content_url === url);
 
 	if (tagItem) {
 		return tagItem.tags || [];
@@ -204,7 +212,7 @@ const getDeckTags = function (model, tags) {
 // references to model.tags should be removed.
 BasePresentationModel.getTags = function (model, options = {}) {
 	if (options.appointmentTags) {
-		return getAppointmentTags(model, options.appointmentTags);
+		return getAppointmentTags(model, options.appointmentTags, options);
 	}
 
 	if (options.deckTags) {

package/src/presentation/presentation-deck.js

@@ -120,21 +120,19 @@ PresentationDeck.createFromDeckVersion = function (
 	deckVersionModel,
 	options = {},
 ) {
-	_.defaults(options, {
-		index: 0,
-		autoAdjuncts: new collections.AutoAdjunctCollection(),
-		adjunctSections: new collections.AdjunctSectionCollection(),
-		adjunctSlides: new collections.AdjunctSlideCollection(),
-		adjunctSubSlides: new collections.AdjunctSubSlideCollection(),
-		sectionSelections: new collections.SectionSelectionCollection(),
-		slideSelections: new collections.SlideSelectionCollection(),
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-		rootAssetPath: null,
-		templates: null,
-		choicelist: null,
-	});
-
-	options.screenshots = PresentationDeck.screenshotsToMap(options.screenshots);
+	options.index ??= 0;
+	options.autoAdjuncts ??= new collections.AutoAdjunctCollection();
+	options.adjunctSections ??= new collections.AdjunctSectionCollection();
+	options.adjunctSlides ??= new collections.AdjunctSlideCollection();
+	options.adjunctSubSlides ??= new collections.AdjunctSubSlideCollection();
+	options.sectionSelections ??= new collections.SectionSelectionCollection();
+	options.slideSelections ??= new collections.SlideSelectionCollection();
+	options.rootAssetPath ??= null;
+	options.templates ??= null;
+	options.choicelist ??= null;
+	options.screenshots = PresentationDeck.screenshotsToMap(
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
+	);
 
 	const assetRoot = getAssetRoot(deckVersionModel.index_asset.url());
 	let html;
@@ -210,6 +208,38 @@ PresentationDeck.createFromDeckVersion = function (
 			}),
 		);
 
+	options.selectionsMap = new Map(options.selections.map((s) => [s.url, s]));
+
+	if (options.appointmentTags) {
+		options.appointmentTagsMap = new Map(
+			options.appointmentTags.map((t) => [t.content_url, t]),
+		);
+	}
+
+	if (options.rootAssetPath) {
+		options.baseRoot = getAssetRoot(deckVersionModel.index_asset.url());
+	}
+
+	options.adjunctSlidesBySection = new Map();
+	for (const slide of options.adjunctSlides.models) {
+		if (slide.section) {
+			const key = slide.section.id;
+			if (!options.adjunctSlidesBySection.has(key)) {
+				options.adjunctSlidesBySection.set(key, []);
+			}
+			options.adjunctSlidesBySection.get(key).push(slide);
+		}
+	}
+
+	options.adjunctSubSlidesBySlide = new Map();
+	for (const subslide of options.adjunctSubSlides.models) {
+		const key = subslide.slide.id;
+		if (!options.adjunctSubSlidesBySlide.has(key)) {
+			options.adjunctSubSlidesBySlide.set(key, []);
+		}
+		options.adjunctSubSlidesBySlide.get(key).push(subslide);
+	}
+
 	// We want all adjuncts to have fake ids that can't possibly overlap with the ids of
 	// normal sections, slides and subslides, so we make a base ID that is larger than
 	// all existing IDs then use the getUniqueAdjunctID function to retrieve an incremented ID
@@ -239,11 +269,11 @@ PresentationDeck.createFromDeckVersion = function (
 			);
 
 			section.addSlides(sectionModel.slide_set, options);
+
 			deck.sections.add(section);
 
-			const adjunctSlides = options.adjunctSlides.filter((slide) => {
-				return slide.section && slide.section.id === section.id;
-			});
+			const adjunctSlides =
+				options.adjunctSlidesBySection.get(section.id) ?? [];
 
 			section.addSlides(adjunctSlides, options);
 		});
@@ -315,10 +345,18 @@ PresentationDeck.createFromDeckVersion = function (
 		// slides with the sequence > 110 then I know that all slides with a sequence > 110
 		// are valid. I then remove those slides from the slides array and move down to the
 		// next section.
+		slides.sort((a, b) => b.sequence - a.sequence);
+
+		let slideIdx = 0;
 		deck.sections.models.reverse().forEach((section) => {
-			const sectionSlides = slides.filter(
-				(slide) => slide.sequence > section.sequence,
-			);
+			const sectionSlides = [];
+			while (
+				slideIdx < slides.length &&
+				slides[slideIdx].sequence > section.sequence
+			) {
+				sectionSlides.push(slides[slideIdx]);
+				slideIdx++;
+			}
 
 			section.slides.add(sectionSlides);
 
@@ -331,8 +369,9 @@ PresentationDeck.createFromDeckVersion = function (
 			section.slides.forEach((slide) => {
 				slide.section = section.id;
 			});
-
-			slides = slides.filter((slide) => slide.sequence <= section.sequence);
+			sectionSlides.forEach((slide) => {
+				slide._values.section = section.id;
+			});
 		});
 
 		// Average the adjunct slide limit used across the entire deck over each section
@@ -509,7 +548,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON, project) {
 			};
 		});
 
-		const minID = _.max(_.map(deck.sections.toJSON(), "id"));
+		const minID = Math.max(...deck.sections.map((s) => s.id));
 
 		deck.sections.add(
 			templates.map((template, index) => {

package/src/presentation/presentation-section.js

@@ -124,14 +124,10 @@ export const PresentationSection = BasePresentationModel.extend(
 		},
 
 		addSlides(slides, options = {}) {
-			_.defaults(options, {
-				rootAssetPath: null,
-				templates: null,
-				choicelist: null,
-				getUniqueAdjunctID: () => {
-					return parseInt(_.uniqueId(), 10);
-				},
-			});
+			options.rootAssetPath ??= null;
+			options.templates ??= null;
+			options.choicelist ??= null;
+			options.getUniqueAdjunctID ??= () => parseInt(_.uniqueId(), 10);
 
 			if (this.createdByTemplate) {
 				throw new Error("Can not add slides to a template");
@@ -181,15 +177,11 @@ export const PresentationSection = BasePresentationModel.extend(
  * @returns {presentation.PresentationSection}
  */
 PresentationSection.createFromSection = function (sectionModel, options = {}) {
-	_.defaults(options, {
-		rootAssetPath: null,
-		selections: null,
-		choicelist: null,
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-	});
-
+	options.rootAssetPath ??= null;
+	options.selections ??= null;
+	options.choicelist ??= null;
 	options.screenshots = PresentationSection.screenshotsToMap(
-		options.screenshots,
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
 	);
 
 	let html;
@@ -198,7 +190,9 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 	const assetRoot = getAssetRoot(sectionModel.index_asset.url());
 
 	if (options.rootAssetPath) {
-		const baseRoot = getAssetRoot(sectionModel.deckversion.index_asset.url());
+		const baseRoot =
+			options.baseRoot ??
+			getAssetRoot(sectionModel.deckversion.index_asset.url());
 		const sectionPath = assetRoot.slice(baseRoot.length);
 
 		html = `${options.rootAssetPath}${sectionPath}index.html`;
@@ -261,18 +255,12 @@ PresentationSection.createFromAdjunctSection = function (
 	deckVersionModel,
 	options = {},
 ) {
-	_.defaults(options, {
-		rootAssetPath: null,
-		selections: null,
-		choicelist: null,
-		getUniqueAdjunctID: () => {
-			return parseInt(_.uniqueId(), 10);
-		},
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-	});
-
+	options.rootAssetPath ??= null;
+	options.selections ??= null;
+	options.choicelist ??= null;
+	options.getUniqueAdjunctID ??= () => parseInt(_.uniqueId(), 10);
 	options.screenshots = PresentationSection.screenshotsToMap(
-		options.screenshots,
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
 	);
 
 	const keyID =
@@ -366,15 +354,11 @@ PresentationSection.createFromImpostorSection = function (
 	slideModel,
 	options = {},
 ) {
-	_.defaults(options, {
-		rootAssetPath: null,
-		selections: null,
-		choicelist: null,
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-	});
-
+	options.rootAssetPath ??= null;
+	options.selections ??= null;
+	options.choicelist ??= null;
 	options.screenshots = PresentationSection.screenshotsToMap(
-		options.screenshots,
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
 	);
 
 	let html;
@@ -383,9 +367,9 @@ PresentationSection.createFromImpostorSection = function (
 	const assetRoot = getAssetRoot(slideModel.index_asset.url());
 
 	if (options.rootAssetPath) {
-		const baseRoot = getAssetRoot(
-			slideModel.section.deckversion.index_asset.url(),
-		);
+		const baseRoot =
+			options.baseRoot ??
+			getAssetRoot(slideModel.section.deckversion.index_asset.url());
 		const sectionPath = assetRoot.slice(baseRoot.length);
 
 		html = `${options.rootAssetPath}${sectionPath}index.html`;
@@ -522,18 +506,15 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		}
 	}
 
-	const options = _.defaults(opts, {
-		allowConvert: true,
-		visible: true,
-		index: -1,
-		deckversionID: -1,
-		sequence: opts.index,
-		impostor: false,
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-	});
-
+	const options = opts;
+	options.allowConvert ??= true;
+	options.visible ??= true;
+	options.index ??= -1;
+	options.deckversionID ??= -1;
+	options.sequence ??= opts.index;
+	options.impostor ??= false;
 	options.screenshots = PresentationSection.screenshotsToMap(
-		options.screenshots,
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
 	);
 
 	const tags = PresentationSection.getTags(

package/src/presentation/presentation-slide.js

@@ -133,18 +133,14 @@ export const PresentationSlide = BasePresentationModel.extend(
  * @returns {presentation.PresentationSlide}
  */
 PresentationSlide.createFromSlide = function (slideModel, options = {}) {
-	_.defaults(options, {
-		adjunctSubSlides: new collections.AdjunctSubSlideCollection(),
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-		rootAssetPath: null,
-		selections: null,
-		choicelist: null,
-		getUniqueAdjunctID: () => {
-			return parseInt(_.uniqueId(), 10);
-		},
-	});
-
-	options.screenshots = PresentationSlide.screenshotsToMap(options.screenshots);
+	options.adjunctSubSlides ??= new collections.AdjunctSubSlideCollection();
+	options.rootAssetPath ??= null;
+	options.selections ??= null;
+	options.choicelist ??= null;
+	options.getUniqueAdjunctID ??= () => parseInt(_.uniqueId(), 10);
+	options.screenshots = PresentationSlide.screenshotsToMap(
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
+	);
 
 	let html;
 	let css;
@@ -152,9 +148,9 @@ PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 	const assetRoot = getAssetRoot(slideModel.index_asset.url());
 
 	if (options.rootAssetPath) {
-		const baseRoot = getAssetRoot(
-			slideModel.section.deckversion.index_asset.url(),
-		);
+		const baseRoot =
+			options.baseRoot ??
+			getAssetRoot(slideModel.section.deckversion.index_asset.url());
 		const slidePath = assetRoot.slice(baseRoot.length);
 		html = `${options.rootAssetPath}${slidePath}index.html`;
 		css = `${options.rootAssetPath}${slidePath}slide.css`;
@@ -202,9 +198,11 @@ PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 		}),
 	);
 
-	const adjunctSubslides = options.adjunctSubSlides.filter((model) => {
-		return model.slide.id === slideModel.id;
-	});
+	const adjunctSubslides = options.adjunctSubSlidesBySlide
+		? (options.adjunctSubSlidesBySlide.get(slideModel.id) ?? [])
+		: options.adjunctSubSlides.filter(
+				(model) => model.slide.id === slideModel.id,
+			);
 
 	// If the slide's content is entirely adjunct and does not have a distinct
 	// first subslide, we need to create one based on the slide.
@@ -220,7 +218,7 @@ PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 
 	let maxID = 0;
 	if (slide.subslides.length) {
-		maxID = _.max(slide.subslides.pluck("id"));
+		maxID = Math.max(...slide.subslides.map((s) => s.id));
 	}
 
 	// Add any adjunct subslides to the list
@@ -251,18 +249,14 @@ PresentationSlide.createFromAdjunctSlide = function (
 	section = null,
 	options = {},
 ) {
-	_.defaults(options, {
-		id: null,
-		rootAssetPath: null,
-		selections: null,
-		choicelist: null,
-		getUniqueAdjunctID: () => {
-			return parseInt(_.uniqueId(), 10);
-		},
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-	});
-
-	options.screenshots = PresentationSlide.screenshotsToMap(options.screenshots);
+	options.id ??= null;
+	options.rootAssetPath ??= null;
+	options.selections ??= null;
+	options.choicelist ??= null;
+	options.getUniqueAdjunctID ??= () => parseInt(_.uniqueId(), 10);
+	options.screenshots = PresentationSlide.screenshotsToMap(
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
+	);
 
 	const keyID =
 		adjunctSlideModel.id ||
@@ -454,18 +448,17 @@ PresentationSlide.createFromAutoAdjunct = function (model, opts = {}) {
 		}
 	}
 
-	const options = _.defaults(opts, {
-		allowConvert: true,
-		visible: true,
-		index: -1,
-		deckversionID: -1,
-		sectionKey: "",
-		sequence: opts.index,
-		impostor: false,
-		screenshots: new collections.DeckVersionScreenshotCollection(),
-	});
-
-	options.screenshots = PresentationSlide.screenshotsToMap(options.screenshots);
+	const options = opts;
+	options.allowConvert ??= true;
+	options.visible ??= true;
+	options.index ??= -1;
+	options.deckversionID ??= -1;
+	options.sectionKey ??= "";
+	options.sequence ??= opts.index;
+	options.impostor ??= false;
+	options.screenshots = PresentationSlide.screenshotsToMap(
+		options.screenshots ?? new collections.DeckVersionScreenshotCollection(),
+	);
 
 	const tags = PresentationSlide.getTags(
 		{

package/src/sync.js

@@ -3,7 +3,6 @@ import SuperAgentRequest from "superagent-bluebird-promise";
 import _ from "lodash";
 import log from "./log.js";
 import { middlewares } from "./middleware.js";
-import superagent from "superagent";
 
 const defaults = _.defaults;
 const assign = _.assign;
@@ -227,10 +226,10 @@ export const ajaxSync = function (method, model, options) {
 					return data;
 				});
 			})
-			.catch(superagent.SuperagentPromiseError, (e) => {
+			.catch((e) => {
 				if (
-					e.res &&
-					e.res.body &&
+					typeof e.status !== "undefined" &&
+					e.res?.body &&
 					((e.status >= 400 && e.status < 500) || e.status === 503)
 				) {
 					e.message += `\nBody: ${JSON.stringify(e.res.body)}`;