@atproto/ozone 0.0.17-next.0 → 0.0.17

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atproto/ozone
 
+## 0.0.17
+
+### Patch Changes
+
+- Updated dependencies [[`4eaadc0ac`](https://github.com/bluesky-social/atproto/commit/4eaadc0acb6b73b9745dd7a2b929d02e58083ab0), [`4eaadc0ac`](https://github.com/bluesky-social/atproto/commit/4eaadc0acb6b73b9745dd7a2b929d02e58083ab0)]:
+  - @atproto/identity@0.3.3
+  - @atproto/api@0.11.0
+  - @atproto/common@0.3.4
+  - @atproto/lexicon@0.3.3
+  - @atproto/syntax@0.2.1
+  - @atproto/crypto@0.3.0
+  - @atproto/xrpc-server@0.4.4
+
 ## 0.0.16
 
 ### Patch Changes

package/dist/api/util.d.ts

@@ -0,0 +1,10 @@
+import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport';
+import { AccountView } from '../lexicon/types/com/atproto/admin/defs';
+import { RepoView, RepoViewDetail } from '../lexicon/types/tools/ozone/moderation/defs';
+import AppContext from '../context';
+export declare const getPdsAccountInfo: (ctx: AppContext, did: string) => Promise<AccountView | null>;
+export declare const addAccountInfoToRepoViewDetail: (repoView: RepoViewDetail, accountInfo: AccountView | null, includeEmail?: boolean) => RepoViewDetail;
+export declare const addAccountInfoToRepoView: (repoView: RepoView, accountInfo: AccountView | null, includeEmail?: boolean) => RepoView;
+export declare const getReasonType: (reasonType: ReportInput['reasonType']) => string | boolean;
+export declare const getEventType: (type: string) => "tools.ozone.moderation.defs#modEventTakedown" | "tools.ozone.moderation.defs#modEventAcknowledge" | "tools.ozone.moderation.defs#modEventEscalate" | "tools.ozone.moderation.defs#modEventComment" | "tools.ozone.moderation.defs#modEventLabel" | "tools.ozone.moderation.defs#modEventReport" | "tools.ozone.moderation.defs#modEventMute" | "tools.ozone.moderation.defs#modEventReverseTakedown" | "tools.ozone.moderation.defs#modEventEmail" | "tools.ozone.moderation.defs#modEventResolveAppeal" | "tools.ozone.moderation.defs#modEventTag";
+export declare const getReviewState: (reviewState?: string) => "tools.ozone.moderation.defs#reviewOpen" | "tools.ozone.moderation.defs#reviewEscalated" | "tools.ozone.moderation.defs#reviewClosed" | "tools.ozone.moderation.defs#reviewNone" | undefined;

package/dist/auth-verifier.d.ts

@@ -3,7 +3,7 @@ import { IdResolver } from '@atproto/identity';
 type ReqCtx = {
     req: express.Request;
 };
-type AdminTokenOutput = {
+export type AdminTokenOutput = {
     credentials: {
         type: 'admin_token';
         isAdmin: true;
@@ -11,7 +11,7 @@ type AdminTokenOutput = {
         isTriage: true;
     };
 };
-type ModeratorOutput = {
+export type ModeratorOutput = {
     credentials: {
         type: 'moderator';
         aud: string;

package/dist/communication-service/template.d.ts

@@ -1,7 +1,7 @@
 import Database from '../db';
 import { Selectable } from 'kysely';
 import { CommunicationTemplate } from '../db/schema/communication_template';
-import { CommunicationTemplateView } from '../lexicon/types/com/atproto/admin/defs';
+import { TemplateView } from '../lexicon/types/tools/ozone/communication/defs';
 export type CommunicationTemplateServiceCreator = (db: Database) => CommunicationTemplateService;
 export declare class CommunicationTemplateService {
     db: Database;
@@ -14,5 +14,5 @@ export declare class CommunicationTemplateService {
     }): Promise<Selectable<CommunicationTemplate>>;
     update(id: number, { name, contentMarkdown, subject, disabled, updatedAt, lastUpdatedBy, }: Partial<Omit<Selectable<CommunicationTemplate>, 'id' | 'createdAt'>>): Promise<Selectable<CommunicationTemplate>>;
     delete(id: number): Promise<void>;
-    view(template: Selectable<CommunicationTemplate>): CommunicationTemplateView;
+    view(template: Selectable<CommunicationTemplate>): TemplateView;
 }

package/dist/config/config.d.ts

@@ -7,6 +7,7 @@ export type OzoneConfig = {
     pds: PdsConfig | null;
     cdn: CdnConfig;
     identity: IdentityConfig;
+    blobDivert: BlobDivertConfig | null;
     access: AccessConfig;
 };
 export type ServiceConfig = {
@@ -16,6 +17,10 @@ export type ServiceConfig = {
     version?: string;
     devMode?: boolean;
 };
+export type BlobDivertConfig = {
+    url: string;
+    adminPassword: string;
+};
 export type DatabaseConfig = {
     postgresUrl: string;
     postgresSchema?: string;

package/dist/config/env.d.ts

@@ -23,4 +23,6 @@ export type OzoneEnvironment = {
     triageDids: string[];
     adminPassword?: string;
     signingKeyHex?: string;
+    blobDivertUrl?: string;
+    blobDivertAdminPassword?: string;
 };

package/dist/context.d.ts

@@ -8,6 +8,7 @@ import { ModerationServiceCreator } from './mod-service';
 import { BackgroundQueue } from './background';
 import Sequencer from './sequencer/sequencer';
 import { CommunicationTemplateServiceCreator } from './communication-service/template';
+import { BlobDiverter } from './daemon/blob-diverter';
 import { AuthVerifier } from './auth-verifier';
 import { ImageInvalidator } from './image-invalidator';
 export type AppContextOptions = {
@@ -17,7 +18,9 @@ export type AppContextOptions = {
     communicationTemplateService: CommunicationTemplateServiceCreator;
     appviewAgent: AtpAgent;
     pdsAgent: AtpAgent | undefined;
+    blobDiverter?: BlobDiverter;
     signingKey: Keypair;
+    signingKeyId: number;
     idResolver: IdResolver;
     imgInvalidator?: ImageInvalidator;
     backgroundQueue: BackgroundQueue;
@@ -33,10 +36,12 @@ export declare class AppContext {
     get db(): Database;
     get cfg(): OzoneConfig;
     get modService(): ModerationServiceCreator;
+    get blobDiverter(): BlobDiverter | undefined;
     get communicationTemplateService(): CommunicationTemplateServiceCreator;
     get appviewAgent(): AtpAgent;
     get pdsAgent(): AtpAgent | undefined;
     get signingKey(): Keypair;
+    get signingKeyId(): number;
     get plcClient(): plc.Client;
     get idResolver(): IdResolver;
     get backgroundQueue(): BackgroundQueue;
@@ -57,5 +62,6 @@ export declare class AppContext {
             authorization: string;
         };
     }>;
+    devOverride(overrides: Partial<AppContextOptions>): void;
 }
 export default AppContext;

package/dist/daemon/blob-diverter.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="node" />
+import { IdResolver } from '@atproto/identity';
+import { Readable } from 'stream';
+import Database from '../db';
+import { BlobDivertConfig } from '../config';
+export declare class BlobDiverter {
+    db: Database;
+    serviceConfig: BlobDivertConfig;
+    idResolver: IdResolver;
+    constructor(db: Database, services: {
+        idResolver: IdResolver;
+        serviceConfig: BlobDivertConfig;
+    });
+    private getBlob;
+    sendImage({ url, imageStream, contentType, }: {
+        url: string;
+        imageStream: Readable;
+        contentType: string;
+    }): Promise<boolean>;
+    private uploadBlob;
+    uploadBlobOnService({ subjectDid, subjectUri, subjectBlobCids, }: {
+        subjectDid: string;
+        subjectUri: string;
+        subjectBlobCids: string[];
+    }): Promise<boolean>;
+}

package/dist/daemon/event-pusher.d.ts

@@ -2,6 +2,8 @@
 import AtpAgent from '@atproto/api';
 import Database from '../db';
 import { RepoPushEventType } from '../db/schema/repo_push_event';
+import { BlobPushEvent } from '../db/schema/blob_push_event';
+import { Insertable, Selectable } from 'kysely';
 type PollState = {
     timer?: NodeJS.Timer;
     promise: Promise<void>;
@@ -46,5 +48,7 @@ export declare class EventPusher {
     attemptRepoEvent(id: number): Promise<void>;
     attemptRecordEvent(id: number): Promise<void>;
     attemptBlobEvent(id: number): Promise<void>;
+    markBlobEventAttempt(dbTxn: Database, event: Selectable<BlobPushEvent>, succeeded: boolean): Promise<void>;
+    logBlobPushEvent(blobValues: Insertable<BlobPushEvent>[], takedownRef?: string | null): Promise<import("kysely").Selection<import("../db/schema").DatabaseSchemaType, "blob_push_event", "id" | "subjectDid" | "subjectUri" | "eventType" | "subjectBlobCid">[]>;
 }
 export {};

package/dist/daemon/index.d.ts

@@ -2,6 +2,7 @@ import { OzoneConfig, OzoneSecrets } from '../config';
 import DaemonContext from './context';
 import { AppContextOptions } from '../context';
 export { EventPusher } from './event-pusher';
+export { BlobDiverter } from './blob-diverter';
 export { EventReverser } from './event-reverser';
 export declare class OzoneDaemon {
     ctx: DaemonContext;

package/dist/db/index.js

@@ -33784,7 +33784,8 @@ __export(migrations_exports, {
   _20231219T205730722Z: () => T205730722Z_init_exports,
   _20240116T085607200Z: () => T085607200Z_communication_template_exports,
   _20240201T051104136Z: () => T051104136Z_mod_event_blobs_exports,
-  _20240208T213404429Z: () => T213404429Z_add_tags_column_to_moderation_subject_exports
+  _20240208T213404429Z: () => T213404429Z_add_tags_column_to_moderation_subject_exports,
+  _20240228T003647759Z: () => T003647759Z_add_label_sigs_exports
 });
 
 // src/db/migrations/20231219T205730722Z-init.ts
@@ -33873,6 +33874,25 @@ async function down4(db) {
   await db.schema.alterTable("moderation_subject_status").dropColumn("tags").execute();
 }
 
+// src/db/migrations/20240228T003647759Z-add-label-sigs.ts
+var T003647759Z_add_label_sigs_exports = {};
+__export(T003647759Z_add_label_sigs_exports, {
+  down: () => down5,
+  up: () => up5
+});
+async function up5(db) {
+  await db.schema.alterTable("label").addColumn("exp", "varchar").execute();
+  await db.schema.alterTable("label").addColumn("sig", sql`bytea`).execute();
+  await db.schema.alterTable("label").addColumn("signingKeyId", "integer").execute();
+  await db.schema.createTable("signing_key").addColumn("id", "serial", (col) => col.primaryKey()).addColumn("key", "varchar", (col) => col.notNull().unique()).execute();
+}
+async function down5(db) {
+  await db.schema.dropTable("signing_key");
+  await db.schema.alterTable("label").dropColumn("exp").execute();
+  await db.schema.alterTable("label").dropColumn("sig").execute();
+  await db.schema.alterTable("label").dropColumn("signingKey").execute();
+}
+
 // src/db/migrations/provider.ts
 var CtxMigrationProvider = class {
   constructor(migrations, ctx) {