@mpgd/adapter-capacitor 0.12.1 → 0.12.3

package/dist/notifications-bridge.d.ts

@@ -11,16 +11,16 @@ export interface CreateNotificationProviderBridgeInput {
   readonly provider: NotificationProvider;
 }
 /**
-* In-process `NativeBridge` over a notifications v2 provider. Each
-* `notifications.v2.*` request validates its payload (a payload the contract
-* rejects answers `NOTIFICATIONS_INVALID_INPUT`) and its answer (one the
-* contract rejects answers `NOTIFICATIONS_CONFIGURATION_REQUIRED`, because the
-* provider broke it). A method the
-* provider does not implement answers `NOTIFICATIONS_UNSUPPORTED`, except
-* `openSettings`, which answers `unavailable`. Events go out through
-* `createBridgeEventSource`, which attaches to the provider only for the
-* first listener, so events the provider buffered reach it. Any other method
-* answers `UNSUPPORTED_METHOD`.
+* In-process `NativeBridge` over a notifications v2 provider:
+* `createNotificationsV2BridgeHandler` from `@mpgd/bridge/notifications`.
+* Each `notifications.v2.*` request validates its payload (a payload the
+* contract rejects answers `NOTIFICATIONS_INVALID_INPUT`) and its answer (one
+* the contract rejects answers `NOTIFICATIONS_CONFIGURATION_REQUIRED`, because
+* the provider broke it). A method the provider does not implement answers
+* `NOTIFICATIONS_UNSUPPORTED`, except `openSettings`, which answers
+* `unavailable`. Events go out through `createBridgeEventSource`, which
+* attaches to the provider only for the first listener, so events the
+* provider buffered reach it. Any other method answers `UNSUPPORTED_METHOD`.
 */
 export declare function createNotificationProviderBridge(input: CreateNotificationProviderBridgeInput): NotificationProviderBridge;
 export interface CreateNotificationServiceProviderInput {

package/dist/notifications-bridge.js

@@ -1,86 +1,24 @@
-import { bridgeNotificationsEventProtocol, createBridgeError, createBridgeEventSource, isBridgeNotificationsV2Method, } from '@mpgd/bridge';
-import { assertBridgeNotificationsV2Payload, assertBridgeNotificationsV2Result, } from '@mpgd/bridge/notifications';
+import { bridgeNotificationsEventProtocol, } from '@mpgd/bridge';
+import { assertBridgeNotificationsV2Payload, assertBridgeNotificationsV2Result, createNotificationsV2BridgeHandler, } from '@mpgd/bridge/notifications';
 import { PlatformOperationError } from '@mpgd/platform';
 import { assertNotificationEventEnvelope, isNotificationErrorCode, NotificationError, notificationsProtocol, notificationsProtocolVersion, toNotificationSubscriptionAdapter, } from '@mpgd/platform/notifications';
 import { namesOtherProtocol } from './bridge-events.js';
 /**
- * In-process `NativeBridge` over a notifications v2 provider. Each
- * `notifications.v2.*` request validates its payload (a payload the contract
- * rejects answers `NOTIFICATIONS_INVALID_INPUT`) and its answer (one the
- * contract rejects answers `NOTIFICATIONS_CONFIGURATION_REQUIRED`, because the
- * provider broke it). A method the
- * provider does not implement answers `NOTIFICATIONS_UNSUPPORTED`, except
- * `openSettings`, which answers `unavailable`. Events go out through
- * `createBridgeEventSource`, which attaches to the provider only for the
- * first listener, so events the provider buffered reach it. Any other method
- * answers `UNSUPPORTED_METHOD`.
+ * In-process `NativeBridge` over a notifications v2 provider:
+ * `createNotificationsV2BridgeHandler` from `@mpgd/bridge/notifications`.
+ * Each `notifications.v2.*` request validates its payload (a payload the
+ * contract rejects answers `NOTIFICATIONS_INVALID_INPUT`) and its answer (one
+ * the contract rejects answers `NOTIFICATIONS_CONFIGURATION_REQUIRED`, because
+ * the provider broke it). A method the provider does not implement answers
+ * `NOTIFICATIONS_UNSUPPORTED`, except `openSettings`, which answers
+ * `unavailable`. Events go out through `createBridgeEventSource`, which
+ * attaches to the provider only for the first listener, so events the
+ * provider buffered reach it. Any other method answers `UNSUPPORTED_METHOD`.
  */
 export function createNotificationProviderBridge(input) {
-    const { provider } = input;
-    const events = createBridgeEventSource(bridgeNotificationsEventProtocol, provider);
-    const serve = async (method, payload) => {
-        const checked = checkedPayload(method, payload);
-        switch (method) {
-            case 'notifications.v2.getCapabilities':
-                return {
-                    protocolVersion: notificationsProtocolVersion,
-                    provider: provider.provider,
-                    capabilities: await provider.getCapabilities(),
-                };
-            case 'notifications.v2.getPermission':
-                return provider.getPermission(checked);
-            case 'notifications.v2.requestPermission':
-                return provider.requestPermission(checked);
-            case 'notifications.v2.revokePermission':
-                return implemented(provider.revokePermission, method).call(provider, checked);
-            case 'notifications.v2.register':
-                return { registration: await implemented(provider.register, method).call(provider) };
-            case 'notifications.v2.scheduleLocal':
-                return implemented(provider.scheduleLocal, method).call(provider, checked);
-            case 'notifications.v2.cancelLocal':
-                await implemented(provider.cancelLocal, method).call(provider, checked);
-                return { cancelled: true };
-            case 'notifications.v2.listLocal':
-                return { pending: await implemented(provider.listLocal, method).call(provider) };
-            case 'notifications.v2.openSettings':
-                return {
-                    status: provider.openSettings === undefined
-                        ? 'unavailable'
-                        : await provider.openSettings(),
-                };
-            default: {
-                // A method added to the list without a case here fails to compile.
-                const unhandled = method;
-                throw new NotificationError('NOTIFICATIONS_UNSUPPORTED', {
-                    message: `The notifications bridge does not serve ${String(unhandled)}.`,
-                });
-            }
-        }
-    };
-    return {
-        async request(request) {
-            if (!isBridgeNotificationsV2Method(request.method)) {
-                return createBridgeError(request.id, 'UNSUPPORTED_METHOD', `${request.method} is not a notifications v2 method.`);
-            }
-            const method = request.method;
-            let data;
-            try {
-                data = await serve(method, request.payload);
-            }
-            catch (error) {
-                return toBridgeError(request, error);
-            }
-            try {
-                return { id: request.id, ok: true, data: assertBridgeNotificationsV2Result(method, data) };
-            }
-            catch (error) {
-                return createBridgeError(request.id, 'NOTIFICATIONS_CONFIGURATION_REQUIRED', `Notifications provider returned invalid data for ${method}: ${error instanceof Error ? error.message : String(error)}`);
-            }
-        },
-        subscribe: (listener) => events.subscribe(listener),
-    };
+    return createNotificationsV2BridgeHandler({ provider: input.provider });
 }
-/** The payload as the contract reads it, or `NOTIFICATIONS_INVALID_INPUT`; both sides of the bridge use it. */
+/** The payload as the contract reads it, or `NOTIFICATIONS_INVALID_INPUT`, before the game side sends it. */
 function checkedPayload(method, payload) {
     try {
         return assertBridgeNotificationsV2Payload(method, payload);
@@ -92,23 +30,6 @@ function checkedPayload(method, payload) {
         });
     }
 }
-function implemented(method, name) {
-    if (method === undefined) {
-        throw new NotificationError('NOTIFICATIONS_UNSUPPORTED', {
-            message: `The notifications provider does not implement ${name}.`,
-        });
-    }
-    return method;
-}
-function toBridgeError(request, error) {
-    if (error instanceof PlatformOperationError) {
-        // A host code kept with `NOTIFICATIONS_CONFIGURATION_REQUIRED` crosses in
-        // the message: the bridge error has no field for it.
-        const hostCode = error instanceof NotificationError ? error.hostCode : undefined;
-        return createBridgeError(request.id, error.code, hostCode === undefined ? error.message : `${error.message} (host code ${hostCode})`, error.retryable);
-    }
-    return createBridgeError(request.id, 'NOTIFICATIONS_TEMPORARILY_UNAVAILABLE', `${request.method} failed: ${error instanceof Error ? error.message : String(error)}`, true);
-}
 /**
  * Registry entry for a notifications v2 provider, as
  * `createCommerceServiceProvider` is for commerce: it declares no feature and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpgd/adapter-capacitor",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "description": "Capacitor platform adapter for mpgd Android and iOS shells.",
   "license": "MIT",
   "repository": {
@@ -43,11 +43,11 @@
   ],
   "dependencies": {
     "@capacitor/app": "8.1.1",
-    "@mpgd/capacitor-game-services": "0.8.1",
-    "@mpgd/bridge": "0.14.2",
-    "@mpgd/game-services": "0.27.0",
-    "@mpgd/target-config": "0.23.5",
-    "@mpgd/platform": "0.27.0"
+    "@mpgd/bridge": "0.15.0",
+    "@mpgd/capacitor-game-services": "0.8.3",
+    "@mpgd/game-services": "0.27.2",
+    "@mpgd/target-config": "0.23.7",
+    "@mpgd/platform": "0.27.2"
   },
   "peerDependencies": {
     "@capacitor-community/admob": "^8.1.0",
@@ -74,7 +74,7 @@
     "ttsc": "0.32.1",
     "typescript": "7.0.2",
     "vitest": "^4.0.0",
-    "@mpgd/game-runtime": "0.7.5"
+    "@mpgd/game-runtime": "0.8.0"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",