@colyseus/schema 3.0.39 → 3.0.40

package/src/decoder/Decoder.ts

@@ -58,16 +58,23 @@ export class Decoder<T extends Schema = any> {
             if (bytes[it.offset] == SWITCH_TO_STRUCTURE) {
                 it.offset++;
 
-                this.currentRefId = decode.number(bytes, it);
-                const nextRef = $root.refs.get(this.currentRefId) as Schema;
+                const nextRefId = decode.number(bytes, it);
+                const nextRef = $root.refs.get(nextRefId);
 
                 //
                 // Trying to access a reference that haven't been decoded yet.
                 //
-                if (!nextRef) { throw new Error(`"refId" not found: ${this.currentRefId}`); }
+                if (!nextRef) {
+                    console.error(`"refId" not found: ${nextRefId}`, { previousRef: this, previousRefId: this.currentRefId });
+                    console.warn("Please report this to the developers. All refIds =>");
+                    console.warn(Schema.debugRefIdsDecoder(this));
+                    this.skipCurrentStructure(bytes, it, totalBytes);
+                }
                 ref[$onDecodeEnd]?.()
-                ref = nextRef;
 
+                this.currentRefId = nextRefId;
+
+                ref = nextRef;
                 decoder = ref.constructor[$decoder];
 
                 continue;
@@ -77,22 +84,7 @@ export class Decoder<T extends Schema = any> {
 
             if (result === DEFINITION_MISMATCH) {
                 console.warn("@colyseus/schema: definition mismatch");
-
-                //
-                // keep skipping next bytes until reaches a known structure
-                // by local decoder.
-                //
-                const nextIterator: Iterator = { offset: it.offset };
-                while (it.offset < totalBytes) {
-                    if (bytes[it.offset] === SWITCH_TO_STRUCTURE) {
-                        nextIterator.offset = it.offset + 1;
-                        if ($root.refs.has(decode.number(bytes, nextIterator))) {
-                            break;
-                        }
-                    }
-
-                    it.offset++;
-                }
+                this.skipCurrentStructure(bytes, it, totalBytes);
                 continue;
             }
         }
@@ -109,6 +101,23 @@ export class Decoder<T extends Schema = any> {
         return allChanges;
     }
 
+    skipCurrentStructure(bytes: Buffer, it: Iterator, totalBytes: number) {
+        //
+        // keep skipping next bytes until reaches a known structure
+        // by local decoder.
+        //
+        const nextIterator: Iterator = { offset: it.offset };
+        while (it.offset < totalBytes) {
+            if (bytes[it.offset] === SWITCH_TO_STRUCTURE) {
+                nextIterator.offset = it.offset + 1;
+                if (this.root.refs.has(decode.number(bytes, nextIterator))) {
+                    break;
+                }
+            }
+            it.offset++;
+        }
+    }
+
     getInstanceType(bytes: Buffer, it: Iterator, defaultType: typeof Schema): typeof Schema {
         let type: typeof Schema;
 

package/src/decoder/ReferenceTracker.ts

@@ -26,7 +26,7 @@ export class ReferenceTracker {
     public refs = new Map<number, Ref>();
     public refIds = new WeakMap<Ref, number>();
 
-    public refCounts: { [refId: number]: number; } = {};
+    public refCount: { [refId: number]: number; } = {};
     public deletedRefs = new Set<number>();
 
     public callbacks: { [refId: number]: SchemaCallbacks } = {};
@@ -42,7 +42,7 @@ export class ReferenceTracker {
         this.refIds.set(ref, refId);
 
         if (incrementCount) {
-            this.refCounts[refId] = (this.refCounts[refId] || 0) + 1;
+            this.refCount[refId] = (this.refCount[refId] || 0) + 1;
         }
 
         if (this.deletedRefs.has(refId)) {
@@ -52,7 +52,7 @@ export class ReferenceTracker {
 
     // for decoding
     removeRef(refId: number) {
-        const refCount = this.refCounts[refId];
+        const refCount = this.refCount[refId];
 
         if (refCount === undefined) {
             try {
@@ -73,7 +73,7 @@ export class ReferenceTracker {
             return;
         }
 
-        if ((this.refCounts[refId] = refCount - 1) <= 0) {
+        if ((this.refCount[refId] = refCount - 1) <= 0) {
             this.deletedRefs.add(refId);
         }
     }
@@ -82,7 +82,7 @@ export class ReferenceTracker {
         this.refs.clear();
         this.deletedRefs.clear();
         this.callbacks = {};
-        this.refCounts = {};
+        this.refCount = {};
     }
 
     // for decoding
@@ -91,7 +91,7 @@ export class ReferenceTracker {
             //
             // Skip active references.
             //
-            if (this.refCounts[refId] > 0) { return; }
+            if (this.refCount[refId] > 0) { return; }
 
             const ref = this.refs.get(refId);
 
@@ -121,7 +121,7 @@ export class ReferenceTracker {
             }
 
             this.refs.delete(refId); // remove ref
-            delete this.refCounts[refId]; // remove ref count
+            delete this.refCount[refId]; // remove ref count
             delete this.callbacks[refId]; // remove callbacks
         });