jspsych 8.2.0 → 8.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspsych",
-  "version": "8.2.0",
+  "version": "8.2.2",
   "description": "Behavioral experiments in a browser",
   "type": "module",
   "main": "dist/index.cjs",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@fontsource/open-sans": "4.5.3",
-    "@jspsych/config": "^3.2.0",
+    "@jspsych/config": "^3.3.0",
     "@types/dom-mediacapture-record": "^1.0.11",
     "base64-inline-loader": "^2.0.1",
     "css-loader": "^6.6.0",

package/src/JsPsych.ts

@@ -36,6 +36,9 @@ export class JsPsych {
     return version;
   }
 
+  // prettier-ignore
+  private citation: any = '__CITATIONS__';
+
   /** Options */
   private options: any = {};
 
@@ -274,8 +277,6 @@ export class JsPsych {
     format: "apa" | "bibtex" = "apa"
   ) {
     const formatOptions = ["apa", "bibtex"];
-    // prettier-ignore
-    const jsPsychCitations: any = '__CITATIONS__';
     format = format.toLowerCase() as "apa" | "bibtex";
     // Check if plugins is an array
     if (!Array.isArray(plugins)) {
@@ -287,7 +288,7 @@ export class JsPsych {
     }
     // Print citations
     else {
-      const jsPsychCitation = jsPsychCitations[format];
+      const jsPsychCitation = this.citation[format];
       const citationSet = new Set([jsPsychCitation]);
 
       for (const plugin of plugins) {

package/src/modules/plugin-api/MediaAPI.ts

@@ -284,11 +284,38 @@ export class MediaAPI {
   private camera_recorder: MediaRecorder = null;
 
   initializeCameraRecorder(stream: MediaStream, opts?: MediaRecorderOptions) {
+    let mimeType = this.getCompatibleMimeType() || "video/webm";
+    const recorderOptions: MediaRecorderOptions = {
+      ...opts,
+      mimeType
+    }
+
     this.camera_stream = stream;
-    const recorder = new MediaRecorder(stream, opts);
+    const recorder = new MediaRecorder(stream, recorderOptions);
     this.camera_recorder = recorder;
   }
 
+  // mimetype checking code adapted from https://github.com/lookit/lookit-jspsych/blob/develop/packages/record/src/videoConfig.ts#L673-L699
+  /** returns a compatible mimetype string, or null if none from the array are supported. */
+  private getCompatibleMimeType(): string {
+    const types = [
+      // chrome firefox edge
+      "video/webm;codecs=vp9,opus",
+      "video/webm;codecs=vp8,opus",
+      // general
+      "video/mp4;codecs=avc1.42E01E,mp4a.40.2",
+      // safari
+      "video/mp4;codecs=h264,aac",
+      "video/mp4;codecs=hevc,aac",
+    ]
+    for (const mimeType of types) {
+      if (MediaRecorder.isTypeSupported(mimeType)) {
+        return mimeType;
+      }
+    }
+    return null;
+  }
+
   getCameraStream(): MediaStream {
     return this.camera_stream;
   }

package/src/timeline/Timeline.spec.ts

@@ -586,10 +586,10 @@ describe("Timeline", () => {
         const variable = new TimelineVariable("x");
 
         await timeline.run();
-        expect(() => timeline.evaluateTimelineVariable(variable)).toThrowError("");
+        expect(() => timeline.evaluateTimelineVariable(variable)).toThrow();
         expect(() =>
           (timeline.children[0] as Timeline).evaluateTimelineVariable(variable)
-        ).toThrowError("");
+        ).toThrow();
       });
     });
   });

package/src/timeline/Trial.spec.ts

@@ -524,7 +524,7 @@ describe("Trial", () => {
           );
           await expect(
             createTrial({ type: TestPlugin, requiredComplexNested: {} }).run()
-          ).rejects.toThrowError('"requiredComplexNested.requiredChild" parameter');
+          ).rejects.toThrow('"requiredComplexNested.requiredChild" parameter');
         });
 
         it("errors on missing parameters nested in `COMPLEX` array parameters", async () => {