@needle-tools/engine 4.8.3-next.1a41273 → 4.8.3-next.66cfa29

package/plugins/vite/poster-client.js

@@ -1,40 +1,46 @@
 
 async function generatePoster() {
-    const { screenshot2 } = await import("@needle-tools/engine");
 
     try {
-        const needleEngine = document.querySelector("needle-engine");
-        if (!needleEngine) return null;
+        const { screenshot2, onStart } = await import("@needle-tools/engine");
 
         // Keep in sync with og:image:width meta tags
         // https://developers.facebook.com/docs/sharing/best-practices/
         const width = 1080;
         const height = 1080;
-        const context = await needleEngine.getContext();
 
-        // wait a fixed time for e.g. fonts to load
-        while(context.time.frameCount < 2)
-            await new Promise((resolve) => setTimeout(resolve, 200));
+        return new Promise(res => {
+            onStart(async context => {
 
-        const mimeType = "image/webp";
+                if (context.lodsManager.manager) {
+                    await context.lodsManager.manager.awaitLoading({ frames: 20, maxPromisesPerObject: 2 });
+                }
 
-        // We're reading back as a blob here because that's async, and doesn't seem
-        // to stress the GPU so much on memory-constrained devices.
-        const blob = await screenshot2({context, width, height, mimeType, type: "blob"});
-        
-        // We can only send a DataURL, so we need to convert it back here.
-        const dataUrl = await new Promise((resolve, reject) => {
-            const reader = new FileReader();
-            reader.onload = function() {
-                resolve(reader.result);
-            };
-            reader.onloadend = function() {
-                resolve(null);
-            };
-            reader.readAsDataURL(blob);
-        });
+                const mimeType = "image/webp";
+
+                // We're reading back as a blob here because that's async, and doesn't seem
+                // to stress the GPU so much on memory-constrained devices.
+                const blob = await screenshot2({ context, width, height, mimeType, type: "blob" });
+
+                // We can only send a DataURL, so we need to convert it back here.
+                const dataUrl = await new Promise((resolve, reject) => {
+                    const reader = new FileReader();
+                    reader.onload = function () {
+                        resolve(reader.result);
+                    };
+                    reader.onloadend = function () {
+                        resolve(null);
+                    };
+                    reader.readAsDataURL(blob);
+                });
+
+
+                res(dataUrl);
+
+
+            }, { once: true });
+        })
 
-        return dataUrl;
     }
     catch (e) {
         console.error(e);
@@ -42,33 +48,11 @@ async function generatePoster() {
     }
 }
 
-async function sendPoster() {
-    const blob = await generatePoster();
-    import.meta.hot.send("needle:screenshot", { data: blob });
-}
 
-// communicate via vite
 if (import.meta.hot) {
-    // wait for needle engine to be fully loaded
-    const needleEngine = document.querySelector("needle-engine");
-    needleEngine?.addEventListener("loadfinished", () => {
-        // wait a moment
-        setTimeout(() => {
-            sendPoster();
-        }, 200);
-    });
-
-    // for debugging: build extra button with dev-only options
-    /*
-    var button = document.createElement("button");
-    button.id = "send-msg";
-    button.innerHTML = "Generate Poster";
-    button.style.position = "fixed";
-    button.style.zIndex = "9999";
-    document.body.appendChild(button);
-
-    document.querySelector("#send-msg").addEventListener("click", async () => {
-        sendPoster();
-    });
-    */
+    async function run() {
+        const blob = await generatePoster();
+        import.meta.hot.send("needle:screenshot", { data: blob });
+    }
+    run();
 }

package/plugins/vite/poster.js

@@ -36,7 +36,7 @@ export const needlePoster = (command, config, userSettings) => {
                 }
                 try {
                     const targetPath = "./" + getPosterPath();
-                    console.debug(`Received poster, saving to ${targetPath}`);
+                    console.debug(`[needle:poster] Saving automatic poster to ${targetPath}`);
                     // remove data:image/png;base64, from the beginning of the string
                     if (targetPath.endsWith(".webp"))
                         data.data = data.data.replace(/^data:image\/webp;base64,/, "");
@@ -47,10 +47,9 @@ export const needlePoster = (command, config, userSettings) => {
                         fs.mkdirSync(dir, { recursive: true })
                     }
                     fs.writeFileSync(targetPath, Buffer.from(data.data, "base64"));
-                    console.debug("Saved poster to file");
                 }
                 catch (err) {
-                    console.error("Failed to save poster", err.message);
+                    console.error("[needle:poster] Failed to save poster", err.message);
                 }
             });
         },

package/src/engine/engine_networking_streams.ts

@@ -237,11 +237,15 @@ export class PeerHandle extends EventDispatcher<any> {
         this.context = context;
         this.id = id;
         this.setupPeer();
+        const isGetUserMediaWriteable = Object.getOwnPropertyDescriptor(navigator, "getUserMedia")?.writable;
         try {
-            navigator["getUserMedia"] = (
-                navigator["getUserMedia"] || navigator["webkitGetUserMedia"] ||
-                navigator["mozGetUserMedia"] || navigator["msGetUserMedia"]
-            );
+            if (isGetUserMediaWriteable) {
+                navigator["getUserMedia"] = (
+                    navigator["getUserMedia"] || navigator["webkitGetUserMedia"] ||
+                    navigator["mozGetUserMedia"] || navigator["msGetUserMedia"]
+                );
+            }
+            else if (debug) console.warn("[PeerJs] getUserMedia is not writable");
         }
         catch (err) {
             if (debug) console.error("[PeerJs] Error setting getUserMedia", err);