diff --git a/packages/frontend/core/src/modules/cloud/services/auth.ts b/packages/frontend/core/src/modules/cloud/services/auth.ts index 060cc8bddb..e9f84ca9f5 100644 --- a/packages/frontend/core/src/modules/cloud/services/auth.ts +++ b/packages/frontend/core/src/modules/cloud/services/auth.ts @@ -129,23 +129,13 @@ export class AuthService extends Service { } async signInPassword(credential: { email: string; password: string }) { - const searchParams = new URLSearchParams(); - const redirectUri = new URL(location.href); - if (environment.isDesktop) { - redirectUri.pathname = this.buildRedirectUri('/open-app/signin-redirect'); - } - searchParams.set('redirect_uri', redirectUri.toString()); - - const res = await this.fetchService.fetch( - '/api/auth/sign-in?' + searchParams.toString(), - { - method: 'POST', - body: JSON.stringify(credential), - headers: { - 'content-type': 'application/json', - }, - } - ); + const res = await this.fetchService.fetch('/api/auth/sign-in', { + method: 'POST', + body: JSON.stringify(credential), + headers: { + 'content-type': 'application/json', + }, + }); if (!res.ok) { throw new Error('Failed to sign in'); } diff --git a/packages/frontend/core/src/modules/cloud/services/fetch.ts b/packages/frontend/core/src/modules/cloud/services/fetch.ts index 8fc8f781b4..8bba500eb3 100644 --- a/packages/frontend/core/src/modules/cloud/services/fetch.ts +++ b/packages/frontend/core/src/modules/cloud/services/fetch.ts @@ -5,6 +5,9 @@ import { fromPromise, Service } from '@toeverything/infra'; import { BackendError, NetworkError } from '../error'; export function getAffineCloudBaseUrl(): string { + if ((globalThis as any)['__AFFINE_CLOUD_BASE_URL__']) { + return (globalThis as any)['__AFFINE_CLOUD_BASE_URL__']; + } if (environment.isDesktop) { return runtimeConfig.serverUrlPrefix; } diff --git a/packages/frontend/graphql/src/index.ts b/packages/frontend/graphql/src/index.ts index 5c92f0e2bf..08f78f2c6d 100644 --- a/packages/frontend/graphql/src/index.ts +++ b/packages/frontend/graphql/src/index.ts @@ -10,6 +10,9 @@ import { gqlFetcherFactory } from './fetcher'; setupGlobal(); export function getBaseUrl(): string { + if ((globalThis as any)['__AFFINE_CLOUD_BASE_URL__']) { + return (globalThis as any)['__AFFINE_CLOUD_BASE_URL__']; + } if (environment.isDesktop) { return runtimeConfig.serverUrlPrefix; } diff --git a/packages/frontend/ios-bridge/package.json b/packages/frontend/ios-bridge/package.json new file mode 100644 index 0000000000..198c29e07a --- /dev/null +++ b/packages/frontend/ios-bridge/package.json @@ -0,0 +1,23 @@ +{ + "name": "@affine/ios-bridge", + "version": "0.0.0", + "description": "AFFiNE API For iOS app", + "private": true, + "browser": "src/index.ts", + "scripts": { + "build": "DISTRIBUTION=ios-bridge yarn workspace @affine/cli build", + "dev": "DISTRIBUTION=ios-bridge yarn workspace @affine/cli dev", + "static-server": "DISTRIBUTION=ios-bridge yarn workspace @affine/cli dev --static" + }, + "dependencies": { + "@affine/core": "workspace:*", + "@affine/env": "workspace:*", + "@sentry/react": "^7.109.0", + "core-js": "^3.36.1", + "intl-segmenter-polyfill-rs": "^0.1.7" + }, + "devDependencies": { + "@affine/cli": "workspace:*", + "typescript": "^5.4.5" + } +} \ No newline at end of file diff --git a/packages/frontend/ios-bridge/src/index.ts b/packages/frontend/ios-bridge/src/index.ts new file mode 100644 index 0000000000..89b836917e --- /dev/null +++ b/packages/frontend/ios-bridge/src/index.ts @@ -0,0 +1,53 @@ +import './polyfill/dispose'; +import './polyfill/intl-segmenter'; +import './polyfill/request-idle-callback'; +import '@affine/core/bootstrap/preload'; + +import { configureCommonModules } from '@affine/core/modules'; +import { AuthService } from '@affine/core/modules/cloud'; +import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage'; +import { + configureBrowserWorkspaceFlavours, + configureIndexedDBWorkspaceEngineStorageProvider, +} from '@affine/core/modules/workspace-engine'; +import { + DocsService, + Framework, + LifecycleService, + type WorkspaceMetadata, + WorkspacesService, +} from '@toeverything/infra'; + +const framework = new Framework(); +configureCommonModules(framework); +configureLocalStorageStateStorageImpls(framework); +configureBrowserWorkspaceFlavours(framework); +configureIndexedDBWorkspaceEngineStorageProvider(framework); +const frameworkProvider = framework.provider(); + +// start the application +frameworkProvider.get(LifecycleService).applicationStart(); + +const jsb = { + signInPassword(email: string, password: string) { + return frameworkProvider + .get(AuthService) + .signInPassword({ email, password }); + }, + + getWorkspacesList() { + return frameworkProvider.get(WorkspacesService).list.workspaces$; + }, + + getWorkspacesDocs(workspaceMeta: WorkspaceMetadata) { + return frameworkProvider + .get(WorkspacesService) + .open({ metadata: workspaceMeta }) + .workspace.scope.get(DocsService) + .list.docs$.map(docs => docs.map(d => d.meta$.value)); + }, + // ... add more methods here +}; + +(window as any).jsb = jsb; +(window as any).workspacesService = frameworkProvider.get(WorkspacesService); diff --git a/packages/frontend/ios-bridge/src/polyfill/dispose.ts b/packages/frontend/ios-bridge/src/polyfill/dispose.ts new file mode 100644 index 0000000000..615ed233c7 --- /dev/null +++ b/packages/frontend/ios-bridge/src/polyfill/dispose.ts @@ -0,0 +1,2 @@ +import 'core-js/modules/esnext.symbol.async-dispose'; +import 'core-js/modules/esnext.symbol.dispose'; diff --git a/packages/frontend/ios-bridge/src/polyfill/intl-segmenter.ts b/packages/frontend/ios-bridge/src/polyfill/intl-segmenter.ts new file mode 100644 index 0000000000..f493cd793e --- /dev/null +++ b/packages/frontend/ios-bridge/src/polyfill/intl-segmenter.ts @@ -0,0 +1,11 @@ +if (Intl.Segmenter === undefined) { + await import('intl-segmenter-polyfill-rs').then(({ Segmenter }) => { + Object.defineProperty(Intl, 'Segmenter', { + value: Segmenter, + configurable: true, + writable: true, + }); + }); +} + +export {}; diff --git a/packages/frontend/ios-bridge/src/polyfill/request-idle-callback.ts b/packages/frontend/ios-bridge/src/polyfill/request-idle-callback.ts new file mode 100644 index 0000000000..e3156d20df --- /dev/null +++ b/packages/frontend/ios-bridge/src/polyfill/request-idle-callback.ts @@ -0,0 +1,19 @@ +window.requestIdleCallback = + window.requestIdleCallback || + function (cb) { + const start = Date.now(); + return setTimeout(function () { + cb({ + didTimeout: false, + timeRemaining: function () { + return Math.max(0, 50 - (Date.now() - start)); + }, + }); + }, 1); + }; + +window.cancelIdleCallback = + window.cancelIdleCallback || + function (id) { + clearTimeout(id); + }; diff --git a/packages/frontend/ios-bridge/tsconfig.json b/packages/frontend/ios-bridge/tsconfig.json new file mode 100644 index 0000000000..af59eddffb --- /dev/null +++ b/packages/frontend/ios-bridge/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "composite": true, + "outDir": "lib", + "moduleResolution": "Bundler", + "types": ["affine__env"], + "rootDir": "./src" + }, + "include": ["./src"], + "references": [{ "path": "../core" }] +} diff --git a/tools/cli/src/bin/build.ts b/tools/cli/src/bin/build.ts index 92712158a0..241a85dd77 100644 --- a/tools/cli/src/bin/build.ts +++ b/tools/cli/src/bin/build.ts @@ -1,3 +1,5 @@ +import { join } from 'node:path'; + import webpack from 'webpack'; import { getCwdFromDistribution } from '../config/cwd.cjs'; @@ -39,6 +41,10 @@ if (DISTRIBUTION === 'desktop') { entry = { app: './index.tsx', shell: './shell/index.tsx' }; } +if (DISTRIBUTION === 'ios-bridge') { + entry = join(cwd, 'src', 'index.ts'); +} + const flags = { distribution: DISTRIBUTION as BuildFlags['distribution'], mode: 'production', diff --git a/tools/cli/src/bin/dev.ts b/tools/cli/src/bin/dev.ts index 12895cab50..6dd1576427 100644 --- a/tools/cli/src/bin/dev.ts +++ b/tools/cli/src/bin/dev.ts @@ -46,6 +46,9 @@ const buildFlags = process.argv.includes('--static') { value: 'desktop', }, + { + value: 'ios-bridge', + }, { value: 'admin', }, @@ -117,6 +120,10 @@ if (flags.distribution === 'desktop') { }; } +if (flags.distribution === 'ios-bridge') { + flags.entry = join(cwd, 'src', 'index.ts'); +} + if (buildFlags.debugBlockSuite) { const { config } = await import('dotenv'); const envLocal = config({ diff --git a/tools/cli/src/config/cwd.cjs b/tools/cli/src/config/cwd.cjs index dbffed6657..10a1b8c193 100644 --- a/tools/cli/src/config/cwd.cjs +++ b/tools/cli/src/config/cwd.cjs @@ -23,6 +23,8 @@ module.exports.getCwdFromDistribution = function getCwdFromDistribution( return join(projectRoot, 'packages/frontend/electron/renderer'); case 'admin': return join(projectRoot, 'packages/frontend/admin'); + case 'ios-bridge': + return join(projectRoot, 'packages/frontend/ios-bridge'); default: { throw new Error('DISTRIBUTION must be one of browser, desktop'); } diff --git a/tools/cli/src/config/index.ts b/tools/cli/src/config/index.ts index 0035fb39da..44acece29c 100644 --- a/tools/cli/src/config/index.ts +++ b/tools/cli/src/config/index.ts @@ -1,5 +1,5 @@ export type BuildFlags = { - distribution: 'browser' | 'desktop' | 'admin'; + distribution: 'browser' | 'desktop' | 'admin' | 'ios-bridge'; mode: 'development' | 'production'; channel: 'stable' | 'beta' | 'canary' | 'internal'; coverage?: boolean; diff --git a/tools/cli/src/webpack/config.ts b/tools/cli/src/webpack/config.ts index 4ebdb40419..bd31bafa7d 100644 --- a/tools/cli/src/webpack/config.ts +++ b/tools/cli/src/webpack/config.ts @@ -76,6 +76,10 @@ export const getPublicPath = (buildFlags: BuildFlags) => { return publicPath; } + if (buildFlags.distribution === 'ios-bridge') { + return '/'; + } + if (BUILD_TYPE === 'canary') { return `https://dev.affineassets.com/`; } else if (BUILD_TYPE === 'beta') { diff --git a/yarn.lock b/yarn.lock index 804c09acef..440d80d32a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -629,6 +629,20 @@ __metadata: languageName: unknown linkType: soft +"@affine/ios-bridge@workspace:packages/frontend/ios-bridge": + version: 0.0.0-use.local + resolution: "@affine/ios-bridge@workspace:packages/frontend/ios-bridge" + dependencies: + "@affine/cli": "workspace:*" + "@affine/core": "workspace:*" + "@affine/env": "workspace:*" + "@sentry/react": "npm:^7.109.0" + core-js: "npm:^3.36.1" + intl-segmenter-polyfill-rs: "npm:^0.1.7" + typescript: "npm:^5.4.5" + languageName: unknown + linkType: soft + "@affine/monorepo@workspace:.": version: 0.0.0-use.local resolution: "@affine/monorepo@workspace:." @@ -12583,6 +12597,17 @@ __metadata: languageName: node linkType: hard +"@sentry-internal/feedback@npm:7.118.0": + version: 7.118.0 + resolution: "@sentry-internal/feedback@npm:7.118.0" + dependencies: + "@sentry/core": "npm:7.118.0" + "@sentry/types": "npm:7.118.0" + "@sentry/utils": "npm:7.118.0" + checksum: 10/b6df5ff545aa5e15a6f055f99d5e405c819206b86d2521511d22e03b5bff1c6116c4f1416a49f1ed15df3b0be13653be807041649b5d67d3ae984173a0b1cd6c + languageName: node + linkType: hard + "@sentry-internal/feedback@npm:8.20.0": version: 8.20.0 resolution: "@sentry-internal/feedback@npm:8.20.0" @@ -12594,6 +12619,18 @@ __metadata: languageName: node linkType: hard +"@sentry-internal/replay-canvas@npm:7.118.0": + version: 7.118.0 + resolution: "@sentry-internal/replay-canvas@npm:7.118.0" + dependencies: + "@sentry/core": "npm:7.118.0" + "@sentry/replay": "npm:7.118.0" + "@sentry/types": "npm:7.118.0" + "@sentry/utils": "npm:7.118.0" + checksum: 10/448c07c1e3837318ac75e4c96ee177b82dac14c3beb7f755889b036d78ad6a68dea86d4aaad873e2c3d259afabdddbbe1ac61282e3ab9003d8b0a6c101af569a + languageName: node + linkType: hard + "@sentry-internal/replay-canvas@npm:8.20.0": version: 8.20.0 resolution: "@sentry-internal/replay-canvas@npm:8.20.0" @@ -12618,6 +12655,17 @@ __metadata: languageName: node linkType: hard +"@sentry-internal/tracing@npm:7.118.0": + version: 7.118.0 + resolution: "@sentry-internal/tracing@npm:7.118.0" + dependencies: + "@sentry/core": "npm:7.118.0" + "@sentry/types": "npm:7.118.0" + "@sentry/utils": "npm:7.118.0" + checksum: 10/267a31c3b539999193b977bdb03a2c0342ffe4b2d09a697918a137ec49f1ef6bcf22d79de2cf1b72c14ebd0da2fe0c25eaecc6ee3df6c4b5de79a0b9754e73b3 + languageName: node + linkType: hard + "@sentry/babel-plugin-component-annotate@npm:2.21.1": version: 2.21.1 resolution: "@sentry/babel-plugin-component-annotate@npm:2.21.1" @@ -12625,6 +12673,22 @@ __metadata: languageName: node linkType: hard +"@sentry/browser@npm:7.118.0": + version: 7.118.0 + resolution: "@sentry/browser@npm:7.118.0" + dependencies: + "@sentry-internal/feedback": "npm:7.118.0" + "@sentry-internal/replay-canvas": "npm:7.118.0" + "@sentry-internal/tracing": "npm:7.118.0" + "@sentry/core": "npm:7.118.0" + "@sentry/integrations": "npm:7.118.0" + "@sentry/replay": "npm:7.118.0" + "@sentry/types": "npm:7.118.0" + "@sentry/utils": "npm:7.118.0" + checksum: 10/525dc1f5a829c4c703560ab3e8200f06bdf291288ba88911b463dac520f4be59e9170b60f299a1d8c05eedd652460d037b5f12f09e2725190d5bac4fb6714f82 + languageName: node + linkType: hard + "@sentry/browser@npm:8.20.0": version: 8.20.0 resolution: "@sentry/browser@npm:8.20.0" @@ -12773,7 +12837,7 @@ __metadata: languageName: node linkType: hard -"@sentry/integrations@npm:^7.109.0": +"@sentry/integrations@npm:7.118.0, @sentry/integrations@npm:^7.109.0": version: 7.118.0 resolution: "@sentry/integrations@npm:7.118.0" dependencies: @@ -12785,6 +12849,21 @@ __metadata: languageName: node linkType: hard +"@sentry/react@npm:^7.109.0": + version: 7.118.0 + resolution: "@sentry/react@npm:7.118.0" + dependencies: + "@sentry/browser": "npm:7.118.0" + "@sentry/core": "npm:7.118.0" + "@sentry/types": "npm:7.118.0" + "@sentry/utils": "npm:7.118.0" + hoist-non-react-statics: "npm:^3.3.2" + peerDependencies: + react: 15.x || 16.x || 17.x || 18.x + checksum: 10/06ad396e96fef6e5a61cca2741eb3def43e05c817a76b5768275f58301aab5d68c765f04d7a22f0934788852dfd1d5547e99f837e0ca6a10d15c2d0cc5dd0948 + languageName: node + linkType: hard + "@sentry/react@npm:^8.0.0, @sentry/react@npm:^8.9.0": version: 8.20.0 resolution: "@sentry/react@npm:8.20.0" @@ -12800,6 +12879,18 @@ __metadata: languageName: node linkType: hard +"@sentry/replay@npm:7.118.0": + version: 7.118.0 + resolution: "@sentry/replay@npm:7.118.0" + dependencies: + "@sentry-internal/tracing": "npm:7.118.0" + "@sentry/core": "npm:7.118.0" + "@sentry/types": "npm:7.118.0" + "@sentry/utils": "npm:7.118.0" + checksum: 10/61ef0f515cd4c611bcd60f49801f5a8a8836a3a3f3333a40e51f2d5d77dee959f9cae1735dce62d9424289d60a9103a4460b588e6086cb5037c82f56b73677df + languageName: node + linkType: hard + "@sentry/types@npm:7.118.0": version: 7.118.0 resolution: "@sentry/types@npm:7.118.0"