@colyseus/schema 3.0.39 → 3.0.41

package/build/cjs/index.js

@@ -3310,18 +3310,22 @@ class Schema {
      * @param showContents display JSON contents of the instance
      * @returns
      */
-    static debugRefIds(ref, showContents = false, level = 0) {
+    static debugRefIds(ref, showContents = false, level = 0, decoder) {
         const contents = (showContents) ? ` - ${JSON.stringify(ref.toJSON())}` : "";
         const changeTree = ref[$changes];
-        const refId = changeTree.refId;
+        const refId = (decoder) ? decoder.root.refIds.get(ref) : changeTree.refId;
+        const root = (decoder) ? decoder.root : changeTree.root;
         // log reference count if > 1
-        const refCount = (changeTree.root?.refCount?.[refId] > 1)
-            ? ` [×${changeTree.root.refCount[refId]}]`
+        const refCount = (root?.refCount?.[refId] > 1)
+            ? ` [×${root.refCount[refId]}]`
             : '';
         let output = `${getIndent(level)}${ref.constructor.name} (refId: ${refId})${refCount}${contents}\n`;
-        changeTree.forEachChild((childChangeTree) => output += this.debugRefIds(childChangeTree.ref, showContents, level + 1));
+        changeTree.forEachChild((childChangeTree) => output += this.debugRefIds(childChangeTree.ref, showContents, level + 1, decoder));
         return output;
     }
+    static debugRefIdsDecoder(decoder) {
+        return this.debugRefIds(decoder.state, false, 0, decoder);
+    }
     /**
      * Return a string representation of the changes on a Schema instance.
      * The list of changes is cleared after each encode.
@@ -4124,7 +4128,7 @@ class ReferenceTracker {
         //
         this.refs = new Map();
         this.refIds = new WeakMap();
-        this.refCounts = {};
+        this.refCount = {};
         this.deletedRefs = new Set();
         this.callbacks = {};
         this.nextUniqueId = 0;
@@ -4137,7 +4141,7 @@ class ReferenceTracker {
         this.refs.set(refId, ref);
         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)) {
             this.deletedRefs.delete(refId);
@@ -4145,7 +4149,7 @@ class ReferenceTracker {
     }
     // for decoding
     removeRef(refId) {
-        const refCount = this.refCounts[refId];
+        const refCount = this.refCount[refId];
         if (refCount === undefined) {
             try {
                 throw new DecodingWarning("trying to remove refId that doesn't exist: " + refId);
@@ -4165,7 +4169,7 @@ class ReferenceTracker {
             }
             return;
         }
-        if ((this.refCounts[refId] = refCount - 1) <= 0) {
+        if ((this.refCount[refId] = refCount - 1) <= 0) {
             this.deletedRefs.add(refId);
         }
     }
@@ -4173,7 +4177,7 @@ class ReferenceTracker {
         this.refs.clear();
         this.deletedRefs.clear();
         this.callbacks = {};
-        this.refCounts = {};
+        this.refCount = {};
     }
     // for decoding
     garbageCollectDeletedRefs() {
@@ -4181,7 +4185,7 @@ class ReferenceTracker {
             //
             // Skip active references.
             //
-            if (this.refCounts[refId] > 0) {
+            if (this.refCount[refId] > 0) {
                 return;
             }
             const ref = this.refs.get(refId);
@@ -4210,7 +4214,7 @@ 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
         });
         // clear deleted refs.
@@ -4267,15 +4271,19 @@ class Decoder {
             //
             if (bytes[it.offset] == SWITCH_TO_STRUCTURE) {
                 it.offset++;
-                this.currentRefId = decode.number(bytes, it);
-                const nextRef = $root.refs.get(this.currentRefId);
+                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}`);
+                    console.error(`"refId" not found: ${nextRefId}`, { previousRef: ref, 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]?.();
+                this.currentRefId = nextRefId;
                 ref = nextRef;
                 decoder = ref.constructor[$decoder];
                 continue;
@@ -4283,20 +4291,7 @@ class Decoder {
             const result = decoder(this, bytes, it, ref, allChanges);
             if (result === DEFINITION_MISMATCH) {
                 console.warn("@colyseus/schema: definition mismatch");
-                //
-                // keep skipping next bytes until reaches a known structure
-                // by local decoder.
-                //
-                const nextIterator = { 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;
             }
         }
@@ -4308,6 +4303,22 @@ class Decoder {
         $root.garbageCollectDeletedRefs();
         return allChanges;
     }
+    skipCurrentStructure(bytes, it, totalBytes) {
+        //
+        // keep skipping next bytes until reaches a known structure
+        // by local decoder.
+        //
+        const nextIterator = { 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, it, defaultType) {
         let type;
         if (bytes[it.offset] === TYPE_ID) {