sonic-ws 1.0.0-beta.1 → 1.0.0-beta.2

package/bundled/SonicWS_bundle.js

@@ -0,0 +1 @@
+(()=>{"use strict";function t(t,e){return function(t,e,r){if(r||2===arguments.length)for(var n,i=0,o=e.length;i<o;i++)!n&&i in e||(n||(n=Array.prototype.slice.call(e,0,i)),n[i]=e[i]);return t.concat(n||Array.prototype.slice.call(e))}([],Array(Math.ceil(t.length/e)),!0).map((function(r,n){return t.slice(n*e,n*e+e)}))}var e,r,n,i,o,s=String.fromCharCode(0),a=Math.floor(27647.5),c=a+1,u=[];function h(t){return t.split("").map((function(t){return t.charCodeAt(0)}))}function f(t){return t<a?t:-t+a}function l(t){if(t>=a||t<-a-1)throw new Error("INT_C Numbers must be within range -".concat(a+1," and ").concat(a));return String.fromCharCode(function(t){return t<0?-t+a:t}(t))}function p(t){if(0==t)return 1;for(var e=1,r=c;t>r;)e++,r*=c;return e}function d(t,e){if(0==t)return s;var r=t<0;t=Math.abs(t);for(var n="",i=0;i<e-1;i++){var o=Math.pow(c,e-i-1),u=Math.floor(t/o);n+=String.fromCharCode(u),t-=u*o}return n+=String.fromCharCode(t%c),r?h(n).map((function(t){return String.fromCharCode(t>0?t+a:t)})).join(""):n}function g(t){return h(t).reduce((function(t,e,r,n){return t+f(e)*function(t){var e;return null!==(e=u[t])&&void 0!==e?e:u[t]=Math.pow(c,t)}(n.length-r-1)}),0)}new TextEncoder,(o=i||(i={}))[o.NONE=0]="NONE",o[o.RAW=1]="RAW",o[o.STRING=1]="STRING",o[o.INTS_C=2]="INTS_C",o[o.INTS_D=3]="INTS_D",o[o.DECIMAL=4]="DECIMAL",o[o.BOOLEAN=6]="BOOLEAN";var y=((e={})[i.NONE]=function(t){return""==t},e[i.RAW]=function(){return!0},e[i.INTS_C]=function(t,e){return t.length==e},e[i.INTS_D]=function(t,e){return t.length>0&&h(t).length%t[0].charCodeAt(0)+1<=e},e[i.DECIMAL]=function(t,e){return t.length>0&&h(t).length%t[0].charCodeAt(0)*2+1<=e},e[i.BOOLEAN]=function(t){return t==s||""==t},e),v=((r={})[i.NONE]=function(t){return""},r[i.RAW]=function(t){return t},r[i.INTS_C]=function(t){return h(t).map(f)},r[i.INTS_D]=function(e){return t(h(e.substring(1)),e[0].charCodeAt(0)).map((function(t){return String.fromCharCode.apply(String,t)})).map(g)},r[i.DECIMAL]=function(e){var r=h(e),n=r.shift(),i=t(r,n).map((function(t){return String.fromCharCode.apply(String,t)})).map(g);return parseFloat(i[0]+"."+i[1])},r[i.BOOLEAN]=function(t){return t==s},r),C=((n={})[i.NONE]=function(t){return""},n[i.RAW]=function(t){return t.toString()},n[i.INTS_C]=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];return t.map(l).join("")},n[i.INTS_D]=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var r=t.reduce((function(t,e){return Math.max(t,p(e))}),1),n=t.map((function(t){return d(t,r)})).join("");return String.fromCharCode(r)+n},n[i.DECIMAL]=function(t){var e=t.toString().split("."),r=parseFloat(e[0])||0,n=e.length>1&&parseFloat(e[1])||0,i=Math.max(p(r),p(n));return String.fromCharCode(i)+d(r,i)+d(n,i)},n[i.BOOLEAN]=function(t){return t?s:""},n),S=function(){function t(t,e,r,n){this.tag=t,this.type=e,this.dataCap=r,this.dontSpread=n}return t.prototype.serialize=function(){return"".concat(this.dontSpread?1:0).concat(String.fromCharCode(this.dataCap+1)).concat(String.fromCharCode(this.type+1)).concat(String.fromCharCode(this.tag.length+1)).concat(this.tag)},t.deserialize=function(e,r){var n="1"==e[r],i=e.charCodeAt(r+1)-1,o=e.charCodeAt(r+2)-1,s=e.charCodeAt(r+3)-1;return[new t(e.substring(r+4,r+4+s),o,i,n),s]},t.deserializeAll=function(t){for(var e=[],r=0;r<t.length;){var n=this.deserialize(t,r),i=n[0],o=n[1];e.push(i),r+=4+o}return e},t}(),m=function(){function t(t){this.key=1,this.keys={},this.tags={},this.packets=t,this.packetMap={},this.createPackets(t)}return t.prototype.createKey=function(t){t.includes(",")?console.log('Tag "'.concat(t,'" is invalid; keys cannot contain commas.')):(this.keys[t]=this.key,this.tags[this.key]=t,this.key++)},t.prototype.createPackets=function(t){for(var e=0,r=t;e<r.length;e++){var n=r[e];this.createKey(n.tag),this.packetMap[n.tag]=n}},t.prototype.get=function(t){return this.keys[t]},t.prototype.getChar=function(t){return String.fromCharCode(this.get(t))},t.prototype.getPacket=function(t){return this.packetMap[t]},t.prototype.has=function(t){return null!=this.tags[t.charCodeAt(0)]},t.prototype.getKeys=function(){return this.keys},t.prototype.serialize=function(){return this.packets.map((function(t){return t.serialize()})).join(",")},t.empty=function(){return new t([])},t}(),w=function(){function t(t,e){this.processor=v[t.type],this.validifier=y[t.type],this.listener=e,this.dontSpread=t.dontSpread,this.dataCap=t.dataCap}return t.prototype.listen=function(t){try{if(!this.validifier(t,this.dataCap))return!1;var e=this.processor(t);return Array.isArray(e)&&!this.dontSpread?this.listener.apply(this,e):this.listener(e),!0}catch(t){return!1}},t}();function k(t,e,r){for(var n=[],i=3;i<arguments.length;i++)n[i-3]=arguments[i];var o=t.getChar(r);if(null==o)throw new Error('Tag "'.concat(r,'" has not been created!'));var s=t.getPacket(r);if(n.length>s.dataCap)throw new Error('Packet "'.concat(r,'" only allows ').concat(s.dataCap," values!"));e(o+C[s.type].apply(C,n))}var A,E,N=function(){function t(t){var e=this;this.clientPackets=m.empty(),this.serverPackets=m.empty(),this.ws=t,this.listeners={message:[],close:[],event:{}},this.preListen={},this.keyHandler=function(t){return e.serverKeyHandler(t)},this.ws.addEventListener("message",this.keyHandler),this.ws.addEventListener("close",(function(t){e.listeners.close.forEach((function(e){return e(t)}))}))}return t.prototype.serverKeyHandler=function(t){var e=this,r=t.data.toString();if(!r.startsWith("SWS"))throw this.ws.close(),new Error("The server requested is not a Sonic WS server.");var n=r.charCodeAt(3);if(0!=n)throw this.ws.close(),new Error("Version mismatch: ".concat(n>0?"client":"server"," is outdated (server: ").concat(n,", client: ").concat(0,")"));var i=r.substring(4).split(s),o=i[0],a=i[1];this.clientPackets.createPackets(S.deserializeAll(o)),this.serverPackets.createPackets(S.deserializeAll(a)),Object.keys(this.preListen).forEach((function(t){return e.preListen[t].forEach((function(r){var n=e.serverPackets.getPacket(t),i=new w(n,r);e.listen(t,i)}))})),this.ws.removeEventListener("message",this.keyHandler),this.ws.addEventListener("message",(function(t){return e.messageHandler(t)}))},t.prototype.messageHandler=function(t){var e,r=t.data.toString();if(this.listeners.message.forEach((function(t){return t(r)})),!(r.length<1)){var n=r.substring(0,1),i=r.substring(1),o=n.charCodeAt(0);null!=o&&(null===(e=this.listeners.event[o])||void 0===e||e.forEach((function(t){return t.listen(i)})))}},t.prototype.listen=function(t,e){var r=this.serverPackets.get(t);r?(this.listeners.event[r]||(this.listeners.event[r]=[]),this.listeners.event[r].push(e)):console.log("Key is not available on server: "+t)},t.prototype.raw_onmessage=function(t){this.listeners.message.push(t)},t.prototype.raw_send=function(t){this.ws.send(t)},t.prototype.send=function(t){for(var e=this,r=[],n=1;n<arguments.length;n++)r[n-1]=arguments[n];k.apply(void 0,function(t,e,r){if(r||2===arguments.length)for(var n,i=0,o=e.length;i<o;i++)!n&&i in e||(n||(n=Array.prototype.slice.call(e,0,i)),n[i]=e[i]);return t.concat(n||Array.prototype.slice.call(e))}([this.clientPackets,function(t){return e.raw_send(t)},t],r,!1))},t.prototype.on_ready=function(t){this.ws.readyState===WebSocket.OPEN?t():this.ws.addEventListener("open",t)},t.prototype.on_close=function(t){this.listeners.close.push(t)},t.prototype.on=function(t,e){if(this.ws.readyState!==WebSocket.OPEN)return this.preListen[t]||(this.preListen[t]=[]),void this.preListen[t].push(e);var r=this.serverPackets.getPacket(t),n=new w(r,e);this.listen(t,n)},t}(),_=(A=function(t,e){return A=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])},A(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function r(){this.constructor=t}A(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)});window.SonicWS=((E=function(t){function e(e,r){var n=new WebSocket(e,r);return t.call(this,n)||this}return _(e,t),e}(N)).PacketType=i,E)})();

package/dist/index.d.ts

@@ -2,3 +2,4 @@ export { SonicWS } from './ws/client/node/ClientNode';
 export { SonicWSConnection } from './ws/server/SonicWSConnection';
 export { SonicWSServer } from './ws/server/SonicWSServer';
 export { PacketType } from './ws/packets/PacketType';
+export { CreatePacket } from './ws/util/PacketUtils';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PacketType = exports.SonicWSServer = exports.SonicWSConnection = exports.SonicWS = void 0;
+exports.CreatePacket = exports.PacketType = exports.SonicWSServer = exports.SonicWSConnection = exports.SonicWS = void 0;
 var ClientNode_1 = require("./ws/client/node/ClientNode");
 Object.defineProperty(exports, "SonicWS", { enumerable: true, get: function () { return ClientNode_1.SonicWS; } });
 var SonicWSConnection_1 = require("./ws/server/SonicWSConnection");
@@ -9,3 +9,5 @@ var SonicWSServer_1 = require("./ws/server/SonicWSServer");
 Object.defineProperty(exports, "SonicWSServer", { enumerable: true, get: function () { return SonicWSServer_1.SonicWSServer; } });
 var PacketType_1 = require("./ws/packets/PacketType");
 Object.defineProperty(exports, "PacketType", { enumerable: true, get: function () { return PacketType_1.PacketType; } });
+var PacketUtils_1 = require("./ws/util/PacketUtils");
+Object.defineProperty(exports, "CreatePacket", { enumerable: true, get: function () { return PacketUtils_1.CreatePacket; } });

package/dist/version.d.ts

@@ -0,0 +1 @@
+export declare const VERSION = 0;

package/dist/version.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VERSION = void 0;
+exports.VERSION = 0;

package/dist/ws/KeyHolder.d.ts

@@ -1,9 +1,18 @@
-export declare class KeyHolder {
+import { Packet } from "./packets/PacketType";
+export declare class PacketHolder {
     private key;
-    keys: Record<string, number>;
-    constructor(keys: string[]);
+    private keys;
+    private tags;
+    private packetMap;
+    private packets;
+    constructor(packets: Packet[]);
     createKey(tag: string): void;
-    createKeys(tags: string[]): void;
-    get(key: string): number;
-    getChar(key: string): string;
+    createPackets(packets: Packet[]): void;
+    get(tag: string): number;
+    getChar(tag: string): string;
+    getPacket(tag: string): Packet;
+    has(data: string): boolean;
+    getKeys(): Record<string, number>;
+    serialize(): string;
+    static empty(): PacketHolder;
 }

package/dist/ws/KeyHolder.js

@@ -1,32 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyHolder = void 0;
-var KeyHolder = /** @class */ (function () {
-    function KeyHolder(keys) {
+exports.PacketHolder = void 0;
+var PacketHolder = /** @class */ (function () {
+    function PacketHolder(packets) {
         this.key = 1;
         this.keys = {};
-        this.createKeys(keys);
+        this.tags = {};
+        this.packets = packets;
+        this.packetMap = {};
+        this.createPackets(packets);
     }
-    KeyHolder.prototype.createKey = function (tag) {
+    PacketHolder.prototype.createKey = function (tag) {
         if (tag.includes(",")) {
             console.log("Tag \"".concat(tag, "\" is invalid; keys cannot contain commas."));
             return;
         }
         this.keys[tag] = this.key;
+        this.tags[this.key] = tag;
         this.key++;
     };
-    KeyHolder.prototype.createKeys = function (tags) {
-        for (var _i = 0, tags_1 = tags; _i < tags_1.length; _i++) {
-            var tag = tags_1[_i];
-            this.createKey(tag);
+    PacketHolder.prototype.createPackets = function (packets) {
+        for (var _i = 0, packets_1 = packets; _i < packets_1.length; _i++) {
+            var packet = packets_1[_i];
+            this.createKey(packet.tag);
+            this.packetMap[packet.tag] = packet;
         }
     };
-    KeyHolder.prototype.get = function (key) {
-        return this.keys[key];
+    PacketHolder.prototype.get = function (tag) {
+        return this.keys[tag];
     };
-    KeyHolder.prototype.getChar = function (key) {
-        return String.fromCharCode(this.get(key));
+    PacketHolder.prototype.getChar = function (tag) {
+        return String.fromCharCode(this.get(tag));
     };
-    return KeyHolder;
+    PacketHolder.prototype.getPacket = function (tag) {
+        return this.packetMap[tag];
+    };
+    PacketHolder.prototype.has = function (data) {
+        return this.tags[data.charCodeAt(0)] != null;
+    };
+    PacketHolder.prototype.getKeys = function () {
+        return this.keys;
+    };
+    PacketHolder.prototype.serialize = function () {
+        return this.packets.map(function (p) { return p.serialize(); }).join(",");
+    };
+    PacketHolder.empty = function () {
+        return new PacketHolder([]);
+    };
+    return PacketHolder;
 }());
-exports.KeyHolder = KeyHolder;
+exports.PacketHolder = PacketHolder;

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

@@ -1,5 +1,4 @@
-import { KeyHolder } from '../../KeyHolder';
-import { PacketType } from '../../packets/PacketType';
+import { PacketHolder } from '../../KeyHolder';
 import { PacketListener } from '../../packets/PacketListener';
 export declare abstract class SonicWSCore {
     protected ws: WebSocket;
@@ -11,17 +10,19 @@ export declare abstract class SonicWSCore {
         };
     };
     protected preListen: {
-        [key: string]: Array<PacketListener>;
+        [key: string]: Array<(value: string) => void>;
     };
-    protected clientKeys: KeyHolder;
-    protected serverKeys: KeyHolder;
+    protected clientPackets: PacketHolder;
+    protected serverPackets: PacketHolder;
+    private keyHandler;
     constructor(ws: WebSocket);
-    protected _finishInit(headers: Record<string, string | string[] | undefined>): void;
+    private serverKeyHandler;
+    private messageHandler;
     protected listen(key: string, listener: PacketListener): void;
     raw_onmessage(listener: (data: string) => void): void;
     raw_send(data: string): void;
-    send(key: string, type?: PacketType, ...value: any[]): void;
+    send(tag: string, ...values: any[]): void;
     on_ready(listener: () => void): void;
     on_close(listener: (event: CloseEvent) => void): void;
-    on(key: string, type: PacketType, listener: (value: string) => void, dontSpread?: boolean): void;
+    on(tag: string, listener: (value: string) => void): void;
 }

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

@@ -1,12 +1,26 @@
 "use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SonicWSCore = void 0;
 var KeyHolder_1 = require("../../KeyHolder");
 var PacketType_1 = require("../../packets/PacketType");
 var PacketListener_1 = require("../../packets/PacketListener");
+var CodePointUtil_1 = require("../../util/CodePointUtil");
+var PacketUtils_1 = require("../../util/PacketUtils");
+var version_1 = require("../../../version");
 var SonicWSCore = /** @class */ (function () {
     function SonicWSCore(ws) {
         var _this = this;
+        this.clientPackets = KeyHolder_1.PacketHolder.empty();
+        this.serverPackets = KeyHolder_1.PacketHolder.empty();
         this.ws = ws;
         this.listeners = {
             message: [],
@@ -14,43 +28,50 @@ var SonicWSCore = /** @class */ (function () {
             event: {},
         };
         this.preListen = {};
-        this.clientKeys = new KeyHolder_1.KeyHolder([]);
-        this.serverKeys = new KeyHolder_1.KeyHolder([]);
-        this.ws.addEventListener('message', function (event) {
-            var _a;
-            var data = event.data.toString();
-            _this.listeners.message.forEach(function (listener) { return listener(data); });
-            if (data.length < 1)
-                return;
-            var key = data.substring(0, 1);
-            var value = data.substring(1);
-            var code = key.charCodeAt(0);
-            if (code != null) {
-                (_a = _this.listeners.event[code]) === null || _a === void 0 ? void 0 : _a.forEach(function (l) { return l.listen(value); });
-            }
-        });
+        this.keyHandler = function (event) { return _this.serverKeyHandler(event); };
+        this.ws.addEventListener('message', this.keyHandler); // lambda to persist 'this'
         this.ws.addEventListener('close', function (event) {
             _this.listeners.close.forEach(function (listener) { return listener(event); });
         });
     }
-    SonicWSCore.prototype._finishInit = function (headers) {
+    SonicWSCore.prototype.serverKeyHandler = function (event) {
         var _this = this;
-        var ckData = headers['s-clientkeys'];
-        var skData = headers['s-serverkeys'];
-        if (typeof ckData !== 'string' ||
-            typeof skData !== 'string') {
+        var data = event.data.toString();
+        if (!data.startsWith("SWS")) {
+            this.ws.close();
+            throw new Error("The server requested is not a Sonic WS server.");
+        }
+        var version = data.charCodeAt(3);
+        if (version != version_1.VERSION) {
             this.ws.close();
-            console.error("The server requested is not a Sonic WS server.");
+            throw new Error("Version mismatch: ".concat(version > version_1.VERSION ? "client" : "server", " is outdated (server: ").concat(version, ", client: ").concat(version_1.VERSION, ")"));
+        }
+        var _a = data.substring(4).split(CodePointUtil_1.NULL), ckData = _a[0], skData = _a[1];
+        this.clientPackets.createPackets(PacketType_1.Packet.deserializeAll(ckData));
+        this.serverPackets.createPackets(PacketType_1.Packet.deserializeAll(skData));
+        Object.keys(this.preListen).forEach(function (tag) { return _this.preListen[tag].forEach(function (listener) {
+            var packet = _this.serverPackets.getPacket(tag);
+            var packetListener = new PacketListener_1.PacketListener(packet, listener);
+            _this.listen(tag, packetListener);
+        }); });
+        this.ws.removeEventListener('message', this.keyHandler);
+        this.ws.addEventListener('message', function (event) { return _this.messageHandler(event); }); // lambda to persist 'this'
+    };
+    SonicWSCore.prototype.messageHandler = function (event) {
+        var _a;
+        var data = event.data.toString();
+        this.listeners.message.forEach(function (listener) { return listener(data); });
+        if (data.length < 1)
             return;
+        var key = data.substring(0, 1);
+        var value = data.substring(1);
+        var code = key.charCodeAt(0);
+        if (code != null) {
+            (_a = this.listeners.event[code]) === null || _a === void 0 ? void 0 : _a.forEach(function (l) { return l.listen(value); });
         }
-        this.clientKeys.createKeys(ckData.split(","));
-        this.serverKeys.createKeys(skData.split(","));
-        Object.keys(this.preListen).forEach(function (key) {
-            return _this.preListen[key].forEach(function (listener) { return _this.listen(key, listener); });
-        });
     };
     SonicWSCore.prototype.listen = function (key, listener) {
-        var skey = this.serverKeys.get(key);
+        var skey = this.serverPackets.get(key);
         if (!skey) {
             console.log("Key is not available on server: " + key);
             return;
@@ -65,16 +86,13 @@ var SonicWSCore = /** @class */ (function () {
     SonicWSCore.prototype.raw_send = function (data) {
         this.ws.send(data);
     };
-    SonicWSCore.prototype.send = function (key, type) {
-        if (type === void 0) { type = PacketType_1.PacketType.NONE; }
-        var value = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            value[_i - 2] = arguments[_i];
+    SonicWSCore.prototype.send = function (tag) {
+        var _this = this;
+        var values = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            values[_i - 1] = arguments[_i];
         }
-        var code = this.clientKeys.getChar(key);
-        if (code == null)
-            throw new Error("Key \"".concat(key, "\" has not been created!"));
-        this.raw_send(code + PacketType_1.PacketSendProcessors[type].apply(PacketType_1.PacketSendProcessors, value));
+        PacketUtils_1.emitPacket.apply(void 0, __spreadArray([this.clientPackets, function (d) { return _this.raw_send(d); }, tag], values, false));
     };
     SonicWSCore.prototype.on_ready = function (listener) {
         if (this.ws.readyState === WebSocket.OPEN) {
@@ -86,18 +104,17 @@ var SonicWSCore = /** @class */ (function () {
     };
     SonicWSCore.prototype.on_close = function (listener) {
         this.listeners.close.push(listener);
-        this.ws.addEventListener('close', listener);
     };
-    SonicWSCore.prototype.on = function (key, type, listener, dontSpread) {
-        if (dontSpread === void 0) { dontSpread = false; }
-        var packetListener = new PacketListener_1.PacketListener(type, listener, -1, dontSpread);
+    SonicWSCore.prototype.on = function (tag, listener) {
         if (this.ws.readyState !== WebSocket.OPEN) {
-            if (!this.preListen[key])
-                this.preListen[key] = [];
-            this.preListen[key].push(packetListener);
+            if (!this.preListen[tag])
+                this.preListen[tag] = [];
+            this.preListen[tag].push(listener);
             return;
         }
-        this.listen(key, packetListener);
+        var packet = this.serverPackets.getPacket(tag);
+        var packetListener = new PacketListener_1.PacketListener(packet, listener);
+        this.listen(tag, packetListener);
     };
     return SonicWSCore;
 }());

package/dist/ws/client/node/ClientNode.js

@@ -24,13 +24,8 @@ var ClientCore_1 = require("../core/ClientCore");
 var SonicWS = /** @class */ (function (_super) {
     __extends(SonicWS, _super);
     function SonicWS(url, options) {
-        var _this = this;
         var ws = new ws_1.default.WebSocket(url, options);
-        _this = _super.call(this, ws) || this; // Cast to match browser WebSocket interface
-        ws.on('upgrade', function (req) {
-            _this._finishInit(req.headers);
-        });
-        return _this;
+        return _super.call(this, ws) || this;
     }
     return SonicWS;
 }(ClientCore_1.SonicWSCore));

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

@@ -1,10 +1,10 @@
-import { PacketType } from "./PacketType";
+import { Packet } from "./PacketType";
 export declare class PacketListener {
     private processor;
     private validifier;
     private listener;
     private dontSpread;
     private dataCap;
-    constructor(type: PacketType, listener: (data: string) => void, dataCap: number, dontSpread: boolean);
+    constructor(packet: Packet, listener: (...data: any[]) => void);
     listen(value: string): boolean;
 }

package/dist/ws/packets/PacketListener.js

@@ -3,23 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PacketListener = void 0;
 var PacketType_1 = require("./PacketType");
 var PacketListener = /** @class */ (function () {
-    function PacketListener(type, listener, dataCap, dontSpread) {
-        this.processor = PacketType_1.PacketReceiveProcessors[type];
-        this.validifier = PacketType_1.PacketValidityProcessors[type];
+    function PacketListener(packet, listener) {
+        this.processor = PacketType_1.PacketReceiveProcessors[packet.type];
+        this.validifier = PacketType_1.PacketValidityProcessors[packet.type];
         this.listener = listener;
-        this.dontSpread = dontSpread;
-        this.dataCap = dataCap;
+        this.dontSpread = packet.dontSpread;
+        this.dataCap = packet.dataCap;
     }
     PacketListener.prototype.listen = function (value) {
-        // -1 if it's the client
-        if (this.dataCap != -1 && !this.validifier(value, this.dataCap))
+        try {
+            if (!this.validifier(value, this.dataCap))
+                return false;
+            var processed = this.processor(value);
+            if (Array.isArray(processed) && !this.dontSpread)
+                this.listener.apply(this, processed);
+            else
+                this.listener(processed);
+            return true;
+        }
+        catch (err) {
             return false;
-        var processed = this.processor(value);
-        if (Array.isArray(processed) && !this.dontSpread)
-            this.listener.apply(this, processed);
-        else
-            this.listener(processed);
-        return true;
+        }
     };
     return PacketListener;
 }());

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

@@ -17,3 +17,13 @@ export declare enum PacketType {
 export declare const PacketValidityProcessors: Record<PacketType, (data: string, dataCap: number) => boolean>;
 export declare const PacketReceiveProcessors: Record<PacketType, (data: string) => "" | string | number | number[] | boolean>;
 export declare const PacketSendProcessors: Record<PacketType, (...data: any) => string>;
+export declare class Packet {
+    tag: string;
+    type: PacketType;
+    dataCap: number;
+    dontSpread: boolean;
+    constructor(tag: string, type: PacketType, dataCap: number, dontSpread: boolean);
+    serialize(): string;
+    static deserialize(text: string, offset: number): [packet: Packet, tagLength: number];
+    static deserializeAll(text: string): Packet[];
+}

package/dist/ws/packets/PacketType.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PacketSendProcessors = exports.PacketReceiveProcessors = exports.PacketValidityProcessors = exports.PacketType = void 0;
+exports.Packet = exports.PacketSendProcessors = exports.PacketReceiveProcessors = exports.PacketValidityProcessors = exports.PacketType = void 0;
 var ArrayUtil_1 = require("../util/ArrayUtil");
 var CodePointUtil_1 = require("../util/CodePointUtil");
 var PacketType;
@@ -27,8 +27,8 @@ exports.PacketValidityProcessors = (_a = {},
     _a[PacketType.NONE] = function (data) { return data == ""; },
     _a[PacketType.RAW] = function () { return true; },
     _a[PacketType.INTS_C] = function (data, cap) { return data.length == cap; },
-    _a[PacketType.INTS_D] = function (data, cap) { return data.length > 0 && (0, CodePointUtil_1.processCharCodes)(data).length == data[0].charCodeAt(0) * cap + 1; },
-    _a[PacketType.DECIMAL] = function (data, cap) { return data.length > 0 && (0, CodePointUtil_1.processCharCodes)(data).length == data[0].charCodeAt(0) * cap * 2 + 1; },
+    _a[PacketType.INTS_D] = function (data, cap) { return data.length > 0 && (0, CodePointUtil_1.processCharCodes)(data).length % data[0].charCodeAt(0) + 1 <= cap; },
+    _a[PacketType.DECIMAL] = function (data, cap) { return data.length > 0 && (0, CodePointUtil_1.processCharCodes)(data).length % data[0].charCodeAt(0) * 2 + 1 <= cap; },
     _a[PacketType.BOOLEAN] = function (data) { return data == CodePointUtil_1.NULL || data == ""; },
     _a);
 // todo: code points might make it need to substring(2) but idk if i need to care abt that-
@@ -73,3 +73,34 @@ exports.PacketSendProcessors = (_c = {},
     },
     _c[PacketType.BOOLEAN] = function (data) { return data ? CodePointUtil_1.NULL : ""; },
     _c);
+var Packet = /** @class */ (function () {
+    function Packet(tag, type, dataCap, dontSpread) {
+        this.tag = tag;
+        this.type = type;
+        this.dataCap = dataCap;
+        this.dontSpread = dontSpread;
+    }
+    Packet.prototype.serialize = function () {
+        return "".concat(this.dontSpread ? 1 : 0).concat(String.fromCharCode(this.dataCap + 1)).concat(String.fromCharCode(this.type + 1)).concat(String.fromCharCode(this.tag.length + 1)).concat(this.tag);
+    };
+    Packet.deserialize = function (text, offset) {
+        var dontSpread = text[offset] == "1";
+        var dataCap = text.charCodeAt(offset + 1) - 1;
+        var type = (text.charCodeAt(offset + 2) - 1);
+        var tagLength = text.charCodeAt(offset + 3) - 1;
+        var tag = text.substring(offset + 4, offset + 4 + tagLength);
+        return [new Packet(tag, type, dataCap, dontSpread), tagLength];
+    };
+    Packet.deserializeAll = function (text) {
+        var arr = [];
+        var offset = 0;
+        while (offset < text.length) {
+            var _a = this.deserialize(text, offset), packet = _a[0], len = _a[1];
+            arr.push(packet);
+            offset += 4 + len;
+        }
+        return arr;
+    };
+    return Packet;
+}());
+exports.Packet = Packet;

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

@@ -1,8 +1,5 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import * as WS from 'ws';
 import { SonicWSServer } from './SonicWSServer';
-import { PacketType } from '../packets/PacketType';
 export declare class SonicWSConnection {
     private socket;
     private host;
@@ -15,14 +12,11 @@ export declare class SonicWSConnection {
     close(): void;
     /**
      * Listens for a packet
-     * @param key The tag of the key to listen for
-     * @param type The type of packet to listen for
+     * @param tag The tag of the key to listen for
      * @param listener A function to listen for it
-     * @param dataCap The amount of values that can pass through the function
-     * @param dontSpread If the values should be kept in an array instead of spread
      */
-    on(key: string, type: PacketType, listener: (value: string) => void, dataCap: number, dontSpread?: boolean): void;
-    send(key: string, type?: PacketType, ...value: any[]): void;
+    on(tag: string, listener: (...values: any) => void): void;
+    send(tag: string, ...values: any[]): void;
     /** Toggles printing all sent and received messages */
     togglePrint(): void;
 }

package/dist/ws/server/SonicWSConnection.js

@@ -1,8 +1,18 @@
 "use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SonicWSConnection = void 0;
-var PacketType_1 = require("../packets/PacketType");
 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) {
         var _this = this;
@@ -11,23 +21,23 @@ var SonicWSConnection = /** @class */ (function () {
         this.host = host;
         this.id = id;
         this.listeners = {};
-        for (var _i = 0, _a = Object.values(host.clientKeys.keys); _i < _a.length; _i++) {
+        for (var _i = 0, _a = Object.values(host.clientPackets.getKeys()); _i < _a.length; _i++) {
             var key = _a[_i];
             this.listeners[String.fromCharCode(key)] = [];
         }
         this.socket.on('message', function (data) {
             var message = data.toString();
             if (_this.print)
-                console.log("\u001B[31m\u2B07\u001B[0m ".concat(_this.id, " ").concat(message));
+                console.log("\u001B[31m\u2B07 \u001B[38;5;245m(".concat(_this.id, ",").concat((0, CodePointUtil_1.getStringBytes)(message), ")\u001B[0m ").concat(message));
             if (message.length < 1) {
-                _this.socket.close();
+                _this.socket.close(4001);
                 return;
             }
             var key = message[0];
             var value = message.substring(1);
             // not a key, bye bye
-            if (!_this.listeners[key]) {
-                _this.socket.close();
+            if (!_this.host.clientPackets.has(key)) {
+                _this.socket.close(4002);
                 return;
             }
             for (var _i = 0, _a = _this.listeners[key]; _i < _a.length; _i++) {
@@ -35,7 +45,7 @@ var SonicWSConnection = /** @class */ (function () {
                 var valid = listener.listen(value);
                 // if invalid then ignore it
                 if (!valid) {
-                    socket.close();
+                    socket.close(4003);
                     break;
                 }
             }
@@ -47,39 +57,33 @@ var SonicWSConnection = /** @class */ (function () {
     };
     SonicWSConnection.prototype.raw_send = function (data) {
         if (this.print)
-            console.log("\u001B[32m\u2B06\u001B[0m ".concat(this.id, " ").concat(data));
+            console.log("\u001B[32m\u2B06 \u001B[38;5;245m(".concat(this.id, ",").concat((0, CodePointUtil_1.getStringBytes)(data), ")\u001B[0m ").concat(data));
         this.socket.send(data);
     };
     SonicWSConnection.prototype.close = function () {
-        this.socket.close();
+        this.socket.close(1000);
     };
     /**
      * Listens for a packet
-     * @param key The tag of the key to listen for
-     * @param type The type of packet to listen for
+     * @param tag The tag of the key to listen for
      * @param listener A function to listen for it
-     * @param dataCap The amount of values that can pass through the function
-     * @param dontSpread If the values should be kept in an array instead of spread
      */
-    SonicWSConnection.prototype.on = function (key, type, listener, dataCap, dontSpread) {
-        if (dontSpread === void 0) { dontSpread = false; }
-        var code = this.host.clientKeys.getChar(key);
+    SonicWSConnection.prototype.on = function (tag, listener) {
+        var code = this.host.clientPackets.getChar(tag);
         if (code == null)
-            throw new Error("Key \"".concat(key, "\" has not been created!"));
+            throw new Error("Tag \"".concat(tag, "\" has not been created!"));
+        var packet = this.host.clientPackets.getPacket(tag);
         if (!this.listeners[code])
             this.listeners[code] = [];
-        this.listeners[code].push(new PacketListener_1.PacketListener(type, listener, dataCap, dontSpread));
+        this.listeners[code].push(new PacketListener_1.PacketListener(packet, listener));
     };
-    SonicWSConnection.prototype.send = function (key, type) {
-        if (type === void 0) { type = PacketType_1.PacketType.NONE; }
-        var value = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            value[_i - 2] = arguments[_i];
+    SonicWSConnection.prototype.send = function (tag) {
+        var _this = this;
+        var values = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            values[_i - 1] = arguments[_i];
         }
-        var code = this.host.serverKeys.getChar(key);
-        if (code == null)
-            throw new Error("Key \"".concat(key, "\" has not been created!"));
-        this.raw_send(code + PacketType_1.PacketSendProcessors[type].apply(PacketType_1.PacketSendProcessors, value));
+        PacketUtils_1.emitPacket.apply(void 0, __spreadArray([this.host.serverPackets, function (d) { return _this.raw_send(d); }, tag], values, false));
     };
     /** Toggles printing all sent and received messages */
     SonicWSConnection.prototype.togglePrint = function () {

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

@@ -1,14 +1,15 @@
 import * as WS from 'ws';
 import { SonicWSConnection } from './SonicWSConnection';
-import { KeyHolder } from '../KeyHolder';
+import { PacketHolder } from '../KeyHolder';
+import { Packet } from '../packets/PacketType';
 export declare class SonicWSServer {
     private wss;
     private socketIDs;
     private connectListeners;
-    clientKeys: KeyHolder;
-    serverKeys: KeyHolder;
+    clientPackets: PacketHolder;
+    serverPackets: PacketHolder;
     connections: SonicWSConnection[];
-    constructor(ck: string[], sk: string[], options?: WS.ServerOptions);
+    constructor(clientPackets: Packet[], serverPackets: Packet[], options?: WS.ServerOptions);
     private generateSocketID;
     on_connect(runner: (client: SonicWSConnection) => void): void;
     on_ready(runner: () => void): void;

package/dist/ws/server/SonicWSServer.js

@@ -15,35 +15,44 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SonicWSServer = void 0;
 var WS = __importStar(require("ws"));
 var SonicWSConnection_1 = require("./SonicWSConnection");
 var KeyHolder_1 = require("../KeyHolder");
+var CodePointUtil_1 = require("../util/CodePointUtil");
+var version_1 = require("../../version");
 var SonicWSServer = /** @class */ (function () {
-    function SonicWSServer(ck, sk, options) {
+    function SonicWSServer(clientPackets, serverPackets, options) {
         if (options === void 0) { options = {}; }
         var _this = this;
         this.socketIDs = [];
         this.connectListeners = [];
         this.connections = [];
         this.wss = new WS.WebSocketServer(options);
-        this.clientKeys = new KeyHolder_1.KeyHolder(ck);
-        this.serverKeys = new KeyHolder_1.KeyHolder(sk);
-        // send tags to the client so it doesn't have to hard code them in
-        this.wss.on('headers', function (headers) {
-            headers.push('S-ClientKeys: ' + ck.join(","));
-            headers.push('S-ServerKeys: ' + sk.join(","));
-        });
+        this.clientPackets = new KeyHolder_1.PacketHolder(clientPackets);
+        this.serverPackets = new KeyHolder_1.PacketHolder(serverPackets);
         this.wss.on('connection', function (socket) {
             var sonicConnection = new SonicWSConnection_1.SonicWSConnection(socket, _this, _this.generateSocketID());
+            // send tags to the client so it doesn't have to hard code them in
+            socket.send("SWS" + String.fromCharCode(version_1.VERSION) + _this.clientPackets.serialize() + CodePointUtil_1.NULL + _this.serverPackets.serialize());
             _this.connections.push(sonicConnection);
             _this.connectListeners.forEach(function (l) { return l(sonicConnection); });
             socket.on('close', function () {

package/dist/ws/util/ArrayUtil.js

@@ -9,8 +9,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitArray = void 0;
+exports.splitArray = splitArray;
 function splitArray(arr, size) {
     return __spreadArray([], Array(Math.ceil(arr.length / size)), true).map(function (_, i) { return arr.slice(i * size, i * size + size); });
 }
-exports.splitArray = splitArray;

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

@@ -2,7 +2,6 @@ export declare const NULL: string;
 export declare const MAX_C = 55295;
 export declare const NEGATIVE_C: number;
 export declare const OVERFLOW: number;
-export declare const LOG_OVERFLOW: number;
 export declare function processCharCodes(text: string): number[];
 export declare function fromSignedINT_C(point: number): number;
 export declare function toSignedINT_C(number: number): number;
@@ -10,3 +9,5 @@ export declare function stringedINT_C(number: number): string;
 export declare function sectorSize(number: number): number;
 export declare function convertINT_D(number: number, chars: number): string;
 export declare function deconvertINT_D(string: string): number;
+export declare function getCharBytes(char: string): number;
+export declare function getStringBytes(str: string): number;

package/dist/ws/util/CodePointUtil.js

@@ -1,7 +1,16 @@
 "use strict";
 // this shit is so complex so i commented it...
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deconvertINT_D = exports.convertINT_D = exports.sectorSize = exports.stringedINT_C = exports.toSignedINT_C = exports.fromSignedINT_C = exports.processCharCodes = exports.LOG_OVERFLOW = exports.OVERFLOW = exports.NEGATIVE_C = exports.MAX_C = exports.NULL = void 0;
+exports.OVERFLOW = exports.NEGATIVE_C = exports.MAX_C = exports.NULL = void 0;
+exports.processCharCodes = processCharCodes;
+exports.fromSignedINT_C = fromSignedINT_C;
+exports.toSignedINT_C = toSignedINT_C;
+exports.stringedINT_C = stringedINT_C;
+exports.sectorSize = sectorSize;
+exports.convertINT_D = convertINT_D;
+exports.deconvertINT_D = deconvertINT_D;
+exports.getCharBytes = getCharBytes;
+exports.getStringBytes = getStringBytes;
 // null char so it's easy
 exports.NULL = String.fromCharCode(0);
 // the highest usable character in utf8
@@ -11,42 +20,46 @@ exports.NEGATIVE_C = Math.floor(exports.MAX_C / 2);
 // overflow is used as our "base" in a positional number system (like base 10, but very large)
 // we use this to reduce the number of characters needed to represent large numbers
 exports.OVERFLOW = exports.NEGATIVE_C + 1;
-// precomputed log(OVERFLOW) lets us calculate how many digits (characters) we need
-exports.LOG_OVERFLOW = Math.log(exports.OVERFLOW);
+var OVERFLOW_POWS = [];
+function overflowPow(num) {
+    var _a;
+    return (_a = OVERFLOW_POWS[num]) !== null && _a !== void 0 ? _a : (OVERFLOW_POWS[num] = Math.pow(exports.OVERFLOW, num));
+}
 function processCharCodes(text) {
     return text.split("").map(function (v) { return v.charCodeAt(0); });
 }
-exports.processCharCodes = processCharCodes;
 // this converts an encoded code point back to a signed number
 function fromSignedINT_C(point) {
     // if the code point is below NEGATIVE_C, it's a positive number and can be returned directly
     // if it's above or equal to NEGATIVE_C, it was originally negative, so we reverse the offset
     return point < exports.NEGATIVE_C ? point : -point + exports.NEGATIVE_C;
 }
-exports.fromSignedINT_C = fromSignedINT_C;
 // this converts a signed number into a non-negative integer that fits in a code point
 function toSignedINT_C(number) {
     // positive numbers are returned as-is
     // negative numbers are made positive and offset above NEGATIVE_C to mark them
     return number < 0 ? -number + exports.NEGATIVE_C : number;
 }
-exports.toSignedINT_C = toSignedINT_C;
 // just conversion and checks lol
 function stringedINT_C(number) {
     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));
 }
-exports.stringedINT_C = stringedINT_C;
 // calculate how many characters (digits) are needed to store this number in OVERFLOW base
 function sectorSize(number) {
     // 0 would make -Infinity;
     if (number == 0)
         return 1;
-    // we add 1 because log gives us a fractional digit count that needs to be rounded up
-    return Math.floor(Math.log(Math.abs(number)) / exports.LOG_OVERFLOW) + 1;
+    // iterative system because it's faster than log
+    var count = 1;
+    var num = exports.OVERFLOW;
+    while (number > num) {
+        count++;
+        num *= exports.OVERFLOW;
+    }
+    return count;
 }
-exports.sectorSize = sectorSize;
 // encodes a signed integer into a unicode-safe string using a large base (OVERFLOW)
 function convertINT_D(number, chars) {
     // special case: zero is always encoded as a single null character
@@ -75,14 +88,19 @@ function convertINT_D(number, chars) {
         : string;
     return stringified;
 }
-exports.convertINT_D = convertINT_D;
 // decodes a string created by convertINT_D back into the original signed integer
 function deconvertINT_D(string) {
     // for each code point in the string, reverse the sign encoding if necessary,
     // then multiply by the appropriate base power based on its position
     return processCharCodes(string).reduce(function (c, n, i, arr) {
         // multiply by the positional weight based on its place (most-significant-digit first)
-        return c + fromSignedINT_C(n) * Math.pow(exports.OVERFLOW, arr.length - i - 1);
+        return c + fromSignedINT_C(n) * overflowPow(arr.length - i - 1);
     }, 0);
 }
-exports.deconvertINT_D = deconvertINT_D;
+var encoder = new TextEncoder();
+function getCharBytes(char) {
+    return encoder.encode(char).length;
+}
+function getStringBytes(str) {
+    return str.split("").reduce(function (c, n) { return c + getCharBytes(n); }, 0);
+}

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

@@ -0,0 +1,4 @@
+import { PacketHolder } from "../KeyHolder";
+import { Packet, PacketType } from "../packets/PacketType";
+export declare function CreatePacket(tag: string, type?: PacketType, dataCap?: number, dontSpread?: boolean): Packet;
+export declare function emitPacket(packets: PacketHolder, send: (data: string) => void, tag: string, ...values: any[]): void;

package/dist/ws/util/PacketUtils.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreatePacket = CreatePacket;
+exports.emitPacket = emitPacket;
+var PacketType_1 = require("../packets/PacketType");
+function CreatePacket(tag, type, dataCap, dontSpread) {
+    if (type === void 0) { type = PacketType_1.PacketType.NONE; }
+    if (dataCap === void 0) { dataCap = 1; }
+    if (dontSpread === void 0) { dontSpread = false; }
+    return new PacketType_1.Packet(tag, type, dataCap, dontSpread);
+}
+function emitPacket(packets, send, tag) {
+    var values = [];
+    for (var _i = 3; _i < arguments.length; _i++) {
+        values[_i - 3] = arguments[_i];
+    }
+    var code = packets.getChar(tag);
+    if (code == null)
+        throw new Error("Tag \"".concat(tag, "\" has not been created!"));
+    var packet = packets.getPacket(tag);
+    if (values.length > packet.dataCap)
+        throw new Error("Packet \"".concat(tag, "\" only allows ").concat(packet.dataCap, " values!"));
+    send(code + PacketType_1.PacketSendProcessors[packet.type].apply(PacketType_1.PacketSendProcessors, values));
+}

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "sonic-ws",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "A bandwidth efficient websocket library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc -d",
-    "test": "rimraf ./dist && npm run build && node test.mjs"
+    "webpack": "webpack --mode production",
+    "build_web": "rimraf ./html && tsc --target ES5 --module ES6 --outdir ./html src/ws/client/browser/ClientBrowser.ts && npm run webpack",
+    "build_node": "rimraf ./dist && tsc -d",
+    "build": "npm run build_node && npm run build_web",
+
+    "test_web": "npm run build && node test-site/server.mjs",
+    "test_node": "npm run build_node && node test.mjs"
   },
   "repository": {
     "type": "git",
@@ -22,6 +27,14 @@
     "ws": "^8.18.2"
   },
   "devDependencies": {
-    "@types/ws": "^8.18.1"
+    "@types/node": "^22.15.17",
+    "@types/ws": "^8.18.1",
+    "ts-loader": "^9.5.2",
+    "typescript": "^5.8.3",
+    "undici": "^7.8.0",
+    "undici-types": "^7.8.0",
+    "webpack": "^5.99.8",
+    "webpack-cli": "^6.0.1",
+    "webpack-dev-server": "^5.2.1"
   }
 }

package/webpack.config.js

@@ -0,0 +1,17 @@
+const path = require('path');
+
+module.exports = {
+  entry: './html/ws/client/browser/ClientBrowser.js',
+  output: {
+    filename: 'SonicWS_bundle.js',
+    path: path.resolve(__dirname, 'bundled'),
+  },
+  resolve: {
+    extensions: ['.js'],
+  },
+  module: {
+    rules: [
+    ],
+  },
+  mode: 'production',
+};

package/dist/ws/client/browser/ClientBrowser.d.ts

@@ -1,4 +0,0 @@
-import { SonicWSCore } from "../core/ClientCore";
-export declare class SonicWS extends SonicWSCore {
-    constructor(url: string, protocols: string | string[]);
-}

package/dist/ws/client/browser/ClientBrowser.js

@@ -1,28 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SonicWS = void 0;
-var ClientCore_1 = require("../core/ClientCore");
-var SonicWS = /** @class */ (function (_super) {
-    __extends(SonicWS, _super);
-    function SonicWS(url, protocols) {
-        var ws = new WebSocket(url, protocols);
-        return _super.call(this, ws) || this;
-    }
-    return SonicWS;
-}(ClientCore_1.SonicWSCore));
-exports.SonicWS = SonicWS;