feat: Operators

kitten-science · Sep 12, 2024 · 179cf84 · 179cf84
1 parent e2de2fb
commit 179cf84
Show file tree

Hide file tree

Showing 54 changed files with 4,506 additions and 119 deletions.
diff --git a/packages/kitten-analysts/examples/a708b0ad-5f94-4466-8a2e-1d381117d0e0.json b/packages/kitten-analysts/examples/a708b0ad-5f94-4466-8a2e-1d381117d0e0.json
diff --git a/packages/kitten-analysts/examples/ka-internal-savestate.json b/packages/kitten-analysts/examples/ka-internal-savestate.json
diff --git a/packages/kitten-analysts/source/entrypoint-backend.ts b/packages/kitten-analysts/source/entrypoint-backend.ts
@@ -4,6 +4,7 @@ import { isNil } from "@oliversalzburg/js-utils/data/nil.js";
 import { redirectErrorsToConsole } from "@oliversalzburg/js-utils/errors/console.js";
 import Koa from "koa";
 import Router from "koa-router";
+import { compressToUTF16, decompressFromUTF16 } from "lz-string";
 import { writeFileSync } from "node:fs";
 import { readdir, readFile } from "node:fs/promises";
 import { join } from "node:path";
@@ -12,6 +13,7 @@ import {
   KGNetSaveFromGame,
   KGNetSavePersisted,
   KGNetSaveUpdate,
+  KGSaveData,
   LOCAL_STORAGE_PATH,
 } from "./globals.js";
 import {
@@ -216,12 +218,17 @@ routerNetwork.post("/kgnet/save/upload", context => {
     saveStore.set(gameGUID, savegame);
     writeFileSync(`${LOCAL_STORAGE_PATH}/${gameGUID}.json`, JSON.stringify(savegame));
 
+    // Rebuild payload to also contain the fixed-string telemetry GUID.
+    const uncompressed = JSON.parse(decompressFromUTF16(gameSave.saveData)) as KGSaveData;
+    uncompressed.telemetry.guid = "ka-internal-savestate";
+    const recompressedSaveData = compressToUTF16(JSON.stringify(uncompressed));
+
     const savegameEphemeral: KGNetSavePersisted = {
       archived: false,
       guid: "ka-internal-savestate",
       index: { calendar: { day: calendar.day, year: calendar.year } },
       label: "Background Game",
-      saveData: gameSave.saveData,
+      saveData: recompressedSaveData,
       size: context.request.length,
       timestamp: Date.now(),
     };

diff --git a/packages/kitten-analysts/source/globals.ts b/packages/kitten-analysts/source/globals.ts
@@ -2,6 +2,27 @@ export const LOCAL_STORAGE_PATH = "/local_storage";
 
 // KGNet Savegame Storage
 
+export interface KGSaveData {
+  saveVersion: number;
+  resources: unknown;
+  telemetry: {
+    guid: string;
+  };
+  game: {
+    forceShowLimits: unknown;
+    isCMBREnabled: unknown;
+    useWorkers: unknown;
+    colorScheme: unknown;
+    unlockedSchemes: unknown;
+    karmaKittens: unknown;
+    karmaZebras: unknown;
+    ironWill: unknown;
+    deadKittens: unknown;
+    cheatMode: unknown;
+    opts: unknown;
+    lastBackup: unknown;
+  };
+}
 export interface KGNetSaveFromGame {
   guid: string;
   metadata: {

diff --git a/packages/kitten-analysts/source/network/KittensGameRemote.ts b/packages/kitten-analysts/source/network/KittensGameRemote.ts
@@ -201,7 +201,11 @@ export class KittensGameRemote {
     console.debug(`<= ${identifyExchange(message)}...`);
 
     const request = new Promise<KittenAnalystsMessage<TMessage> | null>((resolve, reject) => {
-      if (!socket.isAlive || socket.ws.readyState === WebSocket.CLOSED) {
+      if (
+        !socket.isAlive ||
+        socket.ws.readyState === WebSocket.CLOSED ||
+        socket.ws.readyState === WebSocket.CLOSING
+      ) {
         console.warn("Send request can't be handled, because socket is dead!");
         socket.isAlive = false;
         resolve(null);