ozone

2025-05-05 08:15:49 +09:00 · 2025-05-05 08:15:49 +09:00 · e818fbcea5
commit e818fbcea5
parent 246f95a00c
9 changed files with 182 additions and 47 deletions
--- a/compose.yml
+++ b/compose.yml
@ -67,41 +67,6 @@ services:
      database:
        condition: service_healthy

-#  ozone:
-#    ports:
-#      - 2585:3000
-#    build:
-#      context: ./repos/atproto/
-#      dockerfile: services/ozone/Dockerfile
-#    restart: always
-#    command: node --enable-source-maps api.js
-#    volumes:
-#      - ./data/ozone/:/data/
-#      - ./repos/ozone.js:/app/services/ozone/api.js:ro
-#    env_file:
-#      - ./envs/ozone
-#    healthcheck:
-#      test: "wget -q --spider http://localhost:3000/xrpc/_health"
-#      interval: 5s
-#      retries: 20
-#    depends_on:
-#      database:
-#        condition: service_healthy
-#
-#  ozone-daemon:
-#    build:
-#      context: ./repos/atproto/
-#      dockerfile: services/ozone/Dockerfile
-#    restart: always
-#    command: node --enable-source-maps daemon.js
-#    env_file:
-#      - ./envs/ozone
-#    depends_on:
-#      ozone:
-#        condition: service_healthy
-#      database:
-#        condition: service_healthy
-
  social-app:
    ports:
      - 8100:8100
@ -131,3 +96,53 @@ services:
        condition: service_healthy
      redis:
        condition: service_healthy
+
+  jetstream:
+    build:
+      context: ./repos/jetstream/
+      dockerfile: Dockerfile
+    ports:
+      - 6008:6008
+    volumes:
+      - ./data/jetstream:/data
+    restart: always
+    env_file:
+      - ./envs/jetstream
+
+  ozone-web:
+    build:
+      context: ./repos/ozone/
+    ports:
+      - 2586:3000
+    restart: always
+    volumes:
+      - ./data/ozone/:/data/
+    env_file:
+      - ./envs/ozone
+    depends_on:
+      database:
+        condition: service_healthy
+
+  ozone:
+    build:
+      context: ./repos/atproto/
+      dockerfile: services/ozone/Dockerfile
+    ports:
+      - 2585:3000
+    restart: always
+    command: node --enable-source-maps api.js
+    volumes:
+      - ./data/ozone/:/data/
+    env_file:
+      - ./envs/ozone
+
+  ozone-daemon:
+    build:
+      context: ./repos/atproto/
+      dockerfile: services/ozone/Dockerfile
+    restart: always
+    command: node --enable-source-maps daemon.js
+    volumes:
+      - ./data/ozone/:/data/
+    env_file:
+      - ./envs/ozone
--- a/envs/jetstream
+++ b/envs/jetstream
@ -0,0 +1,5 @@
+JETSTREAM_WS_URL=wss://bgs.${host}/xrpc/com.atproto.sync.subscribeRepos
+JETSTREAM_DATA_DIR=/data
+JETSTREAM_LISTEN_ADDR=:6008
+JETSTREAM_METRICS_LISTEN_ADDR=:6009
+JETSTREAM_LIVENESS_TTL=96h
--- a/envs/ozone
+++ b/envs/ozone
@ -19,3 +19,9 @@ OZONE_DB_MIGRATE=1

 OZONE_ADMIN_PASSWORD
 OZONE_SIGNING_KEY_HEX
+OZONE_BLOB_DIVERT_ADMIN_PASSWORD
+OZONE_VERIFIER_URL
+OZONE_VERIFIER_DID
+OZONE_VERIFIER_PASSWORD
+OZONE_VERIFIER_ISSUERS_TO_INDEX
+OZONE_VERIFIER_JETSTREAM_URL
--- a/install.zsh
+++ b/install.zsh
@ -15,6 +15,8 @@ function at-repos-env() {
 		https://github.com/bluesky-social/atproto
 		https://github.com/bluesky-social/social-app
 		https://github.com/bluesky-social/feed-generator
+		https://github.com/bluesky-social/ozone
+		https://github.com/bluesky-social/jetstream
 	)
 	d=${0:a:h}
 	dh=${0:a:h:h}
@ -144,6 +146,23 @@ function at-repos-social-app-patch() {
 	popd
 }

+function at-repos-ozone-patch() {
+	#DOMAIN=syu.is
+	cd $d/repos
+	d_=$d/repos/ozone
+	rm -rf ${d_}
+	git clone https://github.com/bluesky-social/ozone
+	cd ${d_}
+
+	p_=$d/patching/122-ozone-enable-daemon.diff
+	echo "applying patch: under ${d_} for ${p_}"
+	pushd ${d_}
+	patch -p1 < ${p_}
+	popd
+
+	#cp -rf $d/repos/atproto/service/ozone/* $d/ozone/service/
+}
+
 function at-repos-docker() {
 	cd $d
 	docker compose build && docker compose up -d
@ -157,6 +176,7 @@ at-repos-social-app-icon-origin
 at-repos-social-app-write
 at-repos-bsky-patch
 at-repos-social-app-patch
+at-repos-ozone-patch

 echo "[y]docker compose build && up"
 read key
--- a/patching/122-ozone-enable-daemon.diff
+++ b/patching/122-ozone-enable-daemon.diff
@ -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)
--- a/scpt/at.zsh
+++ b/scpt/at.zsh
@ -61,7 +61,7 @@ case $1 in
 		verify-icon
 		;;
 	self-col)
-		self-col
+		self-col $2
 		;;
 	*)
 		echo "${help[@]}"
--- a/scpt/src/ai/syui/game/character.zsh
+++ b/scpt/src/ai/syui/game/character.zsh
@ -219,8 +219,8 @@ delete_game_user() {
 function create_game_user() {
 	col=ai.syui.game
 	rkey=$1
-	did=$did
-	handle=$handle
+	handle_yui=$handle
+	did_yui=$did
 	pds=`cat $f|jq -r ".didDoc.service.[].serviceEndpoint"|cut -d / -f 3`
 	if [ "$pds" != "syu.is" ];then
 		pds=bsky.social
@ -249,6 +249,8 @@ function create_game_user() {
 	if [ "$rkey" = "self" ];then
 		cname=manny
 		unset did handle gender
+		pds=bsky.social
+		plc=plc.directory
 	fi
 	imguri=https://cdn.bsky.app/img/feed_thumbnail/plain/$did_yui/${cid}@jpeg
 	season=1
@ -286,8 +288,8 @@ function create_game_user() {

 	v1_json="
 	{
-		\"repo\": \"$handle\",
-		\"did\": \"$did\",
+		\"repo\": \"$handle_yui\",
+		\"did\": \"$did_yui\",
 		\"collection\": \"$col\",
 		\"rkey\": \"$rkey\",
 		\"record\": {
@ -313,8 +315,8 @@ json_item="

 	json="
 	{
-		\"repo\": \"$handle\",
-		\"did\": \"$did\",
+		\"repo\": \"$handle_yui\",
+		\"did\": \"$did_yui\",
 		\"collection\": \"$col\",
 		\"rkey\": \"$rkey\",
 		\"record\": {
@ -345,7 +347,7 @@ if echo $json|jq . ;then
 	read y
 	if [ "y" = "$y" ];then
 		t=`curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $token" -d $json $url`
-		#echo $t|jq .
+		echo $t|jq .
 		#f=~/ai/ue/json/v${version}_${rkey}.json
 		#if [ -f $f ];then
 		#	get_game_user $rkey >! $f
--- a/scpt/src/func.zsh
+++ b/scpt/src/func.zsh
@ -10,6 +10,10 @@ function at-env() {
 	did=$did_yui
 	created=2025-04-21T00:00:00.323Z
 	docs_uri=https://docs.bsky.app/docs/api
+	at_uri=at://$handle/ai.syui.game/ai
+	did=`echo $at_uri|cut -d / -f 3`
+	collection=`echo $at_uri|cut -d / -f 4`
+	rkey=`echo $at_uri|cut -d / -f 5`
 	d=${0:a:h}
 	f=~/.config/ai/token.json 
 	if [ -f $f ];then
@ -23,10 +27,6 @@ function at-env() {
 		plc=plc.syu.is
 		pds=$host
 	fi
-	at_uri=at://$handle/ai.syui.game/ai
-	did=`echo $at_uri|cut -d / -f 3`
-	collection=`echo $at_uri|cut -d / -f 4`
-	rkey=`echo $at_uri|cut -d / -f 5`
 }

 function at-unset() {
--- a/scpt/src/is/syu/main.zsh
+++ b/scpt/src/is/syu/main.zsh
@ -1,6 +1,11 @@
 #!/bin/zsh

 function self-col(){
+	if [ -n "$1" ];then
+		t=`curl -sL "$pds/xrpc/com.atproto.repo.listRecords?repo=$handle&collection=$1"`
+		echo $t|jq .
+		exit
+	fi
 	col=(
 		ai.syui.game
 		ai.syui.system