@colyseus/sdk 0.17.16 → 0.17.18

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.16 - @colyseus/schema 4.0.4
+// colyseus.js@0.17.18 - @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);
         }
     }
 
@@ -8957,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
@@ -8992,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
@@ -9003,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,
                 };
             });
         }
@@ -9309,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")
@@ -9496,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) {
@@ -9580,6 +9596,7 @@
     registerSerializer('schema', SchemaSerializer);
     registerSerializer('none', NoneSerializer);
 
+    exports.AbortError = AbortError;
     exports.Auth = Auth;
     exports.Callbacks = buildExports.Callbacks;
     exports.Client = Client;