fixes, refactorings for jrpc + usig older theia version

jonah-iden · Aug 30, 2022 · 283c5f0 · 283c5f0
1 parent ed5a561
commit 283c5f0
Show file tree

Hide file tree

Showing 10 changed files with 417 additions and 432 deletions.
diff --git a/browser-app/package.json b/browser-app/package.json
@@ -3,22 +3,22 @@
   "name": "browser-app",
   "version": "0.0.0",
   "dependencies": {
-    "@theia/core": "latest",
-    "@theia/editor": "latest",
-    "@theia/filesystem": "latest",
-    "@theia/markers": "latest",
-    "@theia/messages": "latest",
-    "@theia/monaco": "latest",
-    "@theia/navigator": "latest",
-    "@theia/preferences": "latest",
-    "@theia/process": "latest",
-    "@theia/terminal": "latest",
-    "@theia/workspace": "latest",
-    "@theia/file-search": "latest",
+    "@theia/core": "1.25.0",
+    "@theia/editor": "1.25.0",
+    "@theia/filesystem": "1.25.0",
+    "@theia/markers": "1.25.0",
+    "@theia/messages": "1.25.0",
+    "@theia/monaco": "1.25.0",
+    "@theia/navigator": "1.25.0",
+    "@theia/preferences": "1.25.0",
+    "@theia/process": "1.25.0",
+    "@theia/terminal": "1.25.0",
+    "@theia/workspace": "1.25.0",
+    "@theia/file-search": "1.25.0",
     "typefox-test": "0.1.0"
   },
   "devDependencies": {
-    "@theia/cli": "latest"
+    "@theia/cli": "1.25.0"
   },
   "scripts": {
     "prepare": "theia build --mode development",

diff --git a/electron-app/package.json b/electron-app/package.json
@@ -3,22 +3,22 @@
   "name": "electron-app",
   "version": "0.0.0",
   "dependencies": {
-    "@theia/core": "latest",
-    "@theia/editor": "latest",
-    "@theia/electron": "latest",
-    "@theia/filesystem": "latest",
-    "@theia/markers": "latest",
-    "@theia/messages": "latest",
-    "@theia/monaco": "latest",
-    "@theia/navigator": "latest",
-    "@theia/preferences": "latest",
-    "@theia/process": "latest",
-    "@theia/terminal": "latest",
-    "@theia/workspace": "latest",
+    "@theia/core": "1.25.0",
+    "@theia/editor": "1.25.0",
+    "@theia/electron": "1.25.0",
+    "@theia/filesystem": "1.25.0",
+    "@theia/markers": "1.25.0",
+    "@theia/messages": "1.25.0",
+    "@theia/monaco": "1.25.0",
+    "@theia/navigator": "1.25.0",
+    "@theia/preferences": "1.25.0",
+    "@theia/process": "1.25.0",
+    "@theia/terminal": "1.25.0",
+    "@theia/workspace": "1.25.0",
     "typefox-test": "0.1.0"
   },
   "devDependencies": {
-    "@theia/cli": "latest",
+    "@theia/cli": "1.25.0",
     "electron": "^15.3.5"
   },
   "scripts": {

diff --git a/typefox-test/package.json b/typefox-test/package.json
@@ -9,9 +9,9 @@
     "src"
   ],
   "dependencies": {
-    "@theia/core": "latest",
-    "@theia/filesystem": "latest",
-    "@theia/file-search": "latest",
+    "@theia/core": "1.25.0",
+    "@theia/filesystem": "1.25.0",
+    "@theia/file-search": "1.25.0",
     "toml": "3.0.0"
   },
   "devDependencies": {

diff --git a/typefox-test/src/browser/dependency-version-checker-client.ts b/typefox-test/src/browser/dependency-version-checker-client.ts
diff --git a/typefox-test/src/browser/typefox-test-contribution.ts b/typefox-test/src/browser/typefox-test-contribution.ts
@@ -1,6 +1,6 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry} from '@theia/core/lib/common';
-import { CommonMenus } from '@theia/core/lib/browser';
+import { CommonMenus, FrontendApplication, FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { IDependencyVersionCheckServer } from "../common/dependency-version-checker-protocoll";
 
 
@@ -12,7 +12,7 @@ export const dependencyVersionCheckCommand: Command = {
 @injectable()
 export class TypefoxTestCommandContribution implements CommandContribution {
 
-    constructor(@inject(IDependencyVersionCheckServer) private depCheckServer: IDependencyVersionCheckServer) { }
+    @inject(IDependencyVersionCheckServer) depCheckServer: IDependencyVersionCheckServer;
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(dependencyVersionCheckCommand, {
@@ -34,4 +34,4 @@ export class TypefoxTestMenuContribution implements MenuContribution {
             label: dependencyVersionCheckCommand.label
         });
     }
-}
+}
diff --git a/typefox-test/src/browser/typefox-test-frontend-module.ts b/typefox-test/src/browser/typefox-test-frontend-module.ts
@@ -4,17 +4,13 @@
 import { TypefoxTestCommandContribution, TypefoxTestMenuContribution } from './typefox-test-contribution';
 import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
 import { ContainerModule } from '@theia/core/shared/inversify';
-import { IDependencyVersionCheckerClient, IDependencyVersionCheckServer } from '../common/dependency-version-checker-protocoll';
+import { IDependencyVersionCheckServer, servicePath } from '../common/dependency-version-checker-protocoll';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser';
-import { DependencyVersionCheckerClient } from './dependency-version-checker-client';
 
 export default new ContainerModule(bind => {
-    bind(IDependencyVersionCheckerClient).to(DependencyVersionCheckerClient).inSingletonScope();
     bind(IDependencyVersionCheckServer).toDynamicValue(ctx => {
         const connection = ctx.container.get(WebSocketConnectionProvider);
-        const client = ctx.container.get<IDependencyVersionCheckerClient>(IDependencyVersionCheckerClient);
-        const proxy = connection.createProxy<IDependencyVersionCheckServer>("/services/dependencyVersionChecker");
-        proxy.setClient(client)
+        const proxy = connection.createProxy<IDependencyVersionCheckServer>(servicePath);
         return proxy;
     }).inSingletonScope();
 

diff --git a/typefox-test/src/common/dependency-version-checker-protocoll.ts b/typefox-test/src/common/dependency-version-checker-protocoll.ts
@@ -1,11 +1,8 @@
 import { JsonRpcServer } from "@theia/core"
 
+export const servicePath = "/services/dependencyVersionChecker";
+
 export const IDependencyVersionCheckServer = Symbol.for("DependencyVersionCheckerServer")
-export interface IDependencyVersionCheckServer extends JsonRpcServer<IDependencyVersionCheckerClient> {
+export interface IDependencyVersionCheckServer {
     analyzeDependencies(): Promise<string[]>;
-}
-
-export const IDependencyVersionCheckerClient = Symbol.for("DependencyVersionCheckerClient")
-export interface IDependencyVersionCheckerClient {
-    showDependencyMismatches(mismatches: string[]): Promise<void>;
 }
diff --git a/typefox-test/src/node/dependency-version-checker-server.ts b/typefox-test/src/node/dependency-version-checker-server.ts
@@ -1,32 +1,23 @@
 import { JsonRpcServer, logger, Logger } from "@theia/core";
-import { injectable } from "@theia/core/shared/inversify";
-import { IDependencyVersionCheckerClient, IDependencyVersionCheckServer } from "../common/dependency-version-checker-protocoll";
+import { FileSearchService } from "@theia/file-search/lib/common/file-search-service";
+import { inject, injectable } from "@theia/core/shared/inversify";
+import { IDependencyVersionCheckServer } from "../common/dependency-version-checker-protocoll";
 
 
 @injectable()
 export class DependencyVersionCheckerServer implements IDependencyVersionCheckServer {
-    private client: IDependencyVersionCheckerClient | undefined;
-
-    constructor() {}
+    constructor(@inject(FileSearchService) private fileSearchService: FileSearchService) {}
 
     /**
      * analyzes the dependencies from the cargo.toml and returns a list of mismatches
      */
     async analyzeDependencies(): Promise<string[]> {
         console.log("called analyze dependencies")
-        //const cargoTomlFiles: string[] = await this.fileSearch.find("cargo.toml", {});
-        //console.log(cargoTomlFiles);
+        const cargoTomlFiles: string[] = await this.fileSearchService.find("cargo.toml", {});
+        console.log(cargoTomlFiles);
 
         return ["test 1", "test 2"];
     }
-
-    dispose(): void {}
-
-    setClient(client: IDependencyVersionCheckerClient | undefined): void {
-        this.client = client 
-
-    }
-
 }
 
 
diff --git a/typefox-test/src/node/rust-dep-checker-backend-module.ts b/typefox-test/src/node/rust-dep-checker-backend-module.ts
@@ -1,14 +1,13 @@
 import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
 import { ContainerModule } from 'inversify';
-import { IDependencyVersionCheckerClient as IDependencyVersionCheckClient, IDependencyVersionCheckServer } from '../common/dependency-version-checker-protocoll';
+import { IDependencyVersionCheckServer, servicePath } from '../common/dependency-version-checker-protocoll';
 import { DependencyVersionCheckerServer } from './dependency-version-checker-server';
 
 export default new ContainerModule(bind => {
-    bind(IDependencyVersionCheckServer).to(DependencyVersionCheckerServer);
+    bind(IDependencyVersionCheckServer).to(DependencyVersionCheckerServer).inSingletonScope();
     bind(ConnectionHandler).toDynamicValue(ctx => {
-        return new JsonRpcConnectionHandler<IDependencyVersionCheckClient>("/services/dependencyVersionChecker", client => {
+        return new JsonRpcConnectionHandler(servicePath, () => {
             const depChekerServer = ctx.container.get<IDependencyVersionCheckServer>(IDependencyVersionCheckServer);
-            depChekerServer.setClient(client);
             return depChekerServer;
         });
     }).inSingletonScope()