diff --git a/backend/package.json b/backend/package.json index bcbd7ee..00d7ee1 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "guided-development", - "version": "0.0.11", + "version": "0.0.12", "displayName": "Guided Development", "publisher": "SAPOSS", "author": { diff --git a/bas-platform/package.json b/bas-platform/package.json index 027ef88..db30f81 100644 --- a/bas-platform/package.json +++ b/bas-platform/package.json @@ -2,7 +2,7 @@ "name": "bas-platform", "displayName": "BAS Platform Extension", "description": "SAP Business Application Studio platform extension", - "version": "0.0.7", + "version": "0.0.8", "publisher": "SAPOSS", "license": "Apache-2.0", "engines": { diff --git a/bas-platform/src/actions/basctlAction.ts b/bas-platform/src/actions/basctlServer.ts similarity index 62% rename from bas-platform/src/actions/basctlAction.ts rename to bas-platform/src/actions/basctlServer.ts index 05d1919..9af3353 100644 --- a/bas-platform/src/actions/basctlAction.ts +++ b/bas-platform/src/actions/basctlServer.ts @@ -2,40 +2,34 @@ import * as vscode from 'vscode'; import * as net from 'net'; import * as fs from 'fs'; import * as _ from 'lodash'; -// import { bas } from '../api'; const SOCKETFILE = '/extbin/basctlSocket'; let basctlServer: net.Server; -function _addBasctlAction(socket: net.Socket) { - //const openExternal = new bas.actions.ExecuteAction(); - //openExternal.executeAction = async () => { - socket.on("data", dataBuffer => { +function handleRequest(socket: net.Socket) { + socket.on('data', dataBuffer => { const data: any = getRequestData(dataBuffer); - if (data.command === "open") { + if (data.command === 'open') { const uri = vscode.Uri.parse(data.url, true); vscode.env.openExternal(uri); } }); - // } - - //bas.actions.performAction(openExternal); } function getRequestData(dataBuffer: any) { try { return JSON.parse(_.toString(dataBuffer)); } catch (error) { - showErrorMessage(error, "failed to parse basctl request data"); + showErrorMessage(error, 'failed to parse basctl request data'); return {}; } } function showErrorMessage(error: any, defaultError: string) { - const errorMessage = _.get(error, "stack", _.get(error, "message", defaultError)); + const errorMessage = _.get(error, 'stack', _.get(error, 'message', defaultError)); vscode.window.showErrorMessage(errorMessage); } @@ -48,10 +42,10 @@ export function closeBasctlServer() { function createBasctlServer() { try { basctlServer = net.createServer(socket => { - _addBasctlAction(socket); + handleRequest(socket); }).listen(SOCKETFILE); } catch (error) { - showErrorMessage(error, "failed to start basctl server"); + showErrorMessage(error, 'basctl server error'); } } @@ -62,7 +56,7 @@ export function startBasctlServer() { } else { fs.unlink(SOCKETFILE, err => { if (err) { - throw new Error(err.message); + throw new Error(err.stack); } createBasctlServer(); }); diff --git a/bas-platform/src/extension.ts b/bas-platform/src/extension.ts index ab8e10b..20514d3 100644 --- a/bas-platform/src/extension.ts +++ b/bas-platform/src/extension.ts @@ -1,7 +1,7 @@ import * as vscode from 'vscode'; import { bas } from './api'; import { _performAction } from "./actions/performer"; -import { startBasctlServer, closeBasctlServer } from './actions/basctlAction'; +import { startBasctlServer, closeBasctlServer } from './actions/basctlServer'; const subscriptions: Array = [];