@steambrew/ttc 2.7.3 → 2.7.5

package/dist/index.js

@@ -84,7 +84,7 @@ var BuildType;
     BuildType[BuildType["ProdBuild"] = 1] = "ProdBuild";
 })(BuildType || (BuildType = {}));
 const ValidateParameters = (args) => {
-    let typeProp = BuildType.DevBuild, targetProp = process.cwd();
+    let typeProp = BuildType.DevBuild, targetProp = process.cwd(), isMillennium = false;
     if (args.includes('--help')) {
         PrintParamHelp();
         process.exit();
@@ -118,10 +118,14 @@ const ValidateParameters = (args) => {
             }
             targetProp = args[i + 1];
         }
+        if (args[i] == '--millennium-internal') {
+            isMillennium = true;
+        }
     }
     return {
         type: typeProp,
         targetPlugin: targetProp,
+        isMillennium: isMillennium,
     };
 };
 
@@ -150,13 +154,24 @@ const CheckForUpdates = async () => {
     });
 };
 
-const ValidatePlugin = (target) => {
+const ValidatePlugin = (bIsMillennium, target) => {
     return new Promise((resolve, reject) => {
         if (!existsSync(target)) {
             console.error(chalk.red.bold(`\n[-] --target [${target}] `) + chalk.red('is not a valid system path'));
             reject();
             return;
         }
+        if (bIsMillennium) {
+            console.log(chalk.green.bold('\n[+] Using Millennium internal build configuration'));
+            resolve({
+                name: 'core',
+                common_name: 'Millennium',
+                description: 'An integrated plugin that provides core platform functionality.',
+                useBackend: false,
+                frontend: '.',
+            });
+            return;
+        }
         const pluginModule = path.join(target, 'plugin.json');
         if (!existsSync(pluginModule)) {
             console.error(chalk.red.bold(`\n[-] --target [${target}] `) + chalk.red('is not a valid plugin (missing plugin.json)'));
@@ -294,35 +309,9 @@ function InitializePlugins() {
             MillenniumStore.ignoreProxyFlag = false;
         });
     }
-    async function WebkitInitializeIPC() {
-        let intervalId = null;
-        const maxWaitTime = 10000; // 10 seconds
-        intervalId = setInterval(() => {
-            if (typeof SteamClient === 'undefined') {
-                return;
-            }
-            if (intervalId) {
-                clearInterval(intervalId);
-                intervalId = null;
-            }
-            SteamClient.BrowserView?.RegisterForMessageFromParent((messageId, data) => {
-                if (messageId !== IPCMessageId) {
-                    return;
-                }
-                const payload = JSON.parse(data);
-                MillenniumStore.ignoreProxyFlag = true;
-                MillenniumStore.settingsStore[payload.name] = payload.value;
-                MillenniumStore.ignoreProxyFlag = false;
-            });
-        }, 100);
-        setTimeout(() => {
-            if (intervalId) {
-                clearInterval(intervalId);
-                console.warn('%c Millennium %c Failed to find SteamClient after 10000ms', 'background:rgb(37, 105, 184); color: white;', 'background: transparent;');
-            }
-        }, maxWaitTime);
+    if (isClientModule) {
+        ClientInitializeIPC();
     }
-    isClientModule ? ClientInitializeIPC() : WebkitInitializeIPC();
     const StartSettingPropagation = (name, value) => {
         if (MillenniumStore.ignoreProxyFlag) {
             return;
@@ -683,9 +672,9 @@ async function MergePluginList(plugins) {
     // Merge input plugins with the filtered custom plugins
     return [...plugins, ...filteredCustomPlugins];
 }
-async function GetPluginComponents(props) {
+async function GetPluginComponents(pluginJson, props) {
     let tsConfigPath = '';
-    const frontendDir = GetFrontEndDirectory();
+    const frontendDir = GetFrontEndDirectory(pluginJson);
     if (frontendDir === '.' || frontendDir === './') {
         tsConfigPath = './tsconfig.json';
     }
@@ -697,21 +686,23 @@ async function GetPluginComponents(props) {
     }
     Logger.Info('millenniumAPI', 'Loading tsconfig from ' + chalk.cyan.bold(tsConfigPath) + '... ' + chalk.green.bold('okay'));
     let pluginList = [
+        typescript({
+            tsconfig: tsConfigPath,
+            compilerOptions: {
+                outDir: undefined,
+            },
+        }),
         url({
             include: ['**/*.gif', '**/*.webm', '**/*.svg'], // Add all non-JS assets you use
             limit: 0, // Set to 0 to always copy the file instead of inlining as base64
             fileName: '[hash][extname]', // Optional: custom output naming
         }),
         InsertMillennium(ComponentType.Plugin, props),
-        commonjs(),
-        nodePolyfills(),
         nodeResolve({
             browser: true,
         }),
-        typescript({
-            include: ['**/*.ts', '**/*.tsx', 'src/**/*.ts', 'src/**/*.tsx'],
-            tsconfig: tsConfigPath,
-        }),
+        commonjs(),
+        nodePolyfills(),
         scss({
             output: false,
             outputStyle: 'compressed',
@@ -719,7 +710,6 @@ async function GetPluginComponents(props) {
             watch: 'src/styles',
             sass: sass,
         }),
-        resolve(),
         json(),
         constSysfsExpr(),
         replace({
@@ -776,19 +766,30 @@ async function GetWebkitPluginComponents(props) {
     props.bTersePlugin && pluginList.push(terser());
     return pluginList;
 }
-const GetFrontEndDirectory = () => {
-    const pluginJsonPath = './plugin.json';
+const GetFrontEndDirectory = (pluginJson) => {
     try {
-        return JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'))?.frontend ?? 'frontend';
+        return pluginJson?.frontend ?? 'frontend';
     }
     catch (error) {
         return 'frontend';
     }
 };
-const TranspilerPluginComponent = async (props) => {
+const TranspilerPluginComponent = async (bIsMillennium, pluginJson, props) => {
+    const frontendDir = GetFrontEndDirectory(pluginJson);
+    console.log(chalk.greenBright.bold('config'), 'Frontend directory set to:', chalk.cyan.bold(frontendDir));
+    const frontendPlugins = await GetPluginComponents(pluginJson, props);
+    // Fix entry file path construction
+    let entryFile = '';
+    if (frontendDir === '.' || frontendDir === './' || frontendDir === '') {
+        entryFile = './index.tsx';
+    }
+    else {
+        entryFile = `./${frontendDir}/index.tsx`;
+    }
+    console.log(chalk.greenBright.bold('config'), 'Entry file set to:', chalk.cyan.bold(entryFile));
     const frontendRollupConfig = {
-        input: `./${GetFrontEndDirectory()}/index.tsx`,
-        plugins: await GetPluginComponents(props),
+        input: entryFile,
+        plugins: frontendPlugins,
         context: 'window',
         external: (id) => {
             if (id === '@steambrew/webkit') {
@@ -799,7 +800,7 @@ const TranspilerPluginComponent = async (props) => {
         },
         output: {
             name: 'millennium_main',
-            file: '.millennium/Dist/index.js',
+            file: bIsMillennium ? '../../build/frontend.bin' : '.millennium/Dist/index.js',
             globals: {
                 react: 'window.SP_REACT',
                 'react-dom': 'window.SP_REACTDOM',
@@ -854,15 +855,16 @@ const CheckModuleUpdates = async () => {
 };
 const StartCompilerModule = () => {
     const parameters = ValidateParameters(process.argv.slice(2));
+    const bIsMillennium = parameters.isMillennium || false;
     const bTersePlugin = parameters.type == BuildType.ProdBuild;
     console.log(chalk.greenBright.bold('config'), 'Building target:', parameters.targetPlugin, 'with type:', BuildType[parameters.type], 'minify:', bTersePlugin, '...');
-    ValidatePlugin(parameters.targetPlugin)
+    ValidatePlugin(bIsMillennium, parameters.targetPlugin)
         .then((json) => {
         const props = {
             bTersePlugin: bTersePlugin,
             strPluginInternalName: json?.name,
         };
-        TranspilerPluginComponent(props);
+        TranspilerPluginComponent(bIsMillennium, json, props);
     })
         /**
          * plugin is invalid, we close the proccess as it has already been handled

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steambrew/ttc",
-	"version": "2.7.3",
+	"version": "2.7.5",
 	"type": "module",
 	"main": "dist/index.js",
 	"module": "dist/index.js",

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - '@parcel/watcher'

package/src/check-health.ts

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import path from 'path';
 import { existsSync, readFile } from 'fs';
 
-export const ValidatePlugin = (target: string): Promise<any> => {
+export const ValidatePlugin = (bIsMillennium: boolean, target: string): Promise<any> => {
 	return new Promise<any>((resolve, reject) => {
 		if (!existsSync(target)) {
 			console.error(chalk.red.bold(`\n[-] --target [${target}] `) + chalk.red('is not a valid system path'));
@@ -10,6 +10,19 @@ export const ValidatePlugin = (target: string): Promise<any> => {
 			return;
 		}
 
+		if (bIsMillennium) {
+			console.log(chalk.green.bold('\n[+] Using Millennium internal build configuration'));
+
+			resolve({
+				name: 'core',
+				common_name: 'Millennium',
+				description: 'An integrated plugin that provides core platform functionality.',
+				useBackend: false,
+				frontend: '.',
+			});
+			return;
+		}
+
 		const pluginModule = path.join(target, 'plugin.json');
 
 		if (!existsSync(pluginModule)) {

package/src/index.ts

@@ -23,18 +23,19 @@ const CheckModuleUpdates = async () => {
 
 const StartCompilerModule = () => {
 	const parameters = ValidateParameters(process.argv.slice(2));
+	const bIsMillennium = parameters.isMillennium || false;
 	const bTersePlugin = parameters.type == BuildType.ProdBuild;
 
 	console.log(chalk.greenBright.bold('config'), 'Building target:', parameters.targetPlugin, 'with type:', BuildType[parameters.type], 'minify:', bTersePlugin, '...');
 
-	ValidatePlugin(parameters.targetPlugin)
+	ValidatePlugin(bIsMillennium, parameters.targetPlugin)
 		.then((json: any) => {
 			const props: TranspilerProps = {
 				bTersePlugin: bTersePlugin,
 				strPluginInternalName: json?.name,
 			};
 
-			TranspilerPluginComponent(props);
+			TranspilerPluginComponent(bIsMillennium, json, props);
 		})
 
 		/**

package/src/plugin-api.ts

@@ -188,42 +188,10 @@ function InitializePlugins() {
 		});
 	}
 
-	async function WebkitInitializeIPC() {
-		let intervalId: NodeJS.Timeout | null = null;
-		const maxWaitTime = 10000; // 10 seconds
-
-		intervalId = setInterval(() => {
-			if (typeof SteamClient === 'undefined') {
-				return;
-			}
-
-			if (intervalId) {
-				clearInterval(intervalId);
-				intervalId = null;
-			}
-
-			SteamClient.BrowserView?.RegisterForMessageFromParent((messageId: string, data: string) => {
-				if (messageId !== IPCMessageId) {
-					return;
-				}
-
-				const payload = JSON.parse(data);
-				MillenniumStore.ignoreProxyFlag = true;
-				MillenniumStore.settingsStore[payload.name] = payload.value;
-				MillenniumStore.ignoreProxyFlag = false;
-			});
-		}, 100);
-
-		setTimeout(() => {
-			if (intervalId) {
-				clearInterval(intervalId);
-				console.warn('%c Millennium %c Failed to find SteamClient after 10000ms', 'background:rgb(37, 105, 184); color: white;', 'background: transparent;');
-			}
-		}, maxWaitTime);
+	if (isClientModule) {
+		ClientInitializeIPC();
 	}
 
-	isClientModule ? ClientInitializeIPC() : WebkitInitializeIPC();
-
 	const StartSettingPropagation = (name: string, value: any) => {
 		if (MillenniumStore.ignoreProxyFlag) {
 			return;

package/src/query-parser.ts

@@ -29,11 +29,13 @@ export enum BuildType {
 export interface ParameterProps {
 	type: BuildType;
 	targetPlugin: string; // path
+	isMillennium?: boolean;
 }
 
 export const ValidateParameters = (args: Array<string>): ParameterProps => {
 	let typeProp: BuildType = BuildType.DevBuild,
-		targetProp: string = process.cwd();
+		targetProp: string = process.cwd(),
+		isMillennium: boolean = false;
 
 	if (args.includes('--help')) {
 		PrintParamHelp();
@@ -73,10 +75,15 @@ export const ValidateParameters = (args: Array<string>): ParameterProps => {
 
 			targetProp = args[i + 1];
 		}
+
+		if (args[i] == '--millennium-internal') {
+			isMillennium = true;
+		}
 	}
 
 	return {
 		type: typeProp,
 		targetPlugin: targetProp,
+		isMillennium: isMillennium,
 	};
 };

package/src/transpiler.ts

@@ -119,9 +119,9 @@ async function MergePluginList(plugins: any[]) {
 	return [...plugins, ...filteredCustomPlugins];
 }
 
-async function GetPluginComponents(props: TranspilerProps): Promise<InputPluginOption[]> {
+async function GetPluginComponents(pluginJson: any, props: TranspilerProps): Promise<InputPluginOption[]> {
 	let tsConfigPath = '';
-	const frontendDir = GetFrontEndDirectory();
+	const frontendDir = GetFrontEndDirectory(pluginJson);
 
 	if (frontendDir === '.' || frontendDir === './') {
 		tsConfigPath = './tsconfig.json';
@@ -136,21 +136,23 @@ async function GetPluginComponents(props: TranspilerProps): Promise<InputPluginO
 	Logger.Info('millenniumAPI', 'Loading tsconfig from ' + chalk.cyan.bold(tsConfigPath) + '... ' + chalk.green.bold('okay'));
 
 	let pluginList = [
+		typescript({
+			tsconfig: tsConfigPath,
+			compilerOptions: {
+				outDir: undefined,
+			},
+		}),
 		url({
 			include: ['**/*.gif', '**/*.webm', '**/*.svg'], // Add all non-JS assets you use
 			limit: 0, // Set to 0 to always copy the file instead of inlining as base64
 			fileName: '[hash][extname]', // Optional: custom output naming
 		}),
 		InsertMillennium(ComponentType.Plugin, props),
-		commonjs(),
-		nodePolyfills(),
 		nodeResolve({
 			browser: true,
 		}),
-		typescript({
-			include: ['**/*.ts', '**/*.tsx', 'src/**/*.ts', 'src/**/*.tsx'],
-			tsconfig: tsConfigPath,
-		}),
+		commonjs(),
+		nodePolyfills(),
 		scss({
 			output: false,
 			outputStyle: 'compressed',
@@ -158,7 +160,6 @@ async function GetPluginComponents(props: TranspilerProps): Promise<InputPluginO
 			watch: 'src/styles',
 			sass: sass,
 		}),
-		resolve(),
 		json(),
 		constSysfsExpr(),
 		replace({
@@ -223,19 +224,33 @@ async function GetWebkitPluginComponents(props: TranspilerProps) {
 	return pluginList;
 }
 
-const GetFrontEndDirectory = () => {
-	const pluginJsonPath = './plugin.json';
+const GetFrontEndDirectory = (pluginJson: any) => {
 	try {
-		return JSON.parse(fs.readFileSync(pluginJsonPath, 'utf8'))?.frontend ?? 'frontend';
+		return pluginJson?.frontend ?? 'frontend';
 	} catch (error) {
 		return 'frontend';
 	}
 };
 
-export const TranspilerPluginComponent = async (props: TranspilerProps) => {
+export const TranspilerPluginComponent = async (bIsMillennium: boolean, pluginJson: any, props: TranspilerProps) => {
+	const frontendDir = GetFrontEndDirectory(pluginJson);
+	console.log(chalk.greenBright.bold('config'), 'Frontend directory set to:', chalk.cyan.bold(frontendDir));
+
+	const frontendPlugins = await GetPluginComponents(pluginJson, props);
+
+	// Fix entry file path construction
+	let entryFile = '';
+	if (frontendDir === '.' || frontendDir === './' || frontendDir === '') {
+		entryFile = './index.tsx';
+	} else {
+		entryFile = `./${frontendDir}/index.tsx`;
+	}
+
+	console.log(chalk.greenBright.bold('config'), 'Entry file set to:', chalk.cyan.bold(entryFile));
+
 	const frontendRollupConfig: RollupOptions = {
-		input: `./${GetFrontEndDirectory()}/index.tsx`,
-		plugins: await GetPluginComponents(props),
+		input: entryFile,
+		plugins: frontendPlugins,
 		context: 'window',
 		external: (id) => {
 			if (id === '@steambrew/webkit') {
@@ -249,7 +264,7 @@ export const TranspilerPluginComponent = async (props: TranspilerProps) => {
 		},
 		output: {
 			name: 'millennium_main',
-			file: '.millennium/Dist/index.js',
+			file: bIsMillennium ? '../../build/frontend.bin' : '.millennium/Dist/index.js',
 			globals: {
 				react: 'window.SP_REACT',
 				'react-dom': 'window.SP_REACTDOM',