@rive-app/canvas 2.15.5 → 2.16.0

package/package.json

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

package/rive.d.ts

@@ -123,7 +123,7 @@ export declare enum EventType {
 export type RiveEventPayload = rc.RiveEvent | rc.OpenUrlEvent;
 export interface Event {
     type: EventType;
-    data?: string | string[] | LoopEvent | number | RiveEventPayload;
+    data?: string | string[] | LoopEvent | number | RiveEventPayload | RiveFile;
 }
 /**
  * Looping types: one-shot, loop, and ping-pong
@@ -189,6 +189,7 @@ export interface RiveParameters {
     canvas: HTMLCanvasElement | OffscreenCanvas;
     src?: string;
     buffer?: ArrayBuffer;
+    riveFile?: RiveFile;
     artboard?: string;
     animations?: string | string[];
     stateMachines?: string | string[];
@@ -265,6 +266,7 @@ export interface RiveParameters {
 export interface RiveLoadParameters {
     src?: string;
     buffer?: ArrayBuffer;
+    riveFile?: RiveFile;
     autoplay?: boolean;
     artboard?: string;
     animations?: string | string[];
@@ -278,6 +280,50 @@ export interface RiveResetParameters {
     stateMachines?: string | string[];
     autoplay?: boolean;
 }
+export interface RiveFileParameters {
+    src?: string;
+    buffer?: ArrayBuffer;
+    assetLoader?: AssetLoadCallback;
+    enableRiveAssetCDN?: boolean;
+    onLoad?: EventCallback;
+    onLoadError?: EventCallback;
+}
+export declare class RiveFile {
+    private static readonly missingErrorMessage;
+    private static readonly fileLoadErrorMessage;
+    private src;
+    private buffer;
+    private runtime;
+    private file;
+    private assetLoader;
+    private enableRiveAssetCDN;
+    private eventManager;
+    private referenceCount;
+    constructor(params: RiveFileParameters);
+    private initData;
+    init(): Promise<void>;
+    /**
+     * Subscribe to Rive-generated events
+     * @param type the type of event to subscribe to
+     * @param callback callback to fire when the event occurs
+     */
+    on(type: EventType, callback: EventCallback): void;
+    /**
+     * Unsubscribes from a Rive-generated event
+     * @param type the type of event to unsubscribe from
+     * @param callback the callback to unsubscribe
+     */
+    off(type: EventType, callback: EventCallback): void;
+    cleanup(): void;
+    /**
+     * Unsubscribes all Rive listeners from an event type, or everything if no type is
+     * given
+     * @param type the type of event to unsubscribe from, or all types if
+     * undefined
+     */
+    removeAllRiveEventListeners(type?: EventType): void;
+    getInstance(): rc.File;
+}
 export declare class Rive {
     private readonly canvas;
     private src;
@@ -298,6 +344,7 @@ export declare class Rive {
     private artboard;
     private eventCleanup;
     private file;
+    private riveFile;
     private eventManager;
     private taskQueue;
     private animator;

package/rive.js

@@ -736,7 +736,7 @@ function Ya(a, b) {
     return Xa(c, a, b);
   }));
 }
-var Za, $a, db = {430124:(a, b, c, d, e) => {
+var Za, $a, db = {430204:(a, b, c, d, e) => {
   if ("undefined" === typeof window || void 0 === (window.AudioContext || window.webkitAudioContext)) {
     return 0;
   }
@@ -799,9 +799,9 @@ var Za, $a, db = {430124:(a, b, c, d, e) => {
   }
   window.h.Aa += 1;
   return 1;
-}, 432302:() => {
+}, 432382:() => {
   "undefined" !== typeof window.h && (--window.h.Aa, 0 === window.h.Aa && delete window.h);
-}, 432466:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 432570:() => {
+}, 432546:() => void 0 !== navigator.mediaDevices && void 0 !== navigator.mediaDevices.getUserMedia, 432650:() => {
   try {
     var a = new (window.AudioContext || window.webkitAudioContext)(), b = a.sampleRate;
     a.close();
@@ -809,7 +809,7 @@ var Za, $a, db = {430124:(a, b, c, d, e) => {
   } catch (c) {
     return 0;
   }
-}, 432741:(a, b, c, d, e, f) => {
+}, 432821:(a, b, c, d, e, f) => {
   if ("undefined" === typeof window.h) {
     return -1;
   }
@@ -855,7 +855,7 @@ var Za, $a, db = {430124:(a, b, c, d, e) => {
   a == window.h.H.ya && g.Z.connect(g.I.destination);
   g.pb = f;
   return window.h.yc(g);
-}, 435618:a => window.h.ra(a).I.sampleRate, 435691:a => {
+}, 435698:a => window.h.ra(a).I.sampleRate, 435771:a => {
   a = window.h.ra(a);
   void 0 !== a.Z && (a.Z.onaudioprocess = function() {
   }, a.Z.disconnect(), a.Z = void 0);
@@ -863,13 +863,13 @@ var Za, $a, db = {430124:(a, b, c, d, e) => {
   a.I.close();
   a.I = void 0;
   a.pb = void 0;
-}, 436091:a => {
+}, 436171:a => {
   window.h.Cb(a);
-}, 436141:a => {
+}, 436221:a => {
   a = window.h.ra(a);
   a.I.resume();
   a.state = window.h.ga.xb;
-}, 436280:a => {
+}, 436360:a => {
   a = window.h.ra(a);
   a.I.suspend();
   a.state = window.h.ga.stopped;
@@ -2979,7 +2979,7 @@ var Wd = {__syscall_fcntl64:function(a, b, c) {
   Vc(a, {fc:!0, name:b, argPackAdvance:0, fromWireType:function() {
   }, toWireType:function() {
   },});
-}, _emval_as:function(a, b, c) {
+}, _emscripten_get_now_is_monotonic:() => !0, _emval_as:function(a, b, c) {
   a = rc(a);
   b = Fc(b, "emval::as");
   var d = [], e = sc(d);
@@ -3055,7 +3055,9 @@ var Wd = {__syscall_fcntl64:function(a, b, c) {
     c += 105 != d & c, Kd.push(105 == d ? L[c] : Ia[c++ >> 1]), ++c;
   }
   return db[a].apply(null, Kd);
-}, emscripten_memcpy_big:(a, b, c) => E.copyWithin(a, b, b + c), emscripten_resize_heap:a => {
+}, emscripten_date_now:function() {
+  return Date.now();
+}, emscripten_get_now:() => performance.now(), emscripten_memcpy_big:(a, b, c) => E.copyWithin(a, b, b + c), emscripten_resize_heap:a => {
   var b = E.length;
   a >>>= 0;
   if (2147483648 < a) {
@@ -3353,7 +3355,7 @@ Zd();
 /* 2 */
 /***/ ((module) => {
 
-module.exports = JSON.parse('{"name":"@rive-app/canvas","version":"2.15.5","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_fallback.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.16.0","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_fallback.wasm","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
 
 /***/ }),
 /* 3 */
@@ -3647,6 +3649,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   LoopType: () => (/* binding */ LoopType),
 /* harmony export */   Rive: () => (/* binding */ Rive),
 /* harmony export */   RiveEventType: () => (/* binding */ RiveEventType),
+/* harmony export */   RiveFile: () => (/* binding */ RiveFile),
 /* harmony export */   RuntimeLoader: () => (/* binding */ RuntimeLoader),
 /* harmony export */   StateMachineInput: () => (/* binding */ StateMachineInput),
 /* harmony export */   StateMachineInputType: () => (/* binding */ StateMachineInputType),
@@ -4832,6 +4835,142 @@ var ObjectObservers = /** @class */ (function () {
     return ObjectObservers;
 }());
 var observers = new ObjectObservers();
+var RiveFile = /** @class */ (function () {
+    function RiveFile(params) {
+        // Allow the runtime to automatically load assets hosted in Rive's runtime.
+        this.enableRiveAssetCDN = true;
+        this.referenceCount = 0;
+        this.src = params.src;
+        this.buffer = params.buffer;
+        if (params.assetLoader)
+            this.assetLoader = params.assetLoader;
+        this.enableRiveAssetCDN =
+            typeof params.enableRiveAssetCDN == "boolean"
+                ? params.enableRiveAssetCDN
+                : true;
+        // New event management system
+        this.eventManager = new EventManager();
+        if (params.onLoad)
+            this.on(EventType.Load, params.onLoad);
+        if (params.onLoadError)
+            this.on(EventType.LoadError, params.onLoadError);
+    }
+    RiveFile.prototype.initData = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, loader, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!this.src) return [3 /*break*/, 2];
+                        _a = this;
+                        return [4 /*yield*/, loadRiveFile(this.src)];
+                    case 1:
+                        _a.buffer = _c.sent();
+                        _c.label = 2;
+                    case 2:
+                        if (this.assetLoader) {
+                            loader = new this.runtime.CustomFileAssetLoader({
+                                loadContents: this.assetLoader,
+                            });
+                        }
+                        // Load the Rive file
+                        _b = this;
+                        return [4 /*yield*/, this.runtime.load(new Uint8Array(this.buffer), loader, this.enableRiveAssetCDN)];
+                    case 3:
+                        // Load the Rive file
+                        _b.file = _c.sent();
+                        if (this.file !== null) {
+                            this.eventManager.fire({
+                                type: EventType.Load,
+                                data: this,
+                            });
+                        }
+                        else {
+                            this.eventManager.fire({
+                                type: EventType.LoadError,
+                                data: null,
+                            });
+                            throw new Error(RiveFile.fileLoadErrorMessage);
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    RiveFile.prototype.init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        // If no source file url specified, it's a bust
+                        if (!this.src && !this.buffer) {
+                            throw new Error(RiveFile.missingErrorMessage);
+                        }
+                        _a = this;
+                        return [4 /*yield*/, RuntimeLoader.awaitInstance()];
+                    case 1:
+                        _a.runtime = _b.sent();
+                        return [4 /*yield*/, this.initData()];
+                    case 2:
+                        _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Subscribe to Rive-generated events
+     * @param type the type of event to subscribe to
+     * @param callback callback to fire when the event occurs
+     */
+    RiveFile.prototype.on = function (type, callback) {
+        this.eventManager.add({
+            type: type,
+            callback: callback,
+        });
+    };
+    /**
+     * Unsubscribes from a Rive-generated event
+     * @param type the type of event to unsubscribe from
+     * @param callback the callback to unsubscribe
+     */
+    RiveFile.prototype.off = function (type, callback) {
+        this.eventManager.remove({
+            type: type,
+            callback: callback,
+        });
+    };
+    RiveFile.prototype.cleanup = function () {
+        var _a;
+        this.referenceCount -= 1;
+        if (this.referenceCount <= 0) {
+            this.removeAllRiveEventListeners();
+            (_a = this.file) === null || _a === void 0 ? void 0 : _a.delete();
+        }
+    };
+    /**
+     * Unsubscribes all Rive listeners from an event type, or everything if no type is
+     * given
+     * @param type the type of event to unsubscribe from, or all types if
+     * undefined
+     */
+    RiveFile.prototype.removeAllRiveEventListeners = function (type) {
+        this.eventManager.removeAll(type);
+    };
+    RiveFile.prototype.getInstance = function () {
+        if (this.file !== null) {
+            this.referenceCount += 1;
+            return this.file;
+        }
+    };
+    // Error message for missing source or buffer
+    RiveFile.missingErrorMessage = "Rive source file or data buffer required";
+    // Error message for file load error
+    RiveFile.fileLoadErrorMessage = "The file failed to load";
+    return RiveFile;
+}());
+
 var Rive = /** @class */ (function () {
     function Rive(params) {
         var _this = this;
@@ -4880,6 +5019,7 @@ var Rive = /** @class */ (function () {
         }
         this.src = params.src;
         this.buffer = params.buffer;
+        this.riveFile = params.riveFile;
         this.layout = (_a = params.layout) !== null && _a !== void 0 ? _a : new Layout();
         this.shouldDisableRiveListeners = !!params.shouldDisableRiveListeners;
         this.isTouchScrollEnabled = !!params.isTouchScrollEnabled;
@@ -4933,6 +5073,7 @@ var Rive = /** @class */ (function () {
         this.init({
             src: this.src,
             buffer: this.buffer,
+            riveFile: this.riveFile,
             autoplay: params.autoplay,
             animations: params.animations,
             stateMachines: params.stateMachines,
@@ -4952,11 +5093,12 @@ var Rive = /** @class */ (function () {
     // Initializes the Rive object either from constructor or load()
     Rive.prototype.init = function (_a) {
         var _this = this;
-        var src = _a.src, buffer = _a.buffer, animations = _a.animations, stateMachines = _a.stateMachines, artboard = _a.artboard, _b = _a.autoplay, autoplay = _b === void 0 ? false : _b, _c = _a.useOffscreenRenderer, useOffscreenRenderer = _c === void 0 ? false : _c;
+        var src = _a.src, buffer = _a.buffer, riveFile = _a.riveFile, animations = _a.animations, stateMachines = _a.stateMachines, artboard = _a.artboard, _b = _a.autoplay, autoplay = _b === void 0 ? false : _b, _c = _a.useOffscreenRenderer, useOffscreenRenderer = _c === void 0 ? false : _c;
         this.src = src;
         this.buffer = buffer;
+        this.riveFile = riveFile;
         // If no source file url specified, it's a bust
-        if (!this.src && !this.buffer) {
+        if (!this.src && !this.buffer && !this.riveFile) {
             throw new Error(Rive.missingErrorMessage);
         }
         // List of animations that should be initialized.
@@ -5047,59 +5189,56 @@ var Rive = /** @class */ (function () {
     Rive.prototype.initData = function (artboardName, animationNames, stateMachineNames, autoplay) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, loader, _c, msg;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var error_1, msg;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        if (!this.src) return [3 /*break*/, 2];
-                        _b = this;
-                        return [4 /*yield*/, loadRiveFile(this.src)];
+                        _b.trys.push([0, 3, , 4]);
+                        if (!(this.riveFile == null)) return [3 /*break*/, 2];
+                        this.riveFile = new RiveFile({
+                            src: this.src,
+                            buffer: this.buffer,
+                            enableRiveAssetCDN: this.enableRiveAssetCDN,
+                            assetLoader: this.assetLoader,
+                        });
+                        return [4 /*yield*/, this.riveFile.init()];
                     case 1:
-                        _b.buffer = _d.sent();
-                        _d.label = 2;
+                        _b.sent();
+                        _b.label = 2;
                     case 2:
-                        if (this.assetLoader) {
-                            loader = new this.runtime.CustomFileAssetLoader({
-                                loadContents: this.assetLoader,
-                            });
-                        }
-                        // Load the Rive file
-                        _c = this;
-                        return [4 /*yield*/, this.runtime.load(new Uint8Array(this.buffer), loader, this.enableRiveAssetCDN)];
+                        this.file = this.riveFile.getInstance();
+                        // Initialize and draw frame
+                        this.initArtboard(artboardName, animationNames, stateMachineNames, autoplay);
+                        // Check for audio
+                        this.initializeAudio();
+                        // Everything's set up, emit a load event
+                        this.loaded = true;
+                        this.eventManager.fire({
+                            type: EventType.Load,
+                            data: (_a = this.src) !== null && _a !== void 0 ? _a : "buffer",
+                        });
+                        // Flag ready for playback commands and clear the task queue; this order
+                        // is important or it may infinitely recurse
+                        this.readyForPlaying = true;
+                        this.taskQueue.process();
+                        this.drawFrame();
+                        return [2 /*return*/, Promise.resolve()];
                     case 3:
-                        // Load the Rive file
-                        _c.file = _d.sent();
-                        if (this.file) {
-                            // Initialize and draw frame
-                            this.initArtboard(artboardName, animationNames, stateMachineNames, autoplay);
-                            // Check for audio
-                            this.initializeAudio();
-                            // Everything's set up, emit a load event
-                            this.loaded = true;
-                            this.eventManager.fire({
-                                type: EventType.Load,
-                                data: (_a = this.src) !== null && _a !== void 0 ? _a : "buffer",
-                            });
-                            // Flag ready for playback commands and clear the task queue; this order
-                            // is important or it may infinitely recurse
-                            this.readyForPlaying = true;
-                            this.taskQueue.process();
-                            this.drawFrame();
-                            return [2 /*return*/, Promise.resolve()];
-                        }
-                        else {
-                            msg = "Problem loading file; may be corrupt!";
-                            console.warn(msg);
-                            this.eventManager.fire({ type: EventType.LoadError, data: msg });
-                            return [2 /*return*/, Promise.reject(msg)];
-                        }
-                        return [2 /*return*/];
+                        error_1 = _b.sent();
+                        msg = "Problem loading file; may be corrupt!";
+                        console.warn(msg);
+                        this.eventManager.fire({ type: EventType.LoadError, data: msg });
+                        return [2 /*return*/, Promise.reject(msg)];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
     // Initialize for playback
     Rive.prototype.initArtboard = function (artboardName, animationNames, stateMachineNames, autoplay) {
+        if (!this.file) {
+            return;
+        }
         // Fetch the artboard
         var rootArtboard = artboardName
             ? this.file.artboardByName(artboardName)
@@ -5319,8 +5458,8 @@ var Rive = /** @class */ (function () {
         if (this._observed !== null) {
             observers.remove(this._observed);
         }
-        // Delete the rive file
-        (_a = this.file) === null || _a === void 0 ? void 0 : _a.delete();
+        (_a = this.riveFile) === null || _a === void 0 ? void 0 : _a.cleanup();
+        this.riveFile = null;
         this.file = null;
     };
     /**
@@ -5484,6 +5623,7 @@ var Rive = /** @class */ (function () {
     };
     // Loads a new Rive file, keeping listeners in place
     Rive.prototype.load = function (params) {
+        this.file = null;
         // Stop all animations
         this.stop();
         // Reinitialize
@@ -5562,7 +5702,7 @@ var Rive = /** @class */ (function () {
         // Returns a list of animation names on the chosen artboard
         get: function () {
             // If the file's not loaded, we got nothing to return
-            if (!this.loaded) {
+            if (!this.loaded || !this.artboard) {
                 return [];
             }
             var animationNames = [];
@@ -5580,7 +5720,7 @@ var Rive = /** @class */ (function () {
          */
         get: function () {
             // If the file's not loaded, we got nothing to return
-            if (!this.loaded) {
+            if (!this.loaded || !this.artboard) {
                 return [];
             }
             var stateMachineNames = [];