@arcadible/sdk 1.5.0-next.2 → 1.5.0-next.4

package/dist/context/client.js

@@ -8,8 +8,8 @@ export function createContextClient(bus) {
     let context = null;
     let settled = false;
     bus.on(Names.State, isObject, (data) => {
-        // fixed for the run: the first one stands.
-        if (context)
+        // fixed for the run: the first one stands, and none comes after `ready`.
+        if (context || settled)
             return;
         const next = contextOf(data);
         if (!next) {

package/dist/host.d.ts

@@ -1,6 +1,6 @@
-import type { Hello } from "./bus/protocol.js";
+import { type Hello } from "./bus/protocol.js";
 import { type Server } from "./bus/server.js";
-import type { ContextState } from "./context/rules.js";
+import { type ContextState } from "./context/rules.js";
 import { type Holds } from "./lifecycle/holds.js";
 import { type SystemState } from "./system/rules.js";
 import { type System } from "./system/server.js";

package/dist/host.js

@@ -1,9 +1,12 @@
 // The page's side of the bus. The play page uses `createHost`;
 // a game standing alone runs `serve` in its own page.
+// [import]
+import { log } from "./bus/protocol.js";
 import { answerHellos, createServer } from "./bus/server.js";
 import { contextServer } from "./context/server.js";
+import { isTime } from "./context/rules.js";
 import { createHolds } from "./lifecycle/holds.js";
-import { shortLanguage } from "./system/rules.js";
+import { browserLanguage } from "./system/rules.js";
 import { createSystem } from "./system/server.js";
 import { lifecycleServer } from "./lifecycle/server.js";
 import { savesServer } from "./saves/server.js";
@@ -31,6 +34,18 @@ export function serve(options) {
     });
 }
 // [function]
+// The launch's time: the page's, by Arcadible's clock, or the device's when
+// none is given (as under `arc serve`). One that isn't an ISO time in UTC is
+// a bug in the page, said in the console, and the device's time is used, so
+// the game still gets one.
+function launchedAt(given) {
+    if (isTime(given))
+        return given;
+    if (given !== undefined) {
+        log("error", `launchedAt isn't an ISO time in UTC: ${JSON.stringify(given)}; the device's time is used.`);
+    }
+    return new Date().toISOString();
+}
 // The play page's host: it answers its iframe's hello with a welcome and a
 // private channel. Call it before inserting the iframe, so no hello is
 // missed. It holds the game while the page is hidden; `hold` holds it for
@@ -40,7 +55,7 @@ export function createHost(options) {
     const win = options.window ?? window;
     const holds = createHolds();
     const system = createSystem({
-        language: options.language ?? shortLanguage(win.navigator?.language),
+        language: options.language ?? browserLanguage(win.navigator?.language),
     });
     const answering = answerHellos({
         frame: options.frame,
@@ -50,7 +65,9 @@ export function createHost(options) {
             holds,
             system,
             context: {
-                launch: { at: options.launchedAt ?? new Date().toISOString() },
+                // Arcadible's time when given, else the device's: never a time the
+                // game would refuse.
+                launch: { at: launchedAt(options.launchedAt) },
             },
         }),
         window: win,

package/dist/lifecycle/holds.js

@@ -58,7 +58,10 @@ export function createHolds() {
                     },
                     [Names.Paused]: (data) => {
                         const value = isObject(data) ? data["n"] : undefined;
-                        if (typeof value !== "number" || value > n)
+                        // a pause the page sent: a whole number, from 1 up to the last.
+                        if (!Number.isInteger(value) || value < 1)
+                            return;
+                        if (value > n)
                             return;
                         settled = Math.max(settled, value);
                         if (settled < n)

package/dist/system/client.d.ts

@@ -1,7 +1,12 @@
 import type { Bus } from "../bus/client.js";
 /** Arcadible's state for the player, which changes while the game runs. */
 export interface System {
-    /** The store's language, a short tag: "en", "ja". */
+    /**
+     * The language Arcadible's store shows this player: a well-formed BCP 47
+     * tag in its canonical form ("en", "ja", later perhaps "zh-Hant" or
+     * "pt-BR"), ready for `Intl`. Match it against your game's languages by
+     * dropping parts from the end ("zh-Hant-TW", "zh-Hant", "zh").
+     */
     readonly language: string;
     /**
      * Called when something changes, with the new state (this same object)

package/dist/system/rules.d.ts

@@ -4,9 +4,19 @@ export declare const Names: {
 export type SystemState = {
     language: string;
 };
-/** A language the page may send: a short, lowercase tag. */
+/**
+ * A language tag (BCP 47, as the web, iOS, and Android use) in its canonical
+ * form, `zh-hant-tw` as `zh-Hant-TW`, or null if it isn't a well-formed one
+ * (`en_US`, `English`, empty). Only its shape is checked, never whether
+ * Arcadible uses it, so a language added later is never refused.
+ */
+export declare function languageOf(tag: unknown): string | null;
+/** Whether a value is a language tag in its canonical form. */
 export declare function isLanguage(value: unknown): value is string;
-/** The state as the game keeps it: only fields it knows, each checked. */
+/**
+ * The state as the game keeps it: only fields it knows, each checked, the
+ * language in its canonical form.
+ */
 export declare function stateOf(value: unknown): SystemState | null;
-/** A browser's language as a short tag: `en-US` as `en`, or `en`. */
-export declare function shortLanguage(tag: string | undefined): string;
+/** A browser's language (`navigator.language`) as the page sends it, or `en`. */
+export declare function browserLanguage(tag: string | undefined): string;

package/dist/system/rules.js

@@ -8,23 +8,54 @@ export const Names = {
     // every change.
     State: "system.state",
 };
-// a language as the store names it: a short tag, `en` or `ja`.
-const LANGUAGE = /^[a-z]{2,3}$/u;
+// The longest language tag kept: room for a language, script, region, and a
+// variant or two (`zh-Hant-TW`, `sl-rozaj-biske`), not a paragraph.
+const MAX_LANGUAGE = 35;
+// A tag's shape, where the browser can't say (no `Intl.getCanonicalLocales`).
+const SHAPE = /^[A-Za-z]{2,3}(-[A-Za-z0-9]{1,8})*$/u;
+// The language itself, first: an ISO 639 code, two or three letters. BCP 47
+// also allows five to eight (`english` is well-formed), which nothing uses.
+const PRIMARY = /^[A-Za-z]{2,3}(-|$)/u;
 // [function]
-/** A language the page may send: a short, lowercase tag. */
+/**
+ * A language tag (BCP 47, as the web, iOS, and Android use) in its canonical
+ * form, `zh-hant-tw` as `zh-Hant-TW`, or null if it isn't a well-formed one
+ * (`en_US`, `English`, empty). Only its shape is checked, never whether
+ * Arcadible uses it, so a language added later is never refused.
+ */
+export function languageOf(tag) {
+    if (typeof tag !== "string" || tag.length === 0)
+        return null;
+    if (tag.length > MAX_LANGUAGE || !PRIMARY.test(tag))
+        return null;
+    if (typeof Intl === "undefined" || !Intl.getCanonicalLocales) {
+        return SHAPE.test(tag) ? tag : null;
+    }
+    try {
+        return Intl.getCanonicalLocales(tag)[0] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+// [function]
+/** Whether a value is a language tag in its canonical form. */
 export function isLanguage(value) {
-    return typeof value === "string" && LANGUAGE.test(value);
+    return typeof value === "string" && languageOf(value) === value;
 }
 // [function]
-/** The state as the game keeps it: only fields it knows, each checked. */
+/**
+ * The state as the game keeps it: only fields it knows, each checked, the
+ * language in its canonical form.
+ */
 export function stateOf(value) {
-    if (!isObject(value) || !isLanguage(value["language"]))
+    if (!isObject(value))
         return null;
-    return { language: value["language"] };
+    const language = languageOf(value["language"]);
+    return language ? { language } : null;
 }
 // [function]
-/** A browser's language as a short tag: `en-US` as `en`, or `en`. */
-export function shortLanguage(tag) {
-    const short = (tag ?? "").split("-")[0]?.toLowerCase() ?? "";
-    return isLanguage(short) ? short : "en";
+/** A browser's language (`navigator.language`) as the page sends it, or `en`. */
+export function browserLanguage(tag) {
+    return languageOf(tag) ?? "en";
 }

package/dist/system/server.js

@@ -1,15 +1,15 @@
 // The page's side of `system`: Arcadible's state for the player, sent as
 // the game connects and again whenever it changes. Nothing waits on it.
-import { isLanguage, Names } from "./rules.js";
+import { browserLanguage, languageOf, Names, } from "./rules.js";
 // [function]
 export function createSystem(initial) {
-    let state = { ...initial };
+    // only a well-formed tag goes to the game, in its canonical form.
+    let state = { ...initial, language: browserLanguage(initial.language) };
     let context = null;
     return {
         set(next) {
-            const language = next.language !== undefined && isLanguage(next.language)
-                ? next.language
-                : state.language;
+            // a tag that isn't a language changes nothing.
+            const language = languageOf(next.language) ?? state.language;
             if (language === state.language)
                 return;
             state = { ...state, language };

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.5.0-next.2";
+export declare const VERSION = "1.5.0-next.4";

package/dist/version.js

@@ -1,3 +1,3 @@
 // The client's version, sent in its hello and shown as `arcadible.version`,
 // for bug reports. It matches package.json (test/unit/protocol.test.ts).
-export const VERSION = "1.5.0-next.2";
+export const VERSION = "1.5.0-next.4";

package/package.json

@@ -43,5 +43,5 @@
   ],
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.5.0-next.2"
+  "version": "1.5.0-next.4"
 }