account integration

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "minicraft",
-	"version": "0.9.3",
+	"version": "0.9.4",
 	"description": "voxel-based 3d game, written in javascript",
 	"homepage": "https://l3p3.de/minicraft",
 	"repository": {

src/app.js

@@ -88,6 +88,7 @@ lui_.init(() => {
 		ondragstart: handler_noop,
 	}, [
 		node(App, {
+			account: state.account,
 			actions,
 			config: state.config,
 			ref,

src/etc/state.js

@@ -56,16 +56,19 @@ export const reducers = {
 				needs_save = true;
 			}
 		}
-		if (needs_save) {
-			return reducers.config_save({
-				config,
-				config_saved: null,
-			});
-		}
-		return {
+		const state = {
+			account: {
+				label: '',
+				rank: 0,
+			},
 			config,
 			config_saved: config,
 		};
+		if (needs_save) {
+			state.config_saved = null;
+			return reducers.config_save(state);
+		}
+		return state;
 	},
 	config_save: state => {
 		const {
@@ -87,6 +90,10 @@ export const reducers = {
 			config_saved: config,
 		};
 	},
+	account_set: (state, account) => ({
+		...state,
+		account,
+	}),
 	config_reduce: (state, reducer) => (
 		reducers.config_set(
 			state,

src/externs.js

@@ -310,3 +310,14 @@ var TYPE_WORLD_LISTING_REMOTE;
 	}}
 */
 var TYPE_WORLD_API;
+
+/**
+	@typedef {{
+		account: {
+			label: string,
+			rank: number,
+		},
+		worlds: !Array<TYPE_WORLD_LISTING_REMOTE>,
+	}}
+*/
+var TYPE_RESPONSE_INITIAL;

src/game/c_app.js

@@ -13,6 +13,7 @@ import Game from './c_game.js';
 import MenuStart from './c_menu_start.js';
 
 export default function App({
+	account,
 	actions,
 	config,
 	ref,
@@ -24,12 +25,14 @@ export default function App({
 	return [
 		view === APP_VIEW_WORLDS &&
 		node(MenuStart, {
+			account,
 			actions,
 			config,
 			view_set,
 		}),
 		view === APP_VIEW_GAME &&
 		node(Game, {
+			account,
 			actions,
 			config,
 			frame,

src/game/c_game.js

@@ -43,6 +43,7 @@ import Terminal from './c_terminal.js';
 import Touch from './c_touch.js';
 
 export default function Game({
+	account,
 	actions,
 	config,
 	frame,
@@ -53,7 +54,7 @@ export default function Game({
 	const pointer_locked = document_.pointerLockElement === frame;
 
 	const model = hook_memo(() => (
-		ref.game = game_create(actions, frame, config)
+		ref.game = game_create(actions, frame, config, account)
 	));
 
 	hook_effect(() => {

src/game/c_menu_start.js

@@ -76,6 +76,7 @@ function WorldItem({
 }
 
 export default function MenuStart({
+	account,
 	actions,
 	config,
 	view_set,
@@ -88,33 +89,38 @@ export default function MenuStart({
 		refreshes_set(refreshes_get() + 1);
 	});
 
+	/**
+		last fetched world list
+		@type {{
+			value: ?Array<TYPE_WORLD_LISTING_REMOTE>,
+		}}
+	*/
+	const world_list_remote_ref = hook_static({
+		value: null,
+	});
 	const world_list_remote = hook_async(
 		async () => {
 			try {
-				const response = await fetch(API + 'world?what=meta_all');
+				const initial = !world_list_remote_ref.value && !refreshes;
+				const response = await fetch(API + `world?what=${initial ? 'initial' : 'meta_all'}`);
 				if (!response.ok) throw new Error('Verbindungsfehler.');
-				return await response.json();
+				const json = await response.json();
+				if (!initial) return /** @type {!Array<TYPE_WORLD_LISTING_REMOTE>} */ (json);
+				const json_initial = /** @type {TYPE_RESPONSE_INITIAL} */ (json);
+				defer();
+				actions.account_set(json_initial.account);
+				return json_initial.worlds;
 			}
 			catch (error) {
-				alert('Fehler beim Laden der Weltliste: ' + error.message);
+				alert('Fehler beim Laden der Weltenliste: ' + error.message);
 				return [];
 			}
 		},
 		[refreshes],
 		null
 	);
-	/**
-		last fetched world list
-		@type {{
-			value: ?Array<TYPE_WORLD_LISTING_REMOTE>,
-		}}
-	*/
-	const world_list_remote_ref = hook_static({
-		value: null,
-	});
 	// merged local and remote world list
 	const world_list = hook_memo(() => {
-		const first = !world_list_remote_ref.value;
 		if (world_list_remote) {
 			world_list_remote_ref.value = world_list_remote;
 		}
@@ -359,6 +365,17 @@ export default function MenuStart({
 
 	return [
 		node_dom('h1[innerText=Welten]'),
+		node_dom('button[innerText=Aktualisieren][style=position:absolute;left:0;top:0;height:2rem][title=Liste neu laden]', {
+			disabled: !world_list_remote,
+			onclick: refresh,
+		}),
+		node_dom('button[style=position:absolute;right:0;top:0;height:2rem]', {
+			disabled: account.rank > 0,
+			innerText: account.rank ? account.label : 'Anmelden',
+			onclick: () => {
+				location.href = '/account?redir=minicraft';
+			},
+		}),
 		node_dom('div[className=worlds]', null, [
 			node_map(WorldItem, world_list, {
 				refreshes, // refresh dates as well
@@ -396,7 +413,8 @@ export default function MenuStart({
 				disabled: (
 					!world_list_remote ||
 					!world_selected ||
-					world_selected.local > 0 && world_selected.remote > 0
+					world_selected.local > 0 && world_selected.remote > 0 ||
+					!world_selected.remote && !account.rank
 				),
 				innerText: (
 					world_selected && !world_selected.local
@@ -427,15 +445,13 @@ export default function MenuStart({
 					?	'Keine Welt ausgewählt!'
 					: !world_selected.local
 					?	'Welt von Server herunterladen'
-					: !world_selected.remote
+					: world_selected.remote
+					?	'Die Welt ist schon auf beiden Seiten vorhanden!'
+					: account.rank
 					?	'Welt auf den Server hochladen'
-					:	'Die Welt ist schon auf beiden Seiten vorhanden!'
+					:	'Nicht angemeldet!'
 				),
 			}),
-			node_dom('button[innerText=Aktualisieren][title=Liste neu laden]', {
-				disabled: !world_list_remote,
-				onclick: refresh,
-			}),
 		]),
 		node_dom('hr'),
 		node_dom('center', null, [

src/game/m_game.js

@@ -93,10 +93,10 @@ import {
 
 let message_id_counter = 0;
 
-export const game_create = (actions, frame_element, config) => {
+export const game_create = (actions, frame_element, config, account) => {
 	const world = world_create(config.world_last);
 
-	const player = player_create(world);
+	const player = player_create(world, account);
 
 	world_load(world, player);
 

src/game/m_player.js

@@ -16,7 +16,7 @@ import {
 	slot_create,
 } from './m_slot.js';
 
-export const player_create = world => ({
+export const player_create = (world, account) => ({
 	accel_x: 0.0,
 	accel_y: 0.0,
 	accel_z: 0.0,
@@ -34,7 +34,7 @@ export const player_create = world => ({
 		.fill(null)
 		.map(() => slot_create(null)),
 	mouse_mode: MOUSE_MODE_NORMAL,
-	name: 'Gast',
+	name: account.label || 'Spieler',
 	position_x: world.spawn_x,
 	position_y: world.spawn_y,
 	position_z: world.spawn_z,