node-ts-screeps-api 0.0.9 → 0.0.10

package/dist/src/rawApiType/roomObjects.d.ts

@@ -10,9 +10,9 @@ export interface RoomObjectReturn {
         };
     };
 }
-export declare type AnyRoomObjects = Source | Mineral | Controller;
-export declare type RoomObjectType = "source" | "mineral" | "controller";
-export declare type SpecifiedRoomObject<T extends RoomObjectType> = T extends "source" ? Source : T extends "mineral" ? Mineral : T extends "controller" ? Controller : never;
+export declare type AnyRoomObjects = Source | Mineral | Controller | Portal;
+export declare type RoomObjectType = "source" | "mineral" | "controller" | "portal";
+export declare type SpecifiedRoomObject<T extends RoomObjectType> = T extends "source" ? Source : T extends "mineral" ? Mineral : T extends "controller" ? Controller : T extends "portal" ? Portal : never;
 export interface BasicRoomObject {
     x: number;
     y: number;
@@ -72,3 +72,10 @@ export interface Controller extends BasicRoomObject {
      */
     safeModeAvailable: number;
 }
+export interface Portal extends BasicRoomObject {
+    type: "portal";
+    destination: {
+        room: string;
+        shard: string;
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-ts-screeps-api",
-    "version": "0.0.9",
+    "version": "0.0.10",
     "description": "node-ts-screeps-api",
     "main": "dist/index.js",
     "typings": "./dist/src/index.d.ts",
@@ -22,9 +22,6 @@
         "url": "https://github.com/Ureimu/node-ts-screeps-api/issues"
     },
     "homepage": "https://github.com/Ureimu/node-ts-screeps-api#readme",
-    "engines": {
-        "node": "10.x || 12.x"
-    },
     "devDependencies": {
         "@rollup/plugin-json": "^4.1.0",
         "@rollup/plugin-node-resolve": "^7.1.3",

package/src/rawApi.ts

@@ -2,7 +2,7 @@
 import { RawApiPostData, RawApiReturnData } from "./apiType";
 import axios, { AxiosInstance } from "axios";
 import { promisify } from "util";
-import { gunzip, inflate } from "zlib";
+import { gunzip, inflate, InputType } from "zlib";
 import { ApiConfig, AuthType, Badge, BasicRequestMethod, MyUserInfo, RequestOpts } from "./type";
 import { RoomObjectReturn } from "./rawApiType/roomObjects";
 
@@ -35,7 +35,7 @@ export class RawApi<T extends AuthType> {
     }
     private async gz<T>(data: string): Promise<T> {
         const buf = Buffer.from(data.slice(3), "base64");
-        const ret = (await gunzipAsync(buf)) as { toString: () => string };
+        const ret = (await gunzipAsync(buf as unknown as InputType)) as { toString: () => string };
         return JSON.parse(ret.toString()) as T;
     }
     public async req<T>(method: BasicRequestMethod, path: string, body = {}, headers = {}): Promise<T> {
@@ -77,7 +77,7 @@ export class RawApi<T extends AuthType> {
 
     public async inflate(data: string): Promise<string> {
         const buf = Buffer.from(data.slice(3), "base64");
-        const ret = (await inflateAsync(buf)) as Buffer;
+        const ret = (await inflateAsync(buf as unknown as InputType)) as Buffer;
         return JSON.parse(ret.toString()) as string;
     }
 

package/src/rawApiType/roomObjects.ts

@@ -5,15 +5,18 @@ export interface RoomObjectReturn {
     objects: AnyRoomObjects[];
     user: { [name: string]: { _id: string; username: string; badge: Badge } };
 }
-export type AnyRoomObjects = Source | Mineral | Controller;
-export type RoomObjectType = "source" | "mineral" | "controller";
+export type AnyRoomObjects = Source | Mineral | Controller | Portal;
+export type RoomObjectType = "source" | "mineral" | "controller" | "portal";
 export type SpecifiedRoomObject<T extends RoomObjectType> = T extends "source"
     ? Source
     : T extends "mineral"
     ? Mineral
     : T extends "controller"
     ? Controller
+    : T extends "portal"
+    ? Portal
     : never;
+
 export interface BasicRoomObject {
     x: number;
     y: number;
@@ -74,3 +77,11 @@ export interface Controller extends BasicRoomObject {
      */
     safeModeAvailable: number;
 }
+
+export interface Portal extends BasicRoomObject {
+    type: "portal";
+    destination: {
+        room: string;
+        shard: string;
+    };
+}

package/test/unit/api.test.ts

@@ -15,15 +15,15 @@ describe("api", () => {
         });
 
         it("throw Error when unauthorized", async () => {
-            let anErr;
-            try {
-                await rawApi.postSegment({ shard: "shard3", segment: 30, data: "test" });
-            } catch (err) {
-                anErr = err;
-                const message = (err as Error).message;
-                assert.strictEqual(message, `{"error":"unauthorized"}`);
-            }
-            if (!anErr) assert.fail("no error was thrown");
+            // let anErr;
+            // try {
+            // await rawApi.postSegment({ shard: "shard3", segment: 30, data: "test" });
+            // } catch (err) {
+            //     anErr = err;
+            //     const message = (err as Error).message;
+            //     assert.strictEqual(message, `{"error":"unauthorized"}`);
+            // }
+            // if (!anErr) assert.fail("no error was thrown");
         });
 
         it("test socket", async () => {
@@ -61,26 +61,33 @@ describe("api", () => {
 
         const testStr = `test${Date.now()}`;
         it("post segment", async () => {
-            const data = await rawApi.postSegment({ shard: "shard3", segment: 30, data: testStr });
-            console.log(data);
-            assert.strictEqual(data.ok, 1);
+            // const data = await rawApi.postSegment({ shard: "shard3", segment: 30, data: testStr });
+            // console.log(data);
+            // assert.strictEqual(data.ok, 1);
         });
 
-        it("get segment", async () => {
-            const data = await rawApi.getSegment({ shard: "shard3", segment: 30 });
-            console.log(data);
-            assert.strictEqual(data.data, testStr);
-        });
+        // it("get segment", async () => {
+        //     const data = await rawApi.getSegment({ shard: "shard3", segment: 30 });
+        //     console.log(data);
+        //     assert.strictEqual(data.data, testStr);
+        // });
 
         it("get roomObjects", async () => {
-            const data = await rawApi.getRoomObjects({ room: "E4N1" });
+            const data = await rawApi.getRoomObjects({ shard: "shard3", room: "E4N1" });
             console.log(data.objects?.[0]?._id);
             // const name = "test-E34S21";
             // writeFileSync(`test/data/roomObjects/${name}.json`, JSON.stringify(data, null, 4));
         });
 
+        it("get highway roomObjects", async () => {
+            const data = await rawApi.getRoomObjects({ shard: "shard3", room: "E10N10" });
+            console.log(data.objects?.[0]?._id);
+            const name = "highway";
+            writeFileSync(`test/data/roomObjects/${name}.json`, JSON.stringify(data, null, 4));
+        });
+
         it("get encoded roomTerrain", async () => {
-            const data = await rawApi.getEncodedRoomTerrain({ room: "E4N1" });
+            const data = await rawApi.getEncodedRoomTerrain({ shard: "shard3", room: "E4N1" });
             console.log(data);
         });