Fixing 255/255 issue and 1.1.1 bump

Author: Tynarus

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@runejs/update-server",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "RuneJS Game Update Server",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package.json

@@ -1,7 +1,7 @@
 import { logger } from '@runejs/core';
 import { ByteBuffer } from '@runejs/core/buffer';
 import { openServer, SocketConnectionHandler, parseServerConfig } from '@runejs/core/net';
-import { Filestore, readDataChunk, readIndexedDataChunk } from '@runejs/filestore';
+import { Filestore, readIndexedDataChunk } from '@runejs/filestore';
 import { Socket } from 'net';
 import * as CRC32 from 'crc-32';
 
@@ -50,9 +50,9 @@ class UpdateServerConnection extends SocketConnectionHandler {
                 break;
             case ConnectionStage.ACTIVE:
                 while(buffer.readable >= 4) {
-                    const type = buffer.get('BYTE', 'UNSIGNED');
-                    const index = buffer.get('BYTE', 'UNSIGNED');
-                    const file = buffer.get('SHORT', 'UNSIGNED');
+                    const type = buffer.get('byte', 'u');
+                    const index = buffer.get('byte', 'u');
+                    const file = buffer.get('short', 'u');
 
                     switch(type) {
                         case 0: // queue
@@ -86,13 +86,17 @@ class UpdateServerConnection extends SocketConnectionHandler {
     }
 
     private generateFile(index: number, file: number): Buffer {
-        let cacheFile: ByteBuffer | any; // @todo remove any when cache parser is using @runejs/core
-
-        if(index === 255 && file === 255) {
-            cacheFile = new ByteBuffer(this.updateServer.crcTable.length);
-            this.updateServer.crcTable.copy(cacheFile, 0, 0);
-        } else {
-            cacheFile = this.updateServer.filestore.getIndex(index)?.getFile(file)?.content;
+        let cacheFile: ByteBuffer;
+
+        try {
+            if(index === 255 && file === 255) {
+                cacheFile = new ByteBuffer(this.updateServer.crcTable.length);
+                this.updateServer.crcTable.copy(cacheFile, 0, 0);
+            } else {
+                cacheFile = readIndexedDataChunk(file, index, this.updateServer.filestore.channels).dataFile;
+            }
+        } catch(error) {
+            logger.warn(`Unable to load filestore file for update server request`, index, file);
         }
 
         if(!cacheFile || cacheFile.length === 0) {