@fintekkers/ledger-models 0.4.30 → 0.4.32

package/node/wrappers/models/utils/requestcontext.d.ts

@@ -1,16 +1,21 @@
 import * as grpc from '@grpc/grpc-js';
+import { Service } from '../../util/serviceaddress';
 declare class EnvConfig {
-    private static getEnvVar;
     static get apiKey(): string | undefined;
     /**
-     * Returns the URL for the backend GRPC service. It will default to
-     * api.fintekkers.org:8082 if the environment variable is not set. If
-     * API_URL already includes a port (e.g. localhost:8083), it is used as-is;
-     * otherwise :8082 is appended for backward compatibility.
+     * Returns the `host:port` of the ledger service, found the same way as
+     * every other service: `BROKER_HOST`, then `LEDGER_SERVICE_HOST`/`_PORT`,
+     * then `API_URL` (with :8082 unless it carries a port), then
+     * localhost:8082. Clients should prefer {@link EnvConfig.urlFor}.
      */
     static get apiURL(): string;
-    private static get isLocalURL();
+    /** Returns the `host:port` a client for `service` connects to. */
+    static urlFor(service: Service): string;
+    private static isPlaintext;
+    /** Channel credentials for {@link EnvConfig.apiURL}. */
     static get apiCredentials(): grpc.ChannelCredentials;
+    /** Insecure credentials for a loopback address, SSL otherwise. */
+    static credentialsFor(service: Service): grpc.ChannelCredentials;
     private static addApiKey;
     /**
      * Returns SSL channel credentials combined with per-call credentials that
@@ -21,22 +26,23 @@ declare class EnvConfig {
      * {@link EnvConfig.getAuthenticatedClientOptions}, which sends the key via
      * an interceptor instead.
      *
-     * @throws {InsecureChannelAuthError} when apiURL is localhost / 127.0.0.1.
+     * @throws {InsecureChannelAuthError} when the address of `service` is
+     * localhost / 127.0.0.1.
      */
-    static getAuthenticatedCredentials(apiKey: string): grpc.ChannelCredentials;
+    static getAuthenticatedCredentials(apiKey: string, service?: Service): grpc.ChannelCredentials;
     /**
-     * Returns credentials and interceptors for authenticated calls.
+     * Returns credentials and interceptors for authenticated calls to `service`.
      * For local (insecure) channels, injects the API key via an interceptor.
      * For remote (SSL) channels, uses {@link EnvConfig.getAuthenticatedCredentials}.
      */
-    static getAuthenticatedClientOptions(apiKey: string): {
+    static getAuthenticatedClientOptions(apiKey: string, service?: Service): {
         credentials: grpc.ChannelCredentials;
         interceptors: grpc.Interceptor[];
     };
 }
 /**
- * Thrown by EnvConfig.getAuthenticatedCredentials when API_URL points at an
- * insecure (local) channel. The message never includes the API key.
+ * Thrown by EnvConfig.getAuthenticatedCredentials when the service address is
+ * an insecure (local) channel. The message never includes the API key.
  */
 export declare class InsecureChannelAuthError extends Error {
     constructor();

package/node/wrappers/models/utils/requestcontext.js

@@ -27,35 +27,34 @@ exports.InsecureChannelAuthError = void 0;
 const dotenv = __importStar(require("dotenv"));
 dotenv.config();
 const grpc = __importStar(require("@grpc/grpc-js"));
+const serviceaddress_1 = require("../../util/serviceaddress");
 class EnvConfig {
-    static getEnvVar(key, defaultValue) {
-        const value = process.env[key];
-        if (value === undefined) {
-            if (defaultValue === undefined) {
-                throw new Error(`Environment variable ${key} is not set.`);
-            }
-            return defaultValue;
-        }
-        return value;
-    }
     static get apiKey() {
         return process.env['API_KEY'];
     }
     /**
-     * Returns the URL for the backend GRPC service. It will default to
-     * api.fintekkers.org:8082 if the environment variable is not set. If
-     * API_URL already includes a port (e.g. localhost:8083), it is used as-is;
-     * otherwise :8082 is appended for backward compatibility.
+     * Returns the `host:port` of the ledger service, found the same way as
+     * every other service: `BROKER_HOST`, then `LEDGER_SERVICE_HOST`/`_PORT`,
+     * then `API_URL` (with :8082 unless it carries a port), then
+     * localhost:8082. Clients should prefer {@link EnvConfig.urlFor}.
      */
     static get apiURL() {
-        const base = EnvConfig.getEnvVar('API_URL', 'api.fintekkers.org');
-        return /:\d+$/.test(base) ? base : base + ':8082';
+        return EnvConfig.urlFor(serviceaddress_1.Service.SECURITY);
     }
-    static get isLocalURL() {
-        return /^localhost|^127\.0\.0\.1/.test(this.apiURL);
+    /** Returns the `host:port` a client for `service` connects to. */
+    static urlFor(service) {
+        return (0, serviceaddress_1.target)((0, serviceaddress_1.resolve)(service));
     }
+    static isPlaintext(service) {
+        return (0, serviceaddress_1.resolve)(service).plaintext;
+    }
+    /** Channel credentials for {@link EnvConfig.apiURL}. */
     static get apiCredentials() {
-        if (this.isLocalURL) {
+        return EnvConfig.credentialsFor(serviceaddress_1.Service.SECURITY);
+    }
+    /** Insecure credentials for a loopback address, SSL otherwise. */
+    static credentialsFor(service) {
+        if (EnvConfig.isPlaintext(service)) {
             return grpc.credentials.createInsecure();
         }
         else {
@@ -74,10 +73,11 @@ class EnvConfig {
      * {@link EnvConfig.getAuthenticatedClientOptions}, which sends the key via
      * an interceptor instead.
      *
-     * @throws {InsecureChannelAuthError} when apiURL is localhost / 127.0.0.1.
+     * @throws {InsecureChannelAuthError} when the address of `service` is
+     * localhost / 127.0.0.1.
      */
-    static getAuthenticatedCredentials(apiKey) {
-        if (this.isLocalURL) {
+    static getAuthenticatedCredentials(apiKey, service = serviceaddress_1.Service.SECURITY) {
+        if (EnvConfig.isPlaintext(service)) {
             throw new InsecureChannelAuthError();
         }
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
@@ -88,12 +88,12 @@ class EnvConfig {
         return grpc.credentials.combineChannelCredentials(grpc.credentials.createSsl(), callCreds);
     }
     /**
-     * Returns credentials and interceptors for authenticated calls.
+     * Returns credentials and interceptors for authenticated calls to `service`.
      * For local (insecure) channels, injects the API key via an interceptor.
      * For remote (SSL) channels, uses {@link EnvConfig.getAuthenticatedCredentials}.
      */
-    static getAuthenticatedClientOptions(apiKey) {
-        if (this.isLocalURL) {
+    static getAuthenticatedClientOptions(apiKey, service = serviceaddress_1.Service.SECURITY) {
+        if (EnvConfig.isPlaintext(service)) {
             const interceptor = (_options, nextCall) => {
                 return new grpc.InterceptingCall(nextCall(_options), {
                     start(metadata, listener, next) {
@@ -105,14 +105,14 @@ class EnvConfig {
             return { credentials: grpc.credentials.createInsecure(), interceptors: [interceptor] };
         }
         return {
-            credentials: EnvConfig.getAuthenticatedCredentials(apiKey),
+            credentials: EnvConfig.getAuthenticatedCredentials(apiKey, service),
             interceptors: []
         };
     }
 }
 /**
- * Thrown by EnvConfig.getAuthenticatedCredentials when API_URL points at an
- * insecure (local) channel. The message never includes the API key.
+ * Thrown by EnvConfig.getAuthenticatedCredentials when the service address is
+ * an insecure (local) channel. The message never includes the API key.
  */
 class InsecureChannelAuthError extends Error {
     constructor() {

package/node/wrappers/models/utils/requestcontext.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestcontext.js","sourceRoot":"","sources":["requestcontext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"requestcontext.js","sourceRoot":"","sources":["requestcontext.ts"],"names":[],"mappings":"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"}

package/node/wrappers/models/utils/requestcontext.test.js

@@ -49,9 +49,16 @@ function setEnv(key, value) {
         env[key] = value;
     }
 }
+// Variables the lookup reads before API_URL; the host may set them.
+const SHADOWING = ['BROKER_HOST', 'LEDGER_SERVICE_HOST', 'LEDGER_SERVICE_PORT'];
 describe('EnvConfig.apiURL', () => {
     const original = env['API_URL'];
-    afterEach(() => setEnv('API_URL', original));
+    const saved = SHADOWING.map((k) => env[k]);
+    beforeEach(() => SHADOWING.forEach((k) => setEnv(k, undefined)));
+    afterEach(() => {
+        setEnv('API_URL', original);
+        SHADOWING.forEach((k, i) => setEnv(k, saved[i]));
+    });
     test('appends :8082 when API_URL has no port', () => {
         setEnv('API_URL', 'myhost.example.com');
         expect(requestcontext_1.default.apiURL).toBe('myhost.example.com:8082');
@@ -60,9 +67,14 @@ describe('EnvConfig.apiURL', () => {
         setEnv('API_URL', 'localhost:8083');
         expect(requestcontext_1.default.apiURL).toBe('localhost:8083');
     });
-    test('defaults to api.fintekkers.org:8082 when unset', () => {
+    test('defaults to localhost:8082 when unset', () => {
         setEnv('API_URL', undefined);
-        expect(requestcontext_1.default.apiURL).toBe('api.fintekkers.org:8082');
+        expect(requestcontext_1.default.apiURL).toBe('localhost:8082');
+    });
+    test('is the broker when BROKER_HOST is set, whatever API_URL says', () => {
+        setEnv('API_URL', 'localhost');
+        setEnv('BROKER_HOST', '127.0.0.1:8085');
+        expect(requestcontext_1.default.apiURL).toBe('127.0.0.1:8085');
     });
 });
 describe('EnvConfig.apiKey', () => {

package/node/wrappers/models/utils/requestcontext.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestcontext.test.js","sourceRoot":"","sources":["requestcontext.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"requestcontext.test.js","sourceRoot":"","sources":["requestcontext.test.ts"],"names":[],"mappings":"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"}

package/node/wrappers/models/utils/requestcontext.test.ts

@@ -15,9 +15,17 @@ function setEnv(key: string, value: string | undefined): void {
   }
 }
 
+// Variables the lookup reads before API_URL; the host may set them.
+const SHADOWING = ['BROKER_HOST', 'LEDGER_SERVICE_HOST', 'LEDGER_SERVICE_PORT'];
+
 describe('EnvConfig.apiURL', () => {
   const original = env['API_URL'];
-  afterEach(() => setEnv('API_URL', original));
+  const saved = SHADOWING.map((k) => env[k]);
+  beforeEach(() => SHADOWING.forEach((k) => setEnv(k, undefined)));
+  afterEach(() => {
+    setEnv('API_URL', original);
+    SHADOWING.forEach((k, i) => setEnv(k, saved[i]));
+  });
 
   test('appends :8082 when API_URL has no port', () => {
     setEnv('API_URL', 'myhost.example.com');
@@ -29,9 +37,15 @@ describe('EnvConfig.apiURL', () => {
     expect(EnvConfig.apiURL).toBe('localhost:8083');
   });
 
-  test('defaults to api.fintekkers.org:8082 when unset', () => {
+  test('defaults to localhost:8082 when unset', () => {
     setEnv('API_URL', undefined);
-    expect(EnvConfig.apiURL).toBe('api.fintekkers.org:8082');
+    expect(EnvConfig.apiURL).toBe('localhost:8082');
+  });
+
+  test('is the broker when BROKER_HOST is set, whatever API_URL says', () => {
+    setEnv('API_URL', 'localhost');
+    setEnv('BROKER_HOST', '127.0.0.1:8085');
+    expect(EnvConfig.apiURL).toBe('127.0.0.1:8085');
   });
 });
 

package/node/wrappers/models/utils/requestcontext.ts

@@ -3,39 +3,40 @@ dotenv.config();
 
 import * as grpc from '@grpc/grpc-js';
 
-class EnvConfig {
-  private static getEnvVar(key: string, defaultValue?: string): string {
-    const value = process.env[key];
-    if (value === undefined) {
-      if (defaultValue === undefined) {
-        throw new Error(`Environment variable ${key} is not set.`);
-      }
-      return defaultValue;
-    }
-    return value;
-  }
+import { Service, resolve, target } from '../../util/serviceaddress';
 
+class EnvConfig {
   static get apiKey(): string | undefined {
     return process.env['API_KEY'];
   }
 
   /**
-   * Returns the URL for the backend GRPC service. It will default to
-   * api.fintekkers.org:8082 if the environment variable is not set. If
-   * API_URL already includes a port (e.g. localhost:8083), it is used as-is;
-   * otherwise :8082 is appended for backward compatibility.
+   * Returns the `host:port` of the ledger service, found the same way as
+   * every other service: `BROKER_HOST`, then `LEDGER_SERVICE_HOST`/`_PORT`,
+   * then `API_URL` (with :8082 unless it carries a port), then
+   * localhost:8082. Clients should prefer {@link EnvConfig.urlFor}.
    */
   static get apiURL(): string {
-    const base = EnvConfig.getEnvVar('API_URL', 'api.fintekkers.org');
-    return /:\d+$/.test(base) ? base : base + ':8082';
+    return EnvConfig.urlFor(Service.SECURITY);
   }
 
-  private static get isLocalURL(): boolean {
-    return /^localhost|^127\.0\.0\.1/.test(this.apiURL);
+  /** Returns the `host:port` a client for `service` connects to. */
+  static urlFor(service: Service): string {
+    return target(resolve(service));
   }
 
+  private static isPlaintext(service: Service): boolean {
+    return resolve(service).plaintext;
+  }
+
+  /** Channel credentials for {@link EnvConfig.apiURL}. */
   static get apiCredentials(): grpc.ChannelCredentials {
-    if (this.isLocalURL) {
+    return EnvConfig.credentialsFor(Service.SECURITY);
+  }
+
+  /** Insecure credentials for a loopback address, SSL otherwise. */
+  static credentialsFor(service: Service): grpc.ChannelCredentials {
+    if (EnvConfig.isPlaintext(service)) {
       return grpc.credentials.createInsecure();
     }
     else {
@@ -56,10 +57,11 @@ class EnvConfig {
    * {@link EnvConfig.getAuthenticatedClientOptions}, which sends the key via
    * an interceptor instead.
    *
-   * @throws {InsecureChannelAuthError} when apiURL is localhost / 127.0.0.1.
+   * @throws {InsecureChannelAuthError} when the address of `service` is
+   * localhost / 127.0.0.1.
    */
-  static getAuthenticatedCredentials(apiKey: string): grpc.ChannelCredentials {
-    if (this.isLocalURL) {
+  static getAuthenticatedCredentials(apiKey: string, service: Service = Service.SECURITY): grpc.ChannelCredentials {
+    if (EnvConfig.isPlaintext(service)) {
       throw new InsecureChannelAuthError();
     }
     const callCreds = grpc.credentials.createFromMetadataGenerator(
@@ -76,15 +78,15 @@ class EnvConfig {
   }
 
   /**
-   * Returns credentials and interceptors for authenticated calls.
+   * Returns credentials and interceptors for authenticated calls to `service`.
    * For local (insecure) channels, injects the API key via an interceptor.
    * For remote (SSL) channels, uses {@link EnvConfig.getAuthenticatedCredentials}.
    */
-  static getAuthenticatedClientOptions(apiKey: string): {
+  static getAuthenticatedClientOptions(apiKey: string, service: Service = Service.SECURITY): {
     credentials: grpc.ChannelCredentials;
     interceptors: grpc.Interceptor[];
   } {
-    if (this.isLocalURL) {
+    if (EnvConfig.isPlaintext(service)) {
       const interceptor: grpc.Interceptor = (_options, nextCall) => {
         return new grpc.InterceptingCall(nextCall(_options), {
           start(metadata: grpc.Metadata, listener: grpc.Listener, next: Function) {
@@ -96,15 +98,15 @@ class EnvConfig {
       return { credentials: grpc.credentials.createInsecure(), interceptors: [interceptor] };
     }
     return {
-      credentials: EnvConfig.getAuthenticatedCredentials(apiKey),
+      credentials: EnvConfig.getAuthenticatedCredentials(apiKey, service),
       interceptors: []
     };
   }
 }
 
 /**
- * Thrown by EnvConfig.getAuthenticatedCredentials when API_URL points at an
- * insecure (local) channel. The message never includes the API key.
+ * Thrown by EnvConfig.getAuthenticatedCredentials when the service address is
+ * an insecure (local) channel. The message never includes the API key.
  */
 export class InsecureChannelAuthError extends Error {
   constructor() {

package/node/wrappers/services/apikey.credentials.test.d.ts

@@ -1,7 +1,7 @@
 /**
  * Unit tests for Issue #114: each wrapper service hands the generated gRPC
  * client the authenticated credentials when given an apiKey, and
- * EnvConfig.apiCredentials otherwise.
+ * EnvConfig.credentialsFor(service) otherwise, for its own service (LM-287).
  *
  * The generated *_grpc_pb clients are mocked, so no channel is opened.
  */

package/node/wrappers/services/apikey.credentials.test.js

@@ -2,7 +2,7 @@
 /**
  * Unit tests for Issue #114: each wrapper service hands the generated gRPC
  * client the authenticated credentials when given an apiKey, and
- * EnvConfig.apiCredentials otherwise.
+ * EnvConfig.credentialsFor(service) otherwise, for its own service (LM-287).
  *
  * The generated *_grpc_pb clients are mocked, so no channel is opened.
  */
@@ -50,6 +50,7 @@ jest.mock('../../fintekkers/services/transaction-service/transaction_service_grp
 }));
 const grpc = __importStar(require("@grpc/grpc-js"));
 const requestcontext_1 = __importDefault(require("../models/utils/requestcontext"));
+const serviceaddress_1 = require("../util/serviceaddress");
 const portfolio_service_grpc_pb_1 = require("../../fintekkers/services/portfolio-service/portfolio_service_grpc_pb");
 const position_service_grpc_pb_1 = require("../../fintekkers/services/position-service/position_service_grpc_pb");
 const price_service_grpc_pb_1 = require("../../fintekkers/services/price-service/price_service_grpc_pb");
@@ -61,11 +62,11 @@ const PriceService_1 = require("./price-service/PriceService");
 const SecurityService_1 = require("./security-service/SecurityService");
 const TransactionService_1 = require("./transaction-service/TransactionService");
 const cases = [
-    ['PortfolioService', PortfolioService_1.PortfolioService, portfolio_service_grpc_pb_1.PortfolioClient],
-    ['PositionService', PositionService_1.PositionService, position_service_grpc_pb_1.PositionClient],
-    ['PriceService', PriceService_1.PriceService, price_service_grpc_pb_1.PriceClient],
-    ['SecurityService', SecurityService_1.SecurityService, security_service_grpc_pb_1.SecurityClient],
-    ['TransactionService', TransactionService_1.TransactionService, transaction_service_grpc_pb_1.TransactionClient],
+    ['PortfolioService', PortfolioService_1.PortfolioService, portfolio_service_grpc_pb_1.PortfolioClient, serviceaddress_1.Service.PORTFOLIO],
+    ['PositionService', PositionService_1.PositionService, position_service_grpc_pb_1.PositionClient, serviceaddress_1.Service.POSITION],
+    ['PriceService', PriceService_1.PriceService, price_service_grpc_pb_1.PriceClient, serviceaddress_1.Service.PRICE],
+    ['SecurityService', SecurityService_1.SecurityService, security_service_grpc_pb_1.SecurityClient, serviceaddress_1.Service.SECURITY],
+    ['TransactionService', TransactionService_1.TransactionService, transaction_service_grpc_pb_1.TransactionClient, serviceaddress_1.Service.TRANSACTION],
 ];
 beforeEach(() => {
     jest.clearAllMocks();
@@ -73,7 +74,7 @@ beforeEach(() => {
 afterEach(() => {
     jest.restoreAllMocks();
 });
-describe.each(cases)('%s', (_name, Service, Client) => {
+describe.each(cases)('%s', (_name, Service, Client, service) => {
     const ClientMock = Client;
     test('with apiKey, client gets the authenticated credentials', () => {
         const sentinel = {
@@ -84,18 +85,19 @@ describe.each(cases)('%s', (_name, Service, Client) => {
             .spyOn(requestcontext_1.default, 'getAuthenticatedClientOptions')
             .mockReturnValue(sentinel);
         new Service('k');
-        expect(authSpy).toHaveBeenCalledWith('k');
+        expect(authSpy).toHaveBeenCalledWith('k', service);
         expect(ClientMock).toHaveBeenCalledTimes(1);
-        expect(ClientMock).toHaveBeenCalledWith(requestcontext_1.default.apiURL, sentinel.credentials, { interceptors: sentinel.interceptors });
+        expect(ClientMock).toHaveBeenCalledWith(requestcontext_1.default.urlFor(service), sentinel.credentials, { interceptors: sentinel.interceptors });
     });
-    test('zero-arg constructor constructs with EnvConfig.apiCredentials', () => {
+    test('zero-arg constructor constructs with EnvConfig.credentialsFor(service)', () => {
         const plain = grpc.credentials.createInsecure();
-        jest.spyOn(requestcontext_1.default, 'apiCredentials', 'get').mockReturnValue(plain);
+        const credsSpy = jest.spyOn(requestcontext_1.default, 'credentialsFor').mockReturnValue(plain);
         const authSpy = jest.spyOn(requestcontext_1.default, 'getAuthenticatedClientOptions');
         expect(new Service()).toBeDefined();
         expect(authSpy).not.toHaveBeenCalled();
+        expect(credsSpy).toHaveBeenCalledWith(service);
         expect(ClientMock).toHaveBeenCalledTimes(1);
-        expect(ClientMock).toHaveBeenCalledWith(requestcontext_1.default.apiURL, plain);
+        expect(ClientMock).toHaveBeenCalledWith(requestcontext_1.default.urlFor(service), plain);
     });
 });
 //# sourceMappingURL=apikey.credentials.test.js.map

package/node/wrappers/services/apikey.credentials.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"apikey.credentials.test.js","sourceRoot":"","sources":["apikey.credentials.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apikey.credentials.test.js","sourceRoot":"","sources":["apikey.credentials.test.ts"],"names":[],"mappings":"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"}

package/node/wrappers/services/apikey.credentials.test.ts

@@ -1,7 +1,7 @@
 /**
  * Unit tests for Issue #114: each wrapper service hands the generated gRPC
  * client the authenticated credentials when given an apiKey, and
- * EnvConfig.apiCredentials otherwise.
+ * EnvConfig.credentialsFor(service) otherwise, for its own service (LM-287).
  *
  * The generated *_grpc_pb clients are mocked, so no channel is opened.
  */
@@ -24,6 +24,7 @@ jest.mock('../../fintekkers/services/transaction-service/transaction_service_grp
 
 import * as grpc from '@grpc/grpc-js';
 import EnvConfig from '../models/utils/requestcontext';
+import { Service as ServiceName } from '../util/serviceaddress';
 import { PortfolioClient } from '../../fintekkers/services/portfolio-service/portfolio_service_grpc_pb';
 import { PositionClient } from '../../fintekkers/services/position-service/position_service_grpc_pb';
 import { PriceClient } from '../../fintekkers/services/price-service/price_service_grpc_pb';
@@ -35,12 +36,12 @@ import { PriceService } from './price-service/PriceService';
 import { SecurityService } from './security-service/SecurityService';
 import { TransactionService } from './transaction-service/TransactionService';
 
-const cases: Array<[string, new (apiKey?: string) => unknown, unknown]> = [
-  ['PortfolioService', PortfolioService, PortfolioClient],
-  ['PositionService', PositionService, PositionClient],
-  ['PriceService', PriceService, PriceClient],
-  ['SecurityService', SecurityService, SecurityClient],
-  ['TransactionService', TransactionService, TransactionClient],
+const cases: Array<[string, new (apiKey?: string) => unknown, unknown, ServiceName]> = [
+  ['PortfolioService', PortfolioService, PortfolioClient, ServiceName.PORTFOLIO],
+  ['PositionService', PositionService, PositionClient, ServiceName.POSITION],
+  ['PriceService', PriceService, PriceClient, ServiceName.PRICE],
+  ['SecurityService', SecurityService, SecurityClient, ServiceName.SECURITY],
+  ['TransactionService', TransactionService, TransactionClient, ServiceName.TRANSACTION],
 ];
 
 beforeEach(() => {
@@ -51,7 +52,7 @@ afterEach(() => {
   jest.restoreAllMocks();
 });
 
-describe.each(cases)('%s', (_name, Service, Client) => {
+describe.each(cases)('%s', (_name, Service, Client, service) => {
   const ClientMock = Client as jest.Mock;
 
   test('with apiKey, client gets the authenticated credentials', () => {
@@ -65,24 +66,25 @@ describe.each(cases)('%s', (_name, Service, Client) => {
 
     new Service('k');
 
-    expect(authSpy).toHaveBeenCalledWith('k');
+    expect(authSpy).toHaveBeenCalledWith('k', service);
     expect(ClientMock).toHaveBeenCalledTimes(1);
     expect(ClientMock).toHaveBeenCalledWith(
-      EnvConfig.apiURL,
+      EnvConfig.urlFor(service),
       sentinel.credentials,
       { interceptors: sentinel.interceptors }
     );
   });
 
-  test('zero-arg constructor constructs with EnvConfig.apiCredentials', () => {
+  test('zero-arg constructor constructs with EnvConfig.credentialsFor(service)', () => {
     const plain = grpc.credentials.createInsecure();
-    jest.spyOn(EnvConfig, 'apiCredentials', 'get').mockReturnValue(plain);
+    const credsSpy = jest.spyOn(EnvConfig, 'credentialsFor').mockReturnValue(plain);
     const authSpy = jest.spyOn(EnvConfig, 'getAuthenticatedClientOptions');
 
     expect(new Service()).toBeDefined();
 
     expect(authSpy).not.toHaveBeenCalled();
+    expect(credsSpy).toHaveBeenCalledWith(service);
     expect(ClientMock).toHaveBeenCalledTimes(1);
-    expect(ClientMock).toHaveBeenCalledWith(EnvConfig.apiURL, plain);
+    expect(ClientMock).toHaveBeenCalledWith(EnvConfig.urlFor(service), plain);
   });
 });

package/node/wrappers/services/apikey.test.js

@@ -12,7 +12,7 @@ const PriceService_1 = require("./price-service/PriceService");
 const SecurityService_1 = require("./security-service/SecurityService");
 const TransactionService_1 = require("./transaction-service/TransactionService");
 // No server connection is made in constructors — gRPC connects lazily.
-// API_URL is not set so it defaults to api.fintekkers.org:8082.
+// Addresses come from the environment (BROKER_HOST, API_URL, else localhost).
 describe('PortfolioService', () => {
     test('zero-arg constructor succeeds', () => {
         expect(() => new PortfolioService_1.PortfolioService()).not.toThrow();

package/node/wrappers/services/apikey.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"apikey.test.js","sourceRoot":"","sources":["apikey.test.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2EAAwE;AACxE,wEAAqE;AACrE,+DAA4D;AAC5D,wEAAqE;AACrE,iFAA8E;AAE9E,uEAAuE;AACvE,gEAAgE;AAEhE,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,mCAAgB,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,mCAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,2BAAY,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,2BAAY,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,uCAAkB,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,uCAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"apikey.test.js","sourceRoot":"","sources":["apikey.test.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2EAAwE;AACxE,wEAAqE;AACrE,+DAA4D;AAC5D,wEAAqE;AACrE,iFAA8E;AAE9E,uEAAuE;AACvE,8EAA8E;AAE9E,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,mCAAgB,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,mCAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,2BAAY,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,2BAAY,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,iCAAe,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,uCAAkB,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,uCAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/node/wrappers/services/apikey.test.ts

@@ -12,7 +12,7 @@ import { SecurityService } from './security-service/SecurityService';
 import { TransactionService } from './transaction-service/TransactionService';
 
 // No server connection is made in constructors — gRPC connects lazily.
-// API_URL is not set so it defaults to api.fintekkers.org:8082.
+// Addresses come from the environment (BROKER_HOST, API_URL, else localhost).
 
 describe('PortfolioService', () => {
   test('zero-arg constructor succeeds', () => {

package/node/wrappers/services/portfolio-service/PortfolioService.d.ts

@@ -6,7 +6,8 @@ import { PositionFilter } from '../../models/position/positionfilter';
 import Portfolio from '../../models/portfolio/portfolio';
 declare class PortfolioService {
     private client;
-    static url: string;
+    /** Read on every access, so a changed environment is picked up. */
+    static get url(): string;
     constructor(apiKey?: string);
     validateCreatePortfolio(portfolio: PortfolioProto): Promise<SummaryProto>;
     createPortfolio(portfolio: PortfolioProto): Promise<CreatePortfolioResponseProto>;

package/node/wrappers/services/portfolio-service/PortfolioService.js

@@ -43,18 +43,23 @@ const portfolio_service_grpc_pb_1 = require("../../../fintekkers/services/portfo
 const query_portfolio_request_pb_1 = require("../../../fintekkers/requests/portfolio/query_portfolio_request_pb");
 const create_portfolio_request_pb_1 = require("../../../fintekkers/requests/portfolio/create_portfolio_request_pb");
 const requestcontext_1 = __importDefault(require("../../models/utils/requestcontext"));
+const serviceaddress_1 = require("../../util/serviceaddress");
 const portfolio_1 = __importDefault(require("../../models/portfolio/portfolio"));
 const uuid_1 = require("../../models/utils/uuid");
 const datetime_1 = require("../../models/utils/datetime");
 const LinkCacheModule = __importStar(require("../../util/link-cache"));
 class PortfolioService {
+    /** Read on every access, so a changed environment is picked up. */
+    static get url() {
+        return requestcontext_1.default.urlFor(serviceaddress_1.Service.PORTFOLIO);
+    }
     constructor(apiKey) {
         if (apiKey) {
-            const { credentials, interceptors } = requestcontext_1.default.getAuthenticatedClientOptions(apiKey);
-            this.client = new portfolio_service_grpc_pb_1.PortfolioClient(requestcontext_1.default.apiURL, credentials, { interceptors });
+            const { credentials, interceptors } = requestcontext_1.default.getAuthenticatedClientOptions(apiKey, serviceaddress_1.Service.PORTFOLIO);
+            this.client = new portfolio_service_grpc_pb_1.PortfolioClient(requestcontext_1.default.urlFor(serviceaddress_1.Service.PORTFOLIO), credentials, { interceptors });
         }
         else {
-            this.client = new portfolio_service_grpc_pb_1.PortfolioClient(requestcontext_1.default.apiURL, requestcontext_1.default.apiCredentials);
+            this.client = new portfolio_service_grpc_pb_1.PortfolioClient(requestcontext_1.default.urlFor(serviceaddress_1.Service.PORTFOLIO), requestcontext_1.default.credentialsFor(serviceaddress_1.Service.PORTFOLIO));
         }
     }
     validateCreatePortfolio(portfolio) {
@@ -121,5 +126,4 @@ class PortfolioService {
     }
 }
 exports.PortfolioService = PortfolioService;
-PortfolioService.url = requestcontext_1.default.apiURL;
 //# sourceMappingURL=PortfolioService.js.map