@rerun-io/web-viewer 0.12.0-rc.3 → 0.12.0-rc.4

package/README.md

@@ -41,7 +41,7 @@ viewer.stop();
 ```
 
 The `rrd` in the snippet above should be a URL pointing to either:
-- A hosted `.rrd` file, such as <https://app.rerun.io/version/0.12.0-rc.3/examples/dna.rrd>
+- A hosted `.rrd` file, such as <https://app.rerun.io/version/0.12.0-rc.4/examples/dna.rrd>
 - A WebSocket connection to the SDK opened via the [`serve`](https://www.rerun.io/docs/reference/sdk-operating-modes#serve) API
 
 If `rrd` is not set, the viewer will display the same welcome screen as <https://app.rerun.io>.

package/index.d.ts

@@ -3,10 +3,30 @@ declare module '@rerun-io/web-viewer' {
 		/**
 		 * Start the viewer.
 		 *
-		 * @param rrd Optional URL to an `.rrd` file or a WebSocket connection to our SDK.
+		 * @param rrd URLs to `.rrd` files or WebSocket connections to our SDK.
 		 * @param parent The element to attach the canvas onto.
 		 * */
-		start(rrd?: string | undefined, parent?: HTMLElement | undefined): Promise<this>;
+		start(rrd?: string | string[] | undefined, parent?: HTMLElement | undefined): Promise<void>;
+		/**
+		 * Returns `true` if the viewer is ready to connect to data sources.
+		 */
+		get ready(): boolean;
+		/**
+		 * Open a recording.
+		 *
+		 * The viewer must have been started via `WebViewer.start`.
+		 *
+		 * @param rrd URLs to `.rrd` files or WebSocket connections to our SDK.
+		 */
+		open(rrd: string | string[]): void;
+		/**
+		 * Close a recording.
+		 *
+		 * The viewer must have been started via `WebViewer.start`.
+		 *
+		 * @param rrd URLs to `.rrd` files or WebSocket connections to our SDK.
+		 */
+		close(rrd: string | string[]): void;
 		/**
 		 * Stop the viewer, freeing all associated memory.
 		 *

package/index.js

@@ -28,31 +28,91 @@ export class WebViewer {
   /** @type {HTMLCanvasElement | null} */
   #canvas = null;
 
+  /** @type {'ready' | 'starting' | 'stopped'} */
+  #state = "stopped";
+
   /**
    * Start the viewer.
    *
-   * @param {string} [rrd] Optional URL to an `.rrd` file or a WebSocket connection to our SDK.
+   * @param {string | string[]} [rrd] URLs to `.rrd` files or WebSocket connections to our SDK.
    * @param {HTMLElement} [parent] The element to attach the canvas onto.
-   * @returns {Promise<this>}
+   * @returns {Promise<void>}
    */
   async start(rrd, parent = document.body) {
-    if (this.#canvas || this.#handle) return this;
+    if (this.#state !== "stopped") return;
+    this.#state = "starting";
 
-    const canvas = document.createElement("canvas");
-    canvas.id = randomId();
-    parent.append(canvas);
+    this.#canvas = document.createElement("canvas");
+    this.#canvas.id = randomId();
+    parent.append(this.#canvas);
 
     let WebHandle_class = await load();
-    const handle = new WebHandle_class();
-    await handle.start(canvas.id, rrd);
-    if (handle.has_panicked()) {
-      throw new Error(`Web viewer crashed: ${handle.panic_message()}`);
+    if (this.#state !== "starting") return;
+
+    this.#handle = new WebHandle_class();
+    await this.#handle.start(this.#canvas.id, undefined);
+    if (this.#state !== "starting") return;
+
+    if (this.#handle.has_panicked()) {
+      throw new Error(`Web viewer crashed: ${this.#handle.panic_message()}`);
+    }
+
+    if (rrd) {
+      this.open(rrd);
     }
 
-    this.#canvas = canvas;
-    this.#handle = handle;
+    return;
+  }
 
-    return this;
+  /**
+   * Returns `true` if the viewer is ready to connect to data sources.
+   */
+  get ready() {
+    return this.#state === "ready";
+  }
+
+  /**
+   * Open a recording.
+   *
+   * The viewer must have been started via `WebViewer.start`.
+   *
+   * @see {WebViewer.start}
+   *
+   * @param {string | string[]} rrd URLs to `.rrd` files or WebSocket connections to our SDK.
+   */
+  open(rrd) {
+    if (!this.#handle) {
+      throw new Error(`attempted to open \`${rrd}\` in a stopped viewer`);
+    }
+    const urls = Array.isArray(rrd) ? rrd : [rrd];
+    for (const url of urls) {
+      this.#handle.add_receiver(url);
+      if (this.#handle.has_panicked()) {
+        throw new Error(`Web viewer crashed: ${this.#handle.panic_message()}`);
+      }
+    }
+  }
+
+  /**
+   * Close a recording.
+   *
+   * The viewer must have been started via `WebViewer.start`.
+   *
+   * @see {WebViewer.start}
+   *
+   * @param {string | string[]} rrd URLs to `.rrd` files or WebSocket connections to our SDK.
+   */
+  close(rrd) {
+    if (!this.#handle) {
+      throw new Error(`attempted to close \`${rrd}\` in a stopped viewer`);
+    }
+    const urls = Array.isArray(rrd) ? rrd : [rrd];
+    for (const url of urls) {
+      this.#handle.remove_receiver(url);
+      if (this.#handle.has_panicked()) {
+        throw new Error(`Web viewer crashed: ${this.#handle.panic_message()}`);
+      }
+    }
   }
 
   /**
@@ -61,17 +121,14 @@ export class WebViewer {
    * The same viewer instance may be started multiple times.
    */
   stop() {
-    const canvas = this.#canvas;
-    this.#canvas = null;
-    if (canvas) {
-      canvas.remove();
-    }
+    if (this.#state !== "stopped") return;
+    this.#state = "stopped";
 
-    const handle = this.#handle;
+    this.#canvas?.remove();
+    this.#handle?.destroy();
+    this.#handle?.free();
+
+    this.#canvas = null;
     this.#handle = null;
-    if (handle) {
-      handle.destroy();
-      handle.free();
-    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rerun-io/web-viewer",
-  "version": "0.12.0-rc.3",
+  "version": "0.12.0-rc.4",
   "description": "Embed the Rerun web viewer in your app",
   "private": false,
   "scripts": {

package/re_viewer.d.ts

@@ -134,4 +134,12 @@ export class WebHandle {
 * @returns {string | undefined}
 */
   panic_callstack(): string | undefined;
+/**
+* @param {string} url
+*/
+  add_receiver(url: string): void;
+/**
+* @param {string} url
+*/
+  remove_receiver(url: string): void;
 }

package/re_viewer_bg.js

@@ -222,7 +222,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
     return real;
 }
 function __wbg_adapter_34(arg0, arg1) {
-    wasm.wasm_bindgen__convert__closures__invoke0_mut__h8b44393dabe373c9(arg0, arg1);
+    wasm.wasm_bindgen__convert__closures__invoke0_mut__ha27c7e68dc7e6fec(arg0, arg1);
 }
 
 function __wbg_adapter_37(arg0, arg1) {
@@ -256,7 +256,7 @@ function __wbg_adapter_49(arg0, arg1, arg2) {
 }
 
 function __wbg_adapter_58(arg0, arg1, arg2) {
-    wasm.wasm_bindgen__convert__closures__invoke1_mut__h4c0e725c1e378c2a(arg0, arg1, addHeapObject(arg2));
+    wasm.wasm_bindgen__convert__closures__invoke1_mut__hc6b86564fbbb6bb5(arg0, arg1, addHeapObject(arg2));
 }
 
 function __wbg_adapter_61(arg0, arg1, arg2) {
@@ -329,7 +329,7 @@ function getArrayU32FromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     return getUint32Memory0().subarray(ptr / 4, ptr / 4 + len);
 }
-function __wbg_adapter_977(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_979(arg0, arg1, arg2, arg3) {
     wasm.wasm_bindgen__convert__closures__invoke2_mut__h7fb2e6b27a00dd95(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
@@ -648,8 +648,33 @@ export class WebHandle {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
     }
+    /**
+    * @param {string} url
+    */
+    add_receiver(url) {
+        const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.webhandle_add_receiver(this.__wbg_ptr, ptr0, len0);
+    }
+    /**
+    * @param {string} url
+    */
+    remove_receiver(url) {
+        const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.webhandle_remove_receiver(this.__wbg_ptr, ptr0, len0);
+    }
 }
 
+export function __wbindgen_object_drop_ref(arg0) {
+    takeObject(arg0);
+};
+
+export function __wbindgen_string_new(arg0, arg1) {
+    const ret = getStringFromWasm0(arg0, arg1);
+    return addHeapObject(ret);
+};
+
 export function __wbindgen_cb_drop(arg0) {
     const obj = takeObject(arg0).original;
     if (obj.cnt-- == 1) {
@@ -660,15 +685,6 @@ export function __wbindgen_cb_drop(arg0) {
     return ret;
 };
 
-export function __wbindgen_object_drop_ref(arg0) {
-    takeObject(arg0);
-};
-
-export function __wbindgen_string_new(arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
-    return addHeapObject(ret);
-};
-
 export function __wbindgen_object_clone_ref(arg0) {
     const ret = getObject(arg0);
     return addHeapObject(ret);
@@ -715,12 +731,12 @@ export function __wbg_stack_5e4edbe5d1e14374(arg0, arg1) {
     getInt32Memory0()[arg0 / 4 + 0] = ptr1;
 };
 
-export function __wbg_new_799ae9c8b1bbed12() {
+export function __wbg_new_395a8514ed40239d() {
     const ret = new Error();
     return addHeapObject(ret);
 };
 
-export function __wbg_stack_94b6645f0a650755(arg0, arg1) {
+export function __wbg_stack_d537cf45a4444568(arg0, arg1) {
     const ret = getObject(arg1).stack;
     const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
@@ -2670,19 +2686,19 @@ export function __wbg_focus_dbcbbbb2a04c0e1f() { return handleError(function (ar
     getObject(arg0).focus();
 }, arguments) };
 
-export function __wbg_warn_5bdaa37db713d63c(arg0, arg1) {
+export function __wbg_warn_61f8e6f5038afcb9(arg0, arg1) {
     console.warn(getStringFromWasm0(arg0, arg1));
 };
 
-export function __wbg_info_805a92fcea68dc15(arg0, arg1) {
+export function __wbg_info_91f94e7c63d2ff55(arg0, arg1) {
     console.info(getStringFromWasm0(arg0, arg1));
 };
 
-export function __wbg_debug_ab7cf4cd5b7653b3(arg0, arg1) {
+export function __wbg_debug_e55be755fe0c8f25(arg0, arg1) {
     console.debug(getStringFromWasm0(arg0, arg1));
 };
 
-export function __wbg_trace_b11602bd282cb791(arg0, arg1) {
+export function __wbg_trace_111cce78168df566(arg0, arg1) {
     console.trace(getStringFromWasm0(arg0, arg1));
 };
 
@@ -2914,7 +2930,7 @@ export function __wbg_new_43f1b47c28813cbd(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_977(a, state0.b, arg0, arg1);
+                return __wbg_adapter_979(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -3041,63 +3057,63 @@ export function __wbindgen_memory() {
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper763(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 119, __wbg_adapter_34);
+export function __wbindgen_closure_wrapper1997(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 534, __wbg_adapter_34);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper2637(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 730, __wbg_adapter_37);
+export function __wbindgen_closure_wrapper2596(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 750, __wbg_adapter_37);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper4299(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 1255, __wbg_adapter_40);
+export function __wbindgen_closure_wrapper4259(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 1275, __wbg_adapter_40);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper4301(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 1255, __wbg_adapter_43);
+export function __wbindgen_closure_wrapper4261(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 1275, __wbg_adapter_43);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper4303(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 1255, __wbg_adapter_46);
+export function __wbindgen_closure_wrapper4263(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 1275, __wbg_adapter_46);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper20778(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 7098, __wbg_adapter_49);
+export function __wbindgen_closure_wrapper20739(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 7118, __wbg_adapter_49);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper20780(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 7098, __wbg_adapter_49);
+export function __wbindgen_closure_wrapper20741(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 7118, __wbg_adapter_49);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper20782(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 7098, __wbg_adapter_49);
+export function __wbindgen_closure_wrapper20743(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 7118, __wbg_adapter_49);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper20784(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 7098, __wbg_adapter_49);
+export function __wbindgen_closure_wrapper20745(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 7118, __wbg_adapter_49);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper23791(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 8618, __wbg_adapter_58);
+export function __wbindgen_closure_wrapper23852(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 8627, __wbg_adapter_58);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper24065(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 8676, __wbg_adapter_61);
+export function __wbindgen_closure_wrapper24032(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 8698, __wbg_adapter_61);
     return addHeapObject(ret);
 };
 
-export function __wbindgen_closure_wrapper24191(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 8713, __wbg_adapter_64);
+export function __wbindgen_closure_wrapper24158(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 8735, __wbg_adapter_64);
     return addHeapObject(ret);
 };
 

package/re_viewer_bg.wasm.d.ts

@@ -8,6 +8,8 @@ export function webhandle_destroy(a: number): void;
 export function webhandle_has_panicked(a: number): number;
 export function webhandle_panic_message(a: number, b: number): void;
 export function webhandle_panic_callstack(a: number, b: number): void;
+export function webhandle_add_receiver(a: number, b: number, c: number): void;
+export function webhandle_remove_receiver(a: number, b: number, c: number): void;
 export function set_email(a: number, b: number): void;
 export function is_webgpu_build(): number;
 export function wgpu_compute_pass_set_pipeline(a: number, b: number): void;
@@ -84,14 +86,14 @@ export function pipeoptions_signal(a: number): number;
 export function __wbindgen_malloc(a: number, b: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
 export const __wbindgen_export_2: WebAssembly.Table;
-export function wasm_bindgen__convert__closures__invoke0_mut__h8b44393dabe373c9(a: number, b: number): void;
+export function wasm_bindgen__convert__closures__invoke0_mut__ha27c7e68dc7e6fec(a: number, b: number): void;
 export function _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h4b1e59d19e751877(a: number, b: number): void;
 export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h495e021177c053ee(a: number, b: number, c: number): void;
 export function _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h8fa267ecc1eb02a4(a: number, b: number): void;
 export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h49d90045e5200b5e(a: number, b: number, c: number): void;
 export function wasm_bindgen__convert__closures__invoke1_mut__h5c5582a4f18faa87(a: number, b: number, c: number): void;
-export function wasm_bindgen__convert__closures__invoke1_mut__h4c0e725c1e378c2a(a: number, b: number, c: number): void;
+export function wasm_bindgen__convert__closures__invoke1_mut__hc6b86564fbbb6bb5(a: number, b: number, c: number): void;
 export function wasm_bindgen__convert__closures__invoke1_mut__h8f179b773c7ba316(a: number, b: number, c: number): void;
 export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h83ad0401821b73ca(a: number, b: number, c: number): void;
 export function __wbindgen_free(a: number, b: number, c: number): void;