@quakejs/dedicated 1.0.25 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quakejs/dedicated",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "type": "module",
   "bin": {
     "quakejs-dedicated": "server.js"
@@ -9,6 +9,7 @@
     "@fails-components/webtransport": "^1.5.1",
     "@fails-components/webtransport-transport-http3-quiche": "^1.5.1",
     "@quakejs/demoq3": "^1.0.4",
-    "@quakejs/formats": "^1.0.0"
+    "@quakejs/formats": "^1.0.0",
+    "glob": "^13.0.0"
   }
 }

package/server.js

@@ -6,6 +6,7 @@ import util from 'node:util';
 
 import demoq3 from '@quakejs/demoq3';
 import formats from '@quakejs/formats';
+import { glob } from 'glob';
 
 import dedicated from './dist/ioq3ded.js';
 
@@ -54,16 +55,32 @@ try {
 /* setup server */
 const ioq3 = await dedicated({
   cert: await fs.readFile(args.values.cert),
-  key: await fs.readFile(args.values.key)
+  key: await fs.readFile(args.values.key),
+  ASAN_OPTIONS: 'help=1:verbosity=3:print_stats=1:symbolize=1:malloc_context_size=20:quarantine_size_mb=8'
 });
 
-/* setup filesystem */
-const gamepath = path.resolve(args.values.game);
-const datapath = path.resolve(path.join(gamepath, '..'));
-const homepath = '/quakejs';
+/* synchronize local filesystem */
+const contentBaseUrl = args.values.content;
+const game = path.basename(args.values.game);
+
+const localGamePath = path.resolve(args.values.game);
+const localHomePath = path.dirname(localGamePath);
+const localBasePath = path.join(localHomePath, 'baseq3');
+
+await demoq3.install(contentBaseUrl, async (pakName) => {
+  const pakPath = path.join(localBasePath, pakName);
+  return await fs.readFile(pakPath);
+}, async (pakName, data) => {
+  const pakPath = path.join(localBasePath, pakName);
+  await fs.mkdir(path.dirname(pakPath), { recursive: true });
+  await fs.writeFile(pakPath, data);
+});
+
+/* setup virtual filesystem */
+const virtualHomePath = '/quakejs';
 
 try {
-  ioq3.FS.mkdirTree(homepath, 0o777);
+  ioq3.FS.mkdirTree(virtualHomePath, 0o777);
 } catch (e) {
   if (e.errno !== ioq3.ERRNO_CODES.EEXIST) {
     console.error(e);
@@ -72,7 +89,7 @@ try {
 }
 
 try {
-  ioq3.FS.mount(ioq3.FS.filesystems.NODEFS, { root: datapath }, homepath);
+  ioq3.FS.mount(ioq3.FS.filesystems.NODEFS, { root: localHomePath }, virtualHomePath);
 } catch (e) {
   if (e.errno !== ioq3.ERRNO_CODES.EBUSY) {
     console.error(e);
@@ -80,65 +97,13 @@ try {
   }
 }
 
-/* download demo assets */
-const contentBaseUrl = args.values.content;
-
-await demoq3.install(contentBaseUrl, async (pakname) => {
-  const filename = path.join(homepath, 'baseq3', pakname);
-  return ioq3.FS.readFile(filename);
-}, async (pakname, data) => {
-  const filename = path.join(homepath, 'baseq3', pakname);
-  ioq3.FS.mkdirTree(path.dirname(filename), 0o777);
-  ioq3.FS.writeFile(filename, data);
-});
-
-/* download mod-specific assets */
-const game = path.basename(gamepath);
-const manifest = await fetch(`${contentBaseUrl}/${game}/manifest.json`).then((res) => {
-  if (!res.ok) {
-    throw new Error(`Manifest request returned a ${res.status} status`);
-  }
-
-  return res.json();
-});
-
-for (const [pakname, paksum] of Object.entries(manifest)) {
-  const pakpath = path.join(homepath, game, pakname);
-  const paksumRemote = parseInt(paksum, 16);
-
-  try {
-    const pakdata = ioq3.FS.readFile(pakpath);
-    const paksumLocal = formats.pak.checksum(pakdata);
-
-    if (paksumLocal === paksumRemote) {
-      continue;
-    }
-  } catch (e) {
-    /* ignore */
-  }
-
-  const pakprint = pakname.replace('.pk3', `.${paksum}.pk3`);
-  const pakurl = `${contentBaseUrl}/${game}/${pakprint}`;
-
-  console.log(`downloading ${pakurl}`);
-
-  const data = await fetch(pakurl).then((res) => {
-    if (!res.ok) {
-      throw new Error(`Pak request returned a ${res.status} status`);
-    }
-
-    return res.bytes();
-  });
-  ioq3.FS.mkdirTree(path.dirname(pakpath), 0o777);
-  ioq3.FS.writeFile(pakpath, data);
-}
-
 /* startup the server */
 const port = parseInt(args.values.port);
-const cmdline = `+set fs_homepath ${homepath} ` +
+const cmdline = `+set fs_contentURL "${contentBaseUrl}" ` +
+                `+set fs_homepath ${virtualHomePath} ` +
                 `+set fs_game ${game} ` +
                 '+set dedicated 2 ' +
                 `+set net_port ${port} ` +
-                `+set sv_dlURL "${contentBaseUrl}"`;
+                `+set com_hunkmegs 150`;
 
 ioq3.callMain([...cmdline.split(/\s+/), ...args.positionals]);