h1z1-server 0.36.2-4 → 0.36.2

package/data/2016/dataSources/AllowedFileHashes.json

@@ -1024,6 +1024,6 @@
     },
     {
         "file_name": "Assets_256.pack",
-        "crc32_hash": "c8b93131"
+        "crc32_hash": "0f9d31cf"
     }
 ]

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "h1z1-server",
-  "version": "0.36.2-4",
+  "version": "0.36.2",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <quentingruber@gmail.com> (http://github.com/quentingruber)",
   "license": "GPL-3.0-only",
   "main": "h1z1-server.js",
   "engines": {
-    "node": ">=0.17.0 <23"
+    "node": ">=0.17.0 <21"
   },
   "bin": {
     "h1z1-server-demo": "scripts/h1z1-server-demo.js",
@@ -14,27 +14,27 @@
   },
   "dependencies": {
     "@types/js-yaml": "4.0.9",
-    "@types/node": "20.14.5",
+    "@types/node": "20.11.19",
     "@types/ws": "8.5.10",
-    "debug": "4.3.5",
+    "debug": "4.3.4",
     "h1emu-core": "1.2.8",
-    "h1z1-dataschema": "1.7.2",
+    "h1z1-dataschema": "1.7.1",
     "js-yaml": "4.1.0",
-    "mongodb": "6.7.0",
+    "mongodb": "6.3.0",
     "threads": "1.7.0",
-    "typescript": "5.4.5",
-    "ws": "8.17.1"
+    "typescript": "5.3.3",
+    "ws": "8.16.0"
   },
   "directories": {
     "src": "./src"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
     "eslint": "^8.56.0",
-    "prettier": "^3.3.2",
+    "prettier": "^3.2.5",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.25.13"
+    "typedoc": "^0.25.8"
   },
   "scripts": {
     "gen-packets-types": "npx ts-node ./scripts/genPacketsNames.ts",

package/src/packets/ClientProtocol/ClientProtocol_1080/dto.ts

@@ -55,7 +55,7 @@ export const dtoPackets: PacketStructures = [
             { name: "unknownDword1", type: "uint32", defaultValue: 0 },
             { name: "unknownBool1", type: "boolean", defaultValue: true },
             { name: "unknownBool2", type: "boolean", defaultValue: true },
-            { name: "invisibility", type: "boolean", defaultValue: true }
+            { name: "unknownBool3", type: "boolean", defaultValue: true }
           ]
         },
         {

package/src/packets/ClientProtocol/ClientProtocol_1080/shared.ts

@@ -2857,7 +2857,8 @@ export function pack2ByteLengthString(string: string) {
 
 export const accountItemSchema: PacketFields = [
   { name: "itemId", type: "uint64string", defaultValue: "0" },
-  { name: "itemDefinitionId", type: "uint64", defaultValue: 0 },
+  { name: "itemDefinitionId", type: "uint32", defaultValue: 0 },
+  { name: "unknownDword2", type: "uint32", defaultValue: 0 }, // 44 for itemDefId 1871, 37 for itemDefId 37, ... (No idea where it comes from)
   { name: "itemCount", type: "uint32", defaultValue: 0 },
   { name: "itemGuid", type: "uint64string", defaultValue: "0" },
   { name: "unknownDword4", type: "uint32", defaultValue: 0 }

package/src/servers/LoginServer/loginserver.test.ts

@@ -19,6 +19,7 @@ test("LoginServer-mongo", { timeout: 5000, skip: !isMongoTests }, async (t) => {
   await t.test("start", async () => {
     await loginServer.start();
   });
+  // TODO: start should stop awaiting only when everything is really done
   await scheduler.yield();
   await t.test("stop", async () => {
     await loginServer.stop();

package/src/servers/LoginServer/loginserver.ts

@@ -40,7 +40,7 @@ import { Worker } from "node:worker_threads";
 import { FileHash, httpServerMessage } from "types/shared";
 import { LoginProtocol2016 } from "../../protocols/loginprotocol2016";
 import { crc_length_options } from "../../types/soeserver";
-import { DB_NAME, DEFAULT_CRYPTO_KEY, MAX_UINT32 } from "../../utils/constants";
+import { DB_NAME, DEFAULT_CRYPTO_KEY } from "../../utils/constants";
 import {
   LoginReply,
   CharacterSelectInfoReply,
@@ -1112,10 +1112,12 @@ export class LoginServer extends EventEmitter {
     ];
     const [address, port] = zoneConnectionString.split(":");
 
-    const LZClient = new LZConnectionClient({ address, port: Number(port) });
-    // Hack since the loginserver doesn't have a serverId
-    LZClient.serverId = MAX_UINT32;
-    return LZClient;
+    return {
+      address: address,
+      port: port,
+      clientId: zoneConnectionString,
+      serverId: 1 // TODO: that's a hack
+    } as any;
   }
 
   async askZone(

package/src/servers/LoginZoneConnection/shared/lzconnectionclient.ts

@@ -11,6 +11,8 @@
 //   Based on https://github.com/psemu/soe-network
 // ======================================================================
 
+import { RemoteInfo } from "node:dgram";
+
 export class LZConnectionClient {
   sessionId: number = 0;
   address: string;
@@ -19,8 +21,8 @@ export class LZConnectionClient {
   clientId: string;
   lastPing: number = 0;
 
-  constructor(remote: { address?: string; port: number }) {
-    this.address = remote.address ?? "";
+  constructor(remote: RemoteInfo) {
+    this.address = remote.address;
     this.port = remote.port;
     this.clientId = `${remote.address}:${remote.port}`;
   }

package/src/servers/SoeServer/soeserver.ts

@@ -71,13 +71,15 @@ export class SOEServer extends EventEmitter {
         this.avgEventLoopLag =
           this.eventLoopLagValues.reduce((a, b) => a + b, 0) /
           this.eventLoopLagValues.length;
+        performance.clearMarks();
+        performance.clearMeasures();
+        performance.mark("A");
       });
       obs.observe({ entryTypes: ["measure"], buffered: true });
       performance.mark("A");
       setInterval(() => {
         performance.mark("B");
         performance.measure("A to B", "A", "B");
-        performance.mark("A");
       }, intervalTime);
     } catch (e) {
       console.log("PerformanceObserver not available");
@@ -410,7 +412,7 @@ export class SOEServer extends EventEmitter {
           );
 
           // client.outputStream.on(SOEOutputChannels.Raw, (data: Buffer) => {
-          //  unused in h1z1
+          // TODO:
           // });
         } else {
           client = this._clients.get(clientId) as SOEClient;

package/src/servers/ZoneServer2016/classes/accountinventory.ts

@@ -0,0 +1,25 @@
+// ======================================================================
+//
+//   GNU GENERAL PUBLIC LICENSE
+//   Version 3, 29 June 2007
+//   copyright (C) 2020 - 2021 Quentin Gruber
+//   copyright (C) 2021 - 2024 H1emu community
+//
+//   https://github.com/QuentinGruber/h1z1-server
+//   https://www.npmjs.com/package/h1z1-server
+//
+//   Based on https://github.com/psemu/soe-network
+// ======================================================================
+
+import { EntityDictionary } from "types/zoneserver";
+import { BaseItem } from "./baseItem";
+
+export class AccountInventory {
+  loginSessionId: string;
+  items: EntityDictionary<BaseItem>;
+
+  constructor(loginSessionId: string, items: EntityDictionary<BaseItem>) {
+    this.loginSessionId = loginSessionId;
+    this.items = items;
+  }
+}

package/src/servers/ZoneServer2016/data/loadouts.ts

@@ -195,3 +195,9 @@ export const lootableContainerDefaultLoadouts = {
   repair_box: [{ item: Items.CONTAINER_REPAIR_BOX }],
   stash: [{ item: Items.CONTAINER_STASH }]
 };
+
+export const accountInventoryDefaultRewards = [
+  { item: Items.REWARD_CRATE_WEARABLES, count: 3 },
+  { item: Items.REWARD_CRATE_ALPHA_LAUNCH, count: 3 },
+  { item: Items.MYSTERY_BAG_1, count: 2 }
+];

package/src/servers/ZoneServer2016/data/lootspawns.ts

@@ -220,7 +220,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
     ]
   },
   "ItemSpawner_Weapon_Bat01.adr": {
-    spawnChance: 10,
+    spawnChance: 20,
     items: [
       {
         item: Items.WEAPON_BAT_WOOD,
@@ -311,7 +311,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
     ]
   },
   "ItemSpawner_Weapon_Bat02.adr": {
-    spawnChance: 10,
+    spawnChance: 20,
     items: [
       {
         item: Items.WEAPON_BAT_ALUM,
@@ -482,19 +482,6 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       }
     ]
   },
-  "ItemSpawner_Clothes_Helmet_Tactical_ChipsScratches.adr": {
-    spawnChance: 10,
-    items: [
-      {
-        item: Items.DEFAULT_TACTICAL_HELMET,
-        weight: 100,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      }
-    ]
-  },
   "ItemSpawner_Clothes_BaseballCap.adr": {
     spawnChance: 20,
     items: [
@@ -685,7 +672,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.WATER_DIRTY,
+        item: Items.WATER_PURE,
         weight: 15,
         spawnCount: {
           min: 1,
@@ -782,7 +769,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.WEAPON_BAT_WOOD,
-        weight: 10,
+        weight: 15,
         spawnCount: {
           min: 1,
           max: 1
@@ -790,7 +777,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
       },
       {
         item: Items.WEAPON_BAT_ALUM,
-        weight: 10,
+        weight: 15,
         spawnCount: {
           min: 1,
           max: 1
@@ -1070,7 +1057,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.WATER_DIRTY,
+        item: Items.WATER_PURE,
         weight: 10,
         spawnCount: {
           min: 1,
@@ -1212,30 +1199,6 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
           min: 1,
           max: 1
         }
-      },
-      {
-        item: Items.GROUND_COFFEE,
-        weight: 15,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.SUGAR,
-        weight: 10,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.CANNED_FOOD26,
-        weight: 7,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
       }
     ]
   },
@@ -1342,15 +1305,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.SHIRT_SCRUBS_GRAY,
-        weight: 100,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.PANTS_SCRUBS_GRAY,
+        item: Items.SHIRT_DEFAULT,
         weight: 100,
         spawnCount: {
           min: 1,
@@ -1358,7 +1313,7 @@ export const lootTables: { [lootSpawner: string]: LootSpawner } = {
         }
       },
       {
-        item: Items.CAP_SCRUBS_GRAY,
+        item: Items.PANTS_DEFAULT,
         weight: 100,
         spawnCount: {
           min: 1,
@@ -2117,24 +2072,16 @@ export const containerLootSpawners: {
           min: 2,
           max: 10
         }
-      },
-      {
-        item: Items.AMMO_12GA,
-        weight: 20,
-        spawnCount: {
-          min: 1,
-          max: 6
-        }
       }
     ]
   },
   Locker: {
-    spawnChance: 60,
+    spawnChance: 100,
     maxItems: 1,
     items: [
       {
         item: Items.BACKPACK_MILITARY_TAN,
-        weight: 25,
+        weight: 35,
         spawnCount: {
           min: 1,
           max: 1
@@ -2150,15 +2097,7 @@ export const containerLootSpawners: {
       },
       {
         item: Items.KEVLAR_DEFAULT,
-        weight: 25,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.DEFAULT_TACTICAL_HELMET,
-        weight: 25,
+        weight: 35,
         spawnCount: {
           min: 1,
           max: 1
@@ -3488,82 +3427,6 @@ export const containerLootSpawners: {
       }
     ]
   },
-  Washer: {
-    spawnChance: 10,
-    maxItems: 2,
-    items: [
-      {
-        item: Items.SHIRT_DEFAULT,
-        weight: 30,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.PANTS_DEFAULT,
-        weight: 20,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.BASIC_HOODIE,
-        weight: 10,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.CLOTH,
-        weight: 5,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      }
-    ]
-  },
-  Dryer: {
-    spawnChance: 10,
-    maxItems: 2,
-    items: [
-      {
-        item: Items.SHIRT_DEFAULT,
-        weight: 30,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.PANTS_DEFAULT,
-        weight: 20,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.BASIC_HOODIE,
-        weight: 10,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      },
-      {
-        item: Items.CLOTH,
-        weight: 5,
-        spawnCount: {
-          min: 1,
-          max: 1
-        }
-      }
-    ]
-  },
   // used for crate props
   Crate_buffed: {
     spawnChance: 60,
@@ -3594,7 +3457,7 @@ export const containerLootSpawners: {
         }
       },
       {
-        item: Items.WATER_DIRTY,
+        item: Items.WATER_PURE,
         weight: 10,
         spawnCount: {
           min: 1,
@@ -3616,7 +3479,7 @@ export const containerLootSpawners: {
         }
       },
       {
-        item: Items.WATER_DIRTY,
+        item: Items.WATER_PURE,
         weight: 10,
         spawnCount: {
           min: 1,

package/src/servers/ZoneServer2016/entities/basefullcharacter.ts

@@ -444,19 +444,15 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
     }
   }
 
-  async lootAccountItem(
+  lootAccountItem(
     server: ZoneServer2016,
     client: ZoneClient2016,
-    item?: BaseItem,
+    item: BaseItem,
     sendUpdate: boolean = false
   ) {
-    if (!item) {
-      return;
-    }
-    await server.accountInventoriesManager.addAccountItem(
-      client.loginSessionId,
-      item
-    );
+    const items = server._accountInventories[client.loginSessionId]?.items;
+    if (!items) return;
+    items[item.itemGuid] = item;
     server.sendData(client, "Items.AddEscrowAccountItem", {
       itemData: {
         itemId: item.itemGuid,
@@ -560,9 +556,7 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
       if (
         ammo &&
         loadoutItem.weapon.ammoCount > 0 &&
-        loadoutItem.weapon.itemDefinitionId != Items.WEAPON_REMOVER &&
-        server.getItemDefinition(loadoutItem.itemDefinitionId)?.ITEM_CLASS !=
-          ItemClasses.THROWABLES
+        loadoutItem.weapon.itemDefinitionId != Items.WEAPON_REMOVER
       ) {
         this.lootContainerItem(server, ammo, ammo.stackCount, true);
       }
@@ -957,6 +951,7 @@ export abstract class BaseFullCharacter extends BaseLightweightCharacter {
     let slot = loadoutSlotItemClass?.SLOT;
     if (!slot) return 0;
     switch (itemDef?.ITEM_CLASS) {
+      // TODO: Prevent equipping throwables until fixed
       case ItemClasses.THROWABLES:
       case ItemClasses.WEAPONS_LONG:
       case ItemClasses.WEAPONS_PISTOL:

package/src/servers/ZoneServer2016/entities/character.ts

@@ -101,9 +101,6 @@ export class Character2016 extends BaseFullCharacter {
   /** Used to update the status of the players resources */
   resourcesUpdater?: any;
   factionId = 2;
-  isInInventory: boolean = false;
-  playTime: number = 0;
-  lastDropPlaytime: number = 0;
   set godMode(state: boolean) {
     this.characterStates.invincibility = state;
   }

package/src/servers/ZoneServer2016/entities/destroyable.ts

@@ -17,6 +17,7 @@ import { eul2quat } from "../../../utils/utils";
 import { Effects, ModelIds } from "../models/enums";
 import { AddLightweightNpc, AddSimpleNpc } from "types/zone2016packets";
 import { BaseSimpleNpc } from "./basesimplenpc";
+import { MAX_UINT32 } from "../../../utils/constants";
 
 function getDestroyedModels(actorModelId: ModelIds): number[] {
   switch (actorModelId) {
@@ -47,8 +48,8 @@ function getMaxHealth(actorModelId: ModelIds): number {
     case ModelIds.FENCES_WOOD_PLANKS_GREY_1X1:
     case ModelIds.FENCES_WOOD_PLANKS_GREY_POSTS_1X2:
     case ModelIds.FENCES_WOOD_PLANKS_GREY_GAP_1X1:
-    // temp hack so it can't be destroyed ( or you really wanted to )
-    // return MAX_UINT32;
+      // temp hack so it can't be destroyed ( or you really wanted to )
+      return MAX_UINT32;
     default:
       return 5000;
   }

package/src/servers/ZoneServer2016/entities/lootableprop.ts

@@ -118,16 +118,6 @@ function getContainerAndTime(entity: LootableProp) {
       entity.searchTime = 500;
       entity.lootSpawner = "Fridge";
       break;
-    case ModelIds.WASHER:
-      entity.containerId = Items.CONTAINER_WASHING_MACHINE;
-      entity.searchTime = 500;
-      entity.lootSpawner = "Washer";
-      break;
-    case ModelIds.DRYER:
-      entity.containerId = Items.CONTAINER_DRYER;
-      entity.searchTime = 500;
-      entity.lootSpawner = "Dryer";
-      break;
     case ModelIds.OTTOMAN_01:
     case ModelIds.OTTOMAN_02:
       entity.containerId = Items.CONTAINER_OTTOMAN;
@@ -191,6 +181,16 @@ function getContainerAndTime(entity: LootableProp) {
       entity.searchTime = 500;
       entity.lootSpawner = "Dresser";
       break;
+    case ModelIds.WASHER:
+      entity.containerId = Items.CONTAINER_WASHING_MACHINE;
+      entity.searchTime = 500;
+      entity.lootSpawner = "Washer_Dryer";
+      break;
+    case ModelIds.DRYER:
+      entity.containerId = Items.CONTAINER_DRYER;
+      entity.searchTime = 500;
+      entity.lootSpawner = "Washer_Dryer";
+      break;
     case ModelIds.FURNACE:
       entity.containerId = Items.CONTAINER_FURNACE;
       entity.searchTime = 0;