tnp-helpers 18.0.18 → 18.0.19

package/websql/lib/base/classes/base-cli-worker.d.ts

@@ -16,6 +16,7 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
      * unique id for service
      */
     protected readonly serviceVersion: string;
+    protected SPECIAL_WORKER_READY_MESSAGE: string;
     constructor(
     /**
      * unique id for service
@@ -33,7 +34,9 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
     abstract getControllerForRemoteConnection(): Promise<REMOTE_CTRL>;
     protected get pathToProcessLocalInfoJson(): string;
     protected get processLocalInfoObj(): BaseCliWorkerConfig;
-    startDetachedIfNeedsToBeStarted(): Promise<any>;
+    startDetachedIfNeedsToBeStarted(options?: {
+        useCurrentWindowForDetach?: boolean;
+    }): Promise<any>;
     /**
      * stop if started
      */
@@ -46,6 +49,7 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
      */
     restart(options?: {
         detached?: boolean;
+        useCurrentWindowForDetach?: boolean;
     }): Promise<void>;
     /**
      * only for cli start
@@ -66,7 +70,9 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
     /**
      * start if not started detached process
      */
-    protected startDetached(): Promise<any>;
+    protected startDetached(options?: {
+        useCurrentWindowForDetach?: boolean;
+    }): Promise<any>;
     protected headerText(): Promise<string>;
     protected textHeaderStyle(): CfontStyle;
     protected headerTextAlign(): CfontAlign;
@@ -75,13 +81,30 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
      */
     protected header(): Promise<void>;
     infoMessageBelowHeader(): Promise<void>;
-    protected getWorkerTerminalActions(): {
+    protected get backAction(): {
+        back: {
+            name: string;
+        };
+    };
+    protected get chooseAction(): {
+        emptyAction: {
+            name: string;
+            action: () => Promise<void>;
+        };
+    };
+    protected displaySpecialWorkerReadyMessage(): void;
+    protected getWorkerTerminalActions(options?: {
+        exitIsOnlyReturn?: boolean;
+        chooseAction?: boolean;
+    }): {
         [uniqeActionName: string]: {
             name: string;
             action: () => void | Promise<void>;
         };
     };
-    protected _infoScreen(): Promise<void>;
+    infoScreen(options?: {
+        exitIsOnlyReturn?: boolean;
+    }): Promise<void>;
     private saveProcessInfo;
     protected initializeWorkerMetadata(): Promise<any>;
     protected waitForProcessPortSavedToDisk(): Promise<void>;

package/websql/lib/base/tcp-udp-ports/index.d.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-export * from './not-assignable-port.entity';
 export * from './ports.entity';
 export * from './ports.controller';
 export * from './tcp-upd-ports.worker';

package/websql/lib/base/tcp-udp-ports/ports.controller.d.ts

@@ -2,15 +2,24 @@
 import { Taon } from 'taon/websql';
 import { BaseCliWorkerController } from '../classes/base-cli-worker-controller';
 import { Port, PortStatus } from './ports.entity';
-import { NotAssignablePort } from './not-assignable-port.entity';
 export declare class PortsController extends BaseCliWorkerController {
     START_PORT: number;
     END_PORT: number;
-    readonly takenByOsPorts: Map<number, NotAssignablePort>;
-    readonly assignedPorts: Map<string, Port>;
-    get firstFreePort(): Port;
-    protected firstUnassignedPortMoreThan(port: number): Port;
-    getPortByStatus(status: PortStatus): Taon.Response<Port[]>;
+    readonly portsCache: Map<string, Port>;
+    protected get firstFreePort(): any;
+    protected firstUnassignedPortMoreThan(port: number): any;
+    getFirstFreePort(): Taon.Response<Port>;
+    getPortByNumber(portNumber: number): Taon.Response<Port>;
+    getPortsByStatus(status: PortStatus): Taon.Response<Port[]>;
+    /**
+     * make it unassigned
+     */
+    deletePort(portNumber: number): Taon.Response<Port>;
+    /**
+     * make it unassigned
+     */
+    updatePortUniqueId(portNumber: number, serviceId: string): Taon.Response<Port>;
+    addTakeByOsPort(portNumber: number, uniqueId: string): Taon.Response<Port>;
     /**
      * @param uniqueServiceName unique service name
      * @param startFrom start searching for free port from this number

package/websql/lib/base/tcp-udp-ports/ports.entity.d.ts

@@ -1,13 +1,17 @@
 // @ts-nocheck
-import { NotAssignablePort } from './not-assignable-port.entity';
+import { Taon } from 'taon/websql';
 export type PortStatus = 'unassigned' | 'assigned' | 'assigned-not-registered' | 'assigned-taken-by-os';
 export declare const PortStatusArr: PortStatus[];
-export declare class Port extends NotAssignablePort {
-    static from(opt: Omit<Port, 'version' | '_' | 'clone'>): Port & Omit<Port, "_" | "version" | "clone">;
+export declare class Port extends Taon.Base.Entity {
+    static from(opt: Omit<Port, 'version' | '_' | 'clone' | 'titleOnList'>): Port & Omit<Port, "_" | "version" | "clone" | "titleOnList">;
+    static getTitleForFreePort(port: Number): string;
+    get titleOnList(): string;
+    port: number;
+    serviceId: string;
     /**
      * Port status
      */
-    status?: PortStatus;
+    status: PortStatus;
     /**
      * When port was assigned as registered service
      */

package/websql/lib/base/tcp-udp-ports/tcp-upd-ports.worker.d.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import { BaseCliWorker, CfontStyle } from '../classes/base-cli-worker';
-import { PortStatus } from '../../index';
+import { Port, PortStatus } from '../../index';
 import { PortsController } from '../tcp-udp-ports/ports.controller';
 export declare class PortsWorker extends BaseCliWorker<PortsController> {
     private portsController;
@@ -13,11 +13,13 @@ export declare class PortsWorker extends BaseCliWorker<PortsController> {
      */
     startNormallyInCurrentProcess(): Promise<any>;
     protected displayItemsForPortsStatus(status: PortStatus): Promise<any>;
-    get backAction(): {
-        back: {
-            name: string;
-            action: () => Promise<boolean>;
-        };
-    };
-    getWorkerTerminalActions(): any;
+    getWorkerTerminalActions(options?: {
+        exitIsOnlyReturn?: boolean;
+    }): any;
+    protected getNewPortToAdd(): Promise<number>;
+    protected addPortTerminalUiProcess(): Promise<void>;
+    protected selectPortProcess(ports: Port[], title: string): Promise<Port>;
+    protected deletePortTerminalUiProcess(): Promise<any>;
+    protected editPortTerminalUiProcess(): Promise<any>;
+    protected crudMenuForTakeByOsPorts(): Promise<void>;
 }

package/browser/esm2022/lib/base/tcp-udp-ports/not-assignable-port.entity.mjs

@@ -1,19 +0,0 @@
-var NotAssignablePort_1;
-import { __decorate } from "tslib";
-import { Taon } from 'taon/browser';
-import { _ } from 'tnp-core/browser';
-let NotAssignablePort = NotAssignablePort_1 = class NotAssignablePort extends Taon.Base.Entity {
-    static from(opt) {
-        return _.merge(new NotAssignablePort_1(), opt);
-    }
-};
-NotAssignablePort = NotAssignablePort_1 = __decorate([
-    Taon.Entity({
-        className: 'NotAssignablePort',
-        uniqueKeyProp: 'port',
-    })
-], NotAssignablePort);
-export { NotAssignablePort };
-;
-({}); // @--end-of-file-for-module=tnp-helpers lib/base/tcp-udp-ports/not-assignable-port.entity.ts
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90LWFzc2lnbmFibGUtcG9ydC5lbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi90bXAtbGlicy1mb3ItZGlzdC90bnAtaGVscGVycy9wcm9qZWN0cy90bnAtaGVscGVycy9zcmMvbGliL2Jhc2UvdGNwLXVkcC1wb3J0cy9ub3QtYXNzaWduYWJsZS1wb3J0LmVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBTTlCLElBQU0saUJBQWlCLHlCQUF2QixNQUFNLGlCQUFrQixTQUFRLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTTtJQUNyRCxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQXVEO1FBQ2pFLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLG1CQUFpQixFQUFFLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDL0MsQ0FBQztDQXNCRixDQUFBO0FBekJZLGlCQUFpQjtJQUo3QixJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ1gsU0FBUyxFQUFFLG1CQUFtQjtRQUM5QixhQUFhLEVBQUUsTUFBTTtLQUN0QixDQUFDO0dBQ1csaUJBQWlCLENBeUI3Qjs7QUFFQSxDQUFDO0FBQUEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLDZGQUE2RiIsInNvdXJjZXNDb250ZW50IjpbIlxuXG5pbXBvcnQgeyBUYW9uIH0gZnJvbSAndGFvbi9icm93c2VyJztcbmltcG9ydCB7IF8gfSBmcm9tICd0bnAtY29yZS9icm93c2VyJztcblxuQFRhb24uRW50aXR5KHtcbiAgY2xhc3NOYW1lOiAnTm90QXNzaWduYWJsZVBvcnQnLFxuICB1bmlxdWVLZXlQcm9wOiAncG9ydCcsXG59KVxuZXhwb3J0IGNsYXNzIE5vdEFzc2lnbmFibGVQb3J0IGV4dGVuZHMgVGFvbi5CYXNlLkVudGl0eSB7XG4gIHN0YXRpYyBmcm9tKG9wdDogT21pdDxOb3RBc3NpZ25hYmxlUG9ydCwgJ3ZlcnNpb24nIHwgJ18nIHwgJ2Nsb25lJz4pIHtcbiAgICByZXR1cm4gXy5tZXJnZShuZXcgTm90QXNzaWduYWJsZVBvcnQoKSwgb3B0KTtcbiAgfVxuXG5cbi8qICovXG4vKiAqL1xuLyogKi9cbi8qICovXG4vKiAqL1xuICBcbiAgcG9ydDogbnVtYmVyO1xuXG5cblxuLyogKi9cbi8qICovXG4vKiAqL1xuLyogKi9cbi8qICovXG4vKiAqL1xuICBcbiAgc2VydmljZUlkOiBzdHJpbmc7XG5cbn1cblxuIDsoe30pOyAvLyBALS1lbmQtb2YtZmlsZS1mb3ItbW9kdWxlPXRucC1oZWxwZXJzIGxpYi9iYXNlL3RjcC11ZHAtcG9ydHMvbm90LWFzc2lnbmFibGUtcG9ydC5lbnRpdHkudHMiXX0=

package/browser/lib/base/tcp-udp-ports/not-assignable-port.entity.d.ts

@@ -1,7 +0,0 @@
-// @ts-nocheck
-import { Taon } from 'taon/browser';
-export declare class NotAssignablePort extends Taon.Base.Entity {
-    static from(opt: Omit<NotAssignablePort, 'version' | '_' | 'clone'>): NotAssignablePort & Omit<NotAssignablePort, "_" | "version" | "clone">;
-    port: number;
-    serviceId: string;
-}

package/client/esm2022/lib/base/tcp-udp-ports/not-assignable-port.entity.mjs

@@ -1,19 +0,0 @@
-var NotAssignablePort_1;
-import { __decorate } from "tslib";
-import { Taon } from 'taon/browser';
-import { _ } from 'tnp-core/browser';
-let NotAssignablePort = NotAssignablePort_1 = class NotAssignablePort extends Taon.Base.Entity {
-    static from(opt) {
-        return _.merge(new NotAssignablePort_1(), opt);
-    }
-};
-NotAssignablePort = NotAssignablePort_1 = __decorate([
-    Taon.Entity({
-        className: 'NotAssignablePort',
-        uniqueKeyProp: 'port',
-    })
-], NotAssignablePort);
-export { NotAssignablePort };
-;
-({}); // @--end-of-file-for-module=tnp-helpers lib/base/tcp-udp-ports/not-assignable-port.entity.ts
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90LWFzc2lnbmFibGUtcG9ydC5lbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi90bXAtbGlicy1mb3ItZGlzdC90bnAtaGVscGVycy9wcm9qZWN0cy90bnAtaGVscGVycy9zcmMvbGliL2Jhc2UvdGNwLXVkcC1wb3J0cy9ub3QtYXNzaWduYWJsZS1wb3J0LmVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEMsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBTTlCLElBQU0saUJBQWlCLHlCQUF2QixNQUFNLGlCQUFrQixTQUFRLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTTtJQUNyRCxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQXVEO1FBQ2pFLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLG1CQUFpQixFQUFFLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDL0MsQ0FBQztDQXNCRixDQUFBO0FBekJZLGlCQUFpQjtJQUo3QixJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ1gsU0FBUyxFQUFFLG1CQUFtQjtRQUM5QixhQUFhLEVBQUUsTUFBTTtLQUN0QixDQUFDO0dBQ1csaUJBQWlCLENBeUI3Qjs7QUFFQSxDQUFDO0FBQUEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLDZGQUE2RiIsInNvdXJjZXNDb250ZW50IjpbIlxuXG5pbXBvcnQgeyBUYW9uIH0gZnJvbSAndGFvbi9icm93c2VyJztcbmltcG9ydCB7IF8gfSBmcm9tICd0bnAtY29yZS9icm93c2VyJztcblxuQFRhb24uRW50aXR5KHtcbiAgY2xhc3NOYW1lOiAnTm90QXNzaWduYWJsZVBvcnQnLFxuICB1bmlxdWVLZXlQcm9wOiAncG9ydCcsXG59KVxuZXhwb3J0IGNsYXNzIE5vdEFzc2lnbmFibGVQb3J0IGV4dGVuZHMgVGFvbi5CYXNlLkVudGl0eSB7XG4gIHN0YXRpYyBmcm9tKG9wdDogT21pdDxOb3RBc3NpZ25hYmxlUG9ydCwgJ3ZlcnNpb24nIHwgJ18nIHwgJ2Nsb25lJz4pIHtcbiAgICByZXR1cm4gXy5tZXJnZShuZXcgTm90QXNzaWduYWJsZVBvcnQoKSwgb3B0KTtcbiAgfVxuXG5cbi8qICovXG4vKiAqL1xuLyogKi9cbi8qICovXG4vKiAqL1xuICBcbiAgcG9ydDogbnVtYmVyO1xuXG5cblxuLyogKi9cbi8qICovXG4vKiAqL1xuLyogKi9cbi8qICovXG4vKiAqL1xuICBcbiAgc2VydmljZUlkOiBzdHJpbmc7XG5cbn1cblxuIDsoe30pOyAvLyBALS1lbmQtb2YtZmlsZS1mb3ItbW9kdWxlPXRucC1oZWxwZXJzIGxpYi9iYXNlL3RjcC11ZHAtcG9ydHMvbm90LWFzc2lnbmFibGUtcG9ydC5lbnRpdHkudHMiXX0=

package/client/lib/base/tcp-udp-ports/not-assignable-port.entity.d.ts

@@ -1,7 +0,0 @@
-// @ts-nocheck
-import { Taon } from 'taon/browser';
-export declare class NotAssignablePort extends Taon.Base.Entity {
-    static from(opt: Omit<NotAssignablePort, 'version' | '_' | 'clone'>): NotAssignablePort & Omit<NotAssignablePort, "_" | "version" | "clone">;
-    port: number;
-    serviceId: string;
-}

package/websql/esm2022/lib/base/tcp-udp-ports/not-assignable-port.entity.mjs

@@ -1,34 +0,0 @@
-var NotAssignablePort_1;
-import { __decorate, __metadata } from "tslib";
-import { Taon } from 'taon/websql';
-import { _ } from 'tnp-core/websql';
-let NotAssignablePort = NotAssignablePort_1 = class NotAssignablePort extends Taon.Base.Entity {
-    static from(opt) {
-        return _.merge(new NotAssignablePort_1(), opt);
-    }
-};
-__decorate([
-    Taon.Orm.Column.Primary({
-        type: 'int',
-        unique: true,
-    }),
-    __metadata("design:type", Number)
-], NotAssignablePort.prototype, "port", void 0);
-__decorate([
-    Taon.Orm.Column.Custom({
-        type: 'varchar',
-        length: 1000,
-        unique: true,
-    }),
-    __metadata("design:type", String)
-], NotAssignablePort.prototype, "serviceId", void 0);
-NotAssignablePort = NotAssignablePort_1 = __decorate([
-    Taon.Entity({
-        className: 'NotAssignablePort',
-        uniqueKeyProp: 'port',
-    })
-], NotAssignablePort);
-export { NotAssignablePort };
-;
-({}); // @--end-of-file-for-module=tnp-helpers lib/base/tcp-udp-ports/not-assignable-port.entity.ts
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90LWFzc2lnbmFibGUtcG9ydC5lbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi90bXAtbGlicy1mb3ItZGlzdC13ZWJzcWwvdG5wLWhlbHBlcnMvcHJvamVjdHMvdG5wLWhlbHBlcnMvc3JjL2xpYi9iYXNlL3RjcC11ZHAtcG9ydHMvbm90LWFzc2lnbmFibGUtcG9ydC5lbnRpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ25DLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQU03QixJQUFNLGlCQUFpQix5QkFBdkIsTUFBTSxpQkFBa0IsU0FBUSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU07SUFDckQsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUF1RDtRQUNqRSxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxtQkFBaUIsRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQy9DLENBQUM7Q0FzQkYsQ0FBQTtBQWJDO0lBTEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDO1FBQ3ZCLElBQUksRUFBRSxLQUFLO1FBQ1gsTUFBTSxFQUFFLElBQUk7S0FDYixDQUFDOzsrQ0FFVztBQVdiO0lBTkMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO1FBQ3RCLElBQUksRUFBRSxTQUFTO1FBQ2YsTUFBTSxFQUFFLElBQUk7UUFDWixNQUFNLEVBQUUsSUFBSTtLQUNiLENBQUM7O29EQUVnQjtBQXZCUCxpQkFBaUI7SUFKN0IsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUNYLFNBQVMsRUFBRSxtQkFBbUI7UUFDOUIsYUFBYSxFQUFFLE1BQU07S0FDdEIsQ0FBQztHQUNXLGlCQUFpQixDQXlCN0I7O0FBRUEsQ0FBQztBQUFBLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyw2RkFBNkYiLCJzb3VyY2VzQ29udGVudCI6WyJcblxuaW1wb3J0IHsgVGFvbiB9IGZyb20gJ3Rhb24vd2Vic3FsJztcbmltcG9ydCB7IF8gfSBmcm9tICd0bnAtY29yZS93ZWJzcWwnO1xuXG5AVGFvbi5FbnRpdHkoe1xuICBjbGFzc05hbWU6ICdOb3RBc3NpZ25hYmxlUG9ydCcsXG4gIHVuaXF1ZUtleVByb3A6ICdwb3J0Jyxcbn0pXG5leHBvcnQgY2xhc3MgTm90QXNzaWduYWJsZVBvcnQgZXh0ZW5kcyBUYW9uLkJhc2UuRW50aXR5IHtcbiAgc3RhdGljIGZyb20ob3B0OiBPbWl0PE5vdEFzc2lnbmFibGVQb3J0LCAndmVyc2lvbicgfCAnXycgfCAnY2xvbmUnPikge1xuICAgIHJldHVybiBfLm1lcmdlKG5ldyBOb3RBc3NpZ25hYmxlUG9ydCgpLCBvcHQpO1xuICB9XG5cblxuXG4gIEBUYW9uLk9ybS5Db2x1bW4uUHJpbWFyeSh7XG4gICAgdHlwZTogJ2ludCcsXG4gICAgdW5pcXVlOiB0cnVlLFxuICB9KVxuXG4gIHBvcnQ6IG51bWJlcjtcblxuXG5cblxuICBAVGFvbi5Pcm0uQ29sdW1uLkN1c3RvbSh7XG4gICAgdHlwZTogJ3ZhcmNoYXInLFxuICAgIGxlbmd0aDogMTAwMCxcbiAgICB1bmlxdWU6IHRydWUsXG4gIH0pXG5cbiAgc2VydmljZUlkOiBzdHJpbmc7XG5cbn1cblxuIDsoe30pOyAvLyBALS1lbmQtb2YtZmlsZS1mb3ItbW9kdWxlPXRucC1oZWxwZXJzIGxpYi9iYXNlL3RjcC11ZHAtcG9ydHMvbm90LWFzc2lnbmFibGUtcG9ydC5lbnRpdHkudHMiXX0=

package/websql/lib/base/tcp-udp-ports/not-assignable-port.entity.d.ts

@@ -1,7 +0,0 @@
-// @ts-nocheck
-import { Taon } from 'taon/websql';
-export declare class NotAssignablePort extends Taon.Base.Entity {
-    static from(opt: Omit<NotAssignablePort, 'version' | '_' | 'clone'>): NotAssignablePort & Omit<NotAssignablePort, "_" | "version" | "clone">;
-    port: number;
-    serviceId: string;
-}