local server support! finish all

Author: zardoy

package.json

@@ -75,7 +75,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.51",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.57",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",

pnpm-lock.yaml

@@ -13,7 +13,7 @@ const protectRuntime = () => {
   if (sillyProtection) return
   sillyProtection = true
   const sensetiveKeys = new Set(['authenticatedAccounts', 'serversList', 'username'])
-  window.localStorage = new Proxy(window.localStorage, {
+  const proxy = new Proxy(window.localStorage, {
     get (target, prop) {
       if (typeof prop === 'string') {
         if (sensetiveKeys.has(prop)) {
@@ -69,6 +69,11 @@ const protectRuntime = () => {
       return Reflect.deleteProperty(target, prop)
     }
   })
+  Object.defineProperty(window, 'localStorage', {
+    value: proxy,
+    writable: false,
+    configurable: false,
+  })
 }
 
 // #region Database
@@ -198,6 +203,7 @@ window.mcraft = {
 }
 
 const activateMod = async (mod: ClientMod, reason: string) => {
+  if (mod.enabled === false) return false
   protectRuntime()
   console.debug(`Activating mod ${mod.name} (${reason})...`)
   window.loadedMods ??= {}
@@ -280,24 +286,35 @@ const installOrUpdateMod = async (repo: Repository, mod: ClientModDefinition, ac
     }
     if (mod.stylesGlobal) {
       await progress?.executeWithMessage(
-        `Installing ${mod.name} styles`,
+        `Downloading ${mod.name} styles`,
         async () => {
           mod.stylesGlobal = await fetchData(['global.css']) as any
         }
       )
     }
     if (mod.scriptMainUnstable) {
       await progress?.executeWithMessage(
-        `Installing ${mod.name} script`,
+        `Downloading ${mod.name} script`,
         async () => {
           mod.scriptMainUnstable = await fetchData(['mainUnstable.js']) as any
         }
       )
     }
+    if (mod.serverPlugin) {
+      if (mod.name.endsWith('.disabled')) throw new Error(`Mod name ${mod.name} can't end with .disabled`)
+      await progress?.executeWithMessage(
+        `Downloading ${mod.name} server plugin`,
+        async () => {
+          mod.serverPlugin = await fetchData(['serverPlugin.js']) as any
+        }
+      )
+    }
     if (activate) {
-      const result = await activateMod(mod as ClientMod, 'install')
-      if (!result) {
+      // todo try to de-activate mod if it's already loaded
+      if (window.loadedMods?.[mod.name]) {
         modsWaitingReloadStatus[mod.name] = true
+      } else {
+        await activateMod(mod as ClientMod, 'install')
       }
     }
     await savePlugin(mod as ClientMod)
@@ -324,7 +341,7 @@ const checkRepositoryUpdates = async (repo: Repository) => {
 
 }
 
-const fetchRepository = async (urlOriginal: string, url: string, hasMirrors = false) => {
+export const fetchRepository = async (urlOriginal: string, url: string, hasMirrors = false) => {
   const fetchUrl = normalizeRepoUrl(url).replace(/\/$/, '') + '/mcraft-repo.json'
   try {
     const response = await fetch(fetchUrl).then(async res => res.json())
@@ -393,18 +410,21 @@ export const uninstallModAction = async (name: string) => {
   delete modsErrors[name]
 }
 
-export const setEnabledModAction = async (name: string, enabled: boolean) => {
+export const setEnabledModAction = async (name: string, newEnabled: boolean) => {
   const mod = await getPlugin(name)
   if (!mod) throw new Error(`Mod ${name} not found`)
-  if (enabled) {
-    if (window.loadedMods?.[mod.name]) {
-      mod.enabled = true
-    } else {
+  if (newEnabled) {
+    mod.enabled = true
+    if (!window.loadedMods?.[mod.name]) {
       await activateMod(mod, 'manual')
     }
   } else {
     // todo deactivate mod
     mod.enabled = false
+    if (window.loadedMods?.[mod.name]?.deactivate) {
+      window.loadedMods[mod.name].deactivate()
+      delete window.loadedMods[mod.name]
+    }
   }
   await savePlugin(mod)
 }
@@ -420,7 +440,9 @@ export const getAllModsDisplayList = async () => {
   const mapMods = (mapMods: ClientMod[]) => mapMods.map(mod => ({
     ...mod,
     installed: installedMods.some(m => m.name === mod.name),
-    enabled: !!window.loadedMods?.[mod.name]
+    activated: !!window.loadedMods?.[mod.name],
+    installedVersion: installedMods.find(m => m.name === mod.name)?.version,
+    canBeActivated: mod.scriptMainUnstable || mod.stylesGlobal,
   }))
   return {
     repos: repos.map(repo => ({
@@ -433,7 +455,7 @@ export const getAllModsDisplayList = async () => {
 
 export const removeRepositoryAction = async (url: string) => {
   // todo remove mods
-  const choice = await showOptionsModal('Remove repository? Installed mods won\' be automatically removed.', ['Yes'])
+  const choice = await showOptionsModal('Remove repository? Installed mods wont be automatically removed.', ['Yes'])
   if (!choice) return
   await deleteRepository(url)
   modsReactiveUpdater.counter++
@@ -458,4 +480,21 @@ export const addRepositoryAction = async () => {
   await fetchRepository(url, url)
 }
 
-// export const getAllMods = () => {}
+export const getServerPlugin = async (plugin: string) => {
+  const mod = await getPlugin(plugin)
+  if (!mod) return null
+  if (mod.serverPlugin) {
+    return {
+      content: mod.serverPlugin,
+      version: mod.version
+    }
+  }
+  return null
+}
+
+export const getAvailableServerPlugins = async () => {
+  const mods = await getAllMods()
+  return mods.filter(mod => mod.serverPlugin)
+}
+
+window.inspectInstalledMods = getAllMods

src/clientMods.ts

@@ -8,6 +8,7 @@ module.exports = {
   'gameMode': 0,
   'difficulty': 0,
   'worldFolder': 'world',
+  'pluginsFolder': true,
   // todo set sid, disable entities auto-spawn
   'generation': {
     // grass_field

src/defaultLocalServerOptions.js

@@ -1,11 +1,14 @@
 import { useEffect, useState } from 'react'
 import { proxy, useSnapshot } from 'valtio'
 import { filesize } from 'filesize'
+import { getAvailableServerPlugins } from '../clientMods'
+import { showModal } from '../globalState'
 import Input from './Input'
 import Screen from './Screen'
 import Button from './Button'
 import SelectGameVersion from './SelectGameVersion'
 import styles from './createWorld.module.css'
+import { InputOption, showInputsModal, showOptionsModal } from './SelectOption'
 
 // const worldTypes = ['default', 'flat', 'largeBiomes', 'amplified', 'customized', 'buffet', 'debug_all_block_states']
 const worldTypes = ['default', 'flat'/* , 'void' */]
@@ -15,13 +18,14 @@ export const creatingWorldState = proxy({
   title: '',
   type: worldTypes[0],
   gameMode: gameModes[0],
-  version: ''
+  version: '',
+  plugins: [] as string[]
 })
 
 export default ({ cancelClick, createClick, customizeClick, versions, defaultVersion }) => {
   const [quota, setQuota] = useState('')
 
-  const { title, type, version, gameMode } = useSnapshot(creatingWorldState)
+  const { title, type, version, gameMode, plugins } = useSnapshot(creatingWorldState)
   useEffect(() => {
     creatingWorldState.version = defaultVersion
     void navigator.storage?.estimate?.().then(({ quota, usage }) => {
@@ -69,7 +73,38 @@ export default ({ cancelClick, createClick, customizeClick, versions, defaultVer
         creatingWorldState.gameMode = gameModes[index === gameModes.length - 1 ? 0 : index + 1]
       }}
       >
-        Gamemode: {gameMode}
+        Game Mode: {gameMode}
+      </Button>
+    </div>
+    <div style={{ display: 'flex' }}>
+      <Button onClick={async () => {
+        const availableServerPlugins = await getAvailableServerPlugins()
+        const availableModNames = availableServerPlugins.map(mod => mod.name)
+        const choices: Record<string, InputOption> = Object.fromEntries(availableServerPlugins.map(mod => [mod.name, {
+          type: 'checkbox' as const,
+          defaultValue: creatingWorldState.plugins.includes(mod.name),
+          label: mod.name
+        }]))
+        choices.installMore = {
+          type: 'button' as const,
+          onButtonClick () {
+            showModal({ reactType: 'mods' })
+          }
+        }
+        const choice = await showInputsModal('Select server plugins from mods to install:', choices)
+        if (!choice) return
+        creatingWorldState.plugins = availableModNames.filter(modName => choice[modName])
+      }}
+      >Use Mods ({plugins.length})
+      </Button>
+      <Button
+        onClick={() => {
+          const index = gameModes.indexOf(gameMode)
+          creatingWorldState.gameMode = gameModes[index === gameModes.length - 1 ? 0 : index + 1]
+        }}
+        disabled
+      >
+        Save Type: Java
       </Button>
     </div>
     <div className='muted' style={{ fontSize: 8 }}>Default and other world types are WIP</div>
@@ -80,7 +115,11 @@ export default ({ cancelClick, createClick, customizeClick, versions, defaultVer
       }}
       >Cancel
       </Button>
-      <Button disabled={!title} onClick={createClick}>Create</Button>
+      <Button disabled={!title} onClick={createClick}>
+        <b>
+          Create
+        </b>
+      </Button>
     </div>
     <div className='muted' style={{ fontSize: 9 }}>Note: save important worlds in folders on your hard drive!</div>
     <div className='muted' style={{ fontSize: 9 }}>{quota}</div>

src/react/CreateWorld.tsx

@@ -1,7 +1,10 @@
+import fs from 'fs'
+import path from 'path'
 import { hideCurrentModal, showModal } from '../globalState'
 import defaultLocalServerOptions from '../defaultLocalServerOptions'
 import { mkdirRecursive, uniqueFileNameFromWorldName } from '../browserfs'
 import supportedVersions from '../supportedVersions.mjs'
+import { getServerPlugin } from '../clientMods'
 import CreateWorld, { WorldCustomize, creatingWorldState } from './CreateWorld'
 import { getWorldsPath } from './SingleplayerProvider'
 import { useIsModalActive } from './utilsApp'
@@ -14,7 +17,7 @@ export default () => {
     const versions = Object.values(versionsPerMinor).map(x => {
       return {
         version: x,
-        label: x === defaultLocalServerOptions.version ? `${x} (available offline)` : x
+        label: x === defaultLocalServerOptions.version ? `${x} (default)` : x
       }
     })
     return <CreateWorld
@@ -24,10 +27,20 @@ export default () => {
       }}
       createClick={async () => {
         // create new world
-        const { title, type, version, gameMode } = creatingWorldState
+        const { title, type, version, gameMode, plugins } = creatingWorldState
         // todo display path in ui + disable if exist
         const savePath = await uniqueFileNameFromWorldName(title, getWorldsPath())
         await mkdirRecursive(savePath)
+        for (const plugin of plugins) {
+          // eslint-disable-next-line no-await-in-loop
+          const { content, version } = await getServerPlugin(plugin) ?? {}
+          if (content) {
+            // eslint-disable-next-line no-await-in-loop
+            await mkdirRecursive(path.join(savePath, 'plugins'))
+            // eslint-disable-next-line no-await-in-loop
+            await fs.promises.writeFile(path.join(savePath, 'plugins', `${plugin}-${version}.js`), content)
+          }
+        }
         let generation
         if (type === 'flat') {
           generation = {