Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-06 20:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'canary' into stable

Browse Source
This commit is contained in:
李华桥
2023-12-10 21:04:15 +08:00
parent 120e7397ba f0c70b92f4
commit 42383dbd29
399 changed files with 10365 additions and 4747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/electron/package.json
+13 -13
View File
@@ -11,14 +11,14 @@
"homepage": "https://github.com/toeverything/AFFiNE",
"scripts": {
"start": "electron .",
"dev": "DEV_SERVER_URL=http://localhost:8080 yarn ts-node ./scripts/dev.ts",
"dev:prod": "yarn ts-node scripts/dev.ts",
"build": "NODE_ENV=production ts-node scripts/build-layers.ts",
"build:dev": "NODE_ENV=development ts-node scripts/build-layers.ts",
"generate-assets": "ts-node scripts/generate-assets.ts",
"package": "cross-env NODE_OPTIONS=\"--loader ts-node/esm\" electron-forge package",
"make": "cross-env NODE_OPTIONS=\"--loader ts-node/esm\" electron-forge make",
"make-squirrel": "yarn ts-node scripts/make-squirrel.ts"
"dev": "DEV_SERVER_URL=http://localhost:8080 node --loader ts-node/esm/transpile-only ./scripts/dev.ts",
"dev:prod": "yarn node --loader ts-node/esm/transpile-only scripts/dev.ts",
"build": "NODE_ENV=production node --loader ts-node/esm/transpile-only scripts/build-layers.ts",
"build:dev": "NODE_ENV=development node --loader ts-node/esm/transpile-only scripts/build-layers.ts",
"generate-assets": "node --loader ts-node/esm/transpile-only scripts/generate-assets.ts",
"package": "cross-env NODE_OPTIONS=\"--loader ts-node/esm/transpile-only\" electron-forge package",
"make": "cross-env NODE_OPTIONS=\"--loader ts-node/esm/transpile-only\" electron-forge make",
"make-squirrel": "node --loader ts-node/esm/transpile-only scripts/make-squirrel.ts"
},
"main": "./dist/main.js",
"devDependencies": {
@@ -32,10 +32,10 @@
"@affine/sdk": "workspace:*",
"@affine/templates": "workspace:*",
"@affine/vue-hello-world-plugin": "workspace:*",
"@blocksuite/blocks": "0.0.0-20231124123613-7c06e95d-nightly",
"@blocksuite/editor": "0.0.0-20231124123613-7c06e95d-nightly",
"@blocksuite/lit": "0.0.0-20231124123613-7c06e95d-nightly",
"@blocksuite/store": "0.0.0-20231124123613-7c06e95d-nightly",
"@blocksuite/blocks": "0.11.0-nightly-202312070955-2b5bb47",
"@blocksuite/lit": "0.11.0-nightly-202312070955-2b5bb47",
"@blocksuite/presets": "0.11.0-nightly-202312070955-2b5bb47",
"@blocksuite/store": "0.11.0-nightly-202312070955-2b5bb47",
"@electron-forge/cli": "^7.1.0",
"@electron-forge/core": "^7.1.0",
"@electron-forge/core-utils": "^7.1.0",
@@ -64,7 +64,7 @@
"semver": "^7.5.4",
"tinykeys": "^2.1.0",
"ts-node": "^10.9.1",
"undici": "^5.27.2",
"undici": "^6.0.0",
"uuid": "^9.0.1",
"vitest": "0.34.6",
"which": "^4.0.0",
packages/frontend/electron/src/helper/db/migration.ts
+17 -14
View File
@@ -1,4 +1,3 @@
import { equal } from 'node:assert';
import { resolve } from 'node:path';
import { SqliteConnection } from '@affine/native';
@@ -78,19 +77,23 @@ export const migrateToLatest = async (
};
await downloadBinary(rootDoc, true);
const result = await forceUpgradePages(rootDoc, schema);
equal(result, true, 'migrateWorkspace should return boolean value');
const uploadBinary = async (doc: YDoc, isRoot: boolean) => {
await connection.replaceUpdates(doc.guid, [
{ docId: isRoot ? undefined : doc.guid, data: encodeStateAsUpdate(doc) },
]);
// connection..applyUpdate(encodeStateAsUpdate(doc), 'self', doc.guid)
await Promise.all(
[...doc.subdocs].map(subdoc => {
return uploadBinary(subdoc, false);
})
);
};
await uploadBinary(rootDoc, true);
if (result) {
const uploadBinary = async (doc: YDoc, isRoot: boolean) => {
await connection.replaceUpdates(doc.guid, [
{
docId: isRoot ? undefined : doc.guid,
data: encodeStateAsUpdate(doc),
},
]);
// connection..applyUpdate(encodeStateAsUpdate(doc), 'self', doc.guid)
await Promise.all(
[...doc.subdocs].map(subdoc => {
return uploadBinary(subdoc, false);
})
);
};
await uploadBinary(rootDoc, true);
}
await connection.close();
};
packages/frontend/electron/src/main/application-menu/create.ts
+1 -1
View File
@@ -125,7 +125,7 @@ export function createApplicationMenu() {
{
label: 'Check for Updates',
click: async () => {
await checkForUpdates(true);
await checkForUpdates();
},
},
],
packages/frontend/electron/src/main/deep-link.ts
+5 -4
View File
@@ -5,10 +5,10 @@ import { type App, type BrowserWindow, ipcMain } from 'electron';
import { buildType, CLOUD_BASE_URL, isDev } from './config';
import { logger } from './logger';
import {
getOrCreateWindow,
handleOpenUrlInHiddenWindow,
mainWindowOrigin,
removeCookie,
restoreOrCreateWindow,
setCookie,
} from './main-window';
@@ -39,8 +39,9 @@ export function setupDeepLink(app: App) {
// on windows & linux, we need to listen for the second-instance event
app.on('second-instance', (event, commandLine) => {
restoreOrCreateWindow()
.then(() => {
getOrCreateWindow()
.then(window => {
window.show();
const url = commandLine.pop();
if (url?.startsWith(`${protocol}://`)) {
event.preventDefault();
@@ -67,7 +68,7 @@ async function handleAffineUrl(url: string) {
async function handleOauthJwt(url: string) {
if (url) {
try {
const mainWindow = await restoreOrCreateWindow();
const mainWindow = await getOrCreateWindow();
mainWindow.show();
const urlObj = new URL(url);
const token = urlObj.searchParams.get('token');
packages/frontend/electron/src/main/helper-process.ts
+7 -1
View File
@@ -20,6 +20,8 @@ import { logger } from './logger';
const HELPER_PROCESS_PATH = path.join(__dirname, './helper.js');
const isDev = process.env.NODE_ENV === 'development';
function pickAndBind<T extends object, U extends keyof T>(
obj: T,
keys: U[]
@@ -48,12 +50,16 @@ class HelperProcessManager {
}
private constructor() {
const helperProcess = utilityProcess.fork(HELPER_PROCESS_PATH);
const helperProcess = utilityProcess.fork(HELPER_PROCESS_PATH, [], {
// todo: port number should not being used
execArgv: isDev ? ['--inspect=40894'] : [],
});
this.#process = helperProcess;
this.ready = new Promise((resolve, reject) => {
helperProcess.once('spawn', () => {
try {
this.#connectMain();
logger.info('[helper] forked', helperProcess.pid);
resolve();
} catch (err) {
logger.error('[helper] connectMain error', err);
packages/frontend/electron/src/main/index.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { registerEvents } from './events';
import { registerHandlers } from './handlers';
import { ensureHelperProcess } from './helper-process';
import { logger } from './logger';
import { restoreOrCreateWindow } from './main-window';
import { getOrCreateWindow } from './main-window';
import { registerProtocol } from './protocol';
import { registerUpdater } from './updater';
@@ -56,7 +56,7 @@ app.on('window-all-closed', () => {
* @see https://www.electronjs.org/docs/v14-x-y/api/app#event-activate-macos Event: 'activate'
*/
app.on('activate', () => {
restoreOrCreateWindow().catch(e =>
getOrCreateWindow().catch(e =>
console.error('Failed to restore or create window:', e)
);
});
@@ -72,7 +72,7 @@ app
.then(registerHandlers)
.then(registerEvents)
.then(ensureHelperProcess)
.then(restoreOrCreateWindow)
.then(getOrCreateWindow)
.then(createApplicationMenu)
.then(registerUpdater)
.catch(e => console.error('Failed create window:', e));
packages/frontend/electron/src/main/main-window.ts
+16 -9
View File
@@ -148,16 +148,11 @@ let browserWindow$: Promise<BrowserWindow> | undefined;
/**
* Restore existing BrowserWindow or Create new BrowserWindow
*/
export async function restoreOrCreateWindow() {
export async function getOrCreateWindow() {
if (!browserWindow$ || (await browserWindow$.then(w => w.isDestroyed()))) {
browserWindow$ = createWindow();
}
const mainWindow = await browserWindow$;
if (mainWindow.isMinimized()) {
mainWindow.restore();
logger.info('restore main window');
}
return mainWindow;
}
@@ -188,7 +183,11 @@ export async function setCookie(
arg0: CookiesSetDetails | string,
arg1?: string
) {
const window = await restoreOrCreateWindow();
const window = await browserWindow$;
if (!window) {
// do nothing if window is not ready
return;
}
const details =
typeof arg1 === 'string' && typeof arg0 === 'string'
? parseCookie(arg0, arg1)
@@ -204,12 +203,20 @@ export async function setCookie(
}
export async function removeCookie(url: string, name: string): Promise<void> {
const window = await restoreOrCreateWindow();
const window = await browserWindow$;
if (!window) {
// do nothing if window is not ready
return;
}
await window.webContents.session.cookies.remove(url, name);
}
export async function getCookie(url?: string, name?: string) {
const window = await restoreOrCreateWindow();
const window = await browserWindow$;
if (!window) {
// do nothing if window is not ready
return;
}
const cookies = await window.webContents.session.cookies.get({
url,
name,
packages/frontend/electron/src/main/protocol.ts
+6 -2
View File
@@ -119,8 +119,12 @@ export function registerProtocol() {
// if sending request to the cloud, attach the session cookie
if (isNetworkResource(pathname)) {
const cookie = await getCookie(CLOUD_BASE_URL);
const cookieString = cookie.map(c => `${c.name}=${c.value}`).join('; ');
details.requestHeaders['cookie'] = cookieString;
if (cookie) {
const cookieString = cookie
.map(c => `${c.name}=${c.value}`)
.join('; ');
details.requestHeaders['cookie'] = cookieString;
}
}
callback({
cancel: false,
packages/frontend/electron/src/main/updater/electron-updater.ts
+40 -22
View File
@@ -17,9 +17,9 @@ export const quitAndInstall = async () => {
autoUpdater.quitAndInstall();
};
let lastCheckTime = 0;
let downloading = false;
let configured = false;
let checkingUpdate = false;
export type UpdaterConfig = {
autoCheckUpdate: boolean;
@@ -36,29 +36,39 @@ export const getConfig = (): UpdaterConfig => {
};
export const setConfig = (newConfig: Partial<UpdaterConfig> = {}): void => {
configured = true;
Object.assign(config, newConfig);
logger.info('Updater configured!', config);
// if config.autoCheckUpdate is true, trigger a check
if (config.autoCheckUpdate) {
checkForUpdates().catch(err => {
logger.error('Error checking for updates', err);
});
}
};
export const checkForUpdates = async (force = false) => {
if (disabled) {
export const checkForUpdates = async () => {
if (disabled || checkingUpdate) {
return;
}
if (
force ||
(config.autoCheckUpdate && lastCheckTime + 1000 * 1800 < Date.now())
) {
lastCheckTime = Date.now();
return await autoUpdater.checkForUpdates();
checkingUpdate = true;
try {
const info = await autoUpdater.checkForUpdates();
return info;
} finally {
checkingUpdate = false;
}
return;
};
export const downloadUpdate = async () => {
if (disabled) {
if (disabled || downloading) {
return;
}
downloading = true;
updaterSubjects.downloadProgress.next(0);
autoUpdater.downloadUpdate().catch(e => {
downloading = false;
logger.error('Failed to download update', e);
@@ -96,19 +106,16 @@ export const registerUpdater = async () => {
autoUpdater.setFeedURL(feedUrl);
// register events for checkForUpdatesAndNotify
// register events for checkForUpdates
autoUpdater.on('checking-for-update', () => {
logger.info('Checking for update');
});
autoUpdater.on('update-available', info => {
logger.info('Update available', info);
if (config.autoDownloadUpdate && allowAutoUpdate && !downloading) {
downloading = true;
autoUpdater?.downloadUpdate().catch(e => {
downloading = false;
logger.error('Failed to download update', e);
if (config.autoDownloadUpdate && allowAutoUpdate) {
downloadUpdate().catch(err => {
console.error(err);
});
logger.info('Update available, downloading...', info);
}
updaterSubjects.updateAvailable.next({
version: info.version,
@@ -137,9 +144,20 @@ export const registerUpdater = async () => {
});
autoUpdater.forceDevUpdateConfig = isDev;
// check update whenever the window is activated
let lastCheckTime = 0;
app.on('activate', () => {
checkForUpdates(false).catch(err => {
console.error(err);
(async () => {
if (
configured &&
config.autoCheckUpdate &&
lastCheckTime + 1000 * 1800 < Date.now()
) {
lastCheckTime = Date.now();
await checkForUpdates();
}
})().catch(err => {
logger.error('Error checking for updates', err);
});
});
};
packages/frontend/electron/src/main/updater/index.ts
+2 -2
View File
@@ -29,8 +29,8 @@ export const updaterHandlers = {
): Promise<void> => {
return setConfig(newConfig);
},
checkForUpdatesAndNotify: async () => {
const res = await checkForUpdates(true);
checkForUpdates: async () => {
const res = await checkForUpdates();
if (res) {
const { updateInfo } = res;
return {