@inappstory/game-center-api 1.3.13 → 1.3.14

package/lib/ResourceManager.d.ts

@@ -17,10 +17,10 @@ export declare class ResourceManager {
     private addResourceToCacheTree;
     private createCacheTree;
     cacheAllResources(): Promise<void>;
-    cacheResource({ uri, originUri, resouceKeys, }: {
+    cacheResource({ uri, originUri, resourceKeys, }: {
         uri: string;
         originUri?: string;
-        resouceKeys?: string[];
+        resourceKeys?: string[];
     }): Promise<string>;
     private createObjectUrlByUri;
     revokeCache(): void;

package/lib/ResourceManager.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceManager = void 0;
 const fetchLocalFile_1 = require("./sdkApi/fetchLocalFile");
+const errorHandler_1 = require("./errorHandler");
 let instance;
 class ResourceManager {
     resLists;
@@ -44,11 +45,11 @@ class ResourceManager {
             const { resourceForFetch, relatedResources } = this.cacheTree[resUri];
             const promise = ((resourceForFetch, relatedResources) => {
                 return new Promise(async (resolve, reject) => {
-                    const resouceKeys = relatedResources.map(resource => resource.key);
+                    const resourceKeys = relatedResources.map(resource => resource.key);
                     const uri = resourceForFetch.getUri();
                     const originUri = resourceForFetch.getOriginUri();
                     try {
-                        const objectUrl = await this.cacheResource({ uri, originUri, resouceKeys });
+                        const objectUrl = await this.cacheResource({ uri, originUri, resourceKeys: resourceKeys });
                         if (objectUrl === originUri) {
                             resolve();
                             return;
@@ -59,22 +60,41 @@ class ResourceManager {
                         resolve();
                     }
                     catch (e) {
-                        reject(`Can't load resource for [${resouceKeys.join(", ")}]`);
+                        (0, errorHandler_1.logError)(e, { resourceKeys });
+                        reject(`Can't load resource for [${resourceKeys.join(", ")}]`);
                     }
                 });
             })(resourceForFetch, relatedResources);
             promises.push(promise);
         }
-        await Promise.all(promises);
+        try {
+            await Promise.all(promises);
+        }
+        catch (e) {
+            (0, errorHandler_1.logError)(e);
+        }
         for (const resList of this.resLists)
             resList["onCacheDone"]();
     }
-    async cacheResource({ uri, originUri = uri, resouceKeys = ["outerResource"], }) {
-        let objectUrl = await this.createObjectUrlByUri(uri, resouceKeys);
-        if (objectUrl === null && uri !== originUri)
-            objectUrl = await this.createObjectUrlByUri(originUri, resouceKeys);
-        if (objectUrl !== null)
+    async cacheResource({ uri, originUri = uri, resourceKeys = ["outerResource"], }) {
+        let objectUrl = null;
+        try {
+            objectUrl = await this.createObjectUrlByUri(uri, resourceKeys);
+        }
+        catch (e) {
+            (0, errorHandler_1.logError)(e, { uri, resourceKeys });
+        }
+        if (objectUrl === null && uri !== originUri) {
+            try {
+                objectUrl = await this.createObjectUrlByUri(originUri, resourceKeys);
+            }
+            catch (e) {
+                (0, errorHandler_1.logError)(e, { originUri, resourceKeys });
+            }
+        }
+        if (objectUrl !== null) {
             return objectUrl;
+        }
         return new Promise((resolve, reject) => {
             const image = new Image();
             image.onload = () => resolve(originUri);
@@ -82,21 +102,29 @@ class ResourceManager {
             image.src = originUri;
         });
     }
-    async createObjectUrlByUri(uri, resouceKeys) {
+    async createObjectUrlByUri(uri, resourceKeys) {
         if (!uri) {
-            throw `Resource uri for [${resouceKeys.join(", ")}] can't be empty string`;
+            throw `Resource uri for [${resourceKeys.join(", ")}] can't be empty string`;
         }
         try {
             const response = await (0, fetchLocalFile_1.fetchLocalFile)(uri);
             if (response != null && response.ok) {
-                return URL.createObjectURL(await response.blob());
+                let blob = null;
+                try {
+                    blob = await response.blob();
+                }
+                catch (e) {
+                    (0, errorHandler_1.logError)(e);
+                    throw e;
+                }
+                return URL.createObjectURL(blob);
             }
             else {
                 throw "";
             }
         }
         catch (err) {
-            console.warn(`Error to fetch ${uri} for related images [${resouceKeys.join(", ")}]`, err);
+            console.warn(`Error to fetch ${uri} for related images [${resourceKeys.join(", ")}]`, err);
             return null;
         }
     }

package/lib/errorHandler.d.ts

@@ -1 +1 @@
-export declare const logError: (e: unknown) => void;
+export declare const logError: (e: unknown, cause?: any) => void;

package/lib/errorHandler.js

@@ -1,22 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logError = void 0;
-const logError = (e) => {
-    const error = e;
-    const message = {
-        type: "error",
-        errorName: error.name ?? "",
-        message: error.message ?? "",
-        stack: error.stack ?? "",
-        cause: error.cause ?? "",
-        // @ts-ignore Non-standard: This feature is non-standard and is not on a standards track. Do not use it on production sites facing the Web: it will not work for every user. There may also be large incompatibilities between implementations and the behavior may change in the future.
-        fileName: error.fileName ?? "",
-        // @ts-ignore Non-standard: This feature is non-standard and is not on a standards track. Do not use it on production sites facing the Web: it will not work for every user. There may also be large incompatibilities between implementations and the behavior may change in the future.
-        lineNumber: error.lineNumber ?? "",
-        // @ts-ignore Non-standard: This feature is non-standard and is not on a standards track. Do not use it on production sites facing the Web: it will not work for every user. There may also be large incompatibilities between implementations and the behavior may change in the future.
-        columnNumber: error.columnNumber ?? "",
-    };
-    // will be handled via sdk console.error override
-    console.error(message);
+const logError = (e, cause) => {
+    if (e instanceof Error) {
+        const error = e;
+        const message = {
+            type: "error",
+            errorName: error.name ?? "",
+            message: error.message ?? "",
+            stack: error.stack ?? "",
+            cause: cause ?? error.cause ?? "",
+            // @ts-ignore Non-standard: This feature is non-standard and is not on a standards track. Do not use it on production sites facing the Web: it will not work for every user. There may also be large incompatibilities between implementations and the behavior may change in the future.
+            fileName: error.fileName ?? "",
+            // @ts-ignore Non-standard: This feature is non-standard and is not on a standards track. Do not use it on production sites facing the Web: it will not work for every user. There may also be large incompatibilities between implementations and the behavior may change in the future.
+            lineNumber: error.lineNumber ?? "",
+            // @ts-ignore Non-standard: This feature is non-standard and is not on a standards track. Do not use it on production sites facing the Web: it will not work for every user. There may also be large incompatibilities between implementations and the behavior may change in the future.
+            columnNumber: error.columnNumber ?? "",
+        };
+        // will be handled via sdk console.error override
+        console.error(message);
+    }
+    else {
+        console.error(e);
+    }
 };
 exports.logError = logError;

package/lib/iasApi.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendIasApiRequest = void 0;
 const gameLaunchConfig_1 = require("./gameLaunchConfig");
 const uuid_1 = require("uuid");
+const errorHandler_1 = require("./errorHandler");
 const prepareHeaders = (headers) => ({
     ...{
         "Content-Type": "application/json",
@@ -34,8 +35,11 @@ async function sendIasApiRequest(requestInfo) {
         error: null,
         isOk: false,
     };
+    let url = "";
+    let requestInit = null;
     try {
-        const response = await fetch(prepareUrl(requestInfo.path), {
+        url = prepareUrl(requestInfo.path);
+        requestInit = {
             method: requestInfo.method, // *GET, POST, PUT, DELETE, etc.
             mode: "cors", // no-cors, *cors, same-origin
             cache: "no-cache", // *default, no-cache, reload, force-cache, only-if-cached
@@ -44,7 +48,13 @@ async function sendIasApiRequest(requestInfo) {
             redirect: "follow", // manual, *follow, error
             referrerPolicy: "no-referrer", // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
             body: JSON.stringify(requestInfo.data), // body data type must match "Content-Type" header
-        });
+        };
+    }
+    catch (e) {
+        (0, errorHandler_1.logError)(e, { requestInfo });
+    }
+    try {
+        const response = await fetch(url, requestInit);
         result.status = response.status;
         result.payload = (await response.json()); // parses JSON response into native JavaScript objects
         if (response.status >= 200 && response.status < 300) {
@@ -53,6 +63,7 @@ async function sendIasApiRequest(requestInfo) {
     }
     catch (e) {
         result.error = e;
+        (0, errorHandler_1.logError)(e, { url, requestInit });
     }
     return result;
 }

package/lib/index.d.ts

@@ -91,6 +91,6 @@ declare const GameCenterApi: {
     getApplicationVersion: () => string | null;
     getApplicationBuildVersion: () => number | null;
     openGameInstance: (openGameInstance: import("./sdkApi/openGameInstance.h").OpenGameInstanceOptions) => void;
-    logError: (e: unknown) => void;
+    logError: (e: unknown, cause?: any) => void;
 };
 export { GameCenterApi as default };

package/lib/localData.js

@@ -41,7 +41,12 @@ const initLocalData = async () => {
     if (localDataCreated) {
         console.warn("Duplicate call of initLocalData. Skipping");
     }
-    exports.gameLocalData.init(Object.entries(await getClientLocalData()));
+    try {
+        exports.gameLocalData.init(Object.entries(await getClientLocalData()));
+    }
+    catch (e) {
+        (0, errorHandler_1.logError)(e);
+    }
     localDataCreated = true;
 };
 exports.initLocalData = initLocalData;
@@ -116,8 +121,7 @@ window.gameInstanceGetLocalDataCb = function (id, plainData) {
         localData = JSON.parse(plainData);
     }
     catch (e) {
-        e.cause = { inputData: plainData };
-        (0, errorHandler_1.logError)(e);
+        (0, errorHandler_1.logError)(e, { inputData: plainData });
     }
     finally {
         if (asyncQueue_1.asyncQueue.has(id)) {

package/lib/logger.html

@@ -234,9 +234,21 @@
         }
 
         window._sendErrorLog(payload);
-        console.errorOrigin(messages);
-        if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.errorHandler && messages.length) {
-            window.webkit.messageHandlers.errorHandler.postMessage(messages[0]);
+        if (messages.length && messages[0] != null) {
+            let errorAsString = "";
+            try {
+                errorAsString = JSON.stringify(messages[0]);
+            } catch (e) {
+                // nothing here
+            }
+            // for Android
+            console.errorOrigin(errorAsString);
+            // for iOS
+            if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.errorHandler) {
+                window.webkit.messageHandlers.errorHandler.postMessage(errorAsString);
+            }
+        } else {
+            console.errorOrigin(messages);
         }
     };
 </script>

package/lib/sdkApi/filePicker.js

@@ -5,6 +5,7 @@ const filePicker_h_1 = require("./filePicker.h");
 const uuid_1 = require("uuid");
 const asyncQueue_1 = require("../asyncQueue");
 const env_1 = require("../env");
+const errorHandler_1 = require("../errorHandler");
 const defaultLang = "en";
 // TODO plural and templates for messages
 const messages = {
@@ -100,7 +101,14 @@ const openFilePicker = async ({ accept, multiple, resultAsFiles, lang, }) => {
                 const blobs = new Array();
                 response.forEach(src => {
                     blobs.push(async () => {
-                        const blob = await (await fetch(src)).blob();
+                        let blob = null;
+                        try {
+                            blob = await (await fetch(src)).blob();
+                        }
+                        catch (e) {
+                            (0, errorHandler_1.logError)(e);
+                            throw e;
+                        }
                         const fileName = src.split("\\").pop()?.split("/").pop() || "image";
                         // dataTransfer.items.add(new File([blob], fileName, {
                         //     type: blob.type,
@@ -151,7 +159,14 @@ const openFilePicker = async ({ accept, multiple, resultAsFiles, lang, }) => {
                         duration: sdkFileResponse.duration,
                         getBlob: async () => {
                             const fetchPath = sdkFileResponse.fetchPath;
-                            const blob = await (await fetch(fetchPath)).blob();
+                            let blob = null;
+                            try {
+                                blob = await (await fetch(fetchPath)).blob();
+                            }
+                            catch (e) {
+                                (0, errorHandler_1.logError)(e);
+                                throw e;
+                            }
                             return new File([blob], fileName, {
                                 type: blob.type,
                                 lastModified: new Date().getTime(),

package/lib/sdkApi/index.js

@@ -51,8 +51,7 @@ const createSdkApi = ({ mounted, beforeUnmount: beforeUnmountCb, onSdkCloseGameR
             }
         }
         catch (e) {
-            e.cause = { inputData: payload };
-            (0, errorHandler_1.logError)(e);
+            (0, errorHandler_1.logError)(e, { inputData: payload });
         }
     };
     // create bridge for web-sdk

package/lib/sdkApi/initGame.js

@@ -36,8 +36,7 @@ const gameReader = (function () {
                         window.gameLoadingInfo.description = "index: " + i;
                     }
                     catch (e) {
-                        e.cause = { src: "gameReaderInit queue" };
-                        (0, errorHandler_1.logError)(e);
+                        (0, errorHandler_1.logError)(e, { src: "gameReaderInit queue" });
                     }
                 };
             })(self._e[i], i));
@@ -62,8 +61,7 @@ const gameReader = (function () {
                                 window.gameLoadingInfo.description = "index: " + i;
                             }
                             catch (e) {
-                                e.cause = { src: "gameReaderInit sessionStorage queue" };
-                                (0, errorHandler_1.logError)(e);
+                                (0, errorHandler_1.logError)(e, { src: "gameReaderInit sessionStorage queue" });
                             }
                         };
                     })(_initQueue[i], i));
@@ -85,8 +83,7 @@ const gameReader = (function () {
                 window.gameLoadingInfo.description = "";
             }
             catch (e) {
-                e.cause = { src: "gameReaderInit ready" };
-                (0, errorHandler_1.logError)(e);
+                (0, errorHandler_1.logError)(e, { src: "gameReaderInit ready" });
             }
         });
     };
@@ -118,13 +115,18 @@ const createInitGame = (initLocalData, mounted = () => { }) => {
                 // bcz web-sdk cannot access to document.documentElement inside game iFrame
                 window.document.documentElement.dir = gameLaunchConfig_1.gameLaunchConfig?.clientConfig?.dir;
             }
-            await initLocalData();
+            try {
+                await initLocalData();
+            }
+            catch (e) {
+                (0, errorHandler_1.logError)(e);
+                throw e;
+            }
             mounted();
             window.gameLoadingInfo.state = "after call initGame";
             window.gameLoadingInfo.description = JSON.stringify(config);
         }
         catch (e) {
-            e.cause = { src: "initGame" };
             (0, errorHandler_1.logError)(e);
         }
     };
@@ -202,8 +204,7 @@ const gameLoadedSdkCallbackInternal = (config) => {
         }
     }
     catch (e) {
-        e.cause = { src: "gameLoadedSdkCallback" };
-        (0, errorHandler_1.logError)(e);
+        (0, errorHandler_1.logError)(e, { src: "gameLoadedSdkCallback" });
     }
 };
 const _gameLoadingInfoCreated = {

package/lib/sdkApi/share.js

@@ -51,7 +51,6 @@ window.share_complete = function (requestId, isSuccess) {
         }
     }
     catch (e) {
-        e.cause = { inputData: { requestId, isSuccess } };
-        (0, errorHandler_1.logError)(e);
+        (0, errorHandler_1.logError)(e, { inputData: { requestId, isSuccess } });
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@inappstory/game-center-api",
-    "version": "1.3.13",
+    "version": "1.3.14",
     "description": "",
     "dependencies": {
         "semver": "^7.3.8",