Rename Game Maker to Feuerwerk and serve it at /feuerwerk/ (#422)
The editor gets a name of its own that fits beside Brandmauer, Glutspeicher and Feuerwehr. This is stage 1, 2 and 4 of #422: the name, the URL and the stored state in the browser. Repository, CI runners, containers and the GAME_MAKER_* variables follow in stage 3. - All paths come from SITE_PATH in src/core/site.ts: the API endpoint, the data folders, the play page and the base in vite.config.ts. A later move is one line instead of fifteen. - The window title, the sign-in screen, the playground and the README say Feuerwerk. The package, __feuerwerkPlay, the take worklet and the writing app in Ogg and Matroska follow. - The session cookie is now feuerwerk_session, so everyone signs in once more. - localStorage keys are now feuerwerk.*. moveOldStoredKeys copies the old game-maker.* keys over on the first start, so settings, panel sizes and save games survive. - tools/ci/serve.sh serves the build under /feuerwerk/. The variable GAME_MAKER_BASE_URL keeps its name until stage 3. Outside the repository, nockal.com/feuerwerk/ is a second symlink to the same tree. nginx sends the bare /game-maker/ folder there with a 301. Everything else under /game-maker/ is still served directly, so shared play links and the API keep working. Finding: when nginx redirects a path without a trailing slash or with a query, the Brandmauer answers with its own 307 to the same URL plus a slash, placed after the query. A play link would lose its token that way, which is why only the bare folder is redirected. Tests: - Gate on melektaus-atx: CHECK EXIT 0, 307 files, 4756 tests (4 new in site.test.ts). - Counter-check: when the migration misses the old prefix, 3 of the 4 new tests fail. - e2e 60 under /feuerwerk/: ALL PASSED, 20 checks. - From outside: /feuerwerk/ 200, /game-maker/ 301, an old play link 200. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
f92d69d902
commit
043c224cc3
66 files changed
+212
-112
No files matched your search
@@ -80,7 +80,7 @@ const HEAD: MatroskaHead = {
|
||||
},
|
||||
audio: { channels: 2, private: new TextEncoder().encode('OpusHead'), preSkip: 312 },
|
||||
durationMs: 1234.5,
|
||||
app: 'game-maker',
|
||||
app: 'feuerwerk',
|
||||
};
|
||||
|
||||
/** The whole file: the head, then the clusters handed out before (`earlier`) and at the end. */
|
||||
|
||||
@@ -34,7 +34,7 @@ beforeAll(async () => {
|
||||
describe('the link of a release', () => {
|
||||
it('leads to the play page with the token, and the play page reads it back', () => {
|
||||
const url = releaseUrl('https://nockal.com', TOKEN);
|
||||
expect(url).toBe(`https://nockal.com/game-maker/play.html?game=${TOKEN}`);
|
||||
expect(url).toBe(`https://nockal.com/feuerwerk/play.html?game=${TOKEN}`);
|
||||
expect(releaseToken(new URL(url).search)).toBe(TOKEN);
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { API_ENDPOINT, dataPath, moveOldStoredKeys } from '../../src/core/site';
|
||||
|
||||
function memoryStore(initial: Record<string, string>) {
|
||||
const items = new Map(Object.entries(initial));
|
||||
return {
|
||||
items,
|
||||
get length() {
|
||||
return items.size;
|
||||
},
|
||||
key: (i: number) => [...items.keys()][i] ?? null,
|
||||
getItem: (key: string) => items.get(key) ?? null,
|
||||
setItem: (key: string, value: string) => void items.set(key, value),
|
||||
removeItem: (key: string) => void items.delete(key),
|
||||
};
|
||||
}
|
||||
|
||||
describe('site', () => {
|
||||
it('serves the API and the data files under /feuerwerk/', () => {
|
||||
expect(API_ENDPOINT).toBe('/feuerwerk/api/index.php');
|
||||
expect(dataPath('textures')).toBe('/feuerwerk/data/textures');
|
||||
});
|
||||
|
||||
it('moves the keys stored under the old name and leaves the others alone', () => {
|
||||
const store = memoryStore({
|
||||
'game-maker.panel-sizes': '{"left":300}',
|
||||
'game-maker.saves.p1.Savegame': '{"Lives":2}',
|
||||
'other-site.key': 'x',
|
||||
});
|
||||
expect(moveOldStoredKeys(store)).toBe(2);
|
||||
expect(Object.fromEntries(store.items)).toEqual({
|
||||
'feuerwerk.panel-sizes': '{"left":300}',
|
||||
'feuerwerk.saves.p1.Savegame': '{"Lives":2}',
|
||||
'other-site.key': 'x',
|
||||
});
|
||||
});
|
||||
|
||||
it('keeps a value the new name already has and drops the old one', () => {
|
||||
const store = memoryStore({ 'game-maker.general-settings': 'old', 'feuerwerk.general-settings': 'new' });
|
||||
expect(moveOldStoredKeys(store)).toBe(0);
|
||||
expect(Object.fromEntries(store.items)).toEqual({ 'feuerwerk.general-settings': 'new' });
|
||||
});
|
||||
|
||||
it('does nothing the second time', () => {
|
||||
const store = memoryStore({ 'game-maker.folded-sections': '[]' });
|
||||
moveOldStoredKeys(store);
|
||||
expect(moveOldStoredKeys(store)).toBe(0);
|
||||
expect(Object.fromEntries(store.items)).toEqual({ 'feuerwerk.folded-sections': '[]' });
|
||||
});
|
||||
});
|
||||
@@ -2,7 +2,7 @@
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { keepPanelSize, panelSize, resetPanelSizes } from '../../src/editor/panelSizes';
|
||||
|
||||
const STORAGE_KEY = 'game-maker.panel-sizes';
|
||||
const STORAGE_KEY = 'feuerwerk.panel-sizes';
|
||||
|
||||
function memoryStore(initial: Record<string, string> = {}) {
|
||||
const items = new Map(Object.entries(initial));
|
||||
|
||||
@@ -264,7 +264,7 @@ describe('the memory of folded groups', () => {
|
||||
setFolded(key, true);
|
||||
expect(isFolded(key)).toBe(true);
|
||||
resetFolds();
|
||||
vi.stubGlobal('window', { localStorage: memoryStore({ 'game-maker.folded-sections': '{broken' }) });
|
||||
vi.stubGlobal('window', { localStorage: memoryStore({ 'feuerwerk.folded-sections': '{broken' }) });
|
||||
expect(isFolded(key)).toBe(false);
|
||||
});
|
||||
|
||||
|
||||
@@ -405,7 +405,7 @@ describe('the general settings', () => {
|
||||
keepGeneralSettings({ zoomTransitionMs: 350 });
|
||||
resetGeneralSettings();
|
||||
expect(generalSettings().zoomTransitionMs).toBe(350);
|
||||
expect(JSON.parse(store.items.get('game-maker.general-settings') ?? '')).toEqual({
|
||||
expect(JSON.parse(store.items.get('feuerwerk.general-settings') ?? '')).toEqual({
|
||||
zoomTransitionMs: 350,
|
||||
showEmptyAssetGroups: false,
|
||||
customCursor: true,
|
||||
@@ -437,7 +437,7 @@ describe('the general settings', () => {
|
||||
resetGeneralSettings();
|
||||
expect(generalSettings().customCursor).toBe(false);
|
||||
// Settings kept before the switch existed show it.
|
||||
store.setItem('game-maker.general-settings', JSON.stringify({ zoomTransitionMs: 100 }));
|
||||
store.setItem('feuerwerk.general-settings', JSON.stringify({ zoomTransitionMs: 100 }));
|
||||
resetGeneralSettings();
|
||||
expect(generalSettings().customCursor).toBe(true);
|
||||
});
|
||||
|
||||
@@ -40,7 +40,7 @@ function throws(callable $work, string $class = InvalidArgumentException::class)
|
||||
return false;
|
||||
}
|
||||
|
||||
$dir = sys_get_temp_dir() . '/game-maker-php-test-' . bin2hex(random_bytes(4));
|
||||
$dir = sys_get_temp_dir() . '/feuerwerk-php-test-' . bin2hex(random_bytes(4));
|
||||
mkdir($dir);
|
||||
$file = "{$dir}/users.json";
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ function wav(string $tag): string
|
||||
return 'RIFF' . pack('V', 36) . 'WAVE' . str_repeat("\0", 32) . $tag;
|
||||
}
|
||||
|
||||
$data = sys_get_temp_dir() . '/game-maker-php-files-' . bin2hex(random_bytes(4));
|
||||
$data = sys_get_temp_dir() . '/feuerwerk-php-files-' . bin2hex(random_bytes(4));
|
||||
mkdir("{$data}/projects", 0775, true);
|
||||
$users = new UserStore("{$data}/users.json");
|
||||
$users->put('ann', 'password1');
|
||||
|
||||
@@ -25,7 +25,7 @@ function check(string $name, bool $ok, mixed $got = null): void
|
||||
echo "FAIL {$name}", $got === null ? '' : ' — got ' . json_encode($got), "\n";
|
||||
}
|
||||
|
||||
$dir = sys_get_temp_dir() . '/game-maker-php-releases-' . bin2hex(random_bytes(4));
|
||||
$dir = sys_get_temp_dir() . '/feuerwerk-php-releases-' . bin2hex(random_bytes(4));
|
||||
mkdir($dir);
|
||||
$releases = new ReleaseStore($dir);
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ function check(string $name, bool $ok, mixed $got = null): void
|
||||
echo "FAIL {$name}", $got === null ? '' : ' — got ' . json_encode($got), "\n";
|
||||
}
|
||||
|
||||
$dir = sys_get_temp_dir() . '/game-maker-php-snapshots-' . bin2hex(random_bytes(4));
|
||||
$dir = sys_get_temp_dir() . '/feuerwerk-php-snapshots-' . bin2hex(random_bytes(4));
|
||||
mkdir($dir);
|
||||
$snapshots = new SnapshotStore($dir);
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ check('other lines say nothing', VideoFormat::progress('frame=12', 10.0) === nul
|
||||
check('progress never passes the end', VideoFormat::progress('out_time_us=99000000', 10.0) === 1.0);
|
||||
|
||||
// The store and its queue.
|
||||
$data = sys_get_temp_dir() . '/game-maker-php-videos-' . bin2hex(random_bytes(4));
|
||||
$data = sys_get_temp_dir() . '/feuerwerk-php-videos-' . bin2hex(random_bytes(4));
|
||||
$store = new VideoStore("{$data}/videos");
|
||||
$folder = 'a1b2c3d4e5f6';
|
||||
$rejected = static function (string $bytes) use ($store, $folder): bool {
|
||||
|
||||
Reference in new issue
Block a user