Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,15 @@ module.exports = {
"@typescript-eslint/prefer-literal-enum-member": ["off"],
},
},
/**
* TypeScript requires the "var" keyword within "declare global" to correctly merge variables into the global
* namespace.
*/
{
files: ["**/*.d.ts"],
rules: {
"no-var": "off",
},
},
],
};
23 changes: 23 additions & 0 deletions electron/global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import type { BrowserWindow } from "electron";

declare global {
var steamworksError: Error | undefined;
var app_handlers: {
stopProcess: (window: BrowserWindow) => void;
};
namespace Electron {
interface BrowserWindow {
Comment thread
catloversg marked this conversation as resolved.
gameInfo?: {
player?: {
identifier: string;
playtime: number;
lastSave: number;
};
game?: {
version: string;
hash: string;
};
};
}
}
}
7 changes: 3 additions & 4 deletions electron/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -357,13 +357,12 @@ function getMenu(window) {
label: "Delete Steam Cloud Data",
enabled: steamworksClient !== undefined,
click: () => {
if (steamworksClient.cloud.listFiles().length === 0) {
if (steamworksClient === undefined || steamworksClient.cloud.listFiles().length === 0) {
log.info("There is no Steam cloud file");
return;
}
try {
if (!storage.deleteCloudFile()) {
log.warn("Cannot delete Steam Cloud data");
}
storage.deleteCloudFiles();
} catch (error) {
log.error(error);
}
Expand Down
8 changes: 4 additions & 4 deletions electron/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"buildResources": "public"
},
"dependencies": {
"@catloversg/steamworks.js": "0.0.2",
"@catloversg/steamworks.js": "0.0.3",
"arg": "^5.0.2",
"electron-log": "^4.4.8",
"electron-store": "^8.1.0",
Expand Down
8 changes: 4 additions & 4 deletions electron/saveDataBinaryFormat.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export declare const encodeBytesToBase64String: (bytes: Uint8Array<ArrayBuffer>) => string;
export declare const decodeBase64BytesToBytes: (bytes: Uint8Array<ArrayBuffer>) => Uint8Array<ArrayBuffer>;
export declare const isBinaryFormat: (saveData: string | Uint8Array<ArrayBuffer>) => boolean;
export declare const isSteamCloudFormat: (saveData: string | Uint8Array<ArrayBuffer>) => boolean;
export declare const encodeBytesToBase64String: (bytes: Uint8Array<ArrayBufferLike>) => string;
export declare const decodeBase64BytesToBytes: (bytes: Uint8Array<ArrayBufferLike>) => Uint8Array<ArrayBuffer>;
export declare const isBinaryFormat: (saveData: string | Uint8Array<ArrayBufferLike>) => boolean;
export declare const isSteamCloudFormat: (saveData: string | Uint8Array<ArrayBufferLike>) => boolean;
12 changes: 8 additions & 4 deletions electron/steamworksUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@
const steamworks = require("@catloversg/steamworks.js");
const log = require("electron-log");

let steamworksClient;
/** @type {ReturnType<typeof import("@catloversg/steamworks.js").init> | undefined} */
let steamworksClient = undefined;
try {
// 1812820 is our Steam App ID.
steamworksClient = steamworks.init(1812820);
} catch (error) {
if (error.message?.includes("Steam is probably not running")) {
if (error instanceof Error) {
log.warn(error.message);
global.steamworksError = error;
} else {
log.warn(error);
// This should never happen.
log.error("steamworks.js threw an error that is not an instance of Error");
log.error(error);
global.steamworksError = new Error(typeof error === "string" ? error : String(error), { cause: error });
}
global.steamworksError = error;
}

module.exports = {
Expand Down
Loading
Loading