@syncbridge/common 0.6.4 → 0.6.6

package/classes/base-element.js

@@ -25,8 +25,8 @@ export class BaseElement extends Runnable {
     }
     async _init() {
         for (const component of Object.values(this.components)) {
+            component.on('component-status-change', (...args) => this.emitAsyncSafe('component-status-change', ...args));
             component.on('status-change', (status, statusMessage) => {
-                component.on('component-status-change', (...args) => this.emitAsyncSafe('component-status-change', ...args));
                 /** Reset counters */
                 this._context.statusIndicators = this._context.statusIndicators || {};
                 Object.keys(ServiceStatus).forEach(key => {
@@ -42,9 +42,30 @@ export class BaseElement extends Runnable {
                     counter.components.push(comp);
                     counter.componentNames.push(comp.name);
                 });
+                const oldStatus = this.status;
+                const oldStatusMessage = this.statusMessage;
+                this._context.calculatedStatus = undefined;
+                this._context.calculatedStatusMessage = undefined;
+                /** If there are one or more unhealthy components, set calculatedStatus to unhealthy */
+                if (this._context.status === ServiceStatus.started ||
+                    this._context.status === ServiceStatus.starting) {
+                    for (const _status of [
+                        ServiceStatus.unhealthy,
+                        ServiceStatus.starting,
+                    ]) {
+                        for (const cmp of Object.values(this.components)) {
+                            if (cmp.status === _status) {
+                                this._context.calculatedStatus = _status;
+                                if (_status === ServiceStatus.unhealthy)
+                                    this._context.calculatedStatusMessage = cmp.statusMessage;
+                                break;
+                            }
+                        }
+                    }
+                }
                 this.emitSafe('component-status-change', component, status, statusMessage);
-                if (this._context.status !== this._context.calculatedStatus ||
-                    this._context.statusMessage !== this._context.statusMessage)
+                if (this.status !== oldStatus ||
+                    this.statusMessage !== oldStatusMessage)
                     this.onStatusChange();
             });
         }
@@ -62,20 +83,6 @@ export class BaseElement extends Runnable {
             .map(component => component.stop()));
     }
     onStatusChange() {
-        this._context.calculatedStatus = this._context.status;
-        this._context.calculatedStatusMessage = this._context.statusMessage;
-        if (!(this.status === ServiceStatus.stopped ||
-            this.status === ServiceStatus.stopping)) {
-            /** If there are one or more unhealthy components, set calculatedStatus to unhealthy */
-            for (const _status of [ServiceStatus.unhealthy, ServiceStatus.starting]) {
-                const indicator = this._context.statusIndicators?.[_status];
-                if (indicator?.count) {
-                    this._context.calculatedStatus = _status;
-                    this._context.calculatedStatusMessage = `${_status} components: ${indicator.componentNames}`;
-                    break;
-                }
-            }
-        }
         super.onStatusChange();
     }
 }

package/classes/runnable.js

@@ -112,6 +112,8 @@ export class Runnable extends AsyncEventEmitter {
                 }).finally(() => (promiseSettled = true));
             }
             catch (e) {
+                if (this.status === ServiceStatus.stopping)
+                    return;
                 const err = e instanceof SbError ? e : new SbError(e);
                 err.code = err.code || 'START_FAILED';
                 this.onError(err);

package/constants.js

@@ -1,4 +1,4 @@
-export const version = '0.6.4';
+export const version = '0.6.6';
 export const OWN_ELEMENT_METADATA = Symbol.for('OWN_ELEMENT_METADATA');
 export const COMPONENT_OPTIONS = Symbol.for('COMPONENT_OPTIONS');
 export const PROCESSOR_OPTIONS = Symbol.for('PROCESSOR_OPTIONS');

package/models/metadata/element-component-metadata.d.ts

@@ -12,6 +12,7 @@ export declare class ElementComponentMetadata {
     propertyKey?: string;
     className?: string;
     description?: string;
+    disabled?: boolean;
     interfaces?: string[];
     required?: boolean;
     variables?: VariableMetadataRecord;

package/models/metadata/element-component-metadata.js

@@ -21,6 +21,7 @@ let ElementComponentMetadata = class ElementComponentMetadata {
 };
 __decorate([
     ApiField({
+        label: 'Class Name',
         description: 'Class name of the component',
         type: 'string',
     }),
@@ -28,6 +29,7 @@ __decorate([
 ], ElementComponentMetadata.prototype, "className", void 0);
 __decorate([
     ApiField({
+        label: 'Description',
         description: 'Description of the component',
         type: 'string',
     }),
@@ -35,6 +37,15 @@ __decorate([
 ], ElementComponentMetadata.prototype, "description", void 0);
 __decorate([
     ApiField({
+        label: 'Disabled',
+        description: 'Determine if the component is disabled or not',
+        type: 'string',
+    }),
+    __metadata("design:type", Boolean)
+], ElementComponentMetadata.prototype, "disabled", void 0);
+__decorate([
+    ApiField({
+        label: 'Interfaces',
         description: 'Interfaces should be implemented by the component. This value is ignored if className is set',
         type: 'string',
         required: true,
@@ -44,6 +55,7 @@ __decorate([
 ], ElementComponentMetadata.prototype, "interfaces", void 0);
 __decorate([
     ApiField({
+        label: 'Required',
         description: 'Determine if the component is required or not',
         default: true,
     }),
@@ -51,6 +63,7 @@ __decorate([
 ], ElementComponentMetadata.prototype, "required", void 0);
 __decorate([
     ApiField({
+        label: 'Variables',
         description: 'Variables to be overridden',
     }),
     __metadata("design:type", VariableMetadataRecord)

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@syncbridge/common",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "SyncBridge Common utilities",
   "author": "Panates Inc",
   "license": "MIT",
   "dependencies": {
-    "@jsopen/objects": "^2.1.1",
+    "@jsopen/objects": "^2.2.0",
     "fast-deep-equal": "^3.1.3",
     "node-events-async": "^1.5.0",
     "reflect-metadata": "^0.2.2",

package/processor-factory.js

@@ -121,7 +121,8 @@ export var ProcessorFactory;
             for (const [key, childMetadata] of Object.entries(newMetadata.components)) {
                 // Stack: components/componentName
                 await stackExecutor.executeAsync(key, async () => {
-                    await _configureComponent(ctx, key, childMetadata);
+                    if (!childMetadata.disabled)
+                        await _configureComponent(ctx, key, childMetadata);
                 });
             }
         });

package/registry/extension-package.js

@@ -7,7 +7,7 @@ import { updateErrorMessage } from '@jsopen/objects';
 import { SbError } from '../classes/sb-error.js';
 import { COMPONENT_OPTIONS, PROCESSOR_OPTIONS } from '../constants.js';
 import { isComponentBase, isProcessorBase } from '../utils/type-guartds.js';
-import { normalizeComponentMetadata, normalizeProcessorMetadata, } from './helpers.js';
+import { normalizeComponentMetadata, normalizeProcessorMetadata, } from './normalize-metadata.js';
 /**
  *
  */

package/registry/extension-registry.js

@@ -2,7 +2,7 @@ import semver from 'semver';
 import { SbError } from '../classes/sb-error.js';
 import { COMPONENT_OPTIONS, PROCESSOR_OPTIONS } from '../constants.js';
 import { ComponentExtension, ExtensionPackage, ProcessorExtension, } from './extension-package.js';
-import { normalizeComponentMetadata, normalizeProcessorMetadata, } from './helpers.js';
+import { normalizeComponentMetadata, normalizeProcessorMetadata, } from './normalize-metadata.js';
 export var ExtensionRegistry;
 (function (ExtensionRegistry) {
     let _resolver;