@moonbase-machines/player 0.9.1 → 0.10.0

package/README.md

@@ -1,24 +1,28 @@
 # @moonbase-machines/player
 
-The player for Mark Wharton's titles of 1985 to 1995, the one way each is played in a page, in two ways to play:
-
-- **Original** (`original.js`): the game's own disk, untouched, on Moonbase's Apple IIe or Commodore 64
-  (`@moonbase-machines/apple2e`, `c64`), on Moonbase's own ROMs, which need nothing of Apple's or Commodore's.
-- **Remake** (`remake/main.js`): the game's scenes, lifted from its code and compiled to JavaScript, on an engine:
-  the remake's own for a title of scenes (`card` or `vector`), or the title's own, a module in its folder. Either
-  way the player makes the page's part, the stage, the options line and the status; the title brings its engine
-  and its view.
-
-What a player saves, a game saved, goes on **the player's disk** (`disk/`): a title's own disk of files in this
-browser (IndexedDB), with its own dialogs (`disk/dialogs.js`, in a modal window, `modal.js`). A game saved in one
-way loads in the other.
+The player for Mark Wharton's titles of 1985 to 1995, one way in for every title and every way to play it (`play.js`):
+
+- **Original** (`way: 'original'`, `engines/original.js`): the game's own disk, untouched, on Moonbase's Apple IIe or
+  Commodore 64 (`@moonbase-machines/apple2e`, `c64`), on Moonbase's own ROMs, which need nothing of Apple's or
+  Commodore's.
+- **Remake** (`way: 'remake'`): the game's scenes, lifted from its code and compiled to JavaScript, on the remake's
+  engine (`engines/scenes.js`, a title of `card` or `vector` scenes), or the title's own engine, a module in its folder.
+
+The player makes its part of the page and owns it, the same for every title: the section (classes `player`, the way,
+the title's slug), the stage sized a whole number of the device's pixels to each of the screen's dots, the options
+line and the status, the keys (one listener, each machine's codes, `keys.js`), the sound, a Commodore 64's printer,
+the saves (`saves.js`), and what the page asks of it (`watch`, `claim`, `pace`, a route). An engine plays the game on
+the stage and returns its handle (`play.js` says what it may have). What a player saves goes on **the player's disk**
+(`disk/`): a title's own disk of files in this browser (IndexedDB), with its own dialogs (`disk/dialogs.js`, in a modal
+window, `modal.js`); the player opens it, on the backend the page gives. A game saved in one way loads in the other.
 
 No title is named in it. A title is a folder of its own, kept with the title, which the page gives the player:
 
-- `title.js`, what the title is: its engine (`'card'`, `'vector'` or a module of its own), its scripts and the one
-  it starts with, its `map` (the routines its scenes call, by address, and what its engine needs beside them:
-  `remake/cards.js` and `remake/vector.js` say what each engine reads), the modules it brings (`modules`, its
-  problems; `view`, its view's own drawing), its font's own glyphs (`font`), its stylesheet (`style`);
+- `title.js`, what the title is: its engine (`'card'`, `'vector'` or a module of its own), its screen where it is not
+  its machine's (`screen`, in its own dots), its scripts and the one it starts with, its `map` (the routines its
+  scenes call, by address, and what its engine needs beside them: `remake/cards.js` and `remake/vector.js` say what
+  each engine reads), the modules it brings (`modules`, its problems; `view`, its view's own drawing), its font's own
+  glyphs (`font`), its stylesheet (`style`);
 - its scenes (`<name>.scene`) and `compiled/` (`moonbase-compile`).
 
 Beside it the game's data, `<name>.json` (its disks' files, its kind, and where it saves: `saves`).
@@ -28,10 +32,9 @@ Beside it the game's data, `<name>.json` (its disks' files, its kind, and where
 <script type="importmap">{"imports": {"@moonbase-machines/player/": "/packages/player/", "@moonbase-machines/apple2e/": "/packages/apple2e/", "@moonbase-machines/c64/": "/packages/c64/", "@moonbase-machines/charset/": "/packages/charset/", "@moonbase-machines/mos6502/": "/packages/mos6502/", "@moonbase-machines/vector/": "/packages/vector/"}}</script>
 <section id="player"></section>
 <script type="module">
-  import { play } from '@moonbase-machines/player/remake/main.js';
-  import { openDisk } from '@moonbase-machines/player/disk/disk.js';
-  await play({ title: new URL('title/', location).href, data: new URL('game.json', location).href,
-    root: document.getElementById('player'), disk: await openDisk('title/game'), words: { printer: { line: '', print: 'Print', tear: 'Tear off' } } });
+  import { play } from '@moonbase-machines/player/play.js';
+  await play({ way: 'remake', slug: 'game', title: new URL('title/', location).href, data: new URL('game.json', location).href,
+    root: document.getElementById('player'), words: { printer: { line: '', print: 'Print', tear: 'Tear off' } } });
 </script>
 ```
 

package/bin/moonbase-play.mjs

@@ -31,8 +31,8 @@ async function page() {
     .map(async f => ({ name: f.slice(0, -5), data: f, game: JSON.parse(await readFile(join(root, f), 'utf8')) })));
   const slug = title?.slug ?? games[0]?.name, name = title?.name ?? games[0]?.game.title ?? slug;
   // (the ways: the remake, its data the title's own or, for a title of its own engine, data/; an original for each game)
-  const ways = [...(title ? [{ label: 'Remake', search: '', module: 'remake/main.js', data: existsSync(join(root, slug + '.json')) ? slug + '.json' : 'data/' }] : []),
-    ...games.map((g, i) => ({ label: games.length > 1 ? g.game.title : 'Original', search: !title && !i ? '' : games.length > 1 ? `?game=${g.name}` : '?way=original', module: 'original.js', data: g.data }))];
+  const ways = [...(title ? [{ label: 'Remake', search: '', way: 'remake', data: existsSync(join(root, slug + '.json')) ? slug + '.json' : 'data/' }] : []),
+    ...games.map((g, i) => ({ label: games.length > 1 ? g.game.title : 'Original', search: !title && !i ? '' : games.length > 1 ? `?game=${g.name}` : '?way=original', way: 'original', data: g.data }))];
   const map = { imports: Object.fromEntries(PACKAGES.map(p => [`@moonbase-machines/${p}/`, `/packages/${p}/`])) };
   return `<!doctype html>
 <html lang="en">
@@ -54,9 +54,9 @@ ${ways.length > 1 ? `<nav>${ways.map(w => `<a href="/${w.search}">${esc(w.label)
 const ways = ${JSON.stringify(ways)};
 const way = ways.find(w => w.search === location.search) ?? ways[0];
 for (const a of document.querySelectorAll('nav a')) if (a.search === way.search) a.setAttribute('aria-current', 'page');
-const [{ play }, { openDisk, titleDisk }] = await Promise.all([import('@moonbase-machines/player/' + way.module), import('@moonbase-machines/player/disk/disk.js')]);
+const { play } = await import('@moonbase-machines/player/play.js');
 const at = path => new URL(path, location.origin + '/').href;
-await play({ title: at('title/'), data: at(way.data), root: document.getElementById('player'), disk: await openDisk(titleDisk(${JSON.stringify(slug)})),
+await play({ way: way.way, slug: ${JSON.stringify(slug)}, title: ${title ? "at('title/')" : 'null'}, data: at(way.data), root: document.getElementById('player'),
   words: { printer: { line: 'What the printer has printed.', print: 'Print', tear: 'Tear off' } } });
 </script>
 </body>

package/disk/disk.js

@@ -15,12 +15,14 @@
 //   disk.write(name, bytes, meta)   a promise, kept when stored
 //   disk.remove(name)           a promise
 //   disk.written()              a promise: every write so far stored
+//   disk.failed = err => ...    told of a write or remove the backend could not store (the queue goes on)
 //   disk.name, disk.kept        the disk's name; whether its files outlast the page
+//   disk.where                  where they are kept, as the backend says ('this browser'), for the dialogs
 //
 // A disk's name says whose it is, so a title and a program can never share one: titleDisk(slug), a title's
 // player's, 'title/zoopak'; programDisk(name), one of the site's own programs', 'program/basic'.
 //
-// The backend is where a disk's files are kept: { kept, load(disk), put(disk, file), delete(disk, name) },
+// The backend is where a disk's files are kept: { kept, where, load(disk), put(disk, file), delete(disk, name) },
 // a file { name, bytes, meta, modified }. This browser's is local(); an account's will be the API's.
 import { local } from './local.js';
 import { memory } from './memory.js';
@@ -30,10 +32,12 @@ export async function openDisk(name, { backend } = {}) {
   if (!backend) { try { backend = await local(); } catch { backend = memory({ kept: false }); } }
   const files = new Map((await backend.load(name)).map(f => [f.name, f]));
   let queue = Promise.resolve();
-  const later = job => (queue = queue.then(job));
-  return {
+  // (each job stored in turn; one that fails is said (`failed`) and the next goes on, its own promise rejected for a
+  // caller that waits for it)
+  const later = job => { const p = queue.then(job); queue = p.catch(err => disk.failed?.(err)); p.catch(() => {}); return p; };
+  const disk = {
     name,
-    kept: backend.kept,
+    kept: backend.kept, where: backend.where ?? null, failed: null,
     list: () => [...files.values()].sort((a, b) => b.modified - a.modified).map(({ name, bytes, meta, modified }) => ({ name, size: bytes.length, modified, meta })),
     read: n => files.get(n)?.bytes ?? null,
     write(n, bytes, meta = {}) {
@@ -47,6 +51,7 @@ export async function openDisk(name, { backend } = {}) {
     },
     written: () => queue,
   };
+  return disk;
 }
 
 export const titleDisk = slug => `title/${slug}`;

package/disk/local.js

@@ -2,7 +2,7 @@
 // keyed by its account, its disk and its name. The account is `local`, this browser's own, until there
 // are accounts; theirs will be kept by the API, behind the same calls.
 //
-//   await local({ account })   a backend: { kept, load(disk), put(disk, file), delete(disk, name) }
+//   await local({ account })   a backend: { kept, where, load(disk), put(disk, file), delete(disk, name) }
 // (named here once, for a tool that puts a file on a disk too)
 export const DB = 'moonbase', VERSION = 1, STORE = 'files', KEY = ['account', 'disk', 'name'], ACCOUNT = 'local';
 
@@ -18,7 +18,7 @@ export async function local({ account = ACCOUNT } = {}) {
   const db = await opened();
   const store = mode => db.transaction(STORE, mode).objectStore(STORE);
   return {
-    kept: true,
+    kept: true, where: 'this browser',
     // (the disk's files: those keyed from [account, disk] up to the next disk's)
     load: async disk => (await asked(store('readonly').getAll(IDBKeyRange.bound([account, disk], [account, disk, []]))))
       .map(({ name, bytes, meta, modified }) => ({ name, bytes, meta, modified })),