h1z1-server 0.23.3-2 → 0.23.3-4

package/data/2016/dataSources/ServerItemDefinitions.json

@@ -2866,7 +2866,6 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "WORLD_MODEL_ID": 2,
         "PICKUP_EFFECT": 5151
     },
     "40": {
@@ -22561,7 +22560,8 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "PICKUP_EFFECT": 5151
+        "PICKUP_EFFECT": 5151,
+        "WORLD_MODEL_ID": 8019
     },
     "1536": {
         "NAME": "Hammer",
@@ -60885,7 +60885,8 @@
         "IS_ARMOR": 0,
         "PASSIVE_EQUIP_SLOT_GROUP_ID": 0,
         "SCRAP_VALUE_OVERRIDE": 0,
-        "PICKUP_EFFECT": 5151
+        "PICKUP_EFFECT": 5151,
+        "WORLD_MODEL_ID": 9583
     },
     "2274": {
         "NAME": "Police Body Armor",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.23.3-2",
+  "version": "0.23.3-4",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <quentingruber@gmail.com> (http://github.com/quentingruber)",
   "license": "GPL-3.0-only",

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

@@ -35,7 +35,7 @@ export const voicePackets: any = [
       ],
     },
   ],
-  ["Voice.LeaveChannel", 0x8202, {}],
-  ["Voice.RadioChannel", 0x8207, {}],
-  ["Voice.LeaveRadio", 0x8208, {}],
+  ["Voice.LeaveChannel", 0x8202, { fields: [] }],
+  ["Voice.RadioChannel", 0x8207, { fields: [] }],
+  ["Voice.LeaveRadio", 0x8208, { fields: [] }],
 ];

package/src/protocols/h1emuprotocol.ts

@@ -128,6 +128,26 @@ const packets = [
       ],
     },
   ],
+  [
+    "ClientIsAdminRequest",
+    0x14,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "guid", type: "uint64string", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "ClientIsAdminReply",
+    0x15,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "status", type: "boolean", defaultValue: 0 },
+      ],
+    },
+  ],
 ];
 
 export const [H1emuPacketsPacketTypes, H1emuPacketsPackets] =

package/src/servers/H1emuServer/h1emuLoginServer.ts

@@ -30,7 +30,8 @@ export class H1emuLoginServer extends H1emuServer {
           break;
         case "CharacterCreateReply":
         case "CharacterExistReply":
-        case "CharacterDeleteReply": {
+        case "CharacterDeleteReply":
+        case "ClientIsAdminReply": {
           this.emit("processInternalReq", packet, ["status"]);
           break;
         }

package/src/servers/LoginServer/loginserver.ts

@@ -35,7 +35,7 @@ import { Worker } from "worker_threads";
 import { httpServerMessage } from "types/shared";
 import { LoginProtocol2016 } from "../../protocols/loginprotocol2016";
 import { crc_length_options } from "../../types/soeserver";
-import { DEFAULT_CRYPTO_KEY } from "../../utils/constants";
+import { DB_NAME, DEFAULT_CRYPTO_KEY } from "../../utils/constants";
 import { healthThreadDecorator } from "../../servers/shared/workers/healthWorker";
 import {
   LoginReply,
@@ -52,7 +52,11 @@ import {
 import { LoginUdp_9packets } from "types/LoginUdp_9packets";
 import { getCharacterModelData } from "../shared/functions";
 import LoginClient from "servers/LoginServer/loginclient";
-import { GAME_VERSIONS, NAME_VALIDATION_STATUS } from "../../utils/enums";
+import {
+  DB_COLLECTIONS,
+  GAME_VERSIONS,
+  NAME_VALIDATION_STATUS,
+} from "../../utils/enums";
 import DataSchema from "h1z1-dataschema";
 import { applicationDataKOTK } from "../../packets/LoginUdp/LoginUdp_11/loginpackets";
 import { Resolver } from "dns";
@@ -183,7 +187,7 @@ export class LoginServer extends EventEmitter {
                     );
                     let status = 0;
                     const { serverAddress: fullServerAddress } = await this._db
-                      .collection("servers")
+                      .collection(DB_COLLECTIONS.SERVERS)
                       .findOne({ serverId: serverId });
                     const serverAddress = fullServerAddress.split(":")[0];
                     if (serverAddress) {
@@ -216,19 +220,23 @@ export class LoginServer extends EventEmitter {
                     const { population } = packet.data;
                     const serverId = this._zoneConnections[client.clientId];
                     const { maxPopulationNumber } = await this._db
-                      .collection("servers")
+                      .collection(DB_COLLECTIONS.SERVERS)
                       .findOne({ serverId: serverId });
-                    this._db?.collection("servers").findOneAndUpdate(
-                      { serverId: serverId },
-                      {
-                        $set: {
-                          populationNumber: population,
-                          populationLevel: Number(
-                            ((population / maxPopulationNumber) * 3).toFixed(0)
-                          ),
-                        },
-                      }
-                    );
+                    this._db
+                      ?.collection(DB_COLLECTIONS.SERVERS)
+                      .findOneAndUpdate(
+                        { serverId: serverId },
+                        {
+                          $set: {
+                            populationNumber: population,
+                            populationLevel: Number(
+                              ((population / maxPopulationNumber) * 3).toFixed(
+                                0
+                              )
+                            ),
+                          },
+                        }
+                      );
                     break;
                   }
                   default:
@@ -276,7 +284,10 @@ export class LoginServer extends EventEmitter {
             }`
           );
           delete this._zoneConnections[client.clientId];
-          if (client.serverId) {
+          if (
+            client.serverId &&
+            !Object.values(this._zoneConnections).includes(client.serverId)
+          ) {
             await this.updateServerStatus(client.serverId, false);
           }
         }
@@ -371,7 +382,7 @@ export class LoginServer extends EventEmitter {
         status: 1,
       };
       return await this._db
-        .collection("characters-light")
+        .collection(DB_COLLECTIONS.CHARACTERS_LIGHT)
         .find(charactersQuery)
         .toArray();
     }
@@ -395,15 +406,15 @@ export class LoginServer extends EventEmitter {
         client.protocolName === "LoginUdp_9"
           ? GAME_VERSIONS.H1Z1_15janv_2015
           : GAME_VERSIONS.H1Z1_6dec_2016;
-      console.warn(
-        "Your session id is not a valid json string, please update your launcher to avoid this warning"
-      );
+      //console.warn(
+      //  "Your session id is not a valid json string, please update your launcher to avoid this warning"
+      //);
     }
     if (this._soloMode) {
       client.loginSessionId = String(sessionId);
     } else {
       const realSession = await this._db
-        .collection("user-sessions")
+        .collection(DB_COLLECTIONS.USERS_SESSIONS)
         .findOne({ guid: sessionId });
       client.loginSessionId = realSession ? realSession.authKey : sessionId;
     }
@@ -449,7 +460,7 @@ export class LoginServer extends EventEmitter {
         let status = isValidCharacterName(characterName);
         if (!this._soloMode) {
           const blackListedEntry = await this._db
-            .collection("blackListEntries")
+            .collection(DB_COLLECTIONS.BLACK_LIST_ENTRIES)
             .findOne({
               WORD: characterName.toUpperCase(),
             });
@@ -461,7 +472,7 @@ export class LoginServer extends EventEmitter {
             }
           } else {
             const duplicateCharacter = await this._db
-              .collection("characters-light")
+              .collection(DB_COLLECTIONS.CHARACTERS_LIGHT)
               .findOne({
                 "payload.name": characterName,
                 serverId: baseResponse.serverId,
@@ -555,16 +566,18 @@ export class LoginServer extends EventEmitter {
   }
 
   async updateServerStatus(serverId: number, status: boolean) {
-    const server = await this._db.collection("servers").findOneAndUpdate(
-      { serverId: serverId },
-      {
-        $set: {
-          allowedAccess: status,
-          populationNumber: 0,
-          populationLevel: 0,
-        },
-      }
-    );
+    const server = await this._db
+      .collection(DB_COLLECTIONS.SERVERS)
+      .findOneAndUpdate(
+        { serverId: serverId },
+        {
+          $set: {
+            allowedAccess: status,
+            populationNumber: 0,
+            populationLevel: 0,
+          },
+        }
+      );
     this.clients.forEach((client: Client) => {
       if (client.gameVersion === server.value.gameVersion) {
         this.sendData(client, "ServerUpdate", {
@@ -576,7 +589,10 @@ export class LoginServer extends EventEmitter {
   }
 
   async updateServersStatus(): Promise<void> {
-    const servers = await this._db.collection("servers").find().toArray();
+    const servers = await this._db
+      .collection(DB_COLLECTIONS.SERVERS)
+      .find()
+      .toArray();
 
     for (let index = 0; index < servers.length; index++) {
       const server: GameServer = servers[index];
@@ -593,7 +609,7 @@ export class LoginServer extends EventEmitter {
     let servers;
     if (!this._soloMode) {
       servers = await this._db
-        .collection("servers")
+        .collection(DB_COLLECTIONS.SERVERS)
         .find({
           gameVersion: client.gameVersion,
         })
@@ -675,7 +691,7 @@ export class LoginServer extends EventEmitter {
       const characterId = packet.characterId;
       const characterQuery = { characterId: characterId };
       const charracterToDelete = await this._db
-        .collection("characters-light")
+        .collection(DB_COLLECTIONS.CHARACTERS_LIGHT)
         .findOne(characterQuery);
       if (
         charracterToDelete &&
@@ -688,7 +704,7 @@ export class LoginServer extends EventEmitter {
         )) as number;
         if (deletionStatus) {
           await this._db
-            .collection("characters-light")
+            .collection(DB_COLLECTIONS.CHARACTERS_LIGHT)
             .updateOne(characterQuery, {
               $set: {
                 status: 0,
@@ -712,11 +728,13 @@ export class LoginServer extends EventEmitter {
     loginSessionId: string | undefined
   ): Promise<CharacterLoginReply> {
     const { serverAddress, populationNumber, maxPopulationNumber } =
-      await this._db.collection("servers").findOne({ serverId: serverId });
+      await this._db
+        .collection(DB_COLLECTIONS.SERVERS)
+        .findOne({ serverId: serverId });
     const character = await this._db
-      .collection("characters-light")
+      .collection(DB_COLLECTIONS.CHARACTERS_LIGHT)
       .findOne({ characterId: characterId });
-    const connectionStatus =
+    let connectionStatus =
       Object.values(this._zoneConnections).includes(serverId) &&
       (populationNumber < maxPopulationNumber || !maxPopulationNumber);
     debug(`connectionStatus ${connectionStatus}`);
@@ -728,9 +746,16 @@ export class LoginServer extends EventEmitter {
     }
     const hiddenSession = connectionStatus
       ? await this._db
-          .collection("user-sessions")
+          .collection(DB_COLLECTIONS.USERS_SESSIONS)
           .findOne({ authKey: loginSessionId })
       : { guid: "" };
+    connectionStatus = false;
+    if (!connectionStatus) {
+      // Admins bypass max pop
+      connectionStatus = (await this.askZone(serverId, "ClientIsAdminRequest", {
+        guid: hiddenSession?.guid,
+      })) as boolean;
+    }
     return {
       unknownQword1: "0x0",
       unknownDword1: 0,
@@ -936,7 +961,7 @@ export class LoginServer extends EventEmitter {
     } else {
       let sessionObj;
       const storedUserSession = await this._db
-        ?.collection("user-sessions")
+        ?.collection(DB_COLLECTIONS.USERS_SESSIONS)
         .findOne({ authKey: client.loginSessionId, serverId: serverId });
       if (storedUserSession) {
         sessionObj = storedUserSession;
@@ -946,7 +971,9 @@ export class LoginServer extends EventEmitter {
           authKey: client.loginSessionId,
           guid: generateRandomGuid(),
         };
-        await this._db?.collection("user-sessions").insertOne(sessionObj);
+        await this._db
+          ?.collection(DB_COLLECTIONS.USERS_SESSIONS)
+          .insertOne(sessionObj);
       }
       let newCharacterData;
       switch (client.gameVersion) {
@@ -974,7 +1001,7 @@ export class LoginServer extends EventEmitter {
         : 0;
 
       if (creationStatus === 1) {
-        await this._db.collection("characters-light").insertOne({
+        await this._db.collection(DB_COLLECTIONS.CHARACTERS_LIGHT).insertOne({
           authKey: client.loginSessionId,
           serverId: serverId,
           gameVersion: client.gameVersion,
@@ -1008,11 +1035,11 @@ export class LoginServer extends EventEmitter {
       debug("connected to mongo !");
       // if no collections exist on h1server database , fill it with samples
       const dbIsEmpty =
-        (await mongoClient.db("h1server").collections()).length < 1;
+        (await mongoClient.db(DB_NAME).collections()).length < 1;
       if (dbIsEmpty) {
         await initMongo(mongoClient, debugName);
       }
-      this._db = mongoClient.db("h1server");
+      this._db = mongoClient.db(DB_NAME);
       this.updateServersStatus();
     }
 

package/src/servers/LoginServer/workers/httpServer.ts

@@ -15,6 +15,8 @@ import { MongoClient } from "mongodb";
 import { httpServerMessage } from "types/shared";
 import { parentPort, workerData } from "worker_threads";
 import http from "http";
+import { DB_COLLECTIONS } from "../../../utils/enums";
+import { DB_NAME } from "../../../utils/constants";
 function sendMessageToServer(type: string, requestId: number, data: any) {
   const message: httpServerMessage = {
     type: type,
@@ -29,7 +31,7 @@ const { MONGO_URL, SERVER_PORT } = workerData;
 const client = new MongoClient(MONGO_URL, {
   maxPoolSize: 5,
 });
-const dbName = "h1server";
+const dbName = DB_NAME;
 const db = client.db(dbName);
 client.connect();
 let requestCount = 0;
@@ -61,7 +63,7 @@ httpServer.on("request", async function (req, res) {
   const queryObject: any = queryString ? parseQueryString(queryString) : null;
   switch (path) {
     case "servers": {
-      const collection = db.collection("servers");
+      const collection = db.collection(DB_COLLECTIONS.SERVERS);
       const serversArray = await collection.find().toArray();
       res.writeHead(200, { "Content-Type": "text/json" });
       res.write(JSON.stringify(serversArray));

package/src/servers/ZoneServer2015/zoneserver.ts

@@ -36,7 +36,7 @@ import { ZoneClient as Client } from "./classes/zoneclient";
 import { h1z1PacketsType } from "../../types/packets";
 import { Vehicle } from "./classes/vehicle";
 import { Resolver } from "dns";
-import { DEFAULT_CRYPTO_KEY } from "../../utils/constants";
+import { DB_NAME, DEFAULT_CRYPTO_KEY } from "../../utils/constants";
 
 process.env.isBin && require("./workers/dynamicWeather");
 
@@ -658,12 +658,11 @@ export class ZoneServer2015 extends EventEmitter {
     }
     debug("connected to mongo !");
     // if no collections exist on h1server database , fill it with samples
-    const dbIsEmpty =
-      (await mongoClient.db("h1server").collections()).length < 1;
+    const dbIsEmpty = (await mongoClient.db(DB_NAME).collections()).length < 1;
     if (dbIsEmpty) {
       await initMongo(mongoClient, debugName);
     }
-    this._db = mongoClient.db("h1server");
+    this._db = mongoClient.db(DB_NAME);
   }
 
   async start(): Promise<void> {

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

@@ -36,6 +36,7 @@ export class ZoneClient2016 {
     time: 0,
   };
   speedWarnsNumber: number = 0;
+  allowedProjectiles: number = 0;
   pvpStats: {
     shotsFired: number;
     shotsHit: number;
@@ -60,6 +61,7 @@ export class ZoneClient2016 {
   vehicle: {
     mountedVehicle?: string;
   } = {};
+  radio: boolean = false;
   npcsToSpawnTimer!: NodeJS.Timeout;
   loginSessionId: string;
   pingTimer: NodeJS.Timeout | undefined;