@droz-js/sdk 0.4.27 → 0.5.0

package/package.json

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

package/src/client/config.d.ts

@@ -8,8 +8,7 @@ export interface Service {
 type events = 'error';
 declare class TenantConfig {
     readonly tenant: string;
-    private readonly services;
-    constructor(tenant: string, instances: Service[]);
+    constructor(tenant: string);
     getEndpoint(serviceName: string, type?: 'http' | 'ws'): string;
 }
 /**
@@ -24,9 +23,7 @@ export declare class DrozSdk {
     static withAuthorization(type?: string, ...values: string[]): void;
     static withAuthorizationProvider(provider: () => Promise<string>): void;
     static getAuthorization(customProvider?: AuthorizationProvider): Promise<string>;
-    static getTenantConfig(customTenant?: string): Promise<TenantConfig>;
-    private static getOrDiscoverTenantConfig;
-    private static discoverTenantConfig;
+    static getTenantConfig(customTenant?: string): TenantConfig;
     static on<T>(event: events, listener: (e: T) => void): void;
     static off<T>(event: events, listener: (e: T) => void): void;
     static emit(event: events, data: any): void;

package/src/client/config.js

@@ -4,23 +4,16 @@ exports.DrozSdk = void 0;
 const helpers_1 = require("./helpers");
 class TenantConfig {
     tenant;
-    services;
-    constructor(tenant, instances) {
+    constructor(tenant) {
         this.tenant = tenant;
-        this.services = instances;
     }
     getEndpoint(serviceName, type = 'http') {
         const serviceId = serviceName.replace('@droz/', '');
-        const instance = this.services.find(instance => {
-            return instance.serviceId == serviceId && instance.type == type;
-        });
-        if (instance) {
-            if (type === 'http') {
-                const endpoint = new URL(instance.endpoint);
-                endpoint.pathname = '/graphql';
-                return endpoint.toString();
-            }
-            return instance.endpoint;
+        if (type === 'http') {
+            return `https://${serviceId}-${this.tenant}.droz.services/graphql`;
+        }
+        if (type === 'ws') {
+            return `wss://${serviceId}-${this.tenant}.droz.services/ws`;
         }
         throw new helpers_1.SdkConfigurationError(`Tenant "${this.tenant}" endpoint for service "${serviceId}" and type "${type}" not found`);
     }
@@ -51,36 +44,8 @@ class DrozSdk {
         if (defaultProvider)
             return await (0, helpers_1.resolveAuthorization)(defaultProvider);
     }
-    static async getTenantConfig(customTenant) {
-        if (customTenant)
-            return await this.getOrDiscoverTenantConfig(customTenant);
-        const defaultTenant = this.defaultTenant;
-        return this.getOrDiscoverTenantConfig(defaultTenant);
-    }
-    static async getOrDiscoverTenantConfig(tenant) {
-        if (this.tenantConfigs.has(tenant)) {
-            return await this.tenantConfigs.get(tenant);
-        }
-        return await this.discoverTenantConfig(tenant);
-    }
-    static discoverTenantConfig(tenant) {
-        async function promise() {
-            // fetch instances from discovery service
-            const data = await fetch(`${helpers_1.serviceDiscoveryEndpoint}/discover/${tenant}`);
-            const json = await data.json().catch(error => {
-                console.error(error);
-                return {};
-            });
-            const instances = json.instances ?? [];
-            // validate it's a valid tenant
-            if (instances.length === 0) {
-                throw new helpers_1.SdkConfigurationError(`Invalid tenant '${tenant}', no instances found on service discovery`);
-            }
-            // create tenant config and cache it
-            return new TenantConfig(tenant, instances);
-        }
-        this.tenantConfigs.set(tenant, promise());
-        return this.tenantConfigs.get(tenant);
+    static getTenantConfig(customTenant) {
+        return new TenantConfig(customTenant ?? this.defaultTenant);
     }
     static on(event, listener) {
         this.addEventListener(event, listener);

package/src/client/helpers.d.ts

@@ -1,5 +1,4 @@
 import type { ExecutionResult, GraphQLError } from 'graphql';
-export declare const serviceDiscoveryEndpoint = "https://root.droz.services";
 export type AuthorizationProvider = string | (() => Promise<string>) | (() => string);
 export type Requester<C = {}> = <R, V>(doc: string, vars?: V, options?: C) => Promise<R> | AsyncIterableIterator<R>;
 export type GetSdk<Sdk> = (requester: Requester<Sdk>) => Sdk;

package/src/client/helpers.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapAsyncIterableGraphqlResponse = exports.mapGraphqlResponse = exports.resolveAuthorization = exports.toAuthorizationProvider = exports.SdkConfigurationError = exports.SdkError = exports.serviceDiscoveryEndpoint = void 0;
+exports.mapAsyncIterableGraphqlResponse = exports.mapGraphqlResponse = exports.resolveAuthorization = exports.toAuthorizationProvider = exports.SdkConfigurationError = exports.SdkError = void 0;
 const config_1 = require("./config");
-exports.serviceDiscoveryEndpoint = 'https://root.droz.services';
 class SdkError extends Error {
     statusCode;
     errorCode;

package/src/client/http.js

@@ -65,11 +65,9 @@ class HttpRequester {
             .then(data => (0, helpers_1.mapGraphqlResponse)(data));
     }
     async buildRequest() {
-        const [authorization, tenant] = await Promise.all([
-            config_1.DrozSdk.getAuthorization(this.authorization), //
-            config_1.DrozSdk.getTenantConfig(this.tenant)
-        ]);
+        const tenant = config_1.DrozSdk.getTenantConfig(this.tenant);
         const endpoint = tenant.getEndpoint(this.serviceName);
+        const authorization = await config_1.DrozSdk.getAuthorization(this.authorization);
         const heads = new Headers();
         if (authorization)
             heads.set('Authorization', authorization);

package/src/client/ws.js

@@ -13,11 +13,9 @@ class WsRequester {
     async connect() {
         if (this.client)
             return this.client;
-        const [tenant, authorization] = await Promise.all([
-            config_1.DrozSdk.getTenantConfig(), //
-            config_1.DrozSdk.getAuthorization()
-        ]);
+        const tenant = config_1.DrozSdk.getTenantConfig();
         const endpoint = tenant.getEndpoint(this.serviceName, 'ws');
+        const authorization = await config_1.DrozSdk.getAuthorization();
         const connectionParams = authorization ? { authorization } : {};
         this.client = (0, graphql_ws_1.createClient)({
             url: endpoint,

package/src/sdks/nucleus.d.ts

@@ -664,7 +664,8 @@ export type StateMachineConfigStatesOnInput = {
 export declare enum StateMachineConfigStatus {
     Draft = "Draft",
     Live = "Live",
-    Published = "Published"
+    Published = "Published",
+    Removed = "Removed"
 }
 export type Storage = {
     cdnUrl: Scalars['String']['output'];

package/src/sdks/nucleus.js

@@ -41,6 +41,7 @@ var StateMachineConfigStatus;
     StateMachineConfigStatus["Draft"] = "Draft";
     StateMachineConfigStatus["Live"] = "Live";
     StateMachineConfigStatus["Published"] = "Published";
+    StateMachineConfigStatus["Removed"] = "Removed";
 })(StateMachineConfigStatus || (exports.StateMachineConfigStatus = StateMachineConfigStatus = {}));
 var Typenames;
 (function (Typenames) {