@onlineapps/conn-orch-registry 1.1.26 → 1.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-registry",
-  "version": "1.1.26",
+  "version": "1.1.27",
   "license": "MIT",
   "description": "Connector-registry-client provides the core communication mechanism for microservices in this environment. It enables them to interact with a services_registry to receive and fulfill tasks by submitting heartbeats or their API descriptions.",
   "keywords": [
@@ -39,12 +39,11 @@
   },
   "dependencies": {
     "@onlineapps/conn-base-storage": "1.0.2",
-    "@onlineapps/mq-client-core": "1.0.61",
+    "@onlineapps/mq-client-core": "1.0.62",
+    "@onlineapps/runtime-config": "1.0.2",
     "amqplib": "^0.10.9",
     "axios": "^1.12.2",
-    "dotenv": "^16.6.1",
     "ioredis": "^5.8.0",
-    "joi": "^17.9.2",
     "uuid": "^9.0.1"
   },
   "devDependencies": {

package/src/config.js

@@ -1,52 +1,26 @@
+'use strict';
+
 /**
- * config.js
- *
- * Loads and validates configuration variables via environment variables.
- * Uses dotenv to load the .env file and Joi for validation.
+ * Runtime configuration schema for @onlineapps/conn-orch-registry.
  *
- * @module @onlineapps/connector-registry-client/src/config
+ * Uses @onlineapps/runtime-config for unified priority:
+ * 1. Explicit config
+ * 2. Environment variable
+ * 3. Module-owned defaults (from ./defaults.js)
  */
 
-// Load .env (if it exists)
-require('dotenv').config();
-
-const Joi = require('joi');
-
-// Define schema for environment variables
-const envSchema = Joi.object({
-  AMQP_URL: Joi.string().uri().required()
-    .description('AMQP URI for connecting to RabbitMQ'),
-
-  SERVICE_NAME: Joi.string().required()
-    .description('Name of the service to register'),
-
-  SERVICE_VERSION: Joi.string().required()
-    .description('Service version in SemVer format'),
-
-  HEARTBEAT_INTERVAL: Joi.number().integer().min(1000).default(10000)
-    .description('Interval for sending heartbeat messages in ms'),
-
-  API_QUEUE: Joi.string().default('api_services_queuer')
-    .description('Name of the queue for heartbeat and API requests'),
-
-  REGISTRY_QUEUE: Joi.string().default('registry.register')
-    .description('Name of the queue for registry messages')
-})
-  .unknown() // allow additional variables
-  .required();
-
-// Validate variables
-const { error, value: envVars } = envSchema.validate(process.env);
-if (error) {
-  throw new Error(`Config validation error: ${error.message}`);
-}
-
-// Export configuration
-module.exports = {
-  amqpUrl: envVars.AMQP_URL,
-  serviceName: envVars.SERVICE_NAME,
-  version: envVars.SERVICE_VERSION,
-  heartbeatInterval: envVars.HEARTBEAT_INTERVAL,
-  apiQueue: envVars.API_QUEUE,
-  registryQueue: envVars.REGISTRY_QUEUE
-};
+const { createRuntimeConfig } = require('@onlineapps/runtime-config');
+const DEFAULTS = require('./defaults');
+
+const runtimeCfg = createRuntimeConfig({
+  defaults: DEFAULTS,
+  schema: {
+    // Local spec fetch settings (optional; only required when auto-fetching spec)
+    servicePort: { env: 'PORT', type: 'number' },
+    specHost: { env: 'REGISTRY_SPEC_HOST', defaultKey: 'specHost' },
+    specProtocol: { env: 'REGISTRY_SPEC_PROTOCOL', defaultKey: 'specProtocol' },
+    specificationEndpoint: { env: 'REGISTRY_SPEC_ENDPOINT', defaultKey: 'specificationEndpoint' },
+  }
+});
+
+module.exports = runtimeCfg;

package/src/defaults.js

@@ -0,0 +1,18 @@
+'use strict';
+
+/**
+ * Module-owned defaults for @onlineapps/conn-orch-registry.
+ *
+ * Ownership rule:
+ * - Defaults here belong to the registry connector behavior (not infra topology).
+ * - Any required topology (e.g., service port for local spec fetch) must be provided via config/ENV.
+ */
+
+module.exports = {
+  specificationEndpoint: '/api/v1/specification',
+
+  specProtocol: 'http',
+  specHost: '127.0.0.1',
+};
+
+

package/src/registryClient.js

@@ -20,6 +20,7 @@ const QueueManager = require('./queueManager');
 const RegistryEventConsumer = require('./registryEventConsumer');
 const { v4: uuidv4 } = require('uuid');
 const queueConfig = require('@onlineapps/mq-client-core/src/config/queueConfig');
+const runtimeCfg = require('./config');
 
 
 class ServiceRegistryClient extends EventEmitter {
@@ -43,6 +44,7 @@ class ServiceRegistryClient extends EventEmitter {
     }
     this.serviceName = serviceName;
     this.version = version;
+    // Spec endpoint is still configurable, but defaults are module-owned and can be overridden via runtime config.
     this.specificationEndpoint = specificationEndpoint;
     this.heartbeatInterval = heartbeatInterval;
     this.apiQueue = apiQueue;
@@ -584,7 +586,12 @@ class ServiceRegistryClient extends EventEmitter {
     // If no spec provided, try to fetch it
     if (!spec) {
       try {
-        const response = await fetch(`http://localhost:${process.env.PORT || 3000}${this.specificationEndpoint}`);
+        const resolved = runtimeCfg.resolve({ specificationEndpoint: this.specificationEndpoint });
+        if (!resolved.servicePort) {
+          throw new Error('[RegistryClient] Missing required config - Expected PORT (servicePort) to auto-fetch specification, or pass spec explicitly');
+        }
+        const url = `${resolved.specProtocol}://${resolved.specHost}:${resolved.servicePort}${resolved.specificationEndpoint}`;
+        const response = await fetch(url);
         if (response.ok) {
           spec = await response.json();
         }