@eclipse-glsp-examples/workflow-server 1.1.0-next.0f9fe4e.28 → 1.1.0-next.146ae06.49

package/lib/node/index.d.ts

@@ -0,0 +1,18 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from '../common/index';
+export * from './workflow-cli-parser';
+//# sourceMappingURL=index.d.ts.map

package/lib/node/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC"}

package/lib/node/index.js

@@ -0,0 +1,34 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+__exportStar(require("../common/index"), exports);
+__exportStar(require("./workflow-cli-parser"), exports);
+//# sourceMappingURL=index.js.map

package/lib/node/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kDAAgC;AAChC,wDAAsC"}

package/lib/node/workflow-cli-parser.d.ts

@@ -0,0 +1,21 @@
+/********************************************************************************
+ * Copyright (c) 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, SocketLaunchOptions } from '@eclipse-glsp/server/node';
+export interface WorkflowLaunchOptions extends SocketLaunchOptions {
+    webSocket: boolean;
+}
+export declare function createWorkflowCliParser<O extends WorkflowLaunchOptions = WorkflowLaunchOptions>(defaultOptions?: WorkflowLaunchOptions): CliParser<O>;
+//# sourceMappingURL=workflow-cli-parser.d.ts.map

package/lib/node/workflow-cli-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-cli-parser.d.ts","sourceRoot":"","sources":["../../src/node/workflow-cli-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,SAAS,EAAqD,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAE9H,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;IAC9D,SAAS,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EAC3F,cAAc,GAAE,qBAA2E,GAC5F,SAAS,CAAC,CAAC,CAAC,CAId"}

package/lib/node/workflow-cli-parser.js

@@ -0,0 +1,26 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 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
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createWorkflowCliParser = void 0;
+const node_1 = require("@eclipse-glsp/server/node");
+function createWorkflowCliParser(defaultOptions = Object.assign({ webSocket: false }, node_1.defaultSocketLaunchOptions)) {
+    const parser = (0, node_1.createSocketCliParser)(defaultOptions);
+    parser.command.option('-w , --webSocket', 'Flag to use websocket launcher instead of default launcher', false);
+    return parser;
+}
+exports.createWorkflowCliParser = createWorkflowCliParser;
+//# sourceMappingURL=workflow-cli-parser.js.map

package/lib/node/workflow-cli-parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-cli-parser.js","sourceRoot":"","sources":["../../src/node/workflow-cli-parser.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,oDAA8H;AAM9H,SAAgB,uBAAuB,CACnC,iCAA0C,SAAS,EAAE,KAAK,IAAK,iCAA0B,CAAE;IAE3F,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAAI,cAAc,CAAC,CAAC;IACxD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,4DAA4D,EAAE,KAAK,CAAC,CAAC;IAC/G,OAAO,MAAM,CAAC;AAClB,CAAC;AAND,0DAMC"}

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server",
-  "version": "1.1.0-next.0f9fe4e.28+0f9fe4e",
+  "version": "1.1.0-next.146ae06.49+146ae06",
   "description": "GLSP node server for the workflow example",
-  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
     "eclipse",
     "graphics",
@@ -12,15 +11,16 @@
     "glsp",
     "diagram editor"
   ],
-  "author": {
-    "name": "Eclipse GLSP"
-  },
   "homepage": "https://www.eclipse.org/glsp/",
+  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
   "repository": {
     "type": "git",
     "url": "https://github.com/eclipse-glsp/glsp-server-node.git"
   },
-  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
+  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
+  "author": {
+    "name": "Eclipse GLSP"
+  },
   "contributors": [
     {
       "name": "STMicroelectronics",
@@ -32,27 +32,38 @@
       "url": "https://projects.eclipse.org/projects/ecd.glsp"
     }
   ],
+  "main": "./lib/node/index.js",
+  "browser": {
+    "./lib/node/index.js": "./lib/browser/index.js"
+  },
+  "types": "lib/index",
   "files": [
     "lib",
     "src"
   ],
+  "scripts": {
+    "build": "tsc -b && yarn bundle",
+    "bundle": "webpack",
+    "bundle:browser": "webpack --env target=webworker ",
+    "clean": "rimraf lib tsconfig.tsbuildinfo bundle",
+    "lint": "eslint --ext .ts,.tsx ./src",
+    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
+    "prepare": "yarn clean && yarn build",
+    "start": "node --enable-source-maps bundle/wf-glsp-server-node.js --port 5007",
+    "start:websocket": "node --enable-source-maps bundle/wf-glsp-server-node.js -w --port 8081",
+    "watch": "tsc -w"
+  },
   "dependencies": {
-    "@eclipse-glsp/layout-elk": "1.1.0-next.0f9fe4e.28+0f9fe4e",
-    "@eclipse-glsp/server-node": "1.1.0-next.0f9fe4e.28+0f9fe4e"
+    "@eclipse-glsp/layout-elk": "1.1.0-next.146ae06.49+146ae06",
+    "@eclipse-glsp/server": "1.1.0-next.146ae06.49+146ae06"
   },
-  "scripts": {
-    "prepare": "yarn clean && yarn build && yarn lint",
-    "clean": "rimraf tsconfig.tsbuildinfo lib",
-    "build": "tsc",
-    "lint": "eslint -c ../../.eslintrc.js --ext .ts,.tsx ./src",
-    "lint:fix": "eslint --fix -c ../../.eslintrc.js --ext .ts,.tsx ./src",
-    "watch": "tsc -w",
-    "start:server": "yarn ts-node src/index.ts"
+  "devDependencies": {
+    "source-map-loader": "^4.0.1",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "main": "lib/index",
-  "types": "lib/index",
-  "gitHead": "0f9fe4e469e607b7ae2c45c001b5069c9abaf349"
+  "gitHead": "146ae06fdf2dcaea924873e830a81b0ca4033d85"
 }

package/src/{app.ts → browser/app.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-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
@@ -13,23 +13,30 @@
  *
  * 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, LoggerFactory, resolveAndCatch, SocketServerLauncher } from '@eclipse-glsp/server-node';
+import { createAppModule, LogLevel, WorkerServerLauncher } from '@eclipse-glsp/server/browser';
 import { Container } from 'inversify';
-import { WorkflowLayoutConfigurator } from './layout/workflow-layout-configurator';
-import { WorkflowDiagramModule, WorkflowServerModule } from './workflow-diagram-module';
+import { WorkflowLayoutConfigurator } from '../common/layout/workflow-layout-configurator';
+import { WorkflowDiagramModule, WorkflowServerModule } from '../common/workflow-diagram-module';
+import { WorkflowMockModelStorage } from './mock-model-storage';
 
-export function launch(argv?: string[]): void {
-    const options = createSocketCliParser().parse(argv);
+export async function launch(argv?: string[]): Promise<void> {
     const appContainer = new Container();
-    appContainer.load(createAppModule(options));
+    appContainer.load(createAppModule({ logLevel: LogLevel.info }));
 
-    const logger = appContainer.get<LoggerFactory>(LoggerFactory)('WorkflowServerApp');
-    const launcher = appContainer.resolve(SocketServerLauncher);
+    const launcher = appContainer.resolve(WorkerServerLauncher);
     const elkLayoutModule = configureELKLayoutModule({ algorithms: ['layered'], layoutConfigurator: WorkflowLayoutConfigurator });
-    const serverModule = new WorkflowServerModule().configureDiagramModule(new WorkflowDiagramModule(), elkLayoutModule);
 
-    const errorHandler = (error: any): void => logger.error('Error in workflow server launcher:', error);
+    const serverModule = new WorkflowServerModule().configureDiagramModule(
+        new WorkflowDiagramModule(() => WorkflowMockModelStorage),
+        elkLayoutModule
+    );
+
     launcher.configure(serverModule);
-    resolveAndCatch(() => launcher.start({ port: options.port, host: options.host }), errorHandler);
+
+    await launcher.start({});
 }
+
+launch().catch(error => console.error('Error in workflow server launcher:', error));