@theia/plugin-ext-headless 1.77.0 → 1.78.0-next.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,8 @@
1
- import { DeployedPlugin, HostedPluginServer } from '@theia/plugin-ext/lib/common/plugin-protocol';
1
+ import { DeployedPlugin } from '@theia/plugin-ext/lib/common/plugin-protocol';
2
2
  import { RPCProtocol } from '@theia/plugin-ext/lib/common/rpc-protocol';
3
3
  import { ContributionProvider, Disposable, DisposableCollection, ILogger } from '@theia/core';
4
4
  import { HostedPluginProcess } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin-process';
5
+ import { HostedPluginServerImpl } from '@theia/plugin-ext/lib/hosted/node/plugin-service';
5
6
  import { IShellTerminalServer } from '@theia/terminal/lib/common/shell-terminal-protocol';
6
7
  import { HeadlessPluginManagerExt } from '../../common/headless-plugin-rpc.js';
7
8
  import { AbstractHostedPluginSupport, PluginContributions } from '@theia/plugin-ext/lib/hosted/common/hosted-plugin';
@@ -9,7 +10,7 @@ import { TheiaHeadlessPluginScanner } from './scanners/scanner-theia-headless.js
9
10
  import { PluginDeployerImpl } from '@theia/plugin-ext/lib/main/node/plugin-deployer-impl';
10
11
  export type HeadlessPluginHost = string;
11
12
  export declare function isHeadlessPlugin(plugin: DeployedPlugin): boolean;
12
- export declare class HeadlessHostedPluginSupport extends AbstractHostedPluginSupport<HeadlessPluginManagerExt, HostedPluginServer> {
13
+ export declare class HeadlessHostedPluginSupport extends AbstractHostedPluginSupport<HeadlessPluginManagerExt, HostedPluginServerImpl> {
13
14
  protected logger: ILogger;
14
15
  protected readonly pluginProcess: HostedPluginProcess;
15
16
  protected readonly shellTerminalServer: IShellTerminalServer;
@@ -1 +1 @@
1
- {"version":3,"file":"headless-hosted-plugin.d.ts","sourceRoot":"","sources":["../../../src/hosted/node/headless-hosted-plugin.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAe,cAAc,EAAE,kBAAkB,EAAkB,MAAM,8CAA8C,CAAC;AAE/H,OAAO,EAAE,WAAW,EAAmB,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAO,MAAM,aAAa,CAAC;AAInG,OAAO,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAA4B,MAAM,qCAAqC,CAAC;AACzG,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACrH,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAM1F,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAExC,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAEhE;AAED,qBACa,2BAA4B,SAAQ,2BAA2B,CAAC,wBAAwB,EAAE,kBAAkB,CAAC;IAEtH,UACmB,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,oBAAoB,CAAC;IAG7D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAItD,SAAS,CAAC,QAAQ,CAAC,sCAAsC,EAAE,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC;;IAM1F,QAAQ,IAAI,IAAI;IAIhB,SAAS,CAAC,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKrD,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,GAAG,cAAc;IAcxE,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU;cAKzC,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;cAU7E,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,EAAE,YAAY,EAAE,oBAAoB,GAAG,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;IAyCxK,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW;IAQ1E,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW;cAM5C,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAM7C,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC;CA4B9D"}
1
+ {"version":3,"file":"headless-hosted-plugin.d.ts","sourceRoot":"","sources":["../../../src/hosted/node/headless-hosted-plugin.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAe,cAAc,EAAkB,MAAM,8CAA8C,CAAC;AAE3G,OAAO,EAAE,WAAW,EAAmB,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAO,MAAM,aAAa,CAAC;AAInG,OAAO,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC9F,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAA4B,MAAM,qCAAqC,CAAC;AACzG,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACrH,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAM1F,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAExC,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAEhE;AAED,qBACa,2BAA4B,SAAQ,2BAA2B,CAAC,wBAAwB,EAAE,sBAAsB,CAAC;IAE1H,UACmB,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,oBAAoB,CAAC;IAG7D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAItD,SAAS,CAAC,QAAQ,CAAC,sCAAsC,EAAE,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC;;IAM1F,QAAQ,IAAI,IAAI;IAIhB,SAAS,CAAC,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKrD,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,GAAG,cAAc;IAcxE,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU;cAKzC,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;cAU7E,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,EAAE,YAAY,EAAE,oBAAoB,GAAG,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;IA+CxK,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,GAAG,WAAW;IAQ1E,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW;cAU5C,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAM7C,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC;CA4B9D"}
@@ -76,6 +76,11 @@ let HeadlessHostedPluginSupport = class HeadlessHostedPluginSupport extends Abst
76
76
  async obtainManager(host, hostContributions, toDisconnect) {
77
77
  let manager = this.managers.get(host);
78
78
  if (!manager) {
79
+ // The plugin host is forked once the environment of the user's login shell is known, see HostedPluginServerImpl.
80
+ await this.server.whenPluginServerStarted();
81
+ if (toDisconnect.disposed) {
82
+ return undefined;
83
+ }
79
84
  const pluginId = getPluginId(hostContributions[0].plugin.metadata.model);
80
85
  const rpc = this.initRpc(host, pluginId);
81
86
  toDisconnect.push(rpc);
@@ -117,7 +122,11 @@ let HeadlessHostedPluginSupport = class HeadlessHostedPluginSupport extends Abst
117
122
  return rpc;
118
123
  }
119
124
  createServerRpc(pluginHostId) {
120
- const channel = new IPCChannel(this.pluginProcess['childProcess']);
125
+ const childProcess = this.pluginProcess['childProcess'];
126
+ if (!childProcess) {
127
+ throw new Error(`The plugin host '${pluginHostId}' is not running.`);
128
+ }
129
+ const channel = new IPCChannel(childProcess);
121
130
  return new RPCProtocolImpl(channel);
122
131
  }
123
132
  async getStoragePath() {
@@ -1 +1 @@
1
- {"version":3,"file":"headless-hosted-plugin.js","sourceRoot":"","sources":["../../../src/hosted/node/headless-hosted-plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"headless-hosted-plugin.js","sourceRoot":"","sources":["../../../src/hosted/node/headless-hosted-plugin.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@theia/plugin-ext-headless",
3
- "version": "1.77.0",
3
+ "version": "1.78.0-next.19+437666ef7",
4
4
  "description": "Theia - Headless (Backend-only) Plugin Extension",
5
5
  "type": "module",
6
6
  "main": "lib/common/index.js",
@@ -15,9 +15,9 @@
15
15
  "./*": "./*"
16
16
  },
17
17
  "dependencies": {
18
- "@theia/core": "1.77.0",
19
- "@theia/plugin-ext": "1.77.0",
20
- "@theia/terminal": "1.77.0",
18
+ "@theia/core": "1.78.0-next.19+437666ef7",
19
+ "@theia/plugin-ext": "1.78.0-next.19+437666ef7",
20
+ "@theia/terminal": "1.78.0-next.19+437666ef7",
21
21
  "tslib": "^2.8.1"
22
22
  },
23
23
  "publishConfig": {
@@ -61,5 +61,5 @@
61
61
  "nyc": {
62
62
  "extends": "../../configs/nyc.json"
63
63
  },
64
- "gitHead": "9c6d81590b559ee8a78a7808203674f3127411f1"
64
+ "gitHead": "437666ef7a6573ee8e5f41e3206c8be4d7e83ab4"
65
65
  }
@@ -21,7 +21,7 @@
21
21
 
22
22
  import { generateUuid } from '@theia/core/lib/common/uuid';
23
23
  import { injectable, inject, named } from '@theia/core/shared/inversify';
24
- import { getPluginId, DeployedPlugin, HostedPluginServer, PluginDeployer } from '@theia/plugin-ext/lib/common/plugin-protocol';
24
+ import { getPluginId, DeployedPlugin, PluginDeployer } from '@theia/plugin-ext/lib/common/plugin-protocol';
25
25
  import { setUpPluginApi } from '../../main/node/main-context.js';
26
26
  import { RPCProtocol, RPCProtocolImpl } from '@theia/plugin-ext/lib/common/rpc-protocol';
27
27
  import { ContributionProvider, Disposable, DisposableCollection, ILogger, nls } from '@theia/core';
@@ -29,6 +29,7 @@ import { environment } from '@theia/core/shared/@theia/application-package/lib/e
29
29
  import { IPCChannel } from '@theia/core/lib/node';
30
30
  import { BackendApplicationConfigProvider } from '@theia/core/lib/node/backend-application-config-provider';
31
31
  import { HostedPluginProcess } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin-process';
32
+ import { HostedPluginServerImpl } from '@theia/plugin-ext/lib/hosted/node/plugin-service';
32
33
  import { IShellTerminalServer } from '@theia/terminal/lib/common/shell-terminal-protocol';
33
34
  import { HeadlessPluginManagerExt, HEADLESSMAIN_RPC_CONTEXT } from '../../common/headless-plugin-rpc.js';
34
35
  import { AbstractHostedPluginSupport, PluginContributions } from '@theia/plugin-ext/lib/hosted/common/hosted-plugin';
@@ -47,7 +48,7 @@ export function isHeadlessPlugin(plugin: DeployedPlugin): boolean {
47
48
  }
48
49
 
49
50
  @injectable()
50
- export class HeadlessHostedPluginSupport extends AbstractHostedPluginSupport<HeadlessPluginManagerExt, HostedPluginServer> {
51
+ export class HeadlessHostedPluginSupport extends AbstractHostedPluginSupport<HeadlessPluginManagerExt, HostedPluginServerImpl> {
51
52
 
52
53
  @inject(ILogger) @named('plugin-ext-headless:HeadlessHostedPluginSupport')
53
54
  protected override logger: ILogger;
@@ -113,6 +114,12 @@ export class HeadlessHostedPluginSupport extends AbstractHostedPluginSupport<Hea
113
114
  protected async obtainManager(host: string, hostContributions: PluginContributions[], toDisconnect: DisposableCollection): Promise<HeadlessPluginManagerExt | undefined> {
114
115
  let manager = this.managers.get(host);
115
116
  if (!manager) {
117
+ // The plugin host is forked once the environment of the user's login shell is known, see HostedPluginServerImpl.
118
+ await this.server.whenPluginServerStarted();
119
+ if (toDisconnect.disposed) {
120
+ return undefined;
121
+ }
122
+
116
123
  const pluginId = getPluginId(hostContributions[0].plugin.metadata.model);
117
124
  const rpc = this.initRpc(host, pluginId);
118
125
  toDisconnect.push(rpc);
@@ -160,7 +167,11 @@ export class HeadlessHostedPluginSupport extends AbstractHostedPluginSupport<Hea
160
167
  }
161
168
 
162
169
  protected createServerRpc(pluginHostId: string): RPCProtocol {
163
- const channel = new IPCChannel(this.pluginProcess['childProcess']);
170
+ const childProcess = this.pluginProcess['childProcess'];
171
+ if (!childProcess) {
172
+ throw new Error(`The plugin host '${pluginHostId}' is not running.`);
173
+ }
174
+ const channel = new IPCChannel(childProcess);
164
175
 
165
176
  return new RPCProtocolImpl(channel);
166
177
  }