@atproto/bsky 0.0.15 → 0.0.17

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atproto/bsky
 
+## 0.0.17
+
+### Patch Changes
+
+- Updated dependencies [[`45352f9b`](https://github.com/bluesky-social/atproto/commit/45352f9b6d02aa405be94e9102424d983912ca5d)]:
+  - @atproto/api@0.7.0
+
+## 0.0.16
+
+### Patch Changes
+
+- Updated dependencies [[`3c0ef382`](https://github.com/bluesky-social/atproto/commit/3c0ef382c12a413cc971ae47ffb341236c545f60), [`378fc613`](https://github.com/bluesky-social/atproto/commit/378fc6132f621ca517897c9467ed5bba134b3776)]:
+  - @atproto/syntax@0.1.5
+  - @atproto/api@0.6.24
+  - @atproto/lexicon@0.3.1
+  - @atproto/repo@0.3.6
+  - @atproto/xrpc-server@0.4.2
+
 ## 0.0.15
 
 ### Patch Changes

package/dist/api/com/atproto/moderation/util.d.ts

@@ -1,7 +1,7 @@
 import { CID } from 'multiformats/cid';
 import { AtUri } from '@atproto/syntax';
 import { InputSchema as ReportInput } from '../../../../lexicon/types/com/atproto/moderation/createReport';
-import { InputSchema as ActionInput } from '../../../../lexicon/types/com/atproto/admin/takeModerationAction';
+import { InputSchema as ActionInput } from '../../../../lexicon/types/com/atproto/admin/emitModerationEvent';
 declare type SubjectInput = ReportInput['subject'] | ActionInput['subject'];
 export declare const getSubject: (subject: SubjectInput) => {
     did: string;
@@ -12,6 +12,7 @@ export declare const getSubject: (subject: SubjectInput) => {
     cid: CID;
     did?: undefined;
 };
-export declare const getReasonType: (reasonType: ReportInput['reasonType']) => "com.atproto.moderation.defs#reasonSpam" | "com.atproto.moderation.defs#reasonViolation" | "com.atproto.moderation.defs#reasonMisleading" | "com.atproto.moderation.defs#reasonSexual" | "com.atproto.moderation.defs#reasonRude" | "com.atproto.moderation.defs#reasonOther";
-export declare const getAction: (action: ActionInput['action']) => "com.atproto.admin.defs#takedown" | "com.atproto.admin.defs#flag" | "com.atproto.admin.defs#acknowledge" | "com.atproto.admin.defs#escalate";
+export declare const getReasonType: (reasonType: ReportInput['reasonType']) => string | boolean;
+export declare const getEventType: (type: string) => "com.atproto.admin.defs#modEventTakedown" | "com.atproto.admin.defs#modEventReverseTakedown" | "com.atproto.admin.defs#modEventComment" | "com.atproto.admin.defs#modEventReport" | "com.atproto.admin.defs#modEventLabel" | "com.atproto.admin.defs#modEventAcknowledge" | "com.atproto.admin.defs#modEventEscalate" | "com.atproto.admin.defs#modEventMute" | "com.atproto.admin.defs#modEventEmail";
+export declare const getReviewState: (reviewState?: string) => "com.atproto.admin.defs#reviewOpen" | "com.atproto.admin.defs#reviewEscalated" | "com.atproto.admin.defs#reviewClosed" | undefined;
 export {};

package/dist/cache/read-through.d.ts

@@ -0,0 +1,30 @@
+import { Redis } from '../redis';
+export declare type CacheItem<T> = {
+    val: T | null;
+    updatedAt: number;
+};
+export declare type CacheOptions<T> = {
+    staleTTL: number;
+    maxTTL: number;
+    fetchMethod: (key: string) => Promise<T | null>;
+    fetchManyMethod?: (keys: string[]) => Promise<Record<string, T | null>>;
+};
+export declare class ReadThroughCache<T> {
+    redis: Redis;
+    opts: CacheOptions<T>;
+    constructor(redis: Redis, opts: CacheOptions<T>);
+    private _fetchMany;
+    private fetchAndCache;
+    private fetchAndCacheMany;
+    get(key: string, opts?: {
+        revalidate?: boolean;
+    }): Promise<T | null>;
+    getMany(keys: string[], opts?: {
+        revalidate?: boolean;
+    }): Promise<Record<string, T>>;
+    set(key: string, val: T | null): Promise<void>;
+    setMany(vals: Record<string, T | null>): Promise<void>;
+    clearEntry(key: string): Promise<void>;
+    isExpired(result: CacheItem<T>): boolean;
+    isStale(result: CacheItem<T>): boolean;
+}

package/dist/config.d.ts

@@ -9,9 +9,15 @@ export interface ServerConfigValues {
     dbReplicaPostgresUrls?: string[];
     dbReplicaTags?: Record<string, number[]>;
     dbPostgresSchema?: string;
+    redisHost?: string;
+    redisSentinelName?: string;
+    redisSentinelHosts?: string[];
+    redisPassword?: string;
     didPlcUrl: string;
     didCacheStaleTTL: number;
     didCacheMaxTTL: number;
+    labelCacheStaleTTL: number;
+    labelCacheMaxTTL: number;
     handleResolveNameservers?: string[];
     imgUriEndpoint?: string;
     blobCacheLocation?: string;
@@ -21,6 +27,9 @@ export interface ServerConfigValues {
     moderatorPassword?: string;
     triagePassword?: string;
     moderationPushUrl?: string;
+    rateLimitsEnabled: boolean;
+    rateLimitBypassKey?: string;
+    rateLimitBypassIps?: string[];
 }
 export declare class ServerConfig {
     private cfg;
@@ -39,8 +48,14 @@ export declare class ServerConfig {
     get dbReplicaPostgresUrl(): string[] | undefined;
     get dbReplicaTags(): Record<string, number[]> | undefined;
     get dbPostgresSchema(): string | undefined;
+    get redisHost(): string | undefined;
+    get redisSentinelName(): string | undefined;
+    get redisSentinelHosts(): string[] | undefined;
+    get redisPassword(): string | undefined;
     get didCacheStaleTTL(): number;
     get didCacheMaxTTL(): number;
+    get labelCacheStaleTTL(): number;
+    get labelCacheMaxTTL(): number;
     get handleResolveNameservers(): string[] | undefined;
     get didPlcUrl(): string;
     get imgUriEndpoint(): string | undefined;
@@ -51,4 +66,7 @@ export declare class ServerConfig {
     get moderatorPassword(): string | undefined;
     get triagePassword(): string | undefined;
     get moderationPushUrl(): string | undefined;
+    get rateLimitsEnabled(): boolean;
+    get rateLimitBypassKey(): string | undefined;
+    get rateLimitBypassIps(): string[] | undefined;
 }

package/dist/context.d.ts

@@ -8,11 +8,11 @@ import { DatabaseCoordinator } from './db';
 import { ServerConfig } from './config';
 import { ImageUriBuilder } from './image/uri';
 import { Services } from './services';
-import DidSqlCache from './did-cache';
+import DidRedisCache from './did-cache';
 import { BackgroundQueue } from './background';
 import { MountedAlgos } from './feed-gen/types';
-import { LabelCache } from './label-cache';
 import { NotificationServer } from './notifications';
+import { Redis } from './redis';
 export declare class AppContext {
     private opts;
     moderationPushAgent: AtpAgent | undefined;
@@ -23,8 +23,8 @@ export declare class AppContext {
         services: Services;
         signingKey: Keypair;
         idResolver: IdResolver;
-        didCache: DidSqlCache;
-        labelCache: LabelCache;
+        didCache: DidRedisCache;
+        redis: Redis;
         backgroundQueue: BackgroundQueue;
         searchAgent?: AtpAgent;
         algos: MountedAlgos;
@@ -37,8 +37,8 @@ export declare class AppContext {
     get signingKey(): Keypair;
     get plcClient(): plc.Client;
     get idResolver(): IdResolver;
-    get didCache(): DidSqlCache;
-    get labelCache(): LabelCache;
+    get didCache(): DidRedisCache;
+    get redis(): Redis;
     get notifServer(): NotificationServer;
     get searchAgent(): AtpAgent | undefined;
     get authVerifier(): (reqCtx: {
@@ -63,6 +63,21 @@ export declare class AppContext {
             aud: string | null;
         };
     }>;
+    get authOptionalVerifierAnyAudience(): (reqCtx: {
+        req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+        res: import("express").Response<any, Record<string, any>>;
+    }) => Promise<{
+        credentials: {
+            did: string;
+        };
+        artifacts: {
+            aud: string | null;
+        };
+    } | {
+        credentials: {
+            did: null;
+        };
+    }>;
     get authOptionalVerifier(): (reqCtx: {
         req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
         res: import("express").Response<any, Record<string, any>>;

package/dist/daemon/config.d.ts

@@ -0,0 +1,15 @@
+export interface DaemonConfigValues {
+    version: string;
+    dbPostgresUrl: string;
+    dbPostgresSchema?: string;
+    notificationsDaemonFromDid?: string;
+}
+export declare class DaemonConfig {
+    private cfg;
+    constructor(cfg: DaemonConfigValues);
+    static readEnv(overrides?: Partial<DaemonConfigValues>): DaemonConfig;
+    get version(): string;
+    get dbPostgresUrl(): string;
+    get dbPostgresSchema(): string | undefined;
+    get notificationsDaemonFromDid(): string | undefined;
+}

package/dist/daemon/context.d.ts

@@ -0,0 +1,15 @@
+import { PrimaryDatabase } from '../db';
+import { DaemonConfig } from './config';
+import { Services } from './services';
+export declare class DaemonContext {
+    private opts;
+    constructor(opts: {
+        db: PrimaryDatabase;
+        cfg: DaemonConfig;
+        services: Services;
+    });
+    get db(): PrimaryDatabase;
+    get cfg(): DaemonConfig;
+    get services(): Services;
+}
+export default DaemonContext;

package/dist/daemon/index.d.ts

@@ -0,0 +1,23 @@
+import { PrimaryDatabase } from '../db';
+import { DaemonConfig } from './config';
+import { DaemonContext } from './context';
+import { NotificationsDaemon } from './notifications';
+export { DaemonConfig } from './config';
+export type { DaemonConfigValues } from './config';
+export declare class BskyDaemon {
+    ctx: DaemonContext;
+    notifications: NotificationsDaemon;
+    private dbStatsInterval;
+    private notifStatsInterval;
+    constructor(opts: {
+        ctx: DaemonContext;
+        notifications: NotificationsDaemon;
+    });
+    static create(opts: {
+        db: PrimaryDatabase;
+        cfg: DaemonConfig;
+    }): BskyDaemon;
+    start(): Promise<this>;
+    destroy(): Promise<void>;
+}
+export default BskyDaemon;

package/dist/daemon/logger.d.ts

@@ -0,0 +1,3 @@
+import { subsystemLogger } from '@atproto/common';
+declare const logger: ReturnType<typeof subsystemLogger>;
+export default logger;

package/dist/daemon/notifications.d.ts

@@ -0,0 +1,18 @@
+import DaemonContext from './context';
+export declare class NotificationsDaemon {
+    private ctx;
+    ac: AbortController;
+    running: Promise<void> | undefined;
+    count: number;
+    lastDid: string | null;
+    constructor(ctx: DaemonContext);
+    run(opts?: RunOptions): void;
+    private tidyNotifications;
+    destroy(): Promise<void>;
+}
+declare type RunOptions = {
+    forever?: boolean;
+    batchSize?: number;
+    startFromDid?: string;
+};
+export {};

package/dist/daemon/services.d.ts

@@ -0,0 +1,11 @@
+import { PrimaryDatabase } from '../db';
+import { ActorService } from '../services/actor';
+import { ImageUriBuilder } from '../image/uri';
+export declare function createServices(resources: {
+    imgUriBuilder: ImageUriBuilder;
+}): Services;
+export declare type Services = {
+    actor: FromDbPrimary<ActorService>;
+};
+declare type FromDbPrimary<T> = (db: PrimaryDatabase) => T;
+export {};

package/dist/db/database-schema.d.ts

@@ -24,13 +24,12 @@ import * as actorSync from './tables/actor-sync';
 import * as record from './tables/record';
 import * as notification from './tables/notification';
 import * as notificationPushToken from './tables/notification-push-token';
-import * as didCache from './tables/did-cache';
 import * as moderation from './tables/moderation';
 import * as label from './tables/label';
 import * as algo from './tables/algo';
 import * as viewParam from './tables/view-param';
 import * as suggestedFollow from './tables/suggested-follow';
 import * as suggestedFeed from './tables/suggested-feed';
-export declare type DatabaseSchemaType = duplicateRecord.PartialDB & profile.PartialDB & profileAgg.PartialDB & post.PartialDB & postEmbed.PartialDB & postAgg.PartialDB & repost.PartialDB & threadGate.PartialDB & feedItem.PartialDB & follow.PartialDB & like.PartialDB & list.PartialDB & listItem.PartialDB & listMute.PartialDB & listBlock.PartialDB & mute.PartialDB & actorBlock.PartialDB & feedGenerator.PartialDB & subscription.PartialDB & actor.PartialDB & actorState.PartialDB & actorSync.PartialDB & record.PartialDB & notification.PartialDB & notificationPushToken.PartialDB & didCache.PartialDB & moderation.PartialDB & label.PartialDB & algo.PartialDB & viewParam.PartialDB & suggestedFollow.PartialDB & suggestedFeed.PartialDB;
+export declare type DatabaseSchemaType = duplicateRecord.PartialDB & profile.PartialDB & profileAgg.PartialDB & post.PartialDB & postEmbed.PartialDB & postAgg.PartialDB & repost.PartialDB & threadGate.PartialDB & feedItem.PartialDB & follow.PartialDB & like.PartialDB & list.PartialDB & listItem.PartialDB & listMute.PartialDB & listBlock.PartialDB & mute.PartialDB & actorBlock.PartialDB & feedGenerator.PartialDB & subscription.PartialDB & actor.PartialDB & actorState.PartialDB & actorSync.PartialDB & record.PartialDB & notification.PartialDB & notificationPushToken.PartialDB & moderation.PartialDB & label.PartialDB & algo.PartialDB & viewParam.PartialDB & suggestedFollow.PartialDB & suggestedFeed.PartialDB;
 export declare type DatabaseSchema = Kysely<DatabaseSchemaType>;
 export default DatabaseSchema;

package/dist/db/index.js

@@ -33502,7 +33502,9 @@ __export(migrations_exports, {
   _20230904T211011773Z: () => T211011773Z_block_lists_exports,
   _20230906T222220386Z: () => T222220386Z_thread_gating_exports,
   _20230920T213858047Z: () => T213858047Z_add_tags_to_post_exports,
-  _20230929T192920807Z: () => T192920807Z_record_cursor_indexes_exports
+  _20230929T192920807Z: () => T192920807Z_record_cursor_indexes_exports,
+  _20231003T202833377Z: () => T202833377Z_create_moderation_subject_status_exports,
+  _20231205T000257238Z: () => T000257238Z_remove_did_cache_exports
 });
 
 // src/db/migrations/20230309T045948368Z-init.ts
@@ -34001,6 +34003,43 @@ async function down28(db) {
   await db.schema.dropIndex("follow_subject_cursor_idx").execute();
 }
 
+// src/db/migrations/20231003T202833377Z-create-moderation-subject-status.ts
+var T202833377Z_create_moderation_subject_status_exports = {};
+__export(T202833377Z_create_moderation_subject_status_exports, {
+  down: () => down29,
+  up: () => up29
+});
+async function up29(db) {
+  await db.schema.createTable("moderation_event").addColumn("id", "serial", (col) => col.primaryKey()).addColumn("action", "varchar", (col) => col.notNull()).addColumn("subjectType", "varchar", (col) => col.notNull()).addColumn("subjectDid", "varchar", (col) => col.notNull()).addColumn("subjectUri", "varchar").addColumn("subjectCid", "varchar").addColumn("comment", "text").addColumn("meta", "jsonb").addColumn("createdAt", "varchar", (col) => col.notNull()).addColumn("createdBy", "varchar", (col) => col.notNull()).addColumn("reversedAt", "varchar").addColumn("reversedBy", "varchar").addColumn("durationInHours", "integer").addColumn("expiresAt", "varchar").addColumn("reversedReason", "text").addColumn("createLabelVals", "varchar").addColumn("negateLabelVals", "varchar").addColumn("legacyRefId", "integer").execute();
+  await db.schema.createTable("moderation_subject_status").addColumn("id", "serial", (col) => col.primaryKey()).addColumn("did", "varchar", (col) => col.notNull()).addColumn("recordPath", "varchar", (col) => col.notNull().defaultTo("")).addColumn("blobCids", "jsonb").addColumn("recordCid", "varchar").addColumn("reviewState", "varchar", (col) => col.notNull()).addColumn("comment", "varchar").addColumn("muteUntil", "varchar").addColumn("lastReviewedAt", "varchar").addColumn("lastReviewedBy", "varchar").addColumn("lastReportedAt", "varchar").addColumn("takendown", "boolean", (col) => col.defaultTo(false).notNull()).addColumn("suspendUntil", "varchar").addColumn("createdAt", "varchar", (col) => col.notNull()).addColumn("updatedAt", "varchar", (col) => col.notNull()).addUniqueConstraint("moderation_status_unique_idx", ["did", "recordPath"]).execute();
+  await db.schema.createIndex("moderation_subject_status_blob_cids_idx").on("moderation_subject_status").using("gin").column("blobCids").execute();
+  await db.schema.alterTable("record").dropConstraint("record_takedown_id_fkey").execute();
+  await db.schema.alterTable("actor").dropConstraint("actor_takedown_id_fkey").execute();
+  await db.schema.alterTable("actor").addForeignKeyConstraint("actor_takedown_id_fkey", ["takedownId"], "moderation_event", ["id"]).execute();
+  await db.schema.alterTable("record").addForeignKeyConstraint("record_takedown_id_fkey", ["takedownId"], "moderation_event", ["id"]).execute();
+}
+async function down29(db) {
+  await db.schema.dropTable("moderation_event").execute();
+  await db.schema.dropTable("moderation_subject_status").execute();
+  await db.schema.alterTable("record").dropConstraint("record_takedown_id_fkey").execute();
+  await db.schema.alterTable("actor").dropConstraint("actor_takedown_id_fkey").execute();
+  await db.schema.alterTable("actor").addForeignKeyConstraint("actor_takedown_id_fkey", ["takedownId"], "moderation_action", ["id"]).execute();
+  await db.schema.alterTable("record").addForeignKeyConstraint("record_takedown_id_fkey", ["takedownId"], "moderation_action", ["id"]).execute();
+}
+
+// src/db/migrations/20231205T000257238Z-remove-did-cache.ts
+var T000257238Z_remove_did_cache_exports = {};
+__export(T000257238Z_remove_did_cache_exports, {
+  down: () => down30,
+  up: () => up30
+});
+async function up30(db) {
+  await db.schema.dropTable("did_cache").execute();
+}
+async function down30(db) {
+  await db.schema.createTable("did_cache").addColumn("did", "varchar", (col) => col.primaryKey()).addColumn("doc", "jsonb", (col) => col.notNull()).addColumn("updatedAt", "bigint", (col) => col.notNull()).execute();
+}
+
 // src/db/migrations/provider.ts
 var CtxMigrationProvider = class {
   constructor(migrations, ctx) {
@@ -34022,6 +34061,7 @@ var CtxMigrationProvider = class {
 // src/logger.ts
 var import_pino_http = __toESM(require_logger());
 var dbLogger = subsystemLogger("bsky:db");
+var cacheLogger = subsystemLogger("bsky:cache");
 var subLogger = subsystemLogger("bsky:sub");
 var labelerLogger = subsystemLogger("bsky:labeler");
 var httpLogger = subsystemLogger("bsky");