sonic-ws 1.0.0-rc.0-patch → 1.0.0-rc.2

package/README.md

@@ -25,11 +25,16 @@ Browser (Client):
 
 ### Server:
 ```js
-const wss = new SonicWSServer(
-    [CreatePacket({tag: "pong", type: PacketType.INTS_D, dataMax: 1})], // client-sent packets
-    [CreatePacket({tag: "ping", type: PacketType.INTS_D, dataMax: 1}), CreateObjPacket({tag: "data", types: [PacketType.INTS_A, PacketTypes.STRING], dataMaxes: [2, 3]})], // server-sent packets
-    { port: 1234 }
-);
+const wss = new SonicWSServer({
+    clientPackets: [
+        CreatePacket({tag: "pong", type: PacketType.INTS_D, dataMax: 1})
+    ],
+    serverPackets: [
+        CreatePacket({tag: "ping", type: PacketType.INTS_D, dataMax: 1}),
+        CreateObjPacket({tag: "data", types: [PacketType.INTS_A, PacketTypes.STRING], dataMaxes: [2, 3]})
+    ],
+    websocketOptions: { port: 1234 }
+});
 
 wss.on_connect((socket) => {
 
@@ -75,12 +80,12 @@ ws.on_close((event) => {
 
 ## KNOWN ISSUES
 
-Can't send 0 values through stuff like STRINGS; processes as [""] instead of []
-
 ## PLANNED FEATURES
 
 More data checking and better error handling
 
 Layered object packets
 
-JSDoc'ing stuff
+JSDoc'ing stuff
+
+Possibilities of nested objects; however these are inefficient to do than just a flat one

package/dist/ws/client/core/ClientCore.d.ts

@@ -1,16 +1,15 @@
 import { PacketHolder } from '../../util/PacketHolder';
-import { PacketListener } from '../../packets/PacketListener';
 export declare abstract class SonicWSCore {
     protected ws: WebSocket;
     protected listeners: {
         message: Array<(data: string) => void>;
         close: Array<(event: CloseEvent) => void>;
         event: {
-            [key: string]: Array<PacketListener>;
+            [key: string]: Array<(...data: any[]) => void>;
         };
     };
     protected preListen: {
-        [key: string]: Array<(value: string) => void>;
+        [key: string]: Array<(data: any[]) => void>;
     } | null;
     protected clientPackets: PacketHolder;
     protected serverPackets: PacketHolder;
@@ -24,11 +23,11 @@ export declare abstract class SonicWSCore {
     constructor(ws: WebSocket);
     private serverKeyHandler;
     private messageHandler;
-    protected listen(key: string, listener: PacketListener): void;
+    protected listen(key: string, listener: (data: any[]) => void): void;
     raw_onmessage(listener: (data: string) => void): void;
     raw_send(data: string): void;
     send(tag: string, ...values: any[]): void;
     on_ready(listener: () => void): void;
     on_close(listener: (event: CloseEvent) => void): void;
-    on(tag: string, listener: (value: string) => void): void;
+    on(tag: string, listener: (value: any[]) => void): void;
 }

package/dist/ws/client/core/ClientCore.js

@@ -11,7 +11,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SonicWSCore = void 0;
 var PacketHolder_1 = require("../../util/PacketHolder");
-var PacketListener_1 = require("../../packets/PacketListener");
 var CodePointUtil_1 = require("../../util/CodePointUtil");
 var PacketUtils_1 = require("../../util/PacketUtils");
 var version_1 = require("../../../version");
@@ -71,9 +70,7 @@ var SonicWSCore = /** @class */ (function () {
             // print the error to console without halting execution
             if (key == null)
                 return console.error(new Error("The server does not send the packet with tag \"".concat(tag, "\"!")));
-            var packet = _this.serverPackets.getPacket(tag);
-            var packetListener = new PacketListener_1.PacketListener(packet, listener);
-            _this.listen(tag, packetListener);
+            _this.listen(tag, listener);
         }); });
         this.preListen = null; // clear
         this.pastKeys = true;
@@ -84,7 +81,7 @@ var SonicWSCore = /** @class */ (function () {
         this.keyHandler = null;
     };
     SonicWSCore.prototype.messageHandler = function (event) {
-        var _a;
+        var _a, _b;
         var data = event.data.toString();
         this.listeners.message.forEach(function (listener) { return listener(data); });
         if (data.length < 1)
@@ -94,12 +91,16 @@ var SonicWSCore = /** @class */ (function () {
         var code = key.charCodeAt(0);
         if (code == null)
             return;
-        var result = this.serverPackets.getPacket(this.serverPackets.getTag(key)).listen(value);
+        var packet = this.serverPackets.getPacket(this.serverPackets.getTag(key));
+        var result = packet.listen(value);
         if (result == null) {
             throw new Error("An error occured with data from the server!! This is probably my fault.. make an issue at https://github.com/cutelittlelily/sonic-ws");
         }
-        var processed = result[0], isArray = result[1];
-        (_a = this.listeners.event[code]) === null || _a === void 0 ? void 0 : _a.forEach(function (l) { return l.listen(processed, isArray); });
+        var processed = result[0], flatten = result[1];
+        if (flatten)
+            (_a = this.listeners.event[code]) === null || _a === void 0 ? void 0 : _a.forEach(function (l) { return l.apply(void 0, processed); });
+        else
+            (_b = this.listeners.event[code]) === null || _b === void 0 ? void 0 : _b.forEach(function (l) { return l(processed); });
     };
     SonicWSCore.prototype.listen = function (key, listener) {
         var skey = this.serverPackets.get(key);
@@ -148,8 +149,7 @@ var SonicWSCore = /** @class */ (function () {
             return;
         }
         var packet = this.serverPackets.getPacket(tag);
-        var packetListener = new PacketListener_1.PacketListener(packet, listener);
-        this.listen(tag, packetListener);
+        this.listen(tag, listener);
     };
     return SonicWSCore;
 }());

package/dist/ws/packets/PacketProcessors.js

@@ -35,7 +35,8 @@ exports.PacketValidityProcessors = (_a = {},
         }
         return true;
     },
-    _a[PacketType_1.PacketType.INTS_C] = function (data, cap) { return data.length == cap; },
+    _a[PacketType_1.PacketType.INTS_C] = function (data, cap) { return data.length <= cap; },
+    _a[PacketType_1.PacketType.UINTS_C] = function (data, cap) { return data.length <= cap; },
     _a[PacketType_1.PacketType.INTS_D] = function (data, cap) { return data.length > 0 && ((0, CodePointUtil_1.processCharCodes)(data).length - 1) % data[0].charCodeAt(0) <= cap; },
     _a[PacketType_1.PacketType.INTS_A] = LEN_DELIMIT,
     _a[PacketType_1.PacketType.DECIMALS] = function (data, cap) {
@@ -78,6 +79,7 @@ exports.PacketReceiveProcessors = (_b = {},
         return (0, CodePointUtil_1.processCharCodes)(data).map(function (code) { return pkg.values[code]; });
     },
     _b[PacketType_1.PacketType.INTS_C] = function (data) { return (0, CodePointUtil_1.processCharCodes)(data).map(CodePointUtil_1.fromSignedINT_C); },
+    _b[PacketType_1.PacketType.UINTS_C] = function (data) { return (0, CodePointUtil_1.processCharCodes)(data); },
     _b[PacketType_1.PacketType.INTS_D] = function (data) { return (0, ArrayUtil_1.splitArray)((0, CodePointUtil_1.processCharCodes)(data.substring(1)), data.charCodeAt(0)).map(function (arr) { return String.fromCharCode.apply(String, arr); }).map(CodePointUtil_1.deconvertINT_D); },
     _b[PacketType_1.PacketType.INTS_A] = function (data) {
         var numbers = [];
@@ -130,6 +132,13 @@ exports.PacketSendProcessors = (_c = {},
         }
         return numbers.map(CodePointUtil_1.stringedINT_C).join("");
     },
+    _c[PacketType_1.PacketType.UINTS_C] = function () {
+        var numbers = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            numbers[_i] = arguments[_i];
+        }
+        return String.fromCharCode.apply(String, numbers);
+    },
     _c[PacketType_1.PacketType.INTS_D] = function () {
         var numbers = [];
         for (var _i = 0; _i < arguments.length; _i++) {

package/dist/ws/packets/PacketType.d.ts

@@ -10,12 +10,14 @@ export declare enum PacketType {
     ENUMS = 3,
     /** One or more numbers from -27,648 to 27,647 */
     INTS_C = 4,
+    /** One or more positive numbers from 0 to 55,295 */
+    UINTS_C = 5,
     /** One or more numbers of any size. Similar maximum size will produce maximum efficiency */
-    INTS_D = 5,
+    INTS_D = 6,
     /** One or more numbers of any size. More efficient for differently sized numbers, worse than INTS_D for similar sized numbers. */
-    INTS_A = 6,
+    INTS_A = 7,
     /** One or more decimal numbers of any size */
-    DECIMALS = 7,
+    DECIMALS = 8,
     /** One or more true/false */
-    BOOLEANS = 8
+    BOOLEANS = 9
 }

package/dist/ws/packets/PacketType.js

@@ -15,12 +15,14 @@ var PacketType;
     PacketType[PacketType["ENUMS"] = 3] = "ENUMS";
     /** One or more numbers from -27,648 to 27,647 */
     PacketType[PacketType["INTS_C"] = 4] = "INTS_C";
+    /** One or more positive numbers from 0 to 55,295 */
+    PacketType[PacketType["UINTS_C"] = 5] = "UINTS_C";
     /** One or more numbers of any size. Similar maximum size will produce maximum efficiency */
-    PacketType[PacketType["INTS_D"] = 5] = "INTS_D";
+    PacketType[PacketType["INTS_D"] = 6] = "INTS_D";
     /** One or more numbers of any size. More efficient for differently sized numbers, worse than INTS_D for similar sized numbers. */
-    PacketType[PacketType["INTS_A"] = 6] = "INTS_A";
+    PacketType[PacketType["INTS_A"] = 7] = "INTS_A";
     /** One or more decimal numbers of any size */
-    PacketType[PacketType["DECIMALS"] = 7] = "DECIMALS";
+    PacketType[PacketType["DECIMALS"] = 8] = "DECIMALS";
     /** One or more true/false */
-    PacketType[PacketType["BOOLEANS"] = 8] = "BOOLEANS";
+    PacketType[PacketType["BOOLEANS"] = 9] = "BOOLEANS";
 })(PacketType || (exports.PacketType = PacketType = {}));

package/dist/ws/packets/Packets.d.ts

@@ -16,8 +16,9 @@ export declare class Packet {
     processReceive: (data: string) => any;
     processSend: (data: any[]) => string;
     validate: (data: string) => boolean;
-    constructor(tag: string, schema: PacketSchema, client: boolean);
-    listen(value: string): [processed: any, isArray: boolean] | null;
+    customValidator: ((...values: any[]) => boolean) | null;
+    constructor(tag: string, schema: PacketSchema, customValidator: ((values: any[]) => boolean) | null, client: boolean);
+    listen(value: string): [processed: any, flatten: boolean] | null;
     serialize(): string;
     static deserialize(text: string, offset: number, client: boolean): [packet: Packet, offset: number];
     static deserializeAll(text: string, client: boolean): Packet[];

package/dist/ws/packets/Packets.js

@@ -7,7 +7,7 @@ var CodePointUtil_1 = require("../util/CodePointUtil");
 var PacketProcessors_1 = require("./PacketProcessors");
 var PacketType_1 = require("./PacketType");
 var Packet = /** @class */ (function () {
-    function Packet(tag, schema, client) {
+    function Packet(tag, schema, customValidator, client) {
         var _this = this;
         this.tag = tag;
         if (schema.object) {
@@ -48,24 +48,35 @@ var Packet = /** @class */ (function () {
         }
         this.processReceive = function (data) { return _this.receiveProcessor(data, _this.dataMax, _this, 0); };
         this.validate = client ? function () { return true; } : function (data) { return _this.validifier(data, _this.dataMax, _this, 0); };
+        this.customValidator = customValidator;
         this.enumData = schema.enumData;
         this.dontSpread = schema.dontSpread;
     }
     Packet.prototype.listen = function (value) {
-        var processed, isArray;
         try {
             if (!this.validate(value))
                 return null;
-            processed = this.processReceive(value);
-            isArray = Array.isArray(processed);
+            var processed = this.processReceive(value);
+            var isArray = Array.isArray(processed);
             if (isArray && processed.length < this.dataMin)
                 return null;
+            var flatten = isArray && !this.dontSpread;
+            if (this.customValidator != null) {
+                if (flatten) {
+                    if (!this.customValidator.apply(this, processed))
+                        return null;
+                }
+                else {
+                    if (!this.customValidator(processed))
+                        return null;
+                }
+            }
+            return [processed, flatten];
         }
         catch (err) {
             console.error("There was an error processing the packet! This is probably my fault... report at https://github.com/cutelittlelily/sonic-ws", err);
             return null;
         }
-        return [processed, isArray];
     };
     Packet.prototype.serialize = function () {
         // spread flag; ETX for "2", STX for "1", avoid NULL for delimiting
@@ -134,7 +145,7 @@ var Packet = /** @class */ (function () {
             var tagLength_1 = text.charCodeAt(tagStart_1 - 1) - 1; // tag length is right behind tag, subtracting 1 to reverse
             var tag_1 = text.substring(tagStart_1, tagStart_1 + tagLength_1); // tag is tag length long. yeah
             return [
-                new Packet(tag_1, PacketSchema.object(finalTypes, dataMaxes, dataMins, dontSpread), client),
+                new Packet(tag_1, PacketSchema.object(finalTypes, dataMaxes, dataMins, dontSpread), null, client),
                 (offset - beginningOffset) + 1 + size + size + size + tagLength_1
             ];
         }
@@ -147,7 +158,7 @@ var Packet = /** @class */ (function () {
         var tagLength = text.charCodeAt(tagStart) - 1;
         var tag = text.substring(tagStart + 1, tagStart + 1 + tagLength);
         return [
-            new Packet(tag, PacketSchema.single(finalType, dataMax, dataMin, dontSpread), client),
+            new Packet(tag, PacketSchema.single(finalType, dataMax, dataMin, dontSpread), null, client),
             (offset - beginningOffset) + 1 + tagLength
         ];
     };

package/dist/ws/server/SonicWSConnection.d.ts

@@ -19,7 +19,7 @@ export declare class SonicWSConnection {
     id: number;
     /** The indexed character of the connection. Smaller data packet in strings. */
     code: string;
-    constructor(socket: WS.WebSocket, host: SonicWSServer, id: number, handshakePacket: string | null);
+    constructor(socket: WS.WebSocket, host: SonicWSServer, id: number, handshakePacket: string | null, rateLimit: number);
     private parseData;
     private handshakeHandler;
     private messageHandler;

package/dist/ws/server/SonicWSConnection.js

@@ -44,14 +44,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SonicWSConnection = void 0;
 var WS = __importStar(require("ws"));
-var PacketListener_1 = require("../packets/PacketListener");
 var CodePointUtil_1 = require("../util/CodePointUtil");
 var PacketUtils_1 = require("../util/PacketUtils");
 var SonicWSConnection = /** @class */ (function () {
-    function SonicWSConnection(socket, host, id, handshakePacket) {
+    function SonicWSConnection(socket, host, id, handshakePacket, rateLimit) {
         var _this = this;
         this.print = false;
-        this.rateLimit = 50;
         this.received = 0;
         this.timers = [];
         this.messageLambda = function (data) { return _this.messageHandler(_this.parseData(data)); };
@@ -87,6 +85,7 @@ var SonicWSConnection = /** @class */ (function () {
                 clearInterval(_this.rateLimitInterval);
             _this.timers.forEach(clearTimeout);
         });
+        this.rateLimit = rateLimit;
         if (this.rateLimit != 0)
             this.rateLimitInterval = setInterval(function () { return _this.received = 0; }, 1000);
     }
@@ -128,18 +127,18 @@ var SonicWSConnection = /** @class */ (function () {
         if (data == null)
             return;
         var tag = data[0], value = data[1];
-        var listened = this.host.clientPackets.getPacket(tag).listen(value);
+        var packet = this.host.clientPackets.getPacket(tag);
+        var listened = packet.listen(value);
         // if invalid then ignore it
         if (listened == null) {
             this.socket.close(4003);
             return;
         }
-        var processed = listened[0], isArray = listened[1];
-        for (var _i = 0, _a = this.listeners[tag]; _i < _a.length; _i++) {
-            var listener = _a[_i];
-            listener.listen(processed, isArray);
-        }
-        ;
+        var processed = listened[0], flatten = listened[1];
+        if (flatten)
+            this.listeners[tag].forEach(function (l) { return l.apply(void 0, processed); });
+        else
+            this.listeners[tag].forEach(function (l) { return l(processed); });
     };
     SonicWSConnection.prototype.hideNewLines = function (str) {
         return str.split("\n").join("☺");
@@ -190,7 +189,7 @@ var SonicWSConnection = /** @class */ (function () {
         var packet = this.host.clientPackets.getPacket(tag);
         if (!this.listeners[tag])
             this.listeners[tag] = [];
-        this.listeners[tag].push(new PacketListener_1.PacketListener(packet, listener));
+        this.listeners[tag].push(listener);
     };
     /**
      * Sends a packet with the tag and values

package/dist/ws/server/SonicWSServer.js

@@ -74,7 +74,7 @@ var SonicWSServer = /** @class */ (function () {
         var s_serverPackets = this.serverPackets.serialize();
         var keyData = "SWS" + version_1.VERSION_CHAR + s_clientPackets + CodePointUtil_1.NULL + s_serverPackets;
         this.wss.on('connection', function (socket) {
-            var sonicConnection = new SonicWSConnection_1.SonicWSConnection(socket, _this, _this.generateSocketID(), _this.handshakePacket);
+            var sonicConnection = new SonicWSConnection_1.SonicWSConnection(socket, _this, _this.generateSocketID(), _this.handshakePacket, _this.rateLimit);
             // send tags to the client so it doesn't have to hard code them in
             socket.send(keyData + CodePointUtil_1.NULL + String.fromCharCode(_this.rateLimit));
             _this.connections.push(sonicConnection);

package/dist/ws/util/CodePointUtil.js

@@ -54,7 +54,7 @@ function toSignedINT_C(number) {
 }
 // just conversion and checks lol
 function stringedINT_C(number) {
-    if (number >= exports.NEGATIVE_C || number < -exports.NEGATIVE_C - 1)
+    if (number > exports.NEGATIVE_C || number < -exports.NEGATIVE_C - 1)
         throw new Error("INT_C Numbers must be within range -".concat(exports.NEGATIVE_C + 1, " and ").concat(exports.NEGATIVE_C));
     return String.fromCharCode(toSignedINT_C(number));
 }

package/dist/ws/util/PacketUtils.d.ts

@@ -16,6 +16,8 @@ export type SinglePacketSettings = {
     dataMin?: number;
     /** If the values should be kept in an array or spread along the listener; defaults to false */
     dontSpread?: boolean;
+    /** A validation function that is called whenever data is received. Return true for success, return false to kick socket. */
+    validator?: ((values: any[]) => boolean) | null;
 };
 /** Settings for multi-typed packets */
 export type MultiPacketSettings = {
@@ -29,6 +31,8 @@ export type MultiPacketSettings = {
     dataMins?: number[];
     /** If the values should be kept in an array or spread along the listener; defaults to false */
     dontSpread?: boolean;
+    /** A validation function that is called whenever data is received. Return true for success, return false to kick socket. */
+    validator?: ((values: any[]) => boolean) | null;
 };
 /** Settings for single-typed enum packets */
 export type EnumPacketSettings = {
@@ -44,6 +48,8 @@ export type EnumPacketSettings = {
     dataMin?: number;
     /** If the values should be kept in an array or spread along the listener; defaults to false */
     dontSpread?: boolean;
+    /** A validation function that is called whenever data is received. Return true for success, return false to kick socket. */
+    validator?: ((values: any[]) => boolean) | null;
 };
 /**
  * Creates a structure for a simple single-typed packet.

package/dist/ws/util/PacketUtils.js

@@ -23,6 +23,19 @@ function emitPacket(packets, send, tag, values) {
         if (found)
             console.warn("Passing an array will result in undefined behavior (".concat(JSON.stringify(found), "). Spread the array with ...arr"));
     }
+    else {
+        // also map non arrays to arrays to keep some code cleaner
+        values = values.map(function (x) { return !Array.isArray(x) ? [x] : x; });
+        var dataMins = packet.dataMin;
+        var dataMaxes = packet.dataMax;
+        for (var i = 0; i < dataMins.length; i++) {
+            // these will be the same length
+            if (values[i].length < dataMins[i])
+                throw new Error("Section ".concat(i + 1, " of packet \"").concat(tag, "\" requires at least ").concat(dataMins[i], " values!"));
+            if (values[i].length > dataMaxes[i])
+                throw new Error("Section ".concat(i + 1, " of packet \"").concat(tag, "\" only allows ").concat(dataMaxes[i], " values!"));
+        }
+    }
     send(code + (values.length > 0 ? packet.processSend(values) : ""));
 }
 function isValidType(type) {
@@ -55,13 +68,13 @@ function clampDataMin(dataMin, dataMax) {
  * @throws {Error} If the `type` is invalid.
  */
 function CreatePacket(settings) {
-    var tag = settings.tag, _a = settings.type, type = _a === void 0 ? PacketType_1.PacketType.NONE : _a, _b = settings.dataMax, dataMax = _b === void 0 ? 1 : _b, dataMin = settings.dataMin, _c = settings.dontSpread, dontSpread = _c === void 0 ? false : _c;
+    var tag = settings.tag, _a = settings.type, type = _a === void 0 ? PacketType_1.PacketType.NONE : _a, _b = settings.dataMax, dataMax = _b === void 0 ? 1 : _b, dataMin = settings.dataMin, _c = settings.dontSpread, dontSpread = _c === void 0 ? false : _c, _d = settings.validator, validator = _d === void 0 ? null : _d;
     if (dataMin == undefined)
         dataMin = type == PacketType_1.PacketType.NONE ? 0 : dataMax;
     if (!isValidType(type)) {
         throw new Error("Invalid packet type: ".concat(type));
     }
-    return new Packets_1.Packet(tag, Packets_1.PacketSchema.single(type, clampDataMax(dataMax), clampDataMin(dataMin, dataMax), dontSpread), false);
+    return new Packets_1.Packet(tag, Packets_1.PacketSchema.single(type, clampDataMax(dataMax), clampDataMin(dataMin, dataMax), dontSpread), validator, false);
 }
 /**
  * Creates a structure for an object (multi-typed) packet.
@@ -71,7 +84,7 @@ function CreatePacket(settings) {
  * @throws {Error} If any type in `types` is invalid.
  */
 function CreateObjPacket(settings) {
-    var tag = settings.tag, types = settings.types, dataMaxes = settings.dataMaxes, dataMins = settings.dataMins, _a = settings.dontSpread, dontSpread = _a === void 0 ? false : _a;
+    var tag = settings.tag, types = settings.types, dataMaxes = settings.dataMaxes, dataMins = settings.dataMins, _a = settings.dontSpread, dontSpread = _a === void 0 ? false : _a, _b = settings.validator, validator = _b === void 0 ? null : _b;
     var invalid = types.find(function (type) { return !isValidType(type); });
     if (invalid) {
         throw new Error("Invalid packet type: ".concat(invalid));
@@ -82,7 +95,7 @@ function CreateObjPacket(settings) {
         dataMins = Array.from({ length: types.length }).map(function (_, i) { return dataMaxes[i]; });
     var clampedDataMaxes = dataMaxes.map(clampDataMax);
     var clampedDataMins = dataMins.map(function (m, i) { return types[i] == PacketType_1.PacketType.NONE ? 0 : clampDataMin(m, clampedDataMaxes[i]); });
-    return new Packets_1.Packet(tag, Packets_1.PacketSchema.object(types, clampedDataMaxes, clampedDataMins, dontSpread), false);
+    return new Packets_1.Packet(tag, Packets_1.PacketSchema.object(types, clampedDataMaxes, clampedDataMins, dontSpread), validator, false);
 }
 /**
  * Creates and defines an enum packet. This can be used to create an enum-based packet
@@ -91,12 +104,13 @@ function CreateObjPacket(settings) {
  * @returns The constructed packet structure data.
  */
 function CreateEnumPacket(settings) {
-    var packetTag = settings.packetTag, enumTag = settings.enumTag, values = settings.values, _a = settings.dataMax, dataMax = _a === void 0 ? 1 : _a, _b = settings.dataMin, dataMin = _b === void 0 ? 0 : _b, _c = settings.dontSpread, dontSpread = _c === void 0 ? false : _c;
+    var packetTag = settings.packetTag, enumTag = settings.enumTag, values = settings.values, _a = settings.dataMax, dataMax = _a === void 0 ? 1 : _a, _b = settings.dataMin, dataMin = _b === void 0 ? 0 : _b, _c = settings.dontSpread, dontSpread = _c === void 0 ? false : _c, _d = settings.validator, validator = _d === void 0 ? null : _d;
     return CreatePacket({
         tag: packetTag,
         type: (0, EnumHandler_1.DefineEnum)(enumTag, values),
         dataMax: dataMax,
         dataMin: dataMin,
-        dontSpread: dontSpread
+        dontSpread: dontSpread,
+        validator: validator
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonic-ws",
-  "version": "1.0.0-rc.0-patch",
+  "version": "1.0.0-rc.2",
   "description": "A bandwidth efficient websocket library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/ws/packets/PacketListener.d.ts

@@ -1,7 +0,0 @@
-import { Packet } from "./Packets";
-export declare class PacketListener {
-    private listener;
-    private packet;
-    constructor(packet: Packet, listener: (...data: any[]) => void);
-    listen(processed: any, isArray: boolean): boolean;
-}

package/dist/ws/packets/PacketListener.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PacketListener = void 0;
-var PacketListener = /** @class */ (function () {
-    function PacketListener(packet, listener) {
-        this.listener = listener;
-        this.packet = packet;
-    }
-    PacketListener.prototype.listen = function (processed, isArray) {
-        if (isArray && !this.packet.dontSpread)
-            this.listener.apply(this, processed);
-        else
-            this.listener(processed);
-        return true;
-    };
-    return PacketListener;
-}());
-exports.PacketListener = PacketListener;