@mpgd/cli 0.66.0 → 0.68.0

package/dist/testflight-submission.js

@@ -275,7 +275,8 @@ async function submitVerifiedIosBuildResolved(input, run, { marketingVersion, bu
     let membershipFailure;
     try {
         const memberships = await run(['testflight', 'groups', 'list', '--build-id', build.id, '--internal'], lookupTimeoutMs);
-        if (findInternalGroup(memberships, input.internalGroupId)) {
+        if (readBuildGroupMembership(memberships, build.id).some((group) => group.id === input.internalGroupId
+            && group.type === 'internal')) {
             return { ...base, status: 'testflight-ready', ...uploadReference, buildId: build.id };
         }
     }
@@ -405,6 +406,24 @@ function findInternalGroup(response, groupId) {
         && value.type === 'betaGroups' && value.id === groupId
         && isRecord(value.attributes) && value.attributes.isInternalGroup === true);
 }
+/**
+ * asc 5.5.0 prints `testflight groups list --build-id` as its own membership
+ * result, not as App Store Connect resources:
+ * `{ buildId, appId, complete, groups: [{ id, name, type, membership }] }`
+ * (`internal/cli/testflight/build_group_membership.go`). An incomplete lookup
+ * is never read as "not a member".
+ */
+export function readBuildGroupMembership(response, buildId) {
+    if (!isRecord(response) || response.buildId !== buildId || !Array.isArray(response.groups)
+        || response.groups.some((group) => !isRecord(group) || typeof group.id !== 'string'
+            || group.id === '' || typeof group.type !== 'string')) {
+        throw new Error('asc testflight groups list --build-id returned an invalid membership result.');
+    }
+    if (response.complete !== true) {
+        throw new Error('asc could not read every TestFlight group of the build.');
+    }
+    return response.groups;
+}
 function readDataArray(response, command) {
     if (!isRecord(response) || !Array.isArray(response.data)) {
         throw new Error(`asc ${command} returned an invalid JSON schema.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpgd/cli",
-  "version": "0.66.0",
+  "version": "0.68.0",
   "description": "Gunshi CLI for mpgd-kit starter generation and target workflow orchestration.",
   "license": "MIT",
   "repository": {
@@ -70,10 +70,10 @@
     "parse5": "7.3.0",
     "postcss": "8.5.28",
     "postcss-value-parser": "4.2.0",
-    "@mpgd/catalog": "0.14.1",
+    "@mpgd/catalog": "0.15.0",
+    "@mpgd/target-config": "0.24.7",
     "@mpgd/phaser-assets": "0.9.1",
-    "@mpgd/platform": "0.34.0",
-    "@mpgd/target-config": "0.24.5"
+    "@mpgd/platform": "0.35.0"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",
@@ -81,19 +81,19 @@
     "@types/yauzl": "3.4.0",
     "ttsc": "0.34.2",
     "typescript": "7.0.2",
-    "@mpgd/adapter-ait": "0.21.7",
-    "@mpgd/adapter-capacitor": "0.18.0",
-    "@mpgd/adapter-browser": "0.12.3",
-    "@mpgd/adapter-devvit": "0.14.9",
-    "@mpgd/adapter-verse8": "0.7.18",
-    "@mpgd/bridge": "0.18.0",
-    "@mpgd/capacitor-play-billing": "0.6.0",
-    "@mpgd/analytics": "0.5.7",
-    "@mpgd/capacitor-storekit": "0.6.0",
-    "@mpgd/game-runtime": "0.9.0",
-    "@mpgd/game-services": "0.32.0",
+    "@mpgd/adapter-ait": "0.21.9",
+    "@mpgd/adapter-browser": "0.12.4",
+    "@mpgd/adapter-capacitor": "0.19.1",
+    "@mpgd/adapter-devvit": "0.14.11",
+    "@mpgd/analytics": "0.5.8",
+    "@mpgd/bridge": "0.18.1",
+    "@mpgd/capacitor-play-billing": "0.6.2",
+    "@mpgd/adapter-verse8": "0.7.20",
+    "@mpgd/game-runtime": "0.10.1",
+    "@mpgd/capacitor-storekit": "0.7.1",
+    "@mpgd/game-services": "0.33.1",
     "@mpgd/lite-shell": "0.1.0",
-    "@mpgd/i18n": "0.6.28"
+    "@mpgd/i18n": "0.6.29"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/templates/phaser-game/src/i18n/messages.ts

@@ -14,6 +14,9 @@ export type GameMessageKey =
   | 'reward'
   | 'rewardError'
   | 'rewardPending'
+  | 'rewardNotReady'
+  | 'rewardReconciling'
+  | 'rewardHistoryFull'
   | 'rewardUnavailable'
   | 'analytics'
   | 'bootError'
@@ -59,6 +62,9 @@ const messages = {
     reward: 'Rewarded ad smoke: {status}',
     rewardError: 'Rewarded ad smoke failed',
     rewardPending: 'Press R to request a rewarded ad smoke',
+    rewardNotReady: 'Rewarded ad smoke waits for the current purchase or ad',
+    rewardReconciling: 'Rewarded ad smoke waits until an earlier result is confirmed',
+    rewardHistoryFull: 'Rewarded ad smoke is unavailable until the game restarts',
     rewardUnavailable: 'Rewarded ads unavailable on this target',
     analytics: 'Analytics events: {count}',
     bootError: 'Failed to start game',
@@ -108,6 +114,9 @@ const messages = {
     reward: '리워드 광고 스모크: {status}',
     rewardError: '리워드 광고 스모크 실패',
     rewardPending: 'R 키로 리워드 광고 스모크 요청',
+    rewardNotReady: '진행 중인 구매나 광고가 끝나면 리워드 광고 스모크 요청 가능',
+    rewardReconciling: '이전 결과가 확인되면 리워드 광고 스모크 요청 가능',
+    rewardHistoryFull: '게임을 다시 시작할 때까지 리워드 광고 스모크를 사용할 수 없음',
     rewardUnavailable: '이 타깃에서는 리워드 광고를 사용할 수 없음',
     analytics: '애널리틱스 이벤트: {count}',
     bootError: '게임 시작 실패',

package/templates/phaser-game/src/scenes/PlayScene.ts

@@ -1,4 +1,4 @@
-import type { GameActionController } from '@mpgd/game-runtime/actions';
+import type { GameActionAvailability, GameActionController } from '@mpgd/game-runtime/actions';
 import { bindPhaserGameScene } from '@mpgd/game-runtime/phaser';
 import Phaser from 'phaser';
 
@@ -21,6 +21,8 @@ export class PlayScene extends Phaser.Scene {
   private analyticsText!: Phaser.GameObjects.Text;
   private context!: StarterContext;
   private rewardedAction: GameActionController<'rewarded-ad'> | undefined;
+  private showingNotReady = false;
+  private requesting = false;
   private lastScore = -1;
   private lastAnalyticsCount = -1;
 
@@ -83,19 +85,67 @@ export class PlayScene extends Phaser.Scene {
       })
       .setOrigin(0.5);
 
-    this.rewardedAction = this.context.gameRuntime.actions?.createRewardedAdController();
+    const actions = this.context.gameRuntime.actions;
+    this.rewardedAction = actions?.createRewardedAdController();
     const action = this.rewardedAction;
+    // Follow the runtime's availability, so the hint changes while any purchase
+    // (one from the shop included) or ad holds the screen, without a key press.
+    this.showingNotReady = false;
+    this.requesting = false;
+    const stopAvailability = actions?.subscribeAvailability((availability) => {
+      this.showAvailability(availability);
+    });
+    if (actions !== undefined) {
+      this.showAvailability(actions.getAvailability());
+    }
     const keyboard = this.input.keyboard;
     const onReward = () => {
       void this.requestRewardedAd();
     };
     keyboard?.on('keydown-R', onReward);
     this.events.once('shutdown', () => {
+      stopAvailability?.();
       action?.dispose();
       keyboard?.off('keydown-R', onReward);
     });
   }
 
+  private showAvailability(availability: GameActionAvailability): void {
+    // This scene's own request makes the actions busy too; its result text
+    // follows, so only someone else's purchase or ad shows the waiting text.
+    if (!this.rewardedAdsAvailable() || this.rewardedAction === undefined || availability === 'disposed'
+      || this.requesting) {
+      return;
+    }
+    if (availability === 'ready') {
+      // Restore the hint only over the waiting text, never over a result.
+      if (this.showingNotReady) {
+        this.showingNotReady = false;
+        this.rewardText.setText(this.rewardHint());
+      }
+      return;
+    }
+    this.showingNotReady = true;
+    // `history-full` lasts until the runtime is recreated; only `busy` ends
+    // with the other purchase or ad.
+    this.rewardText.setText(
+      t(
+        this.context.locale,
+        availability === 'history-full'
+          ? 'rewardHistoryFull'
+          : availability === 'reconciliation-required'
+            ? 'rewardReconciling'
+            : 'rewardNotReady',
+      ),
+    );
+  }
+
+  /** A result or error replaces the waiting text for good: `ready` must not restore the hint over it. */
+  private showRewardText(text: string): void {
+    this.showingNotReady = false;
+    this.rewardText.setText(text);
+  }
+
   override update(_time: number, delta: number): void {
     this.state = stepStarterRunState(this.state, delta);
 
@@ -139,13 +189,15 @@ export class PlayScene extends Phaser.Scene {
     const action = this.rewardedAction;
 
     if (!this.rewardedAdsAvailable() || action === undefined) {
-      this.rewardText.setText(t(this.context.locale, 'rewardUnavailable'));
+      this.showRewardText(t(this.context.locale, 'rewardUnavailable'));
       return;
     }
 
+    // The tap-time guard stays: availability can change before the next frame.
     if (this.context.gameRuntime.actions?.getAvailability() !== 'ready') {
       return;
     }
+    this.requesting = true;
     try {
       const result = await action.execute({
         placementId: rewardedPlacementId,
@@ -155,7 +207,7 @@ export class PlayScene extends Phaser.Scene {
       if (action.isDisposed() || this.rewardedAction !== action) {
         return;
       }
-      this.rewardText.setText(
+      this.showRewardText(
         result.claim?.granted === true
           ? t(this.context.locale, 'reward', { status: result.status })
           : t(this.context.locale, 'rewardError'),
@@ -169,9 +221,13 @@ export class PlayScene extends Phaser.Scene {
         },
       });
       if (!action.isDisposed() && this.rewardedAction === action) {
-        this.rewardText.setText(t(this.context.locale, 'rewardError'));
+        this.showRewardText(t(this.context.locale, 'rewardError'));
       }
       console.error('[rewarded-ad]', error);
+    } finally {
+      if (this.rewardedAction === action) {
+        this.requesting = false;
+      }
     }
   }
 }