rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

internal: move home server into internal flag

Browse Source
This commit is contained in:
Mo
2023-07-05 10:53:10 -05:00
parent d4db3e055c
commit c9c93d143a
16 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/desktop/app/application.ts
View File

@@ -28,6 +28,7 @@ export function initializeApplication(args: { app: Electron.App; ipcMain: Electr
if (isDev()) {
/** Expose the app's state as a global variable. Useful for debugging */
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(global as any).appState = state
setTimeout(() => {
@@ -124,7 +125,6 @@ async function finishApplicationInitialization({ app, shell, state }: { app: App
})
if (state.isRunningVersionForFirstTime()) {
console.log('Clearing window cache')
await windowState.window.webContents.session.clearCache()
}

18
packages/desktop/app/javascripts/Main/HomeServer/HomeServerManager.ts
View File

@@ -4,7 +4,7 @@ import {
HomeServerManagerInterface,
HomeServerEnvironmentConfiguration,
} from '@web/Application/Device/DesktopSnjsExports'
import { HomeServer, HomeServerInterface } from '@standardnotes/home-server'
import { HomeServerInterface } from '@standardnotes/home-server'
import { WebContents } from 'electron'
import { MessageToWebApp } from '../../Shared/IpcMessages'
@@ -127,7 +127,7 @@ export class HomeServerManager implements HomeServerManagerInterface {
}
async startHomeServer(): Promise<string | undefined> {
this.doNotInstantiateHomeServerOnWindowsUntilItIsSupported()
await this.lazyLoadHomeServerOnApplicablePlatforms()
if (!this.homeServer) {
return
@@ -265,9 +265,17 @@ export class HomeServerManager implements HomeServerManagerInterface {
return configuration
}
private doNotInstantiateHomeServerOnWindowsUntilItIsSupported(): void {
if (!isWindows() && !this.homeServer) {
this.homeServer = new HomeServer()
private async lazyLoadHomeServerOnApplicablePlatforms(): Promise<void> {
if (isWindows()) {
return
}
if (this.homeServer) {
return
}
const { HomeServer } = await import('@standardnotes/home-server')
this.homeServer = new HomeServer()
}
}

1
packages/desktop/app/javascripts/Main/Window.ts
View File

@@ -61,6 +61,7 @@ export async function createWindowState({
const services = await createWindowServices(window, appState, appLocale)
require('@electron/remote/main').enable(window.webContents)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(global as any).RemoteBridge = new RemoteBridge(
window,
Keychain,

2
packages/desktop/app/javascripts/Renderer/Preload.ts
View File

@@ -22,6 +22,8 @@ process.once('loaded', function () {
setHomeServerStartedHandler: (handler: MainEventHandler) =>
ipcRenderer.on(MessageToWebApp.HomeServerStarted, handler),
setConsoleLogHandler: (handler: MainEventHandler) => ipcRenderer.on(MessageToWebApp.ConsoleLog, handler),
}
contextBridge.exposeInMainWorld('electronMainEvents', mainEvents)

9
packages/desktop/app/javascripts/Renderer/Renderer.ts
View File

@@ -150,8 +150,13 @@ window.electronMainEvents.setWindowFocusedHandler(() => {
window.webClient.windowGainedFocus()
})
window.electronMainEvents.setInstallComponentCompleteHandler((_: IpcRendererEvent, data: any) => {
void window.webClient.onComponentInstallationComplete(data.component, undefined)
window.electronMainEvents.setConsoleLogHandler((_: IpcRendererEvent, message: unknown) => {
window.webClient.consoleLog(message as string)
})
window.electronMainEvents.setInstallComponentCompleteHandler((_: IpcRendererEvent, data: unknown) => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
void window.webClient.onComponentInstallationComplete((data as any).component, undefined)
})
window.electronMainEvents.setWatchedDirectoriesChangeHandler((_: IpcRendererEvent, changes: unknown) => {

1
packages/desktop/app/javascripts/Shared/ElectronMainEvents.ts
View File

@@ -9,4 +9,5 @@ export interface ElectronMainEvents {
setInstallComponentCompleteHandler(handler: MainEventHandler): void
setWatchedDirectoriesChangeHandler(handler: MainEventHandler): void
setHomeServerStartedHandler(handler: MainEventHandler): void
setConsoleLogHandler(handler: MainEventHandler): void
}

1
packages/desktop/app/javascripts/Shared/IpcMessages.ts
View File

@@ -5,6 +5,7 @@ export enum MessageToWebApp {
InstallComponentComplete = 'install-component-complete',
WatchedDirectoriesChanges = 'watched-directories-changes',
HomeServerStarted = 'home-server-started',
ConsoleLog = 'console-log',
}
export enum MessageToMainProcess {

1
packages/desktop/tsconfig.json
View File

@@ -2,6 +2,7 @@
"compilerOptions": {
"target": "ES2019",
"moduleResolution": "node",
"module": "es2020",
"types": ["node"],
"allowJs": true,
"noEmit": false,

2
packages/services/src/Domain/Device/DesktopWebCommunication.ts
View File

@@ -18,6 +18,8 @@ export interface DesktopClientRequiresWebMethods {
windowLostFocus(): void
consoleLog(message: string): void
onComponentInstallationComplete(componentData: DecryptedTransferPayload, error: unknown): Promise<void>
handleWatchedDirectoriesChanges(changes: DesktopWatchedDirectoriesChanges): Promise<void>

1
packages/services/src/Domain/InternalFeatures/InternalFeature.ts
View File

@@ -1,3 +1,4 @@
export enum InternalFeature {
Vaults = 'vaults',
HomeServer = 'home-server',
}

4
packages/web/CHANGELOG.md
View File

@@ -5,9 +5,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
# [3.165.0](https://github.com/standardnotes/app/compare/@standardnotes/web@3.164.3...@standardnotes/web@3.165.0) (2023-07-04)
### Features
* New one-click Home Server, now in Labs. Launch your own self-hosted server instance with just 1 click from the Preferences window. ([#2345](https://github.com/standardnotes/app/issues/2345)) ([0552878](https://github.com/standardnotes/app/commit/05528782a4e9684dbd86fd12b77eb86727d6c414))
**Note:** Version bump only for package @standardnotes/web
## [3.164.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.164.2...@standardnotes/web@3.164.3) (2023-07-04)

14
packages/web/CHANGELOG.md.json
View File

@@ -1,19 +1,5 @@
{
"versions": [
{
"version": "3.165.0",
"title": "[3.165.0](https://github.com/standardnotes/app/compare/@standardnotes/web@3.164.3...@standardnotes/web@3.165.0) (2023-07-04)",
"date": null,
"body": "### Features\n\n* New one-click Home Server, now in Labs. Launch your own self-hosted server instance with just 1 click from the Preferences window. ([#2345](https://github.com/standardnotes/app/issues/2345)) ([0552878](https://github.com/standardnotes/app/commit/05528782a4e9684dbd86fd12b77eb86727d6c414))",
"parsed": {
"_": [
"New one-click Home Server, now in Labs. Launch your own self-hosted server instance with just 1 click from the Preferences window. (#2345) (0552878)"
],
"Features": [
"New one-click Home Server, now in Labs. Launch your own self-hosted server instance with just 1 click from the Preferences window. (#2345) (0552878)"
]
}
},
{
"version": "3.164.3",
"title": "[3.164.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.164.2...@standardnotes/web@3.164.3) (2023-07-04)",

1
packages/web/src/javascripts/Application/DevMode.ts
View File

@@ -4,6 +4,7 @@ import { WebApplicationInterface } from '@standardnotes/ui-services'
export class DevMode {
constructor(private application: WebApplicationInterface) {
InternalFeatureService.get().enableFeature(InternalFeature.Vaults)
InternalFeatureService.get().enableFeature(InternalFeature.HomeServer)
}
/** Valid only when running a mock event publisher on port 3124 */

5
packages/web/src/javascripts/Application/Device/DesktopManager.ts
View File

@@ -176,6 +176,11 @@ export class DesktopManager
}
}
consoleLog(message: string): void {
// eslint-disable-next-line no-console
console.log(message)
}
async onComponentInstallationComplete(componentData: DecryptedTransferPayload<ComponentContent>) {
const component = this.application.items.findItem(componentData.uuid)
if (!component) {

10
packages/web/src/javascripts/Components/Preferences/PreferencesMenu.ts
View File

@@ -5,7 +5,7 @@ import { PackageProvider } from './Panes/General/Advanced/Packages/Provider/Pack
import { securityPrefsHasBubble } from './Panes/Security/securityPrefsHasBubble'
import { PreferenceId } from '@standardnotes/ui-services'
import { isDesktopApplication } from '@/Utils'
import { featureTrunkVaultsEnabled } from '@/FeatureTrunk'
import { featureTrunkHomeServerEnabled, featureTrunkVaultsEnabled } from '@/FeatureTrunk'
interface PreferencesMenuItem {
readonly id: PreferenceId
@@ -47,9 +47,7 @@ const READY_PREFERENCES_MENU_ITEMS: PreferencesMenuItem[] = [
{ id: 'help-feedback', label: 'Help & feedback', icon: 'help', order: 11 },
]
const DESKTOP_PREFERENCES_MENU_ITEMS: PreferencesMenuItem[] = [
{ id: 'home-server', label: 'Home Server', icon: 'server', order: 5 },
]
const DESKTOP_PREFERENCES_MENU_ITEMS: PreferencesMenuItem[] = []
export class PreferencesMenu {
private _selectedPane: PreferenceId = 'account'
@@ -62,6 +60,10 @@ export class PreferencesMenu {
READY_PREFERENCES_MENU_ITEMS.splice(3, 0, { id: 'vaults', label: 'Vaults', icon: 'safe-square', order: 5 })
}
if (featureTrunkHomeServerEnabled()) {
DESKTOP_PREFERENCES_MENU_ITEMS.push({ id: 'home-server', label: 'Home Server', icon: 'server', order: 5 })
}
let menuItems = this._enableUnfinishedFeatures ? PREFERENCES_MENU_ITEMS : READY_PREFERENCES_MENU_ITEMS
if (isDesktopApplication()) {

4
packages/web/src/javascripts/FeatureTrunk.ts
View File

@@ -11,3 +11,7 @@ export function featureTrunkEnabled(trunk: FeatureTrunkName): boolean {
export function featureTrunkVaultsEnabled(): boolean {
return InternalFeatureService.get().isFeatureEnabled(InternalFeature.Vaults)
}
export function featureTrunkHomeServerEnabled(): boolean {
return InternalFeatureService.get().isFeatureEnabled(InternalFeature.HomeServer)
}