@fintekkers/ledger-models 0.4.29 → 0.4.31

package/node/wrappers/models/position/position_matcher.d.ts

@@ -15,8 +15,10 @@ export interface FilterableRow {
  * ASSET_CLASS with EQUALS / NOT_EQUALS uses the shared assetClassMatches
  * rule, so a group code such as FIXED_INCOME matches its members and labels;
  * every other field compares exactly. A null or undefined stored value never
- * throws: EQUALS and the ordering operators drop the row, NOT_EQUALS keeps
- * it. An unknown operator matches nothing. Errors raised by row.getField
+ * throws and drops the row for every operator, except ASSET_CLASS with
+ * NOT_EQUALS, which keeps it (LM-281). The null check runs before the
+ * ASSET_CLASS branch, so it handles that asset-class exception itself
+ * (LM-284). An unknown operator matches nothing. Errors raised by row.getField
  * propagate (a row represents an absent value by returning null).
  */
 export declare function matches(field: FieldProto, operator: PositionFilterOperator, filterValue: any, storedValue: any): boolean;

package/node/wrappers/models/position/position_matcher.js

@@ -9,13 +9,15 @@ const product_hierarchy_1 = require("../security/product_hierarchy");
  * ASSET_CLASS with EQUALS / NOT_EQUALS uses the shared assetClassMatches
  * rule, so a group code such as FIXED_INCOME matches its members and labels;
  * every other field compares exactly. A null or undefined stored value never
- * throws: EQUALS and the ordering operators drop the row, NOT_EQUALS keeps
- * it. An unknown operator matches nothing. Errors raised by row.getField
+ * throws and drops the row for every operator, except ASSET_CLASS with
+ * NOT_EQUALS, which keeps it (LM-281). The null check runs before the
+ * ASSET_CLASS branch, so it handles that asset-class exception itself
+ * (LM-284). An unknown operator matches nothing. Errors raised by row.getField
  * propagate (a row represents an absent value by returning null).
  */
 function matches(field, operator, filterValue, storedValue) {
     if (storedValue === null || storedValue === undefined) {
-        return operator === position_util_pb_1.PositionFilterOperator.NOT_EQUALS;
+        return field === field_pb_1.FieldProto.ASSET_CLASS && operator === position_util_pb_1.PositionFilterOperator.NOT_EQUALS;
     }
     if (field === field_pb_1.FieldProto.ASSET_CLASS &&
         (operator === position_util_pb_1.PositionFilterOperator.EQUALS ||

package/node/wrappers/models/position/position_matcher.test.js

@@ -1,19 +1,46 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * LM-281: the JS filter helper matches Java's PositionFilter row for row.
  *
  * ASSET_CLASS EQUALS / NOT_EQUALS use the shared assetClassMatches rule;
  * every other field compares exactly. A null stored value never throws.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const field_pb_1 = require("../../../fintekkers/models/position/field_pb");
 const position_util_pb_1 = require("../../../fintekkers/models/position/position_util_pb");
 const security_pb_1 = require("../../../fintekkers/models/security/security_pb");
 const security_1 = __importDefault(require("../security/security"));
 const position_matcher_1 = require("./position_matcher");
+const PROTOS = path.resolve(__dirname, '../../../../../ledger-models-protos');
+const nullCases = JSON.parse(fs.readFileSync(path.join(PROTOS, 'fixtures/position_filter_null_cases.json'), 'utf-8')).cases;
 function securityRow(assetClass) {
     const proto = new security_pb_1.SecurityProto();
     proto.setAssetClass(assetClass);
@@ -58,7 +85,26 @@ describe('position_matcher', () => {
         expect((0, position_matcher_1.matches)(field_pb_1.FieldProto.MATURITY_DATE, position_util_pb_1.PositionFilterOperator.MORE_THAN, 1, 2)).toBe(true);
         expect((0, position_matcher_1.matches)(field_pb_1.FieldProto.MATURITY_DATE, position_util_pb_1.PositionFilterOperator.MORE_THAN, 2, 1)).toBe(false);
         expect((0, position_matcher_1.matches)(field_pb_1.FieldProto.PORTFOLIO_NAME, position_util_pb_1.PositionFilterOperator.EQUALS, 'a', null)).toBe(false);
-        expect((0, position_matcher_1.matches)(field_pb_1.FieldProto.PORTFOLIO_NAME, position_util_pb_1.PositionFilterOperator.NOT_EQUALS, 'a', null)).toBe(true);
+        expect((0, position_matcher_1.matches)(field_pb_1.FieldProto.PORTFOLIO_NAME, position_util_pb_1.PositionFilterOperator.NOT_EQUALS, 'a', null)).toBe(false);
+    });
+    // LM-284: NOT_EQUALS drops a null on every field but ASSET_CLASS. Cases
+    // come from ledger-models-protos/fixtures/position_filter_null_cases.json,
+    // shared with the Java, Python and Rust tests.
+    test('the shared null-cases fixture has its cases', () => {
+        expect(nullCases.length).toBeGreaterThanOrEqual(7);
+    });
+    test.each(nullCases)('$field $operator $filter on null -> $expected', (c) => {
+        const field = field_pb_1.FieldProto[c.field];
+        const operator = position_util_pb_1.PositionFilterOperator[c.operator];
+        expect(field).toBeDefined();
+        expect(operator).toBeDefined();
+        expect((0, position_matcher_1.matches)(field, operator, c.filter, null)).toBe(c.expected);
+    });
+    test('filterRows NOT_EQUALS drops a row with a null on another field', () => {
+        const filters = [
+            { field: field_pb_1.FieldProto.PORTFOLIO_NAME, operator: position_util_pb_1.PositionFilterOperator.NOT_EQUALS, value: 'a' },
+        ];
+        expect((0, position_matcher_1.filterRows)([stubRow(null)], filters)).toEqual([]);
     });
 });
 describe('the published (compiled) position_matcher.js', () => {
@@ -74,4 +120,8 @@ describe('the published (compiled) position_matcher.js', () => {
         const kept = compiled.filterRows(rows, assetClassFilter(position_util_pb_1.PositionFilterOperator.EQUALS));
         expect(assetClasses(kept)).toEqual(['RATES']);
     });
+    test('has the LM-284 null rule', () => {
+        expect(compiled.matches(field_pb_1.FieldProto.PORTFOLIO_NAME, position_util_pb_1.PositionFilterOperator.NOT_EQUALS, 'a', null)).toBe(false);
+        expect(compiled.matches(field_pb_1.FieldProto.ASSET_CLASS, position_util_pb_1.PositionFilterOperator.NOT_EQUALS, 'FIXED_INCOME', null)).toBe(true);
+    });
 });

package/node/wrappers/models/position/position_matcher.test.ts

@@ -4,12 +4,28 @@
  * ASSET_CLASS EQUALS / NOT_EQUALS use the shared assetClassMatches rule;
  * every other field compares exactly. A null stored value never throws.
  */
+import * as fs from 'fs';
+import * as path from 'path';
+
 import { FieldProto } from '../../../fintekkers/models/position/field_pb';
 import { PositionFilterOperator } from '../../../fintekkers/models/position/position_util_pb';
 import { SecurityProto } from '../../../fintekkers/models/security/security_pb';
 import Security from '../security/security';
 import { FilterableRow, FilterSpec, filterRows, matches } from './position_matcher';
 
+const PROTOS = path.resolve(__dirname, '../../../../../ledger-models-protos');
+
+interface NullCase {
+  field: string;
+  operator: string;
+  filter: string;
+  expected: boolean;
+}
+
+const nullCases: NullCase[] = JSON.parse(
+  fs.readFileSync(path.join(PROTOS, 'fixtures/position_filter_null_cases.json'), 'utf-8'),
+).cases;
+
 function securityRow(assetClass: string): Security {
   const proto = new SecurityProto();
   proto.setAssetClass(assetClass);
@@ -61,7 +77,29 @@ describe('position_matcher', () => {
     expect(matches(FieldProto.MATURITY_DATE, PositionFilterOperator.MORE_THAN, 1, 2)).toBe(true);
     expect(matches(FieldProto.MATURITY_DATE, PositionFilterOperator.MORE_THAN, 2, 1)).toBe(false);
     expect(matches(FieldProto.PORTFOLIO_NAME, PositionFilterOperator.EQUALS, 'a', null)).toBe(false);
-    expect(matches(FieldProto.PORTFOLIO_NAME, PositionFilterOperator.NOT_EQUALS, 'a', null)).toBe(true);
+    expect(matches(FieldProto.PORTFOLIO_NAME, PositionFilterOperator.NOT_EQUALS, 'a', null)).toBe(false);
+  });
+
+  // LM-284: NOT_EQUALS drops a null on every field but ASSET_CLASS. Cases
+  // come from ledger-models-protos/fixtures/position_filter_null_cases.json,
+  // shared with the Java, Python and Rust tests.
+  test('the shared null-cases fixture has its cases', () => {
+    expect(nullCases.length).toBeGreaterThanOrEqual(7);
+  });
+
+  test.each(nullCases)('$field $operator $filter on null -> $expected', (c) => {
+    const field = FieldProto[c.field as keyof typeof FieldProto];
+    const operator = PositionFilterOperator[c.operator as keyof typeof PositionFilterOperator];
+    expect(field).toBeDefined();
+    expect(operator).toBeDefined();
+    expect(matches(field, operator, c.filter, null)).toBe(c.expected);
+  });
+
+  test('filterRows NOT_EQUALS drops a row with a null on another field', () => {
+    const filters: FilterSpec[] = [
+      { field: FieldProto.PORTFOLIO_NAME, operator: PositionFilterOperator.NOT_EQUALS, value: 'a' },
+    ];
+    expect(filterRows([stubRow(null)], filters)).toEqual([]);
   });
 });
 
@@ -93,4 +131,13 @@ describe('the published (compiled) position_matcher.js', () => {
     const kept = compiled.filterRows(rows, assetClassFilter(PositionFilterOperator.EQUALS));
     expect(assetClasses(kept)).toEqual(['RATES']);
   });
+
+  test('has the LM-284 null rule', () => {
+    expect(
+      compiled.matches(FieldProto.PORTFOLIO_NAME, PositionFilterOperator.NOT_EQUALS, 'a', null),
+    ).toBe(false);
+    expect(
+      compiled.matches(FieldProto.ASSET_CLASS, PositionFilterOperator.NOT_EQUALS, 'FIXED_INCOME', null),
+    ).toBe(true);
+  });
 });

package/node/wrappers/models/position/position_matcher.ts

@@ -19,8 +19,10 @@ export interface FilterableRow {
  * ASSET_CLASS with EQUALS / NOT_EQUALS uses the shared assetClassMatches
  * rule, so a group code such as FIXED_INCOME matches its members and labels;
  * every other field compares exactly. A null or undefined stored value never
- * throws: EQUALS and the ordering operators drop the row, NOT_EQUALS keeps
- * it. An unknown operator matches nothing. Errors raised by row.getField
+ * throws and drops the row for every operator, except ASSET_CLASS with
+ * NOT_EQUALS, which keeps it (LM-281). The null check runs before the
+ * ASSET_CLASS branch, so it handles that asset-class exception itself
+ * (LM-284). An unknown operator matches nothing. Errors raised by row.getField
  * propagate (a row represents an absent value by returning null).
  */
 export function matches(
@@ -30,7 +32,7 @@ export function matches(
   storedValue: any,
 ): boolean {
   if (storedValue === null || storedValue === undefined) {
-    return operator === PositionFilterOperator.NOT_EQUALS;
+    return field === FieldProto.ASSET_CLASS && operator === PositionFilterOperator.NOT_EQUALS;
   }
   if (
     field === FieldProto.ASSET_CLASS &&

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

@@ -33,6 +33,9 @@ const grpc = __importStar(require("@grpc/grpc-js"));
 const requestcontext_1 = __importStar(require("./requestcontext"));
 const savedApiUrl = process.env.API_URL;
 const savedApiKey = process.env.API_KEY;
+// Variables the lookup reads before API_URL; the host may set them.
+const SHADOWING = ['BROKER_HOST', 'LEDGER_SERVICE_HOST', 'LEDGER_SERVICE_PORT'];
+const savedShadowing = SHADOWING.map((k) => process.env[k]);
 function restoreEnv(name, value) {
     if (value === undefined) {
         delete process.env[name];
@@ -44,10 +47,12 @@ function restoreEnv(name, value) {
 beforeEach(() => {
     restoreEnv('API_URL', undefined);
     restoreEnv('API_KEY', undefined);
+    SHADOWING.forEach((k) => restoreEnv(k, undefined));
 });
 afterEach(() => {
     restoreEnv('API_URL', savedApiUrl);
     restoreEnv('API_KEY', savedApiKey);
+    SHADOWING.forEach((k, i) => restoreEnv(k, savedShadowing[i]));
     jest.restoreAllMocks();
 });
 describe('EnvConfig.apiURL', () => {
@@ -59,8 +64,8 @@ describe('EnvConfig.apiURL', () => {
         process.env.API_URL = 'localhost';
         expect(requestcontext_1.default.apiURL).toBe('localhost:8082');
     });
-    test('defaults to api.fintekkers.org:8082 when API_URL is unset', () => {
-        expect(requestcontext_1.default.apiURL).toBe('api.fintekkers.org:8082');
+    test('defaults to localhost:8082 when API_URL is unset', () => {
+        expect(requestcontext_1.default.apiURL).toBe('localhost:8082');
     });
 });
 describe('EnvConfig.apiKey', () => {
@@ -82,7 +87,15 @@ describe('EnvConfig.apiCredentials', () => {
         expect(insecure).toHaveBeenCalledTimes(1);
         expect(ssl).not.toHaveBeenCalled();
     });
-    test('uses SSL credentials when API_URL is unset', () => {
+    test('uses insecure credentials when API_URL is unset (localhost:8082)', () => {
+        const insecure = jest.spyOn(grpc.credentials, 'createInsecure');
+        const ssl = jest.spyOn(grpc.credentials, 'createSsl');
+        requestcontext_1.default.apiCredentials;
+        expect(insecure).toHaveBeenCalledTimes(1);
+        expect(ssl).not.toHaveBeenCalled();
+    });
+    test('uses SSL credentials for a remote API_URL', () => {
+        process.env.API_URL = 'myhost.example.com';
         const insecure = jest.spyOn(grpc.credentials, 'createInsecure');
         const ssl = jest.spyOn(grpc.credentials, 'createSsl');
         requestcontext_1.default.apiCredentials;
@@ -92,13 +105,14 @@ describe('EnvConfig.apiCredentials', () => {
 });
 describe('EnvConfig.getAuthenticatedCredentials', () => {
     test('metadata generator injects x-api-key', () => {
+        process.env.API_URL = 'myhost.example.com';
         const generatorSpy = jest.spyOn(grpc.credentials, 'createFromMetadataGenerator');
         const creds = requestcontext_1.default.getAuthenticatedCredentials('k');
         expect(creds).toBeInstanceOf(grpc.ChannelCredentials);
         expect(generatorSpy).toHaveBeenCalledTimes(1);
         const generator = generatorSpy.mock.calls[0][0];
         const callback = jest.fn();
-        generator({ service_url: 'https://api.fintekkers.org:8082' }, callback);
+        generator({ service_url: 'https://myhost.example.com:8082' }, callback);
         expect(callback).toHaveBeenCalledTimes(1);
         const [err, metadata] = callback.mock.calls[0];
         expect(err).toBeNull();
@@ -127,6 +141,7 @@ describe('EnvConfig.getAuthenticatedCredentials', () => {
             jest.spyOn(console, 'error').mockImplementation(() => { }),
         ];
         const generatorSpy = jest.spyOn(grpc.credentials, 'createFromMetadataGenerator');
+        process.env.API_URL = 'myhost.example.com';
         requestcontext_1.default.getAuthenticatedCredentials(secret);
         generatorSpy.mock.calls[0][0]({ service_url: '' }, () => { });
         process.env.API_URL = 'localhost:80';
@@ -148,8 +163,8 @@ describe('EnvConfig.getAuthenticatedClientOptions', () => {
         expect(ssl).not.toHaveBeenCalled();
         expect(interceptors).toHaveLength(1);
     });
-    test('uses SSL channel for api.fintekkers.org', () => {
-        process.env.API_URL = 'api.fintekkers.org';
+    test('uses SSL channel for a remote host', () => {
+        process.env.API_URL = 'myhost.example.com';
         const insecure = jest.spyOn(grpc.credentials, 'createInsecure');
         const ssl = jest.spyOn(grpc.credentials, 'createSsl');
         const { interceptors } = requestcontext_1.default.getAuthenticatedClientOptions('k');

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

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

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

@@ -10,6 +10,9 @@ import EnvConfig, { InsecureChannelAuthError } from './requestcontext';
 
 const savedApiUrl = process.env.API_URL;
 const savedApiKey = process.env.API_KEY;
+// Variables the lookup reads before API_URL; the host may set them.
+const SHADOWING = ['BROKER_HOST', 'LEDGER_SERVICE_HOST', 'LEDGER_SERVICE_PORT'];
+const savedShadowing = SHADOWING.map((k) => process.env[k]);
 
 function restoreEnv(name: string, value: string | undefined) {
   if (value === undefined) {
@@ -22,11 +25,13 @@ function restoreEnv(name: string, value: string | undefined) {
 beforeEach(() => {
   restoreEnv('API_URL', undefined);
   restoreEnv('API_KEY', undefined);
+  SHADOWING.forEach((k) => restoreEnv(k, undefined));
 });
 
 afterEach(() => {
   restoreEnv('API_URL', savedApiUrl);
   restoreEnv('API_KEY', savedApiKey);
+  SHADOWING.forEach((k, i) => restoreEnv(k, savedShadowing[i]));
   jest.restoreAllMocks();
 });
 
@@ -41,8 +46,8 @@ describe('EnvConfig.apiURL', () => {
     expect(EnvConfig.apiURL).toBe('localhost:8082');
   });
 
-  test('defaults to api.fintekkers.org:8082 when API_URL is unset', () => {
-    expect(EnvConfig.apiURL).toBe('api.fintekkers.org:8082');
+  test('defaults to localhost:8082 when API_URL is unset', () => {
+    expect(EnvConfig.apiURL).toBe('localhost:8082');
   });
 });
 
@@ -70,7 +75,18 @@ describe('EnvConfig.apiCredentials', () => {
     expect(ssl).not.toHaveBeenCalled();
   });
 
-  test('uses SSL credentials when API_URL is unset', () => {
+  test('uses insecure credentials when API_URL is unset (localhost:8082)', () => {
+    const insecure = jest.spyOn(grpc.credentials, 'createInsecure');
+    const ssl = jest.spyOn(grpc.credentials, 'createSsl');
+
+    EnvConfig.apiCredentials;
+
+    expect(insecure).toHaveBeenCalledTimes(1);
+    expect(ssl).not.toHaveBeenCalled();
+  });
+
+  test('uses SSL credentials for a remote API_URL', () => {
+    process.env.API_URL = 'myhost.example.com';
     const insecure = jest.spyOn(grpc.credentials, 'createInsecure');
     const ssl = jest.spyOn(grpc.credentials, 'createSsl');
 
@@ -83,6 +99,7 @@ describe('EnvConfig.apiCredentials', () => {
 
 describe('EnvConfig.getAuthenticatedCredentials', () => {
   test('metadata generator injects x-api-key', () => {
+    process.env.API_URL = 'myhost.example.com';
     const generatorSpy = jest.spyOn(grpc.credentials, 'createFromMetadataGenerator');
 
     const creds = EnvConfig.getAuthenticatedCredentials('k');
@@ -92,7 +109,7 @@ describe('EnvConfig.getAuthenticatedCredentials', () => {
 
     const generator = generatorSpy.mock.calls[0][0];
     const callback = jest.fn();
-    generator({ service_url: 'https://api.fintekkers.org:8082' }, callback);
+    generator({ service_url: 'https://myhost.example.com:8082' }, callback);
 
     expect(callback).toHaveBeenCalledTimes(1);
     const [err, metadata] = callback.mock.calls[0];
@@ -129,6 +146,7 @@ describe('EnvConfig.getAuthenticatedCredentials', () => {
     ];
     const generatorSpy = jest.spyOn(grpc.credentials, 'createFromMetadataGenerator');
 
+    process.env.API_URL = 'myhost.example.com';
     EnvConfig.getAuthenticatedCredentials(secret);
     generatorSpy.mock.calls[0][0]({ service_url: '' }, () => {});
     process.env.API_URL = 'localhost:80';
@@ -155,8 +173,8 @@ describe('EnvConfig.getAuthenticatedClientOptions', () => {
     expect(interceptors).toHaveLength(1);
   });
 
-  test('uses SSL channel for api.fintekkers.org', () => {
-    process.env.API_URL = 'api.fintekkers.org';
+  test('uses SSL channel for a remote host', () => {
+    process.env.API_URL = 'myhost.example.com';
     const insecure = jest.spyOn(grpc.credentials, 'createInsecure');
     const ssl = jest.spyOn(grpc.credentials, 'createSsl');
 

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":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,oDAAsC;AAEtC,MAAM,SAAS;IACL,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,YAAqB;QACzD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,IAAI,YAAY,KAAK,SAAS,EAAE;gBAC9B,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,cAAc,CAAC,CAAC;aAC5D;YACD,OAAO,YAAY,CAAC;SACrB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,MAAM;QACf,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACH,MAAM,KAAK,MAAM;QACf,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC;IACpD,CAAC;IAEO,MAAM,KAAK,UAAU;QAC3B,OAAO,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,KAAK,cAAc;QACvB,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;SAC1C;aACI;YACH,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;SACrC;IACH,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,QAAuB,EAAE,MAAc;QAC9D,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,2BAA2B,CAAC,MAAc;QAC/C,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,IAAI,wBAAwB,EAAE,CAAC;SACtC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,2BAA2B,CAC5D,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;YACpB,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACtC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3B,CAAC,CACF,CAAC;QACF,OAAO,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAC/C,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAC5B,SAAS,CACV,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,6BAA6B,CAAC,MAAc;QAIjD,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,WAAW,GAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;gBAC3D,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACnD,KAAK,CAAC,QAAuB,EAAE,QAAuB,EAAE,IAAc;wBACpE,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;wBACtC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC3B,CAAC;iBACF,CAAC,CAAC;YACL,CAAC,CAAC;YACF,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,EAAE,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;SACxF;QACD,OAAO;YACL,WAAW,EAAE,SAAS,CAAC,2BAA2B,CAAC,MAAM,CAAC;YAC1D,YAAY,EAAE,EAAE;SACjB,CAAC;IACJ,CAAC;CACF;AAED;;;GAGG;AACH,MAAa,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CAAC,gFAAgF,CAAC,CAAC;QACxF,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;QACvC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC;CACF;AAND,4DAMC;AAED,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"requestcontext.js","sourceRoot":"","sources":["requestcontext.ts"],"names":[],"mappings":"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"}