@syncbridge/common 0.6.1 → 0.6.3

package/classes/base-element.d.ts

@@ -14,7 +14,7 @@ export declare abstract class BaseElement<TEvents extends BaseElement.Events = B
     get status(): ServiceStatus;
     get statusMessage(): string;
     protected _init(): Promise<void>;
-    protected _start(abortSignal: AbortSignal): Promise<void>;
+    protected _start(abortSignal?: AbortSignal): Promise<void>;
     protected _stop(): Promise<void>;
     protected onStatusChange(): void;
 }

package/classes/base-element.js

@@ -26,6 +26,7 @@ export class BaseElement extends Runnable {
     async _init() {
         for (const component of Object.values(this.components)) {
             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,7 +43,8 @@ export class BaseElement extends Runnable {
                     counter.componentNames.push(comp.name);
                 });
                 this.emitSafe('component-status-change', component, status, statusMessage);
-                if (this._context.status !== this._context.calculatedStatus)
+                if (this._context.status !== this._context.calculatedStatus ||
+                    this._context.statusMessage !== this._context.statusMessage)
                     this.onStatusChange();
             });
         }
@@ -60,8 +62,6 @@ export class BaseElement extends Runnable {
             .map(component => component.stop()));
     }
     onStatusChange() {
-        const oldStatus = this.status;
-        const oldStatusMessage = this.statusMessage;
         this._context.calculatedStatus = this._context.status;
         this._context.calculatedStatusMessage = this._context.statusMessage;
         if (!(this.status === ServiceStatus.stopped ||
@@ -72,13 +72,10 @@ export class BaseElement extends Runnable {
                 if (indicator?.count) {
                     this._context.calculatedStatus = _status;
                     this._context.calculatedStatusMessage = `${_status} components: ${indicator.componentNames}`;
-                    return;
+                    break;
                 }
             }
         }
-        if (this.status !== oldStatus || this.statusMessage !== oldStatusMessage) {
-            this.logger?.debug(this.status);
-            super.onStatusChange();
-        }
+        super.onStatusChange();
     }
 }

package/classes/runnable.d.ts

@@ -5,6 +5,7 @@ import { ServiceStatus } from '../models/index.js';
  */
 export declare abstract class Runnable<T extends Runnable.Events = Runnable.Events> extends AsyncEventEmitter<EventMap<T>> {
     protected _context: Runnable.Context;
+    private _startAbortController?;
     constructor(init?: Runnable.InitArgs);
     get status(): ServiceStatus;
     get statusMessage(): string;
@@ -34,7 +35,7 @@ export declare abstract class Runnable<T extends Runnable.Events = Runnable.Even
     /**
      *
      */
-    protected abstract _start(abortSignal: AbortSignal): Promise<void>;
+    protected abstract _start(abortSignal?: AbortSignal): Promise<void>;
     /**
      *
      */

package/classes/runnable.js

@@ -8,6 +8,7 @@ import { SbError } from './sb-error.js';
  */
 export class Runnable extends AsyncEventEmitter {
     _context;
+    _startAbortController;
     constructor(init) {
         super();
         this.setMaxListeners(1000);
@@ -67,6 +68,9 @@ export class Runnable extends AsyncEventEmitter {
         if (this.status === ServiceStatus.started)
             return;
         this.setStatus(ServiceStatus.starting);
+        const abortController = (this._startAbortController =
+            new AbortController());
+        abortSignal?.addEventListener('abort', () => abortController.abort());
         this._context.waitTimer = Promise.resolve()
             .then(async () => {
             await this.init();
@@ -74,8 +78,6 @@ export class Runnable extends AsyncEventEmitter {
                 let promiseSettled = false;
                 await new Promise((resolve, reject) => {
                     let startWaitTimer;
-                    const abortController = new AbortController();
-                    abortSignal?.addEventListener('abort', () => abortController.abort());
                     if (this._context.startMaxWaitMs) {
                         startWaitTimer = setTimeout(() => {
                             const err = new SbError('Start timeout', {
@@ -124,6 +126,7 @@ export class Runnable extends AsyncEventEmitter {
             });
         })
             .finally(() => {
+            this._startAbortController = undefined;
             this._context.waitTimer = undefined;
         });
         await this._context.waitTimer;
@@ -132,12 +135,13 @@ export class Runnable extends AsyncEventEmitter {
      *
      */
     async stop() {
-        if (this._context.waitTimer)
-            await this._context.waitTimer;
         if (this.status === ServiceStatus.stopped)
             return;
         this.setStatus(ServiceStatus.stopping);
         this.emit('stopping');
+        this._startAbortController?.abort();
+        if (this._context.waitTimer)
+            await this._context.waitTimer;
         this._context.waitTimer = Promise.resolve()
             .then(async () => {
             try {

package/classes/sb-error.d.ts

@@ -5,6 +5,7 @@ export declare class SbError extends Error implements ErrorIssue {
     code?: string;
     [index: string]: any;
     constructor(message?: string | Error, options?: SbErrorOptions);
+    toJSON(): any;
 }
 export interface SbErrorOptions extends Partial<ErrorIssue> {
     cause?: Error;

package/classes/sb-error.js

@@ -42,6 +42,15 @@ export class SbError extends Error {
             }
         }
     }
+    toJSON() {
+        const out = {
+            message: this.message,
+        };
+        for (const k of Object.keys(this)) {
+            out[k] = this[k];
+        }
+        return out;
+    }
 }
 /**
  *

package/classes/stack-executor.js

@@ -32,15 +32,22 @@ export class StackExecutor {
         if (e instanceof ValidationError) {
             e.issues.forEach(x => {
                 const issue = new SbValidationError(x.message, x);
-                x.severity = x.severity ?? 'error';
-                x.location = location + (x.location ? '/' + x.location : '');
+                issue.severity = x.severity ?? 'error';
+                issue.location = location + (x.location ? '/' + x.location : '');
+                issue.stack = x.stack;
                 this.issues.push(issue);
             });
         }
         else {
-            e.severity = e.severity ?? 'error';
-            e.location = location;
-            this.issues.push(e);
+            const issue = {
+                message: e.message,
+                severity: e.severity || 'error',
+                location,
+                stack: e.stack,
+                ...e,
+            };
+            Object.setPrototypeOf(issue, Object.getPrototypeOf(e));
+            this.issues.push(issue);
         }
     }
 }

package/constants.js

@@ -1,4 +1,4 @@
-export const version = '0.6.1';
+export const version = '0.6.3';
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncbridge/common",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "SyncBridge Common utilities",
   "author": "Panates Inc",
   "license": "MIT",

package/processor-factory.js

@@ -97,7 +97,7 @@ export var ProcessorFactory;
                         oldMetadata?.className !== newMetadata.className)
                         throw new SbError('Cannot change component class while processor running. You should stop it first.');
                     /** Validate sub components */
-                    if (childMetadata.components) {
+                    if (childMetadata.components && componentInstance) {
                         _validateComponents({
                             ...ctx,
                             owner: componentInstance,
@@ -128,9 +128,11 @@ export var ProcessorFactory;
     }
     async function _configureComponent(ctx, key, childMetadata) {
         const { newProfile, oldMetadata, oldProfile, curPath, owner, processor } = ctx;
+        const childProfile = newProfile.components[key];
+        if (!childProfile?.className)
+            return;
         const oldChildMetadata = oldMetadata?.components?.[key];
         const oldChildProfile = oldProfile?.components?.[key];
-        const childProfile = newProfile.components[key];
         const componentPath = curPath ? curPath + '/' + key : key;
         let componentInstance = owner.components?.[key];
         /** Create the component only if the owner stopped */ // todo implement hotplug components

package/utils/decode-profile.js

@@ -14,6 +14,10 @@ export function decodeProfile(materializedMetadata, rawProfile, options) {
             issues
                 .map(issue => `- ${issue.message}. Location: /${issue.location}`)
                 .join('\n  ');
+        issues.forEach(issue => {
+            if (issue instanceof SbValidationError)
+                delete issue.stack;
+        });
         throw new SbValidationError(msg, {
             workerId: rawProfile.id,
             issues,

package/utils/materialize-metadata.js

@@ -13,6 +13,10 @@ export function materializeMetadata(profile) {
             issues
                 .map(issue => `- ${issue.message}. Location: /${issue.location}`)
                 .join('\n  ');
+        issues.forEach(issue => {
+            if (issue instanceof SbValidationError)
+                delete issue.stack;
+        });
         throw new SbValidationError(msg, {
             workerId: profile.id,
             issues,