@eclipse-glsp-examples/workflow-server 1.1.0-next.44aae0c.44 → 1.1.0-next.452eba9.51

package/src/common/index.ts

@@ -0,0 +1,50 @@
+/********************************************************************************
+ * Copyright (c) 2023 STMicroelectronics and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+export * from './graph-extension';
+export * from './handler/create-activity-node-handler';
+export * from './handler/create-automated-task-handler';
+export * from './handler/create-category-handler';
+export * from './handler/create-decision-node-handler';
+export * from './handler/create-edge-handler';
+export * from './handler/create-fork-node-handler';
+export * from './handler/create-fork-or-join-node-handler';
+export * from './handler/create-join-node-handler';
+export * from './handler/create-manual-task-handler';
+export * from './handler/create-merge-node-handler';
+export * from './handler/create-task-handler';
+export * from './handler/create-weighted-edge-handler';
+export * from './handler/create-workflow-node-operation-handler';
+export * from './handler/grid-snapper';
+export * from './index';
+export * from './labeledit/workflow-label-edit-validator';
+export * from './layout/workflow-layout-configurator';
+export * from './marker/workflow-model-validator';
+export * from './model/workflow-navigation-target-resolver';
+export * from './provider/abstract-next-or-previous-navigation-target-provider';
+export * from './provider/next-node-navigation-target-provider';
+export * from './provider/node-documentation-navigation-target-provider';
+export * from './provider/previous-node-navigation-target-provider';
+export * from './provider/workflow-command-palette-action-provider';
+export * from './provider/workflow-context-menu-item-provider';
+export * from './taskedit/edit-task-operation-handler';
+export * from './taskedit/task-edit-context-provider';
+export * from './taskedit/task-edit-validator';
+export * from './util/model-types';
+export * from './workflow-diagram-configuration';
+export * from './workflow-diagram-module';
+export * from './workflow-glsp-server';
+export * from './workflow-popup-factory';

package/src/node/app.ts

@@ -13,38 +13,33 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import 'reflect-metadata';
+
 import { configureELKLayoutModule } from '@eclipse-glsp/layout-elk';
-import {
-    createAppModule,
-    createSocketCliParser,
-    GModelStorage,
-    Logger,
-    LoggerFactory,
-    SocketServerLauncher
-} from '@eclipse-glsp/server/node';
+import { createAppModule, GModelStorage, SocketServerLauncher, WebSocketServerLauncher } from '@eclipse-glsp/server/node';
 import { Container } from 'inversify';
+
 import { WorkflowLayoutConfigurator } from '../common/layout/workflow-layout-configurator';
 import { WorkflowDiagramModule, WorkflowServerModule } from '../common/workflow-diagram-module';
+import { createWorkflowCliParser } from './workflow-cli-parser';
 
-export async function launch(argv?: string[]): Promise<void> {
-    let logger: Logger | undefined;
-    try {
-        const options = createSocketCliParser().parse(argv);
-        const appContainer = new Container();
-        appContainer.load(createAppModule(options));
+async function launch(argv?: string[]): Promise<void> {
+    const options = createWorkflowCliParser().parse(argv);
+    const appContainer = new Container();
+    appContainer.load(createAppModule(options));
 
-        logger = appContainer.get<LoggerFactory>(LoggerFactory)('WorkflowServerApp');
-        const launcher = appContainer.resolve(SocketServerLauncher);
-        const elkLayoutModule = configureELKLayoutModule({ algorithms: ['layered'], layoutConfigurator: WorkflowLayoutConfigurator });
-        const serverModule = new WorkflowServerModule().configureDiagramModule(
-            new WorkflowDiagramModule(() => GModelStorage),
-            elkLayoutModule
-        );
+    const elkLayoutModule = configureELKLayoutModule({ algorithms: ['layered'], layoutConfigurator: WorkflowLayoutConfigurator });
+    const serverModule = new WorkflowServerModule().configureDiagramModule(new WorkflowDiagramModule(() => GModelStorage), elkLayoutModule);
 
+    if (options.webSocket) {
+        const launcher = appContainer.resolve(WebSocketServerLauncher);
+        launcher.configure(serverModule);
+        launcher.start({ port: options.port, host: options.host, path: 'workflow' });
+    } else {
+        const launcher = appContainer.resolve(SocketServerLauncher);
         launcher.configure(serverModule);
-
         launcher.start({ port: options.port, host: options.host });
-    } catch (error) {
-        (logger ?? console).error('Error in workflow server launcher:', error);
     }
 }
+
+launch(process.argv).catch(error => console.error('Error in workflow server launcher:', error));

package/src/node/index.ts

@@ -13,7 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import 'reflect-metadata';
-import { launch } from './app';
-
-launch(process.argv);
+export * from '../common/index';
+export * from './workflow-cli-parser';

package/src/node/workflow-cli-parser.ts

@@ -0,0 +1,29 @@
+/********************************************************************************
+ * Copyright (c) 2022-2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { CliParser, createSocketCliParser, defaultSocketLaunchOptions, SocketLaunchOptions } from '@eclipse-glsp/server/node';
+
+export interface WorkflowLaunchOptions extends SocketLaunchOptions {
+    webSocket: boolean;
+}
+
+export function createWorkflowCliParser<O extends WorkflowLaunchOptions = WorkflowLaunchOptions>(
+    defaultOptions: WorkflowLaunchOptions = { webSocket: false, ...defaultSocketLaunchOptions }
+): CliParser<O> {
+    const parser = createSocketCliParser<O>(defaultOptions);
+    parser.command.option('-w , --webSocket', 'Flag to use websocket launcher instead of default launcher', false);
+    return parser;
+}