@droz-js/sdk 0.3.10 → 0.3.11

package/README.md

@@ -23,6 +23,18 @@ DrozSdk.forTenant('dev');
 DrozSdk.withAuthorization('Basic', 'username', 'password');
 ```
 
+## Global Error Handling
+
+The sdk will throw an error on every request that fails, but you can also catch the error globally by using the `on` method.
+
+```typescript
+import { DrozSdk } from '@droz-js/sdk';
+
+DrozSdk.on('error', (error) => {
+  console.log(error);
+});
+```
+
 ## Websocket
 
 For websockets we use `graphql-ws` protocol with `AsyncIterator` to handle the subscriptions. The sdk will automatically

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@droz-js/sdk",
   "description": "Droz SDK",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "private": false,
   "exports": {
     ".": "./src/index.js",

package/src/client/config.d.ts

@@ -18,6 +18,7 @@ export declare class DrozSdk {
     private static defaultTenant?;
     private static defaultAuthorizationProvider?;
     private static readonly tenantConfigs;
+    private static readonly listeners;
     static forTenant(tenant: string): typeof DrozSdk;
     static withAuthorization(type?: string, ...values: string[]): void;
     static withAuthorizationProvider(provider: () => Promise<string>): void;
@@ -25,5 +26,10 @@ export declare class DrozSdk {
     static getTenantConfig(customTenant?: string): Promise<TenantConfig>;
     private static getOrDiscoverTenantConfig;
     private static discoverTenantConfig;
+    static on<T>(event: string, listener: (e: T) => void): void;
+    static off<T>(event: string, listener: (e: T) => void): void;
+    static emit(event: string, data: any): void;
+    private static addEventListener;
+    private static removeEventListener;
 }
 export {};

package/src/client/config.js

@@ -32,6 +32,7 @@ class DrozSdk {
     static defaultTenant;
     static defaultAuthorizationProvider;
     static tenantConfigs = new Map();
+    static listeners = new Map();
     static forTenant(tenant) {
         this.defaultTenant = tenant;
         this.tenantConfigs.delete(tenant);
@@ -81,5 +82,36 @@ class DrozSdk {
         this.tenantConfigs.set(tenant, promise());
         return this.tenantConfigs.get(tenant);
     }
+    static on(event, listener) {
+        this.addEventListener(event, listener);
+    }
+    static off(event, listener) {
+        this.removeEventListener(event, listener);
+    }
+    static emit(event, data) {
+        if (this.listeners.has(event)) {
+            const listeners = this.listeners.get(event);
+            listeners.forEach(listener => listener(data));
+        }
+    }
+    static addEventListener(event, listener) {
+        if (!this.listeners.has(event)) {
+            this.listeners.set(event, []);
+        }
+        const listeners = this.listeners.get(event);
+        const index = listeners.indexOf(listener);
+        if (index == -1) {
+            listeners.push(listener);
+        }
+    }
+    static removeEventListener(event, listener) {
+        if (this.listeners.has(event)) {
+            const listeners = this.listeners.get(event);
+            const index = listeners.indexOf(listener);
+            if (index > -1) {
+                listeners.splice(index, 1);
+            }
+        }
+    }
 }
 exports.DrozSdk = DrozSdk;

package/src/client/helpers.d.ts

@@ -6,8 +6,8 @@ export type GetSdk<Sdk> = (requester: Requester<Sdk>) => Sdk;
 export declare class SdkError extends Error {
     statusCode?: number;
     errorCode?: string;
-    errors?: ReadonlyArray<GraphQLError>;
-    constructor(errors: ReadonlyArray<GraphQLError>);
+    errors?: ReadonlyArray<Partial<GraphQLError>>;
+    constructor(errors: ReadonlyArray<Partial<GraphQLError>>);
 }
 export declare class SdkConfigurationError extends Error {
     constructor(message: string);

package/src/client/helpers.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapAsyncIterableGraphqlResponse = exports.mapGraphqlResponse = exports.resolveAuthorization = exports.toAuthorizationProvider = exports.SdkConfigurationError = exports.SdkError = exports.serviceDiscoveryEndpoint = void 0;
+const config_1 = require("./config");
 exports.serviceDiscoveryEndpoint = 'https://root.droz.services';
 class SdkError extends Error {
     statusCode;
     errorCode;
     errors;
     constructor(errors) {
-        const { message, extensions } = errors?.[0] ?? {};
-        super(message ?? 'Unknown Error');
+        const { message, extensions, originalError } = errors?.[0] ?? {};
+        super(message ?? 'Unknown Error', {
+            cause: originalError
+        });
         this.errors = errors;
         this.statusCode = extensions?.statusCode;
         this.errorCode = extensions?.errorCode;
@@ -47,12 +50,25 @@ async function resolveAuthorization(provider) {
 exports.resolveAuthorization = resolveAuthorization;
 function mapGraphqlResponse(response) {
     if (response) {
-        if (response && 'stack' in response && 'message' in response)
-            throw response;
-        if ('errors' in response)
-            throw new SdkError(response.errors);
-        if ('data' in response)
+        if (response && 'stack' in response && 'message' in response) {
+            const error = new SdkError([
+                {
+                    message: response.message,
+                    originalError: response,
+                    extensions: { errorCode: '500-unknown-error', statusCode: 500 }
+                }
+            ]);
+            config_1.DrozSdk.emit('error', error);
+            throw error;
+        }
+        if ('errors' in response) {
+            const error = new SdkError(response.errors);
+            config_1.DrozSdk.emit('error', error);
+            throw error;
+        }
+        if ('data' in response) {
             return response.data;
+        }
     }
 }
 exports.mapGraphqlResponse = mapGraphqlResponse;

package/src/client/http.js

@@ -60,7 +60,9 @@ class HttpRequester {
             return emptyAsyncIterator();
         // extract operation name and enqueue the request to be executed in batches
         const operationName = /(?:query|mutation) ([^({ ]*)/.exec(query)?.[1];
-        return this.inbatches({ query, variables, operationName }).then(helpers_1.mapGraphqlResponse);
+        return this.inbatches({ query, variables, operationName })
+            .catch(error => (0, helpers_1.mapGraphqlResponse)(error))
+            .then(data => (0, helpers_1.mapGraphqlResponse)(data));
     }
     async buildRequest() {
         const [authorization, tenant] = await Promise.all([
@@ -94,7 +96,11 @@ class HttpRequester {
             headers,
             body
         });
-        return await response.json();
+        if (response.status === 200) {
+            return await response.json();
+        }
+        const error = await response.text();
+        return [].concat(request).map(() => new Error(error)); // one error per request
     }
 }
 __decorate([

package/src/sdks/droznexo.d.ts

@@ -128,6 +128,7 @@ export type DrozNexoConnectionConnection = {
 };
 export type DrozNexoConnectionSuggestion = {
     destination: DrozNexoAppAndAppInstance;
+    title: Scalars['String']['output'];
     trigger: DrozNexoAppAndAppInstance;
 };
 export type DrozNexoUsageStatistics = {
@@ -174,10 +175,10 @@ export type DrozNexoAppInstanceFragment = {
     app: Pick<DrozNexoApp, 'id' | 'name' | 'description'>;
     appInstance: Pick<DrozNexoAppInstance, 'drn' | 'name' | 'createdAt' | 'updatedAt'>;
 };
-export type DrozNexoSuggestionFragment = {
+export type DrozNexoSuggestionFragment = (Pick<DrozNexoConnectionSuggestion, 'title'> & {
     trigger: DrozNexoAppInstanceFragment;
     destination: DrozNexoAppInstanceFragment;
-};
+});
 export type DrozNexoConnectionFragment = (Pick<DrozNexoConnection, 'id' | 'versionId' | 'title' | 'description' | 'createdAt' | 'updatedAt'> & {
     trigger: DrozNexoAppInstanceFragment;
     destination: DrozNexoAppInstanceFragment;
@@ -216,9 +217,9 @@ export type RemoveDrozNexoConnectionMutation = {
     removeDrozNexoConnection: DrozNexoConnectionFragment;
 };
 export declare const DrozNexoAppInstanceFragmentDoc = "\n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";
-export declare const DrozNexoSuggestionFragmentDoc = "\n    fragment drozNexoSuggestion on DrozNexoConnectionSuggestion {\n  trigger {\n    ...drozNexoAppInstance\n  }\n  destination {\n    ...drozNexoAppInstance\n  }\n}\n    \n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";
+export declare const DrozNexoSuggestionFragmentDoc = "\n    fragment drozNexoSuggestion on DrozNexoConnectionSuggestion {\n  title\n  trigger {\n    ...drozNexoAppInstance\n  }\n  destination {\n    ...drozNexoAppInstance\n  }\n}\n    \n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";
 export declare const DrozNexoConnectionFragmentDoc = "\n    fragment drozNexoConnection on DrozNexoConnection {\n  id\n  versionId\n  title\n  description\n  trigger {\n    ...drozNexoAppInstance\n  }\n  destination {\n    ...drozNexoAppInstance\n  }\n  createdAt\n  updatedAt\n}\n    \n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";
-export declare const ListDrozNexoSuggestionsDocument = "\n    query listDrozNexoSuggestions {\n  listDrozNexoSuggestions {\n    ...drozNexoSuggestion\n  }\n}\n    \n    fragment drozNexoSuggestion on DrozNexoConnectionSuggestion {\n  trigger {\n    ...drozNexoAppInstance\n  }\n  destination {\n    ...drozNexoAppInstance\n  }\n}\n    \n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";
+export declare const ListDrozNexoSuggestionsDocument = "\n    query listDrozNexoSuggestions {\n  listDrozNexoSuggestions {\n    ...drozNexoSuggestion\n  }\n}\n    \n    fragment drozNexoSuggestion on DrozNexoConnectionSuggestion {\n  title\n  trigger {\n    ...drozNexoAppInstance\n  }\n  destination {\n    ...drozNexoAppInstance\n  }\n}\n    \n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";
 export declare const ListDrozNexoConnectionsDocument = "\n    query listDrozNexoConnections($next: Base64) {\n  listDrozNexoConnections(next: $next) {\n    nodes {\n      ...drozNexoConnection\n    }\n    pageInfo {\n      next\n      hasNext\n    }\n  }\n}\n    \n    fragment drozNexoConnection on DrozNexoConnection {\n  id\n  versionId\n  title\n  description\n  trigger {\n    ...drozNexoAppInstance\n  }\n  destination {\n    ...drozNexoAppInstance\n  }\n  createdAt\n  updatedAt\n}\n    \n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";
 export declare const GetUsageStatisticsDocument = "\n    query getUsageStatistics {\n  getUsageStatistics {\n    totalSecrets\n    totalAppInstances\n    totalConnections\n  }\n}\n    ";
 export declare const CreateDrozNexoConnectionDocument = "\n    mutation createDrozNexoConnection($input: CreateDrozNexoConnectionInput!) {\n  createDrozNexoConnection(input: $input) {\n    ...drozNexoConnection\n  }\n}\n    \n    fragment drozNexoConnection on DrozNexoConnection {\n  id\n  versionId\n  title\n  description\n  trigger {\n    ...drozNexoAppInstance\n  }\n  destination {\n    ...drozNexoAppInstance\n  }\n  createdAt\n  updatedAt\n}\n    \n    fragment drozNexoAppInstance on DrozNexoAppAndAppInstance {\n  app {\n    id\n    name\n    description\n  }\n  appInstance {\n    drn\n    name\n    createdAt\n    updatedAt\n  }\n}\n    ";

package/src/sdks/droznexo.js

@@ -31,6 +31,7 @@ exports.DrozNexoAppInstanceFragmentDoc = `
     `;
 exports.DrozNexoSuggestionFragmentDoc = `
     fragment drozNexoSuggestion on DrozNexoConnectionSuggestion {
+  title
   trigger {
     ...drozNexoAppInstance
   }