ozone
This commit is contained in:
parent
caae3a63df
commit
81b8b1851d
GPG Key ID:
5417CFEBAD92DF56
22
install.zsh
22
install.zsh
@ -15,6 +15,7 @@ function at-repos-env() {
|
|||||||
https://github.com/bluesky-social/atproto
|
https://github.com/bluesky-social/atproto
|
||||||
https://github.com/bluesky-social/social-app
|
https://github.com/bluesky-social/social-app
|
||||||
https://github.com/bluesky-social/feed-generator
|
https://github.com/bluesky-social/feed-generator
|
||||||
|
https://github.com/bluesky-social/ozone
|
||||||
)
|
)
|
||||||
d=${0:a:h}
|
d=${0:a:h}
|
||||||
dh=${0:a:h:h}
|
dh=${0:a:h:h}
|
||||||
@ -144,6 +145,26 @@ function at-repos-social-app-patch() {
|
|||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function at-repos-ozone-patch() {
|
||||||
|
#DOMAIN=syu.is
|
||||||
|
cd $d/repos
|
||||||
|
d_=$d/repos/ozone
|
||||||
|
rm -rf ${d_}
|
||||||
|
p_=$d/patching/120-ozone-runtimeEnvVars.diff
|
||||||
|
git clone https://github.com/bluesky-social/ozone
|
||||||
|
cd ${d_}
|
||||||
|
pushd ${d_}
|
||||||
|
echo "applying patch: under ${d_} for ${p_}"
|
||||||
|
patch -p1 < ${p_}
|
||||||
|
popd
|
||||||
|
|
||||||
|
p_=$d/patching/122-ozone-enable-daemon.diff
|
||||||
|
echo "applying patch: under ${d_} for ${p_}"
|
||||||
|
pushd ${d_}
|
||||||
|
patch -p1 < ${p_}
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
function at-repos-docker() {
|
function at-repos-docker() {
|
||||||
cd $d
|
cd $d
|
||||||
docker compose build && docker compose up -d
|
docker compose build && docker compose up -d
|
||||||
@ -157,6 +178,7 @@ at-repos-social-app-icon-origin
|
|||||||
at-repos-social-app-write
|
at-repos-social-app-write
|
||||||
at-repos-bsky-patch
|
at-repos-bsky-patch
|
||||||
at-repos-social-app-patch
|
at-repos-social-app-patch
|
||||||
|
at-repos-ozone-patch
|
||||||
|
|
||||||
echo "[y]docker compose build && up"
|
echo "[y]docker compose build && up"
|
||||||
read key
|
read key
|
||||||
|
|||||||
119
patching/120-ozone-runtimeEnvVars.diff
Normal file
119
patching/120-ozone-runtimeEnvVars.diff
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
diff --git a/app/layout.tsx b/app/layout.tsx
|
||||||
|
index bfc3470..9350629 100644
|
||||||
|
--- a/app/layout.tsx
|
||||||
|
+++ b/app/layout.tsx
|
||||||
|
@@ -5,6 +5,7 @@ import 'yet-another-react-lightbox/styles.css'
|
||||||
|
import 'yet-another-react-lightbox/plugins/thumbnails.css'
|
||||||
|
import 'yet-another-react-lightbox/plugins/captions.css'
|
||||||
|
import { ToastContainer } from 'react-toastify'
|
||||||
|
+import { PublicEnvScript } from 'next-runtime-env';
|
||||||
|
|
||||||
|
import { Shell } from '@/shell/Shell'
|
||||||
|
import { CommandPaletteRoot } from '@/shell/CommandPalette/Root'
|
||||||
|
@@ -36,6 +37,7 @@ export default function RootLayout({
|
||||||
|
isDarkModeEnabled() ? 'dark' : ''
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
+ <head>
|
||||||
|
<title>Ozone</title>
|
||||||
|
<link
|
||||||
|
rel="icon"
|
||||||
|
@@ -43,6 +45,8 @@ export default function RootLayout({
|
||||||
|
sizes="any"
|
||||||
|
/>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
+ <PublicEnvScript />
|
||||||
|
+ </head>
|
||||||
|
<body className="h-full overflow-hidden">
|
||||||
|
<ToastContainer
|
||||||
|
position="bottom-right"
|
||||||
|
diff --git a/environment.d.ts b/environment.d.ts
|
||||||
|
index 7a47cc2..33ab29f 100644
|
||||||
|
--- a/environment.d.ts
|
||||||
|
+++ b/environment.d.ts
|
||||||
|
@@ -9,6 +9,8 @@ declare global {
|
||||||
|
NEXT_PUBLIC_OZONE_SERVICE_DID?: string // e.g. did:plc:xxx#atproto_labeler
|
||||||
|
NEXT_PUBLIC_OZONE_PUBLIC_URL?: string // e.g. https://ozone.example.com (falls back to window.location.origin)
|
||||||
|
NEXT_PUBLIC_SOCIAL_APP_URL?: string // e.g. https://bsky.app
|
||||||
|
+ NEXT_PUBLIC_SOCIAL_APP_DOMAIN?: string // e.g. bsky.app
|
||||||
|
+ NEXT_PUBLIC_HANDLE_RESOLVER_URL?: string // e.g. https://api.bsky.app
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/lib/constants.ts b/lib/constants.ts
|
||||||
|
index fe7c0e8..c286ac6 100644
|
||||||
|
--- a/lib/constants.ts
|
||||||
|
+++ b/lib/constants.ts
|
||||||
|
@@ -1,29 +1,32 @@
|
||||||
|
+import { env } from 'next-runtime-env';
|
||||||
|
+
|
||||||
|
export const OAUTH_SCOPE = 'atproto transition:generic'
|
||||||
|
|
||||||
|
export const OZONE_SERVICE_DID =
|
||||||
|
- process.env.NEXT_PUBLIC_OZONE_SERVICE_DID || undefined
|
||||||
|
+ env('NEXT_PUBLIC_OZONE_SERVICE_DID') || undefined
|
||||||
|
|
||||||
|
export const OZONE_PUBLIC_URL =
|
||||||
|
- process.env.NEXT_PUBLIC_OZONE_PUBLIC_URL || undefined
|
||||||
|
+ env('NEXT_PUBLIC_OZONE_PUBLIC_URL') || undefined
|
||||||
|
|
||||||
|
export const PLC_DIRECTORY_URL =
|
||||||
|
- process.env.NEXT_PUBLIC_PLC_DIRECTORY_URL ||
|
||||||
|
+ env('NEXT_PUBLIC_PLC_DIRECTORY_URL') ||
|
||||||
|
(process.env.NODE_ENV === 'development'
|
||||||
|
? 'http://localhost:2582'
|
||||||
|
: 'https://plc.directory')
|
||||||
|
|
||||||
|
-export const QUEUE_CONFIG = process.env.NEXT_PUBLIC_QUEUE_CONFIG || '{}'
|
||||||
|
+export const QUEUE_CONFIG = env('NEXT_PUBLIC_QUEUE_CONFIG') || '{}'
|
||||||
|
|
||||||
|
-export const QUEUE_SEED = process.env.NEXT_PUBLIC_QUEUE_SEED || ''
|
||||||
|
+export const QUEUE_SEED = env('NEXT_PUBLIC_QUEUE_SEED') || ''
|
||||||
|
|
||||||
|
+export const SOCIAL_APP_DOMAIN = env('NEXT_PUBLIC_SOCIAL_APP_DOMAIN') || 'bsky.app'
|
||||||
|
export const SOCIAL_APP_URL =
|
||||||
|
- process.env.NEXT_PUBLIC_SOCIAL_APP_URL ||
|
||||||
|
+ env('NEXT_PUBLIC_SOCIAL_APP_URL') ||
|
||||||
|
(process.env.NODE_ENV === 'development'
|
||||||
|
? 'http://localhost:2584'
|
||||||
|
- : 'https://bsky.app')
|
||||||
|
+ : `https://${SOCIAL_APP_DOMAIN}`)
|
||||||
|
|
||||||
|
export const HANDLE_RESOLVER_URL =
|
||||||
|
- process.env.NEXT_PUBLIC_HANDLE_RESOLVER_URL ||
|
||||||
|
+ env('NEXT_PUBLIC_HANDLE_RESOLVER_URL') ||
|
||||||
|
(process.env.NODE_ENV === 'development'
|
||||||
|
? 'http://localhost:2584'
|
||||||
|
: 'https://api.bsky.app')
|
||||||
|
diff --git a/lib/util.ts b/lib/util.ts
|
||||||
|
index 0aa4460..ecec7d1 100644
|
||||||
|
--- a/lib/util.ts
|
||||||
|
+++ b/lib/util.ts
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
import { CollectionId } from '@/reports/helpers/subject'
|
||||||
|
-import { SOCIAL_APP_URL } from './constants'
|
||||||
|
+import { SOCIAL_APP_URL, SOCIAL_APP_DOMAIN } from './constants'
|
||||||
|
import { AtUri } from '@atproto/api'
|
||||||
|
|
||||||
|
export function classNames(...classes: (string | undefined)[]) {
|
||||||
|
@@ -57,7 +57,7 @@ export function takesKeyboardEvt(el?: EventTarget | null) {
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
-const blueSkyUrlMatcher = new RegExp('(https?://)?.*bsky.app')
|
||||||
|
+const blueSkyUrlMatcher = new RegExp('(https?://)?.*'+ `${SOCIAL_APP_DOMAIN}`)
|
||||||
|
|
||||||
|
export const isBlueSkyAppUrl = (url: string) => blueSkyUrlMatcher.test(url)
|
||||||
|
|
||||||
|
diff --git a/package.json b/package.json
|
||||||
|
index 8919841..750dce9 100644
|
||||||
|
--- a/package.json
|
||||||
|
+++ b/package.json
|
||||||
|
@@ -37,6 +37,7 @@
|
||||||
|
"kbar": "^0.1.0-beta.45",
|
||||||
|
"lande": "^1.0.10",
|
||||||
|
"next": "15.2.4",
|
||||||
|
+ "next-runtime-env": "^3.2.1",
|
||||||
|
"react": "19.1.0",
|
||||||
|
"react-dom": "19.1.0",
|
||||||
|
"react-dropzone": "^14.3.5",
|
||||||
82
patching/122-ozone-enable-daemon.diff
Normal file
82
patching/122-ozone-enable-daemon.diff
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
diff --git a/service/index.js b/service/index.js
|
||||||
|
index 943c281..7721cd9 100644
|
||||||
|
--- a/service/index.js
|
||||||
|
+++ b/service/index.js
|
||||||
|
@@ -1,5 +1,7 @@
|
||||||
|
const next = require('next')
|
||||||
|
-const {
|
||||||
|
+const ozone = require('@atproto/ozone')
|
||||||
|
+/*
|
||||||
|
+{
|
||||||
|
readEnv,
|
||||||
|
httpLogger,
|
||||||
|
envToCfg,
|
||||||
|
@@ -7,6 +9,7 @@ const {
|
||||||
|
OzoneService,
|
||||||
|
Database,
|
||||||
|
} = require('@atproto/ozone')
|
||||||
|
+*/
|
||||||
|
const pkg = require('@atproto/ozone/package.json')
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
@@ -16,37 +19,48 @@ async function main() {
|
||||||
|
const frontendHandler = frontend.getRequestHandler()
|
||||||
|
await frontend.prepare()
|
||||||
|
// backend
|
||||||
|
- const env = readEnv()
|
||||||
|
+ const env = ozone.readEnv()
|
||||||
|
env.version ??= pkg.version
|
||||||
|
- const config = envToCfg(env)
|
||||||
|
- const secrets = envToSecrets(env)
|
||||||
|
+ const config = ozone.envToCfg(env)
|
||||||
|
+ const secrets = ozone.envToSecrets(env)
|
||||||
|
const migrate = process.env.OZONE_DB_MIGRATE === '1'
|
||||||
|
if (migrate) {
|
||||||
|
- const db = new Database({
|
||||||
|
+ const db = new ozone.Database({
|
||||||
|
url: config.db.postgresUrl,
|
||||||
|
schema: config.db.postgresSchema,
|
||||||
|
})
|
||||||
|
await db.migrateToLatestOrThrow()
|
||||||
|
await db.close()
|
||||||
|
}
|
||||||
|
- const ozone = await OzoneService.create(config, secrets)
|
||||||
|
+ const server = await ozone.OzoneService.create(config, secrets)
|
||||||
|
// setup handlers
|
||||||
|
- ozone.app.get('/.well-known/ozone-metadata.json', (_req, res) => {
|
||||||
|
+ server.app.get('/.well-known/ozone-metadata.json', (_req, res) => {
|
||||||
|
return res.json({
|
||||||
|
- did: ozone.ctx.cfg.service.did,
|
||||||
|
- url: ozone.ctx.cfg.service.publicUrl,
|
||||||
|
- publicKey: ozone.ctx.signingKey.did(),
|
||||||
|
+ did: server.ctx.cfg.service.did,
|
||||||
|
+ url: server.ctx.cfg.service.publicUrl,
|
||||||
|
+ publicKey: server.ctx.signingKey.did(),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
// Note: We must use `use()` here. This should be the last middleware.
|
||||||
|
- ozone.app.use((req, res) => {
|
||||||
|
+ server.app.use((req, res) => {
|
||||||
|
void frontendHandler(req, res, undefined)
|
||||||
|
})
|
||||||
|
// run
|
||||||
|
- const httpServer = await ozone.start()
|
||||||
|
+ const httpServer = await server.start()
|
||||||
|
+ // starts: involve ops from atproto/packages/dev-env/src/ozone.ts >>>
|
||||||
|
+ ozone.httpLogger.info('starts ozone daemon')
|
||||||
|
+ const daemon = await ozone.OzoneDaemon.create(config, secrets)
|
||||||
|
+ await daemon.start()
|
||||||
|
+ //if (process.env.OZONE_ENABLE_EVENT_REVERSER != 'true') // atproto/services/ozone/daemon.js doesn't stop eventReverser
|
||||||
|
+ //{
|
||||||
|
+ // ozone.httpLogger.info('disable ozone daemon eventReverser')
|
||||||
|
+ // await daemon.ctx.eventReverser.destroy()
|
||||||
|
+ //}
|
||||||
|
+ // ends: involve ops from atproto/packages/dev-env/src/ozone.ts <<<
|
||||||
|
+
|
||||||
|
/** @type {import('net').AddressInfo} */
|
||||||
|
const addr = httpServer.address()
|
||||||
|
- httpLogger.info(`Ozone is running at http://localhost:${addr.port}`)
|
||||||
|
+ ozone.httpLogger.info(`Ozone is running at http://localhost:${addr.port}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch(console.error)
|
||||||
Loading…
x
Reference in New Issue
Block a user