multyx-client 0.1.6 → 0.1.8

package/dist/controller.js

@@ -19,7 +19,7 @@ class Controller {
         };
         document.addEventListener('keydown', e => {
             if (this.preventDefault)
-                e.preventDefault;
+                e.preventDefault();
             const key = e.key.toLowerCase();
             // When holding down key
             if (this.keys[key] && this.listening.has('keyhold')) {
@@ -40,7 +40,7 @@ class Controller {
         });
         document.addEventListener('keyup', e => {
             if (this.preventDefault)
-                e.preventDefault;
+                e.preventDefault();
             const key = e.key.toLowerCase();
             delete this.keys[key];
             delete this.keys[e.code];
@@ -52,7 +52,7 @@ class Controller {
         // Mouse input events
         document.addEventListener('mousedown', e => {
             if (this.preventDefault)
-                e.preventDefault;
+                e.preventDefault();
             if (this.mouseGetter) {
                 const mouse = this.mouseGetter();
                 this.mouse.x = mouse.x;
@@ -70,7 +70,7 @@ class Controller {
         });
         document.addEventListener('mouseup', e => {
             if (this.preventDefault)
-                e.preventDefault;
+                e.preventDefault();
             if (this.mouseGetter) {
                 const mouse = this.mouseGetter();
                 this.mouse.x = mouse.x;
@@ -88,7 +88,7 @@ class Controller {
         });
         document.addEventListener('mousemove', e => {
             if (this.preventDefault)
-                e.preventDefault;
+                e.preventDefault();
             if (this.mouseGetter) {
                 const mouse = this.mouseGetter();
                 this.mouse.x = mouse.x;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Add, Done } from './utils';
+import { Add, Done, Interpolate } from './utils';
 import { RawObject } from "./types";
 import { Controller } from "./controller";
 import { MultyxClientObject } from "./items";
@@ -27,6 +27,7 @@ export default class Multyx {
     static Native: symbol;
     static Custom: symbol;
     static Any: symbol;
+    static Interpolate: typeof Interpolate;
     constructor(options?: Options, callback?: () => void);
     /**
      * Listen for a message from the server

package/dist/index.js

@@ -259,4 +259,5 @@ Multyx.Edit = Symbol('edit');
 Multyx.Native = Symbol('native');
 Multyx.Custom = Symbol('custom');
 Multyx.Any = Symbol('any');
+Multyx.Interpolate = utils_1.Interpolate;
 exports.default = Multyx;

package/dist/items/list.d.ts

@@ -2,6 +2,7 @@ import Multyx from '../';
 import { type MultyxClientItem, type MultyxClientObject, MultyxClientValue } from '.';
 import { Edit, EditWrapper, Unpack } from '../utils';
 export default class MultyxClientList {
+    readonly type = "list";
     protected list: MultyxClientItem[];
     private multyx;
     propertyPath: string[];
@@ -62,4 +63,8 @@ export default class MultyxClientList {
     toString: () => string;
     valueOf: () => any[];
     [Symbol.toPrimitive]: () => any[];
+    hydrateFromServer(values: any[]): void;
+    private tryApplyServerValue;
+    private notifyIndexWaiters;
+    private enqueueEditCallbacks;
 }

package/dist/items/list.js

@@ -8,6 +8,7 @@ const _1 = require(".");
 const utils_1 = require("../utils");
 const router_1 = __importDefault(require("./router"));
 const message_1 = require("../message");
+const isPlainObject = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
 class MultyxClientList {
     addEditCallback(callback) {
         this.editCallbacks.push(callback);
@@ -73,6 +74,7 @@ class MultyxClientList {
         }
     }
     constructor(multyx, list, propertyPath = [], editable) {
+        this.type = 'list';
         this.editCallbacks = [];
         this.toString = () => this.value.toString();
         this.valueOf = () => this.value;
@@ -151,40 +153,39 @@ class MultyxClientList {
             this.set(parseInt(path[0]), new utils_1.EditWrapper({}));
             next = this.get(parseInt(path[0]));
         }
+        if (!next || next instanceof _1.MultyxClientValue) {
+            return false;
+        }
         return next.set(path.slice(1), value);
     }
     set(index, value) {
-        var _b, _c;
         if (Array.isArray(index))
             return this.recursiveSet(index, value);
         const oldValue = this.get(index);
         const serverSet = value instanceof utils_1.EditWrapper;
         const allowed = serverSet || this.editable;
-        if (serverSet || (0, _1.IsMultyxClientItem)(value))
-            value = value.value;
-        if (value === undefined)
+        const incoming = (serverSet || (0, _1.IsMultyxClientItem)(value)) ? value.value : value;
+        if (incoming === undefined)
             return this.delete(index, serverSet);
-        // If value is a MultyxClientValue, set the value
-        if (this.list[index] instanceof _1.MultyxClientValue && typeof value != 'object') {
-            return this.list[index].set(serverSet ? new utils_1.EditWrapper(value) : value);
+        if (serverSet && this.tryApplyServerValue(index, incoming, oldValue)) {
+            return true;
+        }
+        // If value is a MultyxClientValue, set the value directly
+        if (this.list[index] instanceof _1.MultyxClientValue && (typeof incoming !== 'object' || incoming === null)) {
+            const result = this.list[index].set(serverSet ? new utils_1.EditWrapper(incoming) : incoming);
+            this.enqueueEditCallbacks(index, oldValue);
+            return result;
         }
         // Attempting to edit property not editable to client
         if (!allowed) {
             if (this.multyx.options.verbose) {
-                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + index}' to ${value}`);
+                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + index}' to ${incoming}`);
             }
             return false;
         }
-        this.list[index] = new ((0, router_1.default)(value))(this.multyx, serverSet ? new utils_1.EditWrapper(value) : value, [...this.propertyPath, index.toString()], this.editable);
-        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + index);
-        if (this.multyx.events.has(propSymbol)) {
-            this.multyx[utils_1.Done].push(...((_c = (_b = this.multyx.events.get(propSymbol)) === null || _b === void 0 ? void 0 : _b.map(e => () => e(this.list[index]))) !== null && _c !== void 0 ? _c : []));
-        }
-        // We have to push into queue, since object may not be fully created
-        // and there may still be more updates to parse
-        for (const listener of this.editCallbacks) {
-            this.multyx[utils_1.Add](() => listener(index, this.get(index), oldValue));
-        }
+        this.list[index] = new ((0, router_1.default)(incoming))(this.multyx, serverSet ? new utils_1.EditWrapper(incoming) : incoming, [...this.propertyPath, index.toString()], this.editable);
+        this.notifyIndexWaiters(index);
+        this.enqueueEditCallbacks(index, oldValue);
         return true;
     }
     delete(index, native = false) {
@@ -403,6 +404,51 @@ class MultyxClientList {
             values[i] = this.get(i);
         return values[Symbol.iterator]();
     }
+    hydrateFromServer(values) {
+        if (!Array.isArray(values))
+            return;
+        for (let i = 0; i < values.length; i++) {
+            this.set(i, new utils_1.EditWrapper(values[i]));
+        }
+        for (let i = values.length; i < this.length; i++) {
+            this.delete(i, true);
+        }
+        this.length = values.length;
+    }
+    tryApplyServerValue(index, incoming, oldValue) {
+        const current = this.list[index];
+        if (!current)
+            return false;
+        if (current instanceof _1.MultyxClientValue && (typeof incoming !== 'object' || incoming === null)) {
+            current.set(new utils_1.EditWrapper(incoming));
+            this.enqueueEditCallbacks(index, oldValue);
+            return true;
+        }
+        const canHydrate = typeof (current === null || current === void 0 ? void 0 : current.hydrateFromServer) === 'function';
+        if (Array.isArray(incoming) && canHydrate && current.type === 'list') {
+            current.hydrateFromServer(incoming);
+            this.enqueueEditCallbacks(index, oldValue);
+            return true;
+        }
+        if (isPlainObject(incoming) && canHydrate && current.type === 'object') {
+            current.hydrateFromServer(incoming);
+            this.enqueueEditCallbacks(index, oldValue);
+            return true;
+        }
+        return false;
+    }
+    notifyIndexWaiters(index) {
+        var _b, _c;
+        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + index);
+        if (this.multyx.events.has(propSymbol)) {
+            this.multyx[utils_1.Done].push(...((_c = (_b = this.multyx.events.get(propSymbol)) === null || _b === void 0 ? void 0 : _b.map(e => () => e(this.list[index]))) !== null && _c !== void 0 ? _c : []));
+        }
+    }
+    enqueueEditCallbacks(index, oldValue) {
+        for (const listener of this.editCallbacks) {
+            this.multyx[utils_1.Add](() => listener(index, this.get(index), oldValue));
+        }
+    }
 }
 _a = Symbol.toPrimitive;
 exports.default = MultyxClientList;

package/dist/items/object.d.ts

@@ -4,6 +4,7 @@ import type Multyx from '../index';
 import { type MultyxClientList, type MultyxClientItem } from ".";
 import MultyxClientValue from "./value";
 export default class MultyxClientObject {
+    readonly type = "object";
     protected object: RawObject<MultyxClientItem>;
     private multyx;
     propertyPath: string[];
@@ -33,4 +34,7 @@ export default class MultyxClientObject {
      * @param constraints Packed constraints object mirroring MultyxClientObject shape
      */
     [Unpack](constraints: RawObject): void;
+    hydrateFromServer(value: RawObject): void;
+    private applyServerValue;
+    private notifyPropertyWaiters;
 }

package/dist/items/object.js

@@ -8,6 +8,7 @@ const utils_1 = require("../utils");
 const _1 = require(".");
 const router_1 = __importDefault(require("./router"));
 const value_1 = __importDefault(require("./value"));
+const isPlainObject = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
 class MultyxClientObject {
     get value() {
         const parsed = {};
@@ -33,6 +34,7 @@ class MultyxClientObject {
         (_a = this.get(updatePath[0])) === null || _a === void 0 ? void 0 : _a[utils_1.Edit](updatePath.slice(1), value);
     }
     constructor(multyx, object, propertyPath = [], editable) {
+        this.type = 'object';
         this.editCallbacks = [];
         this.object = {};
         this.propertyPath = propertyPath;
@@ -109,32 +111,30 @@ class MultyxClientObject {
         return next.set(path.slice(1), value);
     }
     set(property, value) {
-        var _a, _b;
         if (Array.isArray(property))
             return this.recursiveSet(property, value);
         const serverSet = value instanceof utils_1.EditWrapper;
         const allowed = serverSet || this.editable;
-        if (serverSet || (0, _1.IsMultyxClientItem)(value))
-            value = value.value;
-        if (value === undefined)
+        const incoming = (serverSet || (0, _1.IsMultyxClientItem)(value)) ? value.value : value;
+        if (incoming === undefined)
             return this.delete(property, serverSet);
+        if (serverSet && this.applyServerValue(property, incoming)) {
+            return true;
+        }
         // Only create new MultyxClientItem when needed
-        if (this.object[property] instanceof value_1.default && typeof value != 'object') {
-            return this.object[property].set(serverSet ? new utils_1.EditWrapper(value) : value);
+        if (this.object[property] instanceof value_1.default && (typeof incoming !== 'object' || incoming === null)) {
+            return this.object[property].set(serverSet ? new utils_1.EditWrapper(incoming) : incoming);
         }
         // Attempting to edit property not editable to client
         if (!allowed) {
             if (this.multyx.options.verbose) {
-                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + property}' to ${value}`);
+                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + property}' to ${incoming}`);
             }
             return false;
         }
         // Creating a new value
-        this.object[property] = new ((0, router_1.default)(value))(this.multyx, serverSet ? new utils_1.EditWrapper(value) : value, [...this.propertyPath, property], this.editable);
-        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + property);
-        if (this.multyx.events.has(propSymbol)) {
-            this.multyx[utils_1.Done].push(...((_b = (_a = this.multyx.events.get(propSymbol)) === null || _a === void 0 ? void 0 : _a.map(e => () => e(this.object[property]))) !== null && _b !== void 0 ? _b : []));
-        }
+        this.object[property] = new ((0, router_1.default)(incoming))(this.multyx, serverSet ? new utils_1.EditWrapper(incoming) : incoming, [...this.propertyPath, property], this.editable);
+        this.notifyPropertyWaiters(property);
         return true;
     }
     delete(property, native = false) {
@@ -189,5 +189,43 @@ class MultyxClientObject {
             (_a = this.object[prop]) === null || _a === void 0 ? void 0 : _a[utils_1.Unpack](constraints[prop]);
         }
     }
+    hydrateFromServer(value) {
+        if (!isPlainObject(value))
+            return;
+        const remaining = new Set(Object.keys(this.object));
+        for (const [key, entry] of Object.entries(value)) {
+            remaining.delete(key);
+            this.set(key, new utils_1.EditWrapper(entry));
+        }
+        for (const key of remaining) {
+            this.delete(key, true);
+        }
+    }
+    applyServerValue(property, incoming) {
+        const current = this.object[property];
+        if (!current)
+            return false;
+        if (current instanceof value_1.default && (typeof incoming !== 'object' || incoming === null)) {
+            current.set(new utils_1.EditWrapper(incoming));
+            return true;
+        }
+        const canHydrate = typeof (current === null || current === void 0 ? void 0 : current.hydrateFromServer) === 'function';
+        if (Array.isArray(incoming) && canHydrate && current.type === 'list') {
+            current.hydrateFromServer(incoming);
+            return true;
+        }
+        if (isPlainObject(incoming) && canHydrate && current.type === 'object') {
+            current.hydrateFromServer(incoming);
+            return true;
+        }
+        return false;
+    }
+    notifyPropertyWaiters(property) {
+        var _a, _b;
+        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + property);
+        if (this.multyx.events.has(propSymbol)) {
+            this.multyx[utils_1.Done].push(...((_b = (_a = this.multyx.events.get(propSymbol)) === null || _a === void 0 ? void 0 : _a.map(e => () => e(this.object[property]))) !== null && _b !== void 0 ? _b : []));
+        }
+    }
 }
 exports.default = MultyxClientObject;

package/dist/items/value.d.ts

@@ -12,6 +12,10 @@ export default class MultyxClientValue {
     private readModifiers;
     private editCallbacks;
     get value(): Value;
+    private interpolationModifier?;
+    private latestSample?;
+    private previousSample?;
+    private interpolationFrameMs;
     set value(v: Value);
     addReadModifier(modifier: (value: Value) => Value): void;
     addEditCallback(callback: (value: Value, previousValue: Value) => void): void;
@@ -27,4 +31,10 @@ export default class MultyxClientValue {
     toString: () => string;
     valueOf: () => Value;
     [Symbol.toPrimitive]: () => Value;
+    Lerp(maxFrameDuration?: number): this;
+    PredictiveLerp(maxFrameDuration?: number): this;
+    private applyInterpolation;
+    private attachInterpolationModifier;
+    private captureSample;
+    private interpolateValue;
 }

package/dist/items/value.js

@@ -3,12 +3,14 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const message_1 = require("../message");
 const utils_1 = require("../utils");
+const DEFAULT_INTERPOLATION_FRAME_MS = 250;
 class MultyxClientValue {
     get value() {
         return this.readModifiers.reduce((value, modifier) => modifier(value), this._value);
     }
     set value(v) {
         this._value = v;
+        this.captureSample(v);
     }
     addReadModifier(modifier) {
         this.readModifiers.push(modifier);
@@ -25,6 +27,7 @@ class MultyxClientValue {
         var _b, _c;
         this.readModifiers = [];
         this.editCallbacks = [];
+        this.interpolationFrameMs = DEFAULT_INTERPOLATION_FRAME_MS;
         /* Native methods to allow MultyxValue to be treated as primitive */
         this.toString = () => this.value.toString();
         this.valueOf = () => this.value;
@@ -64,7 +67,7 @@ class MultyxClientValue {
                 return false;
             }
         }
-        if (this.value === nv) {
+        if (this._value === nv) {
             this.value = nv;
             return true;
         }
@@ -95,6 +98,57 @@ class MultyxClientValue {
             this.constraints[cname] = constraint;
         }
     }
+    Lerp(maxFrameDuration = DEFAULT_INTERPOLATION_FRAME_MS) {
+        return this.applyInterpolation('lerp', maxFrameDuration);
+    }
+    PredictiveLerp(maxFrameDuration = DEFAULT_INTERPOLATION_FRAME_MS) {
+        return this.applyInterpolation('predictive', maxFrameDuration);
+    }
+    applyInterpolation(mode, maxFrameDuration) {
+        if (typeof this._value !== 'number' || Number.isNaN(this._value)) {
+            throw new Error(`MultyxClientValue.${mode === 'lerp' ? 'Lerp' : 'PredictiveLerp'} can only be applied to numeric values`);
+        }
+        this.interpolationFrameMs = Math.max(1, maxFrameDuration);
+        this.attachInterpolationModifier(mode);
+        return this;
+    }
+    attachInterpolationModifier(mode) {
+        if (this.interpolationModifier) {
+            this.readModifiers = this.readModifiers.filter(fn => fn !== this.interpolationModifier);
+        }
+        this.interpolationModifier = (value) => this.interpolateValue(value, mode);
+        this.readModifiers.push(this.interpolationModifier);
+    }
+    captureSample(value) {
+        if (typeof value !== 'number' || Number.isNaN(value)) {
+            this.latestSample = undefined;
+            this.previousSample = undefined;
+            return;
+        }
+        const now = Date.now();
+        if (!this.latestSample) {
+            this.latestSample = { value, time: now };
+            return;
+        }
+        this.previousSample = Object.assign({}, this.latestSample);
+        this.latestSample = { value, time: now };
+    }
+    interpolateValue(baseValue, mode) {
+        if (typeof baseValue !== 'number' || !this.latestSample || !this.previousSample) {
+            return baseValue;
+        }
+        const durationRaw = this.latestSample.time - this.previousSample.time;
+        if (durationRaw <= 0)
+            return baseValue;
+        const duration = Math.max(1, Math.min(durationRaw, this.interpolationFrameMs));
+        const elapsed = Math.max(0, Math.min(Date.now() - this.latestSample.time, duration));
+        const ratio = duration === 0 ? 1 : elapsed / duration;
+        const delta = this.latestSample.value - this.previousSample.value;
+        if (mode === 'predictive') {
+            return this.latestSample.value + delta * ratio;
+        }
+        return this.previousSample.value + delta * ratio;
+    }
 }
 _a = Symbol.toPrimitive;
 exports.default = MultyxClientValue;

package/dist/message.d.ts

@@ -9,8 +9,6 @@ export declare function UncompressUpdate(str: string): {
     name?: undefined;
     response?: undefined;
     uuid?: undefined;
-    publicData?: undefined;
-    clientUUID?: undefined;
     client?: undefined;
     tps?: undefined;
     constraintTable?: undefined;
@@ -27,8 +25,6 @@ export declare function UncompressUpdate(str: string): {
     name?: undefined;
     response?: undefined;
     uuid?: undefined;
-    publicData?: undefined;
-    clientUUID?: undefined;
     client?: undefined;
     tps?: undefined;
     constraintTable?: undefined;
@@ -45,8 +41,6 @@ export declare function UncompressUpdate(str: string): {
     property?: undefined;
     data?: undefined;
     uuid?: undefined;
-    publicData?: undefined;
-    clientUUID?: undefined;
     client?: undefined;
     tps?: undefined;
     constraintTable?: undefined;
@@ -56,15 +50,13 @@ export declare function UncompressUpdate(str: string): {
 } | {
     instruction: string;
     uuid: string;
-    publicData: any;
+    data: any;
     team?: undefined;
     path?: undefined;
     value?: undefined;
     property?: undefined;
-    data?: undefined;
     name?: undefined;
     response?: undefined;
-    clientUUID?: undefined;
     client?: undefined;
     tps?: undefined;
     constraintTable?: undefined;
@@ -73,7 +65,7 @@ export declare function UncompressUpdate(str: string): {
     space?: undefined;
 } | {
     instruction: string;
-    clientUUID: string;
+    client: string;
     team?: undefined;
     path?: undefined;
     value?: undefined;
@@ -82,8 +74,6 @@ export declare function UncompressUpdate(str: string): {
     name?: undefined;
     response?: undefined;
     uuid?: undefined;
-    publicData?: undefined;
-    client?: undefined;
     tps?: undefined;
     constraintTable?: undefined;
     clients?: undefined;
@@ -105,8 +95,6 @@ export declare function UncompressUpdate(str: string): {
     name?: undefined;
     response?: undefined;
     uuid?: undefined;
-    publicData?: undefined;
-    clientUUID?: undefined;
 } | undefined;
 export declare function CompressUpdate(update: Update): string;
 export declare class Message {

package/dist/message.js

@@ -23,9 +23,9 @@ function UncompressUpdate(str) {
     if (instruction == '5')
         return { instruction: 'resp', name: specifier, response: data[0] };
     if (instruction == '6')
-        return { instruction: 'conn', uuid: specifier, publicData: data[0] };
+        return { instruction: 'conn', uuid: specifier, data: data[0] };
     if (instruction == '7')
-        return { instruction: 'dcon', clientUUID: specifier };
+        return { instruction: 'dcon', client: specifier };
     if (instruction == '8')
         return {
             instruction: 'init',
@@ -54,7 +54,7 @@ function CompressUpdate(update) {
         code = 2;
         pieces = [update.name, JSON.stringify(update.response)];
     }
-    if (!pieces || !code)
+    if (!pieces || code === undefined)
         return '';
     let compressed = code.toString();
     for (let i = 0; i < pieces.length; i++) {

package/dist/utils.js

@@ -29,33 +29,62 @@ exports.EditWrapper = EditWrapper;
  * ```
  */
 function Interpolate(object, property, interpolationCurve) {
+    if (!Array.isArray(interpolationCurve) || interpolationCurve.length === 0) {
+        throw new Error('Interpolation curve must contain at least one slice');
+    }
+    const curve = [...interpolationCurve].sort((a, b) => a.time - b.time);
+    const curveMaxTime = curve[curve.length - 1].time;
+    const usesNormalizedCurve = curveMaxTime <= 1;
+    const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
     let start = { value: object[property], time: Date.now() };
     let end = { value: object[property], time: Date.now() };
     Object.defineProperty(object, property, {
+        configurable: true,
+        enumerable: true,
         get: () => {
-            const time = end.time - start.time;
-            let lower = interpolationCurve[0];
-            let upper = interpolationCurve[0];
-            for (const slice of interpolationCurve) {
-                if (time > slice.time && slice.time > lower.time)
+            if (start.time === end.time)
+                return end.value;
+            const now = Date.now();
+            const duration = Math.max(end.time - start.time, 1);
+            const elapsed = Math.max(0, now - end.time);
+            const targetTime = usesNormalizedCurve
+                ? clamp(elapsed / duration, 0, curveMaxTime)
+                : clamp(elapsed, 0, curveMaxTime);
+            let lower = curve[0];
+            let upper = curve[curve.length - 1];
+            for (const slice of curve) {
+                if (slice.time <= targetTime) {
                     lower = slice;
-                if (time < slice.time && slice.time < upper.time)
-                    upper = slice;
+                    continue;
+                }
+                upper = slice;
+                break;
+            }
+            let ratio;
+            if (upper.time === lower.time) {
+                ratio = lower.progress;
+            }
+            else {
+                const sliceTime = (targetTime - lower.time) / (upper.time - lower.time);
+                ratio = lower.progress + sliceTime * (upper.progress - lower.progress);
             }
-            const sliceTime = (time - lower.time) / (upper.time - lower.time);
-            const ratio = lower.progress + sliceTime * (upper.progress - lower.progress);
             if (Number.isNaN(ratio))
                 return start.value;
-            return end.value * ratio + start.value * (1 - ratio);
+            if (typeof start.value === 'number' && typeof end.value === 'number') {
+                return end.value * ratio + start.value * (1 - ratio);
+            }
+            return ratio >= 1 ? end.value : start.value;
         },
         set: (value) => {
+            const now = Date.now();
             // Don't lerp between edit requests sent in same frame
-            if (Date.now() - end.time < 10) {
+            if (now - end.time < 10) {
                 end.value = value;
+                end.time = now;
                 return true;
             }
             start = Object.assign({}, end);
-            end = { value, time: Date.now() };
+            end = { value, time: now };
             return true;
         }
     });

package/multyx.js

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Multyx=e():t.Multyx=e()}(self,(()=>(()=>{"use strict";var t={376:(t,e,s)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.Controller=void 0;const i=s(210);e.Controller=class{constructor(t){this.listening=new Set,this.ws=t,this.preventDefault=!1,this.keys={},this.mouse={x:NaN,y:NaN,down:!1,centerX:0,centerY:0,scaleX:1,scaleY:1},document.addEventListener("keydown",(t=>{this.preventDefault&&t.preventDefault;const e=t.key.toLowerCase();this.keys[e]&&this.listening.has("keyhold")&&this.relayInput("keyhold",{code:e}),this.keys[t.code]&&this.listening.has("keyhold")&&this.relayInput("keyhold",{code:t.code}),this.listening.has(e)&&!this.keys[e]&&this.relayInput("keydown",{code:t.key}),this.listening.has(t.code)&&!this.keys[t.code]&&this.relayInput("keydown",{code:t.code}),this.keys[e]=!0,this.keys[t.code]=!0})),document.addEventListener("keyup",(t=>{this.preventDefault&&t.preventDefault;const e=t.key.toLowerCase();delete this.keys[e],delete this.keys[t.code],this.listening.has(e)&&this.relayInput("keyup",{code:e}),this.listening.has(t.code)&&this.relayInput("keyup",{code:t.code})})),document.addEventListener("mousedown",(t=>{if(this.preventDefault&&t.preventDefault,this.mouseGetter){const t=this.mouseGetter();this.mouse.x=t.x,this.mouse.y=t.y}else this.mouse.x=(t.clientX-this.mouse.centerX)/this.mouse.scaleX,this.mouse.y=(t.clientY-this.mouse.centerY)/this.mouse.scaleY;this.mouse.down=!0,this.listening.has("mousedown")&&this.relayInput("mousedown",{x:this.mouse.x,y:this.mouse.y})})),document.addEventListener("mouseup",(t=>{if(this.preventDefault&&t.preventDefault,this.mouseGetter){const t=this.mouseGetter();this.mouse.x=t.x,this.mouse.y=t.y}else this.mouse.x=(t.clientX-this.mouse.centerX)/this.mouse.scaleX,this.mouse.y=(t.clientY-this.mouse.centerY)/this.mouse.scaleY;this.mouse.down=!1,this.listening.has("mouseup")&&this.relayInput("mouseup",{x:this.mouse.x,y:this.mouse.y})})),document.addEventListener("mousemove",(t=>{if(this.preventDefault&&t.preventDefault,this.mouseGetter){const t=this.mouseGetter();this.mouse.x=t.x,this.mouse.y=t.y}else this.mouse.x=(t.clientX-this.mouse.centerX)/this.mouse.scaleX,this.mouse.y=(t.clientY-this.mouse.centerY)/this.mouse.scaleY;this.listening.has("mousemove")&&this.relayInput("mousemove",{x:this.mouse.x,y:this.mouse.y})}))}mapCanvasPosition(t,e){const s="top"in e,i="bottom"in e,n="left"in e,o="right"in e,r=e.anchor,l=t.getBoundingClientRect(),h=(t,...e)=>{const s=t?"Cannot include value for ":"Must include value for ",i=1==e.length?e[0]:e.slice(0,-1).join(", ")+(t?" and ":" or ")+e.slice(-1)[0],n=r?" if anchoring at "+r:" if not anchoring";console.error(s+i+n)},a=l.width/l.height,u=l.height/l.width;if((Number.isNaN(a)||Number.isNaN(u))&&console.error("Canvas element bounding box is flat, canvas must be present on the screen"),r){if("center"==r){if(s&&i&&e.top!==-e.bottom||n&&o&&e.left!==-e.right)return h(!0,"top","bottom","left","right");s?(e.left=n?e.left:o?-e.right:-Math.abs(a*e.top),e.right=n?-e.left:o?e.right:Math.abs(a*e.top),e.bottom=-e.top):i?(e.left=n?e.left:o?-e.right:-Math.abs(a*e.bottom),e.right=n?-e.left:o?e.right:Math.abs(a*e.bottom),e.top=-e.bottom):n?(e.top=s?e.top:i?-e.bottom:-Math.abs(u*e.left),e.bottom=s?-e.top:i?e.bottom:Math.abs(u*e.left),e.right=-e.left):o&&(e.top=s?e.top:i?-e.bottom:-Math.abs(u*e.right),e.bottom=s?-e.top:i?e.bottom:Math.abs(u*e.right),e.left=-e.right)}else if("bottom"==r){if(!n&&!o&&!s)return h(!1,"left","right","top");if(e.bottom)return h(!0,"bottom");e.bottom=0,n?(e.top=Math.abs(u*e.left*2),e.right=-e.left):o?(e.top=Math.abs(u*e.right*2),e.left=-e.right):(e.left=-Math.abs(a*e.top/2),e.right=-e.left)}else if("top"==r){if(!n&&!o&&!i)return h(!1,"left","right","bottom");if(e.top)return h(!0,"top");e.top=0,n?(e.bottom=Math.abs(u*e.left*2),e.right=-e.left):o?(e.bottom=Math.abs(u*e.right*2),e.left=-e.right):(e.left=-Math.abs(a*e.bottom/2),e.right=-e.left)}else if("left"==r){if(!s&&!i&&!o)return h(!1,"top","bottom","right");if(n)return h(!0,"left");e.left=0,s?(e.right=-Math.abs(a*e.top*2),e.bottom=-e.top):i?(e.right=Math.abs(a*e.bottom*2),e.top=-e.bottom):(e.top=-Math.abs(u*e.right/2),e.bottom=-e.top)}else if("right"==r){if(!s&&!i&&!n)return h(!1,"top","bottom","left");if(o)return h(!0,"right");e.right=0,s?(e.left=-Math.abs(a*e.top*2),e.bottom=-e.top):i?(e.left=Math.abs(a*e.bottom*2),e.top=-e.bottom):(e.top=-Math.abs(u*e.right/2),e.bottom=-e.top)}else if("topleft"==r){if(!o&&!i)return h(!1,"right","bottom");if(n||s)return h(!0,"left","top");e.left=e.top=0,o?e.bottom=Math.abs(u*e.right):e.right=Math.abs(a*e.bottom)}else if("topright"==r){if(!n&&!i)return h(!1,"left","bottom");if(o||s)return h(!0,"right","top");e.right=e.top=0,n?e.bottom=Math.abs(u*e.left):e.left=Math.abs(a*e.bottom)}else if("bottomleft"==r){if(!o&&!s)return h(!1,"right","top");if(i||n)return h(!0,"bottom","left");e.left=e.bottom=0,o?e.top=Math.abs(u*e.right):e.right=Math.abs(a*e.top)}else if("bottomright"==r){if(!s&&!n)return h(!1,"top","left");if(o||i)return h(!0,"bottom","right");e.right=e.bottom=0,n?e.top=Math.abs(u*e.left):e.left=Math.abs(a*e.top)}}else{if(!s&&!i)return h(!1,"top","bottom");if(i?s||(e.top=e.bottom-t.height):e.bottom=e.top+t.height,!n&&!o)return h(!1,"left","right");o?n||(e.left=e.right-t.width):e.right=e.left+t.width}const c=t.getContext("2d");null==c||c.setTransform(1,0,0,1,0,0),t.width=Math.floor(Math.abs(e.right-e.left)),t.height=Math.floor(Math.abs(e.bottom-e.top)),e.right<e.left&&(null==c||c.scale(-1,1)),e.top>e.bottom&&(null==c||c.scale(1,-1)),null==c||c.translate(-e.left,-e.top)}mapMousePosition(t,e,s=document.body,i=1,n=i){const o=window.innerWidth/(s instanceof HTMLCanvasElement?s.width:s.clientWidth),r=window.innerHeight/(s instanceof HTMLCanvasElement?s.height:s.clientHeight),l=s.getBoundingClientRect();this.mouse.centerX=l.left+t*o,this.mouse.centerY=l.top+e*r,this.mouse.scaleX=i*o,this.mouse.scaleY=n*r}mapMouseToCanvas(t){const e=t.getContext("2d"),s=null==e?void 0:e.getTransform(),i=t.getBoundingClientRect(),n=i.width/t.width,o=i.height/t.height;this.mouse.centerX=i.left+(null==s?void 0:s.e)*n,this.mouse.centerY=i.top+(null==s?void 0:s.f)*o,this.mouse.scaleX=n*(null==s?void 0:s.a),this.mouse.scaleY=o*(null==s?void 0:s.d)}setMouseAs(t){this.mouseGetter=t}relayInput(t,e){if(1!==this.ws.readyState)throw new Error("Websocket connection is "+(2==this.ws.readyState?"closing":"closed"));this.ws.send(i.Message.Native(Object.assign({instruction:"input",input:t},e?{data:e}:{})))}}},34:function(t,e,s){var i=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0}),e.MultyxClientValue=e.MultyxClientObject=e.MultyxClientList=void 0,e.IsMultyxClientItem=function(t){return t instanceof n.default||t instanceof o.default||t instanceof r.default};const n=i(s(70));e.MultyxClientList=n.default;const o=i(s(614));e.MultyxClientObject=o.default;const r=i(s(501));e.MultyxClientValue=r.default},70:function(t,e,s){var i,n=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0});const o=s(34),r=s(787),l=n(s(735)),h=s(210);class a{addEditCallback(t){this.editCallbacks.push(t)}get value(){var t;const e=[];for(let s=0;s<this.length;s++)e[s]=null===(t=this.get(s))||void 0===t?void 0:t.value;return e}get length(){return this.list.length}set length(t){this.list.length=t}handleShiftOperation(t,e){const s=t>=0?e>=0?"right":"left":0==e?"reverse":e<0?"length":"unknown";switch(s){case"reverse":for(let t=0;t<Math.floor(this.length/2);t++){const e=this.list[t];this.list[t]=this.list[this.length-1-t],this.list[this.length-1-t]=e}break;case"left":for(let s=t;s<this.length;s++)s+e<0||(this.list[s+e]=this.list[s]);break;case"right":for(let s=this.length-1;s>=t;s--)this.list[s+e]=this.list[s];break;case"length":this.length+=e;break;default:this.multyx.options.verbose&&console.error("Unknown shift operation: "+s)}}constructor(t,e,s=[],n){this.editCallbacks=[],this.toString=()=>this.value.toString(),this.valueOf=()=>this.value,this[i]=()=>this.value,this.list=[],this.propertyPath=s,this.multyx=t,this.editable=n;const o=e instanceof r.EditWrapper;e instanceof a&&(e=e.value),e instanceof r.EditWrapper&&(e=e.value);for(let t=0;t<e.length;t++)this.set(t,o?new r.EditWrapper(e[t]):e[t]);return new Proxy(this,{has:(t,e)=>"number"==typeof e?t.has(e):e in t,get:(t,e)=>e in t?t[e]:(isNaN(parseInt(e))||(e=parseInt(e)),t.get(e)),set:(t,e,s)=>e in t?(t[e]=s,!0):!!t.set(e,s),deleteProperty:(t,e)=>"number"==typeof e&&t.delete(e)})}has(t){return t>=0&&t<this.length}get(t){if("number"==typeof t)return this.list[t];if(0==t.length)return this;if(1==t.length)return this.list[parseInt(t[0])];const e=this.list[parseInt(t[0])];return!e||e instanceof o.MultyxClientValue?void 0:e.get(t.slice(1))}recursiveSet(t,e){if(0==t.length)return this.multyx.options.verbose&&console.error(`Attempting to edit MultyxClientList with no path. Setting '${this.propertyPath.join(".")}' to ${e}`),!1;if("shift"==t[0]&&e instanceof r.EditWrapper)return this.handleShiftOperation(parseInt(t[1]),e.value),!0;if(1==t.length)return this.set(parseInt(t[0]),e);let s=this.get(parseInt(t[0]));return(s instanceof o.MultyxClientValue||null==s)&&(this.set(parseInt(t[0]),new r.EditWrapper({})),s=this.get(parseInt(t[0]))),s.set(t.slice(1),e)}set(t,e){var s,i;if(Array.isArray(t))return this.recursiveSet(t,e);const n=this.get(t),h=e instanceof r.EditWrapper,a=h||this.editable;if((h||(0,o.IsMultyxClientItem)(e))&&(e=e.value),void 0===e)return this.delete(t,h);if(this.list[t]instanceof o.MultyxClientValue&&"object"!=typeof e)return this.list[t].set(h?new r.EditWrapper(e):e);if(!a)return this.multyx.options.verbose&&console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join(".")+"."+t}' to ${e}`),!1;this.list[t]=new((0,l.default)(e))(this.multyx,h?new r.EditWrapper(e):e,[...this.propertyPath,t.toString()],this.editable);const u=Symbol.for("_"+this.propertyPath.join(".")+"."+t);this.multyx.events.has(u)&&this.multyx[r.Done].push(...null!==(i=null===(s=this.multyx.events.get(u))||void 0===s?void 0:s.map((e=>()=>e(this.list[t]))))&&void 0!==i?i:[]);for(const e of this.editCallbacks)this.multyx[r.Add]((()=>e(t,this.get(t),n)));return!0}delete(t,e=!1){const s=this.get(t);if("string"==typeof t&&(t=parseInt(t)),!this.editable&&!e)return this.multyx.options.verbose&&console.error(`Attempting to delete property that is not editable. Deleting '${this.propertyPath.join(".")+"."+t}'`),!1;delete this.list[t];for(const e of this.editCallbacks)this.multyx[r.Add]((()=>e(t,void 0,s)));return e||this.multyx.ws.send(h.Message.Native({instruction:"edit",path:[...this.propertyPath,t.toString()],value:void 0})),!0}await(t){if(this.has(t))return Promise.resolve(this.get(t));const e=Symbol.for("_"+this.propertyPath.join(".")+"."+t);return new Promise((t=>this.multyx.on(e,t)))}push(...t){for(const e of t)this.set(this.length,e);return this.length}pop(){if(0===this.length)return;const t=this.get(this.length);return this.delete(this.length),t}unshift(...t){for(let e=this.length-1;e>=0;e--)e>=t.length?this.set(e,this.get(e-t.length)):this.set(e,t[e]);return this.length}shift(){if(0==this.length)return;this.length--;const t=this.get(0);for(let t=0;t<this.length;t++)this.set(t,this.get(t+1));return t}slice(t,e){return this.list.slice(t,e)}splice(t,e,...s){return this.list.splice(t,null!=e?e:0,...s)}setSplice(t,e,...s){void 0===e&&(e=this.length-t);let i=s.length-e;if(i>0)for(let s=this.length-1;s>=t+e;s--)this.set(s+i,this.get(s));else if(i<0){for(let s=t+e;s<this.length;s++)this.set(s+i,this.get(s));const s=this.length;for(let t=s+i;t<s;t++)this.set(t,void 0)}for(let e=t;e<s.length;e++)this.set(e,s[e])}filter(t){return this.list.filter(((e,s)=>t(e,s,this)))}setFilter(t){const e=[];for(let s=0;s<this.length;s++)e.push(t(this.get(s),s,this));let s=0;for(let t=0;t<e.length;t++)e[t]&&s&&this.set(t-s,this.get(t)),e[t]||s--}map(t){const e=[];for(let s=0;s<this.length;s++)e.push(t(this.get(s),s,this));return e}flat(){return this.list.flat()}setFlat(){for(let t=0;t<this.length;t++){const e=this.get(t);if(e instanceof a)for(let s=0;s<e.length;s++)t++,this.set(t,e[s])}}reduce(t,e){for(let s=0;s<this.length;s++)e=t(e,this.get(s),s,this);return e}reduceRight(t,e){for(let s=this.length-1;s>=0;s--)e=t(e,this.get(s),s,this);return e}reverse(){let t=this.length-1;for(let e=0;e<t;e++){const s=this.get(e),i=this.get(t);this.set(e,i),this.set(t,s)}return this}forEach(t){for(let e=0;e<this.length;e++)t(this.get(e),e,this)}every(t){for(let e=0;e<this.length;e++)if(!t(this.get(e),e,this))return!1;return!0}some(t){for(let e=0;e<this.length;e++)if(t(this.get(e),e,this))return!0;return!1}find(t){for(let e=0;e<this.length;e++)if(t(this.get(e),e,this))return this.get(e)}findIndex(t){for(let e=0;e<this.length;e++)if(t(this.get(e),e,this))return e;return-1}entries(){const t=[];for(let e=0;e<this.length;e++)t.push([this.get(e),e]);return t}keys(){return Array(this.length).fill(0).map(((t,e)=>e))}[r.Edit](){}[r.Unpack](t){var e;for(let s=0;s<this.length;s++)null===(e=this.get(s))||void 0===e||e[r.Unpack](t[s])}[Symbol.iterator](){const t=[];for(let e=0;e<this.length;e++)t[e]=this.get(e);return t[Symbol.iterator]()}}i=Symbol.toPrimitive,e.default=a},614:function(t,e,s){var i=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0});const n=s(210),o=s(787),r=s(34),l=i(s(735)),h=i(s(501));class a{get value(){const t={};for(const e in this.object)t[e]=this.object[e];return t}addEditCallback(t){this.editCallbacks.push(t)}[o.Edit](t,e){var s;1!=t.length?(0==t.length&&this.multyx.options.verbose&&console.error("Update path is empty. Attempting to edit MultyxClientObject with no path."),this.has(t[0])||this.set(t[0],new o.EditWrapper({})),null===(s=this.get(t[0]))||void 0===s||s[o.Edit](t.slice(1),e)):this.set(t[0],new o.EditWrapper(e))}constructor(t,e,s=[],i){this.editCallbacks=[],this.object={},this.propertyPath=s,this.multyx=t,this.editable=i;const n=e instanceof o.EditWrapper;e instanceof a&&(e=e.value),e instanceof o.EditWrapper&&(e=e.value);for(const t in e)this.set(t,n?new o.EditWrapper(e[t]):e[t]);if(this.constructor===a)return new Proxy(this,{has:(t,e)=>t.has(e),get:(t,e)=>e in t?t[e]:t.get(e),set:(t,e,s)=>e in t?(t[e]=s,!0):t.set(e,s),deleteProperty:(t,e)=>t.delete(e,!1)})}has(t){return t in this.object}get(t){if("string"==typeof t)return this.object[t];if(0==t.length)return this;if(1==t.length)return this.object[t[0]];const e=this.object[t[0]];return!e||e instanceof h.default?void 0:e.get(t.slice(1))}recursiveSet(t,e){if(0==t.length)return this.multyx.options.verbose&&console.error(`Attempting to edit MultyxClientObject with no path. Setting '${this.propertyPath.join(".")}' to ${e}`),!1;if(1==t.length)return this.set(t[0],e);let s=this.get(t[0]);return(s instanceof h.default||null==s)&&(isNaN(parseInt(t[1]))?(this.set(t[0],new o.EditWrapper({})),s=this.get(t[0])):(this.set(t[0],new o.EditWrapper([])),s=this.get(t[0]))),s.set(t.slice(1),e)}set(t,e){var s,i;if(Array.isArray(t))return this.recursiveSet(t,e);const n=e instanceof o.EditWrapper,a=n||this.editable;if((n||(0,r.IsMultyxClientItem)(e))&&(e=e.value),void 0===e)return this.delete(t,n);if(this.object[t]instanceof h.default&&"object"!=typeof e)return this.object[t].set(n?new o.EditWrapper(e):e);if(!a)return this.multyx.options.verbose&&console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join(".")+"."+t}' to ${e}`),!1;this.object[t]=new((0,l.default)(e))(this.multyx,n?new o.EditWrapper(e):e,[...this.propertyPath,t],this.editable);const u=Symbol.for("_"+this.propertyPath.join(".")+"."+t);return this.multyx.events.has(u)&&this.multyx[o.Done].push(...null!==(i=null===(s=this.multyx.events.get(u))||void 0===s?void 0:s.map((e=>()=>e(this.object[t]))))&&void 0!==i?i:[]),!0}delete(t,e=!1){return this.editable||e?(delete this.object[t],e||this.multyx.ws.send(n.Message.Native({instruction:"edit",path:[...this.propertyPath,t],value:void 0})),!0):(this.multyx.options.verbose&&console.error(`Attempting to delete property that is not editable. Deleting '${this.propertyPath.join(".")+"."+t}'`),!1)}keys(){return Object.keys(this.object)}values(){return Object.values(this.object)}entries(){const t=[];for(let e in this.object)t.push([e,this.get(e)]);return t}await(t){if(this.has(t))return Promise.resolve(this.get(t));const e=Symbol.for("_"+this.propertyPath.join(".")+"."+t);return new Promise((t=>this.multyx.on(e,t)))}[o.Unpack](t){var e;for(const s in t)null===(e=this.object[s])||void 0===e||e[o.Unpack](t[s])}}e.default=a},735:(t,e,s)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(t){return Array.isArray(t)?s(70).default:"object"==typeof t?s(614).default:s(501).default}},501:(t,e,s)=>{var i;Object.defineProperty(e,"__esModule",{value:!0});const n=s(210),o=s(787);class r{get value(){return this.readModifiers.reduce(((t,e)=>e(t)),this._value)}set value(t){this._value=t}addReadModifier(t){this.readModifiers.push(t)}addEditCallback(t){this.editCallbacks.push(t)}[o.Edit](t,e){0==t.length&&this.set(new o.EditWrapper(e))}constructor(t,e,s=[],n){var r,l;this.readModifiers=[],this.editCallbacks=[],this.toString=()=>this.value.toString(),this.valueOf=()=>this.value,this[i]=()=>this.value,this.propertyPath=s,this.editable=n,this.multyx=t,this.constraints={},this.set(e);const h=Symbol.for("_"+this.propertyPath.join("."));this.multyx.events.has(h)&&this.multyx[o.Done].push(...null!==(l=null===(r=this.multyx.events.get(h))||void 0===r?void 0:r.map((t=>()=>t(this.value))))&&void 0!==l?l:[])}set(t){if(t instanceof o.EditWrapper){const e=this.value;return this.value=t.value,this.editCallbacks.forEach((s=>s(t.value,e))),!0}if(!this.editable)return this.multyx.options.verbose&&console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join(".")}' to ${t}`),!1;let e=t;for(const s in this.constraints)if(e=(0,this.constraints[s])(e),null===e)return this.multyx.options.verbose&&console.error(`Attempting to set property that failed on constraint. Setting '${this.propertyPath.join(".")}' to ${t}, stopped by constraint '${s}'`),!1;return this.value===e?(this.value=e,!0):(this.value=e,this.multyx.ws.send(n.Message.Native({instruction:"edit",path:this.propertyPath,value:e})),!0)}bindElement(t){this.addEditCallback(((e,s)=>{e!==s&&(t.innerText=e.toString())}))}[o.Unpack](t){for(const[e,s]of Object.entries(t)){const t=(0,o.BuildConstraint)(e,s);t&&(this.constraints[e]=t)}}}i=Symbol.toPrimitive,e.default=r},210:(t,e)=>{function s(t){let e,s;if("edit"==t.instruction?(e=0,s=[t.path.join("."),JSON.stringify(t.value)]):"input"==t.instruction?(e=1,s=[t.input,JSON.stringify(t.data)]):"resp"==t.instruction&&(e=2,s=[t.name,JSON.stringify(t.response)]),!s||!e)return"";let i=e.toString();for(let t=0;t<s.length;t++)i+=s[t].replace(/;/g,";_"),t<s.length-1&&(i+=";,");return JSON.stringify([i])}Object.defineProperty(e,"__esModule",{value:!0}),e.Message=void 0,e.UncompressUpdate=function(t){const[e,...s]=t.split(/;,/),i=e[0],n=e.slice(1).replace(/;_/g,";"),o=s.map((t=>t.replace(/;_/g,";"))).map((t=>"undefined"==t?void 0:JSON.parse(t)));return"0"==i?{instruction:"edit",team:!1,path:n.split("."),value:o[0]}:"1"==i?{instruction:"edit",team:!0,path:n.split("."),value:o[0]}:"2"==i?{instruction:"self",property:"controller",data:JSON.parse(n)}:"3"==i?{instruction:"self",property:"uuid",data:JSON.parse(n)}:"4"==i?{instruction:"self",property:"constraint",data:JSON.parse(n)}:"9"==i?{instruction:"self",property:"space",data:JSON.parse(n)}:"5"==i?{instruction:"resp",name:n,response:o[0]}:"6"==i?{instruction:"conn",uuid:n,publicData:o[0]}:"7"==i?{instruction:"dcon",clientUUID:n}:"8"==i?{instruction:"init",client:JSON.parse(n),tps:o[0],constraintTable:o[1],clients:o[2],teams:o[3],space:o[4]}:void 0},e.CompressUpdate=s;class i{constructor(t,e,s=!1){this.name=t,this.data=e,this.time=Date.now(),this.native=s}static BundleOperations(t,e){return Array.isArray(e)||(e=[e]),JSON.stringify(new i("_",{operations:e,deltaTime:t}))}static Native(t){return s(t)}static Parse(t){var e,s;const n=JSON.parse(t);return Array.isArray(n)?new i("_",n,!0):new i(null!==(e=n.name)&&void 0!==e?e:"",null!==(s=n.data)&&void 0!==s?s:"",!1)}static Create(t,e){if(0==t.length)throw new Error("Multyx message cannot have empty name");if("_"==t[0]&&(t="_"+t),"function"==typeof e)throw new Error("Multyx data must be JSON storable");return JSON.stringify(new i(t,e))}}e.Message=i},944:(t,e)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.DefaultOptions=void 0,e.DefaultOptions={port:8443,secure:!1,uri:"localhost",verbose:!1,logUpdateFrame:!1}},787:(t,e)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.EditWrapper=e.Edit=e.Add=e.Done=e.Unpack=void 0,e.Interpolate=function(t,e,s){let i={value:t[e],time:Date.now()},n={value:t[e],time:Date.now()};Object.defineProperty(t,e,{get:()=>{const t=n.time-i.time;let e=s[0],o=s[0];for(const i of s)t>i.time&&i.time>e.time&&(e=i),t<i.time&&i.time<o.time&&(o=i);const r=(t-e.time)/(o.time-e.time),l=e.progress+r*(o.progress-e.progress);return Number.isNaN(l)?i.value:n.value*l+i.value*(1-l)},set:t=>Date.now()-n.time<10?(n.value=t,!0):(i=Object.assign({},n),n={value:t,time:Date.now()},!0)})},e.BuildConstraint=function(t,e){return"min"==t?t=>t>=e[0]?t:e[0]:"max"==t?t=>t<=e[0]?t:e[0]:"int"==t?t=>Math.floor(t):"ban"==t?t=>e.includes(t)?null:t:"disabled"==t?t=>e[0]?null:t:t=>t},e.Unpack=Symbol("unpack"),e.Done=Symbol("done"),e.Add=Symbol("add"),e.Edit=Symbol("edit"),e.EditWrapper=class{constructor(t){this.value=t}}}},e={};function s(i){var n=e[i];if(void 0!==n)return n.exports;var o=e[i]={exports:{}};return t[i].call(o.exports,o,o.exports,s),o.exports}var i={};return(()=>{var t,e=i;const n=s(210),o=s(787),r=s(376),l=s(34),h=s(944);class a{constructor(e={},s){var i;if(this[t]=[],this.options=Object.assign(Object.assign({},h.DefaultOptions),e),!this.options.uri)throw new Error("URI is required");const o=`ws${this.options.secure?"s":""}://${this.options.uri.split("/")[0]}:${this.options.port}/${null!==(i=this.options.uri.split("/")[1])&&void 0!==i?i:""}`;this.ws=new WebSocket(o),this.ping=0,this.space="default",this.events=new Map,this.self={},this.tps=0,this.all={},this.teams=new l.MultyxClientObject(this,{},[],!0),this.clients={},this.controller=new r.Controller(this.ws),null==s||s(),this.ws.onmessage=t=>{var e,s,i,o;const r=n.Message.Parse(t.data);this.ping=2*(Date.now()-r.time),r.native?(this.parseNativeEvent(r),null===(e=this.events.get(a.Native))||void 0===e||e.forEach((t=>t(r)))):(null===(s=this.events.get(r.name))||void 0===s||s.forEach((t=>{const e=t(r.data);void 0!==e&&this.send(r.name,e)})),null===(i=this.events.get(a.Custom))||void 0===i||i.forEach((t=>t(r)))),null===(o=this.events.get(a.Any))||void 0===o||o.forEach((t=>t(r)))}}on(t,e){var s;const i=null!==(s=this.events.get(t))&&void 0!==s?s:[];i.push(e),this.events.set(t,i)}send(t,e){"_"===t[0]&&(t="_"+t);const s={instruction:"resp",name:t,response:e};this.ws.send(n.Message.Native(s))}await(t,e){return this.send(t,e),new Promise((e=>this.events.set(Symbol.for("_"+t),[e])))}loop(t,e){if(e)this.on(a.Start,(()=>setInterval(t,Math.round(1e3/e))));else{const e=()=>{t(),requestAnimationFrame(e)};this.on(a.Start,(()=>requestAnimationFrame(e)))}}[(t=o.Done,o.Add)](t){this[o.Done].push(t)}parseNativeEvent(t){var e,s,i,r,h;t.data=t.data.map(n.UncompressUpdate),this.options.logUpdateFrame&&console.log(t.data);for(const n of t.data)switch(n.instruction){case"init":this.initialize(n);for(const t of null!==(e=this.events.get(a.Start))&&void 0!==e?e:[])this[o.Done].push((()=>t(n)));this.events.has(a.Start)&&(this.events.get(a.Start).length=0);break;case"edit":if(1==n.path.length)n.team?this.teams.set(n.path[0],new o.EditWrapper(n.value)):this.clients[n.path[0]]=new l.MultyxClientObject(this,new o.EditWrapper(n.value),[n.path[0]],!1);else{const t=n.team?this.teams.get(n.path[0]):this.clients[n.path[0]];if(!t)return;t.set(n.path.slice(1),new o.EditWrapper(n.value))}for(const t of null!==(s=this.events.get(a.Edit))&&void 0!==s?s:[])this[o.Done].push((()=>t(n)));break;case"self":this.parseSelf(n);break;case"conn":this.clients[n.uuid]=new l.MultyxClientObject(this,n.data,[n.uuid],!1);for(const t of null!==(i=this.events.get(a.Connection))&&void 0!==i?i:[])this[o.Done].push((()=>t(this.clients[n.uuid])));break;case"dcon":for(const t of null!==(r=this.events.get(a.Disconnect))&&void 0!==r?r:[]){const e=this.clients[n.client].value;this[o.Done].push((()=>t(e)))}delete this.clients[n.client];break;case"resp":{const t=null===(h=this.events.get(Symbol.for("_"+n.name)))||void 0===h?void 0:h[0];this.events.delete(Symbol.for("_"+n.name)),t&&this[o.Done].push((()=>t(n.response)));break}default:this.options.verbose&&console.error("Server error: Unknown native Multyx instruction")}this[o.Done].forEach((t=>t())),this[o.Done].length=0}initialize(t){this.tps=t.tps,this.uuid=t.client.uuid,this.joinTime=t.client.joinTime,this.controller.listening=new Set(t.client.controller);for(const e of Object.keys(t.teams))this.teams[e]=new o.EditWrapper(t.teams[e]);this.all=this.teams.all,this.clients={};for(const[e,s]of Object.entries(t.clients))e!=this.uuid&&(this.clients[e]=new l.MultyxClientObject(this,new o.EditWrapper(s),[e],!1));const e=new l.MultyxClientObject(this,new o.EditWrapper(t.client.self),[this.uuid],!0);this.self=e,this.clients[this.uuid]=e;for(const[e,s]of Object.entries(t.constraintTable))(this.uuid==e?this.self:this.teams[e])[o.Unpack](s)}parseSelf(t){if("controller"==t.property)this.controller.listening=new Set(t.data);else if("uuid"==t.property)this.uuid=t.data;else if("constraint"==t.property){let e=this.uuid==t.data.path[0]?this.self:this.teams[t.data.path[0]];for(const s of t.data.path.slice(1))e=null==e?void 0:e[s];if(void 0===e)return;e[o.Unpack]({[t.data.name]:t.data.args})}else"space"==t.property&&(this.space=t.data,this.updateSpace())}updateSpace(){"default"!=this.space?document.querySelectorAll("[data-multyx-space]").forEach((t=>{t.style.display=t.dataset.multyxSpace==this.space?"block":"none",t.style.pointerEvents=t.dataset.multyxSpace==this.space?"auto":"none"})):document.querySelectorAll("[data-multyx-space]").forEach((t=>{t.style.display="block",t.style.pointerEvents="auto"}))}}a.Start=Symbol("start"),a.Connection=Symbol("connection"),a.Disconnect=Symbol("disconnect"),a.Edit=Symbol("edit"),a.Native=Symbol("native"),a.Custom=Symbol("custom"),a.Any=Symbol("any"),e.default=a})(),i.default})()));
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Multyx=e():t.Multyx=e()}(self,()=>(()=>{"use strict";var t={249:function(t,e,i){var s,n=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0});const o=i(625),r=i(703),l=n(i(416)),a=i(449);class h{addEditCallback(t){this.editCallbacks.push(t)}get value(){var t;const e=[];for(let i=0;i<this.length;i++)e[i]=null===(t=this.get(i))||void 0===t?void 0:t.value;return e}get length(){return this.list.length}set length(t){this.list.length=t}handleShiftOperation(t,e){const i=t>=0?e>=0?"right":"left":0==e?"reverse":e<0?"length":"unknown";switch(i){case"reverse":for(let t=0;t<Math.floor(this.length/2);t++){const e=this.list[t];this.list[t]=this.list[this.length-1-t],this.list[this.length-1-t]=e}break;case"left":for(let i=t;i<this.length;i++)i+e<0||(this.list[i+e]=this.list[i]);break;case"right":for(let i=this.length-1;i>=t;i--)this.list[i+e]=this.list[i];break;case"length":this.length+=e;break;default:this.multyx.options.verbose&&console.error("Unknown shift operation: "+i)}}constructor(t,e,i=[],n){this.type="list",this.editCallbacks=[],this.toString=()=>this.value.toString(),this.valueOf=()=>this.value,this[s]=()=>this.value,this.list=[],this.propertyPath=i,this.multyx=t,this.editable=n;const o=e instanceof r.EditWrapper;e instanceof h&&(e=e.value),e instanceof r.EditWrapper&&(e=e.value);for(let t=0;t<e.length;t++)this.set(t,o?new r.EditWrapper(e[t]):e[t]);return new Proxy(this,{has:(t,e)=>"number"==typeof e?t.has(e):e in t,get:(t,e)=>e in t?t[e]:(isNaN(parseInt(e))||(e=parseInt(e)),t.get(e)),set:(t,e,i)=>e in t?(t[e]=i,!0):!!t.set(e,i),deleteProperty:(t,e)=>"number"==typeof e&&t.delete(e)})}has(t){return t>=0&&t<this.length}get(t){if("number"==typeof t)return this.list[t];if(0==t.length)return this;if(1==t.length)return this.list[parseInt(t[0])];const e=this.list[parseInt(t[0])];return!e||e instanceof o.MultyxClientValue?void 0:e.get(t.slice(1))}recursiveSet(t,e){if(0==t.length)return this.multyx.options.verbose&&console.error(`Attempting to edit MultyxClientList with no path. Setting '${this.propertyPath.join(".")}' to ${e}`),!1;if("shift"==t[0]&&e instanceof r.EditWrapper)return this.handleShiftOperation(parseInt(t[1]),e.value),!0;if(1==t.length)return this.set(parseInt(t[0]),e);let i=this.get(parseInt(t[0]));return(i instanceof o.MultyxClientValue||null==i)&&(this.set(parseInt(t[0]),new r.EditWrapper({})),i=this.get(parseInt(t[0]))),!(!i||i instanceof o.MultyxClientValue)&&i.set(t.slice(1),e)}set(t,e){if(Array.isArray(t))return this.recursiveSet(t,e);const i=this.get(t),s=e instanceof r.EditWrapper,n=s||this.editable,a=s||(0,o.IsMultyxClientItem)(e)?e.value:e;if(void 0===a)return this.delete(t,s);if(s&&this.tryApplyServerValue(t,a,i))return!0;if(this.list[t]instanceof o.MultyxClientValue&&("object"!=typeof a||null===a)){const e=this.list[t].set(s?new r.EditWrapper(a):a);return this.enqueueEditCallbacks(t,i),e}return n?(this.list[t]=new((0,l.default)(a))(this.multyx,s?new r.EditWrapper(a):a,[...this.propertyPath,t.toString()],this.editable),this.notifyIndexWaiters(t),this.enqueueEditCallbacks(t,i),!0):(this.multyx.options.verbose&&console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join(".")+"."+t}' to ${a}`),!1)}delete(t,e=!1){const i=this.get(t);if("string"==typeof t&&(t=parseInt(t)),!this.editable&&!e)return this.multyx.options.verbose&&console.error(`Attempting to delete property that is not editable. Deleting '${this.propertyPath.join(".")+"."+t}'`),!1;delete this.list[t];for(const e of this.editCallbacks)this.multyx[r.Add](()=>e(t,void 0,i));return e||this.multyx.ws.send(a.Message.Native({instruction:"edit",path:[...this.propertyPath,t.toString()],value:void 0})),!0}await(t){if(this.has(t))return Promise.resolve(this.get(t));const e=Symbol.for("_"+this.propertyPath.join(".")+"."+t);return new Promise(t=>this.multyx.on(e,t))}push(...t){for(const e of t)this.set(this.length,e);return this.length}pop(){if(0===this.length)return;const t=this.get(this.length);return this.delete(this.length),t}unshift(...t){for(let e=this.length-1;e>=0;e--)e>=t.length?this.set(e,this.get(e-t.length)):this.set(e,t[e]);return this.length}shift(){if(0==this.length)return;this.length--;const t=this.get(0);for(let t=0;t<this.length;t++)this.set(t,this.get(t+1));return t}slice(t,e){return this.list.slice(t,e)}splice(t,e,...i){return this.list.splice(t,null!=e?e:0,...i)}setSplice(t,e,...i){void 0===e&&(e=this.length-t);let s=i.length-e;if(s>0)for(let i=this.length-1;i>=t+e;i--)this.set(i+s,this.get(i));else if(s<0){for(let i=t+e;i<this.length;i++)this.set(i+s,this.get(i));const i=this.length;for(let t=i+s;t<i;t++)this.set(t,void 0)}for(let e=t;e<i.length;e++)this.set(e,i[e])}filter(t){return this.list.filter((e,i)=>t(e,i,this))}setFilter(t){const e=[];for(let i=0;i<this.length;i++)e.push(t(this.get(i),i,this));let i=0;for(let t=0;t<e.length;t++)e[t]&&i&&this.set(t-i,this.get(t)),e[t]||i--}map(t){const e=[];for(let i=0;i<this.length;i++)e.push(t(this.get(i),i,this));return e}flat(){return this.list.flat()}setFlat(){for(let t=0;t<this.length;t++){const e=this.get(t);if(e instanceof h)for(let i=0;i<e.length;i++)t++,this.set(t,e[i])}}reduce(t,e){for(let i=0;i<this.length;i++)e=t(e,this.get(i),i,this);return e}reduceRight(t,e){for(let i=this.length-1;i>=0;i--)e=t(e,this.get(i),i,this);return e}reverse(){let t=this.length-1;for(let e=0;e<t;e++){const i=this.get(e),s=this.get(t);this.set(e,s),this.set(t,i)}return this}forEach(t){for(let e=0;e<this.length;e++)t(this.get(e),e,this)}every(t){for(let e=0;e<this.length;e++)if(!t(this.get(e),e,this))return!1;return!0}some(t){for(let e=0;e<this.length;e++)if(t(this.get(e),e,this))return!0;return!1}find(t){for(let e=0;e<this.length;e++)if(t(this.get(e),e,this))return this.get(e)}findIndex(t){for(let e=0;e<this.length;e++)if(t(this.get(e),e,this))return e;return-1}entries(){const t=[];for(let e=0;e<this.length;e++)t.push([this.get(e),e]);return t}keys(){return Array(this.length).fill(0).map((t,e)=>e)}[r.Edit](){}[r.Unpack](t){var e;for(let i=0;i<this.length;i++)null===(e=this.get(i))||void 0===e||e[r.Unpack](t[i])}[Symbol.iterator](){const t=[];for(let e=0;e<this.length;e++)t[e]=this.get(e);return t[Symbol.iterator]()}hydrateFromServer(t){if(Array.isArray(t)){for(let e=0;e<t.length;e++)this.set(e,new r.EditWrapper(t[e]));for(let e=t.length;e<this.length;e++)this.delete(e,!0);this.length=t.length}}tryApplyServerValue(t,e,i){const s=this.list[t];if(!s)return!1;if(s instanceof o.MultyxClientValue&&("object"!=typeof e||null===e))return s.set(new r.EditWrapper(e)),this.enqueueEditCallbacks(t,i),!0;const n="function"==typeof(null==s?void 0:s.hydrateFromServer);return Array.isArray(e)&&n&&"list"===s.type?(s.hydrateFromServer(e),this.enqueueEditCallbacks(t,i),!0):!(null===(l=e)||"object"!=typeof l||Array.isArray(l)||!n||"object"!==s.type||(s.hydrateFromServer(e),this.enqueueEditCallbacks(t,i),0));var l}notifyIndexWaiters(t){var e,i;const s=Symbol.for("_"+this.propertyPath.join(".")+"."+t);this.multyx.events.has(s)&&this.multyx[r.Done].push(...null!==(i=null===(e=this.multyx.events.get(s))||void 0===e?void 0:e.map(e=>()=>e(this.list[t])))&&void 0!==i?i:[])}enqueueEditCallbacks(t,e){for(const i of this.editCallbacks)this.multyx[r.Add](()=>i(t,this.get(t),e))}}s=Symbol.toPrimitive,e.default=h},280:(t,e,i)=>{var s;Object.defineProperty(e,"__esModule",{value:!0});const n=i(449),o=i(703);class r{get value(){return this.readModifiers.reduce((t,e)=>e(t),this._value)}set value(t){this._value=t,this.captureSample(t)}addReadModifier(t){this.readModifiers.push(t)}addEditCallback(t){this.editCallbacks.push(t)}[o.Edit](t,e){0==t.length&&this.set(new o.EditWrapper(e))}constructor(t,e,i=[],n){var r,l;this.readModifiers=[],this.editCallbacks=[],this.interpolationFrameMs=250,this.toString=()=>this.value.toString(),this.valueOf=()=>this.value,this[s]=()=>this.value,this.propertyPath=i,this.editable=n,this.multyx=t,this.constraints={},this.set(e);const a=Symbol.for("_"+this.propertyPath.join("."));this.multyx.events.has(a)&&this.multyx[o.Done].push(...null!==(l=null===(r=this.multyx.events.get(a))||void 0===r?void 0:r.map(t=>()=>t(this.value)))&&void 0!==l?l:[])}set(t){if(t instanceof o.EditWrapper){const e=this.value;return this.value=t.value,this.editCallbacks.forEach(i=>i(t.value,e)),!0}if(!this.editable)return this.multyx.options.verbose&&console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join(".")}' to ${t}`),!1;let e=t;for(const i in this.constraints)if(e=(0,this.constraints[i])(e),null===e)return this.multyx.options.verbose&&console.error(`Attempting to set property that failed on constraint. Setting '${this.propertyPath.join(".")}' to ${t}, stopped by constraint '${i}'`),!1;return this._value===e?(this.value=e,!0):(this.value=e,this.multyx.ws.send(n.Message.Native({instruction:"edit",path:this.propertyPath,value:e})),!0)}bindElement(t){this.addEditCallback((e,i)=>{e!==i&&(t.innerText=e.toString())})}[o.Unpack](t){for(const[e,i]of Object.entries(t)){const t=(0,o.BuildConstraint)(e,i);t&&(this.constraints[e]=t)}}Lerp(t=250){return this.applyInterpolation("lerp",t)}PredictiveLerp(t=250){return this.applyInterpolation("predictive",t)}applyInterpolation(t,e){if("number"!=typeof this._value||Number.isNaN(this._value))throw new Error(`MultyxClientValue.${"lerp"===t?"Lerp":"PredictiveLerp"} can only be applied to numeric values`);return this.interpolationFrameMs=Math.max(1,e),this.attachInterpolationModifier(t),this}attachInterpolationModifier(t){this.interpolationModifier&&(this.readModifiers=this.readModifiers.filter(t=>t!==this.interpolationModifier)),this.interpolationModifier=e=>this.interpolateValue(e,t),this.readModifiers.push(this.interpolationModifier)}captureSample(t){if("number"!=typeof t||Number.isNaN(t))return this.latestSample=void 0,void(this.previousSample=void 0);const e=Date.now();this.latestSample?(this.previousSample=Object.assign({},this.latestSample),this.latestSample={value:t,time:e}):this.latestSample={value:t,time:e}}interpolateValue(t,e){if("number"!=typeof t||!this.latestSample||!this.previousSample)return t;const i=this.latestSample.time-this.previousSample.time;if(i<=0)return t;const s=Math.max(1,Math.min(i,this.interpolationFrameMs)),n=Math.max(0,Math.min(Date.now()-this.latestSample.time,s)),o=0===s?1:n/s,r=this.latestSample.value-this.previousSample.value;return"predictive"===e?this.latestSample.value+r*o:this.previousSample.value+r*o}}s=Symbol.toPrimitive,e.default=r},416:(t,e,i)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(t){return Array.isArray(t)?i(249).default:"object"==typeof t?i(922).default:i(280).default}},449:(t,e)=>{function i(t){let e,i;if("edit"==t.instruction?(e=0,i=[t.path.join("."),JSON.stringify(t.value)]):"input"==t.instruction?(e=1,i=[t.input,JSON.stringify(t.data)]):"resp"==t.instruction&&(e=2,i=[t.name,JSON.stringify(t.response)]),!i||void 0===e)return"";let s=e.toString();for(let t=0;t<i.length;t++)s+=i[t].replace(/;/g,";_"),t<i.length-1&&(s+=";,");return JSON.stringify([s])}Object.defineProperty(e,"__esModule",{value:!0}),e.Message=void 0,e.UncompressUpdate=function(t){const[e,...i]=t.split(/;,/),s=e[0],n=e.slice(1).replace(/;_/g,";"),o=i.map(t=>t.replace(/;_/g,";")).map(t=>"undefined"==t?void 0:JSON.parse(t));return"0"==s?{instruction:"edit",team:!1,path:n.split("."),value:o[0]}:"1"==s?{instruction:"edit",team:!0,path:n.split("."),value:o[0]}:"2"==s?{instruction:"self",property:"controller",data:JSON.parse(n)}:"3"==s?{instruction:"self",property:"uuid",data:JSON.parse(n)}:"4"==s?{instruction:"self",property:"constraint",data:JSON.parse(n)}:"9"==s?{instruction:"self",property:"space",data:JSON.parse(n)}:"5"==s?{instruction:"resp",name:n,response:o[0]}:"6"==s?{instruction:"conn",uuid:n,data:o[0]}:"7"==s?{instruction:"dcon",client:n}:"8"==s?{instruction:"init",client:JSON.parse(n),tps:o[0],constraintTable:o[1],clients:o[2],teams:o[3],space:o[4]}:void 0},e.CompressUpdate=i;class s{constructor(t,e,i=!1){this.name=t,this.data=e,this.time=Date.now(),this.native=i}static BundleOperations(t,e){return Array.isArray(e)||(e=[e]),JSON.stringify(new s("_",{operations:e,deltaTime:t}))}static Native(t){return i(t)}static Parse(t){var e,i;const n=JSON.parse(t);return Array.isArray(n)?new s("_",n,!0):new s(null!==(e=n.name)&&void 0!==e?e:"",null!==(i=n.data)&&void 0!==i?i:"",!1)}static Create(t,e){if(0==t.length)throw new Error("Multyx message cannot have empty name");if("_"==t[0]&&(t="_"+t),"function"==typeof e)throw new Error("Multyx data must be JSON storable");return JSON.stringify(new s(t,e))}}e.Message=s},625:function(t,e,i){var s=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0}),e.MultyxClientValue=e.MultyxClientObject=e.MultyxClientList=void 0,e.IsMultyxClientItem=function(t){return t instanceof n.default||t instanceof o.default||t instanceof r.default};const n=s(i(249));e.MultyxClientList=n.default;const o=s(i(922));e.MultyxClientObject=o.default;const r=s(i(280));e.MultyxClientValue=r.default},703:(t,e)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.EditWrapper=e.Edit=e.Add=e.Done=e.Unpack=void 0,e.Interpolate=function(t,e,i){if(!Array.isArray(i)||0===i.length)throw new Error("Interpolation curve must contain at least one slice");const s=[...i].sort((t,e)=>t.time-e.time),n=s[s.length-1].time,o=n<=1;let r={value:t[e],time:Date.now()},l={value:t[e],time:Date.now()};Object.defineProperty(t,e,{configurable:!0,enumerable:!0,get:()=>{if(r.time===l.time)return l.value;const t=Date.now(),e=Math.max(l.time-r.time,1),i=Math.max(0,t-l.time),a=(h=o?i/e:i,u=0,p=n,Math.min(Math.max(h,u),p));var h,u,p;let c,d=s[0],f=s[s.length-1];for(const t of s){if(!(t.time<=a)){f=t;break}d=t}if(f.time===d.time)c=d.progress;else{const t=(a-d.time)/(f.time-d.time);c=d.progress+t*(f.progress-d.progress)}return Number.isNaN(c)?r.value:"number"==typeof r.value&&"number"==typeof l.value?l.value*c+r.value*(1-c):c>=1?l.value:r.value},set:t=>{const e=Date.now();return e-l.time<10?(l.value=t,l.time=e,!0):(r=Object.assign({},l),l={value:t,time:e},!0)}})},e.BuildConstraint=function(t,e){return"min"==t?t=>t>=e[0]?t:e[0]:"max"==t?t=>t<=e[0]?t:e[0]:"int"==t?t=>Math.floor(t):"ban"==t?t=>e.includes(t)?null:t:"disabled"==t?t=>e[0]?null:t:t=>t},e.Unpack=Symbol("unpack"),e.Done=Symbol("done"),e.Add=Symbol("add"),e.Edit=Symbol("edit"),e.EditWrapper=class{constructor(t){this.value=t}}},832:(t,e,i)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.Controller=void 0;const s=i(449);e.Controller=class{constructor(t){this.listening=new Set,this.ws=t,this.preventDefault=!1,this.keys={},this.mouse={x:NaN,y:NaN,down:!1,centerX:0,centerY:0,scaleX:1,scaleY:1},document.addEventListener("keydown",t=>{this.preventDefault&&t.preventDefault();const e=t.key.toLowerCase();this.keys[e]&&this.listening.has("keyhold")&&this.relayInput("keyhold",{code:e}),this.keys[t.code]&&this.listening.has("keyhold")&&this.relayInput("keyhold",{code:t.code}),this.listening.has(e)&&!this.keys[e]&&this.relayInput("keydown",{code:t.key}),this.listening.has(t.code)&&!this.keys[t.code]&&this.relayInput("keydown",{code:t.code}),this.keys[e]=!0,this.keys[t.code]=!0}),document.addEventListener("keyup",t=>{this.preventDefault&&t.preventDefault();const e=t.key.toLowerCase();delete this.keys[e],delete this.keys[t.code],this.listening.has(e)&&this.relayInput("keyup",{code:e}),this.listening.has(t.code)&&this.relayInput("keyup",{code:t.code})}),document.addEventListener("mousedown",t=>{if(this.preventDefault&&t.preventDefault(),this.mouseGetter){const t=this.mouseGetter();this.mouse.x=t.x,this.mouse.y=t.y}else this.mouse.x=(t.clientX-this.mouse.centerX)/this.mouse.scaleX,this.mouse.y=(t.clientY-this.mouse.centerY)/this.mouse.scaleY;this.mouse.down=!0,this.listening.has("mousedown")&&this.relayInput("mousedown",{x:this.mouse.x,y:this.mouse.y})}),document.addEventListener("mouseup",t=>{if(this.preventDefault&&t.preventDefault(),this.mouseGetter){const t=this.mouseGetter();this.mouse.x=t.x,this.mouse.y=t.y}else this.mouse.x=(t.clientX-this.mouse.centerX)/this.mouse.scaleX,this.mouse.y=(t.clientY-this.mouse.centerY)/this.mouse.scaleY;this.mouse.down=!1,this.listening.has("mouseup")&&this.relayInput("mouseup",{x:this.mouse.x,y:this.mouse.y})}),document.addEventListener("mousemove",t=>{if(this.preventDefault&&t.preventDefault(),this.mouseGetter){const t=this.mouseGetter();this.mouse.x=t.x,this.mouse.y=t.y}else this.mouse.x=(t.clientX-this.mouse.centerX)/this.mouse.scaleX,this.mouse.y=(t.clientY-this.mouse.centerY)/this.mouse.scaleY;this.listening.has("mousemove")&&this.relayInput("mousemove",{x:this.mouse.x,y:this.mouse.y})})}mapCanvasPosition(t,e){const i="top"in e,s="bottom"in e,n="left"in e,o="right"in e,r=e.anchor,l=t.getBoundingClientRect(),a=(t,...e)=>{const i=t?"Cannot include value for ":"Must include value for ",s=1==e.length?e[0]:e.slice(0,-1).join(", ")+(t?" and ":" or ")+e.slice(-1)[0],n=r?" if anchoring at "+r:" if not anchoring";console.error(i+s+n)},h=l.width/l.height,u=l.height/l.width;if((Number.isNaN(h)||Number.isNaN(u))&&console.error("Canvas element bounding box is flat, canvas must be present on the screen"),r){if("center"==r){if(i&&s&&e.top!==-e.bottom||n&&o&&e.left!==-e.right)return a(!0,"top","bottom","left","right");i?(e.left=n?e.left:o?-e.right:-Math.abs(h*e.top),e.right=n?-e.left:o?e.right:Math.abs(h*e.top),e.bottom=-e.top):s?(e.left=n?e.left:o?-e.right:-Math.abs(h*e.bottom),e.right=n?-e.left:o?e.right:Math.abs(h*e.bottom),e.top=-e.bottom):n?(e.top=i?e.top:s?-e.bottom:-Math.abs(u*e.left),e.bottom=i?-e.top:s?e.bottom:Math.abs(u*e.left),e.right=-e.left):o&&(e.top=i?e.top:s?-e.bottom:-Math.abs(u*e.right),e.bottom=i?-e.top:s?e.bottom:Math.abs(u*e.right),e.left=-e.right)}else if("bottom"==r){if(!n&&!o&&!i)return a(!1,"left","right","top");if(e.bottom)return a(!0,"bottom");e.bottom=0,n?(e.top=Math.abs(u*e.left*2),e.right=-e.left):o?(e.top=Math.abs(u*e.right*2),e.left=-e.right):(e.left=-Math.abs(h*e.top/2),e.right=-e.left)}else if("top"==r){if(!n&&!o&&!s)return a(!1,"left","right","bottom");if(e.top)return a(!0,"top");e.top=0,n?(e.bottom=Math.abs(u*e.left*2),e.right=-e.left):o?(e.bottom=Math.abs(u*e.right*2),e.left=-e.right):(e.left=-Math.abs(h*e.bottom/2),e.right=-e.left)}else if("left"==r){if(!i&&!s&&!o)return a(!1,"top","bottom","right");if(n)return a(!0,"left");e.left=0,i?(e.right=-Math.abs(h*e.top*2),e.bottom=-e.top):s?(e.right=Math.abs(h*e.bottom*2),e.top=-e.bottom):(e.top=-Math.abs(u*e.right/2),e.bottom=-e.top)}else if("right"==r){if(!i&&!s&&!n)return a(!1,"top","bottom","left");if(o)return a(!0,"right");e.right=0,i?(e.left=-Math.abs(h*e.top*2),e.bottom=-e.top):s?(e.left=Math.abs(h*e.bottom*2),e.top=-e.bottom):(e.top=-Math.abs(u*e.right/2),e.bottom=-e.top)}else if("topleft"==r){if(!o&&!s)return a(!1,"right","bottom");if(n||i)return a(!0,"left","top");e.left=e.top=0,o?e.bottom=Math.abs(u*e.right):e.right=Math.abs(h*e.bottom)}else if("topright"==r){if(!n&&!s)return a(!1,"left","bottom");if(o||i)return a(!0,"right","top");e.right=e.top=0,n?e.bottom=Math.abs(u*e.left):e.left=Math.abs(h*e.bottom)}else if("bottomleft"==r){if(!o&&!i)return a(!1,"right","top");if(s||n)return a(!0,"bottom","left");e.left=e.bottom=0,o?e.top=Math.abs(u*e.right):e.right=Math.abs(h*e.top)}else if("bottomright"==r){if(!i&&!n)return a(!1,"top","left");if(o||s)return a(!0,"bottom","right");e.right=e.bottom=0,n?e.top=Math.abs(u*e.left):e.left=Math.abs(h*e.top)}}else{if(!i&&!s)return a(!1,"top","bottom");if(s?i||(e.top=e.bottom-t.height):e.bottom=e.top+t.height,!n&&!o)return a(!1,"left","right");o?n||(e.left=e.right-t.width):e.right=e.left+t.width}const p=t.getContext("2d");null==p||p.setTransform(1,0,0,1,0,0),t.width=Math.floor(Math.abs(e.right-e.left)),t.height=Math.floor(Math.abs(e.bottom-e.top)),e.right<e.left&&(null==p||p.scale(-1,1)),e.top>e.bottom&&(null==p||p.scale(1,-1)),null==p||p.translate(-e.left,-e.top)}mapMousePosition(t,e,i=document.body,s=1,n=s){const o=window.innerWidth/(i instanceof HTMLCanvasElement?i.width:i.clientWidth),r=window.innerHeight/(i instanceof HTMLCanvasElement?i.height:i.clientHeight),l=i.getBoundingClientRect();this.mouse.centerX=l.left+t*o,this.mouse.centerY=l.top+e*r,this.mouse.scaleX=s*o,this.mouse.scaleY=n*r}mapMouseToCanvas(t){const e=t.getContext("2d"),i=null==e?void 0:e.getTransform(),s=t.getBoundingClientRect(),n=s.width/t.width,o=s.height/t.height;this.mouse.centerX=s.left+(null==i?void 0:i.e)*n,this.mouse.centerY=s.top+(null==i?void 0:i.f)*o,this.mouse.scaleX=n*(null==i?void 0:i.a),this.mouse.scaleY=o*(null==i?void 0:i.d)}setMouseAs(t){this.mouseGetter=t}relayInput(t,e){if(1!==this.ws.readyState)throw new Error("Websocket connection is "+(2==this.ws.readyState?"closing":"closed"));this.ws.send(s.Message.Native(Object.assign({instruction:"input",input:t},e?{data:e}:{})))}}},922:function(t,e,i){var s=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0});const n=i(449),o=i(703),r=i(625),l=s(i(416)),a=s(i(280)),h=t=>null!==t&&"object"==typeof t&&!Array.isArray(t);class u{get value(){const t={};for(const e in this.object)t[e]=this.object[e];return t}addEditCallback(t){this.editCallbacks.push(t)}[o.Edit](t,e){var i;1!=t.length?(0==t.length&&this.multyx.options.verbose&&console.error("Update path is empty. Attempting to edit MultyxClientObject with no path."),this.has(t[0])||this.set(t[0],new o.EditWrapper({})),null===(i=this.get(t[0]))||void 0===i||i[o.Edit](t.slice(1),e)):this.set(t[0],new o.EditWrapper(e))}constructor(t,e,i=[],s){this.type="object",this.editCallbacks=[],this.object={},this.propertyPath=i,this.multyx=t,this.editable=s;const n=e instanceof o.EditWrapper;e instanceof u&&(e=e.value),e instanceof o.EditWrapper&&(e=e.value);for(const t in e)this.set(t,n?new o.EditWrapper(e[t]):e[t]);if(this.constructor===u)return new Proxy(this,{has:(t,e)=>t.has(e),get:(t,e)=>e in t?t[e]:t.get(e),set:(t,e,i)=>e in t?(t[e]=i,!0):t.set(e,i),deleteProperty:(t,e)=>t.delete(e,!1)})}has(t){return t in this.object}get(t){if("string"==typeof t)return this.object[t];if(0==t.length)return this;if(1==t.length)return this.object[t[0]];const e=this.object[t[0]];return!e||e instanceof a.default?void 0:e.get(t.slice(1))}recursiveSet(t,e){if(0==t.length)return this.multyx.options.verbose&&console.error(`Attempting to edit MultyxClientObject with no path. Setting '${this.propertyPath.join(".")}' to ${e}`),!1;if(1==t.length)return this.set(t[0],e);let i=this.get(t[0]);return(i instanceof a.default||null==i)&&(isNaN(parseInt(t[1]))?(this.set(t[0],new o.EditWrapper({})),i=this.get(t[0])):(this.set(t[0],new o.EditWrapper([])),i=this.get(t[0]))),i.set(t.slice(1),e)}set(t,e){if(Array.isArray(t))return this.recursiveSet(t,e);const i=e instanceof o.EditWrapper,s=i||this.editable,n=i||(0,r.IsMultyxClientItem)(e)?e.value:e;return void 0===n?this.delete(t,i):!(!i||!this.applyServerValue(t,n))||(this.object[t]instanceof a.default&&("object"!=typeof n||null===n)?this.object[t].set(i?new o.EditWrapper(n):n):s?(this.object[t]=new((0,l.default)(n))(this.multyx,i?new o.EditWrapper(n):n,[...this.propertyPath,t],this.editable),this.notifyPropertyWaiters(t),!0):(this.multyx.options.verbose&&console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join(".")+"."+t}' to ${n}`),!1))}delete(t,e=!1){return this.editable||e?(delete this.object[t],e||this.multyx.ws.send(n.Message.Native({instruction:"edit",path:[...this.propertyPath,t],value:void 0})),!0):(this.multyx.options.verbose&&console.error(`Attempting to delete property that is not editable. Deleting '${this.propertyPath.join(".")+"."+t}'`),!1)}keys(){return Object.keys(this.object)}values(){return Object.values(this.object)}entries(){const t=[];for(let e in this.object)t.push([e,this.get(e)]);return t}await(t){if(this.has(t))return Promise.resolve(this.get(t));const e=Symbol.for("_"+this.propertyPath.join(".")+"."+t);return new Promise(t=>this.multyx.on(e,t))}[o.Unpack](t){var e;for(const i in t)null===(e=this.object[i])||void 0===e||e[o.Unpack](t[i])}hydrateFromServer(t){if(!h(t))return;const e=new Set(Object.keys(this.object));for(const[i,s]of Object.entries(t))e.delete(i),this.set(i,new o.EditWrapper(s));for(const t of e)this.delete(t,!0)}applyServerValue(t,e){const i=this.object[t];if(!i)return!1;if(i instanceof a.default&&("object"!=typeof e||null===e))return i.set(new o.EditWrapper(e)),!0;const s="function"==typeof(null==i?void 0:i.hydrateFromServer);return(Array.isArray(e)&&s&&"list"===i.type||!(!h(e)||!s||"object"!==i.type))&&(i.hydrateFromServer(e),!0)}notifyPropertyWaiters(t){var e,i;const s=Symbol.for("_"+this.propertyPath.join(".")+"."+t);this.multyx.events.has(s)&&this.multyx[o.Done].push(...null!==(i=null===(e=this.multyx.events.get(s))||void 0===e?void 0:e.map(e=>()=>e(this.object[t])))&&void 0!==i?i:[])}}e.default=u},960:(t,e)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.DefaultOptions=void 0,e.DefaultOptions={port:8443,secure:!1,uri:"localhost",verbose:!1,logUpdateFrame:!1}}},e={};function i(s){var n=e[s];if(void 0!==n)return n.exports;var o=e[s]={exports:{}};return t[s].call(o.exports,o,o.exports,i),o.exports}var s={};return(()=>{var t,e=s;const n=i(449),o=i(703),r=i(832),l=i(625),a=i(960);class h{constructor(e={},i){var s;if(this[t]=[],this.options=Object.assign(Object.assign({},a.DefaultOptions),e),!this.options.uri)throw new Error("URI is required");const o=`ws${this.options.secure?"s":""}://${this.options.uri.split("/")[0]}:${this.options.port}/${null!==(s=this.options.uri.split("/")[1])&&void 0!==s?s:""}`;this.ws=new WebSocket(o),this.ping=0,this.space="default",this.events=new Map,this.self={},this.tps=0,this.all={},this.teams=new l.MultyxClientObject(this,{},[],!0),this.clients={},this.controller=new r.Controller(this.ws),null==i||i(),this.ws.onmessage=t=>{var e,i,s,o;const r=n.Message.Parse(t.data);this.ping=2*(Date.now()-r.time),r.native?(this.parseNativeEvent(r),null===(e=this.events.get(h.Native))||void 0===e||e.forEach(t=>t(r))):(null===(i=this.events.get(r.name))||void 0===i||i.forEach(t=>{const e=t(r.data);void 0!==e&&this.send(r.name,e)}),null===(s=this.events.get(h.Custom))||void 0===s||s.forEach(t=>t(r))),null===(o=this.events.get(h.Any))||void 0===o||o.forEach(t=>t(r))}}on(t,e){var i;const s=null!==(i=this.events.get(t))&&void 0!==i?i:[];s.push(e),this.events.set(t,s)}send(t,e){"_"===t[0]&&(t="_"+t);const i={instruction:"resp",name:t,response:e};this.ws.send(n.Message.Native(i))}await(t,e){return this.send(t,e),new Promise(e=>this.events.set(Symbol.for("_"+t),[e]))}loop(t,e){if(e)this.on(h.Start,()=>setInterval(t,Math.round(1e3/e)));else{const e=()=>{t(),requestAnimationFrame(e)};this.on(h.Start,()=>requestAnimationFrame(e))}}[(t=o.Done,o.Add)](t){this[o.Done].push(t)}parseNativeEvent(t){var e,i,s,r,a;t.data=t.data.map(n.UncompressUpdate),this.options.logUpdateFrame&&console.log(t.data);for(const n of t.data)switch(n.instruction){case"init":this.initialize(n);for(const t of null!==(e=this.events.get(h.Start))&&void 0!==e?e:[])this[o.Done].push(()=>t(n));this.events.has(h.Start)&&(this.events.get(h.Start).length=0);break;case"edit":if(1==n.path.length)n.team?this.teams.set(n.path[0],new o.EditWrapper(n.value)):this.clients[n.path[0]]=new l.MultyxClientObject(this,new o.EditWrapper(n.value),[n.path[0]],!1);else{const t=n.team?this.teams.get(n.path[0]):this.clients[n.path[0]];if(!t)return;t.set(n.path.slice(1),new o.EditWrapper(n.value))}for(const t of null!==(i=this.events.get(h.Edit))&&void 0!==i?i:[])this[o.Done].push(()=>t(n));break;case"self":this.parseSelf(n);break;case"conn":this.clients[n.uuid]=new l.MultyxClientObject(this,n.data,[n.uuid],!1);for(const t of null!==(s=this.events.get(h.Connection))&&void 0!==s?s:[])this[o.Done].push(()=>t(this.clients[n.uuid]));break;case"dcon":for(const t of null!==(r=this.events.get(h.Disconnect))&&void 0!==r?r:[]){const e=this.clients[n.client].value;this[o.Done].push(()=>t(e))}delete this.clients[n.client];break;case"resp":{const t=null===(a=this.events.get(Symbol.for("_"+n.name)))||void 0===a?void 0:a[0];this.events.delete(Symbol.for("_"+n.name)),t&&this[o.Done].push(()=>t(n.response));break}default:this.options.verbose&&console.error("Server error: Unknown native Multyx instruction")}this[o.Done].forEach(t=>t()),this[o.Done].length=0}initialize(t){this.tps=t.tps,this.uuid=t.client.uuid,this.joinTime=t.client.joinTime,this.controller.listening=new Set(t.client.controller);for(const e of Object.keys(t.teams))this.teams[e]=new o.EditWrapper(t.teams[e]);this.all=this.teams.all,this.clients={};for(const[e,i]of Object.entries(t.clients))e!=this.uuid&&(this.clients[e]=new l.MultyxClientObject(this,new o.EditWrapper(i),[e],!1));const e=new l.MultyxClientObject(this,new o.EditWrapper(t.client.self),[this.uuid],!0);this.self=e,this.clients[this.uuid]=e;for(const[e,i]of Object.entries(t.constraintTable))(this.uuid==e?this.self:this.teams[e])[o.Unpack](i)}parseSelf(t){if("controller"==t.property)this.controller.listening=new Set(t.data);else if("uuid"==t.property)this.uuid=t.data;else if("constraint"==t.property){let e=this.uuid==t.data.path[0]?this.self:this.teams[t.data.path[0]];for(const i of t.data.path.slice(1))e=null==e?void 0:e[i];if(void 0===e)return;e[o.Unpack]({[t.data.name]:t.data.args})}else"space"==t.property&&(this.space=t.data,this.updateSpace())}updateSpace(){"default"!=this.space?document.querySelectorAll("[data-multyx-space]").forEach(t=>{t.style.display=t.dataset.multyxSpace==this.space?"block":"none",t.style.pointerEvents=t.dataset.multyxSpace==this.space?"auto":"none"}):document.querySelectorAll("[data-multyx-space]").forEach(t=>{t.style.display="block",t.style.pointerEvents="auto"})}}h.Start=Symbol("start"),h.Connection=Symbol("connection"),h.Disconnect=Symbol("disconnect"),h.Edit=Symbol("edit"),h.Native=Symbol("native"),h.Custom=Symbol("custom"),h.Any=Symbol("any"),h.Interpolate=o.Interpolate,e.default=h})(),s.default})());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multyx-client",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Framework designed to simplify the creation of multiplayer browser games by addressing the complexities of managing server-client communication, shared state, and input handling",
   "main": "dist/index.js",
   "scripts": {

package/src/controller.ts

@@ -32,7 +32,7 @@ export class Controller {
         };
 
         document.addEventListener('keydown', e => {
-            if(this.preventDefault) e.preventDefault;
+            if(this.preventDefault) e.preventDefault();
 
             const key = e.key.toLowerCase();
 
@@ -57,7 +57,7 @@ export class Controller {
 
         });
         document.addEventListener('keyup', e => {
-            if(this.preventDefault) e.preventDefault;
+            if(this.preventDefault) e.preventDefault();
             
             const key = e.key.toLowerCase();
 
@@ -69,7 +69,7 @@ export class Controller {
 
         // Mouse input events
         document.addEventListener('mousedown', e => {
-            if(this.preventDefault) e.preventDefault;
+            if(this.preventDefault) e.preventDefault();
             
             if(this.mouseGetter) {
                 const mouse = this.mouseGetter();
@@ -86,7 +86,7 @@ export class Controller {
                 });
         });
         document.addEventListener('mouseup', e => {
-            if(this.preventDefault) e.preventDefault;
+            if(this.preventDefault) e.preventDefault();
             
             if(this.mouseGetter) {
                 const mouse = this.mouseGetter();
@@ -103,7 +103,7 @@ export class Controller {
                 });
         });
         document.addEventListener('mousemove', e => {
-            if(this.preventDefault) e.preventDefault;
+            if(this.preventDefault) e.preventDefault();
             
             if(this.mouseGetter) {
                 const mouse = this.mouseGetter();

package/src/index.ts

@@ -1,8 +1,8 @@
 import { Message, UncompressUpdate } from "./message";
-import { Unpack, EditWrapper, Add, Edit, Done } from './utils';
+import { Unpack, EditWrapper, Add, Done, Interpolate } from './utils';
 import { RawObject, ResponseUpdate } from "./types";
 import { Controller } from "./controller";
-import { MultyxClientObject, MultyxClientValue } from "./items";
+import { MultyxClientObject } from "./items";
 import { DefaultOptions, Options } from "./options";
 export default class Multyx {
     ws: WebSocket;
@@ -31,6 +31,8 @@ export default class Multyx {
     static Custom = Symbol('custom');
     static Any = Symbol('any');
 
+    static Interpolate = Interpolate;
+
     constructor(options: Options = {}, callback?: () => void) {
         this.options = { ...DefaultOptions, ...options };
 

package/src/items/list.ts

@@ -4,7 +4,10 @@ import { Add, Done, Edit, EditWrapper, Unpack } from '../utils';
 import MultyxClientItemRouter from './router';
 import { Message } from '../message';
 
+const isPlainObject = (value: any) => value !== null && typeof value === 'object' && !Array.isArray(value);
+
 export default class MultyxClientList {
+    readonly type = 'list';
     protected list: MultyxClientItem[];
     private multyx: Multyx;
     propertyPath: string[];
@@ -157,9 +160,14 @@ export default class MultyxClientList {
         let next = this.get(parseInt(path[0]));
         if(next instanceof MultyxClientValue || next == undefined) {
             this.set(parseInt(path[0]), new EditWrapper({}));
-            next = this.get(parseInt(path[0])) as MultyxClientObject;
+            next = this.get(parseInt(path[0]));
+        }
+
+        if(!next || next instanceof MultyxClientValue) {
+            return false;
         }
-        return next.set(path.slice(1), value);
+
+        return (next as MultyxClientObject | MultyxClientList).set(path.slice(1), value);
     }
 
     set(index: number | string[], value: any): boolean {
@@ -169,41 +177,37 @@ export default class MultyxClientList {
 
         const serverSet = value instanceof EditWrapper;
         const allowed = serverSet || this.editable;
-        if(serverSet || IsMultyxClientItem(value)) value = value.value;
-        if(value === undefined) return this.delete(index, serverSet);
+        const incoming = (serverSet || IsMultyxClientItem(value)) ? value.value : value;
+        if(incoming === undefined) return this.delete(index, serverSet);
+
+        if(serverSet && this.tryApplyServerValue(index, incoming, oldValue)) {
+            return true;
+        }
 
-        // If value is a MultyxClientValue, set the value
-        if(this.list[index] instanceof MultyxClientValue && typeof value != 'object') {
-            return this.list[index].set(serverSet ? new EditWrapper(value) : value);
+        // If value is a MultyxClientValue, set the value directly
+        if(this.list[index] instanceof MultyxClientValue && (typeof incoming !== 'object' || incoming === null)) {
+            const result = this.list[index].set(serverSet ? new EditWrapper(incoming) : incoming);
+            this.enqueueEditCallbacks(index, oldValue);
+            return result;
         }
         
         // Attempting to edit property not editable to client
         if(!allowed) {
             if(this.multyx.options.verbose) {
-                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + index}' to ${value}`);
+                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + index}' to ${incoming}`);
             }
             return false;
         }
         
-        this.list[index] = new (MultyxClientItemRouter(value))(
+        this.list[index] = new (MultyxClientItemRouter(incoming))(
             this.multyx,
-            serverSet ? new EditWrapper(value) : value,
+            serverSet ? new EditWrapper(incoming) : incoming,
             [...this.propertyPath, index.toString()],
             this.editable
         );
 
-        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + index);
-        if(this.multyx.events.has(propSymbol)) {
-            this.multyx[Done].push(...(this.multyx.events.get(propSymbol)?.map(e =>
-                () => e(this.list[index])
-            ) ?? []));
-        }
-
-        // We have to push into queue, since object may not be fully created
-        // and there may still be more updates to parse
-        for(const listener of this.editCallbacks) {
-            this.multyx[Add](() => listener(index, this.get(index), oldValue));
-        }
+        this.notifyIndexWaiters(index);
+        this.enqueueEditCallbacks(index, oldValue);
         
         return true;
     }
@@ -452,4 +456,56 @@ export default class MultyxClientList {
     toString = () => this.value.toString();
     valueOf = () => this.value;
     [Symbol.toPrimitive] = () => this.value;
+
+    hydrateFromServer(values: any[]) {
+        if(!Array.isArray(values)) return;
+        for(let i=0; i<values.length; i++) {
+            this.set(i, new EditWrapper(values[i]));
+        }
+        for(let i=values.length; i<this.length; i++) {
+            this.delete(i, true);
+        }
+        this.length = values.length;
+    }
+
+    private tryApplyServerValue(index: number, incoming: any, oldValue: MultyxClientItem | undefined) {
+        const current = this.list[index];
+        if(!current) return false;
+
+        if(current instanceof MultyxClientValue && (typeof incoming !== 'object' || incoming === null)) {
+            current.set(new EditWrapper(incoming));
+            this.enqueueEditCallbacks(index, oldValue);
+            return true;
+        }
+
+        const canHydrate = typeof (current as any)?.hydrateFromServer === 'function';
+        if(Array.isArray(incoming) && canHydrate && (current as any).type === 'list') {
+            (current as any).hydrateFromServer(incoming);
+            this.enqueueEditCallbacks(index, oldValue);
+            return true;
+        }
+
+        if(isPlainObject(incoming) && canHydrate && (current as any).type === 'object') {
+            (current as any).hydrateFromServer(incoming);
+            this.enqueueEditCallbacks(index, oldValue);
+            return true;
+        }
+
+        return false;
+    }
+
+    private notifyIndexWaiters(index: number) {
+        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + index);
+        if(this.multyx.events.has(propSymbol)) {
+            this.multyx[Done].push(...(this.multyx.events.get(propSymbol)?.map(e =>
+                () => e(this.list[index])
+            ) ?? []));
+        }
+    }
+
+    private enqueueEditCallbacks(index: number, oldValue: MultyxClientItem | undefined) {
+        for(const listener of this.editCallbacks) {
+            this.multyx[Add](() => listener(index, this.get(index), oldValue));
+        }
+    }
 }

package/src/items/object.ts

@@ -7,7 +7,10 @@ import { IsMultyxClientItem, type MultyxClientList, type MultyxClientItem } from
 import MultyxClientItemRouter from "./router";
 import MultyxClientValue from "./value";
 
+const isPlainObject = (value: any) => value !== null && typeof value === 'object' && !Array.isArray(value);
+
 export default class MultyxClientObject {
+    readonly type = 'object';
     protected object: RawObject<MultyxClientItem>;
     private multyx: Multyx;
     propertyPath: string[];
@@ -124,36 +127,35 @@ export default class MultyxClientObject {
 
         const serverSet = value instanceof EditWrapper;
         const allowed = serverSet || this.editable;
-        if(serverSet || IsMultyxClientItem(value)) value = value.value;
-        if(value === undefined) return this.delete(property, serverSet);
+        const incoming = (serverSet || IsMultyxClientItem(value)) ? value.value : value;
+        if(incoming === undefined) return this.delete(property, serverSet);
+
+        if(serverSet && this.applyServerValue(property, incoming)) {
+            return true;
+        }
 
         // Only create new MultyxClientItem when needed
-        if(this.object[property] instanceof MultyxClientValue && typeof value != 'object') {
-            return this.object[property].set(serverSet ? new EditWrapper(value) : value);
+        if(this.object[property] instanceof MultyxClientValue && (typeof incoming !== 'object' || incoming === null)) {
+            return this.object[property].set(serverSet ? new EditWrapper(incoming) : incoming);
         }
         
         // Attempting to edit property not editable to client
         if(!allowed) {
             if(this.multyx.options.verbose) {
-                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + property}' to ${value}`);
+                console.error(`Attempting to set property that is not editable. Setting '${this.propertyPath.join('.') + '.' + property}' to ${incoming}`);
             }
             return false;
         }
 
         // Creating a new value
-        this.object[property] = new (MultyxClientItemRouter(value))(
+        this.object[property] = new (MultyxClientItemRouter(incoming))(
             this.multyx,
-            serverSet ? new EditWrapper(value) : value,
+            serverSet ? new EditWrapper(incoming) : incoming,
             [...this.propertyPath, property],
             this.editable
         );
 
-        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + property);
-        if(this.multyx.events.has(propSymbol)) {
-            this.multyx[Done].push(...(this.multyx.events.get(propSymbol)?.map(e =>
-                () => e(this.object[property])
-            ) ?? []));
-        }
+        this.notifyPropertyWaiters(property);
 
         return true;
     }
@@ -216,4 +218,48 @@ export default class MultyxClientObject {
             this.object[prop]?.[Unpack](constraints[prop]);
         }
     }
+
+    hydrateFromServer(value: RawObject) {
+        if(!isPlainObject(value)) return;
+        const remaining = new Set(Object.keys(this.object));
+        for(const [key, entry] of Object.entries(value)) {
+            remaining.delete(key);
+            this.set(key, new EditWrapper(entry));
+        }
+        for(const key of remaining) {
+            this.delete(key, true);
+        }
+    }
+
+    private applyServerValue(property: string, incoming: any) {
+        const current = this.object[property];
+        if(!current) return false;
+
+        if(current instanceof MultyxClientValue && (typeof incoming !== 'object' || incoming === null)) {
+            current.set(new EditWrapper(incoming));
+            return true;
+        }
+
+        const canHydrate = typeof (current as any)?.hydrateFromServer === 'function';
+        if(Array.isArray(incoming) && canHydrate && (current as any).type === 'list') {
+            (current as any).hydrateFromServer(incoming);
+            return true;
+        }
+
+        if(isPlainObject(incoming) && canHydrate && (current as any).type === 'object') {
+            (current as any).hydrateFromServer(incoming);
+            return true;
+        }
+
+        return false;
+    }
+
+    private notifyPropertyWaiters(property: string) {
+        const propSymbol = Symbol.for("_" + this.propertyPath.join('.') + '.' + property);
+        if(this.multyx.events.has(propSymbol)) {
+            this.multyx[Done].push(...(this.multyx.events.get(propSymbol)?.map(e =>
+                () => e(this.object[property])
+            ) ?? []));
+        }
+    }
 }

package/src/items/value.ts

@@ -3,6 +3,10 @@ import { Message } from "../message";
 import { Constraint, RawObject, Value } from "../types";
 import { BuildConstraint, Done, Edit, EditWrapper, Unpack } from '../utils';
 
+type InterpolationMode = 'lerp' | 'predictive';
+type NumericSample = { value: number, time: number };
+const DEFAULT_INTERPOLATION_FRAME_MS = 250;
+
 export default class MultyxClientValue {
     private _value: Value;
     private multyx: Multyx;
@@ -17,8 +21,14 @@ export default class MultyxClientValue {
         return this.readModifiers.reduce((value, modifier) => modifier(value), this._value);
     }
 
+    private interpolationModifier?: (value: Value) => Value;
+    private latestSample?: NumericSample;
+    private previousSample?: NumericSample;
+    private interpolationFrameMs: number = DEFAULT_INTERPOLATION_FRAME_MS;
+
     set value(v) {
         this._value = v;
+        this.captureSample(v);
     }
 
     addReadModifier(modifier: (value: Value) => Value) {
@@ -79,7 +89,7 @@ export default class MultyxClientValue {
             }
         }
 
-        if(this.value === nv) {
+        if(this._value === nv) {
             this.value = nv;
             return true;
         }
@@ -118,4 +128,68 @@ export default class MultyxClientValue {
     toString = () => this.value.toString();
     valueOf = () => this.value;
     [Symbol.toPrimitive] = () => this.value;
+
+    Lerp(maxFrameDuration: number = DEFAULT_INTERPOLATION_FRAME_MS) {
+        return this.applyInterpolation('lerp', maxFrameDuration);
+    }
+
+    PredictiveLerp(maxFrameDuration: number = DEFAULT_INTERPOLATION_FRAME_MS) {
+        return this.applyInterpolation('predictive', maxFrameDuration);
+    }
+
+    private applyInterpolation(mode: InterpolationMode, maxFrameDuration: number) {
+        if(typeof this._value !== 'number' || Number.isNaN(this._value)) {
+            throw new Error(`MultyxClientValue.${mode === 'lerp' ? 'Lerp' : 'PredictiveLerp'} can only be applied to numeric values`);
+        }
+
+        this.interpolationFrameMs = Math.max(1, maxFrameDuration);
+        this.attachInterpolationModifier(mode);
+        return this;
+    }
+
+    private attachInterpolationModifier(mode: InterpolationMode) {
+        if(this.interpolationModifier) {
+            this.readModifiers = this.readModifiers.filter(fn => fn !== this.interpolationModifier);
+        }
+
+        this.interpolationModifier = (value: Value) => this.interpolateValue(value, mode);
+        this.readModifiers.push(this.interpolationModifier);
+    }
+
+    private captureSample(value: Value) {
+        if(typeof value !== 'number' || Number.isNaN(value)) {
+            this.latestSample = undefined;
+            this.previousSample = undefined;
+            return;
+        }
+
+        const now = Date.now();
+        if(!this.latestSample) {
+            this.latestSample = { value, time: now };
+            return;
+        }
+
+        this.previousSample = { ...this.latestSample };
+        this.latestSample = { value, time: now };
+    }
+
+    private interpolateValue(baseValue: Value, mode: InterpolationMode): Value {
+        if(typeof baseValue !== 'number' || !this.latestSample || !this.previousSample) {
+            return baseValue;
+        }
+
+        const durationRaw = this.latestSample.time - this.previousSample.time;
+        if(durationRaw <= 0) return baseValue;
+
+        const duration = Math.max(1, Math.min(durationRaw, this.interpolationFrameMs));
+        const elapsed = Math.max(0, Math.min(Date.now() - this.latestSample.time, duration));
+        const ratio = duration === 0 ? 1 : elapsed / duration;
+        const delta = this.latestSample.value - this.previousSample.value;
+
+        if(mode === 'predictive') {
+            return this.latestSample.value + delta * ratio;
+        }
+
+        return this.previousSample.value + delta * ratio;
+    }
 }

package/src/message.ts

@@ -15,8 +15,8 @@ export function UncompressUpdate(str: string) {
     if(instruction == '9') return { instruction: 'self', property: "space", data: JSON.parse(specifier) };
 
     if(instruction == '5') return { instruction: 'resp', name: specifier, response: data[0] };
-    if(instruction == '6') return { instruction: 'conn', uuid: specifier, publicData: data[0] };
-    if(instruction == '7') return { instruction: 'dcon', clientUUID: specifier };
+    if(instruction == '6') return { instruction: 'conn', uuid: specifier, data: data[0] };
+    if(instruction == '7') return { instruction: 'dcon', client: specifier };
     
     if(instruction == '8') return {
         instruction: 'init',
@@ -45,7 +45,7 @@ export function CompressUpdate(update: Update) {
         pieces = [update.name, JSON.stringify(update.response)];
     }
 
-    if(!pieces || !code) return '';
+    if(!pieces || code === undefined) return '';
     let compressed = code.toString();
     for(let i = 0; i < pieces.length; i++) {
         compressed += pieces[i].replace(/;/g, ';_');

package/src/utils.ts

@@ -36,34 +36,65 @@ export function Interpolate(
         progress: number,
     }[]
 ) {
+    if(!Array.isArray(interpolationCurve) || interpolationCurve.length === 0) {
+        throw new Error('Interpolation curve must contain at least one slice');
+    }
+
+    const curve = [...interpolationCurve].sort((a, b) => a.time - b.time);
+    const curveMaxTime = curve[curve.length - 1].time;
+    const usesNormalizedCurve = curveMaxTime <= 1;
+    const clamp = (value: number, min: number, max: number) => Math.min(Math.max(value, min), max);
+
     let start = { value: object[property], time: Date.now() };
     let end = { value: object[property], time: Date.now() };
     
     Object.defineProperty(object, property, {
+        configurable: true,
+        enumerable: true,
         get: () => {
-            const time = end.time - start.time;
-            let lower = interpolationCurve[0];
-            let upper = interpolationCurve[0];
+            if(start.time === end.time) return end.value;
+            const now = Date.now();
+            const duration = Math.max(end.time - start.time, 1);
+            const elapsed = Math.max(0, now - end.time);
+            const targetTime = usesNormalizedCurve
+                ? clamp(elapsed / duration, 0, curveMaxTime)
+                : clamp(elapsed, 0, curveMaxTime);
 
-            for(const slice of interpolationCurve) {
-                if(time > slice.time && slice.time > lower.time) lower = slice;
-                if(time < slice.time && slice.time < upper.time) upper = slice;
+            let lower = curve[0];
+            let upper = curve[curve.length - 1];
+            for(const slice of curve) {
+                if(slice.time <= targetTime) {
+                    lower = slice;
+                    continue;
+                }
+                upper = slice;
+                break;
             }
 
-            const sliceTime = (time - lower.time) / (upper.time - lower.time);
-            const ratio = lower.progress + sliceTime * (upper.progress - lower.progress);
+            let ratio: number;
+            if(upper.time === lower.time) {
+                ratio = lower.progress;
+            } else {
+                const sliceTime = (targetTime - lower.time) / (upper.time - lower.time);
+                ratio = lower.progress + sliceTime * (upper.progress - lower.progress);
+            }
 
             if(Number.isNaN(ratio)) return start.value;
-            return end.value * ratio + start.value * (1 - ratio);
+            if(typeof start.value === 'number' && typeof end.value === 'number') {
+                return end.value * ratio + start.value * (1 - ratio);
+            }
+            return ratio >= 1 ? end.value : start.value;
         },
         set: (value) => {
+            const now = Date.now();
             // Don't lerp between edit requests sent in same frame
-            if(Date.now() - end.time < 10) {
+            if(now - end.time < 10) {
                 end.value = value;
+                end.time = now;
                 return true;
             }
             start = { ...end };
-            end = { value, time: Date.now() }
+            end = { value, time: now };
             return true;
         }
     });