Move minecraft protocol into worker!

.eslintrc.json

@@ -199,7 +199,8 @@
         "no-bitwise": "off",
         "unicorn/filename-case": "off",
         "max-depth": "off",
-        "unicorn/no-typeof-undefined": "off"
+        "unicorn/no-typeof-undefined": "off",
+        "unicorn/relative-url-style": "off"
     },
     "overrides": [
         {

renderer/rsbuildSharedConfig.ts

@@ -61,6 +61,16 @@ export const appAndRendererSharedConfig = () => defineConfig({
     ],
     tools: {
         rspack (config, helpers) {
+            if (process.env.SINGLE_FILE_BUILD === 'true') {
+                config.module.rules.push({
+                    test: /\.worker\.(js|ts)$/,
+                    loader: "worker-rspack-loader",
+                    options: {
+                        inline: "no-fallback",
+                    },
+                })
+            }
+
             const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8'))
             const hasFileProtocol = Object.values(packageJson.pnpm.overrides).some((dep) => (dep as string).startsWith('file:'))
             if (hasFileProtocol) {

renderer/viewer/lib/simpleUtils.ts

@@ -33,3 +33,9 @@ export function sectionPos (pos: { x: number, y: number, z: number }) {
   const z = Math.floor(pos.z / 16)
   return [x, y, z]
 }
+// doesn't support snapshots
+
+export const toMajorVersion = version => {
+  const [a, b] = (String(version)).split('.')
+  return `${a}.${b}`
+}

renderer/viewer/lib/workerProxy.ts

@@ -1,9 +1,18 @@
-export function createWorkerProxy<T extends Record<string, (...args: any[]) => void>> (handlers: T, channel?: MessagePort): { __workerProxy: T } {
+export function createWorkerProxy<T extends Record<string, (...args: any[]) => void | Promise<any>>> (handlers: T, channel?: MessagePort): { __workerProxy: T } {
   const target = channel ?? globalThis
   target.addEventListener('message', (event: any) => {
-    const { type, args } = event.data
+    const { type, args, msgId } = event.data
     if (handlers[type]) {
-      handlers[type](...args)
+      const result = handlers[type](...args)
+      if (result instanceof Promise) {
+        void result.then((result) => {
+          target.postMessage({
+            type: 'result',
+            msgId,
+            args: [result]
+          })
+        })
+      }
     }
   })
   return null as any
@@ -23,6 +32,7 @@ export function createWorkerProxy<T extends Record<string, (...args: any[]) => v
 export const useWorkerProxy = <T extends { __workerProxy: Record<string, (...args: any[]) => void> }> (worker: Worker | MessagePort, autoTransfer = true): T['__workerProxy'] & {
   transfer: (...args: Transferable[]) => T['__workerProxy']
 } => {
+  let messageId = 0
   // in main thread
   return new Proxy({} as any, {
     get (target, prop) {
@@ -41,11 +51,25 @@ export const useWorkerProxy = <T extends { __workerProxy: Record<string, (...arg
         }
       }
       return (...args: any[]) => {
+        const msgId = messageId++
         const transfer = autoTransfer ? args.filter(arg => arg instanceof ArrayBuffer || arg instanceof MessagePort || arg instanceof ImageBitmap || arg instanceof OffscreenCanvas || arg instanceof ImageData) : []
         worker.postMessage({
           type: prop,
+          msgId,
           args,
         }, transfer as any[])
+        return {
+          // eslint-disable-next-line unicorn/no-thenable
+          then (onfulfilled: (value: any) => void) {
+            const handler = ({ data }: MessageEvent): void => {
+              if (data.type === 'result' && data.msgId === msgId) {
+                onfulfilled(data.args[0])
+                worker.removeEventListener('message', handler as EventListener)
+              }
+            }
+            worker.addEventListener('message', handler as EventListener)
+          }
+        }
       }
     }
   })

renderer/viewer/lib/worldrendererCommon.ts

@@ -9,13 +9,12 @@ import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import { subscribeKey } from 'valtio/utils'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
-import { toMajorVersion } from '../../../src/utils'
 import { ResourcesManager } from '../../../src/resourcesManager'
 import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
 import { SoundSystem } from '../three/threeJsSound'
 import { buildCleanupDecorator } from './cleanupDecorator'
 import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared'
-import { chunkPos } from './simpleUtils'
+import { chunkPos, toMajorVersion } from './simpleUtils'
 import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateStatText } from './ui/newStats'
 import { WorldDataEmitter } from './worldDataEmitter'
 import { IPlayerState } from './basePlayerState'

rsbuild.config.ts

@@ -208,6 +208,13 @@ const appConfig = defineConfig({
                             if (singleBuildFiles.length !== 1 || singleBuildFiles[0] !== 'index.html') {
                                 throw new Error('Single file build must only have index.html in the dist/single folder. Ensure workers are imported & built correctly.')
                             }
+                            // check if dist/static/js/async is empty
+                            if (fs.existsSync('./dist/static/js/async')) {
+                                const asyncFiles = fs.readdirSync('./dist/static/js/async')
+                                if (asyncFiles.length > 0) {
+                                    throw new Error('dist/static/js/async must be empty. Ensure workers are imported & built correctly.')
+                                }
+                            }
 
                             // process index.html
                             const singleBuildHtml = './dist/single/index.html'
@@ -224,8 +231,9 @@ const appConfig = defineConfig({
                             // write output file size
                             console.log('single file size', (fs.statSync(singleBuildHtml).size / 1024 / 1024).toFixed(2), 'mb')
                         } else {
+                            patchWorkerImport()
                             if (!disableServiceWorker) {
-                            const { count, size, warnings } = await generateSW({
+                                const { count, size, warnings } = await generateSW({
                                     // dontCacheBustURLsMatching: [new RegExp('...')],
                                     globDirectory: 'dist',
                                     skipWaiting: true,
@@ -254,3 +262,21 @@ export default mergeRsbuildConfig(
     appAndRendererSharedConfig(),
     appConfig
 )
+
+const patchWorkerImport = () => {
+    const workerFiles = fs.readdirSync('./dist/static/js/async').filter(x => x.endsWith('.js'))
+    let patched = false
+    for (const file of workerFiles) {
+        const filePath = `./dist/static/js/async/${file}`
+        const content = fs.readFileSync(filePath, 'utf8')
+        const matches = content.match(/importScripts\([^)]+\)/g) || []
+        if (matches.length > 1) throw new Error('Multiple importScripts found in ' + filePath)
+        const newContent = content.replace(/importScripts\(\w+\.\w+/,
+            "importScripts(location.pathname.split('/').slice(0, -4).join('/')+'/'")
+        if (newContent !== content) {
+            fs.writeFileSync(filePath, newContent, 'utf8')
+            patched = true
+        }
+    }
+    if (!patched) throw new Error('No importScripts found in any worker files')
+}