@colyseus/schema 3.0.0-alpha.23 → 3.0.0-alpha.25

package/build/cjs/index.js

@@ -148,7 +148,7 @@ const Metadata = {
         // TODO: remove/refactor this...
         //
         const metadata = {};
-        klass.constructor[Symbol.metadata] = metadata;
+        klass[Symbol.metadata] = metadata;
         Object.defineProperty(metadata, -1, {
             value: 0,
             enumerable: false,
@@ -2415,6 +2415,12 @@ class TypeContext {
             return false;
         }
         this.types[typeid] = schema;
+        //
+        // Workaround to allow using an empty Schema (with no `@type()` fields)
+        //
+        if (schema[Symbol.metadata] === undefined) {
+            Metadata.init(schema);
+        }
         this.schemas.set(schema, typeid);
         return true;
     }
@@ -3430,12 +3436,12 @@ class Encoder {
     static { this.BUFFER_SIZE = 8 * 1024; } // 8KB
     constructor(root) {
         this.sharedBuffer = Buffer.allocUnsafeSlow(Encoder.BUFFER_SIZE);
-        this.setRoot(root);
         //
         // TODO: cache and restore "Context" based on root schema
         // (to avoid creating a new context for every new room)
         //
         this.context = new TypeContext(root.constructor);
+        this.setRoot(root);
         // console.log(">>>>>>>>>>>>>>>> Encoder types");
         // this.context.schemas.forEach((id, schema) => {
         //     console.log("type:", id, schema.name, Object.keys(schema[Symbol.metadata]));
@@ -3444,10 +3450,6 @@ class Encoder {
     setRoot(state) {
         this.root = new Root();
         this.state = state;
-        // Workaround to allow using an empty Schema.
-        if (state.constructor[Symbol.metadata] === undefined) {
-            Metadata.init(state);
-        }
         state[$changes].setRoot(this.root);
     }
     encode(it = { offset: 0 }, view, buffer = this.sharedBuffer, changeTrees = this.root.changes, isEncodeAll = this.root.allChanges === changeTrees) {
@@ -4146,7 +4148,11 @@ function getDecoderStateCallbacks(decoder) {
                     }
                     else {
                         // collection instance not received yet
-                        context.onInstanceAvailable((ref, existing) => onAdd(ref, prop, callback, immediate && existing));
+                        let detachCallback = () => { };
+                        context.onInstanceAvailable((ref, existing) => {
+                            detachCallback = onAdd(ref, prop, callback, immediate && existing);
+                        });
+                        return () => detachCallback();
                     }
                 },
                 onChange: function onChange(callback) {
@@ -4221,19 +4227,27 @@ function getDecoderStateCallbacks(decoder) {
                     //
                     if (context.onInstanceAvailable) {
                         // collection instance not received yet
-                        context.onInstanceAvailable((ref, existing) => onAdd(ref, callback, immediate && existing && !isTriggeringOnAdd));
+                        let detachCallback = () => { };
+                        context.onInstanceAvailable((ref, existing) => {
+                            detachCallback = onAdd(ref, callback, immediate && existing && !isTriggeringOnAdd);
+                        });
+                        return () => detachCallback();
                     }
                     else if (context.instance) {
-                        onAdd(context.instance, callback, immediate && !isTriggeringOnAdd);
+                        return onAdd(context.instance, callback, immediate && !isTriggeringOnAdd);
                     }
                 },
                 onRemove: function (callback) {
                     if (context.onInstanceAvailable) {
                         // collection instance not received yet
-                        context.onInstanceAvailable((ref) => onRemove(ref, callback));
+                        let detachCallback = () => { };
+                        context.onInstanceAvailable((ref) => {
+                            detachCallback = onRemove(ref, callback);
+                        });
+                        return () => detachCallback();
                     }
                     else if (context.instance) {
-                        onRemove(context.instance, callback);
+                        return onRemove(context.instance, callback);
                     }
                 },
             }, {