mirror of https://github.com/coder/code-server.git
src/node/plugin.ts: Warn on duplicate plugin and only load first
This commit is contained in:
parent
82e8a00a0d
commit
30d2962e21
|
@ -8,11 +8,18 @@ import { version } from "./constants"
|
||||||
import * as util from "./util"
|
import * as util from "./util"
|
||||||
const fsp = fs.promises
|
const fsp = fs.promises
|
||||||
|
|
||||||
// These fields are populated from the plugin's package.json.
|
|
||||||
interface Plugin extends pluginapi.Plugin {
|
interface Plugin extends pluginapi.Plugin {
|
||||||
|
/**
|
||||||
|
* These fields are populated from the plugin's package.json.
|
||||||
|
*/
|
||||||
name: string
|
name: string
|
||||||
version: string
|
version: string
|
||||||
description: string
|
description: string
|
||||||
|
|
||||||
|
/**
|
||||||
|
* path to the node module on the disk.
|
||||||
|
*/
|
||||||
|
modulePath: string
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Application extends pluginapi.Application {
|
interface Application extends pluginapi.Application {
|
||||||
|
@ -47,7 +54,6 @@ export class PluginAPI {
|
||||||
for (const p of this.plugins) {
|
for (const p of this.plugins) {
|
||||||
const pluginApps = await p.applications()
|
const pluginApps = await p.applications()
|
||||||
|
|
||||||
// TODO prevent duplicates
|
|
||||||
// Add plugin key to each app.
|
// Add plugin key to each app.
|
||||||
apps.push(
|
apps.push(
|
||||||
...pluginApps.map((app) => {
|
...pluginApps.map((app) => {
|
||||||
|
@ -112,8 +118,15 @@ export class PluginAPI {
|
||||||
encoding: "utf8",
|
encoding: "utf8",
|
||||||
})
|
})
|
||||||
const packageJSON: PackageJSON = JSON.parse(str)
|
const packageJSON: PackageJSON = JSON.parse(str)
|
||||||
|
for (const p of this.plugins) {
|
||||||
|
if (p.name === packageJSON.name) {
|
||||||
|
this.logger.warn(
|
||||||
|
`ignoring duplicate plugin ${q(p.name)} at ${q(dir)}, using previously loaded ${q(p.modulePath)}`,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
const p = this._loadPlugin(dir, packageJSON)
|
const p = this._loadPlugin(dir, packageJSON)
|
||||||
// TODO prevent duplicates
|
|
||||||
this.plugins.push(p)
|
this.plugins.push(p)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err.code !== "ENOENT") {
|
if (err.code !== "ENOENT") {
|
||||||
|
@ -145,6 +158,7 @@ export class PluginAPI {
|
||||||
name: packageJSON.name,
|
name: packageJSON.name,
|
||||||
version: packageJSON.version,
|
version: packageJSON.version,
|
||||||
description: packageJSON.description,
|
description: packageJSON.description,
|
||||||
|
modulePath: dir,
|
||||||
...require(dir),
|
...require(dir),
|
||||||
} as Plugin
|
} as Plugin
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ describe("plugin", () => {
|
||||||
name: "test-plugin",
|
name: "test-plugin",
|
||||||
version: "1.0.0",
|
version: "1.0.0",
|
||||||
description: "Fake plugin for testing code-server's plugin API",
|
description: "Fake plugin for testing code-server's plugin API",
|
||||||
|
modulePath: path.join(__dirname, "test-plugin"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue