@m2c2kit/core 0.3.7 → 0.3.9

package/dist/index.js

@@ -815,10 +815,14 @@ class Entity {
      * @remarks Inspiration from https://stackoverflow.com/a/35361695
      */
     this.toString = () => {
+      let type = this.type.toString();
+      if (this.type == EntityType.Composite) {
+        type = this.compositeType;
+      }
       if (this.name !== this.uuid) {
-        return `"${this.name}" (${this.type}, ${this.uuid})`;
+        return `"${this.name}" (${type}, ${this.uuid})`;
       } else {
-        return `"${this.type} (${this.uuid})`;
+        return `"${type} (${this.uuid})`;
       }
     };
     if (options.name === void 0) {
@@ -1020,11 +1024,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onTapDown(callback, replaceExistingCallback = true) {
+  onTapDown(callback, callbackOptions) {
     this.addEventListener(
       EventType.TapDown,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1042,11 +1046,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onTapUp(callback, replaceExistingCallback = true) {
+  onTapUp(callback, callbackOptions) {
     this.addEventListener(
       EventType.TapUp,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1065,11 +1069,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onTapUpAny(callback, replaceExistingCallback = true) {
+  onTapUpAny(callback, callbackOptions) {
     this.addEventListener(
       EventType.TapUpAny,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1087,11 +1091,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onTapLeave(callback, replaceExistingCallback = true) {
+  onTapLeave(callback, callbackOptions) {
     this.addEventListener(
       EventType.TapLeave,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1107,11 +1111,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onPointerDown(callback, replaceExistingCallback = true) {
+  onPointerDown(callback, callbackOptions) {
     this.addEventListener(
       EventType.PointerDown,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1129,11 +1133,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onPointerUp(callback, replaceExistingCallback = true) {
+  onPointerUp(callback, callbackOptions) {
     this.addEventListener(
       EventType.PointerUp,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1147,11 +1151,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onPointerMove(callback, replaceExistingCallback = true) {
+  onPointerMove(callback, callbackOptions) {
     this.addEventListener(
       EventType.PointerMove,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1164,11 +1168,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onDragStart(callback, replaceExistingCallback = true) {
+  onDragStart(callback, callbackOptions) {
     this.addEventListener(
       EventType.DragStart,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1181,11 +1185,11 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onDrag(callback, replaceExistingCallback = true) {
+  onDrag(callback, callbackOptions) {
     this.addEventListener(
       EventType.Drag,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
   /**
@@ -1198,24 +1202,29 @@ class Entity {
    * ones. It is strongly recommended not to change this, unless you have a
    * special use case. Default is true.
    */
-  onDragEnd(callback, replaceExistingCallback = true) {
+  onDragEnd(callback, callbackOptions) {
     this.addEventListener(
       EventType.DragEnd,
       callback,
-      replaceExistingCallback
+      callbackOptions
     );
   }
-  addEventListener(type, callback, replaceExistingCallback) {
+  addEventListener(type, callback, callbackOptions) {
     const eventListener = {
       type,
       entityUuid: this.uuid,
       callback
     };
-    if (replaceExistingCallback) {
+    if (callbackOptions == null ? void 0 : callbackOptions.replaceExisting) {
       this.eventListeners = this.eventListeners.filter(
         (listener) => !(listener.entityUuid === eventListener.entityUuid && listener.type === eventListener.type)
       );
     }
+    if (this.eventListeners.some((listener) => listener.type == type)) {
+      console.warn(
+        `game {${this.game.id}}: listener for event ${type} has already been added to this entity {${this}}. This is usually not intended.`
+      );
+    }
     this.eventListeners.push(eventListener);
   }
   parseLayoutConstraints(constraints, allGameEntities) {
@@ -1794,6 +1803,7 @@ Constants.FREE_ENTITIES_SCENE_NAME = "__freeEntitiesScene";
 Constants.OUTGOING_SCENE_NAME = "__outgoingScene";
 Constants.OUTGOING_SCENE_SPRITE_NAME = "__outgoingSceneSprite";
 Constants.OUTGOING_SCENE_IMAGE_NAME = "__outgoingSceneSnapshot";
+Constants.SESSION_INITIALIZATION_POLLING_INTERVAL_MS = 50;
 
 var Dimensions = /* @__PURE__ */ ((Dimensions2) => {
   Dimensions2[Dimensions2["MatchConstraint"] = 0] = "MatchConstraint";
@@ -2097,7 +2107,13 @@ class FontManager {
       return Promise.all([Promise.resolve()]);
     }
     const fetchFontsPromises = fontsToFetch.map((font) => {
+      if (!font) {
+        throw new Error("font undefined");
+      }
       const game = games.filter((g) => g.uuid === font.gameUuid).find(Boolean);
+      if (!game) {
+        throw new Error("game undefined");
+      }
       const fontUrl = game.prependAssetsGameIdUrl(font.fontUrl);
       return fetch(fontUrl).then((response) => response.arrayBuffer()).then((arrayBuffer) => {
         this.fontData.push({
@@ -2170,21 +2186,21 @@ class FontManager {
   }
 }
 
-var __defProp$6 = Object.defineProperty;
+var __defProp$7 = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
 var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
+var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$7 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$6.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+    if (__hasOwnProp$7.call(b, prop))
+      __defNormalProp$7(a, prop, b[prop]);
+  if (__getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(b)) {
+      if (__propIsEnum$7.call(b, prop))
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
@@ -2193,7 +2209,7 @@ class Sprite extends Entity {
   /**
    * Visual image displayed on the screen.
    *
-   * @remarks Images that will be used to create the sprite must be loaded during the Game.init() method prior to their use.
+   * @remarks Images that will be used to create the sprite must be loaded during the Game.initialize() method prior to their use.
    *
    * @param options - {@link SpriteOptions}
    */
@@ -2250,7 +2266,7 @@ class Sprite extends Entity {
    * provided, name will be the new uuid
    */
   duplicate(newName) {
-    const dest = new Sprite(__spreadProps$5(__spreadValues$6(__spreadValues$6({}, this.getEntityOptions()), this.getDrawableOptions()), {
+    const dest = new Sprite(__spreadProps$5(__spreadValues$7(__spreadValues$7({}, this.getEntityOptions()), this.getDrawableOptions()), {
       imageName: this.imageName,
       name: newName
     }));
@@ -2305,21 +2321,21 @@ class LoadedImage {
   }
 }
 
-var __defProp$5 = Object.defineProperty;
+var __defProp$6 = Object.defineProperty;
 var __defProps$4 = Object.defineProperties;
 var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$6 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$6(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
     }
   return a;
 };
@@ -2399,7 +2415,7 @@ class Scene extends Entity {
    * provided, name will be the new uuid
    */
   duplicate(newName) {
-    const dest = new Scene(__spreadProps$4(__spreadValues$5(__spreadValues$5({}, this.getEntityOptions()), this.getDrawableOptions()), {
+    const dest = new Scene(__spreadProps$4(__spreadValues$6(__spreadValues$6({}, this.getEntityOptions()), this.getDrawableOptions()), {
       backgroundColor: this.backgroundColor,
       name: newName
     }));
@@ -2814,19 +2830,19 @@ class WebGlInfo {
   }
 }
 
-var __defProp$4 = Object.defineProperty;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$5 = Object.defineProperty;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
@@ -2922,7 +2938,7 @@ class I18n {
     const processedLocales = new Array();
     for (const locale in baseTranslations) {
       processedLocales.push(locale);
-      result[locale] = __spreadValues$4(__spreadValues$4({}, baseTranslations[locale]), additionalTranslations[locale]);
+      result[locale] = __spreadValues$5(__spreadValues$5({}, baseTranslations[locale]), additionalTranslations[locale]);
     }
     for (const locale in additionalTranslations) {
       if (processedLocales.includes(locale)) {
@@ -3052,21 +3068,21 @@ var ShapeType = /* @__PURE__ */ ((ShapeType2) => {
   return ShapeType2;
 })(ShapeType || {});
 
-var __defProp$3 = Object.defineProperty;
+var __defProp$4 = Object.defineProperty;
 var __defProps$3 = Object.defineProperties;
 var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
@@ -3074,11 +3090,11 @@ var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$3.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$4.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$3.call(source, prop))
+  if (source != null && __getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$4.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -3094,6 +3110,7 @@ class Game {
     this.uuid = Uuid.generate();
     this.beginTimestamp = NaN;
     this.beginIso8601Timestamp = "";
+    this.eventListeners = new Array();
     this.gameMetrics = new Array();
     this.stepCount = 0;
     this.steppingNow = 0;
@@ -3172,15 +3189,30 @@ class Game {
     this.fpsMetricReportThreshold = (_a = options.fpsMetricReportThreshold) != null ? _a : Constants.FPS_METRIC_REPORT_THRESHOLD;
     this.maximumRecordedActivityMetrics = (_b = options.maximumRecordedActivityMetrics) != null ? _b : Constants.MAXIMUM_RECORDED_ACTIVITY_METRICS;
     this.addLocalizationParametersToGameParameters();
+    if (!this.options.trialSchema) {
+      this.options.trialSchema = {};
+    }
   }
   addLocalizationParametersToGameParameters() {
-    this.options.parameters = __spreadValues$3(__spreadValues$3({}, this.options.parameters), I18n.makeLocalizationParameters());
+    this.options.parameters = __spreadValues$4(__spreadValues$4({}, this.options.parameters), I18n.makeLocalizationParameters());
   }
   async init() {
+    return this.initialize();
+  }
+  async initialize() {
+    var _a, _b;
     if (this.isLocalizationRequested()) {
       const options = this.getLocalizationOptionsFromGameParameters();
       this.i18n = new I18n(options);
     }
+    if ((_a = this.session.options.activityCallbacks) == null ? void 0 : _a.onActivityLifecycle) {
+      this.onStart(this.session.options.activityCallbacks.onActivityLifecycle);
+      this.onCancel(this.session.options.activityCallbacks.onActivityLifecycle);
+      this.onEnd(this.session.options.activityCallbacks.onActivityLifecycle);
+    }
+    if ((_b = this.session.options.activityCallbacks) == null ? void 0 : _b.onActivityResults) {
+      this.onData(this.session.options.activityCallbacks.onActivityResults);
+    }
   }
   /**
    * Saves an item to the activity's key-value store.
@@ -3190,7 +3222,7 @@ class Game {
    * ```
    * const db: IDataStore = new LocalDatabase();
    * session.dataStore = db;
-   * session.init();
+   * session.initialize();
    * ```
    * @param key - item key
    * @param value - item value
@@ -3212,7 +3244,7 @@ class Game {
    * ```
    * const db: IDataStore = new LocalDatabase();
    * session.dataStore = db;
-   * session.init();
+   * session.initialize();
    * ```
    * @param key - item key
    * @param globalStore - if true, treat the item as "global" and not
@@ -3232,7 +3264,7 @@ class Game {
    * ```
    * const db: IDataStore = new LocalDatabase();
    * session.dataStore = db;
-   * session.init();
+   * session.initialize();
    * ```
    * @param key - item key
    * @param globalStore - if true, treat the item as "global" and not
@@ -3251,7 +3283,7 @@ class Game {
    * ```
    * const db: IDataStore = new LocalDatabase();
    * session.dataStore = db;
-   * session.init();
+   * session.initialize();
    * ```
    */
   storeClearItems() {
@@ -3265,7 +3297,7 @@ class Game {
    * ```
    * const db: IDataStore = new LocalDatabase();
    * session.dataStore = db;
-   * session.init();
+   * session.initialize();
    * ```
    * @param globalStore - if true, treat the item as "global" and not
    * associated with a specific activity; global items can be accessed
@@ -3282,7 +3314,7 @@ class Game {
    * ```
    * const db: IDataStore = new LocalDatabase();
    * session.dataStore = db;
-   * session.init();
+   * session.initialize();
    * ```
    * @param key - item key
    * @param globalStore - if true, treat the item as "global" and not
@@ -3561,7 +3593,7 @@ class Game {
    * @param entryScene - The scene (Scene object or its string name) to display when the game starts
    */
   async start(entryScene) {
-    var _a, _b, _c;
+    var _a, _b;
     const gameInitOptions = this.options;
     this.unitTesting = (_a = gameInitOptions._unitTesting) != null ? _a : false;
     this.setupHtmlCanvases(
@@ -3621,12 +3653,11 @@ class Game {
       warmupFunction: this.warmupShadersWithScenes
     });
     this.surface.requestAnimationFrame(this.loop.bind(this));
-    if ((_c = this.session.options.activityCallbacks) == null ? void 0 : _c.onActivityLifecycle) {
-      this.session.options.activityCallbacks.onActivityLifecycle({
-        type: EventType.ActivityStart,
-        target: this
-      });
-    }
+    const activityStartEvent = {
+      target: this,
+      type: EventType.ActivityStart
+    };
+    this.raiseActivityEventOnListeners(activityStartEvent);
   }
   addTimeSteppingControlsToDom() {
     const existingDiv = document.getElementById("m2c2kit-time-stepping-div");
@@ -3956,7 +3987,7 @@ class Game {
       for (const [variableName2] of variables) {
         emptyTrial[variableName2] = null;
       }
-      this.data.trials.push(__spreadProps$3(__spreadValues$3({
+      this.data.trials.push(__spreadProps$3(__spreadValues$4({
         document_uuid: Uuid.generate(),
         session_uuid: this.session.uuid,
         activity_uuid: this.uuid,
@@ -4008,6 +4039,9 @@ class Game {
   addTrialSchema(schema) {
     const keys = Object.keys(schema);
     keys.forEach((key) => {
+      if (!this.options.trialSchema) {
+        throw new Error("trial schema is undefined");
+      }
       this.options.trialSchema[key] = schema[key];
     });
   }
@@ -4037,6 +4071,9 @@ class Game {
    * @param value - value of the variable to set
    */
   addStaticTrialData(variableName, value) {
+    if (!this.options.trialSchema) {
+      throw new Error("trial schema is undefined");
+    }
     if (this.options.trialSchema[variableName] === void 0) {
       throw new Error(`trial variable ${variableName} not defined in schema`);
     }
@@ -4053,31 +4090,30 @@ class Game {
    * the appropriate time. It is not triggered automatically.
    */
   trialComplete() {
-    var _a, _b, _c;
+    var _a, _b;
     if (Object.keys(this.staticTrialSchema).length > 0) {
-      this.data.trials[this.trialIndex] = __spreadValues$3(__spreadValues$3({}, this.data.trials[this.trialIndex]), this.staticTrialSchema);
+      this.data.trials[this.trialIndex] = __spreadValues$4(__spreadValues$4({}, this.data.trials[this.trialIndex]), this.staticTrialSchema);
     }
     this.trialIndex++;
-    if ((_a = this.session.options.activityCallbacks) == null ? void 0 : _a.onActivityResults) {
-      this.session.options.activityCallbacks.onActivityResults({
-        type: EventType.ActivityData,
-        iso8601Timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        target: this,
-        /** newData is only the trial that recently completed */
-        newData: this.data.trials[this.trialIndex - 1],
-        newDataSchema: this.makeNewGameDataSchema(),
-        /** data is all the data collected so far in the game */
-        data: this.data,
-        dataSchema: this.makeGameDataSchema(),
-        activityConfiguration: this.makeGameActivityConfiguration(
-          (_b = this.options.parameters) != null ? _b : {}
-        ),
-        activityConfigurationSchema: this.makeGameActivityConfigurationSchema(
-          (_c = this.options.parameters) != null ? _c : {}
-        ),
-        activityMetrics: this.gameMetrics
-      });
-    }
+    const resultsEvent = {
+      type: EventType.ActivityData,
+      iso8601Timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      target: this,
+      /** newData is only the trial that recently completed */
+      newData: this.data.trials[this.trialIndex - 1],
+      newDataSchema: this.makeNewGameDataSchema(),
+      /** data is all the data collected so far in the game */
+      data: this.data,
+      dataSchema: this.makeGameDataSchema(),
+      activityConfiguration: this.makeGameActivityConfiguration(
+        (_a = this.options.parameters) != null ? _a : {}
+      ),
+      activityConfigurationSchema: this.makeGameActivityConfigurationSchema(
+        (_b = this.options.parameters) != null ? _b : {}
+      ),
+      activityMetrics: this.gameMetrics
+    };
+    this.raiseActivityEventOnListeners(resultsEvent);
   }
   makeNewGameDataSchema() {
     const newDataSchema = {
@@ -4085,7 +4121,7 @@ class Game {
       $comment: `Activity identifier: ${this.options.id}, version: ${this.options.version}.`,
       $schema: "https://json-schema.org/draft/2019-09/schema",
       type: "object",
-      properties: __spreadProps$3(__spreadValues$3(__spreadValues$3({}, this.automaticTrialSchema), this.options.trialSchema), {
+      properties: __spreadProps$3(__spreadValues$4(__spreadValues$4({}, this.automaticTrialSchema), this.options.trialSchema), {
         device_metadata: deviceMetadataSchema
       })
     };
@@ -4108,7 +4144,7 @@ class Game {
       $defs: {
         trial: {
           type: "object",
-          properties: __spreadProps$3(__spreadValues$3(__spreadValues$3({}, this.automaticTrialSchema), this.options.trialSchema), {
+          properties: __spreadProps$3(__spreadValues$4(__spreadValues$4({}, this.automaticTrialSchema), this.options.trialSchema), {
             device_metadata: deviceMetadataSchema
           })
         }
@@ -4176,60 +4212,60 @@ class Game {
   /**
    * Should be called when current game has ended successfully.
    *
-   * @remarks This will trigger the onActivityLifecycleChange callback function,
-   * if one was provided in SessionOptions. This is how the game can communicate
-   * its state to the parent session. It is the responsibility of the the game
-   * programmer to call this at the appropriate time. It is not triggered
-   * automatically.
+   * @remarks This will send an ActivityEnd event to any listeners, such as
+   * a function provided to Game.onEnd() or a callback defined in
+   * SessionOptions.activityCallbacks.onActivityLifecycle. This is how the
+   * game can communicate changes in activity state to the parent session.
+   * It is the responsibility of the the game programmer to call this at the
+   * appropriate time. It is not triggered automatically.
    */
   end() {
-    var _a, _b, _c;
-    if ((_a = this.session.options.activityCallbacks) == null ? void 0 : _a.onActivityLifecycle) {
-      this.session.options.activityCallbacks.onActivityLifecycle({
-        type: EventType.ActivityEnd,
-        target: this,
-        results: {
-          data: this.data,
-          dataSchema: this.makeGameDataSchema(),
-          activityConfiguration: this.makeGameActivityConfiguration(
-            (_b = this.options.parameters) != null ? _b : {}
-          ),
-          activityConfigurationSchema: this.makeGameActivityConfigurationSchema(
-            (_c = this.options.parameters) != null ? _c : {}
-          ),
-          activityMetrics: this.gameMetrics
-        }
-      });
-    }
+    var _a, _b;
+    const activityEndEvent = {
+      target: this,
+      type: EventType.ActivityEnd
+    };
+    const results = {
+      data: this.data,
+      dataSchema: this.makeGameDataSchema(),
+      activityConfiguration: this.makeGameActivityConfiguration(
+        (_a = this.options.parameters) != null ? _a : {}
+      ),
+      activityConfigurationSchema: this.makeGameActivityConfigurationSchema(
+        (_b = this.options.parameters) != null ? _b : {}
+      ),
+      activityMetrics: this.gameMetrics
+    };
+    this.raiseActivityEventOnListeners(activityEndEvent, results);
   }
   /**
    * Should be called when current game has been canceled by a user action.
    *
-   * @remarks This will trigger the onActivityLifecycleChange callback function,
-   * if one was provided in SessionOptions. This is how the game can communicate
-   * its state to the parent session. It is the responsibility of the the game
-   * programmer to call this at the appropriate time. It is not triggered
-   * automatically.
+   * @remarks This will send an ActivityCancel event to any listeners, such as
+   * a function provided to Game.onCancel() or a callback defined in
+   * SessionOptions.activityCallbacks.onActivityLifecycle. This is how the
+   * game can communicate changes in activity state to the parent session.
+   * It is the responsibility of the the game programmer to call this at the
+   * appropriate time. It is not triggered automatically.
    */
   cancel() {
-    var _a, _b, _c;
-    if ((_a = this.session.options.activityCallbacks) == null ? void 0 : _a.onActivityLifecycle) {
-      this.session.options.activityCallbacks.onActivityLifecycle({
-        type: EventType.ActivityCancel,
-        target: this,
-        results: {
-          data: this.data,
-          dataSchema: this.makeGameDataSchema(),
-          activityConfiguration: this.makeGameActivityConfiguration(
-            (_b = this.options.parameters) != null ? _b : {}
-          ),
-          activityConfigurationSchema: this.makeGameActivityConfigurationSchema(
-            (_c = this.options.parameters) != null ? _c : {}
-          ),
-          activityMetrics: this.gameMetrics
-        }
-      });
-    }
+    var _a, _b;
+    const activityCancelEvent = {
+      target: this,
+      type: EventType.ActivityCancel
+    };
+    const results = {
+      data: this.data,
+      dataSchema: this.makeGameDataSchema(),
+      activityConfiguration: this.makeGameActivityConfiguration(
+        (_a = this.options.parameters) != null ? _a : {}
+      ),
+      activityConfigurationSchema: this.makeGameActivityConfigurationSchema(
+        (_b = this.options.parameters) != null ? _b : {}
+      ),
+      activityMetrics: this.gameMetrics
+    };
+    this.raiseActivityEventOnListeners(activityCancelEvent, results);
   }
   setupHtmlCanvases(canvasId, width, height, stretch) {
     Globals.canvasScale = Math.round(window.devicePixelRatio * 100) / 100;
@@ -4830,10 +4866,10 @@ class Game {
    *
    * @param type - the type of event to listen for, e.g., "tapDown"
    * @param entityName - the entity name for which an event will be listened
-   * @param callback
-   * @param replaceExistingCallback
+   * @param callback - the callback to be invoked when the event occurs
+   * @param callbackOptions
    */
-  createEventListener(type, entityName, callback, replaceExistingCallback = true) {
+  createEventListener(type, entityName, callback, callbackOptions) {
     const entities = this.entities.filter(
       (entity2) => entity2.name === entityName
     );
@@ -4848,17 +4884,12 @@ class Game {
         `could not create event listener. entity with name ${entityName} could not be found in the game entity tree`
       );
     }
-    switch (type) {
-      case EventType.PointerDown: {
-        entity.onPointerDown(callback, replaceExistingCallback);
-        break;
-      }
-      default: {
-        throw new Error(
-          `could not create event listener: event type ${type} is not known`
-        );
-      }
+    if (!Object.values(EventType).includes(type)) {
+      throw new Error(
+        `game ${this.id}: could not create event listener. event type ${type} is not known`
+      );
     }
+    entity.addEventListener(type, callback, callbackOptions);
   }
   /**
    * Returns array of all entities that have been added to the game object.
@@ -5196,6 +5227,67 @@ class Game {
     const relativeY = (y - bb.yMin) / (bb.yMax - bb.yMin) * height;
     return { x: relativeX, y: relativeY };
   }
+  /**
+   * Executes a callback when the game starts.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onStart(callback, options) {
+    this.addEventListener(EventType.ActivityStart, callback, options);
+  }
+  /**
+   * Executes a callback when the game is canceled.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onCancel(callback, options) {
+    this.addEventListener(EventType.ActivityCancel, callback, options);
+  }
+  /**
+   * Executes a callback when the game ends.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onEnd(callback, options) {
+    this.addEventListener(EventType.ActivityEnd, callback, options);
+  }
+  /**
+   * Executes a callback when the game generates data.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onData(callback, options) {
+    this.addEventListener(
+      EventType.ActivityData,
+      callback,
+      options
+    );
+  }
+  addEventListener(type, callback, options) {
+    const eventListener = {
+      type,
+      activityUuid: this.uuid,
+      callback
+    };
+    if (options == null ? void 0 : options.replaceExisting) {
+      this.eventListeners = this.eventListeners.filter(
+        (listener) => !(listener.activityUuid === eventListener.activityUuid && listener.type === eventListener.type)
+      );
+    }
+    this.eventListeners.push(eventListener);
+  }
+  raiseActivityEventOnListeners(activityEvent, extra) {
+    if (extra) {
+      activityEvent = __spreadValues$4(__spreadValues$4({}, activityEvent), extra);
+    }
+    this.eventListeners.filter((listener) => listener.type === activityEvent.type).forEach((listener) => {
+      listener.callback(activityEvent);
+    });
+  }
   raiseEventOnListeningEntities(entity, m2Event, domEvent) {
     entity.eventListeners.filter((listener) => listener.type === m2Event.type).forEach((listener) => {
       if (listener.entityUuid === entity.uuid) {
@@ -5535,6 +5627,9 @@ class ImageManager {
             reloadImageUsingViewBoxWidthHeight(svgElement);
           } else if (browserImage.url) {
             const game = this.session.options.activities.filter((a) => a.type === ActivityType.Game).filter((g) => g.uuid === gameUuid).map((g) => g).find(Boolean);
+            if (!game) {
+              throw new Error("game undefined");
+            }
             const browserImageUrl = game.prependAssetsGameIdUrl(
               browserImage.url
             );
@@ -5575,6 +5670,9 @@ class ImageManager {
         image.src = "data:image/svg+xml," + encodeURIComponent(browserImage.svgString);
       } else if (browserImage.url) {
         const game = this.session.options.activities.filter((a) => a.type === ActivityType.Game).filter((g) => g.uuid === gameUuid).map((g) => g).find(Boolean);
+        if (!game) {
+          throw new Error("game undefined");
+        }
         const browserImageUrl = game.prependAssetsGameIdUrl(browserImage.url);
         fetch(browserImageUrl).then((response) => response.arrayBuffer()).then((data) => {
           const base64String = this.arrayBufferToBase64String(data);
@@ -5684,21 +5782,21 @@ var LabelHorizontalAlignmentMode = /* @__PURE__ */ ((LabelHorizontalAlignmentMod
   return LabelHorizontalAlignmentMode2;
 })(LabelHorizontalAlignmentMode || {});
 
-var __defProp$2 = Object.defineProperty;
+var __defProp$3 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
 var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
     }
   return a;
 };
@@ -5826,9 +5924,14 @@ class Label extends Entity {
         fontManager.gameTypefaces[this.game.uuid][this.fontName].fontFamily
       );
     } else {
-      fontFamilies.push(
-        Object.values(fontManager.gameTypefaces[this.game.uuid]).filter((f) => f.isDefault).find(Boolean).fontFamily
+      const typefaces = Object.values(
+        fontManager.gameTypefaces[this.game.uuid]
       );
+      const defaultTypeface = typefaces.filter((f) => f.isDefault).find(Boolean);
+      if (!defaultTypeface) {
+        throw new Error("no default font");
+      }
+      fontFamilies.push(defaultTypeface.fontFamily);
     }
     this.paraStyle = new this.canvasKit.ParagraphStyle({
       textStyle: {
@@ -5948,7 +6051,7 @@ class Label extends Entity {
    * provided, name will be the new uuid
    */
   duplicate(newName) {
-    const dest = new Label(__spreadProps$2(__spreadValues$2(__spreadValues$2(__spreadValues$2({}, this.getEntityOptions()), this.getDrawableOptions()), this.getTextOptions()), {
+    const dest = new Label(__spreadProps$2(__spreadValues$3(__spreadValues$3(__spreadValues$3({}, this.getEntityOptions()), this.getDrawableOptions()), this.getTextOptions()), {
       horizontalAlignmentMode: this.horizontalAlignmentMode,
       preferredMaxLayoutWidth: this.preferredMaxLayoutWidth,
       backgroundColor: this.backgroundColor,
@@ -6702,6 +6805,22 @@ var w;w||(w=typeof CanvasKitInit !== 'undefined' ? CanvasKitInit : {});var da,ea
 var canvaskitExports = canvaskit.exports;
 var CanvasKitInit = /*@__PURE__*/getDefaultExportFromCjs(canvaskitExports);
 
+var __defProp$2 = Object.defineProperty;
+var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
+var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
+var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$2 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$2.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(b)) {
+      if (__propIsEnum$2.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
+    }
+  return a;
+};
 class Session {
   /**
    * A Session contains one or more activities. The session manages the start
@@ -6710,8 +6829,10 @@ class Session {
    * @param options
    */
   constructor(options) {
+    this.eventListeners = new Array();
     this.sessionDictionary = /* @__PURE__ */ new Map();
-    this.version = "0.3.7 (402d543e)";
+    this.initialized = false;
+    this.version = "0.3.9 (ae8a7530)";
     this.options = options;
     for (const activity of this.options.activities) {
       if (this.options.activities.filter((a) => a === activity).length > 1) {
@@ -6729,61 +6850,253 @@ class Session {
       this.uuid = Uuid.generate();
     }
   }
+  /**
+   * Executes a callback when the session initializes.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onInitialize(callback, options) {
+    this.addEventListener(
+      EventType.SessionInitialize,
+      callback,
+      options
+    );
+  }
+  /**
+   * Executes a callback when the session starts.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onStart(callback, options) {
+    this.addEventListener(
+      EventType.SessionStart,
+      callback,
+      options
+    );
+  }
+  /**
+   * Executes a callback when the session ends.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onEnd(callback, options) {
+    this.addEventListener(
+      EventType.SessionEnd,
+      callback,
+      options
+    );
+  }
+  /**
+   * Executes a callback when any activity in the session generates data.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onActivityData(callback, options) {
+    this.addEventListener(
+      EventType.ActivityData,
+      callback,
+      options
+    );
+  }
+  addEventListener(type, callback, options) {
+    const eventListener = {
+      type,
+      callback,
+      key: options == null ? void 0 : options.key
+    };
+    if (options == null ? void 0 : options.replaceExisting) {
+      this.eventListeners = this.eventListeners.filter(
+        (listener) => !(listener.type === eventListener.type)
+      );
+    }
+    this.eventListeners.push(eventListener);
+  }
+  raiseEventOnListeners(event, extra) {
+    if (extra) {
+      event = __spreadValues$2(__spreadValues$2({}, event), extra);
+    }
+    this.eventListeners.filter((listener) => listener.type === event.type).forEach((listener) => {
+      listener.callback(event);
+    });
+  }
+  async sessionActivityStartHandler(event) {
+    const activityType = event.target.type === ActivityType.Game ? "game" : "survey";
+    console.log(`\u{1F7E2} started activity (${activityType}) ${event.target.name}`);
+  }
+  async sessionActivityCancelHandler(event) {
+    const activityType = event.target.type === ActivityType.Game ? "game" : "survey";
+    console.log(`\u{1F6AB} canceled activity (${activityType}) ${event.target.name}`);
+    if (this.nextActivity && this.options.autoGoToNextActivity !== false) {
+      await this.goToNextActivity();
+      return;
+    }
+    if (!this.nextActivity && this.options.autoEndAfterLastActivity !== false) {
+      this.end();
+    }
+  }
+  async sessionActivityEndHandler(event) {
+    const activityType = event.target.type === ActivityType.Game ? "game" : "survey";
+    console.log(`\u{1F534} ended activity (${activityType}) ${event.target.name}`);
+    if (this.nextActivity && this.options.autoGoToNextActivity !== false) {
+      await this.goToNextActivity();
+      return;
+    }
+    if (!this.nextActivity && this.options.autoEndAfterLastActivity !== false) {
+      this.end();
+    }
+  }
+  async sessionActivityLifecycleHandler(event) {
+    if (event.type === EventType.ActivityStart) {
+      await this.sessionActivityStartHandler(event);
+      return;
+    }
+    if (event.type === EventType.ActivityCancel) {
+      await this.sessionActivityCancelHandler(event);
+      return;
+    }
+    if (event.type === EventType.ActivityEnd) {
+      await this.sessionActivityEndHandler(event);
+      return;
+    }
+    throw new Error("unknown activity lifecycle event type");
+  }
+  activityResultsEventHandler(event) {
+    this.raiseEventOnListeners(event);
+  }
   /**
    * Asynchronously initializes the m2c2kit engine and loads assets
+   *
+   * @deprecated Use Session.initialize() instead.
    */
   async init() {
-    var _a;
+    console.warn(
+      `The init() method of Session is deprecated. Use initialize() instead.`
+    );
+    return this.initialize();
+  }
+  /**
+   * Check if the Activity uses the deprecated init() method.
+   *
+   * @remarks Activity.init() is deprecated and should be replaced with
+   * Activity.initialize().
+   *
+   * @param activity
+   * @returns true if the activity defines its own init() method, false otherwise.
+   */
+  activityUsesDeprecatedInit(activity) {
+    if (activity.type === ActivityType.Survey) {
+      return false;
+    }
+    const activityPrototype = Object.getPrototypeOf(activity);
+    const gamePrototype = Object.getPrototypeOf(activityPrototype);
+    return (activityPrototype == null ? void 0 : activityPrototype.init) !== (gamePrototype == null ? void 0 : gamePrototype.init);
+  }
+  /**
+   * Asynchronously initializes the m2c2kit engine and loads assets
+   */
+  async initialize() {
     console.log(`\u26AA @m2c2kit/core version ${this.version}`);
-    Timer.start("sessionInit");
+    Timer.start("sessionInitialize");
+    const sessionInitializeEvent = {
+      target: this,
+      type: EventType.SessionInitialize
+    };
+    this.raiseEventOnListeners(sessionInitializeEvent);
     DomHelpers.addLoadingElements();
     DomHelpers.setSpinnerVisibility(true);
     DomHelpers.setCanvasOverlayVisibility(true);
     await Promise.all(
       this.options.activities.map((activity) => {
         activity.dataStore = this.dataStore;
-        return activity.init();
+        activity.onStart(this.sessionActivityLifecycleHandler.bind(this));
+        activity.onCancel(this.sessionActivityLifecycleHandler.bind(this));
+        activity.onEnd(this.sessionActivityLifecycleHandler.bind(this));
+        activity.onData((event) => {
+          this.activityResultsEventHandler(event);
+        });
+        if (this.activityUsesDeprecatedInit(activity)) {
+          console.warn(
+            `game ${activity.id}: Activity.init() is deprecated. In the assessment class that extends Game, use Activity.initialize() instead:
+  async initialize() {
+    await super.initialize();
+    ...
+  }
+`
+          );
+          return activity.init();
+        }
+        return activity.initialize();
       })
     );
     const [canvasKit] = await this.getAsynchronousAssets();
     this.loadAssets(canvasKit);
     this.imageManager.removeScratchCanvas();
     console.log(
-      `\u26AA Session.init() took ${Timer.elapsed("sessionInit").toFixed(0)} ms`
+      `\u26AA Session.sessionInitialize() took ${Timer.elapsed(
+        "sessionInitialize"
+      ).toFixed(0)} ms`
     );
-    Timer.remove("sessionInit");
-    const sessionLifecycleChangeCallback = (_a = this.options.sessionCallbacks) == null ? void 0 : _a.onSessionLifecycle;
-    if (sessionLifecycleChangeCallback) {
-      sessionLifecycleChangeCallback({
-        target: this,
-        type: EventType.SessionInitialize
-      });
+    Timer.remove("sessionInitialize");
+    this.initialized = true;
+    if (this.options.autoStartAfterInit !== false) {
+      await this.start();
+    }
+  }
+  /**
+   * Waits for the session to be initialized.
+   *
+   * @remarks Session.initialize() is asynchronous, and it should be awaited
+   * so that the session is fully initialized before calling Session.start().
+   * If it is not awaited (or it cannot be awaited because the target
+   * environment does not support top-level await), this function ensures that
+   * the session has been initialized.
+   */
+  async waitForSessionInitialization() {
+    while (!this.initialized) {
+      await new Promise(
+        (resolve) => setTimeout(
+          resolve,
+          Constants.SESSION_INITIALIZATION_POLLING_INTERVAL_MS
+        )
+      );
     }
   }
   /**
    * Starts the session and starts the first activity.
    */
   async start() {
+    await this.waitForSessionInitialization();
+    console.log("\u{1F7E2} started session");
+    const sessionStartEvent = {
+      target: this,
+      type: EventType.SessionStart
+    };
+    this.raiseEventOnListeners(sessionStartEvent);
     this.currentActivity = this.options.activities.find(Boolean);
     if (this.currentActivity) {
       DomHelpers.configureDomForActivity(this.currentActivity);
       await this.currentActivity.start();
+    } else {
+      console.warn("no activities in session.");
+      this.end();
     }
   }
   /**
    * Declares the session ended and sends callback.
    */
   end() {
-    var _a;
-    const sessionLifecycleChangeCallback = (_a = this.options.sessionCallbacks) == null ? void 0 : _a.onSessionLifecycle;
-    if (sessionLifecycleChangeCallback) {
-      sessionLifecycleChangeCallback({
-        target: this,
-        type: EventType.SessionEnd
-      });
-    }
+    console.log("\u{1F534} ended session");
     DomHelpers.hideAll();
     this.stop();
+    const sessionEndEvent = {
+      target: this,
+      type: EventType.SessionEnd
+    };
+    this.raiseEventOnListeners(sessionEndEvent);
   }
   stop() {
     this.dispose();
@@ -6841,7 +7154,7 @@ class Session {
       this.fontManager.gameTypefaces[this.currentActivity.uuid] = this.fontManager.gameTypefaces[currentActivityOldObject.uuid];
       delete this.fontManager.gameTypefaces[currentActivityOldObject.uuid];
     }
-    await this.currentActivity.init();
+    await this.currentActivity.initialize();
     await this.currentActivity.start();
   }
   /**
@@ -6857,10 +7170,8 @@ class Session {
     }
     this.currentActivity.stop();
     this.currentActivity = this.nextActivity;
-    if (this.currentActivity) {
-      DomHelpers.configureDomForActivity(this.currentActivity);
-      await this.currentActivity.start();
-    }
+    DomHelpers.configureDomForActivity(this.currentActivity);
+    await this.currentActivity.start();
   }
   /**
    * Stops the current activity and advances to next activity in the session.