From 2e8d1e079a64b7c43e8f15a5883a174099b12d89 Mon Sep 17 00:00:00 2001 From: Chris Malloy Date: Mon, 16 Oct 2023 02:36:30 -0300 Subject: [PATCH] Get dice rolls from server plugin --- .../backgammon/backgammon.component.scss | 2 +- .../backgammon/backgammon.component.ts | 297 ++++++++++-------- src/app/model/tag.ts | 11 - src/app/mods/root.ts | 18 ++ src/app/service/admin.service.ts | 3 +- src/app/util/rng.ts | 50 +++ 6 files changed, 241 insertions(+), 140 deletions(-) create mode 100644 src/app/util/rng.ts diff --git a/src/app/component/backgammon/backgammon.component.scss b/src/app/component/backgammon/backgammon.component.scss index 5b5aae801..2b9956b06 100644 --- a/src/app/component/backgammon/backgammon.component.scss +++ b/src/app/component/backgammon/backgammon.component.scss @@ -111,7 +111,7 @@ &.rolling { animation-duration: 0.15s; animation-name: rolling; - animation-iteration-count: 5; + animation-iteration-count: infinite; } @keyframes rolling { from { diff --git a/src/app/component/backgammon/backgammon.component.ts b/src/app/component/backgammon/backgammon.component.ts index cf7c10bc8..3af199afe 100644 --- a/src/app/component/backgammon/backgammon.component.ts +++ b/src/app/component/backgammon/backgammon.component.ts @@ -14,14 +14,19 @@ import { import { defer, delay, filter, range, uniq } from 'lodash-es'; import { autorun, IReactionDisposer, toJS } from 'mobx'; import * as moment from 'moment/moment'; -import { catchError, Subject, Subscription, takeUntil, throwError } from 'rxjs'; +import { catchError, Observable, of, Subject, Subscription, switchMap, takeUntil, throwError } from 'rxjs'; +import { tap } from 'rxjs/operators'; import { Ref } from '../../model/ref'; +import { seed } from '../../mods/root'; +import { AdminService } from '../../service/admin.service'; import { RefService } from '../../service/api/ref.service'; import { StompService } from '../../service/api/stomp.service'; +import { TaggingService } from '../../service/api/tagging.service'; import { AuthzService } from '../../service/authz.service'; import { ConfigService } from '../../service/config.service'; import { Store } from '../../store/store'; -import { hash } from 'src/app/model/tag'; +import { rng } from '../../util/rng'; +import { hasTag } from '../../util/tag'; export type Piece = 'r' | 'b'; export type Spot = { @@ -81,8 +86,12 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { private _ref?: Ref; private cursor?: string; + private remoteCursor?: string; + private seed?: string | number; + private remoteSeed?: string; private resizeObserver = window.ResizeObserver && new ResizeObserver(() => this.onResize()) || undefined; private watches: Subscription[] = []; + private pluginRng = this.admin.getPlugin('plugin/rng'); /** * Flag to prevent animations for own moves. */ @@ -103,12 +112,17 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { * Queued animation. */ private incomingRolling?: Piece; + private lastRoll?: string | number; + private lastRemoteRoll?: string; + private localPlay = false constructor( public config: ConfigService, + private admin: AdminService, private store: Store, private auth: AuthzService, private refs: RefService, + private tags: TaggingService, private stomps: StompService, private el: ElementRef, ) { @@ -125,75 +139,17 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { this.refs.page({ url: this.ref.url, obsolete: true, size: MAX_PLAYERS, sort: ['modified,DESC']}).subscribe(page => { this.stomps.watchRef(this.ref!.url, uniq(page.content.map(r => r.origin))).forEach(w => this.watches.push(w.pipe( takeUntil(this.destroy$), - ).subscribe(u => { - if (u.origin === this.store.account.origin) this.cursor = u.modifiedString; - else this.ref!.modifiedString = u.modifiedString; - const prev = [...this.board]; - const current = (u.comment || '') - .trim() - .split('\n') - .map(m => m.trim()) - .filter(m => !!m); - const minLen = Math.min(prev.length, current.length); - for (let i = 0; i < minLen; i++) { - if (prev[i] !== current[i]) { - prev.splice(0, i); - current.splice(0, i); - break; - } - if (i === minLen - 1) { - prev.splice(0, minLen); - current.splice(0, minLen); - } - } - const multiple = current[0]?.replace(/\(\d\)/, ''); - if (prev.length === 1 && current.length && prev[0].replace(/\(\d\)/, '') === multiple) { - prev.length = 0; - current[0] = multiple; - } - if (prev.length) { - window.alert($localize`Game history was rewritten!`); - this.ref = u; - this.store.eventBus.refresh(u); - } - if (prev.length || !current.length) return; - this.ref!.comment = u.comment; - this.store.eventBus.refresh(this.ref); - this.load(current, u.origin !== this.store.account.origin); - const roll = current.find(m => m.includes('-')); - if (roll) { - const lastRoll = this.incomingRolling = roll.split(' ')[0] as Piece; - requestAnimationFrame(() => { - if (lastRoll != this.incomingRolling) return; - this.rolling = this.incomingRolling; - delay(() => this.rolling = undefined, 3400); - }); - } - if (current.find(m => m.includes('/'))) { - const lastMove = this.incoming = current.filter(m => m.includes('/')).map(m => parseInt(m.split(/\D+/g).filter(m => !!m).pop()!) - 1); - this.incomingRedBar = current.filter(m => m.includes('*') && m.startsWith('b')).length; - this.incomingBlackBar = current.filter(m => m.includes('*') && m.startsWith('r')).length; - requestAnimationFrame(() => { - if (lastMove != this.incoming) return; - this.setBounce(this.incoming); - this.redBarBounce ||= this.incomingRedBar; - this.blackBarBounce ||= this.incomingBlackBar; - clearTimeout(this.bounce); - this.bounce = delay(() => { - this.clearBounce(); - delete this.bounce; - this.incomingRedBar = this.incomingBlackBar = 0; - }, 3400); - }); - } - }))); + ).subscribe(u => this.onMessage(u)))); }); } this.resizeObserver?.observe(this.el.nativeElement.parentElement!); if (this.local) { this.writeAccess = !this.ref?.created || this.ref?.upload || this.auth.writeAccess(this.ref); this.cursor = this.ref?.modifiedString; + this.seed = seed(this.ref); } else { + this.remoteCursor = this.ref?.modifiedString; + this.remoteSeed = seed(this.ref); this.writeAccess = true; this.refs.get(this.ref!.url, this.store.account.origin).pipe( catchError(err => { @@ -204,6 +160,7 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { }) ).subscribe(ref => { this.cursor = ref.modifiedString; + this.seed = seed(ref); this.writeAccess = this.auth.writeAccess(ref); }); } @@ -223,42 +180,6 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { this.resizeObserver?.disconnect(); } - hash(step = 0) { - let ts = this.cursor; - if (!ts) { - if (!this.board.length) { - // Allow first move to use local cursor - ts = this.ref?.modifiedString; - } else { - console.warn($localize`Can only use RNG after remote turn.`); - return Math.random(); - } - } - return hash(ts, step); - } - - remoteHash(step = 0) { - let ts = this.ref?.modifiedString; - if (!ts) { - if (!this.board.length) { - // Allow first move to use local cursor - ts = this.cursor; - } else { - console.warn($localize`Can only use RNG after remote turn.`); - return Math.random(); - } - } - return hash(ts, step); - } - - rng(step = 0) { - return Math.floor(this.remoteHash(step) * 6) + 1; - } - - checkRng(step = 0) { - return Math.floor(this.hash(step) * 6) + 1; - } - get ref() { return this._ref; } @@ -389,10 +310,26 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { ds[0] = parseInt(m[2]); ds[1] = parseInt(m[4]); if (checkRng) { - // This does not work when observing a game between two separate players - // Need to maintain second last remote cursor - if (ds[0] !== this.checkRng(0) || ds[1] !== this.checkRng(3)) { - window.alert(`Dice were ${ds[0]}-${ds[1]} but should be ${this.checkRng(0)}-${this.checkRng(3)}`) + if (!this.remoteSeed) { + if (!window.confirm($localize`Dice are not random! Allow?`)) return; + } + if (this.remoteSeed && this.lastRemoteRoll === this.remoteSeed) { + if (!window.confirm($localize`They rolled again! Allow?`)) return; + } + this.lastRemoteRoll = this.remoteSeed; + const r = rng(this.remoteSeed!); + if (ds[1]) { + const d1 = r.range(1, 6); + const d2 = r.range(1, 6); + if (ds[0] !== d1 || ds[1] !== d2) { + if (!window.confirm(`Dice were ${ds[0]}-${ds[1]} but should be ${d1}-${d2}! Allow?`)) return; + } + } else { + r.cycle(3); + const d = r.range(1, 6); + if (ds[0] !== d) { + if (!window.confirm(`Dice were ${ds[0]} but should be ${d} Allow?`)) return; + } } } this.board.push(`${p} ${ds[0]}-${ds[1]}`); @@ -428,6 +365,74 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { } } + onMessage(u: Ref) { + if (u.origin === this.store.account.origin) { + this.cursor = u.modifiedString; + this.seed = seed(u); + } else { + this.remoteCursor = u.modifiedString; + this.remoteSeed = seed(u); + } + const prev = [...this.board]; + const current = (u.comment || '') + .trim() + .split('\n') + .map(m => m.trim()) + .filter(m => !!m); + const minLen = Math.min(prev.length, current.length); + for (let i = 0; i < minLen; i++) { + if (prev[i] !== current[i]) { + prev.splice(0, i); + current.splice(0, i); + break; + } + if (i === minLen - 1) { + prev.splice(0, minLen); + current.splice(0, minLen); + } + } + const multiple = current[0]?.replace(/\(\d\)/, ''); + if (prev.length === 1 && current.length && prev[0].replace(/\(\d\)/, '') === multiple) { + prev.length = 0; + current[0] = multiple; + } + if (prev.length) { + window.alert($localize`Game history was rewritten!`); + this.ref = u; + this.store.eventBus.refresh(u); + } + if (prev.length || !current.length) return; + this.ref!.comment = u.comment; + this.store.eventBus.refresh(this.ref); + this.load(current, u.origin !== this.store.account.origin); + const roll = current.find(m => m.includes('-')); + if (roll) { + const lastRoll = this.incomingRolling = roll.split(' ')[0] as Piece; + requestAnimationFrame(() => { + if (lastRoll != this.incomingRolling) return; + this.rolling = this.incomingRolling; + delay(() => this.rolling = undefined, 500); + }); + } + if (current.find(m => m.includes('/'))) { + const lastMove = this.incoming = current.filter(m => m.includes('/')).map(m => parseInt(m.split(/\D+/g).filter(m => !!m).pop()!) - 1); + this.incomingRedBar = current.filter(m => m.includes('*') && m.startsWith('b')).length; + this.incomingBlackBar = current.filter(m => m.includes('*') && m.startsWith('r')).length; + requestAnimationFrame(() => { + if (lastMove != this.incoming) return; + this.setBounce(this.incoming); + this.redBarBounce ||= this.incomingRedBar; + this.blackBarBounce ||= this.incomingBlackBar; + clearTimeout(this.bounce); + this.bounce = delay(() => { + this.clearBounce(); + delete this.bounce; + this.incomingRedBar = this.incomingBlackBar = 0; + }, 3400); + }); + } + } + drawPiece(p: string) { return p === 'r' ? '🔴️' : '⚫️'; } @@ -578,7 +583,7 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { } check() { - this.save(); + this.save().subscribe(); this.moves = []; if (!this.redPips) { this.winner = 'r'; @@ -590,28 +595,43 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { this.clearMoves(); } - save() { + save(): Observable { const comment = this.patchingComment = this.board.join(' \n'); this.comment.emit(comment) - if (!this.ref) return; - (this.cursor ? this.refs.merge(this.ref.url, this.store.account.origin, this.cursor, + if (!this.ref) throw 'No ref'; + return (this.cursor ? this.refs.merge(this.ref.url, this.store.account.origin, this.cursor, { comment } ) : this.refs.create({ ...this.ref, + tags: this.pluginRng ? uniq([...this.ref.tags!, 'plugin/rng']) : this.ref.tags, origin: this.store.account.origin, comment, - })).subscribe(modifiedString => { - if (this.patchingComment !== comment) return; - this.ref!.comment = comment; - this.ref!.modified = moment(modifiedString); - this.cursor = this.ref!.modifiedString = modifiedString; - this.patchingComment = ''; - if (!this.local) { - this.ref!.origin = this.store.account.origin; - this.copied.emit(this.store.account.origin) - } - this.store.eventBus.refresh(this.ref); - }); + })).pipe( + switchMap(c => { + if (this.cursor && this.pluginRng && !hasTag('plugin/rng', this.ref)) { + return this.tags.create('plugin/rng', this.ref!.url, this.store.account.origin); + } + return of(c); + }), + tap(modifiedString => { + if (this.patchingComment !== comment) return; + this.ref!.comment = comment; + this.ref!.modified = moment(modifiedString); + this.cursor = this.ref!.modifiedString = modifiedString; + this.patchingComment = ''; + if (!this.local) { + this.ref!.origin = this.store.account.origin; + this.copied.emit(this.store.account.origin) + } + this.store.eventBus.refresh(this.ref); + }), + catchError(err => { + if (err.status === 409 || window.confirm($localize`Error ${err.status}. Retry?`)) { + return this.save(); + } + return throwError(() => err); + }), + ); } clearMoves() { @@ -755,20 +775,44 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { return result; } - roll(p: Piece) { + roll(p: Piece, retry = 3): any { + this.rolling = p; if (!this.writeAccess) throw $localize`Access Denied`; + if (!this.localPlay && (!this.seed || this.remoteCursor && moment(this.cursor).isBefore(moment(this.remoteCursor)))) { + switch (retry) { + case 3: return this.save().subscribe(() => defer(() => this.roll(p, 2))); + case 2: return delay(() => this.roll(p, 0), 2000); + case 1: return delay(() => this.roll(p, 1), 400); + case 0: + if ((!this.seed || this.remoteCursor) && !window.confirm($localize`Still waiting for seed... switch to local play?`)) { + delete this.rolling; + return; + } else { + this.localPlay = true; + } + } + } + if (!this.localPlay && this.seed && this.lastRoll === this.seed) { + if (!window.confirm($localize`Not your turn. Really roll?`)) { + delete this.rolling; + return; + } + } const ds = p === 'r' ? this.redDice : this.blackDice; if (this.winner) throw $localize`Game Over`; if ((!this.first || this.turn !== p) && this.moves.length) throw $localize`Must move`; + this.lastRoll = this.seed; + const r = rng(this.seed || Math.random()); if (!this.turn) { if (ds[0]) return; - ds[0] = this.rng(0); + r.cycle(3); + ds[0] = r.range(1, 6); this.board.push(`${p} ${ds[0]}-0`); } else { if (!this.first && this.turn === p) throw $localize`Not your turn`; this.turn = p; - ds[0] = this.rng(0); - ds[1] = this.rng(3); + ds[0] = r.range(1, 6); + ds[1] = r.range(1, 6); this.board.push(`${p} ${ds[0]}-${ds[1]}`) } if (!this.turn && this.redDice[0] && this.blackDice[0]) { @@ -779,10 +823,9 @@ export class BackgammonComponent implements OnInit, AfterViewInit, OnDestroy { this.turn = this.redDice[0] > this.blackDice[0] ? 'r' : 'b'; } } - this.rolling = p; - delay(() => this.rolling = undefined, 3400); + delay(() => this.rolling = undefined, 500); this.diceUsed = []; this.moves = this.getAllMoves(); - this.save(); + this.save().subscribe(); } } diff --git a/src/app/model/tag.ts b/src/app/model/tag.ts index d7723d1aa..cc2757d70 100644 --- a/src/app/model/tag.ts +++ b/src/app/model/tag.ts @@ -20,17 +20,6 @@ export interface Cursor extends HasOrigin { modifiedString?: string; } -export function hash(ts?: string, shift = 0) { - if (shift > 5) throw 'Only 6 numbers available'; - const m = ts?.match(/(\d{6})Z?$/)?.[1].split('')!; - if (!m) throw 'No hash available'; - while (shift) { - shift--; - m.unshift(m.pop()!); - } - return parseInt(m.join('')) / 1000000.0; -} - export interface Tag extends Cursor { type?: 'ext' | 'user' | 'plugin' | 'template'; tag: string; diff --git a/src/app/mods/root.ts b/src/app/mods/root.ts index ab0181400..be814cd78 100644 --- a/src/app/mods/root.ts +++ b/src/app/mods/root.ts @@ -1,11 +1,15 @@ import { $localize } from '@angular/localize/init'; import * as moment from 'moment'; +import { Plugin } from '../model/plugin'; +import { Ref } from '../model/ref'; import { Template } from '../model/template'; +import { hasPrefix } from '../util/tag'; export const rootTemplate: Template = { tag: '', name: $localize`⚓️ Root Template`, config: { + mod: $localize`⚓️ Root Config`, default: true, generated: 'Generated by jasper-ui ' + moment().toISOString(), description: $localize`Add common features Ext tag pages: Adding pinned Refs, sidebar markdown, @@ -169,3 +173,17 @@ export interface RootConfig { defaultCols?: number; } +export const rngPlugin: Plugin = { + tag: 'plugin/rng', + name: $localize`🎰️ Random Number Generator`, + config: { + mod: $localize`⚓️ Root Config`, + default: true, + generated: 'Generated by jasper-ui ' + moment().toISOString(), + description: $localize`Allow generating random numbers.`, + }, +}; + +export function seed(ref?: Ref) { + return ref?.tags?.find(t => t.startsWith('+plugin/rng/'))?.substring(12); +} diff --git a/src/app/service/admin.service.ts b/src/app/service/admin.service.ts index 94d4e2f32..0af183e4d 100644 --- a/src/app/service/admin.service.ts +++ b/src/app/service/admin.service.ts @@ -59,7 +59,7 @@ import { queueTemplate } from '../mods/queue'; import { repostPlugin } from '../mods/repost'; -import { rootTemplate } from '../mods/root'; +import { rngPlugin, rootTemplate } from '../mods/root'; import { scrapePlugin } from '../mods/scrape'; import { seamlessPlugin } from '../mods/seamless'; import { snippetConfig } from '../mods/snippet'; @@ -139,6 +139,7 @@ export class AdminService { voteUp: voteUpPlugin, voteDown: voteDownPlugin, + rngPlugin: rngPlugin, imagePlugin: imagePlugin, lensPlugin: lensPlugin, pipPlugin: pipPlugin, diff --git a/src/app/util/rng.ts b/src/app/util/rng.ts new file mode 100644 index 000000000..04e325bd1 --- /dev/null +++ b/src/app/util/rng.ts @@ -0,0 +1,50 @@ +import { isString } from 'lodash-es'; + +export function rng(seed: any): Rng { + let gen = sfc32(isString(seed) ? parseInt(seed.substring(0, 8), 16) : seed * 1000000); + const rng = { + random(): number { + return gen(); + }, + range(from: number, to: number): number { + const r = gen(); + return Math.floor(r * to - from + 1) + from; + }, + cycle(run: number) { + while (run > 0) { + run--; + gen(); + } + }, + restart() { + gen = sfc32(parseInt(seed, 16)) + }, + seed(newSeed: string){ + seed = newSeed; + gen = sfc32(parseInt(newSeed, 16)); + } + }; + rng.cycle(1000); // Warm up + return rng; +} + +function sfc32(a = 0, b = 0, c = 0, d = 0) { + return function() { + a |= 0; b |= 0; c |= 0; d |= 0; + const t = (a + b | 0) + d | 0; + d = d + 1 | 0; + a = b ^ b >>> 9; + b = c + (c << 3) | 0; + c = c << 21 | c >>> 11; + c = c + t | 0; + return (t >>> 0) / 4294967296; + } +} + +export interface Rng { + random(): number; + range(...range: number[]): number; + cycle(run: number): void; + restart(): void; + seed(...args: any[]): void; +}