@mdbase-dev/connect 0.1.0-beta.21 → 0.1.0-beta.22

package/dist/session.js

@@ -1,7 +1,8 @@
-import { authorizationReturnToFromError, isAuthorizationCallbackUrl } from "./authorization-url.js";
-import { MdbaseConnectError } from "./errors.js";
+import { authorizationReturnToFromProblem, isAuthorizationCallbackUrl } from "./authorization-url.js";
+import { connectProblem } from "./errors.js";
 import { DEFAULT_OPERATIONS } from "./internal-types.js";
 import { uniqueOperations } from "./operation-helpers.js";
+import { connectFailure, connectSuccess } from "./outcomes.js";
 export class MdbaseSession {
     connect;
     operations;
@@ -38,12 +39,15 @@ export class MdbaseSession {
             });
         }
         const callback = this.selection.authorizationCallback();
-        if (callback)
-            await this.handleAuthorizationCallback(callback);
+        if (callback) {
+            const completed = await this.handleAuthorizationCallback(callback);
+            if (!completed.ok)
+                return completed;
+        }
         else
             this.autoSelectOnlyConnection();
         this.refresh();
-        return this.snapshot;
+        return connectSuccess(this.snapshot);
     }
     destroy() {
         this.stopConnections?.();
@@ -65,12 +69,12 @@ export class MdbaseSession {
     select(collectionId, options = {}) {
         const connection = this.connect.connection(collectionId);
         if (!connection) {
-            throw new MdbaseConnectError("unknown_collection", "This collection is not authorized for this application.");
+            return connectFailure(connectProblem("unknown_collection", "This collection is not authorized for this application."));
         }
         this.unavailableReason = "not_authorized";
         this.selection.select(collectionId, options);
         this.refresh();
-        return connection;
+        return connectSuccess(connection);
     }
     clearSelection(options = {}) {
         this.unavailableReason = "not_authorized";
@@ -93,7 +97,7 @@ export class MdbaseSession {
     async authorize(target, options = {}) {
         const selectedCollectionId = this.selection.selectedCollectionId();
         if (target === "selected" && !selectedCollectionId) {
-            throw new MdbaseConnectError("collection_not_selected", "Choose a collection before updating its access.");
+            return connectFailure(connectProblem("collection_not_selected", "Choose a collection before updating its access."));
         }
         const targetCollectionId = typeof target === "object"
             ? target.collectionId
@@ -110,8 +114,8 @@ export class MdbaseSession {
                     : { kind: "collection", collectionId: targetCollectionId },
                 returnTo: this.selection.authorizationReturnTo()
             });
-            if (outcome.kind === "connected") {
-                this.selection.finishAuthorization(outcome.returnTo, outcome.connection.collectionId);
+            if (outcome.ok && outcome.value.kind === "connected") {
+                this.selection.finishAuthorization(outcome.value.returnTo, outcome.value.connection.collectionId);
             }
             return outcome;
         }
@@ -123,12 +127,13 @@ export class MdbaseSession {
     async ensureOperations(requiredOperations) {
         const current = this.snapshot;
         if (current.status !== "ready") {
-            throw new MdbaseConnectError("collection_not_ready", "Choose an authorized collection first.");
+            return connectFailure(connectProblem("collection_not_ready", "Choose an authorized collection first."));
         }
         const required = uniqueOperations(requiredOperations);
         const capabilities = current.connection.authorizationCapabilities(required);
-        if (capabilities.sufficient)
-            return { kind: "unchanged", connection: current.connection };
+        if (capabilities.sufficient) {
+            return connectSuccess({ kind: "unchanged", connection: current.connection });
+        }
         this.transactionDepth += 1;
         try {
             const outcome = await this.connect.authorize({
@@ -136,8 +141,8 @@ export class MdbaseSession {
                 target: { kind: "collection", collectionId: current.collectionId },
                 returnTo: this.selection.authorizationReturnTo()
             });
-            if (outcome.kind === "connected") {
-                this.selection.finishAuthorization(outcome.returnTo, outcome.connection.collectionId);
+            if (outcome.ok && outcome.value.kind === "connected") {
+                this.selection.finishAuthorization(outcome.value.returnTo, outcome.value.connection.collectionId);
             }
             return outcome;
         }
@@ -148,21 +153,27 @@ export class MdbaseSession {
     }
     handleAuthorizationCallback(callbackUrl) {
         if (!isAuthorizationCallbackUrl(callbackUrl)) {
-            return Promise.reject(new MdbaseConnectError("invalid_callback", "This URL is not an authorization callback."));
+            return Promise.resolve(connectFailure(connectProblem("invalid_callback", "This URL is not an authorization callback.")));
         }
         if (this.callbackPromise)
             return this.callbackPromise;
         this.transactionDepth += 1;
         const completion = this.connect.completeAuthorization(callbackUrl)
-            .then((result) => {
+            .then((outcome) => {
+            if (!outcome.ok) {
+                const returnTo = authorizationReturnToFromProblem(outcome.problem);
+                this.selection.clearAuthorizationCallback(returnTo);
+                this.refresh();
+                return outcome;
+            }
+            const result = outcome.value;
             this.unavailableReason = "not_authorized";
             this.selection.finishAuthorization(result.returnTo, result.connection.collectionId);
             this.refresh();
-            return result.connection;
+            return connectSuccess(result.connection, outcome.diagnostics);
         })
             .catch((error) => {
-            const returnTo = authorizationReturnToFromError(error);
-            this.selection.clearAuthorizationCallback(returnTo);
+            this.selection.clearAuthorizationCallback();
             this.refresh();
             throw error;
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdbase-dev/connect",
-  "version": "0.1.0-beta.21",
+  "version": "0.1.0-beta.22",
   "private": false,
   "type": "module",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@mdbase-dev/connect-protocol": "0.1.0-beta.21"
+    "@mdbase-dev/connect-protocol": "0.1.0-beta.22"
   },
   "devDependencies": {
     "esbuild": "^0.28.1",