@mpgd/adapter-devvit 0.8.2 → 0.8.4

package/dist/index.js

@@ -1,8 +1,7 @@
-import { createBridgeError, } from '@mpgd/bridge';
+import { bridgeStorageLoadProtocol, createBridgeError, decodeBridgeStorageLoadData, } from '@mpgd/bridge';
 import { createBridgeOrpcClient, defaultBridgeRpcEndpoint, } from '@mpgd/bridge/orpc';
 export * from './payments.js';
 export const defaultDevvitRpcEndpoint = defaultBridgeRpcEndpoint;
-const devvitFallbackStoragePrefix = 'mpgd:devvit:fallback:';
 export class DevvitBridgeError extends Error {
     code;
     requestId;
@@ -16,7 +15,6 @@ export class DevvitBridgeError extends Error {
     }
 }
 export function createDevvitPlatformGateway(input) {
-    let lastResolvedStorageFallbackNamespace;
     async function request(method, payload) {
         const bridge = input.bridge ??
             getBridge() ??
@@ -40,18 +38,12 @@ export function createDevvitPlatformGateway(input) {
     }
     return {
         target: 'reddit',
-        getCapabilities: () => request('runtime.getCapabilities', {}),
+        async getCapabilities() {
+            return { ...await request('runtime.getCapabilities', {}) };
+        },
         identity: {
-            getPlayer: async () => {
-                const player = await request('identity.getPlayer', {});
-                rememberStorageFallbackNamespace(player);
-                return player;
-            },
-            getSession: async () => {
-                const session = await request('identity.getSession', {});
-                rememberStorageFallbackNamespace(session.playerId === undefined ? null : { playerId: session.playerId });
-                return session;
-            },
+            getPlayer: () => request('identity.getPlayer', {}),
+            getSession: () => request('identity.getSession', {}),
             requestUpgrade: (payload) => request('identity.requestUpgrade', payload),
         },
         presentation: {
@@ -91,100 +83,16 @@ export function createDevvitPlatformGateway(input) {
         },
         storage: {
             async load(payload) {
-                let value;
-                try {
-                    value = await request('storage.load', payload);
-                }
-                catch (error) {
-                    const fallback = await loadStorageFallback(payload.key, {
-                        useCachedNamespaceOnFailure: true,
-                    });
-                    if (fallback !== null) {
-                        return fallback;
-                    }
-                    throw error;
-                }
-                const fallback = await loadStorageFallback(payload.key, {
-                    useCachedNamespaceOnFailure: value === null,
-                });
-                return fallback ?? (value === null ? null : { value });
+                return decodeBridgeStorageLoadData(await request('storage.load', payload));
             },
             async save(payload) {
-                let result;
-                try {
-                    result = await request('storage.save', payload);
-                }
-                catch (error) {
-                    if (await saveStorageFallback(payload, undefined, {
-                        useCachedNamespaceOnFailure: true,
-                    })) {
-                        return;
-                    }
-                    throw error;
-                }
+                const result = await request('storage.save', payload);
                 if (result.saved !== true) {
-                    if (await saveStorageFallback(payload, result.playerId, {
-                        useCachedNamespaceOnFailure: false,
-                    })) {
-                        return;
-                    }
-                    throw new Error('Devvit storage save was not persisted and local fallback storage is unavailable.');
+                    throw new Error('Devvit storage save was not persisted.');
                 }
-                await removeStorageFallback(payload.key, result.playerId);
             },
         },
     };
-    async function loadStorageFallback(key, options) {
-        if (!hasDevvitStorageFallbackCandidate(key, input.appVersion)) {
-            return null;
-        }
-        const namespace = await resolveNamespace(undefined, options);
-        return namespace === undefined ? null : loadDevvitStorageFallback(key, namespace);
-    }
-    async function saveStorageFallback(payload, playerId, options) {
-        const namespace = await resolveNamespace(playerId, options);
-        return namespace === undefined ? false : saveDevvitStorageFallback(payload, namespace);
-    }
-    async function removeStorageFallback(key, playerId) {
-        const namespace = await resolveNamespace(playerId, {
-            useCachedNamespaceOnFailure: true,
-        });
-        if (namespace === undefined) {
-            console.warn(`devvit storage fallback cleanup skipped due to unresolved namespace for key: ${key}`);
-        }
-        removeDevvitStorageFallback(key, namespace);
-    }
-    async function resolveNamespace(playerId, options) {
-        const namespace = storageFallbackNamespaceFromPlayerId(playerId);
-        if (namespace !== undefined) {
-            lastResolvedStorageFallbackNamespace = namespace;
-            return namespace;
-        }
-        try {
-            return await resolveStorageFallbackNamespace();
-        }
-        catch (error) {
-            console.warn(`devvit storage fallback namespace resolution failed: ${errorMessage(error)}`);
-            return options.useCachedNamespaceOnFailure ? lastResolvedStorageFallbackNamespace : undefined;
-        }
-    }
-    async function resolveStorageFallbackNamespace() {
-        const player = await request('identity.getPlayer', {});
-        return rememberStorageFallbackNamespace(player);
-    }
-    function rememberStorageFallbackNamespace(player) {
-        const playerId = player !== null && typeof player.playerId === 'string' && player.playerId.length > 0
-            ? player.playerId
-            : 'anonymous';
-        const namespace = devvitStorageFallbackNamespace(input.appVersion, playerId);
-        lastResolvedStorageFallbackNamespace = namespace;
-        return namespace;
-    }
-    function storageFallbackNamespaceFromPlayerId(playerId) {
-        return playerId !== undefined && playerId.length > 0
-            ? devvitStorageFallbackNamespace(input.appVersion, playerId)
-            : undefined;
-    }
 }
 export function createDevvitOrpcBridge(input = {}) {
     const client = input.client ?? createBridgeOrpcClient({
@@ -305,13 +213,20 @@ export function createDevvitSandboxBridge() {
                 case 'storage.load': {
                     const payload = optionalObjectPayload(input.payload);
                     const key = typeof payload.key === 'string' ? payload.key : undefined;
-                    return ok(input, key === undefined ? null : (storage.get(key) ?? null));
+                    const value = key === undefined ? undefined : storage.get(key);
+                    return ok(input, value === undefined
+                        ? { __mpgdBridgeProtocol: bridgeStorageLoadProtocol, found: false }
+                        : {
+                            __mpgdBridgeProtocol: bridgeStorageLoadProtocol,
+                            found: true,
+                            value: cloneJsonValue(value),
+                        });
                 }
                 case 'storage.save': {
                     const payload = optionalObjectPayload(input.payload);
                     const key = typeof payload.key === 'string' ? payload.key : undefined;
                     if (key !== undefined) {
-                        storage.set(key, payload.value);
+                        storage.set(key, cloneJsonValue(payload.value));
                     }
                     return ok(input, {
                         saved: key !== undefined,
@@ -323,6 +238,13 @@ export function createDevvitSandboxBridge() {
         },
     };
 }
+function cloneJsonValue(value) {
+    const serialized = JSON.stringify(value);
+    if (serialized === undefined) {
+        throw new TypeError('Storage values must be JSON-serializable.');
+    }
+    return JSON.parse(serialized);
+}
 function optionalObjectPayload(payload) {
     if (typeof payload !== 'object' || payload === null) {
         return {};
@@ -336,73 +258,3 @@ function ok(input, data) {
         data,
     };
 }
-function loadDevvitStorageFallback(key, namespace) {
-    const storage = browserLocalStorage();
-    if (storage === undefined) {
-        return null;
-    }
-    const fallbackKey = devvitStorageFallbackKey(key, namespace);
-    const stored = storage.getItem(fallbackKey);
-    if (stored === null) {
-        return null;
-    }
-    try {
-        return {
-            value: JSON.parse(stored),
-        };
-    }
-    catch {
-        storage.removeItem(fallbackKey);
-        return null;
-    }
-}
-function saveDevvitStorageFallback(input, namespace) {
-    const storage = browserLocalStorage();
-    if (storage === undefined) {
-        return false;
-    }
-    try {
-        storage.setItem(devvitStorageFallbackKey(input.key, namespace), JSON.stringify(input.value));
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-function removeDevvitStorageFallback(key, namespace) {
-    const storage = browserLocalStorage();
-    if (storage !== undefined) {
-        if (namespace !== undefined) {
-            storage.removeItem(devvitStorageFallbackKey(key, namespace));
-        }
-    }
-}
-function hasDevvitStorageFallbackCandidate(key, appVersion) {
-    const storage = browserLocalStorage();
-    if (storage === undefined) {
-        return false;
-    }
-    const prefix = `${devvitFallbackStoragePrefix}${encodeURIComponent(appVersion)}:`;
-    const suffix = `:${encodeURIComponent(key)}`;
-    for (let index = 0; index < storage.length; index += 1) {
-        const candidate = storage.key(index);
-        if (candidate?.startsWith(prefix) === true && candidate.endsWith(suffix)) {
-            return true;
-        }
-    }
-    return false;
-}
-function devvitStorageFallbackNamespace(appVersion, playerId) {
-    return `${encodeURIComponent(appVersion)}:${encodeURIComponent(playerId)}`;
-}
-function devvitStorageFallbackKey(key, namespace) {
-    return `${devvitFallbackStoragePrefix}${namespace}:${encodeURIComponent(key)}`;
-}
-function browserLocalStorage() {
-    try {
-        return globalThis.localStorage;
-    }
-    catch {
-        return undefined;
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpgd/adapter-devvit",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "Reddit Devvit Web platform adapter for mpgd games.",
   "license": "MIT",
   "repository": {
@@ -55,9 +55,9 @@
   ],
   "dependencies": {
     "@devvit/web": "0.13.8",
-    "@mpgd/bridge": "0.6.0",
-    "@mpgd/game-services": "0.8.2",
-    "@mpgd/platform": "0.6.0"
+    "@mpgd/game-services": "0.10.0",
+    "@mpgd/platform": "0.7.0",
+    "@mpgd/bridge": "0.6.1"
   },
   "devDependencies": {
     "ttsc": "0.18.4",