dbgate-api 5.2.8 → 5.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "5.2.8",
+  "version": "5.3.0",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-query-splitter": "^4.9.3",
-    "dbgate-sqltree": "^5.2.8",
-    "dbgate-tools": "^5.2.8",
-    "dbgate-datalib": "^5.2.8",
+    "dbgate-datalib": "^5.3.0",
+    "dbgate-query-splitter": "^4.10.1",
+    "dbgate-sqltree": "^5.3.0",
+    "dbgate-tools": "^5.3.0",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -52,16 +52,15 @@
     "ncp": "^2.0.0",
     "node-cron": "^2.0.3",
     "on-finished": "^2.4.1",
-    "pinomin": "^1.0.1",
+    "pinomin": "^1.0.4",
     "portfinder": "^1.0.28",
     "rimraf": "^3.0.0",
     "simple-encryptor": "^4.0.0",
     "ssh2": "^1.11.0",
-    "tar": "^6.0.5",
-    "uuid": "^3.4.0"
+    "tar": "^6.0.5"
   },
   "scripts": {
-    "start": "env-cmd node src/index.js --listen-api",
+    "start": "env-cmd -f .env node src/index.js --listen-api",
     "start:portal": "env-cmd -f env/portal/.env node src/index.js --listen-api",
     "start:singledb": "env-cmd -f env/singledb/.env node src/index.js --listen-api",
     "start:auth": "env-cmd -f env/auth/.env node src/index.js --listen-api",
@@ -74,7 +73,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^5.2.8",
+    "dbgate-types": "^5.3.0",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",
@@ -84,7 +83,6 @@
   },
   "optionalDependencies": {
     "better-sqlite3": "9.6.0",
-    "msnodesqlv8": "^4.2.1",
-    "oracledb": "^5.5.0"
+    "msnodesqlv8": "^4.2.1"
   }
 }

package/src/controllers/archive.js

@@ -1,12 +1,12 @@
 const fs = require('fs-extra');
 const readline = require('readline');
+const crypto = require('crypto');
 const path = require('path');
 const { archivedir, clearArchiveLinksCache, resolveArchiveFolder } = require('../utility/directories');
 const socket = require('../utility/socket');
 const loadFilesRecursive = require('../utility/loadFilesRecursive');
 const getJslFileName = require('../utility/getJslFileName');
 const { getLogger } = require('dbgate-tools');
-const uuidv1 = require('uuid/v1');
 const dbgateApi = require('../shell');
 const jsldata = require('./jsldata');
 const platformInfo = require('../utility/platformInfo');
@@ -127,7 +127,7 @@ module.exports = {
       return true;
     }
 
-    const tmpchangedFilePath = path.join(resolveArchiveFolder(folder), `${file}-${uuidv1()}.jsonl`);
+    const tmpchangedFilePath = path.join(resolveArchiveFolder(folder), `${file}-${crypto.randomUUID()}.jsonl`);
     const reader = await dbgateApi.modifyJsonLinesReader({
       fileName: changedFilePath,
       changeSet,

package/src/controllers/auth.js

@@ -1,14 +1,14 @@
 const axios = require('axios');
 const jwt = require('jsonwebtoken');
 const getExpressPath = require('../utility/getExpressPath');
-const uuidv1 = require('uuid/v1');
 const { getLogins } = require('../utility/hasPermission');
 const { getLogger } = require('dbgate-tools');
 const AD = require('activedirectory2').promiseWrapper;
+const crypto = require('crypto');
 
 const logger = getLogger('auth');
 
-const tokenSecret = uuidv1();
+const tokenSecret = crypto.randomUUID();
 
 function shouldAuthorizeApi() {
   const logins = getLogins();
@@ -90,6 +90,24 @@ module.exports = {
     ) {
       return { error: `Username ${login} not allowed to log in` };
     }
+
+    const groups = 
+      process.env.OAUTH_GROUP_FIELD && payload && payload[process.env.OAUTH_GROUP_FIELD]
+        ? payload[process.env.OAUTH_GROUP_FIELD]
+        : [];
+
+    const allowedGroups = 
+      process.env.OAUTH_ALLOWED_GROUPS
+        ? process.env.OAUTH_ALLOWED_GROUPS.split(',').map(group => group.toLowerCase().trim())
+        : [];
+    
+    if (
+      process.env.OAUTH_ALLOWED_GROUPS && 
+      !groups.some(group => allowedGroups.includes(group.toLowerCase().trim()))
+    ) {
+      return { error: `Username ${login} does not belong to an allowed group` };
+    }
+
     if (access_token) {
       return {
         accessToken: jwt.sign({ login }, tokenSecret, { expiresIn: getTokenLifetime() }),

package/src/controllers/connections.js

@@ -61,6 +61,7 @@ function getPortalCollections() {
       useDatabaseUrl: !!process.env[`URL_${id}`],
       databaseFile: process.env[`FILE_${id}`],
       socketPath: process.env[`SOCKET_PATH_${id}`],
+      serviceName: process.env[`SERVICE_NAME_${id}`],
       authType: process.env[`AUTH_TYPE_${id}`] || (process.env[`SOCKET_PATH_${id}`] ? 'socket' : undefined),
       defaultDatabase:
         process.env[`DATABASE_${id}`] ||

package/src/controllers/databaseConnections.js

@@ -1,4 +1,3 @@
-const uuidv1 = require('uuid/v1');
 const connections = require('./connections');
 const archive = require('./archive');
 const socket = require('../utility/socket');
@@ -30,6 +29,7 @@ const processArgs = require('../utility/processArgs');
 const { testConnectionPermission } = require('../utility/hasPermission');
 const { MissingCredentialsError } = require('../utility/exceptions');
 const pipeForkLogs = require('../utility/pipeForkLogs');
+const crypto = require('crypto');
 
 const logger = getLogger('databaseConnections');
 
@@ -137,7 +137,7 @@ module.exports = {
 
   /** @param {import('dbgate-types').OpenedDatabaseConnection} conn */
   sendRequest(conn, message) {
-    const msgid = uuidv1();
+    const msgid = crypto.randomUUID();
     const promise = new Promise((resolve, reject) => {
       this.requests[msgid] = [resolve, reject];
       try {

package/src/controllers/files.js

@@ -1,6 +1,6 @@
-const uuidv1 = require('uuid/v1');
 const fs = require('fs-extra');
 const path = require('path');
+const crypto = require('crypto');
 const { filesdir, archivedir, resolveArchiveFolder, uploadsdir, appdir } = require('../utility/directories');
 const getChartExport = require('../utility/getChartExport');
 const { hasPermission } = require('../utility/hasPermission');
@@ -164,7 +164,7 @@ module.exports = {
 
   generateUploadsFile_meta: true,
   async generateUploadsFile({ extension }) {
-    const fileName = `${uuidv1()}.${extension || 'html'}`;
+    const fileName = `${crypto.randomUUID()}.${extension || 'html'}`;
     return {
       fileName,
       filePath: path.join(uploadsdir(), fileName),

package/src/controllers/runners.js

@@ -1,7 +1,7 @@
+const crypto = require('crypto');
 const _ = require('lodash');
 const path = require('path');
 const fs = require('fs-extra');
-const uuidv1 = require('uuid/v1');
 const byline = require('byline');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
@@ -165,7 +165,7 @@ module.exports = {
 
   start_meta: true,
   async start({ script }) {
-    const runid = uuidv1();
+    const runid = crypto.randomUUID()
 
     if (script.type == 'json') {
       const js = jsonScriptToJavascript(script);
@@ -213,7 +213,7 @@ module.exports = {
   loadReader_meta: true,
   async loadReader({ functionName, props }) {
     const promise = new Promise((resolve, reject) => {
-      const runid = uuidv1();
+      const runid = crypto.randomUUID();
       this.requests[runid] = [resolve, reject];
       this.startCore(runid, loaderScriptTemplate(functionName, props, runid));
     });

package/src/controllers/serverConnections.js

@@ -1,7 +1,6 @@
 const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
-const uuidv1 = require('uuid/v1');
 const _ = require('lodash');
 const AsyncLock = require('async-lock');
 const { handleProcessCommunication } = require('../utility/processComm');
@@ -152,7 +151,7 @@ module.exports = {
   },
 
   ping_meta: true,
-  async ping({ conidArray }) {
+  async ping({ conidArray, strmid }) {
     await Promise.all(
       _.uniq(conidArray).map(async conid => {
         const last = this.lastPinged[conid];
@@ -169,6 +168,7 @@ module.exports = {
         }
       })
     );
+    socket.setStreamIdFilter(strmid, { conid: conidArray });
     return { status: 'ok' };
   },
 
@@ -200,7 +200,7 @@ module.exports = {
   },
 
   sendRequest(conn, message) {
-    const msgid = uuidv1();
+    const msgid = crypto.randomUUID();
     const promise = new Promise((resolve, reject) => {
       this.requests[msgid] = [resolve, reject];
       try {
@@ -240,4 +240,20 @@ module.exports = {
     if (opened.connection.isReadOnly) return false;
     return this.loadDataCore('summaryCommand', { conid, command, row });
   },
+
+  getOpenedConnectionReport() {
+    return this.opened.map(con => ({
+      status: con.status,
+      versionText: con.version?.versionText,
+      databaseCount: con.databases.length,
+      connection: _.pick(con.connection, [
+        'engine',
+        'useSshTunnel',
+        'authType',
+        'trustServerCertificate',
+        'useSsl',
+        'sshMode',
+      ]),
+    }));
+  },
 };

package/src/controllers/sessions.js

@@ -1,5 +1,5 @@
+const crypto = require('crypto');
 const _ = require('lodash');
-const uuidv1 = require('uuid/v1');
 const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
@@ -85,7 +85,7 @@ module.exports = {
 
   create_meta: true,
   async create({ conid, database }) {
-    const sesid = uuidv1();
+    const sesid = crypto.randomUUID();
     const connection = await connections.getCore({ conid });
     const subprocess = fork(
       global['API_PACKAGE'] || process.argv[1],

package/src/controllers/uploads.js

@@ -1,8 +1,17 @@
+const crypto = require('crypto');
 const path = require('path');
-const { uploadsdir } = require('../utility/directories');
-const uuidv1 = require('uuid/v1');
+const { uploadsdir, getLogsFilePath } = 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');
 
 module.exports = {
   upload_meta: {
@@ -15,7 +24,7 @@ module.exports = {
       res.json(null);
       return;
     }
-    const uploadName = uuidv1();
+    const uploadName = crypto.randomUUID();
     const filePath = path.join(uploadsdir(), uploadName);
     logger.info(`Uploading file ${data.name}, size=${data.size}`);
 
@@ -35,4 +44,86 @@ module.exports = {
   get(req, res) {
     res.sendFile(path.join(uploadsdir(), req.query.file));
   },
+
+  async getGistToken() {
+    const settings = await config.getSettings();
+
+    return settings['other.gistCreateToken'] || gistSecret;
+  },
+
+  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 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),
+            },
+          },
+        },
+        {
+          headers: {
+            Authorization: `token ${await this.getGistToken()}`,
+            'Content-Type': 'application/json',
+            Accept: 'application/vnd.github.v3+json',
+          },
+        }
+      );
+
+      return response.data;
+    } catch (err) {
+      logger.error({ err }, '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;
+  },
 };

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '5.2.8',
-  buildTime: '2024-05-17T04:41:36.747Z'
+  version: '5.3.0',
+  buildTime: '2024-06-07T08:19:32.117Z'
 };

package/src/gistSecret.js

@@ -0,0 +1,2 @@
+
+module.exports = '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';

package/src/index.js

@@ -1,4 +1,4 @@
-const { setLogger, getLogger, setLoggerName } = require('dbgate-tools');
+const { setLogConfig, getLogger, setLoggerName } = require('dbgate-tools');
 const processArgs = require('./utility/processArgs');
 const fs = require('fs');
 const moment = require('moment');
@@ -30,22 +30,27 @@ function configureLogger() {
   setLogsFilePath(logsFilePath);
   setLoggerName('main');
 
-  const logger = createLogger({
+  const consoleLogLevel = process.env.CONSOLE_LOG_LEVEL || process.env.LOG_LEVEL || 'info';
+  const fileLogLevel = process.env.FILE_LOG_LEVEL || process.env.LOG_LEVEL || 'debug';
+
+  const logConfig = {
     base: { pid: process.pid },
     targets: [
       {
         type: 'console',
         // @ts-ignore
-        level: process.env.CONSOLE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
+        level: consoleLogLevel,
       },
       {
         type: 'stream',
         // @ts-ignore
-        level: process.env.FILE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
+        level: fileLogLevel,
         stream: fs.createWriteStream(logsFilePath, { flags: 'a' }),
       },
     ],
-  });
+  };
+
+  // logger.info(`Initialized logging, console log level: ${consoleLogLevel}, file log level: ${fileLogLevel}`);
 
   // const streams = [];
   // if (!platformInfo.isElectron) {
@@ -83,14 +88,15 @@ function configureLogger() {
   //   },
   // });
 
-  setLogger(logger);
+  // @ts-ignore
+  setLogConfig(logConfig);
 }
 
 if (processArgs.listenApi) {
   configureLogger();
 }
 
-const shell = require('./shell');
+const shell = require('./shell/index');
 const dbgateTools = require('dbgate-tools');
 
 global['DBGATE_TOOLS'] = dbgateTools;

package/src/main.js

@@ -77,6 +77,7 @@ function start() {
   }
 
   app.get(getExpressPath('/stream'), async function (req, res) {
+    const strmid = req.query.strmid;
     res.set({
       'Cache-Control': 'no-cache',
       'Content-Type': 'text/event-stream',
@@ -87,9 +88,9 @@ function start() {
 
     // Tell the client to retry every 10 seconds if connectivity is lost
     res.write('retry: 10000\n\n');
-    socket.addSseResponse(res);
+    socket.addSseResponse(res, strmid);
     onFinished(req, () => {
-      socket.removeSseResponse(res);
+      socket.removeSseResponse(strmid);
     });
   });
 

package/src/nativeModulesContent.js

@@ -2,6 +2,6 @@
 // this file is generated automatically by script fillNativeModules.js, do not edit it manually
 const content = {};
 
-content.oracledb = () => require('oracledb');content['better-sqlite3'] = () => require('better-sqlite3');
+content['better-sqlite3'] = () => require('better-sqlite3');
 
 module.exports = content;

package/src/proc/sessionProcess.js

@@ -1,4 +1,4 @@
-const uuidv1 = require('uuid/v1');
+const crypto = require('crypto');
 const path = require('path');
 const fs = require('fs');
 const _ = require('lodash');
@@ -31,7 +31,7 @@ class TableWriter {
   }
 
   initializeFromQuery(structure, resultIndex) {
-    this.jslid = uuidv1();
+    this.jslid = crypto.randomUUID();
     this.currentFile = path.join(jsldir(), `${this.jslid}.jsonl`);
     fs.writeFileSync(
       this.currentFile,

package/src/shell/download.js

@@ -1,11 +1,11 @@
+const crypto = require('crypto');
 const path = require('path');
-const uuidv1 = require('uuid/v1');
 const { uploadsdir } = require('../utility/directories');
 const { downloadFile } = require('../utility/downloader');
 
 async function download(url) {
   if (url && url.match(/(^http:\/\/)|(^https:\/\/)/)) {
-    const tmpFile = path.join(uploadsdir(), uuidv1());
+    const tmpFile = path.join(uploadsdir(), crypto.randomUUID());
     await downloadFile(url, tmpFile);
     return tmpFile;
   }

package/src/utility/DatastoreProxy.js

@@ -1,5 +1,5 @@
+const crypto = require('crypto');
 const { fork } = require('child_process');
-const uuidv1 = require('uuid/v1');
 const { handleProcessCommunication } = require('./processComm');
 const processArgs = require('../utility/processArgs');
 const pipeForkLogs = require('./pipeForkLogs');
@@ -67,7 +67,7 @@ class DatastoreProxy {
 
   async getRows(offset, limit) {
     await this.ensureSubprocess();
-    const msgid = uuidv1();
+    const msgid = crypto.randomUUID();
     const promise = new Promise((resolve, reject) => {
       this.requests[msgid] = [resolve, reject];
       try {
@@ -81,7 +81,7 @@ class DatastoreProxy {
   }
 
   async notifyChangedCore() {
-    const msgid = uuidv1();
+    const msgid = crypto.randomUUID();
     const promise = new Promise((resolve, reject) => {
       this.requests[msgid] = [resolve, reject];
       try {

package/src/utility/JsonLinesDatabase.js

@@ -1,6 +1,6 @@
+const crypto = require('crypto');
 const AsyncLock = require('async-lock');
 const fs = require('fs-extra');
-const uuidv1 = require('uuid/v1');
 
 const lock = new AsyncLock();
 
@@ -57,7 +57,7 @@ class JsonLinesDatabase {
       ? obj
       : {
           ...obj,
-          _id: uuidv1(),
+          _id: crypto.randomUUID(),
         };
     this.data.push(elem);
     await this._save();

package/src/utility/JsonLinesDatastore.js

@@ -1,3 +1,4 @@
+const crypto = require('crypto');
 const fs = require('fs');
 const os = require('os');
 const rimraf = require('rimraf');
@@ -8,7 +9,6 @@ const stableStringify = require('json-stable-stringify');
 const { evaluateCondition } = require('dbgate-sqltree');
 const requirePluginFunction = require('./requirePluginFunction');
 const esort = require('external-sorting');
-const uuidv1 = require('uuid/v1');
 const { jsldir } = require('./directories');
 const LineReader = require('./LineReader');
 
@@ -28,7 +28,7 @@ class JsonLinesDatastore {
   }
 
   static async sortFile(infile, outfile, sort) {
-    const tempDir = path.join(os.tmpdir(), uuidv1());
+    const tempDir = path.join(os.tmpdir(), crypto.randomUUID());
     fs.mkdirSync(tempDir);
 
     await esort

package/src/utility/connectUtility.js

@@ -52,7 +52,7 @@ async function connectUtility(driver, storedConnection, connectionMode, addition
       throw new Error(tunnel.message);
     }
 
-    connection.server = '127.0.0.1';
+    connection.server = 'localhost';
     connection.port = tunnel.localPort;
   }
 

package/src/utility/downloadPackage.js

@@ -1,7 +1,7 @@
+const crypto = require('crypto');
 // const pacote = require('pacote');
 const axios = require('axios');
 // const tarballExtract = require('tarball-extract');
-const uuidv1 = require('uuid/v1');
 const path = require('path');
 const fs = require('fs');
 const zlib = require('zlib');
@@ -38,9 +38,9 @@ async function downloadPackage(packageName, directory) {
 
   const tarball = infoResp.data.versions[latest].dist.tarball;
 
-  const tmpFile = path.join(uploadsdir(), uuidv1() + '.tgz');
+  const tmpFile = path.join(uploadsdir(), crypto.randomUUID() + '.tgz');
   await downloadFile(tarball, tmpFile);
-  const tmpDir = path.join(uploadsdir(), uuidv1());
+  const tmpDir = path.join(uploadsdir(), crypto.randomUUID());
   fs.mkdirSync(tmpDir);
   await extractTarball(tmpFile, tmpDir);
   await copyDirectory(path.join(tmpDir, 'package'), directory);

package/src/utility/socket.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const stableStringify = require('json-stable-stringify');
 
-const sseResponses = [];
+const sseResponses = {};
 let electronSender = null;
 let pingConfigured = false;
 
@@ -12,12 +12,15 @@ module.exports = {
       pingConfigured = true;
     }
   },
-  addSseResponse(value) {
-    sseResponses.push(value);
+  addSseResponse(value, strmid) {
+    sseResponses[strmid] = {
+      ...sseResponses[strmid],
+      response: value,
+    };
     this.ensurePing();
   },
-  removeSseResponse(value) {
-    _.remove(sseResponses, x => x == value);
+  removeSseResponse(strmid) {
+    delete sseResponses[strmid];
   },
   setElectronSender(value) {
     electronSender = value;
@@ -27,8 +30,25 @@ module.exports = {
     if (electronSender) {
       electronSender.send(message, data == null ? null : data);
     }
-    for (const res of sseResponses) {
-      res.write(`event: ${message}\ndata: ${stableStringify(data == null ? null : data)}\n\n`);
+    for (const strmid in sseResponses) {
+      let skipThisStream = false;
+      if (sseResponses[strmid].filter) {
+        for (const key in sseResponses[strmid].filter) {
+          if (data && data[key]) {
+            if (!sseResponses[strmid].filter[key].includes(data[key])) {
+              skipThisStream = true;
+              break;
+            }
+          }
+        }
+      }
+      if (skipThisStream) {
+        continue;
+      }
+
+      sseResponses[strmid].response?.write(
+        `event: ${message}\ndata: ${stableStringify(data == null ? null : data)}\n\n`
+      );
     }
   },
   emitChanged(key, params = undefined) {
@@ -36,4 +56,10 @@ module.exports = {
     this.emit('changed-cache', { key, ...params });
     // this.emit(key);
   },
+  setStreamIdFilter(strmid, filter) {
+    sseResponses[strmid] = {
+      ...sseResponses[strmid],
+      filter,
+    };
+  },
 };

package/src/utility/sshTunnelProxy.js

@@ -1,5 +1,5 @@
+const crypto = require('crypto');
 const { getLogger } = require('dbgate-tools');
-const uuidv1 = require('uuid/v1');
 const { getSshTunnel } = require('./sshTunnel');
 const logger = getLogger('sshTunnelProxy');
 
@@ -22,7 +22,7 @@ function handleGetSshTunnelResponse({ msgid, response }, subprocess) {
 
 async function getSshTunnelProxy(connection) {
   if (!process.send) return getSshTunnel(connection);
-  const msgid = uuidv1();
+  const msgid = crypto.randomUUID();
   process.send({ msgtype: 'getsshtunnel-request', msgid, connection });
   return new Promise((resolve, reject) => {
     dispatchedMessages[msgid] = { resolve, reject };