BREAKING CHANGE

CONTRIBUTE.md

@@ -17,7 +17,7 @@ Introduce how to setup environment, modify code and submit PR.
 
 ### Pre-requirements
 
-- Node.js 16+
+- Node.js >=18.17.0
 - pnpm (can be setup by node [corepack](https://nodejs.org/api/corepack.html))
 
 ### Setup Dev Workspace

package.json

@@ -10,9 +10,9 @@
     },
     "packageManager": "[email protected]",
     "devDependencies": {
-        "tsx": "^3.12.6",
-        "typedoc": "^0.24.8",
-        "typescript": "^5.0.3",
+        "tsx": "^4.7.1",
+        "typedoc": "^0.25.8",
+        "typescript": "^5.3.3",
         "@vitest/coverage-c8": "^0.30.1",
         "vitest": "^0.32.0"
     }

packages/asm/package.json

@@ -37,6 +37,6 @@
     "esbuild": "^0.17.16",
     "eslint": "^8.37.0",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   }
 }

packages/bytebuffer/package.json

@@ -61,6 +61,6 @@
     "esbuild": "^0.17.16",
     "eslint": "^8.37.0",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   }
 }

packages/client/package.json

@@ -44,6 +44,6 @@
     "esbuild": "^0.17.16",
     "eslint": "^8.37.0",
     "tslib": "^2.5.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   }
 }

packages/core/diagnose.ts

@@ -131,6 +131,11 @@ export async function diagnoseFile<T extends string>({ file, expectedChecksum, r
     receivedChecksum = await checksumFunc(file, algorithm)
     if (signal?.aborted) return
     issue = receivedChecksum !== expectedChecksum
+  } else {
+    const fstat = await stat(file)
+    if (fstat.size === 0) {
+      issue = true
+    }
   }
   const type = fileExisted ? 'corrupted' : 'missing' as const
   if (issue) {

packages/core/folder.ts

@@ -37,7 +37,13 @@ export class MinecraftFolder {
   getNativesRoot(version: string) { return join(this.getVersionRoot(version), version + '-natives') }
   getVersionRoot(version: string) { return join(this.versions, version) }
   getVersionJson(version: string) { return join(this.getVersionRoot(version), version + '.json') }
-  getVersionJar(version: string, type?: string) { return type === 'client' || type === undefined ? join(this.getVersionRoot(version), version + '.jar') : join(this.getVersionRoot(version), `${version}-${type}.jar`) }
+  getVersionServerJson(version: string) { return join(this.getVersionRoot(version), 'server.json') }
+  getVersionJar(version: string, type?: string) {
+    if (type === 'client' || !type) return join(this.getVersionRoot(version), version + '.jar')
+    if (type === 'server') return this.getPath('libraries', 'net', 'minecraft', 'server', version, `server-${version}-bundled.jar`)
+    return join(this.getVersionRoot(version), version + `-${type}.jar`)
+  }
+
   getVersionAll(version: string) {
     return [
       join(this.versions, version), join(this.versions, version, version + '.json'),

packages/core/launch.ts

@@ -393,10 +393,6 @@ export interface BaseServerOptions {
    * Java executable.
    */
   javaPath: string
-  /**
-   * Current working directory. Default is the same with the path.
-   */
-  cwd?: string
   /**
    * No gui for the server launch
    */
@@ -413,16 +409,6 @@ export interface BaseServerOptions {
   spawn?: (command: string, args?: ReadonlyArray<string>, options?: SpawnOptions) => ChildProcess
 }
 
-export interface MinecraftServerOptions extends BaseServerOptions {
-  /**
-   * Minecraft location.
-   */
-  path: string
-  /**
-   * The version id.
-   */
-  version: string | ResolvedVersion
-}
 /**
  * This is the case you provide the server jar execution path.
  */
@@ -432,18 +418,16 @@ export interface ServerOptions extends BaseServerOptions {
    *
    * This is the case like you are launching forge server.
    */
-  serverExectuableJarPath: string
+  serverExectuableJarPath?: string
+
+  mainClass?: string
+
+  classPath?: string[]
 }
 
-export async function launchServer(options: MinecraftServerOptions | ServerOptions) {
+export async function launchServer(options: ServerOptions) {
   const args = await generateArgumentsServer(options)
-  let cwd = options.cwd
-  if ('path' in options) {
-    cwd = options.path
-  } else {
-    cwd = dirname(options.serverExectuableJarPath)
-  }
-  const spawnOption = { cwd, env: process.env, ...(options.extraExecOption || {}) }
+  const spawnOption = { env: process.env, ...(options.extraExecOption || {}) }
   return (options.spawn ?? spawn)(args[0], args.slice(1), spawnOption)
 }
 
@@ -521,7 +505,7 @@ export function createMinecraftProcessWatcher(process: ChildProcess, emitter: Ev
     } else if (string.indexOf('Crash report saved to:') !== -1) {
       crashReportLocation = string.substring(string.indexOf('Crash report saved to:') + 'Crash report saved to: #@!@# '.length)
       crashReportLocation = crashReportLocation.replace(EOL, '').trim()
-    } else if (waitForReady && (string.indexOf('Reloading ResourceManager') !== -1 || string.indexOf('LWJGL Version: ') !== -1 || string.indexOf('OpenAL initialized.') !== -1)) {
+    } else if (waitForReady && (string.indexOf('Missing metadata in pack') !== -1 || string.indexOf('Registering resource reload listener') !== -1 || string.indexOf('Reloading ResourceManager') !== -1 || string.indexOf('LWJGL Version: ') !== -1 || string.indexOf('OpenAL initialized.') !== -1)) {
       waitForReady = false
       emitter.emit('minecraft-window-ready')
     }
@@ -577,21 +561,23 @@ export async function launch(options: LaunchOption): Promise<ChildProcess> {
 /**
  * Generate the argument for server
  */
-export async function generateArgumentsServer(options: MinecraftServerOptions | ServerOptions) {
+export async function generateArgumentsServer(options: ServerOptions) {
   const { javaPath, minMemory = 1024, maxMemory = 1024, extraJVMArgs = [], extraMCArgs = [], extraExecOption = {} } = options
   const cmd = [
     javaPath,
     `-Xms${(minMemory)}M`,
     `-Xmx${(maxMemory)}M`,
     ...extraJVMArgs,
   ]
-  if ('path' in options) {
-    const mc = MinecraftFolder.from(options.path)
-    const version = options.version
-    const resolvedVersion = typeof version === 'string' ? await Version.parse(mc, version) : version
-    cmd.push('-jar', mc.getVersionJar(resolvedVersion.minecraftVersion, 'server'))
-  } else {
+
+  if (options.classPath && options.classPath.length > 0) {
+    cmd.push('-cp', options.classPath.join(delimiter))
+  }
+
+  if (options.serverExectuableJarPath) {
     cmd.push('-jar', options.serverExectuableJarPath)
+  } else if (options.mainClass) {
+    cmd.push(options.mainClass)
   }
 
   cmd.push(...extraMCArgs)
@@ -681,8 +667,6 @@ export async function generateArguments(options: LaunchOption) {
     }
   }
 
-  cmd.push('-DlibraryDirectory=' + mc.getPath('libraries'))
-
   const jvmOptions = {
     natives_directory: nativeRoot,
     launcher_name: launcherName,
@@ -711,6 +695,10 @@ export async function generateArguments(options: LaunchOption) {
 
   cmd.push(...jvmArguments.map((arg) => format(arg, jvmOptions)))
 
+  if (!cmd.some(v => v.startsWith('-DlibraryDirectory'))) {
+    cmd.push('-DlibraryDirectory=' + mc.getPath('libraries'))
+  }
+
   // add extra jvm args
   if (options.extraJVMArgs instanceof Array) {
     if (options.extraJVMArgs.some((v) => typeof v !== 'string')) {

packages/core/package.json

@@ -42,6 +42,6 @@
     "@xmcl/eslint-config": "workspace:^*",
     "esbuild": "^0.17.16",
     "eslint": "^8.37.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   }
 }

packages/core/version.ts

@@ -303,7 +303,14 @@ export namespace Version {
     checksums?: string[]
   }
 
-  export type Library = NormalLibrary | NativeLibrary | PlatformSpecificLibrary | LegacyLibrary
+  export interface FlatLibrary {
+    name: string
+    url: string
+    sha1: string
+    size: number
+  }
+
+  export type Library = NormalLibrary | NativeLibrary | PlatformSpecificLibrary | LegacyLibrary | FlatLibrary
 
   export type LaunchArgument = string | {
     rules?: Rule[]
@@ -680,6 +687,19 @@ export namespace Version {
       }
       return new ResolvedLibrary(lib.name, info, lib.downloads.artifact)
     }
+    // flat library
+    if ('url' in lib && 'sha1' in lib && 'size' in lib) {
+      if (!lib.url) {
+        throw new Error('Corrupted library: ' + JSON.stringify(lib))
+      }
+      return new ResolvedLibrary(lib.name, info, {
+        size: lib.size,
+        sha1: lib.sha1,
+        url: lib.url,
+        path: info.path,
+      })
+    }
+
     const maven = lib.url || 'https://libraries.minecraft.net/'
     const artifact: Artifact = {
       size: -1,
@@ -856,4 +876,12 @@ export interface Version {
    * NON CONVERSION! This only present in some third party launcher like Labymod to mark the real minecraft version
    */
   _minecraftVersion?: string
+  /**
+   * NON CONVERSION! This only present in some third party launcher like Forge to mark the forge version
+   */
+  _forgeVersion?: string
+  /**
+   * NON CONVERSION! This only present in some third party launcher like Fabric to mark the fabric version
+   */
+  _fabricLoaderVersion?: string
 }

packages/curseforge/index.ts

@@ -37,6 +37,7 @@ export const enum FileModLoaderType {
   LiteLoader = 3,
   Fabric = 4,
   Quilt = 5,
+  NeoForge = 6,
 }
 export interface FileIndex {
   gameVersion: string
@@ -243,6 +244,8 @@ export interface File {
 
   hashes: FileHash[]
 
+  fileFingerprint: number
+
   /**
    * The date of this file uploaded
    */
@@ -520,6 +523,38 @@ export interface CurseforgeClientOptions {
   baseUrl?: string
 }
 
+export interface FingerprintMatch {
+  /**
+   * The mod id
+   */
+  id: number
+  file: File
+  latestFiles: File[]
+}
+export interface FingerprintsMatchesResult {
+  data: {
+    isCacheBuilt: boolean
+    exactMatches: FingerprintMatch[]
+    exactFingerprints: number[]
+    partialMatches: FingerprintMatch[]
+    partialFingerprints: object
+    unmatchedFingerprints: number[]
+  }
+}
+
+export interface FingerprintFuzzyMatch {
+  id: number
+  file: File
+  latestFiles: File[]
+  fingerprints: number[]
+}
+
+export interface FingerprintFuzzyMatchResult {
+  data: {
+    fuzzyMatches: FingerprintFuzzyMatch[]
+  }
+}
+
 export class CurseforgeApiError extends Error {
   constructor(readonly url: string, readonly status: number, readonly body: string) {
     super(`Fail to fetch curseforge api ${url}. Status=${status}. ${body}`)
@@ -753,4 +788,44 @@ export class CurseforgeV1Client {
     const result = await response.json() as { data: string }
     return result.data
   }
+
+  async getFingerprintsMatchesByGameId(gameId: number, fingerprints: number[], signal?: AbortSignal) {
+    const url = new URL(this.baseUrl + `/v1/fingerprints/${gameId}`)
+    const response = await fetch(url, {
+      method: 'POST',
+      body: JSON.stringify({ fingerprints }),
+      headers: {
+        ...this.headers,
+        'content-type': 'application/json',
+        accept: 'application/json',
+      },
+      dispatcher: this.dispatcher,
+      signal,
+    })
+    if (response.status !== 200) {
+      throw new CurseforgeApiError(url.toString(), response.status, await response.text())
+    }
+    const result = await response.json() as FingerprintsMatchesResult
+    return result.data
+  }
+
+  async getFingerprintsFuzzyMatchesByGameId(gameId: number, fingerprints: number[], signal?: AbortSignal) {
+    const url = new URL(this.baseUrl + `/v1/fingerprints/fuzzy/${gameId}`)
+    const response = await fetch(url, {
+      method: 'POST',
+      body: JSON.stringify({ fingerprints }),
+      headers: {
+        ...this.headers,
+        'content-type': 'application/json',
+        accept: 'application/json',
+      },
+      dispatcher: this.dispatcher,
+      signal,
+    })
+    if (response.status !== 200) {
+      throw new CurseforgeApiError(url.toString(), response.status, await response.text())
+    }
+    const result = await response.json() as FingerprintFuzzyMatchResult
+    return result.data
+  }
 }

packages/curseforge/package.json

@@ -35,7 +35,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "undici": "6.0.1"
+    "undici": "6.14.0"
   },
   "bugs": {
     "url": "https://github.com/Voxelum/minecraft-launcher-core-node/issues"

packages/discord-rpc/package.json

@@ -35,14 +35,14 @@
   "sideEffects": false,
   "dependencies": {
     "discord-api-types": "^0.37.39",
-    "undici": "6.0.1"
+    "undici": "6.14.0"
   },
   "devDependencies": {
     "@types/node": "~18",
     "eslint": "^8.37.0",
     "@xmcl/eslint-config": "workspace:^*",
     "esbuild": "^0.17.16",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
     "tsx": "^3.12.1"
   },
   "engines": {

packages/eslint-config/package.json

@@ -4,13 +4,13 @@
     "version": "0.0.1",
     "description": "The xmcl commonly used eslint config for typescript",
     "dependencies": {
-        "@typescript-eslint/eslint-plugin": "^6.13.2",
-        "@typescript-eslint/parser": "^6.13.2",
-        "eslint": "^8.37.0",
+        "@typescript-eslint/eslint-plugin": "^7.15.0",
+        "@typescript-eslint/parser": "^7.15.0",
+        "eslint": "^8.57.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-n": "^16.3.1",
         "eslint-plugin-promise": "^6.1.1",
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.3"
     }
 }

packages/file-transfer/abort.ts

@@ -6,9 +6,3 @@ export function resolveAbortSignal(signal?: AbortSignal) {
     removeEventListener() { return this },
   }
 }
-
-export interface AbortSignal {
-  readonly aborted: boolean
-  addEventListener(event: string, handler: () => void): this
-  removeEventListener(event: string, handler: () => void): this
-}