@mpgd/adapter-devvit 0.6.0 → 0.7.0

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { type BridgeRequest, type BridgeResponse } from '@mpgd/bridge';
 import { type BridgeRpcClient, type BridgeRpcEndpoint } from '@mpgd/bridge/orpc';
 import type { PlatformGateway } from '@mpgd/platform';
-export declare const defaultDevvitBridgeEndpoint = "/api/mpgd/bridge";
 export declare const defaultDevvitRpcEndpoint = "/api/mpgd/rpc";
 type BridgeErrorResponse = Extract<BridgeResponse, {
   readonly ok: false;
@@ -20,7 +19,6 @@ export interface DevvitPlatformGatewayOptions {
   readonly buildId: string;
   readonly bridge?: DevvitBridge;
   readonly fallbackBridge?: DevvitBridge;
-  readonly endpoint?: string;
   readonly rpcEndpoint?: BridgeRpcEndpoint;
 }
 export declare function createDevvitPlatformGateway(input: DevvitPlatformGatewayOptions): PlatformGateway;
@@ -29,9 +27,5 @@ export declare function createDevvitOrpcBridge(input?: {
   readonly fetch?: typeof fetch | undefined;
   readonly client?: BridgeRpcClient | undefined;
 }): DevvitBridge;
-export declare function createDevvitFetchBridge(input?: {
-  readonly endpoint?: string | undefined;
-  readonly fetch?: typeof fetch | undefined;
-}): DevvitBridge;
 export declare function createDevvitSandboxBridge(): DevvitBridge;
 export {};

package/dist/index.js

@@ -1,6 +1,5 @@
-import { assertBridgeResponse, createBridgeError, } from '@mpgd/bridge';
+import { createBridgeError, } from '@mpgd/bridge';
 import { createBridgeOrpcClient, defaultBridgeRpcEndpoint, } from '@mpgd/bridge/orpc';
-export const defaultDevvitBridgeEndpoint = '/api/mpgd/bridge';
 export const defaultDevvitRpcEndpoint = defaultBridgeRpcEndpoint;
 const devvitFallbackStoragePrefix = 'mpgd:devvit:fallback:';
 export class DevvitBridgeError extends Error {
@@ -21,9 +20,7 @@ export function createDevvitPlatformGateway(input) {
         const bridge = input.bridge ??
             getBridge() ??
             input.fallbackBridge ??
-            (input.endpoint === undefined
-                ? createDevvitOrpcBridge({ endpoint: input.rpcEndpoint })
-                : createDevvitFetchBridge({ endpoint: input.endpoint }));
+            createDevvitOrpcBridge({ endpoint: input.rpcEndpoint });
         const response = await bridge.request({
             id: generateRequestId(),
             method,
@@ -204,40 +201,6 @@ export function createDevvitOrpcBridge(input = {}) {
         },
     };
 }
-export function createDevvitFetchBridge(input = {}) {
-    const endpoint = input.endpoint ?? defaultDevvitBridgeEndpoint;
-    return {
-        async request(bridgeRequest) {
-            const fetchImpl = input.fetch ?? globalThis.fetch;
-            if (typeof fetchImpl !== 'function') {
-                return createBridgeError(bridgeRequest.id, 'DEVVIT_FETCH_UNAVAILABLE', 'Devvit bridge fetch is not available.', false);
-            }
-            let response;
-            try {
-                response = await fetchImpl(endpoint, {
-                    method: 'POST',
-                    headers: {
-                        'content-type': 'application/json',
-                    },
-                    body: JSON.stringify(bridgeRequest),
-                });
-            }
-            catch (error) {
-                return createBridgeError(bridgeRequest.id, 'DEVVIT_BRIDGE_NETWORK_ERROR', `Devvit bridge network request failed: ${errorMessage(error)}`, true);
-            }
-            if (!response.ok) {
-                return createBridgeError(bridgeRequest.id, 'DEVVIT_BRIDGE_HTTP_ERROR', `Devvit bridge request failed with HTTP ${response.status}.`, response.status >= 500);
-            }
-            try {
-                const body = await response.json();
-                return assertBridgeResponse(body);
-            }
-            catch (error) {
-                return createBridgeError(bridgeRequest.id, 'DEVVIT_BRIDGE_PARSE_ERROR', `Devvit bridge response was not valid JSON: ${errorMessage(error)}`, false);
-            }
-        },
-    };
-}
 function getBridge() {
     const globalBridgeHost = globalThis;
     return globalBridgeHost.__DEVVIT_GAME_PLATFORM_BRIDGE__ ?? globalBridgeHost.__GAME_PLATFORM_BRIDGE__;
@@ -411,7 +374,6 @@ function removeDevvitStorageFallback(key, namespace) {
         if (namespace !== undefined) {
             storage.removeItem(devvitStorageFallbackKey(key, namespace));
         }
-        storage.removeItem(legacyDevvitStorageFallbackKey(key));
     }
 }
 function hasDevvitStorageFallbackCandidate(key, appVersion) {
@@ -435,9 +397,6 @@ function devvitStorageFallbackNamespace(appVersion, playerId) {
 function devvitStorageFallbackKey(key, namespace) {
     return `${devvitFallbackStoragePrefix}${namespace}:${encodeURIComponent(key)}`;
 }
-function legacyDevvitStorageFallbackKey(key) {
-    return `${devvitFallbackStoragePrefix}${encodeURIComponent(key)}`;
-}
 function browserLocalStorage() {
     try {
         return globalThis.localStorage;

package/dist/server/redis-verified-leaderboard.js

@@ -1,4 +1,4 @@
-import { assertGetVerifiedLeaderboardSnapshotRequest, assertRecordVerifiedLeaderboardAttemptRequest, assertRecordVerifiedLeaderboardAttemptResponse, assertVerifiedLeaderboardAttempt, assertVerifiedLeaderboardDefinition, assertVerifiedLeaderboardSnapshot, createVerifiedLeaderboardCursor, parseVerifiedLeaderboardCursor, } from '@mpgd/game-services/verified-leaderboard';
+import { areVerifiedLeaderboardMetricsEqual, assertGetVerifiedLeaderboardSnapshotRequest, assertRecordVerifiedLeaderboardAttemptRequest, assertRecordVerifiedLeaderboardAttemptResponse, assertVerifiedLeaderboardAttempt, assertVerifiedLeaderboardDefinition, assertVerifiedLeaderboardSnapshot, createVerifiedLeaderboardCursor, normalizeVerifiedLeaderboardMetrics, parseVerifiedLeaderboardCursor, } from '@mpgd/game-services/verified-leaderboard';
 const defaultKeyPrefix = 'mpgd:verified-leaderboard:v1';
 const defaultSnapshotLimit = 10;
 const defaultTransactionAttempts = 3;
@@ -256,6 +256,9 @@ function toRankedEntries(rankedAttempts) {
             : { participantLabel: attempt.participantLabel }),
         attemptId: attempt.attemptId,
         score: attempt.score,
+        ...(attempt.metrics === undefined
+            ? {}
+            : { metrics: normalizeVerifiedLeaderboardMetrics(attempt.metrics) }),
         completedAt: attempt.completedAt,
     }));
 }
@@ -305,6 +308,7 @@ function assertSameAttempt(existing, candidate) {
     if (existing.participantId !== candidate.participantId
         || existing.attemptId !== candidate.attemptId
         || existing.score !== candidate.score
+        || !areVerifiedLeaderboardMetricsEqual(existing.metrics, candidate.metrics)
         || Date.parse(existing.completedAt) !== Date.parse(candidate.completedAt)
         || existing.verification.authorityId !== candidate.verification.authorityId
         || existing.verification.evidenceId !== candidate.verification.evidenceId
@@ -376,6 +380,9 @@ function cloneAttempt(input) {
             : { participantLabel: input.participantLabel }),
         attemptId: input.attemptId,
         score: input.score,
+        ...(input.metrics === undefined
+            ? {}
+            : { metrics: normalizeVerifiedLeaderboardMetrics(input.metrics) }),
         completedAt: input.completedAt,
         verification: {
             authorityId: input.verification.authorityId,
@@ -397,6 +404,9 @@ function cloneRecordResponse(input, alreadyProcessed) {
                 : { participantLabel: input.entry.participantLabel }),
             attemptId: input.entry.attemptId,
             score: input.entry.score,
+            ...(input.entry.metrics === undefined
+                ? {}
+                : { metrics: normalizeVerifiedLeaderboardMetrics(input.entry.metrics) }),
             completedAt: input.entry.completedAt,
         },
         ...(input.reason === undefined ? {} : { reason: input.reason }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpgd/adapter-devvit",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Reddit Devvit Web platform adapter for mpgd games.",
   "license": "MIT",
   "repository": {
@@ -46,10 +46,10 @@
     "dist"
   ],
   "dependencies": {
-    "@devvit/web": "0.13.7",
+    "@devvit/web": "0.13.8",
     "@mpgd/bridge": "0.6.0",
-    "@mpgd/platform": "0.5.1",
-    "@mpgd/game-services": "0.6.0"
+    "@mpgd/game-services": "0.7.0",
+    "@mpgd/platform": "0.5.1"
   },
   "devDependencies": {
     "ttsc": "0.18.4",