@needle-tools/engine 5.1.11 → 5.1.13

package/src/engine/engine_license.ts

@@ -7,21 +7,53 @@ import { SSR } from "./engine_ssr.js";
 import type { IContext } from "./engine_types.js";
 import { DeviceUtilities, getParam } from "./engine_utils.js";
 
+// License UI polling must stop when its context goes away; otherwise timers retain scenes.
+const licenseIntervals = new WeakMap<IContext, Set<ReturnType<typeof setInterval>>>();
+const licenseTimeouts = new WeakMap<IContext, Set<ReturnType<typeof setTimeout>>>();
+const disposedLicenseContexts = new WeakSet<IContext>();
+ContextRegistry.registerCallback(ContextEvent.ContextDestroying, ({ context }) => {
+    disposedLicenseContexts.add(context);
+    for (const timer of licenseIntervals.get(context) ?? []) clearInterval(timer);
+    licenseIntervals.delete(context);
+    for (const timer of licenseTimeouts.get(context) ?? []) clearTimeout(timer);
+    licenseTimeouts.delete(context);
+});
+function setLicenseInterval(ctx: IContext, callback: () => void, delay: number) {
+    if (disposedLicenseContexts.has(ctx)) return undefined;
+    let timers = licenseIntervals.get(ctx);
+    if (!timers) licenseIntervals.set(ctx, timers = new Set());
+    const timer = setInterval(callback, delay);
+    timers.add(timer);
+    return timer;
+}
+
+function setLicenseTimeout(ctx: IContext, callback: () => void, delay: number) {
+    if (disposedLicenseContexts.has(ctx)) return undefined;
+    let timers = licenseTimeouts.get(ctx);
+    if (!timers) licenseTimeouts.set(ctx, timers = new Set());
+    const timer = setTimeout(() => {
+        timers.delete(timer);
+        callback();
+    }, delay);
+    timers.add(timer);
+    return timer;
+}
+
 const debug = getParam("__debuglic__");
 
-const _$QkzFPY: ((result: boolean) => void)[] = [];
+const _$zQIZ: ((result: boolean) => void)[] = [];
 
 // DO NOT EDIT MANUALLY
-let _YNAWxLD: string = "";
+let __VqzR: string = "";
 // eslint-disable-next-line prefer-const
-let _$dGYOn: string = "";
+let $OQRl: string = "";
 
 if (debug) {
-    console.log("License Type: " + _YNAWxLD);
-    if (_$dGYOn) {
-        console.log("License JWT: " + _$dGYOn);
+    console.log("License Type: " + __VqzR);
+    if ($OQRl) {
+        console.log("License JWT: " + $OQRl);
         try {
-            const payload = JSON.parse(atob(_$dGYOn.split(".")[1].replace(/-/g, '+').replace(/_/g, '/')));
+            const payload = JSON.parse(atob($OQRl.split(".")[1].replace(/-/g, '+').replace(/_/g, '/')));
             console.log("License JWT payload:", payload);
         }
         catch { console.log("License JWT payload: (failed to decode)"); }
@@ -32,8 +64,8 @@ if (debug) {
 }
 
 /** @internal */
-export function oMxKl() {
-    switch (_YNAWxLD) {
+export function __csRKN() {
+    switch (__VqzR) {
         case "pro":
         case "enterprise":
             return true;
@@ -42,8 +74,8 @@ export function oMxKl() {
 }
 
 /** @internal */
-export function __nlZsk() {
-    switch (_YNAWxLD) {
+export function _qxvTsQJJ() {
+    switch (__VqzR) {
         case "indie":
             return true;
     }
@@ -51,8 +83,8 @@ export function __nlZsk() {
 }
 
 /** @internal */
-export function _VRCiX() {
-    switch (_YNAWxLD) {
+export function $yVfpT() {
+    switch (__VqzR) {
         case "edu":
             return true;
     }
@@ -60,20 +92,26 @@ export function _VRCiX() {
 }
 
 /** @internal */
-export function __zrAx() {
-    return oMxKl() || __nlZsk() || _VRCiX();
+export function __PemN() {
+    return __csRKN() || _qxvTsQJJ() || $yVfpT();
 }
 
 
 /** @internal */
-export function $onQdBrJB(cb: (result: boolean) => void) {
-    if (oMxKl() || __nlZsk() || _VRCiX())
-        return cb(true);
-    _$QkzFPY.push(cb);
+export function _$EPASa(cb: (result: boolean) => void) {
+    if (__csRKN() || _qxvTsQJJ() || $yVfpT()) {
+        cb(true);
+        return () => {};
+    }
+    _$zQIZ.push(cb);
+    return () => {
+        const index = _$zQIZ.indexOf(cb);
+        if (index >= 0) _$zQIZ.splice(index, 1);
+    };
 }
 
-function $AeqIgsC(result: boolean) {
-    for (const cb of _$QkzFPY) {
+function _SUQSFYGK(result: boolean) {
+    for (const cb of _$zQIZ) {
         try {
             cb(result);
         }
@@ -88,7 +126,7 @@ function $AeqIgsC(result: boolean) {
 
 // ECDSA P-256 public key for verifying license JWTs (verification-only, safe to ship)
 /* eslint-disable no-secrets/no-secrets -- public key, not a secret */
-const $oyXrf = {
+const _IIilbQX = {
     kty: "EC",
     crv: "P-256",
     x: "A34nyKMjhQYVgzeE4tyLUYdx34TAKogDa7v7PRaO9Lg",
@@ -112,7 +150,7 @@ function base64urlDecode(str: string): Uint8Array {
  * Verify a JWT license token and return the `type` claim if valid.
  * Returns null if the JWT is missing, malformed, or has an invalid signature.
  */
-async function $lFHtXwo(jwt: string): Promise<string | null> {
+async function _$powD(jwt: string): Promise<string | null> {
     if (!jwt) return null;
     try {
         const parts = jwt.split(".");
@@ -122,7 +160,7 @@ async function $lFHtXwo(jwt: string): Promise<string | null> {
 
         const key = await crypto.subtle.importKey(
             "jwk",
-            $oyXrf,
+            _IIilbQX,
             { name: "ECDSA", namedCurve: "P-256" },
             false,
             ["verify"]
@@ -182,24 +220,24 @@ async function $lFHtXwo(jwt: string): Promise<string | null> {
 }
 
 /** Verify the injected JWT and update the license type if valid.
- * The engine ONLY trusts the JWT — the plain _YNAWxLD string is ignored. */
+ * The engine ONLY trusts the JWT — the plain __VqzR string is ignored. */
 let _jwtVerificationPromise: Promise<void> | undefined = undefined;
-async function _BmnYkq(): Promise<void> {
-    // NOTE: do NOT add an `if (!_$dGYOn) return` guard here.
+async function __EYbYX(): Promise<void> {
+    // NOTE: do NOT add an `if (!$OQRl) return` guard here.
     // esbuild (Vite dependency pre-bundling) would see the variable as constant ""
     // and tree-shake the entire JWT verification code path.
-    const jwt = _$dGYOn;
+    const jwt = $OQRl;
     // Clear after reading — this reassignment also prevents esbuild from
     // constant-folding the variable (it now has multiple assignment sites).
-    _$dGYOn = "";
-    const verifiedType = await $lFHtXwo(jwt);
+    $OQRl = "";
+    const verifiedType = await _$powD(jwt);
     if (verifiedType) {
-        _YNAWxLD = verifiedType;
+        __VqzR = verifiedType;
         if (debug) console.log("License type set from verified JWT: " + verifiedType);
-        $AeqIgsC(__zrAx());
+        _SUQSFYGK(__PemN());
     }
     else {
-        _YNAWxLD = "basic";
+        __VqzR = "basic";
         if (debug && jwt) console.warn("JWT verification failed — license reset to basic");
     }
 }
@@ -650,18 +688,18 @@ export namespace Telemetry {
 }
 
 
-export function FcQBwfj() {
+export function _$oLIu() {
 
-    if(_YNAWxLD === "") _YNAWxLD = "basic";
+    if(__VqzR === "") __VqzR = "basic";
 
     // Start JWT verification — must be here (not top-level) to avoid tree-shaking
-    _jwtVerificationPromise = _BmnYkq();
+    _jwtVerificationPromise = __EYbYX();
 
     Telemetry.init();
     ContextRegistry.registerCallback(ContextEvent.ContextRegistered, evt => {
-        __hrYHVSsM(evt.context);
-        $bbnhzdRV(evt.context);
-        setTimeout(() => _SUkw(evt.context), 2000);
+        gep(evt.context);
+        _$TNE(evt.context);
+        setLicenseTimeout(evt.context, () => cVal(evt.context), 2000);
     });
     // ContextCreated fires after the renderer exists, so the canvas is available for context-loss monitoring
     ContextRegistry.registerCallback(ContextEvent.ContextCreated, evt => {
@@ -670,17 +708,17 @@ export function FcQBwfj() {
     });
 }
 
-export let $StfvQ: Promise<void> | undefined = undefined;
+export let _$zwcLl: Promise<void> | undefined = undefined;
 let applicationIsForbidden = false;
 let applicationForbiddenText = "";
-async function lyWzt() {
+async function _kAPEtsE() {
     // Only perform the runtime license check once
-    if ($StfvQ) return $StfvQ;
+    if (_$zwcLl) return _$zwcLl;
     // Wait for JWT verification to complete first (if running)
     if (_jwtVerificationPromise) {
         await _jwtVerificationPromise;
     }
-    if (_YNAWxLD === "basic") {
+    if (__VqzR === "basic") {
         try {
             const licenseUrl = "https://needle.tools/api/v1/needle-engine/check?location=" + encodeURIComponent(window.location.href) + "&version=" + VERSION + "&generator=" + encodeURIComponent(GENERATOR);
             const res = await fetch(licenseUrl, {
@@ -692,29 +730,29 @@ async function lyWzt() {
             if (res?.status === 200) {
                 applicationIsForbidden = false;
                 if (debug) console.log("License check succeeded");
-                _YNAWxLD = "pro";
-                $AeqIgsC(true);
+                __VqzR = "pro";
+                _SUQSFYGK(true);
             }
             else if (res?.status === 403) {
-                $AeqIgsC(false);
+                _SUQSFYGK(false);
                 applicationIsForbidden = true;
                 applicationForbiddenText = await res.text();
             }
             else {
-                $AeqIgsC(false);
+                _SUQSFYGK(false);
                 if (debug) console.log("License check failed with status " + res?.status);
             }
         }
         catch (err) {
-            $AeqIgsC(false);
+            _SUQSFYGK(false);
             if (debug) console.error("License check failed", err);
         }
     }
-    else if (debug) console.log("Runtime license check is skipped because license is already applied as \"" + _YNAWxLD + "\"");
+    else if (debug) console.log("Runtime license check is skipped because license is already applied as \"" + __VqzR + "\"");
 }
-$StfvQ = lyWzt();
+_$zwcLl = _kAPEtsE();
 
-async function $bbnhzdRV(ctx: IContext) {
+async function _$TNE(ctx: IContext) {
     function createForbiddenElement() {
         const div = document.createElement("div");
         div.className = "needle-forbidden";
@@ -755,7 +793,7 @@ async function $bbnhzdRV(ctx: IContext) {
         const expectedTextStyle = text.style.cssText;
         const forbiddenText = applicationForbiddenText?.length > 1 ? applicationForbiddenText : "This web application has been paused.<br/>You might be in violation of the Needle Engine terms of use.<br/>Please contact the Needle support if you think this is a mistake.";
         text.innerHTML = forbiddenText;
-        setInterval(() => {
+        setLicenseInterval(ctx, () => {
             if (text.innerHTML !== forbiddenText) text.innerHTML = forbiddenText;
             if (text.parentNode !== div) div.appendChild(text);
             if (div.style.cssText !== expectedStyle) div.style.cssText = expectedStyle;
@@ -765,7 +803,7 @@ async function $bbnhzdRV(ctx: IContext) {
     }
     let forbiddenElement = createForbiddenElement();
     const expectedCSS = forbiddenElement.style.cssText;
-    setInterval(() => {
+    setLicenseInterval(ctx, () => {
         if (applicationIsForbidden === true) {
             if (forbiddenElement.style.cssText !== expectedCSS) forbiddenElement = createForbiddenElement();
             if (ctx.domElement.shadowRoot) {
@@ -779,40 +817,40 @@ async function $bbnhzdRV(ctx: IContext) {
     }, 500)
 }
 
-async function __hrYHVSsM(ctx: IContext) {
+async function gep(ctx: IContext) {
     try {
-        if (!oMxKl() && !__nlZsk()) {
-            return __gHN(ctx);
+        if (!__csRKN() && !_qxvTsQJJ()) {
+            return $zQrLfV(ctx);
         }
     }
     catch (err) {
         if (debug) console.log("License check failed", err)
-        return __gHN(ctx)
+        return $zQrLfV(ctx)
     }
-    if (debug) __gHN(ctx)
+    if (debug) $zQrLfV(ctx)
 }
 
 
 
-async function __gHN(ctx: IContext) {
+async function $zQrLfV(ctx: IContext) {
 
     // if the engine loads faster than the license check, we need to capture the ready event here
     let isReady = false;
     ctx.domElement.addEventListener("ready", () => isReady = true);
 
-    await $StfvQ?.catch(() => { });
+    await _$zwcLl?.catch(() => { });
 
 
-    if (oMxKl() || __nlZsk()) return;
-    if (__zrAx() === false) __bdHHYrc();
+    if (__csRKN() || _qxvTsQJJ()) return;
+    if (__PemN() === false) _$Obysw();
 
     // check if the engine is already ready (meaning has finished loading)
     if (isReady) {
-        iJbqLNi(ctx);
+        __HBEW(ctx);
     }
     else {
         ctx.domElement.addEventListener("ready", () => {
-            iJbqLNi(ctx);
+            __HBEW(ctx);
         });
     }
 }
@@ -820,7 +858,7 @@ async function __gHN(ctx: IContext) {
 // const licenseElementIdentifier = "needle-license-element";
 // const licenseDuration = 10000;
 // const licenseDelay = 1200;
-function iJbqLNi(ctx: IContext) {
+function __HBEW(ctx: IContext) {
 
     const style = `
         position: relative;
@@ -833,7 +871,7 @@ function iJbqLNi(ctx: IContext) {
         padding: 10px;
         padding-left: 30px;
     `;
-    if (_YNAWxLD === "edu") {
+    if (__VqzR === "edu") {
         if (navigator.webdriver) {
             console.log("This project is supported by Needle for Education – https://needle.tools");
         }
@@ -871,7 +909,7 @@ function iJbqLNi(ctx: IContext) {
     banner.style.cssText = bannerStyle;
     banner.addEventListener("click", () => { window.open("https://needle.tools", "_blank") });
     let expectedBannerStyle = banner.style.cssText;
-    setTimeout(() => {
+    setLicenseTimeout(ctx, () => {
         bannerStyle = bannerStyle.replace("opacity: 0", "opacity: 1");
         bannerStyle = bannerStyle.replace("transform: translateY(10px)", "transform: translateY(0)");
         banner.style.cssText = bannerStyle;
@@ -879,7 +917,7 @@ function iJbqLNi(ctx: IContext) {
     }, 100);
 
     // ensure the banner is always visible
-    const interval = setInterval(() => {
+    const interval = setLicenseInterval(ctx, () => {
         const parent = ctx.domElement.shadowRoot || ctx.domElement;
         if (banner.parentNode !== parent) {
             parent.appendChild(banner);
@@ -890,16 +928,16 @@ function iJbqLNi(ctx: IContext) {
         }
     }, 1000);
 
-    if (_VRCiX()) {
+    if ($yVfpT()) {
         const removeDelay = 20_000;
-        setTimeout(() => {
+        setLicenseTimeout(ctx, () => {
             clearInterval(interval);
             banner?.remove();
             // show the logo every x minutes
             const intervalInMinutes = 5;
-            setTimeout(() => {
+            setLicenseTimeout(ctx, () => {
                 if (ctx.domElement.parentNode)
-                    iJbqLNi(ctx);
+                    __HBEW(ctx);
             }, 1000 * 60 * intervalInMinutes)
         }, removeDelay);
     }
@@ -910,7 +948,7 @@ function iJbqLNi(ctx: IContext) {
 const base64Logo = "data:image/webp;base64,UklGRrABAABXRUJQVlA4WAoAAAAQAAAAHwAAHwAAQUxQSKEAAAARN6CmbSM4WR7vdARON11EBDq3fLiNbVtVzpMCPlKAEzsx0Y/x+Ovuv4dn0EFE/ydAvz6YggXzgh5sVgXM/zOC/4sii7qgGvB5N7hmuQYwkvazWAu1JPW41FXSHq6pnaQWvqYH18Fc0j1hO/BFTtIeSBlJi5w6qIIO7IOrwhFsB2Yxukif0FTRLpXswHR8MxbslKe9VZsn/Ub5C7YFOpqSTABWUDgg6AAAAFAGAJ0BKiAAIAA+7VyoTqmkpCI3+qgBMB2JbACdMt69DwMIQBLhkTO6XwY00UEDK6cNIDnuNibPf0EgAP7Y1myuiQHLDsF/0h5unrGh6WAbv7aegg2ZMd3uRKfT/3SJztcaujYfTvMXspfCTmYcoO6a+vhC3ss4M8uM58t4siiu59I4aOl59e9Sr6xoxYlHf2v+NnBNpJYeJf8jABQAId/PXuBkLEFkiCucgSGEcfhvajql/j3reCGl0M5/9gQWy7ayNPs+wlvIxFnNfSlfuND4CZOCyxOHhRqOmHN4ULHo3tCSrUNvgAA=";
 
 let lastLogTime = 0;
-async function __bdHHYrc(_logo?: string) {
+async function _$Obysw(_logo?: string) {
     const now = Date.now();
     if (now - lastLogTime < 2000) return;
     lastLogTime = now;
@@ -943,7 +981,7 @@ async function __bdHHYrc(_logo?: string) {
 }
 
 
-async function _SUkw(context: IContext) {
+async function cVal(context: IContext) {
     // isAllowed() now also covers cross-origin-isolated pages (where beacons can't be sent)
     // and Do Not Track / GPC.
     if (!Telemetry.isAllowed(context)) {
@@ -957,7 +995,7 @@ async function _SUkw(context: IContext) {
 
             // current url without query parameters
             const currentUrl = window.location.href.split("?")[0];
-            const license = _YNAWxLD;
+            const license = __VqzR;
 
             const beaconData = {
                 license,

package/src/engine/engine_lifecycle_functions_internal.ts

@@ -148,13 +148,27 @@ function internalInvokeLifecycleFunctions(ctx: Context, evt: Event) {
     }
 }
 
-const bufferArray = new Array<RegisteredLifecycleMethod>();
+const buffers: Array<Array<RegisteredLifecycleMethod>> = [];
+let invocationDepth = 0;
 const hookContext: LifecycleHookContext = {
     context: null as any as Context
 };
 
 function invoke(ctx: Context, methods: Array<RegisteredLifecycleMethod>, invokeOnce: boolean) {
-    bufferArray.length = 0;
+    // Reuse storage per nesting depth: hooks may synchronously invoke other hooks.
+    const bufferArray = buffers[invocationDepth] ?? (buffers[invocationDepth] = []);
+    invocationDepth++;
+    try {
+        invokeWithBuffer(ctx, methods, invokeOnce, bufferArray);
+    }
+    finally {
+        // One-time/unregistered callbacks can capture entire scenes as well.
+        bufferArray.length = 0;
+        invocationDepth--;
+    }
+}
+
+function invokeWithBuffer(ctx: Context, methods: Array<RegisteredLifecycleMethod>, invokeOnce: boolean, bufferArray: Array<RegisteredLifecycleMethod>) {
     for (let i = 0; i < methods.length; i++) {
         bufferArray.push(methods[i]);
     }
@@ -168,6 +182,7 @@ function invoke(ctx: Context, methods: Array<RegisteredLifecycleMethod>, invokeO
         }
 
         if (invoke) {
+            const previousContext = hookContext.context;
             try {
                 hookContext.context = ctx;
                 entry.method?.call(hookContext, ctx);
@@ -175,6 +190,10 @@ function invoke(ctx: Context, methods: Array<RegisteredLifecycleMethod>, invokeO
             catch (e) {
                 console.error("Error in lifecycle method", e);
             }
+            finally {
+                // This shared receiver must not keep the last invoked context alive.
+                hookContext.context = previousContext;
+            }
         }
 
         // Remove the method if it's a one time call

package/src/engine/engine_networking_blob.ts

@@ -1,7 +1,7 @@
 import { FileLoader } from "three";
 
 import { showBalloonWarning } from "./debug/index.js";
-import { __zrAx } from "./engine_license.js";
+import { __PemN } from "./engine_license.js";
 import { delay } from "./engine_utils.js";
 import { md5AsBytes, md5Hex, sha256Base64 } from "./engine_utils_hash.js";
 
@@ -45,7 +45,7 @@ export namespace BlobStorage {
      */
     export function canUpload(info: { filesize: number }) {
         const sizeInMB = info.filesize / 1024 / 1024;
-        if (__zrAx()) {
+        if (__PemN()) {
             return sizeInMB < maxSizeInMB;
         }
         return sizeInMB < maxFreeSizeInMB;
@@ -100,7 +100,7 @@ export namespace BlobStorage {
             console.warn(`Your file is too large for uploading (${filesizeInMB.toFixed(1)}MB). Max allowed size is ${maxSizeInMB}MB`);
             return null;
         }
-        else if (!__zrAx() && filesizeInMB > maxFreeSizeInMB) {
+        else if (!__PemN() && filesizeInMB > maxFreeSizeInMB) {
             if (opts?.silent !== true) showBalloonWarning(`File is too large for uploading. Please get a <a href=\"https://needle.tools/pricing\" target=\"_blank\">commercial license</a> to upload files larger than 5MB`);
             console.warn(`Your file is too large for uploading (${filesizeInMB.toFixed(1)}MB). Max size is 5MB for non-commercial users. Please get a commercial license at https://needle.tools/pricing for larger files (up to 50MB)`);
             return null;

package/src/engine/engine_networking_streams.ts

@@ -8,6 +8,7 @@ import { getPeerjsInstance } from "../engine/engine_networking_peer.js";
 import { showBalloonMessage } from "./debug/index.js";
 import { Application } from "./engine_application.js";
 import { Context } from "./engine_context.js";
+import { ContextEvent, ContextRegistry } from "./engine_context_registry.js";
 import type { IModel } from "./engine_networking_types.js";
 import { type IComponent, isComponent } from "./engine_types.js";
 import { getParam } from "./engine_utils.js";
@@ -121,17 +122,31 @@ function applySdpTransform(sdp) {
 
 export class PeerHandle extends EventDispatcher<any> {
 
-    private static readonly instances: Map<string, PeerHandle> = new Map();
+    // Weak ownership prevents this cache from rooting a context and its scene indefinitely.
+    // IDs are scoped to contexts: separate engine elements may use the same stream ID.
+    private static readonly instances = new WeakMap<Context, Map<string, PeerHandle>>();
+
+    static {
+        ContextRegistry.registerCallback(ContextEvent.ContextDestroying, ({ context }) => {
+            const handles = PeerHandle.instances.get(context as Context);
+            if (!handles) return;
+            PeerHandle.instances.delete(context as Context);
+            for (const handle of handles.values()) handle.dispose();
+            handles.clear();
+        });
+    }
 
     static getOrCreate(context: Context, guid: string): PeerHandle {
-        // if (id === undefined) {
-        //     // randomId
-        //     id = Math.random().toFixed(5);
-        // }
-        if (PeerHandle.instances.has(guid))
-            return PeerHandle.instances.get(guid)!;
-        const peer = new PeerHandle(context, guid);
-        PeerHandle.instances.set(guid, peer);
+        let handles = PeerHandle.instances.get(context);
+        if (!handles) {
+            handles = new Map();
+            PeerHandle.instances.set(context, handles);
+        }
+        let peer = handles.get(guid);
+        if (!peer) {
+            peer = new PeerHandle(context, guid);
+            handles.set(guid, peer);
+        }
         return peer;
     }
 
@@ -151,6 +166,7 @@ export class PeerHandle extends EventDispatcher<any> {
     }
 
     makeCall(peerId: string, stream: MediaStream): CallHandle | undefined {
+        if (this._disposed) return undefined;
         if (!stream?.id) {
             if (debug) console.warn("Can not make a call: mediastream has no id or is undefined");
             else console.debug("Can not make a call: mediastream has no id or is undefined");
@@ -179,10 +195,8 @@ export class PeerHandle extends EventDispatcher<any> {
     }
 
     closeAll() {
-        for (const call of this._incomingCalls) {
-            call.close();
-        }
-        for (const call of this._outgoingCalls) {
+        // Closing a call synchronously removes it from the original array.
+        for (const call of [...this._incomingCalls, ...this._outgoingCalls]) {
             call.close();
         }
         this.updateCalls();
@@ -253,6 +267,23 @@ export class PeerHandle extends EventDispatcher<any> {
         }
     }
 
+    private _disposed = false;
+    private readonly _callIntervals = new Set<ReturnType<typeof setInterval>>();
+
+    private dispose() {
+        if (this._disposed) return;
+        this._disposed = true;
+        this.disable();
+        this.unsubscribePeerEvents();
+        for (const interval of this._callIntervals) clearInterval(interval);
+        this._callIntervals.clear();
+        this.closeAll();
+        this._incomingCalls.length = 0;
+        this._outgoingCalls.length = 0;
+        this._peer?.destroy();
+        this._peer = undefined;
+    }
+
     private _enabled: boolean = false;
     private _enabledPeer: boolean = false;
     private onConnectRoomFn: () => void = this.onConnectRoom.bind(this);
@@ -262,7 +293,7 @@ export class PeerHandle extends EventDispatcher<any> {
     // private _connectionPeerIdMap : Map<string, string> = new Map();
 
     enable() {
-        if (this._enabled) return;
+        if (this._disposed || this._enabled) return;
         this._enabled = true;
         this.context.connection.beginListen(RoomEvents.JoinedRoom, this.onConnectRoomFn);
         // this.context.connection.beginListen(RoomEvents.UserJoinedRoom, this.onUserJoinedOrLeftRoomFn);
@@ -287,13 +318,19 @@ export class PeerHandle extends EventDispatcher<any> {
     // };
 
     private async setupPeer() {
-        if (!this.context.connection.connectionId) return;
+        if (this._disposed || !this.context.connection.connectionId) return;
         if (this._enabledPeer) return;
         this._enabledPeer = true;
         if (!this._peer) {
             const peerId = this.getMyPeerId();
-            if (peerId)
-                this._peer = await getPeerjsInstance(peerId);
+            if (peerId) {
+                const peer = await getPeerjsInstance(peerId);
+                if (this._disposed) {
+                    peer.destroy();
+                    return;
+                }
+                this._peer = peer;
+            }
             else console.error("Failed to setup peerjs because we dont have a connection id", this.context.connection.connectionId);
         }
         if (this._enabled)
@@ -415,6 +452,7 @@ export class PeerHandle extends EventDispatcher<any> {
             });
 
             call.on("stream", () => {
+                if (this._disposed) return;
                 if (debug) console.log("Received stream for call", call.metadata);
                 // workaround for https://github.com/peers/peerjs/issues/636
                 let intervalCounter = 0;
@@ -424,9 +462,15 @@ export class PeerHandle extends EventDispatcher<any> {
                         if (debug) console.warn("Close call because stream is not active", call.metadata);
                         intervalCounter += 1;
                         clearInterval(closeInterval);
+                        this._callIntervals.delete(closeInterval);
                         handle.close();
                     }
                 }, 2000);
+                this._callIntervals.add(closeInterval);
+                call.on("close", () => {
+                    clearInterval(closeInterval);
+                    this._callIntervals.delete(closeInterval);
+                });
             });
         }
         return handle;

package/src/engine/engine_utils_qrcode.ts

@@ -4,7 +4,7 @@ import { Quaternion, Vector2, Vector3, Vector4 } from "three";
 
 import { needleLogoOnlySVG } from "./assets/index.js";
 import { isDevEnvironment } from "./debug/debug.js";
-import { __zrAx } from "./engine_license.js";
+import { __PemN } from "./engine_license.js";
 import { InternalAttributeUtils } from "./engine_utils_attributes.js";
 import type { NeedleEngineWebComponent } from "./webcomponents/needle-engine.js";
 
@@ -135,7 +135,7 @@ async function internalRenderQRCodeOverlays(canvas: HTMLCanvasElement, args: { s
         console.debug("[QR Code] No web component found")
     }
 
-    const canUseCustomLogo = __zrAx();
+    const canUseCustomLogo = __PemN();
 
     // Query logo src from needle-engine attribute.
     // For any supported attribute it's possible to use "falsey" values (e.g. "0" or "false" to disable the logo in the QR code)