@colyseus/sdk 0.17.15 → 0.17.17

package/dist/colyseus.js

@@ -3,7 +3,7 @@
 // This software is released under the MIT License.
 // https://opensource.org/license/MIT
 //
-// colyseus.js@0.17.15 - @colyseus/schema 4.0.1
+// colyseus.js@0.17.17 - @colyseus/schema 4.0.4
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
     typeof define === 'function' && define.amd ? define('@colyseus/sdk', ['exports'], factory) :
@@ -119,10 +119,30 @@
     };
 
     class ServerError extends Error {
-        constructor(code, message) {
+        constructor(code, message, opts) {
             super(message);
             this.name = "ServerError";
             this.code = code;
+            if (opts) {
+                this.headers = opts.headers;
+                this.status = opts.status;
+                this.response = opts.response;
+                this.data = opts.data;
+            }
+        }
+    }
+    class AbortError extends Error {
+        constructor(message) {
+            super(message);
+            this.name = "AbortError";
+        }
+    }
+    class MatchMakeError extends Error {
+        constructor(message, code) {
+            super(message);
+            this.code = code;
+            this.name = "MatchMakeError";
+            Object.setPrototypeOf(this, MatchMakeError.prototype);
         }
     }
 
@@ -130,19 +150,19 @@
     	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
     }
 
-    var umd$1 = {exports: {}};
+    var build$1 = {exports: {}};
 
-    var umd = umd$1.exports;
+    var build = build$1.exports;
 
-    var hasRequiredUmd;
+    var hasRequiredBuild;
 
-    function requireUmd () {
-    	if (hasRequiredUmd) return umd$1.exports;
-    	hasRequiredUmd = 1;
+    function requireBuild () {
+    	if (hasRequiredBuild) return build$1.exports;
+    	hasRequiredBuild = 1;
     	(function (module, exports$1) {
     		(function (global, factory) {
     		    factory(exports$1) ;
-    		})(umd, (function (exports$1) {
+    		})(build, (function (exports$1) {
     		    const SWITCH_TO_STRUCTURE = 255; // (decoding collides with DELETE_AND_ADD + fieldIndex = 63)
     		    const TYPE_ID = 213;
     		    /**
@@ -5265,32 +5285,6 @@
     		        decoder.triggerChanges = callback;
     		    }
 
-    		    /**
-    		     * State Callbacks handler
-    		     *
-    		     * Usage:
-    		     * ```ts
-    		     * const $ = Callbacks.get(decoder);
-    		     *
-    		     * // Listen to property changes
-    		     * $.listen("currentTurn", (currentValue, previousValue) => { ... });
-    		     *
-    		     * // Listen to collection additions
-    		     * $.onAdd("entities", (sessionId, entity) => {
-    		     *     // Nested property listening
-    		     *     $.listen(entity, "hp", (currentHp, previousHp) => { ... });
-    		     * });
-    		     *
-    		     * // Listen to collection removals
-    		     * $.onRemove("entities", (sessionId, entity) => { ... });
-    		     *
-    		     * // Listen to any property change on an instance
-    		     * $.onChange(entity, () => { ... });
-    		     *
-    		     * // Bind properties to another object
-    		     * $.bindTo(player, playerVisual);
-    		     * ```
-    		     */
     		    class StateCallbackStrategy {
     		        decoder;
     		        uniqueRefIds = new Set();
@@ -5329,7 +5323,7 @@
     		                immediate = immediate && this.isTriggering === false;
     		                if (operation === exports$1.OPERATION.ADD && immediate) {
     		                    collection.forEach((value, key) => {
-    		                        handler(key, value);
+    		                        handler(value, key);
     		                    });
     		                }
     		                return this.addCallback(collection[$refId], operation, handler);
@@ -5485,11 +5479,11 @@
     		                        // FIXME: `previousValue` should always be available.
     		                        //
     		                        if (change.previousValue !== undefined) {
-    		                            // trigger onRemove (key, value)
+    		                            // trigger onRemove (value, key)
     		                            const deleteCallbacks = $callbacks[exports$1.OPERATION.DELETE];
     		                            if (deleteCallbacks) {
     		                                for (let j = deleteCallbacks.length - 1; j >= 0; j--) {
-    		                                    deleteCallbacks[j](dynamicIndex, change.previousValue);
+    		                                    deleteCallbacks[j](change.previousValue, dynamicIndex);
     		                                }
     		                            }
     		                        }
@@ -5499,7 +5493,7 @@
     		                            if (addCallbacks) {
     		                                this.isTriggering = true;
     		                                for (let j = addCallbacks.length - 1; j >= 0; j--) {
-    		                                    addCallbacks[j](dynamicIndex, change.value);
+    		                                    addCallbacks[j](change.value, dynamicIndex);
     		                                }
     		                                this.isTriggering = false;
     		                            }
@@ -5507,12 +5501,12 @@
     		                    }
     		                    else if ((change.op & exports$1.OPERATION.ADD) === exports$1.OPERATION.ADD &&
     		                        change.previousValue !== change.value) {
-    		                        // trigger onAdd (key, value)
+    		                        // trigger onAdd (value, key)
     		                        const addCallbacks = $callbacks[exports$1.OPERATION.ADD];
     		                        if (addCallbacks) {
     		                            this.isTriggering = true;
     		                            for (let j = addCallbacks.length - 1; j >= 0; j--) {
-    		                                addCallbacks[j](dynamicIndex, change.value);
+    		                                addCallbacks[j](change.value, dynamicIndex);
     		                            }
     		                            this.isTriggering = false;
     		                        }
@@ -5546,13 +5540,13 @@
     		         * callbacks.listen("currentTurn", (currentValue, previousValue) => { ... });
     		         *
     		         * // Listen to collection additions
-    		         * callbacks.onAdd("entities", (sessionId, entity) => {
+    		         * callbacks.onAdd("entities", (entity, sessionId) => {
     		         *     // Nested property listening
     		         *     callbacks.listen(entity, "hp", (currentHp, previousHp) => { ... });
     		         * });
     		         *
     		         * // Listen to collection removals
-    		         * callbacks.onRemove("entities", (sessionId, entity) => { ... });
+    		         * callbacks.onRemove("entities", (entity, sessionId) => { ... });
     		         *
     		         * // Listen to any property change on an instance
     		         * callbacks.onChange(entity, () => { ... });
@@ -5924,11 +5918,11 @@
     		    exports$1.view = view;
 
     		})); 
-    	} (umd$1, umd$1.exports));
-    	return umd$1.exports;
+    	} (build$1, build$1.exports));
+    	return build$1.exports;
     }
 
-    var umdExports = requireUmd();
+    var buildExports = requireBuild();
 
     var decoder;
     try {
@@ -8158,14 +8152,14 @@
             });
         }
         send(data) {
-            const prefixLength = umdExports.encode.number(this.lengthPrefixBuffer, data.length, { offset: 0 });
+            const prefixLength = buildExports.encode.number(this.lengthPrefixBuffer, data.length, { offset: 0 });
             const dataWithPrefixedLength = new Uint8Array(prefixLength + data.length);
             dataWithPrefixedLength.set(this.lengthPrefixBuffer.subarray(0, prefixLength), 0);
             dataWithPrefixedLength.set(data, prefixLength);
             this.writer.write(dataWithPrefixedLength);
         }
         sendUnreliable(data) {
-            const prefixLength = umdExports.encode.number(this.lengthPrefixBuffer, data.length, { offset: 0 });
+            const prefixLength = buildExports.encode.number(this.lengthPrefixBuffer, data.length, { offset: 0 });
             const dataWithPrefixedLength = new Uint8Array(prefixLength + data.length);
             dataWithPrefixedLength.set(this.lengthPrefixBuffer.subarray(0, prefixLength), 0);
             dataWithPrefixedLength.set(data, prefixLength);
@@ -8195,7 +8189,7 @@
                             //
                             // QUESTION: should we buffer the message in case it's not fully read?
                             //
-                            const length = umdExports.decode.number(messages, it);
+                            const length = buildExports.decode.number(messages, it);
                             this.events.onmessage({ data: messages.subarray(it.offset, it.offset + length) });
                             it.offset += length;
                         } while (it.offset < messages.length);
@@ -8228,7 +8222,7 @@
                             //
                             // QUESTION: should we buffer the message in case it's not fully read?
                             //
-                            const length = umdExports.decode.number(messages, it);
+                            const length = buildExports.decode.number(messages, it);
                             this.events.onmessage({ data: messages.subarray(it.offset, it.offset + length) });
                             it.offset += length;
                         } while (it.offset < messages.length);
@@ -8248,13 +8242,13 @@
         sendSeatReservation(roomId, sessionId, reconnectionToken, skipHandshake) {
             const it = { offset: 0 };
             const bytes = [];
-            umdExports.encode.string(bytes, roomId, it);
-            umdExports.encode.string(bytes, sessionId, it);
+            buildExports.encode.string(bytes, roomId, it);
+            buildExports.encode.string(bytes, sessionId, it);
             if (reconnectionToken) {
-                umdExports.encode.string(bytes, reconnectionToken, it);
+                buildExports.encode.string(bytes, reconnectionToken, it);
             }
             if (skipHandshake) {
-                umdExports.encode.boolean(bytes, 1, it);
+                buildExports.encode.boolean(bytes, 1, it);
             }
             this.writer.write(new Uint8Array(bytes).buffer);
         }
@@ -8524,7 +8518,7 @@
         try {
             // SchemaSerializer
             // @ts-ignore
-            return umdExports.getDecoderStateCallbacks(room['serializer'].decoder);
+            return buildExports.getDecoderStateCallbacks(room['serializer'].decoder);
         }
         catch (e) {
             // NoneSerializer
@@ -8549,12 +8543,12 @@
                 //
                 // TODO: validate definitions against concreate this.state instance
                 //
-                umdExports.Reflection.decode(bytes, it); // no-op
-                this.decoder = new umdExports.Decoder(this.state);
+                buildExports.Reflection.decode(bytes, it); // no-op
+                this.decoder = new buildExports.Decoder(this.state);
             }
             else {
                 // initialize reflected state from server
-                this.decoder = umdExports.Reflection.decode(bytes, it);
+                this.decoder = buildExports.Reflection.decode(bytes, it);
                 this.state = this.decoder.state;
             }
         }
@@ -8676,10 +8670,10 @@
             const it = { offset: 1 };
             this.packr.buffer[0] = Protocol.ROOM_DATA;
             if (typeof (messageType) === "string") {
-                umdExports.encode.string(this.packr.buffer, messageType, it);
+                buildExports.encode.string(this.packr.buffer, messageType, it);
             }
             else {
-                umdExports.encode.number(this.packr.buffer, messageType, it);
+                buildExports.encode.number(this.packr.buffer, messageType, it);
             }
             // force packr to use beginning of the buffer
             this.packr.position = 0;
@@ -8702,10 +8696,10 @@
             const it = { offset: 1 };
             this.packr.buffer[0] = Protocol.ROOM_DATA;
             if (typeof (type) === "string") {
-                umdExports.encode.string(this.packr.buffer, type, it);
+                buildExports.encode.string(this.packr.buffer, type, it);
             }
             else {
-                umdExports.encode.number(this.packr.buffer, type, it);
+                buildExports.encode.number(this.packr.buffer, type, it);
             }
             // force packr to use beginning of the buffer
             this.packr.position = 0;
@@ -8718,10 +8712,10 @@
             const it = { offset: 1 };
             this.packr.buffer[0] = Protocol.ROOM_DATA_BYTES;
             if (typeof (type) === "string") {
-                umdExports.encode.string(this.packr.buffer, type, it);
+                buildExports.encode.string(this.packr.buffer, type, it);
             }
             else {
-                umdExports.encode.number(this.packr.buffer, type, it);
+                buildExports.encode.number(this.packr.buffer, type, it);
             }
             // check if buffer needs to be resized
             // TODO: can we avoid this?
@@ -8759,8 +8753,8 @@
             const it = { offset: 1 };
             const code = buffer[0];
             if (code === Protocol.JOIN_ROOM) {
-                const reconnectionToken = umdExports.decode.utf8Read(buffer, it, buffer[it.offset++]);
-                this.serializerId = umdExports.decode.utf8Read(buffer, it, buffer[it.offset++]);
+                const reconnectionToken = buildExports.decode.utf8Read(buffer, it, buffer[it.offset++]);
+                this.serializerId = buildExports.decode.utf8Read(buffer, it, buffer[it.offset++]);
                 // Instantiate serializer if not locally available.
                 if (!this.serializer) {
                     const serializer = getSerializer(this.serializerId);
@@ -8793,8 +8787,8 @@
                 }
             }
             else if (code === Protocol.ERROR) {
-                const code = umdExports.decode.number(buffer, it);
-                const message = umdExports.decode.string(buffer, it);
+                const code = buildExports.decode.number(buffer, it);
+                const message = buildExports.decode.string(buffer, it);
                 this.onError.invoke(code, message);
             }
             else if (code === Protocol.LEAVE_ROOM) {
@@ -8809,18 +8803,18 @@
                 this.onStateChange.invoke(this.serializer.getState());
             }
             else if (code === Protocol.ROOM_DATA) {
-                const type = (umdExports.decode.stringCheck(buffer, it))
-                    ? umdExports.decode.string(buffer, it)
-                    : umdExports.decode.number(buffer, it);
+                const type = (buildExports.decode.stringCheck(buffer, it))
+                    ? buildExports.decode.string(buffer, it)
+                    : buildExports.decode.number(buffer, it);
                 const message = (buffer.byteLength > it.offset)
                     ? unpack(buffer, { start: it.offset })
                     : undefined;
                 this.dispatchMessage(type, message);
             }
             else if (code === Protocol.ROOM_DATA_BYTES) {
-                const type = (umdExports.decode.stringCheck(buffer, it))
-                    ? umdExports.decode.string(buffer, it)
-                    : umdExports.decode.number(buffer, it);
+                const type = (buildExports.decode.stringCheck(buffer, it))
+                    ? buildExports.decode.string(buffer, it)
+                    : buildExports.decode.number(buffer, it);
                 this.dispatchMessage(type, buffer.subarray(it.offset));
             }
             else if (code === Protocol.PING) {
@@ -8983,7 +8977,7 @@
         }
         executeRequest(method, path, requestOptions) {
             return __awaiter(this, void 0, void 0, function* () {
-                var _a;
+                var _a, _b, _c;
                 //
                 // FIXME: if FormData is provided, merging "baseOptions.body" with
                 // "options.body" will not work as intended
@@ -9018,9 +9012,9 @@
                     body,
                     method });
                 const url = getURLWithQueryParams(this.sdk['getHttpEndpoint'](path.toString()), mergedOptions);
-                let response;
+                let raw;
                 try {
-                    response = yield fetch(url, mergedOptions);
+                    raw = yield fetch(url, mergedOptions);
                 }
                 catch (err) {
                     // If it's an AbortError, re-throw as-is
@@ -9029,35 +9023,36 @@
                     }
                     // Re-throw with network error code at top level (e.g. ECONNREFUSED)
                     const networkError = new ServerError(((_a = err.cause) === null || _a === void 0 ? void 0 : _a.code) || err.code, err.message);
+                    networkError.response = raw;
                     networkError.cause = err.cause;
                     throw networkError;
                 }
-                const contentType = response.headers.get("content-type");
+                const contentType = raw.headers.get("content-type");
                 let data;
-                let error = null;
                 // TODO: improve content-type detection here!
                 if (contentType === null || contentType === void 0 ? void 0 : contentType.indexOf("json")) {
-                    data = yield response.json();
+                    data = yield raw.json();
                 }
                 else if (contentType === null || contentType === void 0 ? void 0 : contentType.indexOf("text")) {
-                    data = yield response.text();
+                    data = yield raw.text();
                 }
                 else {
-                    data = yield response.blob();
+                    data = yield raw.blob();
                 }
-                if (!response.ok) {
-                    // TODO: throw error here?!
-                    error = data;
-                    data = null;
+                if (!raw.ok) {
+                    throw new ServerError((_b = data.code) !== null && _b !== void 0 ? _b : raw.status, (_c = data.message) !== null && _c !== void 0 ? _c : raw.statusText, {
+                        headers: raw.headers,
+                        status: raw.status,
+                        response: raw,
+                        data
+                    });
                 }
                 return {
-                    ok: response.ok,
-                    headers: response.headers,
+                    raw,
                     data,
-                    error,
-                    status: response.status,
-                    statusText: response.statusText,
-                    response,
+                    headers: raw.headers,
+                    status: raw.status,
+                    statusText: raw.statusText,
                 };
             });
         }
@@ -9335,14 +9330,6 @@
     }
 
     var _a;
-    class MatchMakeError extends Error {
-        constructor(message, code) {
-            super(message);
-            this.code = code;
-            this.name = "MatchMakeError";
-            Object.setPrototypeOf(this, MatchMakeError.prototype);
-        }
-    }
     // - React Native does not provide `window.location`
     // - Cocos Creator (Native) does not provide `window.location.hostname`
     const DEFAULT_ENDPOINT = (typeof (window) !== "undefined" && typeof ((_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.hostname) !== "undefined")
@@ -9522,24 +9509,27 @@
         }
         createMatchMakeRequest(method_1, roomName_1) {
             return __awaiter(this, arguments, void 0, function* (method, roomName, options = {}, rootSchema) {
-                const httpResponse = yield this.http.post(`/matchmake/${method}/${roomName}`, {
-                    headers: {
-                        'Accept': 'application/json',
-                        'Content-Type': 'application/json'
-                    },
-                    body: options
-                });
-                // Handle HTTP error responses
-                if (!httpResponse.ok) {
-                    // @ts-ignore
-                    throw new MatchMakeError(httpResponse.error.message || httpResponse.error, httpResponse.error.code || httpResponse.status);
+                try {
+                    const httpResponse = yield this.http.post(`/matchmake/${method}/${roomName}`, {
+                        headers: {
+                            'Accept': 'application/json',
+                            'Content-Type': 'application/json'
+                        },
+                        body: options
+                    });
+                    const response = httpResponse.data;
+                    // forward reconnection token during "reconnect" methods.
+                    if (method === "reconnect") {
+                        response.reconnectionToken = options.reconnectionToken;
+                    }
+                    return yield this.consumeSeatReservation(response, rootSchema);
                 }
-                const response = httpResponse.data;
-                // forward reconnection token during "reconnect" methods.
-                if (method === "reconnect") {
-                    response.reconnectionToken = options.reconnectionToken;
+                catch (error) {
+                    if (error instanceof ServerError) {
+                        throw new MatchMakeError(error.message, error.code);
+                    }
+                    throw error;
                 }
-                return yield this.consumeSeatReservation(response, rootSchema);
             });
         }
         createRoom(roomName, rootSchema) {
@@ -9606,8 +9596,9 @@
     registerSerializer('schema', SchemaSerializer);
     registerSerializer('none', NoneSerializer);
 
+    exports.AbortError = AbortError;
     exports.Auth = Auth;
-    exports.Callbacks = umdExports.Callbacks;
+    exports.Callbacks = buildExports.Callbacks;
     exports.Client = Client;
     exports.CloseCode = CloseCode;
     exports.ColyseusSDK = ColyseusSDK;