yetao
/
vscode-sshfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Overhaul config loading/saving for the new config system

Browse Source
feature/search
Kelvin Schoofs 6 years ago
parent 2d48309fd3
commit 47896927be
5 changed files with 122 additions and 84 deletions
Show Stats Download Patch File Download Diff File

164
src/config.ts
Unescape View File

@ -1,20 +1,12 @@
import { readFile } from 'fs';
import { readFile, writeFile } from 'fs';
import { parse as parseJsonc, ParseError } from 'jsonc-parser';
import * as path from 'path';
import * as vscode from 'vscode';
import { FileSystemConfig } from './fileSystemConfig';
import { ConfigLocation, FileSystemConfig, invalidConfigName } from './fileSystemConfig';
import * as Logging from './logging';
import { toPromise } from './toPromise';
export const skippedConfigNames: string[] = [];
export function invalidConfigName(name: string) {
if (!name) return 'Missing a name for this SSH FS';
if (name.match(/^[\w_\\\/\.@\-+]+$/)) return null;
return `A SSH FS name can only exists of lowercase alphanumeric characters, slashes and any of these: _.+-@`;
}
function randomAvailableName(configs: FileSystemConfig[], index = 0): [string, number] {
let name = index ? `unnamed${index}` : 'unnamed';
while (configs.find(c => c.name === name)) {
@ -72,7 +64,7 @@ async function readConfigFile(location: string, shouldExist = false): Promise<Fi
vscode.window.showErrorMessage(`Couldn't parse ${location} as a 'JSON with Comments' file`);
return [];
}
parsed.forEach(c => c._locations = [location]);
parsed.forEach(c => c._locations = [c._location = location]);
Logging.debug(`Read ${parsed.length} configs from ${location}`);
return parsed;
}
@ -94,8 +86,8 @@ export async function loadConfigs() {
// Note: workspaceFolderValue not used here, we do it later for all workspace folders
layered.workspace = inspect.workspaceValue || [];
layered.global = inspect.globalValue || [];
layered.workspace.forEach(c => c._locations = ['Workspace']);
layered.global.forEach(c => c._locations = ['Global']);
layered.workspace.forEach(c => c._locations = [c._location = vscode.ConfigurationTarget.Workspace]);
layered.global.forEach(c => c._locations = [c._location = vscode.ConfigurationTarget.Global]);
// Get all sshfs.configpaths values into an array
const inspect2 = config.inspect<string[]>('configpaths')!;
configpaths.workspace = inspect2.workspaceValue || [];
@ -115,6 +107,8 @@ export async function loadConfigs() {
];
}
// Fetch configs from opened folders (workspaces)
// Should we really support workspace folders, and not just workspaces?
/*
const { workspaceFolders } = vscode.workspace;
if (workspaceFolders) {
for (const { uri } of workspaceFolders) {
@ -123,7 +117,7 @@ export async function loadConfigs() {
const fConfigs = fConfig && fConfig.workspaceFolderValue || [];
if (fConfigs.length) {
Logging.debug(`Read ${fConfigs.length} configs from workspace folder ${uri}`);
fConfigs.forEach(c => c._locations = [`WorkspaceFolder ${uri}`]);
fConfigs.forEach(c => c._locations = [c._location = `WorkspaceFolder ${uri}`]);
}
layered.folder = [
...await readConfigFile(path.resolve(uri.fsPath, 'sshfs.json')),
@ -132,38 +126,16 @@ export async function loadConfigs() {
...layered.folder,
];
}
}
// Start merging and cleaning up all configs
const all = [...layered.folder, ...layered.workspace, ...layered.global];
}*/
// Store all configs in one array, in order of importance
let all = [...layered.folder, ...layered.workspace, ...layered.global];
all.forEach(c => c.name = (c.name || '').toLowerCase()); // It being undefined shouldn't happen, but better be safe
// Remove duplicates, merging those where the more specific config has `merge` set
// Folder comes before Workspace, comes before Global
const configs: FileSystemConfig[] = [];
// Let the user do some cleaning with the raw configs
for (const conf of all) {
const dup = configs.find(d => d.name === conf.name);
if (dup) {
if (dup.merge) {
// The folder settings should overwrite the higher up defined settings
// Since .sshfs.json gets read after vscode settings, these can overwrite configs
// of the same level, which I guess is a nice feature?
Logging.debug(`\tMerging duplicate ${conf.name} from ${conf._locations}`);
dup._locations = [...dup._locations, ...conf._locations];
Object.assign(dup, Object.assign(conf, dup));
} else {
Logging.debug(`\tIgnoring duplicate ${conf.name} from ${conf._locations}`);
}
} else {
Logging.debug(`\tAdded configuration ${conf.name} from ${conf._locations}`);
configs.push(conf);
}
}
// Let the user do some cleaning
for (const conf of configs) {
if (!conf.name) {
Logging.error(`Skipped an invalid SSH FS config (missing a name field):\n${JSON.stringify(conf, undefined, 4)}`);
vscode.window.showErrorMessage(`Skipped an invalid SSH FS config (missing a name field)`);
} else if (invalidConfigName(conf.name)) {
if (skippedConfigNames.indexOf(conf.name) !== -1) continue;
Logging.warning(`Found a SSH FS config with the invalid name "${conf.name}", prompting user how to handle`);
vscode.window.showErrorMessage(`Invalid SSH FS config name: ${conf.name}`, 'Rename', 'Delete', 'Skip').then(async (answer) => {
if (answer === 'Rename') {
@ -172,51 +144,109 @@ export async function loadConfigs() {
const oldName = conf.name;
Logging.info(`Renaming config "${oldName}" to "${name}"`);
conf.name = name;
return updateConfig(oldName, conf);
return updateConfig(conf, oldName);
}
} else if (answer === 'Delete') {
return updateConfig(conf.name);
return deleteConfig(conf);
}
skippedConfigNames.push(conf.name);
Logging.warning(`Skipped SSH FS config '${conf.name}'`);
vscode.window.showWarningMessage(`Skipped SSH FS config '${conf.name}'`);
});
}
}
loadedConfigs = configs.filter(c => !invalidConfigName(c.name));
// After cleaning up, ignore the configurations that are still bad
all = all.filter(c => !invalidConfigName(c.name));
// Remove duplicates, merging those where the more specific config has `merge` set
// Folder comes before Workspace, comes before Global
const configs: FileSystemConfig[] = [];
for (const conf of all) {
const dup = configs.find(d => d.name === conf.name);
if (dup) {
if (dup.merge) {
// The folder settings should overwrite the higher up defined settings
// Since .sshfs.json gets read after vscode settings, these can overwrite configs
// of the same level, which I guess is a nice feature?
Logging.debug(`\tMerging duplicate ${conf.name} from ${conf._locations}`);
dup._locations = [...dup._locations, ...conf._locations];
Object.assign(dup, Object.assign(conf, dup));
} else {
Logging.debug(`\tIgnoring duplicate ${conf.name} from ${conf._locations}`);
}
} else {
Logging.debug(`\tAdded configuration ${conf.name} from ${conf._locations}`);
configs.push(conf);
}
}
loadedConfigs = configs;
Logging.info(`Found ${loadedConfigs.length} configurations`);
UPDATE_LISTENERS.forEach(listener => listener(loadedConfigs));
return loadedConfigs;
}
export function getConfigLocation(name: string) {
export type ConfigAlterer = (configs: FileSystemConfig[]) => FileSystemConfig[] | null | false;
export async function alterConfigs(location: ConfigLocation, alterer: ConfigAlterer) {
switch (location) {
case vscode.ConfigurationTarget.Global:
case vscode.ConfigurationTarget.Workspace:
case vscode.ConfigurationTarget.WorkspaceFolder:
const conf = vscode.workspace.getConfiguration('sshfs');
const inspect = conf.inspect<FileSystemConfig[]>('configs')!;
const contains = (v?: FileSystemConfig[]) => v && v.find(c => c.name === name);
if (contains(inspect.workspaceFolderValue)) {
return vscode.ConfigurationTarget.WorkspaceFolder;
} else if (contains(inspect.workspaceValue)) {
return vscode.ConfigurationTarget.Workspace;
} else { // if (contains(inspect.globalValue)) {
return vscode.ConfigurationTarget.Global;
const array = [[], inspect.globalValue, inspect.workspaceValue, inspect.workspaceFolderValue][location];
if (!array) throw new Error(`Something very unexpected happened...`);
const modified = alterer(array);
if (!modified) return;
await conf.update('configs', modified, location);
Logging.debug(`\tUpdated configs in ${[, 'Global', 'Workspace', 'WorkspaceFolder'][location]} settings.json`);
return;
}
if (typeof location !== 'string') throw new Error(`Invalid _location field: ${location}`);
const configs = await readConfigFile(location, true);
const altered = alterer(configs);
if (!altered) return;
const data = JSON.stringify(altered, null, 4);
await toPromise(cb => writeFile(location, data, cb))
.catch((e: NodeJS.ErrnoException) => {
Logging.error(`Error while writing configs to ${location}: ${e.message}`);
throw e;
});
Logging.debug(`\tWritten modified configs to ${location}`);
}
export async function updateConfig(name: string, config?: FileSystemConfig) {
const conf = vscode.workspace.getConfiguration('sshfs');
const inspect = conf.inspect<FileSystemConfig[]>('configs')!;
// const contains = (v?: FileSystemConfig[]) => v && v.find(c => c.name === name);
const patch = (v: FileSystemConfig[]) => {
const con = v.findIndex(c => c.name === name);
if (!config) return v.filter(c => !c.name || c.name.toLowerCase() !== name);
v[con === -1 ? v.length : con] = config;
return v;
};
const loc = getConfigLocation(name);
const array = [[], inspect.globalValue, inspect.workspaceValue, inspect.workspaceFolderValue][loc];
await conf.update('configs', patch(array || []), loc || vscode.ConfigurationTarget.Global);
Logging.debug(`Updated config "${name}"`);
return loc;
export async function updateConfig(config: FileSystemConfig, oldName = config.name) {
const { name, _location } = config;
if (!name) throw new Error(`The given config has no name field`);
if (!_location) throw new Error(`The given config has no _location field`);
Logging.info(`Saving config ${name} to ${_location}`);
if (oldName !== config.name) {
Logging.debug(`\tSaving ${name} will try to overwrite old config ${oldName}`);
}
await alterConfigs(_location, (configs) => {
Logging.debug(`\tConfig location '${_location}' has following configs: ${configs.map(c => c.name).join(', ')}`);
const index = configs.findIndex(c => c.name === oldName);
if (index === -1) {
Logging.debug(`\tAdding the new config to the existing configs`);
configs.push(config);
} else {
Logging.debug(`\tOverwriting config '${configs[index].name}' at index ${index} with the new config`);
configs[index] = config;
}
return configs;
});
}
export async function deleteConfig(config: FileSystemConfig) {
const { name, _location } = config;
if (!name) throw new Error(`The given config has no name field`);
if (!_location) throw new Error(`The given config has no _location field`);
Logging.info(`Deleting config ${name} in ${_location}`);
await alterConfigs(_location, (configs) => {
Logging.debug(`\tConfig location '${_location}' has following configs: ${configs.map(c => c.name).join(', ')}`);
const index = configs.findIndex(c => c.name === name);
if (index === -1) throw new Error(`Config '${name}' not found in ${_location}`);
Logging.debug(`\tDeleting config '${configs[index].name}' at index ${index}`);
configs.splice(index, 1);
return configs;
});
}
export function getConfig(name: string) {

6
src/connect.ts
Unescape View File

@ -25,8 +25,8 @@ function replaceVariables(string?: string) {
}
export async function calculateActualConfig(config: FileSystemConfig): Promise<FileSystemConfig | null> {
config = { ...config };
if ('_calculated' in config) return config;
config = { ...config };
(config as any)._calculated = true;
config.username = replaceVariables(config.username);
config.host = replaceVariables(config.host);
@ -169,7 +169,7 @@ export async function createSocket(config: FileSystemConfig): Promise<NodeJS.Rea
return new Promise<NodeJS.ReadableStream>((resolve, reject) => {
Logging.debug(`[${config.name}] Connecting to ${config.host}:${config.port || 22}`);
const socket = new Socket();
socket.connect(config.port || 22, config.host, () => resolve(socket as NodeJS.ReadableStream));
socket.connect(config.port || 22, config.host!, () => resolve(socket as NodeJS.ReadableStream));
socket.once('error', reject);
});
}
@ -193,7 +193,7 @@ export async function createSSH(config: FileSystemConfig, sock?: NodeJS.Readable
}),
)).then(finish);
});
client.once('error', (error: Error & { description?: string }) => {
client.on('error', (error: Error & { description?: string }) => {
if (error.description) {
error.message = `${error.description}\n${error.message}`;
}

4
src/extension.ts
Unescape View File

@ -1,7 +1,7 @@
import * as vscode from 'vscode';
import { invalidConfigName, loadConfigs } from './config';
import { FileSystemConfig } from './fileSystemConfig';
import { loadConfigs } from './config';
import { FileSystemConfig, invalidConfigName } from './fileSystemConfig';
import * as Logging from './logging';
import { Manager } from './manager';
import * as settings from './settings';

12
src/fileSystemConfig.ts
Unescape View File

@ -6,6 +6,8 @@ export interface ProxyConfig {
port: number;
}
export type ConfigLocation = number | string;
export interface FileSystemConfig extends ConnectConfig {
/* Name of the config. Can only exists of lowercase alphanumeric characters, slashes and any of these: _.+-@ */
name: string;
@ -29,6 +31,14 @@ export interface FileSystemConfig extends ConnectConfig {
sftpSudo?: string | boolean;
/* The filemode to assign to created files */
newFileMode?: number | string;
/* Internal property saying where this config comes from. Undefined if this config is merged or something */
_location?: ConfigLocation;
/* Internal property keeping track of where this config comes from (including merges) */
_locations: string[];
_locations: ConfigLocation[];
}
export function invalidConfigName(name: string) {
if (!name) return 'Missing a name for this SSH FS';
if (name.match(/^[\w_\\\/\.@\-+]+$/)) return null;
return `A SSH FS name can only exists of lowercase alphanumeric characters, slashes and any of these: _.+-@`;
}

16
src/manager.ts
Unescape View File

@ -64,7 +64,8 @@ function createConfigFs(manager: Manager): SSHFileSystem {
return new Uint8Array(Buffer.from(str));
},
writeFile: async (uri: vscode.Uri, content: Uint8Array) => {
const name = uri.path.substring(1, uri.path.length - 12);
vscode.window.showWarningMessage('Use the SSH FS config editor to modify/delete configurations');
/*const name = uri.path.substring(1, uri.path.length - 12);
const errors: ParseError[] = [];
const config = parseJsonc(Buffer.from(content).toString(), errors);
if (!config || errors.length) {
@ -85,6 +86,7 @@ function createConfigFs(manager: Manager): SSHFileSystem {
throw new Error(`This isn't supposed to happen! Config location was '${loc}' somehow`);
}
dialog.then(response => response === 'Connect' && manager.commandReconnect(name));
*/
},
} as any;
}
@ -150,11 +152,6 @@ export class Manager implements vscode.FileSystemProvider, vscode.TreeDataProvid
}
return ConfigStatus.Idle;
}
public async registerFileSystem(name: string, config?: FileSystemConfig) {
if (name === '<config>') return;
await updateConfig(name, config);
this.onDidChangeTreeDataEmitter.fire();
}
public async createFileSystem(name: string, config?: FileSystemConfig): Promise<SSHFileSystem> {
if (name === '<config>') return this.configFileSystem;
const existing = this.fileSystems.find(fs => fs.authority === name);
@ -166,7 +163,6 @@ export class Manager implements vscode.FileSystemProvider, vscode.TreeDataProvid
if (!config) {
throw new Error(`A SSH filesystem with the name '${name}' doesn't exist`);
}
this.registerFileSystem(name, { ...config });
const client = await createSSH(config);
if (!client) return reject(null);
let root = config!.root || '/';
@ -330,12 +326,14 @@ export class Manager implements vscode.FileSystemProvider, vscode.TreeDataProvid
}
public async commandConfigure(name: string) {
Logging.info(`Command received to configure ${name}`);
openConfigurationEditor(name);
// openConfigurationEditor(name);
vscode.window.showWarningMessage('Use the SSH FS config editor to modify/delete configurations');
}
public commandDelete(name: string) {
Logging.info(`Command received to delete ${name}`);
this.commandDisconnect(name);
updateConfig(name).then(() => this.onDidChangeTreeDataEmitter.fire());
// updateConfig(name).then(() => this.onDidChangeTreeDataEmitter.fire());
vscode.window.showWarningMessage('Use the SSH FS config editor to modify/delete configurations');
}
}

Write Preview
Loading…
Cancel
Save