@needle-tools/engine 4.15.0-next.f391a30 → 4.15.0

package/plugins/common/logger.js

@@ -1,4 +1,3 @@
-// @ts-check
 import { createWriteStream, existsSync, mkdirSync, readdirSync, rmSync, statSync, write } from "fs";
 
 const filename_timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
@@ -16,209 +15,57 @@ let originalConsoleWarn = console.warn;
 let originalConsoleInfo = console.info;
 let originalConsoleDebug = console.debug;
 let didPatch = false;
-/** @type {(() => void) | null} */
 let unpatchFunction = null;
 
-const buildOutputState = {
-    mode: "serve",
-    progressActive: false,
-    assetFiles: 0,
-    assetTotalKb: 0,
-    assetGzipKb: 0,
-    compressionFiles: 0,
-    compressionTotalKb: 0,
-    compressionGzipKb: 0,
-    compressionCaptureActive: false,
-};
-
-/** @param {unknown} value @returns {number} */
-function parseKb(value) {
-    const numeric = Number.parseFloat(String(value ?? "0").replace(/[^0-9.]/g, ""));
-    return Number.isFinite(numeric) ? numeric : 0;
-}
-
-function clearBuildProgressLine() {
-    if (!process.stdout.isTTY || !buildOutputState.progressActive) return;
-    process.stdout.write("\r\x1b[2K");
-    buildOutputState.progressActive = false;
-}
-
-/** @param {string} text */
-function writeBuildProgressLine(text) {
-    if (!process.stdout.isTTY) return;
-    const maxLength = Math.max(24, (process.stdout.columns || 120) - 1);
-    const line = text.length > maxLength ? `${text.slice(0, Math.max(0, maxLength - 1))}…` : text;
-    process.stdout.write(`\r\x1b[2K${line}\x1b[0K`);
-    buildOutputState.progressActive = true;
-}
-
-function resetBuildOutputState() {
-    buildOutputState.progressActive = false;
-    buildOutputState.assetFiles = 0;
-    buildOutputState.assetTotalKb = 0;
-    buildOutputState.assetGzipKb = 0;
-    buildOutputState.compressionFiles = 0;
-    buildOutputState.compressionTotalKb = 0;
-    buildOutputState.compressionGzipKb = 0;
-    buildOutputState.compressionCaptureActive = false;
-}
-
-function flushBuildOutputSummaries() {
-    if (buildOutputState.mode !== "build") return;
-    clearBuildProgressLine();
-
-    if (buildOutputState.assetFiles > 0) {
-        const msg = formatBuildInfoSummaryMessage(`✓ Bundled ${buildOutputState.assetFiles} files (${buildOutputState.assetTotalKb.toFixed(2)} kB${buildOutputState.assetGzipKb > 0 ? `, gzip ${buildOutputState.assetGzipKb.toFixed(2)} kB` : ""})`);
-        originalConsoleLog(msg);
-        captureLogMessage("server", "log", msg, null);
-    }
-
-    if (buildOutputState.compressionFiles > 0) {
-        const msg = formatBuildInfoSummaryMessage(`✓ Gzip compressed ${buildOutputState.compressionFiles} files (${buildOutputState.compressionTotalKb.toFixed(2)} kB → ${buildOutputState.compressionGzipKb.toFixed(2)} kB)`);
-        originalConsoleLog(msg);
-        captureLogMessage("server", "log", msg, null);
-    }
-
-    resetBuildOutputState();
-}
-
-function supportsColorOutput() {
-    return !!process.stdout?.isTTY && process.env.NO_COLOR !== "1";
-}
-
-/** @param {string} name @returns {string} */
-function formatNeedleHeader(name) {
-    if (!supportsColorOutput()) return `[${name}]`;
-    if (name.startsWith("needle-")) {
-        const suffix = name.substring("needle-".length);
-        return `\x1b[32m[\x1b[0m\x1b[32mneedle-\x1b[0m\x1b[1;32m${suffix}\x1b[0m\x1b[32m]\x1b[0m`;
-    }
-    if (name.startsWith("needle:")) {
-        const suffix = name.substring("needle:".length);
-        return `\x1b[32m[\x1b[0m\x1b[32mneedle:\x1b[0m\x1b[1;32m${suffix}\x1b[0m\x1b[32m]\x1b[0m`;
-    }
-    return `\x1b[32m[\x1b[0m\x1b[1;32m${name}\x1b[0m\x1b[32m]\x1b[0m`;
-}
-
-/** @param {string} body @returns {string} */
-function formatBuildInfoSummaryMessage(body) {
-    return `${formatNeedleHeader("needle-buildinfo")}\n${body}`;
-}
-
-/** @param {unknown[]} args @returns {string} */
-function normalizeConsoleArgs(args) {
-    return args.map(arg => typeof arg === "string" ? arg : stringifyLog(arg)).join(" ");
-}
-
-/** @param {unknown[]} args @returns {boolean} */
-function tryHandleBuildConsoleOutput(args) {
-    if (buildOutputState.mode !== "build") return false;
-
-    const raw = normalizeConsoleArgs(args);
-    const message = raw.replace(/\u001b\[[0-9;]*m/g, "").trim();
-    if (!message.length) return true;
-
-    if (/^transforming\s*\(/i.test(message)) {
-        writeBuildProgressLine(`⏳ ${message}`);
-        return true;
-    }
-
-    if (message.includes("[vite-plugin-compression]:algorithm=")) {
-        buildOutputState.compressionCaptureActive = true;
-        return true;
-    }
-
-    const assetMatch = message.match(/^dist\/.*?\s+([0-9.,]+)\s*kB(?:\s*[│|]\s*gzip:\s*([0-9.,]+)\s*kB)?$/i);
-    if (assetMatch) {
-        buildOutputState.assetFiles++;
-        buildOutputState.assetTotalKb += parseKb(assetMatch[1]);
-        if (assetMatch[2]) buildOutputState.assetGzipKb += parseKb(assetMatch[2]);
-        writeBuildProgressLine(`📦 Bundling assets: ${buildOutputState.assetFiles} files`);
-        return true;
-    }
-
-    if (buildOutputState.compressionCaptureActive) {
-        const compressionMatch = message.match(/^dist\/.*?\s+([0-9.]+)\s*kb\s*\/\s*gzip:\s*([0-9.]+)\s*kb$/i);
-        if (compressionMatch) {
-            buildOutputState.compressionFiles++;
-            buildOutputState.compressionTotalKb += parseKb(compressionMatch[1]);
-            buildOutputState.compressionGzipKb += parseKb(compressionMatch[2]);
-            writeBuildProgressLine(`🗜️ Compressing: ${buildOutputState.compressionFiles} files`);
-            return true;
-        }
-    }
-
-    if (message.startsWith("✓ built in")) {
-        flushBuildOutputSummaries();
-        return false;
-    }
-
-    flushBuildOutputSummaries();
-    return false;
-}
-
-/**
- * @param {{command?: string} | undefined} [options]
- * @returns {(() => void) | undefined}
- */
-export function patchConsoleLogs(options = undefined) {
+export function patchConsoleLogs() {
     if (didPatch) return unpatchFunction;
     didPatch = true;
-    buildOutputState.mode = options?.command === "build" ? "build" : "serve";
-    resetBuildOutputState();
 
     console.log = (...args) => {
-        if (tryHandleBuildConsoleOutput(args)) return;
         originalConsoleLog(...args);
         captureLogMessage("server", 'log', args, null);
     };
     console.error = (...args) => {
-        flushBuildOutputSummaries();
         originalConsoleError(...args);
         captureLogMessage("server", 'error', args, null);
     };
     console.warn = (...args) => {
-        flushBuildOutputSummaries();
         originalConsoleWarn(...args);
         captureLogMessage("server", 'warn', args, null);
     };
     console.info = (...args) => {
-        if (tryHandleBuildConsoleOutput(args)) return;
         originalConsoleInfo(...args);
         captureLogMessage("server", 'info', args, null);
     };
     console.debug = (...args) => {
-        if (tryHandleBuildConsoleOutput(args)) return;
         originalConsoleDebug(...args);
         captureLogMessage("server", 'debug', args, null);
     };
 
     // Restore original console methods
     unpatchFunction = () => {
-        flushBuildOutputSummaries();
         didPatch = false;
         console.log = originalConsoleLog;
         console.error = originalConsoleError;
         console.warn = originalConsoleWarn;
         console.info = originalConsoleInfo;
         console.debug = originalConsoleDebug;
-        buildOutputState.mode = "serve";
     }
     return unpatchFunction;
 }
 
 
 let isCapturing = false;
-/** @type {Set<unknown>} */
+/** @type {Set<string>} */
 const isCapturingLogMessage = new Set();
 
-/** @type {Array<{ process: ProcessType, key: string, log:unknown, timestamp:number, connectionId: string | null }>} */
+/** @type {Array<{ process: ProcessType, key: string, log:any, timestamp:number, connectionId: string | null }>} */
 const queue = new Array();
 
 /**
  * @param {ProcessType} process
  * @param {string} key
- * @param {unknown} log
+ * @param {any} log
  * @param {string | null} connectionId - Optional connection ID for client logs.
  * @param {number} [time] - Optional timestamp, defaults to current time.
  */
@@ -262,10 +109,10 @@ export function captureLogMessage(process, key, log, connectionId, time = Date.n
 
 /**
  * Stringifies a log message, handling circular references and formatting.
- * @param {unknown} log
- * @param {Set<unknown>} [seen]
+ * @param {any} log
+ * @param {Set<any>} [seen]
  */
-function stringifyLog(log, seen = /** @type {Set<unknown>} */ (new Set()), depth = 0) {
+function stringifyLog(log, seen = new Set(), depth = 0) {
     const isServer = typeof window === "undefined";
     const stringify_limits = {
         string: isServer ? 100_000 : 1_000,
@@ -307,9 +154,8 @@ function stringifyLog(log, seen = /** @type {Set<unknown>} */ (new Set()), depth
         || log instanceof BigUint64Array
         || log instanceof Float64Array
     ) {
-        const logArr = /** @type {ArrayLike<unknown>} */ (/** @type {unknown} */ (log));
-        seen.add(logArr);
-        return stringifyArray(logArr);
+        seen.add(log);
+        return stringifyArray(log);
     }
     if (typeof log === "object") {
 
@@ -323,12 +169,11 @@ function stringifyLog(log, seen = /** @type {Set<unknown>} */ (new Set()), depth
             return `<Error: ${log.message}\nStack: ${log.stack}>`;
         }
 
-        const logObj = /** @type {Record<string, unknown>} */ (log);
-        const keys = Object.keys(logObj);
+        const keys = Object.keys(log);
         let res = "{";
         for (let i = 0; i < keys.length; i++) {
             const key = keys[i];
-            let value = logObj[key];
+            let value = log[key];
             if (i >= stringify_limits.object_keys) {
                 res += `, ... <truncated ${keys.length - i} keys>`;
                 break;
@@ -363,7 +208,6 @@ function stringifyLog(log, seen = /** @type {Set<unknown>} */ (new Set()), depth
 
     return String(log);
 
-    /** @param {ArrayLike<unknown>} arr @returns {string} */
     function stringifyArray(arr) {
         let res = "";
         for (let i = 0; i < arr.length; i++) {
@@ -496,11 +340,6 @@ function onExit() {
     filestreams.forEach((stream) => stream.end());
     filestreams.clear();
 }
-
-export function closeLogStreams() {
-    onExit();
-}
-
 const events = ['SIGTERM', 'SIGINT', 'beforeExit', 'rejectionHandled', 'uncaughtException', 'exit'];
 for (const event of events) {
     process.on(event, onExit);

package/plugins/common/worker.js

@@ -1,4 +1,3 @@
-import { needleLog } from '../vite/logging.js';
 
 
 
@@ -52,12 +51,12 @@ export function rollupFixWorkerImport(opts = { logFail: true }) {
                         regexMatchedWorkerCode = true;
                         // console.log("WORKER?", url)
                         if (url?.startsWith("/")) {
-                            needleLog("rollup", `Rewrite worker import in ${chunk.fileName}`, "log", { leadingNewline: true, dimBody: false });
+                            console.log(`[rollup] Rewrite worker import in ${chunk.fileName}`);
                             // Make url file-relative
                             const newUrl = url.replace(/^\//, "");
                             // For CORS issues we need to use importScripts: https://linear.app/needle/issue/NE-6572#comment-ea5dc65e
                             const output = `/* new-worker */ new Worker(URL.createObjectURL(new Blob(["import '" + \`\${new URL('./${newUrl}', import.meta.url).toString()}\` + "';"], { type: 'text/javascript' }))`;
-                            needleLog("rollup", "Did rewrite worker output to: " + output, "log", { leadingNewline: true });
+                            console.log("[rollup] Did rewrite worker output to:", output);
                             return output;
                             // return `new Worker(new URL("./${newUrl}", import.meta.url)`;
                         }
@@ -71,7 +70,7 @@ export function rollupFixWorkerImport(opts = { logFail: true }) {
                         }
                         if (opts?.logFail !== false) {
                             const str = `[...]${code.substring(newWorkerStartIndex, newWorkerStartIndex + 200)}[...]`
-                            needleLog("rollup", `Worker import in ${chunk.fileName} was not rewritten: ${str}`, "warn", { leadingNewline: true, dimBody: false });
+                            console.warn(`\n[rollup] Worker import in ${chunk.fileName} was not rewritten: ${str}`);
                         }
                     }
                     return res;
@@ -117,7 +116,7 @@ function fixWorkerSelfLocation(filename, code) {
                 const fixedCode = workerCode.replace("self.location", "import.meta.url");
                 code = code.substring(0, startIndex) + fixedCode + code.substring(endIndex + 1);
                 lastIndex = startIndex + fixedCode.length;
-                needleLog("rollup", `Rewrite worker 'self.location' to 'import.meta.url' in ${filename}`, "log", { leadingNewline: true, dimBody: false });
+                console.log(`[rollup] Rewrite worker 'self.location' to 'import.meta.url' in ${filename}`);
             } else {
                 lastIndex = endIndex;
             }

package/plugins/types/userconfig.d.ts

@@ -112,48 +112,10 @@ export type userSettings = {
     debugLicense?: boolean;
 
     /**
-     * When enabled, external CDN URLs are downloaded at build time and bundled locally.
-     * This creates fully self-contained deployments that work without internet access.
-     * 
-     * - `true` — enable with all features (download everything)
-     * - `"auto"` — automatically detect which features the project uses and only include those
-     * - `{ enabled: true }` — same as `true`
-     * - `{ enabled: true, features: "auto" }` — same as `"auto"`
-     * - `{ enabled: true, features: ["draco", "ktx2"] }` — only include specific features
-     * - `{ enabled: true, excludeFeatures: ["xr"] }` — include all except specific features
-     * - `{ enabled: true, features: "auto", excludeFeatures: ["skybox"] }` — auto-detect but exclude specific features
-     * 
-     * Available features:
-     * - `"draco"` — Draco mesh decoders
-     * - `"ktx2"` — KTX2/Basis texture transcoders
-     * - `"materialx"` — MaterialX WASM shader compiler
-     * - `"xr"` — WebXR input profiles (controllers/hands)
-     * - `"skybox"` — Skybox/environment textures
-     * - `"fonts"` — Google Fonts CSS + font files
-     * - `"needle-fonts"` — Needle font assets (MSDF, etc.)
-     * - `"needle-models"` — Needle models
-     * - `"needle-avatars"` — Needle avatars
-     * - `"polyhaven"` — Polyhaven HDRIs/models
-     * - `"cdn-scripts"` — Third-party scripts (QRCode.js, vConsole, HLS.js)
-     * - `"github-content"` — GitHub raw content files
-     * - `"threejs-models"` — three.js example models
-     * - `"needle-uploads"` — Needle uploads assets
+     * Experimental: When enabled then fonts from google fonts will be downloaded and copied to the output directory
      */
-    makeFilesLocal?: boolean | "auto" | {
+    makeFilesLocal?: boolean | {
         enabled: boolean;
-        /** URL patterns to exclude from making local */
-        exclude?: string[];
-        /** Target platform preset */
-        platform?: "discord" | "facebook-instant" | null;
-        /** 
-         * Feature categories to include.
-         * - `"auto"` — Automatically detect which features the project uses.
-         * - `FeatureName[]` — Explicit list. When set, ONLY these features are processed.
-         * - When omitted, ALL features are included.
-         */
-        features?: "auto" | Array<"draco" | "ktx2" | "materialx" | "xr" | "skybox" | "fonts" | "needle-fonts" | "needle-models" | "needle-avatars" | "polyhaven" | "cdn-scripts" | "github-content" | "threejs-models" | "needle-uploads">;
-        /** Feature categories to exclude. Applied after `features` (including after auto-detection). */
-        excludeFeatures?: Array<"draco" | "ktx2" | "materialx" | "xr" | "skybox" | "fonts" | "needle-fonts" | "needle-models" | "needle-avatars" | "polyhaven" | "cdn-scripts" | "github-content" | "threejs-models" | "needle-uploads">;
     }
 
     /**

package/plugins/vite/alias.js

@@ -1,6 +1,5 @@
 import { createWriteStream, existsSync, mkdirSync, rmSync, writeFileSync } from 'fs';
 import path from 'path';
-import { needleLog } from './logging.js';
 
 const projectDir = process.cwd() + "/";
 
@@ -78,7 +77,7 @@ export const needleViteAlias = (command, config, userSettings) => {
 
     let outputDebugFile = null;
     function log(...msg) {
-        needleLog("needle-alias", msg.join(" "));
+        console.log(...msg);
         if (debug) logToFile(...msg);
     }
     function logToFile(...msg) {
@@ -92,7 +91,7 @@ export const needleViteAlias = (command, config, userSettings) => {
         const timestamp = new Date().toISOString();
         outputDebugFile.write("\n\n\n--------------------------\n");
         outputDebugFile.write(`[needle-alias] Logging to: ${outputFilePath} (${timestamp})\n`);
-        log("Logging to:", outputFilePath);
+        log("[needle-alias] Logging to: ", outputFilePath);
     }
 
 
@@ -100,7 +99,7 @@ export const needleViteAlias = (command, config, userSettings) => {
     const aliasPlugin = {
         name: "needle-alias",
         config(config) {
-            if (debug) log('ProjectDirectory: ' + projectDir);
+            if (debug) console.log('[needle-alias] ProjectDirectory: ' + projectDir);
             if (!config.resolve) config.resolve = {};
             if (!config.resolve.alias) config.resolve.alias = {};
             const aliasDict = config.resolve.alias;
@@ -120,7 +119,7 @@ export const needleViteAlias = (command, config, userSettings) => {
                 config.optimizeDeps.exclude ??= [];
                 if (!config.optimizeDeps.include?.includes('@needle-tools/engine')) {
                     config.optimizeDeps.exclude.push('@needle-tools/engine');
-                    log("Detected local @needle-tools/engine package → will exclude it from optimization");
+                    log("[needle-alias] Detected local @needle-tools/engine package → will exclude it from optimization");
                 }
             }
 
@@ -133,7 +132,7 @@ export const needleViteAlias = (command, config, userSettings) => {
                     if (typeof entry === "function") res = entry(name, 0, name);
                     testResults.push({ name, entry: res });
                 }
-                log('Aliases: ' + JSON.stringify(testResults));
+                console.log('[needle-alias] Aliases: ', testResults);
             }
         },
     }

package/plugins/vite/asap.js

@@ -3,7 +3,6 @@ import path from 'path';
 import { tryParseNeedleEngineSrcAttributeFromHtml } from '../common/needle-engine.js';
 import { preloadScriptPaths } from './dependencies.js';
 import { makeFilesLocalIsEnabled } from './local-files.js';
-import { needleLog } from './logging.js';
 
 const code = `import('@needle-tools/engine/src/asap/needle-asap.ts');`
 
@@ -31,7 +30,7 @@ export const needleAsap = async (command, config, userSettings) => {
         logoSvg = assets.NEEDLE_LOGO_SVG_URL;
     }
     catch (err) {
-        needleLog("needle:asap", "Could not load needle logo svg: " + err.message, "warn", { dimBody: false });
+        console.warn("Could not load needle logo svg", err.message);
     }
 
     /** @type {import("vite").ResolvedConfig | null} */
@@ -123,7 +122,7 @@ function fixMainTs() {
     if (existsSync(mainTsFilePath)) {
         let code = readFileSync(mainTsFilePath, 'utf-8');
         if (code.includes('import \"@needle-tools/engine\"')) {
-            needleLog("needle:asap", "Changed main.ts and replaced needle engine import with async import", "log", { dimBody: false });
+            console.log("Change main.ts and replace needle engine import with async import");
             code = code.replace(/import \"@needle-tools\/engine\"/g, 'import("@needle-tools/engine") /* async import of needle engine */');
             writeFileSync(mainTsFilePath, code);
         }
@@ -152,7 +151,7 @@ function generateScriptPreloadLinks(_config, tags) {
         }
     }
     catch (err) {
-        needleLog("needle:asap", "Error generating script preload links: " + err.message, "error", { dimBody: false });
+        console.error("Error generating script preload links", err);
     }
 }
 
@@ -202,11 +201,11 @@ function generateGltfPreloadLinks(config, html, tags) {
                             filepath = decodeURIComponent(filepath);
                             const fullpath = path.join(process.cwd(), filepath);
                             if (!existsSync(fullpath)) {
-                                needleLog("needle:asap", `Could not insert head preload link: file not found at \"${filepath}\"`, "warn", { dimBody: false });
+                                console.warn(`[needle:asap] Could not insert head preload link: file not found at \"${filepath}\"`);
                                 continue;
                             }
                         }
-                        needleLog("needle:asap", `Insert head glTF preload link: ${value}`);
+                        console.log(`[needle:asap] Insert head glTF preload link: ${value}`);
                         insertPreloadLink(tags, value, "model/gltf+json");
                     }
                 }