@atproto/ozone 0.1.174 → 0.1.175

package/src/api/verification/listVerifications.ts

@@ -1,6 +1,6 @@
-import { AppContext } from '../../context'
-import { Server } from '../../lexicon'
-import { getReposForVerifications } from '../../verification/util'
+import { AppContext } from '../../context.js'
+import { Server } from '../../lexicon/index.js'
+import { getReposForVerifications } from '../../verification/util.js'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.verification.listVerifications({

package/src/api/verification/revokeVerifications.ts

@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { AppContext } from '../../context'
-import { Server } from '../../lexicon'
+import { AppContext } from '../../context.js'
+import { Server } from '../../lexicon/index.js'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.verification.revokeVerifications({

package/src/api/well-known.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express'
-import { AppContext } from '../context'
+import { AppContext } from '../context.js'
 
 export const createRouter = (ctx: AppContext): Router => {
   const router = Router()

package/src/assignment/index.ts

@@ -1,15 +1,15 @@
 import { Selectable } from 'kysely'
 import { ToolsOzoneQueueDefs } from '@atproto/api'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Database } from '../db'
-import { EndAtIdKeyset, paginate } from '../db/pagination'
-import { ModeratorAssignment } from '../db/schema/moderator_assignment'
-import { ReportQueue } from '../db/schema/report_queue'
-import type * as ToolsOzoneReportDefs from '../lexicon/types/tools/ozone/report/defs'
-import type { Member as TeamMember } from '../lexicon/types/tools/ozone/team/defs'
-import { QueueService, QueueServiceCreator } from '../queue/service'
-import { createReportActivity } from '../report/activity'
-import { TeamService, TeamServiceCreator } from '../team'
+import { Database } from '../db/index.js'
+import { EndAtIdKeyset, paginate } from '../db/pagination.js'
+import { ModeratorAssignment } from '../db/schema/moderator_assignment.js'
+import { ReportQueue } from '../db/schema/report_queue.js'
+import type * as ToolsOzoneReportDefs from '../lexicon/types/tools/ozone/report/defs.js'
+import type { Member as TeamMember } from '../lexicon/types/tools/ozone/team/defs.js'
+import { QueueService, QueueServiceCreator } from '../queue/service.js'
+import { createReportActivity } from '../report/activity.js'
+import { TeamService, TeamServiceCreator } from '../team/index.js'
 
 export interface AssignmentServiceOpts {
   queueDurationMs: number

package/src/auth-verifier.ts

@@ -6,7 +6,7 @@ import {
   parseReqNsid,
   verifyJwt,
 } from '@atproto/xrpc-server'
-import { TeamService } from './team'
+import { TeamService } from './team/index.js'
 
 type ReqCtx = {
   req: express.Request

package/src/background.ts

@@ -1,7 +1,11 @@
 import PQueue from 'p-queue'
-import { Database } from './db'
-import { dbLogger } from './logger'
-import { boundAbortController, isCausedBySignal, startInterval } from './util'
+import { Database } from './db/index.js'
+import { dbLogger } from './logger.js'
+import {
+  boundAbortController,
+  isCausedBySignal,
+  startInterval,
+} from './util.js'
 
 type Task = (db: Database, signal: AbortSignal) => Promise<void>
 
@@ -12,7 +16,7 @@ export class BackgroundQueue {
   private abortController = new AbortController()
   private queue: PQueue
 
-  public get signal() {
+  public get signal(): AbortSignal {
     return this.abortController.signal
   }
 
@@ -99,7 +103,7 @@ export class PeriodicBackgroundTask {
   private intervalPromise?: Promise<void>
   private runningPromise?: Promise<void>
 
-  public get signal() {
+  public get signal(): AbortSignal {
     return this.abortController.signal
   }
 

package/src/communication-service/template.ts

@@ -1,7 +1,7 @@
 import { Selectable } from 'kysely'
-import { Database } from '../db'
-import { CommunicationTemplate } from '../db/schema/communication_template'
-import { TemplateView } from '../lexicon/types/tools/ozone/communication/defs'
+import { Database } from '../db/index.js'
+import { CommunicationTemplate } from '../db/schema/communication_template.js'
+import { TemplateView } from '../lexicon/types/tools/ozone/communication/defs.js'
 
 export type CommunicationTemplateServiceCreator = (
   db: Database,

package/src/config/config.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert'
 import { DAY, HOUR, MINUTE } from '@atproto/common'
-import { OzoneEnvironment } from './env'
+import { OzoneEnvironment } from './env.js'
 
 // off-config but still from env:
 // logging: LOG_LEVEL, LOG_SYSTEMS, LOG_ENABLED, LOG_DESTINATION

package/src/config/index.ts

@@ -1,3 +1,3 @@
-export * from './config'
-export * from './env'
-export * from './secrets'
+export * from './config.js'
+export * from './env.js'
+export * from './secrets.js'

package/src/config/secrets.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { OzoneEnvironment } from './env'
+import { OzoneEnvironment } from './env.js'
 
 export const envToSecrets = (env: OzoneEnvironment): OzoneSecrets => {
   assert(env.adminPassword)

package/src/context.ts

@@ -5,53 +5,59 @@ import { AtpAgent } from '@atproto/api'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { DidCache, IdResolver, MemoryCache } from '@atproto/identity'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
-import { AssignmentService } from './assignment'
-import { AuthVerifier } from './auth-verifier'
-import { BackgroundQueue } from './background'
+import { AssignmentService } from './assignment/index.js'
+import { AuthVerifier } from './auth-verifier.js'
+import { BackgroundQueue } from './background.js'
 import {
   CommunicationTemplateService,
   CommunicationTemplateServiceCreator,
-} from './communication-service/template'
-import { OzoneConfig, OzoneSecrets } from './config'
-import { EventPusher } from './daemon'
-import { BlobDiverter } from './daemon/blob-diverter'
-import { Database } from './db'
-import { ImageInvalidator } from './image-invalidator'
-import { ModerationService, ModerationServiceCreator } from './mod-service'
+} from './communication-service/template.js'
+import { OzoneConfig, OzoneSecrets } from './config/index.js'
+import { BlobDiverter } from './daemon/blob-diverter.js'
+import { EventPusher } from './daemon/index.js'
+import { Database } from './db/index.js'
+import { ImageInvalidator } from './image-invalidator.js'
+import {
+  ModerationService,
+  ModerationServiceCreator,
+} from './mod-service/index.js'
 import {
   ModerationServiceProfile,
   ModerationServiceProfileCreator,
-} from './mod-service/profile'
-import { StrikeService, StrikeServiceCreator } from './mod-service/strike'
-import { QueueService, QueueServiceCreator } from './queue/service'
-import { ReportStatsService, ReportStatsServiceCreator } from './report/stats'
+} from './mod-service/profile.js'
+import { StrikeService, StrikeServiceCreator } from './mod-service/strike.js'
+import { QueueService, QueueServiceCreator } from './queue/service.js'
+import {
+  ReportStatsService,
+  ReportStatsServiceCreator,
+} from './report/stats.js'
 import {
   SafelinkRuleService,
   SafelinkRuleServiceCreator,
-} from './safelink/service'
+} from './safelink/service.js'
 import {
   ScheduledActionService,
   ScheduledActionServiceCreator,
-} from './scheduled-action/service'
-import { Sequencer } from './sequencer/sequencer'
-import { SetService, SetServiceCreator } from './set/service'
-import { SettingService, SettingServiceCreator } from './setting/service'
-import { TeamService, TeamServiceCreator } from './team'
+} from './scheduled-action/service.js'
+import { Sequencer } from './sequencer/sequencer.js'
+import { SetService, SetServiceCreator } from './set/service.js'
+import { SettingService, SettingServiceCreator } from './setting/service.js'
+import { TeamService, TeamServiceCreator } from './team/index.js'
 import {
   LABELER_HEADER_NAME,
   ParsedLabelers,
   defaultLabelerHeader,
   getSigningKeyId,
   parseLabelerHeader,
-} from './util'
+} from './util.js'
 import {
   VerificationIssuer,
   VerificationIssuerCreator,
-} from './verification/issuer'
+} from './verification/issuer.js'
 import {
   VerificationService,
   VerificationServiceCreator,
-} from './verification/service'
+} from './verification/service.js'
 
 export type AppContextOptions = {
   db: Database

package/src/daemon/blob-diverter.ts

@@ -10,9 +10,9 @@ import {
 } from '@atproto/common'
 import { IdResolver } from '@atproto/identity'
 import { ResponseType, XRPCError } from '@atproto/xrpc'
-import { BlobDivertConfig } from '../config'
-import { Database } from '../db'
-import { retryHttp } from '../util'
+import { BlobDivertConfig } from '../config/index.js'
+import { Database } from '../db/index.js'
+import { retryHttp } from '../util.js'
 
 export class BlobDiverter {
   serviceConfig: BlobDivertConfig

package/src/daemon/context.ts

@@ -3,26 +3,26 @@ import { allFulfilled } from '@atproto/common'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
-import { BackgroundQueue } from '../background'
-import { OzoneConfig, OzoneSecrets } from '../config'
-import { Database } from '../db'
-import { ModerationService } from '../mod-service'
-import { StrikeService } from '../mod-service/strike'
-import { QueueService } from '../queue/service'
-import { ReportStatsService } from '../report/stats'
-import { ScheduledActionService } from '../scheduled-action/service'
-import { SettingService } from '../setting/service'
-import { TeamService } from '../team'
-import { getSigningKeyId } from '../util'
-import { EventPusher } from './event-pusher'
-import { EventReverser } from './event-reverser'
-import { MaterializedViewRefresher } from './materialized-view-refresher'
-import { QueueRouter } from './queue-router'
-import { ScheduledActionProcessor } from './scheduled-action-processor'
-import { StatsComputer } from './stats-computer'
-import { StrikeExpiryProcessor } from './strike-expiry-processor'
-import { TeamProfileSynchronizer } from './team-profile-synchronizer'
-import { VerificationListener } from './verification-listener'
+import { BackgroundQueue } from '../background.js'
+import { OzoneConfig, OzoneSecrets } from '../config/index.js'
+import { Database } from '../db/index.js'
+import { ModerationService } from '../mod-service/index.js'
+import { StrikeService } from '../mod-service/strike.js'
+import { QueueService } from '../queue/service.js'
+import { ReportStatsService } from '../report/stats.js'
+import { ScheduledActionService } from '../scheduled-action/service.js'
+import { SettingService } from '../setting/service.js'
+import { TeamService } from '../team/index.js'
+import { getSigningKeyId } from '../util.js'
+import { EventPusher } from './event-pusher.js'
+import { EventReverser } from './event-reverser.js'
+import { MaterializedViewRefresher } from './materialized-view-refresher.js'
+import { QueueRouter } from './queue-router.js'
+import { ScheduledActionProcessor } from './scheduled-action-processor.js'
+import { StatsComputer } from './stats-computer.js'
+import { StrikeExpiryProcessor } from './strike-expiry-processor.js'
+import { TeamProfileSynchronizer } from './team-profile-synchronizer.js'
+import { VerificationListener } from './verification-listener.js'
 
 export type DaemonContextOptions = {
   db: Database

package/src/daemon/event-pusher.ts

@@ -2,13 +2,13 @@ import assert from 'node:assert'
 import { Insertable, Selectable } from 'kysely'
 import { AtpAgent } from '@atproto/api'
 import { SECOND } from '@atproto/common'
-import { Database } from '../db'
-import { BlobPushEvent } from '../db/schema/blob_push_event'
-import { RepoPushEventType } from '../db/schema/repo_push_event'
-import { ids } from '../lexicon/lexicons'
-import { InputSchema } from '../lexicon/types/com/atproto/admin/updateSubjectStatus'
-import { dbLogger } from '../logger'
-import { retryHttp } from '../util'
+import { Database } from '../db/index.js'
+import { BlobPushEvent } from '../db/schema/blob_push_event.js'
+import { RepoPushEventType } from '../db/schema/repo_push_event.js'
+import { ids } from '../lexicon/lexicons.js'
+import { InputSchema } from '../lexicon/types/com/atproto/admin/updateSubjectStatus.js'
+import { dbLogger } from '../logger.js'
+import { retryHttp } from '../util.js'
 
 type EventSubject = InputSchema['subject']
 

package/src/daemon/event-reverser.ts

@@ -1,12 +1,15 @@
 import { MINUTE } from '@atproto/common'
-import { Database } from '../db'
-import { dbLogger } from '../logger'
-import { ModerationServiceCreator, ReversalSubject } from '../mod-service'
+import { Database } from '../db/index.js'
+import { dbLogger } from '../logger.js'
 import {
   deleteExpiringTagsByIds,
   getExpiredTags,
-} from '../mod-service/expiring-tags'
-import { subjectFromStatusRow } from '../mod-service/subject'
+} from '../mod-service/expiring-tags.js'
+import {
+  ModerationServiceCreator,
+  ReversalSubject,
+} from '../mod-service/index.js'
+import { subjectFromStatusRow } from '../mod-service/subject.js'
 
 export class EventReverser {
   destroyed = false

package/src/daemon/index.ts

@@ -1,12 +1,12 @@
-import { OzoneConfig, OzoneSecrets } from '../config'
-import { AppContextOptions } from '../context'
-import { DaemonContext } from './context'
+import { OzoneConfig, OzoneSecrets } from '../config/index.js'
+import { AppContextOptions } from '../context.js'
+import { DaemonContext } from './context.js'
 
-export { EventPusher } from './event-pusher'
-export { BlobDiverter } from './blob-diverter'
-export { EventReverser } from './event-reverser'
-export { ScheduledActionProcessor } from './scheduled-action-processor'
-export { StrikeExpiryProcessor } from './strike-expiry-processor'
+export { EventPusher } from './event-pusher.js'
+export { BlobDiverter } from './blob-diverter.js'
+export { EventReverser } from './event-reverser.js'
+export { ScheduledActionProcessor } from './scheduled-action-processor.js'
+export { StrikeExpiryProcessor } from './strike-expiry-processor.js'
 
 export class OzoneDaemon {
   constructor(public ctx: DaemonContext) {}

package/src/daemon/job-cursor.ts

@@ -1,4 +1,4 @@
-import { Database } from '../db'
+import { Database } from '../db/index.js'
 
 export async function initJobCursor(db: Database, job: string): Promise<void> {
   await db.db

package/src/daemon/materialized-view-refresher.ts

@@ -1,7 +1,7 @@
 import { sql } from 'kysely'
 import { MINUTE } from '@atproto/common'
-import { BackgroundQueue, PeriodicBackgroundTask } from '../background'
-import { dbLogger } from '../logger'
+import { BackgroundQueue, PeriodicBackgroundTask } from '../background.js'
+import { dbLogger } from '../logger.js'
 
 export class MaterializedViewRefresher extends PeriodicBackgroundTask {
   constructor(backgroundQueue: BackgroundQueue, interval = 30 * MINUTE) {

package/src/daemon/queue-router.ts

@@ -1,8 +1,8 @@
 import { MINUTE } from '@atproto/common'
-import { Database } from '../db'
-import { dbLogger } from '../logger'
-import { QueueServiceCreator } from '../queue/service'
-import { initJobCursor } from './job-cursor'
+import { Database } from '../db/index.js'
+import { dbLogger } from '../logger.js'
+import { QueueServiceCreator } from '../queue/service.js'
+import { initJobCursor } from './job-cursor.js'
 
 const JOB_NAME = 'queue_router'
 const BATCH_SIZE = 100

package/src/daemon/scheduled-action-processor.ts

@@ -3,20 +3,23 @@ import { MINUTE, SECOND } from '@atproto/common'
 import {
   assertProtectedTagAction,
   getProtectedTags,
-} from '../api/moderation/util'
-import { Database } from '../db'
-import { ScheduledAction } from '../db/schema/scheduled-action'
+} from '../api/moderation/util.js'
+import { Database } from '../db/index.js'
+import { ScheduledAction } from '../db/schema/scheduled-action.js'
 import {
   ModEventTakedown,
   ModTool,
-} from '../lexicon/types/tools/ozone/moderation/defs'
-import { dbLogger } from '../logger'
-import { ModerationService, ModerationServiceCreator } from '../mod-service'
-import { RepoSubject } from '../mod-service/subject'
-import { ModEventType } from '../mod-service/types'
-import { ScheduledActionServiceCreator } from '../scheduled-action/service'
-import { SettingService, SettingServiceCreator } from '../setting/service'
-import { retryHttp } from '../util'
+} from '../lexicon/types/tools/ozone/moderation/defs.js'
+import { dbLogger } from '../logger.js'
+import {
+  ModerationService,
+  ModerationServiceCreator,
+} from '../mod-service/index.js'
+import { RepoSubject } from '../mod-service/subject.js'
+import { ModEventType } from '../mod-service/types.js'
+import { ScheduledActionServiceCreator } from '../scheduled-action/service.js'
+import { SettingService, SettingServiceCreator } from '../setting/service.js'
+import { retryHttp } from '../util.js'
 
 export class ScheduledActionProcessor {
   destroyed = false

package/src/daemon/stats-computer.ts

@@ -1,8 +1,8 @@
 import { sql } from 'kysely'
 import { MINUTE } from '@atproto/common'
-import { Database } from '../db'
-import { dbLogger } from '../logger'
-import { ReportStatsServiceCreator } from '../report/stats'
+import { Database } from '../db/index.js'
+import { dbLogger } from '../logger.js'
+import { ReportStatsServiceCreator } from '../report/stats.js'
 
 // Stable lock ID for pg_try_advisory_lock across all instances
 const ADVISORY_LOCK_ID = 7_239_401

package/src/daemon/strike-expiry-processor.ts

@@ -1,8 +1,8 @@
 import { HOUR } from '@atproto/common'
-import { Database } from '../db'
-import { dbLogger } from '../logger'
-import { StrikeServiceCreator } from '../mod-service/strike'
-import { getJobCursor, initJobCursor, updateJobCursor } from './job-cursor'
+import { Database } from '../db/index.js'
+import { dbLogger } from '../logger.js'
+import { StrikeServiceCreator } from '../mod-service/strike.js'
+import { getJobCursor, initJobCursor, updateJobCursor } from './job-cursor.js'
 
 const JOB_NAME = 'strike_expiry'
 

package/src/daemon/team-profile-synchronizer.ts

@@ -1,6 +1,6 @@
 import { HOUR } from '@atproto/common'
-import { BackgroundQueue, PeriodicBackgroundTask } from '../background'
-import { TeamService } from '../team'
+import { BackgroundQueue, PeriodicBackgroundTask } from '../background.js'
+import { TeamService } from '../team/index.js'
 
 export class TeamProfileSynchronizer extends PeriodicBackgroundTask {
   constructor(

package/src/daemon/verification-listener.ts

@@ -1,9 +1,9 @@
 import { lexicons } from '@atproto/api'
-import { BackgroundQueue } from '../background'
-import { Database } from '../db'
-import { CommitCreateEvent, Jetstream } from '../jetstream/service'
-import { verificationLogger } from '../logger'
-import { VerificationService } from '../verification/service'
+import { BackgroundQueue } from '../background.js'
+import { Database } from '../db/index.js'
+import { CommitCreateEvent, Jetstream } from '../jetstream/service.js'
+import { verificationLogger } from '../logger.js'
+import { VerificationService } from '../verification/service.js'
 
 type VerificationRecord = {
   subject: string

package/src/db/index.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { EventEmitter } from 'node:stream'
+import { EventEmitter } from 'node:events'
 import {
   Kysely,
   KyselyPlugin,
@@ -11,13 +11,17 @@ import {
   RootOperationNode,
   UnknownRow,
 } from 'kysely'
-import { Pool as PgPool, types as pgTypes } from 'pg'
-import TypedEmitter from 'typed-emitter'
-import { dbLogger } from '../logger'
-import * as migrations from './migrations'
-import { CtxMigrationProvider } from './migrations/provider'
-import { DatabaseSchema, DatabaseSchemaType } from './schema'
-import { PgOptions } from './types'
+// eslint-disable-next-line import/default
+import pg from 'pg'
+// eslint-disable-next-line import/no-named-as-default-member
+const { Pool: PgPool, types: pgTypes } = pg
+type PgPool = InstanceType<typeof PgPool>
+import type TypedEmitter from 'typed-emitter'
+import { dbLogger } from '../logger.js'
+import * as migrations from './migrations/index.js'
+import { CtxMigrationProvider } from './migrations/provider.js'
+import { DatabaseSchema, DatabaseSchemaType } from './schema/index.js'
+import { PgOptions } from './types.js'
 
 export class Database {
   pool: PgPool
@@ -190,7 +194,7 @@ class LeakyTxPlugin implements KyselyPlugin {
   }
 }
 
-type TxnEmitter = TypedEmitter<TxnEvents>
+type TxnEmitter = TypedEmitter.default<TxnEvents>
 
 type TxnEvents = {
   commit: () => void

package/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts

@@ -1,13 +1,13 @@
 import { Kysely, sql } from 'kysely'
-import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs'
+import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs.js'
 import {
   REVIEWESCALATED,
   REVIEWOPEN,
-} from '../../lexicon/types/tools/ozone/moderation/defs'
-import { DatabaseSchemaType } from '../schema'
-import * as modEvent from '../schema/moderation_event'
-import * as modStatus from '../schema/moderation_subject_status'
-import * as recordEventsStats from '../schema/record_events_stats'
+} from '../../lexicon/types/tools/ozone/moderation/defs.js'
+import { DatabaseSchemaType } from '../schema/index.js'
+import * as modEvent from '../schema/moderation_event.js'
+import * as modStatus from '../schema/moderation_subject_status.js'
+import * as recordEventsStats from '../schema/record_events_stats.js'
 
 export async function up(db: Kysely<any>): Promise<void> {
   // Used by "tools.ozone.moderation.queryStatuses". Reduces query cost by two

package/src/db/migrations/20250718T150931000Z-update-appeal-reason-stats.ts

@@ -1,9 +1,9 @@
 import { Kysely, sql } from 'kysely'
-import { OZONE_APPEAL_REASON_TYPE } from '../../api/util'
-import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs'
-import { DatabaseSchemaType } from '../schema'
-import * as modEvent from '../schema/moderation_event'
-import * as recordEventsStats from '../schema/record_events_stats'
+import { OZONE_APPEAL_REASON_TYPE } from '../../api/util.js'
+import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs.js'
+import { DatabaseSchemaType } from '../schema/index.js'
+import * as modEvent from '../schema/moderation_event.js'
+import * as recordEventsStats from '../schema/record_events_stats.js'
 
 export async function up(db: Kysely<any>): Promise<void> {
   // Drop and recreate materialized views to update appeal reason counting