@wwawing/loader 3.8.0 → 3.9.0-beta.0

package/lib/core/index.d.ts

@@ -3,6 +3,6 @@ export declare class WWALoader {
     private fileName;
     private eventEmitter;
     constructor(fileName: string, eventEmitter: WWALoaderEventEmitter);
-    requestAndLoadMapData(): Promise<void>;
+    requestAndLoadMapData(): void;
     private loadMapData;
 }

package/lib/core/index.js

@@ -1,40 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WWALoader = void 0;
 var extractor_1 = require("./extractor");
@@ -55,34 +19,21 @@ var WWALoader = (function () {
         this.eventEmitter = eventEmitter;
     }
     WWALoader.prototype.requestAndLoadMapData = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var client, responseBuffer, wwaData, error_1, name_1, message;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        client = createMapDataClient(this.fileName);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4, client.request()];
-                    case 2:
-                        responseBuffer = _a.sent();
-                        if (!responseBuffer) {
-                            this.eventEmitter.dispatch("error", { name: "マップデータ取得に失敗しました", message: "mapdata is empty" });
-                            return [2];
-                        }
-                        wwaData = this.loadMapData(responseBuffer);
-                        this.eventEmitter.dispatch("mapData", wwaData);
-                        return [3, 4];
-                    case 3:
-                        error_1 = _a.sent();
-                        name_1 = error_1.name || "";
-                        message = error_1.message || "";
-                        this.eventEmitter.dispatch("error", { name: name_1, message: message });
-                        return [3, 4];
-                    case 4: return [2];
-                }
-            });
+        var _this = this;
+        var client = createMapDataClient(this.fileName);
+        client.request(function (error, data) {
+            if (error) {
+                var name_1 = error.name || "";
+                var message = error.message || "";
+                _this.eventEmitter.dispatch("error", { name: name_1, message: message });
+            }
+            else if (!data) {
+                _this.eventEmitter.dispatch("error", { name: "マップデータ取得に失敗しました", message: "mapdata is empty" });
+            }
+            else {
+                var wwaData = _this.loadMapData(data);
+                _this.eventEmitter.dispatch("mapData", wwaData);
+            }
         });
     };
     WWALoader.prototype.loadMapData = function (data) {

package/lib/core/map-data-client/BaseMapDataClient.d.ts

@@ -1,4 +1,5 @@
+export declare type MapDataClientCallback = (error?: any, data?: any) => any;
 export declare abstract class BaseMapDataClient {
     constructor();
-    abstract request(): Promise<ArrayBufferLike>;
+    abstract request(callback: MapDataClientCallback): void;
 }

package/lib/core/map-data-client/BrowserMapDataClient.d.ts

@@ -1,8 +1,6 @@
-import { BaseMapDataClient } from "./BaseMapDataClient";
+import { BaseMapDataClient, MapDataClientCallback } from "./BaseMapDataClient";
 export declare class BrowserMapDataClient extends BaseMapDataClient {
     private uri;
     constructor(uri: string);
-    private static fetch;
-    private static handleError;
-    request(): Promise<ArrayBufferLike>;
+    request(callback: MapDataClientCallback): void;
 }

package/lib/core/map-data-client/BrowserMapDataClient.js

@@ -14,42 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserMapDataClient = void 0;
 var BaseMapDataClient_1 = require("./BaseMapDataClient");
@@ -60,53 +24,53 @@ var BrowserMapDataClient = (function (_super) {
         _this.uri = uri;
         return _this;
     }
-    BrowserMapDataClient.fetch = function (uri) {
-        return __awaiter(this, void 0, void 0, function () {
-            var error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4, fetch(uri)];
-                    case 1: return [2, _a.sent()];
-                    case 2:
-                        error_1 = _a.sent();
-                        throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF \u300C".concat(uri, "\u300D\u306E\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\n        \u901A\u4FE1\u74B0\u5883\u306E\u826F\u3044\u3068\u3053\u308D\u3067\u518D\u5EA6\u304A\u8A66\u3057\u304F\u3060\u3055\u3044\u3002\n        \u30ED\u30FC\u30AB\u30EB\u30C6\u30B9\u30C8\u306E\u5834\u5408\u306F\u3001\u30D6\u30E9\u30A6\u30B6\u304C\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"));
-                    case 3: return [2];
+    BrowserMapDataClient.prototype.request = function (callback) {
+        var _this = this;
+        var xhr = new XMLHttpRequest();
+        try {
+            xhr.open("GET", this.uri, true);
+            xhr.responseType = "arraybuffer";
+            xhr.onloadend = function () {
+                try {
+                    if (xhr.status === 200 || xhr.status === 304) {
+                        callback(undefined, xhr.response);
+                    }
+                    else if (xhr.status === 404) {
+                        throw new Error("マップデータ「" +
+                            _this.uri +
+                            "」が見つかりませんでした。\n" +
+                            "HTTPステータスコードは " +
+                            xhr.status +
+                            "です。");
+                    }
+                    else if (xhr.status === 403) {
+                        throw new Error("マップデータ「" +
+                            _this.uri +
+                            "」を読み取る権限がないようです。\n" +
+                            "管理者の方へ: マップデータのパーミッションを確認してください。\n" +
+                            "HTTPステータスコードは " +
+                            xhr.status +
+                            "です。");
+                    }
+                    else {
+                        throw new Error("マップデータ「" +
+                            _this.uri +
+                            "」の読み込みに失敗しました。\n" +
+                            "HTTPステータスコードは " +
+                            xhr.status +
+                            "です。");
+                    }
                 }
-            });
-        });
-    };
-    BrowserMapDataClient.handleError = function (uri, response) {
-        var statusCodeMessage = "HTTP\u30B9\u30C6\u30FC\u30BF\u30B9\u30B3\u30FC\u30C9\u306F ".concat(response.status, " \u3067\u3059\u3002");
-        switch (response.status) {
-            case 200:
-            case 304:
-                return;
-            case 403:
-                throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u300C".concat(uri, "\u300D\u3092\u8AAD\u307F\u53D6\u308B\u6A29\u9650\u304C\u306A\u3044\u3088\u3046\u3067\u3059\u3002\n          \u7BA1\u7406\u8005\u306E\u65B9\u3078: \u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u306E\u30D1\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n          ").concat(statusCodeMessage));
-            case 404:
-                throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u300C".concat(uri, "\u300D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\n          ").concat(statusCodeMessage));
-            default:
-                throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u300C".concat(uri, "\u300D\u306E\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\n          ").concat(statusCodeMessage));
-        }
-    };
-    BrowserMapDataClient.prototype.request = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var response, buffer;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, BrowserMapDataClient.fetch(this.uri)];
-                    case 1:
-                        response = _a.sent();
-                        BrowserMapDataClient.handleError(this.uri, response);
-                        return [4, response.arrayBuffer()];
-                    case 2:
-                        buffer = _a.sent();
-                        return [2, buffer];
+                catch (error) {
+                    callback(error);
                 }
-            });
-        });
+            };
+            xhr.send(null);
+        }
+        catch (e) {
+            callback(new Error("ロードエラー: ローカルテストの場合は、ブラウザが対応していない可能性があります。\n" +
+                e.message));
+        }
     };
     return BrowserMapDataClient;
 }(BaseMapDataClient_1.BaseMapDataClient));

package/lib/core/map-data-client/NodeLocalMapDataClient.d.ts

@@ -1,6 +1,6 @@
-import { BaseMapDataClient } from "./BaseMapDataClient";
+import { BaseMapDataClient, MapDataClientCallback } from "./BaseMapDataClient";
 export declare class NodeLocalMapDataClient extends BaseMapDataClient {
     private fileName;
     constructor(fileName: string);
-    request(): Promise<ArrayBufferLike>;
+    request(callback: MapDataClientCallback): void;
 }

package/lib/core/map-data-client/NodeLocalMapDataClient.js

@@ -14,42 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -64,22 +28,15 @@ var NodeLocalMapDataClient = (function (_super) {
         _this.fileName = fileName;
         return _this;
     }
-    NodeLocalMapDataClient.prototype.request = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2, new Promise(function (resolve, reject) {
-                        fs_1.default.readFile(_this.fileName, function (error, data) {
-                            if (error) {
-                                reject(error);
-                            }
-                            resolve(data.buffer);
-                        });
-                    })];
-            });
+    NodeLocalMapDataClient.prototype.request = function (callback) {
+        fs_1.default.readFile(this.fileName, function (error, data) {
+            if (error) {
+                callback(error);
+                return;
+            }
+            callback(undefined, data.buffer);
         });
     };
-    ;
     return NodeLocalMapDataClient;
 }(BaseMapDataClient_1.BaseMapDataClient));
 exports.NodeLocalMapDataClient = NodeLocalMapDataClient;

package/lib/core/map-data-client/index.d.ts

@@ -1,4 +1,4 @@
-import { BaseMapDataClient } from "./BaseMapDataClient";
+import { BaseMapDataClient, MapDataClientCallback } from "./BaseMapDataClient";
 import { BrowserMapDataClient } from "./BrowserMapDataClient";
 import { NodeLocalMapDataClient } from "./NodeLocalMapDataClient";
-export { BaseMapDataClient, BrowserMapDataClient, NodeLocalMapDataClient };
+export { BaseMapDataClient, BrowserMapDataClient, NodeLocalMapDataClient, MapDataClientCallback };

package/module/core/index.d.ts

@@ -3,6 +3,6 @@ export declare class WWALoader {
     private fileName;
     private eventEmitter;
     constructor(fileName: string, eventEmitter: WWALoaderEventEmitter);
-    requestAndLoadMapData(): Promise<void>;
+    requestAndLoadMapData(): void;
     private loadMapData;
 }

package/module/core/index.js

@@ -1,39 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { WWADataExtractor } from "./extractor";
 import { decompressMapData } from "./decompressor";
 import { TextLoader } from "./text-loader";
@@ -52,34 +16,21 @@ var WWALoader = (function () {
         this.eventEmitter = eventEmitter;
     }
     WWALoader.prototype.requestAndLoadMapData = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var client, responseBuffer, wwaData, error_1, name_1, message;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        client = createMapDataClient(this.fileName);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4, client.request()];
-                    case 2:
-                        responseBuffer = _a.sent();
-                        if (!responseBuffer) {
-                            this.eventEmitter.dispatch("error", { name: "マップデータ取得に失敗しました", message: "mapdata is empty" });
-                            return [2];
-                        }
-                        wwaData = this.loadMapData(responseBuffer);
-                        this.eventEmitter.dispatch("mapData", wwaData);
-                        return [3, 4];
-                    case 3:
-                        error_1 = _a.sent();
-                        name_1 = error_1.name || "";
-                        message = error_1.message || "";
-                        this.eventEmitter.dispatch("error", { name: name_1, message: message });
-                        return [3, 4];
-                    case 4: return [2];
-                }
-            });
+        var _this = this;
+        var client = createMapDataClient(this.fileName);
+        client.request(function (error, data) {
+            if (error) {
+                var name_1 = error.name || "";
+                var message = error.message || "";
+                _this.eventEmitter.dispatch("error", { name: name_1, message: message });
+            }
+            else if (!data) {
+                _this.eventEmitter.dispatch("error", { name: "マップデータ取得に失敗しました", message: "mapdata is empty" });
+            }
+            else {
+                var wwaData = _this.loadMapData(data);
+                _this.eventEmitter.dispatch("mapData", wwaData);
+            }
         });
     };
     WWALoader.prototype.loadMapData = function (data) {

package/module/core/map-data-client/BaseMapDataClient.d.ts

@@ -1,4 +1,5 @@
+export declare type MapDataClientCallback = (error?: any, data?: any) => any;
 export declare abstract class BaseMapDataClient {
     constructor();
-    abstract request(): Promise<ArrayBufferLike>;
+    abstract request(callback: MapDataClientCallback): void;
 }

package/module/core/map-data-client/BrowserMapDataClient.d.ts

@@ -1,8 +1,6 @@
-import { BaseMapDataClient } from "./BaseMapDataClient";
+import { BaseMapDataClient, MapDataClientCallback } from "./BaseMapDataClient";
 export declare class BrowserMapDataClient extends BaseMapDataClient {
     private uri;
     constructor(uri: string);
-    private static fetch;
-    private static handleError;
-    request(): Promise<ArrayBufferLike>;
+    request(callback: MapDataClientCallback): void;
 }

package/module/core/map-data-client/BrowserMapDataClient.js

@@ -13,42 +13,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { BaseMapDataClient } from "./BaseMapDataClient";
 var BrowserMapDataClient = (function (_super) {
     __extends(BrowserMapDataClient, _super);
@@ -57,53 +21,53 @@ var BrowserMapDataClient = (function (_super) {
         _this.uri = uri;
         return _this;
     }
-    BrowserMapDataClient.fetch = function (uri) {
-        return __awaiter(this, void 0, void 0, function () {
-            var error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4, fetch(uri)];
-                    case 1: return [2, _a.sent()];
-                    case 2:
-                        error_1 = _a.sent();
-                        throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF \u300C".concat(uri, "\u300D\u306E\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\n        \u901A\u4FE1\u74B0\u5883\u306E\u826F\u3044\u3068\u3053\u308D\u3067\u518D\u5EA6\u304A\u8A66\u3057\u304F\u3060\u3055\u3044\u3002\n        \u30ED\u30FC\u30AB\u30EB\u30C6\u30B9\u30C8\u306E\u5834\u5408\u306F\u3001\u30D6\u30E9\u30A6\u30B6\u304C\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"));
-                    case 3: return [2];
+    BrowserMapDataClient.prototype.request = function (callback) {
+        var _this = this;
+        var xhr = new XMLHttpRequest();
+        try {
+            xhr.open("GET", this.uri, true);
+            xhr.responseType = "arraybuffer";
+            xhr.onloadend = function () {
+                try {
+                    if (xhr.status === 200 || xhr.status === 304) {
+                        callback(undefined, xhr.response);
+                    }
+                    else if (xhr.status === 404) {
+                        throw new Error("マップデータ「" +
+                            _this.uri +
+                            "」が見つかりませんでした。\n" +
+                            "HTTPステータスコードは " +
+                            xhr.status +
+                            "です。");
+                    }
+                    else if (xhr.status === 403) {
+                        throw new Error("マップデータ「" +
+                            _this.uri +
+                            "」を読み取る権限がないようです。\n" +
+                            "管理者の方へ: マップデータのパーミッションを確認してください。\n" +
+                            "HTTPステータスコードは " +
+                            xhr.status +
+                            "です。");
+                    }
+                    else {
+                        throw new Error("マップデータ「" +
+                            _this.uri +
+                            "」の読み込みに失敗しました。\n" +
+                            "HTTPステータスコードは " +
+                            xhr.status +
+                            "です。");
+                    }
                 }
-            });
-        });
-    };
-    BrowserMapDataClient.handleError = function (uri, response) {
-        var statusCodeMessage = "HTTP\u30B9\u30C6\u30FC\u30BF\u30B9\u30B3\u30FC\u30C9\u306F ".concat(response.status, " \u3067\u3059\u3002");
-        switch (response.status) {
-            case 200:
-            case 304:
-                return;
-            case 403:
-                throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u300C".concat(uri, "\u300D\u3092\u8AAD\u307F\u53D6\u308B\u6A29\u9650\u304C\u306A\u3044\u3088\u3046\u3067\u3059\u3002\n          \u7BA1\u7406\u8005\u306E\u65B9\u3078: \u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u306E\u30D1\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n          ").concat(statusCodeMessage));
-            case 404:
-                throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u300C".concat(uri, "\u300D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\n          ").concat(statusCodeMessage));
-            default:
-                throw new Error("\u30DE\u30C3\u30D7\u30C7\u30FC\u30BF\u300C".concat(uri, "\u300D\u306E\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\n          ").concat(statusCodeMessage));
-        }
-    };
-    BrowserMapDataClient.prototype.request = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var response, buffer;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, BrowserMapDataClient.fetch(this.uri)];
-                    case 1:
-                        response = _a.sent();
-                        BrowserMapDataClient.handleError(this.uri, response);
-                        return [4, response.arrayBuffer()];
-                    case 2:
-                        buffer = _a.sent();
-                        return [2, buffer];
+                catch (error) {
+                    callback(error);
                 }
-            });
-        });
+            };
+            xhr.send(null);
+        }
+        catch (e) {
+            callback(new Error("ロードエラー: ローカルテストの場合は、ブラウザが対応していない可能性があります。\n" +
+                e.message));
+        }
     };
     return BrowserMapDataClient;
 }(BaseMapDataClient));

package/module/core/map-data-client/NodeLocalMapDataClient.d.ts

@@ -1,6 +1,6 @@
-import { BaseMapDataClient } from "./BaseMapDataClient";
+import { BaseMapDataClient, MapDataClientCallback } from "./BaseMapDataClient";
 export declare class NodeLocalMapDataClient extends BaseMapDataClient {
     private fileName;
     constructor(fileName: string);
-    request(): Promise<ArrayBufferLike>;
+    request(callback: MapDataClientCallback): void;
 }

package/module/core/map-data-client/NodeLocalMapDataClient.js

@@ -13,42 +13,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import fs from "fs";
 import { BaseMapDataClient } from "./BaseMapDataClient";
 var NodeLocalMapDataClient = (function (_super) {
@@ -58,22 +22,15 @@ var NodeLocalMapDataClient = (function (_super) {
         _this.fileName = fileName;
         return _this;
     }
-    NodeLocalMapDataClient.prototype.request = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2, new Promise(function (resolve, reject) {
-                        fs.readFile(_this.fileName, function (error, data) {
-                            if (error) {
-                                reject(error);
-                            }
-                            resolve(data.buffer);
-                        });
-                    })];
-            });
+    NodeLocalMapDataClient.prototype.request = function (callback) {
+        fs.readFile(this.fileName, function (error, data) {
+            if (error) {
+                callback(error);
+                return;
+            }
+            callback(undefined, data.buffer);
         });
     };
-    ;
     return NodeLocalMapDataClient;
 }(BaseMapDataClient));
 export { NodeLocalMapDataClient };

package/module/core/map-data-client/index.d.ts

@@ -1,4 +1,4 @@
-import { BaseMapDataClient } from "./BaseMapDataClient";
+import { BaseMapDataClient, MapDataClientCallback } from "./BaseMapDataClient";
 import { BrowserMapDataClient } from "./BrowserMapDataClient";
 import { NodeLocalMapDataClient } from "./NodeLocalMapDataClient";
-export { BaseMapDataClient, BrowserMapDataClient, NodeLocalMapDataClient };
+export { BaseMapDataClient, BrowserMapDataClient, NodeLocalMapDataClient, MapDataClientCallback };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwawing/loader",
-  "version": "3.8.0",
+  "version": "3.9.0-beta.0",
   "description": "a World Wide Adventure mapdata loader for client-side web applications",
   "main": "./lib/index.js",
   "module": "./module/index.js",
@@ -44,10 +44,10 @@
   },
   "homepage": "https://github.com/WWAWing/WWALoader#readme",
   "dependencies": {
-    "@wwawing/event-emitter": "^3.8.0"
+    "@wwawing/event-emitter": "^3.9.0-beta.0"
   },
   "devDependencies": {
-    "@wwawing/common-interface": "^3.8.0",
+    "@wwawing/common-interface": "^3.9.0-beta.0",
     "cross-env": "^7.0.3",
     "html-loader": "^2.1.2",
     "html-webpack-plugin": "^5.5.0",
@@ -56,8 +56,8 @@
     "shelljs": "^0.8.4",
     "shx": "^0.3.3",
     "ts-loader": "^4.3.0",
-    "ts-node": "^10.8.1",
-    "typescript": "^4.7.3",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.5.4",
     "webpack": "^5.65.0",
     "webpack-cli": "^4.9.1"
   },
@@ -68,5 +68,5 @@
     "node": ">=16",
     "npm": ">=8"
   },
-  "gitHead": "c652b5022ed532432f87b6b9011fcac0170e0999"
+  "gitHead": "31f57918222d901ab542e8382dcd2c2b79023af4"
 }