@atproto/ozone 0.0.14 → 0.0.15

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.0.15
+
+### Patch Changes
+
+- Updated dependencies [[`6ec885992`](https://github.com/bluesky-social/atproto/commit/6ec8859929a16f9725319cc398b716acf913b01f), [`6ec885992`](https://github.com/bluesky-social/atproto/commit/6ec8859929a16f9725319cc398b716acf913b01f), [`6ec885992`](https://github.com/bluesky-social/atproto/commit/6ec8859929a16f9725319cc398b716acf913b01f)]:
+  - @atproto/api@0.10.4
+
 ## 0.0.14
 
 ### Patch Changes

package/dist/config/config.d.ts

@@ -5,6 +5,7 @@ export type OzoneConfig = {
     db: DatabaseConfig;
     appview: AppviewConfig;
     pds: PdsConfig | null;
+    cdn: CdnConfig;
     identity: IdentityConfig;
 };
 export type ServiceConfig = {
@@ -31,3 +32,6 @@ export type PdsConfig = {
 export type IdentityConfig = {
     plcUrl: string;
 };
+export type CdnConfig = {
+    paths?: string[];
+};

package/dist/config/env.d.ts

@@ -15,6 +15,7 @@ export type OzoneEnvironment = {
     dbPoolMaxUses?: number;
     dbPoolIdleTimeoutMs?: number;
     didPlcUrl?: string;
+    cdnPaths?: string[];
     adminPassword?: string;
     moderatorPassword?: string;
     triagePassword?: string;

package/dist/context.d.ts

@@ -10,6 +10,7 @@ import { ModerationServiceCreator } from './mod-service';
 import { BackgroundQueue } from './background';
 import Sequencer from './sequencer/sequencer';
 import { CommunicationTemplateServiceCreator } from './communication-service/template';
+import { ImageInvalidator } from './image-invalidator';
 export type AppContextOptions = {
     db: Database;
     cfg: OzoneConfig;
@@ -19,6 +20,7 @@ export type AppContextOptions = {
     pdsAgent: AtpAgent | undefined;
     signingKey: Keypair;
     idResolver: IdResolver;
+    imgInvalidator?: ImageInvalidator;
     backgroundQueue: BackgroundQueue;
     sequencer: Sequencer;
 };

package/dist/image-invalidator.d.ts

@@ -0,0 +1,3 @@
+export interface ImageInvalidator {
+    invalidate(subject: string, paths: string[]): Promise<void>;
+}

package/dist/index.d.ts

@@ -6,6 +6,7 @@ import http from 'http';
 import { OzoneConfig, OzoneSecrets } from './config';
 import AppContext, { AppContextOptions } from './context';
 export * from './config';
+export { type ImageInvalidator } from './image-invalidator';
 export { Database } from './db';
 export { OzoneDaemon, EventPusher, EventReverser } from './daemon';
 export { AppContext } from './context';

package/dist/index.js

@@ -95204,6 +95204,12 @@ var envStr = (name2) => {
     return void 0;
   return str;
 };
+var envList = (name2) => {
+  const str = process.env[name2];
+  if (str === void 0 || str.length === 0)
+    return [];
+  return str.split(",");
+};
 
 // ../../node_modules/.pnpm/cborg@1.10.2/node_modules/cborg/esm/lib/is.js
 var typeofs = [
@@ -133064,17 +133070,19 @@ var LabelChannel = "label_channel";
 
 // src/mod-service/index.ts
 var ModerationService = class {
-  constructor(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid) {
+  constructor(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid, imgInvalidator, cdnPaths) {
     this.db = db;
     this.backgroundQueue = backgroundQueue;
     this.eventPusher = eventPusher;
     this.appviewAgent = appviewAgent;
     this.appviewAuth = appviewAuth;
     this.serverDid = serverDid;
+    this.imgInvalidator = imgInvalidator;
+    this.cdnPaths = cdnPaths;
     this.views = new ModerationViews(this.db, this.appviewAgent, this.appviewAuth);
   }
-  static creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid) {
-    return (db) => new ModerationService(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid);
+  static creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid, imgInvalidator, cdnPaths) {
+    return (db) => new ModerationService(db, backgroundQueue, eventPusher, appviewAgent, appviewAuth, serverDid, imgInvalidator, cdnPaths);
   }
   async getEvent(id) {
     return await this.db.db.selectFrom("moderation_event").selectAll().where("id", "=", id).executeTakeFirst();
@@ -133371,10 +133379,16 @@ var ModerationService = class {
         confirmedAt: null,
         attempts: 0,
         lastAttempted: null
-      })).returning("id").execute();
+      })).returning(["id", "subjectDid", "subjectBlobCid", "eventType"]).execute();
       this.db.onCommit(() => {
         this.backgroundQueue.add(async () => {
-          await Promise.all(blobEvts.map((evt) => this.eventPusher.attemptBlobEvent(evt.id)));
+          await Promise.allSettled(blobEvts.map((evt) => this.eventPusher.attemptBlobEvent(evt.id).catch((err) => httpLogger.error({ err, ...evt }, "failed to push blob event"))));
+          if (this.imgInvalidator) {
+            await Promise.allSettled((subject.blobCids ?? []).map((cid2) => {
+              const paths = (this.cdnPaths ?? []).map((path) => path.replace("%s", subject.did).replace("%s", cid2));
+              return this.imgInvalidator?.invalidate(cid2, paths).catch((err) => httpLogger.error({ err, paths, cid: cid2 }, "failed to invalidate blob on cdn"));
+            }));
+          }
         });
       });
     }
@@ -134194,7 +134208,7 @@ var AppContext = class {
       appview: cfg.appview,
       pds: cfg.pds ?? void 0
     });
-    const modService = ModerationService.creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth, cfg.service.did);
+    const modService = ModerationService.creator(backgroundQueue, eventPusher, appviewAgent, appviewAuth, cfg.service.did, overrides?.imgInvalidator, cfg.cdn.paths);
     const communicationTemplateService = CommunicationTemplateService.creator();
     const idResolver = new IdResolver({
       plcUrl: cfg.identity.plcUrl
@@ -134323,6 +134337,9 @@ var envToCfg = (env) => {
     url: env.pdsUrl,
     did: env.pdsDid
   };
+  const cdnCfg = {
+    paths: env.cdnPaths
+  };
   (0, import_node_assert.default)(env.didPlcUrl);
   const identityCfg = {
     plcUrl: env.didPlcUrl
@@ -134332,6 +134349,7 @@ var envToCfg = (env) => {
     db: dbCfg,
     appview: appviewCfg,
     pds: pdsCfg,
+    cdn: cdnCfg,
     identity: identityCfg
   };
 };
@@ -134354,6 +134372,7 @@ var readEnv = () => {
     dbPoolMaxUses: envInt("OZONE_DB_POOL_MAX_USES"),
     dbPoolIdleTimeoutMs: envInt("OZONE_DB_POOL_IDLE_TIMEOUT_MS"),
     didPlcUrl: envStr("OZONE_DID_PLC_URL"),
+    cdnPaths: envList("OZONE_CDN_PATHS"),
     adminPassword: envStr("OZONE_ADMIN_PASSWORD"),
     moderatorPassword: envStr("OZONE_MODERATOR_PASSWORD"),
     triagePassword: envStr("OZONE_TRIAGE_PASSWORD"),