@needle-tools/engine 3.37.15-alpha → 3.37.15-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/engine",
-  "version": "3.37.15-alpha",
+  "version": "3.37.15-alpha.1",
   "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in",
   "main": "dist/needle-engine.umd.cjs",
   "type": "module",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@dimforge/rapier3d-compat": "^0.12.0",
-    "@needle-tools/gltf-progressive": "^1.0.0-alpha.13",
+    "@needle-tools/gltf-progressive": "^1.0.0-alpha.14",
     "@webxr-input-profiles/motion-controllers": "^1.0.0",
     "flatbuffers": "2.0.4",
     "md5": "^2.3.0",

package/plugins/common/license.cjs

@@ -45,8 +45,6 @@ const LICENSE_ENDPOINT = `https://urls.needle.tools/license-endpoint`
  * @returns {Promise<string | null>}
  */
 module.exports.resolveLicense = async function (license) {
-    console.log("\n");
-
     if (typeof license !== "object") {
         return license;
     }
@@ -60,7 +58,7 @@ module.exports.resolveLicense = async function (license) {
         return null;
     }
 
-    console.log("Resolve license for " + license.id + "::" + license.key);
+    console.log("INFO: Resolve license for " + license.id + "::" + license.key);
     const url = await fetch(LICENSE_ENDPOINT, { method: "GET" });
     if (!url.ok) {
         console.warn("WARN: Failed to fetch license URL from endpoint. " + url.statusText);

package/plugins/vite/license.js

@@ -8,57 +8,45 @@ import { loadConfig } from './config.js';
  * @param {import('../types/userconfig.js').userSettings}
  */
 export const needleLicense = (command, config, userSettings) => {
+    let license = undefined;
+
     return {
         name: "needle-license",
         enforce: 'pre',
+        async configResolved() {
+            if (userSettings.license) {
+                // we only accept a license object here
+                if (typeof userSettings.license === "object")
+                    license = await resolveLicense(userSettings.license);
+            }
+            else {
+                const needleConfig = await loadConfig();
+                if (needleConfig) {
+                    license = await resolveLicense(needleConfig.license);
+                }
+            }
+        },
         async transform(src, id) {
             const isNeedleEngineFile = id.includes("engine/engine_license") || id.includes("needle-tools_engine");
             // sometimes the actual license parameter is in a unnamed chunk file
             const isViteChunkFile = id.includes("chunk") && id.includes(".vite");
             if (isNeedleEngineFile || isViteChunkFile) {
 
-                if (userSettings.license) {
-                    // we only accept a license object here
-                    if (typeof userSettings.license === "object")
-                        await applyLicense(userSettings.license);
-                }
-                else {
-                    const needleConfig = await loadConfig();
-                    if (needleConfig) {
-                        await applyLicense(needleConfig.license);
-                    }
+                if (!license) {
+                    return;
                 }
 
-                /**
-                 * @param {import('../types/license.js').License | string} license
-                 */
-                async function applyLicense(license) {
-
-                    if (!license) {
-                        return;
-                    }
-                    
-                    // TODO: remove allowing to apply a string license here
-
-                    if (typeof license !== "string") {
-                        license = await resolveLicense(license).catch(err => {
-                            console.error("Error resolving license", err.message);
-                            return null;
-                        });
-                    }
-
-                    const index = src.indexOf("NEEDLE_ENGINE_LICENSE_TYPE");
-                    if (index >= 0) {
-                        const end = src.indexOf(";", index);
-                        if (end >= 0) {
-                            const line = src.substring(index, end);
-                            const replaced = "NEEDLE_ENGINE_LICENSE_TYPE = \"" + license + "\"";
-                            src = src.replace(line, replaced);
-                            return { code: src, map: null }
-                        }
+                const index = src.indexOf("NEEDLE_ENGINE_LICENSE_TYPE");
+                if (index >= 0) {
+                    const end = src.indexOf(";", index);
+                    if (end >= 0) {
+                        const line = src.substring(index, end);
+                        const replaced = "NEEDLE_ENGINE_LICENSE_TYPE = \"" + license + "\"";
+                        src = src.replace(line, replaced);
+                        return { code: src, map: null }
                     }
                 }
             }
         }
     }
-};
+};