@crowdedkingdoms/crowdyjs 17.3.0-dev.1 → 17.4.0-dev.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/MIGRATION.md +75 -0
- package/dist/domains/gameModel.d.ts +172 -14
- package/dist/domains/gameModel.d.ts.map +1 -1
- package/dist/domains/gameModel.js +204 -14
- package/dist/generated/graphql.d.ts +522 -6
- package/dist/generated/graphql.d.ts.map +1 -1
- package/dist/generated/graphql.js +16 -6
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/kit/index.d.ts +1 -1
- package/dist/kit/index.d.ts.map +1 -1
- package/dist/kit/matches.d.ts +79 -2
- package/dist/kit/matches.d.ts.map +1 -1
- package/dist/kit/matches.js +85 -1
- package/dist/kit/npcs.d.ts.map +1 -1
- package/dist/kit/social.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/kit/matches.d.ts
CHANGED
|
@@ -4,6 +4,20 @@ import type { GameModelAPI } from '../domains/gameModel.js';
|
|
|
4
4
|
import type { UdpAPI } from '../domains/udp.js';
|
|
5
5
|
import type { Scalars } from '../generated/graphql.js';
|
|
6
6
|
import { type KitInvokeResult } from './shared.js';
|
|
7
|
+
/**
|
|
8
|
+
* What {@link MatchesKit.finish} did about the backing session after a
|
|
9
|
+
* successful `end_match`: `'ended'` (it ended it), `'already_ended'` (a
|
|
10
|
+
* replayed finish; the session was already ended), `'forbidden'` (the caller
|
|
11
|
+
* passed `end_match` -- creator or the app's elected host -- but is neither
|
|
12
|
+
* the session host nor an app admin, so the session is still active; an app
|
|
13
|
+
* admin can `gameModel.endSession` it).
|
|
14
|
+
* Absent when `end_match` itself was refused (`success: false`).
|
|
15
|
+
*/
|
|
16
|
+
export type KitMatchSessionEnd = 'ended' | 'already_ended' | 'forbidden';
|
|
17
|
+
/** {@link MatchesKit.finish}'s result: the invoke result plus what happened to the session. */
|
|
18
|
+
export type KitMatchFinishResult = KitInvokeResult<string> & {
|
|
19
|
+
sessionEnd?: KitMatchSessionEnd;
|
|
20
|
+
};
|
|
7
21
|
/** Options for {@link MatchesKit}. Must match the deployed matches blueprint. */
|
|
8
22
|
export interface MatchesKitOptions {
|
|
9
23
|
/**
|
|
@@ -77,6 +91,12 @@ export declare class MatchesKit {
|
|
|
77
91
|
private readonly names;
|
|
78
92
|
private readonly actorUuid;
|
|
79
93
|
private readonly engineModuleName;
|
|
94
|
+
/**
|
|
95
|
+
* This client's participant incarnation per session, remembered from
|
|
96
|
+
* {@link create} (a creator starts at 1) and {@link join}, so {@link leave}
|
|
97
|
+
* can send the value the server requires without the caller carrying it.
|
|
98
|
+
*/
|
|
99
|
+
private readonly incarnations;
|
|
80
100
|
constructor(appId: Scalars['BigInt']['input'], gameModel: GameModelAPI, channels: ChannelsAPI | undefined, udp: UdpAPI | undefined, options?: MatchesKitOptions, engines?: EngineDetector | undefined);
|
|
81
101
|
private requireChannels;
|
|
82
102
|
private requireUdp;
|
|
@@ -97,12 +117,47 @@ export declare class MatchesKit {
|
|
|
97
117
|
open(): Promise<KitMatch[]>;
|
|
98
118
|
/** Read one match by its MatchMeta container. */
|
|
99
119
|
get(metaId: string): Promise<KitMatch>;
|
|
100
|
-
/**
|
|
120
|
+
/**
|
|
121
|
+
* Join a match: session participation + the notification channel. A rejoin
|
|
122
|
+
* (you are already in) returns your row with `incarnation + 1`. The
|
|
123
|
+
* incarnation is remembered on this kit instance for {@link leave}.
|
|
124
|
+
*/
|
|
101
125
|
join(match: KitMatch): Promise<{
|
|
102
126
|
__typename?: "GmSessionParticipant";
|
|
103
127
|
sessionId: string;
|
|
104
128
|
userId: string;
|
|
105
129
|
role: string;
|
|
130
|
+
state: string;
|
|
131
|
+
incarnation: number;
|
|
132
|
+
actorUuid: string | null;
|
|
133
|
+
joinedAt: string;
|
|
134
|
+
leftAt: string | null;
|
|
135
|
+
leftReason: string | null;
|
|
136
|
+
}>;
|
|
137
|
+
/**
|
|
138
|
+
* Leave a match: session departure + the notification channel. The server
|
|
139
|
+
* requires the incarnation {@link join} returned to *this* client, so a
|
|
140
|
+
* superseded client can never remove the one that took over; pass it, or
|
|
141
|
+
* let the kit use the one it remembered from `create` / `join` on this
|
|
142
|
+
* instance. A kit session is `presence: 'none'`, so this and {@link finish}
|
|
143
|
+
* are the roster's only exits.
|
|
144
|
+
*
|
|
145
|
+
* @throws {Error} when no incarnation is known for the match on this
|
|
146
|
+
* instance and none was passed.
|
|
147
|
+
* @throws {CrowdyGraphQLError} `SESSION_INCARNATION_STALE` (a newer client
|
|
148
|
+
* of yours rejoined), `SESSION_NOT_PARTICIPANT`, `NOT_FOUND`.
|
|
149
|
+
*/
|
|
150
|
+
leave(match: KitMatch, incarnation?: number): Promise<{
|
|
151
|
+
__typename?: "GmSessionParticipant";
|
|
152
|
+
sessionId: string;
|
|
153
|
+
userId: string;
|
|
154
|
+
role: string;
|
|
155
|
+
state: string;
|
|
156
|
+
incarnation: number;
|
|
157
|
+
actorUuid: string | null;
|
|
158
|
+
joinedAt: string;
|
|
159
|
+
leftAt: string | null;
|
|
160
|
+
leftReason: string | null;
|
|
106
161
|
}>;
|
|
107
162
|
/** Start the match (creator or host). Pings the match channel post-commit. */
|
|
108
163
|
start(match: KitMatch): Promise<KitInvokeResult<string>>;
|
|
@@ -129,6 +184,16 @@ export declare class MatchesKit {
|
|
|
129
184
|
createdByUserId: string | null;
|
|
130
185
|
currentTurnUserId: string | null;
|
|
131
186
|
metadataJson: string;
|
|
187
|
+
admission: string;
|
|
188
|
+
maxParticipants: number | null;
|
|
189
|
+
participantCount: number;
|
|
190
|
+
hostUserId: string | null;
|
|
191
|
+
hostTerm: number;
|
|
192
|
+
revision: string;
|
|
193
|
+
endedAt: string | null;
|
|
194
|
+
endReason: string | null;
|
|
195
|
+
createdAt: string;
|
|
196
|
+
presence: string;
|
|
132
197
|
}>;
|
|
133
198
|
/**
|
|
134
199
|
* Open a turn and arm its deadline (`turnTimer` deployments only) — the
|
|
@@ -167,8 +232,20 @@ export declare class MatchesKit {
|
|
|
167
232
|
* Finish the match and record the winner (creator or host). Also drops the
|
|
168
233
|
* pending turn deadline on a `turnTimer` match — `end_match` already
|
|
169
234
|
* strands it, so this just saves the pointless fire and channel ping.
|
|
235
|
+
*
|
|
236
|
+
* When `end_match` succeeds the backing session is ended too
|
|
237
|
+
* (`gameModelEndSession`, reason `completed`): every participant is marked
|
|
238
|
+
* left, admission closes, and the session's events become eligible for
|
|
239
|
+
* retention. The game-authoritative step runs first, so the match is
|
|
240
|
+
* decided whatever happens next; `sessionEnd` on the result says what
|
|
241
|
+
* happened to the session ({@link KitMatchSessionEnd}): `'ended'`, or
|
|
242
|
+
* `'already_ended'` for a replayed finish, or `'forbidden'` when the caller
|
|
243
|
+
* passed `end_match` (creator or the app's elected host) but is not admitted
|
|
244
|
+
* to the session end (session host or app admin only) -- the match is
|
|
245
|
+
* finished, the session is not, and nothing is thrown. Any other refusal of
|
|
246
|
+
* the session end propagates.
|
|
170
247
|
*/
|
|
171
|
-
finish(match: KitMatch, winnerUserId: Scalars['BigInt']['input']): Promise<
|
|
248
|
+
finish(match: KitMatch, winnerUserId: Scalars['BigInt']['input']): Promise<KitMatchFinishResult>;
|
|
172
249
|
/**
|
|
173
250
|
* Manually ping the match channel with `"match_changed"` (the lifecycle
|
|
174
251
|
* functions do this automatically via their declared notifications; use
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matches.d.ts","sourceRoot":"","sources":["../../src/kit/matches.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"matches.d.ts","sourceRoot":"","sources":["../../src/kit/matches.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAIvD,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AAErB;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,eAAe,GAAG,WAAW,CAAC;AAEzE,+FAA+F;AAC/F,MAAM,MAAM,oBAAoB,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG;IAC3D,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF,iFAAiF;AACjF,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,kCAAkC;AAClC,MAAM,WAAW,QAAQ;IACvB,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iFAAiF;IACjF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAGpD;AAED,sCAAsC;AACtC,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,qBAAa,UAAU;IAYnB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAhB3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;gBAGvC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EACjC,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,GAAG,EAAE,MAAM,GAAG,SAAS,EACxC,OAAO,GAAE,iBAAsB,EACd,OAAO,CAAC,EAAE,cAAc,YAAA;IAO3C,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,UAAU;IASlB;;;;;;OAMG;IACG,MAAM,CAAC,KAAK,EAAE;QAClB,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAyCrB,8DAA8D;IACxD,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAajC,iDAAiD;IAC3C,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAY5C;;;;OAIG;IACG,IAAI,CAAC,KAAK,EAAE,QAAQ;;;;;;;;;;;;IAY1B;;;;;;;;;;;;OAYG;IACG,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,MAAM;;;;;;;;;;;;IAmBjD,8EAA8E;IACxE,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAU9D,mDAAmD;IAC7C,YAAY,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAUrE,uDAAuD;IACjD,MAAM,CACV,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;;;OASG;IACG,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;IAWrE;;;;;OAKG;IACG,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAUlE;;;;;OAKG;IACG,kBAAkB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAO1D,0DAA0D;IACpD,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;;;;;;;;;;;IAqB1E;;;OAGG;IACG,KAAK,CACT,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAUnC,oEAAoE;IAC9D,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAuB1D;;;;;;;;;;;;;;;;OAgBG;IACG,MAAM,CACV,KAAK,EAAE,QAAQ,EACf,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,oBAAoB,CAAC;IAiChC;;;;OAIG;IACG,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAStD;;;;OAIG;IACH,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,MAAM,IAAI;YAYlE,OAAO;IAiCrB;;;;;OAKG;IACH,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAKnC;;;OAGG;IACG,WAAW,CAAC,OAAO,EAAE,MAAM;IAIjC,mEAAmE;IAC7D,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAI5E,+BAA+B;IACzB,aAAa,CAAC,OAAO,EAAE,MAAM;IAInC,uEAAuE;IACjE,YAAY,CAAC,OAAO,EAAE,MAAM;IAIlC;;;OAGG;IACG,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;YAQlD,YAAY;CAU3B"}
|
package/dist/kit/matches.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CrowdyGraphQLError } from '../errors.js';
|
|
1
2
|
import { encodeBase64, generateCrowdyUuid } from '../utils.js';
|
|
2
3
|
import { matchesNames } from './blueprints/index.js';
|
|
3
4
|
import { kitContainerProperties, kitInvoke, } from './shared.js';
|
|
@@ -29,6 +30,12 @@ export class MatchesKit {
|
|
|
29
30
|
this.channels = channels;
|
|
30
31
|
this.udp = udp;
|
|
31
32
|
this.engines = engines;
|
|
33
|
+
/**
|
|
34
|
+
* This client's participant incarnation per session, remembered from
|
|
35
|
+
* {@link create} (a creator starts at 1) and {@link join}, so {@link leave}
|
|
36
|
+
* can send the value the server requires without the caller carrying it.
|
|
37
|
+
*/
|
|
38
|
+
this.incarnations = new Map();
|
|
32
39
|
this.names = matchesNames(options.typePrefix ?? '');
|
|
33
40
|
this.engineModuleName = options.engineModuleName ?? 'match-engine';
|
|
34
41
|
this.actorUuid = options.actorUuid ?? generateCrowdyUuid();
|
|
@@ -53,10 +60,18 @@ export class MatchesKit {
|
|
|
53
60
|
* creator may start/advance/end the match).
|
|
54
61
|
*/
|
|
55
62
|
async create(input) {
|
|
63
|
+
// A kit match talks GraphQL and channel pings; the `actorUuid` here is only
|
|
64
|
+
// the channel-message sender id, never a replicated actor. Under the
|
|
65
|
+
// default `presence: 'actor'` the server would expire every player after
|
|
66
|
+
// the join grace window, so the roster is judged by nothing: players leave
|
|
67
|
+
// with `leave()`, `finish()` ends the session, and an emptied session is
|
|
68
|
+
// abandoned by the empty timeout.
|
|
56
69
|
const session = await this.gameModel.createSession({
|
|
57
70
|
appId: this.appId,
|
|
58
71
|
name: input.displayName ?? `match-${input.mode ?? 'default'}`,
|
|
72
|
+
presence: 'none',
|
|
59
73
|
});
|
|
74
|
+
this.incarnations.set(session.sessionId, 1);
|
|
60
75
|
const channel = await this.requireChannels().create({
|
|
61
76
|
appId: this.appId,
|
|
62
77
|
name: `match-${session.sessionId}`,
|
|
@@ -103,17 +118,51 @@ export class MatchesKit {
|
|
|
103
118
|
});
|
|
104
119
|
return this.toMatch(meta.containerId, meta.sessionId != null ? String(meta.sessionId) : '', meta.displayName);
|
|
105
120
|
}
|
|
106
|
-
/**
|
|
121
|
+
/**
|
|
122
|
+
* Join a match: session participation + the notification channel. A rejoin
|
|
123
|
+
* (you are already in) returns your row with `incarnation + 1`. The
|
|
124
|
+
* incarnation is remembered on this kit instance for {@link leave}.
|
|
125
|
+
*/
|
|
107
126
|
async join(match) {
|
|
108
127
|
const participant = await this.gameModel.joinSession({
|
|
109
128
|
appId: this.appId,
|
|
110
129
|
sessionId: match.sessionId,
|
|
111
130
|
});
|
|
131
|
+
this.incarnations.set(match.sessionId, participant.incarnation);
|
|
112
132
|
if (match.channelId !== '0' && match.channelId !== '') {
|
|
113
133
|
await this.requireChannels().join(match.channelId);
|
|
114
134
|
}
|
|
115
135
|
return participant;
|
|
116
136
|
}
|
|
137
|
+
/**
|
|
138
|
+
* Leave a match: session departure + the notification channel. The server
|
|
139
|
+
* requires the incarnation {@link join} returned to *this* client, so a
|
|
140
|
+
* superseded client can never remove the one that took over; pass it, or
|
|
141
|
+
* let the kit use the one it remembered from `create` / `join` on this
|
|
142
|
+
* instance. A kit session is `presence: 'none'`, so this and {@link finish}
|
|
143
|
+
* are the roster's only exits.
|
|
144
|
+
*
|
|
145
|
+
* @throws {Error} when no incarnation is known for the match on this
|
|
146
|
+
* instance and none was passed.
|
|
147
|
+
* @throws {CrowdyGraphQLError} `SESSION_INCARNATION_STALE` (a newer client
|
|
148
|
+
* of yours rejoined), `SESSION_NOT_PARTICIPANT`, `NOT_FOUND`.
|
|
149
|
+
*/
|
|
150
|
+
async leave(match, incarnation) {
|
|
151
|
+
const known = incarnation ?? this.incarnations.get(match.sessionId);
|
|
152
|
+
if (known === undefined) {
|
|
153
|
+
throw new Error('kit.matches.leave needs the incarnation join() returned — pass it, or join through this kit instance');
|
|
154
|
+
}
|
|
155
|
+
const participant = await this.gameModel.leaveSession({
|
|
156
|
+
appId: this.appId,
|
|
157
|
+
sessionId: match.sessionId,
|
|
158
|
+
incarnation: known,
|
|
159
|
+
});
|
|
160
|
+
this.incarnations.delete(match.sessionId);
|
|
161
|
+
if (match.channelId !== '0' && match.channelId !== '') {
|
|
162
|
+
await this.requireChannels().leave(match.channelId);
|
|
163
|
+
}
|
|
164
|
+
return participant;
|
|
165
|
+
}
|
|
117
166
|
/** Start the match (creator or host). Pings the match channel post-commit. */
|
|
118
167
|
async start(match) {
|
|
119
168
|
return kitInvoke(this.gameModel, {
|
|
@@ -245,6 +294,18 @@ export class MatchesKit {
|
|
|
245
294
|
* Finish the match and record the winner (creator or host). Also drops the
|
|
246
295
|
* pending turn deadline on a `turnTimer` match — `end_match` already
|
|
247
296
|
* strands it, so this just saves the pointless fire and channel ping.
|
|
297
|
+
*
|
|
298
|
+
* When `end_match` succeeds the backing session is ended too
|
|
299
|
+
* (`gameModelEndSession`, reason `completed`): every participant is marked
|
|
300
|
+
* left, admission closes, and the session's events become eligible for
|
|
301
|
+
* retention. The game-authoritative step runs first, so the match is
|
|
302
|
+
* decided whatever happens next; `sessionEnd` on the result says what
|
|
303
|
+
* happened to the session ({@link KitMatchSessionEnd}): `'ended'`, or
|
|
304
|
+
* `'already_ended'` for a replayed finish, or `'forbidden'` when the caller
|
|
305
|
+
* passed `end_match` (creator or the app's elected host) but is not admitted
|
|
306
|
+
* to the session end (session host or app admin only) -- the match is
|
|
307
|
+
* finished, the session is not, and nothing is thrown. Any other refusal of
|
|
308
|
+
* the session end propagates.
|
|
248
309
|
*/
|
|
249
310
|
async finish(match, winnerUserId) {
|
|
250
311
|
const result = await kitInvoke(this.gameModel, {
|
|
@@ -257,6 +318,29 @@ export class MatchesKit {
|
|
|
257
318
|
if (result.success && match.turnSeq !== undefined) {
|
|
258
319
|
await this.cancelTurnDeadline(match);
|
|
259
320
|
}
|
|
321
|
+
if (result.success) {
|
|
322
|
+
try {
|
|
323
|
+
await this.gameModel.endSession({
|
|
324
|
+
appId: this.appId,
|
|
325
|
+
sessionId: match.sessionId,
|
|
326
|
+
reason: 'completed',
|
|
327
|
+
});
|
|
328
|
+
result.sessionEnd = 'ended';
|
|
329
|
+
}
|
|
330
|
+
catch (error) {
|
|
331
|
+
if (error instanceof CrowdyGraphQLError && error.code === 'SESSION_ENDED') {
|
|
332
|
+
result.sessionEnd = 'already_ended';
|
|
333
|
+
}
|
|
334
|
+
else if (error instanceof CrowdyGraphQLError && error.code === 'FORBIDDEN') {
|
|
335
|
+
result.sessionEnd = 'forbidden';
|
|
336
|
+
}
|
|
337
|
+
else {
|
|
338
|
+
throw error;
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
if (result.sessionEnd !== 'forbidden')
|
|
342
|
+
this.incarnations.delete(match.sessionId);
|
|
343
|
+
}
|
|
260
344
|
return result;
|
|
261
345
|
}
|
|
262
346
|
/**
|
package/dist/kit/npcs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npcs.d.ts","sourceRoot":"","sources":["../../src/kit/npcs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,0EAA0E;AAC1E,MAAM,WAAW,cAAc;IAC7B,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qCAAqC;AACrC,MAAM,WAAW,MAAM;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED;;;;;;;;;;GAUG;AACH,qBAAa,OAAO;IAKhB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAP3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAGjB,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EACjC,SAAS,EAAE,YAAY,EACxC,OAAO,GAAE,cAAmB,EACX,OAAO,CAAC,EAAE,cAAc,YAAA;IAM3C;;;;;OAKG;IACH,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAKnC;;;;;;;;;OASG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE;IAW/D,0EAA0E;IACpE,KAAK,CAAC,KAAK,EAAE;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE;YAAE,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC/C,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAC;QACjC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;IAuBD;;;;OAIG;IACG,IAAI,CAAC,OAAO,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAclF,gDAAgD;IAC1C,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ3C,8EAA8E;IACxE,MAAM,CAAC,cAAc,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;IAInC;;;OAGG;IACG,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQzD,6EAA6E;IACvE,KAAK,CAAC,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;sBA+
|
|
1
|
+
{"version":3,"file":"npcs.d.ts","sourceRoot":"","sources":["../../src/kit/npcs.ts"],"names":[],"mappings":"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"}
|
package/dist/kit/social.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"social.d.ts","sourceRoot":"","sources":["../../src/kit/social.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGvD,qCAAqC;AACrC,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,+DAA+D;AAC/D,MAAM,WAAW,mBAAmB;IAClC,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,mDAAmD;AACnD,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,SAAS;IAMlB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGlB,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EACjC,KAAK,EAAE,QAAQ,GAAG,SAAS,EAC3B,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,QAAQ,EAAE,WAAW,EACtC,OAAO,GAAE,gBAAqB;IAOhC,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,UAAU;IASlB,uDAAuD;YACzC,UAAU;IAuBxB,mDAAmD;YACrC,QAAQ;IAetB,sEAAsE;IACtE,QAAQ,CAAC,KAAK;QACZ,2EAA2E;uBACtD,MAAM,KAAG,OAAO,CAAC,mBAAmB,CAAC;QAI1D,4BAA4B;qBACT,MAAM,KAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;QAIpE;;;WAGG;wBACmB,mBAAmB,UAAU,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;;;;;;;;
|
|
1
|
+
{"version":3,"file":"social.d.ts","sourceRoot":"","sources":["../../src/kit/social.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED