fix(core): update
This commit is contained in:
		| @@ -129,90 +129,62 @@ export class TsTest { | ||||
|     server.addRoute('*', new plugins.typedserver.servertools.HandlerStatic(tsbundleCacheDirPath)); | ||||
|     await server.start(); | ||||
|  | ||||
|     // lets handle realtime comms | ||||
|     const wss = new plugins.ws.WebSocketServer({ port: 8080 }); | ||||
|     wss.on('connection', (ws) => { | ||||
|       ws.on('message', (message) => { | ||||
|         console.log(message.toString()); | ||||
|       }); | ||||
|     }); | ||||
|  | ||||
|     // lets do the browser bit | ||||
|     await this.smartbrowserInstance.start(); | ||||
|     const evaluation = await this.smartbrowserInstance.evaluateOnPage( | ||||
|       `http://localhost:3007/test?bundleName=${bundleFileName}`, | ||||
|       async () => { | ||||
|         const convertToText = (obj: any): string => { | ||||
|           // create an array that will later be joined into a string. | ||||
|           const stringArray: string[] = []; | ||||
|         // lets enable real time comms | ||||
|         const ws = new WebSocket('ws://localhost:8080'); | ||||
|         await new Promise((resolve) => (ws.onopen = resolve)); | ||||
|  | ||||
|           if (typeof obj === 'object' && typeof obj.toString === 'function') { | ||||
|             stringArray.push(obj.toString()); | ||||
|           } else if (typeof obj === 'object' && obj.join === undefined) { | ||||
|             stringArray.push('{'); | ||||
|             for (const prop of Object.keys(obj)) { | ||||
|               stringArray.push(prop, ': ', convertToText(obj[prop]), ','); | ||||
|             } | ||||
|             stringArray.push('}'); | ||||
|         // Ensure this function is declared with 'async' | ||||
|         const logStore = []; | ||||
|         const originalLog = console.log; | ||||
|         const originalError = console.error; | ||||
|  | ||||
|             // is array | ||||
|           } else if (typeof obj === 'object' && !(obj.join === undefined)) { | ||||
|             stringArray.push('['); | ||||
|             for (const prop of Object.keys(obj)) { | ||||
|               stringArray.push(convertToText(obj[prop]), ','); | ||||
|             } | ||||
|             stringArray.push(']'); | ||||
|  | ||||
|             // is function | ||||
|           } else if (typeof obj === 'function') { | ||||
|             stringArray.push(obj.toString()); | ||||
|  | ||||
|             // all other values can be done with JSON.stringify | ||||
|           } else { | ||||
|             stringArray.push(JSON.stringify(obj)); | ||||
|           } | ||||
|  | ||||
|           return stringArray.join(''); | ||||
|         }; | ||||
|  | ||||
|         let logStore = ''; | ||||
|         // tslint:disable-next-line: max-classes-per-file | ||||
|         const log = console.log.bind(console); | ||||
|         // Override console methods to capture the logs | ||||
|         console.log = (...args) => { | ||||
|           args = args.map((argument) => { | ||||
|             return typeof argument !== 'string' ? convertToText(argument) : argument; | ||||
|           }); | ||||
|           logStore += `${args}\n`; | ||||
|           log(...args); | ||||
|           logStore.push(args.join(' ')); | ||||
|           ws.send(args.join(' ')); | ||||
|           originalLog(...args); | ||||
|         }; | ||||
|         const error = console.error; | ||||
|         console.error = (...args) => { | ||||
|           args = args.map((argument) => { | ||||
|             return typeof argument !== 'string' ? convertToText(argument) : argument; | ||||
|           }); | ||||
|           logStore += `${args}\n`; | ||||
|           error(...args); | ||||
|           logStore.push(args.join(' ')); | ||||
|           ws.send(args.join(' ')); | ||||
|           originalError(...args); | ||||
|         }; | ||||
|  | ||||
|         const bundleName = new URLSearchParams(window.location.search).get('bundleName'); | ||||
|         console.log(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`); | ||||
|         const bundleResponse = await fetch(`/${bundleName}`); | ||||
|         console.log( | ||||
|           `::TSTEST IN CHROMIUM:: Got ${bundleName} with STATUS ${bundleResponse.status}` | ||||
|         ); | ||||
|         const bundle = await bundleResponse.text(); | ||||
|         console.log(`::TSTEST IN CHROMIUM:: Executing ${bundleName}`); | ||||
|         originalLog(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`); | ||||
|  | ||||
|         try { | ||||
|           // tslint:disable-next-line: no-eval | ||||
|           eval(bundle); | ||||
|           // Dynamically import the test module | ||||
|           const testModule = await import(`/${bundleName}`); | ||||
|           if (testModule && testModule.runTest) { | ||||
|             // Execute the exported test function | ||||
|             await testModule.runTest(); | ||||
|           } else { | ||||
|             originalError('Test module does not export runTest function.'); | ||||
|           } | ||||
|         } catch (err) { | ||||
|           console.error(err); | ||||
|           originalError(err); | ||||
|         } | ||||
|  | ||||
|         if ( | ||||
|           (globalThis as any).tapbundleDeferred && | ||||
|           (globalThis as any).tapbundleDeferred.promise | ||||
|         ) { | ||||
|           await (globalThis as any).tapbundleDeferred.promise; | ||||
|         } else { | ||||
|           console.log('Error: Could not find tapbundle Deferred'); | ||||
|         } | ||||
|         return logStore; | ||||
|         return logStore.join('\n'); | ||||
|       } | ||||
|     ); | ||||
|     await this.smartbrowserInstance.stop(); | ||||
|     await server.stop(); | ||||
|     wss.close(); | ||||
|     console.log( | ||||
|       `${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance and server.` | ||||
|     ); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user