Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "guided-development",
"version": "0.0.11",
"version": "0.0.12",
"displayName": "Guided Development",
"publisher": "SAPOSS",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion bas-platform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls also update guided development version

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

"publisher": "SAPOSS",
"license": "Apache-2.0",
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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');
}
}

Expand All @@ -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();
});
Expand Down
2 changes: 1 addition & 1 deletion bas-platform/src/extension.ts
Original file line number Diff line number Diff line change
@@ -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<vscode.Disposable> = [];

Expand Down