From fbfd92477a09da46a2b10533a8ac88189039eebf Mon Sep 17 00:00:00 2001 From: Louis Date: Mon, 22 Jan 2024 13:56:23 +0700 Subject: [PATCH] chore: copy --- core/src/node/extension/extension.ts | 4 +-- core/src/node/extension/index.ts | 4 +-- core/src/node/log.ts | 2 +- electron/.eslintrc.js | 2 +- server/index.ts | 10 +++---- web/screens/Settings/Advanced/index.tsx | 36 +++++++++++++++---------- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/core/src/node/extension/extension.ts b/core/src/node/extension/extension.ts index c1e3f6fcef..aeb0277c0b 100644 --- a/core/src/node/extension/extension.ts +++ b/core/src/node/extension/extension.ts @@ -103,7 +103,7 @@ export default class Extension { const pacote = await import('pacote') await pacote.extract( this.specifier, - join((await ExtensionManager.instance.getExtensionsPath()) ?? '', this.name ?? ''), + join(ExtensionManager.instance.getExtensionsPath() ?? '', this.name ?? ''), this.installOptions, ) @@ -180,7 +180,7 @@ export default class Extension { * @returns {Promise} */ async uninstall(): Promise { - const path = await ExtensionManager.instance.getExtensionsPath() + const path = ExtensionManager.instance.getExtensionsPath() const extPath = resolve(path ?? '', this.name ?? '') await rmdirSync(extPath, { recursive: true }) diff --git a/core/src/node/extension/index.ts b/core/src/node/extension/index.ts index e77e70ea85..ed8544773a 100644 --- a/core/src/node/extension/index.ts +++ b/core/src/node/extension/index.ts @@ -40,7 +40,7 @@ async function registerExtensionProtocol() { } catch (err) { console.error('Electron is not available') } - const extensionPath = await ExtensionManager.instance.getExtensionsPath() + const extensionPath = ExtensionManager.instance.getExtensionsPath() if (electron) { return electron.protocol.registerFileProtocol('extension', (request: any, callback: any) => { const entry = request.url.substr('extension://'.length - 1) @@ -57,7 +57,7 @@ async function registerExtensionProtocol() { * @param {string} extensionsPath Path to the extensions folder. Required if not yet set up. * @returns {extensionManager} A set of functions used to manage the extension lifecycle. */ -export async function useExtensions(extensionsPath: string) { +export function useExtensions(extensionsPath: string) { if (!extensionsPath) throw Error('A path to the extensions folder is required to use extensions') // Store the path to the extensions folder ExtensionManager.instance.setExtensionsPath(extensionsPath) diff --git a/core/src/node/log.ts b/core/src/node/log.ts index d5fbf6282f..8a5155d8da 100644 --- a/core/src/node/log.ts +++ b/core/src/node/log.ts @@ -23,7 +23,7 @@ export const log = function (message: string) { export const logServer = function (message: string) { const serverLogPath = getServerLogPath() if (!message.startsWith('[')) { - message = `[APP]::${message}` + message = `[SERVER]::${message}` } message = `${new Date().toISOString()} ${message}` diff --git a/electron/.eslintrc.js b/electron/.eslintrc.js index 25a98348fa..d252ec42bd 100644 --- a/electron/.eslintrc.js +++ b/electron/.eslintrc.js @@ -34,5 +34,5 @@ module.exports = { { name: 'Link', linkAttribute: 'to' }, ], }, - ignorePatterns: ['build', 'renderer', 'node_modules'], + ignorePatterns: ['build', 'renderer', 'node_modules', '@global'], } diff --git a/server/index.ts b/server/index.ts index 77a370d1e6..4195e0ad40 100644 --- a/server/index.ts +++ b/server/index.ts @@ -55,7 +55,7 @@ export const startServer = async (configs?: ServerConfig) => { // Start the server try { // Log server start - if (isVerbose) logServer(`[API]::Debug: Starting JAN API server...`); + if (isVerbose) logServer(`Debug: Starting JAN API server...`); // Initialize Fastify server with logging server = fastify({ @@ -116,12 +116,12 @@ export const startServer = async (configs?: ServerConfig) => { // Log server listening if (isVerbose) logServer( - `[API]::Debug: JAN API listening at: http://${JAN_API_HOST}:${JAN_API_PORT}` + `Debug: JAN API listening at: http://${JAN_API_HOST}:${JAN_API_PORT}` ); }); } catch (e) { // Log any errors - if (isVerbose) logServer(`[API]::Error: ${e}`); + if (isVerbose) logServer(`Error: ${e}`); } }; @@ -131,11 +131,11 @@ export const startServer = async (configs?: ServerConfig) => { export const stopServer = async () => { try { // Log server stop - if (isVerbose) logServer(`[API]::Debug: Server stopped`); + if (isVerbose) logServer(`Debug: Server stopped`); // Stop the server await server.close(); } catch (e) { // Log any errors - if (isVerbose) logServer(`[API]::Error: ${e}`); + if (isVerbose) logServer(`Error: ${e}`); } }; diff --git a/web/screens/Settings/Advanced/index.tsx b/web/screens/Settings/Advanced/index.tsx index 45c5c82e0a..0a00a69417 100644 --- a/web/screens/Settings/Advanced/index.tsx +++ b/web/screens/Settings/Advanced/index.tsx @@ -232,22 +232,30 @@ const Advanced = () => { Clear -
-
-
-
- Select Jan Data Folder -
+ {experimentalFeature && ( +
+
+
+
+ Jan Data Folder +
+
+

+ Where messages, model configurations, and other user data is placed. +

+

+ {`${currentPath}`} +

-

- Select Jan's data folder. Current folder is located at - {` ${currentPath}`} -

+
- -
+ )}