dredless 0.2.0 → 0.3.0

package/src/network/cookies.js

@@ -1,85 +1,85 @@
-import {DEFAULT_BASE_URL} from "../constants.js";
-import {hostName, normalizeBaseUrl} from "../runtime.js";
-
-export function cookiePrefix(baseUrl = DEFAULT_BASE_URL) {
-    const host = hostName(baseUrl);
-    if (host === "test.drednot.io") return "test_";
-    if (host === "local.drednot.io") return "local_";
-    return "";
-}
-
-export const cookieName = (baseUrl, name) => `${cookiePrefix(baseUrl)}${name}`;
-
-export function parseCookies(text = "") {
-    const cookies = new Map();
-    for (const part of String(text).split(/;\s*/)) {
-        const index = part.indexOf("=");
-        if (index <= 0) continue;
-        cookies.set(part.slice(0, index).trim(), decodeURIComponent(part.slice(index + 1).trim()));
-    }
-    return cookies;
-}
-
-export function browserCookies() {
-    return canReadDocumentCookie() ? parseCookies(document.cookie || "") : new Map();
-}
-
-export function canReadDocumentCookie() {
-    try {
-        return typeof document !== "undefined" && typeof document.cookie === "string";
-    } catch (_) {
-        return false;
-    }
-}
-
-export function hasCookieStore() {
-    return typeof globalThis.cookieStore !== "undefined" && typeof globalThis.cookieStore.getAll === "function";
-}
-
-export async function readBrowserCookie(name) {
-    if (hasCookieStore()) {
-        try {
-            const cookie = typeof globalThis.cookieStore.get === "function" ? await globalThis.cookieStore.get(name) : null;
-            if (cookie?.value != null) return cookie.value;
-        } catch (_) {
-            // Fall through to document.cookie below.
-        }
-    }
-    return browserCookies().get(name) || "";
-}
-
-export function setCookieValues(baseUrl, source = {}) {
-    const base = normalizeBaseUrl(baseUrl);
-    const values = source instanceof Map ? source : source?.cookies instanceof Map ? source.cookies : Object.entries(source || {});
-    const cookies = new Map(values);
-    const prefix = cookiePrefix(base);
-    const anonKey = source.anonKey || source.anon_key;
-    const gameSession = source.gameSession || source.game_session;
-    const noticeVersion = source.noticeVersion || source.notice_version;
-    if (anonKey && !cookies.has(`${prefix}anon_key`)) cookies.set(`${prefix}anon_key`, anonKey);
-    if (gameSession && !cookies.has(`${prefix}game_session`)) cookies.set(`${prefix}game_session`, gameSession);
-    if (noticeVersion && !cookies.has(`${prefix}notice_version`)) cookies.set(`${prefix}notice_version`, noticeVersion);
-    return cookies;
-}
-
-export function cookieHeader(baseUrl, source = {}) {
-    return [...setCookieValues(baseUrl, source)].map(([key, value]) => `${key}=${encodeURIComponent(value)}`).join("; ");
-}
-
-export function readSetCookies(headers, names = ["game_session", "anon_key"], baseUrl = DEFAULT_BASE_URL) {
-    const values = typeof headers?.getSetCookie === "function"
-        ? headers.getSetCookie()
-        : headers?.get?.("set-cookie") ? [headers.get("set-cookie")] : [];
-    const found = new Map();
-    const prefix = cookiePrefix(baseUrl);
-    for (const header of values) {
-        for (const name of names) {
-            for (const key of prefix ? [name, `${prefix}${name}`] : [name]) {
-                const regex = new RegExp(`(?:^|,\\s*)${key}=([^;]+)`, "g");
-                let match;
-                while ((match = regex.exec(header))) found.set(key, decodeURIComponent(match[1]));
-            }
-        }
-    }
-    return found;
-}
+import {DEFAULT_BASE_URL} from "../constants.js";
+import {hostName, normalizeBaseUrl} from "../runtime.js";
+
+export function cookiePrefix(baseUrl = DEFAULT_BASE_URL) {
+    const host = hostName(baseUrl);
+    if (host === "test.drednot.io") return "test_";
+    if (host === "local.drednot.io") return "local_";
+    return "";
+}
+
+export const cookieName = (baseUrl, name) => `${cookiePrefix(baseUrl)}${name}`;
+
+export function parseCookies(text = "") {
+    const cookies = new Map();
+    for (const part of String(text).split(/;\s*/)) {
+        const index = part.indexOf("=");
+        if (index <= 0) continue;
+        cookies.set(part.slice(0, index).trim(), decodeURIComponent(part.slice(index + 1).trim()));
+    }
+    return cookies;
+}
+
+export function browserCookies() {
+    return canReadDocumentCookie() ? parseCookies(document.cookie || "") : new Map();
+}
+
+export function canReadDocumentCookie() {
+    try {
+        return typeof document !== "undefined" && typeof document.cookie === "string";
+    } catch (_) {
+        return false;
+    }
+}
+
+export function hasCookieStore() {
+    return typeof globalThis.cookieStore !== "undefined" && typeof globalThis.cookieStore.getAll === "function";
+}
+
+export async function readBrowserCookie(name) {
+    if (hasCookieStore()) {
+        try {
+            const cookie = typeof globalThis.cookieStore.get === "function" ? await globalThis.cookieStore.get(name) : null;
+            if (cookie?.value != null) return cookie.value;
+        } catch (_) {
+            // Fall through to document.cookie below.
+        }
+    }
+    return browserCookies().get(name) || "";
+}
+
+export function setCookieValues(baseUrl, source = {}) {
+    const base = normalizeBaseUrl(baseUrl);
+    const values = source instanceof Map ? source : source?.cookies instanceof Map ? source.cookies : Object.entries(source || {});
+    const cookies = new Map(values);
+    const prefix = cookiePrefix(base);
+    const anonKey = source.anonKey || source.anon_key;
+    const gameSession = source.gameSession || source.game_session;
+    const noticeVersion = source.noticeVersion || source.notice_version;
+    if (anonKey && !cookies.has(`${prefix}anon_key`)) cookies.set(`${prefix}anon_key`, anonKey);
+    if (gameSession && !cookies.has(`${prefix}game_session`)) cookies.set(`${prefix}game_session`, gameSession);
+    if (noticeVersion && !cookies.has(`${prefix}notice_version`)) cookies.set(`${prefix}notice_version`, noticeVersion);
+    return cookies;
+}
+
+export function cookieHeader(baseUrl, source = {}) {
+    return [...setCookieValues(baseUrl, source)].map(([key, value]) => `${key}=${encodeURIComponent(value)}`).join("; ");
+}
+
+export function readSetCookies(headers, names = ["game_session", "anon_key"], baseUrl = DEFAULT_BASE_URL) {
+    const values = typeof headers?.getSetCookie === "function"
+        ? headers.getSetCookie()
+        : headers?.get?.("set-cookie") ? [headers.get("set-cookie")] : [];
+    const found = new Map();
+    const prefix = cookiePrefix(baseUrl);
+    for (const header of values) {
+        for (const name of names) {
+            for (const key of prefix ? [name, `${prefix}${name}`] : [name]) {
+                const regex = new RegExp(`(?:^|,\\s*)${key}=([^;]+)`, "g");
+                let match;
+                while ((match = regex.exec(header))) found.set(key, decodeURIComponent(match[1]));
+            }
+        }
+    }
+    return found;
+}

package/src/network/http.js

@@ -1,34 +1,34 @@
-import {getFetch, isBrowser, normalizeBaseUrl, resolveUrl} from "../runtime.js";
-import {cookieHeader} from "./cookies.js";
-
-export class HttpClient {
-    constructor({baseUrl, session = null} = {}) {
-        this.baseUrl = normalizeBaseUrl(baseUrl);
-        this.session = session;
-    }
-
-    async request(path, init = {}) {
-        const headers = new Headers(init.headers || {});
-        const body = this.#body(init.body, headers);
-        const cookie = this.session && !isBrowser() ? cookieHeader(this.baseUrl, this.session) : "";
-        if (cookie) headers.set("cookie", cookie);
-        return getFetch()(resolveUrl(this.baseUrl, path), {
-            ...init,
-            body,
-            headers,
-            credentials: isBrowser() ? "include" : init.credentials
-        });
-    }
-
-    async json(path, init = {}) {
-        const response = await this.request(path, init);
-        if (!response.ok) throw new Error(`${path} failed: ${response.status} ${response.statusText}`);
-        return response.json();
-    }
-
-    #body(body, headers) {
-        if (body == null || typeof body === "string" || body instanceof ArrayBuffer || ArrayBuffer.isView(body)) return body;
-        if (!headers.has("content-type")) headers.set("content-type", "application/json");
-        return JSON.stringify(body);
-    }
-}
+import {getFetch, isBrowser, normalizeBaseUrl, resolveUrl} from "../runtime.js";
+import {cookieHeader} from "./cookies.js";
+
+export class HttpClient {
+    constructor({baseUrl, session = null} = {}) {
+        this.baseUrl = normalizeBaseUrl(baseUrl);
+        this.session = session;
+    }
+
+    async request(path, init = {}) {
+        const headers = new Headers(init.headers || {});
+        const body = this.#body(init.body, headers);
+        const cookie = this.session && !isBrowser() ? cookieHeader(this.baseUrl, this.session) : "";
+        if (cookie) headers.set("cookie", cookie);
+        return getFetch()(resolveUrl(this.baseUrl, path), {
+            ...init,
+            body,
+            headers,
+            credentials: isBrowser() ? "include" : init.credentials
+        });
+    }
+
+    async json(path, init = {}) {
+        const response = await this.request(path, init);
+        if (!response.ok) throw new Error(`${path} failed: ${response.status} ${response.statusText}`);
+        return response.json();
+    }
+
+    #body(body, headers) {
+        if (body == null || typeof body === "string" || body instanceof ArrayBuffer || ArrayBuffer.isView(body)) return body;
+        if (!headers.has("content-type")) headers.set("content-type", "application/json");
+        return JSON.stringify(body);
+    }
+}

package/src/network/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./connection.js";
-export * from "./servers.js";
-export * from "./ships.js";
-export * from "./session.js";
+export * from "./connection.js";
+export * from "./servers.js";
+export * from "./ships.js";
+export * from "./session.js";

package/src/network/index.js

@@ -1,4 +1,4 @@
-export {Connection} from "./connection.js";
-export {fetchGameVersion, fetchNoticeVersion, fetchServers, resolveServer} from "./servers.js";
-export {fetchShips, fetchShipList, createShipSpec, createInviteShipSpec, shipRef} from "./ships.js";
-export {Session, AnonSession, createSession, createAnonSession, createAnonToken} from "./session.js";
+export {Connection} from "./connection.js";
+export {fetchGameVersion, fetchNoticeVersion, fetchServers, resolveServer} from "./servers.js";
+export {fetchShips, fetchShipList, createShipSpec, createInviteShipSpec, shipRef} from "./ships.js";
+export {Session, AnonSession, createSession, createAnonSession, createAnonToken} from "./session.js";

package/src/network/servers.d.ts

@@ -1,7 +1,7 @@
-export {
-    fetchNoticeVersion,
-    fetchGameVersion,
-    fetchServers,
-    type Server,
-    type ServerRef
-} from "../index.js";
+export {
+    fetchNoticeVersion,
+    fetchGameVersion,
+    fetchServers,
+    type Server,
+    type ServerRef
+} from "../index.js";

package/src/network/servers.js

@@ -1,133 +1,133 @@
-import {DEFAULT_BASE_URL} from "../constants.js";
-import {hostName, normalizeBaseUrl} from "../runtime.js";
-import {HttpClient} from "./http.js";
-
-const cache = new Map();
-
-class ServerDirectory {
-    constructor(baseUrl = DEFAULT_BASE_URL) {
-        this.baseUrl = normalizeBaseUrl(baseUrl);
-        this.meta = null;
-    }
-
-    async load() {
-        if (cache.has(this.baseUrl)) {
-            this.meta = await cache.get(this.baseUrl);
-            return this;
-        }
-        const promise = this.#fetchMeta();
-        cache.set(this.baseUrl, promise);
-        this.meta = await promise;
-        return this;
-    }
-
-    async version() {
-        await this.load();
-        if (!this.meta.version) throw new Error("Unable to locate GAME_VERSION in drednot bundle");
-        return this.meta.version;
-    }
-
-    async list() {
-        return this.servers();
-    }
-
-    async servers() {
-        await this.load();
-        if (!this.meta.serverInfo) throw new Error("Unable to locate server list in drednot bundle");
-        return this.meta.serverInfo.servers;
-    }
-
-    async get(id = null) {
-        return this.pick(id);
-    }
-
-    async pick(id = null) {
-        const servers = await this.servers();
-        return servers.find((server) => server.index === Number(id)) || servers[0] || null;
-    }
-
-    async #fetchMeta() {
-        const response = await new HttpClient({baseUrl: this.baseUrl}).request("index.html");
-        if (!response.ok) throw new Error(`Failed to fetch bundle: ${response.status} ${response.statusText}`);
-        const text = await response.text();
-        return {text, version: parseGameVersion(text), serverInfo: parseServerInfo(text, this.baseUrl)};
-    }
-}
-
-export const fetchGameVersion = (baseUrl = DEFAULT_BASE_URL) => new ServerDirectory(baseUrl).version();
-export const fetchServers = (baseUrl = DEFAULT_BASE_URL) => new ServerDirectory(baseUrl).servers();
-
-export async function fetchNoticeVersion(baseUrl = DEFAULT_BASE_URL) {
-    const response = await new HttpClient({baseUrl}).request("index.html");
-    if (!response.ok) throw new Error(`Failed to fetch notice version: ${response.status} ${response.statusText}`);
-    const text = await response.text();
-    const version = parseNoticeVersion(text);
-    if (version == null) throw new Error("Unable to locate notice version in drednot page");
-    return version;
-}
-
-export async function resolveServer(server, baseUrl = DEFAULT_BASE_URL) {
-    if (server && typeof server === "object") return server;
-    const id = Number(server);
-    const servers = await fetchServers(baseUrl);
-    return servers.find((item) => item.index === id) || null;
-}
-
-export function serverId(server) {
-    if (server && typeof server === "object") return Number(server.index ?? server.id);
-    return Number(server);
-}
-
-function parseGameVersion(text) {
-    return text.match(/Object\.defineProperty\(exports,"GAME_VERSION",\{enumerable:true,get:\(\)=>e\}\);const e="([^"]+)"/)?.[1] || null;
-}
-
-function parseNoticeVersion(text) {
-    const moduleMatch = text.match(/Object\.defineProperty\(exports,"checkNotice"[\s\S]{0,8000}?setCookie\)\("notice_version",([A-Za-z_$][\w$]*)\)/);
-    if (moduleMatch) {
-        const constant = moduleMatch[1];
-        const prefix = text.slice(Math.max(0, moduleMatch.index - 1000), moduleMatch.index + moduleMatch[0].length);
-        const constantMatch = prefix.match(new RegExp(`const\\s+${constant}\\s*=\\s*(\\d+)\\s*;`));
-        if (constantMatch) return Number(constantMatch[1]);
-    }
-
-    const patterns = [
-        /notice_version["']?\s*[:=]\s*["']?(\d+)/i,
-        /noticeVersion["']?\s*[:=]\s*["']?(\d+)/i,
-        /NOTICE_VERSION["']?\s*[:=]\s*["']?(\d+)/,
-        /notice[^0-9]{0,40}version[^0-9]{0,20}(\d+)/i
-    ];
-    for (const pattern of patterns) {
-        const match = text.match(pattern);
-        if (match) return Number(match[1]);
-    }
-    return null;
-}
-
-function parseServerInfo(text, baseUrl) {
-    const host = hostName(baseUrl);
-    const match = text.match(/const n=(true|false);const \$="([^"]+)";const o="([^"]+)";const T="([^"]+)";const t="([^"]+)";const S=\[([^\]]+)\];const c=\[([^\]]+)\];const A="([^"]+)";const I="([^"]+)"/s);
-    if (!match) return null;
-    const [localDomain, baseDomain, testDomain, testGameDomain] = match.slice(2, 6);
-    const domains = [...match[6].matchAll(/"((?:[^"\\]|\\.)*)"/g)].map((m) => m[1]);
-    const names = [...match[7].matchAll(/"((?:[^"\\]|\\.)*)"/g)].map((m) => m[1]);
-    const meta = {
-        localDomain,
-        baseDomain,
-        testDomain,
-        testGameDomain,
-        masterDomain: match[8],
-        testMasterDomain: match[9]
-    };
-    if (host === localDomain) return {mode: "local", servers: [server(0, localDomain, "Local Test 1")], meta};
-    if (host === testDomain) return {mode: "test", servers: [server(0, testGameDomain, "Public Test")], meta};
-    return {
-        mode: "production",
-        servers: domains.map((domain, index) => server(index, domain, names[index] || `Server ${index + 1}`)),
-        meta
-    };
-}
-
-function server(index, domain, description) {
-    return {index, domain, description, playerCount: 0, maxPlayerCount: 0, ping: null};
-}
+import {DEFAULT_BASE_URL} from "../constants.js";
+import {hostName, normalizeBaseUrl} from "../runtime.js";
+import {HttpClient} from "./http.js";
+
+const cache = new Map();
+
+class ServerDirectory {
+    constructor(baseUrl = DEFAULT_BASE_URL) {
+        this.baseUrl = normalizeBaseUrl(baseUrl);
+        this.meta = null;
+    }
+
+    async load() {
+        if (cache.has(this.baseUrl)) {
+            this.meta = await cache.get(this.baseUrl);
+            return this;
+        }
+        const promise = this.#fetchMeta();
+        cache.set(this.baseUrl, promise);
+        this.meta = await promise;
+        return this;
+    }
+
+    async version() {
+        await this.load();
+        if (!this.meta.version) throw new Error("Unable to locate GAME_VERSION in drednot bundle");
+        return this.meta.version;
+    }
+
+    async list() {
+        return this.servers();
+    }
+
+    async servers() {
+        await this.load();
+        if (!this.meta.serverInfo) throw new Error("Unable to locate server list in drednot bundle");
+        return this.meta.serverInfo.servers;
+    }
+
+    async get(id = null) {
+        return this.pick(id);
+    }
+
+    async pick(id = null) {
+        const servers = await this.servers();
+        return servers.find((server) => server.index === Number(id)) || servers[0] || null;
+    }
+
+    async #fetchMeta() {
+        const response = await new HttpClient({baseUrl: this.baseUrl}).request("index.html");
+        if (!response.ok) throw new Error(`Failed to fetch bundle: ${response.status} ${response.statusText}`);
+        const text = await response.text();
+        return {text, version: parseGameVersion(text), serverInfo: parseServerInfo(text, this.baseUrl)};
+    }
+}
+
+export const fetchGameVersion = (baseUrl = DEFAULT_BASE_URL) => new ServerDirectory(baseUrl).version();
+export const fetchServers = (baseUrl = DEFAULT_BASE_URL) => new ServerDirectory(baseUrl).servers();
+
+export async function fetchNoticeVersion(baseUrl = DEFAULT_BASE_URL) {
+    const response = await new HttpClient({baseUrl}).request("index.html");
+    if (!response.ok) throw new Error(`Failed to fetch notice version: ${response.status} ${response.statusText}`);
+    const text = await response.text();
+    const version = parseNoticeVersion(text);
+    if (version == null) throw new Error("Unable to locate notice version in drednot page");
+    return version;
+}
+
+export async function resolveServer(server, baseUrl = DEFAULT_BASE_URL) {
+    if (server && typeof server === "object") return server;
+    const id = Number(server);
+    const servers = await fetchServers(baseUrl);
+    return servers.find((item) => item.index === id) || null;
+}
+
+export function serverId(server) {
+    if (server && typeof server === "object") return Number(server.index ?? server.id);
+    return Number(server);
+}
+
+function parseGameVersion(text) {
+    return text.match(/Object\.defineProperty\(exports,"GAME_VERSION",\{enumerable:true,get:\(\)=>e\}\);const e="([^"]+)"/)?.[1] || null;
+}
+
+function parseNoticeVersion(text) {
+    const moduleMatch = text.match(/Object\.defineProperty\(exports,"checkNotice"[\s\S]{0,8000}?setCookie\)\("notice_version",([A-Za-z_$][\w$]*)\)/);
+    if (moduleMatch) {
+        const constant = moduleMatch[1];
+        const prefix = text.slice(Math.max(0, moduleMatch.index - 1000), moduleMatch.index + moduleMatch[0].length);
+        const constantMatch = prefix.match(new RegExp(`const\\s+${constant}\\s*=\\s*(\\d+)\\s*;`));
+        if (constantMatch) return Number(constantMatch[1]);
+    }
+
+    const patterns = [
+        /notice_version["']?\s*[:=]\s*["']?(\d+)/i,
+        /noticeVersion["']?\s*[:=]\s*["']?(\d+)/i,
+        /NOTICE_VERSION["']?\s*[:=]\s*["']?(\d+)/,
+        /notice[^0-9]{0,40}version[^0-9]{0,20}(\d+)/i
+    ];
+    for (const pattern of patterns) {
+        const match = text.match(pattern);
+        if (match) return Number(match[1]);
+    }
+    return null;
+}
+
+function parseServerInfo(text, baseUrl) {
+    const host = hostName(baseUrl);
+    const match = text.match(/const n=(true|false);const \$="([^"]+)";const o="([^"]+)";const T="([^"]+)";const t="([^"]+)";const S=\[([^\]]+)\];const c=\[([^\]]+)\];const A="([^"]+)";const I="([^"]+)"/s);
+    if (!match) return null;
+    const [localDomain, baseDomain, testDomain, testGameDomain] = match.slice(2, 6);
+    const domains = [...match[6].matchAll(/"((?:[^"\\]|\\.)*)"/g)].map((m) => m[1]);
+    const names = [...match[7].matchAll(/"((?:[^"\\]|\\.)*)"/g)].map((m) => m[1]);
+    const meta = {
+        localDomain,
+        baseDomain,
+        testDomain,
+        testGameDomain,
+        masterDomain: match[8],
+        testMasterDomain: match[9]
+    };
+    if (host === localDomain) return {mode: "local", servers: [server(0, localDomain, "Local Test 1")], meta};
+    if (host === testDomain) return {mode: "test", servers: [server(0, testGameDomain, "Public Test")], meta};
+    return {
+        mode: "production",
+        servers: domains.map((domain, index) => server(index, domain, names[index] || `Server ${index + 1}`)),
+        meta
+    };
+}
+
+function server(index, domain, description) {
+    return {index, domain, description, playerCount: 0, maxPlayerCount: 0, ping: null};
+}

package/src/network/session.d.ts

@@ -1,7 +1,7 @@
-export {
-    Session,
-    AnonSession,
-    createSession,
-    createAnonSession,
-    createAnonToken
-} from "../index.js";
+export {
+    Session,
+    AnonSession,
+    createSession,
+    createAnonSession,
+    createAnonToken
+} from "../index.js";