h1z1-server 0.23.4-0 → 0.23.4-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.23.4-0",
+  "version": "0.23.4-2",
   "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

@@ -1,41 +1,41 @@
-// ======================================================================
-//
-//   GNU GENERAL PUBLIC LICENSE
-//   Version 3, 29 June 2007
-//   copyright (C) 2020 - 2021 Quentin Gruber
-//   copyright (C) 2021 - 2023 H1emu community
-//
-//   https://github.com/QuentinGruber/h1z1-server
-//   https://www.npmjs.com/package/h1z1-server
-//
-//   Based on https://github.com/psemu/soe-network
-// ======================================================================
-
-export const voicePackets: any = [
-  [
-    "Voice.Login",
-    0x8200,
-    {
-      fields: [
-        { name: "clientName", type: "string", defaultValue: "" },
-        { name: "sessionId", type: "string", defaultValue: "" },
-        { name: "url", type: "string", defaultValue: "" },
-        { name: "characterName", type: "string", defaultValue: "" },
-      ],
-    },
-  ],
-  [
-    "Voice.JoinChannel",
-    0x8201,
-    {
-      fields: [
-        { name: "roomType", type: "uint8", defaultValue: 0 },
-        { name: "uri", type: "string", defaultValue: "" },
-        { name: "unknown1", type: "uint32", defaultValue: 0 },
-      ],
-    },
-  ],
-  ["Voice.LeaveChannel", 0x8202, { fields: [] }],
-  ["Voice.RadioChannel", 0x8207, { fields: [] }],
-  ["Voice.LeaveRadio", 0x8208, { fields: [] }],
-];
+// ======================================================================
+//
+//   GNU GENERAL PUBLIC LICENSE
+//   Version 3, 29 June 2007
+//   copyright (C) 2020 - 2021 Quentin Gruber
+//   copyright (C) 2021 - 2023 H1emu community
+//
+//   https://github.com/QuentinGruber/h1z1-server
+//   https://www.npmjs.com/package/h1z1-server
+//
+//   Based on https://github.com/psemu/soe-network
+// ======================================================================
+
+export const voicePackets: any = [
+  [
+    "Voice.Login",
+    0x8200,
+    {
+      fields: [
+        { name: "clientName", type: "string", defaultValue: "" },
+        { name: "sessionId", type: "string", defaultValue: "" },
+        { name: "url", type: "string", defaultValue: "" },
+        { name: "characterName", type: "string", defaultValue: "" },
+      ],
+    },
+  ],
+  [
+    "Voice.JoinChannel",
+    0x8201,
+    {
+      fields: [
+        { name: "roomType", type: "uint8", defaultValue: 0 },
+        { name: "uri", type: "string", defaultValue: "" },
+        { name: "unknown1", type: "uint32", defaultValue: 0 },
+      ],
+    },
+  ],
+  ["Voice.LeaveChannel", 0x8202, { fields: [] }],
+  ["Voice.RadioChannel", 0x8207, { fields: [] }],
+  ["Voice.LeaveRadio", 0x8208, { fields: [] }],
+];

package/src/protocols/h1emuprotocol.ts

@@ -1,216 +1,216 @@
-// ======================================================================
-//
-//   GNU GENERAL PUBLIC LICENSE
-//   Version 3, 29 June 2007
-//   copyright (C) 2020 - 2021 Quentin Gruber
-//   copyright (C) 2021 - 2023 H1emu community
-//
-//   https://github.com/QuentinGruber/h1z1-server
-//   https://www.npmjs.com/package/h1z1-server
-//
-//   Based on https://github.com/psemu/soe-network
-// ======================================================================
-
-const debug = require("debug")("H1emuProtocol");
-import DataSchema from "h1z1-dataschema";
-import { H1emuProtocolReadingFormat } from "types/protocols";
-import PacketTableBuild from "../packets/packettable";
-const packets = [
-  [
-    "SessionRequest",
-    0x01,
-    {
-      fields: [
-        { name: "serverId", type: "uint32", defaultValue: 0 },
-        { name: "h1emuVersion", type: "string", defaultValue: "" },
-      ],
-    },
-  ],
-  [
-    "SessionReply",
-    0x02,
-    {
-      fields: [{ name: "status", type: "uint8", defaultValue: 0 }],
-    },
-  ],
-  [
-    "Ping",
-    0x03,
-    {
-      fields: [],
-    },
-  ],
-  ["Ack", 0x04, {}],
-  [
-    "CharacterCreateRequest",
-    0x05,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "characterObjStringify", type: "string", defaultValue: "" },
-      ],
-    },
-  ],
-  [
-    "CharacterCreateReply",
-    0x06,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "status", type: "boolean", defaultValue: 0 },
-      ],
-    },
-  ],
-  [
-    "CharacterDeleteRequest",
-    0x07,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "characterId", type: "uint64string", defaultValue: 0 },
-      ],
-    },
-  ],
-  [
-    "CharacterDeleteReply",
-    0x08,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "status", type: "boolean", defaultValue: 0 },
-      ],
-    },
-  ],
-  [
-    "UpdateZonePopulation",
-    0x09,
-    {
-      fields: [{ name: "population", type: "uint8", defaultValue: 0 }],
-    },
-  ],
-  [
-    "ZonePingRequest",
-    0x10,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "address", type: "string", defaultValue: 0 },
-      ],
-    },
-  ],
-  [
-    "ZonePingReply",
-    0x11,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "status", type: "boolean", defaultValue: 0 },
-      ],
-    },
-  ],
-  [
-    "CharacterExistRequest",
-    0x12,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "characterId", type: "uint64string", defaultValue: 0 },
-      ],
-    },
-  ],
-  [
-    "CharacterExistReply",
-    0x13,
-    {
-      fields: [
-        { name: "reqId", type: "uint32", defaultValue: 0 },
-        { name: "status", type: "boolean", defaultValue: 0 },
-      ],
-    },
-  ],
-  [
-    "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] =
-  PacketTableBuild(packets);
-
-const H1emuPackets = {
-  PacketTypes: H1emuPacketsPacketTypes,
-  Packets: H1emuPacketsPackets,
-};
-
-export class H1emuProtocol {
-  parse(data: Buffer): H1emuProtocolReadingFormat | null {
-    const packetType = data.readUInt8(0);
-    let result;
-    const packet = H1emuPackets.Packets[packetType];
-    if (packet) {
-      if (packet.schema) {
-        try {
-          result = DataSchema.parse(packet.schema, data, 1).result;
-        } catch (e) {
-          console.error(`${packet.name} : ${e}`);
-          return null;
-        }
-        return {
-          type: packet.type,
-          name: packet.name,
-          data: result,
-        };
-      } else {
-        debug("parse()", "No parser for packet " + packet.name);
-        return null;
-      }
-    } else {
-      debug("parse()", "Unknown or unhandled H1emu packet type: " + packetType);
-      return null;
-    }
-  }
-
-  pack(packetName: string, object: any): Buffer | null {
-    const packetType = H1emuPackets.PacketTypes[packetName],
-      packet = H1emuPackets.Packets[packetType];
-    let data;
-    if (packet) {
-      if (packet.schema) {
-        const packetData = DataSchema.pack(packet.schema, object);
-        if (packetData) {
-          data = Buffer.allocUnsafe(1 + packetData.length);
-          data.writeUInt8(packetType, 0);
-          packetData.data.copy(data, 1);
-        } else {
-          debug("Could not pack data schema for " + packet.name);
-          return null;
-        }
-      } else {
-        debug("pack()", "No pack function for packet " + packet.name);
-        return null;
-      }
-    } else {
-      debug("pack()", "Unknown or unhandled H1emu packet type: " + packetType);
-      return null;
-    }
-    return data;
-  }
-}
-
-exports.H1emuPackets = H1emuPackets as any;
+// ======================================================================
+//
+//   GNU GENERAL PUBLIC LICENSE
+//   Version 3, 29 June 2007
+//   copyright (C) 2020 - 2021 Quentin Gruber
+//   copyright (C) 2021 - 2023 H1emu community
+//
+//   https://github.com/QuentinGruber/h1z1-server
+//   https://www.npmjs.com/package/h1z1-server
+//
+//   Based on https://github.com/psemu/soe-network
+// ======================================================================
+
+const debug = require("debug")("H1emuProtocol");
+import DataSchema from "h1z1-dataschema";
+import { H1emuProtocolReadingFormat } from "types/protocols";
+import PacketTableBuild from "../packets/packettable";
+const packets = [
+  [
+    "SessionRequest",
+    0x01,
+    {
+      fields: [
+        { name: "serverId", type: "uint32", defaultValue: 0 },
+        { name: "h1emuVersion", type: "string", defaultValue: "" },
+      ],
+    },
+  ],
+  [
+    "SessionReply",
+    0x02,
+    {
+      fields: [{ name: "status", type: "uint8", defaultValue: 0 }],
+    },
+  ],
+  [
+    "Ping",
+    0x03,
+    {
+      fields: [],
+    },
+  ],
+  ["Ack", 0x04, {}],
+  [
+    "CharacterCreateRequest",
+    0x05,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "characterObjStringify", type: "string", defaultValue: "" },
+      ],
+    },
+  ],
+  [
+    "CharacterCreateReply",
+    0x06,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "status", type: "boolean", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "CharacterDeleteRequest",
+    0x07,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "characterId", type: "uint64string", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "CharacterDeleteReply",
+    0x08,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "status", type: "boolean", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "UpdateZonePopulation",
+    0x09,
+    {
+      fields: [{ name: "population", type: "uint8", defaultValue: 0 }],
+    },
+  ],
+  [
+    "ZonePingRequest",
+    0x10,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "address", type: "string", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "ZonePingReply",
+    0x11,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "status", type: "boolean", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "CharacterExistRequest",
+    0x12,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "characterId", type: "uint64string", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "CharacterExistReply",
+    0x13,
+    {
+      fields: [
+        { name: "reqId", type: "uint32", defaultValue: 0 },
+        { name: "status", type: "boolean", defaultValue: 0 },
+      ],
+    },
+  ],
+  [
+    "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] =
+  PacketTableBuild(packets);
+
+const H1emuPackets = {
+  PacketTypes: H1emuPacketsPacketTypes,
+  Packets: H1emuPacketsPackets,
+};
+
+export class H1emuProtocol {
+  parse(data: Buffer): H1emuProtocolReadingFormat | null {
+    const packetType = data.readUInt8(0);
+    let result;
+    const packet = H1emuPackets.Packets[packetType];
+    if (packet) {
+      if (packet.schema) {
+        try {
+          result = DataSchema.parse(packet.schema, data, 1).result;
+        } catch (e) {
+          console.error(`${packet.name} : ${e}`);
+          return null;
+        }
+        return {
+          type: packet.type,
+          name: packet.name,
+          data: result,
+        };
+      } else {
+        debug("parse()", "No parser for packet " + packet.name);
+        return null;
+      }
+    } else {
+      debug("parse()", "Unknown or unhandled H1emu packet type: " + packetType);
+      return null;
+    }
+  }
+
+  pack(packetName: string, object: any): Buffer | null {
+    const packetType = H1emuPackets.PacketTypes[packetName],
+      packet = H1emuPackets.Packets[packetType];
+    let data;
+    if (packet) {
+      if (packet.schema) {
+        const packetData = DataSchema.pack(packet.schema, object);
+        if (packetData) {
+          data = Buffer.allocUnsafe(1 + packetData.length);
+          data.writeUInt8(packetType, 0);
+          packetData.data.copy(data, 1);
+        } else {
+          debug("Could not pack data schema for " + packet.name);
+          return null;
+        }
+      } else {
+        debug("pack()", "No pack function for packet " + packet.name);
+        return null;
+      }
+    } else {
+      debug("pack()", "Unknown or unhandled H1emu packet type: " + packetType);
+      return null;
+    }
+    return data;
+  }
+}
+
+exports.H1emuPackets = H1emuPackets as any;

package/src/servers/H1emuServer/h1emuLoginServer.ts

@@ -1,58 +1,58 @@
-// ======================================================================
-//
-//   GNU GENERAL PUBLIC LICENSE
-//   Version 3, 29 June 2007
-//   copyright (C) 2020 - 2021 Quentin Gruber
-//   copyright (C) 2021 - 2023 H1emu community
-//
-//   https://github.com/QuentinGruber/h1z1-server
-//   https://www.npmjs.com/package/h1z1-server
-//
-//   Based on https://github.com/psemu/soe-network
-// ======================================================================
-
-import { H1emuClient } from "./shared/h1emuclient";
-import { H1emuServer } from "./shared/h1emuserver";
-
-export class H1emuLoginServer extends H1emuServer {
-  constructor(serverPort?: number) {
-    super(serverPort);
-    this.messageHandler = function (
-      messageType: string,
-      data: Buffer,
-      client: H1emuClient
-    ): void {
-      const packet = this._protocol.parse(data);
-      if (!packet) return;
-      switch (packet.name) {
-        case "Ping":
-          this.ping(client);
-          break;
-        case "CharacterCreateReply":
-        case "CharacterExistReply":
-        case "CharacterDeleteReply":
-        case "ClientIsAdminReply": {
-          this.emit("processInternalReq", packet, ["status"]);
-          break;
-        }
-        default:
-          this.emit("data", null, client, packet);
-          break;
-      }
-    };
-    this.ping = (client: H1emuClient) => {
-      this.updateClientLastPing(client.clientId);
-      super.ping(client);
-    };
-    this._pingTimer = setTimeout(() => {
-      for (const key in this._clients) {
-        const client = this._clients[key];
-        if (Date.now() > client.lastPing + this._pingTimeout) {
-          this.emit("disconnect", null, client, 1);
-          delete this._clients[client.clientId];
-        }
-      }
-      this._pingTimer.refresh();
-    }, this._pingTime);
-  }
-}
+// ======================================================================
+//
+//   GNU GENERAL PUBLIC LICENSE
+//   Version 3, 29 June 2007
+//   copyright (C) 2020 - 2021 Quentin Gruber
+//   copyright (C) 2021 - 2023 H1emu community
+//
+//   https://github.com/QuentinGruber/h1z1-server
+//   https://www.npmjs.com/package/h1z1-server
+//
+//   Based on https://github.com/psemu/soe-network
+// ======================================================================
+
+import { H1emuClient } from "./shared/h1emuclient";
+import { H1emuServer } from "./shared/h1emuserver";
+
+export class H1emuLoginServer extends H1emuServer {
+  constructor(serverPort?: number) {
+    super(serverPort);
+    this.messageHandler = function (
+      messageType: string,
+      data: Buffer,
+      client: H1emuClient
+    ): void {
+      const packet = this._protocol.parse(data);
+      if (!packet) return;
+      switch (packet.name) {
+        case "Ping":
+          this.ping(client);
+          break;
+        case "CharacterCreateReply":
+        case "CharacterExistReply":
+        case "CharacterDeleteReply":
+        case "ClientIsAdminReply": {
+          this.emit("processInternalReq", packet, ["status"]);
+          break;
+        }
+        default:
+          this.emit("data", null, client, packet);
+          break;
+      }
+    };
+    this.ping = (client: H1emuClient) => {
+      this.updateClientLastPing(client.clientId);
+      super.ping(client);
+    };
+    this._pingTimer = setTimeout(() => {
+      for (const key in this._clients) {
+        const client = this._clients[key];
+        if (Date.now() > client.lastPing + this._pingTimeout) {
+          this.emit("disconnect", null, client, 1);
+          delete this._clients[client.clientId];
+        }
+      }
+      this._pingTimer.refresh();
+    }, this._pingTime);
+  }
+}