Merge pull request #379 from Jameskmonger/fix-typechecks

fix: fix typing issues uncovered by typecheck

Author: SchauweM

src/engine/net/inbound-packets/npc-interaction.packet.ts

@@ -1,5 +1,4 @@
 import { logger } from '@runejs/common';
-import { DataType, Endianness, Signedness } from '@runejs/common';
 
 import { PacketData } from '@engine/net';
 import { activeWorld, World } from '@engine/world';
@@ -8,14 +7,14 @@ import { Player } from '@engine/world/actor';
 const npcInteractionPacket = (player: Player, packet: PacketData) => {
     const { buffer, packetId } = packet;
 
-    const args: { [key: number]: [ DataType, Signedness?, Endianness? ] } = {
-        63: [ 'short', 'u', 'le' ],
-        116: [ 'short', 'u', 'le' ],
-        57: [ 'short', 'u' ],
+    const packetReaders: Record<number, () => number> = {
+        63: () => buffer.get('short', 'u', 'le'),
+        116: () => buffer.get('short', 'u', 'le'),
+        57: () => buffer.get('short', 'u'),
         /*42: 'readUnsignedShortLE',
         8: 'readUnsignedShortLE'*/
     };
-    const npcIndex = buffer.get(...args[packetId]);
+    const npcIndex = packetReaders[packetId]();
 
     if (npcIndex < 0 || npcIndex > World.MAX_NPCS - 1) {
         return;

src/engine/net/inbound-packets/player-interaction.packet.ts

@@ -3,15 +3,16 @@ import { logger } from '@runejs/common';
 import { activeWorld, World } from '@engine/world';
 import { Player, playerOptions } from '@engine/world/actor';
 import { PacketData } from '@engine/net';
-import { DataType, Endianness, Signedness } from '@runejs/common';
 
 const playerInteractionPacket = (player: Player, packet: PacketData) => {
     const { buffer, packetId } = packet;
-    const args: { [key: number]: [ DataType, Signedness?, Endianness? ] } = {
-        68: [ 'short', 'u', 'le' ],
-        211: [ 'short', 'u', 'le' ]
+
+    const packetReaders: Record<number, () => number> = {
+        68: () => buffer.get('short', 'u', 'le'),
+        211: () => buffer.get('short', 'u', 'le'),
     };
-    const playerIndex = buffer.get(...args[packetId]) - 1;
+
+    const playerIndex = packetReaders[packetId]() - 1;
 
     if(playerIndex < 0 || playerIndex > World.MAX_PLAYERS - 1) {
         return;

src/engine/util/strings.ts

@@ -171,7 +171,7 @@ const VALID_CHARS = ['_', 'a', 'b', 'c', 'd',
     '*', '(', ')', '-', '+', '=', ':', ';', '.', '>', '<', ',', '"',
     '[', ']', '|', '?', '/', '`'];
 
-export function longToString(nameLong: BigInt): string {
+export function longToString(nameLong: bigint): string {
     let ac: string = '';
     while(nameLong !== BigInt(0)) {
         const l1 = nameLong;

src/plugins/objects/ladders/ladder.plugin.ts

@@ -21,10 +21,10 @@ export const action: objectInteractionActionHandler = (details) => {
                 ]))
             .then(d => {
                 d.close();
-                switch (d._action.data) {
+                switch (d.action) {
                     case 1:
                     case 2:
-                        action({ ...details, option: `climb-${(d._action.data === 1 ? 'up' : 'down')}` });
+                        action({ ...details, option: `climb-${(d.action === 1 ? 'up' : 'down')}` });
                         return;
                 }
             });

src/server/game/game-server.ts

@@ -22,10 +22,11 @@ export let serverConfig: GameServerConfig;
 export let filestore: Filestore;
 
 
-export const openGatewayServer = (host: string, port: number): void =>
+export const openGatewayServer = (host: string, port: number): void => {
     SocketServer.launch<GatewayServer>(
         'Game Gateway Server',
         host, port, socket => new GatewayServer(socket));
+};
 
 
 /**
@@ -57,6 +58,3 @@ export async function launchGameServer(): Promise<void> {
     watchSource('src/').subscribe(() => world.saveOnlinePlayers());
     watchForChanges('dist/plugins/', /[/\\]plugins[/\\]/);
 }
-
-
-