dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-17 20:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed upload error to Gist feature

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-09-03 16:22:02 +02:00
parent c0549fe422
commit a2d77a3917
12 changed files with 67 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build-npm.yaml vendored
View File

@@ -37,11 +37,6 @@ jobs:
- name: setCurrentVersion
run: |
yarn setCurrentVersion
- name: printSecrets
run: |
yarn printSecrets
env:
GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}}
- name: Publish types
working-directory: packages/types
run: |

1
app/src/mainMenuDefinition.js
View File

@@ -86,7 +86,6 @@ module.exports = ({ editMenu, isMac }) => [
{ divider: true },
{ command: 'folder.showLogs', hideDisabled: true },
{ command: 'folder.showData', hideDisabled: true },
{ command: 'new.gist', hideDisabled: true },
{ command: 'app.resetSettings', hideDisabled: true },
{ divider: true },
{ command: 'app.exportConnections', hideDisabled: true },

163
packages/api/src/controllers/uploads.js
View File

@@ -1,19 +1,8 @@
const crypto = require('crypto');
const path = require('path');
const { uploadsdir, getLogsFilePath, filesdir } = require('../utility/directories');
const { getLogger, extractErrorLogData } = require('dbgate-tools');
const { uploadsdir } = require('../utility/directories');
const { getLogger } = require('dbgate-tools');
const logger = getLogger('uploads');
const axios = require('axios');
const os = require('os');
const fs = require('fs/promises');
const { read } = require('./queryHistory');
const platformInfo = require('../utility/platformInfo');
const _ = require('lodash');
const serverConnections = require('./serverConnections');
const config = require('./config');
const gistSecret = require('../gistSecret');
const currentVersion = require('../currentVersion');
const socket = require('../utility/socket');
module.exports = {
upload_meta: {
@@ -51,88 +40,70 @@ module.exports = {
res.sendFile(path.join(uploadsdir(), req.query.file));
},
async getGistToken() {
const settings = await config.getSettings();
// uploadErrorToGist_meta: true,
// async uploadErrorToGist() {
// const logs = await fs.readFile(getLogsFilePath(), { encoding: 'utf-8' });
// const connections = await serverConnections.getOpenedConnectionReport();
// try {
// const response = await axios.default.post(
// 'https://api.github.com/gists',
// {
// description: `DbGate ${currentVersion.version} error report`,
// public: false,
// files: {
// 'logs.jsonl': {
// content: logs,
// },
// 'os.json': {
// content: JSON.stringify(
// {
// release: os.release(),
// arch: os.arch(),
// machine: os.machine(),
// platform: os.platform(),
// type: os.type(),
// },
// null,
// 2
// ),
// },
// 'platform.json': {
// content: JSON.stringify(
// _.omit(
// {
// ...platformInfo,
// },
// ['defaultKeyfile', 'sshAuthSock']
// ),
// null,
// 2
// ),
// },
// 'connections.json': {
// content: JSON.stringify(connections, null, 2),
// },
// 'version.json': {
// content: JSON.stringify(currentVersion, null, 2),
// },
// },
// },
// {
// headers: {
// Authorization: `token ${await this.getGistToken()}`,
// 'Content-Type': 'application/json',
// Accept: 'application/vnd.github.v3+json',
// },
// }
// );
return settings['other.gistCreateToken'] || gistSecret;
},
// return response.data;
// } catch (err) {
// logger.error(extractErrorLogData(err), 'DBGM-00148 Error uploading gist');
uploadErrorToGist_meta: true,
async uploadErrorToGist() {
const logs = await fs.readFile(getLogsFilePath(), { encoding: 'utf-8' });
const connections = await serverConnections.getOpenedConnectionReport();
try {
const response = await axios.default.post(
'https://api.github.com/gists',
{
description: `DbGate ${currentVersion.version} error report`,
public: false,
files: {
'logs.jsonl': {
content: logs,
},
'os.json': {
content: JSON.stringify(
{
release: os.release(),
arch: os.arch(),
machine: os.machine(),
platform: os.platform(),
type: os.type(),
},
null,
2
),
},
'platform.json': {
content: JSON.stringify(
_.omit(
{
...platformInfo,
},
['defaultKeyfile', 'sshAuthSock']
),
null,
2
),
},
'connections.json': {
content: JSON.stringify(connections, null, 2),
},
'version.json': {
content: JSON.stringify(currentVersion, null, 2),
},
},
},
{
headers: {
Authorization: `token ${await this.getGistToken()}`,
'Content-Type': 'application/json',
Accept: 'application/vnd.github.v3+json',
},
}
);
return response.data;
} catch (err) {
logger.error(extractErrorLogData(err), 'DBGM-00148 Error uploading gist');
return {
apiErrorMessage: err.message,
};
// console.error('Error creating gist:', error.response ? error.response.data : error.message);
}
},
deleteGist_meta: true,
async deleteGist({ url }) {
const response = await axios.default.delete(url, {
headers: {
Authorization: `token ${await this.getGistToken()}`,
'Content-Type': 'application/json',
Accept: 'application/vnd.github.v3+json',
},
});
return true;
},
};
// return {
// apiErrorMessage: err.message,
// };
// // console.error('Error creating gist:', error.response ? error.response.data : error.message);
// }
// },
// };

1
packages/api/src/gistSecret.js
View File

@@ -1 +0,0 @@
module.exports = process.env.GIST_UPLOAD_SECRET;

7
packages/web/src/commands/stdCommands.ts
View File

@@ -1137,13 +1137,6 @@ registerCommand({
onClick: () => getElectron().send('window-action', 'selectAll'),
});
registerCommand({
id: 'new.gist',
category: 'New',
name: 'Upload error to gist',
onClick: () => showModal(UploadErrorModal),
});
registerCommand({
id: 'app.unsetCurrentDatabase',
category: 'Application',

66
packages/web/src/modals/UploadErrorModal.svelte
View File

@@ -1,66 +0,0 @@
<script lang="ts">
import { onMount } from 'svelte';
import FormStyledButton from '../buttons/FormStyledButton.svelte';
import FormProvider from '../forms/FormProvider.svelte';
import FormSubmit from '../forms/FormSubmit.svelte';
import FormTextField from '../forms/FormTextField.svelte';
import { apiCall } from '../utility/api';
import ModalBase from './ModalBase.svelte';
import { closeCurrentModal } from './modalTools';
import { copyTextToClipboard } from '../utility/clipboard';
import Link from '../elements/Link.svelte';
import LoadingInfo from '../elements/LoadingInfo.svelte';
import { showSnackbarSuccess } from '../utility/snackbar';
import ErrorInfo from '../elements/ErrorInfo.svelte';
export let error = null;
let htmlUrl;
let url;
let errorMessage;
async function upload() {
const resp = await apiCall('uploads/upload-error-to-gist');
url = resp.url;
htmlUrl = resp.html_url;
errorMessage = resp.errorMessage;
}
onMount(() => {
upload();
});
async function handleDelete() {
const resp = await apiCall('uploads/delete-gist', { url });
closeCurrentModal();
showSnackbarSuccess('Gist was deleted');
}
function handleCopy() {
copyTextToClipboard(htmlUrl);
}
</script>
<ModalBase {...$$restProps}>
<svelte:fragment slot="header">Upload error</svelte:fragment>
{#if htmlUrl}
<div>
<p>
Upload error to gist was successful. Please copy gist URL abnd paste it to related github issue. You could check
uploaded data, if don't want to make them public, use Delete button to remove them from gist.
</p>
<p><Link href={htmlUrl}>Open uploaded data</Link></p>
</div>
{:else if errorMessage}
<ErrorInfo message={errorMessage} />
{:else}
<LoadingInfo message="Uploading error to gist..." />
{/if}
<svelte:fragment slot="footer">
<FormStyledButton value="Copy URL" disabled={!htmlUrl} on:click={handleCopy} />
<FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
<FormStyledButton value="Delete" disabled={!url} on:click={handleDelete} />
</svelte:fragment>
</ModalBase>

7
printSecrets.js
View File

@@ -1,7 +0,0 @@
const fs = require('fs');
const text = `
module.exports = '${process.env.GIST_UPLOAD_SECRET}';
`;
fs.writeFileSync('packages/api/src/gistSecret.js', text);

6
workflow-templates/build-app.tpl.yaml
View File

@@ -137,12 +137,6 @@ jobs:
run: |
<<cd_merged>>
yarn setCurrentVersion
- name: printSecrets
run: |
<<cd_merged>>
yarn printSecrets
env:
GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}}
- name: fillPackagedPlugins
run: |
<<cd_merged>>

8
workflow-templates/build-cloud-pro.yaml
View File

@@ -59,14 +59,6 @@ jobs:
cd dbgate-merged
yarn setCurrentVersion
- name: printSecrets
run: |
cd ..
cd dbgate-merged
yarn printSecrets
env:
GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}}
- name: Prepare packer build
run: |
cd ..

6
workflow-templates/build-docker.tpl.yaml
View File

@@ -95,12 +95,6 @@ jobs:
<<cd_merged>>
yarn setCurrentVersion
- name: printSecrets
run: |
<<cd_merged>>
yarn printSecrets
env:
GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}}
- name: Prepare docker image
run: |
<<cd_merged>>

7
workflow-templates/build-npm-pro.yaml
View File

@@ -69,13 +69,6 @@ jobs:
cd dbgate-merged
yarn setCurrentVersion
- name: printSecrets
run: |
cd ..
cd dbgate-merged
yarn printSecrets
env:
GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}}
- name: Publish dbgate-api-premium
run: |

6
workflow-templates/build-npm.yaml
View File

@@ -49,12 +49,6 @@ jobs:
run: |
yarn setCurrentVersion
- name: printSecrets
run: |
yarn printSecrets
env:
GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}}
- name: Publish types
working-directory: packages/types
run: |