@rive-app/canvas 2.14.1 → 2.14.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rive-app/canvas",
-  "version": "2.14.1",
+  "version": "2.14.2",
   "description": "Rive's canvas based web api.",
   "main": "rive.js",
   "homepage": "https://rive.app",

package/rive.d.ts

@@ -117,7 +117,8 @@ export declare enum EventType {
     Draw = "draw",
     Advance = "advance",
     StateChange = "statechange",
-    RiveEvent = "riveevent"
+    RiveEvent = "riveevent",
+    AudioStatusChange = "audiostatuschange"
 }
 export type RiveEventPayload = rc.RiveEvent | rc.OpenUrlEvent;
 export interface Event {
@@ -311,6 +312,7 @@ export declare class Rive {
     isTouchScrollEnabled: boolean;
     constructor(params: RiveParameters);
     static new(params: RiveParameters): Rive;
+    private onSystemAudioChanged;
     private init;
     /**
      * Setup Rive Listeners on the canvas

package/rive.js

@@ -731,7 +731,7 @@ function Ya(a, b) {
     return Xa(c, a, b);
   }));
 }
-var N, P, bb = {433284:(a, b, c, d, e) => {
+var N, P, bb = {433276:(a, b, c, d, e) => {
   if ("undefined" === typeof window || void 0 === (window.AudioContext || window.webkitAudioContext)) {
     return 0;
   }
@@ -794,9 +794,9 @@ var N, P, bb = {433284:(a, b, c, d, e) => {
   }
   window.h.Aa += 1;
   return 1;
-}, 435462:() => {
+}, 435454:() => {
   "undefined" !== typeof window.h && (--window.h.Aa, 0 === window.h.Aa && delete window.h);
-}, 435626:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 435730:() => {
+}, 435618:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 435722:() => {
   try {
     var a = new (window.AudioContext || window.webkitAudioContext)(), b = a.sampleRate;
     a.close();
@@ -804,7 +804,7 @@ var N, P, bb = {433284:(a, b, c, d, e) => {
   } catch (c) {
     return 0;
   }
-}, 435901:(a, b, c, d, e, f) => {
+}, 435893:(a, b, c, d, e, f) => {
   if ("undefined" === typeof window.h) {
     return -1;
   }
@@ -850,7 +850,7 @@ var N, P, bb = {433284:(a, b, c, d, e) => {
   a == window.h.H.za && g.$.connect(g.I.destination);
   g.qb = f;
   return window.h.Gc(g);
-}, 438778:a => window.h.sa(a).I.sampleRate, 438851:a => {
+}, 438770:a => window.h.sa(a).I.sampleRate, 438843:a => {
   a = window.h.sa(a);
   void 0 !== a.$ && (a.$.onaudioprocess = function() {
   }, a.$.disconnect(), a.$ = void 0);
@@ -858,13 +858,13 @@ var N, P, bb = {433284:(a, b, c, d, e) => {
   a.I.close();
   a.I = void 0;
   a.qb = void 0;
-}, 439251:a => {
+}, 439243:a => {
   window.h.Db(a);
-}, 439301:a => {
+}, 439293:a => {
   a = window.h.sa(a);
   a.I.resume();
   a.state = window.h.ga.yb;
-}, 439440:a => {
+}, 439432:a => {
   a = window.h.sa(a);
   a.I.suspend();
   a.state = window.h.ga.stopped;
@@ -3336,8 +3336,8 @@ m._ma_malloc_emscripten = (a, b) => (m._ma_malloc_emscripten = x.ma_malloc_emscr
 m._ma_free_emscripten = (a, b) => (m._ma_free_emscripten = x.ma_free_emscripten)(a, b);
 var $a = m._ma_device_process_pcm_frames_capture__webaudio = (a, b, c) => ($a = m._ma_device_process_pcm_frames_capture__webaudio = x.ma_device_process_pcm_frames_capture__webaudio)(a, b, c), ab = m._ma_device_process_pcm_frames_playback__webaudio = (a, b, c) => (ab = m._ma_device_process_pcm_frames_playback__webaudio = x.ma_device_process_pcm_frames_playback__webaudio)(a, b, c), Ud = () => (Ud = x.__errno_location)(), Dc = a => (Dc = x.__getTypeName)(a);
 m.__embind_initialize_bindings = () => (m.__embind_initialize_bindings = x._embind_initialize_bindings)();
-m.dynCall_iiji = (a, b, c, d, e) => (m.dynCall_iiji = x.dynCall_iiji)(a, b, c, d, e);
 m.dynCall_iiiji = (a, b, c, d, e, f) => (m.dynCall_iiiji = x.dynCall_iiiji)(a, b, c, d, e, f);
+m.dynCall_iiji = (a, b, c, d, e) => (m.dynCall_iiji = x.dynCall_iiji)(a, b, c, d, e);
 m.dynCall_jiji = (a, b, c, d, e) => (m.dynCall_jiji = x.dynCall_jiji)(a, b, c, d, e);
 m.dynCall_iij = (a, b, c, d) => (m.dynCall_iij = x.dynCall_iij)(a, b, c, d);
 m.dynCall_jii = (a, b, c) => (m.dynCall_jii = x.dynCall_jii)(a, b, c);
@@ -3404,7 +3404,7 @@ Zd();
 /* 2 */
 /***/ ((module) => {
 
-module.exports = JSON.parse('{"name":"@rive-app/canvas","version":"2.14.1","description":"Rive\'s canvas based web api.","main":"rive.js","homepage":"https://rive.app","repository":{"type":"git","url":"https://github.com/rive-app/rive-wasm/tree/master/js"},"keywords":["rive","animation"],"author":"Rive","contributors":["Luigi Rosso <luigi@rive.app> (https://rive.app)","Maxwell Talbot <max@rive.app> (https://rive.app)","Arthur Vivian <arthur@rive.app> (https://rive.app)","Umberto Sonnino <umberto@rive.app> (https://rive.app)","Matthew Sullivan <matt.j.sullivan@gmail.com> (mailto:matt.j.sullivan@gmail.com)"],"license":"MIT","files":["rive.js","rive.js.map","rive.wasm","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
+module.exports = JSON.parse('{"name":"@rive-app/canvas","version":"2.14.2","description":"Rive\'s canvas based web api.","main":"rive.js","homepage":"https://rive.app","repository":{"type":"git","url":"https://github.com/rive-app/rive-wasm/tree/master/js"},"keywords":["rive","animation"],"author":"Rive","contributors":["Luigi Rosso <luigi@rive.app> (https://rive.app)","Maxwell Talbot <max@rive.app> (https://rive.app)","Arthur Vivian <arthur@rive.app> (https://rive.app)","Umberto Sonnino <umberto@rive.app> (https://rive.app)","Matthew Sullivan <matt.j.sullivan@gmail.com> (mailto:matt.j.sullivan@gmail.com)"],"license":"MIT","files":["rive.js","rive.js.map","rive.wasm","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
 
 /***/ }),
 /* 3 */
@@ -3708,6 +3708,21 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _rive_advanced_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var package_json__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
+var __extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -4551,6 +4566,7 @@ var EventType;
     EventType["Advance"] = "advance";
     EventType["StateChange"] = "statechange";
     EventType["RiveEvent"] = "riveevent";
+    EventType["AudioStatusChange"] = "audiostatuschange";
 })(EventType || (EventType = {}));
 /**
  * Looping types: one-shot, loop, and ping-pong
@@ -4643,8 +4659,176 @@ var TaskQueueManager = /** @class */ (function () {
     };
     return TaskQueueManager;
 }());
+// #endregion
+// #region Audio
+var SystemAudioStatus;
+(function (SystemAudioStatus) {
+    SystemAudioStatus[SystemAudioStatus["AVAILABLE"] = 0] = "AVAILABLE";
+    SystemAudioStatus[SystemAudioStatus["UNAVAILABLE"] = 1] = "UNAVAILABLE";
+})(SystemAudioStatus || (SystemAudioStatus = {}));
+// Class to handle audio context availability and status changes
+var AudioManager = /** @class */ (function (_super) {
+    __extends(AudioManager, _super);
+    function AudioManager() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this._started = false;
+        _this._enabled = false;
+        _this._status = SystemAudioStatus.UNAVAILABLE;
+        return _this;
+    }
+    AudioManager.prototype.delay = function (time) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve) { return setTimeout(resolve, time); })];
+            });
+        });
+    };
+    AudioManager.prototype.timeout = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (_, reject) { return setTimeout(reject, 50); })];
+            });
+        });
+    };
+    // Alerts animations on status changes and removes the listeners to avoid alerting twice.
+    AudioManager.prototype.reportToListeners = function () {
+        this.fire({ type: EventType.AudioStatusChange });
+        this.removeAll();
+    };
+    /**
+     * The audio context has been resolved.
+     * Alert any listeners that we can now play audio.
+     * Rive will now play audio at the configured volume.
+     */
+    AudioManager.prototype.enableAudio = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (!this._enabled) {
+                    this._enabled = true;
+                    this._status = SystemAudioStatus.AVAILABLE;
+                    this.reportToListeners();
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    /**
+     * Check if we are able to play audio.
+     *
+     * We currently check the audio context, when resume() returns before a timeout we know that the
+     * audio context is running and we can enable audio.
+     */
+    AudioManager.prototype.testAudio = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!(this._status === SystemAudioStatus.UNAVAILABLE &&
+                            this._audioContext !== null)) return [3 /*break*/, 4];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, Promise.race([this._audioContext.resume(), this.timeout()])];
+                    case 2:
+                        _b.sent();
+                        this.enableAudio();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _a = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Establish audio for use with rive.
+     * We both test if we can use audio intermittently and listen for user interaction.
+     * The aim is to enable audio playback as soon as the browser allows this.
+     */
+    AudioManager.prototype._establishAudio = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!this._started) return [3 /*break*/, 5];
+                        this._started = true;
+                        if (!(typeof window == "undefined")) return [3 /*break*/, 1];
+                        this.enableAudio();
+                        return [3 /*break*/, 5];
+                    case 1:
+                        this._audioContext = new AudioContext();
+                        this.listenForUserAction();
+                        _a.label = 2;
+                    case 2:
+                        if (!(this._status === SystemAudioStatus.UNAVAILABLE)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.testAudio()];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, this.delay(1000)];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 2];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    AudioManager.prototype.listenForUserAction = function () {
+        var _this = this;
+        // NOTE: AudioContexts are ready immediately if requested in a ui callback
+        // we *could* re request one in this listener.
+        var _clickListener = function () { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                // note this has "better" results than calling `await this.testAudio()`
+                // as we force audio to be enabled in the current thread, rather than chancing
+                // the thread to be passed over for some other async context
+                this.enableAudio();
+                return [2 /*return*/];
+            });
+        }); };
+        // NOTE: we should test this on mobile/pads
+        document.addEventListener("pointerdown", _clickListener, {
+            once: true,
+        });
+    };
+    /**
+     * Establish the audio context for rive, this lets rive know that we can play audio.
+     */
+    AudioManager.prototype.establishAudio = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this._establishAudio();
+                return [2 /*return*/];
+            });
+        });
+    };
+    Object.defineProperty(AudioManager.prototype, "systemVolume", {
+        get: function () {
+            if (this._status === SystemAudioStatus.UNAVAILABLE) {
+                // We do an immediate test to avoid depending on the delay of the running test
+                this.testAudio();
+                return 0;
+            }
+            return 1;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AudioManager.prototype, "status", {
+        get: function () {
+            return this._status;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return AudioManager;
+}(EventManager));
+var audioManager = new AudioManager();
 var Rive = /** @class */ (function () {
     function Rive(params) {
+        var _this = this;
         var _a;
         // Tracks if a Rive file is loaded
         this.loaded = false;
@@ -4729,6 +4913,14 @@ var Rive = /** @class */ (function () {
             this.assetLoader = params.assetLoader;
         // Hook up the task queue
         this.taskQueue = new TaskQueueManager(this.eventManager);
+        // Initialize audio
+        if (audioManager.status == SystemAudioStatus.UNAVAILABLE) {
+            audioManager.add({
+                type: EventType.AudioStatusChange,
+                callback: function () { return _this.onSystemAudioChanged(); },
+            });
+            audioManager.establishAudio();
+        }
         this.init({
             src: this.src,
             buffer: this.buffer,
@@ -4744,6 +4936,10 @@ var Rive = /** @class */ (function () {
         console.warn("This function is deprecated: please use `new Rive({})` instead");
         return new Rive(params);
     };
+    // Event handler for when audio context becomes available
+    Rive.prototype.onSystemAudioChanged = function () {
+        this.volume = this._volume;
+    };
     // Initializes the Rive object either from constructor or load()
     Rive.prototype.init = function (_a) {
         var _this = this;
@@ -4887,7 +5083,7 @@ var Rive = /** @class */ (function () {
             return;
         }
         this.artboard = rootArtboard;
-        rootArtboard.volume = this._volume;
+        rootArtboard.volume = this._volume * audioManager.systemVolume;
         // Check that the artboard has at least 1 animation
         if (this.artboard.animationCount() < 1) {
             var msg = "Artboard has no animations";
@@ -5628,7 +5824,7 @@ var Rive = /** @class */ (function () {
         set: function (value) {
             this._volume = value;
             if (this.artboard) {
-                this.artboard.volume = value;
+                this.artboard.volume = value * audioManager.systemVolume;
             }
         },
         enumerable: false,